dev-java/javacup: Break circular dependency

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

4 files changed, 29 insertions, 14 deletions

diff --git a/dev-java/javacup/ChangeLog b/dev-java/javacup/ChangeLog
index f7d779400834..127a579d985f 100644
--- a/dev-java/javacup/ChangeLog
+++ b/dev-java/javacup/ChangeLog
@@ -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 <sping@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)
 
diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
index a204a8c08858..b2d296ba8e83 100644
--- a/dev-java/javacup/Manifest
+++ b/dev-java/javacup/Manifest
@@ -5,13 +5,13 @@ AUX javacup-0.11b_beta20150326-build-xml.patch 949 SHA256 9dd0eadd540a3bd202485f
 DIST java-cup-src-11b-20150326.tar.gz 376913 SHA256 3df107f48b9726d1bf6c4061f6a1304b125aa766da211cd17ff85a2d56339825 SHA512 020beda9f019e03b1d35a20b7c10f4d43d5d39e46f3beb0a993fe6471f4c1369440d76b4f88a6161f8169406760720c7811c07396ca0ad7eab5ee9e4b091b733 WHIRLPOOL 54e2b7d53918c0e053c690c0db14e5ab2ddc2454c64f7a531690b9e4fe37e76aee1e9bb3711cc515423cf2d288ca7054a903d331619b1dd0a28f62121555e004
 DIST javacup-0.11a_beta20060608.tar.bz2 285727 SHA256 cb3ad4951d734bd1e5a6ff835018dea26a47564f820ae0a925f9c30f2fb7e1ff SHA512 383172f7d9cb127ad5d1d6de561eaf53b057bf7511f6f8c353fc03860daabb023e11330e0518b9c390e255a643c9c1e609b5fbdfd3c2e92dd68dc2d2354a931f WHIRLPOOL 6480219de3a997eb9a942ce816f9868dc13d06b8c0553521e9cf37fe568265cf752efcd36d9b64ea424d225d4823fce0652c9b0d7e1c853e38cd9f00fb12ce30
 EBUILD javacup-0.11a_beta20060608.ebuild 1790 SHA256 9000d71da2734f3c8e864203dfca3ccc64633e36bd611464f091402f42f0f43d SHA512 e9c291c2201ceab9cdb752b51ef63bcd24d73720cbb7c430c733b7dfc4f24c005f98827237e6393eb28a17998ee1303b93f3d6544be489fb39ea1cf4ae2ad6cc WHIRLPOOL 5f9410130b549860576f43e5304644cddfd3eeaa40673696d03d38c29706219a3e6783e371e7e8c0380bbec8843b648b9f5ceaeaf2e3874d58398c4221ccca26
-EBUILD javacup-0.11b_beta20150326.ebuild 1959 SHA256 8f3bf6f981de1bf89f1ed0228cb30075aeb45721a6d46a4d56830741664c30cb SHA512 e88b9247c2e2501d1749691b5fb99d166bf1e70858c6d50453f74a90f49fc844d69b21d01303a7c9e5c62a5fdfc42309807338c1c44463cd8fb474134b9e5b82 WHIRLPOOL 8922e79413334f2b40a13613297d3bec57924832fe12c507b47e69372697087f3de0c41d384dd7996c5240aab60c7c24fbc51992db628f05b6bbb10fe95e3089
-MISC ChangeLog 4645 SHA256 af6a408dd98160daf2fe7cb913fdf6d43fb1fc92e2f375b8b794d0f7bc039289 SHA512 4cda36f2c5f0f60d9f5756785ef54323c0c1199427516d217530217ddcf248df669d7a17296d56f2f8c808f014ff127e39ac7b51f4e79ae46d3708b1c04114f6 WHIRLPOOL 1c9d7412479b8a7a4a211d47cc5107ff43ddc012ab09c7537cac13afda295fe8db25ea548637f798ccc35a4f7a7810fbab2bd56046e64a145f0402cf25e08e46
-MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+EBUILD javacup-0.11b_beta20150326.ebuild 2090 SHA256 c6827211af77aaace6243addaf63ecbd4a708e8c787f9a66793d5a728c31f177 SHA512 1b7dd851353a7fba55d739697a3982f006166b2beaa0e780cd777b17571f38b9a8ae6b95ff395b575220ae489d21f78262fb256c44b0e646cbd64966a2939921 WHIRLPOOL 9630e4183225fa276037197f1c3efae38b5972ea1947f4c9556388ca34a2261c70c5b606226927f10b47b5e7cc82c4af385152ecdebdb32397b78fe4b8f3626c
+MISC ChangeLog 4903 SHA256 92b176c4dfb02d2da7f7a0bf15b4d477a796371a5c2b67ecea0dbd8c9cd44e98 SHA512 5ec86132df9df2f89b2fdbaa5d59e3bfd1853e61050a73243c4eac8b19a9c34edeb897a188b26eca229764234e94d5f3b8fdcc21b92aa3b463f1f149bb9efa74 WHIRLPOOL 838a1d77cf472a9fa43697b62d15e5de4a7ba41d890c7bc6cc28509e02855b354ae03f97e4f92684f57bdefc2f7763028a53c06d3eb3e1c8a0dfc3442659e1d9
+MISC metadata.xml 370 SHA256 1b8730623493e18e34cdddf569793af693ade323d3c688916711a52c9cd61438 SHA512 251403631412484e52c902420e4c3b5e5f4014b5503587f851c9800963360688308bc4c21b8b4c47716c3f3d8dcf2e20054a4aee420fcde47a8bc83564cbcc85 WHIRLPOOL f251297ba390d5e508e68e714d3f61984d1cc0d04c7118c56311b8c5a0d7a1cf15c31e0151ad9a5f83a7074d5e10c8777d383869e65dacbfaa78d0c9b541876f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlXFDgEACgkQsAvGakAaFgAs+wCgpbUs0xLIRqKjU+58+yotHUi0
-vY4AoIqxMeDBBubNGzNwkOqekFD0uLNg
-=0/wk
+iEYEAREIAAYFAlXFVcwACgkQsAvGakAaFgDDEwCfR3OPcNv+p3uQUxUOlaV7e2Ys
+VT8Ani5od8b2w7y6LTTLkTEVWYjouQk1
+=IVFD
 -----END PGP SIGNATURE-----
diff --git a/dev-java/javacup/javacup-0.11b_beta20150326.ebuild b/dev-java/javacup/javacup-0.11b_beta20150326.ebuild
index 8d10fc8806fa..ab0ef7e21c56 100644
--- a/dev-java/javacup/javacup-0.11b_beta20150326.ebuild
+++ b/dev-java/javacup/javacup-0.11b_beta20150326.ebuild
@@ -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 @@ SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.
 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 @@ src_prepare() {
 
 	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
 }
diff --git a/dev-java/javacup/metadata.xml b/dev-java/javacup/metadata.xml
index 7303cef96964..3364029ae5a8 100644
--- a/dev-java/javacup/metadata.xml
+++ b/dev-java/javacup/metadata.xml
@@ -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>