From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SVTeY-00052o-Im for garchives@archives.gentoo.org; Fri, 18 May 2012 20:19:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C791E07A1; Fri, 18 May 2012 20:19:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2FD0EE07A1 for ; Fri, 18 May 2012 20:19:51 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6843E1B4006 for ; Fri, 18 May 2012 20:19:50 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 293862004B; Fri, 18 May 2012 20:19:49 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/cracklib: cracklib-2.8.19.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: cracklib-2.8.19.ebuild ChangeLog X-VCS-Directories: sys-libs/cracklib X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20120518201949.293862004B@flycatcher.gentoo.org> Date: Fri, 18 May 2012 20:19:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: d0d02f5f-f823-409d-941a-c0e02c5254c8 X-Archives-Hash: 7f39d9c314fe16e211f9e68908898e15 vapier 12/05/18 20:19:49 Modified: cracklib-2.8.19.ebuild ChangeLog Log: Make zlib optional. =20 (Portage version: 2.2.0_alpha102/cvs/Linux x86_64) Revision Changes Path 1.2 sys-libs/cracklib/cracklib-2.8.19.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/cracklib/= cracklib-2.8.19.ebuild?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/cracklib/= cracklib-2.8.19.ebuild?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/cracklib/= cracklib-2.8.19.ebuild?r1=3D1.1&r2=3D1.2 Index: cracklib-2.8.19.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.19.ebuil= d,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cracklib-2.8.19.ebuild 18 May 2012 18:24:05 -0000 1.1 +++ cracklib-2.8.19.ebuild 18 May 2012 20:19:49 -0000 1.2 @@ -1,6 +1,6 @@ # 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.ebu= ild,v 1.1 2012/05/18 18:24:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.19.ebu= ild,v 1.2 2012/05/18 20:19:49 vapier Exp $ =20 EAPI=3D"3" PYTHON_DEPEND=3D"python? 2" @@ -17,9 +17,9 @@ LICENSE=3D"LGPL-2.1" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390= ~sh ~sparc ~x86 ~x86-fbsd" -IUSE=3D"nls python static-libs" +IUSE=3D"nls python static-libs zlib" =20 -RDEPEND=3D"sys-libs/zlib" +RDEPEND=3D"zlib? ( sys-libs/zlib )" DEPEND=3D"${RDEPEND} python? ( dev-python/setuptools )" =20 @@ -27,9 +27,17 @@ =20 PYTHON_MODNAME=3D"cracklib.py" do_python() { - pushd python > /dev/null || die - distutils_src_${EBUILD_PHASE} - popd > /dev/null + 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 } =20 pkg_setup() { @@ -45,10 +53,12 @@ =20 src_prepare() { elibtoolize #269003 - use python && do_python + do_python } =20 src_configure() { + export ac_cv_header_zlib_h=3D$(usex zlib) + export ac_cv_search_gzopen=3D$(usex zlib -lz no) econf \ --with-default-dict=3D'$(libdir)/cracklib_dict' \ --without-python \ @@ -58,7 +68,7 @@ =20 src_compile() { default - use python && do_python + do_python } =20 src_install() { @@ -66,7 +76,7 @@ use static-libs || find "${ED}"/usr -name libcrack.la -delete rm -r "${ED}"/usr/share/cracklib =20 - use python && do_python + do_python =20 # move shared libs to / gen_usr_ldscript -a crack @@ -84,9 +94,9 @@ eend $? fi =20 - use python && distutils_pkg_postinst + do_python } =20 pkg_postrm() { - use python && distutils_pkg_postrm + do_python } 1.164 sys-libs/cracklib/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/cracklib/= ChangeLog?rev=3D1.164&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/cracklib/= ChangeLog?rev=3D1.164&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/cracklib/= ChangeLog?r1=3D1.163&r2=3D1.164 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- ChangeLog 18 May 2012 18:24:05 -0000 1.163 +++ ChangeLog 18 May 2012 20:19:49 -0000 1.164 @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/cracklib # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.163 2= 012/05/18 18:24:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.164 2= 012/05/18 20:19:49 vapier Exp $ + + 18 May 2012; Mike Frysinger cracklib-2.8.19.ebuild= : + Make zlib optional. =20 *cracklib-2.8.19 (18 May 2012) =20