Dropped old slot, which depends on an old version of resin.

(Portage version: 2.1.2_rc1-r5)
 (Unsigned Manifest commit)

6 files changed, 4 insertions, 283 deletions

diff --git a/dev-java/mx4j/Manifest b/dev-java/mx4j/Manifest
index ce3b8cda44eb..58d5cefac46c 100644
--- a/dev-java/mx4j/Manifest
+++ b/dev-java/mx4j/Manifest
@@ -1,20 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX mx4j-2.1.0-gentoo.patch 4583 RMD160 696e1e2b661793f7859eebb70edefb3b3c3d9191 SHA1 cdc118be3e4050485c8b1a388f2e2dc18d29b949 SHA256 a5008e0f0e11a0b2e90ce0954bbc5859c56fbd14093229d674e59a95e370ab2c
-MD5 be55fe365b4d3539f734ecfb88cf1738 files/mx4j-2.1.0-gentoo.patch 4583
-RMD160 696e1e2b661793f7859eebb70edefb3b3c3d9191 files/mx4j-2.1.0-gentoo.patch 4583
-SHA256 a5008e0f0e11a0b2e90ce0954bbc5859c56fbd14093229d674e59a95e370ab2c files/mx4j-2.1.0-gentoo.patch 4583
-DIST mx4j-2.1.0-src.tar.gz 675671 RMD160 fce0352348b9bde1d43fbaadd5b54596899f70a7 SHA1 c93867610582f4b977d9e055c4ad5aabc00aad55 SHA256 f5b3af91fb5c91da23759552fc31ae762f30564ee7d67fe3c368a9ada9c0a74e
 DIST mx4j-3.0.1-src.tar.gz 622504 RMD160 fbbc976aebbe7af024992f15be7feb364d6d2b15 SHA1 e35d4935c0b780cb51760cc30322bf576523e319 SHA256 f6cef53b68b06d97041f77b69e091eb76f08d1bd0d92f48c9bea958e8cb5dcba
-EBUILD mx4j-2.1.0-r1.ebuild 2658 RMD160 8f047e8311136a21293d068d8c1c0e4fd232823e SHA1 3c5d8c32384dfde7c2b49025aff4fe3251d013e3 SHA256 2a0ac487d9a48aa747a491391a3cb1fd8a3b1c85419f8bda2f0c63bccd9698d9
-MD5 e59ed06250a23d244ac5622d80f16e10 mx4j-2.1.0-r1.ebuild 2658
-RMD160 8f047e8311136a21293d068d8c1c0e4fd232823e mx4j-2.1.0-r1.ebuild 2658
-SHA256 2a0ac487d9a48aa747a491391a3cb1fd8a3b1c85419f8bda2f0c63bccd9698d9 mx4j-2.1.0-r1.ebuild 2658
-EBUILD mx4j-2.1.0.ebuild 1984 RMD160 94ed1ac9f0c1f4f9c0d8ac42f291009ac27741e4 SHA1 ea133563df71d587c98a7b3643c261c26e22654c SHA256 d637eb552ce5b269a542399a25a46164094fd262950f6791c59199e774a5102b
-MD5 577e162070ac052548f55d3370d5106c mx4j-2.1.0.ebuild 1984
-RMD160 94ed1ac9f0c1f4f9c0d8ac42f291009ac27741e4 mx4j-2.1.0.ebuild 1984
-SHA256 d637eb552ce5b269a542399a25a46164094fd262950f6791c59199e774a5102b mx4j-2.1.0.ebuild 1984
 EBUILD mx4j-3.0.1-r1.ebuild 1784 RMD160 15c5bd1f9572a7f78ac04e00ed5120de337adbd9 SHA1 283cf02a13988db0f2a7f208c2c8fb9fc37e1a72 SHA256 6475f7dea1be9f4bcc509780a7a0122e8e52312354d8b975a1ea3a5a08133639
 MD5 7be5e591f864cb9bc0cf7e408d29c12a mx4j-3.0.1-r1.ebuild 1784
 RMD160 15c5bd1f9572a7f78ac04e00ed5120de337adbd9 mx4j-3.0.1-r1.ebuild 1784
