Remove old. Depend on dev-java/servletapi and old slot of jcu4j.

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

5 files changed, 15 insertions, 230 deletions

diff --git a/dev-java/xom/ChangeLog b/dev-java/xom/ChangeLog
index 658a8470a6d6..23bdfbae326d 100644
--- a/dev-java/xom/ChangeLog
+++ b/dev-java/xom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xom
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.65 2012/05/21 08:15:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.66 2012/05/24 12:33:53 sera Exp $
+
+  24 May 2012; Ralph Sennhauser <sera@gentoo.org> -xom-1.0-r6.ebuild,
+  -xom-1.0-r7.ebuild, -xom-1.2.6.ebuild:
+  Remove old. Depend on dev-java/servletapi and old slot of jcu4j.
 
   21 May 2012; Johannes Huber <johu@gentoo.org> xom-1.2.6-r1.ebuild:
   Stable for x86, wrt bug #381981
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index 08b1175cf89f..54b30efc6cee 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -1,25 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX xom-1.2.6.patch 2096 RMD160 2ed1dc3356638dbb5a51b4d19e1979ff68904615 SHA1 b859d0ab9853a76a1414702a03d0c366a4901e87 SHA256 d3fb76a36a60b4d364f82f0ea0b87e449379721b71056b91f134067b9c93ce03
 AUX xom-strip-fallback-parser.patch 690 RMD160 bbf1cd5b8e1083b48f14568cfa33495cae5d57b4 SHA1 879eec46d05004252bb923293f83b7f5e6340498 SHA256 152c505a672526452599e8fd825ef6b89e0eba8a967b64b112509c78e9496d13
 DIST jaxen-1.1.3-src.tar.gz 267657 RMD160 6b2d0ae8102e49c8b497c0f1baf3166a479e5319 SHA1 35c543df4ff06903d4af65c1a0c93697d7a60eeb SHA256 0509a8a30eeaf6af8132536a5fa0bb64c969fa9edb7827021cfcfd6ad55884cf
-DIST xom-1.0.tar.gz 3396586 RMD160 9e524b87d0cce968aaabe9aff3010de210e23745 SHA1 bf6de9cd45263e6670a95ac7b2a34b97ee4d3db3 SHA256 d37fbb5a2e6f1dd716c1f55f2e2ce6d96f9227788c2cd73e436c1cd087925a16
 DIST xom-1.2.6.tar.gz 11098494 RMD160 98213b3ea927d8e9ff1fd286fce2ace181269959 SHA1 f840fef96de30871e6b361b671bb2028816b38bf SHA256 dae81733cd5bfdbe505ffea97c3a6d6057b6b0b269e90a0fa43854f0d276c8d6
-EBUILD xom-1.0-r6.ebuild 1762 RMD160 eed2671c7e0497569b222374d7755b9eae1a7271 SHA1 76f6c03a41db8f9dbacbb6913e52ac57dcfbdc3e SHA256 a71d94c79a6f463a291556b0eb0a8b8a35a00f8c947a27dce5f58ae3b3ece5b0
-EBUILD xom-1.0-r7.ebuild 1951 RMD160 f11b8320b83f726d5c062671e2eb68b1c27490e0 SHA1 04d3a09d6b3a69f2617c70b8f1d3864da2995c11 SHA256 cbb2a0eac2dd633fba27a1736237cf6e414ca66b94245a13698c0d646619717c
 EBUILD xom-1.2.6-r1.ebuild 2291 RMD160 b3e2c876bd5954dc08cf4e16ab09f950b0d7dac9 SHA1 009b7c8fa0b7f8eec0a99c6c2138f3d78fd948e9 SHA256 56c2395c1e7858c61d73d7203717723606a88dee3ded29db6eddcbb737bc4f56
-EBUILD xom-1.2.6.ebuild 2277 RMD160 1b445b646e91c817694958af0800fed4d592d89d SHA1 08a1c93f042470d6cce92d1c434d26a010a7e7a1 SHA256 a5098b20fd93cbd93b187497443accc8339dec50675916b126021e074b4b60ac
-MISC ChangeLog 8403 RMD160 f8b1e6a35ad52af1fefec9dfaee4cdcaeb0ff9ac SHA1 1fd708986971e5f6914591b744befc28e5b1ed85 SHA256 abc279cc8238724666e6833ec0a1243c4479eda5202d517f6d7a6d35c3b36d45
+MISC ChangeLog 8582 RMD160 011acc2bfdc44a768615318c88618c7094dce6e7 SHA1 cd724e4e2b708c022aa5d9089558d6bae4fcd5e1 SHA256 4e119c798cf90d50d3a7a18f2d7ddfdac4a2a07d501ebdc1214d39708f9e6125
 MISC metadata.xml 329 RMD160 6eae130480bb2aaffeb7d11f07ced2bad8eab1e3 SHA1 09cb7ea27575a9d281a52b46b19fe63f6ea54adc SHA256 3f4ca05bff0b5512bd08e7e4471ff434786c27b458e840dda8e64c02e1901d1d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPufm+AAoJEO+t9ga+3I3aoKkH/2n4O7G2GVOz/Fn/zVulPBd0
