gentoo resync : 24.07.2021

5 files changed, 10 insertions, 218 deletions

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 5981cdecce20..6083800a38b1 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -3,8 +3,7 @@ AUX libxcrypt-4.4.12-pythonver.patch 616 BLAKE2B 73c7039127b23c075a7b8e5bc897299
 AUX libxcrypt-4.4.19-multibuild.patch 303 BLAKE2B cd342eef2a8ce3e305e544d37373370748690878b4171709028b7b894ad2c76c9188496ab089a46645ad6f9fca09fa4f89cdcb444e1400747ee358c079441661 SHA512 3cbd4bbd0827801faaaa2198eccccb285100cdfc43525b70816121aa70b32dc2c8479c53e16b9e99920926b1b11014dcc19909c4f72a09d9d19fcdb0fa6350cd
 DIST libxcrypt-4.4.20-autotools.tar.xz 628688 BLAKE2B 4c23af2a765495758e52c8e95d53d1c1d911fea011375160c4f10e468939734fcc7198cc327fafa4d5c90afa6d4c56dfe6d1b56c2c17bbc015b44cffcd7bcc8b SHA512 5b7504e9d83df12af7d11864e88d1034ed9ce0a837ef061044c5c7fe603d7f3e5613ddf20b30613a7943735120cd058f2117401d59879afcba34ce0e48ae62ee
 DIST libxcrypt-4.4.23-autotools.tar.xz 630204 BLAKE2B a1c82906f59f6d0ed8f00de8fecf2c3c20608f0e3422bc0692b290c4eefd536019395e28b380031ae16be4ef37671327aca20dc63ca0367f73c2e85dfa5e3199 SHA512 30acea7e643a87d2c032c97ad8ca6c8c445c2e4af66d22906e332311a5b54a6905cc7ca74af7215a2e9ca362e1af2a8a3be8b3e0f0872f42ce0e5ea3e63bad46
