summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Clement <monsieurp@gentoo.org>2015-06-08 23:32:50 +0000
committerPatrice Clement <monsieurp@gentoo.org>2015-06-08 23:32:50 +0000
commit3aa1384e12a0b62178bcabc3bdf3d9d9e6ad1dec (patch)
treeca1ab706095951a6c5a389a42054738fb1b15fc3
parentAdd back ~ppc and ~ppc64 keywords. (diff)
downloadhistorical-3aa1384e12a0b62178bcabc3bdf3d9d9e6ad1dec.tar.gz
historical-3aa1384e12a0b62178bcabc3bdf3d9d9e6ad1dec.tar.bz2
historical-3aa1384e12a0b62178bcabc3bdf3d9d9e6ad1dec.zip
Fix wrong dependency in JAVA_GENTOO_CLASSPATH.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org> Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x93491BB8
-rw-r--r--dev-java/easymock/ChangeLog5
-rw-r--r--dev-java/easymock/Manifest18
-rw-r--r--dev-java/easymock/easymock-3.2-r1.ebuild20
3 files changed, 15 insertions, 28 deletions
diff --git a/dev-java/easymock/ChangeLog b/dev-java/easymock/ChangeLog
index 4eeebd67edd2..ba14cae2753a 100644
--- a/dev-java/easymock/ChangeLog
+++ b/dev-java/easymock/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/easymock
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/easymock/ChangeLog,v 1.3 2015/04/11 22:23:20 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/easymock/ChangeLog,v 1.4 2015/06/08 23:31:46 monsieurp Exp $
+
+ 08 Jun 2015; Patrice Clement <monsieurp@gentoo.org> easymock-3.2-r1.ebuild:
+ Fix wrong dependency in JAVA_GENTOO_CLASSPATH.
*easymock-3.3.1 (11 Apr 2015)
diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
index 0456050a0421..02543818279d 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -1,22 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX 3.2-no-android.patch 685 SHA256 4b3653e6d39c007fb960cd5773638e60ee1b811b7d8126f1c2b404eb216765f1 SHA512 3ead2f05c122e3e8a3eb1d1748b59c15775fee79e28cf01dba193b8b21aae0039d9608300cbca6e9bdbe291ab15db9f56abe8c2503c6667495f61fccbf3d56ff WHIRLPOOL 203c833b98294753786caf4972762d3781eb5a0aa9073911adb9cd6a6566a5d695e54db417cf1824a4c069258fa54c8fb55f39a9749d4d94096c7dce93f25e29
AUX 3.3.1-no-android.patch 685 SHA256 4b3653e6d39c007fb960cd5773638e60ee1b811b7d8126f1c2b404eb216765f1 SHA512 3ead2f05c122e3e8a3eb1d1748b59c15775fee79e28cf01dba193b8b21aae0039d9608300cbca6e9bdbe291ab15db9f56abe8c2503c6667495f61fccbf3d56ff WHIRLPOOL 203c833b98294753786caf4972762d3781eb5a0aa9073911adb9cd6a6566a5d695e54db417cf1824a4c069258fa54c8fb55f39a9749d4d94096c7dce93f25e29
DIST easymock-3.2.zip 970922 SHA256 3ada340522b94d549a887774d42aaea008fb0aabc6f7e649ad6d23399bc7b80c SHA512 472b0f7183f48dcbd60996a78a69f3be0c9c5762856bf827d9a721b3ff03fca2fb68d3baae970a1de3eee0f293d02b3d9dba3c5634575ba395200e67f767ba3b WHIRLPOOL 5bf9dc61bf4716b88d72cbf80553b2629f7e55ffcd00821e74d8fcdb58160d1a494008d75f39a17ef2319c0bb913ae666f7c7e7d45394f6ad69d032d9e125442
DIST easymock-3.3.1.zip 1015625 SHA256 06332d947698e615e00baa5441e54f03423912079d81733dc089e57cae138a36 SHA512 0898276df82a99df10e4c91b5b097b6d579914580995b35274ef9d4e0c874266d54c865f96d008becaa210a6307916f6488d0caa205a85caf62920e939becf46 WHIRLPOOL 61e68261374caa1c7a879c28c329e8f3f6a5f067b57bb3c3eb79405b978544e0f3924b5cbe63cdee35964284d3ea602bb039d68461c73869783cf5e555a2d245
-EBUILD easymock-3.2-r1.ebuild 1243 SHA256 866ce22173b2eabdaccb5bcf4db66ab359a80bc356b3e6a53f98c3b95e48045c SHA512 b1b54b90a263cdb28d49f7c7809c9a5dda905e2ba5ec55c03b38705d746ec064dffa11c21e3f49c9a101193738d0b1c7c79876dee86ab52aaf4620f34b5da963 WHIRLPOOL b1c3a87895380d7a8d736135ffa19ce3ba77090f5d3d3c5e519df0a469efe1391fcf04e7fd0b003c15d7c15e4caad3a251ee19039acb1a900972a5626b6dea02
+EBUILD easymock-3.2-r1.ebuild 1216 SHA256 4d21c3cdafab2afd2812da61ecd4eae71eb6825ad3e4a0ddf9ba72aa6ae5bf35 SHA512 191789481b2211ecf9ff679e91affa2abd98630e1e5e9ab733ffda3c6f134220f5d3f8f6f07f78062e0554c76c715649a4a909024bfbf8165b321aea087e199f WHIRLPOOL 52dc9e013ab7e83732bb8505066ed67977bc4a2f32d6eb2bbf7c692685c83a2f2a94170d963aee7f191a960238862aeeec72f55b0c3e83c2fba697a934baa360
EBUILD easymock-3.3.1.ebuild 1250 SHA256 4d2c96ed72e6b5c194f3972e0af932ce280ff9b2641b07dad29b4edbc6771622 SHA512 ff5f63c796aa6c5983305e53d823aba0421a5c1ff24d7da6c8239a60b95246a89652e637eb0cb55f3f59ac730402355d10b6aa814004eaabbc9b24c5ebf93c7a WHIRLPOOL a557b55669b92fe98fad0a8f580363ebba686eebb39a45ae94a72650e305b3576e295d480ea4c3fcb8cd03f987875f1068327a4665bba7fcbc3aaccc241acb4c
-MISC ChangeLog 840 SHA256 e1abc18fd8e57d72e5a041116841b56cb2245e0e19016cd1a9b24dc4f653054e SHA512 febac44607a09acb85ac5900c939d6c0e50a95d3a9a0051e202ae2fa82ccb1421f5d80d7d7ee1246c1ca33cb216a7f24f28ed84df9e44c4c6db035d978181256 WHIRLPOOL 5d6e1efaecb94fcef930428f878c8d12b15c9fad577c00446f252c9bb9f250e5f8dd6848e4a96c8c0a81eedc888ccf4b86ba5215299c1df1763b12e0a9f14078
+MISC ChangeLog 968 SHA256 21e8df7508907238a439f921937aa461ee54d1296c6e357d608a76a7c6c4ea86 SHA512 1456b47f30a7f51934152981b3b1b4313772aa165284d9da59bb329b19f466a2cb25311d32e681031434697c08190cc074dd2fd1893068a71b14119344d46ad1 WHIRLPOOL 4ad3a23e8918c778364dad7f036b97cdcc807bde07529e3ddc8a88bf4eb0dd297fc760d417302a4d6c3c3e28073e28d08148319a69e4c8fb38d170c735e2062d
MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJVKZ7cAAoJEJGRpfGTSRu4U4wH/2aat1cjVHf9TEiQ6Uv0/muf
-kwsoMWDSmmTmSFZYH9ZyEkUx8Ou6Klidcl9F9IPgZRv1gc8RmzV9Rq35cR32mvTH
-K7C205I1tn6Pf/ulBlTiUtYBJb3ryBd+ga3ty9vgLYkAOvM0shRDYClVyAu6XE/n
-RBcIYnIw2xEc5m5eKFI48+g3eVBRSunEgpfHyQZc/KWj4eKNSmkstRS/dKxA74l6
-jZWqydSdtOnq0wYkVcdyvuXryR/09YigWnqyJ0x7ekda3luS2FQf419TJD2a0zy4
-1lKhvkk9JcIO3gp+z9Wf9CrIeeEmmU3M8rwxfHVwazjVH9TVG/nROJgeF5/+Hks=
-=hTE8
------END PGP SIGNATURE-----
diff --git a/dev-java/easymock/easymock-3.2-r1.ebuild b/dev-java/easymock/easymock-3.2-r1.ebuild
index c8eecedfbb9a..6fc9328749f2 100644
--- a/dev-java/easymock/easymock-3.2-r1.ebuild
+++ b/dev-java/easymock/easymock-3.2-r1.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/easymock/easymock-3.2-r1.ebuild,v 1.3 2015/04/11 22:23:20 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/easymock/easymock-3.2-r1.ebuild,v 1.4 2015/06/08 23:31:46 monsieurp Exp $
EAPI="5"
@@ -14,25 +14,23 @@ SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
LICENSE="|| ( MIT Apache-2.0 )"
SLOT="3.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
-COMMON_DEPEND="
- dev-java/junit:4
+CDEPEND="dev-java/junit:4
dev-java/objenesis:0
- dev-java/cglib:2.2
-"
+ dev-java/cglib:3"
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
app-arch/unzip
- ${COMMON_DEPEND}"
+ ${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
S="${WORKDIR}/${P}"
-JAVA_GENTOO_CLASSPATH="junit-4,objenesis,cglib-2.2"
+JAVA_GENTOO_CLASSPATH="junit-4,objenesis,cglib-3"
JAVA_SRC_DIR="src"
src_unpack() {