gentoo resync : 28.04.2021

4 files changed, 41 insertions, 9 deletions

diff --git a/sys-auth/nss_ldap/Manifest b/sys-auth/nss_ldap/Manifest
index 28e220d22236..16a507360b85 100644
--- a/sys-auth/nss_ldap/Manifest
+++ b/sys-auth/nss_ldap/Manifest
@@ -5,11 +5,12 @@ AUX nss_ldap-257.2-gssapi-headers.patch 2343 BLAKE2B d82b77be7a5f449e2367719262a
 AUX nss_ldap-264-disable-automagic.patch 4357 BLAKE2B 6ed58c1478d7aaeaa29002af980149c48b53ce7aa3fa2762194cd5b632ba16adea568023db019c8043c1bda6a82b6e1a13f63cffbf89b928003c1d74af4ad36d SHA512 4d7fc328f90dfc189ee0784db0298434b9a91ed5a9b2828dd94c2632c2116193e22df737de9ff7044746b337c47744284371aa4f32b83be61c5f0ec86edb7d35
 AUX nss_ldap-265-fbsd.patch 13987 BLAKE2B c6a68bff90547ce503e8319639ae0ebc027ed9376e2d1d05ca5aa66e7e955e7025279aed0892860c8a75d6008a50f6863d512379171048b085589c6b0457630d SHA512 efb2e6c955b43743a06b7ddbda9bdf4c3a58f881a45f5d3166c87afd265399bc6da2014c17e3ef4b10a8a66532f38190fab8ddd3f970f155905372f09f6ff3e2
 AUX nss_ldap-265-installdir.patch 1626 BLAKE2B 733cb83d77595cc445f74ba0f9508a6fa32ee84f20f552fd06f1d936770d902ef3b7bfb0fc91ebd4e10ac159b4dcff314ab47165f4736802c027924a76c78322 SHA512 7e86ff4fff320ef8132fff6f317dc58641845327c4de9be3b0d41004d27dab41fcc8752987682cee0b8e22230ab1034f0cf45a84ec405706aa37d499bbcc70b8
+AUX nss_ldap-265-libdir.patch 1311 BLAKE2B 238efa51862e9399c1f0c98476085079542f4b742d95e7ea4afd1397845339183a398487d9c72595ecae1a789b63590d6461b2250a92c7d460cacd3267fdcbf9 SHA512 61bfd43b42ff62b6afa11f3c61195b8182b94646a986fe170381e717d4d1edd333b98814e6bade6c52b6c09111bc563ba13aa224e2437092306c1057e9c46bf6
 AUX nss_ldap-265-missing-entries-oneshot.patch 3734 BLAKE2B 8ecc35b20719222a747c511242ba826ce29adfbaf74d20883ede0b7b17aa712cf7ce05a23e9e9a9e6cf47a5098f728e43d666d2681a6df60076d60c4b1626957 SHA512 07136f98f5b195f4b794ede35d314db205b89e63168b14489964ad676714ecf861acdd5810fc99c2e784115af4e0e0a20f849672e7f6643dbb6e14db11c9cb05
 AUX nss_ldap-265-pthread.patch 18698 BLAKE2B 1a158ddca1dbc99536b2d637a938c6ab121bb217b6b4b6f9755139ea8aec860023ec5fdcdbcebd925b99d9d440fc4a06da364646cd30f6654e41cbedb18e74df SHA512 2afc8a8ee20043985b739923a4c7472f0e13c6854de6d3023ac6c843d3ba6ecf4cf7ee21da4d8dad907f27ab476eec646fa4603d8be725f079f60a4a220c025d
 AUX nss_ldap-265-reconnect-timeouts.patch 2806 BLAKE2B b254a9959892a0a8ecb6e53778c4581f5ce8f9f0b90ceaf7fdb3e08cdc029b3914d9f95a7b65f3f9ceedf6669ae5727d8bc41c7229c567667896b4cb8868b227 SHA512 d9767cfaf32b9041d222c7b313c327a72ac2766d26fed7ce19cc1acff56cf2493d4e1e83b33852083505952f983ba64c00409e3cf09dcbf74676390968dd935b
 AUX nsswitch.ldap.diff 575 BLAKE2B 9578535ea6cff87ac21fa8f3a0a1b8d727c657a53318b378dd86b4dded15bac950e241af59b15b6898a1ed089d1c481f0615ca7de3ae4e07a231432920af7b52 SHA512 0d08d4dacea0213714cab864300e625158106245eeb34a7d4b983749dd4fa4156d3f36d6c2dd214efdf80cf926c37657eb00651bceb89907286a3310123399a0
 DIST nss_ldap-265.tar.gz 280976 BLAKE2B 31b233ef7680204abfb62408141609b9489e133327c787c59afedd9ac41194189bde26d1f3b0a885622f57ec769ddee2bdf7d274b9584d4d5002d1c016c86892 SHA512 c4584682968861dd5880992fe7d11c6005d94f0c17252ab1cda04380fd7a81b419ba7e87d0efa44c24c5ce5bf76b9fd8331034dddb4f1400f132eb2192472077
