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

(Portage version: 2.2_rc48/cvs/Linux x86_64)

6 files changed, 10 insertions, 324 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/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 ..."
-}