Fix installing .py files.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 59 insertions, 22 deletions

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index 25d358f4f3d1..9161203f206d 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/cracklib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.192 2014/05/29 21:21:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.193 2014/05/29 22:00:54 mgorny Exp $
+
+  29 May 2014; Michał Górny <mgorny@gentoo.org>
+  +files/cracklib-2.9.1-setup.py-srcdir.patch, cracklib-2.9.1-r1.ebuild:
+  Fix installing .py files.
 
   29 May 2014; Michał Górny <mgorny@gentoo.org> cracklib-2.9.1-r1.ebuild:
   Fix tests.
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index 62de6a723f19..872fbe30ced5 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX cracklib-2.8.16-no-nls.patch 743 SHA256 51b8188ed3a580712aba36817ba1b288108273dab4965901798c787e0fce00be SHA512 691fa76eee5ef232500ad03abbe5bb4220c335f628d5762fdd6f7964983b810663a46073599f2de28ec6e3595089d0d634154944ba3af4e1572847980f8adfc7 WHIRLPOOL abc252e84b4606eea92f48a48881033848ffd904f5bc3af76ad9ed9995053f29a1e3f8e5dc4db53737da0a765ea8a7a6ad073f1598fffe76bdfcb445efc9d4e3
 AUX cracklib-2.8.16-python.patch 303 SHA256 553eda1706718dec30e954222ffbabba6681a06308f52c2e8e2a81e78c1e6080 SHA512 9a71013787209c2e87b2e601b0d2fc7c797eab0472d07afe27d63e7ae4359d1564f812ea5471388f09e706067d09e5c54af9098741d04df5fba6f5d25b1f2b08 WHIRLPOOL 67bea21c3de213b54b9b9ff668943303f6b7164d0a2a75fc36663e2c720487e127579df0ea209161204c39330caa1c7cffc87ca2a253e5444df5a51b4daf9c56
 AUX cracklib-2.8.18-python-stat.patch 915 SHA256 ae271c1a6a967e3520ca15e42141daecaba26ecef0a6d52d06bb25b571bd0575 SHA512 0da99ff1cc694ce04ae6ccd9ace00f8ba6e2b789b4b3dd62537927b24ab1f0aca91c11678e009fdee137d4b1d143fe17a3238afed73d6427926fd5ea5c676e8d WHIRLPOOL ab2553af73b3b88a14f0daf533b88340471e54837c31c20a206b60ecdde124e6924054757fab3815f5eab8b3770535fe30b628445889a3eb09843f23c9d41b0f
+AUX cracklib-2.9.1-setup.py-srcdir.patch 1097 SHA256 f3b2cdd7c9db3d30e8696ed1620f6fa66dcf439292a2e8433d921b8f858e5ca6 SHA512 31784d3fcf8024bc61084a83adc38e9d91eb070ac8831307d50159a3576a1d159548c467f57c137434e52115693066bda6f3121db365ddb97395b331da2ba9e4 WHIRLPOOL 5be326e50c77938b6ff97457c5c45759021c202ab6b1b2900ac8d9199e9de4a855147cbd10f5a1421dab90dcf1935e3b8aaee195d789200cf1eb32c02c7e5ea0
 DIST cracklib-2.8.16.tar.gz 618120 SHA256 fc3aa492c2879e304bae30955ab8b37d6865d26f79d0493b8c36a9bc1b6475bc SHA512 f8a19d295499898958b59c772db65f2ec3e66c7fa792bc66f500e2e30e13d7f5a8fc01d50f4d81788768df8a6f5770f45e710dab5659e235d1521138b36b4a17 WHIRLPOOL 3d8a4a8a80af69c088be1d68deaa23e02332b5b5558a97f05fe48e9799bf9f7b5d929c29a92ab606ddf38b643e55f9442b09900e18b11dcf85eee93fc9015a36
 DIST cracklib-2.8.18.tar.gz 587311 SHA256 2b072f67f7267358459424c3ed70f7f5b70919118e6504a90d3bce37a67c1454 SHA512 f9a754598f9be16507cb4e16a35720da71796dcda664bcfb36038b842ab9f5a1f4bbcdf4c9f64ef0981781ab91dc80117a531cd1651b29def2054be66e485725 WHIRLPOOL 74724c1ab9de87cae7fd6ff6cf707c9a8ff60dc605bc50a5df07ab1ba061362dc1b69426bf7f6b525dcb97a8c0ae174bbe7ba33b8c5382026e4305f74fd16762
 DIST cracklib-2.8.19.tar.gz 611602 SHA256 7086b0ca23f875c9cd9ea2a993c262384b274dba9c4ea1da845ec8ac290748a9 SHA512 64fa9c9d53e9d7f82fa8de9708096b6d6ad4704c4a89c42e113395612af1a82385a7de5f8678fe521016960ebfd0ed4258041afe3a5e4d15bd50ec76bb76fc2c WHIRLPOOL 2fa1e15430987dcc6d9561474e84d4ff19ace156cc6fa7a073c97d263e23b44beb7b83291843b6e7a8bab699f3a6e2d2e87fcf99371379096c62fa58ca26dfdb