-EBUILD nss_ldap-265-r5.ebuild 3982 BLAKE2B c1c0fe18519694473ec42f310e6f3e45ba4f3adcb511d57a60b2c4ca61218276eb33307828068f9ec837559a647c7ff71aedf9217674efde016738ec4bbaf469 SHA512 a505439d2138460a055c6d00db152937493dc1ebe96316be937065ebfbb25de6345979e5e184f572832347dc7656904d03faa5a8abbbf64bcf4ca3ea4e9d4ede
-EBUILD nss_ldap-265-r8.ebuild 3728 BLAKE2B 52967dd0d189451057c9dac58ce5cee507e90dd3b1501a835d73b3297f1d0f85dcd5f4786d9f6273cb0b280f640d22ce23bae6a20954059c23cbda7de7abc7b5 SHA512 59aeefcc414fb80abe3634b56c0f983f309415125f0e96c816f5c00cf14c595f57e66c028ebeae195edfe803cb1e32bd6e3959b06ddc155da70a8d2eeb51b1a5
+EBUILD nss_ldap-265-r5.ebuild 3982 BLAKE2B 0bb870135f045e18d4e7cfd70b3c1577920efd6a7ec7b662fd6085e5084246a39bd6a0e8ed87a14d86df761f4b508a302a918814f01cb099c84aa43c3150e91f SHA512 c3187609058fb57f6e4270b322226fd2c8a10cebf206e98e0ce800f097d6ce8da7d1a9269a950bacdc247f20a1bcca1cfddc3b97b50240a4375009cbd62c0df0
+EBUILD nss_ldap-265-r9.ebuild 3758 BLAKE2B 691b51c82704357a51c5f8e6374661e25b38c3e8a3e654eef7db6f336024959cbde1c9e4fb22573422e35773c4bc5b02d2da270490beba8bcd30557c483203e1 SHA512 7cb1e5bfcaff91a3aca03c4a17584672ef016dc1978cde96e291b2e9f57f3fc3ea8208103d3bf9ecd8463c8c4bfb404a18f07a4472893b3824b16c3ba15c9f7b
 MISC metadata.xml 418 BLAKE2B 0ee38489c1ce6a94df354e507b4e89255abe13a587b6b8887eb234eb1463da037194ad6f3e834e9ce4c5ef6e00c3082706a4b602a2ad39b9ea3eafff71596b22 SHA512 0395ea328ffe10ee708706b9e524ef863716dcb4d762a05546a64c2dbde75ab1ff3ec853c6973e421e0d3a7c837df96adf502aacce726016c4302ab466e1e7a8
