Add missing dependencies to RDEPEND.

Package-Manager: portage-2.1.2.4

3 files changed, 36 insertions, 19 deletions

diff --git a/dev-java/xmldb/ChangeLog b/dev-java/xmldb/ChangeLog
index 278892281b50..3c88f3221ca6 100644
--- a/dev-java/xmldb/ChangeLog
+++ b/dev-java/xmldb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xmldb
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmldb/ChangeLog,v 1.22 2007/03/15 00:54:13 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmldb/ChangeLog,v 1.23 2007/04/20 15:25:31 betelgeuse Exp $
+
+  20 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  xmldb-20011111-r1.ebuild:
+  Add missing dependencies to RDEPEND.
 
   15 Mar 2007; Joshua Nichols <nichoj@gentoo.org> xmldb-20011111-r1.ebuild:
   amd64 stable for bug #166560.
diff --git a/dev-java/xmldb/Manifest b/dev-java/xmldb/Manifest
index e07be646c6fe..7b65ffd74ace 100644
--- a/dev-java/xmldb/Manifest
+++ b/dev-java/xmldb/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX build-20011111.xml 1982 RMD160 d21b794ae228252474c2df6dbe84adb4d1126b21 SHA1 5d2113f8a259d6191eb33ee4791f6a2480442724 SHA256 5869d9ccf4636bb21423fa5629e04033aa329ba642060d10f8422b92b3d01ede
 MD5 216371e5d4c8989fdab24cf70fef05ab files/build-20011111.xml 1982
 RMD160 d21b794ae228252474c2df6dbe84adb4d1126b21 files/build-20011111.xml 1982
@@ -7,18 +10,18 @@ MD5 21c727f1afea0d4c02f10a03bbbedd60 files/xmldb-20011111-unreachable.patch 456
 RMD160 a9ddff6a4314f5639230981d2d97dd3d8f20b4cd files/xmldb-20011111-unreachable.patch 456
 SHA256 c121305c217165ae34a593c0ec4b3c990672240285df2992f10aeb96f04234b2 files/xmldb-20011111-unreachable.patch 456
 DIST xmldb-api-11112001.tar.gz 36553 RMD160 afa086d80b917d8801b195f399fe17a045dcdaad SHA1 2fca53370d68683c88865756eba4eac3b52fa50e SHA256 9bf195503b6ce45d17e1953041c125602bc69e3f6812a031055d26ca558d1006
-EBUILD xmldb-20011111-r1.ebuild 1227 RMD160 72f1854d41c28ddc6aae9567c0b4304f3399d144 SHA1 11534a40be47351712eecc761a973b096031b78e SHA256 15e2c4391e758ff3a09bf923569bcb5bcf46ab837e6386a9997fc6814e078be8
-MD5 8fd972ca3d3d7feabec6070186bb3c30 xmldb-20011111-r1.ebuild 1227
-RMD160 72f1854d41c28ddc6aae9567c0b4304f3399d144 xmldb-20011111-r1.ebuild 1227
-SHA256 15e2c4391e758ff3a09bf923569bcb5bcf46ab837e6386a9997fc6814e078be8 xmldb-20011111-r1.ebuild 1227
+EBUILD xmldb-20011111-r1.ebuild 1264 RMD160 8ad33349f0f988ce494e5086c40d2a1dc5ad8c2c SHA1 3cf4563f29fa104d0e17aa1c4be2c99ff022bf22 SHA256 546738e687c3210c18154d6acd4e106ef63014999a3f09893951912f39dc8036
+MD5 9a39e778cae52f3430cd33316a145851 xmldb-20011111-r1.ebuild 1264
+RMD160 8ad33349f0f988ce494e5086c40d2a1dc5ad8c2c xmldb-20011111-r1.ebuild 1264
+SHA256 546738e687c3210c18154d6acd4e106ef63014999a3f09893951912f39dc8036 xmldb-20011111-r1.ebuild 1264
 EBUILD xmldb-20011111.ebuild 1388 RMD160 0bb77eb453c7a310cff739c2887a348153778640 SHA1 f24a676915cf7f596c729469a10499709ec52134 SHA256 a41f37d2d032c705f290ccf727e3623288450d26c4b4de9f5fef9e65853e5aef
 MD5 777c6fd5c5387055ba12e63cb9cc024f xmldb-20011111.ebuild 1388
 RMD160 0bb77eb453c7a310cff739c2887a348153778640 xmldb-20011111.ebuild 1388
 SHA256 a41f37d2d032c705f290ccf727e3623288450d26c4b4de9f5fef9e65853e5aef xmldb-20011111.ebuild 1388