@@ -17,26 +18,26 @@ EBUILD cracklib-2.8.19.ebuild 2437 SHA256 aad7d6d3d514279b026eb8bc57defe761aec4c
 EBUILD cracklib-2.8.22.ebuild 2449 SHA256 73c22a3e2f7e488fbbcafb1a96843050675e65d292ef9b414f0302f2b6300c3c SHA512 4371dff09c6c9c2d70794a2f9cad6297100828d4dce6581126ead6edbd67a8ca76548ae9c60f0d0b2017e348f9d3712411a5a52be709fab1fb14f3dc28dc5a48 WHIRLPOOL 63fb061f04a8aa619aec3fda87f47014047662fead1ad89552d6a12cac278c2cad5a331620e08d7357bb2259f1186d97b93851d3f567161a316527be9ebc993f
 EBUILD cracklib-2.9.0-r1.ebuild 2396 SHA256 859ac5912f319858ecc71fd51d2777e28999898c7e80a7695d1754572053d269 SHA512 c3f40bba25c63b2491f77a6e2e5836c48cbb21ab250f0834d5268c7cd6b0d9b7c8b1f8551e1d7aef7a41c71ea6b06ffac08dd2195ca63854daf886ac0baf4f49 WHIRLPOOL 3c3cf114797c2072c27ebce923ce424218c96def8568716494c7cc5a3139487afa300cef847263c508e0974e8ebf994ee68778316808ac5c202b1f3e88ec6cd3
 EBUILD cracklib-2.9.0.ebuild 2448 SHA256 e911f4c86224321cbb816459d86af73a1429096600a47afc99c893725176d90a SHA512 3b4099bd7fabeb315de51a11699e3fd13565fa7c970730ae7c4a550a9ee3c82072f4bf7ce4113c226856cc3d6766dbc2cd13355fa70f35232ba6ddf864c776cc WHIRLPOOL 26fdfc31a606b59971e5d1107ff2da7ac1fc55f65f84cd6506f0371ac73e72c79030eb5b8a48b6c4e985d7a234a87a9563a26f2fd3e7e4251fd164a466102785
