sping 15/08/08 01:05:15
Modified: metadata.xml ChangeLog
javacup-0.11b_beta20150326.ebuild
Log:
dev-java/javacup: Break circular dependency
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
0x401A1600)
Revision Changes Path
1.3 dev-java/javacup/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacup/metadata.xml?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacup/metadata.xml?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacup/metadata.xml?r1=1.2&r2=1.3
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/javacup/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml 11 Sep 2005 00:04:28 -0000 1.2
+++ metadata.xml 8 Aug 2015 01:05:15 -0000 1.3
@@ -2,4 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
<herd>java</herd>
+ <use>
+ <flag name="system-jflex">
+ Build against system <pkg>dev-java/jflex</pkg> rather
than the bundled one.
+ Disabling this flag allows breaking the circular
dependency when necessary.
+ </flag>
+ </use>
</pkgmetadata>
1.37 dev-java/javacup/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacup/ChangeLog?rev=1.37&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacup/ChangeLog?rev=1.37&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacup/ChangeLog?r1=1.36&r2=1.37
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/javacup/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog 7 Aug 2015 19:58:56 -0000 1.36
+++ ChangeLog 8 Aug 2015 01:05:15 -0000 1.37
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/javacup
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/ChangeLog,v 1.36
2015/08/07 19:58:56 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/ChangeLog,v 1.37
2015/08/08 01:05:15 sping Exp $
+
+ 08 Aug 2015; Sebastian Pipping <sp...@gentoo.org>
+ javacup-0.11b_beta20150326.ebuild, metadata.xml:
+ Introduce use flag "system-jflex" to break circular dependency, address
+ warning on dev-java/ant-core (by specifying slot 0 and also adding to DEPEND)
*javacup-0.11b_beta20150326 (07 Aug 2015)
1.2 dev-java/javacup/javacup-0.11b_beta20150326.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild?r1=1.1&r2=1.2
Index: javacup-0.11b_beta20150326.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- javacup-0.11b_beta20150326.ebuild 7 Aug 2015 19:58:56 -0000 1.1
+++ javacup-0.11b_beta20150326.ebuild 8 Aug 2015 01:05:15 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild,v
1.1 2015/08/07 19:58:56 sping Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild,v
1.2 2015/08/08 01:05:15 sping Exp $
EAPI="5"
@@ -22,14 +22,16 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="userland_BSD"
+IUSE="userland_BSD system-jflex"
# find for bug #214664
+CDEPEND=">=dev-java/ant-core-1.7.0:0"
DEPEND=">=virtual/jdk-1.5
- dev-java/jflex:0
- !userland_BSD? ( >=sys-apps/findutils-4.4 )"
+ system-jflex? ( dev-java/jflex:0 )
+ !userland_BSD? ( >=sys-apps/findutils-4.4 )
+ ${CDEPEND}"
RDEPEND=">=virtual/jre-1.5
- >=dev-java/ant-core-1.7.0"
+ ${CDEPEND}"
S="${WORKDIR}"
@@ -38,8 +40,10 @@
find . -name '*.class' -delete || die
- rm bin/JFlex.jar || die
- java-pkg_jar-from --build-only jflex JFlex.jar bin/JFlex.jar
+ if use system-jflex; then # break the circular dependency
+ rm bin/JFlex.jar || die
+ java-pkg_jar-from --build-only jflex JFlex.jar bin/JFlex.jar
+ fi
java-ant_rewrite-classpath
}
