gentoo resync : 16.09.2020

7 files changed, 4 insertions, 273 deletions

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 84794409d3b8..a992b4434c64 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,14 +1,7 @@
-AUX libxcrypt-2.4-glibc-2.16.patch 1024 BLAKE2B 8dd6aa90feef9b056de81e8d499ad4699c8050bd243cd581db691cfd8b4457b997f245f76eaa1abce2c5a93a1155c75455925ff148632f9fd86f09f73def1664 SHA512 72dc3944ea6ad600887d99ba0a9b3c0acb9d107f6591a139f863032a45a5efa516ec8b08a06e564552694d14febed0a1e065b96dc4aef06cd274aebf98baedcd
-AUX libxcrypt-4.4.10-multibuild.patch 637 BLAKE2B c7c81457457b6262a5236a378fe3a2487b6da1f10ac84b4b3bc42f0beb47c52a42d20836ae44f647819d2b2042ff03b69a7681f76fc5eea5ab1333f9cd6f3ac0 SHA512 8222636d4b29909f1fa09aecd9a2284ceaa732707d4242df73bc9215edbb3c59fe517227fae66251c6312fb98ee79b6e73aab7b3c7dc5db1594740f9bd514cc6
-AUX libxcrypt-4.4.10-pythonver.patch 617 BLAKE2B 2d3779020a63899f9e4f0275e279baee2128b6c491bc6c2e6a5f9f1ce53b467838f82b4a7c4ec176c69f520544acc896b6372a8beca879aa4acdff80b384bccd SHA512 c1fda3843f02e9ffde09307147ed7cf617e2ab5a86c1766f85bb99fa377dcd4ac37e9bbcca814623c22bcf45a3d7da19237409d88a4578f38795ddd65abd1a7f
 AUX libxcrypt-4.4.12-multibuild.patch 636 BLAKE2B 51fdf0b0f3ffe209c270cc2ff4bec7ea458bc5ec5267415aea8b7e151c24c49b70c7f12f1172c460e660fbbdf97901b833c5bc5e431e94e93341335da64ce686 SHA512 f7f581cf4ac375d4ff33b70f3d09ce7e9db88f6cae487303d62ff0f09abbff99c35cee4d4f774bf7360e496f3c92bf813424ea58f9d1aeded9e44449844e4974
 AUX libxcrypt-4.4.12-pythonver.patch 616 BLAKE2B 73c7039127b23c075a7b8e5bc897299c3e083bece50638d025649e2146325f78fa82427b7690f0df3e5a0eeb0fc66ddb13992e0d14ccf8380fc11f641c2d90a1 SHA512 dffbbfe09c4c8a93e1f6cf63acb5f237ce143585fe22eeb7c44f6929131137011c1777184f802ad86bda2e2c64de60131f6dbe18c8c309d6848d330c1cb13364
-DIST libxcrypt-4.4.10.tar.gz 499736 BLAKE2B 32da99488c21a21c3310a735a08a70002a3a56d7d9d4a9fd0c16436ef2b42ee8a9b877c5b5dcbf1bc9a38fbef3370d5ff4585167ff25025f854ccd020014dcd4 SHA512 fd714542dad40db721c03270b5a03e2c068b0750e887dcac4c651433d5905d08bd5c5db3762cc2e4ceee0103bd62810559ea197d164126169e0b253675415ca2
-DIST libxcrypt-4.4.12.tar.gz 493620 BLAKE2B 185cc9a0b9f573801e75bf2ffb3eaa578016804d175443a53b2cef01334acb6f8fa5a0fe72e346ff368e3db355338b1f1dbd00e93828dde2594f0adee3753f69 SHA512 945dfd307ebd3d1b3dd9f22057b23b651c0ffaab55bf4151950565a3f0fea8b0e2bc2886318ceea707985d720e83e8663e4590bc72e91f470bae3a98f41ab30f
 DIST libxcrypt-4.4.16.tar.gz 480694 BLAKE2B 0e93c2ff45a8148f82a80a67fb732a3ef42e87505d19258023f91d3352a382483204e77e2704e7a0de15f4f1e38a326d0867506a5580faf8c81857270588a4a3 SHA512 e1d3b1262c6be7c6c8847b8c4eb8191d9e5e482798be6f1186876c72f3d8c737124378ec45a38aa464f556e10a557b96f855bd371f03c3611eada27904bf6781
