cracklib: upgraded package to upstream
Upgraded sys-libs/cracklib to version 2.8.19 on amd64, arm, x86
This isn't used by any targets atm.
BUG=chromium:267982
TEST=`cbuildbot chromiumos-sdk` works
Change-Id: Ie33169634afe89ce4cff9b6d2d51761850a2dfb9
Reviewed-on: https://chromium-review.googlesource.com/176800
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/metadata/md5-cache/sys-libs/cracklib-2.8.13-r1 b/metadata/md5-cache/sys-libs/cracklib-2.8.13-r1
deleted file mode 100644
index 9dd7e0b..0000000
--- a/metadata/md5-cache/sys-libs/cracklib-2.8.13-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=python? ( <dev-lang/python-3 )
-DESCRIPTION=Password Checking Library
-HOMEPAGE=http://sourceforge.net/projects/cracklib
-IUSE=nls python
-KEYWORDS=alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=CRACKLIB
-RDEPEND=python? ( <dev-lang/python-3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/cracklib/cracklib-2.8.13.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 libtool 0fd90d183673bf1107465ec45849d1ea multilib ded93e450747134a079e647d888aa80b toolchain-funcs 3e30ef439a720915f8f4fd4fe75f704c user 9e552f935106ff0bc92af16da64b4b29
-_md5_=6bab9c311db1c5a6a29f74f0b254ae59
diff --git a/metadata/md5-cache/sys-libs/cracklib-2.8.19 b/metadata/md5-cache/sys-libs/cracklib-2.8.19
new file mode 100644
index 0000000..8992c93
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/cracklib-2.8.19
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=zlib? ( sys-libs/zlib ) python? ( dev-python/setuptools ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+DESCRIPTION=Password Checking Library
+EAPI=3
+HOMEPAGE=http://sourceforge.net/projects/cracklib
+IUSE=build nls python static-libs zlib
+KEYWORDS=alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
+LICENSE=LGPL-2.1
+RDEPEND=zlib? ( sys-libs/zlib ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+SLOT=0
+SRC_URI=mirror://sourceforge/cracklib/cracklib-2.8.19.tar.gz
+_eclasses_=distutils b4c334e216d998c4ce4b750cb091e42e eutils d40dc948067bd3db1c8ebf7d51897313 libtool 0fd90d183673bf1107465ec45849d1ea multilib ded93e450747134a079e647d888aa80b python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 3e30ef439a720915f8f4fd4fe75f704c user 9e552f935106ff0bc92af16da64b4b29
+_md5_=c8e32767c7e23c21030432e957210a3c
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index e014bac..2e20647 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1 +1 @@
-DIST cracklib-2.8.13.tar.gz 593050 RMD160 948b02e6a74dfc94192f6f6ce9e3fc733d7a92f4 SHA1 e107d0a14c09aea9c63c18840db8b94b972b5315 SHA256 0a06caff3626c397d023f0c19efedfea295180c2c5ba2def57016a17e158041a
+DIST cracklib-2.8.19.tar.gz 611602 SHA256 7086b0ca23f875c9cd9ea2a993c262384b274dba9c4ea1da845ec8ac290748a9 SHA512 64fa9c9d53e9d7f82fa8de9708096b6d6ad4704c4a89c42e113395612af1a82385a7de5f8678fe521016960ebfd0ed4258041afe3a5e4d15bd50ec76bb76fc2c WHIRLPOOL 2fa1e15430987dcc6d9561474e84d4ff19ace156cc6fa7a073c97d263e23b44beb7b83291843b6e7a8bab699f3a6e2d2e87fcf99371379096c62fa58ca26dfdb
diff --git a/sys-libs/cracklib/cracklib-2.8.13-r1.ebuild b/sys-libs/cracklib/cracklib-2.8.13-r1.ebuild
deleted file mode 100644
index 01b73a8..0000000
--- a/sys-libs/cracklib/cracklib-2.8.13-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.13-r1.ebuild,v 1.3 2010/03/08 22:35:46 zmedico Exp $
-
-inherit eutils toolchain-funcs multilib libtool
-
-MY_P=${P/_}
-DESCRIPTION="Password Checking Library"
-HOMEPAGE="http://sourceforge.net/projects/cracklib"
-SRC_URI="mirror://sourceforge/cracklib/${MY_P}.tar.gz"
-
-LICENSE="CRACKLIB"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls python"
-
-DEPEND="python? ( <dev-lang/python-3 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- # workaround #195017
- if has unmerge-orphans ${FEATURES} && has_version "<${CATEGORY}/${PN}-2.8.10" ; then
- eerror "Upgrade path is broken with FEATURES=unmerge-orphans"
- eerror "Please run: FEATURES=-unmerge-orphans emerge cracklib"
- die "Please run: FEATURES=-unmerge-orphans emerge cracklib"
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-python-linkage.patch #246747
- elibtoolize #269003
-}
-
-src_compile() {
- econf \
- --with-default-dict='$(libdir)/cracklib_dict' \
- $(use_enable nls) \
- $(use_with python) \
- || die
- emake || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- rm -r "${D}"/usr/share/cracklib
-
- # move shared libs to /
- gen_usr_ldscript -a crack
-
- insinto /usr/share/dict
- doins dicts/cracklib-small || die "word dict"
-
- dodoc AUTHORS ChangeLog NEWS README*
-}
-
-pkg_postinst() {
- if [[ ${ROOT} == "/" ]] ; then
- ebegin "Regenerating cracklib dictionary"
- create-cracklib-dict /usr/share/dict/* > /dev/null
- eend $?
- fi
-}
diff --git a/sys-libs/cracklib/cracklib-2.8.19.ebuild b/sys-libs/cracklib/cracklib-2.8.19.ebuild
new file mode 100644
index 0000000..08bfafc
--- /dev/null
+++ b/sys-libs/cracklib/cracklib-2.8.19.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.19.ebuild,v 1.12 2012/10/31 20:49:42 zerochaos Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
+
+inherit eutils distutils libtool toolchain-funcs
+
+MY_P=${P/_}
+DESCRIPTION="Password Checking Library"
+HOMEPAGE="http://sourceforge.net/projects/cracklib"
+SRC_URI="mirror://sourceforge/cracklib/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+IUSE="build nls python static-libs zlib"
+
+RDEPEND="zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ python? ( dev-python/setuptools )"
+
+S=${WORKDIR}/${MY_P}
+
+PYTHON_MODNAME="cracklib.py"
+do_python() {
+ use build && return 0
+ use python || return 0
+ case ${EBUILD_PHASE} in
+ prepare|configure|compile|install)
+ pushd python > /dev/null || die
+ distutils_src_${EBUILD_PHASE}
+ popd > /dev/null
+ ;;
+ *)
+ distutils_pkg_${EBUILD_PHASE}
+ ;;
+ esac
+}
+
+pkg_setup() {
+ # workaround #195017
+ if has unmerge-orphans ${FEATURES} && has_version "<${CATEGORY}/${PN}-2.8.10" ; then
+ eerror "Upgrade path is broken with FEATURES=unmerge-orphans"
+ eerror "Please run: FEATURES=-unmerge-orphans emerge cracklib"
+ die "Please run: FEATURES=-unmerge-orphans emerge cracklib"
+ fi
+
+ if use !build; then
+ use python && python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ elibtoolize #269003
+ do_python
+}
+
+src_configure() {
+ export ac_cv_header_zlib_h=$(usex zlib)
+ export ac_cv_search_gzopen=$(usex zlib -lz no)
+ econf \
+ --with-default-dict='$(libdir)/cracklib_dict' \
+ --without-python \
+ $(use_enable nls) \
+ $(use_enable static-libs static)
+}
+
+src_compile() {
+ default
+ do_python
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ use static-libs || find "${ED}"/usr -name libcrack.la -delete
+ rm -r "${ED}"/usr/share/cracklib
+
+ do_python
+
+ # move shared libs to /
+ gen_usr_ldscript -a crack
+
+ insinto /usr/share/dict
+ doins dicts/cracklib-small || die
+
+ dodoc AUTHORS ChangeLog NEWS README*
+}
+
+pkg_postinst() {
+ if [[ ${ROOT} == "/" ]] ; then
+ ebegin "Regenerating cracklib dictionary"
+ create-cracklib-dict "${EPREFIX}"/usr/share/dict/* > /dev/null
+ eend $?
+ fi
+
+ do_python
+}
+
+pkg_postrm() {
+ do_python
+}
diff --git a/sys-libs/cracklib/files/cracklib-2.8.13-python-linkage.patch b/sys-libs/cracklib/files/cracklib-2.8.13-python-linkage.patch
deleted file mode 100644
index 568d081..0000000
--- a/sys-libs/cracklib/files/cracklib-2.8.13-python-linkage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/246747
-
---- cracklib/python/Makefile.in
-+++ cracklib/python/Makefile.in
-@@ -57,7 +57,7 @@
- am__installdirs = "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pythondir)"
- pyexecLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(pyexec_LTLIBRARIES)
--_cracklibmodule_la_LIBADD =
-+_cracklibmodule_la_LIBADD = -lpython$(PYTHON_VERSION)
- _cracklibmodule_la_SOURCES = _cracklibmodule.c
- _cracklibmodule_la_OBJECTS = _cracklibmodule.lo
- _cracklibmodule_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
