From: Krzysztof Pawlik <nelchael@gentoo.org>
Date: Wed, 25 Apr 2007 19:17:53 +0000 (+0000)
Subject: Fix compiling with JAVA_PKG_STRICT.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=525ca4141108fb2ac786ddf0cdd698b27ffbf9b0;p=gentoo.git

Fix compiling with JAVA_PKG_STRICT.
Package-Manager: portage-2.1.2.4
---

diff --git a/dev-java/commons-el/Manifest b/dev-java/commons-el/Manifest
index 84fbb2fed931..e417e4554bd9 100644
--- a/dev-java/commons-el/Manifest
+++ b/dev-java/commons-el/Manifest
@@ -1,23 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST commons-el-1.0-src.tar.gz 64009 RMD160 1f178aeb6aed1cd807573c3add6195a719a533e2 SHA1 bb39426efbd03a2b27105fa42faf90858cfc3d50 SHA256 3c9bdded6073563aaaddc9ad7c7387b242dc03cc385381503026b665a366c2c6
 EBUILD commons-el-1.0-r1.ebuild 1510 RMD160 25447f69c6da40280c4868a8436e2ffacf90339d SHA1 a4dd84a1882e6e33dab84a4bc690f7eb11a2a469 SHA256 7c36d80e5bec662f2ba9c07f96e07b90ee2b473a10bb31ef84f1322d2d03d27f
 MD5 b0e6e879155cd818607d55b597a90860 commons-el-1.0-r1.ebuild 1510
 RMD160 25447f69c6da40280c4868a8436e2ffacf90339d commons-el-1.0-r1.ebuild 1510
 SHA256 7c36d80e5bec662f2ba9c07f96e07b90ee2b473a10bb31ef84f1322d2d03d27f commons-el-1.0-r1.ebuild 1510
-EBUILD commons-el-1.0.ebuild 1604 RMD160 1e44f86be70a11ad735acc1b1fb1edb24b9e0c4d SHA1 c398c5657f74dcbf9d55d0ca8fbbfcc7d445b69e SHA256 09c68bb8c4c9db8a95718d91558ea613edb7e1387254b022c99da30a9f5cf7c6
-MD5 154119177aeb8ce143c323c8599ff4ce commons-el-1.0.ebuild 1604
-RMD160 1e44f86be70a11ad735acc1b1fb1edb24b9e0c4d commons-el-1.0.ebuild 1604
-SHA256 09c68bb8c4c9db8a95718d91558ea613edb7e1387254b022c99da30a9f5cf7c6 commons-el-1.0.ebuild 1604
-MISC ChangeLog 2079 RMD160 744d1f7bea4cfa1bc82b19031ac8f8cb3d5fe712 SHA1 52d726c424fd7cdd23c019adff0b3badfec642be SHA256 885dd919194cb480c1a5aa6c7e7fc33a97196a6bf8ac0035a0126fe64e4c095f
-MD5 439335a83db06e3c5c11c13a14a0520b ChangeLog 2079
-RMD160 744d1f7bea4cfa1bc82b19031ac8f8cb3d5fe712 ChangeLog 2079
-SHA256 885dd919194cb480c1a5aa6c7e7fc33a97196a6bf8ac0035a0126fe64e4c095f ChangeLog 2079
+MISC ChangeLog 2190 RMD160 62811be4a7bf2ff1dfb04a6bf437ae29dba03f0a SHA1 c3fcf5f8e6f447fbf2df1964e3b95f1974570a3b SHA256 5b3d28aefd0c9355bc049106dd96069e16ff77008a4cf91b35e5f335f390c896
+MD5 1e07e38769dfe1f7c2beff2f801d1198 ChangeLog 2190
+RMD160 62811be4a7bf2ff1dfb04a6bf437ae29dba03f0a ChangeLog 2190
+SHA256 5b3d28aefd0c9355bc049106dd96069e16ff77008a4cf91b35e5f335f390c896 ChangeLog 2190
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 c232ea01626b316aeeb00eab9424c777 files/digest-commons-el-1.0 253
-RMD160 9101127771f7dbce7214db2c3af52bb7e617e6b2 files/digest-commons-el-1.0 253
-SHA256 93d74c102c14220b7f4333544e66dea40458dbbe5b1af8ed1836fac1cd4e132d files/digest-commons-el-1.0 253
 MD5 c232ea01626b316aeeb00eab9424c777 files/digest-commons-el-1.0-r1 253
 RMD160 9101127771f7dbce7214db2c3af52bb7e617e6b2 files/digest-commons-el-1.0-r1 253
 SHA256 93d74c102c14220b7f4333544e66dea40458dbbe5b1af8ed1836fac1cd4e132d files/digest-commons-el-1.0-r1 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGL6pNcxLzpIGCsLQRAuVoAJ9gBnFaf3wYvPfqmTEqz/+uZ7zThgCglIcZ
+7Q7SKjthmwusY+cUehGbLCc=
+=2Dnn
+-----END PGP SIGNATURE-----
diff --git a/dev-java/swarmcache/ChangeLog b/dev-java/swarmcache/ChangeLog
index 7667e339728d..f36548968aef 100644
--- a/dev-java/swarmcache/ChangeLog
+++ b/dev-java/swarmcache/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/swarmcache
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swarmcache/ChangeLog,v 1.3 2007/01/11 13:19:50 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swarmcache/ChangeLog,v 1.4 2007/04/25 19:17:53 nelchael Exp $
+
+  25 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  swarmcache-1.0_pre20050106-r1.ebuild:
+  Fix compiling with JAVA_PKG_STRICT.
 
 *swarmcache-1.0_pre20050106-r1 (11 Jan 2007)
 
diff --git a/dev-java/swarmcache/swarmcache-1.0_pre20050106-r1.ebuild b/dev-java/swarmcache/swarmcache-1.0_pre20050106-r1.ebuild
index a9a790dcbdab..a9cd6fb1bb38 100644
--- a/dev-java/swarmcache/swarmcache-1.0_pre20050106-r1.ebuild
+++ b/dev-java/swarmcache/swarmcache-1.0_pre20050106-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swarmcache/swarmcache-1.0_pre20050106-r1.ebuild,v 1.1 2007/01/11 13:19:50 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swarmcache/swarmcache-1.0_pre20050106-r1.ebuild,v 1.2 2007/04/25 19:17:53 nelchael Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -10,14 +12,18 @@ HOMEPAGE="http://swarmcache.sourceforge.net"
 LICENSE="LGPL-2"
 SLOT="1.0"
 KEYWORDS="~x86 ~amd64"
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/commons-collections-3
+IUSE=""
+
+COMMON_DEP=">=dev-java/commons-collections-3
 	>=dev-java/commons-logging-1.0.4
 	>=dev-java/jgroups-2.2.7"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
 DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
+	${COMMON_DEP}
 	>=dev-java/ant-core-1.5"
-IUSE="doc source"
 
 src_unpack() {
 	unpack ${A}