-EBUILD libxcrypt-4.4.20.ebuild 5783 BLAKE2B 1e2095164227fc440d80c20c0bdabc1880058052b7de330ccd7b48900ea9e791956a735855f213210c01baeaa869909c52932197f70795e6e5d062389c745702 SHA512 54dea2fc4e9c1105b8d9188a723483fa334e5c697d057f96344fa55c43ec65abfe5ee7329318393b7d6439fa5e48516d15a64d9d5c317103615f52b4eef13285
-EBUILD libxcrypt-4.4.23-r1.ebuild 5820 BLAKE2B 3c526b6a73e403ec587bb4259df85ac7287ab931d317e6e8b8753e10f660c2c830741d936ca9d76c4a9447c13ccf4a026fb60dbd19fa75f504fc0764840f688d SHA512 874bfeaa73f58e8275840fa2cf1200e1858124ae591d6a813fe90220a85b8f06b2cdfe5ec86ad19d5fe9acf70b76a8f27ec879e10fc0ead6690c1971874de667
-EBUILD libxcrypt-4.4.23-r2.ebuild 5856 BLAKE2B 8647acbc70466d29e59a22106f4bbf113c00a90bd9b9ab88c32a6f1f3ff85798e16484691512e75e28a98d66e68dc3a4d4b76681d6688fd4f8fdb1ab47b1c73f SHA512 85b4edfd836ddb381477862833a96bf390e211356d7f5fe61703398ba4757c168944cafa02772a3c8eb645e4bbab9445576315fcfcf03a4cf309dd0375d929bd
-EBUILD libxcrypt-4.4.23.ebuild 5792 BLAKE2B 732a9dfe8569dc7f11088467be788b6724a006d99ca5268e086ae6f17c302c5c6d72a1dbe43d69352de626824fb650dc99b277cec7aeb471daaa10c4b5f58fbd SHA512 411efce10b7dccf76e5e2ca9ffefff548a94aafb702eb26352845fb9d859e14d055cb9767d7fc8d8de2d73106ee0154fca39b0939b961dd070fa29748c96d996
+EBUILD libxcrypt-4.4.20.ebuild 5781 BLAKE2B 20aa5b04a02fff77c110a2a6f40e9b5b64f6aefae68c72531ce24a757825707283bbd367c663fe882e45d07f11892aa99ab919ae4b2945bebadb1aad0594e36f SHA512 1520d594c33482de9e0a78009d76898daacf3c66e38e6395d6a7eaa899e45e5a18c05ce5336b8356d89f171a5e85960598ec4eebe164c58e5b76a2d94eca0add
+EBUILD libxcrypt-4.4.23-r2.ebuild 5853 BLAKE2B 24f2114d84458f84b3b4dc06b50e14b05de046964c0c58f9743528cb9541eaaf6bbafc1db05b7c8577f7b4b736cfe3f2465c97551a961a14d11be3a7a9afc9bb SHA512 e79e6c6133444a97d5b40e7331b507bf8b44b1b0eef0eb858dd0b418a5e3a3c6294d938477c0c05f20b4057d1d5d88222934baad465aced6608ef3e227c573d0
+EBUILD libxcrypt-4.4.23.ebuild 5790 BLAKE2B a4f109d6f546d88b2acebde3826503446494da40ad94d73dffe47bfc72f67c1a1a2f6ed13f7c93e75cd4a752f46b2c28922432849bae727a36f0e8405aff981e SHA512 6c254e624b5292faee45bd19fcf0b54ec5d11f309c99d96ed16cd9810c1bed652d9175a85df33e50df90c7b012885f161df7acc8d1e3dc0fc13f7effbb97bcd8
 MISC metadata.xml 830 BLAKE2B 21022e8e6a34737874590a560010f2a8fd1fb11275b4f675d195b66af70ebf8f28a2d881bab0a6653b0b1fbc09c14b99339f43d6f07fd8ffe282f951c64a4f96 SHA512 03dafb661b2273d25c7e282bb91ba01a371734446e12d140d5c5c469172e62f768de6d2a0f5bcdcdae7275f4ba0ad46de69c546b381c1f0bf338cdb487267773
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
index 21e04f396784..01358ced2620 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
@@ -54,8 +54,8 @@ src_prepare() {
 	#
 	# There are two circular dependencies to be aware of:
 	# 1)
-	# 	if we're bootstrapping configure and makefiles:
-	# 		libxcrypt -> automake -> perl -> libxcrypt
+	#	if we're bootstrapping configure and makefiles:
+	#		libxcrypt -> automake -> perl -> libxcrypt
 	#
 	#   mitigation:
 	#		toolchain@ manually runs `make dist` after running autoconf + `./configure`
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild
deleted file mode 100644
index 59a192d732e9..000000000000
--- a/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 2004-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-# NEED_BOOTSTRAP is for developers to quickly generate a tarball
-# for publishing to the tree.
-NEED_BOOTSTRAP="no"
-inherit multibuild python-any-r1 multilib-minimal
-
-DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
-HOMEPAGE="https://github.com/besser82/libxcrypt"
-if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
-	inherit autotools
-	SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools.tar.xz"
-fi
-
-LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+compat split-usr +static-libs system test"
-REQUIRED_USE="split-usr? ( system )"
-RESTRICT="!test? ( test )"
-
-DEPEND="system? (
-		elibc_glibc? ( sys-libs/glibc[-crypt(+)] )
-		!sys-libs/musl
-	)"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-lang/perl
-	sys-apps/findutils
-	test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
-
-python_check_deps() {
-	has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=(
-		$(usex compat 'xcrypt_compat' '')
-		xcrypt_nocompat
-	)
-
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# WARNING: Please read on bumping or applying patches!
-	#
-	# There are two circular dependencies to be aware of:
-	# 1)
-	# 	if we're bootstrapping configure and makefiles:
-	# 		libxcrypt -> automake -> perl -> libxcrypt
-	#
-	#   mitigation:
-	#		toolchain@ manually runs `make dist` after running autoconf + `./configure`
-	#		and the ebuild uses that.
-	#		(Don't include the pre-generated Perl artefacts.)
-	#
-	#	solution for future:
-	#		Upstream are working on producing `make dist` tarballs.
-	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
-	#
-	# 2)
-	#	configure *unconditionally* needs Perl at build time to generate
-	#	a list of enabled algorithms based on the set passed to `configure`:
-	#		libxcrypt -> perl -> libxcrypt
-	#
-	#	mitigation:
-	#		None at the moment.
-	#
-	#	solution for future:
-	#		Not possible right now. Upstream intend on depending on Perl for further
-	#		configuration options.
-	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
-	#
-	# Therefore, on changes (inc. bumps):
-	#	* You must check whether upstream have started providing tarballs with bootstrapped
-	#	  auto{conf,make};
-	#
-	#	* diff the build system changes!
-	#
-	if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
-		# Facilitate our split variant build for compat + non-compat
-		eapply "${FILESDIR}"/${PN}-4.4.19-multibuild.patch
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-get_xclibdir() {
-	printf -- "%s/%s/%s\n" \
-		"$(usex split-usr '' '/usr')" \
-		"$(get_libdir)" \
-		"$(usex system '' 'xcrypt')"
-}
-
-multilib_src_configure() {
-	local -a myconf=(
-		--disable-werror
-		--libdir="${EPREFIX}"$(get_xclibdir)
-		--with-pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-		--includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')"
-	)
-
-	case "${MULTIBUILD_ID}" in
-		xcrypt_compat-*)
-			myconf+=(
-				--disable-static
-				--disable-xcrypt-compat-files
-				--enable-obsolete-api=yes
-			)
-			;;
-		xcrypt_nocompat-*)
-			myconf+=(
-				--enable-obsolete-api=no
-				$(use_enable static-libs static)
-			)
-		;;
-		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
-}
-
-multilib_src_test() {
-	emake check
-}
-
-src_test() {
-	multibuild_foreach_variant multilib-minimal_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant multilib-minimal_src_install
-
-	(
-		shopt -s failglob || die "failglob failed"
-
-		# Make sure our man pages do not collide with glibc or man-pages.
-		for manpage in "${ED}"/usr/share/man/man3/crypt{,_r}.?*; do
-			mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
-				|| die "mv failed"
-		done
-	) || die "failglob error"
-
-	# Remove useless stuff from installation
-	find "${ED}"/usr/share/doc/${PF} -type l -delete || die
-	find "${ED}" -name '*.la' -delete || die
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Don't install the libcrypt.so symlink for the "compat" version
-	case "${MULTIBUILD_ID}" in
-		xcrypt_compat-*)
-			rm "${ED}"$(get_xclibdir)/libcrypt$(get_libname) \
-				|| die "failed to remove extra compat libraries"
-		;;
-		xcrypt_nocompat-*)
-			if use split-usr; then
-				(
-					if use static-libs; then
-						# .a files are installed to /$(get_libdir) by default
-						# Move static libraries to /usr prefix or portage will abort
-						shopt -s nullglob || die "failglob failed"
-						static_libs=( "${ED}"/$(get_xclibdir)/*.a )
-
-						if [[ -n ${static_libs[*]} ]]; then
-							dodir "/usr/$(get_xclibdir)"
-							mv "${static_libs[@]}" "${ED}/usr/$(get_xclibdir)" \
-								|| die "Moving static libs failed"
-						fi
-					fi
-
-					if use system; then
-						# Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir)
-						# to allow linker to correctly find shared libraries.
-						shopt -s failglob || die "failglob failed"
-
-						for lib_file in "${ED}"$(get_xclibdir)/*$(get_libname); do
-							lib_file_basename="$(basename "${lib_file}")"
-							lib_file_target="$(basename "$(readlink -f "${lib_file}")")"
-							dosym "../../$(get_libdir)/${lib_file_target}" "/usr/$(get_xclibdir)/${lib_file_basename}"
-						done
-
-						rm "${ED}"$(get_xclibdir)/*$(get_libname) || die "Removing symlinks in incorrect location failed"
-					fi
-				)
-			fi
-		;;
-		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
-	esac
-}
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.23-r2.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.23-r2.ebuild
index 9a542cc2117c..6ca63517d947 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.23-r2.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.23-r2.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+compat split-usr +static-libs system test"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"
@@ -58,8 +58,8 @@ src_prepare() {
 	#
 	# There are two circular dependencies to be aware of:
 	# 1)
-	# 	if we're bootstrapping configure and makefiles:
-	# 		libxcrypt -> automake -> perl -> libxcrypt
+	#	if we're bootstrapping configure and makefiles:
+	#		libxcrypt -> automake -> perl -> libxcrypt
 	#
 	#   mitigation:
 	#		toolchain@ manually runs `make dist` after running autoconf + `./configure`
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.23.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.23.ebuild
index d03062b4d64a..39cbf0e019ee 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.23.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.23.ebuild
@@ -54,8 +54,8 @@ src_prepare() {
 	#
 	# There are two circular dependencies to be aware of:
 	# 1)
-	# 	if we're bootstrapping configure and makefiles:
-	# 		libxcrypt -> automake -> perl -> libxcrypt
+	#	if we're bootstrapping configure and makefiles:
+	#		libxcrypt -> automake -> perl -> libxcrypt
 	#
 	#   mitigation:
 	#		toolchain@ manually runs `make dist` after running autoconf + `./configure`