From 5217aab927866d7afa29ca58892b2b07cf97882a Mon Sep 17 00:00:00 2001 From: geos_one Date: Wed, 20 Aug 2008 11:57:53 +0000 Subject: [PATCH] Delete jss as already in tree git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@458 6952d904-891a-0410-993b-d76249ca496b --- dev-java/jss/ChangeLog | 15 ---- dev-java/jss/Manifest | 28 -------- .../jss/files/jss-3.4-target_source.patch | 12 ---- dev-java/jss/files/jss-4.2.5-pkg-config.patch | 23 ------- .../jss/files/jss-4.2.5-use_pkg-config.patch | 25 ------- dev-java/jss/jss-4.2.5-r1.ebuild | 69 ------------------- dev-java/jss/metadata.xml | 5 -- 7 files changed, 177 deletions(-) delete mode 100644 dev-java/jss/ChangeLog delete mode 100644 dev-java/jss/Manifest delete mode 100644 dev-java/jss/files/jss-3.4-target_source.patch delete mode 100644 dev-java/jss/files/jss-4.2.5-pkg-config.patch delete mode 100644 dev-java/jss/files/jss-4.2.5-use_pkg-config.patch delete mode 100644 dev-java/jss/jss-4.2.5-r1.ebuild delete mode 100644 dev-java/jss/metadata.xml diff --git a/dev-java/jss/ChangeLog b/dev-java/jss/ChangeLog deleted file mode 100644 index 9f8ff0be..00000000 --- a/dev-java/jss/ChangeLog +++ /dev/null @@ -1,15 +0,0 @@ -# ChangeLog for dev-java/jss -# 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: - initial jss 4.2.5 with correct slot "4" - diff --git a/dev-java/jss/Manifest b/dev-java/jss/Manifest deleted file mode 100644 index b399bb13..00000000 --- a/dev-java/jss/Manifest +++ /dev/null @@ -1,28 +0,0 @@ -AUX jss-3.4-target_source.patch 633 RMD160 cc76aea593fb7493b59f0ed61f70bb1a636ccbc5 SHA1 7ef2d2876808bff77ed865aaf2746933ae40afea SHA256 7785f02cb67d47198e5d6052ecaf88ec1f237585e3244ee6bac147d5a5336732 -MD5 a7b470e604b083c7af151e663b3a079f files/jss-3.4-target_source.patch 633 -RMD160 cc76aea593fb7493b59f0ed61f70bb1a636ccbc5 files/jss-3.4-target_source.patch 633 -SHA256 7785f02cb67d47198e5d6052ecaf88ec1f237585e3244ee6bac147d5a5336732 files/jss-3.4-target_source.patch 633 -AUX jss-4.2.5-pkg-config.patch 599 RMD160 cfda9fe5946279a8901b2620b7f9bf4b6cefc54a SHA1 021498a6752d0cb1cfc439323335911de869f411 SHA256 4af1e4ca03d347dc427847956e0f1e33ee0240257068d845df571b74bfa03c98 -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-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/jss-3.4-target_source.patch b/dev-java/jss/files/jss-3.4-target_source.patch deleted file mode 100644 index e024a0b8..00000000 --- a/dev-java/jss/files/jss-3.4-target_source.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru jss-3.4-src/mozilla/security/jss/build_java.pl jss-3.4-src.patched/mozilla/security/jss/build_java.pl ---- jss-3.4-src/mozilla/security/jss/build_java.pl 2002-10-17 02:33:29.000000000 +0200 -+++ jss-3.4-src.patched/mozilla/security/jss/build_java.pl 2006-08-15 00:53:05.000000000 +0200 -@@ -190,7 +190,7 @@ - # - if( scalar(@source_list) > 0 ) { - ensure_dir_exists($class_dir); -- print_do("$javac $javac_opt_flag -sourcepath . -d $class_dir " . -+ print_do("$javac $ENV{JAVA_GENTOO_OPTS} $javac_opt_flag -sourcepath . -d $class_dir " . - "$classpath " . join(" ",@source_list)); - } - diff --git a/dev-java/jss/files/jss-4.2.5-pkg-config.patch b/dev-java/jss/files/jss-4.2.5-pkg-config.patch deleted file mode 100644 index 154b9699..00000000 --- a/dev-java/jss/files/jss-4.2.5-pkg-config.patch +++ /dev/null @@ -1,23 +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,14 +72,7 @@ - else - - EXTRA_SHARED_LIBS += \ -- -L$(NSS_LIB_DIR) \ -- -lnss3 \ -- -lsmime3 \ -- -lssl3 \ -- -L$(NSPR_LIB_DIR) \ -- -lplc4 \ -- -lplds4 \ -- -lnspr4 \ -+ `pkg-config --libs nss` \ - $(JAVA_LIBS) \ - $(NULL) - 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 deleted file mode 100644 index a2c3a3e5..00000000 --- a/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch +++ /dev/null @@ -1,25 +0,0 @@ -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-r1.ebuild b/dev-java/jss/jss-4.2.5-r1.ebuild deleted file mode 100644 index 2bdeffde..00000000 --- a/dev-java/jss/jss-4.2.5-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2007 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.2 2007/02/16 21:23:43 betelgeuse Exp $ - -inherit eutils 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_5_RTM mozilla/security/coreconf -# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \ -# -r JSS_4_2_5_RTM mozilla/security/jss -# tar cvjf jss-4.2.5.tar.bz2 mozilla -SRC_URI="ftp://mars.arge.at/pub/${P}.tar.bz2 - http://ftp.mars.arge.at/pub/${P}.tar.bz2" - -LICENSE="MPL-1.1" -SLOT="3.4" -KEYWORDS="~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 - -src_unpack() { - unpack ${A} - epatch "${FILESDIR}/${PN}-3.4-target_source.patch" - epatch "${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)" - 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 -} - -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 - if use examples; then - docinto examples - dodoc ./security/jss/samples/* - fi -} diff --git a/dev-java/jss/metadata.xml b/dev-java/jss/metadata.xml deleted file mode 100644 index 7e328698..00000000 --- a/dev-java/jss/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -maintainer-wanted -