Remove old.

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

4 files changed, 9 insertions, 201 deletions

diff --git a/dev-java/mx4j-tools/ChangeLog b/dev-java/mx4j-tools/ChangeLog
index e93bf2d00b3e..bf0384886194 100644
--- a/dev-java/mx4j-tools/ChangeLog
+++ b/dev-java/mx4j-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/mx4j-tools
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j-tools/ChangeLog,v 1.10 2008/06/17 14:03:09 nelchael Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j-tools/ChangeLog,v 1.11 2009/10/04 15:09:39 caster Exp $
+
+  04 Oct 2009; Vlastimil Babka <caster@gentoo.org> -mx4j-tools-3.0.1.ebuild:
+  Remove old.
 
 *mx4j-tools-3.0.2 (17 Jun 2008)
 
diff --git a/dev-java/mx4j-tools/mx4j-tools-3.0.1.ebuild b/dev-java/mx4j-tools/mx4j-tools-3.0.1.ebuild
deleted file mode 100644
index 489c58ff413c..000000000000
--- a/dev-java/mx4j-tools/mx4j-tools-3.0.1.ebuild
+++ /dev/null
@@ -1,94 +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/mx4j-tools/mx4j-tools-3.0.1.ebuild,v 1.4 2007/02/03 22:47:23 beandog Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_P=${P/-tools/}
-MY_PN=${PN/-tools/}
-
-DESCRIPTION="Optional tool classes and utilities for MX4J"
-HOMEPAGE="http://mx4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}-src.tar.gz"
-
-# The ${S}/BUILD-HOWTO is a good source for dependencies
-# This package could also be built with jdk-1.3; see special
-# handling instructions in ${S}/BUILD-HOWTO.
-
-# javamail and jython support is optional but because ant-core puts it in the classpath
-# if it is installed we can't force disable it without modifying the build.xml
-# and jikes refuses to compile mx4j with javamail support disabled
-
-# Optional jetty support can be enabled after jetty uses java-pkg_dojar to install jars
-
-RDEPEND="
-	dev-java/bcel
-	dev-java/commons-logging
-	dev-java/log4j
-	=www-servers/axis-1*
-	=dev-java/burlap-3.0*
-	=dev-java/hessian-3.0.8*
-	dev-java/jython
-	~dev-java/servletapi-2.3
-	=dev-java/gnu-jaf-1*
-	=dev-java/gnu-javamail-1*"
-#    >=www-servers/jetty-4.2
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.4
-	>=dev-java/ant-core-1.6
-	source? ( app-arch/zip )"
-RDEPEND="${RDEPEND}
-	>=virtual/jre-1.4"
-
-LICENSE="mx4j"
-SLOT="3.0"
-KEYWORDS="amd64 x86"
-IUSE="doc source"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-split-javadoc-build.patch"
-
-	cd "${S}/lib"
-	java-pkg_jar-from bcel bcel.jar
-	java-pkg_jar-from commons-logging commons-logging.jar
-	java-pkg_jar-from log4j
-	java-pkg_jar-from axis-1
-	java-pkg_jar-from servletapi-2.3 servlet.jar
-
-	# optionals
-#    java-pkg_jar-from jetty org.mortbay.jetty.jar
-	java-pkg_jar-from burlap-3.0
-	java-pkg_jar-from hessian-3.0.8
-	java-pkg_jar-from jython jython.jar
-	java-pkg_jar-from gnu-jaf-1 activation.jar
-	java-pkg_jar-from gnu-javamail-1 gnumail.jar mail.jar
-}
-
-src_compile() {
-	eant -f build/build.xml compile.tools $(use_doc javadocs.tools)
-}
-
-src_install() {
-	java-pkg_dojar dist/lib/mx4j-tools.jar
-	java-pkg_dowar dist/lib/mx4j-soap.war
-
-	dodoc README.txt
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc "${S}/src/tools/*"
-}
-
-pkg_postinst() {
-	elog
-	elog "This package is currently built without Jetty support. Jetty support will be"
-	elog "added when Jetty is brought up-to-date in Portage with the new Java system."
-	elog "To track Jetty progress, see the following:"
-	elog
-	elog "  http://bugs.gentoo.org/show_bug.cgi?id=94452"
-	elog "  http://bugs.gentoo.org/show_bug.cgi?id=147469"
-	elog
-}
diff --git a/dev-java/mx4j/ChangeLog b/dev-java/mx4j/ChangeLog
index 76e269eea25b..f1fb84ace11c 100644
--- a/dev-java/mx4j/ChangeLog
+++ b/dev-java/mx4j/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/mx4j
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.28 2009/07/23 13:20:03 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.29 2009/10/04 15:08:07 caster Exp $
+
+  04 Oct 2009; Vlastimil Babka <caster@gentoo.org> -mx4j-3.0.1-r2.ebuild:
+  Remove old.
 
   23 Jul 2009; Alistair Bush <ali_bush@gentoo.org> mx4j-3.0.1-r2.ebuild,
   mx4j-3.0.1-r4.ebuild, mx4j-3.0.2.ebuild,