@@ -23,30 +7,17 @@ EBUILD mx4j-3.0.1.ebuild 1988 RMD160 673b0e99f9189b4ae315b9d0525ba2b27837543e SH
 MD5 1de85cca4be67bc79ea57133e3b1602a mx4j-3.0.1.ebuild 1988
 RMD160 673b0e99f9189b4ae315b9d0525ba2b27837543e mx4j-3.0.1.ebuild 1988
 SHA256 aab3b26d8fefd57aa4c40e4ec7b2b5743bbadd9bdc753ee07b1d8793bd2ea2fc mx4j-3.0.1.ebuild 1988
-MISC ChangeLog 1441 RMD160 11453a830736c041225b149658dd6b453b383d11 SHA1 c57531c403bee1ed25631e61f917350145950596 SHA256 ca4a170931ba91ac4f4bb2a85ba244301e0a8474ac1d282e3c4696bc7d244dff
-MD5 f0951b0447e6b5c3fa312018aead7640 ChangeLog 1441
-RMD160 11453a830736c041225b149658dd6b453b383d11 ChangeLog 1441
-SHA256 ca4a170931ba91ac4f4bb2a85ba244301e0a8474ac1d282e3c4696bc7d244dff ChangeLog 1441
+MISC ChangeLog 1632 RMD160 fa43dcce125454e754597c0116d7d52a9d90aad1 SHA1 d4d4ea5da347d13fb11c98db0cda36387e675864 SHA256 e45b36b875692d9de948839a45a6b49b15ca836a0d4cddf627ccf3e23271804d
+MD5 640b7b978f8398f2c64bf726f171ce15 ChangeLog 1632
+RMD160 fa43dcce125454e754597c0116d7d52a9d90aad1 ChangeLog 1632
+SHA256 e45b36b875692d9de948839a45a6b49b15ca836a0d4cddf627ccf3e23271804d ChangeLog 1632
 MISC metadata.xml 756 RMD160 fc8a38a7f1afd54eb4c4761da3958eccca1ce56a SHA1 77c6dba4518af5234b3f9009774df80a8b4df0ce SHA256 0408b9087d726ef932597f150e1de741419993f0804c821b545c1097c8dec4e2
 MD5 7973f86372fa9120f93c1c7f5caeb4bf metadata.xml 756
 RMD160 fc8a38a7f1afd54eb4c4761da3958eccca1ce56a metadata.xml 756
 SHA256 0408b9087d726ef932597f150e1de741419993f0804c821b545c1097c8dec4e2 metadata.xml 756
-MD5 3f257409337db21a3f932962ec6a0646 files/digest-mx4j-2.1.0 244
-RMD160 ece3987bf683f620185c34ab6fb48bdfce23746b files/digest-mx4j-2.1.0 244
-SHA256 f2904e040c184fd94a3e1ad4147beaca2296d4178edc70ec4db06b4ba204c62d files/digest-mx4j-2.1.0 244
-MD5 3f257409337db21a3f932962ec6a0646 files/digest-mx4j-2.1.0-r1 244
-RMD160 ece3987bf683f620185c34ab6fb48bdfce23746b files/digest-mx4j-2.1.0-r1 244
-SHA256 f2904e040c184fd94a3e1ad4147beaca2296d4178edc70ec4db06b4ba204c62d files/digest-mx4j-2.1.0-r1 244
 MD5 cc7604d7334a2b7d2171c2baacada25e files/digest-mx4j-3.0.1 244
 RMD160 cd1c3fabbf60acb0b8a1830788962bf9b65ceff3 files/digest-mx4j-3.0.1 244
 SHA256 d5e8a1a30175e8368ff175e886ae1a8227b7a5be0438286e4145459fc620bf71 files/digest-mx4j-3.0.1 244
 MD5 cc7604d7334a2b7d2171c2baacada25e files/digest-mx4j-3.0.1-r1 244
 RMD160 cd1c3fabbf60acb0b8a1830788962bf9b65ceff3 files/digest-mx4j-3.0.1-r1 244
 SHA256 d5e8a1a30175e8368ff175e886ae1a8227b7a5be0438286e4145459fc620bf71 files/digest-mx4j-3.0.1-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFZaShNQqtfCuFneMRAsJWAJ0W03TCC9zt35TOpEXIB8T1iq/oEwCeJOuX
