summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-process')
-rw-r--r--sys-process/psmisc/ChangeLog7
-rw-r--r--sys-process/psmisc/Manifest58
-rw-r--r--sys-process/psmisc/files/psmisc-22.5-no-nls.patch32
-rw-r--r--sys-process/psmisc/psmisc-22.5-r2.ebuild3
4 files changed, 56 insertions, 44 deletions
diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog
index 9d36ab97743b..229c2f2d3e2d 100644
--- a/sys-process/psmisc/ChangeLog
+++ b/sys-process/psmisc/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-process/psmisc
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.74 2007/09/27 15:28:18 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.75 2007/10/06 14:14:01 vapier Exp $
+
+ 06 Oct 2007; Mike Frysinger <vapier@gentoo.org>
+ +files/psmisc-22.5-no-nls.patch, psmisc-22.5-r2.ebuild:
+ Fix from impulze for building with USE=-nls and no gettext installed #193920
+ by Julian Golderer.
27 Sep 2007; Joseph Jezak <josejx@gentoo.org> psmisc-22.5-r2.ebuild:
Marked ppc stable for bug #193833.
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index f83ad748ea94..5276f7e71c03 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -5,6 +5,10 @@ AUX psmisc-22.2-gcc2.patch 1625 RMD160 8e1b80c56a5a3dfea3db3ae554f9a33f910b9699
MD5 4b14fe14a62770a45a7e3bc5cd54ea26 files/psmisc-22.2-gcc2.patch 1625
RMD160 8e1b80c56a5a3dfea3db3ae554f9a33f910b9699 files/psmisc-22.2-gcc2.patch 1625
SHA256 6a710d66db02902db9b99d57abde991ab172b7a41b29b33eb3e552422e0843b5 files/psmisc-22.2-gcc2.patch 1625
+AUX psmisc-22.5-no-nls.patch 736 RMD160 ac2c51cccc6c95f0aa47efe1ecaeb0d5eaefbce9 SHA1 0227573aa987bfb78ecef891673dc2792c98aba5 SHA256 b2137d22d62276cbd4a1b154c119df025d864054063302a91b5a1610f6c7102c
+MD5 9c4b755e4870d714cf1e98eff58c229e files/psmisc-22.5-no-nls.patch 736
+RMD160 ac2c51cccc6c95f0aa47efe1ecaeb0d5eaefbce9 files/psmisc-22.5-no-nls.patch 736
+SHA256 b2137d22d62276cbd4a1b154c119df025d864054063302a91b5a1610f6c7102c files/psmisc-22.5-no-nls.patch 736
AUX psmisc-22.5-sockets.patch 4178 RMD160 f47532677c80a8411d8036940587fbc9246e3b67 SHA1 9e00314d9ecf181a359e4703de07495af51df6f5 SHA256 e47d0fc4803713e669ef45d4caca52826cd794dff476e2920f5ae02bb7475103
MD5 6a06aaa609390001287fd3faff8a5702 files/psmisc-22.5-sockets.patch 4178
RMD160 f47532677c80a8411d8036940587fbc9246e3b67 files/psmisc-22.5-sockets.patch 4178
@@ -13,56 +17,26 @@ AUX psmisc-22.5-user-header.patch 234 RMD160 a284b4898a868894a5956a689f5c6496942
MD5 d07d5aedc05be5004bdb89e44ecde323 files/psmisc-22.5-user-header.patch 234
RMD160 a284b4898a868894a5956a689f5c64969422c2ce files/psmisc-22.5-user-header.patch 234
SHA256 68035208f6e4d94af61c79fcb3041a2607c8df19d751f0650dc46ca13ec7aedb files/psmisc-22.5-user-header.patch 234
-DIST psmisc-22.2.tar.gz 244247 RMD160 aaa11a5bb4139fbe571177518ebc79198e9e2d57 SHA1 1ae222803c5b5967a1b93e69f08330e0cdc1a554 SHA256 6bca237485a352362133792e000a3c8e367a26b0312c5c607db7c2a97717d15f
-DIST psmisc-22.3.tar.gz 257325 RMD160 1db16a81030e22fe66f1d770bba8792679c70395 SHA1 262e5a738c323f5b1f0a112c6fcc906f9860e948 SHA256 9b561fec2ed2e1199f6cd5dfec44b3d0fe78320bc4417b6dea5290cdd20acf1f
DIST psmisc-22.5.tar.gz 277404 RMD160 315e02a601b8729696244379038885365978ebbe SHA1 0fd6c52dd0dad464a9be7baa79fb810caf43c923 SHA256 f1cfe0b3b85cf06ef67d4648b59b896abce1a3f2a810d694567aff7e33273c02
-EBUILD psmisc-22.2.ebuild 1164 RMD160 c55898aded8eaef22dd14d932a8fb2c18ae2e989 SHA1 a2796fafb9f18b05ede925b7441cdebefb5d8d5e SHA256 8d954ab7afeddbc58d7edeabb2be5f7ddf3beeb9b4a0a6adcc06cab95e0b6335
-MD5 7d80ba50be4e1c5429ce03bada67b025 psmisc-22.2.ebuild 1164
-RMD160 c55898aded8eaef22dd14d932a8fb2c18ae2e989 psmisc-22.2.ebuild 1164
-SHA256 8d954ab7afeddbc58d7edeabb2be5f7ddf3beeb9b4a0a6adcc06cab95e0b6335 psmisc-22.2.ebuild 1164
-EBUILD psmisc-22.3.ebuild 1172 RMD160 4c2f6b2a5a35279318e4285af7256204b9a1e274 SHA1 9353a4619566296dd37619c269ac28898b0d187f SHA256 3ee134fe3507ad038ddeafb2e0cb3b07ed2683de0acc5fba2ead0521e08c3783
-MD5 b73129512fca00bec6f6af51e4f6b689 psmisc-22.3.ebuild 1172
-RMD160 4c2f6b2a5a35279318e4285af7256204b9a1e274 psmisc-22.3.ebuild 1172
-SHA256 3ee134fe3507ad038ddeafb2e0cb3b07ed2683de0acc5fba2ead0521e08c3783 psmisc-22.3.ebuild 1172
-EBUILD psmisc-22.5-r1.ebuild 1263 RMD160 8ac5de1cb5029a14e3ca680ed6948d0307437eae SHA1 b84552dd0b5e4e01c898ca8c68d3b8b04f8dcc47 SHA256 21a03d015d4499902867d62953422f7d204f15c06517ef16105b7ca2a2d24231
-MD5 2a4016ac36c19904f46df87fb57db3d6 psmisc-22.5-r1.ebuild 1263
-RMD160 8ac5de1cb5029a14e3ca680ed6948d0307437eae psmisc-22.5-r1.ebuild 1263
-SHA256 21a03d015d4499902867d62953422f7d204f15c06517ef16105b7ca2a2d24231 psmisc-22.5-r1.ebuild 1263
-EBUILD psmisc-22.5-r2.ebuild 1410 RMD160 b70208bff7e5da3c2c3d37671d142724b0a12c10 SHA1 aed370e9112a681ffc15c973e37e323ff7a52dfb SHA256 5a2930b26a25b945fc3c621f3f0a5821dc1eb20c18c7a41abf8574f35797843a
-MD5 70fe0fbd710f971fcbae9b90541b574f psmisc-22.5-r2.ebuild 1410
-RMD160 b70208bff7e5da3c2c3d37671d142724b0a12c10 psmisc-22.5-r2.ebuild 1410
-SHA256 5a2930b26a25b945fc3c621f3f0a5821dc1eb20c18c7a41abf8574f35797843a psmisc-22.5-r2.ebuild 1410
-EBUILD psmisc-22.5.ebuild 1186 RMD160 b8023e80bf2eb8ea4520f80bdeaf797b90a7ac8d SHA1 fbc6c3ad8f2276e303072b8d3fdf7e82375f75d3 SHA256 6871bf964e9a12b934eda076906937bcd427202eefd03731da15f588d629ddfe
-MD5 663cee7162aca3f111864e158f673019 psmisc-22.5.ebuild 1186
-RMD160 b8023e80bf2eb8ea4520f80bdeaf797b90a7ac8d psmisc-22.5.ebuild 1186
-SHA256 6871bf964e9a12b934eda076906937bcd427202eefd03731da15f588d629ddfe psmisc-22.5.ebuild 1186
-MISC ChangeLog 14526 RMD160 e97b1f5728e5cc60333bbe0f03e17fae3c241ebc SHA1 49885160fc433de9c788f417f6678c9a73fa334a SHA256 d0ef12724efcf1f18312149222fd8fe8d3515bd3b39fad58f94c993325599720
-MD5 224567704fa20042f70e35425c26a518 ChangeLog 14526
-RMD160 e97b1f5728e5cc60333bbe0f03e17fae3c241ebc ChangeLog 14526
-SHA256 d0ef12724efcf1f18312149222fd8fe8d3515bd3b39fad58f94c993325599720 ChangeLog 14526
+EBUILD psmisc-22.5-r2.ebuild 1469 RMD160 d7297e1b2f2483f9711280a7af5dab629a2a0d9c SHA1 39bdb9d2de36aea338e56361111bdeca2f4761ee SHA256 54a1c19f77c813ce502636ec6eb3e0058305978561a1359813f769fb2bdaa212
+MD5 bb523b437f404d845340b768bb7a8ad0 psmisc-22.5-r2.ebuild 1469
+RMD160 d7297e1b2f2483f9711280a7af5dab629a2a0d9c psmisc-22.5-r2.ebuild 1469
+SHA256 54a1c19f77c813ce502636ec6eb3e0058305978561a1359813f769fb2bdaa212 psmisc-22.5-r2.ebuild 1469
+MISC ChangeLog 14736 RMD160 f406b70c7ca2a6c31b63d99bebbbf2f54755bc14 SHA1 fd1dcd74dca7255529a68fa8af7334702242e671 SHA256 10a5928388ef9be18036853d7499d1e03263aa03f091b712f1c1ad81499a4095
+MD5 3c82c4c75876ee543b33b44fe5b1b662 ChangeLog 14736
+RMD160 f406b70c7ca2a6c31b63d99bebbbf2f54755bc14 ChangeLog 14736
+SHA256 10a5928388ef9be18036853d7499d1e03263aa03f091b712f1c1ad81499a4095 ChangeLog 14736
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 31b893fab6c1a7d95752e63dd94bfa26 files/digest-psmisc-22.2 235
-RMD160 0c806149c35f520fcf5a4eaebf1329073c2336c6 files/digest-psmisc-22.2 235
-SHA256 c0e455a65fcd13cc2d90c37eae7101a58bfdfd99e0c7a50886fa7667021d16e7 files/digest-psmisc-22.2 235
-MD5 76401348a4d7960355d0df803cc723e8 files/digest-psmisc-22.3 235
-RMD160 81f569513108416873b821d120a5cb6a9473c952 files/digest-psmisc-22.3 235
-SHA256 d2a3a616119fa55a6f80a24748fb1fe34d7f07dfc6b355f388928aeb47f0d1fb files/digest-psmisc-22.3 235
-MD5 1590aaf049b785f84112230dc6a79a89 files/digest-psmisc-22.5 235
-RMD160 3c30c02a0697f859d3d2cd831249dc1584a8553f files/digest-psmisc-22.5 235
-SHA256 731c1dbe435888285f4ad568ed5587e849cdbeb2757a20b270e4da3ade756472 files/digest-psmisc-22.5 235
-MD5 1590aaf049b785f84112230dc6a79a89 files/digest-psmisc-22.5-r1 235
-RMD160 3c30c02a0697f859d3d2cd831249dc1584a8553f files/digest-psmisc-22.5-r1 235
-SHA256 731c1dbe435888285f4ad568ed5587e849cdbeb2757a20b270e4da3ade756472 files/digest-psmisc-22.5-r1 235
MD5 1590aaf049b785f84112230dc6a79a89 files/digest-psmisc-22.5-r2 235
RMD160 3c30c02a0697f859d3d2cd831249dc1584a8553f files/digest-psmisc-22.5-r2 235
SHA256 731c1dbe435888285f4ad568ed5587e849cdbeb2757a20b270e4da3ade756472 files/digest-psmisc-22.5-r2 235
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
-iD8DBQFG+8x5csIHjyDViGQRAp2fAJ47EApHQtPQCb6141g9vxprum0FlwCeID0r
-Zz8szGT0P8Q1W1paj+XtB8Y=
-=REC3
+iD8DBQFHB5gvp/wUKkr7RBoRAmvxAKCAcOhZ2ov69T7iTsKLGe/5rKT/kACg2XdQ
+Wdq5Fs15qD0x2dEiLGEhDEw=
+=eqAn
-----END PGP SIGNATURE-----
diff --git a/sys-process/psmisc/files/psmisc-22.5-no-nls.patch b/sys-process/psmisc/files/psmisc-22.5-no-nls.patch
new file mode 100644
index 000000000000..2681a0433f5d
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-22.5-no-nls.patch
@@ -0,0 +1,32 @@
+http://bugs.gentoo.org/193920
+
+--- psmisc-22.5/Makefile.am
++++ psmisc-22.5/Makefile.am
+@@ -1,5 +1,5 @@
+
+-SUBDIRS = doc src po icons
++SUBDIRS = doc src icons
+
+ #EXTRA_DIST = config.rpath ABOUT-NLS mkinstalldirs
+
+--- psmisc-22.5/configure.ac
++++ psmisc-22.5/configure.ac
+@@ -65,10 +65,6 @@
+ test $ac_cv_member_struct_user_regs_struct_ecx = yes &&
+ test $ac_cv_member_struct_user_regs_struct_edx = yes )
+
+-dnl Check for language stuff
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.16.1])
+-
+ dnl Checks for library functions.
+ AC_FUNC_CLOSEDIR_VOID
+ AC_FUNC_GETMNTENT
+@@ -87,6 +83,5 @@
+ AC_CONFIG_FILES([Makefile
+ doc/Makefile
+ src/Makefile
+- icons/Makefile
+- po/Makefile.in])
++ icons/Makefile])
+ AC_OUTPUT
diff --git a/sys-process/psmisc/psmisc-22.5-r2.ebuild b/sys-process/psmisc/psmisc-22.5-r2.ebuild
index 4456458b9367..b6fea3d0bce6 100644
--- a/sys-process/psmisc/psmisc-22.5-r2.ebuild
+++ b/sys-process/psmisc/psmisc-22.5-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.5-r2.ebuild,v 1.10 2007/09/27 15:28:18 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.5-r2.ebuild,v 1.11 2007/10/06 14:14:01 vapier Exp $
inherit eutils autotools
@@ -27,6 +27,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-sockets.patch
# this package doesnt actually need C++
sed -i '/AC_PROG_CXX/d' configure.ac || die
+ use nls || epatch "${FILESDIR}"/${P}-no-nls.patch #193920
eautoreconf
}