diff options
| author |   Nick Hadaway <raker@gentoo.org> | 2003-06-10 17:01:29 +0000 |
|---|---|---|
| committer | Nick Hadaway <raker@gentoo.org> | 2003-06-10 17:01:29 +0000 |
| commit | 26913e12333228d8542cc7f46dd57038dd415d51 (patch) | |
| tree | bc100f80def63493a9746ca5ee95d3850e9de7fc /sys-apps | |
| parent | GD fix for bug #22555 (diff) | |
| download | gentoo-2-26913e12333228d8542cc7f46dd57038dd415d51.tar.gz gentoo-2-26913e12333228d8542cc7f46dd57038dd415d51.tar.bz2 gentoo-2-26913e12333228d8542cc7f46dd57038dd415d51.zip | |
fixed pam enable/disable sed conflict
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/util-linux/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.11z-r4.ebuild | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index 3cc0d5ff649b..3246d2841cdd 100644 --- a/sys-apps/util-linux/ChangeLog +++ b/sys-apps/util-linux/ChangeLog @@ -1,9 +1,12 @@ # ChangeLog for sys-apps/util-linux # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.37 2003/06/01 05:32:45 lostlogic Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.38 2003/06/10 17:01:29 raker Exp $ *util-linux-2.11z-r4 (01 Jun 2003) + 09 Jun 2003; Nick Hadaway <raker@gentoo.org> util-linux-2.11z-r4.ebuild: + If pam was disabled in IUSE, src_unpack would fail. Fixed the logic. + 01 Jun 2003; Brandon Low <lostlogic@gentoo.org> util-linux-2.11z-r4.ebuild: Add enhancement to script command from bug 21147 diff --git a/sys-apps/util-linux/util-linux-2.11z-r4.ebuild b/sys-apps/util-linux/util-linux-2.11z-r4.ebuild index 7070a3f4733f..f810e1998e6d 100644 --- a/sys-apps/util-linux/util-linux-2.11z-r4.ebuild +++ b/sys-apps/util-linux/util-linux-2.11z-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11z-r4.ebuild,v 1.2 2003/06/01 05:33:57 lostlogic Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11z-r4.ebuild,v 1.3 2003/06/10 17:01:29 raker Exp $ IUSE="crypt nls selinux static pam" @@ -56,12 +56,11 @@ src_unpack() { fi #enable pam only if we use it - use pam && sed -i "s:HAVE_PAM=no:HAVE_PAM=yes:" MCONFIG || die "MCONFIG Pam" + use pam && sed -i "s:HAVE_PAM=no:HAVE_PAM=yes:" MCONFIG sed -i \ -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \ -e "s:CPU=.*:CPU=${CHOST%%-*}:" \ - -e "s:HAVE_PAM=no:HAVE_PAM=yes:" \ -e "s:HAVE_SLN=no:HAVE_SLN=yes:" \ -e "s:HAVE_TSORT=no:HAVE_TSORT=yes:" \ -e "s:usr/man:usr/share/man:" \ |