-A3KpvY1hYN/lCNSaWqpdSVo=
-=ACfl
------END PGP SIGNATURE-----
diff --git a/dev-java/mx4j/files/digest-mx4j-2.1.0 b/dev-java/mx4j/files/digest-mx4j-2.1.0
deleted file mode 100644
index 3d7a989c0170..000000000000
--- a/dev-java/mx4j/files/digest-mx4j-2.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e5b0a056d25cee4bb7708a97715336b4 mx4j-2.1.0-src.tar.gz 675671
-RMD160 fce0352348b9bde1d43fbaadd5b54596899f70a7 mx4j-2.1.0-src.tar.gz 675671
-SHA256 f5b3af91fb5c91da23759552fc31ae762f30564ee7d67fe3c368a9ada9c0a74e mx4j-2.1.0-src.tar.gz 675671
diff --git a/dev-java/mx4j/files/digest-mx4j-2.1.0-r1 b/dev-java/mx4j/files/digest-mx4j-2.1.0-r1
deleted file mode 100644
index 3d7a989c0170..000000000000
--- a/dev-java/mx4j/files/digest-mx4j-2.1.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e5b0a056d25cee4bb7708a97715336b4 mx4j-2.1.0-src.tar.gz 675671
-RMD160 fce0352348b9bde1d43fbaadd5b54596899f70a7 mx4j-2.1.0-src.tar.gz 675671
-SHA256 f5b3af91fb5c91da23759552fc31ae762f30564ee7d67fe3c368a9ada9c0a74e mx4j-2.1.0-src.tar.gz 675671
diff --git a/dev-java/mx4j/files/mx4j-2.1.0-gentoo.patch b/dev-java/mx4j/files/mx4j-2.1.0-gentoo.patch
deleted file mode 100644
index 0e7939f9700a..000000000000
--- a/dev-java/mx4j/files/mx4j-2.1.0-gentoo.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -uprN mx4j-2.1.0.orig/build/build.xml mx4j-2.1.0/build/build.xml
---- mx4j-2.1.0.orig/build/build.xml	2004-12-23 17:56:18.000000000 +0100
-+++ mx4j-2.1.0/build/build.xml	2004-12-23 23:34:15.153231952 +0100
-@@ -225,7 +225,7 @@
-       <mkdir dir="${core.classes.dir}"/>

-       <mkdir dir="${dist.lib.dir}"/>

- 

--      <javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">

-+      <javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="off" deprecation="off" encoding="US-ASCII" source="1.4" target="1.4">

-          <patternset refid="mx4j.classes"/>

-          <classpath refid="lib.classpath"/>

-       </javac>

-@@ -264,7 +264,7 @@
-    </target>

- 

-    <target name="compile.rjmx" description="Compiles the Remote JMX (JSR 160) classes" depends="compile.jmx" if="jaas.present">

--      <javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">

-+      <javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="off" deprecation="off" encoding="US-ASCII" source="1.4" target="1.4">

-          <patternset refid="rmx4j.classes"/>

-          <classpath refid="lib.classpath"/>

-       </javac>

-@@ -295,7 +295,7 @@
-    <target name="compile.tools" description="Compiles the MX4J tools classes" depends="compile.rjmx">

-       <mkdir dir="${tools.classes.dir}"/>

- 

--      <javac srcdir="${tools.src.dir}" destdir="${tools.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">

-+      <javac srcdir="${tools.src.dir}" destdir="${tools.classes.dir}" debug="off" deprecation="off" encoding="US-ASCII" source="1.4" target="1.4">

