gentoo auto-resync : 04:12:2022 - 09:02:03

3 files changed, 2 insertions, 89 deletions

diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index bda882873205..f4f30a284bdd 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -2,7 +2,6 @@ AUX libpwquality-1.4.4-musl-fgetpwent_r.patch 1260 BLAKE2B e9c9df60e0e1ba0221853
 AUX libpwquality-1.4.4-pam_pwquality-include.patch 1208 BLAKE2B d7899e6caeb8a1f4515026165d9a321e0a7840b45e4f2472a8562f7a88e35c80f7295349491f3a0037da1ff12e7c74e99236c4ef1d3334fbc477bf393bf3954b SHA512 e570c7f036a1182e43c63b852040468b0dd45ca115ff98f62bc4d3bba02b0c368cd9b1e857e39ea5fcd0b74b265cc7baea529359593512d896f65c6b658afd27
 DIST libpwquality-1.4.4.tar.bz2 426923 BLAKE2B 732e349a89b418d0b29d433551cd67e7b5f0daacb50ea73cfa7e45623801f6b559322645b4f4b0d741512964556d7e004d6a1c63b20e395c3c1b96923506e8bb SHA512 2d49b79105361663f009f7183fde9123e6f1e63bd678dfe5418143f611e763af8dd44374b826b3c22a00e721047c539741dc44d99a2289b9ab229791768d6e76
 DIST libpwquality-1.4.5.tar.bz2 433961 BLAKE2B f5326996ab607bf9d24de446d9714987ad259fd2222bc54983769abc298969e2e9a4cee78f2a5c5d963bd0e5f57ea3aa346b0ce108b465a8da82810486b37e36 SHA512 91a6febbf40047e553b6051df727857df7932c816638f15118a46b8286527a80446ca4f6a050d2b1f4e33335bf4b75290751ce358fa477cb9d06fe89a450d647
-EBUILD libpwquality-1.4.4-r1.ebuild 2088 BLAKE2B 45114a8a0e6fad03eb18ed2e8f0a7229115ed715a2c5a986e734f2cf26bdacacc4c4b357c72bf1bafdc8c733390d5fdc194bd0892fbbd6b588cff35be546dadf SHA512 eb83fcec8077595910448d3be5580438e7842e395d0066d34f4a708fffb9c766c2fe5baccc00180d0ea885f9d41ad60ae749c526bb41d14a31b6a16d5782d676
 EBUILD libpwquality-1.4.4-r2.ebuild 2270 BLAKE2B 71cf75507263df789ca13a713a71d2f1e716e9be9e3a2da76d45dcff65b57ce0382c63518d33cdab866d9d42f374f5970e7316b6bb0d4377311e248ac96a5bd1 SHA512 302c531cb70e24bb615d40a37bdb076a8a3406462a21d40493f85c82224657292b1b52520012f9d37878c1c27c1bc14e958916d60f03485c5ecb47885c966a07
-EBUILD libpwquality-1.4.5.ebuild 2235 BLAKE2B a95eebf770c7ed16e2faa4be35bad2885870cf8801ca802c02429a5dae60919f2d5f24b901b1864281453324895eb94253b67d615dac7beecd25378ab09d110e SHA512 61ffd87cbff1f496c0aa301bbcb575880ff55738a8cbee232e35dff203cea86fc5d33f490c833ebcae76f5e0bd446202c7315acf6a65cfb30b9f19c85dd91bbf
+EBUILD libpwquality-1.4.5.ebuild 2164 BLAKE2B 3a1addde1f7f9d406ca38a9ac1b98a8fa5f13be4b08f231fd6f67262cac915aa6366cb7ccd9a7985cf9264a057820e1f5c80e2e08940ab009106d2991a3ea4d7 SHA512 3cadf8114047c49c9c0d5dfbf3912245d51dac347ede63bd46c828e709c84d0a5101f3a0f0e0bfb8da0e95caacad69afc19fc9dd6e956a3f6e968b2c886606d2
 MISC metadata.xml 354 BLAKE2B c7c1c6aad6af351f12d42c720fe4372aa0966601624454febad3d0ac2c40b069acfaae7f1c77c41546c701a8ad1e242bd715f421ed2103e9c48cc5a63d7e44fa SHA512 41ecf39d00ced11f91831aa04bbca66d0a409367ae87aab765c94dbcdfc4dd8900f707b767e2fe76ad1eaa62c33e2e571027c7e5112e799104029bb773d812df
diff --git a/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild b/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
deleted file mode 100644
index 1da2d9795e4d..000000000000
--- a/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit pam python-r1 usr-ldscript
-
-DESCRIPTION="Library for password quality checking and generating random passwords"
-HOMEPAGE="https://github.com/libpwquality/libpwquality"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="pam python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=sys-libs/cracklib-2.8:=[static-libs(+)?]
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	# ensure pkgconfig files go in /usr
-	sed -e "s:\(pkgconfigdir *=\).*:\1 ${EPREFIX}/usr/$(get_libdir)/pkgconfig:" \
-		-i src/Makefile.{am,in} || die "sed failed"
-
-	if use python ; then
-		# bug #830397
-		export SETUPTOOLS_USE_DISTUTILS=stdlib
-		python_copy_sources
-	fi
-}
-
-src_configure() {
-	# Install library in /lib for pam
-	configuring() {
-		local sitedir
-		econf \
-			--libdir="${EPREFIX}/$(get_libdir)" \
-			$(use_enable pam) \
-			--with-securedir="${EPREFIX}/$(getpam_mod_dir)" \
-			$(use_enable python python-bindings) \
-			$(usex python "--with-pythonsitedir=$(use python && python_get_sitedir)" "") \
-			$(use_enable static-libs static)
-	}
-	if_use_python_python_foreach_impl configuring
-}
-
-src_compile() {
-	if_use_python_python_foreach_impl default
-}
-
-src_test() {
-	if_use_python_python_foreach_impl default
-}
-
-src_install() {
-	if_use_python_python_foreach_impl default
-	if use static-libs; then
-		# Do not install static libs in /lib
-		mkdir -p "${ED}/usr/$(get_libdir)"
-		mv "${ED}/$(get_libdir)/libpwquality.a" "${ED}/usr/$(get_libdir)/" || die
-		gen_usr_ldscript libpwquality.so
-	fi
-	find "${ED}" -name '*.la' -delete || die
-}
-
-if_use_python_python_foreach_impl() {
-	if use python; then
-		python_foreach_impl run_in_build_dir "$@"
-	else
-		"$@"
-	fi
-}
diff --git a/dev-libs/libpwquality/libpwquality-1.4.5.ebuild b/dev-libs/libpwquality/libpwquality-1.4.5.ebuild
index b6704ac8fe51..310d2d4d8b88 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.5.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..11} )
-inherit autotools pam python-r1 usr-ldscript
+inherit pam python-r1 usr-ldscript
 
 DESCRIPTION="Library for password quality checking and generating random passwords"
 HOMEPAGE="https://github.com/libpwquality/libpwquality"
@@ -37,9 +37,6 @@ src_prepare() {
 	sed -e "s:\(pkgconfigdir *=\).*:\1 ${EPREFIX}/usr/$(get_libdir)/pkgconfig:" \
 		-i src/Makefile.{am,in} || die "sed failed"
 
-	# Needed for musl patch, drop on next release
-	eautoreconf
-
 	if use python ; then
 		# bug #830397
 		export SETUPTOOLS_USE_DISTUTILS=stdlib