Version bump #399377 by Samuli Suominen.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 306 insertions, 2 deletions

diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog
index 38ac246a8251..e5f62d55b483 100644
--- a/sys-process/procps/ChangeLog
+++ b/sys-process/procps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/procps
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.60 2012/01/04 22:36:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.61 2012/01/24 06:20:13 vapier Exp $
+
+*procps-3.3.2_p2 (24 Jan 2012)
+
+  24 Jan 2012; Mike Frysinger <vapier@gentoo.org> +procps-3.3.2_p2.ebuild,
+  +files/procps-3.3.2-headers.patch, +files/procps-3.3.2-noproc.patch:
+  Version bump #399377 by Samuli Suominen.
 
   04 Jan 2012; Brent Baude <ranger@gentoo.org> procps-3.2.8_p11.ebuild:
   Marking procps-3.2.8_p11 ppc for bug 390003
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index dd7b9732f438..24253aa6acd0 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.2.5-top-sort.patch 1384 RMD160 7ab964b4dd310d5032826abe64a46b8b6e968a80 SHA1 ad7782f3f4d118fa67c667d611a1eb2f4c736808 SHA256 bd52bdde8f43e9f1428d18efa13691abd83a25ea2f99d8c44fabccd7f2ba902b
 AUX procps-3.2.3-noproc.patch 514 RMD160 0d27f02b6e1e8a9a717f293d2cde4013a531cc06 SHA1 6106530a402f772426ee80d05dab9a24deec49a4 SHA256 44dd3145a8be03cdb0ab3b691de5a98c89398d9990b3094af2e879ef54f98c51
 AUX procps-3.2.7-proc-mount.patch 657 RMD160 90d0dae26d4a514ef0dbcb3c90ba167d0890d14e SHA1 07bdfb5484189daad7beb18fd5e2f280e3de3cad SHA256 17194621e6f5307c1712fab15a13a7da0e10315cf8b45b34403b54c70013b2ba
@@ -7,14 +10,36 @@ AUX procps-3.2.8-linux-ver-init.patch 823 RMD160 e029ee04df0be7ca11878c3bb4e3c54
 AUX procps-3.2.8-r1-forest-prefix.patch 1178 RMD160 a1290cdca6b058a0b7a6f648f9c4f030ad037dd9 SHA1 5476d86cce4d201b3b684c99ddd53bb09962ef5c SHA256 7f1f56c34014243b140f4e71bfd396b5e3e86fba600e7826bb031236ae95d5dc
 AUX procps-3.2.8-time_t.patch 510 RMD160 e091b640bb1a7ebf7bc970448c3f2426244d1c60 SHA1 7f416bc994fa8ea8937303e66198203d47dbe4e9 SHA256 e2f48af1e487bdbb1d30ba4b638951b1082209ea9cd2607ff91f95591445bba7
 AUX procps-3.2.8-toprc-fixup.patch 647 RMD160 68ced4f43bcf86f61f4e66baecd60832fbcd8693 SHA1 e81c7dd3f836078bcb9b1d25ef2a161a48c5dce4 SHA256 da07ed67e5d1405ca673075459070f2fee985692ff930124ed484dacfe4db588
