diff options
Diffstat (limited to 'sys-libs/cracklib')
| -rw-r--r-- | sys-libs/cracklib/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/cracklib/cracklib-2.9.1-r1.ebuild | 7 | ||||
| -rw-r--r-- | sys-libs/cracklib/files/cracklib-2.9.1-setup.py-srcdir.patch | 35 |
3 files changed, 42 insertions, 6 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/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 + |