Stable on amd64, bug #175997. Removed older version in same slot.

7 files changed, 16 insertions, 128 deletions

diff --git a/dev-java/commons-jxpath/ChangeLog b/dev-java/commons-jxpath/ChangeLog
index 990927afeba0..56abd0329777 100644
--- a/dev-java/commons-jxpath/ChangeLog
+++ b/dev-java/commons-jxpath/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-jxpath
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.17 2007/04/26 12:15:36 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.18 2007/04/27 03:46:34 wltjr Exp $
+
+  27 Apr 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -commons-jxpath-1.1-r1.ebuild, -commons-jxpath-1.1-r2.ebuild,
+  commons-jxpath-1.2-r2.ebuild:
+  Stable on amd64, bug #175997. Removed older version in same slot.
 
   26 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
   commons-jxpath-1.2-r2.ebuild:
diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
index ea11ecf3072d..ec0619ca504d 100644
--- a/dev-java/commons-jxpath/Manifest
+++ b/dev-java/commons-jxpath/Manifest
@@ -1,45 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX commons-jxpath-1.2-gentoo.patch 657 RMD160 602218617d7108a85a41022b601b58e8840217b0 SHA1 2fbf6692f601544b10fd19288e870bda887f6767 SHA256 8af00bb31da88eae4d6ba8f5617ad728416e64951f9722c6c681c793aeafb39b
 MD5 d1b5492badaeab329958c059b54cc5be files/commons-jxpath-1.2-gentoo.patch 657
 RMD160 602218617d7108a85a41022b601b58e8840217b0 files/commons-jxpath-1.2-gentoo.patch 657
 SHA256 8af00bb31da88eae4d6ba8f5617ad728416e64951f9722c6c681c793aeafb39b files/commons-jxpath-1.2-gentoo.patch 657
-DIST commons-jxpath-1.1-src.tar.gz 181809 RMD160 052ae221c9ed249e20654da1573bf80a09cd1d10 SHA1 48c371595af43a8d09295077145e81716e2a8e0d SHA256 cecfe01d7e78303ea00c1decfceffaa3ee775a3581557154b06f5007e316cf46
 DIST commons-jxpath-1.2-src.tar.gz 184231 RMD160 77d39147a9c17cc044bb0ad080c183d36ce8038e SHA1 56e0d69c2797371ff96743eea4f03deb73ecb509 SHA256 85b6cb3d5cfb92dbf4ace9ddd8d6880ccf86ba521039ff0e75483e3a86783b40
