diff options
| -rw-r--r-- | dev-java/jss/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/jss/files/jss-4.2.5-use_pkg-config.patch | 25 | ||||
| -rw-r--r-- | dev-java/jss/jss-4.2.5.ebuild | 68 |
3 files changed, 100 insertions, 1 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/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 +} |