-          <patternset refid="tools.classes"/>

-          <exclude name="mx4j/tools/mail/**" unless="javamail.present"/>

-          <exclude name="mx4j/tools/jython/**" unless="jython.present"/>

-@@ -369,7 +369,7 @@
-       <mkdir dir="${test.classes.dir}"/>

-       <mkdir dir="${dist.test.dir}"/>

- 

--      <javac srcdir="${test.src.dir}" destdir="${test.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">

-+      <javac srcdir="${test.src.dir}" destdir="${test.classes.dir}" debug="off" deprecation="off" encoding="US-ASCII" source="1.4" target="1.4">

-          <patternset refid="tests.classes"/>

-          <exclude name="test/javax/management/remote/**" unless="jaas.present"/>

-          <exclude name="test/mx4j/remote/**" unless="jaas.present"/>

-@@ -398,7 +398,7 @@
-    <target name="compile.examples" description="Compiles and jars the MX4J examples" depends="compile.tools">

-       <mkdir dir="${examples.classes.dir}"/>

- 

--      <javac srcdir="${examples.src.dir}" destdir="${examples.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">

-+      <javac srcdir="${examples.src.dir}" destdir="${examples.classes.dir}" debug="off" deprecation="off" source="1.4" target="1.4" encoding="US-ASCII">

-          <classpath refid="classpath"/>

-          <exclude name="mx4j/examples/tools/xdoclet/**"/>

-          <exclude name="mx4j/examples/remote/rmi/ssl/**" unless="jdk14.present"/>

-@@ -685,4 +685,9 @@
-       <delete dir="${dist.dir}" quiet="true"/>

-    </target>

- 

-+   <target name="sourcezip">

-+	   <zip destfile="${dist.dir}/${name}-src.zip">

-+		   <zipfileset dir="${core.src.dir}" />

-+      	   </zip>

-+   </target>

- </project>

-diff -uprN mx4j-2.1.0.orig/src/core/mx4j/remote/MX4JRemoteUtils.java mx4j-2.1.0/src/core/mx4j/remote/MX4JRemoteUtils.java
---- mx4j-2.1.0.orig/src/core/mx4j/remote/MX4JRemoteUtils.java	2004-12-23 17:56:18.000000000 +0100
-+++ mx4j-2.1.0/src/core/mx4j/remote/MX4JRemoteUtils.java	2004-12-23 18:08:50.000000000 +0100
-@@ -336,7 +336,7 @@ public class MX4JRemoteUtils

-             Principal[] principals = (Principal[])subject.getPrincipals().toArray(new Principal[0]);

-             try

-             {

--               domain = (ProtectionDomain)domainConstructor.newInstance(new Object[]{new CodeSource(null, null), null, null, principals});

-+               domain = (ProtectionDomain)domainConstructor.newInstance(new Object[]{new java.security.CodeSource(null, null), null, null, principals});

-             }

-             catch (Exception x)

-             {

-@@ -346,7 +346,7 @@ public class MX4JRemoteUtils

-          if (domain == null)

-          {

-             // This is done for JDK 1.3 compatibility.

--            domain = new SubjectProtectionDomain(new CodeSource(null, null), subject);

-+            domain = new SubjectProtectionDomain(new java.security.CodeSource(null, null), subject);

-          }

-       }

- 

