Mark stable on amd64 wrt bug #167273 and remove old gen 1 ebuild.

Package-Manager: portage-2.1.2.3

diff --git a/dev-java/jss/ChangeLog b/dev-java/jss/ChangeLog
index d01c8f1bd593583ce27d5f5fcdb22ecca31008e5..520c340110f3359aa7818a75cc12ef8ececb4fdf 100644 (file)
--- a/dev-java/jss/ChangeLog
+++ b/dev-java/jss/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jss
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v 1.13 2007/02/20 22:57:36 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v 1.14 2007/04/02 16:20:39 betelgeuse Exp $
+
+  02 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> -jss-3.4.ebuild,
+  jss-3.4-r1.ebuild:
+  Mark stable on amd64 wrt bug #167273 and remove old gen 1 ebuild.
 
   20 Feb 2007; Christian Faulhammer <opfer@gentoo.org> jss-3.4-r1.ebuild:
   stable x86; bug 167273

diff --git a/dev-java/jss/Manifest b/dev-java/jss/Manifest
index c6d810e7eb3a413ef967e8b08cccc1413ca67399..b12d9705d5add3d4c9042478b5551caffc206d1f 100644 (file)
--- a/dev-java/jss/Manifest
+++ b/dev-java/jss/Manifest
@@ -11,29 +11,22 @@ RMD160 df3e74da0679ffd5c087050fc352dd90a64e3262 files/jss-4.2-pkg-config.patch 5
 SHA256 492d82cf076c69f9194563588b663a3c7cc8c04a217da499a78d5c19874d35cb files/jss-4.2-pkg-config.patch 571
 DIST jss-3.4-src.tar.gz 481774 RMD160 2c0577de95fd753c176d3d37e9d2cdfbbc7fdf71 SHA1 3a316e926b2db3ae41a7b6eb4c323f8aad092742 SHA256 53396a99eb8d4024ede7a416ee3e2ece95daeca9353e92b971243d52181b919c
 DIST jss-4.2.tar.bz2 376845 RMD160 1bc9180a43d062dbf46818427f96df86bb0ce4e5 SHA1 aa1312971b2e13456ad01ea181702d0aa0643bcf SHA256 1c7240312193620607d4b823adb69ad63b3f8bd5de8e0c284f3df2d19aab8621
-EBUILD jss-3.4-r1.ebuild 1979 RMD160 bb9511562f1c25e273a2a293d05f58daec7a0732 SHA1 9f0fdad90bd9654b8f9703792e045286bdff85b6 SHA256 0b408305947842412e1e0abf5bcf26d0f4c18f518636b980c706fa2395d52c80
-MD5 18afec0592360054dc377144eb42148d jss-3.4-r1.ebuild 1979
-RMD160 bb9511562f1c25e273a2a293d05f58daec7a0732 jss-3.4-r1.ebuild 1979
-SHA256 0b408305947842412e1e0abf5bcf26d0f4c18f518636b980c706fa2395d52c80 jss-3.4-r1.ebuild 1979
-EBUILD jss-3.4.ebuild 2052 RMD160 4a91fe0384123a44728b67b08109ddb49da13354 SHA1 e65bd9c347118f83208d69ad102e148242c8b3bb SHA256 6012e55e4baac92895ecbaca545c79f2d90e84809a966a8b0f5359306e56a823
-MD5 df55afc34b93ca9a5b84917cd9e8bb0b jss-3.4.ebuild 2052
-RMD160 4a91fe0384123a44728b67b08109ddb49da13354 jss-3.4.ebuild 2052
-SHA256 6012e55e4baac92895ecbaca545c79f2d90e84809a966a8b0f5359306e56a823 jss-3.4.ebuild 2052
+EBUILD jss-3.4-r1.ebuild 1983 RMD160 f0bdb5b5fddd0cd35d1301541ca547602ecc46ae SHA1 5be5fe0180a9ee92cd9eab3799771688ac72c9f7 SHA256 9d16a9e8be83d613a08ac54dbb26297c7e37da07417b90644333c6ad2a17efaa
+MD5 6c36890bb5df42e2a5631d40bdfe697f jss-3.4-r1.ebuild 1983
+RMD160 f0bdb5b5fddd0cd35d1301541ca547602ecc46ae jss-3.4-r1.ebuild 1983
+SHA256 9d16a9e8be83d613a08ac54dbb26297c7e37da07417b90644333c6ad2a17efaa jss-3.4-r1.ebuild 1983
 EBUILD jss-4.2.ebuild 2092 RMD160 cd2b4581e60bcfbb7d2b0ed6b7cb0f9d56d47c8c SHA1 2611791ec8b0a1f5ff0e72e159ec76975f9ac458 SHA256 442593fcdb2252b0612bdb903a459ecd8d2971ce12097d5761eed9971ddf7e9d
 MD5 38df93c67de0d080f69b45d8f83b019b jss-4.2.ebuild 2092
 RMD160 cd2b4581e60bcfbb7d2b0ed6b7cb0f9d56d47c8c jss-4.2.ebuild 2092
 SHA256 442593fcdb2252b0612bdb903a459ecd8d2971ce12097d5761eed9971ddf7e9d jss-4.2.ebuild 2092