diff --git a/sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch b/sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch
new file mode 100644
index 000000000000..d3609b604a23
--- /dev/null
+++ b/sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch
@@ -0,0 +1,31 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -38,17 +38,13 @@
+ DEFS = @DEFS@
+ #INCLUDES = -I$(top_builddir) -I$(srcdir)
+ 
+-if GCC
+-MULTI_OS_DIRECTORY=$(shell $(CC) $(CFLAGS) -print-multi-os-directory)
+-else
+ MULTI_OS_DIRECTORY=.
+-endif
+ 
+ if GLIBC
+-LIBC_VERS = $(shell ls /lib/$(MULTI_OS_DIRECTORY)/libc-*.so | tail -n 1 | sed -e 's|.*libc-\(.*\)\.so|\1|')
++LIBC_VERS = $(shell ls @GENTOO_PORTAGE_EPREFIX@/lib/$(MULTI_OS_DIRECTORY)/libc-*.so | tail -n 1 | sed -e 's|.*libc-\(.*\)\.so|\1|')
+ NSS_LDAP_LIBC_VERSIONED = libnss_ldap-$(LIBC_VERS).so
+ 
+-NSS_VERS = $(shell ls /lib/$(MULTI_OS_DIRECTORY)/libnss_files.so.? | tail -n 1 | sed -e 's|.*libnss_files\.so\.\(.*\)|\1|')
++NSS_VERS = $(shell ls @GENTOO_PORTAGE_EPREFIX@/lib/$(MULTI_OS_DIRECTORY)/libnss_files.so.? | tail -n 1 | sed -e 's|.*libnss_files\.so\.\(.*\)|\1|')
+ NSS_LDAP_NSS_VERSIONED = libnss_ldap.so.$(NSS_VERS)
+ endif
+ 
+@@ -83,8 +79,6 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	$(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/$(NSS_LDAP_LIBC_VERSIONED)
+ 	(cd $(DESTDIR)$(libdir); ln -sf $(NSS_LDAP_LIBC_VERSIONED) $(NSS_LDAP_NSS_VERSIONED))
+-	$(mkinstalldirs) $(DESTDIR)/usr$(libdir)
+-	(cd $(DESTDIR)/usr$(libdir); ln -sf ../..$(libdir)/$(NSS_LDAP_NSS_VERSIONED) .)
+ else
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ if HPUX
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
index af476d7f04e1..ca216ce28544 100644
--- a/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit fixheadtails eutils multilib multilib-minimal autotools prefix
+inherit fixheadtails epatch multilib multilib-minimal autotools prefix
 
 IUSE="debug ssl sasl kerberos"
 
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r8.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r9.ebuild
index e6ed3ba6fc38..749cdb870cf0 100644
--- a/sys-auth/nss_ldap/nss_ldap-265-r8.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-265-r9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.padl.com/download/${P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="debug kerberos ssl sasl"
+IUSE="debug kerberos ssl sasl split-usr"
 
 DEPEND="
 	>=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}]
@@ -32,7 +32,7 @@ src_prepare() {
 	# eprefixify is safe on non-Prefix systems, so go unconditional
 	# Note: comment this out or make it conditional on 'use prefix'
 	# if needs rebasing. Don't remove.
-	eapply "${FILESDIR}"/${P}-installdir.patch
+	eapply "${FILESDIR}"/${P}-libdir.patch
 	eprefixify Makefile.am
 
 	# bug 438692
@@ -121,8 +121,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	# Dumb /usr/lib* -> /lib* symlinks gone wrong
-	rm -rf "${ED}"/usr/usr || die
+	use split-usr &&
+		dosym ../../$(get_libdir)/libnss_ldap.so.2 /usr/$(get_libdir)/libnss_ldap.so.2
 
 	insinto /etc
 	doins ldap.conf
@@ -138,7 +138,7 @@ multilib_src_install_all() {
 		CVSVersionInfo.txt README nsswitch.ldap certutil
 
 	docinto docs
-	dodoc doc/*
+	dodoc -r doc/.
 }
 
 pkg_postinst() {