-xDjlu4lO4jGZyRlwZcMSGuTCXtdE6XFLubcZCAd/ZnKO745F/IIuI+JsxHNdZhM7
-wwtyanDuXXyhV0qYIg8yfffS95cRyakfkG0wsZj/jTkoKpPTZF2X5cS76TQ0hAHO
-L4gGmGhevtyevB0YmIGR3aUCQpdcFOUocGzTBtJ+w0GDTjjXFflcaRbipCZYUCGI
-/mNYY3R2wHZpYG+UODqUsFeoAD9Xoprt6KnhIIbG8R+eW/Zb2JTpTzHU+JHtUjkA
-vgGIuZHTNwHW7xR73LJFaVzBM6gT/+V32mbqJZ0U/EW7cgUqOiIX6mEVNAdho3E=
-=DEBo
+iQEcBAEBAgAGBQJPvirCAAoJEIUJ+svaV1637B0H/1ROMm67uva4y1I9BMe4XwCf
+97ObUQcl7F1nvACF8QyLNCtblbJmV65BpSRM0pYd34zU1LSVrtoWCAebVQAuKSJF
+Tx5j2BpzcuZR4oiYNjDu3T8sI7ar5Xs5JiPwCpJBAMo0CQU+to8282utE9KU9KOH
+Ink24AwKadhVyCtkqyU3g/mI/JsHsa/RDDSSdA6ZBNY6r/O4cxIXrn8ejXOZqwWo
+/w5718xXLQPS+rv0OQUU/PG5IBro4r7ytw5GMpBazzZm0gh4ebcOrUB+1yVUkW8Q
+XGU32/bItKmvO4BYvsRZTpflWfnfyFWyO/5BLVuDMU1MGiIkHvRt4NY0ajvad4c=
+=UGzl
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xom/xom-1.0-r6.ebuild b/dev-java/xom/xom-1.0-r6.ebuild
deleted file mode 100644
index 9fdb80b155ec..000000000000
--- a/dev-java/xom/xom-1.0-r6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0-r6.ebuild,v 1.8 2012/04/13 18:54:06 ulm Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-XOMVER="xom-${PV/_beta/b}"
-DESCRIPTION="A new XML object model."
-HOMEPAGE="http://cafeconleche.org/XOM/index.html"
-SRC_URI="http://cafeconleche.org/XOM/${XOMVER}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-COMMON_DEPEND="dev-java/xerces:2
-		dev-java/xalan:0
-		dev-java/junit:0
-		dev-java/icu4j:0
-		examples? ( dev-java/servletapi:2.4 )"
-RDEPEND=">=virtual/jre-1.4
-		${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.4
-		${COMMON_DEPEND}"
-
-S=${WORKDIR}/XOM
-
-# Test require network access to pass
-# They need a redirected http document on public web
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	java-ant_ignore-system-classes
-	rm -v *.jar || die
-	cd "${S}/lib"
-	rm -v *.jar || die
-	java-pkg_jar-from junit
-	java-pkg_jar-from xalan
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from icu4j icu4j.jar normalizer.jar
-	# tagsoup is only needed to run betterdoc but we use the pregenerated ones
-}
-
-src_compile() {
-	local ant_flags="-Ddebug=off"
-	use examples && ant_flags="${ant_flags} -Dservlet.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)"
-
-	eant jar ${ant_flags}\
-		$(use examples && echo samples)
-}
-
-EANT_TEST_ANT_TASKS="ant-trax"
-
-src_install() {
-	java-pkg_newjar build/${XOMVER}.jar ${PN}.jar
-	use examples && java-pkg_dojar build/xom-samples.jar
-	dodoc Todo.txt || die
-
-	use doc && java-pkg_dojavadoc apidocs/
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples --subdir nu/xom/samples src/nu/xom/samples
-}
diff --git a/dev-java/xom/xom-1.0-r7.ebuild b/dev-java/xom/xom-1.0-r7.ebuild
deleted file mode 100644
index fbe184b07c74..000000000000
--- a/dev-java/xom/xom-1.0-r7.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0-r7.ebuild,v 1.8 2012/04/13 18:54:06 ulm Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-XOMVER="xom-${PV/_beta/b}"
-DESCRIPTION="A new XML object model."
-HOMEPAGE="http://cafeconleche.org/XOM/index.html"
-SRC_URI="http://cafeconleche.org/XOM/${XOMVER}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEPEND="dev-java/xerces:2
-		dev-java/icu4j:0
-		examples? ( dev-java/servletapi:2.4 )"
-RDEPEND=">=virtual/jre-1.4
-		${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.4
-		${COMMON_DEPEND}"
-#test? ( dev-java/ant-junit:0 )
-
-S=${WORKDIR}/XOM
-
-# Test require network access to pass
-# They need a redirected http document on public web
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	java-ant_ignore-system-classes
-	rm -v *.jar || die
-	# nuke test files as we aren't installing them
-	rm -vr src/nu/xom/tests || die
-	cd "${S}/lib"
-	rm -v *.jar || die
-	#java-pkg_jar-from --build-only junit
-	#java-pkg_jar-from --build-only xalan
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from icu4j icu4j.jar normalizer.jar
-	# tagsoup is only needed to run betterdoc but we use the pregenerated ones
-}
-
-src_compile() {
-	local ant_flags="-Ddebug=off"
-	use examples && ant_flags="${ant_flags} -Dservlet.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)"
-
-	eant jar ${ant_flags}\
-		$(use examples && echo samples)
-}
-
-EANT_TEST_ANT_TASKS="ant-trax"
-
-src_install() {
-	java-pkg_newjar build/${XOMVER}.jar ${PN}.jar
-	use examples && java-pkg_dojar build/xom-samples.jar
-	dodoc Todo.txt || die
-
-	use doc && java-pkg_dojavadoc apidocs/
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples --subdir nu/xom/samples src/nu/xom/samples
-}
diff --git a/dev-java/xom/xom-1.2.6.ebuild b/dev-java/xom/xom-1.2.6.ebuild
deleted file mode 100644
index a73fafab212c..000000000000
--- a/dev-java/xom/xom-1.2.6.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.2.6.ebuild,v 1.4 2012/01/01 14:51:59 sera Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-JAXEN_V="1.1.3"
-JAXEN_P="jaxen-${JAXEN_V}"
-
-DESCRIPTION="A new XML object model."
-HOMEPAGE="http://cafeconleche.org/XOM/index.html"
-SRC_URI="http://cafeconleche.org/XOM/${P}.tar.gz
-	http://dist.codehaus.org/jaxen/distributions/${JAXEN_P}-src.tar.gz"
-# Bundled jaxen as its moved under XOM's namespace
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEPEND="dev-java/xerces:2
-		dev-java/xml-commons-external:1.3
-		examples? ( dev-java/servletapi:2.4 )"
-RDEPEND=">=virtual/jre-1.4
-		${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.4
-		dev-java/jarjar:1
-		${COMMON_DEPEND}"
-
-S="${WORKDIR}/XOM"
-
-# Test require network access to pass
-# They need a redirected http document on public web
-RESTRICT="test"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}.patch"
-
-	# Delete test files as they aren't installed
-	rm -vr src/nu/xom/tests || die
-
-	# Delete bundled jars
-	rm -v *.jar lib/*.jar || die
-
-	# Delete bundled classes
-	find . -name "*.class" -delete -print || die
-
-	# Move bundled jaxen to where the build.xml expects it
-	mv "${WORKDIR}"/${JAXEN_P}/ lib/ || die
-
-	java-pkg_jar-from --into lib/ xml-commons-external-1.3
-	java-pkg_jar-from --into lib/ xerces-2
-	java-pkg_jar-from --build-only --into lib/ jarjar-1
-	# tagsoup is only needed to run betterdoc but we use the pregenerated ones
-}
-
-src_compile() {
-	local ant_flags="-Ddebug=off"
-	use examples && ant_flags="${ant_flags} -Dservlet.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)"
-
-	ejavac src15/nu/xom/JDK15XML1_0Parser.java -d classes15
-
-	ANT_TASKS="jarjar-1" eant jar ${ant_flags}\
-		$(use examples && echo samples)
-}
-
-src_install() {
-	java-pkg_newjar build/${P}.jar ${PN}.jar
-	use examples && java-pkg_dojar build/xom-samples.jar
-	dodoc Todo.txt || die
-
-	use doc && java-pkg_dojavadoc apidocs/
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples --subdir nu/xom/samples src/nu/xom/samples
-}