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

Package-Manager: portage-2.1.2.3

5 files changed, 24 insertions, 57 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/Manifest b/dev-java/gnu-jaf/Manifest
index 54b6d655d095..6d0804d34178 100644
--- a/dev-java/gnu-jaf/Manifest
+++ b/dev-java/gnu-jaf/Manifest
@@ -1,23 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST activation-1.0.tar.gz 146228 RMD160 6a8b04385e22168bf584238a4b6b289853e8641e SHA1 484347c75c1d2902383d97718d8593a920e514c0 SHA256 be75c9a97317778a483635f5df2092a68f63e9443523aa36f61290733cfdbac8
-EBUILD gnu-jaf-1.0-r1.ebuild 932 RMD160 5acbb3c8bd465d9bfd1aaf5e173c6b2871bd950c SHA1 b9b377df1c16bd23c90bf3fe21b6fcbb049ec763 SHA256 3568a65725752c0fbba79f5294787050df8318509bf81f820dec9ab5cfb0def1
-MD5 8b8abf40d4ec6e2dc0111f3f31e357db gnu-jaf-1.0-r1.ebuild 932
-RMD160 5acbb3c8bd465d9bfd1aaf5e173c6b2871bd950c gnu-jaf-1.0-r1.ebuild 932
-SHA256 3568a65725752c0fbba79f5294787050df8318509bf81f820dec9ab5cfb0def1 gnu-jaf-1.0-r1.ebuild 932
-EBUILD gnu-jaf-1.0-r2.ebuild 1227 RMD160 07ba6c81fc225b38729ca2325d9ba3165062cb82 SHA1 d0d21cf84f1f5b168483b34170b9e2b25976a142 SHA256 f267c07a22363242298be9872e296795d45cf3f63ccaca72bf41a59e43d0405d
-MD5 d0cf43da3a8a20654bbbdc04ecd4437c gnu-jaf-1.0-r2.ebuild 1227
-RMD160 07ba6c81fc225b38729ca2325d9ba3165062cb82 gnu-jaf-1.0-r2.ebuild 1227
-SHA256 f267c07a22363242298be9872e296795d45cf3f63ccaca72bf41a59e43d0405d gnu-jaf-1.0-r2.ebuild 1227
-MISC ChangeLog 2492 RMD160 fb1e4aa4857ee6d99ae467568faf0eba4d34b6f8 SHA1 a416f55b164c9b7e385fa4fa55766715eb6c0f65 SHA256 b7bfe32ecf10d2193e345815cd1e2a88b0bc7b670b04c46a6e8cc17cd42a02ce
-MD5 986a9e14174ebff406aaea5a00943d44 ChangeLog 2492
-RMD160 fb1e4aa4857ee6d99ae467568faf0eba4d34b6f8 ChangeLog 2492
-SHA256 b7bfe32ecf10d2193e345815cd1e2a88b0bc7b670b04c46a6e8cc17cd42a02ce ChangeLog 2492
+EBUILD gnu-jaf-1.0-r2.ebuild 1227 RMD160 d31e4adc247c6c0db7ba38a39e0118292d3315e4 SHA1 a73d5ad2935311571ac8b48f49796659889582e9 SHA256 2c017ca89365b6357e76308e341b5eeaed42d147fc9b1591269be663b9bb103e
+MD5 0ec9c1726d0026302e1df465a239a08f gnu-jaf-1.0-r2.ebuild 1227
+RMD160 d31e4adc247c6c0db7ba38a39e0118292d3315e4 gnu-jaf-1.0-r2.ebuild 1227
+SHA256 2c017ca89365b6357e76308e341b5eeaed42d147fc9b1591269be663b9bb103e gnu-jaf-1.0-r2.ebuild 1227
+MISC ChangeLog 2641 RMD160 24cea7b38e0ea75849a17f660309aafcd3b39314 SHA1 949402ef48414e4c783284955fe8ed338dd7266f SHA256 ae8f904e4a1d470e19e335f6299d0cb0a296ec8ae15926e89b9bd7963bb9f4e9
+MD5 a7a786d4062cbdf2dd2a01ff3dea9ace ChangeLog 2641
+RMD160 24cea7b38e0ea75849a17f660309aafcd3b39314 ChangeLog 2641
+SHA256 ae8f904e4a1d470e19e335f6299d0cb0a296ec8ae15926e89b9bd7963bb9f4e9 ChangeLog 2641
 MISC metadata.xml 997 RMD160 9f27212c951865bfaafe84c97de04bf0ceef0622 SHA1 5a316caeea3738bb47eb3130a9b81e45b6cfe4ca SHA256 1f234a499c492444a93add202b9e370764f51c58cd390f226536bbae2d31f7b2
 MD5 240119fe174b85ef28b79587a6a68ebb metadata.xml 997
 RMD160 9f27212c951865bfaafe84c97de04bf0ceef0622 metadata.xml 997
 SHA256 1f234a499c492444a93add202b9e370764f51c58cd390f226536bbae2d31f7b2 metadata.xml 997
-MD5 8a8ce791e5453327100a20b8d6e9b0e3 files/digest-gnu-jaf-1.0-r1 244
-RMD160 b0ee309d8a5e94377b161d09d80a34e5e072d10a files/digest-gnu-jaf-1.0-r1 244
-SHA256 8480eeec9df80b66684b5fc170eec7d4d4ad4f71ac90da4447176fdcba4d1fe1 files/digest-gnu-jaf-1.0-r1 244
 MD5 8a8ce791e5453327100a20b8d6e9b0e3 files/digest-gnu-jaf-1.0-r2 244
 RMD160 b0ee309d8a5e94377b161d09d80a34e5e072d10a files/digest-gnu-jaf-1.0-r2 244
 SHA256 8480eeec9df80b66684b5fc170eec7d4d4ad4f71ac90da4447176fdcba4d1fe1 files/digest-gnu-jaf-1.0-r2 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGFtDycxLzpIGCsLQRAs2pAKCc9iarlid84zpCkVHmBrJo+hqR3wCcCqG+
+2hi+43NXmnFIqhQ9lnKSwvc=
+=Ssyo
+-----END PGP SIGNATURE-----
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