-DIST libxcrypt_2.4.orig.tar.gz 361503 BLAKE2B 6347bea4b22ae7742cb516a0a8673bbd7c37f645b2dbb383f4c4a6bbcc95a12897068ab7354fa015bbb65f6dc331b95ce24b48aa4bdd7a57433d8f5bc245392d SHA512 7171ce1b5b7f949232c4db94cf98bdd6396c3e2a8f2f483c041cab92d752e3a2fa93d564ede7efece57c069df129e6cc03049cf3e3f07bd3556031a7c4197cbf
-EBUILD libxcrypt-2.4.ebuild 649 BLAKE2B 672890b0c7988494047e064cccd5a53323a25a1f40b953a516547fd302abac2c435e2185f31ed3e95884b3136c843f6e1fcc701b08bfc7c68a00e1bae717c124 SHA512 1aa50cd37c918682f043abc694696f6f0b1ac20d71ca2443d776d3eebfddccddab9e8e31f19ba8b473099124fb9f1d8eccb92d2efe5e7aa1b7b1bcd6393cbbcb
-EBUILD libxcrypt-4.4.10-r1.ebuild 3662 BLAKE2B 3ca592fb85f417b6d36613123ea86067dc1153b8e59acbb76ffbfad3aa1bb3b7024907225e8bd1f401e4bfbf766072c750cf39e3f0d270920520560b61dd3140 SHA512 3002fc88260a5b3a7695de457e9bcf4b0a085de239d4bcd06d627fea29d9567734ef73e4dd5eae73c29d36928e5fb9834a3335879ef7628c23b323aff484f6a6
-EBUILD libxcrypt-4.4.12-r3.ebuild 4177 BLAKE2B e0094f7c1a9ea955a0570951c33ba4e8ed114500b2426295e106d090f4cfd73671327f7da22721714e6026375cc2cd0e8584c3460b198ef593767b82fb614e67 SHA512 d10ba7899927c3aaefeab8e7eb282cd1ca89744dfa36e715c668f4f7077b0e03027db5c1c70ebf2f82de41aa8b66ac8123c56e82cb62524fe0b70106cb55e808
+DIST libxcrypt-4.4.17.tar.gz 519096 BLAKE2B 12cbe3d1f235baddd8d2ec8159f2a7514e75c2f91cf0db18ef909ec11c38ac19efebecec647a90cafb27c7ebc7e940da448ca8f3edd1c49e5cb9cc4407d5198c SHA512 94aaba6ccf9b6d1a32f9a571ee32261cecd393d5b8d8c6f18d740dc7bb29ac0fbd381124e7f0d84882559bb634208c08151b3dc05c9138fa0a229c4ba20fb6f7
 EBUILD libxcrypt-4.4.16.ebuild 4194 BLAKE2B 2db05b3f147b69116373aa37f83591cf9eb82dabe4ee57dcb2c39c41df7b76107e43054ea886589d6f3521a57a4dffb3ba7de9eb259c431f7375fde4cfb899f7 SHA512 288c81206e0e3c32901bacd0ce5d8b96275162801dddaed62490615297df7628f80193bfd0f36c1282d052377f4360e2e77679ffa29f7f403ecb1cd66df440fb
+EBUILD libxcrypt-4.4.17.ebuild 4195 BLAKE2B 73c49e0e491b95ce780b595d1b103edf147eddbeb111f1707ea1005c6191935bc150361478c019fb02178fe44590f53f185d25c1246887bf861c31c542e05388 SHA512 753725a1a997ed011756e1137f15a37a7ca6c0b370643998faadae33282e7802960228b643d1ad004c09e00261e1a075d3051d2e5c3a917817e29f8adabad743
 MISC metadata.xml 856 BLAKE2B e9fea1aa08f5b3f0abdd4d490973da2f133ea90e3a366d4549361233f51e674cc646b2fb6b4b15bca72d5a4e3b36be9a06e55afd3a4cb8f439d3958f09f8af25 SHA512 862cf3201efbecfc23167ecd1f6798f6729ba4e76749c174d17baf8aa4887f21d36f40234f35bc1b896e4384d110033b3f2260f01930b926f759e0243039adf8
