Mark stable on amd64 wrt bug #172304 and remove generation 1 ebuild.

(Portage version: 2.1.2.3)

4 files changed, 6 insertions, 42 deletions

diff --git a/dev-java/gnu-jaf/ChangeLog b/dev-java/gnu-jaf/ChangeLog
index 93248c6a4d30..15be28c1961c 100644
--- a/dev-java/gnu-jaf/ChangeLog
+++ b/dev-java/gnu-jaf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/gnu-jaf
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaf/ChangeLog,v 1.17 2007/04/06 22:38:59 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaf/ChangeLog,v 1.18 2007/04/06 23:00:03 betelgeuse Exp $
+
+  06 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> -gnu-jaf-1.0-r1.ebuild:
+  Mark stable on amd64 wrt bug #172304 and remove generation 1 ebuild.
 
   06 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   gnu-jaf-1.0-r2.ebuild:
diff --git a/dev-java/gnu-jaf/files/digest-gnu-jaf-1.0-r1 b/dev-java/gnu-jaf/files/digest-gnu-jaf-1.0-r1
deleted file mode 100644
index b26730e07731..000000000000
--- a/dev-java/gnu-jaf/files/digest-gnu-jaf-1.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7bc83fccf5519e8aa30848139ed9715a activation-1.0.tar.gz 146228
-RMD160 6a8b04385e22168bf584238a4b6b289853e8641e activation-1.0.tar.gz 146228
-SHA256 be75c9a97317778a483635f5df2092a68f63e9443523aa36f61290733cfdbac8 activation-1.0.tar.gz 146228
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.0-r1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.0-r1.ebuild
deleted file mode 100644
index befaba95bf45..000000000000
--- a/dev-java/gnu-jaf/gnu-jaf-1.0-r1.ebuild
+++ /dev/null
@@ -1,36 +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/gnu-jaf/gnu-jaf-1.0-r1.ebuild,v 1.7 2007/03/28 18:11:43 betelgeuse Exp $
-
-inherit java-pkg
-
-DESCRIPTION="GNU JAF: JavaBeans Activation Framework"
-HOMEPAGE="http://www.gnu.org/software/classpathx/jaf/jaf.html"
-SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="1"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="doc source"
-
-DEPEND=">=virtual/jdk-1.4
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.4"
-
-S=${WORKDIR}/activation-${PV}
-
-src_compile() {
-	econf || die "configure failed"
-	make || die "make failed"
-
-	if use doc; then
-		make javadoc || die "failed to create javadoc"
-	fi
-}
-
-src_install() {
-	java-pkg_dojar activation.jar
-	dodoc AUTHORS ChangeLog
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc source/*
-}
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.0-r2.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.0-r2.ebuild
index 4f3857dd560a..054a04ea21b3 100644
--- a/dev-java/gnu-jaf/gnu-jaf-1.0-r2.ebuild
+++ b/dev-java/gnu-jaf/gnu-jaf-1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaf/gnu-jaf-1.0-r2.ebuild,v 1.9 2007/04/06 22:38:59 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaf/gnu-jaf-1.0-r2.ebuild,v 1.10 2007/04/06 23:00:03 betelgeuse Exp $
 
 inherit java-pkg-2
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="1"
-KEYWORDS="~amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="doc source"
 
 # doesn't like 1.6+ because of bundled javax.activation which it can't override