cleanup, removed old revision with a dependency to oro.

Package-Manager: portage-2.0.51.19

8 files changed, 13 insertions, 117 deletions

diff --git a/dev-java/commons-net/ChangeLog b/dev-java/commons-net/ChangeLog
index 898c803bd248..aae66bdaa83d 100644
--- a/dev-java/commons-net/ChangeLog
+++ b/dev-java/commons-net/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-net
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/ChangeLog,v 1.26 2005/03/29 15:35:45 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/ChangeLog,v 1.27 2005/04/02 21:49:52 luckyduck Exp $
+
+  02 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  commons-net-1.2.2-r1.ebuild, -commons-net-1.2.2.ebuild,
+  commons-net-1.3.0-r1.ebuild, -commons-net-1.3.0.ebuild:
+  cleanup, removed old revision with a dependency to oro.
 
 *commons-net-1.2.2-r1 (29 Mar 2005)
 
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index 8fc9c6800609..659a2028a174 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1,22 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a27695d76c5e800f9c45a2c730788e13 commons-net-1.2.2-r1.ebuild 1367
-MD5 b7966d1c603722c6bcae07a757d251e9 commons-net-1.2.2.ebuild 1297
-MD5 1f7cd2fd408977b9907da7e112ddd74b commons-net-1.3.0.ebuild 1586
-MD5 8c8895e645d4191e3b4304eafcf3fb1c ChangeLog 3360
+MD5 4ad8c27f139150ea40d2e7c23858a865 commons-net-1.2.2-r1.ebuild 1363
+MD5 f86b22e397ca616e33ca440bbbb3e4fe ChangeLog 3587
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 7c235b66f05f5cc48d4436b5a953c347 commons-net-1.3.0-r1.ebuild 1816
+MD5 6ee5859a114423658b5a85dce7414099 commons-net-1.3.0-r1.ebuild 1815
 MD5 e2628a3419f04cdb65cb4a3caad1c9df files/gentoo.diff 4678
 MD5 cd5dd0f16006dfa0491e9fb71981d402 files/gentoo-1.2.diff 3152
 MD5 fb9978c1444923f864212fcb8914da67 files/digest-commons-net-1.2.2-r1 73
 MD5 36815c4f205c7a6b95614626967da49b files/digest-commons-net-1.3.0-r1 73
-MD5 fb9978c1444923f864212fcb8914da67 files/digest-commons-net-1.2.2 73
-MD5 36815c4f205c7a6b95614626967da49b files/digest-commons-net-1.3.0 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCSXXk06ebR+OMO78RAgmJAJ0fUeVUMVg53VEmWpezOhYEj5Cv8ACfcR59
-x/suIqib8C3+xg0Aibkn7lA=
-=O8+J
------END PGP SIGNATURE-----
diff --git a/dev-java/commons-net/commons-net-1.2.2-r1.ebuild b/dev-java/commons-net/commons-net-1.2.2-r1.ebuild
index 030f323de1c0..419d2b4d52fb 100644
--- a/dev-java/commons-net/commons-net-1.2.2-r1.ebuild
+++ b/dev-java/commons-net/commons-net-1.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.2.2-r1.ebuild,v 1.1 2005/03/29 15:35:45 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.2.2-r1.ebuild,v 1.2 2005/04/02 21:49:52 luckyduck Exp $
 
 inherit eutils java-pkg
 
