Remove masked for removal packages

23 files changed, 0 insertions, 754 deletions

diff --git a/app-admin/aws-as-tools/Manifest b/app-admin/aws-as-tools/Manifest
deleted file mode 100644
index 8f1032a7ad54..000000000000
--- a/app-admin/aws-as-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST AutoScaling-1.0.49.1.zip 12387808 BLAKE2B 7f43b3544b05f1adc196c28b7c2fc5c26ea84cb3d3bd7cf098d8413b98aac5d2908177ee5567aad6dbea96d1abbf60794c4450423de768c280a33cb4efdbbd1e SHA512 aefc4dfc970757062ca972c5d532485c9e28ceb771b6fa0a4fb2fe25460bd67e3023bcefde57f9852340b6015e7ab2771c49beb0826e1394710ea7eea94948ed
diff --git a/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild b/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild
deleted file mode 100644
index a9b3692c2a2a..000000000000
--- a/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The API tools serve as the client interface to the Auto Scaling web service"
-HOMEPAGE="http://aws.amazon.com/developertools/2535"
-# SRC_URI="http://ec2-downloads.s3.amazonaws.com/AutoScaling-2011-01-01.zip"
-SRC_URI="mirror://sabayon/app-admin/AutoScaling-1.0.49.1.zip"
-
-LICENSE="Amazon"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/jre"
-
-S="${WORKDIR}/AutoScaling-${PV}"
-
-src_prepare() {
-	default
-
-	find . -name '*.cmd' -delete || die
-	rm bin/{as-cmd,service}-2009-05-15 || die
-}
-
-src_install() {
-	insinto /opt/${PN}/lib
-	doins -r lib/.
-
-	exeinto /opt/${PN}/bin
-	doexe bin/*
-
-	cat > "${T}"/99${PN} <<- EOF || die
-		AWS_AUTO_SCALING_HOME=/opt/${PN}
-		PATH=/opt/${PN}/bin
-		ROOTPATH=/opt/${PN}/bin
-	EOF
-	doenvd "${T}"/99${PN}
-
-	dodoc "THIRDPARTYLICENSE.TXT"
-}
-
-pkg_postinst() {
-	ewarn "Remember to run: env-update && source /etc/profile if you plan"
-	ewarn "to use these tools in a shell before logging out (or restarting"
-	ewarn "your login manager)"
-
-	elog
-	elog "You need to put the following in your ~/.bashrc replacing the"
-	elog "values with the full path to your AWS credentials file."
-	elog
-	elog "  export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
-	elog
-	elog "It should contains two lines: the first line lists the AWS Account's"
-	elog "AWS Access Key ID, and the second line lists the AWS Account's"
-	elog "Secret Access Key. For example:"
-	elog
-	elog "  AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
-	elog "  AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
-}
diff --git a/app-admin/aws-as-tools/metadata.xml b/app-admin/aws-as-tools/metadata.xml
deleted file mode 100644
index 6d127b5ab82c..000000000000
--- a/app-admin/aws-as-tools/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>sergey.zhuga@gmail.com</email>
-    <name>Sergey Zhuga</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-admin/aws-cw-tools/Manifest b/app-admin/aws-cw-tools/Manifest
deleted file mode 100644
index 918cd8f94fab..000000000000
--- a/app-admin/aws-cw-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CloudWatch-1.0.12.1.zip 6156651 BLAKE2B 140dc28fa44423824f180f34ab05918068e941f31de3081c0ee7ae462ee8d63f26c4fdc838a9e677638a34609a215f52b83572980e488d34557d39d610c434e7 SHA512 881a428a2861b86196a691f24a3471058426f049170d16f067d7cc319712beb161c80041e9ae89339d5298ffbf2869c04509fbe4620cd60cc74658c8d3ab11ec
diff --git a/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild b/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild
deleted file mode 100644
index ab4c5fb5543e..000000000000
--- a/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The API tools serve as the client interface to the Amazon CloudWatch web service"
-HOMEPAGE="http://aws.amazon.com/developertools/2534"
-# SRC_URI="http://ec2-downloads.s3.amazonaws.com/CloudWatch-2010-08-01.zip"
-SRC_URI="mirror://sabayon/${CATEGORY}/CloudWatch-${PV}.zip"
-
-LICENSE="Amazon"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/jre"
-
-S="${WORKDIR}/CloudWatch-${PV}"
-
-src_prepare() {
-	default
-	find . -name '*.cmd' -delete || die
-}
-
-src_install() {
-	insinto /opt/${PN}/lib
-	doins -r lib/.
-
-	exeinto /opt/${PN}/bin
-	doexe bin/*
-
-	dodir /etc/env.d
-	cat - > "${T}"/99${PN} <<- EOF || die
-		AWS_CLOUDWATCH_HOME=/opt/${PN}
-		PATH=/opt/${PN}/bin
-		ROOTPATH=/opt/${PN}/bin
-	EOF
-	doenvd "${T}"/99${PN}
-
-	dodoc "THIRDPARTYLICENSE.TXT"
-}
-
-pkg_postinst() {
-	ewarn "Remember to run: env-update && source /etc/profile if you plan"
-	ewarn "to use these tools in a shell before logging out (or restarting"
-	ewarn "your login manager)"
-
-	elog
-	elog "You need to put the following in your ~/.bashrc replacing the"
-	elog "values with the full path to your AWS credentials file."
-	elog
-	elog "  export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
-	elog
-	elog "It should contains two lines: the first line lists the AWS Account's"
-	elog "AWS Access Key ID, and the second line lists the AWS Account's"
-	elog "Secret Access Key. For example:"
-	elog
-	elog "  AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
-	elog "  AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
-}
diff --git a/app-admin/aws-cw-tools/metadata.xml b/app-admin/aws-cw-tools/metadata.xml
deleted file mode 100644
index 6d127b5ab82c..000000000000
--- a/app-admin/aws-cw-tools/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>sergey.zhuga@gmail.com</email>
-    <name>Sergey Zhuga</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-admin/aws-iam-tools/Manifest b/app-admin/aws-iam-tools/Manifest
deleted file mode 100644
index 3b7799099101..000000000000
--- a/app-admin/aws-iam-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST IAMCli-1.3.0.zip 3957057 BLAKE2B b2e429c2fb3169e23d6e6fc4c4b33594f2814bf976d1c584551008561b71977a3ee4abafd50bd3e52592e918624da01b83527557d2079772d083fbe96ee52eb5 SHA512 5012ece2d0569545848d83cf879b4d05f7f955f22bbc31b86f3993e4f5ee48de3099369fddf7f2b2d98f89e56c8c329e427a1f7dca0afa728ea9593c1b36497c
diff --git a/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild b/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild
deleted file mode 100644
index 5714f191ff31..000000000000
--- a/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The Command Line Interface for the AWS Identity and Access Management Service"
-HOMEPAGE="http://aws.amazon.com/developertools/AWS-Identity-and-Access-Management/4143"
-SRC_URI="mirror://sabayon/${CATEGORY}/IAMCli-${PV}.zip"
-
-LICENSE="Amazon"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/jre"
-
-S="${WORKDIR}/IAMCli-${PV}"
-
-src_prepare() {
-	default
-	find . -name '*.cmd' -delete || die
-}
-
-src_install() {
-	insinto /opt/${PN}/lib
-	doins -r lib/.
-
-	exeinto /opt/${PN}/bin
-	doexe bin/*
-
-	cat > "${T}"/99${PN} <<- EOF || die
-		AWS_IAM_HOME=/opt/${PN}
-		PATH=/opt/${PN}/bin
-		ROOTPATH=/opt/${PN}/bin
-	EOF
-	doenvd "${T}"/99${PN}
-
-	dodoc LICENSE.txt
-}
-
-pkg_postinst() {
-	ewarn "Remember to run: env-update && source /etc/profile if you plan"
-	ewarn "to use these tools in a shell before logging out (or restarting"
-	ewarn "your login manager)"
-
-	elog
-	elog "You need to put the following in your ~/.bashrc replacing the"
-	elog "values with the full path to your AWS credentials file."
-	elog
-	elog "  export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
-	elog
-	elog "It should contains two lines: the first line lists the AWS Account's"
-	elog "AWS Access Key ID, and the second line lists the AWS Account's"
-	elog "Secret Access Key. For example:"
-	elog
-	elog "  AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
-	elog "  AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
-}
diff --git a/app-admin/aws-iam-tools/metadata.xml b/app-admin/aws-iam-tools/metadata.xml
deleted file mode 100644
index 6d127b5ab82c..000000000000
--- a/app-admin/aws-iam-tools/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>sergey.zhuga@gmail.com</email>
-    <name>Sergey Zhuga</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-admin/aws-rds-tools/Manifest b/app-admin/aws-rds-tools/Manifest
deleted file mode 100644
index d58107a3bbe7..000000000000
--- a/app-admin/aws-rds-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RDSCli-1.6.001.zip 6291974 BLAKE2B bdb7f9bce07e920b144cce15e6b05f9d98aeab4cbb33c181914d8584c5e24f70ef486e3d2b677e166ad9f936a2d15758ba55cc26f7fc129ed907989c2d3424a8 SHA512 29eb31064cc9b067bdc625e9777dd1cc77bdbd01a167c91c396d52f89fd9617496e2383fe343a17abb0d8029e47eb87f8ae7e60c0dd5a89cee485dbe45a05963
diff --git a/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild b/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild
deleted file mode 100644
index 1cd6d1b4857c..000000000000
--- a/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The Command Line Toolkit for the Amazon Relational Database Service"
-HOMEPAGE="http://aws.amazon.com/developertools/2928"
-SRC_URI="mirror://sabayon/${CATEGORY}/RDSCli-${PV}.zip"
-
-LICENSE="Amazon"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/jre"
-
-S="${WORKDIR}/RDSCli-${PV}"
-
-src_prepare() {
-	default
-	find . -name '*.cmd' -delete || die
-}
-
-src_install() {
-	insinto /opt/${PN}/lib
-	doins -r lib/.
-
-	exeinto /opt/${PN}/bin
-	doexe bin/*
-
-	cat > "${T}"/99${PN} <<- EOF || die
-		AWS_RDS_HOME=/opt/${PN}
-		PATH=/opt/${PN}/bin
-		ROOTPATH=/opt/${PN}/bin
-	EOF
-	doenvd "${T}"/99${PN}
-
-	dodoc THIRDPARTYLICENSE.TXT
-}
-
-pkg_postinst() {
-	ewarn "Remember to run: env-update && source /etc/profile if you plan"
-	ewarn "to use these tools in a shell before logging out (or restarting"
-	ewarn "your login manager)"
-
-	elog
-	elog "You need to put the following in your ~/.bashrc replacing the"
-	elog "values with the full path to your AWS credentials file."
-	elog
-	elog "  export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
-	elog
-	elog "It should contains two lines: the first line lists the AWS Account's"
-	elog "AWS Access Key ID, and the second line lists the AWS Account's"
-	elog "Secret Access Key. For example:"
-	elog
-	elog "  AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
-	elog "  AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
-}
diff --git a/app-admin/aws-rds-tools/metadata.xml b/app-admin/aws-rds-tools/metadata.xml
deleted file mode 100644
index 6d127b5ab82c..000000000000
--- a/app-admin/aws-rds-tools/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>sergey.zhuga@gmail.com</email>
-    <name>Sergey Zhuga</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-admin/jinit/Manifest b/app-admin/jinit/Manifest
deleted file mode 100644
index 66ca7d86aec6..000000000000
--- a/app-admin/jinit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jinit-0.1.12.tar.gz 110745 BLAKE2B 411f02a45726b20045de7ce6e40627c0652ae778631e3bb1de37182839b316efaccb84b4270a3dc15258d3eb479ff3fcc1a99cd7f313a615d06326154c61cd78 SHA512 3428ba2c9bc57f6a1e30d75b9c2b86f597753fdb29e5c748986a3bf90b8189f35b88591dffb8f861b728e7ce08e78c6c5f1780147bfdb5b6a1d5f2128d34db5d
diff --git a/app-admin/jinit/files/jinit-0.1.12-gcc43.patch b/app-admin/jinit/files/jinit-0.1.12-gcc43.patch
deleted file mode 100644
index c9f6d92fcb03..000000000000
--- a/app-admin/jinit/files/jinit-0.1.12-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- org/jinit-0.1.12/init_ipc/User.hh	2003-04-29 23:35:53.000000000 +0200
-+++ jinit-0.1.12/init_ipc/User.hh	2009-01-04 11:19:16.000000000 +0100
-@@ -13,6 +13,7 @@
- #include <errno.h>
- #include <time.h>
- #include <err.h>
-+#include <cstdlib>
- 
- #include "init_ipc/sysvq.hh"
- #include "need/error.hh"
diff --git a/app-admin/jinit/jinit-0.1.12-r1.ebuild b/app-admin/jinit/jinit-0.1.12-r1.ebuild
deleted file mode 100644
index b5e444f27838..000000000000
--- a/app-admin/jinit/jinit-0.1.12-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-DESCRIPTION="An alternative to sysvinit which supports the need(8) concept"
-HOMEPAGE="http://john.fremlin.de/programs/linux/jinit/"
-SRC_URI="http://john.fremlin.de/programs/linux/jinit/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "failed emake install"
-	emake prefix="${D}"/usr/share/doc/${PF}/example-setup install-initscripts \
-		|| die "failed installing example setup"
-	mv "${D}"/usr/sbin "${D}"/ || die
-	mv "${D}"/sbin/init "${D}"/sbin/jinit || die
-	mv "${D}"/sbin/shutdown "${D}"/sbin/jinit-shutdown || die
-	dodoc AUTHORS ChangeLog NEWS README TODO || die
-}
diff --git a/app-admin/jinit/metadata.xml b/app-admin/jinit/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-admin/jinit/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-admin/procinfo/Manifest b/app-admin/procinfo/Manifest
deleted file mode 100644
index 0062821ca20f..000000000000
--- a/app-admin/procinfo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST procinfo-18.tar.gz 24365 BLAKE2B 7da2f2afe014dc5b991244c0f2eff631db87ed00942a38dcbd1f5080df0bc7c2fb30fd5c7af14a180dfc2ce0562b2a26633451e0a3a17a577cd15a5f281f0118 SHA512 12c4d7983f5d6531be6d4df39f5f1e1ee2ea2394a6eb8fb8df0573f0085499e4b7d43355bfa549a24ddf1ecb09bbfa7b038cef9c483620c74ad5cedc219e35fa
diff --git a/app-admin/procinfo/files/cpu-usage-fix.patch b/app-admin/procinfo/files/cpu-usage-fix.patch
deleted file mode 100644
index f2bace1bd2cc..000000000000
--- a/app-admin/procinfo/files/cpu-usage-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- procinfo.c~	2005-01-31 20:52:29.250918264 +0200
-+++ procinfo-18/procinfo.c	2005-01-31 20:48:55.907351416 +0200
-@@ -402,26 +402,8 @@
-     }
- 
-     elapsed = new.uptime;
--
--/* XXX Is this stuff still relevant/true? */
--
--#ifdef __i386__		/* IRQ 0 is timer tick on i386's... */
--    if (nr_irqs) {
--	if (fs && old.uptime)
--	    elapsed = DIFF (intr[0]);
--    } else
--#endif
--#ifdef __sparc__	/* IRQ 10 is timer tick on sparc's... */
--    if (nr_irqs) {
--	if (fs && old.uptime)
--	    elapsed = DIFF (intr[10]);
--    } else
--#endif
--    {
--	/* This won't be exact... */
--	if (fs && old.uptime)
--	    elapsed = DIFF (uptime);
--    }
-+    if (fs && old.uptime)
-+	elapsed = DIFF (uptime);
- 
-     printf ("user  : %s %s",
- 	    hms (bDIFF (cpu_user)), perc (bDIFF (cpu_user), elapsed, nr_cpus));
diff --git a/app-admin/procinfo/files/kernel-2.6.patch b/app-admin/procinfo/files/kernel-2.6.patch
deleted file mode 100644
index b1eef39e3088..000000000000
--- a/app-admin/procinfo/files/kernel-2.6.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-diff -ruN procinfo-18/procinfo.c procinfo-19/procinfo.c
---- procinfo-18/procinfo.c	2001-02-25 11:29:16.000000000 +0000
-+++ procinfo-19/procinfo.c	2004-06-17 10:28:33.767925439 +0100
-@@ -5,9 +5,10 @@
-   Displays general info from /proc.
- 
-   Date:        1995-07-08 05:30:34
--  Last Change: 2001-02-25 00:27:21
-+  Last Change: 2004-06-17 11:28:13
- 
-   Copyright (c) 1994-2001 svm@kozmix.cistron.nl
-+  Copyright (c) 2004 procinfo@meisel.cc (upgrades for 2.6 kernel)
- 
-   This software is released under the GNU Public Licence. See the file
-   `COPYING' for details. Since you're probably running Linux I'm sure
-@@ -26,6 +27,7 @@
- #include <string.h>
- #include <termios.h>
- #include <termcap.h>
-+#include <ctype.h>
- #include <time.h>
- #include <unistd.h>
- #include <sys/param.h>	/* for HZ -- should be in <time.h> ? */
-@@ -72,9 +74,9 @@
- int nr_irqs = 0;
- int nr_cpus = 0;
- 
--FILE *loadavgfp, *meminfofp, *modulesfp, *statfp, *uptimefp,
-+FILE *loadavgfp, *meminfofp, *modulesfp, *statfp, *uptimefp, *diskstatsfp,
-     *devicesfp, *filesystemsfp, *interruptsfp, *dmafp, *cmdlinefp,
--    *versionfp, *cpuinfofp;
-+    *versionfp, *cpuinfofp, *vmstatfp;
- 
- char line[1024], cmdline[1024], booted[40], *version = NULL, *message = NULL;
- 
-@@ -89,9 +91,13 @@
- {
-     unsigned long elapsed;
-     char loadavg[32];
--    int i;
-+    int i, havetwosix = 0, lastdisk;
-     static int have_m_c = -1;	/* Do we have cache info? */
-     static int have_m_l = -1;	/* Do we have new-style-one-datum-per-line? */
-+    char devicename[10];
-+    char *last;
-+    unsigned int q,w,a,s,d,f,g,h,j,k,l,y,x;
-+    int disk_counter = 0, ret;
- 
- 
- /**** /proc/uptime ****/
-@@ -237,6 +243,50 @@
- 
-     printf ("Bootup: %s    Load average: %s\n\n", booted, loadavg);
- 
-+/**** /proc/vmstat ... 2.6.x kernel only ****/
-+	if (vmstatfp) {
-+		havetwosix = 1;
-+		fseek (vmstatfp, 0L, SEEK_SET);
-+		while (fgets (line, sizeof (line), vmstatfp)) {
-+			char *type = strtok (line, " ");
-+			if (ISSTR ("pgpgin")) {
-+				new.pgin = VAL;
-+			} else if (ISSTR ("pgpgout")) {
-+				new.pgout = VAL;
-+			} else if (ISSTR ("pgactivate")) {
-+				new.pgac = VAL;
-+			} else if (ISSTR ("pgdeactivate")) {
-+				new.pgdeac = VAL;
-+			} else if (ISSTR ("pgfault")) {
-+				new.pgfault = VAL;
-+			} else if (ISSTR ("pswpin")) {
-+				new.swin = VAL;
-+			} else if (ISSTR ("pswpout")) {
-+				new.swout = VAL;
-+			}
-+		}
-+	}
-+
-+/**** /proc/diskstats ... 2.6.x kernel only ****/
-+   if (diskstatsfp) {
-+	havetwosix = 1;
-+	fseek (diskstatsfp, 0L, SEEK_SET);
-+	while (fgets (line, sizeof (line), diskstatsfp)) {
-+	   char *type = strtok (line, "\n");
-+		   ret = sscanf (type, "%d%d%s%d%d%d%d%d%d%d%d%d%d%d", &q, &w, devicename, &a, &s, &d, &f, &g, &h, &j, &k, &l, &y, &x);
-+		   if (ret != 14) /* Everything with less than 14 elements is not a disk device */
-+			   continue;
-+         last = devicename+strlen(devicename)-1;
-+         if (isalpha(*last)) {/* Is the last char is a number ignore it .. like fd0 */
-+            if (++disk_counter > 7) /* 7 disks is all we have room for */
-+               continue;
-+            else {
-+               new.disk_r[disk_counter-1] = a;
-+               new.disk_w[disk_counter-1] = g;
-+            }
-+         }
-+      }
-+   }
- 
- /**** /proc/stat ****/
- 
-@@ -249,6 +299,9 @@
- 	    new.cpu_nice = VAL;
- 	    new.cpu_sys = VAL;
- 	    new.cpu_idle = VAL;
-+	    new.cpu_iowait = VAL;
-+	    new.cpu_hirq = VAL;
-+	    new.cpu_sirq = VAL;
- 	    /*
- 	     * according to bug #1959, sometimes the cpu_idle
- 	     * seems to go backwards(!) on SMP boxes.  This may
-@@ -262,34 +315,54 @@
- 	    new.disk[1] = VAL;
- 	    new.disk[2] = VAL;
- 	    new.disk[3] = VAL;
-+	    new.disk[4] = VAL;
-+	    new.disk[5] = VAL;
-+	    new.disk[6] = VAL;
- 	} else if (ISSTR ("disk_rio") && io_or_blk == 0) {
- 	    new.disk_r[0] = VAL;
- 	    new.disk_r[1] = VAL;
- 	    new.disk_r[2] = VAL;
- 	    new.disk_r[3] = VAL;
-+	    new.disk_r[4] = VAL;
-+	    new.disk_r[5] = VAL;
-+	    new.disk_r[6] = VAL;
-+	} else if (ISSTR ("disk_wio") && io_or_blk == 0) {
-+	    new.disk_w[0] = VAL;
-+	} else if (ISSTR ("disk_wio") && io_or_blk == 0) {
-+	    new.disk_w[0] = VAL;
-+	} else if (ISSTR ("disk_wio") && io_or_blk == 0) {
-+	    new.disk_w[0] = VAL;
- 	} else if (ISSTR ("disk_wio") && io_or_blk == 0) {
- 	    new.disk_w[0] = VAL;
- 	    new.disk_w[1] = VAL;
- 	    new.disk_w[2] = VAL;
- 	    new.disk_w[3] = VAL;
-+	    new.disk_w[4] = VAL;
-+	    new.disk_w[5] = VAL;
-+	    new.disk_w[6] = VAL;
- 	} else if (ISSTR ("disk_rblk") && io_or_blk == 1) {
- 	    new.disk_r[0] = VAL;
- 	    new.disk_r[1] = VAL;
- 	    new.disk_r[2] = VAL;
- 	    new.disk_r[3] = VAL;
-+	    new.disk_r[4] = VAL;
-+	    new.disk_r[5] = VAL;
-+	    new.disk_r[6] = VAL;
- 	} else if (ISSTR ("disk_wblk") && io_or_blk == 1) {
- 	    new.disk_w[0] = VAL;
- 	    new.disk_w[1] = VAL;
- 	    new.disk_w[2] = VAL;
- 	    new.disk_w[3] = VAL;
-+	    new.disk_w[4] = VAL;
-+	    new.disk_w[5] = VAL;
-+	    new.disk_w[6] = VAL;
- 	} else if (ISSTR ("disk_io:")) {
--	    int disk_counter = 0, ret;
- 	    unsigned int q, w, e, r, t, y, u; /* I'm NOT in the mood today. */
- 	    char *barf;
- 
- 	    while ((barf = strtok (NULL, " "))) {
- 
--		if (++disk_counter > 4) /* 4 is all we have room for */
-+		if (++disk_counter > 7) /* 7 is all we have room for */
- 		    continue;
- 
- 		ret = sscanf (barf, "(%d,%d):(%d,%d,%d,%d,%d)",
-@@ -374,7 +447,10 @@
- 
-     printf ("system: %s %s",
- 	    hms (bDIFF (cpu_sys)), perc (bDIFF (cpu_sys), elapsed, nr_cpus));
--    printf ("  swap in :%9lu", bDIFF (swin));
-+    if (havetwosix)
-+        printf ("  page act:%9lu", bDIFF (pgac));
-+    else
-+        printf ("  swap in :%9lu", bDIFF (swin));
-     if (new.disk_r[2])
- 	printf ("  disk 3: %8lur%8luw\n", bDIFF (disk_r[2]),
- 		bDIFF (disk_w[2]));
-@@ -383,14 +459,53 @@
-     else
- 	putchar ('\n');
- 
-+    if (havetwosix) {
-+        printf ("IOwait: %s %s",
-+            hms (bDIFF (cpu_iowait)), perc (bDIFF (cpu_iowait), elapsed, nr_cpus));
-+        printf ("  page dea:%9lu", bDIFF (pgdeac));
-+        if (new.disk_r[3])
-+	    printf ("  disk 4: %8lur%8luw\n", bDIFF (disk_r[3]),
-+		bDIFF (disk_w[3]));
-+        else if (new.disk[3])
-+	    printf ("  disk 4: %8lu\n", bDIFF (disk[3]));
-+        else
-+	    putchar ('\n');
-+
-+        printf ("hw irq: %s %s",
-+            hms (bDIFF (cpu_hirq)), perc (bDIFF (cpu_hirq), elapsed, nr_cpus));
-+        printf ("  page flt:%9lu", bDIFF (pgfault));
-+        if (new.disk_r[4])
-+	    printf ("  disk 5: %8lur%8luw\n", bDIFF (disk_r[4]),
-+		bDIFF (disk_w[4]));
-+        else if (new.disk[4])
-+	    printf ("  disk 5: %8lu\n", bDIFF (disk[4]));
-+        else
-+	    putchar ('\n');
-+
-+        printf ("sw irq: %s %s",
-+            hms (bDIFF (cpu_sirq)), perc (bDIFF (cpu_sirq), elapsed, nr_cpus));
-+        printf ("  swap in :%9lu", bDIFF (swin));
-+        if (new.disk_r[5])
-+	    printf ("  disk 6: %8lur%8luw\n", bDIFF (disk_r[5]),
-+		bDIFF (disk_w[5]));
-+        else if (new.disk[5])
-+	    printf ("  disk 6: %8lu\n", bDIFF (disk[5]));
-+        else
-+	    putchar ('\n');
-+    }
-+
-     printf ("idle  : %s %s",
- 	    hms (bDIFF (cpu_idle)), perc (bDIFF (cpu_idle), elapsed, nr_cpus));
-     printf ("  swap out:%9lu", bDIFF (swout));
--    if (new.disk_r[3])
--	printf ("  disk 4: %8lur%8luw\n", bDIFF (disk_r[3]),
--		bDIFF (disk_w[3]));
--    else if (new.disk[3])
--	printf ("  disk 4: %8lu\n", bDIFF (disk[3]));
-+    if (havetwosix)
-+        lastdisk = 3;
-+    else
-+        lastdisk = 6;
-+    if (new.disk_r[lastdisk])
-+	printf ("  disk %d: %8lur%8luw\n", lastdisk+1, bDIFF (disk_r[lastdisk]),
-+		bDIFF (disk_w[lastdisk]));
-+    else if (new.disk[lastdisk])
-+	printf ("  disk %d: %8lu\n", lastdisk+1, bDIFF (disk[lastdisk]));
-     else
- 	putchar ('\n');
- 
-@@ -786,6 +901,8 @@
-     meminfofp = myfopen (PROC_DIR "meminfo");
-     statfp = myfopen (PROC_DIR "stat");
-     /* These may be missing, so check for NULL later. */
-+    diskstatsfp = fopen (PROC_DIR "diskstats", "r");
-+    vmstatfp = fopen (PROC_DIR "vmstat", "r");
-     modulesfp = fopen (PROC_DIR "modules", "r");
-     devicesfp = fopen (PROC_DIR "devices", "r");
-     filesystemsfp = fopen (PROC_DIR "filesystems", "r");
-@@ -990,6 +1107,9 @@
- 			new.disk_r[1] = new.disk_w[1] =
- 			new.disk_r[2] = new.disk_w[2] =
- 			new.disk_r[3] = new.disk_w[3] = 0;
-+			new.disk_r[4] = new.disk_w[4] = 0;
-+			new.disk_r[5] = new.disk_w[5] = 0;
-+			new.disk_r[6] = new.disk_w[6] = 0;
- 		    redrawn = 1;
- 		    message = io_or_blk ? "showing I/O in blocks" :
- 			"showing I/O per requests";
-diff -ruN procinfo-18/procinfo.h procinfo-19/procinfo.h
---- procinfo-18/procinfo.h	2001-02-24 23:30:45.000000000 +0000
-+++ procinfo-19/procinfo.h	2004-06-17 09:24:16.511726412 +0100
-@@ -81,11 +81,11 @@
-     unsigned long uptime;
-     long m_to, m_us, m_fr, m_sh, m_bu, m_ca;
-     long s_to, s_us, s_fr;
--    unsigned long cpu_user, cpu_nice, cpu_sys, cpu_idle;
--    unsigned long disk[5];
--    unsigned long disk_r[5];
--    unsigned long disk_w[5];
--    unsigned long pgin, pgout, swin, swout;
-+    unsigned long cpu_user, cpu_nice, cpu_sys, cpu_idle, cpu_iowait, cpu_hirq, cpu_sirq;
-+    unsigned long disk[8];
-+    unsigned long disk_r[8];
-+    unsigned long disk_w[8];
-+    unsigned long pgin, pgout, pgac, pgdeac, pgfault, swin, swout;
-     unsigned long *intr;	/* Phew. That's better. */
-     unsigned long old_intr;
-     unsigned long ctxt;
-diff -ruN procinfo-18/routines.c procinfo-19/routines.c
---- procinfo-18/routines.c	2001-02-24 23:30:45.000000000 +0000
-+++ procinfo-19/routines.c	2004-06-16 16:36:51.000000000 +0100
-@@ -388,9 +388,13 @@
- hms (unsigned long t)
- {
-     unsigned int d, h, m, s;
-+    unsigned long q;
-     static char buf[22];
- 
--    t = t * 100 / HZ;
-+    q = 100 / HZ; /* We need this because the libc does something funny here */
-+                  /* if we try to use: t = t * 100 / HZ; here! */
-+                  /* procinfo@meisel.cc 11. Feb. 2004 */
-+    t = t * q;
-     d = (int) (t / 8640000);
-     t = t - (long) (d * 8640000);
-     h = (int) (t / 360000);
diff --git a/app-admin/procinfo/files/procinfo-18-stat.patch b/app-admin/procinfo/files/procinfo-18-stat.patch
deleted file mode 100644
index d7dc4a458b28..000000000000
--- a/app-admin/procinfo/files/procinfo-18-stat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur procinfo-18/procinfo.c procinfo-18-mod/procinfo.c
---- procinfo-18/procinfo.c	2001-02-25 11:29:16.000000000 +0000
-+++ procinfo-18-mod/procinfo.c	2008-04-16 10:16:29.000000000 +0100
-@@ -76,7 +76,7 @@
-     *devicesfp, *filesystemsfp, *interruptsfp, *dmafp, *cmdlinefp,
-     *versionfp, *cpuinfofp;
- 
--char line[1024], cmdline[1024], booted[40], *version = NULL, *message = NULL;
-+char line[4096], cmdline[1024], booted[40], *version = NULL, *message = NULL;
- 
- float rate = 1.0;		/* per interval or per sec */
- 
-@@ -446,7 +446,7 @@
- 		    */
- 		    char *q;
- 
--		    if ((q = strstr (p, "PIC"))) {
-+		    if ((q = strstr (p, "PIC")) || (q = strstr (p, "MSI"))) {
- 			while (*q != ' ')	/* eat up "PIC" or "PIC-foo" */
- 			    q++;
- 			while (*q == ' ')	/* eat up spaces */
diff --git a/app-admin/procinfo/files/procinfo-flags.patch b/app-admin/procinfo/files/procinfo-flags.patch
deleted file mode 100644
index e254c254e1a9..000000000000
--- a/app-admin/procinfo/files/procinfo-flags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- procinfo-18/Makefile.orig	2001-02-25 00:29:53.000000000 +0100
-+++ procinfo-18/Makefile	2006-10-21 13:57:47.000000000 +0200
-@@ -2,10 +2,10 @@
- 
- prefix=/usr
- 
--CC = gcc -Wall -Wstrict-prototypes
-+CC += 
- 
--CFLAGS = -O2
--LDFLAGS = -s
-+CFLAGS += -Wall -Wstrict-prototypes
-+LDFLAGS +=
- 
- # If you get lots of `undefined references', you probably need -lncurses
- # instead:
diff --git a/app-admin/procinfo/metadata.xml b/app-admin/procinfo/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-admin/procinfo/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-admin/procinfo/procinfo-18-r2.ebuild b/app-admin/procinfo/procinfo-18-r2.ebuild
deleted file mode 100644
index 33a1d8dc6daa..000000000000
--- a/app-admin/procinfo/procinfo-18-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Displays some kernel stats and info on a running Linux system"
-HOMEPAGE="http://www.kozmix.org/src/"
-SRC_URI="http://www.kozmix.org/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/kernel-2.6.patch
-	epatch "${FILESDIR}"/cpu-usage-fix.patch
-	epatch "${FILESDIR}"/${PN}-flags.patch
-	epatch "${FILESDIR}"/${P}-stat.patch
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		LDLIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
-}
-
-src_install() {
-	dobin procinfo
-	newbin lsdev.pl lsdev
-	newbin socklist.pl socklist
-
-	doman *.8
-	dodoc README CHANGES
-}