old

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

15 files changed, 12 insertions, 951 deletions

diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog
index 7263c237052a..19454cadc2cc 100644
--- a/sys-process/procps/ChangeLog
+++ b/sys-process/procps/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-process/procps
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.77 2013/03/09 19:06:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.78 2013/03/10 15:38:02 ssuominen Exp $
+
+  10 Mar 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -files/3.2.5-top-sort.patch, -procps-3.2.8.ebuild, -procps-3.2.8-r1.ebuild,
+  -procps-3.2.8-r2.ebuild, -procps-3.2.8_p10-r1.ebuild,
+  -files/procps-3.2.8+gmake-3.82.patch,
+  -files/procps-3.2.8-forest-prefix.patch,
+  -files/procps-3.2.8-linux-ver-init.patch, -procps-3.3.2_p2-r1.ebuild,
+  -files/procps-3.3.2-headers.patch, -files/procps-3.3.2-ncurses.patch,
+  -files/procps-3.3.2-noproc.patch, -procps-3.3.3.ebuild,
+  -files/procps-3.3.3-watch-8bit.patch:
+  old
 
   09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> procps-3.3.4.ebuild:
   Stable for sparc, wrt bug #460394
diff --git a/sys-process/procps/files/3.2.5-top-sort.patch b/sys-process/procps/files/3.2.5-top-sort.patch
deleted file mode 100644
index b160bcc301a9..000000000000
--- a/sys-process/procps/files/3.2.5-top-sort.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Under certain conditions, top's display can break.
-This patch is by Curtis Doty, updated by Andreas Kling for 3.2.5.
-
-To reproduce bug:
- - run top
- - turn on color mode ('z')
- - highlight sort column ('x')
- - move sort column all the way to the left ('<')
- - get drunk
-
-procps e-mail: http://sourceforge.net/mailarchive/forum.php?thread_id=6042978&forum_id=12454
-Redhat bug:    http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=140975
-Gentoo bug:    http://bugs.gentoo.org/show_bug.cgi?id=80296
-
---- procps-3.2.5/top.c~	2005-01-26 06:15:18.000000000 +0100
-+++ procps-3.2.5/top.c	2005-02-01 09:23:35.000000000 +0100
-@@ -2952,12 +2952,10 @@
-    for (x = 0; x < q->maxpflgs; x++) {
-       char cbuf[ROWBUFSIZ], _z[ROWBUFSIZ];
-       FLG_t       i = q->procflags[x];          // support for our field/column
--      const char *f = Fieldstab[i].fmts;        // macro AND sometimes the fmt
-+      const char *f = Fieldstab[i].fmts + ((x==0) && !Rc.mode_altscr);
-       unsigned    s = Fieldstab[i].scale;       // string must be altered !
-       unsigned    w = Fieldstab[i].width;
- 
--      int advance = (x==0) && !Rc.mode_altscr;
--
-       switch (i) {
-          case P_CMD:
-          {  char tmp[ROWBUFSIZ];
-@@ -3069,7 +3067,7 @@
- 
-         } /* end: switch 'procflag' */
- 
--        rp = scat(rp, cbuf+advance);
-+        rp = scat(rp, cbuf);
-    } /* end: for 'maxpflgs' */
- 
-    PUFF(
diff --git a/sys-process/procps/files/procps-3.2.8+gmake-3.82.patch b/sys-process/procps/files/procps-3.2.8+gmake-3.82.patch
deleted file mode 100644
index b66945c4de8d..000000000000
--- a/sys-process/procps/files/procps-3.2.8+gmake-3.82.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-ps/module.mk depends on vars set up in proc/module.mk, so make sure we always
-include the .mk files in the right order
-
---- procps-3.2.8/Makefile
-+++ procps-3.2.8/Makefile
-@@ -174,7 +174,8 @@
- # want this rule first, use := on ALL, and ALL not filled in yet
- all: do_all
- 
---include */module.mk
-+-include proc/module.mk
-+-include ps/module.mk
- 
- do_all:    $(ALL)
- 
diff --git a/sys-process/procps/files/procps-3.2.8-forest-prefix.patch b/sys-process/procps/files/procps-3.2.8-forest-prefix.patch
deleted file mode 100644
index 915be67308b7..000000000000
--- a/sys-process/procps/files/procps-3.2.8-forest-prefix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-avoid gcc warnings like:
-
-ps/output.c:341:6: warning: the address of ‘forest_prefix’ will always evaluate as ‘true’
-
-Index: ps/output.c
-===================================================================
-RCS file: /cvsroot/procps/procps/ps/output.c,v
-retrieving revision 1.63
-diff -u -p -r1.63 output.c
---- ps/output.c	3 May 2009 06:39:33 -0000	1.63
-+++ ps/output.c	14 Nov 2010 00:24:56 -0000
-@@ -338,7 +338,7 @@ static int pr_args(char *restrict const 
-   unsigned flags;
-   int rightward=max_rightward;
- 
--  if(forest_prefix){
-+  if(/*forest_prefix*/1){
-     int fh = forest_helper(outbuf);
-     endp += fh;
-     rightward -= fh;
-@@ -365,7 +365,7 @@ static int pr_comm(char *restrict const 
-   unsigned flags;
-   int rightward=max_rightward;
-   
--  if(forest_prefix){
-+  if(/*forest_prefix*/1){
-     int fh = forest_helper(outbuf);
-     endp += fh;
-     rightward -= fh;
-@@ -390,7 +390,7 @@ static int pr_fname(char *restrict const
-   char *endp = outbuf;
-   int rightward = max_rightward;
-   
--  if(forest_prefix){
-+  if(/*forest_prefix*/1){
-     int fh = forest_helper(outbuf);
-     endp += fh;
-     rightward -= fh;
diff --git a/sys-process/procps/files/procps-3.2.8-linux-ver-init.patch b/sys-process/procps/files/procps-3.2.8-linux-ver-init.patch
deleted file mode 100644
index 6d4039c91088..000000000000
--- a/sys-process/procps/files/procps-3.2.8-linux-ver-init.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/303120
-
-make sure the linux version constructor runs before the libproc constructor
-since the latter uses variables setup by the former
-
-fix by Chris Coleman
-
-Index: proc/version.c
-===================================================================
-RCS file: /cvsroot/procps/procps/proc/version.c,v
-retrieving revision 1.7
-diff -u -p -r1.7 version.c
---- proc/version.c	9 Feb 2003 07:27:16 -0000	1.7
-+++ proc/version.c	14 Nov 2010 00:22:44 -0000
-@@ -33,7 +33,7 @@ void display_version(void) {
- 
- int linux_version_code;
- 
--static void init_Linux_version(void) __attribute__((constructor));
-+static void init_Linux_version(void) __attribute__((constructor(100)));
- static void init_Linux_version(void) {
-     static struct utsname uts;
-     int x = 0, y = 0, z = 0;	/* cleared in case sscanf() < 3 */
diff --git a/sys-process/procps/files/procps-3.3.2-headers.patch b/sys-process/procps/files/procps-3.3.2-headers.patch
deleted file mode 100644
index c359f4c9062f..000000000000
--- a/sys-process/procps/files/procps-3.3.2-headers.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-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-ncurses.patch b/sys-process/procps/files/procps-3.3.2-ncurses.patch
deleted file mode 100644
index d717502489a8..000000000000
--- a/sys-process/procps/files/procps-3.3.2-ncurses.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 1928653399e4aa73a99049c34334d66345ca8b97 Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@enc.com.au>
-Date: Mon, 9 Jan 2012 21:40:53 +1100
-Subject: [PATCH] watch needs a conditonal LDADD
-
-Makes Debian patch makefile_watch_ncurses redundant.
-watch was being linked to NCURSES_LIBS when it should of been
-WATCH_NCURSES_LIBS which can be ncursesw with 8bit enabled.
----
- Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 06b70ed..0ec2938 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -62,7 +62,7 @@ dist_man_MANS += \
- slabtop_SOURCES = slabtop.c $(top_srcdir)/lib/strutils.c
- slabtop_LDADD = @NCURSES_LIBS@
- watch_SOURCES = watch.c $(top_srcdir)/lib/strutils.c
--watch_LDADD = @NCURSES_LIBS@
-+watch_LDADD = @WATCH_NCURSES_LIBS@
- endif
- 
- kill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c
--- 
-1.7.8.3
-
-From b953a2926549a26b185c56de17d15b232368f6d6 Mon Sep 17 00:00:00 2001
-From: Samuli Suominen <ssuominen@gentoo.org>
-Date: Tue, 24 Jan 2012 12:11:46 -0500
-Subject: [PATCH] fix basic ncurses check
-
-The first check for ncurses is for the non-wide variant, so drop the "w".
-The wide version gets checked later on based on watch8bit.
-
-Signed-off-by: Samuli Suominen <ssuominen@gentoo.org>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-			squashed below
--- 
-1.7.8.3
-
-From fd1295e4618ad9711d8af359e097f3162f30ebd0 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 24 Jan 2012 12:15:13 -0500
-Subject: [PATCH] fix AC_ARG_WITH(ncurses) handling
-
-The third arg is for "the user has specified some flag", not "the user
-has disabled things", so use $withval.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 838d4a4..f6a24a6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -127,7 +127,7 @@ AC_TRY_COMPILE([#include <argp.h>],
- 
- AC_ARG_WITH([ncurses],
-   AS_HELP_STRING([--without-ncurses], [build only applications not needing ncurses]),
--  [with_ncurses=no], [with_ncurses=yes]
-+  [with_ncurses=$withval], [with_ncurses=yes]
- )
- 
- if test "x$with_ncurses" = xno; then
--- 
-1.7.8.3
-
-From 32b74bce18cda251cb1f8d4b1851b1217065eaa3 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 24 Jan 2012 12:40:27 -0500
-Subject: [PATCH] use pkg-config for ncurses by default
-
-Newer ncurses install pkg-config files, so search those first.  If they
-aren't found, fall back to existing detection logic.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.ac |   23 ++++++++++++++---------
- 1 files changed, 14 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f6a24a6..792222c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -16,6 +16,7 @@ AC_PROG_CC
- AM_PROG_CC_C_O
- AC_PROG_INSTALL
- AC_PROG_LN_S
-+PKG_PROG_PKG_CONFIG
- 
- AC_SUBST([WITH_WATCH8BIT])
- AC_ARG_ENABLE([watch8bit],
-@@ -133,19 +134,23 @@ AC_ARG_WITH([ncurses],
- if test "x$with_ncurses" = xno; then
-   AM_CONDITIONAL(WITH_NCURSES, false)
- else
--  AC_CHECK_LIB(ncursesw, initscr, [have_ncurses=yes], [have_ncurses=no])
--  AC_CHECK_HEADERS(curses.h ncurses.h term.h, [], [have_ncurses=no], AC_INCLUDES_DEFAULT)
--  if test "x$have_ncurses" = xno; then
--    AC_MSG_ERROR([ncurses support missing/incomplete (for partial build use --without-ncurses)])
--  fi
-+  PKG_CHECK_MODULES([NCURSES], [ncurses], [], [
-+    AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
-+    AC_CHECK_HEADERS(curses.h ncurses.h term.h, [], [have_ncurses=no], AC_INCLUDES_DEFAULT)
-+    if test "x$have_ncurses" = xno; then
-+      AC_MSG_ERROR([ncurses support missing/incomplete (for partial build use --without-ncurses)])
-+    fi
-+    NCURSES_LIBS="-lncurses"
-+  ])
-   AM_CONDITIONAL(WITH_NCURSES, true)
-   if test "$enable_watch8bit" = yes; then
--    AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw],
--                [AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])])
-+    PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"], [
-+      AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw],
-+                   [AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])])
-+    ])
-   else
--    WATCH_NCURSES_LIBS="-lncurses"
-+    WATCH_NCURSES_LIBS="$NCURSES_LIBS"
-   fi
--  NCURSES_LIBS="-lncurses"
- fi
- AC_SUBST([NCURSES_LIBS])
- AC_SUBST([WATCH_NCURSES_LIBS])
--- 
-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
deleted file mode 100644
index 43cf5b2ef9af..000000000000
--- a/sys-process/procps/files/procps-3.3.2-noproc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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/files/procps-3.3.3-watch-8bit.patch b/sys-process/procps/files/procps-3.3.3-watch-8bit.patch
deleted file mode 100644
index e2a1169bb78a..000000000000
--- a/sys-process/procps/files/procps-3.3.3-watch-8bit.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ff3ab9d52d2d5bb9eed1cfcb54013d5483a37677 Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@enc.com.au>
-Date: Sun, 20 May 2012 17:08:29 +1000
-Subject: [PATCH] watch compiles with 8bit enabled
-
-watch wouldn't compile with --enable-watch8bit as some variables were
-missing.  This changes fixes it.
----
- watch.c |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/watch.c b/watch.c
-index 4465268..4649844 100644
---- a/watch.c
-+++ b/watch.c
-@@ -296,7 +296,11 @@ wint_t my_getwc(FILE * s)
- }
- #endif	/* WITH_WATCH8BIT */
- 
-+#ifdef WITH_WATCH8BIT
-+void output_header(wchar_t *restrict wcommand, int wcommand_columns, int wcommand_characters, double interval)
-+#else
- void output_header(char *restrict command, double interval)
-+#endif	/* WITH_WATCH8BIT */
- {
- 	time_t t = time(NULL);
- 	char *ts = ctime(&t);
-@@ -718,7 +722,11 @@ int main(int argc, char *argv[])
- 		}
- 
- 		if (show_title)
-+#ifdef WITH_WATCH8BIT
-+			output_header(wcommand, wcommand_columns, wcommand_characters, interval);
-+#else
- 			output_header(command, interval);
-+#endif	/* WITH_WATCH8BIT */
- 
- 		if (run_command(command, command_argv))
- 			break;
--- 
-1.7.8.6
-
diff --git a/sys-process/procps/procps-3.2.8-r1.ebuild b/sys-process/procps/procps-3.2.8-r1.ebuild
deleted file mode 100644
index 64f96fb78ce2..000000000000
--- a/sys-process/procps/procps-3.2.8-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8-r1.ebuild,v 1.3 2011/06/14 20:35:27 mattst88 Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DESCRIPTION="Standard informational utilities and process-handling tools"
-HOMEPAGE="http://procps.sourceforge.net/"
-SRC_URI="http://procps.sourceforge.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/3.2.5-top-sort.patch
-	epatch "${FILESDIR}"/procps-3.2.7-proc-mount.patch
-	epatch "${FILESDIR}"/procps-3.2.3-noproc.patch
-	epatch "${FILESDIR}"/procps-3.2.8-toprc-fixup.patch
-	epatch "${FILESDIR}"/procps-3.2.8+gmake-3.82.patch
-
-	# Clean up the makefile
-	#  - we do stripping ourselves
-	#  - punt fugly gcc flags
-	sed -i \
-		-e '/install/s: --strip : :' \
-		-e '/ALL_CFLAGS += $(call check_gcc,-fweb,)/d' \
-		-e '/ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing=2,)/s,=2,,' \
-		-e "/^lib64/s:=.*:=$(get_libdir):" \
-		-e 's:-m64::g' \
-		Makefile || die "sed Makefile"
-
-	# mips 2.4.23 headers (and 2.6.x) don't allow PAGE_SIZE to be defined in
-	# userspace anymore, so this patch instructs procps to get the
-	# value from sysconf().
-	epatch "${FILESDIR}"/${PN}-mips-define-pagesize.patch
-
-	# lame unicode stuff checks glibc defines
-	sed -i "s:__GNU_LIBRARY__ >= 6:0 == $(use unicode; echo $?):" proc/escape.c || die
-}
-
-src_compile() {
-	replace-flags -O3 -O2
-	emake \
-		CC="$(tc-getCC)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die "make failed"
-}
-
-src_install() {
-	emake \
-		ln_f="ln -sf" \
-		ldconfig="true" \
-		DESTDIR="${D}" \
-		install \
-		|| die "install failed"
-
-	insinto /usr/include/proc
-	doins proc/*.h || die "doins include"
-
-	dodoc sysctl.conf BUGS NEWS TODO ps/HACKING
-
-	# compat symlink so people who shouldnt be using libproc can #170077
-	dosym libproc-${PV}.so /$(get_libdir)/libproc.so
-}
-
-pkg_postinst() {
-	einfo "NOTE: With NPTL \"ps\" and \"top\" no longer"
-	einfo "show threads. You can use any of: -m m -L -T H"
-	einfo "in ps or the H key in top to show them"
-}
diff --git a/sys-process/procps/procps-3.2.8-r2.ebuild b/sys-process/procps/procps-3.2.8-r2.ebuild
deleted file mode 100644
index f4838b34b520..000000000000
--- a/sys-process/procps/procps-3.2.8-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8-r2.ebuild,v 1.8 2011/06/14 20:35:27 mattst88 Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DESCRIPTION="Standard informational utilities and process-handling tools"
-HOMEPAGE="http://procps.sourceforge.net/"
-SRC_URI="http://procps.sourceforge.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/3.2.5-top-sort.patch
-	epatch "${FILESDIR}"/procps-3.2.7-proc-mount.patch
-	epatch "${FILESDIR}"/procps-3.2.3-noproc.patch
-	epatch "${FILESDIR}"/procps-3.2.8-toprc-fixup.patch
-	epatch "${FILESDIR}"/procps-3.2.8+gmake-3.82.patch
-	epatch "${FILESDIR}"/procps-3.2.8-linux-ver-init.patch #303120
-	epatch "${FILESDIR}"/procps-3.2.8-forest-prefix.patch
-
-	# Clean up the makefile
-	#  - we do stripping ourselves
-	#  - punt fugly gcc flags
-	sed -i \
-		-e '/install/s: --strip : :' \
-		-e '/ALL_CFLAGS += $(call check_gcc,-fweb,)/d' \
-		-e '/ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing=2,)/s,=2,,' \
-		-e "/^lib64/s:=.*:=$(get_libdir):" \
-		-e 's:-m64::g' \
-		Makefile || die "sed Makefile"
-
-	# mips 2.4.23 headers (and 2.6.x) don't allow PAGE_SIZE to be defined in
-	# userspace anymore, so this patch instructs procps to get the
-	# value from sysconf().
-	epatch "${FILESDIR}"/${PN}-mips-define-pagesize.patch
-
-	# lame unicode stuff checks glibc defines
-	sed -i "s:__GNU_LIBRARY__ >= 6:0 == $(use unicode; echo $?):" proc/escape.c || die
-}
-
-src_compile() {
-	replace-flags -O3 -O2
-	emake \
-		CC="$(tc-getCC)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die "make failed"
-}
-
-src_install() {
-	emake \
-		ln_f="ln -sf" \
-		ldconfig="true" \
-		DESTDIR="${D}" \
-		install \
-		|| die "install failed"
-
-	insinto /usr/include/proc
-	doins proc/*.h || die "doins include"
-
-	dodoc sysctl.conf BUGS NEWS TODO ps/HACKING
-
-	# compat symlink so people who shouldnt be using libproc can #170077
-	dosym libproc-${PV}.so /$(get_libdir)/libproc.so
-}
-
-pkg_postinst() {
-	einfo "NOTE: With NPTL \"ps\" and \"top\" no longer"
-	einfo "show threads. You can use any of: -m m -L -T H"
-	einfo "in ps or the H key in top to show them"
-}
diff --git a/sys-process/procps/procps-3.2.8.ebuild b/sys-process/procps/procps-3.2.8.ebuild
deleted file mode 100644
index 840f6ca5f4cc..000000000000
--- a/sys-process/procps/procps-3.2.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8.ebuild,v 1.10 2011/06/14 20:35:27 mattst88 Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DESCRIPTION="Standard informational utilities and process-handling tools"
-HOMEPAGE="http://procps.sourceforge.net/"
-SRC_URI="http://procps.sourceforge.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/3.2.5-top-sort.patch
-	epatch "${FILESDIR}"/procps-3.2.7-proc-mount.patch
-	epatch "${FILESDIR}"/procps-3.2.3-noproc.patch
-
-	# Clean up the makefile
-	#  - we do stripping ourselves
-	#  - punt fugly gcc flags
-	sed -i \
-		-e '/install/s: --strip : :' \
-		-e '/ALL_CFLAGS += $(call check_gcc,-fweb,)/d' \
-		-e '/ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing=2,)/s,=2,,' \
-		-e "/^lib64/s:=.*:=$(get_libdir):" \
-		-e 's:-m64::g' \
-		Makefile || die "sed Makefile"
-
-	# mips 2.4.23 headers (and 2.6.x) don't allow PAGE_SIZE to be defined in
-	# userspace anymore, so this patch instructs procps to get the
-	# value from sysconf().
-	epatch "${FILESDIR}"/${PN}-mips-define-pagesize.patch
-
-	# lame unicode stuff checks glibc defines
-	sed -i "s:__GNU_LIBRARY__ >= 6:0 == $(use unicode; echo $?):" proc/escape.c || die
-}
-
-src_compile() {
-	replace-flags -O3 -O2
-	emake \
-		CC="$(tc-getCC)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die "make failed"
-}
-
-src_install() {
-	emake \
-		ln_f="ln -sf" \
-		ldconfig="true" \
-		DESTDIR="${D}" \
-		install \
-		|| die "install failed"
-
-	insinto /usr/include/proc
-	doins proc/*.h || die "doins include"
-
-	dodoc sysctl.conf BUGS NEWS TODO ps/HACKING
-
-	# compat symlink so people who shouldnt be using libproc can #170077
-	dosym libproc-${PV}.so /$(get_libdir)/libproc.so
-}
-
-pkg_postinst() {
-	einfo "NOTE: With NPTL \"ps\" and \"top\" no longer"
-	einfo "show threads. You can use any of: -m m -L -T H"
-	einfo "in ps or the H key in top to show them"
-}
diff --git a/sys-process/procps/procps-3.2.8_p10-r1.ebuild b/sys-process/procps/procps-3.2.8_p10-r1.ebuild
deleted file mode 100644
index d6106267a071..000000000000
--- a/sys-process/procps/procps-3.2.8_p10-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8_p10-r1.ebuild,v 1.2 2011/09/06 18:44:05 mattst88 Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DEB_VER=${PV#*_p}
-MY_PV=${PV%_p*}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Standard informational utilities and process-handling tools"
-HOMEPAGE="http://procps.sourceforge.net/"
-SRC_URI="http://procps.sourceforge.net/${MY_P}.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="unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2[unicode?]"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	local p d="${WORKDIR}"/debian/patches
-	pushd "${d}" >/dev/null
-	# makefile_dev_null: this bug is actually in gcc and is already fixed
-	for p in $(use unicode || echo watch_{unicode,ansi_colour}) makefile_dev_null ; do
-		rm ${p}.patch || die
-		sed -i "/^${p}/d" series || die
-	done
-	popd >/dev/null
-	EPATCH_SOURCE="${d}" \
-	epatch $(<"${d}"/series)
-	# fixup debian watch_exec_beep.patch
-	sed -i '1i#include <sys/wait.h>' watch.c || die
-
-	epatch "${FILESDIR}"/${PN}-3.2.7-proc-mount.patch
-	epatch "${FILESDIR}"/${PN}-3.2.3-noproc.patch
-	epatch "${FILESDIR}"/${PN}-3.2.8-toprc-fixup.patch
-	epatch "${FILESDIR}"/${PN}-3.2.8-r1-forest-prefix.patch
-
-	# Clean up the makefile
-	#  - we do stripping ourselves
-	#  - punt fugly gcc flags
-	sed -i \
-		-e '/install/s: --strip : :' \
-		-e '/ALL_CFLAGS += $(call check_gcc,-fweb,)/d' \
-		-e '/ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing=2,)/s,=2,,' \
-		-e "/^lib64/s:=.*:=$(get_libdir):" \
-		-e 's:-m64::g' \
-		Makefile || die "sed Makefile"
-
-	# mips 2.4.23 headers (and 2.6.x) don't allow PAGE_SIZE to be defined in
-	# userspace anymore, so this patch instructs procps to get the
-	# value from sysconf().
-	epatch "${FILESDIR}"/${PN}-mips-define-pagesize.patch
-
-	# lame unicode stuff checks glibc defines
-	sed -i "s:__GNU_LIBRARY__ >= 6:0 == $(use unicode; echo $?):" proc/escape.c || die
-}
-
-src_compile() {
-	replace-flags -O3 -O2
-	emake \
-		CC="$(tc-getCC)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die "make failed"
-}
-
-src_install() {
-	emake \
-		ln_f="ln -sf" \
-		ldconfig="true" \
-		DESTDIR="${D}" \
-		install \
-		|| die "install failed"
-
-	insinto /usr/include/proc
-	doins proc/*.h || die
-
-	dodoc sysctl.conf BUGS NEWS TODO ps/HACKING
-
-	# compat symlink so people who shouldnt be using libproc can #170077
-	dosym libproc-${MY_PV}.so /$(get_libdir)/libproc.so || die
-}
diff --git a/sys-process/procps/procps-3.3.2_p2-r1.ebuild b/sys-process/procps/procps-3.3.2_p2-r1.ebuild
deleted file mode 100644
index 7b4b37c3290c..000000000000
--- a/sys-process/procps/procps-3.3.2_p2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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-r1.ebuild,v 1.2 2012/05/03 04:54:03 jdhore Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs autotools
-
-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="+ncurses static-libs unicode"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.2-r2[unicode?] )"
-DEPEND="${RDEPEND}
-	ncurses? ( virtual/pkgconfig )"
-
-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
-	epatch "${FILESDIR}"/${PN}-3.3.2-ncurses.patch #400555
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--exec-prefix="${EPREFIX}/" \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		$(use_with ncurses) \
-		$(use_enable static-libs static) \
-		$(use_enable unicode watch8bit)
-}
-
-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
-}
diff --git a/sys-process/procps/procps-3.3.3.ebuild b/sys-process/procps/procps-3.3.3.ebuild
deleted file mode 100644
index bfd7b2be16cf..000000000000
--- a/sys-process/procps/procps-3.3.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.3.ebuild,v 1.2 2012/07/29 21:29:38 ottxor Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs autotools
-
-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="http://gitorious.org/procps/procps/archive-tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="+ncurses static-libs unicode"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.2-r2[unicode?] )"
-DEPEND="${RDEPEND}
-	ncurses? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/${PN}-${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-watch-8bit.patch
-
-	po/update-potfiles || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--exec-prefix="${EPREFIX}/" \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		$(use_with ncurses) \
-		$(use_enable static-libs static) \
-		$(use_enable unicode watch8bit)
-}
-
-src_install() {
-	default
-	dodoc sysctl.conf
-
-	# The configure script is completely whacked in the head
-	mv "${ED}"/lib* "${ED}"/usr/ || die
-	gen_usr_ldscript -a procps
-	find "${ED}"/usr -name '*.la' -delete
-}