@@ -15,7 +15,7 @@ DEPEND=">=virtual/jdk-1.3
 RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="x86 sparc ppc amd64"
 IUSE="doc jikes source"
 
 src_unpack() {
diff --git a/dev-java/commons-net/commons-net-1.2.2.ebuild b/dev-java/commons-net/commons-net-1.2.2.ebuild
deleted file mode 100644
index 8987f6551e6f..000000000000
--- a/dev-java/commons-net/commons-net-1.2.2.ebuild
+++ /dev/null
@@ -1,39 +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/commons-net/commons-net-1.2.2.ebuild,v 1.12 2005/01/20 18:10:31 luckyduck Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="The purpose of the library is to provide fundamental protocol access, not higher-level abstractions."
-HOMEPAGE="http://jakarta.apache.org/commons/net/"
-SRC_URI="mirror://apache/jakarta/commons/net/source/${P}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-		>=dev-java/ant-core-1.5.4
-		>=dev-java/oro-2.0.7
-		jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.3"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="x86 sparc ppc amd64"
-IUSE="jikes doc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gentoo-1.2.diff
-	#for some reason 1.2.2 claims its 1.3
-	sed "s/commons-net-1.3.0-dev/commons-net-1.2.2-dev/" -i build.xml || die "died on sed"
-}
-
-src_compile() {
-	local antflags="-Doro.jar=$(java-config -p oro) jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadoc"
-	ant ${antflags} || die "died on ant"
-}
-
-src_install() {
-	mv ${S}/target/${P}-dev.jar ${S}/target/${PN}.jar
-	java-pkg_dojar target/${PN}.jar || die "died on java-pkg_dojar"
-	use doc && java-pkg_dohtml -r dist/docs/
-}
diff --git a/dev-java/commons-net/commons-net-1.3.0-r1.ebuild b/dev-java/commons-net/commons-net-1.3.0-r1.ebuild
index 4a87ac038148..179f05e5130a 100644
--- a/dev-java/commons-net/commons-net-1.3.0-r1.ebuild
+++ b/dev-java/commons-net/commons-net-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.3.0-r1.ebuild,v 1.1 2005/03/29 15:35:45 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.3.0-r1.ebuild,v 1.2 2005/04/02 21:49:52 luckyduck Exp $
 
 inherit eutils java-pkg
 
@@ -16,7 +16,7 @@ DEPEND=">=virtual/jdk-1.3
 RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~ppc64"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64 ppc64"
 IUSE="doc examples jikes junit source"
 
 S=${WORKDIR}/${P}-src
diff --git a/dev-java/commons-net/commons-net-1.3.0.ebuild b/dev-java/commons-net/commons-net-1.3.0.ebuild
deleted file mode 100644
index dcc3c06e3f0e..000000000000
--- a/dev-java/commons-net/commons-net-1.3.0.ebuild
+++ /dev/null
@@ -1,54 +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/commons-net/commons-net-1.3.0.ebuild,v 1.8 2005/01/26 21:48:15 corsair Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="The purpose of the library is to provide fundamental protocol access, not higher-level abstractions."
-HOMEPAGE="http://jakarta.apache.org/commons/net/"
-SRC_URI="mirror://apache/jakarta/commons/net/source/${P}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-core-1.5.4
-	>=dev-java/oro-2.0.7
-	junit? ( dev-java/junit )
-	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.3"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64 ppc64"
-IUSE="jikes doc junit"
-
-S=${WORKDIR}/${P}-src
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i 's|depends="get-deps"||' build.xml || die "sed failed"
-	mkdir -p target/lib
-	cd target/lib
-	java-pkg_jar-from oro
-
-	cd ${S}
-	if ! use junit ; then
-			sed -i 's/depends="compile,test"/depends="compile"/' \
-				build.xml || die "Failed to disable junit"
-	else
-		if ! has_version dev-java/ant-tasks; then
-			sed -i 's/depends="compile,test"/depends="compile"/' \
-				build.xml || die "Failed to disable junit"
-		fi
-	fi
-}
-
-src_compile() {
-	local antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadoc"
-	ant ${antflags} || die "died on ant"
-}
-
-src_install() {
-	mv ${S}/target/${P}-dev.jar ${S}/target/${PN}.jar
-	java-pkg_dojar target/${PN}.jar || die "died on java-pkg_dojar"
-	use doc && java-pkg_dohtml -r dist/docs/
-}
diff --git a/dev-java/commons-net/files/digest-commons-net-1.2.2 b/dev-java/commons-net/files/digest-commons-net-1.2.2
deleted file mode 100644
index dd2834f25e40..000000000000
--- a/dev-java/commons-net/files/digest-commons-net-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3856e8b3f50bdfffbf186e07c477f73b commons-net-1.2.2-src.tar.gz 178572
diff --git a/dev-java/commons-net/files/digest-commons-net-1.3.0 b/dev-java/commons-net/files/digest-commons-net-1.3.0
deleted file mode 100644
index 606eacd19f41..000000000000
--- a/dev-java/commons-net/files/digest-commons-net-1.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1394cc644125c9cf69d23db5ac37295b commons-net-1.3.0-src.tar.gz 267046