Removed un-bundling of cglib/asm from mockito as it creates troubles with other packages.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

3 files changed, 22 insertions, 16 deletions

diff --git a/dev-java/mockito/ChangeLog b/dev-java/mockito/ChangeLog
index 7bd5e4c0ffe5..b3762fcbdf46 100644
--- a/dev-java/mockito/ChangeLog
+++ b/dev-java/mockito/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/mockito
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mockito/ChangeLog,v 1.2 2013/10/12 16:17:15 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mockito/ChangeLog,v 1.3 2013/11/30 17:39:59 ercpe Exp $
+
+*mockito-1.9.5-r1 (30 Nov 2013)
+
+  30 Nov 2013; Johann Schmitz <ercpe@gentoo.org> +mockito-1.9.5-r1.ebuild,
+  -mockito-1.9.5.ebuild:
+  Removed un-bundling of cglib/asm from mockito as it creates troubles with
+  other packages.
 
   12 Oct 2013; Johann Schmitz <ercpe@gentoo.org> mockito-1.9.5.ebuild:
   Added missing dependency to hamcrest-core:0 to mockito and set JAVA_SRC_DIR to
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index 3f6bd8251714..ec720f8ded6d 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST mockito-1.9.5.zip 6453870 SHA256 aaef6647ebded1deffa74e8b9cd5a3449eb385dbc127e1d56f0bdb59cde5c00e SHA512 93768992c74fbc2e2653b46b3afb526ab816b9c707cb5f9608564299ffd206e256182be146c590b4777a624379f576d7117ed7d43b11f8d2974e87c402eede51 WHIRLPOOL 2746b67745fbeff7752137e6afae8871fd20ccfe72a3b769df4e29d051bdc9da5de90cced3418641247cd8e8e0ff8c37b84483b91bfd6625b2fad25750aeead1
-EBUILD mockito-1.9.5.ebuild 1050 SHA256 fb67cb6eb3f6f595e16d3ab360ed6f2a287469ef4baa686135e8b31f0158ca75 SHA512 6f9c605ea9ca50e558f61bad920257360ace0bf7860290063e40091382c0bcb541bd7f638510910451e31a3d912c619f39c81097e95d20bff51908e5cd3323e8 WHIRLPOOL 916af3a87caf3d0afc03bae136fa9b9349df6e89d504f0ce26cbbbc594968d60005857e38cb5b6127e0ac2878ed56acf55b14eb7ae8d51fe4e49fc512971e532
-MISC ChangeLog 667 SHA256 a5cbaed52d8fffc894d2aaafb20e966c76ac40e02fbfd0b4bc5a3161ad238aaa SHA512 9dae23731c372baa6f6827df1c4e1d64431bcc604e7fd02293323f2911dc6e440a4189ad90ad419f1520945f824b97ac4f030584e7ef1bb4911412d2fd695f6b WHIRLPOOL 41d1ad04e738738cb003d2bdfa897ccabd8b9dcf1bfd941c1671c7aed5622819e1255e65caeb4583889c8dc7e787ee75df098ecba3c6023f7371f328b39324a7
+EBUILD mockito-1.9.5-r1.ebuild 947 SHA256 3e4df965cad566c5b0918703a016c2e970917f230f162e034ba7245896606788 SHA512 97fa5e0e199e56bc248e1402ff089c67a3f27f0416eb184a08667f9802652ac7f0b7f99cf58e05bfb31963ba62b942c5f629816eabc977bad39b93d6042e46b6 WHIRLPOOL d4b7a9da38af90af92d174bc984bc780c4b70b3b6b7bc6392980a2b5ec0facc5f5022b6e5e7ea8500848b6aed0dbfca8c042babc66d56cc5c5984d9d9695464a
+MISC ChangeLog 895 SHA256 b392d2beee37290da8a2084fe196996b2331e80e9bfea09a019294d3cf442370 SHA512 fa3b691c784b062f679150a38d0435faf1196c8a7e2eede5e1a018c163163174cbb5305101dd4be4c257b8434e823c706c0eb46b039b3455d6a665bfbb9d13b4 WHIRLPOOL 22f1d7483bacc32a0768dcbd80e4904e172b9af45e7c6a7d900b04aa5bbe2c10bad24c0f840947ac3dc82417b86450a4fdea4db213e3dcd46b7f49e86bc20ebd
 MISC metadata.xml 290 SHA256 4280e44cd034069e55e73b935a8a894995842da224144edc097f4ba08f7bd965 SHA512 c6e068e96cc4b6c5847f63212059b0702f03049e3d44aa7b104b40c67024389b45a3faccf1fab69c7848af5014e09cd1d771b769099252395e5882f020ad37e7 WHIRLPOOL b19248990cd8248809c9212e298611dd23f758c2d00c4d8b62698708c39cf55add015e518b042b8d80a197b92b42bd0e92ae609f5c3db4eeb691bc6061943827
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSWXYMAAoJEKCEBkJ3xQHt7uwH/0Kz9xl3e+emi/jUoQtZvlJ5
-avzpPked+BEWVgYygz0ty3oQcdqnTplIhoEWdaHiey/4wMB8zrWvK8AO4Dt2fLBL
-pDzgtUljHOXEnwxNCrXVd2yXUygvrAjJZc5HUWpw4BchQVKeQ98vBFGJtBLHfJuq
-wt6xCzP0J4VWwI03B/jso050a2x8djJuNCBSLh69Sem/JqJrEPrbVW6NlDIoJWkV
-xiZzAX4Hc3i2SDYKBS1TX+BkfAf9yuiJoLLQ/qeRxIgAVxLJEQQ1mETvmiYaJEhD
-U6MOPcsyekHiYfmFV/hwQVe2AmaV0YYsHpf71lRjxM6Y+7S7XQxlUNwKpk1q3aQ=
-=YztV
+iQEcBAEBCAAGBQJSmiL4AAoJEKCEBkJ3xQHtA9IH/1sWepZnn0ksgOFUZqF29xZr
+wpFRqbm2sgYX0rDcn62q3/ac+FCCLvYjZ5rPkBoU/4sNEZ+SyCZbf5ytkpa6lBHo
+FjXF9ssK0TudjaYMxCGAPVyswV/YdqBJJn5WiCSJ4L+nQRKor95rbum1BTtfUVs/
+erMSIlbsh4/CdMUisIje4/a75+FuE/0b/58gw/KzjzkOwvhgS2cy7MPpPEWlq/nd
+WAMnx/lL7oSp8mgDgyG1D2mJ5wqOEf9XU1jc7EfSTmvUUaBucypWoau/lr8D8SDD
+0KjTrnZGIVgv5lAVXYJMosgLF/vguC38ef9Bf1mWDUsHsSbsDnJiUCz2OB1P7pE=
+=/zcE
 -----END PGP SIGNATURE-----
