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
commitda94094ed1a52a6bc6ed827d0977a9006f2b5f8c (patch)
tree868f2aead8821b6961f5ad3765ef91f1fd0c0ff5 /sys-process/psmisc
parentDo not install /usr/bin/bcp - collides with boost (bug #224327) (diff)
downloadhistorical-da94094ed1a52a6bc6ed827d0977a9006f2b5f8c.tar.gz
historical-da94094ed1a52a6bc6ed827d0977a9006f2b5f8c.tar.bz2
historical-da94094ed1a52a6bc6ed827d0977a9006f2b5f8c.zip
Dont pass --disable-nls in the USE=-nls case to avoid confusing warnings #220787 by Martin Mokrejs.
Package-Manager: portage-2.2_pre5.spank.spunk
Diffstat (limited to 'sys-process/psmisc')
-rw-r--r--sys-process/psmisc/ChangeLog6
-rw-r--r--sys-process/psmisc/Manifest14
-rw-r--r--sys-process/psmisc/psmisc-22.6.ebuild7
3 files changed, 22 insertions, 5 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/Manifest b/sys-process/psmisc/Manifest
index 2515d980a46f..c20090a348e8 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX psmisc-22.2-gcc2.patch 1625 RMD160 8e1b80c56a5a3dfea3db3ae554f9a33f910b9699 SHA1 bb779b02988837bff2dbaec5aa7909d5e84a050f SHA256 6a710d66db02902db9b99d57abde991ab172b7a41b29b33eb3e552422e0843b5
AUX psmisc-22.5-no-nls.patch 736 RMD160 ac2c51cccc6c95f0aa47efe1ecaeb0d5eaefbce9 SHA1 0227573aa987bfb78ecef891673dc2792c98aba5 SHA256 b2137d22d62276cbd4a1b154c119df025d864054063302a91b5a1610f6c7102c
AUX psmisc-22.5-sockets.patch 4178 RMD160 f47532677c80a8411d8036940587fbc9246e3b67 SHA1 9e00314d9ecf181a359e4703de07495af51df6f5 SHA256 e47d0fc4803713e669ef45d4caca52826cd794dff476e2920f5ae02bb7475103
@@ -5,6 +8,13 @@ AUX psmisc-22.5-user-header.patch 234 RMD160 a284b4898a868894a5956a689f5c6496942
DIST psmisc-22.5.tar.gz 277404 RMD160 315e02a601b8729696244379038885365978ebbe SHA1 0fd6c52dd0dad464a9be7baa79fb810caf43c923 SHA256 f1cfe0b3b85cf06ef67d4648b59b896abce1a3f2a810d694567aff7e33273c02
DIST psmisc-22.6.tar.gz 283532 RMD160 6dddf63e2b7879ae9083533914a7257ab49ac968 SHA1 cb15c23e9cfe618e9de5f066525bce7dc7b77421 SHA256 a13c81897c94b3d6e705fc9da07c610492e28cf7abd5ff8e992f0ec95a269d62
EBUILD psmisc-22.5-r2.ebuild 1469 RMD160 d7297e1b2f2483f9711280a7af5dab629a2a0d9c SHA1 39bdb9d2de36aea338e56361111bdeca2f4761ee SHA256 54a1c19f77c813ce502636ec6eb3e0058305978561a1359813f769fb2bdaa212
-EBUILD psmisc-22.6.ebuild 1391 RMD160 9cf860fde7c7e455fbb71a1966897ba8e1612d4f SHA1 7a7e35e39d690636dee6b4df58566cc8e4c3869a SHA256 b9b78e20aab7ffba0532acefbe0c498214866f9b688f6a346e84b34bf40d86fb
-MISC ChangeLog 15218 RMD160 dc7b0a741c87b76973badb67f4b63e4863dfad9d SHA1 8a63837768d54d6a8341aa42c8bf455c479b2e2b SHA256 5244fdeb80e12a4dccd6a8e1b8d8e58366f4226eb587c932746d8b583d7af115
+EBUILD psmisc-22.6.ebuild 1619 RMD160 6e7c09432bec5b7fbcc455bca8f67e9bcac4c00a SHA1 b5f89f0b724d6c52f08128df728d3813f88bdb44 SHA256 ded86209a91ae152b2161db728166edebc2583e6c1f113d8c14a6ba76d2989aa
+MISC ChangeLog 15396 RMD160 6a493dddc754629e02de4f553df0276fa0b75596 SHA1 36fc2af119459206e813e1e7b5971e0e99b66b4b SHA256 2678428cef6f3468bf7a272dc34e0cb9c6223e69092be6829b9a9486db5d8b20
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIQgYPj9hvisErhMIRAmsfAKDWOPZo0q2Tal5dok4wHPmc+EVlZACgutNU
+tb6ng3fEGrrtE+SpFLrEG0Y=
+=0wM4
+-----END PGP SIGNATURE-----
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