NM: Cleanup superseeded ebuilds.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key )

3 files changed, 6 insertions, 176 deletions

diff --git a/dev-java/xalan/ChangeLog b/dev-java/xalan/ChangeLog
index 7b4b43130e54..7b36c7452e77 100644
--- a/dev-java/xalan/ChangeLog
+++ b/dev-java/xalan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xalan
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.95 2013/06/14 19:38:27 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.96 2014/06/17 10:42:13 mrueg Exp $
+
+  17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -xalan-2.7.0-r4.ebuild,
+  -xalan-2.7.0-r5.ebuild:
+  NM: Cleanup superseeded ebuilds.
 
   14 Jun 2013; Alexis Ballier <aballier@gentoo.org> xalan-2.7.1.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-java/xalan/xalan-2.7.0-r4.ebuild b/dev-java/xalan/xalan-2.7.0-r4.ebuild
deleted file mode 100644
index 3346ef892b2b..000000000000
--- a/dev-java/xalan/xalan-2.7.0-r4.ebuild
+++ /dev/null
@@ -1,88 +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/xalan/xalan-2.7.0-r4.ebuild,v 1.8 2012/01/01 22:43:45 sera Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils versionator
-
-MY_PN="${PN}-j"
-MY_PV="$(replace_all_version_separators _)"
-MY_P="${MY_PN}_${MY_PV}"
-SRC_DIST="${MY_P}-src.tar.gz"
-BIN_DIST="${MY_P}-bin.tar.gz"
-DESCRIPTION="Apache's XSLT processor for transforming XML documents into HTML, text, or other XML document types."
-HOMEPAGE="http://xml.apache.org/xalan-j/index.html"
-SRC_URI="mirror://apache/xml/${MY_PN}/source/${SRC_DIST}
-	doc? ( mirror://apache/xml/${MY_PN}/binaries/${BIN_DIST} )"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="doc source"
-COMMON_DEP="
-	dev-java/javacup
-	dev-java/bcel
-	=dev-java/jakarta-regexp-1.3*
-	>=dev-java/xerces-2.7.1
-	=dev-java/xml-commons-external-1.3*
-	~dev-java/xalan-serializer-${PV}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack "${SRC_DIST}"
-	if use doc; then
-		mkdir bin || die
-		cd bin
-		unpack ${BIN_DIST} || die
-		cd ..
-	fi
-	cd "${S}"
-
-	# disable building of serializer.jar
-	sed -i -e 's/depends="prepare,serializer.jar"/depends="prepare"/' \
-		build.xml || die "sed build.xml failed"
-
-	# remove bundled jars
-	rm -f lib/*.jar tools/*.jar
-	cd lib
-	java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
-	java-pkg_jar-from xerces-2 xercesImpl.jar
-	java-pkg_jar-from javacup javacup.jar java_cup.jar
-	java-pkg_jar-from javacup javacup.jar runtime.jar
-	java-pkg_jar-from bcel bcel.jar BCEL.jar
-	java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar regexp.jar
-
-	cd "${S}"
-	mkdir build && cd build
-	java-pkg_jar-from xalan-serializer serializer.jar
-}
-
-# When version bumping Xalan make sure that the installed jar
-# does not bunled .class files from dependencies
-src_compile() {
-	eant jar \
-		-Dxsltc.bcel_jar.not_needed=true \
-		-Dxsltc.runtime_jar.not_needed=true \
-		-Dxsltc.regexp_jar.not_needed=true
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-	# installs symlinks to the file in /usr/share/xalan-serializer
-	java-pkg_dojar build/serializer.jar
-	# and records it to package.env as if it belongs to this one's
-	# classpath, for maximum possible backward compatibility
-	java-pkg_regjar $(java-pkg_getjar xalan-serializer serializer.jar)
-
-	java-pkg_dolauncher ${PN} --main org.apache.xalan.xslt.Process
-	newdoc ${PN}.README.txt README || die
-	if use doc; then
-		java-pkg_dohtml -r "${WORKDIR}"/bin/${MY_P}/docs/* || die
-	fi
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/xalan/xalan-2.7.0-r5.ebuild b/dev-java/xalan/xalan-2.7.0-r5.ebuild
deleted file mode 100644
index e35aa101e2ec..000000000000
--- a/dev-java/xalan/xalan-2.7.0-r5.ebuild
+++ /dev/null
@@ -1,86 +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/xalan/xalan-2.7.0-r5.ebuild,v 1.6 2012/01/01 22:43:45 sera Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils versionator
-
-MY_PN="${PN}-j"
-MY_PV="$(replace_all_version_separators _)"
-MY_P="${MY_PN}_${MY_PV}"
-SRC_DIST="${MY_P}-src.tar.gz"
-BIN_DIST="${MY_P}-bin.tar.gz"
-DESCRIPTION="Apache's XSLT processor for transforming XML documents into HTML, text, or other XML document types."
-HOMEPAGE="http://xml.apache.org/xalan-j/index.html"
-SRC_URI="mirror://apache/xml/${MY_PN}/source/${SRC_DIST}
-	doc? ( mirror://apache/xml/${MY_PN}/binaries/${BIN_DIST} )"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="doc source"
-COMMON_DEP="
-	dev-java/javacup
-	dev-java/bcel
-	>=dev-java/xerces-2.7.1
-	=dev-java/xml-commons-external-1.3*
-	~dev-java/xalan-serializer-${PV}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack "${SRC_DIST}"
-	if use doc; then
-		mkdir bin || die
-		cd bin
-		unpack ${BIN_DIST} || die
-		cd ..
-	fi
-	cd "${S}"
-
-	# disable building of serializer.jar
-	sed -i -e 's/depends="prepare,serializer.jar"/depends="prepare"/' \
-		build.xml || die "sed build.xml failed"
-
-	# remove bundled jars
-	rm -v lib/*.jar tools/*.jar || die
-	cd lib
-	java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
-	java-pkg_jar-from xerces-2 xercesImpl.jar
-	java-pkg_jar-from javacup javacup.jar java_cup.jar
-	java-pkg_jar-from javacup javacup.jar runtime.jar
-	java-pkg_jar-from bcel bcel.jar BCEL.jar
-
-	cd "${S}"
-	mkdir build && cd build
-	java-pkg_jar-from xalan-serializer serializer.jar
-}
-
-# When version bumping Xalan make sure that the installed jar
-# does not bundle .class files from dependencies
-src_compile() {
-	eant jar \
-		-Dxsltc.bcel_jar.not_needed=true \
-		-Dxsltc.runtime_jar.not_needed=true \
-		-Dxsltc.regexp_jar.not_needed=true
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-	# installs symlinks to the file in /usr/share/xalan-serializer
-	java-pkg_dojar build/serializer.jar
-	# and records it to package.env as if it belongs to this one's
-	# classpath, for maximum possible backward compatibility
-	java-pkg_regjar $(java-pkg_getjar xalan-serializer serializer.jar)
-
-	java-pkg_dolauncher ${PN} --main org.apache.xalan.xslt.Process
-	newdoc ${PN}.README.txt README || die
-	if use doc; then
-		java-pkg_dohtml -r "${WORKDIR}"/bin/${MY_P}/docs/* || die
-	fi
-	use source && java-pkg_dosrc src/org
-}