Remove old.

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 6 insertions, 167 deletions

diff --git a/dev-java/dom4j/ChangeLog b/dev-java/dom4j/ChangeLog
index 5c737b1f4690..787efdeb1c17 100644
--- a/dev-java/dom4j/ChangeLog
+++ b/dev-java/dom4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/dom4j
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.65 2013/11/30 08:16:14 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.66 2014/03/08 16:22:42 tomwij Exp $
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -dom4j-1.6.1-r2.ebuild,
+  -dom4j-1.6.1-r3.ebuild:
+  Remove old.
 
   30 Nov 2013; Tom Wijsman <TomWij@gentoo.org> dom4j-1.6.1-r2.ebuild:
   Quoted multiple S variables.
diff --git a/dev-java/dom4j/dom4j-1.6.1-r2.ebuild b/dev-java/dom4j/dom4j-1.6.1-r2.ebuild
deleted file mode 100644
index 4ec09d02563a..000000000000
--- a/dev-java/dom4j/dom4j-1.6.1-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r2.ebuild,v 1.13 2013/11/30 08:16:14 tomwij Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java library for working with XML"
-HOMEPAGE="http://dom4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz
-	mirror://gentoo/${P}-java5.patch.bz2"
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-RDEPEND=">=virtual/jre-1.3
-	dev-java/jaxme
-	dev-java/jsr173
-	dev-java/msv
-	dev-java/xpp2
-	dev-java/xpp3
-	dev-java/relaxng-datatype
-	>=dev-java/xerces-2.7
-	dev-java/xsdlib"
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Add missing methods to compile on Java 5
-	# see bug #137970
-	epatch "${WORKDIR}/${P}-java5.patch"
-
-	cd "${S}"/lib
-	#circular deps with jaxen
-	rm -f $(echo *.jar | sed 's/jaxen[^ ]\+//')
-	java-pkg_jar-from jaxme
-	java-pkg_jar-from jsr173
-	java-pkg_jar-from msv
-	java-pkg_jar-from xpp2
-	java-pkg_jar-from xpp3
-	java-pkg_jar-from relaxng-datatype
-	java-pkg_jar-from xsdlib
-
-	cd "${S}"/lib/endorsed
-	rm -f *.jar
-	java-pkg_jar-from xerces-2 || die
-
-	rm -r "${S}"/lib/test
-	# we don't really to fix any of these if we're not doing testing
-#	# TODO: replace jsr173_1.0_ri.jar
-#	java-pkg_jar-from ${JUNITPERF} || die
-
-	# We don't need the stuff in tools
-	rm -r "${S}"/lib/tools
-#	cd ${S}/lib/tools
-#	# apparently we don't really need clover's jar
-#	rm clover*
-#	java-pkg_jar-from ${ISORELAX} || die
-#	# TODO: replace jaxme-0.3.jar
-#	# TODO: replace jaxme-js-0.3.jar
-#	# TODO: replace jaxme-xs-0.3.jar
-#	java-pkg_jar-from ${TIDY} || die
-#	java-pkg_jar-from ${XALAN} || die
-#	java-pkg_jar-from ${XERCES_IMPL} || die
-}
-
-src_compile() {
-	local antflags="clean package"
-	use doc && antflags="${antflags} -Dbuild.javadocs=build/doc/api javadoc"
-
-	eant ${antflags} || die "Compilation failed"
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-	use doc && java-pkg_dohtml -r build/doc/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/dom4j/dom4j-1.6.1-r3.ebuild b/dev-java/dom4j/dom4j-1.6.1-r3.ebuild
deleted file mode 100644
index 7867a5a3e10b..000000000000
--- a/dev-java/dom4j/dom4j-1.6.1-r3.ebuild
+++ /dev/null
@@ -1,83 +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/dom4j/dom4j-1.6.1-r3.ebuild,v 1.13 2012/04/15 18:47:52 vapier Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java library for working with XML"
-HOMEPAGE="http://dom4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz
-	mirror://gentoo/${P}-java5.patch.bz2"
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-RDEPEND=">=virtual/jre-1.4
-	dev-java/jaxme:0
-	dev-java/jsr173:0
-	>=dev-java/msv-20050627-r2:0
-	dev-java/xpp2:0
-	dev-java/xpp3:0
-	dev-java/relaxng-datatype:0
-	dev-java/xerces:2
-	>=dev-java/xsdlib-20050627-r2:0
-	dev-java/xml-commons-external:1.3"
-DEPEND="
-	>=virtual/jdk-1.4
-	test? (
-		dev-java/ant-junit:0
-		dev-java/xalan:0
-		dev-java/junitperf:0
-	)
-	${RDEPEND}"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Add missing methods to compile on Java 5
-	# see bug #137970
-	epatch "${WORKDIR}/${P}-java5.patch"
-
-	# Needs X11
-	rm -v ./src/test/org/dom4j/bean/BeansTest.java || die
-	# fails with a 1.6 JDK for some reason
-	rm -v src/test/org/dom4j/io/StaxTest.java || die
-	rm -v *.jar || die
-	cd "${S}/lib"
-	#circular deps with jaxen
-	rm -f $(echo *.jar | sed 's/jaxen[^ ]\+//')
-	java-pkg_jar-from jaxme
-	java-pkg_jar-from jsr173
-	java-pkg_jar-from msv
-	java-pkg_jar-from xpp2
-	java-pkg_jar-from xpp3
-	java-pkg_jar-from relaxng-datatype
-	java-pkg_jar-from xsdlib
-	java-pkg_jar-from xml-commons-external-1.3
-
-	cd "${S}/lib/endorsed"
-	rm -v *.jar || die
-	java-pkg_jar-from xerces-2 || die
-
-	rm -vr "${S}"/lib/test/* || die
-	if use test; then
-		java-pkg_jar-from --build-only xalan,junitperf,junit
-	fi
-	rm -vr "${S}"/lib/tools/* || die
-}
-
-EANT_BUILD_TARGET="clean package"
-EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-	use doc && java-pkg_dojavadoc build/doc/api
-	use source && java-pkg_dosrc src/java/*
-}