-MISC ChangeLog 1993 RMD160 2708973250f77c78e8c929063993733db2884870 SHA1 b4b478254f18dd41a6f1c2b674a5c065c475699c SHA256 966a95df98d538d07d8b8c8cb3c113aab72056adaf69f3639aca755b062b7da7
-MD5 4ac091173f2e3ff9f30c15c281261720 ChangeLog 1993
-RMD160 2708973250f77c78e8c929063993733db2884870 ChangeLog 1993
-SHA256 966a95df98d538d07d8b8c8cb3c113aab72056adaf69f3639aca755b062b7da7 ChangeLog 1993
+MISC ChangeLog 2158 RMD160 889df1967be68b953475952cfe129081129b17f5 SHA1 6aeab79c3ce60409982883e68af626b4f06f4207 SHA256 2e5601ccad006ab5527825c9042230f1f07b07abf3a6465fbcf7e1b3183476a3
+MD5 f604926caf4649f34c966c40ec2e8eff ChangeLog 2158
+RMD160 889df1967be68b953475952cfe129081129b17f5 ChangeLog 2158
+SHA256 2e5601ccad006ab5527825c9042230f1f07b07abf3a6465fbcf7e1b3183476a3 ChangeLog 2158
 MISC metadata.xml 434 RMD160 bf2f7b01b200787d7473ce84834202067366f86d SHA1 86157cdb7f1921ef19906439056d5ef4a0bc1c59 SHA256 c92168f2c1bddf51758e8fbef06d9cf84df325cef503d5d2d040de174d3c7397
 MD5 2f430734ab6744f82037df29e1f0e6c4 metadata.xml 434
 RMD160 bf2f7b01b200787d7473ce84834202067366f86d metadata.xml 434
 SHA256 c92168f2c1bddf51758e8fbef06d9cf84df325cef503d5d2d040de174d3c7397 metadata.xml 434
-MD5 484470914b36b944f1dfce77f6256ff7 files/digest-jss-3.4 235
-RMD160 e6a7036f57f6923dd5f4ec340f7ea0f9ca8d4bd2 files/digest-jss-3.4 235
-SHA256 768bf597fec0894ea2d321b191276d10f872fcc7996902e945f3a6de7f512bdc files/digest-jss-3.4 235
 MD5 484470914b36b944f1dfce77f6256ff7 files/digest-jss-3.4-r1 235
 RMD160 e6a7036f57f6923dd5f4ec340f7ea0f9ca8d4bd2 files/digest-jss-3.4-r1 235
 SHA256 768bf597fec0894ea2d321b191276d10f872fcc7996902e945f3a6de7f512bdc files/digest-jss-3.4-r1 235
