gentoo resync : 03.03.2019

2 files changed, 27 insertions, 20 deletions

diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index b3f27c3388dc..b16d4aa52c03 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,5 +1,5 @@
 AUX cracklib-2.9.6-CVE-2016-6318.patch 3288 BLAKE2B ed213c5d5228ded6ceed088bed2bfe462f6102bb1414dbdd5e61f1cb4bdfd50902e072c0e35222d6e913bb61e87a4c25102aebb82661c9c6668d7caea6ae158c SHA512 232f632034fb602ea464885cd9f07aa30a3feb04bd231e7c2f2854f47493e027d87910454c089dc2c567aa01f6882bed7ee2a86d929fa36178746cf2a7dbf346
 AUX cracklib-2.9.6-fix-long-word-bufferoverflow.patch 1614 BLAKE2B 01add5ae4241f0200e8b3e35c376f176c137c8ab9a75e4364e4fd285ac85d1b2e59327eb34bb21f29e0b638199cf4f9c9603b8e747d52e62978fd392b13ce89d SHA512 e4a2f9f467d3f0ce8acd4c9ea6ca19787dca6bd2bfaa80ddbf9ec1214a5e2b519c088b07760349adac9bd6805a4b512c015181863d679643cc12c68104c29a6d
 DIST cracklib-2.9.6.tar.gz 642402 BLAKE2B 4d7a0d12d1e7101c82d03f76e073407481078747c283fe3251f947542017fff03fbc5e98505c6a7a8987a2bbcea99dab558c15b1eb8fd16755859ce5a4440ed2 SHA512 2b09672e5b412d670e7ed911ebf0c0023fe2901ea05c9c02eefb7a58a13cddbc27a65d75bb20be9f8cebf4c90a9a56dfe1a3b656dff62b1d6048f5376e671786
-EBUILD cracklib-2.9.6-r1.ebuild 2586 BLAKE2B 470c7a72a6e09e0157a9e2771bd5aaddf31cdd2ffa53bbf98ed06199791264ebcb4ebf4c0d0880ca7c5c25b0c23f886dfb3ce3492bbd2853847b92d1506654aa SHA512 0154faa441e253340b73b681ca939cc63bb3a3e6fc165f94593da6036478bd3b849557ac53f6b260028d4627414b269434d7bbb3f5dc1e5bccb149abf10add2c
+EBUILD cracklib-2.9.6-r2.ebuild 2810 BLAKE2B f32fa0a1d090544507ddb38a7dcce74a57b11bc93d2cef7abb04ef4f2d29b7461d50808cd83a59ae81fd4b4e975c99a3abddd35ae41ac421f39c8a33be81a7cc SHA512 6835917366c92d1ecd06462707f5b3f0823f63277b9b34ad716bdbcc1a732c6a60dd6a83aef364e34611ed4d30d41daa9a824b972eba94e06ac5ef9ad3297b5a
 MISC metadata.xml 384 BLAKE2B 68827917aeea5af1cc1b3c9badfc420c3e9652f3c79fa22b925f4e317c722bf43420c5cb7e4060ed63d5b5319aad1d4cbe3b09f47422a1be06d07c598ea1cff5 SHA512 773287176f56f1a0f11edc6cd1ca85453f998ad8e58b1e608562335f814aab18124bfb850063dd4fa35aba525b776bf2c202d8afa6d4b51e354276678f324bd1
diff --git a/sys-libs/cracklib/cracklib-2.9.6-r1.ebuild b/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
index 101aef422958..34d81481f3b1 100644
--- a/sys-libs/cracklib/cracklib-2.9.6-r1.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 DISTUTILS_OPTIONAL=1
 
-inherit eutils distutils-r1 libtool multilib-minimal toolchain-funcs
+inherit distutils-r1 libtool multilib-minimal toolchain-funcs
 
 MY_P=${P/_}
 DESCRIPTION="Password Checking Library"
 HOMEPAGE="https://github.com/cracklib/cracklib/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
+# source tarballs on GitHub lack pre-generated configure script.
+#SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -20,13 +22,18 @@ IUSE="nls python static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	python? (
 		dev-python/setuptools[${PYTHON_USEDEP}]
 	)"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/cracklib-2.9.6-CVE-2016-6318.patch
+	"${FILESDIR}"/cracklib-2.9.6-fix-long-word-bufferoverflow.patch
+)
 
 do_python() {
 	multilib_is_native_abi || return 0
@@ -46,23 +53,23 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/cracklib-2.9.6-CVE-2016-6318.patch
-	epatch "${FILESDIR}"/cracklib-2.9.6-fix-long-word-bufferoverflow.patch
-
+	eapply -p2 "${PATCHES[@]}"
+	eapply_user
 	elibtoolize #269003
 	do_python
 }
 
 multilib_src_configure() {
+	local myeconfargs=(
+		# use /usr/lib so that the dictionary is shared between ABIs
+		--with-default-dict='/usr/lib/cracklib_dict'
+		--without-python
+		$(use_enable nls)
+		$(use_enable static-libs static)
+	)
 	export ac_cv_header_zlib_h=$(usex zlib)
 	export ac_cv_search_gzopen=$(usex zlib -lz no)
-	# use /usr/lib so that the dictionary is shared between ABIs
-	ECONF_SOURCE=${S} \
-	econf \
-		--with-default-dict='/usr/lib/cracklib_dict' \
-		--without-python \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {
@@ -89,11 +96,11 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	einstalldocs
-	prune_libtool_files
-	rm -r "${ED}"/usr/share/cracklib
+	find "${ED}" -name "*.la" -delete || die
+	rm -r "${ED%/}"/usr/share/cracklib || die
 
 	insinto /usr/share/dict
-	doins dicts/cracklib-small || die
+	doins dicts/cracklib-small
 }
 
 pkg_postinst() {