summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-06-01 02:14:33 +0000
committerMike Frysinger <vapier@gentoo.org>2008-06-01 02:14:33 +0000
commitf6f61099fda15e9a76b1f2db37c41da0fb9f443c (patch)
tree1e647bd3097432fcafbdea2e3aa5776d71a56472 /sys-process/psmisc
parentDo not install /usr/bin/bcp - collides with boost (bug #224327) (diff)
downloadgentoo-2-f6f61099fda15e9a76b1f2db37c41da0fb9f443c.tar.gz
gentoo-2-f6f61099fda15e9a76b1f2db37c41da0fb9f443c.tar.bz2
gentoo-2-f6f61099fda15e9a76b1f2db37c41da0fb9f443c.zip
Dont pass --disable-nls in the USE=-nls case to avoid confusing warnings #220787 by Martin Mokrejs.
(Portage version: 2.2_pre5.spank.spunk)
Diffstat (limited to 'sys-process/psmisc')
-rw-r--r--sys-process/psmisc/ChangeLog6
-rw-r--r--sys-process/psmisc/psmisc-22.6.ebuild7
2 files changed, 10 insertions, 3 deletions
diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog
index 75272b39a19a..10cf488df0bf 100644
--- a/sys-process/psmisc/ChangeLog
+++ b/sys-process/psmisc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-process/psmisc
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.80 2008/05/14 14:34:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.81 2008/06/01 02:14:33 vapier Exp $
+
+ 01 Jun 2008; Mike Frysinger <vapier@gentoo.org> psmisc-22.6.ebuild:
+ Dont pass --disable-nls in the USE=-nls case to avoid confusing warnings
+ #220787 by Martin Mokrejs.
14 May 2008; Jeroen Roovers <jer@gentoo.org> psmisc-22.6.ebuild:
Stable for HPPA too.
diff --git a/sys-process/psmisc/psmisc-22.6.ebuild b/sys-process/psmisc/psmisc-22.6.ebuild
index 66999d383de5..b971947626e7 100644
--- a/sys-process/psmisc/psmisc-22.6.ebuild
+++ b/sys-process/psmisc/psmisc-22.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.6.ebuild,v 1.5 2008/05/14 14:34:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.6.ebuild,v 1.6 2008/06/01 02:14:33 vapier Exp $
inherit eutils autotools
@@ -30,9 +30,12 @@ src_unpack() {
}
src_compile() {
+ # the nls looks weird, but it's because we actually delete the nls stuff
+ # above when USE=-nls. this should get cleaned up so we dont have to patch
+ # it out, but until then, let's not confuse users ... #220787
econf \
$(use_enable selinux) \
- $(use_enable nls) \
+ $(use nls && use_enable nls) \
$(use_enable ipv6) \
|| die
emake || die