@@ -41,9 +34,9 @@ MD5 f5b9db74e437cebe1a32eb93b6a67ded files/digest-jss-4.2 226
 RMD160 2dc6de16dbc37e11d1c10bd15d86e8775a526c68 files/digest-jss-4.2 226
 SHA256 2ff63bf22ccb9f5efbe63b660f923649a27e398bfd94c5bdc4ba2438488c0ecb files/digest-jss-4.2 226
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF23yyNQqtfCuFneMRAmUBAJ0THRdu4kPIT4Qb8cP7yndXfr09+QCfaVqY
-PrQo4cq85gEOHYBAOG2Y17M=
-=4jeG
+iD8DBQFGES1bcxLzpIGCsLQRAtTCAKCR/j0TQoZzaw6uUpBUrtf2VR11NgCggVIC
+ITDzn6k9uW0UfXgIm3otY14=
+=JfiO
 -----END PGP SIGNATURE-----

diff --git a/dev-java/jss/files/digest-jss-3.4 b/dev-java/jss/files/digest-jss-3.4
deleted file mode 100644 (file)
index f5f7dd4..0000000
--- a/dev-java/jss/files/digest-jss-3.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ceeab5fd5adbbe8f3a1c3547b2389abf jss-3.4-src.tar.gz 481774
-RMD160 2c0577de95fd753c176d3d37e9d2cdfbbc7fdf71 jss-3.4-src.tar.gz 481774
-SHA256 53396a99eb8d4024ede7a416ee3e2ece95daeca9353e92b971243d52181b919c jss-3.4-src.tar.gz 481774

diff --git a/dev-java/jss/jss-3.4-r1.ebuild b/dev-java/jss/jss-3.4-r1.ebuild
index 002d0865137dd01c13044a17e2ecedea0ac754f6..7efd0efe0470bc06092637efb392bc6698d1990a 100644 (file)
--- a/dev-java/jss/jss-3.4-r1.ebuild
+++ b/dev-java/jss/jss-3.4-r1.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/jss/jss-3.4-r1.ebuild,v 1.4 2007/02/20 22:57:36 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/jss-3.4-r1.ebuild,v 1.5 2007/04/02 16:20:40 betelgeuse Exp $
 
 inherit eutils java-pkg-2 versionator linux-info
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/${PN}/releases/${RTM_NAM
 
 LICENSE="MPL-1.1"
 SLOT="3.4"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.4

diff --git a/dev-java/jss/jss-3.4.ebuild b/dev-java/jss/jss-3.4.ebuild
deleted file mode 100644 (file)
index baeff85..0000000
--- a/dev-java/jss/jss-3.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/jss-3.4.ebuild,v 1.10 2006/10/05 18:21:17 gustavoz Exp $
-
-inherit eutils java-pkg versionator linux-info
-
-RTM_NAME="JSS_${PV//./_}_RTM"
-DESCRIPTION="Network Security Services for Java (JSS)"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/jss/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/${PN}/releases/${RTM_NAME}/src/${P}-src.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="3.4"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4
-               >=dev-libs/nspr-4.3
-               >=dev-libs/nss-3.9.2"
-DEPEND=">=virtual/jdk-1.4
-               ${RDEPEND}
-               app-arch/zip
-               >=sys-apps/sed-4"
-
-S=${WORKDIR}/${P}-src
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}/mozilla/security/coreconf
-       cp Linux2.5.mk Linux$(get_version_component_range 1-3 ${KV}).mk
-       cp Linux2.5.mk Linux$(get_version_component_range 1-2 ${KV}).mk
-
-       echo "INCLUDES += -I${ROOT}usr/include/nss -I${ROOT}usr/include/nspr" \
-               >> ${S}/mozilla/security/coreconf/headers.mk
-
-       if use x86; then
-               sed -e 's:-L$(DIST)/lib:-L/usr/lib/nspr -L/usr/lib/nss -L$(JAVA_HOME)/jre/lib/i386 -L$(JAVA_HOME)/jre/lib/i386/server -L$(DIST)/lib:' \
-                       -i ${S}/mozilla/security/jss/lib/config.mk
-       elif use amd64; then
-               sed -e 's:-L$(DIST)/lib:-L/usr/lib/nspr -L/usr/lib/nss -L$(JAVA_HOME)/jre/lib/amd64 -L$(JAVA_HOME)/jre/lib/amd64/server -L$(DIST)/lib:' \
-                       -i ${S}/mozilla/security/jss/lib/config.mk
-       elif use sparc; then
-               sed -e 's:-L$(DIST)/lib:-L/usr/lib/nspr -L/usr/lib/nss -L$(JAVA_HOME)/jre/lib/sparc -L$(JAVA_HOME)/jre/lib/sparc/server -L$(DIST)/lib:' \
-                       -i ${S}/mozilla/security/jss/lib/config.mk
-       fi
-}
-
-src_compile() {
-       cd ${S}/mozilla/security/coreconf
-       emake -j1 BUILD_OPT=1 || die "coreconf make failed"
-
-       cd ${S}/mozilla/security/jss
-       emake -j1 BUILD_OPT=1 || die "nss make failed"
-}
-
-src_install() {
-       cd ${S}/mozilla/dist/classes*
-       zip -q -r ../jss34.jar . || die "zip failed"
-       java-pkg_dojar ../jss34.jar
-
-       cd ${S}
-       java-pkg_doso mozilla/dist/Linux*/lib/libjss3.so
-}

diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 5a0a216204ceea442c43b20304420616f3be2eb9..8f451ef4a341fcb8f95d630dd3accf9c3fb79d8d 100644 (file)
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.5-build.xml 2864 RMD160 d69af37473e7526f17ce99d7e5e624d2edac630b SHA1 f3da528002c5463406141bf63b5301d5518577f5 SHA256 b2cbb540ab2bfacc8044e0c6d67afbbd8c1e2e04a12a9c0f565902e1ef3c687a
 MD5 66ba82dc585e7dec8814097eae04a5d3 files/2.5-build.xml 2864
 RMD160 d69af37473e7526f17ce99d7e5e624d2edac630b files/2.5-build.xml 2864
@@ -9,18 +12,18 @@ EBUILD tomcat-servlet-api-5.5.20.ebuild 1428 RMD160 a9a34ea036252ed40539209e6310
 MD5 c3a9c70bd497ec64b16f6ec295a563c3 tomcat-servlet-api-5.5.20.ebuild 1428
 RMD160 a9a34ea036252ed40539209e6310688089e86b0c tomcat-servlet-api-5.5.20.ebuild 1428
 SHA256 5390b3378af14532fb838e3d2d48ab19d6a09da3c8558c2be07c306e13724e97 tomcat-servlet-api-5.5.20.ebuild 1428