diff --git a/dev-java/mockito/mockito-1.9.5.ebuild b/dev-java/mockito/mockito-1.9.5-r1.ebuild
index c8c48e039a08..ac67f9a95548 100644
--- a/dev-java/mockito/mockito-1.9.5.ebuild
+++ b/dev-java/mockito/mockito-1.9.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mockito/mockito-1.9.5.ebuild,v 1.2 2013/10/12 16:17:15 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mockito/mockito-1.9.5-r1.ebuild,v 1.1 2013/11/30 17:39:59 ercpe Exp $
 
 EAPI="5"
 
@@ -19,9 +19,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 CDEPEND="dev-java/junit:4
-	dev-java/cglib:3
 	dev-java/objenesis:0
-	dev-java/hamcrest-core:0"
+	dev-java/hamcrest-core:0
+	dev-java/ant-core:0"
 RDEPEND=">=virtual/jre-1.5
 	${CDEPEND}"
 DEPEND=">=virtual/jdk-1.5
@@ -31,7 +31,7 @@ DEPEND=">=virtual/jdk-1.5
 S="${WORKDIR}"
 
 JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="junit-4,cglib-3,objenesis,hamcrest-core"
+JAVA_GENTOO_CLASSPATH="junit-4,objenesis,hamcrest-core,ant-core"
 
 src_unpack() {
 	unpack ${A}
@@ -39,6 +39,5 @@ src_unpack() {
 }
 
 java_prepare() {
-	rm -rf "${S}"/src/org/mockito/{cglib,asm} || die
-	find src/ -name "*.java" | xargs sed -i -e 's/import org.mockito.cglib/import net.sf.cglib/g' || die
+	find "${S}" -name "*.jar" -delete || die
 }