-MISC ChangeLog 2894 RMD160 2b72f02e74e11a9ce28bac8d664fa60d63542cc6 SHA1 319738e5cff4f771455cd9b3daa4d4a39b527920 SHA256 720a91ec7f7e69d8a1d7fef3240245cb240ca545eb30a39274e6e7f85da0740b
-MD5 51fccfff7267e61b1c66ec738528379e ChangeLog 2894
-RMD160 2b72f02e74e11a9ce28bac8d664fa60d63542cc6 ChangeLog 2894
-SHA256 720a91ec7f7e69d8a1d7fef3240245cb240ca545eb30a39274e6e7f85da0740b ChangeLog 2894
+MISC ChangeLog 3019 RMD160 160620232e19ebc2644daee205760ca1cd3ac8f1 SHA1 577a0eecbd9e7a02930ea7d79f6363fd0c9f2d2b SHA256 20eb4dbb0700061ab3a3bbc12e6bdcc6a0ff1a6be160069e1960e11dd96becec
+MD5 1f1acd078ccd62b4b6f9bfb0b465f577 ChangeLog 3019
+RMD160 160620232e19ebc2644daee205760ca1cd3ac8f1 ChangeLog 3019
+SHA256 20eb4dbb0700061ab3a3bbc12e6bdcc6a0ff1a6be160069e1960e11dd96becec ChangeLog 3019
 MISC metadata.xml 435 RMD160 01da37918051dd37f9a7f1b57472ba331b23e538 SHA1 ef745b84850479a7c5945f30a98e57485a590f9e SHA256 e38b2692f1a7736a0c1f409d54d99335409a62d7d6b2240c8d1bddd8245240ce
 MD5 20be4e8a0bb3cc7b9e34662930eed0a7 metadata.xml 435
 RMD160 01da37918051dd37f9a7f1b57472ba331b23e538 metadata.xml 435
@@ -29,3 +32,10 @@ SHA256 130477b57d0be42861a33a3037f6522c0b6f2c59f3f84597c02a3774c8e2b65e files/di
 MD5 c139e860938059a5c42c59e7ee92e65b files/digest-xmldb-20011111-r1 253
 RMD160 492fecb7fd7aaecef8d5bde58171de6b70e7b355 files/digest-xmldb-20011111-r1 253
 SHA256 130477b57d0be42861a33a3037f6522c0b6f2c59f3f84597c02a3774c8e2b65e files/digest-xmldb-20011111-r1 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGKNtycxLzpIGCsLQRAoDtAJ0UVFE1PNYYnIN+wKsCnazsZ53DXgCfaeF6
+H8kPQR1GY9OGOiiXMp+BVA8=
+=hSBw
+-----END PGP SIGNATURE-----
diff --git a/dev-java/xmldb/xmldb-20011111-r1.ebuild b/dev-java/xmldb/xmldb-20011111-r1.ebuild
index 020bc41d8965..5790d2eedb7b 100644
--- a/dev-java/xmldb/xmldb-20011111-r1.ebuild
+++ b/dev-java/xmldb/xmldb-20011111-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/xmldb/xmldb-20011111-r1.ebuild,v 1.10 2007/03/15 00:54:13 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmldb/xmldb-20011111-r1.ebuild,v 1.11 2007/04/20 15:25:31 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -14,29 +16,30 @@ SRC_URI="mirror://sourceforge/xmldb-org/${MY_P}.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="doc source"
+IUSE=""
 
 # TODO please make compiling the junit tests optional
-DEPEND=">=virtual/jdk-1.4
-	source? ( app-arch/zip )
+COMMON_DEP="
 	>=dev-java/xerces-2.7
 	>=dev-java/xalan-2.7
-	dev-java/ant-core
 	=dev-java/junit-3.8*"
-RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
 
 S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	rm *.jar
+	cd "${S}"
+	rm -v *.jar || die
 	mkdir lib
 
-	epatch ${FILESDIR}/${P}-unreachable.patch
+	epatch "${FILESDIR}/${P}-unreachable.patch"
 
 	mkdir src && mv org src
-	cp ${FILESDIR}/build-${PV}.xml build.xml
+	cp "${FILESDIR}/build-${PV}.xml" build.xml
 }
 
 src_compile() {