diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-09-07 04:23:04 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-09-07 04:23:04 +0000 |
| commit | 096c3f9ebd38ef46ae4c0c79ecebd3daf6227258 (patch) | |
| tree | 3beb09a8e55bfee5618148d96479dc3f951af09d | |
| parent | Bump to 2.24.12; themeing updates, cups-1.6 support, etc (diff) | |
| download | gentoo-2-096c3f9ebd38ef46ae4c0c79ecebd3daf6227258.tar.gz gentoo-2-096c3f9ebd38ef46ae4c0c79ecebd3daf6227258.tar.bz2 gentoo-2-096c3f9ebd38ef46ae4c0c79ecebd3daf6227258.zip | |
Fix USE=perl handling with chkdupexe #434146 by Alexandre.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
| -rw-r--r-- | sys-apps/util-linux/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.22.ebuild | 8 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-9999.ebuild | 8 |
3 files changed, 9 insertions, 13 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index 8589109cf663..e09e7d9d1249 100644 --- a/sys-apps/util-linux/ChangeLog +++ b/sys-apps/util-linux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/util-linux # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.395 2012/09/06 16:40:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.396 2012/09/07 04:23:04 vapier Exp $ + + 07 Sep 2012; Mike Frysinger <vapier@gentoo.org> util-linux-2.22.ebuild, + util-linux-9999.ebuild: + Fix USE=perl handling with chkdupexe #434146 by Alexandre. *util-linux-2.22 (06 Sep 2012) diff --git a/sys-apps/util-linux/util-linux-2.22.ebuild b/sys-apps/util-linux/util-linux-2.22.ebuild index 47e8a1a90ba3..1d0d8a6f954a 100644 --- a/sys-apps/util-linux/util-linux-2.22.ebuild +++ b/sys-apps/util-linux/util-linux-2.22.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-apps/util-linux/util-linux-2.22.ebuild,v 1.1 2012/09/06 16:40:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.22.ebuild,v 1.2 2012/09/07 04:23:04 vapier Exp $ EAPI="3" @@ -72,6 +72,7 @@ src_configure() { --enable-fs-paths-extra=/usr/sbin \ $(use_enable nls) \ --enable-agetty \ + $(use_enable perl chkdupexe) \ $(use_enable cramfs) \ $(use_enable ddate) \ $(use_enable old-linux elvtune) \ @@ -99,11 +100,6 @@ src_install() { emake install DESTDIR="${D}" || die dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt} - if ! use perl ; then #284093 - rm "${ED}"/usr/bin/chkdupexe || die - rm "${ED}"/usr/share/man/man1/chkdupexe.1 || die - fi - # need the libs in / gen_usr_ldscript -a blkid mount uuid # e2fsprogs-libs didnt install .la files, and .pc work fine diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 12bef714f190..30c6bd87a51f 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.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-apps/util-linux/util-linux-9999.ebuild,v 1.35 2012/09/06 16:40:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.36 2012/09/07 04:23:04 vapier Exp $ EAPI="3" @@ -72,6 +72,7 @@ src_configure() { --enable-fs-paths-extra=/usr/sbin \ $(use_enable nls) \ --enable-agetty \ + $(use_enable perl chkdupexe) \ $(use_enable cramfs) \ $(use_enable ddate) \ $(use_enable old-linux elvtune) \ @@ -99,11 +100,6 @@ src_install() { emake install DESTDIR="${D}" || die dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt} - if ! use perl ; then #284093 - rm "${ED}"/usr/bin/chkdupexe || die - rm "${ED}"/usr/share/man/man1/chkdupexe.1 || die - fi - # need the libs in / gen_usr_ldscript -a blkid mount uuid # e2fsprogs-libs didnt install .la files, and .pc work fine |