gentoo resync : 21.06.2020

5 files changed, 3 insertions, 69 deletions

diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index ab6477cd2799..60d0f275de68 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/jxplorer/Manifest b/net-nds/jxplorer/Manifest
index b331118ba59a..e7d4552d3405 100644
--- a/net-nds/jxplorer/Manifest
+++ b/net-nds/jxplorer/Manifest
@@ -5,6 +5,6 @@ DIST jxplorer-3.3.1-project.zip 4500476 BLAKE2B 6e5fb357c19ab9fd8a40f38d01fc650b
 DIST jxplorer-3.3.1.1-project.zip 4566815 BLAKE2B 420277d44da94d5c54b0ac4a1bb67381785a4f4270be9ce1e5a07da00d7056bde8ab799a524e891176229579085e606482357f11d5567024017119ff09492995 SHA512 aa7c1c976f5987055abeb97aba865e9cdbc657d5baca199ff83c97ac5017c9d48869c8ee6346a7cf07b236b04059043256d0545c7b6cc37d97c81de2f9015d03
 DIST jxplorer-3.3.1.2-project.zip 4625538 BLAKE2B b1bfb552dd4524f4d0fde4ff15617bf3e50629c0f879f05ee87c9f301afa9a5a4c544c8bb85d5b9639fe809f030752f9e96c321a4e6d20fda7aa55097363bdeb SHA512 6c95de48b2abd41a4926de3bd9bd203e266676028e12d1f1c93d8ef6f10b233eefcb122c8c075d6758b43c85e30fdc4b01d55811e5fcbdcd64d353c6f0fef94a
 EBUILD jxplorer-3.3.1.1.ebuild 1645 BLAKE2B 9d50c7a71c4ee02d8e0a265a799add552bc076f12dccc111118c51d52e97fe590dc2548cee65a193445f065bfb9ece012a157a0f089202c8b00fb65708916b53 SHA512 7e7e43e8af0add77baa0bb11a5f78f0fa7a050b6c8b1096c2970d22cfd48f3aac016e51481dcd4c98afd2ba5aa7d77e83cf9d86cd7f1d2b7b2753a3a679bd4a6
-EBUILD jxplorer-3.3.1.2.ebuild 1685 BLAKE2B 3961c74ba6be671f4946e5e93a86b9ee510d8266f1bf048432c5c9b97eb2bc0bfc2a3bc69a51514579bca0a27fc548291dac4966195c819658efc1aea54dade1 SHA512 535a8cfdb99029fab8b15a3be5360f9b46d82eaf68b78e6c489d5ea637c24271cff78a23d0647d0e2b7fcf360887dffb72a9411b2f96ebc7bebd7a576278fa00
+EBUILD jxplorer-3.3.1.2.ebuild 1680 BLAKE2B 5a2327c75dab4c6b05804a0ab00c4d0791987bf1d3267c04899ca76916c9b64ffc88bbc2ae3dc41e6a88b05b4cde8ecfa61ba8ef1b4d7cf6a24172562a7f1a94 SHA512 571ce1951eaa38cb8e3386b76c142806673125583071425e8c5d71d74b32657004ac49470728932398bb9ae6ca24a7c7f7d65b64c3e406f27a1199ddf6b70d2f
 EBUILD jxplorer-3.3.1.ebuild 1643 BLAKE2B 3db5aa47b60b5bf64c061394ed80dac93cadf4690b89c3103b8a61c810b58c0c261874533101a95347af7897417aa3e0149606716628dcdb4ef5f79b32b1687f SHA512 6be611580e3e5ecb6d0df336be48bfeab0c054db5c3644417e564146f14db8d2dc60ff725ff38684000f855ee8fda59c00697d9bd35a2292253025b55b39f06d
 MISC metadata.xml 314 BLAKE2B f90c3010c15a26ffb04114d4049aadedb720df7d6bf04801603d6fb4f63331d6a5f7b135d4d926e0cbc8504849c1677b04b9d61e0fe67ee97ec41d5e30375b88 SHA512 28b10ef2e247491aac4d9868d8c42ccef74abdc9806820b84a29d479e8f53218e1aab497c3f450c289cacf40ea8fbd193a508203ffc915ad2fb7582258bc7d96
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild
index 161a2fe5f6cc..ff20bda345bc 100644
--- a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,7 @@ RDEPEND="
 
 DEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.5
+	virtual/jdk:1.8
 	test? ( dev-java/junit:0 )"
 
 S="${WORKDIR}/${PN}"
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index a3a42284da8a..07067197cea0 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -11,7 +11,6 @@ AUX openldap-2.4.35-contrib-smbk5pwd.patch 1626 BLAKE2B 309b08c5bc3042625741daff
 AUX openldap-2.4.40-slapd-conf 2059 BLAKE2B bc80677203c52304fd302288ea33face5b05504bcc8f98b202db3251b9cc85047db5a72f9596d51206e946298652bd1f277c1494bfae2f64d2b9bc4b7771e681 SHA512 7ce8a8262db74d86449a3d31b96b2efa9e8dae2f9992a1c3a6d6899fb65531eaf917f410d8728852cb74338d7ba3c8c3b52d2f6cdcbba4cb3b97f6c733099fa2
 AUX openldap-2.4.42-mdb-unbundle.patch 3589 BLAKE2B 243dc22251aacd5d978120219b6078bf640df2b34034adfef3b1eb7cea70bf94926cebb60c7c199a74d91b594d39763c46b07ffc1b0d72e52a86fd36f5450802 SHA512 ec123ff8cef6c32b1f29c2d0643433dd88dfa8ab62b4d7536de829475ff8b45b5c7376f3e17f3424aab326a573aa36a593630feecbd40c3e574c6c24f5dd83ec
 AUX openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch 3542 BLAKE2B ffc226dc3dc2fe55d697667a49057ca9818d9bb85280bc68f1aa46e90abc92cca4ce18dbf3c735b83c1126a817e1c62911d486ef790de5a06c83468021733232 SHA512 326e73df430eb152fa5c53deb12071795f5958e6c48167021ebab83c6b1c4320ed56b0dfe5dd3475de463ff24e43cc8fe2c7cbf905e11cc1d48a70e350cb0ebc
