Version bump, bug #290890. Remove old.

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

5 files changed, 35 insertions, 134 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/Manifest b/dev-java/jss/Manifest
index 6b859410cfb6..5ba3876973ec 100644
--- a/dev-java/jss/Manifest
+++ b/dev-java/jss/Manifest
@@ -1,21 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX jss-3.4-target_source.patch 633 RMD160 cc76aea593fb7493b59f0ed61f70bb1a636ccbc5 SHA1 7ef2d2876808bff77ed865aaf2746933ae40afea SHA256 7785f02cb67d47198e5d6052ecaf88ec1f237585e3244ee6bac147d5a5336732
-AUX jss-4.2-pkg-config.patch 571 RMD160 df3e74da0679ffd5c087050fc352dd90a64e3262 SHA1 f4ca079eb8d188b66fa0ed2be9a3d1fd75a616c2 SHA256 492d82cf076c69f9194563588b663a3c7cc8c04a217da499a78d5c19874d35cb
 AUX jss-4.2.5-use_pkg-config.patch 1004 RMD160 81564af0313746dd1a80bb85df88bbcf3f6d2531 SHA1 4b0e53fa28c8aa01842a939dd738615d4b253f1c SHA256 04fdb13b7435e11149485d62218aeeefc7d20544f057b3097bef46498b8aeff0
-DIST jss-3.4-src.tar.gz 481774 RMD160 2c0577de95fd753c176d3d37e9d2cdfbbc7fdf71 SHA1 3a316e926b2db3ae41a7b6eb4c323f8aad092742 SHA256 53396a99eb8d4024ede7a416ee3e2ece95daeca9353e92b971243d52181b919c
 DIST jss-4.2.5.tar.bz2 390376 RMD160 ea2355225da16f4e18d06255fae4058c1b31184a SHA1 b9da668ebe8a1d7135e64dd95ab32351ffcb9c94 SHA256 97fe53b97653a85eadf3b22e5cf9205de7acc0abd694e90216b4475701072f93
-DIST jss-4.2.tar.bz2 376845 RMD160 1bc9180a43d062dbf46818427f96df86bb0ce4e5 SHA1 aa1312971b2e13456ad01ea181702d0aa0643bcf SHA256 1c7240312193620607d4b823adb69ad63b3f8bd5de8e0c284f3df2d19aab8621
-EBUILD jss-3.4-r1.ebuild 2055 RMD160 0535e0fff60871b284c54c399321c93a0b06bbc7 SHA1 acf21b8be8f2c2bb7d20a1029e0940f458353222 SHA256 c77864e78a05b9dc4aedc7464f75404ebd02b2ac790620696256b5f134e072c8
+DIST jss-4.3.tar.bz2 421731 RMD160 21d07b4c931cdbdd57d98ed92a12a287991d1b5d SHA1 6ed57f0d84d9de6a2e6a5fe0150f7d4b52ed8fcd SHA256 e82cdcadd6d7acd0d5f9274134dd5a88f26d7e47e7d9d8b059ce68ca413fb54e
 EBUILD jss-4.2.5.ebuild 2068 RMD160 46414e53c6c54318258e765b28a2e143cfe7a66e SHA1 554f552c9d30ddad5d8d8812eb37ffd0e92d786b SHA256 c360ee1a736d61a0b303978a3fd9c765364ed06bd7b095e6c8398167a14119f2
-EBUILD jss-4.2.ebuild 2123 RMD160 fc06c239eee2f41abe7cc6ef5c9d19e7e7756e4b SHA1 1cf7541dfb864ee6231f90abf5a73db516611315 SHA256 69ace381bf0edc6ac046459d63f9efb1cc6a43507545af655a4fc3f7c7d287c4
-MISC ChangeLog 3088 RMD160 eb37fdc00e80d1f5328292c3fa950df4137f9c87 SHA1 c4901c4147753b839d8c9dc9424eac77aff56fad SHA256 08aaebb35e5730479a3c2c869527585815aed2c3d1db821d97d7abdccf45a74b
+EBUILD jss-4.3.ebuild 2082 RMD160 6f72f2f2615141910fa56d03c389829469057b0b SHA1 5c5bea03f30f8a17a51ef6c5cb2711e61ec1cfdb SHA256 7bc4d579f03605571bd03171897a3b80c9da6de0dcd6a347e0af3c4a94cb657e
+MISC ChangeLog 3294 RMD160 e3547f52f944732fbc3793805fed15a5dd391f04 SHA1 6083cb28a463c029c771779a7e1459404f9d0270 SHA256 19ac1773eaf7efcc4a6994527fd1be457496e9593d2f785ee030fb1ab6f451a9
 MISC metadata.xml 434 RMD160 bf2f7b01b200787d7473ce84834202067366f86d SHA1 86157cdb7f1921ef19906439056d5ef4a0bc1c59 SHA256 c92168f2c1bddf51758e8fbef06d9cf84df325cef503d5d2d040de174d3c7397
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkg9sK4ACgkQkKaRLQcq0GK2BACfUWFa8t3DnDugoi4ixD8F2dPj
-LUgAn1oSi9eD98HFzLxw1D1Cz7znd94m
-=+Q9/
------END PGP SIGNATURE-----
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
 }