From: Vlastimil Babka <caster@gentoo.org>
Date: Thu, 26 Apr 2007 23:21:30 +0000 (+0000)
Subject: Fix dependencies and recording of jars.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=48d17c37414cedf75a431d6b9dc5225ae26b4cdd;p=gentoo.git

Fix dependencies and recording of jars.
Package-Manager: portage-2.1.2.4
---

diff --git a/dev-java/mx4j/ChangeLog b/dev-java/mx4j/ChangeLog
index 073e0ff67402..4a56a960a1be 100644
--- a/dev-java/mx4j/ChangeLog
+++ b/dev-java/mx4j/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/mx4j
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.19 2007/04/08 13:04:08 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.20 2007/04/26 23:21:30 caster Exp $
+
+  26 Apr 2007; Vlastimil Babka <caster@gentoo.org> mx4j-3.0.1-r2.ebuild:
+  Fix dependencies and recording of jars.
 
   08 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> -mx4j-3.0.1-r1.ebuild:
   Time for the non splitted ebuild to go.
diff --git a/dev-java/mx4j/Manifest b/dev-java/mx4j/Manifest
index 18ff91421dd4..99c892174b42 100644
--- a/dev-java/mx4j/Manifest
+++ b/dev-java/mx4j/Manifest
@@ -1,16 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST mx4j-3.0.1-src.tar.gz 622504 RMD160 fbbc976aebbe7af024992f15be7feb364d6d2b15 SHA1 e35d4935c0b780cb51760cc30322bf576523e319 SHA256 f6cef53b68b06d97041f77b69e091eb76f08d1bd0d92f48c9bea958e8cb5dcba
 DIST mx4j-3.0.1.tar.gz 4562130 RMD160 918808d122fba60388d5b344edffad3756b50936 SHA1 49094816e404f531c2442ea91a2167e5a9f38239 SHA256 bcb066f5b2323c66b80e80e641685e3adbd4a2d4c654f31c4a49b32b8290e006
-EBUILD mx4j-3.0.1-r2.ebuild 2484 RMD160 f3afa00d65acc46e1829dbd4c7e5206105312bd5 SHA1 c45c9fbf05c4a13029213f4c2b7fb9412dd390a0 SHA256 2959532a09d18d99b365340bfa491b0658f61669657d7df40b539c0b8a205038
-MD5 7f6cdb2b85f5a72065edffeba67a38db mx4j-3.0.1-r2.ebuild 2484
-RMD160 f3afa00d65acc46e1829dbd4c7e5206105312bd5 mx4j-3.0.1-r2.ebuild 2484
-SHA256 2959532a09d18d99b365340bfa491b0658f61669657d7df40b539c0b8a205038 mx4j-3.0.1-r2.ebuild 2484
-MISC ChangeLog 2870 RMD160 3dd8688c599913102fe4fc200b86a0b0a67f57bc SHA1 cb97527a05dfe0e96e9921bc955bdb5abbde41f2 SHA256 0323653e98b8711462c19df97311f57da69faf253ee5dfb883eb17d82c7cc8bd
-MD5 2ca6c78fee99260c3cfec9a1c6387ce1 ChangeLog 2870
-RMD160 3dd8688c599913102fe4fc200b86a0b0a67f57bc ChangeLog 2870
-SHA256 0323653e98b8711462c19df97311f57da69faf253ee5dfb883eb17d82c7cc8bd ChangeLog 2870
+EBUILD mx4j-3.0.1-r2.ebuild 2468 RMD160 045ab922698d2add9682e0824b9ab53ec9693a54 SHA1 800e9050925c520743e182e91a3a18e74c7efe17 SHA256 c230605ca63648110073a8fd1e0e3ff6201459367ed5bf2b07ab9d70feba31ed
+MD5 82bdaecf79afef68901ecf8e6163672b mx4j-3.0.1-r2.ebuild 2468
+RMD160 045ab922698d2add9682e0824b9ab53ec9693a54 mx4j-3.0.1-r2.ebuild 2468
+SHA256 c230605ca63648110073a8fd1e0e3ff6201459367ed5bf2b07ab9d70feba31ed mx4j-3.0.1-r2.ebuild 2468
+MISC ChangeLog 2982 RMD160 87109c7ca8c37c7f76c9ca0caf55917657e50764 SHA1 885c5e43df9a99acfbd05eb6e5197dcd63a93721 SHA256 6c224ca68a170bfe2e57075753a331b01d93058c85f5bee7cd0a5578e12dc360
+MD5 7f024286c33417a7a5ce8a63ce855992 ChangeLog 2982
+RMD160 87109c7ca8c37c7f76c9ca0caf55917657e50764 ChangeLog 2982
+SHA256 6c224ca68a170bfe2e57075753a331b01d93058c85f5bee7cd0a5578e12dc360 ChangeLog 2982
 MISC metadata.xml 960 RMD160 f01dfdf3b03a84656f0c17ee634381d01e6288f9 SHA1 0c20fd32321a719a2c1e1047bbad403c0c6158da SHA256 a7c53c20547646cf8ee55f8c64935ed669eddfcc8dd3e54da66afecf21b4d2da
 MD5 3ef22a0f5aafa3b6494e26b3639eece2 metadata.xml 960
 RMD160 f01dfdf3b03a84656f0c17ee634381d01e6288f9 metadata.xml 960