-EBUILD commons-jxpath-1.1-r1.ebuild 1275 RMD160 8d5b5c8cacc8fd947762c985fb5245d0a7c58d2c SHA1 a701ad828b5b8aa15929496cfd16f1bbfb6386a5 SHA256 2c234c5b915f44a567526d3d4c4da6576b000d80c7d2363fbc71c68e6879cf40
-MD5 53b0dd95594e1315f466ae4d02012267 commons-jxpath-1.1-r1.ebuild 1275
-RMD160 8d5b5c8cacc8fd947762c985fb5245d0a7c58d2c commons-jxpath-1.1-r1.ebuild 1275
-SHA256 2c234c5b915f44a567526d3d4c4da6576b000d80c7d2363fbc71c68e6879cf40 commons-jxpath-1.1-r1.ebuild 1275
-EBUILD commons-jxpath-1.1-r2.ebuild 1295 RMD160 b8609cfe5fc63b2bf6f8b1eaf773127d10668eb5 SHA1 dcf34e821c2c31795423939636ccd5dbeb39349f SHA256 2d1ee566b95f14eefe3c6477d0ad82e8daaf478f3f1bf454ffddbbb0c8a42c03
-MD5 f650ffcc29ab7bd7a9296c52233c4a8e commons-jxpath-1.1-r2.ebuild 1295
-RMD160 b8609cfe5fc63b2bf6f8b1eaf773127d10668eb5 commons-jxpath-1.1-r2.ebuild 1295
-SHA256 2d1ee566b95f14eefe3c6477d0ad82e8daaf478f3f1bf454ffddbbb0c8a42c03 commons-jxpath-1.1-r2.ebuild 1295
-EBUILD commons-jxpath-1.2-r2.ebuild 1525 RMD160 c4d10c55e46135a15371edf5038ad2b5b53e22db SHA1 c0f434cdcec51caff1be477ae80a4e16a34da2ff SHA256 518cc8d0129aead218f48e08d3baf44d3d9d27ee0c857cf3910b05543a5a2fe3
-MD5 ce507fda93772f83c8a4d55dda616ae6 commons-jxpath-1.2-r2.ebuild 1525
-RMD160 c4d10c55e46135a15371edf5038ad2b5b53e22db commons-jxpath-1.2-r2.ebuild 1525
-SHA256 518cc8d0129aead218f48e08d3baf44d3d9d27ee0c857cf3910b05543a5a2fe3 commons-jxpath-1.2-r2.ebuild 1525
-MISC ChangeLog 2520 RMD160 51f78c1befc2c7ce201a117f82e71eff0264cf63 SHA1 ded4989cf8259b9df516b127807194d6d17a57bb SHA256 c691b119c25eb035e66ade9f3d2fe1b64dff6ca13dbd8f4c36bec73fd023f9e6
-MD5 569c2272c189465685314b0e267a0ea1 ChangeLog 2520
-RMD160 51f78c1befc2c7ce201a117f82e71eff0264cf63 ChangeLog 2520
-SHA256 c691b119c25eb035e66ade9f3d2fe1b64dff6ca13dbd8f4c36bec73fd023f9e6 ChangeLog 2520
+EBUILD commons-jxpath-1.2-r2.ebuild 1524 RMD160 0047fe814d6f7e2848993b5220cbb01518fe0e57 SHA1 29c0dd3b6bb7ddf313b469de69ab0088a1ef8b18 SHA256 e2226c47d05460adc37aa509066ad2fc966ddba9a81fe978ba52179ca004da7a
+MD5 de448d3b2749b8f99e448bde62a731c5 commons-jxpath-1.2-r2.ebuild 1524
+RMD160 0047fe814d6f7e2848993b5220cbb01518fe0e57 commons-jxpath-1.2-r2.ebuild 1524
+SHA256 e2226c47d05460adc37aa509066ad2fc966ddba9a81fe978ba52179ca004da7a commons-jxpath-1.2-r2.ebuild 1524
+MISC ChangeLog 2742 RMD160 2d7327fda12c35c35d21e52bef229cbe600e16aa SHA1 c0d918845497b45ab964ff4c70ecdcf76129bd22 SHA256 503741904fbd462ee839478d56656fce0c085ba38a669ad80cacafff9f9cdd2b
+MD5 4241606dd714f4985784593a9cbc525a ChangeLog 2742
+RMD160 2d7327fda12c35c35d21e52bef229cbe600e16aa ChangeLog 2742
+SHA256 503741904fbd462ee839478d56656fce0c085ba38a669ad80cacafff9f9cdd2b ChangeLog 2742
 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 2e27bbc9d7e8de76fc433c51e4d0107a files/digest-commons-jxpath-1.1-r1 268
