gentoo resync : 25.11.2020

5 files changed, 3 insertions, 136 deletions

diff --git a/sys-auth/passwdqc/Manifest b/sys-auth/passwdqc/Manifest
index 3a5fe0c20852..4dcc986fc5f8 100644
--- a/sys-auth/passwdqc/Manifest
+++ b/sys-auth/passwdqc/Manifest
@@ -1,6 +1,3 @@
-AUX passwdqc-1.3.0-build.patch 1773 BLAKE2B e954aa56f4f12c57430b9c53cac9220360b6450a747fd50305db8838638833e5f76fc893be762593f89ab02b665499fbc4063dfd7ad3019134ef81771e3dcc50 SHA512 da43381deab4c39e8c905187f17e49379e44b96c729d229a1fa5aff067b510fae5cbb107896fd83273cc8f41e916023eff5d1b1f37ad739e4de3cf3945f289b8
-DIST passwdqc-1.3.0.tar.gz 48833 BLAKE2B bf6353749376ca8b52a8aac89b05561d4a0dde54133361b77228dd4d35f2e1e75f0b53a0f9c4fc2f6be5717110c1d762e2aa76f6461281b60fa3bdc9b19f2f7d SHA512 d9c2fd075ed4ff1f1dfa63fe40010d446abf8db306cacc77fd1e429fbd2dd1a6d2e4e91df46beb4c30bc30ff0cdd183ba85cefd362455ead9629d3a1c4eefece
 DIST passwdqc-1.4.0.tar.gz 55219 BLAKE2B 3f96a2d219ee23f11db2ad8ba433eaa56b97a263ad1a49159e0356b779cb4486ec9aa74cd7002fdd6d273e5a7bae4fe1b94e02f60256d331e5afc30d63e81360 SHA512 b9be6632688a1d7d929ec546679a366a67d44e7841e106c7f739a8e0656842866125160c87b04c8e0b3189a3e85eb182aa789196f68925b2f8ec71cd6a479800
-EBUILD passwdqc-1.3.0.ebuild 1711 BLAKE2B 19a51a550eb5824a35341c0638c1c1fec3d9e5ce73772151b6e4eae9afa99211b562519a796aab117f4ebfad16e2c8716cb067ebc1162da4d021694f38102f72 SHA512 8e245c777ef722106cc0e89d413dfc83b434e9b90ff9559eea47d90245f4e9b8bcf9ed8a15d42922cef7084c8e1be618d60aca6b99b06dc73a619638aecb28e0
-EBUILD passwdqc-1.4.0-r1.ebuild 1282 BLAKE2B 80353f2c519fd5afb65a4d567948407088e3cad8605ac6f87f34aec548f5e27d277619ddbe4f7140dbd59bc823b89fc22a1c9ce5bf8c8bb3d34c022b419c137d SHA512 30806db924279bb17fd0f1466628f51c0bd7a7e110ff2b4959fc6c76f9222f9d232678a6906ad802ec50a01f1f0edae1de57a24ca3cfd0ab8b6b3ff9a4452abc
-MISC metadata.xml 328 BLAKE2B 708e739a28626b1451952b869907c4c2513774329dfdac794178b468ffe1044db82ea5c015c641a5142f1f6ee6176545193e97beed1698f7f8c42a3d38e3f84a SHA512 383c32b28259f9a70406eb6c9a3d05143212a63c347019143983c3e6a2c48eb9a32ed7e8e50c99339b65c60d680b530770c4fa3e826c6e746429274814716d97
+EBUILD passwdqc-1.4.0-r1.ebuild 1274 BLAKE2B 64a1c52ee69fc3697d85d11083a57853eb483c60f7a6c41ada89e06ee8a885f921705a81246b2ad566f6ffa205fd9d2a12334f5b9b17fdb854a3be023a3ae007 SHA512 3c9372041f51b688d43f29aca59f411a77c3497d50a3cce06ad895331486ff6869f95be0670b3f0f6dba9821598455e6e129de644d75ebe70c113aa0ea6098cb
+MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/sys-auth/passwdqc/files/passwdqc-1.3.0-build.patch b/sys-auth/passwdqc/files/passwdqc-1.3.0-build.patch
deleted file mode 100644
index c8adeb89b4ab..000000000000
--- a/sys-auth/passwdqc/files/passwdqc-1.3.0-build.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -20,10 +20,11 @@
- BINMODE = 755
- CONFDIR = /etc
- CONFMODE = 644
--SHARED_LIBDIR = /lib
-+LIBDIR = lib
-+SHARED_LIBDIR = /$(LIBDIR)
- SHARED_LIBDIR_SUN = /usr/lib
- SHARED_LIBDIR_REL = ../..$(SHARED_LIBDIR)
--DEVEL_LIBDIR = /usr/lib
-+DEVEL_LIBDIR = /usr/$(LIBDIR)
--SECUREDIR = /lib/security
-+SECUREDIR = /$(LIBDIR)/security
- SECUREDIR_SUN = /usr/lib/security
- SECUREDIR_DARWIN = /usr/lib/pam
-@@ -48,7 +49,7 @@
- INSTALL_SUN = /usr/ucb/install -c
- CFLAGS = -Wall -W -O2
- CFLAGS_lib = $(CFLAGS) -fPIC
--CFLAGS_bin = $(CFLAGS) -fomit-frame-pointer
-+CFLAGS_bin = $(CFLAGS)
- 
- LDFLAGS =
- LDFLAGS_shared = --shared
-@@ -93,7 +94,7 @@
- 
- default: all
- 
--all pam utils install install_lib install_pam install_utils uninstall remove remove_lib remove_pam remove_utils:
-+all lib pam utils install install_lib install_pam install_utils uninstall remove remove_lib remove_pam remove_utils:
- 	case "`uname -s`" in \
- 	Linux)	$(MAKE) CFLAGS_lib="$(CFLAGS_lib) -DHAVE_SHADOW" \
- 			LDFLAGS_lib="$(LDFLAGS_lib_LINUX)" \
-@@ -126,18 +127,20 @@
- 
- all_wrapped: pam_wrapped utils_wrapped
- 
-+lib_wrapped: $(SHARED_LIB) $(DEVEL_LIB)
-+
- pam_wrapped: $(SHARED_PAM)
- 
- utils_wrapped: $(BINS)
- 
- $(SHARED_LIB): $(OBJS_LIB) $(MAP_LIB)
--	$(LD_lib) $(LDFLAGS_lib) $(OBJS_LIB) $(LDLIBS_lib) -o $(SHARED_LIB)
-+	$(LD_lib) $(LDFLAGS) $(LDFLAGS_lib) $(OBJS_LIB) $(LDLIBS_lib) -o $(SHARED_LIB)
- 
- $(DEVEL_LIB): $(SHARED_LIB)
- 	$(LN_s) $(SHARED_LIB) $(DEVEL_LIB)
- 
- $(SHARED_PAM): $(OBJS_PAM) $(MAP_PAM) $(DEVEL_LIB)
--	$(LD_lib) $(LDFLAGS_pam) $(OBJS_PAM) $(LDLIBS_pam) -L. -lpasswdqc -o $(SHARED_PAM)
-+	$(LD_lib) $(LDFLAGS) $(LDFLAGS_pam) $(OBJS_PAM) $(LDLIBS_pam) -L. -lpasswdqc -o $(SHARED_PAM)
- 
- pwqgen: $(OBJS_GEN) $(DEVEL_LIB)
- 	$(LD) $(LDFLAGS) $(OBJS_GEN) -L. -lpasswdqc -o $@
diff --git a/sys-auth/passwdqc/metadata.xml b/sys-auth/passwdqc/metadata.xml
index dec6162a1b7c..203fa55c746f 100644
--- a/sys-auth/passwdqc/metadata.xml
+++ b/sys-auth/passwdqc/metadata.xml
@@ -5,7 +5,4 @@
 	<email>zlogene@gentoo.org</email>
 	<name>Mikle Kolyada</name>
 </maintainer>