-EBUILD cracklib-2.9.1-r1.ebuild 2723 SHA256 3f6f5085f607b3b3974ed81649968e40b4b4b03262c22c7d8f1486f1e1a4725a SHA512 a02acbd247197035d4b5953bd0ae87d2638bfb699effbc6e6a623bfba7fe312c920bb02a630b7605aecdfafce24422259eaadb8612368a2667f1eab523ebae76 WHIRLPOOL 86b3b05b5506f7c24c96ff48ee9da263de3b173eac09e8aaaa7f7b16950041a9bd5f2645ccdbacbeb5a60ad70572ab4c69f3bf1eca8177db0ae118aa0b142a91
+EBUILD cracklib-2.9.1-r1.ebuild 2672 SHA256 1909e04805c910e9ef768f985e395c5ce4371d5b0b785c5ad5eb8c9c137915b5 SHA512 2f785118637714c3f6b5b5e0d70221f66b03a69918610d772681a36faffebaf7a9784b407f697d517e12455bad666ad0d273e70d072fe1a18a78d5aac4a300c9 WHIRLPOOL efe8cb6258df634c7b5868791cc1e9be038474eb2037cb20e6523d81eec64f448b246290f5858177f5af57eaf0d70a7af25a4026451c20362f096eb0748bdc1d
 EBUILD cracklib-2.9.1.ebuild 2226 SHA256 f5abbae9f0f6417cec98a90b4a3f4b08ee650582687c272054662e8f90e6ab97 SHA512 f77ce60afaf78ecfd27c6105b9e272c0c4ade4adcb11afe0f2f0df74722278b23b554f6f27fddcbb8c885931e115277e8c0abd39d05d738851e0ec4aa26668be WHIRLPOOL c690c5cafeb0322e8892bccace0c66bd57ca3c6d744c799a9a39621f9a5e9a486961f88307abb4fd891ea1685b9d0eb41a2ebb09cbb6697b0e069009fefa91ad