@@ -18,10 +15,3 @@ SHA256 a7c53c20547646cf8ee55f8c64935ed669eddfcc8dd3e54da66afecf21b4d2da metadata
 MD5 ebe9005d4a0d8f793d9d2724877d98dc files/digest-mx4j-3.0.1-r2 479
 RMD160 1dc5a0ca676e90267f10855335a3259c3dee9957 files/digest-mx4j-3.0.1-r2 479
 SHA256 11aec312a732c1d7aa13be693a289989c049d67d31019fdb1f7c99d651e465e4 files/digest-mx4j-3.0.1-r2 479
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGGOhNcxLzpIGCsLQRAk2JAJ0T5X/9YwGD4wt+TPgsXfLghl+aogCfQY3R
-hLmdlobeX1qbcayiwXcLDbU=
-=A3iF
------END PGP SIGNATURE-----
diff --git a/dev-java/mx4j/mx4j-3.0.1-r2.ebuild b/dev-java/mx4j/mx4j-3.0.1-r2.ebuild
index 81272592daae..b43d4943453a 100644
--- a/dev-java/mx4j/mx4j-3.0.1-r2.ebuild
+++ b/dev-java/mx4j/mx4j-3.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-3.0.1-r2.ebuild,v 1.5 2007/02/03 22:49:14 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-3.0.1-r2.ebuild,v 1.6 2007/04/26 23:21:30 caster Exp $
 
 JAVA_PKG_OPT_USE="examples"
 
@@ -31,12 +31,12 @@ COMMON_DEP="
 		dev-java/jython
 		=dev-java/gnu-jaf-1*
 		=dev-java/gnu-javamail-1*
-	)"
-
-
-RDEPEND="
+	)
 	=dev-java/mx4j-core-3.0*
 	=dev-java/mx4j-tools-3.0*
+	"
+
+RDEPEND="
 	${COMMON_DEP}
 	examples? ( >=virtual/jre-1.4 )"
 
@@ -91,12 +91,10 @@ src_install() {
 	fi
 
 	# Recording jars to get the same behaviour as before
-	oldifs="${IFS}"
-	IFS=":"
-	for jar in $(java-pkg_getjars mx4j-core-3.0,mx4j-tools-3.0); do
+	local jars="$(java-pkg_getjars mx4j-core-3.0,mx4j-tools-3.0)"
+	for jar in ${jars//:/ }; do
 		java-pkg_regjar "${jar}"
 	done
-	IFS="${oldifs}"
 }
 
 pkg_postinst() {