-<use>
-	<flag name="utils">Install pwqcheck and pwqgen helper utilities</flag>
-</use>
 </pkgmetadata>
diff --git a/sys-auth/passwdqc/passwdqc-1.3.0.ebuild b/sys-auth/passwdqc/passwdqc-1.3.0.ebuild
deleted file mode 100644
index 61f8e548190d..000000000000
--- a/sys-auth/passwdqc/passwdqc-1.3.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit pam eutils toolchain-funcs multilib
-
-DESCRIPTION="Password strength checking library (and PAM module)"
-HOMEPAGE="http://www.openwall.com/passwdqc/"
-SRC_URI="http://www.openwall.com/${PN}/${P}.tar.gz"
-
-LICENSE="Openwall BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="pam utils"
-
-RDEPEND="
-	pam? (
-		sys-libs/pam
-		!<sys-auth/pam_passwdqc-1.3.0
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3.0-build.patch
-	sed -i \
-		-e 's:`uname -s`:Linux:' \
-		Makefile || die
-	# See if the system has a shadow.h. #554504
-	echo '#include <shadow.h>' > "${T}"/test.c
-	if ! $(tc-getCPP) ${CPPFLAGS} "${T}"/test.c >& /dev/null ; then
-		sed -i -e 's:-DHAVE_SHADOW::' Makefile || die
-	fi
-}
-
-_emake() {
-	emake \
-		LIBDIR="$(get_libdir)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		"$@"
-}
-
-src_compile() {
-	# The use of wrapped targets defeats the Makefile dep tracking.
-	# Build all the targets explicitly after the library.
-	_emake lib
-	if use pam || use utils ; then
-		_emake $(usev pam) $(usev utils)
-	fi
-}
-
-src_install() {
-	_emake \
-		DESTDIR="${ED}" \
-		install_lib $(usex pam install_pam '') $(usex utils install_utils '')
-	dodoc README PLATFORMS INTERNALS
-}
-
-pkg_postinst() {
-	if use pam ; then
-		elog "To activate pam_passwdqc use pam_passwdqc.so instead"
-		elog "of pam_cracklib.so in /etc/pam.d/system-auth."
-		elog "Also, if you want to change the parameters, read up"
-		elog "on the pam_passwdqc(8) man page."
-	fi
-}
diff --git a/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild b/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
index 3861096f8540..462be697b147 100644
--- a/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
+++ b/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.openwall.com/${PN}/${P}.tar.gz"
 
 LICENSE="Openwall BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-libs/pam"
 DEPEND="${RDEPEND}"