From ff5f4b68679ce1e55784c07cc2c3d5342b5ba329 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 27 Feb 2012 20:53:19 +0000 Subject: Fix thinko in USE=static-libs handling #406079 by Andrew John Hughes. (Portage version: 2.2.0_alpha86/cvs/Linux x86_64) --- sys-libs/e2fsprogs-libs/ChangeLog | 6 +++++- sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild | 4 ++-- sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'sys-libs') diff --git a/sys-libs/e2fsprogs-libs/ChangeLog b/sys-libs/e2fsprogs-libs/ChangeLog index 9190c6196815..c8a122be80fb 100644 --- a/sys-libs/e2fsprogs-libs/ChangeLog +++ b/sys-libs/e2fsprogs-libs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/e2fsprogs-libs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.78 2012/02/24 17:19:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.79 2012/02/27 20:53:19 vapier Exp $ + + 27 Feb 2012; Mike Frysinger e2fsprogs-libs-1.42.ebuild, + e2fsprogs-libs-1.42.1.ebuild: + Fix thinko in USE=static-libs handling #406079 by Andrew John Hughes. *e2fsprogs-libs-1.42.1 (24 Feb 2012) diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild index f1c9385738e0..4755a2c6ad54 100644 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild +++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild @@ -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/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild,v 1.1 2012/02/24 17:19:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild,v 1.2 2012/02/27 20:53:19 vapier Exp $ case ${PV} in *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; @@ -58,5 +58,5 @@ src_install() { emake STRIP=: DESTDIR="${D}" install || die gen_usr_ldscript -a com_err ss # configure doesn't have an option to disable static libs :/ - find "${D}" -name '*.a' -delete + use static-libs || find "${D}" -name '*.a' -delete } diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild index 5c7082f8ac3a..8295d2b38f71 100644 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild +++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild @@ -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/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild,v 1.5 2012/02/22 18:40:56 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild,v 1.6 2012/02/27 20:53:19 vapier Exp $ case ${PV} in *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; @@ -58,5 +58,5 @@ src_install() { emake STRIP=: DESTDIR="${D}" install || die gen_usr_ldscript -a com_err ss # configure doesn't have an option to disable static libs :/ - find "${D}" -name '*.a' -delete + use static-libs || find "${D}" -name '*.a' -delete } -- cgit v1.2.3-65-gdbad