Do not install static library in /lib (bug #449224, thanks to BillWho). Update to python-r1.eclass.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 96 insertions, 52 deletions

diff --git a/dev-libs/libpwquality/ChangeLog b/dev-libs/libpwquality/ChangeLog
index c4058c45007a..01da6b2f08b1 100644
--- a/dev-libs/libpwquality/ChangeLog
+++ b/dev-libs/libpwquality/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libpwquality
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpwquality/ChangeLog,v 1.3 2012/12/05 08:54:27 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpwquality/ChangeLog,v 1.4 2012/12/29 19:29:15 tetromino Exp $
+
+*libpwquality-1.2.0-r2 (29 Dec 2012)
+
+  29 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -libpwquality-1.2.0.ebuild, +libpwquality-1.2.0-r2.ebuild:
+  Do not install static library in /lib (bug #449224, thanks to BillWho).
+  Update to python-r1.eclass. Drop old.
 
 *libpwquality-1.2.0-r1 (05 Dec 2012)
 
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 290fcbcddfc0..8788491aef34 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -3,17 +3,17 @@ Hash: SHA256
 
 DIST libpwquality-1.2.0.tar.bz2 361427 SHA256 32cfbe302ade7e7271ed44bcae8aae3b6b55ca56ff642c4ece1752ffaa8003ee SHA512 b125448dc26f904abe9bacfd1f61505220152a4a27c6b468a49724c875c27250ab4040ac2ffc21faac1326b70fe20eafb005b618ff0125f292cce1bd66ea25aa WHIRLPOOL 1a3452b69b76cb5743645e79af6772a38848d7ed17089134fa07fb323f15f2df4599a19419a0dd4d4f49dd9374cb01172696d27878e508e526f1b921aa18e27e
 EBUILD libpwquality-1.2.0-r1.ebuild 1416 SHA256 ab86a9e12c9f243594dc4967929f1fc56f7cc26f30025018318f2c6fce12860a SHA512 fb23cea60b35ff311e67120cde8340ddafb7139ca71877c7ad2527b7a526f6c164b9bab0e2c09cfa75cf64f3271e7cf8feef9b50c26ee453cc6f18708e682151 WHIRLPOOL f0691e909179e33dbeebd480788ed9b2f54e40061944e56bc50d06dd685dae3cff3dc92e6afadb0cb3d075503eeb63ee65f7e9dc5439afc8549d66ed7f858cd6
-EBUILD libpwquality-1.2.0.ebuild 1065 SHA256 9253e8a6276947b74042df0241e7e248eb798dda33afd0f2b512f074c295b336 SHA512 0e44374265da1d54613c497273281ef5d58e150d52e2eb154f9650e1937b7db60bb7b6dd97a2be5eb26da0f30d3176d61db58663bb94fa25ef4417b963e5fdd2 WHIRLPOOL 6b3d0e7b7d09e1c583b8c49b00a3b4ef3477bb36a1c677719758c57fc7641446573e8ebf9ede00e2e01e36b6da68abba6fad657dbcb132fed205d323e314de59
-MISC ChangeLog 821 SHA256 317a8d6f649bcd0de6b724512441b7448437063467d3c2555b5a77ae72e3f932 SHA512 f68ac9957007403aba0acf5c60d43fe394c75bf86d6e00db6b632be8a6b4d8c703016235dbb07b5789c03116a19379264f0548da6fcb953a701e49d6b1b627c2 WHIRLPOOL f33b4656a1c2f099d100eaedecd241ceb00db51acd98686a86da7ad3c12ca94eea74ef746c9eb1d502d75bbb70dc46b68016ea10f008000431c342c80cee59be
+EBUILD libpwquality-1.2.0-r2.ebuild 2055 SHA256 43f11c2892aa803909fe418fcbf86a188370dfbf58fce596d599d0b0f6b941b2 SHA512 7a43f541aa6a7ba406bdb11126c94e78783bb5fce497a9a15ff3b4b19ea91dce8034b45fd367580f601579fe6e27583259a9283db2c9355bf44e9a4ebece6e6a WHIRLPOOL 4785919636d1b0d7b0d9d662b93b3d994c96512e09eb4a1376adfdf013d7af3a8787f369e2b5dd58c4853ad5c74c52bf87de939289ee8b372a6992f4efaa16ad
+MISC ChangeLog 1094 SHA256 1d0eaad05f00b8ad245884e429bae867035a2230a6879416b5bbea79592f8d65 SHA512 868d8d14e439605a519da233c6de44e38ccc3b48c3c0553a78b6bc1c614bfa31ac1672280395f384cb152c89046a1063968cc23c7e5d9e048626fdd44cc5fc92 WHIRLPOOL 68f497fdbb1d0c52ec6b67ad660cb170976579c3c1c45cbf40937eebfa9ba2a33b4c562c62b8dfa1c5ac71925096943f2d3cae730a2240c61daa607b706a39d5
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQvwvEAAoJEJ0WA1zPCt1hyIgH/1chNWrv/6safVp7KM1wlnje
-N+pJU7oCBdN9Wp8iPsQuSGFChD6cGIhuzj033rXQYgjMJps4ZXLPxJJcYloKH3Pt
-24sv6AsGzrXQTVTe0M3llFcJp5ehy+7iGt9ClusI9gr7AyNI1vveueqM8COAWixV
-2AInn/8bBkDBcB7rTlbGIxyyCfgz4btf1zRPgfcBSPP3AHBTIQrn+2Vxjglphhn/
-PHW3UzRbey24IqB8aSMaMg+iC9AZhmwdcz55E2OLeRXFzLnxYZ/dp0gRCHOji3wp
-fmd7Psbfa6OaTthasV7oRx5KxUNmcCMpMEVVNb1SPF6hzbt3Ddje84mMA6xdEV0=
-=wmiz
+iQEcBAEBCAAGBQJQ30SMAAoJEJ0WA1zPCt1hNN0H/3HkjdBvEGAIhiH2qPef9ZvR
+LwUC0EkYMr60wAjURjB0I8kDlFAq7MRxgxpjMcLR5wRS7yPVPd/SaFtS6O5YbLYb
+UNXOtLuqdQJIvSWVg+e9lsDs3AdyExARywrpCb65Cr08chHD9LwkV0ZLRm75Dwew
+jGyMI2VtMjMv6U8kGLuvIJFQTX4uML8Hxwk6ptvTAl7cc1b2JynYOmEpeP/Rc35r
+WjeU6zKQHI5V2Im4fAiEntJGs01gDctGALC0k6bqGEZ/6NcK3iYC49MlGghq6H+6
+c95hg/yGpF77gRrrYTiNhUHFGvNIA6SBlTkZjZb/qFTeXy/TH8i50YBeIi6vXwc=
+=JTSf
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libpwquality/libpwquality-1.2.0-r2.ebuild b/dev-libs/libpwquality/libpwquality-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..3eb675160b25
--- /dev/null
+++ b/dev-libs/libpwquality/libpwquality-1.2.0-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpwquality/libpwquality-1.2.0-r2.ebuild,v 1.1 2012/12/29 19:29:15 tetromino Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib pam python-r1 toolchain-funcs
+
+DESCRIPTION="Library for password quality checking and generating random passwords"
+HOMEPAGE="https://fedorahosted.org/libpwquality/"
+SRC_URI="https://fedorahosted.org/releases/l/i/${PN}/${P}.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pam python static-libs"
+
+RDEPEND=">=sys-libs/cracklib-2.8:=
+	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	virtual/pkgconfig"
+
+src_prepare() {
+	# 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() {
+	run_in_build_dir() {
+		pushd "${BUILD_DIR}" > /dev/null || die
+		"$@"
+		popd > /dev/null
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir "$@"
+	else
+		"$@"
+	fi
+}
diff --git a/dev-libs/libpwquality/libpwquality-1.2.0.ebuild b/dev-libs/libpwquality/libpwquality-1.2.0.ebuild
deleted file mode 100644
index 7f99f73ebc67..000000000000
--- a/dev-libs/libpwquality/libpwquality-1.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpwquality/libpwquality-1.2.0.ebuild,v 1.2 2012/08/24 22:00:37 tetromino Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2:2.7"
-
-inherit eutils multilib python
-
-DESCRIPTION="Library for password quality checking and generating random passwords"
-HOMEPAGE="https://fedorahosted.org/libpwquality/"
-SRC_URI="https://fedorahosted.org/releases/l/i/${PN}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pam python static-libs"
-
-RDEPEND=">=sys-libs/cracklib-2.8
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_configure() {
-	econf \
-		$(use_enable pam) \
-		$(use_enable python python-bindings) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	# prune_libtool_files doesn't remove it...
-	use pam && rm -v "${ED}usr/$(get_libdir)/security/pam_pwquality.la"
-	prune_libtool_files
-}