Remove unneeded versions, leave 1.2-r1 at only ppc keyword so that sun-based 1.4 java can be removed.

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

7 files changed, 12 insertions, 340 deletions

diff --git a/dev-java/xstream/ChangeLog b/dev-java/xstream/ChangeLog
index c621f36a1c5f..5e330c099ac8 100644
--- a/dev-java/xstream/ChangeLog
+++ b/dev-java/xstream/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/xstream
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.23 2009/10/15 08:36:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.24 2009/11/17 14:46:49 caster Exp $
+
+  17 Nov 2009; Vlastimil Babka <caster@gentoo.org> -xstream-1.2.ebuild,
+  xstream-1.2-r1.ebuild, -xstream-1.2-r2.ebuild, -xstream-1.2-r3.ebuild,
+  -xstream-1.3.1.ebuild:
+  Remove unneeded versions, leave 1.2-r1 at only ppc keyword so that
+  sun-based 1.4 java can be removed.
 
   15 Oct 2009; Markus Meier <maekke@gentoo.org> xstream-1.3.1-r1.ebuild:
   amd64/x86 stable, bug #287619
diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index bbe39022335f..c3a73e521639 100644
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -1,21 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xstream-1.2-javadoc-fix.patch 829 RMD160 64385a5c8ca0750438cebb0ba547073bfbe73536 SHA1 eeca9df4c01083fc05fe67bd8c7abc427621f178 SHA256 b2aadc0ef4857240b31a248a37e532388ce2c45517f348df9ab3bb566948c828
 DIST xstream-1.2.zip 5488349 RMD160 1f55cf75c8ed2cf2746727e3435b119c5caa1eff SHA1 e0713b355dea36be4951299e441ffd510eee6d19 SHA256 7536d9b1f2bf1c1b235d1a1114dbdae08a8ed5953b1fe7a2c760bf807770e26d
 DIST xstream-distribution-1.3.1-src.zip 7505723 RMD160 01b0993881adc569d16fbb7df72def0046f44258 SHA1 7eace8ba0cc4c3cd7d5d8d31bc394b5b28613ed8 SHA256 df645ea4e2e16c4a149fb45966ea50d48b54776ead4727837348195daad94f6b
-EBUILD xstream-1.2-r1.ebuild 1938 RMD160 1f653ff581588ad68fda5a0d278b24e31abec39e SHA1 81531224435c9f2eb9adb2c7c697daa7862ac235 SHA256 7fe79c9ec91442677a67daeb917cc1e4ca65b8e757b7eecf9ac816b76adcada6
-EBUILD xstream-1.2-r2.ebuild 1782 RMD160 111c980f20c50998f74d638cd84102666cd1e4b6 SHA1 2e3d75b77a0f9c3d9a515a12d654c337abd45875 SHA256 ea3a3adc4809d1f43ebc854aea0f37d097bfc1d38a210ff612476e92122cd361
-EBUILD xstream-1.2-r3.ebuild 1797 RMD160 76bb599cc2ab1a4c36426e5eaa00904bb5d1fc25 SHA1 82a21918bd3288a1194cb3e8067608b22d761294 SHA256 97ca01d0b9bc321eaf393ec480f8afee4d61770fd49718d83d0af6cf9f24070f
-EBUILD xstream-1.2.ebuild 1904 RMD160 b8119d34fb6373615a7b7d41b972afb69de33791 SHA1 cb7c5e1a30155eb402fa041f1ce26c5b357ea02a SHA256 338ee81a859aeb2c05b20886b5caf502e4b5aaf10d7aa07575c93915512bd75c
+EBUILD xstream-1.2-r1.ebuild 1921 RMD160 84e152a318d6844eef338288f83ad1c007b791e8 SHA1 586e44807cee8e81a069aa4d8dafb9b699a2fc7f SHA256 8abae74ae6a1b277340f40602ac83ed3e8a93a01ab5e8855312ba1f6961e2dfe
 EBUILD xstream-1.3.1-r1.ebuild 2004 RMD160 51e44a40e19d3d80e72677534afb7ebc3755e13b SHA1 7ba4213c33f71369aa9751a6a03abdc695667dc2 SHA256 71ce22dda1a47bd6730a1ff59b6055c681a0bc2e8c6ae1d10c7056f492fa1048