+AUX procps-3.3.2-headers.patch 5485 RMD160 16d2e2541c99d50381d2ee2fc1c64e8a36dbe954 SHA1 ff7711d2833488cf4eea2b94cdd09524a7534574 SHA256 3f2f14e9f544e39c72f35c0137921c654eb07e44a546c40fa67444af06b83d3d
+AUX procps-3.3.2-noproc.patch 532 RMD160 52f20f6873b4cc4c993d1389894edd737ca25779 SHA1 adacc40636a65693ef8e4893cbc0a8ba6ceca5cc SHA256 02e593d5b7471dc16c624f627e765784f260cec3fb612ba0a7589db77e749ceb
 AUX procps-mips-define-pagesize.patch 1028 RMD160 aa0cb4fdf76d50bae983683e0de0a06daba52361 SHA1 7658c35e40c4c565bd4f4124b09c43ec474da0bd SHA256 9000966beaa7ae9e8261dfc691b7b7bec08857e8404de60f30b10bbe6e702d8e
 DIST procps-3.2.8.tar.gz 285758 RMD160 ad63601fb6bf4692108484d9ed362f510cbcf505 SHA1 a0c86790569dec26b5d9037e8868ca907acc9829 SHA256 11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535
 DIST procps_3.2.8-10.debian.tar.gz 97024 RMD160 140630444577b7349ce6feea84cecf926a2fd98d SHA1 898449da0ac41194b8743f965862ce9be3760075 SHA256 07d2295014920e5ff4182257f5b7781019dc0e70a12755cefa93e19022f45aad
 DIST procps_3.2.8-11.debian.tar.gz 97608 RMD160 2e905aedd18bc9fe97498c37658c07f4a4a21732 SHA1 e300d30209fe97b1c4d88a2b25586682377ec70b SHA256 a7472ef878ac05b6de430d9839e6818990cf01880c62fd524d7fe5f37afaf437
+DIST procps_3.3.2-2.debian.tar.gz 33605 RMD160 adf1437b7d8d1a8f28278fefeb5bf6be354d48b1 SHA1 c6b8e75e856050bfb040290f80f036938f5cf04f SHA256 2bf9be3d8de87da9040343807644b46a832ff5b8a56734f1f96c6b68ba4b8301
+DIST procps_3.3.2.orig.tar.gz 746691 RMD160 a8e75e1cd228b37d56a14836a55630ad98594bd1 SHA1 258c5722e0f145ae7a0b7887fad8fe489acbd6dd SHA256 b108491bc7306471d5d2317984c87c04a7f8fda6f9ef55ae3b591a6b2dfdbba1
 EBUILD procps-3.2.8-r1.ebuild 2297 RMD160 33568cf3dbc91f41dbc77a91e68a629359e438ab SHA1 f8d3285f5bd5e48b7e3012002056499f8524820e SHA256 8792660ca782802a70bebd9209d418d399daa19b86c5f88f3810cb4708d6e843
 EBUILD procps-3.2.8-r2.ebuild 2404 RMD160 6c7555d8704fc852ad796cf964829a4d9a1456b0 SHA1 8b2bcc0c9be52cdd3f76a1220a9c06d9cbc85cf2 SHA256 288127656d1c50ed1a4da866a41179bedc29fa37836e3aefae33bba40edd2107
 EBUILD procps-3.2.8.ebuild 2178 RMD160 137ac755f53942f610174836337d95189278b2c1 SHA1 a2078c1e328c8dcf27323076faf133e590221611 SHA256 aa8bf0982fb584e8bc27cd6fba80871a85db1f818464bb9e7b08f586e10af1be
 EBUILD procps-3.2.8_p10-r1.ebuild 2666 RMD160 3697b5505e2360f0a633cdbebb0133db6546d352 SHA1 556d84a3433f3854785a2a225ffb18a5751dd090 SHA256 0ba59322fe034c1bab2f0e750ec7b225a9123a3270b630a60c559829a3b388c4
 EBUILD procps-3.2.8_p11.ebuild 2697 RMD160 f38b34860ed195d5e437e4b86ec7d1ca2ffc034c SHA1 431d39b532389d64abd12ec82bf768034718d685 SHA256 e377909f38408982a50eadb3b84ee2e021ab967cad013960b0da639fd90d8b0f
