From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-java/jss/Manifest | 9 -- dev-java/jss/files/jss-3.4-target_source.patch | 12 -- dev-java/jss/files/jss-4.2.5-use_pkg-config.patch | 25 ---- dev-java/jss/files/jss-4.3-cflags.patch | 11 -- dev-java/jss/files/jss-4.3-javadoc.patch | 11 -- dev-java/jss/files/jss-4.3-secitem.patch | 154 ---------------------- dev-java/jss/files/jss-4.3.2-ldflags.patch | 11 -- dev-java/jss/jss-4.3.2.ebuild | 93 ------------- dev-java/jss/metadata.xml | 16 --- 9 files changed, 342 deletions(-) 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-use_pkg-config.patch delete mode 100644 dev-java/jss/files/jss-4.3-cflags.patch delete mode 100644 dev-java/jss/files/jss-4.3-javadoc.patch delete mode 100644 dev-java/jss/files/jss-4.3-secitem.patch delete mode 100644 dev-java/jss/files/jss-4.3.2-ldflags.patch delete mode 100644 dev-java/jss/jss-4.3.2.ebuild delete mode 100644 dev-java/jss/metadata.xml (limited to 'dev-java/jss') diff --git a/dev-java/jss/Manifest b/dev-java/jss/Manifest deleted file mode 100644 index f6c6c2adb809..000000000000 --- a/dev-java/jss/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX jss-3.4-target_source.patch 633 BLAKE2B a28bc0629e20852554e569f24ae494690d96320265c7b41a29b3debb17aa11d7c4b85b6b495f6f37812d36f8c73ee1a39d55f5110ed4bae9047ca2dfbb69d0a7 SHA512 5e41d3c7ccebdf91394f8c2e341f2d4667ec1b8a77417abff69be950d41824409f065023a927fa9836c3301e8df5ff2183c259338636cb04c31c38a6385fb4ce -AUX jss-4.2.5-use_pkg-config.patch 1004 BLAKE2B 9cacf1b6499d4b87ae4de80dc403815942063ff2859491ee35a875f47cca95dcd79ac44b4e91f9ceca9926b0571bd09b0fe504b38ab69dbdf91f2be796b7c7b0 SHA512 1e32d7d9b66b90ed4e974ad5e3e0bf35c5d36fc749fa8398597b17bab27f076c533d724620b57a2cabfe2020a2b9979aa393ea4736bacff86798814e94367559 -AUX jss-4.3-cflags.patch 511 BLAKE2B f8a9f86047432348d0e82da5d540db0ab58e25d83ed1b7ece3ff8e585bed07deb2e44dd40f656d164c0796278c15c7ec5acb037099978ea20ab50a15bb3adff8 SHA512 80d01093adf1006771a3e0d8a03e826b4f68819297c4d2f1ef28b9403a7c9d50a08929c1e84b3ca471bf0a56fd60de2bff8555bd25596f3d869daa102916d513 -AUX jss-4.3-javadoc.patch 660 BLAKE2B 775e482c8b50d6eaff279de62825bc64a2c4633665a4c06911839fc1fbd45d708c993b0a1330325b3a587cd631d4b08b8cd30507cc7cee3a754eb06a743bcfd3 SHA512 8ecc605934999a1c6d063b71345727561daff776c411147e8c2858c127ca8d430e79f155b19e7527a4be41e50d8b96f19f02788d2f2db673e87bbbaf9ca0f7ea -AUX jss-4.3-secitem.patch 5259 BLAKE2B 7ddf49b8857bed0b6c5412104b076124d8a01c0d52d4ff0828532658e86921de855e3b74d4cd3637afa450cf6a162c0d5ca7d2092b1bf6d5d54263dee9528504 SHA512 16eedbfd311829e2fa73ff88767b2474fcd1f5750cf3351d3bc23efdcbcb2729f861a7f69d6589418e6308576846b93a8d7dc615095c0cadc0accb9f63f6850b -AUX jss-4.3.2-ldflags.patch 465 BLAKE2B 77ecfcfaf39cfde7d15b7b23a78c9fec92db72eb4bfb336b7afd1b92ec2d5c03802205bc71afae0e7d6a83eb6d8a86339b46d3d6062aecb90c645852cc440c06 SHA512 19910a0aeb0b994d0f5c871d011a7b97a0d323f43dcc86d88442aed17561c1bab379e0eeae93961afaf595a2651d29c17a36daa28a2bbfe522fcd04955d82214 -DIST jss-4.3.2.tar.bz2 435542 BLAKE2B 9623018e6e67654219fa439fdc907777cd286aa28b6bdbafee39a7082f949bc393d60dba32ca0b49178ecd423dcff0aa3ad411abb9db9332c6429d7751d89127 SHA512 3296da72f204fc4a0ea58dd889cf2721a4afa0ec7b5406312e64354cc67edcfc370140ad22a24f0dfcf11e438e69ebe9da45a70b5cbaa4026b40fd5fcf96c232 -EBUILD jss-4.3.2.ebuild 2759 BLAKE2B 8352d5e0e941de72fbecc4f9b47bdc6346500c65c13d861daf87f1e7412a2aefcf9c45e1bb8ef87321d687594e51ae8a758959cef1e7349d38069b1a501a6f72 SHA512 bf3369ab5385c7a36bbe51a0e4b4efa4358febe655e8d72b0ccc46eb0e8ad46d9054d78d9c1e19cb16f5348e352608c5ca247b4e07b96dc40352e586fbc1b830 -MISC metadata.xml 508 BLAKE2B 1c0a970c2297ce45006e6779871e7f9ea7035f3cc395b7b1dd7b5eb08594c3804f1b3024b8ac68fbdd8d9fdb841846c4f38006d361b66ceaabcadca566d9b0de SHA512 025f9d7f269f4c0dc744e6b705311b1efcb730bbe32e08a70233f2bb8a62a69e3d65de6cd2c3d3c8afdb383cee4bf76af180fff12b187dce7504d1e55fa56d4f 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 e024a0b8b622..000000000000 --- 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-use_pkg-config.patch b/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch deleted file mode 100644 index a2c3a3e5ad93..000000000000 --- 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/files/jss-4.3-cflags.patch b/dev-java/jss/files/jss-4.3-cflags.patch deleted file mode 100644 index 3298a2765fc1..000000000000 --- a/dev-java/jss/files/jss-4.3-cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- security/coreconf/command.mk 2007-10-23 23:55:00.000000000 +0200 -+++ security/coreconf/command.mk.b 2013-06-05 11:15:31.092383902 +0200 -@@ -45,7 +45,7 @@ - CCF = $(CC) $(CFLAGS) - LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) - LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS) --CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ -+CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ - $(XCFLAGS) - PERL = perl - RANLIB = echo diff --git a/dev-java/jss/files/jss-4.3-javadoc.patch b/dev-java/jss/files/jss-4.3-javadoc.patch deleted file mode 100644 index 891e1ff93838..000000000000 --- a/dev-java/jss/files/jss-4.3-javadoc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- security/jss/build_java.pl.orig 2015-10-01 23:04:22.540035573 +0100 -+++ security/jss/build_java.pl 2015-10-01 23:11:41.413230402 +0100 -@@ -323,7 +323,7 @@ - ensure_dir_exists("$dist_dir/jssdoc"); - my $targets = join(" ", @packages); - print "$targets\n"; -- print_do("$javadoc -breakiterator -sourcepath . -d $dist_dir/jssdoc $html_header_opt $targets"); -+ print_do("$javadoc -Xdoclint:none -breakiterator -sourcepath . -d $dist_dir/jssdoc $html_header_opt $targets"); - print_do("cp $dist_dir/jssdoc/index.html $dist_dir/jssdoc/index.html.bak"); - print_do("cp $dist_dir/jssdoc/overview-summary.html $dist_dir/jssdoc/index.html"); - } diff --git a/dev-java/jss/files/jss-4.3-secitem.patch b/dev-java/jss/files/jss-4.3-secitem.patch deleted file mode 100644 index d9e7da394075..000000000000 --- a/dev-java/jss/files/jss-4.3-secitem.patch +++ /dev/null @@ -1,154 +0,0 @@ ---- a/security/jss/org/mozilla/jss/CryptoManager.c 2008-05-22 06:28:09.000000000 +0200 -+++ b/security/jss/org/mozilla/jss/CryptoManager.c 2013-06-05 11:09:58.649080012 +0200 -@@ -35,7 +35,7 @@ - * ***** END LICENSE BLOCK ***** */ - #include "_jni/org_mozilla_jss_CryptoManager.h" - --#include -+#include - #include - #include - #include ---- a/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c 2003-12-19 20:36:30.000000000 +0100 -+++ b/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c 2013-06-05 11:09:58.585746684 +0200 -@@ -36,7 +36,7 @@ - - #include "_jni/org_mozilla_jss_SecretDecoderRing_KeyManager.h" - #include --#include -+#include - #include - #include - #include ---- a/security/jss/org/mozilla/jss/crypto/PQGParams.c 2004-04-25 17:02:21.000000000 +0200 -+++ b/security/jss/org/mozilla/jss/crypto/PQGParams.c 2013-06-05 11:09:58.589080017 +0200 -@@ -39,7 +39,7 @@ - #include - - #include --#include -+#include - #include - #include /* for PQGParams */ - #include ---- a/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c 2002-01-08 20:38:46.000000000 +0100 -+++ b/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c 2013-06-05 11:09:58.585746684 +0200 -@@ -36,7 +36,7 @@ - - #include "_jni/org_mozilla_jss_crypto_SecretDecoderRing.h" - #include --#include -+#include - #include - #include - #include ---- a/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c 2004-04-25 17:02:22.000000000 +0200 -+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c 2013-06-05 11:09:58.632413347 +0200 -@@ -40,7 +40,7 @@ - #include - #include - #include --#include -+#include - - /* JSS includes */ - #include ---- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c 2006-02-23 02:21:42.000000000 +0100 -+++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c 2013-06-05 11:09:58.595746684 +0200 -@@ -40,7 +40,7 @@ - #include - #include - #include --#include -+#include - - #include - #include ---- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c 2006-02-23 02:21:42.000000000 +0100 -+++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c 2013-06-05 11:09:58.629080014 +0200 -@@ -40,7 +40,7 @@ - #include - #include - #include --#include -+#include - #include - - /* JSS includes */ ---- a/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c 2004-04-25 17:02:22.000000000 +0200 -+++ b/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c 2013-06-05 11:09:58.609080016 +0200 -@@ -40,7 +40,7 @@ - #include - #include - #include --#include -+#include - - /* JSS includes */ - #include ---- a/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c 2006-04-25 03:26:42.000000000 +0200 -+++ b/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c 2013-06-05 11:09:58.609080016 +0200 -@@ -43,7 +43,7 @@ - #include - #include - #include --#include -+#include - - #include - #include ---- a/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c 2004-04-25 17:02:22.000000000 +0200 -+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c 2013-06-05 11:09:58.605746683 +0200 -@@ -35,7 +35,7 @@ - * ***** END LICENSE BLOCK ***** */ - - #include --#include -+#include - #include - #include - #include ---- a/security/jss/org/mozilla/jss/pkcs11/PK11Token.c 2007-11-10 01:37:57.000000000 +0100 -+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Token.c 2013-06-05 11:09:58.622413348 +0200 -@@ -53,7 +53,7 @@ - #include - #include - --#include -+#include - #include "java_ids.h" - - #include "pk11util.h" ---- a/security/jss/org/mozilla/jss/ssl/callbacks.c 2004-09-03 20:32:03.000000000 +0200 -+++ b/security/jss/org/mozilla/jss/ssl/callbacks.c 2013-06-05 11:09:58.565746686 +0200 -@@ -39,7 +39,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- a/security/jss/org/mozilla/jss/util/jssutil.c 2004-04-25 17:02:29.000000000 +0200 -+++ b/security/jss/org/mozilla/jss/util/jssutil.c 2013-06-05 11:09:58.579080018 +0200 -@@ -38,7 +38,7 @@ - #include - #include - #include --#include -+#include - #include "jssutil.h" - #include "jss_bigint.h" - #include "jss_exceptions.h" ---- a/security/jss/org/mozilla/jss/util/jssutil.h 2004-04-25 17:02:29.000000000 +0200 -+++ b/security/jss/org/mozilla/jss/util/jssutil.h 2013-06-05 11:09:49.829080794 +0200 -@@ -39,7 +39,7 @@ - /* Need to include these first. - * #include - * #include -- * #include -+ * #include - */ - - PR_BEGIN_EXTERN_C diff --git a/dev-java/jss/files/jss-4.3.2-ldflags.patch b/dev-java/jss/files/jss-4.3.2-ldflags.patch deleted file mode 100644 index fde2e26bf77c..000000000000 --- a/dev-java/jss/files/jss-4.3.2-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- security/coreconf/Linux.mk.orig 2010-01-15 22:19:00.000000000 +0000 -+++ security/coreconf/Linux.mk 2015-09-27 22:17:50.102547607 +0100 -@@ -142,7 +142,7 @@ - ARCH = linux - - DSO_CFLAGS = -fPIC --DSO_LDOPTS = -shared $(ARCHFLAG) -+DSO_LDOPTS = $(LDFLAGS) -shared $(ARCHFLAG) - # The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8) - # incorrectly reports undefined references in the libraries we link with, so - # we don't use -z defs there. diff --git a/dev-java/jss/jss-4.3.2.ebuild b/dev-java/jss/jss-4.3.2.ebuild deleted file mode 100644 index 077c3bf848fb..000000000000 --- a/dev-java/jss/jss-4.3.2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="doc source" - -inherit multilib toolchain-funcs java-pkg-2 - -DESCRIPTION="Network Security Services for Java (JSS)" -HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/JSS" -# 4.3.2 was released but was seemingly never announced. The binary jar -# exists on Mozilla's servers but Chewi could only find a source tarball -# at https://obs.kolabsys.com/package/show/Kolab:3.4/jss. However, you -# need to register in order to download it, hence he has mirrored it. -SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.bz2" -LICENSE="MPL-1.1" -SLOT="3.4" -KEYWORDS="amd64 x86" -IUSE="examples test" - -CDEPEND=">=dev-libs/nspr-4.7.1 - >=dev-libs/nss-3.12.5" - -DEPEND="${CDEPEND} - dev-lang/perl - >=virtual/jdk-1.6 - virtual/pkgconfig - test? ( dev-libs/nss[utils] )" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.6" - -S="${WORKDIR}/${P}/mozilla" - -java_prepare() { - epatch "${FILESDIR}"/${PN}-3.4-target_source.patch - epatch "${FILESDIR}"/${PN}-4.2.5-use_pkg-config.patch - epatch "${FILESDIR}"/${PN}-4.3-cflags.patch - epatch "${FILESDIR}"/${PN}-4.3.2-ldflags.patch - epatch "${FILESDIR}"/${PN}-4.3-secitem.patch - - if java-pkg_is-vm-version-ge 1.8; then - epatch "${FILESDIR}"/${PN}-4.3-javadoc.patch - fi -} - -src_compile() { - local ARGS=( - "CC=$(tc-getCC)" - "AR=$(tc-getAR) cr \$@" - "OS_RELEASE=2.6" - "BUILD_OPT=1" - ) - - export JAVA_GENTOO_OPTS="$(java-pkg_javac-args)" - use amd64 && export USE_64=1 - - cd "${S}/security/coreconf" || die - emake -j1 "${ARGS[@]}" - - cd "${S}/security/jss" || die - emake -j1 "${ARGS[@]}" USE_PKGCONFIG=1 NSS_PKGCONFIG=nss NSPR_PKGCONFIG=nspr - use doc && emake -j1 "${ARGS[@]}" javadoc -} - -# Chewi has managed to reach a test pass rate of 31/40 (78%) but the -# remainder fail due to JSS not having kept pace with the ciphersuites -# in NSS. There's not much we can do about that. The suite also leaves -# java processes running and exits successfully on failure. -RESTRICT="test" - -src_test() { - # Parts of NSS are required for the tests. - ln -snf "${EROOT}usr/$(get_libdir)/libnssckbi.so" dist/Linux*.OBJ/lib/ || die - ln -snf "${EROOT}usr/bin" dist/Linux*.OBJ/ || die - - # The tests must be run from this directory. - cd security/jss/org/mozilla/jss/tests || die - BUILD_OPT=1 perl all.pl dist "${S}"/dist/Linux*.OBJ/ || die "tests failed" -} - -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 -} diff --git a/dev-java/jss/metadata.xml b/dev-java/jss/metadata.xml deleted file mode 100644 index a3b5c860a274..000000000000 --- a/dev-java/jss/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - java@gentoo.org - Java - - - - -Network Security Services for Java (JSS) is a Java interface to NSS. It supports -most of the security standards and encryption technologies supported by NSS. JSS -also provides a pure Java interface for ASN.1 types and BER/DER encoding. - - - -- cgit v1.2.3