gentoo resync : 20.06.2021

8 files changed, 52 insertions, 52 deletions

diff --git a/dev-java/jss/Manifest b/dev-java/jss/Manifest
index f6c6c2adb809..01ac01393907 100644
--- a/dev-java/jss/Manifest
+++ b/dev-java/jss/Manifest
@@ -1,9 +1,9 @@
-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
+AUX jss-3.4-target_source.patch 421 BLAKE2B 469c4ba398466b32d77dd3987b2215808e4b1a6675002c2e258b555ea3be34fb64b82cd2c07c50cd076c169e0616af2f09b1202578d23d8d8e39bbb9e66f2d02 SHA512 ced7c6246dd82f7e0c49f2ba403694941e62b5f786bfc3a126f496d44b2c7fd73c4ddbf0f654507ca985d60afaac315be93656e825ec1dfdaf481c4272b09475
+AUX jss-4.2.5-use_pkg-config.patch 851 BLAKE2B c833490023ff63ad6789c03faeb3238e20fc1bdb7804b73edf53696eee859a8837d168b3da72606000b8b41e222439bf5cf863206aac31de60167689dd09a359 SHA512 5087408b0b50f08e919668d193531530c37e9b0a4a27138c76377ab2efa9a00f5489c3b0029a7e75dfe0fee51aa0f647ab9a72c654395fab3445b8edc56f68de
+AUX jss-4.3-cflags.patch 441 BLAKE2B f09b352c6f69005882138126ea36c4ce6282e96630dddee2871a97c93904270690900a2d97f738c57b6b50b44eb13646bdccef1d7c41004bdfd52129f2dbb707 SHA512 83354a23dbe3e0e5874bed2cd9d240231ba37f5f2c886c0ed042e4e34380149c6d400c4206cda223f9d4a24d3220cf77d2408ad452501038351d1ecd8469de2f
+AUX jss-4.3-javadoc.patch 587 BLAKE2B ceebde6b399745acc4e922c078badc26bb3b456ec81d783f7a2a44b71825d62e1f322db9eb7db710bea15f7673fecadc0c066ed4b7cc0da325f5b26c4f5ffb90 SHA512 230b144bab6a3235f70baee7c4f8414f3a23b3ba11eb4ede22c2dd6a02dc718c198bb63df540b6e61a640526731fb788ce05a45cb976e195496c55351cfcdcc7
+AUX jss-4.3-secitem.patch 4251 BLAKE2B caa2f2445c90501aa8a656a7f4cd817cd29af782fa71ba8b9d7b3b59acb5c703b2fd7558eec05bb51974c8aef03c7df9c8a79664e1df86e069bdac71cbd96f15 SHA512 0c17388db50c82d80e77082d73cceadbdd1192936a33591c70e0fc2ce397cababd48eede0f5ab62a8b3c2e34738bbbe93a9e6e7d846d6380e530b5333e42f6d1
+AUX jss-4.3.2-ldflags.patch 392 BLAKE2B c4b93c84bf3ed54c4ae8f885d8995a5226b72fc3358a6a92b6d44becbd21420ea0492ce6c7c453d57eb207e961eaba67b6f3623fb40d2be924c249b0e16fdf72 SHA512 b62a949200b0cb301d2e82f425fe6b593a12c2f1e8f8de970ae43c2892ab1a818d99a1600eee24cbc6da8449153f30dbae91f28edd7be4756bbc66bd1ab35072
 DIST jss-4.3.2.tar.bz2 435542 BLAKE2B 9623018e6e67654219fa439fdc907777cd286aa28b6bdbafee39a7082f949bc393d60dba32ca0b49178ecd423dcff0aa3ad411abb9db9332c6429d7751d89127 SHA512 3296da72f204fc4a0ea58dd889cf2721a4afa0ec7b5406312e64354cc67edcfc370140ad22a24f0dfcf11e438e69ebe9da45a70b5cbaa4026b40fd5fcf96c232
