gentoo resync : 15.01.2020

4 files changed, 7 insertions, 86 deletions

diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 21a18c39dd4c..27f6508bfac0 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,7 +1,5 @@
-DIST libpwquality-1.4.0.tar.bz2 450384 BLAKE2B 52a6f1c1bf90f6f01fb07667937b9792935729be77042bfc97dee8faa923212fa02410ad4e5c56f778bc9a8d248655f0b738889f5a0e73dc201d62d0c79093d0 SHA512 b8049f8b71bbfd4d345dbd4c4cffd29e9029b0fca4c95527af54d11a3b06e4708236b630df6c66738368298679c96cb3bf26b1b5d95cb3c5f7e1073cab8a98d9
 DIST libpwquality-1.4.1.tar.bz2 423053 BLAKE2B 305dbad6bba47d489cc5af7a362564cf9d8800e72d2e77cdbb2ea6fbf4d6888ef07ea93a4af474a60e6c25df417d0222ba54ebfa458894508410cec1ffbae654 SHA512 0bbec7e79a4db56c2cbda65c36003758a1044eee2ac8c678447d96d3cddf034a3196a7d8cd7972e9f50701391b8b81e2c3769fd81c4e4605fed96efd120ff257
 DIST libpwquality-1.4.2.tar.bz2 423072 BLAKE2B 7f571e73ed4d12e6780dd47b6579aca3b7413eff23f9c11114ee2f95134893097b3cd183fcfc5482c96ca9bfdd1e137d4064062591f56b3998f3bf85768389eb SHA512 6f395e94797cc565edae6de8f4c7c60736d07ffa849c9878ec4d867f8cb7bea6f08bdd20501791dd05b02d487f8fea66a02a30841c7cea6e86b5903eaf685879
-EBUILD libpwquality-1.4.0.ebuild 2013 BLAKE2B e02c0b8cdbf67f824252221bf8068598512989c31d3b40466f9f078c056d539a73e79ecc10976e07f8270217af9918e3694bc7836e8bd436aaf537c0985b66b4 SHA512 33485f5ef2564b490372a6a6ecee65b08ed40079658ddeed9481707d7d496870f74e05e1c8bb52e4ff13b1a0b9e21d730aeaca05324ec1978621ae488b0fa876
-EBUILD libpwquality-1.4.1.ebuild 2012 BLAKE2B c2e9d210c8f61b4afc05eb7869d5f16a1cde6cfad4aa2a6f95fd46b6e87bd7726a648b0f7de27a9fdb0d38eef9a85fea63e71247a6130132d3111cf8aea2f0a0 SHA512 35fe8a6a7df9a79580ca374d39a78cb66d1376c91eec698351e74bb05dffa3fb3389235a377ea5eef61155844efb7eefe737fde271b88599397b3f8ce04e9c6e
-EBUILD libpwquality-1.4.2.ebuild 2029 BLAKE2B 701d8bfac112b7f19f7511516bae9d0f3f832ec661b0234ca02ad46e4827542945a5f8813b99f5e9c1702073f1f9d1313995809219d681ee85217972c576995c SHA512 287996e5e2770c9b75afb94472f418855c72f70f28638b51029b9ea11a81f28e8f5af231ae55a81685425db06fd62d85957ab7ee83e2960f64131adbf567c1b3
+EBUILD libpwquality-1.4.1.ebuild 2007 BLAKE2B ae4222f4d3d4bb1f9af95caed3308210b4032f88bafeadcd287b75efd21e11ba493d8cb340107eb2caafab36f57ffb260b2b6e71294078509b790dca90d8e31e SHA512 01781514a50d9296c2de51b88a87fea379dbfa4190160fe603f52db90762dbcd78f15861e70e5d888f295a9dda06ff0504b88ce630040a5f7796fe9d7fdd83a9
+EBUILD libpwquality-1.4.2.ebuild 2027 BLAKE2B b9c0a7598f7f6f1deae68bcaa371ce45183273eef9786b7c51f8fb4211f092a3fccbcc30c2c281322bf9f2eda9d1dd3a475abfb356226b6009f7136cc4dbd03b SHA512 b042bf39c6da73bc622d1ad59f28f23c82e45bdcaf1a8e5f7c5991f232fdd7f50ed0eb38cd4e7d9550685a714b60a52016f7f3c3ba090b5f293bd981bb3f2701
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libpwquality/libpwquality-1.4.0.ebuild b/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
deleted file mode 100644
index 0bb5bb2eb52c..000000000000
--- a/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit eutils multilib pam python-r1 toolchain-funcs 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 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="pam python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=sys-libs/cracklib-2.8:=[static-libs(+)?]
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-"
-
-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"
-	use python && python_copy_sources
-}
-
-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
-	prune_libtool_files --modules
-}
-
-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.1.ebuild b/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
index 78dc44265604..b636c419f030 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils multilib pam python-r1 toolchain-funcs usr-ldscript
 
@@ -12,7 +12,7 @@ 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 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="pam python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
index f14269767cb8..c0df7acab5f3 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit pam python-r1 toolchain-funcs usr-ldscript