diff --git a/dev-java/jss/ChangeLog b/dev-java/jss/ChangeLog index d9668b12..9f8ff0be 100644 --- a/dev-java/jss/ChangeLog +++ b/dev-java/jss/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 06 Oct 2007; Mario Fetka + +files/jss-4.2.5-use_pkg-config.patch, ++, +metadata.xml, + -jss-4.2.5.ebuild: + add different way to solve the pkg-config problem & correct the slot back to + 3.4 + 18 Aug 2007; Mario Fetka +files/jss-3.4-target_source.patch, +jss-4.2.5.ebuild, +files/jss-4.2.5-pkg-config.patch: diff --git a/dev-java/jss/Manifest b/dev-java/jss/Manifest index ec8ce3fa..b399bb13 100644 --- a/dev-java/jss/Manifest +++ b/dev-java/jss/Manifest @@ -6,15 +6,23 @@ AUX jss-4.2.5-pkg-config.patch 599 RMD160 cfda9fe5946279a8901b2620b7f9bf4b6cefc5 MD5 7fa6c5edfb9e42ce5d81a361c0939afc files/jss-4.2.5-pkg-config.patch 599 RMD160 cfda9fe5946279a8901b2620b7f9bf4b6cefc54a files/jss-4.2.5-pkg-config.patch 599 SHA256 4af1e4ca03d347dc427847956e0f1e33ee0240257068d845df571b74bfa03c98 files/jss-4.2.5-pkg-config.patch 599 +AUX jss-4.2.5-use_pkg-config.patch 1004 RMD160 81564af0313746dd1a80bb85df88bbcf3f6d2531 SHA1 4b0e53fa28c8aa01842a939dd738615d4b253f1c SHA256 04fdb13b7435e11149485d62218aeeefc7d20544f057b3097bef46498b8aeff0 +MD5 ba3f1759b6f731d9f03cdca09482e56c files/jss-4.2.5-use_pkg-config.patch 1004 +RMD160 81564af0313746dd1a80bb85df88bbcf3f6d2531 files/jss-4.2.5-use_pkg-config.patch 1004 +SHA256 04fdb13b7435e11149485d62218aeeefc7d20544f057b3097bef46498b8aeff0 files/jss-4.2.5-use_pkg-config.patch 1004 DIST jss-4.2.5.tar.bz2 390376 RMD160 ea2355225da16f4e18d06255fae4058c1b31184a SHA1 b9da668ebe8a1d7135e64dd95ab32351ffcb9c94 SHA256 97fe53b97653a85eadf3b22e5cf9205de7acc0abd694e90216b4475701072f93 -EBUILD jss-4.2.5.ebuild 2147 RMD160 c5fe54fff249d80cd6460afdd2ba4613b61711f5 SHA1 33c6ae811506af496b4258b5b5bba63b7d70ae7c SHA256 478c8193a60e82b65b74c611239894a7e8377d5bb92a8adf636ceadda39737a5 -MD5 b98cb93bcbe9bf98c755869eb2635da1 jss-4.2.5.ebuild 2147 -RMD160 c5fe54fff249d80cd6460afdd2ba4613b61711f5 jss-4.2.5.ebuild 2147 -SHA256 478c8193a60e82b65b74c611239894a7e8377d5bb92a8adf636ceadda39737a5 jss-4.2.5.ebuild 2147 -MISC ChangeLog 298 RMD160 f91998c30faf0e08c0790f123d0ac4564cb2e8ce SHA1 459b43a76266aca39307c3590398fdffe5bd8345 SHA256 b0ca258dfaec776524036b8c1f98d3d347d64d5354ce69efe5cfb73e316ca1bf -MD5 fb2393aff6d10d467121bc8c9aeebed5 ChangeLog 298 -RMD160 f91998c30faf0e08c0790f123d0ac4564cb2e8ce ChangeLog 298 -SHA256 b0ca258dfaec776524036b8c1f98d3d347d64d5354ce69efe5cfb73e316ca1bf ChangeLog 298 -MD5 b9adfc048f79115475649f686a62a82e files/digest-jss-4.2.5 232 -RMD160 6454326a9a91abc027349c55be8e657e7a7f9ee9 files/digest-jss-4.2.5 232 -SHA256 ef8b08a0c99081647f799ec4f6687814fd0b376d044299ed95f305e94d40c2b0 files/digest-jss-4.2.5 232 +EBUILD jss-4.2.5-r1.ebuild 2097 RMD160 c54712c9fe13b134f75a70b6debdce462006aad3 SHA1 bfe0c55ae40aa9ab92ca8678c7e367e907bb4c6e SHA256 5e80f487566f8e059f52e57e7f550f643ad584c8b774cf4a8dff82bc1d8c3eab +MD5 76ef21a14652b7a6464661f2ced8b8cd jss-4.2.5-r1.ebuild 2097 +RMD160 c54712c9fe13b134f75a70b6debdce462006aad3 jss-4.2.5-r1.ebuild 2097 +SHA256 5e80f487566f8e059f52e57e7f550f643ad584c8b774cf4a8dff82bc1d8c3eab jss-4.2.5-r1.ebuild 2097 +MISC ChangeLog 513 RMD160 79b723c79ec5db31e3e00145a739cf7e035111d2 SHA1 d77ed67c594983bd8d53aec9c000a410430a0820 SHA256 ce246b2f133086e2066e1b0dfecdd41bfe93bd8048b66827b90d191d918825bd +MD5 fda2430b6e68b678a4f2dabe57612163 ChangeLog 513 +RMD160 79b723c79ec5db31e3e00145a739cf7e035111d2 ChangeLog 513 +SHA256 ce246b2f133086e2066e1b0dfecdd41bfe93bd8048b66827b90d191d918825bd ChangeLog 513 +MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 +MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 +RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 +SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170 +MD5 b9adfc048f79115475649f686a62a82e files/digest-jss-4.2.5-r1 232 +RMD160 6454326a9a91abc027349c55be8e657e7a7f9ee9 files/digest-jss-4.2.5-r1 232 +SHA256 ef8b08a0c99081647f799ec4f6687814fd0b376d044299ed95f305e94d40c2b0 files/digest-jss-4.2.5-r1 232 diff --git a/dev-java/jss/files/digest-jss-4.2.5 b/dev-java/jss/files/digest-jss-4.2.5-r1 similarity index 100% rename from dev-java/jss/files/digest-jss-4.2.5 rename to dev-java/jss/files/digest-jss-4.2.5-r1 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 00000000..a2c3a3e5 --- /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-r1.ebuild similarity index 89% rename from dev-java/jss/jss-4.2.5.ebuild rename to dev-java/jss/jss-4.2.5-r1.ebuild index c5bdb1dc..2bdeffde 100644 --- a/dev-java/jss/jss-4.2.5.ebuild +++ b/dev-java/jss/jss-4.2.5-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="ftp://mars.arge.at/pub/${P}.tar.bz2 http://ftp.mars.arge.at/pub/${P}.tar.bz2" LICENSE="MPL-1.1" -SLOT="4" +SLOT="3.4" KEYWORDS="~x86" IUSE="doc examples source" @@ -35,10 +35,7 @@ S=${WORKDIR}/mozilla src_unpack() { unpack ${A} epatch "${FILESDIR}/${PN}-3.4-target_source.patch" - epatch "${FILESDIR}/${PN}-4.2.5-pkg-config.patch" - - echo "INCLUDES += -I/usr/include/nss -I/usr/include/nspr" \ - >> "${S}"/security/coreconf/headers.mk || die + epatch "${FILESDIR}/${PN}-4.2.5-use_pkg-config.patch" } src_compile() { @@ -47,7 +44,7 @@ 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 diff --git a/dev-java/jss/metadata.xml b/dev-java/jss/metadata.xml new file mode 100644 index 00000000..7e328698 --- /dev/null +++ b/dev-java/jss/metadata.xml @@ -0,0 +1,5 @@ + + + +maintainer-wanted +