-EBUILD jss-4.3.2.ebuild 2759 BLAKE2B 8352d5e0e941de72fbecc4f9b47bdc6346500c65c13d861daf87f1e7412a2aefcf9c45e1bb8ef87321d687594e51ae8a758959cef1e7349d38069b1a501a6f72 SHA512 bf3369ab5385c7a36bbe51a0e4b4efa4358febe655e8d72b0ccc46eb0e8ad46d9054d78d9c1e19cb16f5348e352608c5ca247b4e07b96dc40352e586fbc1b830
+EBUILD jss-4.3.2.ebuild 2779 BLAKE2B 78d9c4c19b977a3346beb0a8d42f70c4437ae1646c9f0a0557b40ebf0175dcabe5796f0edf14b533d6e94af25dbc4228cf447f4e9521351a97e56f1b8784a673 SHA512 c00aa7a32d424ab09b0886aee25ab94d0a03752fd93d75e674f58a7f48ffdaa21ce47d7a6bc0b29ad349ed2235f29f1a544e4e3c2b6dc905c3f0db40839012a2
 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
index e024a0b8b622..5d5ce6409654 100644
--- a/dev-java/jss/files/jss-3.4-target_source.patch
+++ b/dev-java/jss/files/jss-3.4-target_source.patch
@@ -1,6 +1,5 @@
-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
+--- a/mozilla/security/jss/build_java.pl
++++ b/mozilla/security/jss/build_java.pl
 @@ -190,7 +190,7 @@
      #
      if( scalar(@source_list) > 0 ) {
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
index a2c3a3e5ad93..adf2862c90e6 100644
--- 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
@@ -6,18 +6,17 @@ 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
+--- a/mozilla/security/coreconf/location.mk
++++ b/mozilla/security/coreconf/location.mk
 @@ -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)`
++    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
diff --git a/dev-java/jss/files/jss-4.3-cflags.patch b/dev-java/jss/files/jss-4.3-cflags.patch
index 3298a2765fc1..8b9705ca1e3d 100644
--- a/dev-java/jss/files/jss-4.3-cflags.patch
+++ b/dev-java/jss/files/jss-4.3-cflags.patch
@@ -1,5 +1,5 @@
---- 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
+--- a/security/coreconf/command.mk
++++ b/security/coreconf/command.mk
 @@ -45,7 +45,7 @@
  CCF           = $(CC) $(CFLAGS)
  LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
diff --git a/dev-java/jss/files/jss-4.3-javadoc.patch b/dev-java/jss/files/jss-4.3-javadoc.patch
index 891e1ff93838..87941029bcee 100644
--- a/dev-java/jss/files/jss-4.3-javadoc.patch
+++ b/dev-java/jss/files/jss-4.3-javadoc.patch
@@ -1,5 +1,5 @@
---- 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
+--- a/security/jss/build_java.pl
++++ b/security/jss/build_java.pl
 @@ -323,7 +323,7 @@
      ensure_dir_exists("$dist_dir/jssdoc");
      my $targets = join(" ", @packages);
diff --git a/dev-java/jss/files/jss-4.3-secitem.patch b/dev-java/jss/files/jss-4.3-secitem.patch
index d9e7da394075..a215bc628ea7 100644
--- a/dev-java/jss/files/jss-4.3-secitem.patch
+++ b/dev-java/jss/files/jss-4.3-secitem.patch
@@ -1,5 +1,5 @@
---- 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
+--- a/security/jss/org/mozilla/jss/CryptoManager.c
++++ b/security/jss/org/mozilla/jss/CryptoManager.c
 @@ -35,7 +35,7 @@
   * ***** END LICENSE BLOCK ***** */
  #include "_jni/org_mozilla_jss_CryptoManager.h"
@@ -9,8 +9,8 @@
  #include <secmod.h>
  #include <cert.h>
  #include <certt.h>
---- 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
+--- a/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c
++++ b/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c
 @@ -36,7 +36,7 @@
  
  #include "_jni/org_mozilla_jss_SecretDecoderRing_KeyManager.h"
@@ -20,8 +20,8 @@
  #include <jss_exceptions.h>
  #include <jssutil.h>
  #include <pk11func.h>
---- 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
+--- a/security/jss/org/mozilla/jss/crypto/PQGParams.c
++++ b/security/jss/org/mozilla/jss/crypto/PQGParams.c
 @@ -39,7 +39,7 @@
  #include <nspr.h>
  
@@ -31,8 +31,8 @@
  #include <secoidt.h>
  #include <keyt.h>   /* for PQGParams */
  #include <pk11pqg.h>
---- 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
+--- a/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c
++++ b/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c
 @@ -36,7 +36,7 @@
  
  #include "_jni/org_mozilla_jss_crypto_SecretDecoderRing.h"
@@ -42,8 +42,8 @@
  #include <pk11sdr.h>
  #include <jss_exceptions.h>
  #include <jssutil.h>
---- 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
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c
 @@ -40,7 +40,7 @@
  #include <plarena.h>
  #include <seccomon.h>
@@ -53,8 +53,8 @@
  
  /* JSS includes */
  #include <java_ids.h>
---- 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
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c
 @@ -40,7 +40,7 @@
  #include <pk11pqg.h>
  #include <nspr.h>
@@ -64,8 +64,8 @@
  
  #include <jssutil.h>
  #include <pk11util.h>
---- 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
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c
 @@ -40,7 +40,7 @@
  #include <plarena.h>
  #include <seccomon.h>
@@ -75,8 +75,8 @@
  #include <keyt.h>
  
  /* 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
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c
 @@ -40,7 +40,7 @@
  #include <plarena.h>
  #include <seccomon.h>
@@ -86,8 +86,8 @@
  
  /* JSS includes */
  #include <java_ids.h>
---- 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
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c
 @@ -43,7 +43,7 @@
  #include <secerr.h>
  #include <nspr.h>
@@ -97,8 +97,8 @@
  
  #include <jss_bigint.h>
  #include <jssutil.h>
---- 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
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c
 @@ -35,7 +35,7 @@
   * ***** END LICENSE BLOCK ***** */
  
@@ -108,8 +108,8 @@
  #include <secoidt.h>
  #include <secmodt.h>
  #include <pk11func.h>
---- 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
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11Token.c
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11Token.c
 @@ -53,7 +53,7 @@
  #include <jss_bigint.h>
  #include <Algorithm.h>
@@ -119,8 +119,8 @@
  #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
+--- a/security/jss/org/mozilla/jss/ssl/callbacks.c
++++ b/security/jss/org/mozilla/jss/ssl/callbacks.c
 @@ -39,7 +39,7 @@
  #include <nspr.h>
  #include <java_ids.h>
@@ -130,8 +130,8 @@
  #include <jssutil.h>
  #include <certt.h>
  #include <keythi.h>
---- 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
+--- a/security/jss/org/mozilla/jss/util/jssutil.c
++++ b/security/jss/org/mozilla/jss/util/jssutil.c
 @@ -38,7 +38,7 @@
  #include <nspr.h>
  #include <plstr.h>
@@ -141,8 +141,8 @@
  #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
+--- a/security/jss/org/mozilla/jss/util/jssutil.h
++++ b/security/jss/org/mozilla/jss/util/jssutil.h
 @@ -39,7 +39,7 @@
  /* Need to include these first.
   * #include <nspr.h>
diff --git a/dev-java/jss/files/jss-4.3.2-ldflags.patch b/dev-java/jss/files/jss-4.3.2-ldflags.patch
index fde2e26bf77c..11687fac4a09 100644
--- a/dev-java/jss/files/jss-4.3.2-ldflags.patch
+++ b/dev-java/jss/files/jss-4.3.2-ldflags.patch
@@ -1,5 +1,5 @@
---- 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
+--- a/security/coreconf/Linux.mk
++++ b/security/coreconf/Linux.mk
 @@ -142,7 +142,7 @@
  ARCH			= linux
  
diff --git a/dev-java/jss/jss-4.3.2.ebuild b/dev-java/jss/jss-4.3.2.ebuild
index 077c3bf848fb..5c5137e81997 100644
--- a/dev-java/jss/jss-4.3.2.ebuild
+++ b/dev-java/jss/jss-4.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -53,6 +53,8 @@ src_compile() {
 		"BUILD_OPT=1"
 	)
 
+	tc-export PKG_CONFIG
+
 	export JAVA_GENTOO_OPTS="$(java-pkg_javac-args)"
 	use amd64 && export USE_64=1