-EBUILD xstream-1.3.1.ebuild 2093 RMD160 6be19dae92c48770f140c808d8f6bf4f80c34ccd SHA1 068bc492686e77a6ad3a5f847e4a92977a0c2977 SHA256 ea3a4d3b816e5611d55e54463cf8d2a9f0ff3cff66d7325b5eb6733df4a3dde0
-MISC ChangeLog 3260 RMD160 5e8c2204681d60fdb7a2e76e625f2cdfc9d06c38 SHA1 e62a96d0aac27d828331e058f03dc68bc3bc9781 SHA256 4fc4f065cc22002c1f7032070dbc7f5e474f2d8a147416e953ad3455ad54636e
+MISC ChangeLog 3537 RMD160 b0981fa0f12d8816cc04d66123e36653ac6a5564 SHA1 e8cb6eb31f4f8b023680c41bb17790938329c28c SHA256 3f9f37a7c1fa9181667397d2654a1260647b26e2ff7a11ab87f528401f052088
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrW30oACgkQkKaRLQcq0GIK5QCfTuNgu3dj+QWugaL7Ms0TFkyX
-BigAn1Ql+6Cpyx7c8lMoaSrAdDYEVP2B
-=zXtd
------END PGP SIGNATURE-----
diff --git a/dev-java/xstream/xstream-1.2-r1.ebuild b/dev-java/xstream/xstream-1.2-r1.ebuild
index e90d5648f691..edbe7eb8c742 100644
--- a/dev-java/xstream/xstream-1.2-r1.ebuild
+++ b/dev-java/xstream/xstream-1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.2-r1.ebuild,v 1.6 2008/04/27 20:03:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.2-r1.ebuild,v 1.7 2009/11/17 14:46:49 caster Exp $
 
 JAVA_PKG_IUSE="doc examples java5 source"
 
@@ -12,7 +12,7 @@ SRC_URI="http://dist.codehaus.org/xstream/distributions/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="ppc"
 IUSE=""
 
 COMMON_DEPS="
