| 1 |
arfrever 10/06/03 20:13:55 |
| 2 |
|
| 3 |
Modified: cracklib-2.8.16.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Support installation for multiple Python ABIs (bug #316951). |
| 6 |
(Portage version: HEAD/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 sys-libs/cracklib/cracklib-2.8.16.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/cracklib/cracklib-2.8.16.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/cracklib/cracklib-2.8.16.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/cracklib/cracklib-2.8.16.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: cracklib-2.8.16.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.16.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- cracklib-2.8.16.ebuild 30 Apr 2010 13:02:14 -0000 1.1 |
| 22 |
+++ cracklib-2.8.16.ebuild 3 Jun 2010 20:13:55 -0000 1.2 |
| 23 |
@@ -1,8 +1,13 @@ |
| 24 |
# Copyright 1999-2010 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.16.ebuild,v 1.1 2010/04/30 13:02:14 vapier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.16.ebuild,v 1.2 2010/06/03 20:13:55 arfrever Exp $ |
| 28 |
|
| 29 |
-inherit eutils toolchain-funcs multilib libtool |
| 30 |
+EAPI="3" |
| 31 |
+PYTHON_DEPEND="python? 2" |
| 32 |
+SUPPORT_PYTHON_ABIS="1" |
| 33 |
+RESTRICT_PYTHON_ABIS="3.*" |
| 34 |
+ |
| 35 |
+inherit distutils libtool toolchain-funcs |
| 36 |
|
| 37 |
MY_P=${P/_} |
| 38 |
DESCRIPTION="Password Checking Library" |
| 39 |
@@ -14,10 +19,14 @@ |
| 40 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
| 41 |
IUSE="nls python" |
| 42 |
|
| 43 |
-DEPEND="python? ( <dev-lang/python-3 )" |
| 44 |
+DEPEND="sys-libs/zlib |
| 45 |
+ python? ( dev-python/setuptools )" |
| 46 |
+RDEPEND="${DEPEND}" |
| 47 |
|
| 48 |
S=${WORKDIR}/${MY_P} |
| 49 |
|
| 50 |
+PYTHON_MODNAME="cracklib.py" |
| 51 |
+ |
| 52 |
pkg_setup() { |
| 53 |
# workaround #195017 |
| 54 |
if has unmerge-orphans ${FEATURES} && has_version "<${CATEGORY}/${PN}-2.8.10" ; then |
| 55 |
@@ -25,30 +34,46 @@ |
| 56 |
eerror "Please run: FEATURES=-unmerge-orphans emerge cracklib" |
| 57 |
die "Please run: FEATURES=-unmerge-orphans emerge cracklib" |
| 58 |
fi |
| 59 |
+ |
| 60 |
+ use python && python_pkg_setup |
| 61 |
} |
| 62 |
|
| 63 |
-src_unpack() { |
| 64 |
- unpack ${A} |
| 65 |
- cd "${S}" |
| 66 |
- epatch "${FILESDIR}"/${PN}-2.8.13-python-linkage.patch #246747 |
| 67 |
- sed -i '/PYTHON/s:\(print\) \([^"]*\):\1(\2):' configure #302908 |
| 68 |
+src_prepare() { |
| 69 |
elibtoolize #269003 |
| 70 |
+ |
| 71 |
+ if use python; then |
| 72 |
+ pushd python > /dev/null |
| 73 |
+ distutils_src_prepare |
| 74 |
+ popd > /dev/null |
| 75 |
+ fi |
| 76 |
} |
| 77 |
|
| 78 |
-src_compile() { |
| 79 |
+src_configure() { |
| 80 |
econf \ |
| 81 |
--with-default-dict='$(libdir)/cracklib_dict' \ |
| 82 |
- $(use_enable nls) \ |
| 83 |
- $(use_with python) \ |
| 84 |
- || die |
| 85 |
- emake || die |
| 86 |
+ --without-python \ |
| 87 |
+ $(use_enable nls) |
| 88 |
+} |
| 89 |
+ |
| 90 |
+src_compile() { |
| 91 |
+ default |
| 92 |
+ |
| 93 |
+ if use python; then |
| 94 |
+ pushd python > /dev/null |
| 95 |
+ distutils_src_compile |
| 96 |
+ popd > /dev/null |
| 97 |
+ fi |
| 98 |
} |
| 99 |
|
| 100 |
src_install() { |
| 101 |
- emake DESTDIR="${D}" install || die "make install failed" |
| 102 |
- rm -r "${D}"/usr/share/cracklib |
| 103 |
+ emake DESTDIR="${D}" install || die "emake install failed" |
| 104 |
+ rm -r "${ED}"/usr/share/cracklib |
| 105 |
|
| 106 |
- find "${D}" -name '_cracklibmodule.*a' -exec rm {} + #316495 |
| 107 |
+ if use python; then |
| 108 |
+ pushd python > /dev/null |
| 109 |
+ distutils_src_install |
| 110 |
+ popd > /dev/null |
| 111 |
+ fi |
| 112 |
|
| 113 |
# move shared libs to / |
| 114 |
gen_usr_ldscript -a crack |
| 115 |
@@ -65,4 +90,10 @@ |
| 116 |
create-cracklib-dict /usr/share/dict/* > /dev/null |
| 117 |
eend $? |
| 118 |
fi |
| 119 |
+ |
| 120 |
+ use python && distutils_pkg_postinst |
| 121 |
+} |
| 122 |
+ |
| 123 |
+pkg_postrm() { |
| 124 |
+ use python && distutils_pkg_postrm |
| 125 |
} |
| 126 |
|
| 127 |
|
| 128 |
|
| 129 |
1.146 sys-libs/cracklib/ChangeLog |
| 130 |
|
| 131 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/cracklib/ChangeLog?rev=1.146&view=markup |
| 132 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/cracklib/ChangeLog?rev=1.146&content-type=text/plain |
| 133 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/cracklib/ChangeLog?r1=1.145&r2=1.146 |
| 134 |
|
| 135 |
Index: ChangeLog |
| 136 |
=================================================================== |
| 137 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v |
| 138 |
retrieving revision 1.145 |
| 139 |
retrieving revision 1.146 |
| 140 |
diff -u -r1.145 -r1.146 |
| 141 |
--- ChangeLog 30 Apr 2010 13:02:14 -0000 1.145 |
| 142 |
+++ ChangeLog 3 Jun 2010 20:13:55 -0000 1.146 |
| 143 |
@@ -1,6 +1,10 @@ |
| 144 |
# ChangeLog for sys-libs/cracklib |
| 145 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 146 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.145 2010/04/30 13:02:14 vapier Exp $ |
| 147 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.146 2010/06/03 20:13:55 arfrever Exp $ |
| 148 |
+ |
| 149 |
+ 03 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
| 150 |
+ cracklib-2.8.16.ebuild: |
| 151 |
+ Support installation for multiple Python ABIs (bug #316951). |
| 152 |
|
| 153 |
*cracklib-2.8.16 (30 Apr 2010) |
Archives