diff --git a/sys-libs/libxcrypt/files/libxcrypt-2.4-glibc-2.16.patch b/sys-libs/libxcrypt/files/libxcrypt-2.4-glibc-2.16.patch
deleted file mode 100644
index 150ff99ab2f9..000000000000
--- a/sys-libs/libxcrypt/files/libxcrypt-2.4-glibc-2.16.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -urN libxcrypt-3.0.2/src/crypt_util.c libxcrypt-3.0.2.new/src/crypt_util.c
---- libxcrypt-3.0.2/src/crypt_util.c	2007-10-25 15:17:46.000000000 +0200
-+++ libxcrypt-3.0.2.new/src/crypt_util.c	2013-02-04 12:45:20.560191479 +0100
-@@ -30,8 +30,7 @@
- #endif
- #include <string.h>
- 
--#include <bits/libc-lock.h>
--#define __libc_lock_t pthread_mutex_t
-+#include <pthread.h>
- 
- #ifndef STATIC
- #define STATIC static
-@@ -265,7 +264,7 @@
-  */
- struct crypt_data _ufc_foobar;
- 
--__libc_lock_define_initialized (static, _ufc_tables_lock)
-+static pthread_mutex_t _ufc_tables_lock = PTHREAD_MUTEX_INITIALIZER;
- 
- #ifdef DEBUG
- 
-@@ -362,7 +361,7 @@
- #endif
- 
-   if(small_tables_initialized == 0) {
--    __libc_lock_lock (_ufc_tables_lock);
-+    pthread_mutex_lock (&_ufc_tables_lock);
-     if(small_tables_initialized)
-       goto small_tables_done;
- 
-@@ -471,7 +470,7 @@
-     }
-     small_tables_initialized = 1;
- small_tables_done:
--    __libc_lock_unlock(_ufc_tables_lock);
-+    pthread_mutex_unlock (&_ufc_tables_lock);
-   }
- 
-   /*
diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.10-multibuild.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.10-multibuild.patch
deleted file mode 100644
index aee7d7229b1b..000000000000
--- a/sys-libs/libxcrypt/files/libxcrypt-4.4.10-multibuild.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 3502a5c..afb8079 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -84,11 +84,7 @@ noinst_HEADERS = \
- 	test/des-cases.h \
- 	test/crypt-kat.inc
- 
--if ENABLE_XCRYPT_COMPAT_FILES
- nodist_include_HEADERS += xcrypt.h
--else
--nodist_noinst_HEADERS += xcrypt.h
--endif
- 
- noinst_PROGRAMS = \
- 	lib/gen-des-tables
-@@ -137,7 +133,7 @@ uninstall_hook_targets = \
- 	uninstall-hook-pkgconfig
- install-data-hook-pkgconfig:
- 	cd $(DESTDIR)$(pkgconfigdir) && \
--		$(LN_S) libxcrypt.pc libcrypt.pc
-+		$(LN_S) -f libxcrypt.pc libcrypt.pc
- uninstall-hook-pkgconfig:
- 	-rm -f $(DESTDIR)$(pkgconfigdir)/libcrypt.pc
- 
diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.10-pythonver.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.10-pythonver.patch
deleted file mode 100644
index 0ca1563995bd..000000000000
--- a/sys-libs/libxcrypt/files/libxcrypt-4.4.10-pythonver.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 16885c8..fd8c8e3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -247,11 +247,7 @@ ENABLE_CRYPT_KAT_GEN="no"
- # This way we just need one call to AC_PATH_PROGS to likely get a
- # suitable version of Python.  The version check afterwards is for
- # the case just a generic 'python3' or 'python' executable was found.
--PYTHON_CANDIDATE_VERSIONS="python3 python"
--
--for ver in `seq 6 1 10`; do
--  PYTHON_CANDIDATE_VERSIONS="python3.$ver $PYTHON_CANDIDATE_VERSIONS"
--done
-+PYTHON_CANDIDATE_VERSIONS="${EPYTHON}"
- 
- AC_PATH_PROGS([PYTHON], [$PYTHON_CANDIDATE_VERSIONS], [])
- 
diff --git a/sys-libs/libxcrypt/libxcrypt-2.4.ebuild b/sys-libs/libxcrypt/libxcrypt-2.4.ebuild
deleted file mode 100644
index 28ba5c5295c1..000000000000
--- a/sys-libs/libxcrypt/libxcrypt-2.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils ltprune multilib
-
-DESCRIPTION="A replacement for libcrypt with DES, MD5 and blowfish support"
-SRC_URI="mirror://debian/pool/main/libx/${PN}/${PN}_${PV}.orig.tar.gz"
-HOMEPAGE="http://packages.debian.org/sid/libxcrypt1"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.4-glibc-2.16.patch"
-}
-
-src_configure() {
-	# Do not install into /usr so that tcb and pam can use us.
-	econf --libdir=/$(get_libdir) --disable-static
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.10-r1.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.10-r1.ebuild
deleted file mode 100644
index 8e27bd3934b4..000000000000
--- a/sys-libs/libxcrypt/libxcrypt-4.4.10-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-inherit autotools multibuild python-any-r1 multilib-minimal
-
-DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others "
-SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/besser82/libxcrypt"
-
-LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="+compat split-usr static-libs system test"
-
-DEPEND="system? (
-		elibc_glibc? ( sys-libs/glibc[-crypt(+)] )
-		!sys-libs/musl
-	)"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-apps/findutils
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]')
-	)"
-
-# Gentoo CI complained about not having this
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/libxcrypt-4.4.10-pythonver.patch"
-	"${FILESDIR}/libxcrypt-4.4.10-multibuild.patch"
-)
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=(
-		$(usex compat 'xcrypt_compat' '')
-		xcrypt_nocompat
-	)
-
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-get_xclibdir() {
-	printf -- "%s\n" "$(usex split-usr '' '/usr')/$(get_libdir)/$(usex system '' 'xcrypt')"
-}
-
-multilib_src_configure() {
-	local -a myconf=(
-		--libdir=$(get_xclibdir)
-		--with-pkgconfigdir=/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 out man pages don't 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 "${D}"/usr/share/doc/${PF} -type l -delete || die
-	find "${D}" -name '*.la' -delete || die
-}
-
-multilib_install() {
-	local install_target
-
-	case "${MULTIBUILD_ID}" in
-		xcrypt_compat-*) install_target="install-libLTLIBRARIES";;
-		xcrypt_nocompat-*)
-			if is_final_abi; then
-				install_target="install"
-			else
-				install_target="install-libLTLIBRARIES"
-			fi
-			;;
-		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
-	esac
-
-	emake DESTDIR="${D}" ${install_target}
-
-	# don't install the libcrypt.so symlink for the "compat" version
-	case "${MULTIBUILD_ID}" in
-		xcrypt_compat-*)
-			rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \
-				"${D}"/usr/include/$(usex system '' 'xcrypt/')xcrypt.h || die
-		;;
-		xcrypt_nocompat-*)
-			if use split-usr; then
-				(
-					shopt -s failglob || die "failglob failed"
-
-					for so_file in "${D}"$(get_xclibdir)/*$(get_libname)*; do
-						so_file=$(basename "${so_file}") || die
-
-						dosym ../../$(usex system '' '../')$(get_libdir)/$(usex system '' 'xcrypt')/${so_file} \
-							/usr/$(get_libdir)/$(usex system '' 'xcrypt/')${so_file}
-					done
-				) || die "symlinking library failure"
-			fi
-			;;
-	esac
-}
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.12-r3.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.17.ebuild
index 166f638a5790..0a1ca516b2b2 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.12-r3.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.17.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit autotools multibuild python-any-r1 multilib-minimal
 
 DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others "
@@ -62,6 +62,7 @@ get_xclibdir() {
 
 multilib_src_configure() {
 	local -a myconf=(
+		--disable-werror
 		--libdir=$(get_xclibdir)
 		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig
 		--includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')"