diff --git a/dev-java/mx4j/mx4j-2.1.0-r1.ebuild b/dev-java/mx4j/mx4j-2.1.0-r1.ebuild
deleted file mode 100644
index 317f7df03b9c..000000000000
--- a/dev-java/mx4j/mx4j-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-2.1.0-r1.ebuild,v 1.4 2005/12/16 01:05:50 nichoj Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX."
-HOMEPAGE="http://mx4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-# The ${S}/BUILD-HOWTO is a good source for dependencies
-# This package could also be built with 1.3 after the virtual
-# handling for java-config goes official
-
-# 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=">=virtual/jre-1.4
-	=www-servers/axis-1*
-	=dev-java/bcel-5.1*
-	~dev-java/burlap-3.0.8
-	>=dev-java/commons-logging-1.0.4
-	~dev-java/hessian-3.0.8
-	=dev-java/servletapi-2.3*
-	>=dev-java/sun-jaf-bin-1.0.2
-	>=dev-java/sun-javamail-bin-1.3.1
-	>=dev-java/jython-2.1"
-
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	>=dev-java/ant-1.6
-	jikes? ( >=dev-java/jikes-1.21 )
-	source? ( app-arch/zip )"
-
-LICENSE="mx4j"
-SLOT="2.1"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc examples jikes source"
-
-src_unpack(){
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-
-	cd ${S}/lib
-
-#	use jetty && java-pkg_jar-from jetty
-
-	# for jmx
-	java-pkg_jar-from bcel
-	java-pkg_jar-from commons-logging
-
-	# for tools
-	java-pkg_jar-from axis-1
-	java-pkg_jar-from burlap-3.0
-	java-pkg_jar-from hessian-3.0.8
-	java-pkg_jar-from servletapi-2.3
-
-	# optionals (tools)
-	java-pkg_jar-from jython
-	java-pkg_jar-from sun-jaf-bin
-	java-pkg_jar-from sun-javamail-bin mail.jar
-}
-
-src_compile() {
-	cd build/
-
-	# The jsr160 and tools compilation could probably
-	# be made optional by use flags.
-	local antflags="compile.jmx compile.rjmx compile.tools"
-	use doc && antflags="${antflags} javadocs"
-	use examples && antflags="${antflags} compile.examples"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "ant failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/lib/*.jar
-	java-pkg_dowar dist/lib/*.war
-
-	dodoc README
-
-	use doc && java-pkg_dohtml -r dist/docs/api/*
-	use source && java-pkg_dosrc ${S}/src/core/*
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -r src/examples/mx4j/examples/* ${D}usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-java/mx4j/mx4j-2.1.0.ebuild b/dev-java/mx4j/mx4j-2.1.0.ebuild
deleted file mode 100644
index 838defad2458..000000000000
--- a/dev-java/mx4j/mx4j-2.1.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-2.1.0.ebuild,v 1.8 2005/07/13 10:21:59 axxo Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX."
-HOMEPAGE="http://mx4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/commons-logging-1.0.4
-	>=dev-java/sun-jaf-bin-1.0.2
-	>=dev-java/sun-javamail-bin-1.3.1
-	>=dev-java/jython-2.1
-	=dev-java/servletapi-2.3*
-	=dev-java/xmlunit-1*
-	=www-servers/axis-1*
-	=www-servers/resin-3.0.8*" # api incompatbile with at least resin .12
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	>=dev-java/ant-1.6
-	jikes? ( >=dev-java/jikes-1.21 )
-	source? ( app-arch/zip )"
-LICENSE="mx4j"
-SLOT="2.1"
-KEYWORDS="x86 amd64"
-IUSE="doc examples jikes source"
-
-src_unpack(){
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-
-	cd ${S}/lib
-	java-pkg_jar-from sun-jaf-bin
-	java-pkg_jar-from sun-javamail-bin mail.jar
-	java-pkg_jar-from jython
-	java-pkg_jar-from axis-1
-	java-pkg_jar-from servletapi-2.3
-	java-pkg_jar-from resin resin.jar
-	java-pkg_jar-from xmlunit-1
-}
-
-src_compile() {
-	cd build/
-
-	local antflags="compile.jmx compile.rjmx compile.tools"
-	use doc && antflags="${antflags} javadocs"
-	use examples && antflags="${antflags} compile.examples"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "ant failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/lib/*.jar
-	java-pkg_dowar dist/lib/*.war
-
-	dodoc LICENSE README
-	if use doc ; then
-		java-pkg_dohtml -r dist/docs/api/*
-	fi
-	if use source; then
-		java-pkg_dosrc ${S}/src/core/*
-	fi
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -r src/examples/mx4j/examples/* ${D}usr/share/doc/${PF}/examples
-	fi
-}