[gentoo-musl] [PATCH 2/7] sys-process/procps: in tree version works

[Felix Janda]

Gentoo-Bug: https://bugs.gentoo.org/583978
---
 sys-process/procps/Manifest                        | 14 -----
 .../procps/files/procps-3.3.6-error_at_line.patch  | 12 ----
 .../procps/files/procps-3.3.8-kill-neg-pid.patch   | 46 ----------------
 .../procps/files/procps-3.3.8-no-GLOB_TILDE.patch  | 12 ----
 .../procps/files/procps-3.3.8-no-error_h.patch     | 54 ------------------
 .../procps/files/procps-3.3.9-configure.patch      | 13 -----
 .../procps/files/procps-3.3.9-no-error_h.patch     | 64 ----------------------
 sys-process/procps/metadata.xml                    | 15 -----
 sys-process/procps/procps-3.3.10-r99.ebuild        | 63 ---------------------
 sys-process/procps/procps-3.3.8-r99.ebuild         | 56 -------------------
 sys-process/procps/procps-3.3.9-r99.ebuild         | 56 -------------------
 11 files changed, 405 deletions(-)
 delete mode 100644 sys-process/procps/Manifest
 delete mode 100644 sys-process/procps/files/procps-3.3.6-error_at_line.patch
 delete mode 100644 sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch
 delete mode 100644 sys-process/procps/files/procps-3.3.8-no-GLOB_TILDE.patch
 delete mode 100644 sys-process/procps/files/procps-3.3.8-no-error_h.patch
 delete mode 100644 sys-process/procps/files/procps-3.3.9-configure.patch
 delete mode 100644 sys-process/procps/files/procps-3.3.9-no-error_h.patch
 delete mode 100644 sys-process/procps/metadata.xml
 delete mode 100644 sys-process/procps/procps-3.3.10-r99.ebuild
 delete mode 100644 sys-process/procps/procps-3.3.8-r99.ebuild
 delete mode 100644 sys-process/procps/procps-3.3.9-r99.ebuild

diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
deleted file mode 100644
index 0e14650..0000000
--- a/sys-process/procps/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX procps-3.3.6-error_at_line.patch 325 SHA256 642eb70e9165f3cf18b7ca3afe370f93991b32bc0271c9e1064c774dd2fadbb3 SHA512 fd0fd437deb7c1ac683ca90f3e94d14b35f3e9d19422e84f59b74d7530f204a04a289e5397d986536adffb2a30611ec5a8486bc9f01a32708d9025d3fb7c98b9 WHIRLPOOL f0f2da5452a8a1817a48a76723f6d02eddb856e8e69bac8ec8d87891a7f94f10c8945dba5c501cdc0d3f52fe690940524d0ae2c32868a3aa48155e54ffd2c3af
-AUX procps-3.3.8-kill-neg-pid.patch 1446 SHA256 847c21f6619c7aa0f2847726a17595f986ec2fe0f361d95e17812639abe32a79 SHA512 3ed4e83d81f7dd574ff68bbcae9ad9f8649a39d46a17de5fd4297f215d8f70cd28e415b1d3c7b5142e7719343af28f4b393061a60eb012caece81dfe5ff6c271 WHIRLPOOL cf452118312e60a0bab7a4ec87bed9a9d2f5fb8bb563769a0430f11c72348e5be79bdfc031f67f4e97e0bf9b32f6ccd1ac590f392c95ee935b77b857ce1b1739
-AUX procps-3.3.8-no-GLOB_TILDE.patch 466 SHA256 17b3e7360d740c97b842e1c68cd863bb66b13b1539b6ead7435d75c1daf5f48a SHA512 9fc13cff6c310080f5af8a2fa83e88d88ff741046c988ae806ce010b37cfd38a770726bc98bb50b9532c5c1679f7da45b12803f55e4e40638daf4dd55c58b84f WHIRLPOOL d791950607fd06a8bfeccf21fd17a454f3c3a207f562bcebdd1c521f0afecdd8a358dec8a4277951eed0f71a7210ba89bae2f9e8887043e39169aab7bd9c6269
-AUX procps-3.3.8-no-error_h.patch 1394 SHA256 2535f3cafc047aff6ddb879dc31479d95b445130471934a48d9aaa25835b91f3 SHA512 0c4dd060f93dca15fc36a0a4640909dd1782dc7af96ada62ec42a0d4f2831ccd1e274c14136d0df679b7066316dc44203267c077a875f6183df131b90c6f2a26 WHIRLPOOL 8232a4c92687ea8334ab933947fee107a1e7d712dbd3dbff4030353e41fd83384772b24a6acaa8335245205d06dedcf3ad28a5f642dd141882a73332d5c36920
-AUX procps-3.3.9-configure.patch 462 SHA256 d5d1274b7a41d2e2c6ccdada90f5107cbbc416b6b977e44da3bde2e299085ab2 SHA512 197c22cd86e601f77a6fa86d6bfcae6019982d4faad50aaf1c002d093f961cb8f664169b8b90f17572511c7fdd2b3afe6cc655793abf8bce4257c603be47ade5 WHIRLPOOL 6ee6d5ad2c24a17722613847fced3e6d962f1a4f4af3f4bc9c87aec269ee43f825effcb5308f496a9c78f8ea61ca8295ff598142ee005abeaee62a9b76ee0da9
-AUX procps-3.3.9-no-error_h.patch 1587 SHA256 0ed0d24f05ff23f83bd8cafa45e07cd015d45b394dadad76f3deea2316211465 SHA512 f05db99409189c3e284d65faa7ca9d267ab8cb111d5958bb722f57919fe45cbb00332d0c1b1f9f666b492ba657e0ea6bf931b9c71d4dfc5b69775fcf18acf480 WHIRLPOOL f41d32288b340e8de389034b60afd6b3b011f565e63b27b98d429fe4be1f73e90a72f35e550706dc5d5f856e4b9b540b6cfcbc4ec504ae3aea9ff374d86027d8
-DIST procps-3.3.8-respect_epipe_in_fileutils.patch 1412 SHA256 4a56c88697fa6099a62a4169838c9c04df2c2c2bbc08e9ad9953e5b00df16d68 SHA512 317fc8e7c3fbd280182f55b399a30b2cfbc72268590825ea323537361cd761776afe1486509cb04ae937287ccf11578def5aac2eaa0fe660d04f0357282d9c14 WHIRLPOOL f8fdac8a172037edf51e1e777374293848afaa2180adc35adce5bf8ebefceb37df30082b27f6d6f1f5a571ba0f84bdfff9fc6c2343f120ce5c80b2f52e1804ac
-DIST procps-ng-3.3.10.tar.xz 657232 SHA256 1759229cd0d97da3d200d5599c4ea82726d61fae9c4b7d3edd52c544962791b7 SHA512 cbfa49e79a88a8e7066a9c316ef089f15fa825c5bfbc22ab8a83f53c6f367a7c586cef9c403e360d373d824c471533a15ddb11cd30c561650e6879fe687e7e4f WHIRLPOOL 723dd1c00578a7fa7e3ff47bed60283c30850cc8ae8069c704ba648792809a67c5944dbfd9b7b0159e0be83215b61e6b71b2d76e65b3619aed54223900ffed9b
-DIST procps-ng-3.3.8.tar.xz 553056 SHA256 a4109cfb6fe3bcfb5a0efb37efe04d0c8ce858bff3820d48cc258bad41bed46b SHA512 63ba13f9ef0f4558748c6b2d1b0719a1173bd87e38279e3b052a10e207e1b808626d031f16dd65b05c55708366df7350cb0a64da8dc20e7f9f1fdc1cd2417c71 WHIRLPOOL 671860af1f028c9c8c7bb0c035db86e3e13d9d754801e7a3f19105710bb9720bbfa627e4e748b823192286319fe4e7e736c1af5a3fb34116cbe93386b0d2bed6
-DIST procps-ng-3.3.9.tar.xz 560812 SHA256 00f0cb0fadf968ddf605b0ef119846af07386629244d4f3da711a2cecf4e8663 SHA512 62c7270aa48b4346a3198f306d1cb8474f64650bfb67e8cc6c4d41923e50c31c95b3a0367a464823fb50a6137ec0c6352006292ac85b50caf730ec8ec35eb553 WHIRLPOOL dac97433a87badd40b46e3155bf0e30652ed2961a41bc8fca074357431301d250632215512ad752634c9c4f3273a1c75caba1ecf4f5a3c510bee155660dde166
-EBUILD procps-3.3.10-r99.ebuild 1793 SHA256 d1b4167a22d1ad0a5ca4f143760454e2fb3edfd22754ad0c7dc33e19fea5d309 SHA512 efbf7891204d4842cbe9a4e9e2b2c9d380a8eb25f325be9e3995f3b9c4515d307bed2240b5fb9dd1b19ed532f9b4778f4160e593c671d9bc1a69e524787a60ed WHIRLPOOL 6eacf550758d0f72705fbea9ab133808d74c2082b125cfcef2c70f24dc7a92b4ffec58810bc34645ab178b0a62dd5c014b8a985c4effe3b86d9bac7645c02fe4
-EBUILD procps-3.3.8-r99.ebuild 1708 SHA256 2d56b5c335a6ccc9a81e001e4aedaa126c234d7be1c5f1acb43faaa98f719149 SHA512 e7af787334c663b2f1de33e5fe51baa5ef972b088b77b78028b3ee13d1129bd2caf0c6c6107f5af93f5f78f55280462e4a6ebdc1bc1980eef904ea1b2c18aac8 WHIRLPOOL 2a4c2fcb4027d9feb5e947800d3be0bd049a045cc382ff1e2d418f215a7ac77ae4bf7990cd6ef348b142f565a1f1ef7bc2b5f22cf7ba500cd25ec1ab6b930986
-EBUILD procps-3.3.9-r99.ebuild 1589 SHA256 189ea98c0f0f7db46f6aa34c914783326ac13a6f67bf0282a65da342b0686016 SHA512 8f6763c6d7ca68389da4b22b7fac85c79051312b1facbca744221b7d34985177af7e42f05936da7e09bb5a2802b2048a24ec3ad936157b8c439a45387dd21441 WHIRLPOOL efd7173ed2400acd54eee3f4c0a5aa125c8a229f42c5d02ca7c63ae8d6dfc5cced46cf15c24821ba13dacaaaea4ae84ce2b236b25323211d08bd5da78c4a1a62
-MISC metadata.xml 521 SHA256 2ee3b62f25fdcfc88808ec134b7c8f1f8c3c584f4e2481ae0d3ac5040f180476 SHA512 399650761c1ac469e4588555b69dddb3ce8022922151ca657cf9b4e73f10461a79fcbb80a2781ed71409ffe6ca03e5979342cb93b6740d2cda4e0e0fda22f330 WHIRLPOOL de20c01b8270c61e06592afc4e69a08d23e1e19b273d8c6c96e7b6856c2aafd208e223e4575191152550a622bc353bdb282641506190879682cc8f8da21916ea
diff --git a/sys-process/procps/files/procps-3.3.6-error_at_line.patch b/sys-process/procps/files/procps-3.3.6-error_at_line.patch
deleted file mode 100644
index 4329a49..0000000
--- a/sys-process/procps/files/procps-3.3.6-error_at_line.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-ps/display.c:65:7: warning: implicit declaration of function ‘error_at_line’ [-Wimplicit-function-declaration]
-
---- ps/display.c
-+++ ps/display.c
-@@ -25,6 +25,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <error.h> /* error_at_line */
- 
- #include <sys/sysmacros.h>
- #include <sys/types.h>
diff --git a/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch b/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch
deleted file mode 100644
index 0039748..0000000
--- a/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 396cbc4cf36166217d877e2ff7e0a290758b0bc2 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@g.o>
-Date: Thu, 27 Jun 2013 18:37:17 -0400
-Subject: [PATCH] kill: fix -PID handling
-
-Commit 19b6f48990b02aeca211b480625b95b2033c1017 tried to fix -PID
-handling, but the new logic ends up skipping over the arg.  This is
-because getopt increments optind after it processed the -PID (even
-though it was an unknown option).  We need to decrement it by one
-so the loop at the end of the code will process it for us.
-
-I also fixed some whitespace errors in that same commit.
-
-URL: http://code.google.com/p/chromium/issues/detail?id=255209
-Signed-off-by: Mike Frysinger <vapier@g.o>
----
- skill.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/skill.c b/skill.c
-index fb57305..074c5d7 100644
---- a/skill.c
-+++ b/skill.c
-@@ -390,7 +390,7 @@ static void __attribute__ ((__noreturn__))
- 	else
- 		sigopt++;
- 
--	opterr=0; /* suppress errors on -123 */
-+	opterr = 0; /* suppress errors on -123 */
- 	while (loop == 1 && (i = getopt_long(argc, argv, "l::Ls:hV", longopts, NULL)) != -1)
- 		switch (i) {
- 		case 'l':
-@@ -423,7 +423,9 @@ static void __attribute__ ((__noreturn__))
- 				xwarnx(_("invalid argument %c"), optopt);
- 				kill_usage(stderr);
- 			}
--			loop=0;
-+			/* We need to back off by one since getopt() ate the -PID */
-+			--optind;
-+			loop = 0;
- 			break;
- 		default:
- 			kill_usage(stderr);
--- 
-1.8.2.1
-
diff --git a/sys-process/procps/files/procps-3.3.8-no-GLOB_TILDE.patch b/sys-process/procps/files/procps-3.3.8-no-GLOB_TILDE.patch
deleted file mode 100644
index 09af420..0000000
--- a/sys-process/procps/files/procps-3.3.8-no-GLOB_TILDE.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar procps-ng-3.3.8.orig/sysctl.c procps-ng-3.3.8/sysctl.c
---- procps-ng-3.3.8.orig/sysctl.c	2013-05-25 21:39:41.000000000 +0000
-+++ procps-ng-3.3.8/sysctl.c	2014-01-17 16:28:37.241303653 +0000
-@@ -500,7 +500,7 @@
- 	int globerr;
- 	int j;
- 
--	globerr = glob(filename, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf);
-+	globerr = glob(filename, GLOB_NOCHECK, NULL, &globbuf);
- 	if (globerr != 0 && globerr != GLOB_NOMATCH)
- 		xerr(EXIT_FAILURE, _("glob failed"));
- 
diff --git a/sys-process/procps/files/procps-3.3.8-no-error_h.patch b/sys-process/procps/files/procps-3.3.8-no-error_h.patch
deleted file mode 100644
index e6ca793..0000000
--- a/sys-process/procps/files/procps-3.3.8-no-error_h.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur procps-ng-3.3.8.orig/ps/display.c procps-ng-3.3.8/ps/display.c
---- procps-ng-3.3.8.orig/ps/display.c	2013-05-25 21:39:40.000000000 +0000
-+++ procps-ng-3.3.8/ps/display.c	2014-01-17 14:43:26.027950754 +0000
-@@ -25,7 +25,12 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+
-+#if HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#endif
- 
- #include <sys/sysmacros.h>
- #include <sys/types.h>
-@@ -63,7 +68,11 @@
-     case SIGUSR2:
-       exit(EXIT_FAILURE);
-     default:
-+#if HAVE_ERROR_H
-       error_at_line(0, 0, __FILE__, __LINE__, "%s", _("please report this bug"));
-+#else
-+      err(1, "%s:%d: %s", __FILE__, __LINE__, _("please report this bug"));
-+#endif
-       signal(signo, SIG_DFL);  /* allow core file creation */
-       kill(getpid(), signo);
-   }
---- procps-ng-3.3.8.orig/ps/global.c	2013-05-25 21:39:40.000000000 +0000
-+++ procps-ng-3.3.8/ps/global.c	2014-01-17 14:42:00.972945998 +0000
-@@ -25,7 +27,12 @@
- #include <string.h>
- #include <termios.h>
- #include <unistd.h>
-+
-+#if HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#endif
- 
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-@@ -522,6 +529,10 @@
- 		     unsigned int linenum,
- 		     const char *message)
- {
-+#if HAVE_ERROR_H
-   error_at_line(0, 0, filename, linenum, "%s", message);
-+#else
-+  err(1, "%s:%d: %s", filename, linenum, message);
-+#endif
-   exit(EXIT_FAILURE);
- }
diff --git a/sys-process/procps/files/procps-3.3.9-configure.patch b/sys-process/procps/files/procps-3.3.9-configure.patch
deleted file mode 100644
index 4822f62..0000000
--- a/sys-process/procps/files/procps-3.3.9-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/procps-ng-3.3.9/configure.ac
-+++ b/procps-ng-3.3.9/configure.ac
-@@ -235,7 +235,9 @@
- else
-   AC_SEARCH_LIBS([dlopen], [dl], [],
-     [AC_MSG_ERROR([dynamic linking unavailable, circumvent with --disable-numa])])
--  DL_LIB="$ac_cv_search_dlopen"
-+  if test "$ac_cv_search_dlopen" != "none required" ; then               
-+    DL_LIB="$ac_cv_search_dlopen"
-+  fi                                                                     
- fi
- AC_SUBST([DL_LIB])
- 
diff --git a/sys-process/procps/files/procps-3.3.9-no-error_h.patch b/sys-process/procps/files/procps-3.3.9-no-error_h.patch
deleted file mode 100644
index 070e1fe..0000000
--- a/sys-process/procps/files/procps-3.3.9-no-error_h.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -aur a/procps-ng-3.3.9/lib/nsutils.c b/procps-ng-3.3.9/lib/nsutils.c
---- a/procps-ng-3.3.9/lib/nsutils.c
-+++ b/procps-ng-3.3.9/lib/nsutils.c
-@@ -1,5 +1,4 @@
- #include <errno.h>
--#include <error.h>
- #include <stdio_ext.h>
- #include <stdlib.h>
- #include <sys/types.h>
-diff -aur a/procps-ng-3.3.9/ps/display.c b/procps-ng-3.3.9/ps/display.c
---- a/procps-ng-3.3.9/ps/display.c
-+++ b/procps-ng-3.3.9/ps/display.c
-@@ -25,7 +25,12 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+
-+#if HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#endif
- 
- #include <sys/sysmacros.h>
- #include <sys/types.h>
-@@ -63,7 +68,11 @@
-     case SIGUSR2:
-       exit(EXIT_FAILURE);
-     default:
-+#if HAVE_ERROR_H
-       error_at_line(0, 0, __FILE__, __LINE__, "%s", _("please report this bug"));
-+#else
-+      err(1, "%s:%d: %s", __FILE__, __LINE__, _("please report this bug"));
-+#endif
-       signal(signo, SIG_DFL);  /* allow core file creation */
-       kill(getpid(), signo);
-   }
-diff -aur a/procps-ng-3.3.9/ps/global.c b/procps-ng-3.3.9/ps/global.c
---- a/procps-ng-3.3.9/ps/global.c
-+++ b/procps-ng-3.3.9/ps/global.c
-@@ -25,7 +25,12 @@
- #include <string.h>
- #include <termios.h>
- #include <unistd.h>
-+
-+#if HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#endif
- 
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-@@ -522,6 +527,10 @@
- 		     unsigned int linenum,
- 		     const char *message)
- {
-+#if HAVE_ERROR_H
-   error_at_line(0, 0, filename, linenum, "%s", message);
-+#else
-+  err(1, "%s:%d: %s", filename, linenum, message);
-+#endif
-   exit(EXIT_FAILURE);
- }
diff --git a/sys-process/procps/metadata.xml b/sys-process/procps/metadata.xml
deleted file mode 100644
index d98c01d..0000000
--- a/sys-process/procps/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@g.o</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="modern-top">Enables new startup defaults of top. Keeps old defaults if disabled</flag>
-	<flag name="ncurses">Build programs that use ncurses: top, slabtop, watch</flag>
-</use>
-<upstream>
-	<remote-id type="sourceforge">procps</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/sys-process/procps/procps-3.3.10-r99.ebuild b/sys-process/procps/procps-3.3.10-r99.ebuild
deleted file mode 100644
index 9d68a02..0000000
--- a/sys-process/procps/procps-3.3.10-r99.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="standard informational utilities and process-handling tools"
-# http://packages.debian.org/sid/procps
-HOMEPAGE="http://procps.sourceforge.net/ http://gitorious.org/procps"
-# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz"
-#FEDORA_HASH="0980646fa25e0be58f7afb6b98f79d74"
-#SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz"
-SRC_URI="http://dev.gentoo.org/~polynomial-c/${PN}-ng-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips x86"
-IUSE="+ncurses modern-top nls selinux static-libs systemd test"
-
-RDEPEND="!<sys-apps/sysvinit-2.88-r6
-	ncurses? ( >=sys-libs/ncurses-5.7-r7 )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209 )"
-DEPEND="${RDEPEND}
-	ncurses? ( virtual/pkgconfig )
-	systemd? ( virtual/pkgconfig )
-	test? ( dev-util/dejagnu )"
-
-S=${WORKDIR}/${PN}-ng-${PV}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch
-	sed -i -e 's:systemd-login:systemd:' configure || die #501306
-}
-
-src_configure() {
-	use elibc_musl && append-cppflags -D_XOPEN_SOURCE_EXTENDED
-	econf \
-		--exec-prefix="${EPREFIX}" \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--disable-watch8bit \
-		$(use_enable modern-top) \
-		$(use_with ncurses) \
-		$(use_enable nls) \
-		$(use_enable selinux libselinux) \
-		$(use_enable static-libs static) \
-		$(use_with systemd)
-}
-
-src_install() {
-	default
-	#dodoc sysctl.conf
-
-	mv "${ED}"/usr/bin/pidof "${ED}"/bin/ || die
-
-	# The configure script is completely whacked in the head
-	mv "${ED}"/lib* "${ED}"/usr/ || die
-	gen_usr_ldscript -a procps
-	prune_libtool_files
-}
diff --git a/sys-process/procps/procps-3.3.8-r99.ebuild b/sys-process/procps/procps-3.3.8-r99.ebuild
deleted file mode 100644
index 3a40d96..0000000
--- a/sys-process/procps/procps-3.3.8-r99.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="standard informational utilities and process-handling tools"
-# http://packages.debian.org/sid/procps
-HOMEPAGE="http://procps.sourceforge.net/ http://gitorious.org/procps"
-# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz"
-FEDORA_HASH="aecbeeda2ab308f8d09dddcb4cb9a572"
-SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz
-	https://gitorious.org/${PN}/${PN}/commit/ce5e995921e770bfcda25e42fe090aeccdbf1291.patch -> ${P}-respect_epipe_in_fileutils.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="+ncurses nls static-libs unicode"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7[unicode?] )"
-DEPEND="${RDEPEND}
-	ncurses? ( virtual/pkgconfig )
-	test? ( dev-util/dejagnu )"
-
-S=${WORKDIR}/${PN}-ng-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-kill-neg-pid.patch \
-		"${DISTDIR}"/${P}-respect_epipe_in_fileutils.patch \
-		"${FILESDIR}"/${P}-no-error_h.patch \
-		"${FILESDIR}"/${P}-no-GLOB_TILDE.patch
-}
-
-src_configure() {
-	use elibc_musl && export ac_cv_search_dlopen=
-	use elibc_musl && append-cflags -D_XOPEN_SOURCE_EXTENDED
-	econf \
-		--exec-prefix="${EPREFIX}" \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		$(use_with ncurses) \
-		$(use_enable nls) \
-		$(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
-	prune_libtool_files
-}
diff --git a/sys-process/procps/procps-3.3.9-r99.ebuild b/sys-process/procps/procps-3.3.9-r99.ebuild
deleted file mode 100644
index ec161f5..0000000
--- a/sys-process/procps/procps-3.3.9-r99.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="standard informational utilities and process-handling tools"
-# http://packages.debian.org/sid/procps
-HOMEPAGE="http://procps.sourceforge.net/ http://gitorious.org/procps"
-# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz"
-FEDORA_HASH="0980646fa25e0be58f7afb6b98f79d74"
-SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="+ncurses nls static-libs test unicode"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7[unicode?] )
-	!<sys-apps/sysvinit-2.88-r6"
-DEPEND="${RDEPEND}
-	ncurses? ( virtual/pkgconfig )
-	test? ( dev-util/dejagnu )"
-
-S=${WORKDIR}/${PN}-ng-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch
-	epatch "${FILESDIR}"/${PN}-3.3.8-no-GLOB_TILDE.patch
-	epatch "${FILESDIR}"/${P}-no-error_h.patch
-	epatch "${FILESDIR}"/${P}-configure.patch
-	autoreconf
-}
-
-src_configure() {
-	use elibc_musl && append-cppflags -D_XOPEN_SOURCE_EXTENDED
-	econf \
-		--exec-prefix="${EPREFIX}" \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		$(use_with ncurses) \
-		$(use_enable nls) \
-		$(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
-	prune_libtool_files
-}
-- 
2.7.3