-EBUILD tomcat-servlet-api-5.5.23.ebuild 1428 RMD160 2b53f4ee0d75c798b25945551bbb92171ddadb6e SHA1 c3c5e7443b229c88af35f9130361013306a04a77 SHA256 de2b5283b4de09826940702505fb47be0dbd7b1ef2a14121d0af190f26fff1b8
-MD5 18170ac61aa4432c4a07b39eacdf7e97 tomcat-servlet-api-5.5.23.ebuild 1428
-RMD160 2b53f4ee0d75c798b25945551bbb92171ddadb6e tomcat-servlet-api-5.5.23.ebuild 1428
-SHA256 de2b5283b4de09826940702505fb47be0dbd7b1ef2a14121d0af190f26fff1b8 tomcat-servlet-api-5.5.23.ebuild 1428
-EBUILD tomcat-servlet-api-6.0.10.ebuild 1134 RMD160 db21b5b27f06b51e4271432c19e055e2c6e49f92 SHA1 e37127425e52cbcdc05e994e75c0d883adc76fb2 SHA256 8867c2ad7ccfe214f1376d7b4ad4faf480f4d525452978d95e7470788c8b276c
-MD5 e23cf377ec67f360e6d5597e9ed0ba2b tomcat-servlet-api-6.0.10.ebuild 1134
-RMD160 db21b5b27f06b51e4271432c19e055e2c6e49f92 tomcat-servlet-api-6.0.10.ebuild 1134
-SHA256 8867c2ad7ccfe214f1376d7b4ad4faf480f4d525452978d95e7470788c8b276c tomcat-servlet-api-6.0.10.ebuild 1134
-MISC ChangeLog 3971 RMD160 4d34037ba09c775e45384bf8822a91a6d7246284 SHA1 a07ac2499c3c74f2db3c4f0021fb2f19bbb73c71 SHA256 56629cc1ad69a560dc5d5fbbc72322ae66427a6655184b11d1f022804228c39d
-MD5 94166db60d3064770d6415eb7a614bf6 ChangeLog 3971
-RMD160 4d34037ba09c775e45384bf8822a91a6d7246284 ChangeLog 3971
-SHA256 56629cc1ad69a560dc5d5fbbc72322ae66427a6655184b11d1f022804228c39d ChangeLog 3971
+EBUILD tomcat-servlet-api-5.5.23.ebuild 1334 RMD160 7590dd4878d239652a38ab5bcd9530d78920c5f9 SHA1 c0653317a60298fb4efdde3edd605cbb0712e2ec SHA256 1050f97c44b03eb863faa35b3cdcf8f28a101168b32fc3ad082b464f2dabef24
+MD5 6cd03ee435ff3c9a0fc3fae7017e9686 tomcat-servlet-api-5.5.23.ebuild 1334
+RMD160 7590dd4878d239652a38ab5bcd9530d78920c5f9 tomcat-servlet-api-5.5.23.ebuild 1334
+SHA256 1050f97c44b03eb863faa35b3cdcf8f28a101168b32fc3ad082b464f2dabef24 tomcat-servlet-api-5.5.23.ebuild 1334
+EBUILD tomcat-servlet-api-6.0.10.ebuild 985 RMD160 ffb1e1cf906f040f2f60b7afdd7bd8952d61b941 SHA1 baf5b9758a5621e3fba28ebc49cafb73ab17da89 SHA256 ef9da90a3f402ec8aab9a03492d449b97f05c754cb37c1461acd0e45f09f4bb4
+MD5 8691cca92a306c611b9f7e4d8b7c9680 tomcat-servlet-api-6.0.10.ebuild 985
+RMD160 ffb1e1cf906f040f2f60b7afdd7bd8952d61b941 tomcat-servlet-api-6.0.10.ebuild 985
+SHA256 ef9da90a3f402ec8aab9a03492d449b97f05c754cb37c1461acd0e45f09f4bb4 tomcat-servlet-api-6.0.10.ebuild 985
+MISC ChangeLog 4121 RMD160 e4af53472a8006c30dbad63cc6501216d7485b82 SHA1 8df89fbc31b7ef02bc1a679c8fadc8cd59623c34 SHA256 5775bf1b83cffa8f76f8069e4c85263ca9c8c5cbae8d785412d4589393ea391a
+MD5 f9998c760df0c7891de2744800e3f987 ChangeLog 4121
+RMD160 e4af53472a8006c30dbad63cc6501216d7485b82 ChangeLog 4121
+SHA256 5775bf1b83cffa8f76f8069e4c85263ca9c8c5cbae8d785412d4589393ea391a ChangeLog 4121
 MISC metadata.xml 370 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 SHA1 0d60a8ede5babbd15577612fe7b9e504e5a73689 SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704
 MD5 eab22d527a1a92afde250a0ff957b829 metadata.xml 370
 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 metadata.xml 370
@@ -34,3 +37,10 @@ SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/di
 MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-servlet-api-6.0.10 277
 RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-servlet-api-6.0.10 277
 SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-servlet-api-6.0.10 277
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGES4/cxLzpIGCsLQRAj+fAJ47aFLgL/yzagkhLbv4Y8PU+/m1OACgjKwJ
+kneJHLqxxNt2LMVRb9VtYM4=
+=bEUD
+-----END PGP SIGNATURE-----