Version bump. Fixes bug #189443. Thanks to Mario Fetka <mario-fetka@gmx.at>.

Package-Manager: portage-2.1.5_rc6

4 files changed, 108 insertions, 6 deletions

diff --git a/dev-java/jss/ChangeLog b/dev-java/jss/ChangeLog
index ce394f377e74..0294d423a99d 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.18 2008/03/28 07:43:54 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v 1.19 2008/05/04 22:56:38 betelgeuse Exp $
+
+*jss-4.2.5 (04 May 2008)
+
+  04 May 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +files/jss-4.2.5-use_pkg-config.patch, +jss-4.2.5.ebuild:
+  Version bump. Fixes bug #189443. Thanks to Mario Fetka <mario-fetka@gmx.at>.
 
   28 Mar 2008; Christian Faulhammer <opfer@gentoo.org> jss-4.2.ebuild:
   stable x86, bug 214780
diff --git a/dev-java/jss/Manifest b/dev-java/jss/Manifest
index 591fb91e17ce..c57cc08933e4 100644
--- a/dev-java/jss/Manifest
+++ b/dev-java/jss/Manifest
@@ -3,16 +3,19 @@ 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
+EBUILD jss-4.2.5.ebuild 2074 RMD160 5d84467b18a7b41de6b4e928305b0f7a25afdc4c SHA1 4a21a29a13c4561cc4a1ba2562890afd8c741095 SHA256 7b37a7a997ed5fd616c3a03e3d243db87932a9676a4c91ea36719385f09fada1
 EBUILD jss-4.2.ebuild 2123 RMD160 75d1973a762805f110aa6802815ddaac1db91591 SHA1 83a7d0eeddde8a932e28c57a0af89bb61e180430 SHA256 7055fcbf2fa05a9cdb4de64341acef615e26058602c96f399f1c387c88bf9f6f
-MISC ChangeLog 2676 RMD160 00e457265008d9646d8f86dbad4ad35d8f92b7a2 SHA1 3e505caae21cf5e7eb666e7ff16d488f02e843e3 SHA256 fee61b768e8fbc07da4d7e54a4e80c9bbbffe2dce6bce79bb429ce2c8ea0f5d7
+MISC ChangeLog 2900 RMD160 5a19ed8352a9336d0d39c7bff5c19a2ffe05da89 SHA1 578610d4cf4723d4bd3fdf889e2e73b0ae15b347 SHA256 1321c5c7f6246747483ab006ed88d93c2d878bc1dff81a3882b03c15e6714138
 MISC metadata.xml 434 RMD160 bf2f7b01b200787d7473ce84834202067366f86d SHA1 86157cdb7f1921ef19906439056d5ef4a0bc1c59 SHA256 c92168f2c1bddf51758e8fbef06d9cf84df325cef503d5d2d040de174d3c7397
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH7KHANQqtfCuFneMRAvsTAKCBVdP43jp5nr6bFrKx33wYyGqpmQCeL7Qj
-BGZLVKrOGBjyJcCSbrlTZGI=
-=FIwb
+iEYEARECAAYFAkgePzAACgkQcxLzpIGCsLRjAwCfWccxf6gfejgU2sAyq14EjseM
+UvUAnj5hDJhg/4g1tybieOgbKdYEl6uQ
+=TVBp
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch b/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
new file mode 100644
index 000000000000..a2c3a3e5ad93
--- /dev/null
+++ b/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
@@ -0,0 +1,25 @@
+Submitted By: Mario Fetka (mario-fetka at gmx dot at)
+Date: 2007-10-06
+Initial Package Version: 4.2.5
+Origin: me
+Upstream Status: #392775 UNCONFIRMED 
+Description: this patch adds pkgconfig support to jss coreconf 
+!!!! no check for NSS_PKGCONFIG NSPR_PKGCONFIG at the moment !!!!
+ 
+diff -Naur mozilla.orig/security/coreconf/location.mk mozilla/security/coreconf/location.mk
+--- mozilla.orig/security/coreconf/location.mk	2006-02-27 21:18:31.000000000 +0000
++++ mozilla/security/coreconf/location.mk	2007-10-06 10:10:17.000000000 +0000
+@@ -67,6 +67,13 @@
+ 
+ GARBAGE += $(DEPENDENCIES) core $(wildcard core.[0-9]*)
+ 
++ifdef USE_PKGCONFIG
++    NSPR_INCLUDE_DIR = `pkg-config --variable=includedir $(NSPR_PKGCONFIG)`
++    NSPR_LIB_DIR = `pkg-config --variable=libdir $(NSPR_PKGCONFIG)`
++    NSS_INCLUDE_DIR = `pkg-config --variable=includedir $(NSS_PKGCONFIG)`
++    NSS_LIB_DIR = `pkg-config --variable=libdir $(NSS_PKGCONFIG)`
++endif
++
+ ifdef NSPR_INCLUDE_DIR
+     INCLUDES += -I$(NSPR_INCLUDE_DIR)
+ endif
diff --git a/dev-java/jss/jss-4.2.5.ebuild b/dev-java/jss/jss-4.2.5.ebuild
new file mode 100644
index 000000000000..d450ab253b69
--- /dev/null
+++ b/dev-java/jss/jss-4.2.5.ebuild
@@ -0,0 +1,68 @@
+# 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-4.2.5.ebuild,v 1.1 2008/05/04 22:56:38 betelgeuse Exp $
+
+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
+# 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
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="MPL-1.1"
+SLOT="3.4"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples source"
+
+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
+		dev-util/pkgconfig
+		>=sys-apps/sed-4"
+
+S=${WORKDIR}/mozilla
+
+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)"
+	use amd64 && export USE_64=1
+	cd "${S}/security/coreconf" || die
+	emake -j1 BUILD_OPT=1 || die "coreconf make failed"
+
+	cd "${S}/security/jss" || die
+	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/
+}
+
+src_install() {
+	java-pkg_dojar dist/*.jar
+	# Use this instead of the one in dist because it is a symlink
+	# and doso handles symlinks by just symlinking to the original
+	java-pkg_doso ./security/${PN}/lib/*/*.so
+	use doc && java-pkg_dojavadoc dist/jssdoc
+	use source && java-pkg_dosrc ./security/jss/org
+	use examples && java-pkg_doexamples ./security/jss/samples
+}