diff --git a/dev-java/xstream/xstream-1.2-r2.ebuild b/dev-java/xstream/xstream-1.2-r2.ebuild
deleted file mode 100644
index c713d5978f8f..000000000000
--- a/dev-java/xstream/xstream-1.2-r2.ebuild
+++ /dev/null
@@ -1,76 +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/xstream/xstream-1.2-r2.ebuild,v 1.1 2008/07/18 20:25:53 betelgeuse Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc examples java5 source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A text-processing Java classes that serialize objects to XML and back again."
-HOMEPAGE="http://xstream.codehaus.org/index.html"
-SRC_URI="http://dist.codehaus.org/xstream/distributions/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-COMMON_DEPS="
-	=dev-java/cglib-2.1*
-	>=dev-java/dom4j-1.3
-	dev-java/jsr173
-	~dev-java/jdom-1.0
-	>=dev-java/joda-time-1.2
-	dev-java/xom
-	>=dev-java/xpp3-1.1.3.4
-	=dev-java/xml-commons-external-1.3*
-	test? (
-		dev-java/commons-lang:2.1
-		dev-java/jmock:1.0
-		dev-java/ant-junit
-		dev-java/ant-trax
-		dev-java/xml-writer
-		dev-java/stax
-	)"
-
-DEPEND="java5? ( >=virtual/jdk-1.5 )
-	!java5? ( =virtual/jdk-1.4* )
-	app-arch/unzip
-	${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPS}"
-
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-javadoc-fix.patch"
-	rm -v *.jar || die
-	rm -v lib/jdk1.3/*.jar || die
-	cd "${S}/lib"
-	rm -v *.jar
-	java-pkg_jar-from xml-commons-external-1.3
-	java-pkg_jar-from jsr173
-	java-pkg_jar-from cglib-2.1
-	java-pkg_jar-from dom4j-1
-	java-pkg_jar-from jdom-1.0
-	java-pkg_jar-from joda-time
-	java-pkg_jar-from xom
-	java-pkg_jar-from xpp3
-	java-pkg_filter-compiler jikes
-}
-
-src_test() {
-	java-pkg_jar-from --into lib \
-		junit,xml-writer,stax,commons-lang-2.1,jmock-1.0
-	ANT_TASKS="ant-junit ant-trax" eant test
-}
-
-src_install() {
-	java-pkg_newjar ${P}.jar
-
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/java/com
-}
diff --git a/dev-java/xstream/xstream-1.2-r3.ebuild b/dev-java/xstream/xstream-1.2-r3.ebuild
deleted file mode 100644
index 679c5d7ae955..000000000000
--- a/dev-java/xstream/xstream-1.2-r3.ebuild
+++ /dev/null
@@ -1,76 +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/xstream/xstream-1.2-r3.ebuild,v 1.1 2008/10/05 16:53:11 serkan Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc examples java5 source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A text-processing Java classes that serialize objects to XML and back again."
-HOMEPAGE="http://xstream.codehaus.org/index.html"
-SRC_URI="http://dist.codehaus.org/xstream/distributions/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-COMMON_DEPS="
-	=dev-java/cglib-2.1*
-	>=dev-java/dom4j-1.3
-	java-virtuals/stax-api
-	~dev-java/jdom-1.0
-	>=dev-java/joda-time-1.2
-	dev-java/xom
-	>=dev-java/xpp3-1.1.3.4
-	=dev-java/xml-commons-external-1.3*
-	test? (
-		dev-java/commons-lang:2.1
-		dev-java/jmock:1.0
-		dev-java/ant-junit
-		dev-java/ant-trax
-		dev-java/xml-writer
-		dev-java/stax
-	)"
-
-DEPEND="java5? ( >=virtual/jdk-1.5 )
-	!java5? ( =virtual/jdk-1.4* )
-	app-arch/unzip
-	${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPS}"
-
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-javadoc-fix.patch"
-	rm -v *.jar || die
-	rm -v lib/jdk1.3/*.jar || die
-	cd "${S}/lib"
-	rm -v *.jar
-	java-pkg_jar-from xml-commons-external-1.3
-	java-pkg_jar-from --virtual stax-api
-	java-pkg_jar-from cglib-2.1
-	java-pkg_jar-from dom4j-1
-	java-pkg_jar-from jdom-1.0
-	java-pkg_jar-from joda-time
-	java-pkg_jar-from xom
-	java-pkg_jar-from xpp3
-	java-pkg_filter-compiler jikes
-}
-
-src_test() {
-	java-pkg_jar-from --into lib \
-		junit,xml-writer,stax,commons-lang-2.1,jmock-1.0
-	ANT_TASKS="ant-junit ant-trax" eant test
-}
-
-src_install() {
-	java-pkg_newjar ${P}.jar
-
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/java/com
-}
diff --git a/dev-java/xstream/xstream-1.2.ebuild b/dev-java/xstream/xstream-1.2.ebuild
deleted file mode 100644
index b49bfc34fe7d..000000000000
--- a/dev-java/xstream/xstream-1.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.2.ebuild,v 1.11 2007/11/13 13:23:14 opfer Exp $
-
-JAVA_PKG_IUSE="doc examples java5 source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A text-processing Java classes that serialize objects to XML and back again."
-HOMEPAGE="http://xstream.codehaus.org/index.html"
-SRC_URI="http://dist.codehaus.org/xstream/distributions/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-COMMON_DEPS="
-	>=dev-java/commons-lang-2.1
-	=dev-java/cglib-2.1*
-	>=dev-java/dom4j-1.3
-	dev-java/jsr173
-	~dev-java/jdom-1.0
-	=dev-java/jmock-1*
-	>=dev-java/joda-time-1.2
-	dev-java/xom
-	>=dev-java/xpp3-1.1.3.4
-	=dev-java/xml-commons-external-1.3*
-"
-#test? (
-#		dev-java/ant-junit
-#		dev-java/ant-trax
-#		dev-java/xml-writer
-#		dev-java/stax
-#	)
-
-DEPEND="java5? ( >=virtual/jdk-1.5 )
-	!java5? ( =virtual/jdk-1.4* )
-	app-arch/unzip
-	${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPS}"
-
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -v *.jar || die
-	rm -v lib/jdk1.3/*.jar || die
-	cd "${S}/lib"
-	rm -v *.jar
-	java-pkg_jar-from xml-commons-external-1.3
-	java-pkg_jar-from jsr173
-	java-pkg_jar-from cglib-2.1
-	java-pkg_jar-from commons-lang-2.1
-	java-pkg_jar-from dom4j-1
-	java-pkg_jar-from jdom-1.0
-	java-pkg_jar-from jmock-1.0
-	java-pkg_jar-from joda-time
-	java-pkg_jar-from xom
-	java-pkg_jar-from xpp3
-	java-pkg_filter-compiler jikes
-}
-
-# Restricted until we get keywords for deps. See:
-# https://bugs.gentoo.org/show_bug.cgi?id=184234
-RESTRICT="test"
-
-src_test() {
-	java-pkg_jar-from --into lib junit,xml-writer,stax
-	ANT_TASKS="ant-junit ant-trax" eant test
-}
-
-src_install() {
-	java-pkg_newjar ${P}.jar
-
-	if use doc; then
-		html *.html || die
-		java-pkg_dohtml -r docs/
-	fi
-	use source && java-pkg_dosrc src/java/com
-}
diff --git a/dev-java/xstream/xstream-1.3.1.ebuild b/dev-java/xstream/xstream-1.3.1.ebuild
deleted file mode 100644
index df8f60e0946b..000000000000
--- a/dev-java/xstream/xstream-1.3.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.3.1.ebuild,v 1.3 2009/04/20 20:22:53 maekke Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc java5 source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A text-processing Java classes that serialize objects to XML and back again."
-HOMEPAGE="http://xstream.codehaus.org/index.html"
-SRC_URI="http://repository.codehaus.org/com/thoughtworks/${PN}/${PN}-distribution/${PV}/${PN}-distribution-${PV}-src.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE=""
-
-COMMON_DEPS="
-	dev-java/cglib:2.1
-	dev-java/dom4j:1
-	dev-java/jdom:1.0
-	dev-java/joda-time:0
-	dev-java/xom:0
-	dev-java/xpp3:0
-	dev-java/xml-commons-external:1.3
-	dev-java/jettison:0
-	java-virtuals/stax-api
-	test? (
-		dev-java/junit:0
-		dev-java/xml-writer:0
-		dev-java/commons-lang:2.1
-		dev-java/jmock:1.0
-		dev-java/jakarta-oro:2.0
-		dev-java/stax:0
-		dev-java/wstx:3.2
-	)"
-
-DEPEND="
-	java5? ( >=virtual/jdk-1.5 )
-	!java5? ( >=virtual/jdk-1.4 )
-	app-arch/unzip
-	${COMMON_DEPS}"
-RDEPEND="
-	java5? ( >=virtual/jre-1.5 )
-	!java5? ( >=virtual/jre-1.4 )
-	${COMMON_DEPS}"
-
-S="${WORKDIR}/${P}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}/lib"
-	rm -v *.jar || die
-	rm -rf jdk1.3 || die
-}
-
-EANT_GENTOO_CLASSPATH="xpp3,jdom-1.0,xom,dom4j-1,joda-time,cglib-2.1
-xml-commons-external-1.3,jettison,stax-api"
-
-EANT_BUILD_TARGET="benchmark:compile jar"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-
-src_test(){
-	EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
-		junit,jmock-1.0,commons-lang-2.1,xml-writer,wstx-3.2,stax,jakarta-oro-2.0" \
-		ANT_TASKS="ant-junit ant-trax" eant test || die "Tests failed"
-}
-
-src_install(){
-	java-pkg_newjar target/${P}.jar
-	java-pkg_newjar target/${PN}-benchmark-${PV}.jar ${PN}-benchmark.jar
-
-	use doc && java-pkg_dojavadoc target/javadoc
-	use source && java-pkg_dosrc src/java/com
-}
-
-pkg_postinst(){
-	elog "Major Changes from 1.2 See:"
-	elog "http://xstream.codehaus.org/changes.html"
-	elog "to prevent breakage ..."
-}