-RMD160 150d458da6849617be3216737470881feb3255e4 files/digest-commons-jxpath-1.1-r1 268
-SHA256 3cd112afffbbf19f76868699496cfc663070349311bdd584abbf78eb6962560d files/digest-commons-jxpath-1.1-r1 268
-MD5 2e27bbc9d7e8de76fc433c51e4d0107a files/digest-commons-jxpath-1.1-r2 268
-RMD160 150d458da6849617be3216737470881feb3255e4 files/digest-commons-jxpath-1.1-r2 268
-SHA256 3cd112afffbbf19f76868699496cfc663070349311bdd584abbf78eb6962560d files/digest-commons-jxpath-1.1-r2 268
 MD5 1c0580380dd9face127c630de498eba8 files/digest-commons-jxpath-1.2-r2 268
 RMD160 934f49297e2eac197117efb3af08fab59813d744 files/digest-commons-jxpath-1.2-r2 268
 SHA256 d02b085df57c226745148456c00f2203455a5cecf31f51aeb422dfc3915b5e72 files/digest-commons-jxpath-1.2-r2 268
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFGMJfvNQqtfCuFneMRAoSWAJ0WQ2F09NYEUBm+Li+UvZJQDl2JEQCfesVZ
-F+AMd+f10SBlWybfS5EH2jQ=
-=tcum
------END PGP SIGNATURE-----
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.1-r1.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.1-r1.ebuild
deleted file mode 100644
index 69a9c190b809..000000000000
--- a/dev-java/commons-jxpath/commons-jxpath-1.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.1-r1.ebuild,v 1.2 2005/07/12 12:14:03 axxo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds."
-HOMEPAGE="http://jakarta.apache.org/commons/jxpath/"
-SRC_URI="mirror://apache/jakarta/commons/jxpath/source/${P}-src.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="doc"
-
-RDEPEND=">=virtual/jre-1.3
-	=dev-java/commons-beanutils-1.6*
-	=dev-java/servletapi-2.3*
-	~dev-java/jdom-1.0_beta9"
-DEPEND=">=virtual/jdk-1.3
-	${RDEPEND}
-	dev-java/ant-core"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	echo "jdom.jar=$(java-pkg_getjar jdom-1.0_beta9 jdom.jar)" > build.properties
-	echo "servlet.jar=$(java-pkg_getjar servletapi-2.3 servlet.jar)" >> build.properties
-	echo "commons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.6 commons-beanutils.jar)" >> build.properties
-}
-
-src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} javadoc"
-	ant ${antflags} || die "compile problem"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	dohtml PROPOSAL.html STATUS.html usersguide.html
-	use doc && java-pkg_dohtml -r dist/docs/
-}
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.1-r2.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.1-r2.ebuild
deleted file mode 100644
index f704ba298527..000000000000
--- a/dev-java/commons-jxpath/commons-jxpath-1.1-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.1-r2.ebuild,v 1.1 2006/07/22 22:58:20 nelchael Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds."
-HOMEPAGE="http://jakarta.apache.org/commons/jxpath/"
-SRC_URI="mirror://apache/jakarta/commons/jxpath/source/${P}-src.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=virtual/jre-1.3
-	=dev-java/commons-beanutils-1.6*
-	=dev-java/servletapi-2.3*
-	~dev-java/jdom-1.0_beta9"
-DEPEND=">=virtual/jdk-1.3
-	${RDEPEND}
-	dev-java/ant-core"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	echo "jdom.jar=$(java-pkg_getjar jdom-1.0_beta9 jdom.jar)" > build.properties
-	echo "servlet.jar=$(java-pkg_getjar servletapi-2.3 servlet.jar)" >> build.properties
-	echo "commons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.6 commons-beanutils.jar)" >> build.properties
-}
-
-src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} javadoc"
-	eant ${antflags} || die "compile problem"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	dohtml PROPOSAL.html STATUS.html usersguide.html
-	use doc && java-pkg_dohtml -r dist/docs/
-}
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.2-r2.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.2-r2.ebuild
index 14df49a26755..9dfbd1c7772c 100644
--- a/dev-java/commons-jxpath/commons-jxpath-1.2-r2.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.2-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/commons-jxpath/commons-jxpath-1.2-r2.ebuild,v 1.4 2007/04/26 12:15:36 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.2-r2.ebuild,v 1.5 2007/04/27 03:46:34 wltjr Exp $
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/jakarta/commons/jxpath/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 COMMON_DEPEND="=dev-java/commons-beanutils-1.6*
diff --git a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r1 b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r1
deleted file mode 100644
index 76e048ed9096..000000000000
--- a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ec32e3521572ca678e4862892389bc5b commons-jxpath-1.1-src.tar.gz 181809
-RMD160 052ae221c9ed249e20654da1573bf80a09cd1d10 commons-jxpath-1.1-src.tar.gz 181809
-SHA256 cecfe01d7e78303ea00c1decfceffaa3ee775a3581557154b06f5007e316cf46 commons-jxpath-1.1-src.tar.gz 181809
diff --git a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r2 b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r2
deleted file mode 100644
index 76e048ed9096..000000000000
--- a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ec32e3521572ca678e4862892389bc5b commons-jxpath-1.1-src.tar.gz 181809
-RMD160 052ae221c9ed249e20654da1573bf80a09cd1d10 commons-jxpath-1.1-src.tar.gz 181809
-SHA256 cecfe01d7e78303ea00c1decfceffaa3ee775a3581557154b06f5007e316cf46 commons-jxpath-1.1-src.tar.gz 181809