Fix: Class files not found via DEPEND in package.env - by adding antlr-3 to JAVA_GENTOO_CLASSPATH. Try to fix bug #458462 - it merges ok with JAVA_PKG_STRICT="true" in my tests.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

3 files changed, 19 insertions, 19 deletions

diff --git a/sci-mathematics/kodkodi/ChangeLog b/sci-mathematics/kodkodi/ChangeLog
index b94e88f1eb44..c2909bc49f90 100644
--- a/sci-mathematics/kodkodi/ChangeLog
+++ b/sci-mathematics/kodkodi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/kodkodi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkodi/ChangeLog,v 1.2 2013/05/24 05:48:44 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkodi/ChangeLog,v 1.3 2013/08/17 02:59:08 gienah Exp $
+
+  17 Aug 2013; Mark Wright <gienah@gentoo.org> kodkodi-1.5.2.ebuild:
+  Fix: Class files not found via DEPEND in package.env - by adding antlr-3 to
+  JAVA_GENTOO_CLASSPATH. Try to fix bug #458462 - it merges ok with
+  JAVA_PKG_STRICT="true" in my tests.
 
   24 May 2013; Mark Wright <gienah@gentoo.org> metadata.xml:
   fix bug 466776 - typo in email address
diff --git a/sci-mathematics/kodkodi/Manifest b/sci-mathematics/kodkodi/Manifest
index 7627c43638ad..ea357f2c5848 100644
--- a/sci-mathematics/kodkodi/Manifest
+++ b/sci-mathematics/kodkodi/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA256
 
 DIST kodkodi-1.5.2.tgz 2826648 SHA256 1518d75f3748aa7c791623ff1508b4202f14d744e13b9bd41abf575429caa2b7 SHA512 117e0f1b3e3ee88efb9a9e2f02e8a7ce82a3487528ad0476acf20fafd885d3d48c051bd4a8cb6aa5cda61f24dfa74159448b83398be4119e726e757f6ff3aad4 WHIRLPOOL f331b423b2ad430b59f425d799c3991dccf0e5e9018015f12c30be851f8254cf3b0e39da12fcfd07083813671316ecdcbfc70429742e89cf7b2b4093b773bb0b
-EBUILD kodkodi-1.5.2.ebuild 3121 SHA256 d8f5d029dbfc31dab30248ac66a8e08ec4cf99bddabdeaebcc1b89506c28d1df SHA512 b9697ff679248a68ca4ef3374457ef93d18d5b8bc1b770a5df156697f1129dd2d9a570664aa8701e13c6c6ba81aadf4ac7f97fc056cff80f9838414dde1c5b4e WHIRLPOOL 55a4e658137dc30d70576b4421df3a4ff6cfbe4cbe9b901b56c833e71113c0a0ac0aa99db2f9081f64e9a6387f053236b800d3a02244d855167b586465fe741c
-MISC ChangeLog 527 SHA256 6351097efb3b9ef1d877380e9bb006f1ecd9990af37b6d0072a70b402472abd5 SHA512 9f3b50c62f99f03afe55318f79702fd7f959e5cf187c5fdf6762ec809b0681e62fcb51566239c16ab113fd3c9c80c1ecaffd9d7c061d39b03e262d4f954050ef WHIRLPOOL f215f340e25bf552acadaad202d42c07a5ab7ac7173846ff4a422907a2481724cadbce542c12ed7fb583f100ab3c9ce89f07b0fdff326117ce114991900e7d84
+EBUILD kodkodi-1.5.2.ebuild 3015 SHA256 415172eda7b6b0095ae8cce542bf7d12898d8e81dcc9b2f191e80d4efe2d0750 SHA512 ba24e73bd861883172d4cb8980d88b2e111dd67c96f5222f24f4a8d571634ed889d949750574a2fe8316ce37c85c55ff8f7ea9a1e08b52ee63f1aa28ebd64aba WHIRLPOOL f8239b45be6585d47e819453de35d89e556ee8f442e5c669ec2126bcd2a10947b2b86d10dad00d9c7328e69c946d2ce26b7ae6371e44ed8e9859d900ee1027cf
+MISC ChangeLog 781 SHA256 484fcafa1cb0088d5e50e203085e7b0aa1f54388cfe5462ba816ff42cdc7bcce SHA512 9e878f8bbb67faa78d2860de0ac40840e695291b8a7afc40794d93ced2d39b5e23a65c42768d09b80e607347e5b86fce513e360f681e3b30d9ba27c4cfd11254 WHIRLPOOL f5604007f76beedd078953832c4123853b31c90c719fb1159c472f70f7aaf8f4711c32ff6d88ea20d03ba422c9a9673b2117bc52ae6a1e128401e3d0aaf68a76
 MISC metadata.xml 457 SHA256 a1cd9b7637ed993b791e220170ded5abe7d3ab79d5cfc82fcd65c7a691fef5d2 SHA512 6ac61c897c8013bdda86334ed09d4de78b641a12fa4dfb8430de8803e4475ac758ddbeb39d6b3c83bfc53af76d0a84f2f35d2732c7e64191bae35dd30d91fd3e WHIRLPOOL 2fdde110d292428ad8888b0e68b202da4eb939e16281c660cc5d6083183a8f737034cd9a44f697deb17b015c7c606019c308a14ee1aa9a8ae5dec7f90a0f054c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlGe/p8ACgkQoBEVQmGOlx/bRQEAutWla0/E8wqvK3N6W/Blc/mz
