Remove old.

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

4 files changed, 7 insertions, 81 deletions

diff --git a/dev-java/commons-jxpath/ChangeLog b/dev-java/commons-jxpath/ChangeLog
index 17af0e8e4742..3d39af7569c8 100644
--- a/dev-java/commons-jxpath/ChangeLog
+++ b/dev-java/commons-jxpath/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-jxpath
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.32 2009/03/18 15:03:10 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.33 2009/11/07 11:48:56 caster Exp $
+
+  07 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  -commons-jxpath-1.2-r3.ebuild, -files/commons-jxpath-1.2-gentoo.patch:
+  Remove old.
 
   18 Mar 2009; Brent Baude <ranger@gentoo.org> commons-jxpath-1.3.ebuild:
   stable ppc, bug 262534
diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
index f8bb55e415c1..f407030bafb2 100644
--- a/dev-java/commons-jxpath/Manifest
+++ b/dev-java/commons-jxpath/Manifest
@@ -1,7 +1,4 @@
-AUX commons-jxpath-1.2-gentoo.patch 657 RMD160 602218617d7108a85a41022b601b58e8840217b0 SHA1 2fbf6692f601544b10fd19288e870bda887f6767 SHA256 8af00bb31da88eae4d6ba8f5617ad728416e64951f9722c6c681c793aeafb39b
-DIST commons-jxpath-1.2-src.tar.gz 184231 RMD160 77d39147a9c17cc044bb0ad080c183d36ce8038e SHA1 56e0d69c2797371ff96743eea4f03deb73ecb509 SHA256 85b6cb3d5cfb92dbf4ace9ddd8d6880ccf86ba521039ff0e75483e3a86783b40
 DIST commons-jxpath-1.3-src.tar.gz 285339 RMD160 691d7945fa63349ae218fb0c08ebaeeedcdea633 SHA1 12845646e684d344501b6a28c2e782165e7ea473 SHA256 da314198d75c6da660e2603bd1543a8f5d0b640c5144b748e62e59afc278efe6
-EBUILD commons-jxpath-1.2-r3.ebuild 1471 RMD160 ce8f237a67b8253df99ddc9ae5806fffc762047c SHA1 c602ffff389afda360dfd1a37bb8d4be4a9bba7d SHA256 a3c552752396d87748d98ed952c3625b17d360c3e74e82a7645b8d1e5de5dcb6
 EBUILD commons-jxpath-1.3.ebuild 1558 RMD160 641146f36dc3b8d6e0504dd8b6ff60032d78f732 SHA1 fda94a39a164eecbc783209236ff6d612a5b18cc SHA256 8c2436b7f07feb73e85da3f22aad0734c8d5894c4c79fef504d937a9ab8dcc45
-MISC ChangeLog 4274 RMD160 fd293207e9e72178cab9962cb1e602bcadcc3810 SHA1 269bfb2a52d1ce728f6e2891b56089b1a815a1a2 SHA256 3a2f33618b826056ee6bab01f1343e60eab75c30f0d748383ba30b33bc52bbbe
+MISC ChangeLog 4413 RMD160 78febf9e2d7acfbeb24469f840490bf22d8a899e SHA1 c2836a842f183ec3c157c94fa6f73259853f4475 SHA256 4bc2b4597fc308d56dd7a3b944f34bc0a447e6b156bf2d52186e646f03aaedcd
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.2-r3.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.2-r3.ebuild
deleted file mode 100644
index 5b4f7bf5f3f2..000000000000
--- a/dev-java/commons-jxpath/commons-jxpath-1.2-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2008 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-r3.ebuild,v 1.5 2008/04/13 08:16:21 dertobi123 Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source test"
-
-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-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-COMMON_DEPEND="dev-java/commons-beanutils:1.7
-	dev-java/servletapi:2.3
-	dev-java/jdom:1.0"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-# Java 1.6's javadoc doesn't like enums
-DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
-	test? (
-		dev-java/ant-junit
-		dev-java/commons-collections
-		dev-java/commons-logging
-	)
-	${COMMON_DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Don't automatically run tests
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	mkdir -p "${S}/target/lib"
-	cd "${S}/target/lib"
-	java-pkg_jar-from commons-beanutils-1.7
-	java-pkg_jar-from servletapi-2.3
-	java-pkg_jar-from jdom-1.0
-}
-
-src_test() {
-	java-pkg_jar-from --into target/lib \
-		commons-collections,commons-logging,junit
-	ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-jxpath/files/commons-jxpath-1.2-gentoo.patch b/dev-java/commons-jxpath/files/commons-jxpath-1.2-gentoo.patch
deleted file mode 100644
index 1f87d01f9342..000000000000
--- a/dev-java/commons-jxpath/files/commons-jxpath-1.2-gentoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- build.xml.orig	2006-10-13 00:54:56.000000000 +0200
-+++ build.xml	2006-10-13 00:55:08.000000000 +0200
-@@ -52,7 +52,7 @@
-       </fileset>

-     </copy>

-   </target>

--  <target name="jar" description="o Create the jar" depends="compile,test">

-+  <target name="jar" description="o Create the jar" depends="compile">

-     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">

-     </jar>

-   </target>

-@@ -182,4 +182,4 @@
-     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">

-     </unjar>

-   </target>

--</project>
-\ Chybí znak konce řádku na konci souboru
-+</project>