-AUX openldap-2.4.45-libressl.patch 2276 BLAKE2B 5db4802b2ed606879a1c6ae31068f9569bcf10db7ffca7c7b48bad5331396d1dd669ed77fc7af99e418570be10c47c6e229afea1eb2a7512ed2c99bad4d3343b SHA512 72d5177f67ce62053a66c241bedcc3a301544726c6ebf7055482c58337cf2a9fdab89336f910e039f90ef7f23fade4fdc167b8caab91acfb5ca5754780c962ab
 AUX openldap-2.4.47-libressl.patch 2071 BLAKE2B 8c8d14e849c40de698431484a8be31b4b8fa63e19387b59fba8d9ed7d5d6e2c0ccded94b8933f77b145965b9c2aac376713c7561971139c4446c39c54b808fd3 SHA512 e3a7fbf994a67ba224f1024f5c0ee260c9252cab67ca8e49279d20cab2d7a0eb4c6431a4800857f247185c9a875fc1d5e9a94200c9e2f90d4d664969c9659b75
 AUX openldap-2.4.47-warnings.patch 1096 BLAKE2B d5843b0370a8785e42281ee4a760198450963e21de3babfc97bf1d69c3010360c9012c04956fedc4a9e5e3b993682b50a3aae44e7d17ba833d0c6b96a3db3e64 SHA512 7669f87e5838abae0d67b0ad42c08c51b9891507b2e4026d5910e0c770675ca71c70360e3dddfec2c077decdfce6c35cc7fb0f6332904beac12702a1db6de35f
 AUX openldap-2.4.6-evolution-ntlm.patch 5161 BLAKE2B edd265d9012c91c36a7cd6abe1a409e3aac384f49dcf410d1cf3f41e8ec3a988ec90995239dd4d9c5016a3b320e945526abdaeb6f3187b4a4323fdff97e73eeb SHA512 a553231ad3e2d2ca3a3a195b20da6163c135a723e0a3ed39afcad5601ed4ef01e692533df3f8f96d5ec8cc74ca27cbd16508818007dc1343899a42b5595b980b
diff --git a/net-nds/openldap/files/openldap-2.4.45-libressl.patch b/net-nds/openldap/files/openldap-2.4.45-libressl.patch
deleted file mode 100644
index 20a65a4e0fd1..000000000000
--- a/net-nds/openldap/files/openldap-2.4.45-libressl.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- libraries/libldap/tls_o.c.orig	2017-06-04 16:31:28 UTC
-+++ libraries/libldap/tls_o.c
-@@ -47,7 +47,7 @@
- #include <ssl.h>
- #endif
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
- #define ASN1_STRING_data(x)	ASN1_STRING_get0_data(x)
- #endif
- 
-@@ -157,7 +157,7 @@ tlso_init( void )
- 	(void) tlso_seed_PRNG( lo->ldo_tls_randfile );
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
- 	SSL_load_error_strings();
- 	SSL_library_init();
- 	OpenSSL_add_all_digests();
-@@ -205,7 +205,7 @@ static void
- tlso_ctx_ref( tls_ctx *ctx )
- {
- 	tlso_ctx *c = (tlso_ctx *)ctx;
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
- #define	SSL_CTX_up_ref(ctx)	CRYPTO_add( &(ctx->references), 1, CRYPTO_LOCK_SSL_CTX )
- #endif
- 	SSL_CTX_up_ref( c );
-@@ -464,7 +464,7 @@ tlso_session_my_dn( tls_session *sess, struct berval *
- 	if (!x) return LDAP_INVALID_CREDENTIALS;
- 	
- 	xn = X509_get_subject_name(x);
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
- 	der_dn->bv_len = i2d_X509_NAME( xn, NULL );
- 	der_dn->bv_val = xn->bytes->data;
- #else
-@@ -500,7 +500,7 @@ tlso_session_peer_dn( tls_session *sess, struct berval
- 		return LDAP_INVALID_CREDENTIALS;
- 
- 	xn = X509_get_subject_name(x);
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
- 	der_dn->bv_len = i2d_X509_NAME( xn, NULL );
- 	der_dn->bv_val = xn->bytes->data;
- #else
-@@ -721,7 +721,7 @@ struct tls_data {
- 	Sockbuf_IO_Desc		*sbiod;
- };
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
- #define BIO_set_init(b, x)	b->init = x
- #define BIO_set_data(b, x)	b->ptr = x
- #define BIO_clear_flags(b, x)	b->flags &= ~(x)
-@@ -822,7 +822,7 @@ tlso_bio_puts( BIO *b, const char *str )
- 	return tlso_bio_write( b, str, strlen( str ) );
- }
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
- struct bio_method_st {
-     int type;
-     const char *name;