-oaKjmHDh0zE/D9E5XCYA/RBSm0hMmyr6Wyo5c/iCTugOy7lSRyHcuzCJwhYSSe++
-=okK+
+iF4EAREIAAYFAlIO5qkACgkQoBEVQmGOlx8ySQEA1zLk6CXzeTsSx7KkTL0hSOtM
+1ciWL6MAcQJM6Bz6UCwA/ilbn4h+2n90UGHJxAeOBn3F42plZImXpZASSnQPuYPb
+=DFsq
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/kodkodi/kodkodi-1.5.2.ebuild b/sci-mathematics/kodkodi/kodkodi-1.5.2.ebuild
index 1296bc738a9c..f3ff084bb930 100644
--- a/sci-mathematics/kodkodi/kodkodi-1.5.2.ebuild
+++ b/sci-mathematics/kodkodi/kodkodi-1.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkodi/kodkodi-1.5.2.ebuild,v 1.1 2012/12/05 10:44:14 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkodi/kodkodi-1.5.2.ebuild,v 1.2 2013/08/17 02:59:08 gienah Exp $
 
 EAPI="5"
 
@@ -17,13 +17,12 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="isabelle examples"
 
-COMMON_DEP=""
+COMMON_DEP="dev-java/antlr:3
+	=sci-mathematics/kodkod-1.5*:="
 RDEPEND="${COMMON_DEP}
-	=dev-java/antlr-3*:3
 	isabelle? (
 		>=sci-mathematics/isabelle-2011-r1:=
 	)
-	=sci-mathematics/kodkod-1.5*:=
 	>=virtual/jre-1.6"
 DEPEND="${COMMON_DEP}
 	>=virtual/jdk-1.6
@@ -31,20 +30,16 @@ DEPEND="${COMMON_DEP}
 
 S="${WORKDIR}/${P}"
 
-java_prepare() {
-	find \( -name 'kodkod*.jar' -o -name 'sat4j*.jar' \) -exec rm -v {} + || die
-}
+JAVA_GENTOO_CLASSPATH="kodkod,antlr-3"
 
-src_prepare() {
+java_prepare() {
 	sed -e 's@exec "$ISABELLE_TOOL" java $KODKODI_JAVA_OPT@java@' \
 		-i "${S}/bin/kodkodi" || die "Could not patch bin/kodkodi"
+	rm -f jar/*.jar || die "Could not rm jar files"
 }
 
 src_compile() {
 	JAVA_SRC_DIR="src"
-	JAVA_GENTOO_CLASSPATH="kodkod"
-	JAVA_CLASSPATH_EXTRA="$(java-config --classpath=antlr:3)"
-
 	TARGETDIR="/usr/share/${P}"
 	KODKOD_LIBDIR="/usr/"$(get_libdir)"/kodkod"