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

(Portage version: 2.1.2.3)

4 files changed, 7 insertions, 69 deletions

diff --git a/dev-java/jss/ChangeLog b/dev-java/jss/ChangeLog
index d01c8f1bd593..520c340110f3 100644
--- 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/files/digest-jss-3.4 b/dev-java/jss/files/digest-jss-3.4
deleted file mode 100644
index f5f7dd4fd22b..000000000000
--- 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 002d0865137d..7efd0efe0470 100644
--- 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
index baeff855e3e1..000000000000
--- 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
-}