Cleanup & Marking x86

12 files changed, 15 insertions, 199 deletions

diff --git a/dev-java/commons-net/ChangeLog b/dev-java/commons-net/ChangeLog
index cd5977a34027..2c7536aff1f9 100644
--- a/dev-java/commons-net/ChangeLog
+++ b/dev-java/commons-net/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-net
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/ChangeLog,v 1.12 2004/07/23 21:00:28 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/ChangeLog,v 1.13 2004/08/24 03:58:14 zx Exp $
+
+  23 Aug 2004; Chris Aniszczyk <zx@gentoo.org> -commons-net-1.1.0.ebuild,
+  -commons-net-1.2.0.ebuild, commons-net-1.2.2.ebuild:
+  Cleanup & Marking x86
 
   23 Jul 2004; Thomas Matthijs <axxo@gentoo.org> commons-net-1.1.0.ebuild,
   commons-net-1.2.0.ebuild, commons-net-1.2.2.ebuild:
diff --git a/dev-java/commons-net/commons-net-1.1.0.ebuild b/dev-java/commons-net/commons-net-1.1.0.ebuild
deleted file mode 100644
index 2904eeedee4d..000000000000
--- a/dev-java/commons-net/commons-net-1.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2004 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.1.0.ebuild,v 1.8 2004/07/23 21:00:28 axxo 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/index.html"
-SRC_URI="mirror://apache/jakarta/commons/net/source/${P}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-		>=dev-java/ant-1.5.4
-		>=dev-java/oro-2.0.7"
-RDEPEND=">=virtual/jdk-1.3"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="jikes"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gentoo.diff
-}
-
-src_compile() {
-	local antflags="-Doro.jar=$(java-config -p oro) jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "died on ant"
-}
-
-src_install() {
-	java-pkg_dojar target/*.jar || die "died on java-pkg_dojar"
-}
diff --git a/dev-java/commons-net/commons-net-1.2.0.ebuild b/dev-java/commons-net/commons-net-1.2.0.ebuild
deleted file mode 100644
index b4b01c8ee70b..000000000000
--- a/dev-java/commons-net/commons-net-1.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 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.0.ebuild,v 1.3 2004/07/23 21:00:28 axxo 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-1.5.4
-		>=dev-java/oro-2.0.7"
-RDEPEND=">=virtual/jdk-1.3"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="jikes doc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gentoo-1.2.diff
-}
-
-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 && dohtml -r dist/docs/
-}
diff --git a/dev-java/commons-net/commons-net-1.2.2.ebuild b/dev-java/commons-net/commons-net-1.2.2.ebuild
index 1a681da7a657..b5c408ab4663 100644
--- a/dev-java/commons-net/commons-net-1.2.2.ebuild
+++ b/dev-java/commons-net/commons-net-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.4 2004/07/26 19:10:46 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.2.2.ebuild,v 1.5 2004/08/24 03:58:14 zx Exp $
 
 inherit eutils java-pkg
 
@@ -13,7 +13,7 @@ DEPEND=">=virtual/jdk-1.3
 RDEPEND=">=virtual/jdk-1.3"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~sparc ~ppc ~amd64"
 IUSE="jikes doc"
 
 src_unpack() {
diff --git a/dev-java/commons-net/files/digest-commons-net-1.1.0 b/dev-java/commons-net/files/digest-commons-net-1.1.0
deleted file mode 100644
index 20f3f86224b2..000000000000
--- a/dev-java/commons-net/files/digest-commons-net-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e54d771b56b19085991cb9fcff7f5187 commons-net-1.1.0-src.tar.gz 178397
diff --git a/dev-java/commons-net/files/digest-commons-net-1.2.0 b/dev-java/commons-net/files/digest-commons-net-1.2.0
deleted file mode 100644
index 9000d7304640..000000000000
--- a/dev-java/commons-net/files/digest-commons-net-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f63a734433821a6836c4a62daf117c27 commons-net-1.2.0-src.tar.gz 179936
diff --git a/dev-java/commons-validator/ChangeLog b/dev-java/commons-validator/ChangeLog
index 7255569360b7..07b2bb4c8a81 100644
--- a/dev-java/commons-validator/ChangeLog
+++ b/dev-java/commons-validator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-validator
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.11 2004/06/24 22:23:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.12 2004/08/24 04:01:13 zx Exp $
+
+  24 Aug 2004; Chris Aniszczyk <zx@gentoo.org>
+  -commons-validator-1.0.2-r1.ebuild, -commons-validator-1.0.2-r2.ebuild,
+  commons-validator-1.0.2-r3.ebuild:
+  Cleanup & Stable on x86
 
 *commons-validator-1.0.2-r3 (21 Jun 2004)
 
diff --git a/dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild b/dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild
deleted file mode 100644
index e56256d4a728..000000000000
--- a/dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild,v 1.4 2004/06/24 22:23:46 agriffis Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Jakarta component to validate user input, or data input"
-HOMEPAGE="http://jakarta.apache.org/commons/validator/"
-SRC_URI="mirror://apache/jakarta/commons/validator/source/${PN}-${PV}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4
-	>=dev-java/oro-2.0.6
-	>=dev-java/commons-digester-1.0
-	>=dev-java/commons-collections-2.0
-	>=dev-java/commons-logging-1.0
-	>=dev-java/commons-beanutils-1.0
-	>=dev-java/xerces-2.0.1
-	app-arch/zip
-	jikes? ( dev-java/jikes )
-	junit? ( >=junit-3.7 )"
-RDEPEND=">=virtual/jre-1.3"
-LICENSE="Apache-1.1"
-SLOT="0"
-RESTRICT="nomirror"
-KEYWORDS="x86 ~ppc ~sparc"
-IUSE="doc jikes junit"
-
-S="${WORKDIR}/${P}-src"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	echo "oro.jar=`java-config --classpath=oro`" >> build.properties
-	echo "commons-digester.jar=`java-config --classpath=commons-digester`" >> build.properties
-	echo "commons-collections.jar=`java-config --classpath=commons-collections`" >> build.properties
-	echo "commons-logging.jar=`java-config --classpath=commons-logging | sed s/.*://`" >> build.properties
-	echo "commons-beanutils.jar=`java-config --classpath=commons-beanutils`" >> build.properties
-	echo "xerces.jar=`java-config --classpath=xerces`" >> build.properties
-}
-
-src_compile() {
-	local antflags="compile"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadoc"
-	use junit && antflags="${antflags} test"
-	ant ${antflags}
-}
-
-src_install() {
-	# Dirty hack
-	mv ${S}/target/conf/MANIFEST.MF ${S}/target/classes/
-	cd ${S}/target/classes
-	zip -qr ../${PN}.jar org
-
-	cd ${S}
-	java-pkg_dojar target/${PN}.jar
-	use doc && dohtml -r dist/docs/
-	dohtml PROPOSAL.html STATUS.html
-	dodoc RELEASE-NOTES.txt
-}
diff --git a/dev-java/commons-validator/commons-validator-1.0.2-r2.ebuild b/dev-java/commons-validator/commons-validator-1.0.2-r2.ebuild
deleted file mode 100644
index 678e1b6d2793..000000000000
--- a/dev-java/commons-validator/commons-validator-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.0.2-r2.ebuild,v 1.3 2004/06/24 22:23:46 agriffis Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Jakarta component to validate user input, or data input"
-HOMEPAGE="http://jakarta.apache.org/commons/validator/"
-SRC_URI="mirror://apache/jakarta/commons/validator/source/${PN}-${PV}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4
-	app-arch/zip
-	jikes? ( dev-java/jikes )
-	junit? ( >=junit-3.7 )"
-RDEPEND=">=virtual/jre-1.3
-	>=dev-java/oro-2.0.6
-	>=dev-java/commons-digester-1.0
-	>=dev-java/commons-collections-2.0
-	>=dev-java/commons-logging-1.0
-	>=dev-java/commons-beanutils-1.0
-	>=dev-java/xerces-2.0.1"
-LICENSE="Apache-1.1"
-SLOT="0"
-RESTRICT="nomirror"
-KEYWORDS="x86 ~ppc ~sparc"
-IUSE="doc jikes junit"
-
-S="${WORKDIR}/${P}-src"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	echo "oro.jar=`java-config --classpath=oro`" >> build.properties
-	echo "commons-digester.jar=`java-config --classpath=commons-digester`" >> build.properties
-	echo "commons-collections.jar=`java-config --classpath=commons-collections`" >> build.properties
-	echo "commons-logging.jar=`java-config --classpath=commons-logging | sed s/.*://`" >> build.properties
-	echo "commons-beanutils.jar=`java-config --classpath=commons-beanutils`" >> build.properties
-	echo "xerces.jar=`java-config --classpath=xerces`" >> build.properties
-}
-
-src_compile() {
-	local antflags="compile"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadoc"
-	use junit && antflags="${antflags} test"
-	ant ${antflags}
-}
-
-src_install() {
-	# Dirty hack
-	mv ${S}/target/conf/MANIFEST.MF ${S}/target/classes/
-	cd ${S}/target/classes
-	zip -qr ../${PN}.jar org
-
-	cd ${S}
-	java-pkg_dojar target/${PN}.jar
-	use doc && dohtml -r dist/docs/
-	dohtml PROPOSAL.html STATUS.html
-	dodoc RELEASE-NOTES.txt
-}
diff --git a/dev-java/commons-validator/commons-validator-1.0.2-r3.ebuild b/dev-java/commons-validator/commons-validator-1.0.2-r3.ebuild
index 1d0a80a99766..139d30060472 100644
--- a/dev-java/commons-validator/commons-validator-1.0.2-r3.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.0.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.0.2-r3.ebuild,v 1.2 2004/06/24 22:23:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.0.2-r3.ebuild,v 1.3 2004/08/24 04:01:13 zx Exp $
 
 inherit java-pkg
 
@@ -22,7 +22,7 @@ RDEPEND=">=virtual/jre-1.3
 LICENSE="Apache-1.1"
 SLOT="0"
 RESTRICT="nomirror"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 IUSE="doc jikes junit"
 
 S="${WORKDIR}/${P}-src"
diff --git a/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r1 b/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r1
deleted file mode 100644
index f6bd8c581e2d..000000000000
--- a/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 917cf3d82847e497e11f9e86488d4b56 commons-validator-1.0.2-src.tar.gz 53692
diff --git a/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r2 b/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r2
deleted file mode 100644
index f6bd8c581e2d..000000000000
--- a/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 917cf3d82847e497e11f9e86488d4b56 commons-validator-1.0.2-src.tar.gz 53692