-MISC ChangeLog 24438 SHA256 c3a1c5f47c578bbdfa955f43fe89a98735f9f61678dac55964722f9ec0e42716 SHA512 c8f2c4e529953c03a058997815e47441f0395ddffb45892cc8715649aaa269f50cf572939fc9ad7dbf1b3aaceedb0b5182b12a0c5065bcd769a6423e22b72ce0 WHIRLPOOL 0295ea30375c3f955b8e75ebb278a35f8e7cd78f82205769bf0a4b032003b2ffbeab4bdcc7791fb73725db6f4a1bd0d9b61f1cdd81885e644fd0aa2483ba5ce9
+MISC ChangeLog 24590 SHA256 36e0d2f421370f061ef9f321d3dca84c83fbd925dd21a91fce16bad95bafd445 SHA512 c4b75631052af06b79f065810fc60d2358cdd2f3d59e8f9d2f06b8b2a809efc3ba94a1372234345e81a71c7120315781ff73206d7225de4ed8aeefb284eb79a5 WHIRLPOOL ebc24945202e77a8000bb1f2decc5539a6d4310e1e1fcfa1dcbdf0ec0ad88201b7c39d5cb0645e9c9c6499f1a6658ef8cd03b8be9c1606a2e21adab927da8cd2
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTh6TSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTh64aXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOftgQANvw03nBLLMSBpJZZFjEwvXB
-DqbDCPcYHMH0UQF2V6BNygtP9jeU/gYKAX3sc0r6t6+b4NNWRB5s1r0xOuSIO/ce
-OamBdAv2CQcILuJ4MpozecEOUEC5X0ruR+BMY6eQWmJVU7VBNd1buQPazPJDwod+
-7DzEYxwgGOrdI957c3uoa2Ui7S5kIo+baax05PiLL0Si56RnmaOUzHIQIEdTazBq
-iY3xuSEvT7afrj3Iw0MR8TNJyyDPnb4GMpdKjUL7oXKuLqN5uXNoN7JxJJIaWI76
-Fw5Vh2TutxFpCl7qV8ci4YNXk+1v7v6VPta6SFxqIYHXlhx/HYMw3Z6UCc8E7nA2
-NTZZvhWmUMGsdpQScpD6j/e0OOqQI7AuDQBGRzCS6iK+syWtSYB/A74yZENZhoI7
-6GhO/IWXrKfF6AGeks92i8vvVHxpVX3/fGlpe19KwgISqFtyME/qDhM9rGuTcH9j
-fbCDQmKfHattdTyGAE36QFwd7CxXJAZ4Gw89tbplwC0NeVEJQGBgkMNOrTQF9qAE
-UNNpylqKQ9p3fPLR4STgSC2J/jGV5/WMOSGGuWIWuNMe/Q+370Fqz4h8SHnUXrIy
-NWKMcAIbYMI88T6isTaamHXGgSIn/Mlu3+nfe4AttSaEC1F8CogR7YaY4i+v+hL4
-tWbz0mAnjkMSHEaFoBm8
-=bFLa
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOF3sQANqiZIqJBFdAXLA1BZWjATqd
+qesW8uONCOfJvH/fFMvzBIpQgLc2MDAeX9z2CRDIx4+lCrLn83vTTVsyJw6XDy1r
+3bkC+9gn9hcmvg4+cP68bSi/PCFAClBA8uk+3vJhwl6noVoK2y5W+zEsoTisnI6W
+QrPYFaTwT2o6sHZQZOTJ9B7lSX2p2ZUv2oqOCTvK0Kr5mHS4iR++9suUVHG30fF0
+eWakvys1vp5NyRmFawkdEjMIi8qk5P1eCj/5dBmsMBJYZKaA/uIVMhDNpEZmwiZ/
+xXmmWcciCMR7F0cEhb2bv7uoSeYfYS5UFUBzS3VV3FF2t3dl0R3On5PTjEwkffzu
+NOrmvkvGTR/PxzkR3LprTbMFabif1T2nXxGP08WeUil4z1v0plK1lZ/Xa8oH0ju/
+XG+62iKm6GfK8zNTwDCxA/D8GV/PjCil63SY98fIPexzqDu8vU0akPpLkY70CS2i
+jv6JPsoMjaLLUlK3LgxxU4OcKSmDd1U6RNEg8lHbCHFAZic22pIP+trc+UZ9RGrJ
+bTuOYAB/8gNICbjd/gieI5bfg0HKQaeesJGE8VH9ALCyEpWRL52IFsaykBpjgCO0
+fJ3xPHMhjzuqRP1uVi7ouMK3NAUf/x2MUW0Y05LX/uhA947QDe0YEItJSkn5tVZD
+nKfWXLST2kktoZ78MxRC
+=+Rx7
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild b/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild
index 5ea3c1a8d08b..483904044bef 100644
--- a/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild,v 1.2 2014/05/29 21:21:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild,v 1.3 2014/05/29 22:00:54 mgorny Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -51,10 +51,7 @@ pkg_setup() {
 
 src_prepare() {
 	elibtoolize #269003
-	sed -i \
-		-e 's:_cracklib.c:@srcdir@/&:' \
-		-e '/include/s:builddir:srcdir:' \
-		python/setup.py.in || die
+	epatch "${FILESDIR}"/cracklib-2.9.1-setup.py-srcdir.patch
 	do_python
 }
 
diff --git a/sys-libs/cracklib/files/cracklib-2.9.1-setup.py-srcdir.patch b/sys-libs/cracklib/files/cracklib-2.9.1-setup.py-srcdir.patch
new file mode 100644
index 000000000000..ac69b9f60581
--- /dev/null
+++ b/sys-libs/cracklib/files/cracklib-2.9.1-setup.py-srcdir.patch
@@ -0,0 +1,35 @@
+From 70909dd3d30a13bb0406ca76feea49f05b8b978d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 29 May 2014 23:57:32 +0200
+Subject: [PATCH] Fix paths in setup.py to support out-of-source builds.
+
+---
+ python/setup.py.in | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/python/setup.py.in b/python/setup.py.in
+index 4a258a0..4c70de4 100644
+--- a/python/setup.py.in
++++ b/python/setup.py.in
+@@ -23,8 +23,8 @@ from setuptools import setup, Extension, find_packages
+ 
+ extensions = [
+     Extension("_cracklib",
+-        ["_cracklib.c"],
+-        include_dirs = ["@top_builddir@/lib"],
++        ["@srcdir@/_cracklib.c"],
++        include_dirs = ["@top_srcdir@/lib"],
+         libraries = ["crack"],
+         library_dirs = ["@top_builddir@/lib/.libs"]),
+ ]
+@@ -43,6 +43,7 @@ convenience functions.
+     url="http://cracklib.sourceforge.net/",
+     license="GPLv2+",
+     py_modules=['cracklib', 'test_cracklib'],
++    package_dir={'': '@srcdir@'},
+     ext_modules=extensions,
+     zip_safe=False,
+     classifiers=[
+-- 
+2.0.0
+