diff --git a/dev-java/mx4j/mx4j-3.0.1-r2.ebuild b/dev-java/mx4j/mx4j-3.0.1-r2.ebuild
deleted file mode 100644
index d2b30c0c3b0a..000000000000
--- a/dev-java/mx4j/mx4j-3.0.1-r2.ebuild
+++ /dev/null
@@ -1,104 +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/mx4j/mx4j-3.0.1-r2.ebuild,v 1.8 2009/07/23 13:20:03 ali_bush Exp $
-
-JAVA_PKG_OPT_USE="examples"
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-opt-2 java-ant-2
-
-DESCRIPTION="Metapackage for mx4j"
-HOMEPAGE="http://mx4j.sourceforge.net/"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz
-	doc? ( mirror://sourceforge/${PN}/${P}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="3.0"
-
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-COMMON_DEP="
-	examples? (
-		dev-java/bcel
-		dev-java/log4j
-		dev-java/commons-logging
-		=www-servers/axis-1*
-		~dev-java/servletapi-2.3
-		=dev-java/burlap-3.0*
-		=dev-java/hessian-3.0.8*
-		=dev-java/jython-2.2*
-		=dev-java/gnu-jaf-1*
-		=dev-java/gnu-javamail-1*
-	)
-	=dev-java/mx4j-core-3.0*
-	=dev-java/mx4j-tools-3.0*
-	"
-
-RDEPEND="
-	${COMMON_DEP}
-	examples? ( >=virtual/jre-1.4 )"
-
-# We always depend on a jdk to get the package.env created
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-
-src_unpack() {
-	unpack "${P}-src.tar.gz"
-
-	if use doc; then
-		mkdir binary && cd binary
-		unpack "${P}.tar.gz"
-	fi
-
-	if use examples; then
-		cd "${S}/lib"
-		java-pkg_jar-from bcel bcel.jar
-		java-pkg_jar-from log4j
-		java-pkg_jar-from commons-logging commons-logging.jar
-		java-pkg_jar-from axis-1
-		java-pkg_jar-from servletapi-2.3 servlet.jar
-		java-pkg_jar-from burlap-3.0
-		java-pkg_jar-from hessian-3.0.8
-		java-pkg_jar-from jython jython.jar
-		java-pkg_jar-from gnu-jaf-1 activation.jar
-		java-pkg_jar-from gnu-javamail-1 gnumail.jar mail.jar
-	fi
-}
-
-src_compile() {
-	cd build
-	use examples && eant compile.examples
-}
-
-src_install() {
-	dodoc README.txt RELEASE-NOTES-* || die
-
-	if use examples ; then
-		java-pkg_dojar dist/examples/mx4j-examples.jar
-		dodir /usr/share/doc/${PF}/examples
-		cp -r src/examples/mx4j/examples/* "${D}usr/share/doc/${PF}/examples"
-	fi
-
-	use source && java-pkg_dosrc src/examples/mx4j
-
-	if use doc; then
-		local docdir="${WORKDIR}/binary/${P}/docs/"
-		java-pkg_dojavadoc "${docdir}/api"
-		java-pkg_dohtml -r "${docdir}/images"
-		java-pkg_dohtml "${docdir}"/{*.html,*.css}
-	fi
-
-	# Recording jars to get the same behaviour as before
-	local jars="$(java-pkg_getjars mx4j-core-3.0,mx4j-tools-3.0)"
-	for jar in ${jars//:/ }; do
-		java-pkg_regjar "${jar}"
-	done
-}
-
-pkg_postinst() {
-	elog "Although this package can be used directly with java-config,"
-	elog "ebuild developers should use mx4j-core and mx4j-tools directly."
-}