-MISC ChangeLog 24438 RMD160 a87e056281b154bbb231e2b94abd3dad8ddee34f SHA1 073fa6766ace8e0748988e1fd463eb32fcc096c9 SHA256 7af232c1d8362781e5d7e2fe96899328162654a8847d1683788e0166a769646a
+EBUILD procps-3.3.2_p2.ebuild 1500 RMD160 161001507ff025cff8d4707fcff85ab0eb41a762 SHA1 167e4d58b82f581e43e9db20d1420373cfa0f53a SHA256 242a0a5da08f0f7f07bc8f8bda938ae73204579a149c3ece136892120608960f
+MISC ChangeLog 24660 RMD160 6ab7ab68b71291664d0a6510e5a3278b678561ca SHA1 b3ac3ed94821d43e82b9e659c7803aefd4ee6054 SHA256 c6d58d650329718f4395b729f0655390e119295b1f013998bd8c5f09539f5a4c
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPHk3EAAoJELEHsLL7fEFWqxgQALHbdhBhjLdsnZ5KOA5IT87a
+BSm47TIJ0G03VBJlZetr568zXVWLDz65aNu5ccmwe9GU+Jh05C7UjCvU00RP2uFE
+9R7QvHqKtfFNblEbmQ3rZAlwEBxMoj9T2ZSVV/2dQkp2F39Xel7ASG50T6lQty3L
+8jFz24wEP7fxBRP4gyVUWHdfa1vWyH/YzQsEPVdSDZ/OMDbHhc+Yydi92/zsHv4s
+EicuVQJjYV3QE3MgySvDN9X/yBORqKg5B0+HQKbztu5RsDDkXH199ucYZ+PGiczq
+77CAL9jMggc7MxBsg9TrClUVOqmRWVMT8mOWvOw3suG6ncAPd/nHutsO2J+UhlKR
+LiJ52dG8ukZjsXF01ds9Qq47s2lsADL5kw4X+Ksqj5iiQklKsYJ8yp9VXGh2hFRd
+Hun5Dn+Xzn69N+ija4A+DCIUZfrKobXdXg1t2/BcerkX8EOgNdTyvuITh9w/Nkdo
+wzvNezORK5Ea0mPSjp6Ju+tUZsH53lzujaqHWvN8XeNn7Ll3HFCbgxhS2tRRTDr5
+Dh9YmZSrO/8FFRzknipdN3c5gpm+mFg2Ari8w/PH7QBN4UgoV3KhLyMNA7ISUBda
+RyqB1V+AgT0QbxCmCuyC1HP+h1upDv4hL2KliqWge7UL1+3A7JiTSRWtTwqAvxl3
+f7QqgcFOMNaBg7U7Jo26
+=0tZn
+-----END PGP SIGNATURE-----
diff --git a/sys-process/procps/files/procps-3.3.2-headers.patch b/sys-process/procps/files/procps-3.3.2-headers.patch
new file mode 100644
index 000000000000..c359f4c9062f
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.2-headers.patch
@@ -0,0 +1,205 @@
+From 3bbf0d863131ce650928460bf1222617e7e68094 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 24 Jan 2012 00:33:57 -0500
+Subject: [PATCH 1/5] include error.h for error() and friends
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ include/c.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/include/c.h b/include/c.h
+index 2be7495..747e4e3 100644
+--- a/include/c.h
++++ b/include/c.h
+@@ -16,6 +16,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
++#include <error.h>
+ 
+ /*
+  * Compiler specific stuff
+-- 
+1.7.8.3
+
+From eee0a65a45713a8e6efcfd94dbeabd33f6cf8a3a Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 24 Jan 2012 00:36:02 -0500
+Subject: [PATCH 2/5] watch: include sys/wait.h for waitpid
+
+Fixes build warning:
+	watch.c:682:3: warning: implicit declaration of
+		function 'waitpid' [-Wimplicit-function-declaration]
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ watch.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/watch.c b/watch.c
+index 4a2646b..0bb6239 100644
+--- a/watch.c
++++ b/watch.c
+@@ -31,6 +31,7 @@
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
++#include <sys/wait.h>
+ #include <termios.h>
+ #include <termios.h>
+ #include <time.h>
+-- 
+1.7.8.3
+
+From 4191f4598701b7d76df4be0506f06f15d97b9a64 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 24 Jan 2012 00:39:49 -0500
+Subject: [PATCH 3/5] use helpers from c.h
+
+A few files still use the C library helpers from err.h, so migrate
+them to the local c.h helpers.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ include/xalloc.h |    8 ++++----
+ proc/sig.c       |    3 ++-
+ skill.c          |    2 +-
+ 4 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/include/xalloc.h b/include/xalloc.h
+index bd02c75..37bf0ef 100644
+--- a/include/xalloc.h
++++ b/include/xalloc.h
+@@ -24,7 +24,7 @@ void *xmalloc(const size_t size)
+ {
+ 	void *ret = malloc(size);
+ 	if (!ret && size)
+-		err(XALLOC_EXIT_CODE, "cannot allocate %zu bytes", size);
++		xerrx(XALLOC_EXIT_CODE, "cannot allocate %zu bytes", size);
+ 	return ret;
+ }
+ 
+@@ -33,7 +33,7 @@ void *xrealloc(void *ptr, const size_t size)
+ {
+ 	void *ret = realloc(ptr, size);
+ 	if (!ret && size)
+-		err(XALLOC_EXIT_CODE, "cannot allocate %zu bytes", size);
++		xerrx(XALLOC_EXIT_CODE, "cannot allocate %zu bytes", size);
+ 	return ret;
+ }
+ 
+@@ -42,7 +42,7 @@ void *xcalloc(const size_t nelems, const size_t size)
+ {
+ 	void *ret = calloc(nelems, size);
+ 	if (!ret && size && nelems)
+-		err(XALLOC_EXIT_CODE, "cannot allocate %zu bytes", size);
++		xerrx(XALLOC_EXIT_CODE, "cannot allocate %zu bytes", size);
+ 	return ret;
+ }
+ 
+@@ -53,7 +53,7 @@ static inline char *xstrdup(const char *str)
+ 		return NULL;
+ 	ret = strdup(str);
+ 	if (!ret)
+-		err(XALLOC_EXIT_CODE, "cannot duplicate string");
++		xerrx(XALLOC_EXIT_CODE, "cannot duplicate string");
+ 	return ret;
+ }
+ 
+diff --git a/proc/sig.c b/proc/sig.c
+index 1137fef..b83e645 100644
+--- a/proc/sig.c
++++ b/proc/sig.c
+@@ -13,6 +13,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include "sig.h"
++#include "c.h"
+ 
+ /* Linux signals:
+  *
+@@ -221,7 +222,7 @@ char *strtosig(const char *restrict s){
+ 
+   copy = strdup(s);
+   if (!copy)
+-    err(EXIT_FAILURE, "cannot duplicate string");
++    xerrx(EXIT_FAILURE, "cannot duplicate string");
+   for (p = copy; *p != '\0'; p++)
+     *p = toupper(*p);
+   p = copy;
+diff --git a/skill.c b/skill.c
+index de3ccb9..078624d 100644
+--- a/skill.c
++++ b/skill.c
+@@ -131,7 +131,7 @@ static void check_proc(int pid, struct run_time_conf_t *run_time)
+ 	if (fd == -1) {
+ 		/* process exited maybe */
+ 		if (run_time->warnings)
+-			warn(_("cannot open file %s"), buf);
++			xwarn(_("cannot open file %s"), buf);
+ 		return;
+ 	}
+ 	fstat(fd, &statbuf);
+-- 
+1.7.8.3
+
+From b5de7d14e1db889c83dc45ae275652aa042c359c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 24 Jan 2012 00:41:25 -0500
+Subject: [PATCH 4/5] proc: pull in ctype.h where needed
+
+Fix the build warnings:
+
+sig.c:227:5: warning: implicit declaration of function 'toupper' [-Wimplicit-function-declaration]
+sig.c:231:3: warning: implicit declaration of function 'isdigit' [-Wimplicit-function-declaration]
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ proc/sig.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/proc/sig.c b/proc/sig.c
+index b83e645..b427e01 100644
+--- a/proc/sig.c
++++ b/proc/sig.c
+@@ -8,6 +8,7 @@
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  * GNU Library General Public License for more details.
+  */
++#include <ctype.h>
+ #include <signal.h>
+ #include <string.h>
+ #include <stdio.h>
+-- 
+1.7.8.3
+
+From 4abea5e70d391a363c2af9a6405e375081cb10b2 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 24 Jan 2012 00:43:35 -0500
+Subject: [PATCH 5/5] ps: include error.h
+
+This code currently uses error_at_line() from error.h, so pull it in.
+Long term, this might get moved to c.h as a local helper on err.h,
+but I have no idea.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ ps/global.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/ps/global.c b/ps/global.c
+index 22cf3ef..5bddb8c 100644
+--- a/ps/global.c
++++ b/ps/global.c
+@@ -17,6 +17,7 @@
+ #include <string.h>
+ #include <termios.h>
+ #include <unistd.h>
++#include <error.h>
+ 
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+-- 
+1.7.8.3
+
diff --git a/sys-process/procps/files/procps-3.3.2-noproc.patch b/sys-process/procps/files/procps-3.3.2-noproc.patch
new file mode 100644
index 000000000000..43cf5b2ef9af
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.2-noproc.patch
@@ -0,0 +1,17 @@
+If /proc isnt mounted, `top` will cause screen corruption ...
+
+--- b/top/top.c
++++ b/top/top.c
+@@ -3201,6 +3201,12 @@
+ {
+    (void)dont_care_argc;
+    before(*argv);
++
++   if (access("/proc/stat", F_OK)) {
++      fprintf(stderr, "/proc is not mounted, required for output data");
++      exit(1);
++   }
++
+                                         //                 +-------------+
+    windows_stage1();                    //                 top (sic) slice
+    configs_read();                      //                 > spread etc, <
diff --git a/sys-process/procps/procps-3.3.2_p2.ebuild b/sys-process/procps/procps-3.3.2_p2.ebuild
new file mode 100644
index 000000000000..befe2a21fce7
--- /dev/null
+++ b/sys-process/procps/procps-3.3.2_p2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.3.2_p2.ebuild,v 1.1 2012/01/24 06:20:13 vapier Exp $
+
+EAPI="4"
+
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+DEB_VER=${PV#*_p}
+MY_PV=${PV%_p*}
+DESCRIPTION="standard informational utilities and process-handling tools"
+HOMEPAGE="http://procps.sourceforge.net/ http://gitorious.org/procps http://packages.debian.org/sid/procps"
+SRC_URI="mirror://debian/pool/main/p/procps/${PN}_${MY_PV}.orig.tar.gz
+	mirror://debian/pool/main/p/procps/${PN}_${MY_PV}-${DEB_VER}.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs unicode"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r2[unicode?]"
+
+S=${WORKDIR}/${PN}-ng-${MY_PV}
+
+src_prepare() {
+	local d="${WORKDIR}"/debian/patches
+	EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
+
+	epatch "${FILESDIR}"/${PN}-3.3.2-noproc.patch
+	epatch "${FILESDIR}"/${PN}-3.3.2-headers.patch
+}
+
+src_configure() {
+	econf \
+		--exec-prefix="${EPREFIX}/" \
+		--docdir='$(datarootdir)'/doc/${PF} \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	# Baselayout takes care of this file
+	dodoc "${ED}"/etc/sysctl.conf
+	rm "${ED}"/etc/sysctl.conf || die
+
+	# The configure script is completely whacked in the head
+	mv "${ED}"/lib* "${ED}"/usr/ || die
+	gen_usr_ldscript -a procps
+	find "${ED}" -name '*.la' -delete
+}