Version bump, bug #290890. Remove old.

(Portage version: 2.2_rc48/cvs/Linux x86_64)

4 files changed, 32 insertions, 118 deletions

diff --git a/dev-java/jss/ChangeLog b/dev-java/jss/ChangeLog
index 1e062f15566f..9bb5cf3e0ade 100644
--- a/dev-java/jss/ChangeLog
+++ b/dev-java/jss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jss
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v 1.21 2008/05/28 19:20:28 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v 1.22 2009/11/03 19:45:46 caster Exp $
+
+*jss-4.3 (03 Nov 2009)
+
+  03 Nov 2009; Vlastimil Babka <caster@gentoo.org> -jss-3.4-r1.ebuild,
+  -jss-4.2.ebuild, -files/jss-4.2-pkg-config.patch, +jss-4.3.ebuild:
+  Version bump, bug #290890. Remove old.
 
   28 May 2008; Markus Meier <maekke@gentoo.org> jss-4.2.5.ebuild:
   amd64/x86 stable, bug #223573
diff --git a/dev-java/jss/files/jss-4.2-pkg-config.patch b/dev-java/jss/files/jss-4.2-pkg-config.patch
deleted file mode 100644
index befd3fbe68ae..000000000000
--- a/dev-java/jss/files/jss-4.2-pkg-config.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: security/jss/lib/config.mk
-===================================================================
-RCS file: /cvsroot/mozilla/security/jss/lib/config.mk,v
-retrieving revision 1.19
-diff -u -r1.19 config.mk
---- mozilla/security/jss/lib/config.mk	25 Apr 2004 15:02:19 -0000	1.19
-+++ mozilla/security/jss/lib/config.mk	30 Jan 2007 21:08:06 -0000
-@@ -72,13 +72,7 @@
- else
- 
- EXTRA_SHARED_LIBS += \
--    -L$(DIST)/lib \
--    -lnss3 \
--    -lsmime3 \
--    -lssl3 \
--    -lplc4 \
--    -lplds4 \
--    -lnspr4 \
-+    `pkg-config --libs nss` \
-     $(JAVA_LIBS) \
-     $(NULL)
- 
diff --git a/dev-java/jss/jss-3.4-r1.ebuild b/dev-java/jss/jss-3.4-r1.ebuild
deleted file mode 100644
index 3c385ed84f20..000000000000
--- a/dev-java/jss/jss-3.4-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 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.7 2008/02/08 00:31:27 wltjr Exp $
-
-inherit eutils java-pkg-2 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="amd64 x86"
-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
-
-pkg_setup() {
-	linux-info_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-target_source.patch"
-	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/usr/include/nss -I/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"
-	fi
-}
-
-src_compile() {
-	export JAVA_GENTOO_OPTS="-target $(java-pkg_get-target) -source $(java-pkg_get-source)"
-	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/security/jss/lib/Linux2*/libjss3.so
-}
diff --git a/dev-java/jss/jss-4.2.ebuild b/dev-java/jss/jss-4.3.ebuild
index c9cd6c79db2b..46ff38e2a95b 100644
--- a/dev-java/jss/jss-4.2.ebuild
+++ b/dev-java/jss/jss-4.3.ebuild
@@ -1,44 +1,41 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/jss-4.2.ebuild,v 1.5 2008/05/11 13:43:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/jss-4.3.ebuild,v 1.1 2009/11/03 19:45:46 caster Exp $
 
-inherit eutils java-pkg-2 versionator
+inherit base java-pkg-2 versionator
 
 RTM_NAME="JSS_${PV//./_}_RTM"
 DESCRIPTION="Network Security Services for Java (JSS)"
 HOMEPAGE="http://www.mozilla.org/projects/security/pki/jss/"
 # To prepare this tarball
 # cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \
-#    -r JSS_4_2_RTM mozilla/security/corefonf
+#    -r JSS_4_3_RTM mozilla/security/coreconf
 # cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \
-#    -r JSS_4_2_RTM mozilla/security/jss
-# tar cvjf jss-4.2.tar.bz2 mozilla
+#    -r JSS_4_3_RTM mozilla/security/jss
+# tar cvjf jss-4.3.tar.bz2 mozilla
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="MPL-1.1"
 SLOT="3.4"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples source"
 
-RDEPEND=">=virtual/jre-1.4
-		>=dev-libs/nspr-4.3
-		>=dev-libs/nss-3.9.2"
+RDEPEND=">=dev-libs/nspr-4.7
+	>=dev-libs/nss-3.12"
 DEPEND=">=virtual/jdk-1.4
-		${RDEPEND}
-		app-arch/zip
-		dev-util/pkgconfig
-		>=sys-apps/sed-4"
+	app-arch/zip
+	dev-util/pkgconfig
+	>=sys-apps/sed-4
+	${RDEPEND}"
+RDEPEND=">=virtual/jre-1.4
+	${RDEPEND}"
 
 S=${WORKDIR}/mozilla
 
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${PN}-3.4-target_source.patch"
-	epatch "${FILESDIR}/${PN}-4.2-pkg-config.patch"
-
-	echo "INCLUDES += -I/usr/include/nss -I/usr/include/nspr" \
-		>> "${S}"/security/coreconf/headers.mk || die
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4-target_source.patch"
+	"${FILESDIR}/${PN}-4.2.5-use_pkg-config.patch"
+)
 
 src_compile() {
 	export JAVA_GENTOO_OPTS="-target $(java-pkg_get-target) -source $(java-pkg_get-source)"
@@ -47,12 +44,15 @@ src_compile() {
 	emake -j1 BUILD_OPT=1 || die "coreconf make failed"
 
 	cd "${S}/security/jss" || die
-	emake -j1 BUILD_OPT=1 || die "jss make failed"
+	emake -j1 BUILD_OPT=1 USE_PKGCONFIG=1 NSS_PKGCONFIG=nss NSPR_PKGCONFIG=nspr || die "jss make failed"
 	if use doc; then
 		emake -j1 BUILD_OPT=1 javadoc || die "failed to create javadocs"
 	fi
 }
 
+# Investigate why this fails
+RESTRICT="test"
+
 src_test() {
 	BUILD_OPT=1 perl security/jss/org/mozilla/jss/tests/all.pl dist \
 		"${S}"/dist/Linux*.OBJ/
@@ -65,8 +65,5 @@ src_install() {
 	java-pkg_doso ./security/${PN}/lib/*/*.so
 	use doc && java-pkg_dojavadoc dist/jssdoc
 	use source && java-pkg_dosrc ./security/jss/org
-	if use examples; then
-		docinto examples
-		dodoc ./security/jss/samples/*
-	fi
+	use examples && java-pkg_doexamples ./security/jss/samples
 }