gentoo resync : 14.07.2018

1734 files changed, 52008 insertions, 5643 deletions

diff --git a/app-admin/389-console-1.1.7-r1 b/app-admin/389-console-1.1.7-r1
deleted file mode 100644
index 5f734b391316..000000000000
--- a/app-admin/389-console-1.1.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A Java based console for remote management 389 server
-EAPI=5
-HOMEPAGE=http://port389.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=1.1
-SRC_URI=http://directory.fedoraproject.org/sources/389-console-1.1.7.tar.bz2 https://dev.gentoo.org/~lxnay/389-console/fedora.png
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d0cdfc0a5c36c7b3a0b20673e8824ead
diff --git a/app-admin/389-console/389-console-1.1.7-r1.ebuild b/app-admin/389-console/389-console-1.1.7-r1.ebuild
new file mode 100644
index 000000000000..25ca62955f9b
--- /dev/null
+++ b/app-admin/389-console/389-console-1.1.7-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java based console for remote management 389 server"
+HOMEPAGE="http://port389.org/"
+SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2
+	https://dev.gentoo.org/~lxnay/${PN}/fedora.png"
+
+LICENSE="LGPL-2.1"
+SLOT="1.1"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/jss:3.4
+	dev-java/ldapsdk:4.1
+	>=dev-java/idm-console-framework-1.1"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+src_prepare() {
+	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
+	java-pkg_jar-from jss-3.4 xpclass.jar jss4.jar
+	java-pkg_jar-from idm-console-framework-1.1
+}
+
+src_compile() {
+	eant -Dbuilt.dir="${S}"/build \
+		-Dldapjdk.local.location="${S}" \
+		-Djss.local.location="${S}" \
+		-Dconsole.local.location="${S}" ${antflags}
+}
+
+src_install() {
+	java-pkg_newjar "${S}"/build/389-console-${PV}_en.jar 389-console_en.jar
+	java-pkg_dolauncher ${PN} \
+		--main com.netscape.management.client.console.Console \
+		--pwd "/usr/share/dirsrv/html/java/" \
+		--pkg_args "-Djava.util.prefs.systemRoot=\"\$HOME/.${PN}\" -Djava.util.prefs.userRoot=\"\$HOME/.${PN}\""
+
+	doicon "${DISTDIR}"/fedora.png
+	make_desktop_entry ${PN} "Port389 Management Console" fedora System
+}
diff --git a/app-admin/389-console/Manifest b/app-admin/389-console/Manifest
new file mode 100644
index 000000000000..a1d1134a3b4d
--- /dev/null
+++ b/app-admin/389-console/Manifest
@@ -0,0 +1,4 @@
+DIST 389-console-1.1.7.tar.bz2 112970 BLAKE2B fc5cda6d43e63db92781e6a6e1c40b76149c82fdbfb43a75561450893245ca5924f0c098e028917d5a72f4ed4c178324d09617a1e965597899ae7c0474616eee SHA512 d2ea4c65ea6bb01d3163271a44bb4fab4167863e2df1389e8d4bd2782083c33563ddfd232512d8b28f0de037a7cf0dd7ee554c1660d40fa50d731224748d9f6e
+DIST fedora.png 11606 BLAKE2B f715a10ed2f0ff7ef588cb2e766f6cf88388100e41a6a43bb75806418edaf298d538a1297aac4089fc3b9981016bf34eacb6cc4cb9bfe8d22ad3df52715bd1ad SHA512 f6adbf8d3cb0e09a819baa54fc638bf48a478bbea666a49ed7f6ac91c3ee2e03ded61d7e17a184ae29dddfc128a11fee724dfaa42e0493a57dd7c91531809aad
+EBUILD 389-console-1.1.7-r1.ebuild 1347 BLAKE2B b17e11f9ea12d88aa2acc17f611e77f32df129162909ae1371150b94184bf4e71a6f0cb92d958099d59f3554ca34b8ab175e3a3cd72d6bbb4e814da6da1d225d SHA512 a5b3c0dc60fdb54adcb93ba0a180c60a700d8a6e2f013801e8f8488abdfaa4b75be299445792da6980988b465a783ae07acf6a0d429f1148d7bc75ab7a9a410c
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/app-admin/389-console/metadata.xml b/app-admin/389-console/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/app-admin/389-console/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f3eef55323d9..db104becfcc5 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/abrt-2.0.12-r2 b/app-admin/abrt-2.0.12-r2
deleted file mode 100644
index 37c2167c60ba..000000000000
--- a/app-admin/abrt-2.0.12-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/btparser-0.18 >=dev-libs/glib-2.21:2 >=dev-libs/libreport-2.0.11[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libxml2 dev-libs/nss sys-apps/dbus sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 x11-libs/libnotify app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=Automatic bug detection and reporting tool
-EAPI=5
-HOMEPAGE=https://github.com/abrt/abrt/wiki/ABRT-Project
-IUSE=debug python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/btparser-0.18 >=dev-libs/glib-2.21:2 >=dev-libs/libreport-2.0.11[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libxml2 dev-libs/nss sys-apps/dbus sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 x11-libs/libnotify app-arch/cpio dev-libs/elfutils >=sys-devel/gdb-7
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://fedorahosted.org/released/abrt/abrt-2.0.12.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c586e5e4067f86d0d6769699cada6132
diff --git a/app-admin/abrt-2.10.10 b/app-admin/abrt-2.10.10
deleted file mode 100644
index b0ca60427e1e..000000000000
--- a/app-admin/abrt-2.10.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.43:2 >=dev-libs/libreport-2.9.5[python] dev-libs/libxml2 dev-libs/nss >=gnome-base/gsettings-desktop-schemas-3.15.1 sys-apps/dbus sys-apps/systemd sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 >=x11-libs/libnotify-0.7 app-text/asciidoc app-text/xmlto dev-libs/satyr[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=Automatic bug detection and reporting tool
-EAPI=6
-HOMEPAGE=https://github.com/abrt/abrt/wiki/ABRT-Project
-IUSE=debug selinux python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.43:2 >=dev-libs/libreport-2.9.5[python] dev-libs/libxml2 dev-libs/nss >=gnome-base/gsettings-desktop-schemas-3.15.1 sys-apps/dbus sys-apps/systemd sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 >=x11-libs/libnotify-0.7 app-arch/cpio dev-libs/elfutils dev-python/argcomplete[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/argh[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/humanize[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/util-linux >=sys-devel/gdb-7
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/abrt/abrt/archive/2.10.10.tar.gz -> abrt-2.10.10.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2d22d7473321cc2c5c2f2dacbe1035f2
diff --git a/app-admin/abrt-2.10.10-r1 b/app-admin/abrt-2.10.10-r1
deleted file mode 100644
index c1d4f9c0f796..000000000000
--- a/app-admin/abrt-2.10.10-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.43:2 >=dev-libs/libreport-2.9.5[python] dev-libs/libxml2 dev-libs/nss >=gnome-base/gsettings-desktop-schemas-3.15.1 sys-apps/dbus sys-apps/systemd sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 >=x11-libs/libnotify-0.7 app-text/asciidoc app-text/xmlto dev-libs/satyr[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=Automatic bug detection and reporting tool
-EAPI=6
-HOMEPAGE=https://github.com/abrt/abrt/wiki/ABRT-Project
-IUSE=debug selinux python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.43:2 >=dev-libs/libreport-2.9.5[python] dev-libs/libxml2 dev-libs/nss >=gnome-base/gsettings-desktop-schemas-3.15.1 sys-apps/dbus sys-apps/systemd sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 >=x11-libs/libnotify-0.7 app-arch/cpio dev-libs/elfutils dev-python/argcomplete[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/argh[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/humanize[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/util-linux >=sys-devel/gdb-7
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/abrt/abrt/archive/2.10.10.tar.gz -> abrt-2.10.10.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=17ab8eb6b0d5c5d192acc2cac23d789b
diff --git a/app-admin/abrt-2.10.9 b/app-admin/abrt-2.10.9
deleted file mode 100644
index a69ecc08a84c..000000000000
--- a/app-admin/abrt-2.10.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.43:2 >=dev-libs/libreport-2.9.5[python] dev-libs/libxml2 dev-libs/nss >=gnome-base/gsettings-desktop-schemas-3.15.1 sys-apps/dbus sys-apps/systemd sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 >=x11-libs/libnotify-0.7 app-text/asciidoc app-text/xmlto dev-libs/satyr[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=Automatic bug detection and reporting tool
-EAPI=6
-HOMEPAGE=https://github.com/abrt/abrt/wiki/ABRT-Project
-IUSE=debug selinux python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.43:2 >=dev-libs/libreport-2.9.5[python] dev-libs/libxml2 dev-libs/nss >=gnome-base/gsettings-desktop-schemas-3.15.1 sys-apps/dbus sys-apps/systemd sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 >=x11-libs/libnotify-0.7 app-arch/cpio dev-libs/elfutils dev-python/argcomplete dev-python/argh dev-python/humanize sys-apps/util-linux >=sys-devel/gdb-7
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/abrt/abrt/archive/2.10.9.tar.gz -> abrt-2.10.9.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b6b086877e83d06240a6c0bcd566b53
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
new file mode 100644
index 000000000000..343be31cf5b3
--- /dev/null
+++ b/app-admin/abrt/Manifest
@@ -0,0 +1,14 @@
+AUX abrt-2.0.12-automake-1.12.patch 1905 BLAKE2B 303b2626c9bbdcfea7d8b1aad8376d54f5c548b8f8ccbe9998f35f484128b1f9e69f90deaf5fcb099267575e246f18b0bfddf5120ed8979ff49249229fcffb3d SHA512 f29fd4bcb33bb20fd1d555ddc9dc21bb243641bb0d6a44d5a49948f2c6221404482718f4d6a4bb68a8e59945c2ca5566faab2628fa4c98f7900fa76e994ad7cb
+AUX abrt-2.0.12-dbus-fallback.patch 3515 BLAKE2B bedefb2909555ac679e4f316c8ac398a69396f208eddc7576dfa1999a75a51d9da82996588468985323f2d3595a43e3a76ecb1f4505e86a93976ae1f36883ea0 SHA512 6f6c298c14e0f6a0e127c635337883ee9ae3f1afa0229064a7bd2ad9431c5ec144452c33f2ee65a3ba0aebbcd33c10f9688ff8f74a553ad179a3faa098a9dbcd
+AUX abrt-2.0.12-gentoo.patch 13050 BLAKE2B 1f43c99b1d8f2a16c0f238c36c49e8f8437288cc588c434d4de90cf0cc9fbd9dca6408d68a1018fb59e52041d9c08d35fcd2f05a0cbbe0b465b9815023bb8006 SHA512 246eaf8faf1a5793837be94ecc3a56dc37488473140b05c17d6383c235922494468fac7aaa18f50654395c0b4fbaafc904262a3c15a8dc9fc21de320da43bbfa
+AUX abrt-2.0.12-r1-conf 687 BLAKE2B 771c5370e3f7f181c22f8a56d8a13a02759aed2fdd5f7182d4bf9e7bebf1f80f6178acbce4ffddff7ab292c773685148621d53528b96c3099d96dcd0f26b1280 SHA512 8dc19a07ca57a7a95184366e747f20e36b97eea6423aafb88390f9754f90bfa76b6d0c33806c714fcadfebeebda05e989b282bf07cd0ce50cf01efa8721357f2
+AUX abrt-2.0.12-r1-init 1921 BLAKE2B dc8bbe3d4902ac65165f1e71eb6400810980f6b90014619aa87614f0a8e1c6e9bb79afa964e5c0324ca090fefa9b90f2705c7388b488709f31619d824850e3e8 SHA512 a6f7c4029f974af083f33020756bc0eaa877c23f658d6b92388627e3a923aae499dd44e1b0e22af792a6c431a683ebe4604d6dec62bf09f70a2a5209cd45be81
+AUX abrt-2.0.6-format-security.patch 911 BLAKE2B e502ea10a65de1b0ebff3f7d954d42af365a8384be817ff0b891153877d2714f63b9edb8565df503b455824a03f94bc62ef596aa670516d212239922d23e0b62 SHA512 8e9f8bb37698834b998d1d4a9452e17f5484a2fa9fbc400b80f2154fb4f7ad35dcbc65112afa3fef2f1b2ccf78a01f745e436e61323c40d76f17da11a6229b71
+DIST abrt-2.0.12.tar.gz 1090121 BLAKE2B 272f486bd166a33fea3e340763b3443b5643a650fe16ad326e249309c355f214c67937456dd2d8f3e7cdac65cb85bd8030e6b89671f427085a05dca64b8f874d SHA512 5432205edb4483fb1883b9bcebab48784b16dd9e72c3a929ea0d50c48dab638d80f136b6b0d7648d8ec9fcb79d5ce8c1be37d36301d3b2b151868901be82a63a
+DIST abrt-2.10.10.tar.gz 6830586 BLAKE2B 5cd45144678e6355cb1362c3ebe5531104bb150ff95c42d10e3056f7619cdc7dc3da57e4025cab05234866a4634f29bc07fd78f574800d6b303385c6befa25bd SHA512 6daeea898c9328d31b952ef12202162e002f91b4115301e5d66a0e6991251f9a8322b87201128f7efd54b42b76cb94abc4cf01e5d5b563f254f6757ec7e2127d
+DIST abrt-2.10.9.tar.gz 6830234 BLAKE2B ec96b915103c8b8157eb64c98791d283225091d0f2aa7b78520bfae1bee22f43703715fabc43828c750aa7e84eea4a886878d411670b7b4ad31ca49b96d387f3 SHA512 1ff7e2edf29085fb03c569b67e8bf2bc83aaf4dd77730e5fc96184453224f83dd0632eaf85a7ad03351fdfaea3d4ed50e8a89eb28d82151f95bd34eb1850f93c
+EBUILD abrt-2.0.12-r2.ebuild 2643 BLAKE2B 2799f38b03a18400cdaa0d471a64aada8204cd837198b107f1217740d00c50bab937f98a46354811fe573d99d5e84b61730a60d39ea45cf5d1c1d31f57ce4de1 SHA512 f9fcd1f028b14744c7f9e930ee684bd6e010bd453d7d4b44b689cca103e7a5770a1b5a6a041193826a29229ab6acde442b8f91cc1714384a3312e0560beb4809
+EBUILD abrt-2.10.10-r1.ebuild 2702 BLAKE2B e337dc8fb42cdbf634ddea35674e8c841a4fca1b9bcf4c65b8e3fcd4553eb791d25ca4313dbda08834aec59c712f84845833d6025939ea8ba1bcce4f5d852c0b SHA512 10af342514fc3cb62942a3ea0b8580cdd1e05a91ec55548bf046a960ed4a38d95f0e362c89dd7f32bf39b080e7d5208dd021645e439130633708a1417b48f1b5
+EBUILD abrt-2.10.10.ebuild 2698 BLAKE2B c4020d0aceff14802ff9dee884cc8e15abfe8751f9167a3e99a983c3347e3091a5008259f4e2de46473532f614c633be30ab11b1b51664bf9759665cb4effcb1 SHA512 870aeb8a60428bdd21b311ee9114a3b4f5605ef7c3095d97c54bd280153555d1c8c3e2ea6175dad62d79a71f707ba9a7a91d939393067c5b678ff4fc4f5b769e
+EBUILD abrt-2.10.9.ebuild 2687 BLAKE2B 2554c809fdb24139c97f968fac129f0b408025033e8c6a4241295a94db18241ecae501299de57eb3fd1318df0e770db0e3ce4bb84d9fb99f478c41ee59c74cfa SHA512 59743039a3316da2c725e2ca3ca97e30d4c4242636523f02aa75baacfbb4191639d4c364ee3feffd5ccdfb004e93f1a390391fd1752918dec16035c430a40b21
+MISC metadata.xml 327 BLAKE2B e5a24f189c128e35fd3b878143c5d99da897af8535258f7eece0153df8a5b2dfc8b4f19000c60a6fcb70bb4f0b9efad98d2deab9e36dd205615e4176a06c0c45 SHA512 687cee8b12e63a46b815a1d6099a2853ed72d3d19d118e4e0cdbe67f501475ed02949848a4537a7c5eef0ac4a398edab868f816bdff277e3c1b348e5ab73ee40
diff --git a/app-admin/abrt/abrt-2.0.12-r2.ebuild b/app-admin/abrt/abrt-2.0.12-r2.ebuild
new file mode 100644
index 000000000000..e9e2cbced8f7
--- /dev/null
+++ b/app-admin/abrt/abrt-2.0.12-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+# Need gnome2-utils for gnome2_icon_cache_update
+inherit autotools eutils gnome2-utils python-single-r1 systemd user
+
+DESCRIPTION="Automatic bug detection and reporting tool"
+HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
+SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/btparser-0.18
+	>=dev-libs/glib-2.21:2
+	>=dev-libs/libreport-2.0.11[${PYTHON_USEDEP}]
+	dev-libs/libxml2
+	dev-libs/nss
+	sys-apps/dbus
+	sys-auth/polkit
+	sys-fs/inotify-tools
+	x11-libs/gtk+:3
+	x11-libs/libnotify"
+RDEPEND="${COMMON_DEPEND}
+	app-arch/cpio
+	dev-libs/elfutils
+	>=sys-devel/gdb-7"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	enewgroup abrt
+	enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+	# Disable redhat-specific code not usable in gentoo, or that requires
+	# bugs.gentoo.org infra support.
+	epatch "${FILESDIR}/${PN}-2.0.12-gentoo.patch"
+
+	# Using a server response as a format string is a bad idea
+	epatch "${FILESDIR}/${PN}-2.0.6-format-security.patch"
+
+	# pyhook test is sensitive to the format of python's error messages, and
+	# fails with certain python versions
+	sed -e '/pyhook.at/ d' \
+		-i tests/Makefile.* tests/testsuite.at || die "sed 2 failed"
+
+	# automake-1.12, #427926
+	epatch "${FILESDIR}/${PN}-2.0.12-automake-1.12.patch"
+
+	# Fix dbus timeout in gui; in next release
+	epatch "${FILESDIR}/${P}-dbus-fallback.patch"
+
+	eautoreconf
+
+	python_fix_shebang .
+}
+
+src_configure() {
+	myeconfargs=(
+		"--localstatedir=${EPREFIX}/var"
+		"$(systemd_with_unitdir)"
+	)
+	# --disable-debug enables debug!
+	use debug && myeconfargs=( "${myeconfargs[@]}" --enable-debug )
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/run/abrt
+	# /var/spool/abrt is created by dev-libs/libreport
+
+	diropts -m 700 -o abrt -g abrt
+	keepdir /var/spool/abrt-upload
+
+	diropts -m 775 -o abrt -g abrt
+	keepdir /var/cache/abrt-di
+
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+
+	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
+	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	elog "To start the bug detection service on an openrc-based system, do"
+	elog "# /etc/init.d/abrt start"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-admin/abrt/abrt-2.10.10-r1.ebuild b/app-admin/abrt/abrt-2.10.10-r1.ebuild
new file mode 100644
index 000000000000..12dd86750951
--- /dev/null
+++ b/app-admin/abrt/abrt-2.10.10-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools gnome2-utils python-single-r1 systemd user
+
+DESCRIPTION="Automatic bug detection and reporting tool"
+HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug selinux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.43:2
+	>=dev-libs/libreport-2.9.5[python]
+	dev-libs/libxml2
+	dev-libs/nss
+	>=gnome-base/gsettings-desktop-schemas-3.15.1
+	sys-apps/dbus
+	sys-apps/systemd
+	sys-auth/polkit
+	sys-fs/inotify-tools
+	x11-libs/gtk+:3
+	>=x11-libs/libnotify-0.7
+"
+RDEPEND="${COMMON_DEPEND}
+	app-arch/cpio
+	dev-libs/elfutils
+	dev-python/argcomplete[${PYTHON_USEDEP}]
+	dev-python/argh[${PYTHON_USEDEP}]
+	dev-python/humanize[${PYTHON_USEDEP}]
+	sys-apps/util-linux
+	>=sys-devel/gdb-7
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	dev-libs/satyr[${PYTHON_USEDEP}]
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17
+"
+
+RESTRICT="test" # tests *may* be broken due to all the RHEL crap.  explore later.
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	enewgroup abrt
+	enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+	default
+
+	# pyhook test is sensitive to the format of python's error messages, and
+	# fails with certain python versions
+	sed -e '/pyhook.at/ d' \
+		-i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
+	./gen-version || die # Needed to be run before autoreconf
+	eautoreconf
+}
+
+src_configure() {
+	myeconfargs=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-bodhi
+		# package breaks due to not finding libreport-web with bodhi plugin enabled
+		--without-rpm
+		$(usex selinux "" "--without-selinux")
+		--without-python2
+		# Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
+		--with-python3
+		--without-pythondoc
+		# package breaks due to no sphinx-build-3
+		--without-pythontests
+		# kill tests for now until they can be explored.
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/run/abrt
+	# /var/spool/abrt is created by dev-libs/libreport
+
+	diropts -m 700 -o abrt -g abrt
+	keepdir /var/spool/abrt-upload
+
+	diropts -m 775 -o abrt -g abrt
+	keepdir /var/cache/abrt-di
+
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
+	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-admin/abrt/abrt-2.10.10.ebuild b/app-admin/abrt/abrt-2.10.10.ebuild
new file mode 100644
index 000000000000..92a41f5008a3
--- /dev/null
+++ b/app-admin/abrt/abrt-2.10.10.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools gnome2-utils python-single-r1 systemd user
+
+DESCRIPTION="Automatic bug detection and reporting tool"
+HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug selinux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.43:2
+	>=dev-libs/libreport-2.9.5[python]
+	dev-libs/libxml2
+	dev-libs/nss
+	>=gnome-base/gsettings-desktop-schemas-3.15.1
+	sys-apps/dbus
+	sys-apps/systemd
+	sys-auth/polkit
+	sys-fs/inotify-tools
+	x11-libs/gtk+:3
+	>=x11-libs/libnotify-0.7
+"
+RDEPEND="${COMMON_DEPEND}
+	app-arch/cpio
+	dev-libs/elfutils
+	dev-python/argcomplete[${PYTHON_USEDEP}]
+	dev-python/argh[${PYTHON_USEDEP}]
+	dev-python/humanize[${PYTHON_USEDEP}]
+	sys-apps/util-linux
+	>=sys-devel/gdb-7
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	dev-libs/satyr[${PYTHON_USEDEP}]
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17
+"
+
+RESTRICT="test" # tests *may* be broken due to all the RHEL crap.  explore later.
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	enewgroup abrt
+	enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+	default
+
+	# pyhook test is sensitive to the format of python's error messages, and
+	# fails with certain python versions
+	sed -e '/pyhook.at/ d' \
+		-i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
+	./gen-version || die # Needed to be run before autoreconf
+	eautoreconf
+}
+
+src_configure() {
+	myeconfargs=(
+		--libdir="${EPREFIX}/$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-bodhi
+		# package breaks due to not finding libreport-web with bodhi plugin enabled
+		--without-rpm
+		$(usex selinux "" "--without-selinux")
+		--without-python2
+		# Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
+		--with-python3
+		--without-pythondoc
+		# package breaks due to no sphinx-build-3
+		--without-pythontests
+		# kill tests for now until they can be explored.
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/run/abrt
+	# /var/spool/abrt is created by dev-libs/libreport
+
+	diropts -m 700 -o abrt -g abrt
+	keepdir /var/spool/abrt-upload
+
+	diropts -m 775 -o abrt -g abrt
+	keepdir /var/cache/abrt-di
+
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
+	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-admin/abrt/abrt-2.10.9.ebuild b/app-admin/abrt/abrt-2.10.9.ebuild
new file mode 100644
index 000000000000..313aab7271b3
--- /dev/null
+++ b/app-admin/abrt/abrt-2.10.9.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools gnome2-utils python-single-r1 systemd user
+
+DESCRIPTION="Automatic bug detection and reporting tool"
+HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug selinux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.43:2
+	>=dev-libs/libreport-2.9.5[python]
+	dev-libs/libxml2
+	dev-libs/nss
+	>=gnome-base/gsettings-desktop-schemas-3.15.1
+	sys-apps/dbus
+	sys-apps/systemd
+	sys-auth/polkit
+	sys-fs/inotify-tools
+	x11-libs/gtk+:3
+	>=x11-libs/libnotify-0.7"
+RDEPEND="${COMMON_DEPEND}
+	app-arch/cpio
+	dev-libs/elfutils
+	dev-python/argcomplete
+	dev-python/argh
+	dev-python/humanize
+	sys-apps/util-linux
+	>=sys-devel/gdb-7"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	dev-libs/satyr[${PYTHON_USEDEP}]
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RESTRICT="test" # tests *may* be broken due to all the RHEL crap.  explore later.
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	enewgroup abrt
+	enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+	default
+
+	# pyhook test is sensitive to the format of python's error messages, and
+	# fails with certain python versions
+	sed -e '/pyhook.at/ d' \
+		-i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
+	./gen-version || die # Needed to be run before autoreconf
+	eautoreconf
+}
+
+src_configure() {
+
+	myeconfargs=(
+		--libdir="${EPREFIX}/$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-bodhi
+		# package breaks due to not finding libreport-web with bodhi plugin enabled
+		--without-rpm
+		$(usex selinux "" "--without-selinux")
+		--without-python2
+		# Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
+		--with-python3
+		--without-pythondoc
+		# package breaks due to no sphinx-build-3
+		--without-pythontests
+		# kill tests for now until they can be explored.
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/run/abrt
+	# /var/spool/abrt is created by dev-libs/libreport
+
+	diropts -m 700 -o abrt -g abrt
+	keepdir /var/spool/abrt-upload
+
+	diropts -m 775 -o abrt -g abrt
+	keepdir /var/cache/abrt-di
+
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+
+	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
+	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-admin/abrt/files/abrt-2.0.12-automake-1.12.patch b/app-admin/abrt/files/abrt-2.0.12-automake-1.12.patch
new file mode 100644
index 000000000000..e2723067cb6e
--- /dev/null
+++ b/app-admin/abrt/files/abrt-2.0.12-automake-1.12.patch
@@ -0,0 +1,64 @@
+From 00704d4eb30dd12d6f4fcf97320c354ed3eacfa7 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 22 Sep 2012 05:50:38 -0400
+Subject: [PATCH] Fix automake-1.12 autoreconf issues
+
+Need -Wno-portablity for '%'-style pattern rules in doc/Makefile.am and
+':='-style assignments and $(wildcard *~) in src/hooks/Makefile.am.
+
+Need AM_PROG_CC_C_O for src/applet/applet.c
+
+gettext-0.18.1.1's AM_GNU_GETTEXT requires AM_PROG_MKDIR_P, causing
+problems for automake-1.12.
+---
+ configure.ac           | 8 +++-----
+ src/daemon/Makefile.am | 2 +-
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a78d9f8..42acccf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@ AC_INIT([abrt],
+ 	[crash-catcher@fedorahosted.org])
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign])
+ # Support silent build rules. Disable by either passing --disable-silent-rules
+ # to ./configure or passing V=1 to make
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+@@ -12,8 +12,9 @@ AM_SILENT_RULES([yes])
+ 
+ 
+ AC_DISABLE_STATIC
++AM_PROG_AR
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
++AM_PROG_CC_C_O
+ AC_PROG_LN_S
+ 
+ AC_SYS_LARGEFILE
+@@ -30,9 +31,6 @@ GETTEXT_PACKAGE=abrt
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
+ 
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.17])
+-
+ IT_PROG_INTLTOOL([0.35.0])
+ 
+ dnl ****** END ****************************************
+diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
+index 777dfc4..5a5f0ea 100644
+--- a/src/daemon/Makefile.am
++++ b/src/daemon/Makefile.am
+@@ -63,4 +63,4 @@ EXTRA_DIST = abrt-handle-upload
+ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+ 
+ install-data-local:
+-	$(mkdir_p) '$(DESTDIR)/$(VAR_RUN)'
++	$(MKDIR_P) '$(DESTDIR)/$(VAR_RUN)'
+-- 
+1.7.12
+
diff --git a/app-admin/abrt/files/abrt-2.0.12-dbus-fallback.patch b/app-admin/abrt/files/abrt-2.0.12-dbus-fallback.patch
new file mode 100644
index 000000000000..e15731bbf04c
--- /dev/null
+++ b/app-admin/abrt/files/abrt-2.0.12-dbus-fallback.patch
@@ -0,0 +1,111 @@
+From 3ddf2f38a47c7cc13dd6f480841b9b90f6304ed4 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Mon, 3 Sep 2012 19:01:24 +0200
+Subject: [PATCH] abrt-gui: fall back to direct access if dbus access fails.
+ Closes #484
+
+It looks like this:
+
+root> abrt-gui
+Can't connect to system DBus: Error connecting: No such file or directory
+Error in DBus communication, falling back to direct access to '/var/spool/abrt'
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ src/gui-gtk/main.c    | 44 +++++++++++++++++++++++++++-----------------
+ src/lib/problem_api.c |  5 +++--
+ 2 files changed, 30 insertions(+), 19 deletions(-)
+
+diff --git a/src/gui-gtk/main.c b/src/gui-gtk/main.c
+index 2cc4bef..e6e8ef0 100644
+--- a/src/gui-gtk/main.c
++++ b/src/gui-gtk/main.c
+@@ -252,23 +252,6 @@ static void add_directory_to_dirlist(const char *problem_dir_path, gpointer data
+     VERB1 log("added: %s", problem_dir_path);
+ }
+ 
+-static void query_dbus_and_add_to_dirlist(void)
+-{
+-    GList *problem_dirs = get_problems_over_dbus(g_authorize);
+-
+-    if (problem_dirs)
+-    {
+-        g_list_foreach(problem_dirs, (GFunc)add_directory_to_dirlist, /*use_dbus:*/ (void*)true);
+-        list_free_with_free(problem_dirs);
+-    }
+-
+-    /* HACK ALERT! We "magically know" that dbus-reported problem dirs
+-     * live in g_settings_dump_location.
+-     * Notifications on changes should be implemented to go over dbus too.
+-     */
+-    watch_this_dir(g_settings_dump_location);
+-}
+-
+ static void scan_directory_and_add_to_dirlist(const char *path)
+ {
+     DIR *dp = opendir(path);
+@@ -296,6 +279,33 @@ static void scan_directory_and_add_to_dirlist(const char *path)
+     watch_this_dir(path);
+ }
+ 
++static void query_dbus_and_add_to_dirlist(void)
++{
++    GList *problem_dirs = get_problems_over_dbus(g_authorize);
++
++    if (problem_dirs == ERR_PTR)
++    {
++        /* One way to trigger this is to temporarily rename
++         * dbus socket (/var/run/dbus/system_bus_socket)
++         */
++        error_msg("Error in DBus communication, falling back to direct access to '%s'", g_settings_dump_location);
++        scan_directory_and_add_to_dirlist(g_settings_dump_location);
++        return;
++    }
++
++    if (problem_dirs)
++    {
++        g_list_foreach(problem_dirs, (GFunc)add_directory_to_dirlist, /*use_dbus:*/ (void*)true);
++        list_free_with_free(problem_dirs);
++    }
++
++    /* HACK ALERT! We "magically know" that dbus-reported problem dirs
++     * live in g_settings_dump_location.
++     * Notifications on changes should be implemented to go over dbus too.
++     */
++    watch_this_dir(g_settings_dump_location);
++}
++
+ static void scan_dirs_and_add_to_dirlist(void)
+ {
+     if (!(g_opts & OPT_D))
+diff --git a/src/lib/problem_api.c b/src/lib/problem_api.c
+index b9967e8..04f4069 100644
+--- a/src/lib/problem_api.c
++++ b/src/lib/problem_api.c
+@@ -144,7 +144,7 @@ GList *get_problems_over_dbus(bool authorize)
+ {
+     GDBusProxy *proxy = get_dbus_proxy();
+     if (!proxy)
+-        return NULL;
++        return ERR_PTR;
+ 
+     GError *error = NULL;
+     GVariant *result = g_dbus_proxy_call_sync(proxy,
+@@ -159,6 +159,7 @@ GList *get_problems_over_dbus(bool authorize)
+     {
+         error_msg(_("Can't get problem list from abrt-dbus: %s"), error->message);
+         g_error_free(error);
++        return ERR_PTR;
+     }
+ 
+     GList *list = NULL;
+@@ -172,4 +173,4 @@ GList *get_problems_over_dbus(bool authorize)
+     }
+ 
+     return list;
+-}
+\ No newline at end of file
++}
+-- 
+1.7.12
+
diff --git a/app-admin/abrt/files/abrt-2.0.12-gentoo.patch b/app-admin/abrt/files/abrt-2.0.12-gentoo.patch
new file mode 100644
index 000000000000..0aa4267910e6
--- /dev/null
+++ b/app-admin/abrt/files/abrt-2.0.12-gentoo.patch
@@ -0,0 +1,398 @@
+From 1f56956ade3bd28ef192fba675e798db58b3ae40 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 22 Sep 2012 05:45:28 -0400
+Subject: [PATCH] Disable code not relevant for Gentoo
+
+Disable code that is only relevant for an RPM-based distro or that
+requires additional bugs.gentoo.org infrastructure support. Ensure that
+crashes still get analyzed even if they cannot be assigned to any
+package (since we lack any way of doing that at the moment).
+---
+ configure.ac                        |  1 -
+ doc/Makefile.am                     |  2 --
+ src/daemon/Makefile.am              | 18 ----------
+ src/daemon/abrt_event.conf          | 14 +++++---
+ src/plugins/Makefile.am             | 71 +------------------------------------
+ src/plugins/abrt-action-list-dsos   | 18 +++-------
+ src/plugins/ccpp_event.conf         | 29 +--------------
+ src/plugins/ccpp_retrace_event.conf |  8 +----
+ src/plugins/koops_event.conf        | 15 --------
+ src/plugins/python_event.conf       | 16 ---------
+ src/plugins/xorg_event.conf         |  2 +-
+ 11 files changed, 17 insertions(+), 177 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index bb2b986..a78d9f8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -79,7 +79,6 @@ PKG_CHECK_MODULES([GTK], [gtk+-3.0])
+ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.21])
+ PKG_CHECK_MODULES([DBUS], [dbus-1])
+ PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
+-PKG_CHECK_MODULES([RPM], [rpm])
+ PKG_CHECK_MODULES([LIBNOTIFY], [libnotify])
+ PKG_CHECK_MODULES([NSS], [nss])
+ PKG_CHECK_MODULES([BTPARSER], [btparser])
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 0a829d4..33cc8e6 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -16,11 +16,9 @@ MAN1_TXT += abrt-cli.txt
+ MAN1_TXT += abrt-action-save-package-data.txt
+ MAN1_TXT += abrt-install-ccpp-hook.txt
+ MAN1_TXT += abrt-action-analyze-vmcore.txt
+-MAN1_TXT += abrt-bodhi.txt
+ 
+ MAN5_TXT =
+ MAN5_TXT += abrt.conf.txt
+-MAN5_TXT += abrt-action-save-package-data.conf.txt
+ 
+ MAN8_TXT =
+ MAN8_TXT += abrtd.txt abrt-dbus.txt
+diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
+index 2e24403..777dfc4 100644
+--- a/src/daemon/Makefile.am
++++ b/src/daemon/Makefile.am
+@@ -6,9 +6,6 @@ dist_eventsconf_DATA = \
+ bin_SCRIPTS = \
+     abrt-handle-upload
+ 
+-bin_PROGRAMS = \
+-    abrt-action-save-package-data
+-
+ sbin_PROGRAMS = \
+     abrtd \
+     abrt-server
+@@ -55,21 +52,6 @@ abrt_handle_event_LDADD = \
+     $(LIBREPORT_LIBS) \
+     $(BTPARSER_LIBS)
+ 
+-abrt_action_save_package_data_SOURCES = \
+-    rpm.h rpm.c \
+-    abrt-action-save-package-data.c
+-abrt_action_save_package_data_CPPFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-    -DCONF_DIR=\"$(CONF_DIR)\" \
+-    $(GLIB_CFLAGS) \
+-    $(LIBREPORT_CFLAGS) \
+-    -D_GNU_SOURCE
+-abrt_action_save_package_data_LDADD = \
+-    $(RPM_LIBS) \
+-    $(LIBREPORT_LIBS) \
+-    ../lib/libabrt.la
+-
+ daemonconfdir = $(CONF_DIR)
+ dist_daemonconf_DATA = \
+     abrt.conf \
+diff --git a/src/daemon/abrt_event.conf b/src/daemon/abrt_event.conf
+index a1411e4..aab7dc0 100644
+--- a/src/daemon/abrt_event.conf
++++ b/src/daemon/abrt_event.conf
+@@ -44,7 +44,7 @@
+ 
+ 
+ # Determine in which package/component the crash happened (if not yet done):
+-EVENT=post-create component= remote!=1
++#EVENT=post-create component= remote!=1
+         abrt-action-save-package-data
+ 
+ 
+@@ -60,19 +60,19 @@ EVENT=post-create
+         if [ -f uid ]; then getent passwd "`cat uid`" | cut -d: -f1 >username; fi
+ 
+ 
+-EVENT=notify package!= uid!=
++EVENT=notify uid!=
+ 	dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
+ 	string:"`cat package`" string:"$DUMP_DIR" string:"`cat uid`"
+ 
+-EVENT=notify package!= uid=
++EVENT=notify uid=
+ 	dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
+ 	string:"`cat package`" string:"$DUMP_DIR"
+ 
+-EVENT=notify-dup package!= uid!=
++EVENT=notify-dup uid!=
+ 	dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
+ 	string:"`cat package`" string:"$DUMP_DIR" string:"`cat uid`"
+ 
+-EVENT=notify-dup package!= uid=
++EVENT=notify-dup uid=
+ 	dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
+ 	string:"`cat package`" string:"$DUMP_DIR"
+ 
+@@ -108,6 +108,10 @@ EVENT=notify-dup package!= uid=
+ #EVENT=post-create
+         reporter-upload -u scp://user:password@server.name/var/spool/abrt-upload || :
+ 
++#report-gui event is used for reporting by abrt-applet and abrt-gui
++
++EVENT=report-gui analyzer=CCpp
++        report-gtk -e analyze_LocalGDB -e report_Logger -- "$DUMP_DIR"
+ 
+ #open-gui event is used by abrt-gui's "Edit"->"Open problem data"
+ 
+diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
+index 10ab579..f0248b1 100644
+--- a/src/plugins/Makefile.am
++++ b/src/plugins/Makefile.am
+@@ -1,7 +1,6 @@
+ -include ../../config.mak
+ 
+ bin_SCRIPTS = \
+-    abrt-action-install-debuginfo \
+     abrt-action-analyze-core \
+     abrt-action-analyze-vmcore \
+     abrt-action-list-dsos
+@@ -16,12 +15,7 @@ bin_PROGRAMS = \
+     abrt-action-trim-files \
+     abrt-action-generate-backtrace \
+     abrt-action-generate-core-backtrace \
+-    abrt-action-analyze-backtrace \
+-    abrt-retrace-client \
+-    abrt-dedup-client \
+-    abrt-bodhi
+-
+-libexec_PROGRAMS = abrt-action-install-debuginfo-to-abrt-cache
++    abrt-action-analyze-backtrace
+ 
+ #dist_pluginsconf_DATA = Python.conf
+ 
+@@ -44,7 +38,6 @@ eventsconfdir = $(EVENTS_CONF_DIR)
+ 
+ dist_eventsconf_DATA = \
+     ccpp_event.conf \
+-    ccpp_retrace_event.conf \
+     koops_event.conf \
+     xorg_event.conf \
+     vmcore_event.conf \
+@@ -56,7 +49,6 @@ dist_eventsconf_DATA = \
+ 
+ 
+ PYTHON_FILES = \
+-    abrt-action-install-debuginfo.in \
+     abrt-action-list-dsos \
+     abrt-action-analyze-core \
+     abrt-action-analyze-vmcore.in
+@@ -69,7 +61,6 @@ EXTRA_DIST = \
+     collect_vimrc_user.xml.in \
+     collect_vimrc_system.xml.in \
+     analyze_LocalGDB.xml.in \
+-    analyze_RetraceServer.xml.in \
+     analyze_VMcore.xml.in \
+     abrt-action-analyze-vmcore \
+     https-utils.h \
+@@ -204,64 +195,4 @@ abrt_action_analyze_backtrace_LDADD = \
+     $(LIBREPORT_LIBS) \
+     $(BTPARSER_LIBS)
+ 
+-abrt_action_install_debuginfo_to_abrt_cache_SOURCES = \
+-    abrt-action-install-debuginfo-to-abrt-cache.c
+-abrt_action_install_debuginfo_to_abrt_cache_CPPFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-    -D_GNU_SOURCE \
+-    $(LIBREPORT_CFLAGS) \
+-    -Wall -Wwrite-strings
+-abrt_action_install_debuginfo_to_abrt_cache_LDADD = \
+-     $(LIBREPORT_LIBS) \
+-     ../lib/libabrt.la
+-
+-abrt_retrace_client_SOURCES = \
+-    abrt-retrace-client.c \
+-    https-utils.c
+- abrt_retrace_client_CFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-     $(NSS_CFLAGS) \
+-     $(GLIB_CFLAGS) \
+-     -D_GNU_SOURCE \
+-     $(LIBREPORT_CFLAGS)
+- abrt_retrace_client_LDADD = \
+-     $(LIBREPORT_LIBS) \
+-     $(BTPARSER_LIBS) \
+-     $(NSS_LIBS)
+-
+-abrt_dedup_client_SOURCES = \
+-    abrt-dedup-client.c \
+-    https-utils.c
+- abrt_dedup_client_CFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-     $(NSS_CFLAGS) \
+-     $(GLIB_CFLAGS) \
+-     -D_GNU_SOURCE \
+-     $(LIBREPORT_CFLAGS)
+- abrt_dedup_client_LDADD = \
+-     $(LIBREPORT_LIBS) \
+-     $(BTPARSER_LIBS) \
+-     $(NSS_LIBS)
+-
+-abrt_bodhi_SOURCES = \
+-    bodhi.c
+- abrt_bodhi_CPPFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-    $(GLIB_CFLAGS) \
+-    $(LIBREPORT_CFLAGS) \
+-    $(LIBREPORT_WEB_CFLAGS) \
+-    $(JSON_C_CFLAGS) \
+-    $(RPM_CFLAGS) \
+-    -D_GNU_SOURCE
+- abrt_bodhi_LDADD = \
+-    $(JSON_C_LIBS) \
+-    $(RPM_LIBS) \
+-    $(LIBREPORT_LIBS) \
+-    $(LIBREPORT_WEB_LIBS)
+-
+-
+ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+diff --git a/src/plugins/abrt-action-list-dsos b/src/plugins/abrt-action-list-dsos
+index 81a9927..bf1491c 100644
+--- a/src/plugins/abrt-action-list-dsos
++++ b/src/plugins/abrt-action-list-dsos
+@@ -5,7 +5,6 @@
+ import sys
+ import os
+ import getopt
+-import rpm
+ 
+ def log(s):
+     sys.stderr.write("%s\n" % s)
+@@ -68,19 +67,10 @@ if __name__ == "__main__":
+         try:
+             dso_paths = parse_maps(memfile)
+             for path in dso_paths:
+-                ts = rpm.TransactionSet()
+-                mi = ts.dbMatch('basenames', path)
+-                if len(mi):
+-                    for h in mi:
+-                        if outname:
+-                            outfile = xopen(outname, "w")
+-                            outname = None
+-                        outfile.write("%s %s (%s) %s\n" %
+-                                    (path,
+-                                     h[rpm.RPMTAG_NEVRA],
+-                                     h[rpm.RPMTAG_VENDOR],
+-                                     h[rpm.RPMTAG_INSTALLTIME])
+-                                    )
++                if outname:
++                    outfile = xopen(outname, "w")
++                    outname = None
++                outfile.write(path)
+ 
+         except Exception, ex:
+             error_msg_and_die("Can't get the DSO list: %s" % ex)
+diff --git a/src/plugins/ccpp_event.conf b/src/plugins/ccpp_event.conf
+index 81b14d2..cda0b7d 100644
+--- a/src/plugins/ccpp_event.conf
++++ b/src/plugins/ccpp_event.conf
+@@ -31,31 +31,4 @@ EVENT=collect_xsession_errors analyzer=CCpp dso_list~=.*/libX11.*
+ # or was this ability lost with move to python installer?
+ EVENT=analyze_LocalGDB analyzer=CCpp
+         abrt-action-analyze-core --core=coredump -o build_ids &&
+-        /usr/libexec/abrt-action-install-debuginfo-to-abrt-cache --size_mb=4096 &&
+-        abrt-action-generate-backtrace &&
+-        abrt-action-analyze-backtrace &&
+-        (
+-            bug_id=$(reporter-bugzilla -h `cat duphash`) &&
+-            if test -n "$bug_id"; then
+-                abrt-bodhi -r -b $bug_id
+-            fi
+-        )
+-
+-
+-# Bugzilla requires nonempty duphash
+-EVENT=report_Bugzilla analyzer=CCpp duphash!=
+-        abrt-dedup-client
+-        test -f component || abrt-action-save-package-data
+-        reporter-bugzilla -b -c /etc/libreport/plugins/bugzilla.conf
+-
+-# Send micro report
+-EVENT=report_uReport analyzer=CCpp
+-        reporter-ureport
+-
+-# update ABRT database after successful report to bugzilla
+-EVENT=post_report analyzer=CCpp
+-        reporter-ureport -r
+-
+-# Reporting of C/Cpp problems
+-EVENT=report-gui analyzer=CCpp
+-        report-gtk -e report_uReport -e analyze_RetraceServer -e report_Bugzilla -e post_report -- "$DUMP_DIR"
++        abrt-action-generate-backtrace
+diff --git a/src/plugins/ccpp_retrace_event.conf b/src/plugins/ccpp_retrace_event.conf
+index 60e53d7..893502f 100644
+--- a/src/plugins/ccpp_retrace_event.conf
++++ b/src/plugins/ccpp_retrace_event.conf
+@@ -1,9 +1,3 @@
+ EVENT=analyze_RetraceServer analyzer=CCpp
+         abrt-retrace-client batch --dir "$DUMP_DIR" --status-delay 10 &&
+-        abrt-action-analyze-backtrace &&
+-        (
+-            bug_id=$(reporter-bugzilla -h `cat duphash`) &&
+-            if test -n "$bug_id"; then
+-                abrt-bodhi -r -b $bug_id
+-            fi
+-        )
++        abrt-action-analyze-backtrace
+diff --git a/src/plugins/koops_event.conf b/src/plugins/koops_event.conf
+index 91759b1..41708df 100644
+--- a/src/plugins/koops_event.conf
++++ b/src/plugins/koops_event.conf
+@@ -14,18 +14,3 @@ EVENT=post-create analyzer=Kerneloops
+ # report
+ #EVENT=report_Kerneloops analyzer=Kerneloops
+         reporter-kerneloops
+-
+-EVENT=report_Bugzilla analyzer=Kerneloops
+-        reporter-bugzilla -b
+-
+-# Send micro report
+-EVENT=report_uReport analyzer=Kerneloops
+-        reporter-ureport
+-
+-# update ABRT database after successful report to bugzilla
+-EVENT=post_report analyzer=Kerneloops
+-        reporter-ureport -r
+-
+-# Reporting of kernel oopses
+-EVENT=report-gui analyzer=Kerneloops
+-        report-gtk -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
+diff --git a/src/plugins/python_event.conf b/src/plugins/python_event.conf
+index e60df11..66b41f2 100644
+--- a/src/plugins/python_event.conf
++++ b/src/plugins/python_event.conf
+@@ -1,19 +1,3 @@
+ EVENT=post-create analyzer=Python
+         abrt-action-analyze-python
+         abrt-action-generate-core-backtrace
+-
+-EVENT=report_Bugzilla analyzer=Python
+-        test -f component || abrt-action-save-package-data
+-        reporter-bugzilla -b -c /etc/libreport/plugins/bugzilla.conf
+-
+-# Send micro report
+-EVENT=report_uReport analyzer=Python
+-        reporter-ureport
+-
+-# update ABRT database after successful report to bugzilla
+-EVENT=post_report analyzer=Python
+-        reporter-ureport -r
+-
+-# Reporting of python exceptions
+-EVENT=report-gui analyzer=Python
+-        report-gtk -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
+diff --git a/src/plugins/xorg_event.conf b/src/plugins/xorg_event.conf
+index b974a6b..5476230 100644
+--- a/src/plugins/xorg_event.conf
++++ b/src/plugins/xorg_event.conf
+@@ -33,4 +33,4 @@ EVENT=report_Bugzilla analyzer=xorg
+ 
+ # Reporting of xorg problems
+ EVENT=report-gui analyzer=xorg
+-    report-gtk -e report_Bugzilla -- "$DUMP_DIR"
++    report-gtk -e report_Logger -- "$DUMP_DIR"
+-- 
+1.7.12
+
diff --git a/app-admin/abrt/files/abrt-2.0.12-r1-conf b/app-admin/abrt/files/abrt-2.0.12-r1-conf
new file mode 100644
index 000000000000..073eb0daf82e
--- /dev/null
+++ b/app-admin/abrt/files/abrt-2.0.12-r1-conf
@@ -0,0 +1,27 @@
+# abrtd command-line options
+# Default: ""
+ABRTD_OPTS=""
+
+# Run abrt-harvest-vmcore to make new kdump dumps available for abrtd
+START_VMCORE="yes"
+
+# Install abrt-ccpp hook to watch for segfaults
+START_CCPP="yes"
+
+# Call abrt-dump-oops to log kernel oops
+START_OOPS="yes"
+# log file to watch for kernel oops
+# Default: "/var/log/messages"
+OOPS_WATCH_LOG="/var/log/messages"
+# abrt-dump-oops command-line options
+# Default: "-xD"
+OOPS_DUMP_OPTS="-xD"
+
+# Call abrt-dump-xorg to log X crashes
+START_XORG="yes"
+# log file to watch for X crashes
+# Default: "/var/log/Xorg.0.log"
+XORG_WATCH_LOG="/var/log/Xorg.0.log"
+# abrt-dump-xorg command-line options
+# Default: "-xD"
+XORG_DUMP_OPTS="-xD"
diff --git a/app-admin/abrt/files/abrt-2.0.12-r1-init b/app-admin/abrt/files/abrt-2.0.12-r1-init
new file mode 100644
index 000000000000..3fb32b7c3e43
--- /dev/null
+++ b/app-admin/abrt/files/abrt-2.0.12-r1-init
@@ -0,0 +1,76 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Automated crash detection service"
+
+depend() {
+	need dbus logger
+}
+
+start() {
+	ebegin "Starting abrtd"
+	start-stop-daemon --start --quiet --pidfile /var/run/abrt/abrtd.pid \
+		--exec /usr/sbin/abrtd -- ${ABRTD_OPTS}
+	eend $?
+
+	if [ "${START_VMCORE}" = "yes" ]; then
+		ebegin "Running abrt-harvest-vmcore"
+		/usr/sbin/abrt-harvest-vmcore
+		eend $?
+	fi
+
+	if [ "${START_CCPP}" = "yes" ]; then
+		ebegin "Installing abrt-ccpp hook"
+		/usr/sbin/abrt-install-ccpp-hook install
+		eend $?
+	fi
+
+	if [ "${START_OOPS}" = "yes" ]; then
+		ebegin "Starting abrt-dump-oops"
+		start-stop-daemon --start --quiet \
+			--pidfile /var/run/abrt/abrt-dump-oops.pid \
+			--make-pidfile --background \
+			--exec /usr/bin/abrt-watch-log -- \
+			-F "`/usr/bin/abrt-dump-oops -m`" ${OOPS_WATCH_LOG} -- \
+			/usr/bin/abrt-dump-oops ${OOPS_DUMP_OPTS}
+		eend $?
+	fi
+
+	if [ "${START_XORG}" = "yes" ]; then
+		ebegin "Starting abrt-dump-xorg"
+		start-stop-daemon --start --quiet \
+			--pidfile /var/run/abrt/abrt-dump-xorg.pid \
+			--make-pidfile --background \
+			--exec /usr/bin/abrt-watch-log -- \
+			-F "`/usr/bin/abrt-dump-xorg -m`" ${XORG_WATCH_LOG} -- \
+			/usr/bin/abrt-dump-xorg ${XORG_DUMP_OPTS}
+		eend $?
+	fi
+}
+
+stop() {
+	if [ "${START_XORG}" = "yes" ]; then
+		ebegin "Stopping abrt-dump-xorg"
+		start-stop-daemon --stop --quiet \
+			--pidfile /var/run/abrt/abrt-dump-xorg.pid
+		eend $?
+	fi
+
+	if [ "${START_OOPS}" = "yes" ]; then
+		ebegin "Stopping abrt-dump-oops"
+		start-stop-daemon --stop --quiet \
+			--pidfile /var/run/abrt/abrt-dump-oops.pid
+		eend $?
+	fi
+
+	if [ "${START_CCPP}" = "yes" ]; then
+		ebegin "Uninstalling abrt-ccpp hook"
+		/usr/sbin/abrt-install-ccpp-hook uninstall
+		eend $?
+	fi
+
+	ebegin "Stopping abrtd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/abrt/abrtd.pid
+	eend $?
+}
diff --git a/app-admin/abrt/files/abrt-2.0.6-format-security.patch b/app-admin/abrt/files/abrt-2.0.6-format-security.patch
new file mode 100644
index 000000000000..6b5c8d0e3721
--- /dev/null
+++ b/app-admin/abrt/files/abrt-2.0.6-format-security.patch
@@ -0,0 +1,27 @@
+From d0d7954713541df4612ab5b54b2808aae9a3d6f0 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 16 Nov 2011 00:41:10 -0500
+Subject: [PATCH] Don't use server response as a format string
+
+It's bad practice even for trusted servers, and makes gcc complain about
+format-security.
+---
+ src/plugins/abrt-retrace-client.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/plugins/abrt-retrace-client.c b/src/plugins/abrt-retrace-client.c
+index 0fb17a3..4c30334 100644
+--- a/src/plugins/abrt-retrace-client.c
++++ b/src/plugins/abrt-retrace-client.c
+@@ -958,7 +958,7 @@ static int create(bool delete_temp_archive,
+     if (response_code == 500 || response_code == 507)
+     {
+         alert_server_error();
+-        error_msg_and_die(http_body);
++        error_msg_and_die("%s", http_body);
+     }
+     else if (response_code == 403)
+     {
+-- 
+1.7.8.rc1
+
diff --git a/app-admin/abrt/metadata.xml b/app-admin/abrt/metadata.xml
new file mode 100644
index 000000000000..a14673b81f96
--- /dev/null
+++ b/app-admin/abrt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">abrt/abrt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/aerospike-amc-community-3.6.13-r1 b/app-admin/aerospike-amc-community-3.6.13-r1
deleted file mode 100644
index 969a7f23d3fa..000000000000
--- a/app-admin/aerospike-amc-community-3.6.13-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-crypt/gcr dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
-DESCRIPTION=Web UI based monitoring tool for Aerospike Community Edition Server
-EAPI=5
-HOMEPAGE=http://www.aerospike.com
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-crypt/gcr dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
-SLOT=0
-SRC_URI=http://www.aerospike.com/artifacts/aerospike-amc-community/3.6.13/aerospike-amc-community-3.6.13.all.x86_64.deb
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1289eaedd794ea6bec05b00e2b802aa2
diff --git a/app-admin/aerospike-amc-community-4.0.19-r1 b/app-admin/aerospike-amc-community-4.0.19-r1
deleted file mode 100644
index 5b85b8687c79..000000000000
--- a/app-admin/aerospike-amc-community-4.0.19-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Web UI based monitoring tool for Aerospike Community Edition Server
-EAPI=6
-HOMEPAGE=http://www.aerospike.com
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=http://www.aerospike.com/download/amc/4.0.19/artifact/linux -> aerospike-amc-community-4.0.19.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cf40d77563db21a4e3d76a4ae324d824
diff --git a/app-admin/aerospike-amc-community/Manifest b/app-admin/aerospike-amc-community/Manifest
new file mode 100644
index 000000000000..1dacf8721f73
--- /dev/null
+++ b/app-admin/aerospike-amc-community/Manifest
@@ -0,0 +1,8 @@
+AUX amc.init 562 BLAKE2B f4aed655b924f345905aa8d3f149799ad299086cca1555e4902e09b376a47e2da8a34445446b00f7508cf4b6ef1d7eb83df93ae6af7c89d9b6e23d027ea5ce45 SHA512 4f50237b23ec1d2257791266ee5ee4c8b963bb0429c7386d50e4ba74ee8a451cd99a8dde277ed92b490a9b40bf33f5f6920e66c777e388bae43cfe402d255094
+AUX amc.init.4 401 BLAKE2B a649832bdbc6dc33de0f87ac0037b1c38212b97abdec16d25d714db6c183fcaed0eb8374d7fecccaf8c8cdeff2c125007b4a924e208721e9d6a8e83befb93dc6 SHA512 00cca21719821efff950d272bfe1c35bbedaf5597507d2b19ecdf6f6c2e7ac7c1c1bdd42474177551e55b9751060ec396add7f4cc94f693537c105f5cbe1bac6
+AUX amc.init2 583 BLAKE2B 0745a48ecfdc060ac9995c0634761d9b16d7d190df9d6a3d8fd7ec415fda486157e22f6f7ff03b2d4a3afe93632a67e7ad07214831007101bd9ebc71557f6003 SHA512 c91d1e66a6bcd286efec425295fc168c7d277f0d4886c9e0cd43f49e58b9c9ae0b0c2c453d278404d4d07935c55baf91bffe272699de095df13028316cc0d317
+DIST aerospike-amc-community-3.6.13.all.x86_64.deb 1436414 BLAKE2B cd823dd1c546fe69948ef3f77fa8bf0a68a8d95ed3ee778272b84c39b1b1bc4e5afef803931ce859fd957421f4816358590a3c1e0845fdc524a0f029b52ce828 SHA512 8077f8c51aab39ca701eb1ada633a3a378e02fed39ef2e565fed57fa57cf12da6c69a2b3d93e179110c29043a0a5a114512d30752eab6356e1b819ae490d23bb
+DIST aerospike-amc-community-4.0.19.tar.gz 7868527 BLAKE2B 69835bdf3d7f1a4b23cd63bb7344c50b6bbbdc04fd55b2d6ec5783a429a442fa6cdf985c77cb4ac73f8ac0663ed2524c8d7a853e970cc086335cf810fd9eaecf SHA512 821de8569bf020b9a2b829e71aab5d48d25639620468aa0b3ed28dc24e0d57bc61be60939425c0a69c418602fa2fbf5ef60f1870edb3f04fa40a2a2aca281218
+EBUILD aerospike-amc-community-3.6.13-r1.ebuild 1404 BLAKE2B 8b278cd44569c009fb9801ebded251e7dbbb074056a94ff07f9634660150171219e73af4638990bb660676a1e6d127015eef515b46026e97ba30a6eaed360baf SHA512 b359adddaf57972b90436bf09edac8081ee5113636f427f69e94e57eae15da8ad1a93c0e1c97ee2ddd590a98ff22290a360fe2ff54da292a16d4ed009fbbf77d
+EBUILD aerospike-amc-community-4.0.19-r1.ebuild 539 BLAKE2B f68e4bdeed829f5340c2ce1dd15773da038a1755e7682aa4cc02236e7654ff956f87582be75bcea950c1aafd9f8b26848039990354ac780a9574425ae93b3a55 SHA512 89c275ed1d9706a4cd9bf068f0ab6d7931f6a7b346248b5ced94163e98434461b2c22226c0c83a75cec4f5f13a0efec63ab3a09c8537d513fe6bc1dcdd4681f4
+MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r1.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r1.ebuild
new file mode 100644
index 000000000000..aeea28831d00
--- /dev/null
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="app-crypt/gcr
+	dev-python/eventlet
+	dev-python/flask
+	dev-python/greenlet
+	dev-python/setproctitle
+	www-servers/gunicorn"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	default
+	mkdir "${P}"
+	tar -xf data.tar.xz -C "${S}" || die
+	tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
+}
+
+src_install() {
+	mv opt/amc/amc/* opt/amc/
+	rm -rf opt/amc/amc
+	rm -f opt/amc/install
+	rm -f opt/amc/bin/uninstall
+	rm -f opt/amc/bin/amc_*.sh
+	rm -f opt/amc/bin/gunicorn
+	rm -rf opt/amc/server/site-packages/
+	rm -rf opt/amc/server/setups/
+
+	insinto /etc/logrotate.d
+	newins opt/amc/config/logrotate amc
+	rm -f opt/amc/config/logrotate
+
+	insinto /etc/cron.daily
+	newins opt/amc/config/logcron amc
+	rm -f opt/amc/config/logcron
+
+	sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
+
+	insinto /etc/amc/config
+	doins -r opt/amc/config/*
+	rm -rf opt/amc/config/
+
+	echo "${PV}" > opt/amc/amc_version
+
+	insinto /opt/amc/
+	doins -r opt/amc/*
+
+	keepdir /var/log/amc
+
+	newinitd "${FILESDIR}"/amc.init2 amc
+}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19-r1.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19-r1.ebuild
new file mode 100644
index 000000000000..d1d21c1ab7be
--- /dev/null
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils user
+
+DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/download/amc/${PV}/artifact/linux -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S=$WORKDIR
+
+src_install() {
+	cp -r "$S/"* "$D"
+	rm "${D}/etc/init.d/*"
+	newinitd "${FILESDIR}/amc.init.4" amc
+}
diff --git a/app-admin/aerospike-amc-community/files/amc.init b/app-admin/aerospike-amc-community/files/amc.init
new file mode 100644
index 000000000000..06c14001f5d6
--- /dev/null
+++ b/app-admin/aerospike-amc-community/files/amc.init
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+config_file=${config_file:-/etc/amc/config/gunicorn_config.py}
+run_dir=${run_dir:-/run}
+
+command="/usr/bin/gunicorn"
+command_args="--daemon --config ${config_file} flaskapp:app"
+command_background="true"
+pidfile=${run_dir}/${SVCNAME}.pid
+user=${user:-root}
+group=${group:-root}
+start_stop_daemon_args="--user ${user} --group ${group}"
+required_files="${config_file}"
+
+depend() {
+	use net
+}
+
+start_post() {
+	ewaitfile 60 "${pidfile}"
+}
diff --git a/app-admin/aerospike-amc-community/files/amc.init.4 b/app-admin/aerospike-amc-community/files/amc.init.4
new file mode 100644
index 000000000000..87405a83c709
--- /dev/null
+++ b/app-admin/aerospike-amc-community/files/amc.init.4
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+run_dir=${run_dir:-/run}
+
+command="/opt/amc/amc"
+command_progress="true"
+retry='TERM/30/KILL/5'
+pidfile=${run_dir}/${SVCNAME}.pid
+user=${user:-root}
+group=${group:-root}
+start_stop_daemon_args="--user ${user} --group ${group}"
+command_args="--daemon"
+
+depend() {
+	use net
+}
diff --git a/app-admin/aerospike-amc-community/files/amc.init2 b/app-admin/aerospike-amc-community/files/amc.init2
new file mode 100644
index 000000000000..3e3bdd9920a3
--- /dev/null
+++ b/app-admin/aerospike-amc-community/files/amc.init2
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+config_file=${config_file:-/etc/amc/config/gunicorn_config.py}
+run_dir=${run_dir:-/run}
+
+command="/usr/bin/gunicorn"
+command_args="--daemon --config ${config_file} flaskapp:app"
+command_progress="true"
+retry='TERM/30/KILL/5'
+pidfile=${run_dir}/${SVCNAME}.pid
+user=${user:-root}
+group=${group:-root}
+start_stop_daemon_args="--user ${user} --group ${group}"
+required_files="${config_file}"
+
+depend() {
+	use net
+}
+
+start_post() {
+	ewaitfile 60 "${pidfile}"
+}
diff --git a/app-admin/aerospike-amc-community/metadata.xml b/app-admin/aerospike-amc-community/metadata.xml
new file mode 100644
index 000000000000..8c5a5301197b
--- /dev/null
+++ b/app-admin/aerospike-amc-community/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/amazon-ec2-init-20101127-r1 b/app-admin/amazon-ec2-init-20101127-r1
deleted file mode 100644
index 164cbf23e8a2..000000000000
--- a/app-admin/amazon-ec2-init-20101127-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Init script to setup Amazon EC2 instance parameters
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-misc/wget
-SLOT=0
-_md5_=be98a79980a67e933b1b83546195f411
diff --git a/app-admin/amazon-ec2-init/Manifest b/app-admin/amazon-ec2-init/Manifest
new file mode 100644
index 000000000000..158d06c1b336
--- /dev/null
+++ b/app-admin/amazon-ec2-init/Manifest
@@ -0,0 +1,3 @@
+AUX amazon-ec2.init 1073 BLAKE2B f9bfa80b9317965eb603bb414e02b77c8e4045045fd10c29bf1fbe4a216e0f71d71b411b77123ca66a282716b510768773cb47a6ccd717683354f5688a2c85b0 SHA512 6dcbca0fed4e3a4e8c0d0e9da4cb8ea380f6604605402350d8980bad1377376584b644157f88a2babcd605e690f3a52cf89e63e130d679b501327675c90d5836
+EBUILD amazon-ec2-init-20101127-r1.ebuild 766 BLAKE2B 190643bfd2d999dfc9f716e1b2fc49d1aecaeff87eee132a124051bcfb57badd4d28cca7e268d72b23b748e5fdc7bfdb2f31db2a930cba0fe5154a7042afe6f6 SHA512 a0c1986867363a9eb4616afdef8b20cd2a08372d05ea03853289cb6539f1152a9da876e5379b364d46b3f0e0f5f0e23eaaedde5b7c45c026cbbe84b479bc7259
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild b/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild
new file mode 100644
index 000000000000..41cd0c9ccb81
--- /dev/null
+++ b/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Init script to setup Amazon EC2 instance parameters"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+# Amazon only provides x86 and amd64 Linux Xen guests, possibly FreeBSD,
+# so just don't go adding further keywords.
+KEYWORDS="-* ~amd64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="net-misc/wget"
+DEPEND=""
+
+# EAPI 4+ requires $S to be set
+S="$WORKDIR"
+
+src_install() {
+	newinitd "${FILESDIR}/amazon-ec2.init" amazon-ec2
+}
+
+pkg_postinst() {
+	elog "Remember to add amazon-ec2 init script to your boot runlevel"
+	elog "otherwise it won't bring up the correct interfaces and won't."
+	elog "start before the hostname has been set."
+}
diff --git a/app-admin/amazon-ec2-init/files/amazon-ec2.init b/app-admin/amazon-ec2-init/files/amazon-ec2.init
new file mode 100644
index 000000000000..29ce3aabd6a8
--- /dev/null
+++ b/app-admin/amazon-ec2-init/files/amazon-ec2.init
@@ -0,0 +1,34 @@
+#!/sbin/openrc-run
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+         before hostname
+         need net.eth0
+}
+
+start() {
+        einfo "Fetching metadata from EC2 servers"
+
+        ebegin "  hostname"
+        local hostname=$(wget -t 2 -T 5 -q -O - http://169.254.169.254/latest/meta-data/local-hostname)
+        echo "hostname=${hostname}" >> /etc/conf.d/hostname
+        eend $?
+
+        ebegin "  SSH keys"
+
+        mkdir -p /root/.ssh
+
+        local keys=$(wget -t 2 -T 5 -q -O - http://169.254.169.254/latest/meta-data/public-keys/ | cut -d = -f 1 | xargs echo)
+        [ -n "${keys}" ] && \
+            wget -t 2 -T 5 -q -O - $(for key in $keys; do echo "http://169.254.169.254/latest/meta-data/public-keys/$key/openssh-key"; done) \
+            >> /root/.ssh/authorized_keys \
+            2>/dev/null
+
+        if [ -f /root/.ssh/authorized_keys ]; then
+            chown root:root /root/.ssh/authorized_keys
+            chmod 0600 /root/.ssh/authorized_keys
+        fi
+
+        eend $?
+}
diff --git a/app-admin/amazon-ec2-init/metadata.xml b/app-admin/amazon-ec2-init/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/amazon-ec2-init/metadata.xml
@@ -0,0 +1,5 @@
+<?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/analog-6.0-r4 b/app-admin/analog-6.0-r4
deleted file mode 100644
index ab494e712b0f..000000000000
--- a/app-admin/analog-6.0-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-libs/libpcre-3.4 >=media-libs/gd-1.8.4-r2[jpeg,png] sys-libs/zlib
-DESCRIPTION=A webserver log analyzer
-EAPI=4
-HOMEPAGE=http://www.c-amie.co.uk/analog/
-KEYWORDS=alpha amd64 arm hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libpcre-3.4 >=media-libs/gd-1.8.4-r2[jpeg,png] sys-libs/zlib
-SLOT=0
-SRC_URI=http://www.analog.cx/analog-6.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24a14213edf34d382918f6d8b462ff22
diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
new file mode 100644
index 000000000000..7e94e350fd57
--- /dev/null
+++ b/app-admin/analog/Manifest
@@ -0,0 +1,7 @@
+AUX analog-5.1-gentoo.diff 799 BLAKE2B 66aae5e4f66ab232cdb98eef893ffe2794e06ecb76f5c0716f9074596388ee62344a5b4b38391a22b75338ab97eb91a05e2670ae8152f20f97895d2fb3cea25a SHA512 34b03160213ca13f1b634dad1895b2cba5777188c7f673bbf00ee543d43ae3cf593d7be83b861b553e213ad0619d28f25ffcd1850f3ba7633bd13e37c4bd67b2
+AUX analog-6.0-bzip2.patch 3260 BLAKE2B a9bab8a2a7d070b59690606f393d80407f6ffcb38f2c40c30c22ffadcaf8de3f868c56660fbdf358e76ca342296305670b12d41cdefd5d03acb0ce22dea371c7 SHA512 ea256338713338043ccaa48ffd8344753811721cf42c8269a2c58c2a14f7ebe901b16131ff021163a02c570b1b902bb3ab6516e34570a7961bce716cf600920b
+AUX analog-6.0-undefined-macro.patch 997 BLAKE2B 9ae68f90acfa81e861a6fddbd588ed4cbfdf9b4ad26355894bc3aaa0df50e5bbd180096c4baf393f6dcdd7d91d28b4e6a85e5b5c65714ff540e9ae127a08905b SHA512 759d6dfc2a09305a6178d1c147219487f988d432bf6d011e49776cec2de04ccc7ab27568638063f0ca723a92a75abeda82eddd5240a0b42bab3a2de3ae99007f
+AUX analog.cfg 3992 BLAKE2B 8e68cc26a59a5bbed57f84e06ac8f5c9874cf1a36bdbb5c6f9144bc39df17ea380ebd323b2ddb891dd968078fd3d7bae6b29a90cb5ec2051a10722489d0d83d2 SHA512 af6e8eb3013fea513efcce2e57b2680850604552a8def8f3148cfc4b11bf01114778fc112ee562b7ce4cce6b496b37a53251d1061d67fe5748d39c5225f94141
+DIST analog-6.0.tar.gz 1553316 BLAKE2B 5363880cf65e8a4e845603a19dd30b79d4fb13b51b68d0cbcf59c2827a2c099d02c662e55b59ef9b4526ade53ca3f7401415a3bc78de3d7cc39b4e4988299241 SHA512 42b766d45f86a32d2e97cc2be35ebb5f4e0ffc2fb72d48196939027ea1ed3398a8cc0a43c47868f542bfb464199ab35bd93fa2ba5e37c4fc83ff15cfe19b9c60
+EBUILD analog-6.0-r4.ebuild 1274 BLAKE2B f7f95820d6865ded71f6d71b2739c4ff5670572cd472ceace633878ae3c77156b72c7791ec6d8ed5b149e7b5c55915e3c72ee6e7bb26fccbf187c0085bffa2f0 SHA512 8dc0af3bd800e4deb00c3e3b65902fbdb58353365c3bb6366fc2c31f3395ca76761dea5b9dd65089f86a95a3f335a32cb2e50752923ee4f215f3b6c7b7044c28
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/analog/analog-6.0-r4.ebuild b/app-admin/analog/analog-6.0-r4.ebuild
new file mode 100644
index 000000000000..334c5652bfc3
--- /dev/null
+++ b/app-admin/analog/analog-6.0-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A webserver log analyzer"
+HOMEPAGE="http://www.c-amie.co.uk/analog/"
+SRC_URI="http://www.analog.cx/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND=">=dev-libs/libpcre-3.4
+	>=media-libs/gd-1.8.4-r2[jpeg,png]
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cd src/
+	epatch "${FILESDIR}/${PN}-5.1-gentoo.diff"
+	epatch "${FILESDIR}/${P}-bzip2.patch"
+	epatch "${FILESDIR}/${P}-undefined-macro.patch"
+
+	sed -i Makefile \
+		-e 's| -o | $(LDFLAGS)&|g' \
+		|| die "sed Makefile"
+}
+
+src_compile() {
+	tc-export CC
+	# emake in main dir just executes "cd src && make",
+	# i.e. MAKEOPTS are ignored
+	emake -C src
+}
+
+src_install() {
+	dobin analog
+	newman analog.man analog.1
+
+	dodoc README.txt Licence.txt analog.cfg
+	dohtml -a html,gif,css,ico docs/*
+	dohtml -r how-to
+	dodoc -r examples
+	docinto cgi ; dodoc anlgform.pl
+
+	insinto /usr/share/analog/images ; doins images/*
+	insinto /usr/share/analog/lang ; doins lang/*
+	dodir /var/log/analog
+	dosym ../../../usr/share/analog/images /var/log/analog/images
+	insinto /etc/analog ; doins "${FILESDIR}/analog.cfg"
+}
diff --git a/app-admin/analog/files/analog-5.1-gentoo.diff b/app-admin/analog/files/analog-5.1-gentoo.diff
new file mode 100644
index 000000000000..b604c254c572
--- /dev/null
+++ b/app-admin/analog/files/analog-5.1-gentoo.diff
@@ -0,0 +1,20 @@
+--- a/src/anlghead.h	Wed Nov  7 06:06:46 2001
++++ b/src/anlghead.h	Mon Dec 31 16:47:43 2001
+@@ -81,15 +81,11 @@
+    and use that directory; or the current directory if it couldn't deduce a
+    directory. This may or may not work, so it's better to specify a location
+    explicitly here if you know where the files will be kept. */
+-#ifndef LANGDIR
+-#define LANGDIR NULL
+-#endif
++#define LANGDIR "/usr/share/analog/lang/"
+ /* Directory where the language files live. Actually, if this one is defined
+    to be NULL, they will be looked for inside the "lang" subdirectory of the
+    directory containing the analog binary. */
+-#ifndef CONFIGDIR
+-#define CONFIGDIR NULL
+-#endif
++#define CONFIGDIR "/etc/analog/" 
+ /* Directory containing configuration files. */
+ #ifndef LOGSDIR
+ #define LOGSDIR NULL
diff --git a/app-admin/analog/files/analog-6.0-bzip2.patch b/app-admin/analog/files/analog-6.0-bzip2.patch
new file mode 100644
index 000000000000..f950a30ef470
--- /dev/null
+++ b/app-admin/analog/files/analog-6.0-bzip2.patch
@@ -0,0 +1,64 @@
+Use system bzip2 library. Get CC and CFLAGS from environment.
+ -jer (bug #249140)
+
+
+--- a/src/Makefile	2004-12-19 14:51:30.000000000 +0100
++++ b/src/Makefile	2008-12-15 22:50:04.000000000 +0100
+@@ -2,16 +2,16 @@
+ # Please read docs/Readme.html, or http://www.analog.cx/
+ # This is a general Unix-like Makefile: Makefiles for other OS's can be found
+ #   in the "build" directory.
+-CC = gcc           # which compiler to use: eg cc, acc, gcc. NB Different
++# CC is set in the environment.
+ #                    compilers need different CFLAGS, e.g., -O instead of -O2.
+ MAKE = make        # which "make" to use
+-CFLAGS = -O2    # options, e.g. for optimisation or ANSI compilation.
++# CFLAGS is set in the environment.
+ #                 Some OS's need -D_FILE_OFFSET_BITS=64 to support files > 2MB.
+ #                 HP/UX cc needs CFLAGS = -Aa (HP/UX 9) or -Ae (HP/UX 10)
+ #                 BeOS needs CFLAGS = -O2 -Wl,-L/boot/home/config/lib
+ #                 BS2000/OSD needs CFLAGS = -XLLML -XLLMK
+ #                 NeXTSTEP needs CFLAGS = -O2 -pipe -no-precomp 
+-DEFS =          # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
++DEFS = -DHAVE_GD -DHAVE_PCRE -DHAVE_ZLIB -DHAVE_BZLIB
+ #                 ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ...
+ #                 ... -DEBCDIC -DUSE_PLAIN_SETJMP ...
+ #                 ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_BZLIB -DHAVE_PCRE ...
+@@ -30,7 +30,7 @@
+ #
+ OS = UNIX         # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS
+ #                   RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400, OS390
+-LIBS = -lm  # extra libraries needed; most platforms (but not OS X or BeOS)
++LIBS = -lgd -lz -lbz2 -lpcre -lm -lpng -ljpeg
+ #               need -lm LAST
+ #             if you defined HAVE_GD above you also need -lgd -lpng -ljpeg -lz
+ #             if you defined HAVE_ZLIB above you also need -lz
+@@ -54,7 +54,7 @@
+ 	input.o macinput.o macstuff.o output.o output2.o outcro.o outhtml.o \
+ 	outlatex.o outplain.o outxhtml.o outxml.o process.o settings.o sort.o \
+ 	tree.o utils.o win32.o
+-SUBDIRS = bzip2 libgd libpng pcre unzip zlib
++SUBDIRS = libgd libpng pcre unzip zlib
+ SUBDIROBJS = libgd/gd.o  libgd/gd_io.o libgd/gd_io_file.o libgd/gd_png.o \
+ 	libgd/gdfontf.o libgd/gdfonts.o libgd/gdtables.o \
+ 	libpng/png.o libpng/pngerror.o libpng/pngmem.o libpng/pngset.o \
+@@ -63,9 +63,7 @@
+ 	zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o \
+ 	zlib/gzio.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
+ 	zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
+-	zlib/uncompr.o zlib/zutil.o unzip/ioapi.o unzip/unzip.o \
+-	bzip2/bzlib.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o \
+-	bzip2/decompress.o bzip2/huffman.o bzip2/randtable.o
++	zlib/uncompr.o zlib/zutil.o unzip/ioapi.o unzip/unzip.o
+ HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h \
+ 	pcre/pcre.h libgd/gd.h libgd/gdfontf.h libgd/gdfonts.h unzip/unzip.h \
+ 	zlib/zlib.h bzip2/bzlib.h
+@@ -77,8 +75,6 @@
+ 
+ # There doesn't seem to be a good way to write all these rules in a generic
+ # form that works for all "make" programs
+-bzip2: ALWAYS
+-	cd bzip2 && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)'
+ 
+ libgd: ALWAYS
+ 	cd libgd && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)'
diff --git a/app-admin/analog/files/analog-6.0-undefined-macro.patch b/app-admin/analog/files/analog-6.0-undefined-macro.patch
new file mode 100644
index 000000000000..5a98541c465c
--- /dev/null
+++ b/app-admin/analog/files/analog-6.0-undefined-macro.patch
@@ -0,0 +1,38 @@
+--- a/src/unzip/ioapi.h	2004-12-19 14:51:32.000000000 +0100
++++ b/src/unzip/ioapi.h	2012-01-11 18:07:59.570768250 +0100
+@@ -35,6 +35,16 @@
+ extern "C" {
+ #endif
+ 
++/* Work-around for NetBSD. Its zconf.h doesn't define OF(x) */
++#ifndef OF
++#ifdef __STDC__
++#define OF(x) x
++#else
++#define OF(x) ()
++#endif
++#endif
++
++
+ typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
+ typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+ typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+--- a/src/unzip/unzip.h 2004-12-19 14:51:32.000000000 +0100
++++ b/src/unzip/unzip.h 2012-01-11 18:00:25.988120225 +0100
+@@ -47,6 +47,15 @@
+ extern "C" {
+ #endif
+ 
++/* Work-around for NetBSD. Its zconf.h doesn't define OF(x) */
++#ifndef OF
++#ifdef __STDC__
++#define OF(x) x
++#else
++#define OF(x) ()
++#endif
++#endif
++
+ #ifndef _ZLIB_H
+ #include "../zlib/zlib.h"
+ #endif
+
diff --git a/app-admin/analog/files/analog.cfg b/app-admin/analog/files/analog.cfg
new file mode 100644
index 000000000000..99e452b36e3d
--- /dev/null
+++ b/app-admin/analog/files/analog.cfg
@@ -0,0 +1,101 @@
+# Configuration file for analog 5.1
+# See http://www.analog.cx/
+#
+# This is a simple default configuration file which works when you run
+# analog with no command line parameters.  There are much more extensive
+# configuration examples included with the documentation.
+# See the big.cfg example file.
+#
+# If you need a LOGFORMAT command (most people don't -- try it without first!),
+# it must go here, above the LOGFILE commands.
+LOGFILE /var/log/apache/access_log
+OUTFILE /var/log/analog/index.html
+LANGUAGE ENGLISH
+IMAGEDIR images/
+# HOSTNAME "[my organisation]"
+REQLINKINCLUDE pages
+REFLINKINCLUDE *
+REDIRREFLINKINCLUDE *
+FAILREFLINKINCLUDE *
+UNCOMPRESS *.gz,*.Z "gzip -cd"
+BROWOUTPUTALIAS IWENG AOL
+SUBBROW */*
+SUBTYPE *.gz,*.Z
+# Add whichever of these types of pages you have on your server, or others.
+# PAGEINCLUDE *.shtml
+# PAGEINCLUDE *.asp
+# PAGEINCLUDE *.jsp
+# PAGEINCLUDE *.cfm
+# PAGEINCLUDE *.pl
+# PAGEINCLUDE *.php
+SEARCHENGINE http://*altavista.*/* q
+SEARCHENGINE http://*yahoo.*/* p
+SEARCHENGINE http://*google.*/* q
+SEARCHENGINE http://*lycos.*/* query
+SEARCHENGINE http://*aol.*/* query
+SEARCHENGINE http://*excite.*/* search
+SEARCHENGINE http://*go2net.*/* general
+SEARCHENGINE http://*metacrawler.*/* general
+SEARCHENGINE http://*msn.*/* MT
+SEARCHENGINE http://*hotbot.com/* MT
+SEARCHENGINE http://*netscape.*/* search
+SEARCHENGINE http://*looksmart.*/* key
+SEARCHENGINE http://*infoseek.*/* qt
+SEARCHENGINE http://*webcrawler.*/* search,searchText
+SEARCHENGINE http://*goto.*/* Keywords
+SEARCHENGINE http://*snap.*/* keyword
+SEARCHENGINE http://*dogpile.*/* q
+SEARCHENGINE http://*askjeeves.*/* ask
+SEARCHENGINE http://*ask.*/* ask
+SEARCHENGINE http://*aj.*/* ask
+SEARCHENGINE http://*directhit.*/* qry
+SEARCHENGINE http://*alltheweb.*/* query
+SEARCHENGINE http://*northernlight.*/* qr
+SEARCHENGINE http://*nlsearch.*/* qr
+SEARCHENGINE http://*dmoz.*/* search
+SEARCHENGINE http://*newhoo.*/* search
+SEARCHENGINE http://*netfind.*/* query,search,s
+SEARCHENGINE http://*/netfind* query
+SEARCHENGINE http://*/pursuit query
+ROBOTINCLUDE REGEXPI:robot
+ROBOTINCLUDE REGEXPI:spider
+ROBOTINCLUDE REGEXPI:crawler
+ROBOTINCLUDE Googlebot*
+ROBOTINCLUDE Infoseek*
+ROBOTINCLUDE Scooter*
+ROBOTINCLUDE Slurp*
+ROBOTINCLUDE Ultraseek*
+TYPEOUTPUTALIAS .html    ".html [Hypertext Markup Language]"
+TYPEOUTPUTALIAS .htm     ".htm  [Hypertext Markup Language]"
+TYPEOUTPUTALIAS .shtml   ".shtml [Server-parsed HTML]"
+TYPEOUTPUTALIAS .ps      ".ps   [PostScript]"
+TYPEOUTPUTALIAS .gz      ".gz   [Gzip compressed files]"
+TYPEOUTPUTALIAS .tar.gz  ".tar.gz [Compressed archives]"
+TYPEOUTPUTALIAS .jpg     ".jpg  [JPEG graphics]"
+TYPEOUTPUTALIAS .jpeg    ".jpeg  [JPEG graphics]"
+TYPEOUTPUTALIAS .gif     ".gif  [GIF graphics]"
+TYPEOUTPUTALIAS .png     ".png  [PNG graphics]"
+TYPEOUTPUTALIAS .txt     ".txt  [Plain text]"
+TYPEOUTPUTALIAS .cgi     ".cgi  [CGI scripts]"
+TYPEOUTPUTALIAS .pl      ".pl   [Perl scripts]"
+TYPEOUTPUTALIAS .css     ".css  [Cascading Style Sheets]"
+TYPEOUTPUTALIAS .class   ".class [Java class files]"
+TYPEOUTPUTALIAS .pdf     ".pdf  [Adobe Portable Document Format]"
+TYPEOUTPUTALIAS .zip     ".zip  [Zip archives]"
+TYPEOUTPUTALIAS .hqx     ".hqx  [Macintosh archives]"
+TYPEOUTPUTALIAS .exe     ".exe  [Executables]"
+TYPEOUTPUTALIAS .wav     ".wav  [WAV sound files]"
+TYPEOUTPUTALIAS .avi     ".avi  [AVI movies]"
+TYPEOUTPUTALIAS .arc     ".arc  [Compressed archives]"
+TYPEOUTPUTALIAS .mid     ".mid  [MIDI sound files]"
+TYPEOUTPUTALIAS .mp3     ".mp3  [MP3 sound files]"
+TYPEOUTPUTALIAS .doc     ".doc  [Microsoft Word document]"
+TYPEOUTPUTALIAS .rtf     ".rtf  [Rich Text Format]"
+TYPEOUTPUTALIAS .mov     ".mov  [Quick Time movie]"
+TYPEOUTPUTALIAS .mpg     ".mpg  [MPEG movie]"
+TYPEOUTPUTALIAS .mpeg    ".mpeg  [MPEG movie]"
+TYPEOUTPUTALIAS .asp     ".asp  [Active Server Pages]"
+TYPEOUTPUTALIAS .jsp     ".jsp  [Java Server Pages]"
+TYPEOUTPUTALIAS .cfm     ".cfm  [Cold Fusion]"
+TYPEOUTPUTALIAS .php     ".php  [PHP]"
+TYPEOUTPUTALIAS .js      ".js   [JavaScript code]"
diff --git a/app-admin/analog/metadata.xml b/app-admin/analog/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/analog/metadata.xml
@@ -0,0 +1,5 @@
+<?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/ansible-2.4.3.0 b/app-admin/ansible-2.4.3.0
deleted file mode 100644
index 69401dad244b..000000000000
--- a/app-admin/ansible-2.4.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=6
-HOMEPAGE=https://ansible.com/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.4.3.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0464c7ecfde30891cec31a9397874006
diff --git a/app-admin/ansible-2.4.4.0 b/app-admin/ansible-2.4.4.0
deleted file mode 100644
index 2502b46a6b74..000000000000
--- a/app-admin/ansible-2.4.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=6
-HOMEPAGE=https://ansible.com/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.4.4.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=808bdaa6c07173e7842b65dd78f381c1
diff --git a/app-admin/ansible-2.4.5.0 b/app-admin/ansible-2.4.5.0
deleted file mode 100644
index f19647212033..000000000000
--- a/app-admin/ansible-2.4.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=6
-HOMEPAGE=https://ansible.com/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.4.5.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=808bdaa6c07173e7842b65dd78f381c1
diff --git a/app-admin/ansible-2.4.6.0 b/app-admin/ansible-2.4.6.0
deleted file mode 100644
index 04726317f941..000000000000
--- a/app-admin/ansible-2.4.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=6
-HOMEPAGE=https://ansible.com/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.4.6.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=808bdaa6c07173e7842b65dd78f381c1
diff --git a/app-admin/ansible-2.5.5 b/app-admin/ansible-2.5.5
deleted file mode 100644
index 0d60f811252f..000000000000
--- a/app-admin/ansible-2.5.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=6
-HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.5.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5b54ac6f5034b4b840567dbe1bb6ff0
diff --git a/app-admin/ansible-2.5.6 b/app-admin/ansible-2.5.6
deleted file mode 100644
index 3835e10c34fa..000000000000
--- a/app-admin/ansible-2.5.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=6
-HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.5.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=73beead4d32ff66bdab1f630ff38d020
diff --git a/app-admin/ansible-2.6.0 b/app-admin/ansible-2.6.0
deleted file mode 100644
index 236e90180eb4..000000000000
--- a/app-admin/ansible-2.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=6
-HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.6.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=73beead4d32ff66bdab1f630ff38d020
diff --git a/app-admin/ansible-2.6.1 b/app-admin/ansible-2.6.1
deleted file mode 100644
index 6d614c78973b..000000000000
--- a/app-admin/ansible-2.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=6
-HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.6.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=73beead4d32ff66bdab1f630ff38d020
diff --git a/app-admin/ansible-9999 b/app-admin/ansible-9999
deleted file mode 100644
index da002ff32f4a..000000000000
--- a/app-admin/ansible-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=6
-HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7021a2144a1aaca0b55b3525ee446c1d
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
new file mode 100644
index 000000000000..e0ba8cc244cb
--- /dev/null
+++ b/app-admin/ansible/Manifest
@@ -0,0 +1,18 @@
+DIST ansible-2.4.3.0.tar.gz 6511115 BLAKE2B d43679c651f6aa5fd86c797a204645a8ee98efbcde9abaa25385aeb6f1d7c8b4ad74185434bfd159dbf673fe9339ef8f915f78238f8b8a5caf924b54cb9bdd52 SHA512 a7cda358c67c519c7e5ba248bf47070f21a27203fb29d70d9d75ecf027ba1275d71c0f96493e047281211d172a3be8273d7e08144446284695fb0bc8b94daa82
+DIST ansible-2.4.4.0.tar.gz 6512938 BLAKE2B 51e397d2242209271a8aef211c3bdeb34a15e2061a202415749ecb4232e0521aff304d5585d536b1805f14ff476b0733d559eeabe6e44de7b273b8606b11b805 SHA512 f0dcf92f2c69931fa06e6dd3845c11592d5a7e44f19a99c4d6c361022708560170f2b74ad20eded61fa5812c90eed281b78396aa92e0b33717970afb5966dd72
+DIST ansible-2.4.5.0.tar.gz 6515523 BLAKE2B b6d2eeae93ec8b61ca426682d702179d60674cdb95b2cc9fe413f32d429cdbcab804f34a6d0bcd51a6151dcc29297c6aef6025df52b859130b5ef4c552e85d68 SHA512 44d0e05730a9d7b5ee256c8c19a08c007d19d6523319e3c45b65206781d7384386bbde1a0f5b452b29c9b95a236140bf1c011b46f1c15592c47a15deccf8748e
+DIST ansible-2.4.6.0.tar.gz 6516642 BLAKE2B 27c94a9de0ba7e9aa3d519fd18eb7a27e77b6cf8de3b51a74131a96cbd85c625f43d55e7894483cf623b1e62bddfedf448b1051ad7b2bc7f81a338cfca410458 SHA512 3b4d4d8f3b1eb27861e7beac4557b608e3f9a77d4a24d33868c8d1be2b3fd9a57ef98e4685bbfd859d64a2f591487852fb5409ef00006036be4409eaf07d1b5b
+DIST ansible-2.5.5.tar.gz 10150862 BLAKE2B 51184d11418c0a534c0176fcc6fde6da3c962e00502b354317b311d20122b28bbafbb8dfdfb7700a0153116c70396a882b538524395af590af16eeac043d0655 SHA512 a3d50539d2a109dc0bbcdb440e0800b917f63141dce935e6426cb6bdc51e3a93e02f05c23714c24ab00b19842a86677b8d2f2455d20ca15410fa8d3c8ba379ca
+DIST ansible-2.5.6.tar.gz 10157989 BLAKE2B 07341ab7a087e3139442d5420b461ca332f3a9e550874a746f43904763660ef12c9a2041bb991eeb315abdc7f6e31e3615d9283f407003eddddf2b661331c59a SHA512 169badaa6a94d1ea2d16cb97c7e5eb0b8c225a455edfa95f3ad9e4ec968d5b9525dec4732b60e5ba5f92412f87d8aacc0b2299f2595f3bb820ad8604be8e76d6
+DIST ansible-2.6.0.tar.gz 10721104 BLAKE2B 894700762139339e43cde35d74bfcfda218a1325b45749d8ea94c1a19e210f98e2f0717ff39c54da97f9795380268da040158271f2e26986b5d2fe177e3dfe2e SHA512 0c7353eeb4a65b21439489ef8a101bb0455d24d88904011460548bfba218688b4a1fdc1d61d60d611c2bcce7f1c301c0d6bcb9f3e9db12eaf9c9ef2f96994af9
+DIST ansible-2.6.1.tar.gz 10724749 BLAKE2B af4523ab904660fa3369bdae2839ab4b2f386235be5a004e1f9a9a5f7c555a2e6fe82319abe20ecbf7e74152f8e2ad5060fda2c2af0f5d62fdd9416901c9072c SHA512 1235e12a510317665956bfae9e0d03814083a24ba6e5c98072437e50b4a596437a173b32d9d5af37b4b9e168e35045fdb65e65276fdc830f473ab1f42dcba2d2
+EBUILD ansible-2.4.3.0.ebuild 1406 BLAKE2B f2c87ce03b3c4914087b0401485a07f7b3287ebf62a4d0b7acaa7b9c06bd670c0f91bf2288edbbd45ab577403a1b85de2733c0a3fced85c99720ae8f7848ed46 SHA512 b4d4d40758c6f638f07480af76ff2cdcebe787276c27c23b3e046841ecfaacac83845c14bca352ed603c15a3fff4eb19ae53c990e7fa2662d5b5822890091a1a
+EBUILD ansible-2.4.4.0.ebuild 1408 BLAKE2B acca3919cf1cf8240b4d4cad16ad41b61cf7d6af7c4adefd81c404dc538d1bf75b97dc3e4a87ba38b1e4dd7e3cbf3b319144adad083b1e813492322cc179baae SHA512 cdf8791066fc9b72bf1c1dd3a3595c2901f71e69b24a163f2b6eb100a410d5bfc942a76cf92a5fc2d730eecd57028165eed3c4e3330ac06f1975c7022b6d904b
+EBUILD ansible-2.4.5.0.ebuild 1408 BLAKE2B acca3919cf1cf8240b4d4cad16ad41b61cf7d6af7c4adefd81c404dc538d1bf75b97dc3e4a87ba38b1e4dd7e3cbf3b319144adad083b1e813492322cc179baae SHA512 cdf8791066fc9b72bf1c1dd3a3595c2901f71e69b24a163f2b6eb100a410d5bfc942a76cf92a5fc2d730eecd57028165eed3c4e3330ac06f1975c7022b6d904b
+EBUILD ansible-2.4.6.0.ebuild 1408 BLAKE2B acca3919cf1cf8240b4d4cad16ad41b61cf7d6af7c4adefd81c404dc538d1bf75b97dc3e4a87ba38b1e4dd7e3cbf3b319144adad083b1e813492322cc179baae SHA512 cdf8791066fc9b72bf1c1dd3a3595c2901f71e69b24a163f2b6eb100a410d5bfc942a76cf92a5fc2d730eecd57028165eed3c4e3330ac06f1975c7022b6d904b
+EBUILD ansible-2.5.5.ebuild 1636 BLAKE2B 8c6498794147e6fc8c2cf50429a44f481f1244d532cb0205f6c0828bfceda1690264e78621fc74d75a03f3521600cc81f9f78afcba60a9e089b3472d9f4fa687 SHA512 5b90735e77ea2e0f47b6744f179ad555da406a6efa1a0137e590fe6e22cba1406aa925dd175a421fe7499ba2cdf9a8666673118700c046f9512d0572c6ec6fb6
+EBUILD ansible-2.5.6.ebuild 1638 BLAKE2B 867eaee65aba92146eab5a003bd77f2e8c07cd14bc757e52886b0934297f5a4af186f5f53012809606bc7e4972d6ec29e57f6e1cbc724eac3e74e2918b39def7 SHA512 60851978084f2d683d5bd4281c34817f643a03fff840de9a942aaa5652bde04e7ab2619334381e4eeccdc4b4e81a36f5ca4beadb9adf3dbbeba21df057280ae6
+EBUILD ansible-2.6.0.ebuild 1638 BLAKE2B 867eaee65aba92146eab5a003bd77f2e8c07cd14bc757e52886b0934297f5a4af186f5f53012809606bc7e4972d6ec29e57f6e1cbc724eac3e74e2918b39def7 SHA512 60851978084f2d683d5bd4281c34817f643a03fff840de9a942aaa5652bde04e7ab2619334381e4eeccdc4b4e81a36f5ca4beadb9adf3dbbeba21df057280ae6
+EBUILD ansible-2.6.1.ebuild 1638 BLAKE2B 867eaee65aba92146eab5a003bd77f2e8c07cd14bc757e52886b0934297f5a4af186f5f53012809606bc7e4972d6ec29e57f6e1cbc724eac3e74e2918b39def7 SHA512 60851978084f2d683d5bd4281c34817f643a03fff840de9a942aaa5652bde04e7ab2619334381e4eeccdc4b4e81a36f5ca4beadb9adf3dbbeba21df057280ae6
+EBUILD ansible-9999.ebuild 1664 BLAKE2B 8463e681f2153fab9d62b7f47bae487cb40927af74817f769ebc0c66cf75480de8ad985ea370041531c5c7c221ae3fabe0003d9bb3c4107139697597d1d2e937 SHA512 859021b4e84575812e732c38e6915e6524ca4f6a75b8800e85c77546f82af47760c779821526447264279cf93cede262838a4ccc7aa495d3b1340dc78402a0f8
+MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.4.3.0.ebuild b/app-admin/ansible/ansible-2.4.3.0.ebuild
new file mode 100644
index 000000000000..eeb696f6cfd4
--- /dev/null
+++ b/app-admin/ansible/ansible-2.4.3.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.4.4.0.ebuild b/app-admin/ansible/ansible-2.4.4.0.ebuild
new file mode 100644
index 000000000000..573d04b35802
--- /dev/null
+++ b/app-admin/ansible/ansible-2.4.4.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.4.5.0.ebuild b/app-admin/ansible/ansible-2.4.5.0.ebuild
new file mode 100644
index 000000000000..573d04b35802
--- /dev/null
+++ b/app-admin/ansible/ansible-2.4.5.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.4.6.0.ebuild b/app-admin/ansible/ansible-2.4.6.0.ebuild
new file mode 100644
index 000000000000..573d04b35802
--- /dev/null
+++ b/app-admin/ansible/ansible-2.4.6.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.5.5.ebuild b/app-admin/ansible/ansible-2.5.5.ebuild
new file mode 100644
index 000000000000..fb7e782721e5
--- /dev/null
+++ b/app-admin/ansible/ansible-2.5.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.5.6.ebuild b/app-admin/ansible/ansible-2.5.6.ebuild
new file mode 100644
index 000000000000..8f63e8546445
--- /dev/null
+++ b/app-admin/ansible/ansible-2.5.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.6.0.ebuild b/app-admin/ansible/ansible-2.6.0.ebuild
new file mode 100644
index 000000000000..8f63e8546445
--- /dev/null
+++ b/app-admin/ansible/ansible-2.6.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.6.1.ebuild b/app-admin/ansible/ansible-2.6.1.ebuild
new file mode 100644
index 000000000000..8f63e8546445
--- /dev/null
+++ b/app-admin/ansible/ansible-2.6.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
new file mode 100644
index 000000000000..0ca97a267cc6
--- /dev/null
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 git-r3 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+EGIT_BRANCH="devel"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_prepare_all() {
+	rm -fv MANIFEST.in || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/metadata.xml b/app-admin/ansible/metadata.xml
new file mode 100644
index 000000000000..7c4e1dffb27b
--- /dev/null
+++ b/app-admin/ansible/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>calchan@gentoo.org</email>
+    <name>Denis Dupeyron</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+    <name>Patrice Clement</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">ansible</remote-id>
+    <remote-id type="github">ansible/ansible</remote-id>
+    <bugs-to>https://github.com/ansible/ansible/issues</bugs-to>
+  </upstream>
+  <longdescription lang="en">
+Radically simple deployment, model-driven configuration management, and 
+command execution framework.
+</longdescription>
+</pkgmetadata>
diff --git a/app-admin/apache-tools-2.2.34 b/app-admin/apache-tools-2.2.34
deleted file mode 100644
index 7a09753430f7..000000000000
--- a/app-admin/apache-tools-2.2.34
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND==dev-libs/apr-1* =dev-libs/apr-util-1* dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= ) !<www-servers/apache-2.2.4 sys-devel/libtool
-DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
-EAPI=6
-HOMEPAGE=https://httpd.apache.org/
-IUSE=ssl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=Apache-2.0
-RDEPEND==dev-libs/apr-1* =dev-libs/apr-util-1* dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= ) !<www-servers/apache-2.2.4
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/httpd/httpd-2.2.34.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=445f45885f9549815885a4ad5bca0697
diff --git a/app-admin/apache-tools-2.4.27 b/app-admin/apache-tools-2.4.27
deleted file mode 100644
index bf02c8bd9081..000000000000
--- a/app-admin/apache-tools-2.4.27
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/apr-1.5.0:1 dev-libs/apr-util:1 dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-devel/libtool
-DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
-EAPI=6
-HOMEPAGE=https://httpd.apache.org/
-IUSE=libressl ssl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/apr-1.5.0:1 dev-libs/apr-util:1 dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/httpd/httpd-2.4.27.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=78acee5806d8fb5e655b7110d0bd8802
diff --git a/app-admin/apache-tools-2.4.29 b/app-admin/apache-tools-2.4.29
deleted file mode 100644
index 5cecbe9dc9a2..000000000000
--- a/app-admin/apache-tools-2.4.29
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/apr-1.5.0:1 dev-libs/apr-util:1 dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-devel/libtool
-DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
-EAPI=6
-HOMEPAGE=https://httpd.apache.org/
-IUSE=libressl ssl
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/apr-1.5.0:1 dev-libs/apr-util:1 dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/httpd/httpd-2.4.29.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d3f017a10d858f5d0d5addc152cb6888
diff --git a/app-admin/apache-tools-2.4.33 b/app-admin/apache-tools-2.4.33
deleted file mode 100644
index f8f7dcf47661..000000000000
--- a/app-admin/apache-tools-2.4.33
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-devel/libtool
-DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
-EAPI=6
-HOMEPAGE=https://httpd.apache.org/
-IUSE=libressl ssl
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/httpd/httpd-2.4.33.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=19d5e98a8b0bd25f9b96614feaf45534
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
new file mode 100644
index 000000000000..241cadfa3301
--- /dev/null
+++ b/app-admin/apache-tools/Manifest
@@ -0,0 +1,11 @@
+AUX apache-tools-2.2.20-Makefile.patch 1573 BLAKE2B 56de28f38934b73740d68f6429f3361bfd37f079f1f6de4e169741e7c97bceed86330744c1b69045f8ffee0baf927e35e0eca10036d2da461f14e45cd218e5cd SHA512 85120f1b57cd14baf3482dc21d4175447e135700a1f8e6455970c14e576cb0c510815681a9906de4c7eb68743de7e41bbb2d86e83dcb62cd57eb0c9f638f6892
+AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
+DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
+DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c
+DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0ed8f975e76cb994247601f7c2f89a3f862e011638afb77988eda0ef2b543634fb6bc45b583e9bdba2c30e565731 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a
+DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269
+EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
+EBUILD apache-tools-2.4.27.ebuild 2653 BLAKE2B 00b1b5e96e7eab66981fc339faf6db5e40d05af2d819c92a5faff3ad2f60c566d0235cbf60ded1d5daa79cec7815534b96b53b8e8f00333d1a814058752dd011 SHA512 e23b494555f6685f482fcecc59b5e81147780bf399de740b91bc19de9197a3d6f9d32a701472ba6551a3039214adc2e0bfd4436e0b82edb388f26d4dc88bd110
+EBUILD apache-tools-2.4.29.ebuild 2655 BLAKE2B 4132c82619471dd8d7ea7da20e780bfe848a571934944c9b209f4e17b6c133d7930ddac23af68ddc60ec93f39abff6075141c214b724e84dd0052ec99303e1f7 SHA512 5a8a2605aa5b46d35dfc14e3c6f39cf6164d310f594bf31d7980d1e9d0a313d22478a7df119759059aa76d0e396801f57ebbbf977247efba4f833e853a1ecae5
+EBUILD apache-tools-2.4.33.ebuild 2577 BLAKE2B cb22dea646e2136f767d99f36d0f6fcd341f09ba8a38a278b33980e251b99dc8186d78287c47a698d3d5462089afdb1517191ab2bde3f8d93e1578a8bf7a798d SHA512 2e468db54aeb16e14b6bd65e13cf63ffb43b7428feaa83a6f13f66d6d2da710f40e30613a1a19102ea45ca7d270252196ae6cf98b20bee49ee78e5e55e0b3484
+MISC metadata.xml 466 BLAKE2B 06dbc2df528810dc0aa7335271c987c6310ceb7d8b0db3dc74c6727c27d280e499ddd9ee75580dba63e0f33e24ce63ecfa40059a46ebdec80005769608cae82c SHA512 2820a1f104fbdc752196f600def1e0c56eed6025fa3e66b297077be7a6eb735a2009f1a57cc320e2cf0c2d6cebf9db8c338cf2c6cc9c746766ab99a0b49c63fe
diff --git a/app-admin/apache-tools/apache-tools-2.2.34.ebuild b/app-admin/apache-tools/apache-tools-2.2.34.ebuild
new file mode 100644
index 000000000000..e7272e344834
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.34.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic eutils
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND="=dev-libs/apr-1*
+	=dev-libs/apr-util-1*
+	dev-libs/expat
+	dev-libs/libpcre
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? ( dev-libs/openssl:0= )
+	!<www-servers/apache-2.2.4"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.20-Makefile.patch"
+)
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
+	append-ldflags $(no-as-needed)
+
+	# econf overwrites the stuff from config.layout.
+	econf \
+		--sbindir=/usr/sbin \
+		--with-z=/usr \
+		--with-apr=/usr \
+		--with-apr-util=/usr \
+		--with-pcre=/usr \
+		$(use_enable ssl) \
+		$(usex ssl '--with-ssl=/usr' '')
+}
+
+src_compile() {
+	cd support || die
+	emake
+}
+
+src_install () {
+	cd support || die
+
+	make DESTDIR="${D}" install || die
+
+	# install manpages
+	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
+		"${S}"/docs/man/{htcacheclean,rotatelogs,ab,logresolve}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${D}"/usr/sbin/ >/dev/null || die
+	for i in *; do
+		dosym /usr/sbin/${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl; then
+		dosym /usr/sbin/ab /usr/sbin/ab-ssl
+		dosym /usr/sbin/ab /usr/sbin/ab2-ssl
+	fi
+
+	# make htpasswd accessible for non-root users
+	dosym /usr/sbin/htpasswd /usr/bin/htpasswd
+	dosym /usr/sbin/htdigest /usr/bin/htdigest
+
+	dodoc "${S}"/CHANGES
+}
diff --git a/app-admin/apache-tools/apache-tools-2.4.27.ebuild b/app-admin/apache-tools/apache-tools-2.4.27.ebuild
new file mode 100644
index 000000000000..706e3a0d036d
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.27.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE="libressl ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1
+	dev-libs/apr-util:1
+	dev-libs/expat
+	dev-libs/libpcre
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+	default
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF >"${T}"/pcre-config
+	#!/bin/bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre-config
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+
+	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
+	#append-ldflags $(no-as-needed)
+
+	# econf overwrites the stuff from config.layout.
+	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
+	econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
+		--sbindir="${EPREFIX}"/usr/sbin \
+		--with-perl="${EPREFIX}"/usr/bin/perl \
+		--with-expat="${EPREFIX}"/usr \
+		--with-z="${EPREFIX}"/usr \
+		--with-apr="${SYSROOT}${EPREFIX}"/usr \
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr \
+		--with-pcre="${T}"/pcre-config \
+		$(use_enable ssl) \
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+	emake -C support
+}
+
+src_install() {
+	emake -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${ED}"/usr/sbin >/dev/null || die
+	local i
+	for i in *; do
+		dosym ${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl; then
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
+	fi
+}
diff --git a/app-admin/apache-tools/apache-tools-2.4.29.ebuild b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
new file mode 100644
index 000000000000..a863d1e02223
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE="libressl ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1
+	dev-libs/apr-util:1
+	dev-libs/expat
+	dev-libs/libpcre
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+	default
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF >"${T}"/pcre-config
+	#!/bin/bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre-config
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+
+	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
+	#append-ldflags $(no-as-needed)
+
+	# econf overwrites the stuff from config.layout.
+	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
+	econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
+		--sbindir="${EPREFIX}"/usr/sbin \
+		--with-perl="${EPREFIX}"/usr/bin/perl \
+		--with-expat="${EPREFIX}"/usr \
+		--with-z="${EPREFIX}"/usr \
+		--with-apr="${SYSROOT}${EPREFIX}"/usr \
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr \
+		--with-pcre="${T}"/pcre-config \
+		$(use_enable ssl) \
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+	emake -C support
+}
+
+src_install() {
+	emake -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${ED}"/usr/sbin >/dev/null || die
+	local i
+	for i in *; do
+		dosym ${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl; then
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
+	fi
+}
diff --git a/app-admin/apache-tools/apache-tools-2.4.33.ebuild b/app-admin/apache-tools/apache-tools-2.4.33.ebuild
new file mode 100644
index 000000000000..85c34c5fe8c2
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.33.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE="libressl ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+	dev-libs/apr-util:1=
+	dev-libs/expat
+	dev-libs/libpcre
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+	default
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF >"${T}"/pcre-config
+	#!/bin/bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre-config
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+
+	local myeconfargs=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+		--sbindir="${EPREFIX}"/usr/sbin
+		--with-perl="${EPREFIX}"/usr/bin/perl
+		--with-expat="${EPREFIX}"/usr
+		--with-z="${EPREFIX}"/usr
+		--with-apr="${SYSROOT}${EPREFIX}"/usr
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
+		--with-pcre="${T}"/pcre-config
+		$(use_enable ssl)
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	)
+	# econf overwrites the stuff from config.layout.
+	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
+	econf "${myeconfargs[@]}"
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+	emake -C support
+}
+
+src_install() {
+	emake -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${ED%/}"/usr/sbin >/dev/null || die
+	local i
+	for i in *; do
+		dosym ${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl ; then
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
+	fi
+}
diff --git a/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch
new file mode 100644
index 000000000000..7bc39527790c
--- /dev/null
+++ b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch
@@ -0,0 +1,41 @@
+=== modified file 'support/Makefile.in'
+--- a/support/Makefile.in
++++ b/support/Makefile.in
+@@ -1,9 +1,10 @@
+ DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
+-	logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
++	logresolve.pl phf_abuse_log.cgi split-logfile
+ 
+ CLEAN_TARGETS = suexec
+ 
+-PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT)
++PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm \
++	$(NONPORTABLE_SUPPORT) log_server_status split-logfile dbmmanage
+ TARGETS  = $(PROGRAMS)
+ 
+ PROGRAM_LDADD        = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
+@@ -12,22 +13,13 @@
+ include $(top_builddir)/build/rules.mk
+ 
+ install:
+-	@test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+ 	@test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
+-	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
+-	@cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
+-	@for i in apxs apachectl dbmmanage; do \
++	@for i in $(PROGRAMS) ; do \
+ 	    if test -f "$(builddir)/$$i"; then \
+ 	        cp -p $$i $(DESTDIR)$(sbindir); \
+ 	        chmod 755 $(DESTDIR)$(sbindir)/$$i; \
+ 	    fi ; \
+ 	done
+-	@if test -f "$(builddir)/envvars-std"; then \
+-	    cp -p envvars-std $(DESTDIR)$(sbindir); \
+-	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+-	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+-	    fi ; \
+-	fi
+ 
+ htpasswd_OBJECTS = htpasswd.lo
+ htpasswd: $(htpasswd_OBJECTS)
+
diff --git a/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch b/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch
new file mode 100644
index 000000000000..b7d3c274ea48
--- /dev/null
+++ b/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/459446
+
+https://raw.github.com/archlinuxcn/repo/master/apache-tools/apache-tools-Makefile.patch
+
+--- a/support/Makefile.in
++++ b/support/Makefile.in
+@@ -1,9 +1,9 @@
+ DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
+-	logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
++	logresolve.pl phf_abuse_log.cgi split-logfile
+ 
+ CLEAN_TARGETS = suexec
+ 
+-bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm
++bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm dbmmanage
+ sbin_PROGRAMS = htcacheclean rotatelogs $(NONPORTABLE_SUPPORT)
+ TARGETS  = $(bin_PROGRAMS) $(sbin_PROGRAMS)
+ 
+@@ -15,26 +15,18 @@
+ install:
+ 	@test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+ 	@test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
+-	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
+-	@cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
+-	@for i in apxs dbmmanage; do \
++	@for i in $(bin_PROGRAMS); do \
+ 	    if test -f "$(builddir)/$$i"; then \
+ 	        cp -p $$i $(DESTDIR)$(bindir); \
+ 	        chmod 755 $(DESTDIR)$(bindir)/$$i; \
+ 	    fi ; \
+ 	done
+-	@for i in apachectl; do \
++	@for i in $(sbin_PROGRAMS); do \
+ 	    if test -f "$(builddir)/$$i"; then \
+ 	        cp -p $$i $(DESTDIR)$(sbindir); \
+ 	        chmod 755 $(DESTDIR)$(sbindir)/$$i; \
+ 	    fi ; \
+ 	done
+-	@if test -f "$(builddir)/envvars-std"; then \
+-	    cp -p envvars-std $(DESTDIR)$(sbindir); \
+-	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+-	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+-	    fi ; \
+-	fi
+ 
+ htpasswd.lo: passwd_common.h
+ passwd_common.lo: passwd_common.h
diff --git a/app-admin/apache-tools/metadata.xml b/app-admin/apache-tools/metadata.xml
new file mode 100644
index 000000000000..b9cdf53e2d0c
--- /dev/null
+++ b/app-admin/apache-tools/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<longdescription lang="en">
+		app-admin/apache-tools contains tools that might be useful without
+		having apache itself installed (like htdigest/htpasswd, but also ab -
+		the apache benchmark).
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/apachetop-0.12.6-r2 b/app-admin/apachetop-0.12.6-r2
deleted file mode 100644
index d249219420f6..000000000000
--- a/app-admin/apachetop-0.12.6-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= fam? ( virtual/fam ) pcre? ( dev-libs/libpcre ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A realtime Apache log analyzer
-EAPI=6
-HOMEPAGE=https://github.com/tessus/apachetop
-IUSE=fam pcre
-KEYWORDS=amd64 hppa ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= fam? ( virtual/fam ) pcre? ( dev-libs/libpcre )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jstein/dist/apachetop-0.12.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c24ace20f00c60c602a32409413cd8d5
diff --git a/app-admin/apachetop-0.17.4 b/app-admin/apachetop-0.17.4
deleted file mode 100644
index 1d26b9256444..000000000000
--- a/app-admin/apachetop-0.17.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= fam? ( virtual/fam ) pcre? ( dev-libs/libpcre ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A realtime Apache log analyzer
-EAPI=6
-HOMEPAGE=https://github.com/tessus/apachetop
-IUSE=fam pcre
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= fam? ( virtual/fam ) pcre? ( dev-libs/libpcre )
-SLOT=0
-SRC_URI=https://github.com/tessus/apachetop/releases/download/0.17.4/apachetop-0.17.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c16a5ad5c26461b69664f875948753ab
diff --git a/app-admin/apachetop-0.18.4 b/app-admin/apachetop-0.18.4
deleted file mode 100644
index 99e42daa4a3a..000000000000
--- a/app-admin/apachetop-0.18.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= fam? ( virtual/fam ) pcre? ( dev-libs/libpcre ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A realtime Apache log analyzer
-EAPI=6
-HOMEPAGE=https://github.com/tessus/apachetop
-IUSE=fam pcre
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= fam? ( virtual/fam ) pcre? ( dev-libs/libpcre )
-SLOT=0
-SRC_URI=https://github.com/tessus/apachetop/releases/download/0.18.4/apachetop-0.18.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c16a5ad5c26461b69664f875948753ab
diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
new file mode 100644
index 000000000000..e3cb3b59482c
--- /dev/null
+++ b/app-admin/apachetop/Manifest
@@ -0,0 +1,12 @@
+AUX apachetop-0.12.6-ac_config_header.patch 458 BLAKE2B 714adf5ee34629abae9cfe38d630e4e1c0829a99c823bc00a5276fe424264378316e18274976c71b974e970a25329413ab720f6621dcf3a6dcf61f02bc7d46d7 SHA512 dc10e46cac980a3544579222c5859d8baf4a1b5fd86a4700b07661e202270ff59b746b14661ca548d83322965e789bf70c7eddf8bf07b51d97d9e13256040109
+AUX apachetop-0.12.6-configure.patch 2884 BLAKE2B 34310a487b0dc68e184c9facce01d8ca95364c6c8ed041fa5ccf9dbbdce3ca4ac944fff91aafb4866e7086e8fd9ebeb961026f84bd3c77ccaabdbc5e1be97997 SHA512 7c399fd434476291504cd7674fe63559c59a7b32628477ad4fbd1386e936be4d1f49d4faa2d8d95839c74908e755d50400ab8f4f30163967b94dc058456c9c15
+AUX apachetop-0.12.6-gcc41.patch 247 BLAKE2B f193def780fc35322d49af0e13898a5dd95ecb49f8c0f4039260eb6b2aaf6e5a45131682d68d38f474d384b9d6d35c27a5233b57949da8b6ff54d29b9634c86e SHA512 710b8e3b381dcf9aac58544f9afe0f2a3cc598b38e87145caad29404fc19983bc683b160f0f80dd003ffa57d246fbc5b0fa5754aa1012e985b4c2ffc7e01f50f
+AUX apachetop-0.12.6-maxpathlen.patch 1577 BLAKE2B 97c046e1bf9f7cd67aaf95f9ed755bc3f12774756da35b31cd7b38db22b2860400bcbc9626a37ea795dc454c46b90dd2a53f41c42124e9d777a7da7a75da3a4c SHA512 c0e4562b9789168acbea68b4f19eb32238244d8003bd4d0df458582b095d9680f2e20b592990f0bebe5ae17fcbcbfd2154e74169788a8d3a31498f26776f6f36
+AUX apachetop-0.12.6-ncurses.patch 5392 BLAKE2B bfbe54d1a3b32157cda1a22aba83829948233df7d18d6f54c9ec6f9b4e987c9c201d1bc5af43c3ce0edd8af5d83f14b229725f68b44e8e9ab202da961d628542 SHA512 2c4759a1a8c4a54fb10d75779c23bfadfdb789be1a790add29adc2cb9ba1829f57239da568057ddbfaf0cea5468a74a3fdf20b1fd35b0bf51e8c8ab9e6027b6d
+DIST apachetop-0.12.6.tar.gz 126930 BLAKE2B 06d12cc72791920c959fa4ef8e18aa90f1f29a616389329685abf445f416cde9ce6edd2db5aaadaba51488033148e8109245200086a11422436ffe0aab1b4a40 SHA512 35081772f817c6a83a1fcf78790d2a288a9e4e48234c4b3163a09ad15f49a78d649b77f41aa002940fb9416c263cea159c5092a9b87285488eb450964c823c3a
+DIST apachetop-0.17.4.tar.gz 128153 BLAKE2B 7601ce98618d041f6fc67e528775ce79b63a726b765ff298d1d74a1dd22a4451be6c36669c7ab9bf82fb8c120a6930d2bbf03823de02a216c558c358c53c07be SHA512 b5115048f79c694344fd341631fe7739567ba3ce6e18514d0be250cb6f42e04c54d35cc023dea5258725fcbfbb6debdaa51b91d64ae3120e70f5b78a7989a330
+DIST apachetop-0.18.4.tar.gz 128849 BLAKE2B 912f060984da326b2e005cc0e3eb99c28182bc6a0930e6781d5a0a990dbbe56b5dbfe871baea1c86a5ac2bc02faa1e583ca104d3c8bd00cc3617599601b2d8bd SHA512 e32f94ab6223578aa5b8c11083de762e8f916ba6d057d93f99208333632a8362b421c41fff76bf60a52f0b377a70d69c17ed02abfb95f86474ad3719016e59f7
+EBUILD apachetop-0.12.6-r2.ebuild 896 BLAKE2B d8fa75f505641c95219c94f0fb09bbb8382a4797c08be644ac17958c4c804c2594c3c5809c9b82fc413010230f5a83a70a74f4616fce507a1726bcbed204e231 SHA512 b5368a948c0b4f4e6c2d754335de9dd20cb263985192631703d437f7f1c833758b11e4a17cd18fa6f5d09a2edba8de91966d9d72c453e17c6145012686ad68ca
+EBUILD apachetop-0.17.4.ebuild 726 BLAKE2B 2979fc7c056474d3e6e968eb7f8a9729a9dcd83137020f50f45c14d1dae27a567dc03e189878e7a2edaa5fb9c68a4ddb4b9211c4d2f5089a98f4850bc67185da SHA512 3e7bcd2561a0dcbdf8d494e3e41c4735e1d08b6893d2c1889dc7590edb83ba729d42b73327284eb50f7c313f0c4b7d07a7c2e63cc5cc01544fa593eebdd8a072
+EBUILD apachetop-0.18.4.ebuild 726 BLAKE2B 2979fc7c056474d3e6e968eb7f8a9729a9dcd83137020f50f45c14d1dae27a567dc03e189878e7a2edaa5fb9c68a4ddb4b9211c4d2f5089a98f4850bc67185da SHA512 3e7bcd2561a0dcbdf8d494e3e41c4735e1d08b6893d2c1889dc7590edb83ba729d42b73327284eb50f7c313f0c4b7d07a7c2e63cc5cc01544fa593eebdd8a072
+MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
new file mode 100644
index 000000000000..00e66ae0691c
--- /dev/null
+++ b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A realtime Apache log analyzer"
+HOMEPAGE="https://github.com/tessus/apachetop"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ~mips ppc sparc x86"
+IUSE="fam pcre"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	fam? ( virtual/fam )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-maxpathlen.patch
+	"${FILESDIR}"/${P}-ac_config_header.patch
+	"${FILESDIR}"/${P}-ncurses.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
+		--without-adns \
+		$(use_with fam) \
+		$(use_with pcre)
+}
diff --git a/app-admin/apachetop/apachetop-0.17.4.ebuild b/app-admin/apachetop/apachetop-0.17.4.ebuild
new file mode 100644
index 000000000000..2f5954eb82bf
--- /dev/null
+++ b/app-admin/apachetop/apachetop-0.17.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A realtime Apache log analyzer"
+HOMEPAGE="https://github.com/tessus/apachetop"
+SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="fam pcre"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	fam? ( virtual/fam )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
+		--without-adns \
+		$(use_with fam) \
+		$(use_with pcre)
+}
diff --git a/app-admin/apachetop/apachetop-0.18.4.ebuild b/app-admin/apachetop/apachetop-0.18.4.ebuild
new file mode 100644
index 000000000000..2f5954eb82bf
--- /dev/null
+++ b/app-admin/apachetop/apachetop-0.18.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A realtime Apache log analyzer"
+HOMEPAGE="https://github.com/tessus/apachetop"
+SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="fam pcre"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	fam? ( virtual/fam )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
+		--without-adns \
+		$(use_with fam) \
+		$(use_with pcre)
+}
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch b/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch
new file mode 100644
index 000000000000..aabdb13d75f3
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch
@@ -0,0 +1,12 @@
+diff -uNr apachetop-0.12.6.orig/configure.ac apachetop-0.12.6/configure.ac
+--- apachetop-0.12.6.orig/configure.ac	2013-07-09 14:06:14.000000000 -0400
++++ apachetop-0.12.6/configure.ac	2013-07-09 14:07:36.000000000 -0400
+@@ -6,7 +6,7 @@
+ AC_CONFIG_AUX_DIR(config)
+ #AC_CONFIG_MACRO_DIR(m4) # 2.58
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
+ AM_INIT_AUTOMAKE(apachetop, 0.12.6) # 2.53 only?
+ 
+ # Add non-standard directories to the include path
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-configure.patch b/app-admin/apachetop/files/apachetop-0.12.6-configure.patch
new file mode 100644
index 000000000000..38a1fc7f6a1a
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-configure.patch
@@ -0,0 +1,101 @@
+Index: apachetop-0.12.6/configure.ac
+===================================================================
+--- apachetop-0.12.6.orig/configure.ac
++++ apachetop-0.12.6/configure.ac
+@@ -52,48 +52,60 @@ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS([inet_aton memset strchr strdup kqueue strerror strstr])
+ 
+ # pcre {{{
+-AC_ARG_WITH(pcre,
+-	[  --with-pcre=<path>      prefix of pcre installation (eg /usr/local)],
+-	[
+-		CPPFLAGS="$CPPFLAGS -I $withval/include"
+-		LDFLAGS="$LDFLAGS -L $withval/lib"
+-	]
+-)
+-
+-AC_CHECK_HEADERS(pcre.h,
+-	AC_SEARCH_LIBS([pcre_compile], [pcre]) ,
+-	AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre])
+-)
++AC_ARG_WITH([pcre],
++			[  --with-pcre=<path>      prefix of pcre installation (eg /usr/local)],
++			[case "${withval}" in
++			  yes) with_pcre="/usr";;
++			  no)  with_pcre="no";;
++			  *)   with_pcre="/usr";;
++			 esac],
++			 [with_pcre="/usr"])
++
++if test x$with_pcre != xno; then
++	CPPFLAGS="$CPPFLAGS -I $withval/include"
++	LDFLAGS="$LDFLAGS -L $withval/lib"
++	AC_CHECK_HEADERS(pcre.h,
++					 AC_SEARCH_LIBS([pcre_compile], [pcre]),
++					 AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre]))
++fi
+ # }}}
+ 
+ # fam {{{
+-AC_ARG_WITH(fam,
+-	[  --with-fam=<path>      prefix of fam installation (eg /usr/local)],
+-	[
+-		CPPFLAGS="$CPPFLAGS -I $withval/include"
+-		LDFLAGS="$LDFLAGS -L $withval/lib"
+-	]
+-)
+-
+-AC_CHECK_HEADERS(fam.h,
+-	AC_SEARCH_LIBS([FAMOpen], [fam]) ,
+-	AC_MSG_WARN([*** fam.h not found -- consider using --with-fam])
+-)
++AC_ARG_WITH([fam],
++			[  --with-fam=<path>      prefix of fam installation (eg /usr/local)],
++			[case "${withval}" in
++			  yes) with_fam="/usr";;
++			  no)  with_fam="no";;
++			  *)   with_fam="/usr";;
++			 esac],
++			 [with_fam="/usr"])
++
++if test x$with_fam != xno; then
++	CPPFLAGS="$CPPFLAGS -I $with_fam/include"
++	LDFLAGS="$LDFLAGS -L $with_fam/lib"
++	AC_CHECK_HEADERS(fam.h,
++					 AC_SEARCH_LIBS([FAMOpen], [fam]),
++					 AC_MSG_WARN([*** fam.h not found -- consider using --with-fam]))
++fi
+ # }}}
+ 
+ # adns {{{
+-AC_ARG_WITH(adns,
+-	[  --with-adns=<path>     prefix of adns installation (eg /usr/local)],
+-	[
+-		CPPFLAGS="$CPPFLAGS -I $withval/include"
+-		LDFLAGS="$LDFLAGS -L $withval/lib"
+-	]
+-)
+-
+-AC_CHECK_HEADERS(adns.h,
+-	AC_SEARCH_LIBS([adns_submit], [adns]) ,
+-	AC_MSG_WARN([*** adns.h not found -- consider using --with-adns])
+-)
++AC_ARG_WITH([adns],
++			[  --with-adns=<path>     prefix of adns installation (eg /usr/local)],
++			[case "${withval}" in
++			  yes) with_adns="/usr";;
++			  no)  with_adns="no";;
++			  *)   with_adns="/usr";;
++			 esac],
++			 [with_adns="/usr"])
++
++if test x$with_adns != xno; then
++	CPPFLAGS="$CPPFLAGS -I $with_adns/include"
++	LDFLAGS="$LDFLAGS -L $with_adns/lib"
++	AC_CHECK_HEADERS(adns.h,
++					 AC_SEARCH_LIBS([adns_submit], [adns]),
++					 AC_MSG_WARN([*** adns.h not found -- consider using --with-adns]))
++fi
+ # }}}
+ 
+ # --with-logfile {{{
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch b/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
new file mode 100644
index 000000000000..6bfb49d9f9d8
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
@@ -0,0 +1,13 @@
+--- a/src/resolver.h
++++ b/src/resolver.h
+@@ -10,8 +10,8 @@
+ class Resolver
+ {
+ 	public:
+-	Resolver::Resolver(void);
+-	Resolver::~Resolver(void);
++	Resolver(void);
++	~Resolver(void);
+ 	int add_request(char *request, enum resolver_action act);
+ 
+ 
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch b/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch
new file mode 100644
index 000000000000..b648b07cbfc5
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch
@@ -0,0 +1,39 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for apachetop <= 0.12.6, which
+adds some includes in order to have a real change to get MAXPATHLEN defined with
+a valid value. Once MAXPATHLEN really gets filled with 128, it will just cause a
+buffer overflow.
+
+See Red Hat Bugzilla #446199 (https://bugzilla.redhat.com/show_bug.cgi?id=446199)
+for more information. This patch should solve the mentioned bug report and should
+be sane enough to get included by upstream of apachetop for the next release. It
+is important to run autoheader before ./configure to get these changes activated.
+
+--- apachetop-0.12.6/configure.ac		2005-10-27 18:39:25.000000000 +0200
++++ apachetop-0.12.6/configure.ac.maxpathlen	2008-06-21 16:00:38.000000000 +0200
+@@ -34,7 +34,8 @@
+ # Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h \
+-		string.h strings.h sys/socket.h time.h sys/time.h])
++		string.h strings.h sys/socket.h time.h sys/time.h \
++		limits.h sys/param.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ #AC_HEADER_STDBOOL # not in 2.53?
+--- apachetop-0.12.6/src/apachetop.h		2005-10-15 18:10:01.000000000 +0200
++++ apachetop-0.12.6/src/apachetop.h.maxpatlen	2008-06-21 16:02:00.000000000 +0200
+@@ -89,8 +89,12 @@
+ #define getMIN(a,b) (a < b ? a : b)
+ #define getMAX(a,b) (a > b ? a : b)
+ 
+-#ifndef MAXPATHLEN
+-# define MAXPATHLEN 128
++#ifdef HAVE_SYS_PARAM_H
++# include <sys/param.h>
++#endif
++ 
++#if HAVE_LIMITS_H
++# include <limits.h>
+ #endif
+ 
+ /* upon startup, each input file is put into an element of this array,
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch b/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch
new file mode 100644
index 000000000000..f12c989c3407
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch
@@ -0,0 +1,166 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,7 +4,7 @@
+ AC_CONFIG_SRCDIR(src/apachetop.cc)
+ 
+ AC_CONFIG_AUX_DIR(config)
+-#AC_CONFIG_MACRO_DIR(m4) # 2.58
++AC_CONFIG_MACRO_DIR(m4)
+ 
+ AC_CONFIG_HEADER(config.h)
+ AM_INIT_AUTOMAKE(apachetop, 0.12.6) # 2.53 only?
+@@ -29,7 +29,6 @@
+ #AC_PROG_CC
+ #AC_PROG_CPP
+ AC_PROG_CXX
+-AC_LANG_CPLUSPLUS
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+@@ -120,24 +119,9 @@
+ 
+ AC_SEARCH_LIBS([socket], [socket])
+ AC_SEARCH_LIBS([inet_addr], [nsl])
+-AC_SEARCH_LIBS([attron], [ncurses])
+-AC_SEARCH_LIBS([tgetstr], [termcap])
+-AC_SEARCH_LIBS([mvprintw], [curses ncurses] ,
+-	[] ,
+-	[
+-		AC_MSG_ERROR([No useful curses library found!])
+-	]
+-)
+ 
+-AC_SEARCH_LIBS([readline], [readline],
+-	[
+-		AC_DEFINE(HAVE_READLINE,1,[Define if you have readline library])
+-		AC_SUBST(HAVE_READLINE)
+-	] ,
+-	[
+-		AC_MSG_ERROR(readline library not found)
+-	]
+-)
++PKG_CHECK_MODULES([NCURSES], [ncurses])
++AX_LIB_READLINE
+ 
+ 
+ # everything is in CPPFLAGS up to this point, now we move to CXXFLAGS
+--- a/m4/ax_lib_readline.m4
++++ b/m4/ax_lib_readline.m4
+@@ -0,0 +1,107 @@
++# ===========================================================================
++#     https://www.gnu.org/software/autoconf-archive/ax_lib_readline.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_LIB_READLINE
++#
++# DESCRIPTION
++#
++#   Searches for a readline compatible library. If found, defines
++#   `HAVE_LIBREADLINE'. If the found library has the `add_history' function,
++#   sets also `HAVE_READLINE_HISTORY'. Also checks for the locations of the
++#   necessary include files and sets `HAVE_READLINE_H' or
++#   `HAVE_READLINE_READLINE_H' and `HAVE_READLINE_HISTORY_H' or
++#   'HAVE_HISTORY_H' if the corresponding include files exists.
++#
++#   The libraries that may be readline compatible are `libedit',
++#   `libeditline' and `libreadline'. Sometimes we need to link a termcap
++#   library for readline to work, this macro tests these cases too by trying
++#   to link with `libtermcap', `libcurses' or `libncurses' before giving up.
++#
++#   Here is an example of how to use the information provided by this macro
++#   to perform the necessary includes or declarations in a C file:
++#
++#     #ifdef HAVE_LIBREADLINE
++#     #  if defined(HAVE_READLINE_READLINE_H)
++#     #    include <readline/readline.h>
++#     #  elif defined(HAVE_READLINE_H)
++#     #    include <readline.h>
++#     #  else /* !defined(HAVE_READLINE_H) */
++#     extern char *readline ();
++#     #  endif /* !defined(HAVE_READLINE_H) */
++#     char *cmdline = NULL;
++#     #else /* !defined(HAVE_READLINE_READLINE_H) */
++#       /* no readline */
++#     #endif /* HAVE_LIBREADLINE */
++#
++#     #ifdef HAVE_READLINE_HISTORY
++#     #  if defined(HAVE_READLINE_HISTORY_H)
++#     #    include <readline/history.h>
++#     #  elif defined(HAVE_HISTORY_H)
++#     #    include <history.h>
++#     #  else /* !defined(HAVE_HISTORY_H) */
++#     extern void add_history ();
++#     extern int write_history ();
++#     extern int read_history ();
++#     #  endif /* defined(HAVE_READLINE_HISTORY_H) */
++#       /* no history */
++#     #endif /* HAVE_READLINE_HISTORY */
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Ville Laurikari <vl@iki.fi>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 7
++
++AU_ALIAS([VL_LIB_READLINE], [AX_LIB_READLINE])
++AC_DEFUN([AX_LIB_READLINE], [
++  AC_CACHE_CHECK([for a readline compatible library],
++                 ax_cv_lib_readline, [
++    ORIG_LIBS="$LIBS"
++    for readline_lib in readline edit editline; do
++      for termcap_lib in "" termcap curses ncurses; do
++        if test -z "$termcap_lib"; then
++          TRY_LIB="-l$readline_lib"
++        else
++          TRY_LIB="-l$readline_lib -l$termcap_lib"
++        fi
++        LIBS="$ORIG_LIBS $TRY_LIB"
++        AC_TRY_LINK_FUNC(readline, ax_cv_lib_readline="$TRY_LIB")
++        if test -n "$ax_cv_lib_readline"; then
++          break
++        fi
++      done
++      if test -n "$ax_cv_lib_readline"; then
++        break
++      fi
++    done
++    if test -z "$ax_cv_lib_readline"; then
++      ax_cv_lib_readline="no"
++    fi
++    LIBS="$ORIG_LIBS"
++  ])
++
++  if test "$ax_cv_lib_readline" != "no"; then
++    LIBS="$LIBS $ax_cv_lib_readline"
++    AC_DEFINE(HAVE_LIBREADLINE, 1,
++              [Define if you have a readline compatible library])
++    AC_CHECK_HEADERS(readline.h readline/readline.h)
++    AC_CACHE_CHECK([whether readline supports history],
++                   ax_cv_lib_readline_history, [
++      ax_cv_lib_readline_history="no"
++      AC_TRY_LINK_FUNC(add_history, ax_cv_lib_readline_history="yes")
++    ])
++    if test "$ax_cv_lib_readline_history" = "yes"; then
++      AC_DEFINE(HAVE_READLINE_HISTORY, 1,
++                [Define if your readline library has \`add_history'])
++      AC_CHECK_HEADERS(history.h readline/history.h)
++    fi
++  fi
++])dnl
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,6 +6,7 @@
+                     display.cc hits_circle.cc timed_circle.cc filters.cc \
+ 		    resolver.cc
+ 
++apachetop_LDADD = $(NCURSES_LIBS)
+ 
+ noinst_HEADERS = apachetop.h log.h ohtbl.h map.h queue.h \
+                  display.h hits_circle.h circle.h timed_circle.h filters.h \
diff --git a/app-admin/apachetop/metadata.xml b/app-admin/apachetop/metadata.xml
new file mode 100644
index 000000000000..e7214b7e32c5
--- /dev/null
+++ b/app-admin/apachetop/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>oleksandr.trotsenko@gmail.com</email>
+		<name>Oleksandr Trotsenko</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/apg-2.3.0b-r5 b/app-admin/apg-2.3.0b-r5
deleted file mode 100644
index bc69c81e9b7c..000000000000
--- a/app-admin/apg-2.3.0b-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=cracklib? ( sys-libs/cracklib )
-DESCRIPTION=Another Password Generator
-EAPI=2
-HOMEPAGE=http://www.adel.nursat.kz/apg/
-IUSE=cracklib
-KEYWORDS=~alpha amd64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-RDEPEND=cracklib? ( sys-libs/cracklib )
-SLOT=0
-SRC_URI=http://www.adel.nursat.kz/apg/download/apg-2.3.0b.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bc909d1f34610a6e4d867e4c907b96b9
diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
new file mode 100644
index 000000000000..3914e77cd8d7
--- /dev/null
+++ b/app-admin/apg/Manifest
@@ -0,0 +1,6 @@
+AUX apg-2.3.0b-cracklib.patch 925 BLAKE2B bcc3579d24a69d6936fd14d78cd2d1a1b3f467eb892faa0e7e1ba170dce41e14e3f8c4ebddf44a28d27cb9825d789e54cfc2332ce48bdb582b8536317566d03f SHA512 19477c54c22d2fff712a8a5822bfa11fbf42a55a27a18eb9d6bdbe38e3c388342bc36f596d4c2e03cfbdb9c4a4c6a35b519b48e909602332e063e41c906889eb
+AUX apg-2.3.0b-crypt_password.patch 836 BLAKE2B 974a8a4d5936cc7b30535746011f34f659f46a7f168ca4b60927ac51d88e16dd7b56a3696f2242a53c871e5d0ecaa47135673b2f6a61d2315e44e2f68ec871fb SHA512 3696ea5cf3ebadd22daf589ee708e1472e6f0d7e569cc479b1ea4e59743a31aa484a254e4c02d908996faab624999db76e443f74dccd2117fdab44e1e7fb8580
+AUX apg-glibc-2.4.patch 261 BLAKE2B 10de29e4200591ab800f3c33a2d2936beb0c3c8812b37c9446ac178277d6a54128b675f61d96d607ff4ddc7f23598d61de69d9a6adc3ed20900cd9d944106989 SHA512 c7a3f388b5132d21caf6d45ad0c987bb9511a9fc4edd9e7f75739c270438d436159603b4eeb554bbc8cafce3329d01b66d11ab6e75f43b8bd2de57a31bd73bf5
+DIST apg-2.3.0b.tar.gz 109995 BLAKE2B 9b4a6141fb7f6e649fe06ed91bda636879a03d6e5e6071267bbb6cd27e63b4588c23ea7902c5b1a74dde8520843566a4f2857a34f4d66020142425e5faf53daf SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a
+EBUILD apg-2.3.0b-r5.ebuild 1344 BLAKE2B cbdb7df15da6c6b6e08804bc5b9a94124a62c2d10c6873a697047d1ab1bbfd0c94bbfe1c992b3a958b141705c8c3749bd9c13a1b1a7646c8e8e28bf9ce56dbb0 SHA512 69f23df5f60996446721ec5ad11b201fa97cf4a1c2c12e28da17ff855debcb349e293fbba174066aa91fac5f773fe69c1b45b46530bc853dcc4c474699c60cd3
+MISC metadata.xml 490 BLAKE2B 6daed6930e317bb6b39f21dccd9cc4f08ddc549528076d6948212c7f62fe5d1e981f57c52278ea0fbcfd3fa36b3ce79192d52bc6e91c64940c1285933166735c SHA512 b1c2173415979d73b36b5e1650f27eebb89698f65a75af8351f8f77e762b9e54798a7b2398d6146ec54e975e4dd8ce59efc3b3c803eec863784107b1ce588e9c
diff --git a/app-admin/apg/apg-2.3.0b-r5.ebuild b/app-admin/apg/apg-2.3.0b-r5.ebuild
new file mode 100644
index 000000000000..818202c48ce4
--- /dev/null
+++ b/app-admin/apg/apg-2.3.0b-r5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Another Password Generator"
+HOMEPAGE="http://www.adel.nursat.kz/apg/"
+SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cracklib"
+
+DEPEND="cracklib? ( sys-libs/cracklib )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	chmod -R 0700 "${S}"
+	if use cracklib; then
+		epatch "${FILESDIR}"/${P}-cracklib.patch
+		epatch "${FILESDIR}"/${PN}-glibc-2.4.patch
+	fi
+	epatch "${FILESDIR}"/${P}-crypt_password.patch
+}
+
+src_compile() {
+	sed -i 's,^#\(APG_CS_CLIBS += -lnsl\)$,\1,' Makefile \
+		|| die "Sed failed"
+	if [[ ${CHOST} == *-darwin* ]]; then
+		sed -i 's,^APG_CLIBS += -lcrypt,APG_CLIBS += ,' Makefile \
+		|| die "Sed failed"
+	fi
+
+	emake \
+		FLAGS="${CFLAGS} ${LDFLAGS}" CFLAGS="${CFLAGS} ${LDFLAGS}" \
+		CC="$(tc-getCC)" \
+		standalone || die "compile problem"
+	emake FLAGS="${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \
+		-C bfconvert || die "compile problem"
+}
+
+src_install() {
+	dobin apg apgbfm bfconvert/bfconvert || die
+	dodoc CHANGES INSTALL README THANKS TODO || die
+	cd doc
+	doman man/apg.1 man/apgbfm.1 || die
+	dodoc APG_TIPS pronun.txt rfc0972.txt rfc1750.txt || die
+}
diff --git a/app-admin/apg/files/apg-2.3.0b-cracklib.patch b/app-admin/apg/files/apg-2.3.0b-cracklib.patch
new file mode 100644
index 000000000000..a1c34a14f5a0
--- /dev/null
+++ b/app-admin/apg/files/apg-2.3.0b-cracklib.patch
@@ -0,0 +1,17 @@
+--- Makefile	2003-08-07 09:40:39.000000000 -0600
++++ Makefile.cracklib	2004-10-14 07:16:17.288530686 -0600
+@@ -44,10 +44,10 @@
+ # If you want to use cracklib for password quality check then you
+ # must uncomment the folowing 4 lines (you must not do this for WIN32)
+ #
+-#CRACKLIB_DICTPATH = "/usr/local/lib/pw_dict"
+-#STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
+-#CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
+-#APG_CLIBS += -lcrack
++CRACKLIB_DICTPATH = "/usr/lib/cracklib_dict"
++STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}'
++CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}'
++APG_CLIBS += -lcrack
+ 
+ ##################################################################
+ # Support for ANSI X9.17/SHA1 PRNG
diff --git a/app-admin/apg/files/apg-2.3.0b-crypt_password.patch b/app-admin/apg/files/apg-2.3.0b-crypt_password.patch
new file mode 100644
index 000000000000..93f3f152a2b4
--- /dev/null
+++ b/app-admin/apg/files/apg-2.3.0b-crypt_password.patch
@@ -0,0 +1,31 @@
+--- restrict.c	2007-03-09 13:48:27.000000000 +0300
++++ restrict.c	2007-03-09 13:49:31.000000000 +0300
+@@ -33,6 +33,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if defined(APG_USE_CRACKLIB)
++#include <crack.h>
++#endif /* APG_USE_CRACKLIB */
+ #include "restrict.h"
+ extern struct sym smbl[94];
+ /*
+--- apg.c	2007-03-08 17:32:40.000000000 +0300
++++ apg.c	2007-03-08 17:34:07.000000000 +0300
+@@ -100,6 +100,7 @@
+ #else /* CLISERV */
+ #if defined(APG_USE_CRACKLIB)
+ #define APG_PROGRAMM_OPTIONS "M:E:a:r:b:p:n:m:x:vkt"
++#include <crack.h>
+ #else /* CRACKLIB */
+ #define APG_PROGRAMM_OPTIONS "M:E:a:r:b:p:n:m:x:vt"
+ #endif /* CRACKLIB */
+@@ -709,7 +710,7 @@
+ */
+ char * crypt_passstring (const char *p)
+ {
+- char salt[10];
++ char salt[11];
+  gen_rand_pass (salt, 10, 10, S_SL|S_CL|S_NB);
+  return (crypt(p, salt));
+ }
diff --git a/app-admin/apg/files/apg-glibc-2.4.patch b/app-admin/apg/files/apg-glibc-2.4.patch
new file mode 100644
index 000000000000..be90c6355e66
--- /dev/null
+++ b/app-admin/apg/files/apg-glibc-2.4.patch
@@ -0,0 +1,11 @@
+--- restrict.h.orig	2006-03-26 03:33:50.168661936 +0400
++++ restrict.h	2006-03-26 03:34:10.427582112 +0400
+@@ -33,6 +33,8 @@
+ #ifndef APG_RESTRICT_H
+ #define APG_RESTRICT_H	1
+ 
++#define uint32_t int
++
+ #if defined(APG_USE_CRACKLIB)
+ #include <packer.h>
+ #endif
diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml
new file mode 100644
index 000000000000..971e516f3bf3
--- /dev/null
+++ b/app-admin/apg/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>DuPol@gmx.de</email>
+		<name>Dustin Polke</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+<longdescription>Another Password Generator. Generates random, pronouncable passwords with a variety of algorithms</longdescription>
+</pkgmetadata>
diff --git a/app-admin/ara-0.15.0 b/app-admin/ara-0.15.0
deleted file mode 100644
index dd105cfb6cb0..000000000000
--- a/app-admin/ara-0.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=ARA Records Ansible
-EAPI=6
-HOMEPAGE=https://github.com/openstack/ara
-IUSE=python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/flask-sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/flask-script[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/frozen-flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/cliff[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/subunit[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/debtcollector[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/junit-xml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyfakefs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pbr-3.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/oslo-serialization[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/oslo-utils[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/openstack/ara/archive/0.15.0.tar.gz -> ara-0.15.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c1f117a21fe9fb4d04f9ad2bd1c9ae1c
diff --git a/app-admin/ara-0.15.0-r1 b/app-admin/ara-0.15.0-r1
deleted file mode 100644
index 9503a25b8069..000000000000
--- a/app-admin/ara-0.15.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=ARA Records Ansible
-EAPI=6
-HOMEPAGE=https://github.com/openstack/ara
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-admin/ansible[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask-migrate[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask-sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask-script[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/frozen-flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cliff[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/subunit[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/debtcollector[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/junit-xml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyfakefs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-3.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/oslo-serialization[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/oslo-utils[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xstatic-bootstrap-scss[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xstatic-datatables[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xstatic-jquery[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xstatic-patternfly[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xstatic-patternfly-bootstrap-treeview[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/openstack/ara/archive/0.15.0.tar.gz -> ara-0.15.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cf6295688bc89881cc582a5d3820b4c1
diff --git a/app-admin/ara/Manifest b/app-admin/ara/Manifest
new file mode 100644
index 000000000000..00a57a303ad5
--- /dev/null
+++ b/app-admin/ara/Manifest
@@ -0,0 +1,4 @@
+DIST ara-0.15.0.tar.gz 1216308 BLAKE2B c1b88891a3859f32e70a3e8dcb383549ea17cf126e3204eb3dd4f8bf28e11f702c3cbb51bde05c03097d2bb2dbf85354027846b8b3d40916d18e855335a5c16c SHA512 848437db36a398c3e4699b4ee500207e7e90bcbe1ede81c6f15e3b6624538beccd76ffcb51af0293f9371f67c27e430e3e23b1e6e0444665103b91f6587d6b9a
+EBUILD ara-0.15.0-r1.ebuild 1648 BLAKE2B c5ddef5434f417c28666909e45fa221a28a017e60c6cb6d8cd0c936ed86800f67f2e18d866b509069c1466c5f270460c6a62a257115a9c32b3dad659ac476419 SHA512 cf8b1f30bff89c1a123e3fe54c06de671d9cc9b312d309628aec9297c8c0bad9d3494cb3a603a14c0ef0126224ab14bd981047ed0a395ba24380b5be606bb01e
+EBUILD ara-0.15.0.ebuild 1260 BLAKE2B 5cdfc9cf34d619de78d6c793fc5bfdddb04c0c7ecda0ababe594138419dc0c50e0b76aaa743643fc057ae17f7b03d780d4df9ec81b269d2f807ee78d9f67e112 SHA512 f965e70ff9a6ae90e3f5b9820ff54d5c0fc95e368f3585dd2ebe57e92b78e0bfcec38790b63094094c3f9d2e9cc80dc065ba579325a8768d823b68ba35863f99
+MISC metadata.xml 324 BLAKE2B 109d17014a3a31a24650f82a296c2b81ccc751b56b54a85d3238f7bd471fe9e034028ffcdb16263d44ac53038bff754dceb9e8059299cab5126760cd50d6be9c SHA512 a7d6e8f532f0aedc330eba7c5b6b378974e0c0f7752ebc5aea7c820aa7d851e15ce07fbb33994e812f523f79686bbc2abccebfcbc095426664e8922d602d2921
diff --git a/app-admin/ara/ara-0.15.0-r1.ebuild b/app-admin/ara/ara-0.15.0-r1.ebuild
new file mode 100644
index 000000000000..b1f1595918b1
--- /dev/null
+++ b/app-admin/ara/ara-0.15.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="ARA Records Ansible"
+HOMEPAGE="https://github.com/openstack/ara"
+SRC_URI="https://github.com/openstack/ara/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-admin/ansible[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-migrate[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/flask-script[${PYTHON_USEDEP}]
+	dev-python/frozen-flask[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/cliff[${PYTHON_USEDEP}]
+	dev-python/subunit[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/debtcollector[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/pyfakefs[${PYTHON_USEDEP}]
+	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	dev-python/oslo-serialization[${PYTHON_USEDEP}]
+	dev-python/oslo-utils[${PYTHON_USEDEP}]
+	dev-python/xstatic[${PYTHON_USEDEP}]
+	dev-python/xstatic-bootstrap-scss[${PYTHON_USEDEP}]
+	dev-python/xstatic-datatables[${PYTHON_USEDEP}]
+	dev-python/xstatic-jquery[${PYTHON_USEDEP}]
+	dev-python/xstatic-patternfly[${PYTHON_USEDEP}]
+	dev-python/xstatic-patternfly-bootstrap-treeview[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_compile() {
+	export PBR_VERSION="${PV}"
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	einstalldocs
+	dodoc -r doc
+}
diff --git a/app-admin/ara/ara-0.15.0.ebuild b/app-admin/ara/ara-0.15.0.ebuild
new file mode 100644
index 000000000000..a931118f60a0
--- /dev/null
+++ b/app-admin/ara/ara-0.15.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="ARA Records Ansible"
+HOMEPAGE="https://github.com/openstack/ara"
+SRC_URI="https://github.com/openstack/ara/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/flask-script[${PYTHON_USEDEP}]
+	dev-python/frozen-flask[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/cliff[${PYTHON_USEDEP}]
+	dev-python/subunit[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/debtcollector[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/pyfakefs[${PYTHON_USEDEP}]
+	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	dev-python/oslo-serialization[${PYTHON_USEDEP}]
+	dev-python/oslo-utils[${PYTHON_USEDEP}]"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+python_compile() {
+	export PBR_VERSION="${PV}"
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	einstalldocs
+	dodoc -r doc
+}
diff --git a/app-admin/ara/metadata.xml b/app-admin/ara/metadata.xml
new file mode 100644
index 000000000000..65cbe41f2f35
--- /dev/null
+++ b/app-admin/ara/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">ara</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/augeas-1.10.1 b/app-admin/augeas-1.10.1
deleted file mode 100644
index 975237c5065b..000000000000
--- a/app-admin/augeas-1.10.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/libxml2 sys-libs/readline:= virtual/pkgconfig >=app-doc/NaturalDocs-1.40 test? ( dev-lang/ruby ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A library for changing configuration files
-EAPI=6
-HOMEPAGE=http://augeas.net/
-IUSE=static-libs test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxml2 sys-libs/readline:=
-SLOT=0
-SRC_URI=http://download.augeas.net/augeas-1.10.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=133ff540f35a148ce85a5304138621b5
diff --git a/app-admin/augeas-1.8.1 b/app-admin/augeas-1.8.1
deleted file mode 100644
index f792b601a032..000000000000
--- a/app-admin/augeas-1.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/libxml2 sys-libs/readline:= virtual/pkgconfig >=app-doc/NaturalDocs-1.40 test? ( dev-lang/ruby ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A library for changing configuration files
-EAPI=6
-HOMEPAGE=http://augeas.net/
-IUSE=static-libs test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxml2 sys-libs/readline:=
-SLOT=0
-SRC_URI=http://download.augeas.net/augeas-1.8.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d128414110003107f6938f6a470cc0c3
diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
new file mode 100644
index 000000000000..d65f3e2722a2
--- /dev/null
+++ b/app-admin/augeas/Manifest
@@ -0,0 +1,5 @@
+DIST augeas-1.10.1.tar.gz 2289207 BLAKE2B 6e3cf750c4d3faf7dc472ec7bfe3c46f5babca294d2bd5169cca419c2f93e21bdd656bbc44b30ab66c00fb793df1aa045f60c1260963901773c334b9019eff0b SHA512 382e8ef6a5bd3d12d7d2e0d2987f39c04ff7df3f07cd68aa732bf266b89d5d59a85be63921a7ff70f9219dbc6bb8547f80528242caa9417e08a008d1721cb1d2
+DIST augeas-1.8.1.tar.gz 2165325 BLAKE2B aa309984b5b11441fd2b10f3dc0b4a5f79a39038c1a71af6f7ef68b4fc24074db0bbcfd97341828211cc63d60d4b814515b119d0305367e9594cd5aa5159b822 SHA512 80be6dc75e86e2a00c56cb668824ffbe54105b64fad64a2737d980c8ee5ba347a97ddd190a1c712bd07a768ed23a8d07b0eb676033b367632036a8e7f98c976b
+EBUILD augeas-1.10.1.ebuild 1000 BLAKE2B c6d0e200c970a67013c4495d5018f622a947c96de0f3f6435b9b8ae193335a5c7181e33debab36db20fe96fcdd87ce1e4e4b00ea2a22c3ebb37aa6e46e906608 SHA512 85322cb00d04bf5b8c9b7534126ed6c966b73f094b63afc211345d80ee83a836d90bec866168107d390072c2f0d90ea113b4fa1b525c54d4c3d820bafa704b9a
+EBUILD augeas-1.8.1.ebuild 1000 BLAKE2B 601f1da391549d104db635310c3fbc7ce590c0b14428b4059e6f32c4f5265a3821eb28f7581766cc773572646e67434d3114ba8d2959cf15a4418884f18e482b SHA512 47871941fbcb08efce33560c5e8d857fef6e2dff1cdde7c31af6b205517af837840b83664fde9b6943b5ee3c3a367a7709c603b9409397cb79d7f879fedde1a0
+MISC metadata.xml 693 BLAKE2B c47bd36818c81a0fcb3d8f2e18e7a48797038c8a4a93302d592140faaed41d093523b6ad407b58dc7ae8c5f81c999c04e8514511b685e2a9b7d556dea177bde8 SHA512 1fcdcea259ed6cb652d08e763ccc67bee7bd5da9a7d3600dd492beaec7300868a47a7afdd71950ca8631886042428fce36cc17602a0776a9fa489f0fa2d27436
diff --git a/app-admin/augeas/augeas-1.10.1.ebuild b/app-admin/augeas/augeas-1.10.1.ebuild
new file mode 100644
index 000000000000..da590fa69145
--- /dev/null
+++ b/app-admin/augeas/augeas-1.10.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://download.augeas.net/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86"
+IUSE="static-libs test"
+
+RDEPEND="
+	dev-libs/libxml2
+	sys-libs/readline:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=app-doc/NaturalDocs-1.40
+	test? ( dev-lang/ruby )"
+
+PATCHES=(
+)
+
+src_prepare() {
+	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
+		addwrite /usr/share/NaturalDocs/Config/Languages.txt
+	fi
+	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
+		addwrite /usr/share/NaturalDocs/Config/Topics.txt
+	fi
+	default
+}
+
+src_configure() {
+	# Needs to implemented
+	local myeconfargs="--without-selinux
+	$(use_enable !static-libs shared)
+	$(use_enable static-libs static)"
+	eautoreconf
+	econf ${myeconfargs}
+	default
+}
diff --git a/app-admin/augeas/augeas-1.8.1.ebuild b/app-admin/augeas/augeas-1.8.1.ebuild
new file mode 100644
index 000000000000..bd87d5c497e5
--- /dev/null
+++ b/app-admin/augeas/augeas-1.8.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://download.augeas.net/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86"
+IUSE="static-libs test"
+
+RDEPEND="
+	dev-libs/libxml2
+	sys-libs/readline:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=app-doc/NaturalDocs-1.40
+	test? ( dev-lang/ruby )"
+
+PATCHES=(
+)
+
+src_prepare() {
+	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
+		addwrite /usr/share/NaturalDocs/Config/Languages.txt
+	fi
+	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
+		addwrite /usr/share/NaturalDocs/Config/Topics.txt
+	fi
+	default
+}
+
+src_configure() {
+	# Needs to implemented
+	local myeconfargs="--without-selinux
+	$(use_enable !static-libs shared)
+	$(use_enable static-libs static)"
+	eautoreconf
+	econf ${myeconfargs}
+	default
+}
diff --git a/app-admin/augeas/metadata.xml b/app-admin/augeas/metadata.xml
new file mode 100644
index 000000000000..2b1c8d903c2b
--- /dev/null
+++ b/app-admin/augeas/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+	<email>prometheanfire@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+A library for programmatically editing configuration files. Augeas parses
+configuration files into a tree structure, which it exposes through its
+public API. Changes made through the API are written back to the initially
+read files.
+
+The transformation works very hard to preserve comments and formatting
+details. It is controlled by ``lens'' definitions that describe the file
+format and the transformation into a tree.
+</longdescription>
+</pkgmetadata>
diff --git a/app-admin/authbind-2.1.1 b/app-admin/authbind-2.1.1
deleted file mode 100644
index 1275848fd6f4..000000000000
--- a/app-admin/authbind-2.1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Bind sockets to privileged ports without root
-EAPI=5
-HOMEPAGE=http://www.chiark.greenend.org.uk/ucgi/~ian/git/authbind.git/
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=mirror://debian/pool/main/a/authbind/authbind_2.1.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=15bc89f048e6a537d3c10e7cf92544d9
diff --git a/app-admin/authbind/Manifest b/app-admin/authbind/Manifest
new file mode 100644
index 000000000000..eb4103eaf6b3
--- /dev/null
+++ b/app-admin/authbind/Manifest
@@ -0,0 +1,4 @@
+AUX authbind-2.1.1-respect-flags.patch 808 BLAKE2B 3a74723e5bfe38b2ba31959850b7ea475afe76a73165b267936249809c46632883988f5ae8d56f89af41f682c9afcd3bc4eb3f9e3d5467ad1ce5c53cc5f809d9 SHA512 5c22805ee442cfa76e59e11a7614acaddfc6c38a316c290e147a159a221baf3ca44b44135bf4862031faacbc1c913c97a8a95f000ffcd33688021ece7df19750
+DIST authbind_2.1.1.tar.gz 14407 BLAKE2B 624cb647b138006324611d00943ad78f9166e4c47821ef5b395c58eb75c1034591cb4a0549f6870fa4294f4f4ca628f03390b4539a4543a64111d33ac9cb3261 SHA512 f3a45fcf1d8d6e6762bc1cef7a1b89f211e4af56c68b4c6c5e508a2f7ee039499b8b2f11ce8aeb94822d20377d309035760fa7b58aabaa4e87417ca25811c812
+EBUILD authbind-2.1.1.ebuild 1179 BLAKE2B 3da9b5f5f1cd5bfbe95c1caae16b0d0106439dd5154fba54d3d10941f547b9b450f975f525e0a1674b9bcc13851c2e6e79cdeef33b384009f911fb2e33590f19 SHA512 777f23b0e2d3999a73f8262659d92a45c9f99d51e439650bdf50a124288afccdd153de74f97c4b1253cea9029a785f3342ba2c495f6d67a52ebe727504293fce
+MISC metadata.xml 250 BLAKE2B 50c4b89c67107f8c4eba77c3b35992d381dfc6a30f5e8fb7c696f6b2cde6b7b1f90566a99ceba3df17485a88283059ef51010414e8df6c72d9e7b8c7f9ff0e27 SHA512 a57d332a86b16f67fe2896c47c6cc9ba57f602b65943080289c816a9d0f70b779f61cde882034cc1c2adda79208865dae0bf43d95deea4556e840b785e062343
diff --git a/app-admin/authbind/authbind-2.1.1.ebuild b/app-admin/authbind/authbind-2.1.1.ebuild
new file mode 100644
index 000000000000..c7a9890aa7ce
--- /dev/null
+++ b/app-admin/authbind/authbind-2.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib flag-o-matic
+
+DESCRIPTION="Bind sockets to privileged ports without root"
+HOMEPAGE="http://www.chiark.greenend.org.uk/ucgi/~ian/git/authbind.git/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-respect-flags.patch"
+}
+
+src_configure() {
+	sed -i \
+		-e "s|^prefix=.*|prefix=/usr|" \
+		-e "s|^lib_dir=.*|lib_dir=\$(prefix)/$(get_libdir)|" \
+		-e "s|^libexec_dir=.*|libexec_dir=\$(prefix)/libexec/authbind|" \
+		-e "s|^SHARED_LDFLAGS=.*|SHARED_LDFLAGS=$(raw-ldflags)|" \
+		Makefile || die "sed failed"
+
+	sed -i \
+		-e 's|/usr/lib|/usr/libexec|' \
+		authbind-helper.8 || die "sed failed"
+}
+
+src_install() {
+	dobin authbind
+	doman authbind.1 authbind-helper.8
+
+	ln -s libauthbind.so.* libauthbind.so.$(awk -F= '/MAJOR=/ { print $2 }' < Makefile)
+	dolib.so libauthbind.so*
+
+	exeinto /usr/libexec/authbind
+	exeopts -m4755
+	doexe helper
+
+	keepdir /etc/authbind/by{addr,port,uid}
+
+	dodoc debian/changelog
+}
diff --git a/app-admin/authbind/files/authbind-2.1.1-respect-flags.patch b/app-admin/authbind/files/authbind-2.1.1-respect-flags.patch
new file mode 100644
index 000000000000..2a9eb5f6b84c
--- /dev/null
+++ b/app-admin/authbind/files/authbind-2.1.1-respect-flags.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile b/Makefile
+index c1eed73..932ea60 100644
+--- a/Makefile
++++ b/Makefile
+@@ -34,10 +34,9 @@ INSTALL_PROGRAM ?= install -o root -g root -m 755 -s
+ INSTALL_DIR	?= install -o root -g root -m 755 -d
+ STRIP		?= strip
+ 
+-OPTIMISE=	-O2
+-LDFLAGS=	-g
+ LIBS=		-ldl -lc
+-CFLAGS=		-g $(OPTIMISE) \
++SHARED_LDFLAGS=
++CFLAGS+=	\
+ 		-Wall -Wwrite-strings -Wpointer-arith -Wimplicit \
+ 		-Wnested-externs -Wmissing-prototypes -Wstrict-prototypes
+ CPPFLAGS=	-DMAJOR_VER='"$(MAJOR)"' -DMINOR_VER='"$(MINOR)"' \
+@@ -82,7 +81,7 @@ helper:			helper.o
+ helper.o authbind.o:	authbind.h
+ 
+ $(LIBTARGET):		libauthbind.o
+-		ld -shared -soname $(LIBCANON) -o $@ $< $(LIBS)
++		$(LD) $(SHARED_LDFLAGS) -shared -soname $(LIBCANON) -o $@ $< $(LIBS)
+ 
+ clean distclean:
+ 		rm -f $(TARGETS) *.o *~ ./#*# *.bak *.new core
diff --git a/app-admin/authbind/metadata.xml b/app-admin/authbind/metadata.xml
new file mode 100644
index 000000000000..5c23291b5215
--- /dev/null
+++ b/app-admin/authbind/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dev-zero@gentoo.org</email>
+		<name>Tiziano Müller</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/aws-elb-tools-1.0.15.1-r1 b/app-admin/aws-elb-tools-1.0.15.1-r1
deleted file mode 100644
index 4702388e56d3..000000000000
--- a/app-admin/aws-elb-tools-1.0.15.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=Serves as the client interface to the Elastic Load Balancing web service
-EAPI=6
-HOMEPAGE=http://aws.amazon.com/developertools/Amazon-EC2/2536
-KEYWORDS=~amd64 ~x86
-LICENSE=Amazon
-RDEPEND=virtual/jre
-RESTRICT=mirror
-SLOT=0
-SRC_URI=mirror://sabayon/app-admin/ElasticLoadBalancing-1.0.15.1.zip
-_md5_=72f77899636853606a4a8529cbaebda4
diff --git a/app-admin/aws-elb-tools/Manifest b/app-admin/aws-elb-tools/Manifest
new file mode 100644
index 000000000000..3ce8b7d4817e
--- /dev/null
+++ b/app-admin/aws-elb-tools/Manifest
@@ -0,0 +1,3 @@
+DIST ElasticLoadBalancing-1.0.15.1.zip 6717939 BLAKE2B deef8cfb32a9c0d3627af26f32430efbe27a7712acd7c5dd9b7e8947b7c16ac866cec64100dd1bc315c4a2729451d181da8d16f133ea81fc927452cce6cc4f9b SHA512 813f00d632b483a5ec98632d830be4b02fc1bc71aa7bd845faa477f7d05bda7c801e5d83992c111dfc136bf5e1204bf96b00a1c24e5b19438decb356d0841725
+EBUILD aws-elb-tools-1.0.15.1-r1.ebuild 1562 BLAKE2B 54ac1fd7d026dd4f58dc2d1a294efa97ca4f6c94c869a968cee44e104e31356be2309e931d1c764fa5d8e1b5a1ee2c10df49880fb8d223d6927ccc34e9432b62 SHA512 a443939e59330c71b6b360c0420d18649ea21c26eefb4f8da961295faed18242578354bc954c8d64359168308b8a3d1a2bb57116c515e1ea734e87ac17c01672
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild
new file mode 100644
index 000000000000..7b6784456062
--- /dev/null
+++ b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Serves as the client interface to the Elastic Load Balancing web service"
+HOMEPAGE="http://aws.amazon.com/developertools/Amazon-EC2/2536"
+SRC_URI="mirror://sabayon/${CATEGORY}/ElasticLoadBalancing-${PV}.zip"
+
+LICENSE="Amazon"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND="app-arch/unzip"
+RDEPEND="virtual/jre"
+
+S="${WORKDIR}/ElasticLoadBalancing-${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_ELB_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-elb-tools/metadata.xml b/app-admin/aws-elb-tools/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/aws-elb-tools/metadata.xml
@@ -0,0 +1,5 @@
+<?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/bastille-3.0.9-r1 b/app-admin/bastille-3.0.9-r1
deleted file mode 100644
index ef831ebf1660..000000000000
--- a/app-admin/bastille-3.0.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Bastille-Linux is a security hardening tool
-EAPI=5
-HOMEPAGE=http://bastille-linux.org/
-IUSE=X
-KEYWORDS=~x86 ~ppc ~sparc ~alpha ~amd64
-LICENSE=GPL-2
-RDEPEND=net-firewall/iptables app-admin/logrotate dev-perl/Curses net-firewall/psad X? ( dev-perl/Tk ) virtual/logger dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://sourceforge/bastille-linux/Bastille-3.0.9.tar.bz2 mirror://gentoo/bastille-3.0.9-gentoo-0.2.patch.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=86c1c7caf49f04589f7605351fc38921
diff --git a/app-admin/bastille-3.0.9-r2 b/app-admin/bastille-3.0.9-r2
deleted file mode 100644
index fee674cfc979..000000000000
--- a/app-admin/bastille-3.0.9-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=Bastille-Linux is a security hardening tool
-EAPI=6
-HOMEPAGE=http://bastille-linux.org/
-IUSE=X
-KEYWORDS=~x86 ~ppc ~sparc ~alpha ~amd64
-LICENSE=GPL-2
-RDEPEND=net-firewall/iptables app-admin/logrotate dev-lang/perl:= dev-perl/Curses net-firewall/psad X? ( dev-perl/Tk ) virtual/logger
-SLOT=0
-SRC_URI=mirror://sourceforge/bastille-linux/Bastille-3.0.9.tar.bz2 mirror://gentoo/bastille-3.0.9-gentoo-0.2.patch.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d75479ca8ce5c998db45d2b306b8a7bd
diff --git a/app-admin/bastille/Manifest b/app-admin/bastille/Manifest
new file mode 100644
index 000000000000..1a138d4e6ab0
--- /dev/null
+++ b/app-admin/bastille/Manifest
@@ -0,0 +1,8 @@
+AUX bastille-3.0.9-openrc.patch 650 BLAKE2B de676aa353116cfb2297b5d08dbb4bc38ab9706d696be53d42941c5f5c198d1ea197a3f9c0db7635819f588ec64b9fe24e2fbf55d77833b1229a5a5af0bd19e2 SHA512 fe880f40185d129fef192a5a4e98e891691087958382d7ac8fa05612fea7f24d8116f0787796b1a1a1dab31d54d1bef52a59cdcf3213feae384e7c838a9801cf
+AUX bastille-3.0.9-perl.patch 1049 BLAKE2B 2a82c1883bf795b83a86d34e29fc2b3495123035479ce7c30451e37e30b2890db7f14fa0451c5a7d68f88b49f97dc7945f886071bae16a9a20508aa886d6e99a SHA512 23446f6ca65fa4b164b6dd688eb31a957cf76ce5017c4b74b4bcf402091811e1b2b51a55957c6bf6de5b7f6b7f58a9f651c7f85b760b5d270ec9280eab405dfd
+AUX bastille-3.0.9-renamewidgets.patch 2015 BLAKE2B 12003ebd9d40296e5285b45b063050787fc71c8d0f1002e07407105eaa2678ed25e2dbee66bd9c057047b323076e19e258a5efd2156c043b3d1fba5a92f8ef70 SHA512 28cf0f8a5bf11c29127f128fee80bd0a169960996b4d97b3666d7cfb2485850ca040670deaaf9d0c728e08747adefeecf02c4647cbd4c0e3673cf327c9b46f92
+DIST Bastille-3.0.9.tar.bz2 319045 BLAKE2B 480288c6e9fc5462e8e6ca84665d5769aab4252813ff478ab0519d382e1f03994da008ac2818b1d4214a09607c7316711665bce154121b3029bace6f2822df09 SHA512 a97ab2c2bb64c655d43ddcfd4000cee8666787e5b5923390e3155b258c3a2cf7d131abd474f9b0dd415eb455b664ab26a875da6636268b2a715ea87dd4dae2f0
+DIST bastille-3.0.9-gentoo-0.2.patch.bz2 14117 BLAKE2B 9c4383eae9e27cc4e110553a21424cd2811172c32609b0d3bcc72ccc3f61ba7cd76bfdbee969de5a89c22d0c1dd91b9ba92ce27ea5ac2b7260e5c0e1ce424be5 SHA512 a4ecfc064d6cf8c12b6f53c81dea841931df270293b03c39266861121f3def28fcbc4127b3bc9374028983e584736fb85361443badaadec7441cfb1570bdea8f
+EBUILD bastille-3.0.9-r1.ebuild 1526 BLAKE2B 09328a348bb79902ca551d56126bc8631cf56bf1922f82ddca4a446037412819d87761557e0d41ea9f92ca414f0abfec84a73144e800d1176de09ad3b1d1b4f4 SHA512 0230bf041a3845924250baf7046b0c3ec76daa36c47768075a57f792925ad5af958e6a912b88e0ac087d7f8dffd0d1c81651965861ceefd01698177dd605f728
+EBUILD bastille-3.0.9-r2.ebuild 1713 BLAKE2B 4315e54117b2fab2d2e485ffd8e5df4a4abeca702c8fa3483745adfa0013d2de43fa0e96a5baaa4e2e27129285f806a3aa1608094e419aeeb22e3adedf06d435 SHA512 42259f52dd049db2686deffa101cdaf71d2ad29321a057b4c2e7578f369199d9d2bdf53ffa04d83deaa81629dca535870e905680f91f5ffba290daef69f874aa
+MISC metadata.xml 459 BLAKE2B ef04f8221c3a19d7efded571376315032035b3ba4e4cb9cb9e3ecf2930e1ecfbf8bddec92485d8bd91655a68afb3f29aaae88f3a017bc5b56a083dcd31ce0257 SHA512 5c339c93e1aba939528018b1b4a6f21b3f87c93efc60471300064c85c9c0723474fcd5092d6367b02ac1d21564451b319f4ba6c261fa890def1e58a1647f4fc9
diff --git a/app-admin/bastille/bastille-3.0.9-r1.ebuild b/app-admin/bastille/bastille-3.0.9-r1.ebuild
new file mode 100644
index 000000000000..cfdc9cf09dcd
--- /dev/null
+++ b/app-admin/bastille/bastille-3.0.9-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+inherit eutils perl-module
+
+PATCHVER=0.2
+MY_PN=${PN/b/B}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_PN}
+DESCRIPTION="Bastille-Linux is a security hardening tool"
+HOMEPAGE="http://bastille-linux.org/"
+SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
+	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+IUSE="X"
+
+RDEPEND="
+	net-firewall/iptables
+	app-admin/logrotate
+	dev-perl/Curses
+	net-firewall/psad
+	X? ( dev-perl/Tk )
+	virtual/logger
+"
+
+src_prepare() {
+	epatch "${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch
+
+	# make sure the Perl modules go into vendor dir
+	epatch "${FILESDIR}/${P}-perl.patch"
+	perl_set_version
+
+	cd "${S}"
+	chmod a+x Install.sh bastille-ipchains bastille-netfilter
+}
+
+src_install() {
+	perl_set_version
+	export VENDOR_LIB
+
+	cd "${S}"
+	DESTDIR="${D}" ./Install.sh
+
+	# Example configs
+	cd "${S}"
+	insinto /usr/share/Bastille
+	doins *.config
+
+	newinitd ${PN}-firewall.gentoo-init ${PN}-firewall
+
+	# Documentation
+	cd "${S}"
+	dodoc *.txt BUGS Change* README*
+	cd "${S}"/docs
+	doman *.1m
+}
+
+pkg_postinst() {
+	elog "Please be aware that when using the Server Lax, Server Moderate, or"
+	elog "Server Paranoia configurations, you may need to use InteractiveBastille"
+	elog "to set any advanced network information, such as masquerading and"
+	elog "internal interfaces, if you plan to use them."
+}
diff --git a/app-admin/bastille/bastille-3.0.9-r2.ebuild b/app-admin/bastille/bastille-3.0.9-r2.ebuild
new file mode 100644
index 000000000000..0e2b22c76c1a
--- /dev/null
+++ b/app-admin/bastille/bastille-3.0.9-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-functions
+
+PATCHVER=0.2
+MY_PN=${PN/b/B}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_PN}
+DESCRIPTION="Bastille-Linux is a security hardening tool"
+HOMEPAGE="http://bastille-linux.org/"
+SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
+	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+IUSE="X"
+
+RDEPEND="
+	net-firewall/iptables
+	app-admin/logrotate
+	dev-lang/perl:=
+	dev-perl/Curses
+	net-firewall/psad
+	X? ( dev-perl/Tk )
+	virtual/logger
+"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch
+
+	# make sure the Perl modules go into vendor dir
+	"${FILESDIR}/${P}-perl.patch"
+
+	# prevent file collision, bug 536292
+	"${FILESDIR}/${P}-renamewidgets.patch"
+
+	# openrc runscript rename
+	"${FILESDIR}/${P}-openrc.patch"
+)
+
+src_prepare() {
+	perl_set_version
+
+	default
+
+	cd "${S}" || die
+	chmod a+x Install.sh bastille-ipchains bastille-netfilter || die
+}
+
+src_install() {
+	perl_set_version
+	export VENDOR_LIB
+
+	cd "${S}" || die
+	DESTDIR="${D}" ./Install.sh || die
+
+	# Example configs
+	cd "${S}" || die
+	insinto /usr/share/Bastille
+	doins *.config
+
+	newinitd ${PN}-firewall.gentoo-init ${PN}-firewall
+
+	# Documentation
+	cd "${S}" || die
+	dodoc *.txt BUGS Change* README*
+	cd "${S}"/docs || die
+	doman *.1m
+}
+
+pkg_postinst() {
+	elog "Please be aware that when using the Server Lax, Server Moderate, or"
+	elog "Server Paranoia configurations, you may need to use InteractiveBastille"
+	elog "to set any advanced network information, such as masquerading and"
+	elog "internal interfaces, if you plan to use them."
+}
diff --git a/app-admin/bastille/files/bastille-3.0.9-openrc.patch b/app-admin/bastille/files/bastille-3.0.9-openrc.patch
new file mode 100644
index 000000000000..08d0a04fa480
--- /dev/null
+++ b/app-admin/bastille/files/bastille-3.0.9-openrc.patch
@@ -0,0 +1,12 @@
+diff -ruN Bastille.orig/bastille-firewall.gentoo-init Bastille/bastille-firewall.gentoo-init
+--- Bastille.orig/bastille-firewall.gentoo-init	2017-01-02 09:47:33.144433650 +0100
++++ Bastille/bastille-firewall.gentoo-init	2017-01-02 09:49:05.396431757 +0100
+@@ -1,6 +1,6 @@
+-#!/sbin/runscript
++#!/sbin/openrc-run
+ # Copyright 1999-2004 Gentoo Foundation
+-# Distributed under the terms of the GNU General Public License v2         
++# Distributed under the terms of the GNU General Public License v2
+ # $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/files/bastille-3.0.2-firewall.init,v 1.1 2005/07/31 05:21:10 battousai Exp $
+ 
+ opts="start stop"
diff --git a/app-admin/bastille/files/bastille-3.0.9-perl.patch b/app-admin/bastille/files/bastille-3.0.9-perl.patch
new file mode 100644
index 000000000000..ab109093bc14
--- /dev/null
+++ b/app-admin/bastille/files/bastille-3.0.9-perl.patch
@@ -0,0 +1,25 @@
+diff -ruN Bastille-gentoo-2/Install.sh Bastille/Install.sh
+--- Bastille-gentoo-2/Install.sh	2014-12-09 23:05:55.674808824 +0100
++++ Bastille/Install.sh	2014-12-09 23:17:25.907847419 +0100
+@@ -3,7 +3,7 @@
+ umask 077
+ 
+ mkdir -p ${DESTDIR}/usr/sbin
+-mkdir -p ${DESTDIR}/usr/lib/perl5/site_perl/Curses
++mkdir -p ${DESTDIR}/${VENDOR_LIB}/Curses
+ mkdir -p ${DESTDIR}/usr/lib/Bastille
+ mkdir -p ${DESTDIR}/usr/share/Bastille
+ mkdir -p ${DESTDIR}/usr/share/Bastille/OSMap
+@@ -13,9 +13,9 @@
+  
+ cp AutomatedBastille ${DESTDIR}/usr/sbin/
+ cp BastilleBackEnd ${DESTDIR}/usr/sbin
+-cp Bastille_Curses.pm ${DESTDIR}/usr/lib/perl5/site_perl
+-cp Bastille_Tk.pm ${DESTDIR}/usr/lib/perl5/site_perl
+-cp Curses/Widgets.pm ${DESTDIR}/usr/lib/perl5/site_perl/Curses
++cp Bastille_Curses.pm ${DESTDIR}/${VENDOR_LIB}
++cp Bastille_Tk.pm ${DESTDIR}/${VENDOR_LIB}
++cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses
+ cp InteractiveBastille ${DESTDIR}/usr/sbin
+ # Questions.txt has been replaced by Modules.txt and Questions/
+ #cp Questions.txt ${DESTDIR}/usr/share/Bastille
diff --git a/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch b/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch
new file mode 100644
index 000000000000..2cf303a548dc
--- /dev/null
+++ b/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch
@@ -0,0 +1,48 @@
+diff -ruN Bastille.orig/AutomatedBastille Bastille/AutomatedBastille
+--- Bastille.orig/AutomatedBastille	2017-01-02 09:39:20.720443755 +0100
++++ Bastille/AutomatedBastille	2017-01-02 09:40:54.293441835 +0100
+@@ -77,7 +77,7 @@
+ 
+ # Use the Curses interface
+ use Curses;
+-use Curses::Widgets;
++use Curses::Widgets_Bastille;
+ 
+ # Hardcoded List of configurations -- to be replaced by list read from file
+ @list = ("WorkstationLax","WorkstationModerate","WorkstationParanoia","ServerLax","ServerModerate","ServerParanoia","Quit");
+diff -ruN Bastille.orig/Bastille_Curses.pm Bastille/Bastille_Curses.pm
+--- Bastille.orig/Bastille_Curses.pm	2005-04-18 14:32:10.000000000 +0200
++++ Bastille/Bastille_Curses.pm	2017-01-02 09:41:24.470441216 +0100
+@@ -34,7 +34,7 @@
+ sub do_Bastille {
+ 
+     use Curses;
+-    use Curses::Widgets;
++    use Curses::Widgets_Bastille;
+ 
+     # Number_Modules is the number of modules loaded in by Load_Questions
+     $Number_Modules=0;
+diff -ruN Bastille.orig/Curses/Widgets.pm Bastille/Curses/Widgets.pm
+--- Bastille.orig/Curses/Widgets.pm	2005-04-06 01:18:11.000000000 +0200
++++ Bastille/Curses/Widgets.pm	2017-01-02 09:42:31.145439848 +0100
+@@ -11,7 +11,7 @@
+ #
+ ########################################################################
+ 
+-package Curses::Widgets;
++package Curses::Widgets_Bastille;
+ 
+ use strict;
+ use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
+diff -ruN Bastille.orig/Install.sh Bastille/Install.sh
+--- Bastille.orig/Install.sh	2017-01-02 09:39:20.767443754 +0100
++++ Bastille/Install.sh	2017-01-02 09:41:05.537441604 +0100
+@@ -15,7 +15,7 @@
+ cp BastilleBackEnd ${DESTDIR}/usr/sbin
+ cp Bastille_Curses.pm ${DESTDIR}/${VENDOR_LIB}
+ cp Bastille_Tk.pm ${DESTDIR}/${VENDOR_LIB}
+-cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses
++cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses/Widgets_Bastille.pm
+ cp InteractiveBastille ${DESTDIR}/usr/sbin
+ # Questions.txt has been replaced by Modules.txt and Questions/
+ #cp Questions.txt ${DESTDIR}/usr/share/Bastille
diff --git a/app-admin/bastille/metadata.xml b/app-admin/bastille/metadata.xml
new file mode 100644
index 000000000000..fb9c3ca6f9ff
--- /dev/null
+++ b/app-admin/bastille/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
+	<longdescription>The Bastille Hardening System attempts to "harden" or "tighten" Unix operating systems.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">bastille-linux</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/bcfg2-1.2.4-r1 b/app-admin/bcfg2-1.2.4-r1
deleted file mode 100644
index 25fa22a2ada2..000000000000
--- a/app-admin/bcfg2-1.2.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Configuration management tool
-EAPI=5
-HOMEPAGE=http://bcfg2.org
-IUSE=doc cheetah genshi server python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=BSD-2
-RDEPEND=app-portage/gentoolkit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] cheetah? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) genshi? ( dev-python/genshi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) server? ( dev-libs/libgamin[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !kernel_linux? ( virtual/fam ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-1.2.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e475cac35b358dc4d44c233bfc87782
diff --git a/app-admin/bcfg2/Manifest b/app-admin/bcfg2/Manifest
new file mode 100644
index 000000000000..8e574f6b688d
--- /dev/null
+++ b/app-admin/bcfg2/Manifest
@@ -0,0 +1,4 @@
+AUX bcfg2-server-1.2.0.rc 481 BLAKE2B 745d64db46f3398ceb47ccbdd34985dd31dc1bc502b754e844c55c956546aebc512486b4c32a1f4e5a6087e1f4f04c8410762aa6bd9280d3b9a024f9a0949f73 SHA512 06a0134018d2475ce116b9dbcceeedba00dc4392d7dbb3ef7bfb42294806476613ab596e08656cfbd30661cc700a9f4fa122d330c4ed48006c572658298fd65c
+DIST bcfg2-1.2.4.tar.gz 1959767 BLAKE2B abd99f054a549c1239c938591ee4d5bd808a6fdad36d784d5efccbcc878b1a8b64413dcf84adce547ba46f036b612f76ad8d748fcbffe33a87501a0f63ec67e5 SHA512 15f9079dd18485088464da5ea63e53435e2a2141970e6c0400797424bd3c612928349438ed0f6bb2874eb4599768e210e3fef970ed09f8fb2c2d673b986221d9
+EBUILD bcfg2-1.2.4-r1.ebuild 1603 BLAKE2B 9bc807a21d1a2937b39c8a5afffcee1edd086444b4fa7f2041f0380930f0daaae02a964e1099f26175abba5aa038fb9755c4aeecf7d1b0580d7022d2dc9c1cbc SHA512 e2626067f2c0d515d0c89bdcb51735b667e94781807e242e6e52d8404b09c5a01dd518274f47b2dae8daaeb2ed374ef32a3997181aef98745e80f706c8dcf5ad
+MISC metadata.xml 465 BLAKE2B 96452846cb478484b00ede7c16b6b8b7f5f47f6635c513d5ec52be8fa120a7c2777a22a215d3a2cf0780dae0d7e1cd5a18cc09c5fc256f0a031bea5036028bc5 SHA512 97d6a0be1c4b11585e0acbd0b9f150890d761ebbcf6ad4609c929ba1179a08682d84c366b4f5f48b18a577ae730cbfc204f1d39a2d1f6cef2dd1b2ea6e24b7eb
diff --git a/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild b/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..99526eb04d2b
--- /dev/null
+++ b/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ssl'
+
+inherit distutils-r1
+
+DESCRIPTION="Configuration management tool"
+HOMEPAGE="http://bcfg2.org"
+SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="doc cheetah genshi server"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="app-portage/gentoolkit[${PYTHON_USEDEP}]
+	cheetah? ( dev-python/cheetah[${PYTHON_USEDEP}] )
+	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
+	server? (
+		dev-libs/libgamin[python,${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		!kernel_linux? ( virtual/fam ) )"
+
+python_compile_all() {
+	if use doc; then
+		einfo "Building Bcfg2 documentation"
+		sphinx-build doc doc_output || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--record=PY_SERVER_LIBS
+
+	if ! use server; then
+		rm -f "${ED%/}"/usr/bin/bcfg2-* || die
+		rm -f "${D%/}$(python_get_scriptdir)"/bcfg2-* || die
+		rm -rf "${ED%/}"/usr/share/bcfg2 || die
+		rm -rf "${ED%/}"/usr/share/man/man8 || die
+	else
+		newinitd "${FILESDIR}/${PN}-server-1.2.0.rc" bcfg2-server
+	fi
+
+	insinto /etc
+	doins examples/bcfg2.conf
+
+	if use doc; then
+		cd doc_output || die
+		docinto html
+		dodoc -r [a-z]* _images _static
+	fi
+}
+
+pkg_postinst () {
+	if use server; then
+		einfo "If this is a new installation, you probably need to run:"
+		einfo "    bcfg2-admin init"
+	fi
+}
diff --git a/app-admin/bcfg2/files/bcfg2-server-1.2.0.rc b/app-admin/bcfg2/files/bcfg2-server-1.2.0.rc
new file mode 100644
index 000000000000..f40248037079
--- /dev/null
+++ b/app-admin/bcfg2/files/bcfg2-server-1.2.0.rc
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+#
+# bcfgd - bcfg configuration daemon
+#
+# 
+
+depend () {
+	need net
+}
+
+start () {
+	ebegin "Starting bcfg2-server"
+	start-stop-daemon --start --quiet --pidfile /var/run/bcfg2-server.pid \
+		--exec /usr/sbin/bcfg2-server -- -D /var/run/bcfg2-server.pid
+	eend $? "Failed to start bcfg2-server"
+}
+
+stop () {
+	ebegin "Stopping bcfg2-server"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bcfg2-server.pid \
+		--signal INT
+	eend $? "Failed to stop bcfg2-server"
+}
diff --git a/app-admin/bcfg2/metadata.xml b/app-admin/bcfg2/metadata.xml
new file mode 100644
index 000000000000..f46d2d0d99a9
--- /dev/null
+++ b/app-admin/bcfg2/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
+</maintainer>
+<use>
+	<flag name="cheetah">Include dev-python/cheetah support</flag>
+	<flag name="genshi">Include dev-python/genshi support</flag>
+	<flag name="server">Installs scripts to be used on the server-side of this app</flag>
+</use>
+</pkgmetadata>
diff --git a/app-admin/calamares-3.1.13 b/app-admin/calamares-3.1.13
deleted file mode 100644
index fd66e03ce37a..000000000000
--- a/app-admin/calamares-3.1.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Distribution-independent installer framework
-EAPI=6
-HOMEPAGE=https://calamares.io
-IUSE=+networkmanager pythonqt +upower debug python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync >=sys-block/parted-3.0 || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=5
-SRC_URI=https://github.com/calamares/calamares/releases/download/v3.1.13/calamares-3.1.13.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b73d36acc242736d1449d358cc28fed0
diff --git a/app-admin/calamares-3.2.0 b/app-admin/calamares-3.2.0
deleted file mode 100644
index aeb59d3ed51c..000000000000
--- a/app-admin/calamares-3.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libpwquality[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Distribution-independent installer framework
-EAPI=6
-HOMEPAGE=https://calamares.io
-IUSE=+networkmanager pythonqt +upower debug python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libpwquality[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync >=sys-block/parted-3.0 || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-SLOT=5
-SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.0/calamares-3.2.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2230d229a6b7c78bc206030c8087a150
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
new file mode 100644
index 000000000000..10cbcfd59ddb
--- /dev/null
+++ b/app-admin/calamares/Manifest
@@ -0,0 +1,6 @@
+AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
+DIST calamares-3.1.13.tar.gz 2279516 BLAKE2B ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df SHA512 451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a
+DIST calamares-3.2.0.tar.gz 2488863 BLAKE2B 6941cdd7eb381a6ee4f7bc2628605ee5a670de0d839b5797cec930737ec5fc09e214c484c2e8398ab2f12669bbc64768d5ee20b2aa1adae799fb96373a0b07df SHA512 0b502749ace48ce56f2bb364d265c5b9197cca2b27115663f928cb58d02ba43e93b80b5022053bca5899ce6ee35146992157408fc5af017da6d61abdcdbc4e1d
+EBUILD calamares-3.1.13.ebuild 1983 BLAKE2B ee4739b47d4224b681e5909fcc872eb59f8d414ecfd316338ae948b45fdcca51bcf7a82608b74b25e79db6a77fbe538f1ba4850edbc848a07bb4bf10aa9e471a SHA512 6c1630a7e30912297bc8238b46f40eb2935bd36ec862a421d46281881f167bd31b116c9bb19f082f9f584c01bc4102a241b8a668eae1cbcd6803e4b7404a969b
+EBUILD calamares-3.2.0.ebuild 2134 BLAKE2B 48d01855b913950b9e3fe68ed4e4ca7d2879e62bbf4f10ffa2d364704a1b806709b2afd0d48a1daa2ed8a50aab4154bc2135be949817bff8fd2c25b603ef610f SHA512 021c49d45c83ee2491f3eb14ac4d7c601139dfe40a1950fcae45381048760081c14120283a5988286f6e2487851a5629cfb1143279170e7d28924d6b38e7798c
+MISC metadata.xml 1055 BLAKE2B a6c7974103baa5a646cb1d594e3f224903df9ce5c618ad4ed46c0b3d4df5d3437be570eda0d55e3b0ca8f6df4af9627b088ace2a3f0efc802528aeb49fc7bce6 SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f
diff --git a/app-admin/calamares/calamares-3.1.13.ebuild b/app-admin/calamares/calamares-3.1.13.ebuild
new file mode 100644
index 000000000000..261aa9e0169b
--- /dev/null
+++ b/app-admin/calamares/calamares-3.1.13.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io"
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	dev-cpp/yaml-cpp:=
+	>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-auth/polkit-qt[qt5(+)]
+	>=sys-libs/kpmcore-3.0.3:5=
+	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+	app-admin/sudo
+	dev-libs/libatasmart
+	net-misc/rsync
+	>=sys-block/parted-3.0
+	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
+	sys-boot/os-prober
+	sys-fs/squashfs-tools
+	virtual/udev
+	networkmanager? ( net-misc/networkmanager )
+	upower? ( sys-power/upower )
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	python_setup
+	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+	       PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+	       PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+	       PYTHON_LIBS="$(python_get_LIBS)"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWEBVIEW_FORCE_WEBKIT=OFF
+		-DWITH_PYTHONQT=$(usex pythonqt)
+	)
+
+	kde5_src_configure
+	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
+	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
+}
+
+src_install() {
+	kde5_src_install
+	dobin "${FILESDIR}"/calamares-pkexec
+}
diff --git a/app-admin/calamares/calamares-3.2.0.ebuild b/app-admin/calamares/calamares-3.2.0.ebuild
new file mode 100644
index 000000000000..a0864c5ac076
--- /dev/null
+++ b/app-admin/calamares/calamares-3.2.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_5,3_6} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io"
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-cpp/yaml-cpp:=
+	>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+	dev-libs/libpwquality[${PYTHON_USEDEP}]
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-auth/polkit-qt[qt5(+)]
+	>=sys-libs/kpmcore-3.0.3:5=
+	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+	app-admin/sudo
+	dev-libs/libatasmart
+	net-misc/rsync
+	>=sys-block/parted-3.0
+	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
+	sys-boot/os-prober
+	sys-fs/squashfs-tools
+	virtual/udev
+	networkmanager? ( net-misc/networkmanager )
+	upower? ( sys-power/upower )
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	python_setup
+	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+	       PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+	       PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+	       PYTHON_LIBS="$(python_get_LIBS)"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWEBVIEW_FORCE_WEBKIT=OFF
+		-DWITH_PYTHONQT=$(usex pythonqt)
+	)
+
+	kde5_src_configure
+	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
+	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
+}
+
+src_install() {
+	kde5_src_install
+	dobin "${FILESDIR}"/calamares-pkexec
+}
diff --git a/app-admin/calamares/files/calamares-pkexec b/app-admin/calamares/files/calamares-pkexec
new file mode 100644
index 000000000000..3300d3b70c61
--- /dev/null
+++ b/app-admin/calamares/files/calamares-pkexec
@@ -0,0 +1,2 @@
+#!/bin/sh
+pkexec "/usr/bin/calamares" "$@"
diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
new file mode 100644
index 000000000000..bc9aeb32994b
--- /dev/null
+++ b/app-admin/calamares/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mudler@gentoo.org</email>
+		<name>Ettore Di Giacinto</name>
+	</maintainer>
+	<longdescription>
+		Calamares is a distribution-independent system installer, with an
+		advanced partitioning feature for both manual and automated
+		partitioning operations. It is the first installer with an automated
+		“Replace Partition” option, which makes it easy to reuse a partition
+		over and over for distribution testing. Calamares is designed to be
+		customizable by distribution maintainers without need for cumbersome
+		patching, thanks to third party branding and external modules support.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">calamares/calamares</remote-id>
+	</upstream>
+	<use>
+		<flag name="pythonqt">Enable PythonQt-based module interface</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/cancd-0.1.0-r4 b/app-admin/cancd-0.1.0-r4
deleted file mode 100644
index acfb4c89ca9d..000000000000
--- a/app-admin/cancd-0.1.0-r4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install preinst prepare
-DESCRIPTION=CA NetConsole Daemon receives output from the Linux netconsole driver
-EAPI=6
-HOMEPAGE=http://oss.oracle.com/projects/cancd/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://oss.oracle.com/projects/cancd/dist/files/source/cancd-0.1.0.tar.gz
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=e8f1186123503650eb470a9bf7fb68ce
diff --git a/app-admin/cancd/Manifest b/app-admin/cancd/Manifest
new file mode 100644
index 000000000000..7b0327de086b
--- /dev/null
+++ b/app-admin/cancd/Manifest
@@ -0,0 +1,9 @@
+AUX cancd-0.1.0-build-r1.patch 266 BLAKE2B 0f1c43d64e02899b09d2ce4401f951ba60bad8bf31aa41c1c40677266021d2a3869db40f593f84745782d2ceaef226c7e3398b541cd9746496024d2455923ffc SHA512 83886c972ccc4b34fa4255d2b66f7abd286ba8b3929f2c35d85652ff290559ad837f96015f05d47cbae97fed6aec468852e75e0e6ac0bbac1a0538ea889f603b
+AUX cancd-0.1.0-c-cleanup.patch 1648 BLAKE2B 498c2eff05163a49e1499146e24d54e03ea0c8136e925b8ecfadccd7bcfcb77548ce49a31072c4c5d63c36a8c4b161d5d456b4b0247e915f0a6065e3a586637c SHA512 16350363f8f8f7e3843000e3128216d302ea7112608d61ae8d74ca79688588f3b028e1eedf187df06c78f8aaa2c987cdfdf33761adb9e597d4ca617f34b1072e
+AUX cancd-conf.d-r1 378 BLAKE2B 2b2b73484d8de7ee533bd217eb78224c3edae2c894c328ed8b17a941b2087461cc2b83483dd27563d162a83ff254b86f6fc564442bdef8510eb0cd14d51a7c0e SHA512 02c27367dda025f2a1b7aada8bc4c5a2cf5b046b4ded22c7bd7f50daa1ee18ffdda5997faa0d9edacfb17b23aedb007c8dbdee11cc2a70f7f9214e77fa1fb919
+AUX cancd-init.d-r1 596 BLAKE2B 5c439792ef8680238aa59e3f441b1b69ac1889e9a9ea4e57828b9969ec38ae0611971d7a52d68fbc676e2162f726a011839a2810991c70d2e7d3f25f81df9011 SHA512 73ed3f87e98822b0d5cc53b4a515ec02cdbbad03551eb58206522f615f2eafe6d2e2e190dcb41d8ec67ccad4d4411cbd1ce9087035539291ba520e2c3a84b2bf
+AUX netconsole-conf.d 751 BLAKE2B a81cdd8aa5be18e55065e1ca27698a2106bea320da98ea149e4da3f8a0817765b593fe816a9dda8adc9f1cde853f4debaf769e551ff97fe9ac24976c6045ab1e SHA512 7095ec6b8595865fc084b39f027efa0818c1348b8bfc8bfbea8d7d05c767f57a8357ae2eb07f13f073143911451e0fa005e1623ec9865076e4350f442cb8648b
+AUX netconsole-init.d 1503 BLAKE2B e03ee0010c92e011070950bdbb538add60a3eb2291b6b7ff9df60baa28d6fce2ce8e80b5750f730d56d6767743cf6daed358feb524359a0410cf678cf33b140f SHA512 33005e692fce59d567e399fca58b81b740cb381ce897f689af7e33785ccd1991506be1af2c09de8f96b6eb3996c5be16c212daee03d304b1fff7095b2ae1491d
+DIST cancd-0.1.0.tar.gz 7634 BLAKE2B 3ff488caf54764df053237d6ae4c39e7db44c5a5ecd1bcb18f3006e31030232ade4d7a93286dce8f58fb2ae7743700fd14939f219b7f5059cd2fb84bbc107b19 SHA512 9b01ed3ea1e27276799d657572645a7b40da9cf80910a73e2de9d733e8f3cfa374e29764b1e5853d7fb5a6835edda3103a1a6d31fd699010f98318631e62c5fb
+EBUILD cancd-0.1.0-r4.ebuild 1162 BLAKE2B 5060bcf92d4c5495a7a3160ab67e3050eff26889ee005f55fad3e330899bcd3f3333b64468cd1e767f248b0c5f51e21081546f9e8bbf2826055c6b1d12bf4a3c SHA512 e135297de6f711870435a688d5b1fff4b3bffed77c3136cf52de41566c019e01f28d5dc120ae0a4f94a286614c9344330debf5728748013a7459b5377f87a647
+MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/app-admin/cancd/cancd-0.1.0-r4.ebuild b/app-admin/cancd/cancd-0.1.0-r4.ebuild
new file mode 100644
index 000000000000..d66212991751
--- /dev/null
+++ b/app-admin/cancd/cancd-0.1.0-r4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="CA NetConsole Daemon receives output from the Linux netconsole driver"
+HOMEPAGE="http://oss.oracle.com/projects/cancd/"
+SRC_URI="http://oss.oracle.com/projects/cancd/dist/files/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-build-r1.patch"
+	"${FILESDIR}/${P}-c-cleanup.patch"
+)
+
+src_prepare() {
+	default
+
+	# slight makefile cleanup
+	sed -i \
+		-e '/^CFLAGS/s,-g,,' \
+		-e '/^CFLAGS/s,-O2,-Wall -W -Wextra -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wredundant-decls -Wunreachable-code -Wlong-long,' \
+		-e '/rm cancd cancd.o/s,rm,rm -f,' \
+		Makefile || die
+}
+
+src_install() {
+	dosbin cancd
+	newinitd "${FILESDIR}"/cancd-init.d-r1 cancd
+	newconfd "${FILESDIR}"/cancd-conf.d-r1 cancd
+	newinitd "${FILESDIR}"/netconsole-init.d netconsole
+	newconfd "${FILESDIR}"/netconsole-conf.d netconsole
+}
+
+pkg_preinst() {
+	enewuser cancd
+}
diff --git a/app-admin/cancd/files/cancd-0.1.0-build-r1.patch b/app-admin/cancd/files/cancd-0.1.0-build-r1.patch
new file mode 100644
index 000000000000..19bc929b2bc0
--- /dev/null
+++ b/app-admin/cancd/files/cancd-0.1.0-build-r1.patch
@@ -0,0 +1,14 @@
+fix building with newer glibc
+
+http://bugs.gentoo.org/246734
+
+--- a/cancd.c
++++ b/cancd.c
+@@ -36,6 +36,7 @@
+ #include <libgen.h>
+ #include <getopt.h>
+ #include <stdarg.h>
++#include <limits.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <netinet/in.h>
diff --git a/app-admin/cancd/files/cancd-0.1.0-c-cleanup.patch b/app-admin/cancd/files/cancd-0.1.0-c-cleanup.patch
new file mode 100644
index 000000000000..47defb3e43b2
--- /dev/null
+++ b/app-admin/cancd/files/cancd-0.1.0-c-cleanup.patch
@@ -0,0 +1,65 @@
+diff -Nuar --exclude '*~' --exclude '*.orig' --exclude Makefile cancd-0.1.0/cancd.c cancd-0.1.0.new/cancd.c
+--- cancd-0.1.0/cancd.c	2005-08-18 11:47:48.000000000 -0700
++++ cancd-0.1.0.new/cancd.c	2006-03-17 17:09:46.402025517 -0800
+@@ -199,7 +199,7 @@
+     char *path;
+ };
+ 
+-static int make_tree(const char *path, int mode)
++static int make_tree(const char *path, mode_t mode)
+ {
+     struct stat stat_buf;
+     char *ptr, *tmp;
+@@ -319,7 +319,7 @@
+ static int open_socket()
+ {
+     int rc;
+-    struct sockaddr_in servaddr = {0, };
++    struct sockaddr_in servaddr;
+ 
+     sock_fd = socket(PF_INET, SOCK_DGRAM, 0);
+     if (sock_fd < 0)
+@@ -438,7 +438,7 @@
+     int rc;
+     static int block = 1;
+ 
+-    rc = recvfrom(sock_fd, buf, bufsize, 0,
++    rc = recvfrom(fd, buf, bufsize, 0,
+                   (struct sockaddr *)from, fromlen);
+     if (rc < 0)
+     {
+@@ -569,7 +569,7 @@
+ 
+ static int valid_format()
+ {
+-    struct in_addr addr = {0, };
++    struct in_addr addr;
+     char *name;
+     int rc;
+ 
+@@ -599,9 +599,11 @@
+     exit(rc);
+ }
+ 
++/*
+ extern char *optarg;
+ extern int optopt;
+ extern int opterr;
++*/
+ static int parse_options(int argc, char *argv[])
+ {
+     int c;
+@@ -641,11 +643,11 @@
+                             optarg);
+                     print_usage(-EINVAL);
+                 }
+-                log_prefix = optarg;
++                log_prefix = strdup(optarg);
+                 break;
+ 
+             case 'o':
+-                log_format = optarg;
++                log_format = strdup(optarg);
+                 if (!log_format || !*log_format || !valid_format())
+                 {
+                     fprintf(stderr,
diff --git a/app-admin/cancd/files/cancd-conf.d-r1 b/app-admin/cancd/files/cancd-conf.d-r1
new file mode 100644
index 000000000000..13322298f28b
--- /dev/null
+++ b/app-admin/cancd/files/cancd-conf.d-r1
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# port to listen on
+CANCD_PORT=6667
+
+# directory to output to
+CANCD_LOG_DIR=/var/log/cancd
+
+# one file per minute, one dir per host/date
+#CANCD_LOG_FORMAT="%Q/%Y-%m-%d/%H:%M.log"
+# one file per day, one dir per host
+CANCD_LOG_FORMAT="%Q/%Y-%m-%d.log"
diff --git a/app-admin/cancd/files/cancd-init.d-r1 b/app-admin/cancd/files/cancd-init.d-r1
new file mode 100644
index 000000000000..a2a96f1ce81c
--- /dev/null
+++ b/app-admin/cancd/files/cancd-init.d-r1
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/cancd"
+command_args="-p ${CANCD_PORT}
+              -l ${CANCD_LOG_DIR}
+              -o ${CANCD_LOG_FORMAT}"
+command_user="cancd"
+
+# cancd daemonizes itself, but doesn't write a PID file and doesn't
+# have an option to run in the foreground. So the best we can do
+# is try to match the process name when stopping it.
+procname="cancd"
+
+depend() {
+    need net
+}
+
+start_pre() {
+    checkpath --directory --owner cancd --mode 0700 "${CANCD_LOG_DIR}"
+}
diff --git a/app-admin/cancd/files/netconsole-conf.d b/app-admin/cancd/files/netconsole-conf.d
new file mode 100644
index 000000000000..aad2fc797172
--- /dev/null
+++ b/app-admin/cancd/files/netconsole-conf.d
@@ -0,0 +1,27 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# required!
+TGT_IP=''
+
+DEVICE=eth0
+
+SRC_IP='' 
+# will default to first address on $DEVICE
+# must be specified if the device does not have an IP at init time
+SRC_PORT=6665 # default
+
+# note that cancd daemon uses 6667 as default
+# but netconsole.txt says 6666 is the default
+TGT_PORT=6667 
+
+# if you want to broadcast, specify 'broadcast' here.
+# it's a security hole on an untrusted network.
+TGT_MAC='' 
+
+LOGLEVEL='1'
+# LOGLEVEL are the kernel console logging levels
+# [0..7] = EMERG,ALERT,CRIT,ERR,WARNING,NOTICE,INFO,DEBUG 
+# 1 means only kernel panics are reported (default)
+# this affects all console logging
+# see syslog(2) for more info
diff --git a/app-admin/cancd/files/netconsole-init.d b/app-admin/cancd/files/netconsole-init.d
new file mode 100644
index 000000000000..dfb28eb9eac0
--- /dev/null
+++ b/app-admin/cancd/files/netconsole-init.d
@@ -0,0 +1,67 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	checkconfig || return 1
+	if [ -z "${TGT_MAC}" ]; then
+		LC_ALL=C /bin/ping -nq -c 3 "${TGT_IP}" -I "${DEVICE}" 1>/dev/null 2>/dev/null
+		ret=$?
+		# ping worked, try arp
+		if [ $ret -eq 0 ]; then
+			TGT_MAC="$(LC_ALL=C arp -an -i ${DEVICE} ${TGT_IP} |egrep -v 'incomplete|no match' | awk '{print $4}')"
+		fi
+	elif [ "${TGT_MAC}" = "broadcast" ]; then
+		TGT_MAC=''
+	fi
+	ebegin "Starting netconsole ${SRC_IP}:${SRC_PORT}(${DEVICE}) -> ${TGT_IP}:${TGT_PORT} ${TGT_MAC}"
+	# else we use the MAC that we are given
+	modprobe netconsole netconsole=${SRC_PORT}@${SRC_IP}/${DEVICE},${TGT_PORT}@${TGT_IP}/${TGT_MAC}
+	ret=$?
+	[ $ret -eq 0 ] && dmesg -n ${LOGLEVEL}
+	eend $ret
+}
+
+stop() {
+	ebegin "Stopping netconsole"
+	modprobe -r netconsole
+	eend $?
+}
+
+checkconfig() {
+	# kernel uses 15 internally
+	if [ "$LOGLEVEL" -lt 0 -o "${LOGLEVEL}" -gt 15 ]; then
+		eerror "Invalid kernel console loglevel."
+		return 1
+	fi
+
+	if [ "$SRC_PORT" -le 0 ]; then
+		eerror "Invalid source port."
+		return 1
+	fi
+
+	LC_ALL=C ifconfig "${DEVICE}" 1>/dev/null 2>/dev/null
+	ret=$?
+
+	if [ -z "${DEVICE}" -o "${ret}" -gt 0 ]; then
+		eerror "Source device invalid."
+		return 1
+	fi
+
+	if [ "$TGT_PORT" -le 0 ]; then
+		eerror "Invalid target port."
+		return 1
+	fi
+
+	if [ -z "$TGT_IP" ]; then
+		eerror "Unspecified target address."
+		return 1
+	fi
+
+	return 0
+}
+# vim: ts=4 sw=4 sts=4:
diff --git a/app-admin/cancd/metadata.xml b/app-admin/cancd/metadata.xml
new file mode 100644
index 000000000000..a4e0d354f696
--- /dev/null
+++ b/app-admin/cancd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>robbat2@gentoo.org</email>
+        <name>Robin H. Johnson</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/app-admin/ccze-0.2.1-r3 b/app-admin/ccze-0.2.1-r3
deleted file mode 100644
index 3096d54ad3e5..000000000000
--- a/app-admin/ccze-0.2.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/libpcre sys-libs/ncurses:0= >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A flexible and fast logfile colorizer
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~joker/ccze/ccze.txt
-KEYWORDS=amd64 ~arm ppc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-libs/libpcre sys-libs/ncurses:0=
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gentoo/ccze-0.2.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f3f155d2678cf53a9c4c6c7975c4892c
diff --git a/app-admin/ccze-0.2.1-r4 b/app-admin/ccze-0.2.1-r4
deleted file mode 100644
index 09847690ae6e..000000000000
--- a/app-admin/ccze-0.2.1-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/libpcre sys-libs/ncurses:0= >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A flexible and fast logfile colorizer
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~joker/ccze/ccze.txt
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-libs/libpcre sys-libs/ncurses:0=
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gentoo/ccze-0.2.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e0943994b86160abc7a8afe6135ffe6
diff --git a/app-admin/ccze/Manifest b/app-admin/ccze/Manifest
new file mode 100644
index 000000000000..c36ebec0626a
--- /dev/null
+++ b/app-admin/ccze/Manifest
@@ -0,0 +1,8 @@
+AUX ccze-0.2.1-tinfo.patch 369 BLAKE2B 2bd1d6046a5c7def5dbf1903dfde695da135554ccfcc410fd15bdd87aa1a440fd42289f7c00ac612378d333ba9da886a8860cf93cc485b5a08cc4a14830bf480 SHA512 8dd3d7a66807782fef49119e380eec9230d4d0708ef8b20cb9606740015f96f024b22967fae348bc59b3334a3b110dc1cacc8792a9a3402ddfdf600ccd71a62d
+AUX ccze-fbsd.patch 531 BLAKE2B ef16b94b4c1a94a3385b3b21c6c1fc51a463769de06f65cbb918c3e29f28b2a5c41618c6a38b2db4b696373e880f3cb4fbcb648516b5eb7c4722cd85ab3ba685 SHA512 c94926f907b054b84df8c1887183fc44024d4a4b4e9cb4a91ce34adf25857cc30d9572673a3869fa1affacda047fa30f9d73ba198cdebecf40ae86b5fc9dceec
+AUX ccze-ldflags.patch 424 BLAKE2B a769c1c617b7f421a0cac4cdb3141169eca8a0e23fd384b4bac702a2f84c15643e2a780eed2b706540a88b8c881227592caf588d1278148dbf8cec8e55dd3847 SHA512 7dff2e235acc665abcc3ed35744776e60a336b45cafbd80e3f4707f61d3746821e63949e73c32ee4fc5ca43b5639a816c42bb5e0b08912a7c617744dff39ec07
+AUX ccze-segfault.patch 660 BLAKE2B 863fa14c8ded2df423b0ff5cd9936ccb390b11d3b0dfa396d515e9a85e411c9f9f7f3ba76f04c4ba04ccc19cc43594f4d304b54cb2155ef44ef08c9c00d4b691 SHA512 e8ebdbc8293b4d765d683bbdd222c0af3aaf0668ea8376ed830efac3cdb4a99dfc75dda6e59b95e7a36b7ab4fc521a9a1937e4ab9a48218acc76d2b02844b900
+DIST ccze-0.2.1.tar.gz 139795 BLAKE2B 112e3968ca00bdb9ebda91b30a697f4422935755b3bf33d47c0a8800f3d05e371a4ca4db0ef52f10e5cba1c537ee3f666479103dc88a30f270c76268fece5cb6 SHA512 1704da8d4c97a3403a57d7841db8a6e4ba6116e401f91d9ecf1b1371cc18b40641e5665c9414740d6a523874be6b6527f5c0d4f3a3796c7b96ed83192146b2b7
+EBUILD ccze-0.2.1-r3.ebuild 946 BLAKE2B a10072f19126232ed62677066e2acb0805a34492a902ad8cb5e0d03a1f39647b8572fc7444d116be0ebe5a01b199926921d0c7db8d15bc4327debda761c4470e SHA512 2aba3653cce66c2a95a960b0cbdcd7cf24e60b6340fe2f5b03cd2d0fe98fd5f52be1ae6691b184b594d6377f442b136fb0b95459fb4b2634658c62ca3c5a1b59
+EBUILD ccze-0.2.1-r4.ebuild 942 BLAKE2B 8a340fd17cf7205c9e9559e4a4ebeb7f09631326024494f13de8bf4c5233c4ab9b6f44285bd9259d0c8ea29b8ee84a3ba5003b4e80ceed8ba4f96d6d5f5a1dc8 SHA512 89175fcd5e332bfca5bafa3106b0e39b0cd786038d748faaa745e13eafc4d2a69d5bc6a08d4302eb5e0acea84265cab67f69ea148470b56d659103815cb4dddd
+MISC metadata.xml 492 BLAKE2B a2658f32b8d62f60965cb71d66e3bc90c4d0aa03d4e53bca596de964c63bcd0b157b9e407ca91f789457731bf62d0d4b504376917acdf2f95b76a63bc513c29e SHA512 96d871b02eee0348e6d62f01bd25deca9044248f0f495be24fc8cadd30c16ef933a285e250f58d58b47f64eec8f964de2ef243617f66266a655cb83f02acd8d8
diff --git a/app-admin/ccze/ccze-0.2.1-r3.ebuild b/app-admin/ccze/ccze-0.2.1-r3.ebuild
new file mode 100644
index 000000000000..94fa5efed7b1
--- /dev/null
+++ b/app-admin/ccze/ccze-0.2.1-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit fixheadtails autotools eutils toolchain-funcs
+
+DESCRIPTION="A flexible and fast logfile colorizer"
+HOMEPAGE="https://dev.gentoo.org/~joker/ccze/ccze.txt"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/libpcre
+	sys-libs/ncurses:0="
+
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ )
+
+src_prepare() {
+
+	epatch "${FILESDIR}"/ccze-fbsd.patch
+	epatch "${FILESDIR}"/ccze-segfault.patch
+	epatch "${FILESDIR}"/ccze-ldflags.patch
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+
+	# GCC 4.x fixes
+	sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' \
+	    -i src/Makefile.in || die
+	sed -e '/AC_CHECK_TYPE(error_t, int)/d' \
+	    -i configure.ac || die
+
+	eautoreconf
+
+	ht_fix_file Rules.mk.in
+
+	tc-export CC
+}
diff --git a/app-admin/ccze/ccze-0.2.1-r4.ebuild b/app-admin/ccze/ccze-0.2.1-r4.ebuild
new file mode 100644
index 000000000000..e2677e5eeb1f
--- /dev/null
+++ b/app-admin/ccze/ccze-0.2.1-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fixheadtails autotools eutils toolchain-funcs
+
+DESCRIPTION="A flexible and fast logfile colorizer"
+HOMEPAGE="https://dev.gentoo.org/~joker/ccze/ccze.txt"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/libpcre
+	sys-libs/ncurses:0="
+
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ )
+
+PATCHES=(
+	"${FILESDIR}"/ccze-fbsd.patch
+	"${FILESDIR}"/ccze-segfault.patch
+	"${FILESDIR}"/ccze-ldflags.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+)
+
+src_prepare() {
+	default
+
+	# GCC 4.x fixes
+	sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' \
+	    -i src/Makefile.in || die
+	sed -e '/AC_CHECK_TYPE(error_t, int)/d' \
+	    -i configure.ac || die
+
+	eautoreconf
+
+	ht_fix_file Rules.mk.in
+
+	tc-export CC
+}
diff --git a/app-admin/ccze/files/ccze-0.2.1-tinfo.patch b/app-admin/ccze/files/ccze-0.2.1-tinfo.patch
new file mode 100644
index 000000000000..d0d7550e3337
--- /dev/null
+++ b/app-admin/ccze/files/ccze-0.2.1-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -100,6 +100,7 @@
+ 		strndup strstr])
+ 
+ AC_CHECK_LIB(ncurses, initscr, [], [AC_ERROR(NCurses library not found)])
++AC_SEARCH_LIBS(stdscr, tinfo,,[AC_ERROR([Cannot find a library providing stdscr])])
+ AC_CHECK_FUNC(dlopen, [], [AC_CHECK_LIB(dl, dlopen)])
+ AC_CHECK_FUNC(getopt_long, [], [AC_CHECK_LIB(gnugetopt, getopt_long)])
+ 
diff --git a/app-admin/ccze/files/ccze-fbsd.patch b/app-admin/ccze/files/ccze-fbsd.patch
new file mode 100644
index 000000000000..ae694e0e4423
--- /dev/null
+++ b/app-admin/ccze/files/ccze-fbsd.patch
@@ -0,0 +1,25 @@
+--- a/src/ccze-compat.h
++++ b/src/ccze-compat.h
+@@ -29,6 +29,11 @@
+ #include <stddef.h>
+ #include <stdio.h>
+ 
++# ifndef __error_t_defined
++typedef int error_t;
++#  define __error_t_defined     1
++# endif
++
+ #ifndef HAVE_STRNDUP
+ char *strndup (const char *s, size_t size);
+ #endif
+--- a/src/ccze-compat.c
++++ b/src/ccze-compat.c
+@@ -275,7 +275,7 @@
+ 		char **valuep)
+ {
+   int i = getsubopt (optionp, tokens, valuep);
+-#if HAVE_SUBOPTARg
++#if HAVE_SUBOPTARG
+   if (!*valuep && suboptarg)
+     *valuep = strdup (suboptarg);
+ #endif
diff --git a/app-admin/ccze/files/ccze-ldflags.patch b/app-admin/ccze/files/ccze-ldflags.patch
new file mode 100644
index 000000000000..4f8c8f207209
--- /dev/null
+++ b/app-admin/ccze/files/ccze-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -75,7 +75,7 @@
+ ${PROGRAM}: ${OBJECTS} ${PLUGIN_SOBJS}
+ 	${CC} -rdynamic ${ALL_CFLAGS} -o $@ $^ ${ALL_LDFLAGS}
+ ccze-dump ccze-cssdump: %: %.o ccze-compat.o ccze-color.c
+-	${CC} ${ALL_CFLAGS} -o $@ $@.o ccze-compat.o
++	${CC} ${ALL_CFLAGS} ${ALL_LDFLAGS} -o $@ $@.o ccze-compat.o
+ ccze-builtins.c: Makefile
+ 	echo '#include <ccze.h>' >$@
+ 	echo '#include "ccze-private.h"' >>$@
diff --git a/app-admin/ccze/files/ccze-segfault.patch b/app-admin/ccze/files/ccze-segfault.patch
new file mode 100644
index 000000000000..5bdd823e4120
--- /dev/null
+++ b/app-admin/ccze/files/ccze-segfault.patch
@@ -0,0 +1,29 @@
+--- a/src/ccze.c
++++ b/src/ccze.c
+@@ -209,7 +209,7 @@
+ 	}
+       break;
+     case 'a':
+-      plugin = strtok (optarg, "=");
++      plugin = strtok (arg, "=");
+       value = strtok (NULL, "\n");
+       ccze_plugin_argv_set (plugin, value);
+       break;
+@@ -249,7 +249,7 @@
+       ccze_config.remfac = 1;
+       break;
+     case 'm':
+-      subopts = optarg;
++      subopts = arg;
+       while (*subopts != '\0')
+ 	{
+ 	  switch (getsubopt (&subopts, m_subopts, &value))
+@@ -273,7 +273,7 @@
+ 	}
+       break;
+     case 'o':
+-      subopts = optarg;
++      subopts = arg;
+       while (*subopts != '\0')
+ 	{
+ 	  switch (getsubopt (&subopts, o_subopts, &value))
diff --git a/app-admin/ccze/metadata.xml b/app-admin/ccze/metadata.xml
new file mode 100644
index 000000000000..49a6829d2fd1
--- /dev/null
+++ b/app-admin/ccze/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>
+ CCZE is my C port of RASZi's colorize, with a set of bug fixes and enhancements.
+ It uses PCRE to do the matching, and NCurses for the output. The goal was to
+ create a log coloriser, that is fast and light on resources. Also, being extensible
+ via plug-ins is an important feature too. 
+</longdescription>
+</pkgmetadata>
diff --git a/app-admin/cdist-4.6.1 b/app-admin/cdist-4.6.1
deleted file mode 100644
index 086c5b3ca32b..000000000000
--- a/app-admin/cdist-4.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A usable configuration management system
-EAPI=6
-HOMEPAGE=https://www.nico.schottelius.org/software/cdist/
-IUSE=doc python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/c/cdist/cdist-4.6.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bfbac444b78800731c4264807a9e7e1c
diff --git a/app-admin/cdist-4.7.3 b/app-admin/cdist-4.7.3
deleted file mode 100644
index 5d4d1f324e66..000000000000
--- a/app-admin/cdist-4.7.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A usable configuration management system
-EAPI=6
-HOMEPAGE=https://www.nico.schottelius.org/software/cdist/
-IUSE=doc python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/c/cdist/cdist-4.7.3.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bfbac444b78800731c4264807a9e7e1c
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
new file mode 100644
index 000000000000..07cf36281721
--- /dev/null
+++ b/app-admin/cdist/Manifest
@@ -0,0 +1,5 @@
+DIST cdist-4.6.1.tar.gz 454461 BLAKE2B 5cf5ba376b981feb6d740f53b4c4cdf51a8f0b4d4422db2c2c7312dd1288e006bfcae7c3459707e361536002a2a6b49bb8ef836783fac8167834978fb5737683 SHA512 f0c3759d00221fbd36d7662de6ccc57fc0070b8aee6a0d80e6bab6f41215c537a1cf1a6ec9fdebf81c45ad8126b8e730a14be8f1286d5baf5f4a5672611e31dc
+DIST cdist-4.7.3.tar.gz 497537 BLAKE2B e743e49291d6b212810911607ac149a54e6c8423841c4149f620d2127bbeb2fdce7d5ceff76572f1599a3a3326944066ba336f93f25de50d98ad972188562709 SHA512 9b69e257c816d515e4d94bc73d26ca1cfb2343fc4fc8298aadfbb82417aa28c9759831c304b90d6427e275988442cd19681e455c98757c87426d0435dd90ae41
+EBUILD cdist-4.6.1.ebuild 596 BLAKE2B 68bdf8cedb9d41f9ae5b276c1c8f81bc71096abefdab55f9abe9def93e4fc33e9ce170faa5240fd9006b23ef363ef9d2c9c446a6be1d7b7d61c723a7b6f9a37e SHA512 95f4fadaf35314bc667a3f6eafade25820dd3fbe07c96158285c35f1fee2681f577135c10e954ad518b56780ec86c5a4e9db579563488335cda9252d1b70d802
+EBUILD cdist-4.7.3.ebuild 596 BLAKE2B 68bdf8cedb9d41f9ae5b276c1c8f81bc71096abefdab55f9abe9def93e4fc33e9ce170faa5240fd9006b23ef363ef9d2c9c446a6be1d7b7d61c723a7b6f9a37e SHA512 95f4fadaf35314bc667a3f6eafade25820dd3fbe07c96158285c35f1fee2681f577135c10e954ad518b56780ec86c5a4e9db579563488335cda9252d1b70d802
+MISC metadata.xml 443 BLAKE2B 2742628c4f58fc21f1fca78752bce1e6275ec34ca7aa547a39d8a11cf3c7d9c149030078a55383f706053fa3cd70f071d5d5c571f3b009e941cbbc2c29b6c21a SHA512 5d1dbb6742101c7b89662f3edba9d3eb7da595611fbb613a1da1482e76cbf563fdf5fbf227471ca4c90e5a96d62c65433beaf9b90bbc716c7614ea5fe6b5063a
diff --git a/app-admin/cdist/cdist-4.6.1.ebuild b/app-admin/cdist/cdist-4.6.1.ebuild
new file mode 100644
index 000000000000..52491eaacc40
--- /dev/null
+++ b/app-admin/cdist/cdist-4.6.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A usable configuration management system"
+HOMEPAGE="https://www.nico.schottelius.org/software/cdist/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
+	distutils-r1_python_install_all
+
+	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
+}
diff --git a/app-admin/cdist/cdist-4.7.3.ebuild b/app-admin/cdist/cdist-4.7.3.ebuild
new file mode 100644
index 000000000000..52491eaacc40
--- /dev/null
+++ b/app-admin/cdist/cdist-4.7.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A usable configuration management system"
+HOMEPAGE="https://www.nico.schottelius.org/software/cdist/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
+	distutils-r1_python_install_all
+
+	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
+}
diff --git a/app-admin/cdist/metadata.xml b/app-admin/cdist/metadata.xml
new file mode 100644
index 000000000000..3bc61f181389
--- /dev/null
+++ b/app-admin/cdist/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>nerve@ipwar.ch</email>
+    <name>Daniel Heule</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">cdist</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/certmgr-1.6.0 b/app-admin/certmgr-1.6.0
deleted file mode 100644
index 5c5737b5964b..000000000000
--- a/app-admin/certmgr-1.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Automated certificate management using a CFSSL CA
-EAPI=6
-HOMEPAGE=https://github.com/cloudflare/certmgr
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/cloudflare/certmgr/archive/v1.6.0.tar.gz -> certmgr-1.6.0.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=78b15da68325cd1f2f8edbc7fbad766c
diff --git a/app-admin/certmgr/Manifest b/app-admin/certmgr/Manifest
new file mode 100644
index 000000000000..81e33db4cc2e
--- /dev/null
+++ b/app-admin/certmgr/Manifest
@@ -0,0 +1,3 @@
+DIST certmgr-1.6.0.tar.gz 31187831 BLAKE2B a1269aac2817f077fa2aae3d14f692aa5c83b0f53ffe041b9436754a93c7970dcc24bed94259e05b99105de5400b3b8c5e22bde087fe365a1c21b8eaf4b3e4a3 SHA512 65b0cb8d5b7a3b76698b3b3aa8c2b9db88d08fed209044668cb19f13eca69714a7a4bc8a20bbf60af05f5c9e39b221801a36e90c8b1c647dbf07952ac385e6ea
+EBUILD certmgr-1.6.0.ebuild 636 BLAKE2B 04c13ebf4349cb36bd4df1b5f97775d6614e7666168f29b0ece03cb020d0dccb6759c4d0c77c433a789a93eb92891f720d2a06e90370cb3e09210037d7ef96d3 SHA512 6268aae4ca61265579e263ca766a6fdac438e5ef79730e10dbf467384c6040113fa31600bc149794151f7fff45c63587faeee17a33480e6761ae012c4688b5ca
+MISC metadata.xml 250 BLAKE2B 267d35ba6d759d93dba62b94026d1f4219bef12cdd930e75b1bbc88e4603fe53602b0de8fb1dee62d4bf2ce778cf7ac2e241c5dc117900bb8086902a4a404df5 SHA512 35c362c6a4c181cf124fd1e86b9a06430beae594982b15bd53f6fce2c958189ff5c9cd778bb9fd9a2e9c9675af9e8efb1d5d037059b72f16ad6e6db502f886d1
diff --git a/app-admin/certmgr/certmgr-1.6.0.ebuild b/app-admin/certmgr/certmgr-1.6.0.ebuild
new file mode 100644
index 000000000000..6951be522070
--- /dev/null
+++ b/app-admin/certmgr/certmgr-1.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/cloudflare/${PN}"
+inherit golang-build golang-vcs-snapshot
+
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Automated certificate management using a CFSSL CA"
+HOMEPAGE="https://github.com/cloudflare/certmgr"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src || die
+	GOPATH="${S}" go install -v ${EGO_PN}/cmd/... || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	pushd src/${EGO_PN} || die
+	dodoc README.md
+	popd || die
+}
diff --git a/app-admin/certmgr/metadata.xml b/app-admin/certmgr/metadata.xml
new file mode 100644
index 000000000000..e0546fc77f98
--- /dev/null
+++ b/app-admin/certmgr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">cloudflare/certmgr</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/cgmanager-0.41 b/app-admin/cgmanager-0.41
deleted file mode 100644
index 6d70b93d0254..000000000000
--- a/app-admin/cgmanager-0.41
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/libnih[dbus] sys-apps/dbus selinux? ( sec-policy/selinux-cgmanager ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Control Group manager daemon
-EAPI=6
-HOMEPAGE=https://linuxcontainers.org/cgmanager/introduction/
-IUSE=pam selinux
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=sys-libs/libnih[dbus] sys-apps/dbus selinux? ( sec-policy/selinux-cgmanager )
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/cgmanager/cgmanager-0.41.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cf1b6ea182db863538370b9df387379e
diff --git a/app-admin/cgmanager/Manifest b/app-admin/cgmanager/Manifest
new file mode 100644
index 000000000000..274db0735b75
--- /dev/null
+++ b/app-admin/cgmanager/Manifest
@@ -0,0 +1,5 @@
+AUX cgmanager.initd-r1 331 BLAKE2B 725b5044fa567e7f7146bd62cc63a0674873d6fcb022eda77b7296dbe1af76645815b67b113a41eec8f83898aba90be3706a10f672a2565c7af26967c196fb54 SHA512 f50afaf471f9e9d500cbc909da1185c1342481699eb1887f694ef91bd49c7cd727d21871ff5d6c0b6046601cfa72a4ac167926c62920b2f3a4902ec817401948
+AUX cgproxy.initd-r1 661 BLAKE2B f84189b5fe16b6327cd1a6a2cd1805f1bbd75791d0f6f75a601ea58fa51d5a490d655371355205c499a51628b4e9cdf21f98431adcb3000397508cdacef2928b SHA512 7f43ea6369428d71d122a191c6a1718987ed09eafe2217ae326606ddf2a50f0500d0de0520fe21e5d2edefb8ddd4c3a85623d2aac1212e821ea922cb8256fffc
+DIST cgmanager-0.41.tar.gz 461805 BLAKE2B 22c779953d637012694c19490da9d3707b9e2a935f910d192fd1e6a44c27e933e93b6ae516399991924175a9e8e05fd650cf3117d3e7bde034a20bc083ebaa09 SHA512 e8ba64665a21d987cd835580c2b6bafbcb05e22ce7f6216762d04840957c2cd21fb571360e0206ae9143656beed88ff3396eb1f644052c05189093a665a705fd
+EBUILD cgmanager-0.41.ebuild 1234 BLAKE2B 3c69ccac261321f47b0064422a55541023efe27dcd902a94d0a9dc4e5c4c3f13a4d846b244903cbbec616196fb41a4294a4e4684bcf3ac9300b2138517439c9b SHA512 b5236eeb934b5a8679a965783ef187b4b3f603b69d37d1a572ea1c8a0f22bbd78c7339cad4aba8f4ffdf3970dc647cf46c1b132e18f19c4fd7057031fd06ba41
+MISC metadata.xml 370 BLAKE2B 663ce6f2f49c18a577d778210731960b1c750de6f4fb4c1d91d23ec2e409db04c94ea89a999e34be5d1520ef65c36c33085abf0011126e90584a1e9e2db3eb4b SHA512 eba74394c34246d7ca096cd81be0d41e4431cbb885331c9fdfde61e273a3f01bae0726dac514af8b96a4bf272961706a8845d84d802e216ce745793f930320dd
diff --git a/app-admin/cgmanager/cgmanager-0.41.ebuild b/app-admin/cgmanager/cgmanager-0.41.ebuild
new file mode 100644
index 000000000000..88b2a849915a
--- /dev/null
+++ b/app-admin/cgmanager/cgmanager-0.41.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools pam
+
+DESCRIPTION="Control Group manager daemon"
+HOMEPAGE="https://linuxcontainers.org/cgmanager/introduction/"
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="pam selinux"
+
+RDEPEND="sys-libs/libnih[dbus]
+	sys-apps/dbus
+	selinux? ( sec-policy/selinux-cgmanager )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	eapply_user
+
+	# systemd expects files in /sbin but we will have them in /usr/sbin
+	pushd config/init/systemd > /dev/null || die
+	sed -i -e "s@sbin@usr/&@" {${PN},cgproxy}.service || \
+		die "Failed to fix paths in systemd service files"
+	popd > /dev/null || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-distro=gentoo \
+		--with-pamdir="$(usex pam $(getpam_mod_dir) none)" \
+		--with-init-script=systemd
+}
+
+src_install () {
+	default
+
+	# I see no reason to have the tests in the filesystem. Drop them
+	rm -r "${D}"/usr/share/${PN}/tests || die "Failed to remove ${PN} tests"
+
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newinitd "${FILESDIR}"/cgproxy.initd-r1 cgproxy
+}
diff --git a/app-admin/cgmanager/files/cgmanager.initd-r1 b/app-admin/cgmanager/files/cgmanager.initd-r1
new file mode 100644
index 000000000000..6efc80b7155a
--- /dev/null
+++ b/app-admin/cgmanager/files/cgmanager.initd-r1
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Control Group manager daemon"
+pidfile="/run/cgmanager.pid"
+command="/usr/sbin/cgmanager"
+command_args="-m name=systemd"
+command_background="yes"
+retry="TERM/45"
+
+depend() {
+	before cgproxy
+}
diff --git a/app-admin/cgmanager/files/cgproxy.initd-r1 b/app-admin/cgmanager/files/cgproxy.initd-r1
new file mode 100644
index 000000000000..ceb075254a3f
--- /dev/null
+++ b/app-admin/cgmanager/files/cgproxy.initd-r1
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Control Group manager proxy"
+pidfile="/run/cgproxy.pid"
+command="/usr/sbin/cgproxy"
+command_args="--daemon"
+command_background="yes"
+retry="TERM/45"
+NESTED="${NESTED:-no}"
+
+depend() {
+	after cgmanager
+}
+
+start_pre() {
+	if ! /usr/sbin/cgproxy --check-master; then
+		ewarn "cgmanager is not running"
+		return 1
+	fi
+	# cgproxy should only run on container unless on older kernel
+	if [ -e /proc/self/ns/pid ] && [ "$NESTED" != "yes" ]; then
+		eerror "Too old kernel to support cgroup, please update to >3.8"
+		return 1
+	fi
+}
diff --git a/app-admin/cgmanager/metadata.xml b/app-admin/cgmanager/metadata.xml
new file mode 100644
index 000000000000..734f29efb788
--- /dev/null
+++ b/app-admin/cgmanager/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+		<maintainer type="person">
+				<email>perfinion@gentoo.org</email>
+				<name>Jason Zaman</name>
+		</maintainer>
+		<maintainer type="person">
+				<email>hwoarang@gentoo.org</email>
+				<name>Markos Chandras</name>
+		</maintainer>
+</pkgmetadata>
diff --git a/app-admin/checksec-1.7.5 b/app-admin/checksec-1.7.5
deleted file mode 100644
index 26c863173209..000000000000
--- a/app-admin/checksec-1.7.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
-EAPI=5
-HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=amd64 ~mips ~ppc ~ppc64 x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/slimm609/checksec.sh/archive/1.7.5.tar.gz -> checksec-1.7.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=785c408f1271f749f90cae1088dfead3
diff --git a/app-admin/checksec-1.8.0 b/app-admin/checksec-1.8.0
deleted file mode 100644
index f1d0fb3655b7..000000000000
--- a/app-admin/checksec-1.8.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
-EAPI=5
-HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/slimm609/checksec.sh/archive/1.8.0.tar.gz -> checksec-1.8.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4b079701dd0c323eec55a37a210ae88b
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
new file mode 100644
index 000000000000..0f2ff44fba01
--- /dev/null
+++ b/app-admin/checksec/Manifest
@@ -0,0 +1,6 @@
+AUX checksec-1.7.2-path.patch 510 BLAKE2B d17d260f41cf0c7e71accfa4b728a9c35511d1d1a90726bbd3a7fbbc401b69e6245f596c62d323013d29142d256eca6d792c6256f4b5d752bf55e64f96e7798a SHA512 5a5af3c35f8e8ca0ef0c44bc84ea3108bdd96c7ee98c3bda31a0f5308fd843c47a0d825fdff39e1995260391a7a747187ef804250fd0da6ccad5f93b3595a706
+DIST checksec-1.7.5.tar.gz 51266 BLAKE2B a77e6d0bf52bc8a0ec18c0f1ffe883b68acccaaee6fd0d1714d456c31c3004b5d9279c3926885be168befba1dc7a75b1269dac5cb5847c247470e765601f08e6 SHA512 7269fb3628907f6fe4e8b720d2dcbd5bf8586e1821bd758533dff6255c6a52be9146b58f60abea798ee92471c3d5ad9e867fa7ad4b8e5ea2d8aa03d5a3b83098
+DIST checksec-1.8.0.tar.gz 52391 BLAKE2B 3720e4faae5aa82172c673ce7ddc662db1433b82d25f25be4c219f1664da8af687d2a5ee9c05703e9f151a998be9226e896e125b7cff05d3881e61e8a9f5c918 SHA512 0236e40ba8b4f7c13ebd3b51f22dd05e6c4442e8646b5a1ee814556d9a6ca19f9bae638af33a6bfec2f8ef95567d222a20dcdcd9eae6ffb7ea5261919f020283
+EBUILD checksec-1.7.5.ebuild 761 BLAKE2B 928d7f91b7ac04ac04a9bcfaa14f8ea781eaaf2be75182d7b8d0f3cf63e0bdf9178d03da87732da11286ba172e2368eb5fa490021c3d5d71f3419d426b7b911d SHA512 5a15da1104314647688e68017189e1b661f0efd58d3a7ad5a788ab2cdda79249dce9c07e9db48d775ace6d8fb8679f2cb6669c1f16758f9c6e736e9eca2d57ba
+EBUILD checksec-1.8.0.ebuild 763 BLAKE2B 3456a3d42a58795e00cf46689bc60a99357dfec5a8ea7c43841584c10d4fe8bceb3d3c0e3a4965cd38e7c718b6c716a36cdbf895635a458122aaa34324f13600 SHA512 dd2af6317e19baef0e21112b6a64783dd1ccffaf2f0f2d80acf802b4ee14b021be23548375c9c86c8a073da38bbe4f1c58c533cb5b16cf60e082f8164dc84738
+MISC metadata.xml 334 BLAKE2B 96b933c9475a18c3957d46b58c41162e396f27ff7c53eaf4ba5be2a24e22e8a136a0814cce5c0d3c113e5d18a286fdd34a1b3cd46e509a7eec986f82d7d8ea9c SHA512 dd9373f93f165e576bd930ae4a49019d0c53359c4ef288c5d1ed5fc1033b82afff7d0421551eb9518bbfb3f25bc7cdab09cf89b1e0bd9c1ffe0137432d70b716
diff --git a/app-admin/checksec/checksec-1.7.5.ebuild b/app-admin/checksec/checksec-1.7.5.ebuild
new file mode 100644
index 000000000000..da34dcf8e557
--- /dev/null
+++ b/app-admin/checksec/checksec-1.7.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7.2-path.patch
+	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
+}
+
+src_install() {
+	default
+
+	doman extras/man/*
+
+	insinto /usr/share/zsh/site-functions
+	doins extras/zsh/_${PN}
+
+	dobin ${PN}
+}
diff --git a/app-admin/checksec/checksec-1.8.0.ebuild b/app-admin/checksec/checksec-1.8.0.ebuild
new file mode 100644
index 000000000000..eb85bc06b860
--- /dev/null
+++ b/app-admin/checksec/checksec-1.8.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7.2-path.patch
+	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
+}
+
+src_install() {
+	default
+
+	doman extras/man/*
+
+	insinto /usr/share/zsh/site-functions
+	doins extras/zsh/_${PN}
+
+	dobin ${PN}
+}
diff --git a/app-admin/checksec/files/checksec-1.7.2-path.patch b/app-admin/checksec/files/checksec-1.7.2-path.patch
new file mode 100644
index 000000000000..aa048b079d53
--- /dev/null
+++ b/app-admin/checksec/files/checksec-1.7.2-path.patch
@@ -0,0 +1,24 @@
+From 2065e51b255b5f9c014a0db35ffe5ce9ea946693 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 6 Jan 2016 17:28:36 +0100
+Subject: [PATCH] Extend ${PATH} so that sysctl is found
+
+---
+ checksec | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/checksec b/checksec
+index 3660e82..0ac685f 100755
+--- a/checksec
++++ b/checksec
+@@ -59,6 +59,7 @@
+ 
+ #set global lang to C
+ export LC_ALL="C"
++export PATH="${PATH}:/usr/sbin/"  # for sysctl
+ 
+ # global vars
+ debug=false
+-- 
+2.7.0
+
diff --git a/app-admin/checksec/metadata.xml b/app-admin/checksec/metadata.xml
new file mode 100644
index 000000000000..5d7a81f67440
--- /dev/null
+++ b/app-admin/checksec/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">slimm609/checksec.sh</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/chroot_safe-1.4 b/app-admin/chroot_safe-1.4
deleted file mode 100644
index 138ab7710ccc..000000000000
--- a/app-admin/chroot_safe-1.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=a tool to chroot any dynamically linked application in a safe and sane manner
-EAPI=4
-HOMEPAGE=http://chrootsafe.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=mirror://sourceforge/chrootsafe/chroot_safe-1.4.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5febd0d6ed2092231f946530e34af543
diff --git a/app-admin/chroot_safe/Manifest b/app-admin/chroot_safe/Manifest
new file mode 100644
index 000000000000..1bc4dd55817b
--- /dev/null
+++ b/app-admin/chroot_safe/Manifest
@@ -0,0 +1,4 @@
+AUX chroot_safe-1.4-ldflags.patch 399 BLAKE2B 3acacf5d552da06fd1907d988f113d96058efbd357cd4e6bbe514d8e8ed750b7931f3ea61a065cf605c42e3d7a21986da5d27e5b242cc0d594adcd6537b9893a SHA512 f5e3114b5d553f95d1b885d1ff43aee4d3cfb2d15a5d519818ff2f4c36fe099cdd27e6bd578dbf7ce957c38d8b329fd786f0efb22d0785197706e19892da2753
+DIST chroot_safe-1.4.tgz 25886 BLAKE2B 62247d568240a93914e5c42c3bfefd2e8793a9b6bd27c13668ff3cc48ec396b622553764e934045c0c570eeff7b15c5ae9fb7b3623c5661be537e79ce9d93287 SHA512 7eee0d8e2c75ccf4bd918f610c21511498a6499b638d09634993a4d6874882a0dbc8c27eea95e9776f1722593e3445399a893557bfa6398a11b85447564dfe61
+EBUILD chroot_safe-1.4.ebuild 783 BLAKE2B acdc573b676ce35d9cf686f15f33231099361986209e15a28ac05c17a1b487dfa7d689ecd0ae2e474a23f089f50c63972aa4673c2e2e406a652f4ce4f2dca909 SHA512 f5977571dfaf1f7e63cdd6d75bd7ba01986856e75bb73dcc49f0da6d08f9a127cfe56cb286026f3f504956994e238fa53cf571400f4fdcba2116b9935c455364
+MISC metadata.xml 247 BLAKE2B 306b96b46dafe605c41d3111cf9bd2fc3ef659f9f66692d05f952f8c9606d5bf1b1dd8051cdf1cd2d4e41f01934e57ae3e55ae46d23ba5acc2314d2fef325a4f SHA512 c46fc3160d29be2ce0948b1503ce44ead81dc76a264e183dc667be4e4f9bce0e235c94c2ebd06934b63cc7575aa8d5f27a528bb79185d35a138c7e0ec6dd1e3c
diff --git a/app-admin/chroot_safe/chroot_safe-1.4.ebuild b/app-admin/chroot_safe/chroot_safe-1.4.ebuild
new file mode 100644
index 000000000000..210b10565d66
--- /dev/null
+++ b/app-admin/chroot_safe/chroot_safe-1.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils multilib
+
+DESCRIPTION="a tool to chroot any dynamically linked application in a safe and sane manner"
+HOMEPAGE="http://chrootsafe.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN//_}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_configure() {
+	econf --libexecdir="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_compile() {
+	emake CPPFLAGS="${CXXFLAGS}" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	dolib.so chroot_safe.so
+	dosbin chroot_safe
+	sed -i -e "s:/chroot_safe::" "${ED}"/usr/sbin/chroot_safe \
+		|| die "sed chroot_safe failed"
+	doman chroot_safe.1
+	dodoc CHANGES.txt
+}
diff --git a/app-admin/chroot_safe/files/chroot_safe-1.4-ldflags.patch b/app-admin/chroot_safe/files/chroot_safe-1.4-ldflags.patch
new file mode 100644
index 000000000000..e9e94580ac42
--- /dev/null
+++ b/app-admin/chroot_safe/files/chroot_safe-1.4-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index ce69ab7..e8542b5 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -12,7 +12,7 @@ install=@INSTALL@
+ all: chroot_safe.so
+ 
+ chroot_safe.so: chroot_safe.cpp Makefile
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) $(SOFLAGS) -o chroot_safe.so $<
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(DEFINES) $(SOFLAGS) -o chroot_safe.so $<
+ 
+ clean:
+ 	rm -f *.o *.so *~
diff --git a/app-admin/chroot_safe/metadata.xml b/app-admin/chroot_safe/metadata.xml
new file mode 100644
index 000000000000..7c5fd5d3ecad
--- /dev/null
+++ b/app-admin/chroot_safe/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">chrootsafe</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/chrootuid-1.3-r1 b/app-admin/chrootuid-1.3-r1
deleted file mode 100644
index 175011c43330..000000000000
--- a/app-admin/chrootuid-1.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Run a network service at low privilege level and restricted file system access
-EAPI=4
-HOMEPAGE=ftp://ftp.porcupine.org/pub/security/index.html
-KEYWORDS=amd64 arm ia64 ppc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/pub/security/chrootuid1.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5b41ae1c28c0d4ca00fb8546b809b259
diff --git a/app-admin/chrootuid-1.3-r2 b/app-admin/chrootuid-1.3-r2
deleted file mode 100644
index 7436b2d3c719..000000000000
--- a/app-admin/chrootuid-1.3-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Run a network service at low privilege level and restricted file system access
-EAPI=7
-HOMEPAGE=ftp://ftp.porcupine.org/pub/security/index.html
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/pub/security/chrootuid1.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9af3669e224edd0f47baa724747a3f59
diff --git a/app-admin/chrootuid/Manifest b/app-admin/chrootuid/Manifest
new file mode 100644
index 000000000000..688080306525
--- /dev/null
+++ b/app-admin/chrootuid/Manifest
@@ -0,0 +1,4 @@
+DIST chrootuid1.3.tar.gz 5439 BLAKE2B 315be66360f8d81b77169cdac28171399492657d7a377bcf688c17cf82ed16b4042ead9dbf8e4c6149895c727f74fb4185bec867a93a14fea2c272cc1c7296ca SHA512 55ccc60e6010910466e700f9d0f2f666bc16ab72af3fbc1115916b4e005684d9ad28bc0b8b1cba3804ca68384c3b0fbe137114623eba70241eb8653325382a1f
+EBUILD chrootuid-1.3-r1.ebuild 623 BLAKE2B 6d059bf8b265c728dd13fdba0f890d06a69224f414f5b1774a1de2bb60d693b42489fdc4eb6af7e8028d3079901a698683ca19cc1772c369cc02c615701457ce SHA512 a31cc38602064d125b9ef6060d9a1d9ea15728501b4a36ed45b2e282d4be159e3632df1d6fa3747e5596321ee753de7864d3732b51e25628ba3040b21e29d76f
+EBUILD chrootuid-1.3-r2.ebuild 626 BLAKE2B d8c864b342c4ff1b6c4837a6209002821f18277cdc28bb347ea6086ca5a4a94d04e4aa9cf1e2278005da2bb6031a94fa4dffecefe507074c2470017b79a22435 SHA512 9898fea1bdc1f949dd974d27cad94fca8ea8e11948956d2828e0f2bded887f9d5bd8a7c845858aa4803745d183a80dc02b1e1bcc6fea52b76ce4029816a528c7
+MISC metadata.xml 222 BLAKE2B 49e8d7211eae902342acdd0ded674ae77affa878ee3ad2d1928f8988373fed091b4ab792823d739af897d5703bd67e36e19bb3c8295787123930b3b0aaf1fbda SHA512 a92bf1c4f983f2c7c834060538f86818a43cd13c06fda425d628a50b3f890fa3e6c36640a449df57af495ac39c3baf3560a4555cacd32c71f3dde533a992556a
diff --git a/app-admin/chrootuid/chrootuid-1.3-r1.ebuild b/app-admin/chrootuid/chrootuid-1.3-r1.ebuild
new file mode 100644
index 000000000000..4c7913e04081
--- /dev/null
+++ b/app-admin/chrootuid/chrootuid-1.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+MY_P="${P/-/}"
+
+DESCRIPTION="Run a network service at low privilege level and restricted file system access"
+HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
+SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ia64 ppc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dobin chrootuid
+	doman chrootuid.1
+	dodoc README chrootuid_license
+}
diff --git a/app-admin/chrootuid/chrootuid-1.3-r2.ebuild b/app-admin/chrootuid/chrootuid-1.3-r2.ebuild
new file mode 100644
index 000000000000..cdb02fef8c5a
--- /dev/null
+++ b/app-admin/chrootuid/chrootuid-1.3-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${P/-/}"
+
+DESCRIPTION="Run a network service at low privilege level and restricted file system access"
+HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
+SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dodoc README chrootuid_license
+	dobin chrootuid
+	doman chrootuid.1
+}
diff --git a/app-admin/chrootuid/metadata.xml b/app-admin/chrootuid/metadata.xml
new file mode 100644
index 000000000000..75fc762a7ae6
--- /dev/null
+++ b/app-admin/chrootuid/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hattya@gentoo.org</email>
+   </maintainer>
+</pkgmetadata>
diff --git a/app-admin/chrpath-0.13-r2 b/app-admin/chrpath-0.13-r2
deleted file mode 100644
index 247cb141c464..000000000000
--- a/app-admin/chrpath-0.13-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=chrpath can modify the rpath and runpath of ELF executables
-EAPI=6
-HOMEPAGE=http://directory.fsf.org/project/chrpath/
-IUSE=static-libs
-KEYWORDS=amd64 arm ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/chrpath/chrpath-0.13.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5edb946980248bea639032f6eb8f6b3c
diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest
new file mode 100644
index 000000000000..25d6bed03315
--- /dev/null
+++ b/app-admin/chrpath/Manifest
@@ -0,0 +1,6 @@
+AUX chrpath-0.13-multilib.patch 4129 BLAKE2B d6a2405751bba1774bd62ad3244928e0243c24825e986ed9e1531d28bd7521fb67fd5523365e574bfed1f8b404002afb76b89ec3e855fb6f5eababe042b5e360 SHA512 45f1a25a7abee84e955ffb13485480efb1f768cb225d35a57fae5fa6a75dac7d633aa7221aad81aa6fef2cf8f27f221dcaee972ad82e70677049f2f2fc6e9ff3
+AUX chrpath-0.13-testsuite-1.patch 575 BLAKE2B 0fa870a459c564a48ec82a86af46ca25afd52b98e9342b4690b876fcac18357fabe996fdb638378128596271f2855219de48b651903ec655316a166b746921e7 SHA512 0969af4defcf4b3650e4416c8d17d747f6a785b6a2f0cdd2105e6ff111c04ecbfc236c073e6f48096494b08c41d6077a332b02104ff3e07e60c542d706f7ef6c
+AUX chrpath-keepgoing.patch 1041 BLAKE2B d5ec2b6d482fbd42b2d3cd04626984c1d6ea0c5ca35d5aa25160bb6781a0bd534c637d90e19f8c873e12ad477b2f0d17d57f066401afd95fc0d82c4e3319ff12 SHA512 7bd459313f3cd83c86c63adf8a39df41c0454f6a689aab803d3211b5ffa295a72ce45a8ed7c3f61af0f705fc614c4ce48d86c6a5706b20c4d45265bbeafceb9c
+DIST chrpath-0.13.tar.gz 125129 BLAKE2B 004db7e3567ceeb700d018e7e32036843413605466c218bf40252927b169775c5a86f81f8ea355f0d141821313d114ec24654ed62d75443e31739118e31bc497 SHA512 9ec2ab2731fb553497996939b421130ae221d478dab8887c184ae91f7d3ae697688e7a30e3bea30cc0cf765f1dc8c7f47d2a1f4369b36079b4033e8d0303d75e
+EBUILD chrpath-0.13-r2.ebuild 1138 BLAKE2B 759093b1b0ac32ea57866d3266e7be4f14e24d16125e11531cacb627107a8ed48a4fdc4681fef51a6c6e964cf0d0ea5e5991ba4d58ef7075fd6e157457921eac SHA512 dc6d7b28af227b1ac365a3402a171a393ab7adb5e68b6fa764dfb61876b9d27717df3575fcf47f7febadbbb2c09b2094c24a5e52799ab618318ce06735bd1f15
+MISC metadata.xml 325 BLAKE2B 3d1e56e84a1ee9bfb3ab37bdce7fe7d4d2d74eca05ad6beee2f3d90da661f5bf59aa45dff767a72f210dcbdcff7818e41494a58e8c14183a6f11a9f59c0b073f SHA512 bc84447080d9969bb04b15981db6ef6cc35d7a38a796085a7397f5bf2f629ea97785828f895aeb8296e87977d40991a4dd5ffec9cf4ae2393f267afa8d3768c8
diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild
new file mode 100644
index 000000000000..ae32d8001b8c
--- /dev/null
+++ b/app-admin/chrpath/chrpath-0.13-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="chrpath can modify the rpath and runpath of ELF executables"
+HOMEPAGE="http://directory.fsf.org/project/chrpath/"
+# original upstream no longer exists (ftp://ftp.hungry.com/pub/hungry)
+SRC_URI="http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/chrpath/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-multilib.patch
+	"${FILESDIR}"/${PN}-keepgoing.patch
+	"${FILESDIR}"/${P}-testsuite-1.patch
+)
+
+src_prepare() {
+	default
+	# disable installing redundant docs in the wrong dir
+	sed -i -e '/doc_DATA/d' Makefile.am || die
+	# fix for automake-1.13, #467538
+	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static) || die
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		find "${D}" -name "*.la" -delete || die
+	fi
+}
diff --git a/app-admin/chrpath/files/chrpath-0.13-multilib.patch b/app-admin/chrpath/files/chrpath-0.13-multilib.patch
new file mode 100644
index 000000000000..e7db0a124053
--- /dev/null
+++ b/app-admin/chrpath/files/chrpath-0.13-multilib.patch
@@ -0,0 +1,160 @@
+Index: chrpath-0.13/Makefile.am
+===================================================================
+--- chrpath-0.13.orig/Makefile.am
++++ chrpath-0.13/Makefile.am
+@@ -12,12 +12,19 @@ debs:
+ 	fakeroot debian/rules binary
+ 
+ chrpath_SOURCES = \
+-	chrpath.c	\
+-	killrpath.c	\
+ 	main.c		\
+-	elf.c		\
+ 	protos.h
+ 
++chrpath_LDADD = $(LDLIBS)
++
++lib_LTLIBRARIES = libchrpath32.la libchrpath64.la
++libchrpath32_la_SOURCES = chrpath.c killrpath.c elf.c protos.h
++libchrpath32_la_CFLAGS = -DSIZEOF_VOID_P=4
++libchrpath32_la_LDFLAGS = -avoid-version
++libchrpath64_la_SOURCES = chrpath.c killrpath.c elf.c protos.h
++libchrpath64_la_CFLAGS = -DSIZEOF_VOID_P=8
++libchrpath64_la_LDFLAGS = -avoid-version
++
+ EXTRA_DIST = ChangeLog.usermap $(man_MANS)
+ 
+ CLEANFILES = *.bb *.bbg *.da *.gcov testsuite/*.bb testsuite/*.bbg
+Index: chrpath-0.13/configure.ac
+===================================================================
+--- chrpath-0.13.orig/configure.ac
++++ chrpath-0.13/configure.ac
+@@ -16,6 +16,7 @@ CHRPATH_LDRPATH_OPTION
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
++AC_PROG_LIBTOOL
+ 
+ dnl Checks for libraries.
+ 
+@@ -26,11 +27,19 @@ AC_CHECK_HEADERS([getopt.h elf.h fcntl.h
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_BIGENDIAN
+-AC_CHECK_SIZEOF(void *)
+ 
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS(getopt_long)
+ 
++dnl See if we need -ldl on this platform for dlopen
++LDLIBS=
++save_LIBS="$LIBS"
++LIBS=
++AC_SEARCH_LIBS([dlopen], [dl])
++LDLIBS=${LIBS}
++LIBS="${save_LIBS}"
++AC_SUBST([LDLIBS])
++
+ if eval "test x$GCC = xyes"; then
+   for flag in \
+       -ansi \
+Index: chrpath-0.13/main.c
+===================================================================
+--- chrpath-0.13.orig/main.c
++++ chrpath-0.13/main.c
+@@ -12,13 +12,19 @@
+ #  include "config.h"
+ #endif
+ 
++#include <dlfcn.h>
++#include <elf.h>
++#include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #ifdef HAVE_GETOPT_H
+ #include <getopt.h>
+ #endif
+-#include "protos.h"
++
++typedef int (*killrpath_t)(const char *filename);
++typedef int (*chrpath_t)(const char *filename, const char *newpath, int convert);
+ 
+ #ifdef HAVE_GETOPT_LONG
+ #  define GETOPT_LONG getopt_long
+@@ -61,6 +67,30 @@ usage(char *progname)
+   printf("\n");
+ }
+ 
++static unsigned
++elf_class(const char *filename)
++{
++   Elf32_Ehdr ehdr;
++   int fd;
++
++   fd = open(filename, O_RDONLY);
++   if (fd == -1)
++     return 0;
++   if (read(fd, &ehdr, sizeof(ehdr)) != sizeof(ehdr))
++   {
++     close(fd);
++     return 0;
++   }
++   close(fd);
++   if ((memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0)
++       || (ehdr.e_ident[EI_VERSION] != EV_CURRENT))
++   {
++     fprintf(stderr, "`%s' probably isn't an ELF file.\n", filename);
++     return 0;
++   }
++   return ehdr.e_ident[EI_CLASS];
++}
++
+ int
+ main(int argc, char * const argv[])
+ {
+@@ -73,6 +103,9 @@ main(int argc, char * const argv[])
+ #ifdef HAVE_GETOPT_LONG
+   int option_index = 0;
+ #endif /* HAVE_GETOPT_LONG */
++  void* dll[2];
++  killrpath_t killrpath[2];
++  chrpath_t chrpath[2];
+ 
+   if (argc < 2)
+     {
+@@ -116,14 +149,31 @@ main(int argc, char * const argv[])
+       }
+   } while (-1 != opt);
+ 
++  dll[0] = dlopen("libchrpath32.so", RTLD_LAZY);
++  killrpath[0] = (killrpath_t)dlsym(dll[0], "killrpath");
++  chrpath[0] = (chrpath_t)dlsym(dll[0], "chrpath");
++
++  dll[1] = dlopen("libchrpath64.so", RTLD_LAZY);
++  killrpath[1] = (killrpath_t)dlsym(dll[1], "killrpath");
++  chrpath[1] = (chrpath_t)dlsym(dll[1], "chrpath");
++
+   while (optind < argc && (!retval || keep_going))
+     {
++      const char* program = argv[optind++];
++      unsigned eclass = elf_class(program);
++      if (!eclass)
++      {
++        retval = 1;
++        continue;
++      }
+       if (remove)
+-        retval |= killrpath(argv[optind++]);
++        retval |= killrpath[eclass - ELFCLASS32](program);
+       else
+         /* list by default, replace if path is set */
+-        retval |= chrpath(argv[optind++], newpath, convert);
++        retval |= chrpath[eclass - ELFCLASS32](program, newpath, convert);
+     }
+ 
++  dlclose(dll[0]);
++  dlclose(dll[1]);
+   return retval;
+ }
diff --git a/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch b/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch
new file mode 100644
index 000000000000..1a30ce1eb94a
--- /dev/null
+++ b/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch
@@ -0,0 +1,19 @@
+Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
+Date: 2010-04-04
+Initial Package Version: 0.13
+Origin: me
+Upstream Status: unknown
+Description: make the testsuite run with the new mltilib design
+ 
+diff -Naur chrpath-0.13.orig/testsuite/runtest.sh chrpath-0.13/testsuite/runtest.sh
+--- chrpath-0.13.orig/testsuite/runtest.sh	2010-04-04 09:02:21.859114159 +0000
++++ chrpath-0.13/testsuite/runtest.sh	2010-04-04 09:42:08.762112560 +0000
+@@ -2,6 +2,8 @@
+ 
+ set -x
+ 
++export LD_LIBRARY_PATH=$PWD/../.libs:$LD_LIBRARY_PATH
++
+ CHRPATH=../chrpath
+ 
+ retval=0
diff --git a/app-admin/chrpath/files/chrpath-keepgoing.patch b/app-admin/chrpath/files/chrpath-keepgoing.patch
new file mode 100644
index 000000000000..d8f6965729ff
--- /dev/null
+++ b/app-admin/chrpath/files/chrpath-keepgoing.patch
@@ -0,0 +1,20 @@
+--- chrpath-0.13/main.c.orig	2006-02-27 20:21:06.000000000 +0100
++++ chrpath-0.13/main.c	2006-02-27 21:07:16.027641500 +0100
+@@ -57,6 +57,7 @@
+   printf("   -r <path>|--replace <path>  Replace current rpath/runpath setting\n");
+   printf("                               with the path given\n");
+   printf("   -l|--list                   List the current rpath/runpath (default)\n");
++  printf("   -k|--keepgoing              Continue as much as possible after an error.\n");
+   printf("   -h|--help                   Show this usage information.\n");
+ #ifndef HAVE_GETOPT_LONG
+   printf("\n *** The long options are not available on this platform");
+--- chrpath-0.13/chrpath.1.orig	2004-09-19 10:35:44.000000000 +0200
++++ chrpath-0.13/chrpath.1	2006-02-28 10:06:28.187060500 +0100
+@@ -22,6 +22,7 @@
+ [ \fB-r\fP \fI<path>\fP |\  \fB--replace\fP \fI<path>\fP ]
+ [ \fB-c\fP | \fB--convert\fP ]
+ [ \fB-l\fP | \fB--list\fP ]
++[ \fB-k\fP | \fB--keepgoing\fP ]
+ [ \fB-h\fP | \fB--help\fP ]
+ \fI<program>\fP [ \fI<program>\fP ... ]
+ .SH DESCRIPTION
diff --git a/app-admin/chrpath/metadata.xml b/app-admin/chrpath/metadata.xml
new file mode 100644
index 000000000000..ec89a074cbfa
--- /dev/null
+++ b/app-admin/chrpath/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+	</maintainer>
+<maintainer type="project">
+		<email>prefix@gentoo.org</email>
+		<name>Gentoo Prefix</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/cli53-0.8.12 b/app-admin/cli53-0.8.12
deleted file mode 100644
index 2f5eb8a92fba..000000000000
--- a/app-admin/cli53-0.8.12
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Command line tool for Amazon Route 53
-EAPI=6
-HOMEPAGE=https://github.com/barnybug/cli53
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/barnybug/cli53/archive/0.8.12.tar.gz -> cli53-0.8.12.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=60df1e9a4fd49892b05c301aa5cb4f97
diff --git a/app-admin/cli53-0.8.9 b/app-admin/cli53-0.8.9
deleted file mode 100644
index d98957a7fdb3..000000000000
--- a/app-admin/cli53-0.8.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Command line tool for Amazon Route 53
-EAPI=6
-HOMEPAGE=https://github.com/barnybug/cli53
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/barnybug/cli53/archive/0.8.9.tar.gz -> cli53-0.8.9.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=60df1e9a4fd49892b05c301aa5cb4f97
diff --git a/app-admin/cli53-9999 b/app-admin/cli53-9999
deleted file mode 100644
index 68791a65c07d..000000000000
--- a/app-admin/cli53-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Command line tool for Amazon Route 53
-EAPI=6
-HOMEPAGE=https://github.com/barnybug/cli53
-LICENSE=MIT
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b7e3100a7214716730162a9f7d815c9
diff --git a/app-admin/cli53/Manifest b/app-admin/cli53/Manifest
new file mode 100644
index 000000000000..0f9a929f8a1a
--- /dev/null
+++ b/app-admin/cli53/Manifest
@@ -0,0 +1,6 @@
+DIST cli53-0.8.12.tar.gz 973966 BLAKE2B 9011b036a2673a32170accf3be80d1e18d7fab4a1f83e0c3c9c84029e27a9aedc14642822e22bbeaafb12381bffb76c8ad926521bb68c3f6e2091de4730ebe18 SHA512 abe5e092fb570336b2d50099934d1cc5e722e394155b86de2dc2315df70eb1a89bb57f131913ec2dd588b6476c900c9d07daab0e8396e8364548f92651377fea
+DIST cli53-0.8.9.tar.gz 4372517 BLAKE2B 9780883159cb2fb4ecedee58e4df57d03e55576cb0d81cfadacf42fa7c7b679d21ad182bce5cc32652c102b4d663f162f3ac7bec520e9ec32bd12cc565ce28e5 SHA512 14db2d69feaa5af9e82c77b6c837be55a5d97e438eb6efbb71857fa1630ec1aa5ec77648d0979ce69ca8fcf72478b55c55c12a5e5dbac20415e656fd9c8d0beb
+EBUILD cli53-0.8.12.ebuild 673 BLAKE2B 60d775ad2c7d96f0f3a8cedd5d435b7c48951a0f40f3f34dbfbffda8e508e7ddb32ccbc87fa5c810fd4ace0d7ccd57616d35e3c5067085f11022065fe21fe26e SHA512 d4935cf863dd45b05d1c099af76943c6b79bb5ce6830d7c9b730e49cc0ed4e0169037291e9f193b445f4b5d58bd86f0b0441a6ea92bbe1d150ac3b2d01a03590
+EBUILD cli53-0.8.9.ebuild 673 BLAKE2B 60d775ad2c7d96f0f3a8cedd5d435b7c48951a0f40f3f34dbfbffda8e508e7ddb32ccbc87fa5c810fd4ace0d7ccd57616d35e3c5067085f11022065fe21fe26e SHA512 d4935cf863dd45b05d1c099af76943c6b79bb5ce6830d7c9b730e49cc0ed4e0169037291e9f193b445f4b5d58bd86f0b0441a6ea92bbe1d150ac3b2d01a03590
+EBUILD cli53-9999.ebuild 673 BLAKE2B 0c01340e0940c62c88fd486c97f85f0c2f01672bf853017a10593e7212f23f63e9cdcbbd18298d591ac6af4943af80ba3e86024f859c18ce32bb636ac3173092 SHA512 0fe48f48ede9500a63bbeb03f4da47aaa4235fb0fa2c29519b3860adda4c37a5a0e97587d5825ae75d97fedcef4fce5837662c7ccd88b2f6be9c3011cd73b201
+MISC metadata.xml 325 BLAKE2B 30e300a3cb064a2eaf04123f7e2943924e91515325d5b30c2a7aa2cc58b69f73ffb92c7da37a87eaf4e0925374234c7d6e1ea56634702879a8286b295fe64b74 SHA512 febb62ce8c56413c541726fdf6c61942a075b7c21d52ca24bb519fea2a271abc9034cc283f300fbf0458f73c6e5a4729308a3676899d0e5d3915d45939e88ad6
diff --git a/app-admin/cli53/cli53-0.8.12.ebuild b/app-admin/cli53/cli53-0.8.12.ebuild
new file mode 100644
index 000000000000..c2d625e1fc6d
--- /dev/null
+++ b/app-admin/cli53/cli53-0.8.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	inherit golang-vcs
+else
+	inherit golang-vcs-snapshot
+	SRC_URI="https://github.com/barnybug/cli53/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Command line tool for Amazon Route 53"
+HOMEPAGE="https://github.com/barnybug/cli53"
+
+LICENSE="MIT"
+SLOT="0"
+
+EGO_PN="github.com/barnybug/cli53"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" emake build
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}" go test -v || die
+}
+
+src_install() {
+	dobin cli53
+	dodoc CHANGELOG.md README.md
+}
diff --git a/app-admin/cli53/cli53-0.8.9.ebuild b/app-admin/cli53/cli53-0.8.9.ebuild
new file mode 100644
index 000000000000..c2d625e1fc6d
--- /dev/null
+++ b/app-admin/cli53/cli53-0.8.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	inherit golang-vcs
+else
+	inherit golang-vcs-snapshot
+	SRC_URI="https://github.com/barnybug/cli53/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Command line tool for Amazon Route 53"
+HOMEPAGE="https://github.com/barnybug/cli53"
+
+LICENSE="MIT"
+SLOT="0"
+
+EGO_PN="github.com/barnybug/cli53"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" emake build
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}" go test -v || die
+}
+
+src_install() {
+	dobin cli53
+	dodoc CHANGELOG.md README.md
+}
diff --git a/app-admin/cli53/cli53-9999.ebuild b/app-admin/cli53/cli53-9999.ebuild
new file mode 100644
index 000000000000..6b40b7aa8485
--- /dev/null
+++ b/app-admin/cli53/cli53-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	inherit golang-vcs
+else
+	inherit golang-vcs-snapshot
+	SRC_URI="https://github.com/barnybug/cli53/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Command line tool for Amazon Route 53"
+HOMEPAGE="https://github.com/barnybug/cli53"
+
+LICENSE="MIT"
+SLOT="0"
+
+EGO_PN="github.com/barnybug/cli53"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" emake build
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}" go test -v || die
+}
+
+src_install() {
+	dobin cli53
+	dodoc CHANGELOG.md README.md
+}
diff --git a/app-admin/cli53/metadata.xml b/app-admin/cli53/metadata.xml
new file mode 100644
index 000000000000..236c772d21c3
--- /dev/null
+++ b/app-admin/cli53/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">barnybug/cli53</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/clog-1.3.0 b/app-admin/clog-1.3.0
deleted file mode 100644
index 5b01b57d13c9..000000000000
--- a/app-admin/clog-1.3.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=clog is a colorized log tail utility
-EAPI=6
-HOMEPAGE=https://taskwarrior.org/docs/clog/
-KEYWORDS=~amd64 ~x86 ~x64-macos ~amd64-fbsd
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://tasktools.org/download/clog-1.3.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05351df9e6c44969307bdf06cc20fc52
diff --git a/app-admin/clog/Manifest b/app-admin/clog/Manifest
new file mode 100644
index 000000000000..faa26bc2de05
--- /dev/null
+++ b/app-admin/clog/Manifest
@@ -0,0 +1,3 @@
+DIST clog-1.3.0.tar.gz 705807 BLAKE2B 5e78cf1ed209ef7dae301175e11048eec3e9227ca740ae444a0302e5ee40af260349c9b02d8fe86a159c2db9bc29b5854240000f793e868b270a5852eb552229 SHA512 dfd4ae9c5e31be1620c246edd4b1642ff2351589da04c4fb805d3566e3efe0958ba6978fea567d40b7faeb217ba9f7b42b201a059f939c35564ee8f40b8b452a
+EBUILD clog-1.3.0.ebuild 357 BLAKE2B e124263196aaadc8c034a0ba5d517547889a1bbb8f6ac8aa8eb50921af8028d1ec9bd3a0956bca863f76661ae9990e113513e46f111c1c9b8ee8c7a8fdfb7b00 SHA512 75619f204275b6c3b83ec889566c72b93ba8ee9982a401ee2751c56bd803fb497c6fa5dbe65986a1ab03912ee10d35df0f031b4084f064a3e9d9b245e5d118c6
+MISC metadata.xml 247 BLAKE2B 481f340933d489b2df2b718152ba79fac9d5561acac95070086d5abcd5c5bcca3d9e33eb3b2e56a9fa87978cff3ea33127e0672b3e721f71058eff43ef04acfb SHA512 f7f4f34a879fe0fee0e2054e2c47ed3348c773c96767475a8587272825b7af88a610f35ac2fe22fcba6d973acea82e073dcf3bb3abe0b6b9acbb2dc9c543db24
diff --git a/app-admin/clog/clog-1.3.0.ebuild b/app-admin/clog/clog-1.3.0.ebuild
new file mode 100644
index 000000000000..6b2025e3985b
--- /dev/null
+++ b/app-admin/clog/clog-1.3.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="clog is a colorized log tail utility"
+HOMEPAGE="https://taskwarrior.org/docs/clog/"
+SRC_URI="https://tasktools.org/download/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~x64-macos ~amd64-fbsd"
+LICENSE="MIT"
+SLOT="0"
diff --git a/app-admin/clog/metadata.xml b/app-admin/clog/metadata.xml
new file mode 100644
index 000000000000..143be88f0726
--- /dev/null
+++ b/app-admin/clog/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alicef@gentoo.org</email>
+		<name>Alice Ferrazzi</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/clsync-0.4.1 b/app-admin/clsync-0.4.1
deleted file mode 100644
index 9036e74521c7..000000000000
--- a/app-admin/clsync-0.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=dev-libs/glib:2 cgroups? ( dev-libs/libcgroup ) mhash? ( app-crypt/mhash ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Live sync tool based on inotify, written in GNU C
-EAPI=5
-HOMEPAGE=https://github.com/xaionaro/clsync http://ut.mephi.ru/oss/clsync
-IUSE=+caps cluster control-socket cgroups debug extra-debug extra-hardened gio hardened +highload-locks +inotify mhash namespaces seccomp kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 cgroups? ( dev-libs/libcgroup ) mhash? ( app-crypt/mhash ) ~app-doc/clsync-docs-0.4.1
-REQUIRED_USE=|| ( gio inotify ) extra-debug? ( debug ) extra-hardened? ( hardened ) mhash? ( cluster ) seccomp? ( caps )
-SLOT=0
-SRC_URI=https://github.com/xaionaro/clsync/archive/v0.4.1.tar.gz -> clsync-0.4.1.tar.gz https://dev.gentoo.org/~bircoph/patches/clsync-0.4.1-20150524-v2.patch.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=74cd3e136e59eaff75c8debf6b251446
diff --git a/app-admin/clsync-0.4.2 b/app-admin/clsync-0.4.2
deleted file mode 100644
index 0ac65afb8965..000000000000
--- a/app-admin/clsync-0.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=dev-libs/glib:2 cgroups? ( dev-libs/libcgroup ) mhash? ( app-crypt/mhash ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Live sync tool based on inotify, written in GNU C
-EAPI=6
-HOMEPAGE=https://github.com/xaionaro/clsync http://ut.mephi.ru/oss/clsync
-IUSE=+caps cluster control-socket cgroups debug extra-debug extra-hardened gio hardened +highload-locks +inotify mhash namespaces seccomp kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 cgroups? ( dev-libs/libcgroup ) mhash? ( app-crypt/mhash ) ~app-doc/clsync-docs-0.4.2
-REQUIRED_USE=|| ( gio inotify ) extra-debug? ( debug ) extra-hardened? ( hardened ) mhash? ( cluster ) seccomp? ( caps )
-SLOT=0
-SRC_URI=https://github.com/xaionaro/clsync/archive/v0.4.2.tar.gz -> clsync-0.4.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=827d83c4118b8b652002c282ee41f2b6
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
new file mode 100644
index 000000000000..4f5a18638f12
--- /dev/null
+++ b/app-admin/clsync/Manifest
@@ -0,0 +1,9 @@
+AUX clsync.conf 589 BLAKE2B fb7736b0972c91916770c6cfca693267bdf0cb3f6ad540388967c80fe609579fe458c40d71622fde0c2a3709530419536d1c358035637b2309ecde71892ee448 SHA512 46d8d786378eed0bfa46195e45f764015258ba55b35a5acf2685967e9fbd1fc7656c6aeba26b06889fa2f7c62cb11ecb84b10b856356ea3c0d463eaa4980c33d
+AUX clsync.confd 645 BLAKE2B f2e2f70f5a88ea3a416f4151637d63f79cce483b499ee0c1b5005ef8e9d16558f0d1c23ddd182335f7e963172bafaf4b41a37c1288f7fe55e7a57e2868418ae1 SHA512 75dcc49d51f6da94d42eb501f1ad2868f163405dd7aa933f4c8078ec18f5b54eb6c66ff796ee744f7751699162627af843edbe5de5adf99c23712cedaebaddc5
+AUX clsync.initd 555 BLAKE2B 18b3f0e1e8e079eb306709d2b55b99100ce3efa852f285d7ac9acd4269fe41e0fe5d1b7c12fa966dc01f60a598d6178cf5c8b6a2cd21410bdcf0f66c1facf1d2 SHA512 a5ee987466dec0e8ca7ce2502bd71d000419e03f33e1585e47fa5d91fdb5321f949f3d3ca566e68a0aedcc50ab6a84a92210aa866520d1703805958a2bfa270a
+DIST clsync-0.4.1-20150524-v2.patch.xz 13632 BLAKE2B 422ec7dc05c2f21aa96c397efa7ce1079b882d5ec4ce14beb8ce5e308e134142dcc557857ff8162b5fba84d8eaa078016794ed26433427d6a80e4e4f81fd90a8 SHA512 d39c3c4f116eff2365668374ef62f4dfd8e5926267cbbf36b430f97ad5306f92cf6be3164c0e1c3d959db55453f5ded00d98d48af62f9eacde39a9f9667cfbf9
+DIST clsync-0.4.1.tar.gz 253890 BLAKE2B c8aada690635f1cac355a1eaa51f4379688b0005869c5dcd6edccf5ae8e86abddf9ff99ccfcffeb165ccc80f407087a3f0863d1b78279894ff410daf25467740 SHA512 875280f706026d44806b92c22fa58d016136b2792f67a6b7e77f932465081da7a1ebaf22c25e538e4b58bfe04cd1cd5450ecab99c3df53ddd2a0fa966442d444
+DIST clsync-0.4.2.tar.gz 256042 BLAKE2B 28474fc66341b93705a502fcff390e3affcd89a9e1eb272dce9b28be709562e09c03e9c300cfeb5371e2e618a2239468a58c46212a39d751fbbfddeaab12bcf6 SHA512 d14a2efc4bf58d9d5c7a3fe5634cacdd182cd7cd814b0e9ebd99024a7282b056d1f7ceeec6903666391c3572d599a18e205af818b098ed7768d5c0e0f4cd1200
+EBUILD clsync-0.4.1.ebuild 3051 BLAKE2B c70ff1c28fe6e5ad077d00e004894e20f9a683da431191484bb9b6c6671637940a76255f2bb64382aeb08b67364f8b203159b5f51b6f622e965ce12722129656 SHA512 db6893a5290741d7d42225875c145cc9b783fb722f7484b5393752c43e64f65b53287c3e4a3156f46013a3045514df997e3f49501f82795715f71601e2a49ca2
+EBUILD clsync-0.4.2.ebuild 2793 BLAKE2B 4b72e721e319ec0187a6ca38b3d90cdbec4385a654ad97bbf26a55ebfa433650ac212cc33ca41481b434ce9dcb20245ce58ca2d47faf7a03cb9ffb1372c77a2e SHA512 380171a754b0d590a14c4977f811198168dbd7f47d735692d3df5766ebabbcf746126a54cb7b0181628ef787777db250f909230d662ab3badaa672c49236e191
+MISC metadata.xml 1757 BLAKE2B e907cb32524743bc5571eddc4d0c7a30b51b82f49f72405939110e3085a8561b55e5927950be83ae3a647418479183aeae8491092ba8e5432a7633365f769e2a SHA512 6f853983a4886bbacb2fe1e26b728ba5d86b05f348b6df2cf0779725ef11623f73274829605b88aacd4300b4cb28ff6fbeead916c8dd01f4a07c9780218f1bfa
diff --git a/app-admin/clsync/clsync-0.4.1.ebuild b/app-admin/clsync/clsync-0.4.1.ebuild
new file mode 100644
index 000000000000..c037951819d2
--- /dev/null
+++ b/app-admin/clsync/clsync-0.4.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xaionaro/${PN}.git"
+else
+	PVER="20150524-v2"
+	SRC_URI="
+		https://github.com/xaionaro/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~bircoph/patches/${P}-${PVER}.patch.xz
+	"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools eutils linux-info
+
+DESCRIPTION="Live sync tool based on inotify, written in GNU C"
+HOMEPAGE="https://github.com/xaionaro/clsync http://ut.mephi.ru/oss/clsync"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+caps cluster control-socket cgroups debug extra-debug
+extra-hardened gio hardened +highload-locks +inotify mhash
+namespaces seccomp"
+
+REQUIRED_USE="
+	|| ( gio inotify )
+	extra-debug? ( debug )
+	extra-hardened? ( hardened )
+	mhash? ( cluster )
+	seccomp? ( caps )
+"
+CDEPEND="
+	dev-libs/glib:2
+	cgroups? ( dev-libs/libcgroup )
+	mhash? ( app-crypt/mhash )
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	~app-doc/clsync-docs-${PV}
+"
+
+pkg_pretend() {
+	use namespaces && CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
+	use seccomp && CONFIG_CHECK+=" ~SECCOMP"
+	check_extra_config
+}
+
+src_prepare() {
+	# upstream fixes for 0.4.1
+	epatch "${WORKDIR}/${P}-${PVER}.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local harden_level=0
+	use hardened && harden_level=1
+	use extra-hardened && harden_level=2
+
+	local debug_level=0
+	use debug && debug_level=1
+	use extra-debug && debug_level=2
+
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-socket-library \
+		--enable-clsync \
+		--enable-debug=${debug_level} \
+		--enable-paranoid=${harden_level} \
+		--without-bsm \
+		--without-kqueue \
+		$(use_enable caps capabilities) \
+		$(use_enable cluster) \
+		$(use_enable control-socket socket) \
+		$(use_enable highload-locks) \
+		$(use_enable namespaces unshare) \
+		$(use_enable seccomp) \
+		$(use_with cgroups libcgroup) \
+		$(use_with gio gio lib) \
+		$(use_with inotify inotify native) \
+		$(use_with mhash)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# docs go into clsync-docs
+	rm -rf "${ED}/usr/share/doc" || die
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	# filter rules and sync scripts are supposed to be here
+	keepdir "${EPREFIX}/etc/${PN}"
+	insinto "/etc/${PN}"
+	newins "${FILESDIR}/${PN}.conf" "${PN}.conf"
+}
+
+pkg_postinst() {
+	einfo "${PN} is just a convenient way to run synchronization tools on live data,"
+	einfo "it doesn't copy data itself, so you need to install software to do actual"
+	einfo "data transfer. Usually net-misc/rsync is a good choise, but ${PN} is"
+	einfo "is flexible enough to use any user tool, see manual page for details."
+	einfo
+	einfo "${PN} init script can be multiplexed, to use symlink init script to"
+	einfo "othername and use conf.d/othername to configure it."
+	einfo
+	einfo "If you're interested in improved security, enable"
+	einfo "USE=\"caps cgroups hardened namespaces seccomp\""
+}
diff --git a/app-admin/clsync/clsync-0.4.2.ebuild b/app-admin/clsync/clsync-0.4.2.ebuild
new file mode 100644
index 000000000000..d0e9c3ece979
--- /dev/null
+++ b/app-admin/clsync/clsync-0.4.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils linux-info
+
+DESCRIPTION="Live sync tool based on inotify, written in GNU C"
+HOMEPAGE="https://github.com/xaionaro/clsync http://ut.mephi.ru/oss/clsync"
+SRC_URI="https://github.com/xaionaro/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+caps cluster control-socket cgroups debug extra-debug
+extra-hardened gio hardened +highload-locks +inotify mhash
+namespaces seccomp"
+
+REQUIRED_USE="
+	|| ( gio inotify )
+	extra-debug? ( debug )
+	extra-hardened? ( hardened )
+	mhash? ( cluster )
+	seccomp? ( caps )
+"
+CDEPEND="
+	dev-libs/glib:2
+	cgroups? ( dev-libs/libcgroup )
+	mhash? ( app-crypt/mhash )
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	~app-doc/clsync-docs-${PV}
+"
+
+pkg_pretend() {
+	use namespaces && CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
+	use seccomp && CONFIG_CHECK+=" ~SECCOMP"
+	check_extra_config
+}
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local harden_level=0
+	use hardened && harden_level=1
+	use extra-hardened && harden_level=2
+
+	local debug_level=0
+	use debug && debug_level=1
+	use extra-debug && debug_level=2
+
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-socket-library \
+		--enable-clsync \
+		--enable-debug=${debug_level} \
+		--enable-paranoid=${harden_level} \
+		--without-bsm \
+		--without-kqueue \
+		$(use_enable caps capabilities) \
+		$(use_enable cluster) \
+		$(use_enable control-socket socket) \
+		$(use_enable highload-locks) \
+		$(use_enable namespaces unshare) \
+		$(use_enable seccomp) \
+		$(use_with cgroups libcgroup) \
+		$(use_with gio gio lib) \
+		$(use_with inotify inotify native) \
+		$(use_with mhash)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# docs go into clsync-docs
+	rm -rf "${ED}/usr/share/doc" || die
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	# filter rules and sync scripts are supposed to be here
+	keepdir "${EPREFIX}/etc/${PN}"
+	insinto "/etc/${PN}"
+	newins "${FILESDIR}/${PN}.conf" "${PN}.conf"
+}
+
+pkg_postinst() {
+	einfo "${PN} is just a convenient way to run synchronization tools on live data,"
+	einfo "it doesn't copy data itself, so you need to install software to do actual"
+	einfo "data transfer. Usually net-misc/rsync is a good choise, but ${PN} is"
+	einfo "is flexible enough to use any user tool, see manual page for details."
+	einfo
+	einfo "${PN} init script can be multiplexed, to use symlink init script to"
+	einfo "othername and use conf.d/othername to configure it."
+	einfo
+	einfo "If you're interested in improved security, enable"
+	einfo "USE=\"caps cgroups hardened namespaces seccomp\""
+}
diff --git a/app-admin/clsync/files/clsync.conf b/app-admin/clsync/files/clsync.conf
new file mode 100644
index 000000000000..91f38f17cd5c
--- /dev/null
+++ b/app-admin/clsync/files/clsync.conf
@@ -0,0 +1,18 @@
+# clsync system configuration file
+#
+# General recommendations:
+# 1. Put --dir-lists on tmpfs.
+# 2. Use --uid and --gid to drop privileges whenever possible.
+# 3. Keeep your clsync rules and sync scripts in /etc/clsync/.
+
+[default]
+# Put your options here, see clsync man pages for a list of valid options.
+# Also check examples directory (/usr/share/doc/clsync-*/examples).
+#
+#watch-dir       = /what/dir/to/sync
+#sync-handler    = /etc/clsync/action.sh
+#rules-dir       = /etc/clsync/rules
+#lists-dir       = /tmp/clsync
+#threading       = safe
+#delay-sync      = 5
+#delay-collect   = 5
diff --git a/app-admin/clsync/files/clsync.confd b/app-admin/clsync/files/clsync.confd
new file mode 100644
index 000000000000..389f84e5d4b9
--- /dev/null
+++ b/app-admin/clsync/files/clsync.confd
@@ -0,0 +1,20 @@
+# /etc/conf.d/clsync: config file for /etc/init.d/clsync
+
+# config file, default is /etc/clsync/clsync.conf.
+# to disable set to /dev/null
+#CLSYNC_CONF="/etc/clsync/clsync.conf"
+
+# clsync options, have precedence over config file,
+# see man clsync and $docdir/examples for details
+#CLSYNC_OPTS=""
+
+# Example of direct rsync usage:
+#CLSYNC_OPTS="--lists-dir /tmp/clsync --mode rsyncshell
+#--watch-dir /source/dir --sync-handler /usr/bin/rsync 
+#--rules-file /etc/clsync/rules --distination-dir /destination/dir"
+
+# Change clsync nice level (default is unset)
+#CLSYNC_NICE="0"
+
+# Change clsync ionice level (default is unset)
+#CLSYNC_IONICE="2:7"
diff --git a/app-admin/clsync/files/clsync.initd b/app-admin/clsync/files/clsync.initd
new file mode 100644
index 000000000000..28175a5fb696
--- /dev/null
+++ b/app-admin/clsync/files/clsync.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+[ -n "${CLSYNC_CONF}" ] && conffile="--config-file ${CLSYNC_CONF}"
+[ -n "${CLSYNC_NICE}" ] && cmd_nice="--nice ${CLSYNC_NICE}"
+[ -n "${CLSYNC_IONICE}" ] && cmd_ionice="--ionice ${CLSYNC_IONICE}"
+
+command="/usr/bin/clsync"
+pidfile="/var/run/${SVCNAME}.pid"
+command_args="--background --output=syslog --pid-file=${pidfile} \
+${conffile} ${CLSYNC_OPTS}"
+start_stop_daemon_args="${cmd_nice} ${cmd_ionice}"
+
+depend() {
+    use net
+}
diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml
new file mode 100644
index 000000000000..9cbe60e8159c
--- /dev/null
+++ b/app-admin/clsync/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <longdescription>
+  Clsync recursively watches for source directory and executes external
+  program to sync the changes. Clsync is adapted to be used together with rsync.
+  This utility is much more lightweight than competitors and supports such
+  features as separate queue for big files, regex file filter, multi-threading
+  and multicast notifing clsync instances on another nodes to prevent loop
+  syncing. Clsync can use advanced features for isolation: capabilities, cgroups,
+  namespaces, seccomp, code hardening.
+</longdescription>
+  <use>
+    <flag name="cluster">Enable clustering support (allows master-master clsync on multiple hosts). Not fully implemented yet.</flag>
+    <flag name="control-socket">Enable AF_UNIX control socket support.</flag>
+    <flag name="cgroups">Use cgroups to limit /dev access.</flag>
+    <flag name="extra-debug">Enable extra debugging. This will hurt performance badly. Be ready for tons of output.</flag>
+    <flag name="extra-hardened">Enable extra security checks. This will hurt performance.</flag>
+    <flag name="gio">Enable GIO for FS monitoring (glib based alternative to inotify interface, not recommended; if both are compiled, may be selected at runtime).</flag>
+    <flag name="highload-locks">Allows to use spinlocks for short delays instead of mutexes, but only on SMP systems.</flag>
+    <flag name="namespaces">Enable namespaces isolation.</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">xaionaro/clsync</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/clustershell-1.6 b/app-admin/clustershell-1.6
deleted file mode 100644
index 675c021c83aa..000000000000
--- a/app-admin/clustershell-1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python framework for efficient cluster administration
-EAPI=5
-HOMEPAGE=https://cea-hpc.github.com/clustershell/
-IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=CeCILL-C
-RDEPEND=dev-libs/openssl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.6.tar.gz -> clustershell-1.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5238b0e23eb3f3bdf428f11507e8482c
diff --git a/app-admin/clustershell-1.6-r1 b/app-admin/clustershell-1.6-r1
deleted file mode 100644
index a05882126ede..000000000000
--- a/app-admin/clustershell-1.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python framework for efficient cluster administration
-EAPI=5
-HOMEPAGE=https://cea-hpc.github.com/clustershell/
-IUSE=doc libressl python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=CeCILL-C
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.6.tar.gz -> clustershell-1.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=52c1ad36e8e704af11dd98ed8639ce1e
diff --git a/app-admin/clustershell-1.7.3 b/app-admin/clustershell-1.7.3
deleted file mode 100644
index 42ca10a746d2..000000000000
--- a/app-admin/clustershell-1.7.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python framework for efficient cluster administration
-EAPI=6
-HOMEPAGE=https://cea-hpc.github.com/clustershell/
-IUSE=doc libressl test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.7.3.tar.gz -> clustershell-1.7.3.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6844bdac3679624cee682ee181e0d21f
diff --git a/app-admin/clustershell/Manifest b/app-admin/clustershell/Manifest
new file mode 100644
index 000000000000..8599ad260b02
--- /dev/null
+++ b/app-admin/clustershell/Manifest
@@ -0,0 +1,6 @@
+DIST clustershell-1.6.tar.gz 950548 BLAKE2B e6b2eb236537b23e86f0942b56db3bab7d970870febe76b7dd80719f90d5cd8ac5c0b059695110f966fc3423b77c289c0b951e8c329f33905175004ee811b723 SHA512 d94979bf5b5ead406f49e4ba691cf8541c03398913eb2fb9da724f50ba8b47059b76ddb6058dc5aaea86bbc8588b4d9c75cc34a8a7a94dcfa184ca73250c3b02
+DIST clustershell-1.7.3.tar.gz 345447 BLAKE2B 45bf059670a71724d8614f9b084c5e865daa1fb8dd2268e572d1a30b4d69259162fda8ee22eb2cc22261773c4e34849d345147de76c1628422f6c326b746724d SHA512 acb8e8a5b4a576ee93fbe23a8d903bab813f4182b50d9cd752b3684c743e611d3ee3fcfde31818c0a92495a3ee7640094d4568a03fdbf543e398a1b741a978d4
+EBUILD clustershell-1.6-r1.ebuild 953 BLAKE2B 29d90f4d32e0dde737806c2d7a59c6891b0d3734ceda694f369ab9685a42f9a922d1f7541aa41f8fbb56428ea329dc36fa50143cc8ab83aa5d3955cb8f6f7030 SHA512 cd8694812a01006f3f66a797bad01037e22d28a581c286fa0d22fb1ad44bf13ee3c44278d1c575b609854094aac2f928df62a38d82661157935ce96c15ad9269
+EBUILD clustershell-1.6.ebuild 886 BLAKE2B f9bb4cbafde98c9c7e6bc217ec8b77664f9fdf2e92a51d4314a31ff945ca467e199a5bb63712b598a390eeae4780bc6032b5db3392500bf7d670688035cdf68c SHA512 4a87ed707eb37cee226e8e8e432e9445398903cf4df8d2a66447383b60ce481e048de427b8d7fc8c5d27742ea6a8c526d444581dbe43e26b35eb5a1a703ddff5
+EBUILD clustershell-1.7.3.ebuild 1178 BLAKE2B f34c186c9d67313ecd36c3f30e738d49cbd06b40a0554742963bbcf57b3a63b391d713e48b3e98b42122c5afbd6ea71ebf35512852ef5f8472e03fdf967e8339 SHA512 acb24ccfff54f345d031380cf344db5a8e27b31ec294b299d226d71547df80b1bcc2670ee30f55e1bffaf1e204f7d3b30ad5a482731bad2f847ea162c4f0e4e7
+MISC metadata.xml 257 BLAKE2B ab7ed946089a6a737244d144e97b9ab34ee6bf812bb341a994d1a3552d15c20186311322905354baa6353bed45b2248709e801558bc4c64a207a204f7e374e92 SHA512 a24cf6411331ed58ac1395d5f10e85530bbe2f7d9ca09121ac8e3ed3b518ad8b31ad50adb903404b41749c089bda33aa34bd28d8ba0da0b1f1b36620674e77be
diff --git a/app-admin/clustershell/clustershell-1.6-r1.ebuild b/app-admin/clustershell/clustershell-1.6-r1.ebuild
new file mode 100644
index 000000000000..faa5e3e63f9c
--- /dev/null
+++ b/app-admin/clustershell/clustershell-1.6-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: test phase
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+inherit distutils-r1
+
+DESCRIPTION="Python framework for efficient cluster administration"
+HOMEPAGE="https://cea-hpc.github.com/clustershell/"
+SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+
+	if use doc ; then
+		local i
+		for i in $(ls -I man "${S}"/doc) ; do
+			dodoc -r doc/${i}
+		done
+	fi
+
+	doman doc/man/man*/*
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Some default system-wide config files have been installed into"
+	einfo "/etc/${PN}"
+	einfo
+}
diff --git a/app-admin/clustershell/clustershell-1.6.ebuild b/app-admin/clustershell/clustershell-1.6.ebuild
new file mode 100644
index 000000000000..6a13780d51c7
--- /dev/null
+++ b/app-admin/clustershell/clustershell-1.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: test phase
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+inherit distutils-r1
+
+DESCRIPTION="Python framework for efficient cluster administration"
+HOMEPAGE="https://cea-hpc.github.com/clustershell/"
+SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CeCILL-C"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/openssl"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+
+	if use doc ; then
+		local i
+		for i in $(ls -I man "${S}"/doc) ; do
+			dodoc -r doc/${i}
+		done
+	fi
+
+	doman doc/man/man*/*
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Some default system-wide config files have been installed into"
+	einfo "/etc/${PN}"
+	einfo
+}
diff --git a/app-admin/clustershell/clustershell-1.7.3.ebuild b/app-admin/clustershell/clustershell-1.7.3.ebuild
new file mode 100644
index 000000000000..3756006e28cf
--- /dev/null
+++ b/app-admin/clustershell/clustershell-1.7.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: test phase
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+inherit distutils-r1
+
+DESCRIPTION="Python framework for efficient cluster administration"
+HOMEPAGE="https://cea-hpc.github.com/clustershell/"
+SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc libressl test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND="${CDEPEND}
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+
+RESTRICT="test" # currently fail
+
+src_install() {
+	distutils-r1_src_install
+
+	if use doc ; then
+		local i
+		for i in $(ls -I man "${S}"/doc) ; do
+			dodoc -r doc/${i}
+		done
+	fi
+
+	doman doc/man/man*/*
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	cd tests || die
+	nosetests -sv --all-modules || die
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Some default system-wide config files have been installed into"
+	einfo "/etc/${PN}"
+	einfo
+}
diff --git a/app-admin/clustershell/metadata.xml b/app-admin/clustershell/metadata.xml
new file mode 100644
index 000000000000..5d5942742693
--- /dev/null
+++ b/app-admin/clustershell/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="github">cea-hpc/clustershell</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/conky-1.10.4 b/app-admin/conky-1.10.4
deleted file mode 100644
index 95c77a4a64e5..000000000000
--- a/app-admin/conky-1.10.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( >=virtual/mysql-5.0 ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 app-text/docbook2X sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An advanced, highly configurable system monitor for X
-EAPI=6
-HOMEPAGE=https://github.com/brndnmtthws/conky
-IUSE=apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax weather-metar weather-xoap webserver wifi X xmms2 kernel_linux
-KEYWORDS=alpha amd64 ~arm ppc ppc64 sparc x86
-LICENSE=GPL-3 BSD LGPL-2.1 MIT
-RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( >=virtual/mysql-5.0 ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.4.tar.gz -> conky-1.10.4.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=abec6c50df26a139da1af85505e2564b
diff --git a/app-admin/conky-1.10.8-r1 b/app-admin/conky-1.10.8-r1
deleted file mode 100644
index d420ac565b90..000000000000
--- a/app-admin/conky-1.10.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( >=virtual/mysql-5.0 ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 app-text/docbook2X sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An advanced, highly configurable system monitor for X
-EAPI=6
-HOMEPAGE=https://github.com/brndnmtthws/conky
-IUSE=apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax weather-metar weather-xoap webserver wifi X xmms2 kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~ppc ppc64 sparc x86
-LICENSE=GPL-3 BSD LGPL-2.1 MIT
-RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( >=virtual/mysql-5.0 ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=261e47616363518e7986bfecbb8e8aba
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
new file mode 100644
index 000000000000..3e724c483054
--- /dev/null
+++ b/app-admin/conky/Manifest
@@ -0,0 +1,7 @@
+AUX conky-1.10.4-x11-build.patch 944 BLAKE2B eafeab1078e1c1c96190dce1207f49272a86fb964b153cd971d3e773ddfb8094a55b0c8e77f0d152c5cc4ec77f0863b694fca8d776208f2aae26d6366cc898ef SHA512 4ef0fb7467101befd1adbc0ae43268d69ceaa35af0185ade1f3b8ce4ebe8d8083cc6c71ddabae73bae1c5f92f5f95b0a4595dd92dd55bd9ffc4a34d10af26afa
+AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
+DIST conky-1.10.4.tar.gz 365145 BLAKE2B 60f6f53ef67a9958d4dd4c3f1ab53886235927ed457ad3e98d2f6f61568a14baa7cd2afa0d3ddde9ed5e16aae17891213d906f49c308269f678adf37ea627329 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c
+DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
+EBUILD conky-1.10.4.ebuild 4850 BLAKE2B 4d7e00ca639cfc5eed0b80f2ddb473e2979014e2564c684a07e0d4647612ee53c0cee16e6d2806e25a70c0725521678a04d5e43cc3544d4612fee749bbf50510 SHA512 612694ed4db70e8198f6a5b4110f972ab09dff8e3f8619367db3e2697dce97d22fae09b971b3c7800b150f744e86a3268c0999f4e1f3ed3f3041bb32dbbb7663
+EBUILD conky-1.10.8-r1.ebuild 5185 BLAKE2B f35554a27175e3b728281b781e1dbb654d4c9d8aa7d5c84825dbbc9ed4c097ffb290daa2e5a19d7650870de2e9aaaec80784454efb465765a66e4c12d0fdc8e1 SHA512 89a46bd70e5565cc03bed1fc9ff10f95d1479edf9e5ca65f5bd663912731c412ba97ea568e273cecaa7bf5cd3d5ae3c9a172618e9e37cd3e7c3cf7289fcdc348
+MISC metadata.xml 2525 BLAKE2B 805fd872d69f00911fa599d87f2c638b1126c438fd0c8ccdda84ff5cbddecbca882b74fa1828e703c32a4035a4223606a1da75bb27cc63ac19b8dd61f5f90b42 SHA512 ccfe5718005f521aa00e7a66429493ea1301f7691acf0cca2faa5372c5f1349ba62d5046b85059f395fe51b30130a06f6867e0736b80cf4b76f9388b05fa76bb
diff --git a/app-admin/conky/conky-1.10.4.ebuild b/app-admin/conky/conky-1.10.4.ebuild
new file mode 100644
index 000000000000..38f3c714f274
--- /dev/null
+++ b/app-admin/conky/conky-1.10.4.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils linux-info readme.gentoo-r1
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86"
+IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
+	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
+	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
+	weather-metar weather-xoap webserver wifi X xmms2"
+
+DEPEND_COMMON="
+	X? (
+		imlib? ( media-libs/imlib2[X] )
+		lua-cairo? (
+			>=dev-lua/toluapp-1.0.93
+			x11-libs/cairo[X] )
+		lua-imlib? (
+			>=dev-lua/toluapp-1.0.93
+			media-libs/imlib2[X] )
+		lua-rsvg? (
+			>=dev-lua/toluapp-1.0.93
+			gnome-base/librsvg )
+		nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+		x11-libs/libXfixes
+		x11-libs/libXext
+		audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
+		xmms2? ( media-sound/xmms2 )
+	)
+	cmus? ( media-sound/cmus )
+	curl? ( net-misc/curl )
+	eve? ( net-misc/curl dev-libs/libxml2 )
+	ical? ( dev-libs/libical )
+	iconv? ( virtual/libiconv )
+	irc? ( net-libs/libircclient )
+	mysql? ( >=virtual/mysql-5.0 )
+	ncurses? ( sys-libs/ncurses:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+	systemd? ( sys-apps/systemd )
+	wifi? ( net-wireless/wireless-tools )
+	weather-metar? ( net-misc/curl )
+	weather-xoap? ( dev-libs/libxml2 net-misc/curl )
+	webserver? ( net-libs/libmicrohttpd )
+	>=dev-lang/lua-5.1.4-r8:0
+	"
+RDEPEND="
+	${DEPEND_COMMON}
+	apcupsd? ( sys-power/apcupsd )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+	nano-syntax? ( app-editors/nano )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+DEPEND="
+	${DEPEND_COMMON}
+	app-text/docbook2X
+	"
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+
+PATCHES=( "${FILESDIR}"/${P}-x11-build.patch )
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}.
+To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
+and edit it to your liking.
+
+There are pretty html docs available at the conky homepage
+or in ${ROOT%/}/usr/share/doc/${PF}/html.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+	use ipv6 && linux-info_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs
+
+	if use X; then
+		mycmakeargs=(
+			-DBUILD_X11=ON
+			-DOWN_WINDOW=ON
+			-DBUILD_XDAMAGE=ON
+			-DBUILD_XINERAMA=ON
+			-DBUILD_XDBE=ON
+			-DBUILD_XFT=$(usex truetype)
+			-DBUILD_IMLIB2=$(usex imlib)
+			-DBUILD_XSHAPE=ON
+			-DBUILD_ARGB=ON
+			-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+			-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+			-DBUILD_LUA_RSVG=$(usex lua-rsvg)
+			-DBUILD_NVIDIA=$(usex nvidia)
+			-DBUILD_AUDACIOUS=$(usex audacious)
+			-DBUILD_XMMS2=$(usex xmms2)
+		)
+	else
+		mycmakeargs=(
+			-DBUILD_X11=OFF
+			-DBUILD_NVIDIA=OFF
+			-DBUILD_LUA_CAIRO=OFF
+			-DBUILD_LUA_IMLIB2=OFF
+			-DBUILD_LUA_RSVG=OFF
+			-DBUILD_AUDACIOUS=OFF
+			-DBUILD_XMMS2=OFF
+		)
+	fi
+
+	mycmakeargs+=(
+		-DBUILD_APCUPSD=$(usex apcupsd)
+		-DBUILD_CMUS=$(usex cmus)
+		-DBUILD_CURL=$(usex curl)
+		-DBUILD_EVE=$(usex eve)
+		-DBUILD_HDDTEMP=$(usex hddtemp)
+		-DBUILD_IOSTATS=$(usex iostats)
+		-DBUILD_ICAL=$(usex ical)
+		-DBUILD_ICONV=$(usex iconv)
+		-DBUILD_IPV6=$(usex ipv6)
+		-DBUILD_IRC=$(usex irc)
+		-DBUILD_MATH=$(usex math)
+		-DBUILD_MOC=$(usex moc)
+		-DBUILD_MPD=$(usex mpd)
+		-DBUILD_MYSQL=$(usex mysql)
+		-DBUILD_NCURSES=$(usex ncurses)
+		-DBUILD_PORT_MONITORS=$(usex portmon)
+		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_RSS=$(usex rss)
+		-DBUILD_JOURNAL=$(usex systemd)
+		-DBUILD_IBM=$(usex thinkpad)
+		-DBUILD_WEATHER_METAR=$(usex weather-metar)
+		-DBUILD_WEATHER_XOAP=$(usex weather-xoap)
+		-DBUILD_HTTP=$(usex webserver)
+		-DBUILD_WLAN=$(usex wifi)
+		-DBUILD_BUILTIN_CONFIG=ON
+		-DBUILD_OLD_CONFIG=ON
+		-DBUILD_I18N=ON
+		-DMAINTAINER_MODE=OFF
+		-DRELEASE=ON
+		-DBUILD_BMPX=OFF
+		-DDOC_PATH=/usr/share/doc/${PF}
+	)
+	# -DMAINTAINER_MODE=OFF disables building documentation and fixes bug #486270
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/conkyrc.vim
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano/
+		doins "${S}"/extras/nano/conky.nanorc
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-admin/conky/conky-1.10.8-r1.ebuild b/app-admin/conky/conky-1.10.8-r1.ebuild
new file mode 100644
index 000000000000..f9d5660cd0cd
--- /dev/null
+++ b/app-admin/conky/conky-1.10.8-r1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils linux-info readme.gentoo-r1
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 sparc x86"
+IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
+	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
+	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
+	weather-metar weather-xoap webserver wifi X xmms2"
+
+DEPEND_COMMON="
+	X? (
+		imlib? ( media-libs/imlib2[X] )
+		lua-cairo? (
+			>=dev-lua/toluapp-1.0.93
+			x11-libs/cairo[X] )
+		lua-imlib? (
+			>=dev-lua/toluapp-1.0.93
+			media-libs/imlib2[X] )
+		lua-rsvg? (
+			>=dev-lua/toluapp-1.0.93
+			gnome-base/librsvg )
+		nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+		x11-libs/libXfixes
+		x11-libs/libXext
+		audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
+		xmms2? ( media-sound/xmms2 )
+	)
+	cmus? ( media-sound/cmus )
+	curl? ( net-misc/curl )
+	eve? ( net-misc/curl dev-libs/libxml2 )
+	ical? ( dev-libs/libical )
+	iconv? ( virtual/libiconv )
+	irc? ( net-libs/libircclient )
+	mysql? ( >=virtual/mysql-5.0 )
+	ncurses? ( sys-libs/ncurses:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+	systemd? ( sys-apps/systemd )
+	wifi? ( net-wireless/wireless-tools )
+	weather-metar? ( net-misc/curl )
+	weather-xoap? ( dev-libs/libxml2 net-misc/curl )
+	webserver? ( net-libs/libmicrohttpd )
+	>=dev-lang/lua-5.1.4-r8:0
+	"
+RDEPEND="
+	${DEPEND_COMMON}
+	apcupsd? ( sys-power/apcupsd )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+	nano-syntax? ( app-editors/nano )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+DEPEND="
+	${DEPEND_COMMON}
+	app-text/docbook2X
+	"
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+
+PATCHES=( "${FILESDIR}"/${P}-use-pkgconfig.patch )
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}.
+To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
+and edit it to your liking.
+
+There are pretty html docs available at the conky homepage
+or in ${ROOT%/}/usr/share/doc/${PF}/html.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+	use ipv6 && linux-info_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
+		cmake/ConkyPlatformChecks.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs
+
+	if use X; then
+		mycmakeargs=(
+			-DBUILD_X11=ON
+			-DOWN_WINDOW=ON
+			-DBUILD_XDAMAGE=ON
+			-DBUILD_XINERAMA=ON
+			-DBUILD_XDBE=ON
+			-DBUILD_XFT=$(usex truetype)
+			-DBUILD_IMLIB2=$(usex imlib)
+			-DBUILD_XSHAPE=ON
+			-DBUILD_ARGB=ON
+			-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+			-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+			-DBUILD_LUA_RSVG=$(usex lua-rsvg)
+			-DBUILD_NVIDIA=$(usex nvidia)
+			-DBUILD_AUDACIOUS=$(usex audacious)
+			-DBUILD_XMMS2=$(usex xmms2)
+		)
+	else
+		mycmakeargs=(
+			-DBUILD_X11=OFF
+			-DBUILD_NVIDIA=OFF
+			-DBUILD_LUA_CAIRO=OFF
+			-DBUILD_LUA_IMLIB2=OFF
+			-DBUILD_LUA_RSVG=OFF
+			-DBUILD_AUDACIOUS=OFF
+			-DBUILD_XMMS2=OFF
+		)
+	fi
+
+	if use weather-xoap; then
+		mycmakeargs+=(
+			-DBUILD_WEATHER_XOAP=ON
+			-DBUILD_WEATHER_METAR=ON
+		)
+	elif use weather-metar; then
+		mycmakeargs+=(
+			-DBUILD_WEATHER_METAR=ON
+			-DBUILD_WEATHER_XOAP=$(usex weather-xoap)
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_WEATHER_XOAP=OFF
+			-DBUILD_WEATHER_METAR=OFF
+		)
+	fi
+
+	mycmakeargs+=(
+		-DBUILD_APCUPSD=$(usex apcupsd)
+		-DBUILD_CMUS=$(usex cmus)
+		-DBUILD_CURL=$(usex curl)
+		-DBUILD_EVE=$(usex eve)
+		-DBUILD_HDDTEMP=$(usex hddtemp)
+		-DBUILD_IOSTATS=$(usex iostats)
+		-DBUILD_ICAL=$(usex ical)
+		-DBUILD_ICONV=$(usex iconv)
+		-DBUILD_IPV6=$(usex ipv6)
+		-DBUILD_IRC=$(usex irc)
+		-DBUILD_MATH=$(usex math)
+		-DBUILD_MOC=$(usex moc)
+		-DBUILD_MPD=$(usex mpd)
+		-DBUILD_MYSQL=$(usex mysql)
+		-DBUILD_NCURSES=$(usex ncurses)
+		-DBUILD_PORT_MONITORS=$(usex portmon)
+		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_RSS=$(usex rss)
+		-DBUILD_JOURNAL=$(usex systemd)
+		-DBUILD_IBM=$(usex thinkpad)
+		-DBUILD_HTTP=$(usex webserver)
+		-DBUILD_WLAN=$(usex wifi)
+		-DBUILD_BUILTIN_CONFIG=ON
+		-DBUILD_OLD_CONFIG=OFF
+		-DBUILD_I18N=ON
+		-DMAINTAINER_MODE=ON
+		-DRELEASE=ON
+		-DBUILD_BMPX=OFF
+		-DDOC_PATH=/usr/share/doc/${PF}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/conkyrc.vim
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano/
+		doins "${S}"/extras/nano/conky.nanorc
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-admin/conky/files/conky-1.10.4-x11-build.patch b/app-admin/conky/files/conky-1.10.4-x11-build.patch
new file mode 100644
index 000000000000..eb113a47fd57
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.4-x11-build.patch
@@ -0,0 +1,31 @@
+From 178015a9495b7d40031ed7459e4f6b6731633a7c Mon Sep 17 00:00:00 2001
+From: shizeeg <shizeeque@gmail.com>
+Date: Thu, 8 Sep 2016 18:24:29 +0300
+Subject: [PATCH] Fix build without X11 (#317)
+
+---
+ src/conky.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/conky.cc b/src/conky.cc
+index 0a812fc..4c5da94 100644
+--- a/src/conky.cc
++++ b/src/conky.cc
+@@ -1404,6 +1404,9 @@ static void draw_string(const char *s)
+ 
+ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
+ {
++#ifndef BUILD_X11
++	static int cur_x, cur_y;	/* current x and y for drawing */
++#endif
+ #ifdef BUILD_X11
+ 	int font_h = 0;
+ 	int cur_y_add = 0;
+@@ -1934,6 +1937,7 @@ static void draw_text(void)
+ 
+ static void draw_stuff(void)
+ {
++	static int text_offset_x, text_offset_y; /* offset for start position */
+ 	text_offset_x = text_offset_y = 0;
+ #ifdef BUILD_IMLIB2
+ 	cimlib_render(text_start_x, text_start_y, window.width, window.height);
diff --git a/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch b/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch
new file mode 100644
index 000000000000..97e6bd02323f
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch
@@ -0,0 +1,34 @@
+Reversed patch
+
+From abd0be51a00444d3be6b213e0926675e5a4e5ed3 Mon Sep 17 00:00:00 2001
+From: Brenden Matthews <brenden@diddyinc.com>
+Date: Tue, 23 Jan 2018 12:56:06 -0500
+Subject: [PATCH] Use FindCurses instead of pkg_check_modules.
+
+This should resolve #217.
+---
+ cmake/ConkyPlatformChecks.cmake | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
+index c5b39b2f..19ec7b9b 100644
+--- a/cmake/ConkyPlatformChecks.cmake
++++ b/cmake/ConkyPlatformChecks.cmake
+@@ -129,12 +129,12 @@ if(BUILD_HTTP)
+ endif(BUILD_HTTP)
+ 
+ if(BUILD_NCURSES)
++	pkg_check_modules(NCURSES ncurses)
++	if(NOT NCURSES_FOUND)
+-	include(FindCurses)
+-	if(NOT CURSES_FOUND)
+ 		message(FATAL_ERROR "Unable to find ncurses library")
++	endif(NOT NCURSES_FOUND)
++	set(conky_libs ${conky_libs} ${NCURSES_LIBRARIES})
++	set(conky_includes ${conky_includes} ${NCURSES_INCLUDE_DIRS})
+-	endif(NOT CURSES_FOUND)
+-	set(conky_libs ${conky_libs} ${CURSES_LIBRARIES})
+-	set(conky_includes ${conky_includes} ${CURSES_INCLUDE_DIR})
+ endif(BUILD_NCURSES)
+ 
+ if(BUILD_MYSQL)
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
new file mode 100644
index 000000000000..3bdd546109e7
--- /dev/null
+++ b/app-admin/conky/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>brenden@rty.ca</email>
+			<name>Brenden Matthews</name>
+		</maintainer>
+		<remote-id type="sourceforge">conky</remote-id>
+		<remote-id type="github">brndnmtthws/conky</remote-id>
+	</upstream>
+	<longdescription>Conky is a system monitor that sits in the corner of your desktop. It is a fork of Torsmo that is actually maintained.</longdescription>
+	<use>
+		<flag name="apcupsd">Enable support for <pkg>sys-power/apcupsd</pkg></flag>
+		<flag name="audacious">Enable monitoring of music played by <pkg>media-sound/audacious</pkg></flag>
+		<flag name="cmus">Enable monitoring of music played by <pkg>media-sound/cmus</pkg></flag>
+		<flag name="eve">Enable support for the eve-online skill monitor</flag>
+		<flag name="ical">Enable support for events from iCalendar (RFC 5545) files using <pkg>dev-libs/libical</pkg></flag>
+		<flag name="iostats">Enable support for per-task I/O statistics</flag>
+		<flag name="irc">Enable support for displaying everything from an irc channel using <pkg>net-libs/libircclient</pkg></flag>
+		<flag name="lua-cairo">Enable if you want Lua Cairo bindings</flag>
+		<flag name="lua-imlib">Enable if you want Lua Imlib2 bindings</flag>
+		<flag name="lua-rsvg">Enable if you want Lua RSVG bindings</flag>
+		<flag name="math">Enable support for glibc's libm math library</flag>
+		<flag name="moc">Enable monitoring of music played by <pkg>media-sound/moc</pkg></flag>
+		<flag name="mpd">Enable monitoring of music controlled by <pkg>media-sound/mpd</pkg></flag>
+		<flag name="nano-syntax">Enable syntax highlighting for <pkg>app-editors/nano</pkg></flag>
+		<flag name="nvidia">Enable reading of nvidia card temperature sensors via <pkg>media-video/nvidia-settings</pkg></flag>
+		<flag name="portmon">Enable support for tcp (ip4) port monitoring</flag>
+		<flag name="thinkpad">Enable support for IBM/Lenovo notebooks</flag>
+		<flag name="weather-metar">Enable support for metar weather service</flag>
+		<flag name="weather-xoap">Enable support for metar and xoap weather service</flag>
+		<flag name="webserver">Enable support to act as a webserver serving conkys output using <pkg>net-libs/libmicrohttpd</pkg></flag>
+		<flag name="xmms2">Enable monitoring of music played by <pkg>media-sound/xmms2</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/conkyforecast-2.24-r1 b/app-admin/conkyforecast-2.24-r1
deleted file mode 100644
index 51050433110f..000000000000
--- a/app-admin/conkyforecast-2.24-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Conky weather forecast script with support for language files
-EAPI=5
-HOMEPAGE=https://launchpad.net/~conky-companions
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-admin/conky python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://launchpad.net/~conky-companions/+archive/ppa/+files/conkyforecast_2.24.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e06c266547272f04567fd9641f82960b
diff --git a/app-admin/conkyforecast/Manifest b/app-admin/conkyforecast/Manifest
new file mode 100644
index 000000000000..579cefa2c44e
--- /dev/null
+++ b/app-admin/conkyforecast/Manifest
@@ -0,0 +1,3 @@
+DIST conkyforecast_2.24.tar.gz 11347231 BLAKE2B 76d77229044375e7852823b92ac60cfafd190731e823a6e0d639ece16ef0dc94b7e182b4c6735529fc1f3145baa52c25412436acfb67ea69398a873aee81b14d SHA512 dcff08915c00915f6be4cd25824e3d8de978ed15ffb6776f002d585d95856f5e0827632371dd4d37016e07d58542e2bc95a7a859ebdc8ab9d1200ac04d4364e0
+EBUILD conkyforecast-2.24-r1.ebuild 1143 BLAKE2B 618f34f3c0260394f72ba7fadcabb372e7cc4cd63594e4abda88e5ad8399f28ea2931d09f6bd992ebe2339f717d4c37b89de14dad30e2e120ce7ee8ad5fe5308 SHA512 b269faef892efa7ded0d49830e0232fb2eefc95c55e24a6e50935aa40b9e2c0ad198c061237d7200a252a6169cc2480df6b1d865423963374375dc264f4c5695
+MISC metadata.xml 328 BLAKE2B 88458a82a675c10e772d5cdb3d84b2aeb55a12a2e24228d5cf4a8534851daba5cd244dfc20409988b25b7b5ea0cdbc61619fcf3a618e8633a9d47fa35765bce0 SHA512 b82738da77f143327af6973f163191826c7883fb1d3991f2c369ebcc84e50c71b1ea714d124562236501788fde015c3c3b33c4300561cc549a275931dc9fe426
diff --git a/app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild b/app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild
new file mode 100644
index 000000000000..2a1f73e2ee42
--- /dev/null
+++ b/app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# upstream broke setup.py to install into /usr/share...
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Conky weather forecast script with support for language files"
+HOMEPAGE="https://launchpad.net/~conky-companions"
+SRC_URI="https://launchpad.net/~conky-companions/+archive/ppa/+files/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-admin/conky"
+
+S=${WORKDIR}/src
+
+python_prepare_all() {
+	sed -i -e "s:pythoncmd=.*$:pythoncmd=${EPYTHON}:" conkyForecast* || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_optimize "${ED%/}"/usr/share/${PN}
+}
+
+pkg_postinst() {
+	elog "You have to define a partner id and registration code for "
+	elog "the weather.com xoap. You need to copy the template from"
+	elog "/usr/share/conkyforecast/conkyForecast.config into you account"
+	elog "as ~/.conkyForecast.config and edit the respective fields."
+	elog
+	elog "More details can be found in the README file."
+}
diff --git a/app-admin/conkyforecast/metadata.xml b/app-admin/conkyforecast/metadata.xml
new file mode 100644
index 000000000000..d9f08c9f2411
--- /dev/null
+++ b/app-admin/conkyforecast/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">~conky-companions</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/conserver-8.1.18-r1 b/app-admin/conserver-8.1.18-r1
deleted file mode 100644
index 72f73f18fbc3..000000000000
--- a/app-admin/conserver-8.1.18-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Serial Console Manager
-EAPI=5
-HOMEPAGE=https://www.conserver.com/
-IUSE=kerberos libressl pam ssl tcpd debug ssl
-KEYWORDS=alpha amd64 ia64 ppc ppc64 ~sparc x86
-LICENSE=BSD GPL-2
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) pam? ( >=sys-auth/pambase-20080219.1 )
-SLOT=0
-SRC_URI=https://www.conserver.com/conserver-8.1.18.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=89cdb42927dd147112106c4f69996e4d
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
new file mode 100644
index 000000000000..ee5901f90d69
--- /dev/null
+++ b/app-admin/conserver/Manifest
@@ -0,0 +1,9 @@
+AUX conserver-8.1.18-dmalloc.patch 2806 BLAKE2B 0ce6a09d90c82a455bb706f755e8485df1d8aec4f7a8cb534ac97d584ccb94715c68568d46496a3a298cd258a5e68219ce3f37cc33a6239d3b533636b53d85bf SHA512 90d3a4bd6fb3a58ece053e4680dab5b24f23c7265e5244f3185b67a143c58ccd2c200c2fccc0a6cec8444ab2895f358138cba05be27119b014187e539dfa78d6
+AUX conserver-prestrip.patch 882 BLAKE2B b5a327827a6a56ead78821e9fa091cabba0b914d94a8cb273b6fc5003e927948483d7a32ad858a7c94f7c7422f1a124fd42b65544b198bea317cd2caf68c96ac SHA512 aeb112f8df0bd97ac3e3b909a42c54d2d16d6d59d39ea10dca9c86d2a6f866ba33c56fca77fb551c706314692469ed668a0158ff04712594192856b363bcb4af
+AUX conserver.confd 170 BLAKE2B f6bc04796726454fec2c24207d3342c72c1789db5aeb39e47928e12d12300a16cec51f82e9447bf4546f732e3f9184724936450a852392671d4725fa3df99985 SHA512 af326d215eb7b6e4bdf68a9fc8b58c42dae9d0b31f653af181097c7cf4ee663bcc7c848f77ef051327e54a18e0202536b524b1b82d36693751f07d2c37f5b071
+AUX conserver.initd 1055 BLAKE2B a515ff3c81c1e66b53f49d28db082d2a9eb3cd69a60f73bf7a1405a242801f145fe788935a63212a8990135cae3537369ee36c39503d859a96c90d1fec678215 SHA512 4bd10a1cd95707d6ebde6774ed88ef69552ed1b823baac4942958f9ecc2c5185f45d08d9a4707ad31320645c80e13a34b5fecbfb6eac9f282c2c422820986ac6
+AUX conserver.initd-r1 1088 BLAKE2B 2ab26bafddf29f24488b147c2a90dca6e482361af96fc008df0029581a0308f380db36b7985ac8fdfc1884e0eeb897d3e84fed9ed3341e2b9ba35c9393850200 SHA512 332e59313f066a8e313f65b0f04c4a7f464cb77f9ac2b3ab5beb24b5fee393d9036b9f80a1c9cc0f6ba43a5c3519801aea6d61f96bed861d5caa3130ab4ff1e3
+AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
+DIST conserver-8.1.18.tar.gz 323247 BLAKE2B 48176ba8be648df16ddb18c1a760af8069f7d926d2e0767e3b7ef903276d6104cfa9464a6ebdce009720fe5118862d89cf5371e104d17b967e11fe8e8968e8f9 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f
+EBUILD conserver-8.1.18-r1.ebuild 2294 BLAKE2B ed919fd5d042acb254861e7caa29becfa4637bf9077a791d5828e5c873f4479ce398ef8da72316d4059f63ae3c2b75550e78c8f778b8a20fbb1924bd5f033fff SHA512 ffbadfef4f779a87d0e6631be8e9bdad909176076713502d053f4acd538358281a20bdd94ea74d45d4311b3ae5e580114ea13114cff8a6835e488a03b620143b
+MISC metadata.xml 1170 BLAKE2B cb2e515dc5e79cd5bea66d737f507c4a65be82b46968fa3f07ead05d5467756ca3a3f6b348ff50fe21c20dada080b1ddf2f2b24d703752b0266259d74d3c3327 SHA512 8b8babc1d68eadb8e5ffac32145fd28fe5c372cb87ad9d12c6266e17aef59511c7e20db0a97958e6da7120d9f7555ad708197395263c301eac222c1f7718eed1
diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild b/app-admin/conserver/conserver-8.1.18-r1.ebuild
new file mode 100644
index 000000000000..0ab9102d365a
--- /dev/null
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit ssl-cert eutils pam autotools
+
+DESCRIPTION="Serial Console Manager"
+HOMEPAGE="https://www.conserver.com/"
+SRC_URI="https://www.conserver.com/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
+IUSE="kerberos libressl pam ssl tcpd debug"
+
+DEPEND="ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	pam? ( virtual/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	debug? ( dev-libs/dmalloc )
+	kerberos? (
+		virtual/krb5
+		net-libs/libgssglue
+	)"
+RDEPEND="${DEPEND}
+	pam? ( >=sys-auth/pambase-20080219.1 )"
+
+src_prepare() {
+	# Apply patch to prevent package from stripping binaries
+	epatch "${FILESDIR}"/${PN}-prestrip.patch
+
+	# Apply patch to use custom dmalloc macro
+	epatch "${FILESDIR}"/${P}-dmalloc.patch
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ssl openssl) \
+		$(use_with pam) \
+		$(use_with tcpd libwrap) \
+		$(use_with debug dmalloc) \
+		$(use_with kerberos gssapi) \
+		--with-logfile=/var/log/conserver.log \
+		--with-pidfile=/var/run/conserver.pid \
+		--with-cffile=conserver/conserver.cf \
+		--with-pwdfile=conserver/conserver.passwd \
+		--with-master=localhost \
+		--with-port=7782
+}
+
+src_install() {
+	emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
+
+	## create data directory
+	dodir /var/consoles
+	fowners daemon:daemon /var/consoles
+	fperms 700 /var/consoles
+
+	## add startup and sample config
+	newinitd "${FILESDIR}"/conserver.initd-r1 conserver
+	newconfd "${FILESDIR}"/conserver.confd conserver
+
+	dodir /etc/conserver
+	fperms 700 /etc/conserver
+	insinto /etc/conserver
+	newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
+	newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
+
+	## add docs
+	dohtml conserver.html
+	dodoc CHANGES FAQ PROTOCOL README TODO
+	dodoc conserver/Sun-serial contrib/maketestcerts
+	newdoc conserver.cf/conserver.cf conserver.cf.sample
+
+	# Add pam config
+	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+}
+
+pkg_postinst() {
+	# Add certs if SSL use flag is enabled
+	if use ssl && [ ! -f "${ROOT}"/etc/ssl/conserver/conserver.key ]; then
+		install_cert /etc/ssl/conserver/conserver
+	fi
+}
diff --git a/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch b/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch
new file mode 100644
index 000000000000..ff82f74b261c
--- /dev/null
+++ b/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch
@@ -0,0 +1,100 @@
+--- configure.in	2011-08-19 01:11:06.000000000 -0400
++++ configure.in	2011-08-19 02:06:50.000000000 -0400
+@@ -320,6 +320,8 @@
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ 
++AM_WITH_DMALLOC([cons_with_dmalloc="YES"],[cons_with_dmalloc="NO"])
++
+ dnl ### Compiler characteristics. ##################################
+ AC_AIX
+ AC_C_CONST
+@@ -578,51 +580,6 @@
+     fi]
+ )
+ 
+-cons_with_dmalloc="NO"
+-AC_ARG_WITH(dmalloc,
+-    AS_HELP_STRING([--with-dmalloc@<:@=PATH@:>@],
+-	[Compile in dmalloc support]),
+-    [if test "$withval" != "no"; then
+-	if test "$withval" != "yes"; then
+-	    DMALLOCCPPFLAGS="-I$withval/include"
+-	    if test "$use_dash_r" != "yes"; then
+-		DMALLOCLDFLAGS="-L$withval/lib"
+-	    else
+-		DMALLOCLDFLAGS="-L$withval/lib -R$withval/lib"
+-	    fi
+-	else
+-	    DMALLOCCPPFLAGS=""
+-	    DMALLOCLDFLAGS=""
+-	fi
+-
+-	oCPPFLAGS="$CPPFLAGS"
+-	oLDFLAGS="$LDFLAGS"
+-	oLIBS="$LIBS"
+-	have_dmalloc=no
+-
+-	CPPFLAGS="$CPPFLAGS $DMALLOCCPPFLAGS"
+-	LDFLAGS="$LDFLAGS $DMALLOCLDFLAGS"
+-
+-	AC_CHECK_HEADER([dmalloc.h],
+-	    [LIBS="$LIBS -ldmalloc"
+-	    AC_MSG_CHECKING(for dmalloc libraries -ldmalloc)
+-	    AC_TRY_LINK([#include <dmalloc.h>
+-		],[dmalloc_debug(0)],
+-		[AC_MSG_RESULT(yes)
+-		cons_with_dmalloc="YES"
+-		AC_DEFINE(HAVE_DMALLOC)
+-		have_dmalloc=yes],
+-		[AC_MSG_RESULT(no)])],)
+-
+-	if test $have_dmalloc = no; then
+-	    LIBS="$oLIBS"
+-	    CPPFLAGS="$oCPPFLAGS"
+-	    LDFLAGS="$oLDFLAGS"
+-	fi
+-    fi]
+-)
+-
+-
+ dnl ### Check for needed functions. ################################
+ 
+ dnl dnl The following basically stollen from the less-358 distribution, but
+--- /dev/null		2011-08-07 13:18:05.535976733 -0400
++++ m4/dmalloc.m4	2011-08-19 03:49:03.755073497 -0400
+@@ -0,0 +1,34 @@
++## ----------------------------------- ##                   -*- Autoconf -*-
++## Check if --with-dmalloc was given.  ##
++## From Franc,ois Pinard               ##
++## ----------------------------------- ##
++
++# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2010,
++# 2011 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 7
++
++dnl AM_WITH_DMALLOC([ACTION-IF-FOUND],[ACTION-IF-NOT])
++AC_DEFUN([AM_WITH_DMALLOC],
++[AC_MSG_CHECKING([if malloc debugging is wanted])
++AC_ARG_WITH([dmalloc],
++[AS_HELP_STRING([--with-dmalloc],
++                [use dmalloc, as in http://www.dmalloc.com])],
++[if test "$withval" = yes; then
++  AC_MSG_RESULT([yes])
++  AC_DEFINE([WITH_DMALLOC], [1],
++	    [Define if using the dmalloc debugging malloc package])
++  LIBS="$LIBS -ldmalloc"
++  LDFLAGS="$LDFLAGS -g"
++  [$1]
++else
++  AC_MSG_RESULT([no])
++  [$2]
++fi], [AC_MSG_RESULT([no])])
++])
++
++AU_DEFUN([fp_WITH_DMALLOC], [AM_WITH_DMALLOC])
diff --git a/app-admin/conserver/files/conserver-prestrip.patch b/app-admin/conserver/files/conserver-prestrip.patch
new file mode 100644
index 000000000000..e67c49da1a66
--- /dev/null
+++ b/app-admin/conserver/files/conserver-prestrip.patch
@@ -0,0 +1,24 @@
+diff -Nuar conserver-8.1.14.orig/conserver/Makefile.in conserver-8.1.14/conserver/Makefile.in
+--- conserver-8.1.14.orig/conserver/Makefile.in	2006-10-25 17:41:00.398082243 -0600
++++ conserver-8.1.14/conserver/Makefile.in	2006-10-25 17:41:27.876759095 -0600
+@@ -13,7 +13,7 @@
+ 
+ ### Installation programs and flags
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ LN_S = @LN_S@
+ MKDIR = @MKDIR@
+ 
+diff -Nuar conserver-8.1.14.orig/console/Makefile.in conserver-8.1.14/console/Makefile.in
+--- conserver-8.1.14.orig/console/Makefile.in	2006-10-25 17:41:00.401081662 -0600
++++ conserver-8.1.14/console/Makefile.in	2006-10-25 17:41:18.188635834 -0600
+@@ -9,7 +9,7 @@
+ 
+ ### Installation programs and flags
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ LN_S = @LN_S@
+ MKDIR = @MKDIR@
+ 
diff --git a/app-admin/conserver/files/conserver.confd b/app-admin/conserver/files/conserver.confd
new file mode 100644
index 000000000000..4544fed4ab36
--- /dev/null
+++ b/app-admin/conserver/files/conserver.confd
@@ -0,0 +1,6 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+## Config file for /etc/init.d/conserver
+
+CONSERVER_OPTS="-d"
diff --git a/app-admin/conserver/files/conserver.initd b/app-admin/conserver/files/conserver.initd
new file mode 100644
index 000000000000..0c0771c72c6b
--- /dev/null
+++ b/app-admin/conserver/files/conserver.initd
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need clock
+}
+
+checkconfig() {
+	if [ ! -e /etc/conserver/conserver.cf ] ; then
+		eerror "You need to create /etc/conserver/conserver.cf first."
+		eerror "A sample is placed there to be renamed and ajusted."
+		eerror "Read the man page or see /usr/share/doc/conserver-<version>/."
+		return 1
+	fi
+
+	if [ ! -e /etc/conserver/conserver.passwd ] ; then
+		eerror "You need to create /etc/conserver/conserver.passwd first."
+		eerror "A sample is placed there to be renamed and ajusted."
+		eerror "Read the man page or see /usr/share/doc/conserver-<version>/."
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting conserver"
+	start-stop-daemon --start --quiet --exec \
+		/usr/sbin/conserver -- ${CONSERVER_OPTS} 1>/dev/null
+	eend $? "Failed to start conserver"
+}
+
+stop() {
+	ebegin "Stopping conserver"
+	start-stop-daemon --stop --quiet --pidfile /var/run/conserver.pid
+	eend $? "Failed to stop conserver"
+}
diff --git a/app-admin/conserver/files/conserver.initd-r1 b/app-admin/conserver/files/conserver.initd-r1
new file mode 100644
index 000000000000..907b1b711705
--- /dev/null
+++ b/app-admin/conserver/files/conserver.initd-r1
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need clock
+}
+
+checkconfig() {
+	if [ ! -e /etc/conserver/conserver.cf ] ; then
+		eerror "You need to create /etc/conserver/conserver.cf first."
+		eerror "A sample is placed there to be renamed and ajusted."
+		eerror "Read the man page or see /usr/share/doc/conserver-<version>/."
+		return 1
+	fi
+
+	if [ ! -e /etc/conserver/conserver.passwd ] ; then
+		eerror "You need to create /etc/conserver/conserver.passwd first."
+		eerror "A sample is placed there to be renamed and ajusted."
+		eerror "Read the man page or see /usr/share/doc/conserver-<version>/."
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting conserver"
+	start-stop-daemon --start --quiet --pidfile /var/run/conserver.pid --exec \
+		/usr/sbin/conserver -- ${CONSERVER_OPTS} 1>/dev/null
+	eend $? "Failed to start conserver"
+}
+
+stop() {
+	ebegin "Stopping conserver"
+	start-stop-daemon --stop --quiet --pidfile /var/run/conserver.pid
+	eend $? "Failed to stop conserver"
+}
diff --git a/app-admin/conserver/files/conserver.pam-pambase b/app-admin/conserver/files/conserver.pam-pambase
new file mode 100644
index 000000000000..30025fe1403e
--- /dev/null
+++ b/app-admin/conserver/files/conserver.pam-pambase
@@ -0,0 +1,6 @@
+auth       required	pam_securetty.so
+auth       include	system-remote-login
+
+account    include	system-remote-login
+password   include	system-remote-login
+session    include	system-remote-login
diff --git a/app-admin/conserver/metadata.xml b/app-admin/conserver/metadata.xml
new file mode 100644
index 000000000000..06b3d82363fe
--- /dev/null
+++ b/app-admin/conserver/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dan@danweeks.net</email>
+		<name>Dan Weeks</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Conserver is an application that allows multiple users to watch a serial
+		console at the same time. It can log the data, allows users to take
+		write-access of a console (one at a time), and has a variety of bells
+		and whistles to accentuate that basic functionality. The idea is that
+		conserver will log all your serial traffic so you can go back and review
+		why something crashed, look at changes (if done on the console), or tie
+		the console logs into a monitoring system (just watch the logfiles it
+		creates). With multi-user capabilities you can work on equipment with
+		others, mentor, train, etc. It also does all that client-server stuff so
+		that, assuming you have a network connection, you can interact with any
+		of the equipment from home or wherever.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/consolehm-1.31 b/app-admin/consolehm-1.31
deleted file mode 100644
index f0b993d1ec74..000000000000
--- a/app-admin/consolehm-1.31
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Console based hardware monitor for FreeBSD
-EAPI=0
-HOMEPAGE=ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/fenner/
-KEYWORDS=~x86-fbsd
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/fenner/consolehm-1.31.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7265fb86d0f374ff43d8409b04acb246
diff --git a/app-admin/consolehm/Manifest b/app-admin/consolehm/Manifest
new file mode 100644
index 000000000000..d40d5eb68b5d
--- /dev/null
+++ b/app-admin/consolehm/Manifest
@@ -0,0 +1,4 @@
+AUX consolehm-gcc4.patch 250 BLAKE2B 645d4a4aee3dd5a693b4528ef842b7aeca9369aa1574175c2e96b2fc5e05bccc961a6c1bd8bcb74902a911e1a6f1ad57095eec454fe989bbc5075ad7f297ce51 SHA512 d9d74aed3961073c2356ce30296635e000e8c9b0ab27b1b860d6a9ee30dd49c0e7ac9fea8c4f21118c36e3973ede0a07b14afd6da2506a0762fdafb89abcccbb
+DIST consolehm-1.31.tar.gz 21615 BLAKE2B e2e90628026eb5936b346bc6ee072f23e9dacdf4f028612d647771f6cb23b816a18a4f139ff7cf6c2333fd6cda133bd7220929113f6d77993e7073ec8086b1ec SHA512 595a5808bf85b878254e10fbe9a7beccffb4e5a35e03fe9fbea710963733fb4d6afe6fe6b70b30fa2b4fd565ed4ac1ffcca624b6717cc3b6d900960e7e6001f8
+EBUILD consolehm-1.31.ebuild 1027 BLAKE2B c47dd43e3aac39d882b2361d61cd5c5b89580df0b752f13e5df3d80601cfae183289b73d2d727b03da20127b463cfe648ec38c7e12e70b20bb3d38410cda266a SHA512 18f4e3d33fb3b439973c0d6dbdf5b14fc8d26e6ad5c073b884e9ee28bfe958394d715f4cd99bc53348dd38d1e42ea9bf35da70a970e3d8966d6f56254984f25d
+MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/app-admin/consolehm/consolehm-1.31.ebuild b/app-admin/consolehm/consolehm-1.31.ebuild
new file mode 100644
index 000000000000..5fe3da38f115
--- /dev/null
+++ b/app-admin/consolehm/consolehm-1.31.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils
+
+DESCRIPTION="Console based hardware monitor for FreeBSD"
+HOMEPAGE="ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/fenner/"
+SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/fenner/${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0"
+
+KEYWORDS="~x86-fbsd"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${PN}-gcc4.patch || die "patch failed"
+	export CHMS="${S}/consolehm"
+	# The only 'SMBus' smb.h i've found is in a different place:
+	cd "${S}/consolehm"
+	sed -i.orig -e 's:machine/smb.h:dev/smbus/smb.h:g' \
+		configure.in \
+		configure \
+		chm.h  || die "sed failed."
+}
+
+src_compile() {
+	cd "${S}/consolehm"
+	econf || die "econf failed"
+	MAKE=make emake || die "emake failed"
+}
+
+src_install() {
+	dobin "${S}/consolehm/chm"
+	doman "${S}/consolehm/chm.8"
+	dodoc "${S}"/CHANGELOG
+	dodoc "${S}"/README
+	dodoc "${S}"/TODO
+}
diff --git a/app-admin/consolehm/files/consolehm-gcc4.patch b/app-admin/consolehm/files/consolehm-gcc4.patch
new file mode 100644
index 000000000000..85f677a29cbf
--- /dev/null
+++ b/app-admin/consolehm/files/consolehm-gcc4.patch
@@ -0,0 +1,10 @@
+--- consolehm/consolehm/chm.c.orig	2000-12-23 03:51:45 -0300
++++ consolehm/consolehm/chm.c	2007-01-12 11:18:27 -0300
+@@ -165,6 +165,7 @@
+ 			printf("Delay: %d microseconds. \n\n",delay);
+ 			break;
+ 		default:
++			;;
+ 	}
+ 	
+ 	file_handle = OpenIO();
diff --git a/app-admin/consolehm/metadata.xml b/app-admin/consolehm/metadata.xml
new file mode 100644
index 000000000000..a00f3aeb1f81
--- /dev/null
+++ b/app-admin/consolehm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/consul-1.0.6 b/app-admin/consul-1.0.6
deleted file mode 100644
index d7205d85a8fe..000000000000
--- a/app-admin/consul-1.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=dev-go/gox >=dev-lang/go-1.9:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=A tool for service discovery, monitoring and configuration
-EAPI=6
-HOMEPAGE=https://www.consul.io
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/consul/archive/v1.0.6.tar.gz -> consul-1.0.6.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=7646b9af3c7234c47bd39812bfe1c1d8
diff --git a/app-admin/consul-1.2.0 b/app-admin/consul-1.2.0
deleted file mode 100644
index 2b789ef8841a..000000000000
--- a/app-admin/consul-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=dev-go/gox >=dev-lang/go-1.9:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=A tool for service discovery, monitoring and configuration
-EAPI=6
-HOMEPAGE=https://www.consul.io
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/consul/archive/v1.2.0.tar.gz -> consul-1.2.0.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=77b1104cb355332c5193bd6c5d99f650
diff --git a/app-admin/consul-1.2.1 b/app-admin/consul-1.2.1
deleted file mode 100644
index 5c17de5f2e87..000000000000
--- a/app-admin/consul-1.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=dev-go/gox >=dev-lang/go-1.9:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=A tool for service discovery, monitoring and configuration
-EAPI=6
-HOMEPAGE=https://www.consul.io
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/consul/archive/v1.2.1.tar.gz -> consul-1.2.1.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c34c675289cbaf6528d94c3fa158a8cf
diff --git a/app-admin/consul-replicate-0.2.0 b/app-admin/consul-replicate-0.2.0
deleted file mode 100644
index 5324ead8cd76..000000000000
--- a/app-admin/consul-replicate-0.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-lang/go-1.4:= >=dev-lang/go-1.9
-DESCRIPTION=Consul cross-DC KV replication daemon
-EAPI=5
-HOMEPAGE=https://github.com/hashicorp/consul-replicate
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-SLOT=0
-SRC_URI=https://github.com/hashicorp/consul-replicate/archive/v0.2.0.tar.gz -> consul-replicate-0.2.0.tar.gz https://github.com/hashicorp/consul-template/archive/v0.8.0.tar.gz -> consul-template-0.8.0.tar.gz https://github.com/fatih/structs/archive/a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz -> structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c
-_md5_=863b1e2da42a810e3032fcebfee9a31a
diff --git a/app-admin/consul-replicate/Manifest b/app-admin/consul-replicate/Manifest
new file mode 100644
index 000000000000..36cdc46a997c
--- /dev/null
+++ b/app-admin/consul-replicate/Manifest
@@ -0,0 +1,14 @@
+DIST consul-0.6.3.tar.gz 2224536 BLAKE2B 3c840b6380f16d2b93d8b9ebf003f26f0e8c46d4527083ca261c9c35cc0aa7f38c451806eeb719d6bbc77e98ff69693d38c0fe46686a69c7c060bfc0c753b470 SHA512 c80b96e18c283f8d2dc7542393e9d788c8247200890b1f2ecdf292b545c01c971f1452f6b37b23b92654409a191fbd4608710b1ca31d6c426ff77b53c4840c4b
+DIST consul-replicate-0.2.0.tar.gz 24575 BLAKE2B 61e358078735bcf0c7884441b360af8e755731611bd84c74823e95c72ee4a3d00dc38501b5a55f428937f60964702ede3841ca8165bf639b00feb6af0ee70bbc SHA512 af1bdc0747524996a1cffe989d05a265c0fbcfac9d4d7c4b4bcf94dbd3db6f7635cb013cf542e1cdad049975a8dfad2bca417dd5566c922b7f86e7fd451ea0a2
+DIST consul-template-0.8.0.tar.gz 63281 BLAKE2B f26868d8a1b1b591a58342adfff22860d568152475953b9c48d0ff74df02fb808a3970442d14db3e66a296bf3f110a8dc0b71b3ee5beb65125876bef34c7d752 SHA512 4a738aa70a291df6e7a48e40fd73c70e279bb957d988de1277b1223dfe151867e06de28542fdbd9fd7f816650b150ed53989fc061fc228b930551fcd0b3005fb
+DIST errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz 8320 BLAKE2B d73eeb7a4070f300f2c844089b152fe69d5fcfc40687608cb7e1b8b6e3b37c45f9d04428234f357912282831331695aa4d25711987f844c3ac540eab04ab0348 SHA512 da45b1696253bebe012f3d0e624a63dd11ad1a613d81cc302f2ea6f096f29a8d81015b9c00363bd2590c4cacc59de52a27e84435a7b4ad6512485cdd87df11c0
+DIST go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz 6595 BLAKE2B aace1fd6671f89275192c39a2a34e151ad35de41657bd6e749928140a23ce5c9a802bceb2dabf3b12e596886524279e1818baab4d7f2b366d62eed89b3fe2b57 SHA512 bfdeea0c0aad4160729bb023c9c908ff56c7faa64a820b16e982efede0389365987343b2a227cac95edaa4c9096f2dfcb1fd3f7d55510328dfdb284cfbf7600a
+DIST go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz 8792 BLAKE2B e63fc6db5a92daaa4b0d6856bffaa60053fe8728616df4e5bf9c764954bddda363d429f744d205023441ab85546155f1d15ead10f80bec968598f3358df057de SHA512 8a3e37ac07bbd571dd8b76bd8c119e5dbc620444e78a6f9fe2c4d28b0171a46704a0b088380ca201a08f7235698f07de4e4881691aef5370739c8bfe2db9e85b
+DIST go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz 4397 BLAKE2B ee049201f02e1565fa6cafecf3cc684239b80461564c5ddfce94d99d940dad03f6d856171dcbcf8a97dd9e88e99da31401aae0b2604d56680d2a47ae5739799c SHA512 42257d0599936bb215f4a9f9189518418f02bc43e4d7417823ea460bfc45c6fd1f9b0bf5a35dd73881b57cd9e892c702b813a68fe6e417e82dd31c6635c1b24e
+DIST hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz 54677 BLAKE2B b8a22fbf1fb03a734b52617062be86cf1103c9929e6f0d73e4ae8bb685bc0a113b25e6dd7d73fa2fb3b88a545106e6489be8c61531101347be0dfc177c8efe99 SHA512 a430b7a4be9147e0fad3d932ecaee5970f049991351654682c679ace971e883615f957255d81da3dc2f732b0bfa26d66eb73ec7811957f05c2f72c2c506c23cd
+DIST logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz 7717 BLAKE2B 083cc3630c8a56aa0c4d230a3767fa8cab34f17a11c178dde5c3cc47d60978d6cd4ba4b7defdc1cef9ec22921bfeb0cb57be08aa68d4d99d1cdec4c438c501bd SHA512 54e55f95808fb68be532e35076ffb04ff844a7d032530b82bbdd87f809bd1b0585538964cc22c7ae1cc039c5c30a02eca9734734c0c01ad76a14bd5a4c386426
+DIST mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz 13977 BLAKE2B eb7d4e853621798b63ec9806e2fb0d609d33fc7b370276433f055bea4282ab938488272e5a7334a54cf351f4380bc36cb0a0e991d8856e7ed1dc26de76110055 SHA512 f495fe99c8ce752830b3d36db445cdc32baac6e266a0862d13e7e80e04f412ae7ee85e13ba794f1cfae3effb226007874c8ee819a4ef568ce2884077dfba4f9c
+DIST serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz 579000 BLAKE2B 1ae7805273210e02ed1779c29b24f7ea32233e860d3ea324af670547ae85f9ce66a9a98ad2105e59bec222d74ee385bf0051974a38503bff3fb464d68959e8f4 SHA512 eced133c2ba261e4e39d16f2252f555611e90f23f70a746a6f8d60b24e6747e73e619ec74f10a1c0646ec5edfd731cd79f6700d9bc5fb7b100723aac32203a5f
+DIST structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz 12276 BLAKE2B 1e28027d9dc21fafd181ba772ae79049584f803c19dbd9da01ef488a5c9f3998071bb87df0b0a8982b31823e1b4bead2386860ca5309fd4c32aa36941c784445 SHA512 ae2f0bc1f9e1ddbf1bd32d5e50a2ffbc4841c17d451739aee7cbbe359abac982e98a00caaff2aa433d10aad4dc414ce17e94a1d0893610ff53c52beddb21dd4f
+EBUILD consul-replicate-0.2.0.ebuild 3458 BLAKE2B 2a164f14aaafa91ca28f03637e2b632b45bf035ef6922430b2a4240887b5cc9d469701260c8247ddee8caad7b1c9d4888bae0e328d36944eabd4c5c94e29fc67 SHA512 345f308a1de4bbbf736b7e8b40588dfc1bb8e9799e494ae2d6f0e8c3777fc86b8f869f00e6ee2acd7a3c586adfc03bcf4ce2d1e861156433598f4b31335cc511
+MISC metadata.xml 317 BLAKE2B 8e79b0f3b2b9099081cf94886f39e476e0bde6dd5eacffdfe48c70e1c2d2eb1d7902e8543e1bd3ae9427bd67cc699d6531be23d964cd72e993ebec7cb7cfdc0f SHA512 f99b2d57b72e37417fe17dfc9e71aa7be80fa554c6e75500953ad150a761e0f54634fc0c37787b8ac603d3d5e06e6980ffffdae87fe738dab6071620367bee3d
diff --git a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
new file mode 100644
index 000000000000..0b1176db1d8e
--- /dev/null
+++ b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit golang-base
+
+KEYWORDS="~amd64"
+DESCRIPTION="Consul cross-DC KV replication daemon"
+EGO_PN="github.com/hashicorp/${PN}/..."
+HOMEPAGE="https://github.com/hashicorp/consul-replicate"
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND=">=dev-lang/go-1.4:="
+RDEPEND=""
+
+SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/hashicorp/consul-template/archive/v0.8.0.tar.gz -> consul-template-0.8.0.tar.gz
+	https://github.com/fatih/structs/archive/a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz -> structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz
+	https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz
+	https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
+	https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz
+	https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz
+	https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
+	https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz
+	https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz
+	https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz
+	https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz"
+
+S="${WORKDIR}/src/${EGO_PN%/*}"
+
+get_archive_go_package() {
+	local archive=${1} uri x
+	for x in ${SRC_URI}; do
+		if [[ ${x} == http* ]]; then
+			uri=${x}
+		elif [[ ${x} == ${archive} ]]; then
+			break
+		fi
+	done
+	uri=${uri#https://}
+	echo ${uri%/archive/*}
+}
+
+unpack_go_packages() {
+	local go_package x
+	# Unpack packages to appropriate locations for GOPATH
+	for x in ${A}; do
+		unpack ${x}
+		go_package=$(get_archive_go_package ${x})
+		mkdir -p src/${go_package%/*}
+		mv ${go_package##*/}-* src/${go_package} || die
+	done
+}
+
+src_unpack() {
+	unpack_go_packages
+	export GOPATH=${WORKDIR}:$(get_golibdir_gopath)
+}
+
+src_prepare() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	export GOROOT="${WORKDIR}/goroot"
+	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+	rm -rf "${GOROOT}"/{src,pkg/$(go env GOOS)_$(go env GOARCH)}/"${EGO_PN%/*}" || die
+
+	# Prune conflicting libraries from GOROOT
+	while read -r -d '' x; do
+		x=${x#${WORKDIR}/src}
+		rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die
+	done < <(find "${WORKDIR}/src" -maxdepth 3 -mindepth 3 -type d -print0)
+
+	sed -e 's:TestParseConfig_parseFileError(:_\0:' -i config_test.go || die
+}
+
+src_compile() {
+	go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+	go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_install() {
+	dobin "${WORKDIR}/bin/${PN}"
+	dodoc CHANGELOG.md README.md
+}
diff --git a/app-admin/consul-replicate/metadata.xml b/app-admin/consul-replicate/metadata.xml
new file mode 100644
index 000000000000..387973160cac
--- /dev/null
+++ b/app-admin/consul-replicate/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">hashicorp/consul-replicate</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/consul-template-0.18.5-r1 b/app-admin/consul-template-0.18.5-r1
deleted file mode 100644
index f56497113668..000000000000
--- a/app-admin/consul-template-0.18.5-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.6:= >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=Generic template rendering and notifications with Consul
-EAPI=6
-HOMEPAGE=https://github.com/hashicorp/consul-template
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-SLOT=0
-SRC_URI=https://github.com/hashicorp/consul-template/archive/v0.18.5.tar.gz -> consul-template-0.18.5.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=219c0c558bbc4d28461829b365828203
diff --git a/app-admin/consul-template-0.19.5 b/app-admin/consul-template-0.19.5
deleted file mode 100644
index d31ba292edce..000000000000
--- a/app-admin/consul-template-0.19.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-lang/go test? ( app-admin/consul ) >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=Generic template rendering and notifications with Consul
-EAPI=6
-HOMEPAGE=https://github.com/hashicorp/consul-template
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-SLOT=0
-SRC_URI=https://github.com/hashicorp/consul-template/archive/v0.19.5.tar.gz -> consul-template-0.19.5.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=bd5e37848a4ab2e5c5df1553c39455dc
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
new file mode 100644
index 000000000000..f1a481717481
--- /dev/null
+++ b/app-admin/consul-template/Manifest
@@ -0,0 +1,9 @@
+AUX consul-template.confd 293 BLAKE2B 5c3ef27d72b4c98098b128f29c55f5e674c7d4427df9bc74519d84ad852c94c73d840a571cbf39bac4020558df57ea3f2d79b5e1dc60da8d8118fb6241586e60 SHA512 ee07c0f95b3ac35599417524dc2b76931a541f60888d93bf403c535518693452ff01076f70f3e891bca962376e422fb6650496297b5ffad96544fb4c36df0295
+AUX consul-template.initd 592 BLAKE2B 21d6ff6bee67a82c4305eba3765f8e9c49ee59357a553677fbf049a37dccad0d7645e681665db36e89263a5a73a1155e9b19446bdab7f58f04bb7173a727c711 SHA512 bbaa059f1b339f7f8c70babe90917fc1bbff36ca446452f6e4a744dd986392227342b865aa47be02ccec2d35c43814b8faadd66f9e5af5dab3abec9805b7e676
+AUX consul-template.logrotated 103 BLAKE2B 66f91c1a2cd0c926da67e99ccf0535c6ff5ed1e57c23fb3bb3df4066cfdc1ff70f2eae6a67c7816d8d38d41106f003fe2a98732a9180838c05d04a710d9bef09 SHA512 642b53e43fd7a4da00907600f26e3814893b61856a62083c804b0077043a4f8f6603f0ae4461e901105f8e1fe52c2f34f3e949e752441f5f510e9cc21890ca75
+AUX consul-template.service 398 BLAKE2B 94a30973f6e0ee114dc844bf9b83e423d72a2fc0a3bc0fb6a01668fdc268c7a4f7d550c67f2f6f5e5de3140d6f14aba99eb65702ee8e335e2c3750a8aba6d7ef SHA512 6f0621088475a392c142ff8cc7236850a61f2fdcb10d456a29a68dff1c12cd52f66cdb37ae2d7c84ba7513f430dc8cea6fd5f128a559b4de708c5b517aab75e1
+DIST consul-template-0.18.5.tar.gz 5285939 BLAKE2B 822df39f77d9aebc55e03d74b43ace9d453135c6270aedd3d41a674b5ae325a588af2a76c9236072d6f6dd274ab75c050df6607aa5bfc98b0caf2cd3065b1b04 SHA512 1709c889cd414d2b3510400e8077aec49006c31958618a38f6bce78dad2ba4aac5405410b030bf968b5cf148f4cfbe963ccf95a015cd1e58f2f6d1f09edc13de
+DIST consul-template-0.19.5.tar.gz 6054881 BLAKE2B 48d691f9d09531248310ec50c6c59d3c74db4c8ca5f0236ac8336df92c75da89677e64cb593518032f48f53b9f5aa914a7b6ac0a2dc6bf6d32ae7c1f6d1dc60d SHA512 bdba4e821e353a71f9f6287b8ff352e85a916201314229b998bfbebb066fec17c5d7f12e224bf2920b018a4f5fec9000f122f6c04cb2e455a195b945e35235a5
+EBUILD consul-template-0.18.5-r1.ebuild 1351 BLAKE2B d48a01aabea1abe073bf834c3167d6c15d5ea169ccb164a7daec1643ed4b9f8d1ac34aadd1df655b73b56442a5761df2f1e8b4e72ef4788876d86c422cedd836 SHA512 0ad472d57b8c815ee88d051d18287b13c7839f147bcef5525a92c15cfe099c71dae7a5acb349239fa4158f2fed5fe6363eceb47b1b0861d8235f2a2510882e6e
+EBUILD consul-template-0.19.5.ebuild 1328 BLAKE2B f19e2a8bc8129da1a7ec87b6e7b58cdba797e7ab52f6b401aac40b8e0126f76569166b054a80d343e05cc5df67c77140c1a46afa9e7502fe368ea0985bf69249 SHA512 500a8fdb1dcfa4456a252167bed358b8e14b04ac23c1889672e34eff22d12b88dd09fc40bf00c56252421ff82d213763f69a4327db12f913fef042e17747d944
+MISC metadata.xml 316 BLAKE2B 857b3a0a26e35ac2f52f797b85a42f91c74a10b4d8d6a1f5394465e68f6ad57bd732286650966f99cc516ec68d00f31f0f880931e2041cb596d50e521ac3a599 SHA512 e66cfdeeab0bec39ed4149454fd1876ce963f7bd0012fc659abf92aefbad4e5fba90c9fe84019273d5f837f6bdf438146b433d9ea00cfe1cf4356e112522f1ad
diff --git a/app-admin/consul-template/consul-template-0.18.5-r1.ebuild b/app-admin/consul-template/consul-template-0.18.5-r1.ebuild
new file mode 100644
index 000000000000..47439c5c68f5
--- /dev/null
+++ b/app-admin/consul-template/consul-template-0.18.5-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="Generic template rendering and notifications with Consul"
+EGO_PN="github.com/hashicorp/${PN}"
+HOMEPAGE="https://github.com/hashicorp/consul-template"
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.6:="
+RDEPEND=""
+
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	eapply_user
+	# Avoid the need to have a git checkout
+	sed -e 's:^GIT.*::' \
+		-i src/${EGO_PN}/scripts/compile.sh || die
+}
+
+src_compile() {
+	export GOPATH=${S}
+	cd "${S}"/src/${EGO_PN} || die
+	PATH=${PATH}:${S}/bin \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	emake bin-local
+}
+
+src_test() {
+	cd "${S}"/src/${EGO_PN} || die
+	emake test || die
+}
+
+src_install() {
+	dobin "${S}"/src/${EGO_PN}/pkg/$(go env GOOS)_$(go env GOARCH)/${PN}
+	dodoc "${S}"/src/${EGO_PN}/{CHANGELOG.md,README.md}
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+}
diff --git a/app-admin/consul-template/consul-template-0.19.5.ebuild b/app-admin/consul-template/consul-template-0.19.5.ebuild
new file mode 100644
index 000000000000..dfa6bf036b0b
--- /dev/null
+++ b/app-admin/consul-template/consul-template-0.19.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="Generic template rendering and notifications with Consul"
+GIT_COMMIT="f8c8205"
+EGO_PN="github.com/hashicorp/${PN}"
+HOMEPAGE="https://github.com/hashicorp/consul-template"
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND="dev-lang/go
+	test? ( app-admin/consul )"
+RDEPEND=""
+
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e "s:git rev-parse --short HEAD:echo ${GIT_COMMIT}:" \
+		-e '/-s \\/d' \
+		-i src/${EGO_PN}/Makefile || die
+}
+
+src_compile() {
+	export GOPATH=${S}
+	cd src/${EGO_PN} || die
+	#XC_ARCH=$(go env GOARCH) \
+	#XC_OS=$(go env GOOS) \
+	emake dev
+}
+
+src_test() {
+	cd src/${EGO_PN} || die
+	emake test
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc src/${EGO_PN}/{CHANGELOG.md,README.md}
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+}
diff --git a/app-admin/consul-template/files/consul-template.confd b/app-admin/consul-template/files/consul-template.confd
new file mode 100644
index 000000000000..9af7d023305e
--- /dev/null
+++ b/app-admin/consul-template/files/consul-template.confd
@@ -0,0 +1,7 @@
+# you can change the init script behavior by setting those parameters
+# - group (default: consul-template)
+# - pidfile (default: /run/consul-template/consul-template.pid)
+# - user (default: consul-template)
+
+# extra arguments for the consul agent
+command_args="-config=/etc/consul-template.d"
diff --git a/app-admin/consul-template/files/consul-template.initd b/app-admin/consul-template/files/consul-template.initd
new file mode 100644
index 000000000000..f968d8d08612
--- /dev/null
+++ b/app-admin/consul-template/files/consul-template.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 2015-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="consul-template agent"
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+
+command="/usr/bin/${RC_SVCNAME}"
+command_args="-config=/etc/consul-template.d ${command_args}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+stopsig="SIGINT"
+
+depend() {
+	need net
+}
diff --git a/app-admin/consul-template/files/consul-template.logrotated b/app-admin/consul-template/files/consul-template.logrotated
new file mode 100644
index 000000000000..51e2737fd491
--- /dev/null
+++ b/app-admin/consul-template/files/consul-template.logrotated
@@ -0,0 +1,7 @@
+/var/log/consul-template/consul-template.log {
+	missingok
+	size 5M
+	rotate 3
+	compress
+	copytruncate
+}
diff --git a/app-admin/consul-template/files/consul-template.service b/app-admin/consul-template/files/consul-template.service
new file mode 100644
index 000000000000..69b1c86ddb46
--- /dev/null
+++ b/app-admin/consul-template/files/consul-template.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=consul-template daemon
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=consul-template
+Environment=CONSUL_TEMPLATE_DAEMON_OPTS="-config=/etc/consul-template.d"
+ExecStart=/usr/bin/consul-template $CONSUL_TEMPLATE_DAEMON_OPTS
+Restart=on-failure
+SuccessExitStatus=12
+KillSignal=SIGINT
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=default.target
diff --git a/app-admin/consul-template/metadata.xml b/app-admin/consul-template/metadata.xml
new file mode 100644
index 000000000000..7efeb6aef9c6
--- /dev/null
+++ b/app-admin/consul-template/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">hashicorp/consul-template</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
new file mode 100644
index 000000000000..0dd45ae7b8e6
--- /dev/null
+++ b/app-admin/consul/Manifest
@@ -0,0 +1,14 @@
+AUX bootstrap.json.example 46 BLAKE2B 70821b3ebd2d39d67ec3b1fb06d7ffd20b89c13932e125682cc671d3914e860ee495e422d1d67fadf0762acfbcbdc9194fd54d851fc537966370287c13e1c779 SHA512 eda1c8779b06ce6020e3f4e759201336b2bfa716986446882db4e6e95ff89a7da0c6101dd4dd603a59202b9c2db79d96f36cf53b63bc63375d94ba74ba4e2857
+AUX consul.confd 301 BLAKE2B 0e3e2953a92c26f7cad295c5c11f8a1efe0c764266f9478a19cf64b182d561bc70485dc6aa18f10caf6d0ce056f40656cc7579033d3447150e3d2ef53c4b0c71 SHA512 d0587263753965b4614a24c3bd4aeed13e236a1dc6ed329b2ce542d394d1d5542e5db061af2151be54f5882c4bb0e254511645065f32c59d7fc338ac0bd4de7a
+AUX consul.initd 726 BLAKE2B b3bf7924a0eb0e3c499256a802b9d5f22bf362b59ba2d50b45049edb72192c9f67733d8042ed219835a997b4994a1d3966000cff79efb541f3d62c798836de80 SHA512 a13fa8476d27288ee284b7460d77f7e67327b5a18b4635ab9c6f2f5ae05981f6876f1a2f4f27448a22a602a2ed30bd7873fe15776473d5aa6db9497765f1be6e
+AUX consul.logrotated 85 BLAKE2B 8f3212c58295d57e9265dec26b9bfe562c47ca16844218002e51bdaf421adca082b9a955f1ebb71d83f1243b2e79c236f94f5f520d0606c15d20c3db9f5f7de6 SHA512 e4943908e26d75ca8eb658b268479e47bc71b96957de8c35dddec52e7b8062aec3fada4e86fd97f986fbac912d29cad1f83f943ea4451b7469df0712799bb972
+AUX consul.service 354 BLAKE2B 9996b9d6a1aab360a3b46518e2091e8f30794f3bd3d113a3e9cbff2f4ff8a4cd014475806bd75feb6948c12b60846a403e35630820b814032fadc9a664985b90 SHA512 537d35e5a79d40dc62f6eb04f4631251d1e6dd62f2bd7d5483274903996052705db5fb4026000ef6e768e3dafb02f155c5bc1fd15a32813ecca8b1348a95e92d
+AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e25606fb97b252be16f2d3f50630092be39be378821f7e17e4914557a55c620156e7d07ced151d1f977689 SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b
+AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
+DIST consul-1.0.6.tar.gz 8211299 BLAKE2B 7ea5df497f4796e572a86127e0854935f97439504aff82fb697f33700e9d138048772f32f171dbbe4f1fb4d1ceefa7ca96cf3dce2a22cdffd4e1906f6befa55b SHA512 c55f09272859b828816ddf548952769172331c22be8a70a7f73ab9362744fb1f4bc5fdf81955a0dbc4101584cf3660f182620dcdc56bcf94b42dce644be232a8
+DIST consul-1.2.0.tar.gz 17187054 BLAKE2B 5e8d1151efe1e8ad5932886367d0012774713081aa2725f10d45af1e05751e328d76471ff3cbd85031c252c65cde0137f96c3ef86eca7e3e7f6b28e2d20ed0d5 SHA512 1c018a5f35164a899a086ccdae94cb5e6e2a490e4c788d65b0026dbf448950d0c1038b2d61cb10f5e8c9ad22a1affad64dd4a7086b59dffd115d40aa7b3d0cce
+DIST consul-1.2.1.tar.gz 14819500 BLAKE2B debb7ee5b8016527de0ebc680b228a9749435db4364e8d6e0160b1a20e2896dd4109edc5930dad961ce18f79182dda0c00a52a567ea6ff2d267b17448df2129d SHA512 5b5d8b62056c305f7388db50b54427ed21c41fef6d1b5f67da845a66bece35454e9f538bb0df59bc86788826b6cd20cd6179552060482908fc5cbc4a048c14a8
+EBUILD consul-1.0.6.ebuild 1578 BLAKE2B c32a67c19567b1b601bb6f272f6e435f9600accb4a41a03e774c197bb8f743d67c8fb4cc9e97c4829fb1bfd21eceed9318cc3f8e31217f89d57fe20c78f71054 SHA512 c2abbe3e57e2939832f443b2df5a5c3fad3fae197a5e96f6ed116f2c235a9df882848153f1928be71b5845c38256d99e1cceaf76c88efe30470495f0ef765572
+EBUILD consul-1.2.0.ebuild 1531 BLAKE2B 0d3891c096bd5a7b33a0f7b7969c7b27ea8536a1f1b608e1d119c1096734cf232dedf4ec38a011a39676ace9fa44de6ae8a58ad594f3d3fdd3093ee580e8509c SHA512 9ba4ed9ebb5c77b7ebc8daddf4346b8d14fca664eed894ee61c3aab06918d07a6a5156bf9717006009e65ff72c9954fd653630b0a16ab3ade5cbd9a36ef5005e
+EBUILD consul-1.2.1.ebuild 1529 BLAKE2B 5cfc78afbddfa423c8ffbe18e5ef532889de54bcb966dd51601297fc360dcf35e8ada41cfd3c725dbffb0ce52d95c79758a2b847cfe989ed48a4887c568c13ab SHA512 56c00a9377b39338c1735424b23b22b6b9cfcd6edf2d53d738ef57f951a9cce1307161f0a54e1be0b3afe9e792710f31a6dc540021d6684aee7837a8e4f9a032
+MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.0.6.ebuild b/app-admin/consul/consul-1.0.6.ebuild
new file mode 100644
index 000000000000..05b4622df94f
--- /dev/null
+++ b/app-admin/consul/consul-1.0.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+	>=dev-lang/go-1.9:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+	default
+
+	sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
+		-e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e 's:go get -u -v $(GOTOOLS)::' \
+		-e 's:vendorfmt dev-build:dev-build:' \
+		-i "${S}/src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GOPATH="${S}" GOBIN="${S}/bin" \
+		emake -C "${S}/src/${EGO_PN}" dev
+}
+
+src_install() {
+	local x
+
+	dobin "${S}/bin/${PN}"
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/consul/consul-1.2.0.ebuild b/app-admin/consul/consul-1.2.0.ebuild
new file mode 100644
index 000000000000..1f9dd43d9356
--- /dev/null
+++ b/app-admin/consul/consul-1.2.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+GIT_COMMIT="2814197"
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+	>=dev-lang/go-1.9:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+	default
+
+	sed -e 's:go get -u -v $(GOTOOLS)::' \
+		-e 's:vendorfmt dev-build:dev-build:' \
+		-i "src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GOPATH="${S}" \
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake -C "src/${EGO_PN}" dev-build
+}
+
+src_install() {
+	local x
+
+	newbin bin consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/consul/consul-1.2.1.ebuild b/app-admin/consul/consul-1.2.1.ebuild
new file mode 100644
index 000000000000..c23a7225e2cc
--- /dev/null
+++ b/app-admin/consul/consul-1.2.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+GIT_COMMIT="39f3f0"
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+	>=dev-lang/go-1.9:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+	default
+
+	sed -e 's:go get -u -v $(GOTOOLS)::' \
+		-e 's:vendorfmt dev-build:dev-build:' \
+		-i "src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GOPATH="${S}" \
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake -C "src/${EGO_PN}" dev-build
+}
+
+src_install() {
+	local x
+
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/consul/files/bootstrap.json.example b/app-admin/consul/files/bootstrap.json.example
new file mode 100644
index 000000000000..b7d573c0d2b3
--- /dev/null
+++ b/app-admin/consul/files/bootstrap.json.example
@@ -0,0 +1,4 @@
+{
+  "server": true,
+  "bootstrap_expect": 1
+}
diff --git a/app-admin/consul/files/consul.confd b/app-admin/consul/files/consul.confd
new file mode 100644
index 000000000000..b15e19c77013
--- /dev/null
+++ b/app-admin/consul/files/consul.confd
@@ -0,0 +1,10 @@
+# you can change the init script behavior by setting those parameters
+# - group (default: consul)
+# - pidfile (default: /run/consul/consul.pid)
+# - user (default: consul)
+
+# extra arguments for the consul agent
+command_args="-config-dir=/etc/consul.d"
+
+# upstream strongly recommends > 1
+GOMAXPROCS=2
diff --git a/app-admin/consul/files/consul.initd b/app-admin/consul/files/consul.initd
new file mode 100644
index 000000000000..b36db8aef13c
--- /dev/null
+++ b/app-admin/consul/files/consul.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 2015-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="consul agent"
+extra_started_commands="reload"
+export GOMAXPROCS=${GOMAXPROCS:-2}
+group=${group:-${RC_SVCNAME}}
+user=${user:-${RC_SVCNAME}}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+command="/usr/bin/${RC_SVCNAME}"
+command_args="agent ${command_args:-config-dir=/etc/consul.d}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+stopsig="SIGINT"
+
+depend() {
+	need net
+}
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME}"
+	${command} reload
+	eend $?
+}
diff --git a/app-admin/consul/files/consul.logrotated b/app-admin/consul/files/consul.logrotated
new file mode 100644
index 000000000000..ca958a5f5d05
--- /dev/null
+++ b/app-admin/consul/files/consul.logrotated
@@ -0,0 +1,7 @@
+/var/log/consul/consul.log {
+	missingok
+	size 5M
+	rotate 3
+	compress
+	copytruncate
+}
diff --git a/app-admin/consul/files/consul.service b/app-admin/consul/files/consul.service
new file mode 100644
index 000000000000..496fe4814789
--- /dev/null
+++ b/app-admin/consul/files/consul.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=consul agent
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=consul
+Environment=GOMAXPROCS=2
+Environment=CONSUL_AGENT_OPTS="-config-dir=/etc/consul.d"
+ExecStart=/usr/bin/consul agent $CONSUL_AGENT_OPTS
+Restart=on-failure
+KillSignal=SIGINT
+ExecReload=/usr/bin/consul reload
+
+[Install]
+WantedBy=default.target
diff --git a/app-admin/consul/files/data-dir.json.example b/app-admin/consul/files/data-dir.json.example
new file mode 100644
index 000000000000..af162113af62
--- /dev/null
+++ b/app-admin/consul/files/data-dir.json.example
@@ -0,0 +1,3 @@
+{
+  "data_dir": "/var/lib/consul"
+}
diff --git a/app-admin/consul/files/ui.json.example b/app-admin/consul/files/ui.json.example
new file mode 100644
index 000000000000..f8ce72f7753a
--- /dev/null
+++ b/app-admin/consul/files/ui.json.example
@@ -0,0 +1,3 @@
+{
+  "ui": true
+}
diff --git a/app-admin/consul/metadata.xml b/app-admin/consul/metadata.xml
new file mode 100644
index 000000000000..a028c353fe53
--- /dev/null
+++ b/app-admin/consul/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>ultrabug@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">hashicorp/consul</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/cpulimit-1.8 b/app-admin/cpulimit-1.8
deleted file mode 100644
index eb7df85e781b..000000000000
--- a/app-admin/cpulimit-1.8
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Limits the CPU usage of a process
-EAPI=5
-HOMEPAGE=http://cpulimit.sourceforge.net
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/limitcpu/cpulimit-1.8.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=aa7cc0dba624bc5c0e654bea5205d2db
diff --git a/app-admin/cpulimit-2.2 b/app-admin/cpulimit-2.2
deleted file mode 100644
index b7fd75383933..000000000000
--- a/app-admin/cpulimit-2.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Limits the CPU usage of a process
-EAPI=5
-HOMEPAGE=http://cpulimit.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/limitcpu/cpulimit-2.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e2ec485ecac2c44763abb3f31bb2dde4
diff --git a/app-admin/cpulimit-2.4 b/app-admin/cpulimit-2.4
deleted file mode 100644
index 9d93c99d2891..000000000000
--- a/app-admin/cpulimit-2.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Limits the CPU usage of a process
-EAPI=6
-HOMEPAGE=http://cpulimit.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/limitcpu/cpulimit-2.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9e8de91210ca76aa531953c85e30b505
diff --git a/app-admin/cpulimit/Manifest b/app-admin/cpulimit/Manifest
new file mode 100644
index 000000000000..867b6a25b3a4
--- /dev/null
+++ b/app-admin/cpulimit/Manifest
@@ -0,0 +1,8 @@
+AUX cpulimit.8 1451 BLAKE2B d65e5e47767e6202635cdb1247c343f2a68e49b70b0748e16d7eb8a5e17344ccaa929d77bfc29462d61909b9363d9486b709f9a23552aa0d2db58aac04d410e7 SHA512 3cceb217f5053aa6583a13ada2ef9ed6370859bb072474fcc6fef88f5184985b0a369b1f0c1ead634b07a1318ea1f81a4f4128de95513f9e6cabdf86223f6083
+DIST cpulimit-1.8.tar.gz 20610 BLAKE2B 4b80322b035d79267a97a491e51b2ae82488c59f4383e2dbf87d178a4a69d03a4d1aa653eccd8d801fac48e95c2f0780bd46881f4d38626b3c28b73f0a53bd71 SHA512 3098236139b092eb706ec2a6b84528a090b3f4b8b3adfc8debda1b92ffa119ed9adc508898e0f98add593561f5f6b67d52e0966de01a682a6e2e885e3c47b0fa
+DIST cpulimit-2.2.tar.gz 22224 BLAKE2B e59e65c0bd38ff93b2daaef6858c46cc99b8a1345e5a6dc66b871b1b1c7930557b6d6607d9b61e0538195aaf5fc8eda42edacda38a2f729aa56eb582bb9343a7 SHA512 e708b27e969024ed37689341d76979e5041c050c259359c46f988cfc55f571c16c17f48ca63cd93349041b76bb2c314ab69af36634fec5212e49aa0d0cb0a46e
+DIST cpulimit-2.4.tar.gz 24669 BLAKE2B e0fe0d6766e76e6e2a68dcdc553039400233daabbb14ce4a9dae46a7b694d2ecd660f4c1d13f417a74b12365c719780c732a03bd91c6384d1e7118d0fce521fb SHA512 008dc3fbdcbd8afd875a2a1ce03d609db595c6e110803140c676d3713ea60f4877a1bb8e7aa0e8b669dce31522ad81e2703f616341a0f4cbc69a6b01865b66d0
+EBUILD cpulimit-1.8.ebuild 575 BLAKE2B 6d289bdc46838d5c495908533e0d4c5419ddd7f5f7024a7acd39858cfe46544662ab64adb03dc967c146fa49be34a8ddf6fa2c027733f40b240b85fc7ca9f576 SHA512 5b726887834de6eb7ccaef9d8797998a4bd82e3cd06c8e8982895d9780178afda4778ed2a3a55bdf89125ee78d179c594c1ca82d3d7f7bbad4384d83e6da5cf4
+EBUILD cpulimit-2.2.ebuild 593 BLAKE2B 1571a3b20a315aeac1c051e04691bb71ac832d969908de2e85a95b68876c51d3479476adc5bae4a1f248b98bb0dd27d712209d8d628e71b6dbafc488aa96524c SHA512 a488c04229230cbcc83f800ae39a391a61d8ecb7c704bdeaba85d6dcfc02179e939bbf098b26520350be25350f3ec3a8a2a709cf25991b7777b53a609c6942ac
+EBUILD cpulimit-2.4.ebuild 642 BLAKE2B aa27d5417efb47d655d7e3e22879743b376676f868995ccd7fbf16b7c6c87394985f710c0df3b322c08bed70009b7651a2aacc7f75ed3a1b7504f231e24e676a SHA512 3ea7af0885d83069ce70bc0bf3a2fd6247d05bf6c54bb08b703523209acdc4e146a0a7272b9a25e5a2171e6a161a0914182daa19edda65eadd784c62f73798b1
+MISC metadata.xml 328 BLAKE2B cfd9269eca123a335dd8b842cf59029ae1aef98293d1f955cd4cf33ddd56a658c1aba076e7de6318720c4ee0a282bee3c5282dab611e316a1ddbbf45c18af334 SHA512 5bf3122d96aba89083a0776bfeb5cd1ca84cdabc59a1ad4e158b1b50e4eb42b3ebf7a45a51807af380a040c6ae106ddc30c97003a2398e7944bce932fb35d8b1
diff --git a/app-admin/cpulimit/cpulimit-1.8.ebuild b/app-admin/cpulimit/cpulimit-1.8.ebuild
new file mode 100644
index 000000000000..bdc78ff5f3f2
--- /dev/null
+++ b/app-admin/cpulimit/cpulimit-1.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Limits the CPU usage of a process"
+HOMEPAGE="http://cpulimit.sourceforge.net"
+SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	tc-export CC
+	# set correct VERSION
+	sed -i -e '/^#define VERSION/s/1.7/1.8/' cpulimit.c || die 'sed on VERSION string failed'
+}
+
+src_install() {
+	dosbin ${PN}
+	doman "${FILESDIR}/${PN}.8"
+}
diff --git a/app-admin/cpulimit/cpulimit-2.2.ebuild b/app-admin/cpulimit/cpulimit-2.2.ebuild
new file mode 100644
index 000000000000..8df40c18cf64
--- /dev/null
+++ b/app-admin/cpulimit/cpulimit-2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Limits the CPU usage of a process"
+HOMEPAGE="http://cpulimit.sourceforge.net"
+SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	tc-export CC
+	# set correct VERSION
+	sed -i -e "/^#define VERSION/s@[[:digit:]\.]\+\$@${PV}@" cpulimit.c || die 'sed on VERSION string failed'
+}
+
+src_install() {
+	dosbin ${PN}
+	doman "${FILESDIR}/${PN}.8"
+}
diff --git a/app-admin/cpulimit/cpulimit-2.4.ebuild b/app-admin/cpulimit/cpulimit-2.4.ebuild
new file mode 100644
index 000000000000..72e81d6e2ab9
--- /dev/null
+++ b/app-admin/cpulimit/cpulimit-2.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Limits the CPU usage of a process"
+HOMEPAGE="http://cpulimit.sourceforge.net"
+SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	tc-export CC
+	# set correct VERSION
+	#sed -i -e "/^#define VERSION/s@[[:digit:]\.]\+\$@${PV}@" cpulimit.c \
+	#	|| die 'sed on VERSION string failed'
+
+	default
+}
+
+src_install() {
+	local DOCS=( CHANGELOG README )
+	dosbin ${PN}
+	doman ${PN}.1
+	einstalldocs
+}
diff --git a/app-admin/cpulimit/files/cpulimit.8 b/app-admin/cpulimit/files/cpulimit.8
new file mode 100644
index 000000000000..8e6dcf9bbf42
--- /dev/null
+++ b/app-admin/cpulimit/files/cpulimit.8
@@ -0,0 +1,49 @@
+.TH CPULIMIT "8" "July 2006" "cpulimit" "System Management"
+.SH NAME
+cpulimit -- limits the CPU usage of a process
+.SH SYNOPSIS
+.B cpulimit
+\fITARGET \fR[\fIOPTIONS\fR...]
+.SH DESCRIPTION
+.P
+\fITARGET \fRmust be exactly one of these:
+.TP
+\fB\-p\fR, \fB\-\-pid\fR=\fIN\fR
+pid of the process
+.TP
+\fB\-e\fR, \fB\-\-exe\fR=\fIFILE\fR
+name of the executable program file
+.TP
+\fB\-P\fR, \fB\-\-path\fR=\fIPATH\fR
+absolute path name of the executable program file
+.P
+\fIOPTIONS\fR
+.TP
+\fB\-l\fR, \fB\-\-limit\fR=\fIN\fR
+percentage of CPU allowed from 0 to 100 (mandatory)
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+show control statistics
+.TP
+\fB\-z\fR, \fB\-\-lazy\fR
+exit if there is no suitable target process, or if it dies
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit
+.SH EXAMPLES
+Assuming you have started \fB`foo \-\-bar`\fR and you find out with \fItop\fR(1) or
+\fIps\fR(1) that this process uses all your CPU time you can either
+.TP
+\[sh] \fBcpulimit \-e foo \-l 50\fR
+limits the CPU usage of the process by acting on the executable program file
+(note: the argument "\-\-bar" is omitted)
+.TP
+\[sh] \fBcpulimit \-p 1234 \-l 50\fR
+limits the CPU usage of the process by acting on its PID, as shown by
+\fIps\fR(1)
+.TP
+\[sh] \fBcpulimit \-P /usr/bin/foo \-l 50\fR
+same as \fI\-e\fR but uses the absolute path name 
+.SH AUTHOR
+This manpage was written for the Debian project by gregor herrmann
+<gregor+debian@comodo.priv.at> but may be used by others.
diff --git a/app-admin/cpulimit/metadata.xml b/app-admin/cpulimit/metadata.xml
new file mode 100644
index 000000000000..79f77a166fa8
--- /dev/null
+++ b/app-admin/cpulimit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bircoph@gentoo.org</email>
+		<name>Andrew Savchenko</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">limitcpu</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/cronolog-1.6.2-r5 b/app-admin/cronolog-1.6.2-r5
deleted file mode 100644
index 8ed0ea541286..000000000000
--- a/app-admin/cronolog-1.6.2-r5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Log rotation software
-EAPI=6
-HOMEPAGE=https://github.com/fordmason/cronolog
-KEYWORDS=amd64 ~arm ppc x86
-LICENSE=GPL-2+ Apache-1.0
-SLOT=0
-SRC_URI=http://cronolog.org/download/cronolog-1.6.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cde3a85060951d02c4ae946298822943
diff --git a/app-admin/cronolog/Manifest b/app-admin/cronolog/Manifest
new file mode 100644
index 000000000000..f295cfda33bc
--- /dev/null
+++ b/app-admin/cronolog/Manifest
@@ -0,0 +1,12 @@
+AUX 1.6.2-patches/cronolog-define-strptime.patch 302 BLAKE2B 304b7ae3133268d18533457632e57aed6436a100acc1a31cdc8acb7d0f5312373474c6da7cf66d56b220173429612f15023d3d255214f4a4cdaa58ab5876e190 SHA512 f2bd5b109ef4c3656f31f516364defaad899a16f279d867a1548e7c797b30691daef49b7bee49e6ce15be3903aea09c3b5cf04cf077797d066ada9ac68e6335a
+AUX 1.6.2-patches/cronolog-doc.patch 406 BLAKE2B 311f67dbc1bc7832c178a54e923583ec4808d1c1b6204bd7313ef9f5edb6ea985833f26d4a8819c6f5a291e23b638512b6643125dde7d2a79cce048d99aa58a0 SHA512 a33eda2c8d9cb1c4f72ec6fa80de9748789cb1e754f6448f53c12df601d78f5284c66d1ed476cd11435fb83a4d834cdaea85f0a4d1421fb1796197a871860cfa
+AUX 1.6.2-patches/cronolog-getopt-long.patch 1080 BLAKE2B 887e6366498306ea735aa795827a3f8e91185a414616c96f57cfdbb873b4a8fe9d333d17701b50c21319655bb1883a278c95c4f92a4a064e61ff1627d426b81f SHA512 84f784dff035200a15ade43e5379bbaadf8ac24216c2dd157d2f3f2e30575d0bda8357b0d2661f1d13ba1b446e88b4bbe2805b46fd8af80c5f6af4a47bc03f4e
+AUX 1.6.2-patches/cronolog-large-file.patch 823 BLAKE2B 830cad8a5ea427a6d7351cd2fefb4be127bca84847c61d82d2b76380a781dd52ef0dbdb6d23cb5b7315ea8e151769c1de597a49b838e597c629afbc98e01731b SHA512 23d2579941d57bab47e73c3f258e54074b87bd5306877d8139b3a777de97be8d24c994142d6a38163048d02aa550096264e076fd47b3e5b4d5599d16f48edd3e
+AUX 1.6.2-patches/cronolog-missing-symlink.patch 326 BLAKE2B e4f442f3d14f96b239ef10db3c7b9cb2512c6012c82588701df0271739a034c9924f413159f07903877b5d3f30014690a4e39a46cecb8cb0b75363cfbb6fae72 SHA512 6617e7ccde6fd97e68147157b1c1341e5d4d0ad2ffe69225d543990ef5dba3bfea2f79c3a351d696470a70e0da57595d3eea194cc53aea81d3926b0f3b2eabad
+AUX 1.6.2-patches/cronolog-setugid.patch 12345 BLAKE2B 1ecf5ecf5611a83a70727696accf268222ce12eb788ed3e636d2c7c4699248a1fe567b8e474032963b25c51809fa5142fb9e4afc319396864924e75ce097568c SHA512 ed9048ceb5e9dcb86c34f34e0f2619ec85a1789883939ca99875ec61b3df711e6793204363445c8df3a13298aaa079fadde76f0a9e87b62b8bc44f103143a9e0
+AUX 1.6.2-patches/cronolog-sigusr1.patch 1154 BLAKE2B a5506f1252a18eeb805c8703baadffc42d8d358cba9ec887b00fb0e8fcf436dcfa0912490d3e31869d4f0855e9057a319212a3ef4ace58da6109091bbbc25472 SHA512 8d31f0032581b3295b168b5af4755f0ac5793869d7472a42c66ebe2b0ac7ecf03b88aa6459341bcbc5f6dfa3265f205844fe1a1b4e1256f957f12b5577ef2ed6
+AUX 1.6.2-patches/cronolog-strftime.patch 435 BLAKE2B a4f817a743df2a1193609bb16e9d82ab932875bfe7e34c90af3289be8b01783ce7da9a8c8c9ee55d2db413e20efd264707de11b6669f5fd32445f8508a18aeda SHA512 8c226b70c7b026ce5e7400798d0e2016ed984df04bd66b6a2358ce445323be930b5f7951b879545c8f075761cc2b5062f9ccc4b759f2e586a4c8943efa4ee914
+AUX cronolog-1.6.2-umask.patch 2366 BLAKE2B 84134bf197929689edcb95605c89732175004771b8cbe0b7de84b7608444e1b37b447d3f37c5db3645c22d74a6e62d150a85cdb4d6487f92d32632d6646ef2ce SHA512 da3f7d84ce365edce396bc43ec9b469973301c6a28f3eb56b7f019dcb65fb7ceec981f92c1382542d01e4b6e49e32ff4fe283aed9dbc7bb30c6780775acf39b3
+DIST cronolog-1.6.2.tar.gz 133591 BLAKE2B 5a78d0136a834849c6f9fc9f41341808295fe38919ac795d5329c46f353b5fadebc5819031a07c2c2a780d54957d16edb9e8935e15a2ed77eb13a2d6c7d2832d SHA512 786135aaa1359605840effb9a755c500970098ca32c1c4976c62f9d7481d24cecefe223ce8dcc34a139427259a6f3ba1c435c700a72ee07ed68ffc7f2d36e4ea
+EBUILD cronolog-1.6.2-r5.ebuild 539 BLAKE2B d1ce1f7f0e51a85ff4b36fcfbbe270a473d4a6b896e8cffc98e4ff5caf41e42dc3f621303cbab8d5859c2b7f20bc0de0ed83e07304dff2dcdc6c05138da54e3a SHA512 3fbac862e8f8410d5dc69c4efc134838f3070a8b255f655b681a303506ff1ea5d65b532ea12ef543dae1e1edc907e32d32c502c28000f2d29466997b05fc7618
+MISC metadata.xml 719 BLAKE2B aeabc972c2347a9a39d7073165aeebb1b307f81c52db0e294405e10cf903b4058a0d2fbab64cc4f81b1013c6b39fe1ceead0725b32ee9bfee1fa9e307499deee SHA512 d5b5452b8105d8273328ee8ab1c95674686a00862a578f8171c4799791ceb131ac0204693a3d65ce6136d9cbea114f7f899a85669bde9b76b8c8e800a4c4c75f
diff --git a/app-admin/cronolog/cronolog-1.6.2-r5.ebuild b/app-admin/cronolog/cronolog-1.6.2-r5.ebuild
new file mode 100644
index 000000000000..f8b32bd5968e
--- /dev/null
+++ b/app-admin/cronolog/cronolog-1.6.2-r5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Log rotation software"
+HOMEPAGE="https://github.com/fordmason/cronolog"
+SRC_URI="http://cronolog.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2+ Apache-1.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-patches
+	# rename and move into ${PV}-patches after -r3 removal
+	"${FILESDIR}"/${P}-umask.patch
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-define-strptime.patch b/app-admin/cronolog/files/1.6.2-patches/cronolog-define-strptime.patch
new file mode 100644
index 000000000000..26ac2a40319c
--- /dev/null
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-define-strptime.patch
@@ -0,0 +1,11 @@
+diff -urb cronolog-1.6.2/src/cronoutils.c cronolog-1.6.2-patched/src/cronoutils.c
+--- a/src/cronoutils.c	2001-05-03 09:43:21.000000000 -0700
++++ b/src/cronoutils.c	2008-01-05 22:08:42.000000000 -0800
+@@ -69,6 +69,8 @@
+  *
+  */
+ 
++#define _GNU_SOURCE
++
+ #include "cronoutils.h"
+ extern char *tzname[2];
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-doc.patch b/app-admin/cronolog/files/1.6.2-patches/cronolog-doc.patch
new file mode 100644
index 000000000000..b4b68d5690a9
--- /dev/null
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-doc.patch
@@ -0,0 +1,12 @@
+diff -ur cronolog-1.6.2/doc/cronolog.1m cronolog-1.6.2/doc/cronolog.1m
+--- a/doc/cronolog.1m	2001-05-04 01:44:55.000000000 -0700
++++ b/doc/cronolog.1m	2008-01-06 00:43:33.000000000 -0800
+@@ -77,7 +77,7 @@
+ to the current log file.
+ .\"
+ .IP "-P \fINAME\fP"
+-.IP "--prevlink=\fINAME\fP"
++.IP "--prev-symlink=\fINAME\fP"
+ maintain a symbolic link from 
+ .I NAME
+ to the previous log file.  Requires that the
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-getopt-long.patch b/app-admin/cronolog/files/1.6.2-patches/cronolog-getopt-long.patch
new file mode 100644
index 000000000000..b7eb5c1760c4
--- /dev/null
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-getopt-long.patch
@@ -0,0 +1,24 @@
+diff -urp cronolog-1.6.2/src/cronolog.c cronolog-1.6.2/src/cronolog.c
+--- a/src/cronolog.c	2001-05-03 09:42:48.000000000 -0700
++++ b/src/cronolog.c	2008-01-05 23:54:53.000000000 -0800
+@@ -139,7 +139,8 @@ struct option long_options[] =
+     { "delay",		required_argument,	NULL, 'd' },
+     { "once-only", 	no_argument,       	NULL, 'o' },
+     { "help",      	no_argument,       	NULL, 'h' },
+-    { "version",   	no_argument,       	NULL, 'V' }
++    { "version",   	no_argument,       	NULL, 'V' },
++    { NULL,		0,			NULL, 0 }
+ };
+ #endif
+ 
+diff -urp cronolog-1.6.2/src/cronotest.c cronolog-1.6.2/src/cronotest.c
+--- cronolog-1.6.2/src/cronotest.c	2001-05-03 09:26:44.000000000 -0700
++++ cronolog-1.6.2/src/cronotest.c	2008-01-06 00:02:24.000000000 -0800
+@@ -112,7 +112,8 @@ struct option   long_options[] =
+     { "test-subdirs",	required_argument,	NULL, 'D' },
+     { "help",       	no_argument,		NULL, 'h' },
+     { "version",	no_argument,		NULL, 'V' },
+-    { "verbose",	no_argument,		NULL, 'v' }
++    { "verbose",	no_argument,		NULL, 'v' },
++    { NULL,		0,			NULL, 0 }
+ };
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-large-file.patch b/app-admin/cronolog/files/1.6.2-patches/cronolog-large-file.patch
new file mode 100644
index 000000000000..25e488f061c0
--- /dev/null
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-large-file.patch
@@ -0,0 +1,27 @@
+--- a/src/cronolog.c	2003-10-13 12:35:17.000000000 +0000
++++ b/src/cronolog.c	2003-10-13 12:36:36.000000000 +0000
+@@ -82,6 +82,8 @@
+  * written to "file" (e.g. /dev/console) or to stderr if "file" is "-".
+  */
+ 
++#define _GNU_SOURCE	1
++
+ #include "cronoutils.h"
+ #include "getopt.h"
+ 
+@@ -394,13 +396,13 @@
+ 	   timestamp(*pnext_period), *pnext_period,
+ 	   *pnext_period - time_now));
+     
+-    log_fd = open(pfilename, O_WRONLY|O_CREAT|O_APPEND, FILE_MODE);
++    log_fd = open(pfilename, O_WRONLY|O_CREAT|O_APPEND|O_LARGEFILE, FILE_MODE);
+     
+ #ifndef DONT_CREATE_SUBDIRS
+     if ((log_fd < 0) && (errno == ENOENT))
+     {
+ 	create_subdirs(pfilename);
+-	log_fd = open(pfilename, O_WRONLY|O_CREAT|O_APPEND, FILE_MODE);
++	log_fd = open(pfilename, O_WRONLY|O_CREAT|O_APPEND|O_LARGEFILE, FILE_MODE);
+     }
+ #endif	    
+ 
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-missing-symlink.patch b/app-admin/cronolog/files/1.6.2-patches/cronolog-missing-symlink.patch
new file mode 100644
index 000000000000..974c69faa74a
--- /dev/null
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-missing-symlink.patch
@@ -0,0 +1,11 @@
+--- a/src/cronoutils.c	2003-10-13 12:44:59.000000000 +0000
++++ b/src/cronoutils.c	2003-10-13 12:45:08.000000000 +0000
+@@ -199,7 +199,7 @@
+     {
+ 	unlink(prevlinkname);
+     }
+-    if (stat(linkname, &stat_buf) == 0)
++    if (lstat(linkname, &stat_buf) == 0)
+     {
+ 	if (prevlinkname) {
+ 	    rename(linkname, prevlinkname);
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-setugid.patch b/app-admin/cronolog/files/1.6.2-patches/cronolog-setugid.patch
new file mode 100644
index 000000000000..8fe4c0f12396
--- /dev/null
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-setugid.patch
@@ -0,0 +1,390 @@
+diff -Naur cronolog-1.6.2/configure cronolog-1.6.2-new/configure
+--- a/configure	Thu May  3 17:44:22 2001
++++ b/configure	Mon Jun  3 00:38:32 2002
+@@ -1757,15 +1757,49 @@
+ 
+ fi
+ 
++echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
++echo "configure:1762: checking for uid_t in sys/types.h" >&5
++if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1767 "configure"
++#include "confdefs.h"
++#include <sys/types.h>
++EOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  egrep "uid_t" >/dev/null 2>&1; then
++  rm -rf conftest*
++  ac_cv_type_uid_t=yes
++else
++  rm -rf conftest*
++  ac_cv_type_uid_t=no
++fi
++rm -f conftest*
++
++fi
++
++echo "$ac_t""$ac_cv_type_uid_t" 1>&6
++if test $ac_cv_type_uid_t = no; then
++  cat >> confdefs.h <<\EOF
++#define uid_t int
++EOF
++
++  cat >> confdefs.h <<\EOF
++#define gid_t int
++EOF
++
++fi
++
+ 
+ 
+ echo $ac_n "checking for strftime""... $ac_c" 1>&6
+-echo "configure:1764: checking for strftime" >&5
++echo "configure:1798: checking for strftime" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1769 "configure"
++#line 1803 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char strftime(); below.  */
+@@ -1788,7 +1822,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_strftime=yes"
+ else
+@@ -1810,7 +1844,7 @@
+   echo "$ac_t""no" 1>&6
+ # strftime is in -lintl on SCO UNIX.
+ echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
+-echo "configure:1814: checking for strftime in -lintl" >&5
++echo "configure:1848: checking for strftime in -lintl" >&5
+ ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1818,7 +1852,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lintl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1822 "configure"
++#line 1856 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -1829,7 +1863,7 @@
+ strftime()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1856,12 +1890,12 @@
+ fi
+ 
+ echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+-echo "configure:1860: checking for vprintf" >&5
++echo "configure:1894: checking for vprintf" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1865 "configure"
++#line 1899 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char vprintf(); below.  */
+@@ -1884,7 +1918,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_vprintf=yes"
+ else
+@@ -1908,12 +1942,12 @@
+ 
+ if test "$ac_cv_func_vprintf" != yes; then
+ echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+-echo "configure:1912: checking for _doprnt" >&5
++echo "configure:1946: checking for _doprnt" >&5
+ if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1917 "configure"
++#line 1951 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char _doprnt(); below.  */
+@@ -1936,7 +1970,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func__doprnt=yes"
+ else
+@@ -1963,12 +1997,12 @@
+ for ac_func in mkdir mktime putenv
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:1967: checking for $ac_func" >&5
++echo "configure:2001: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1972 "configure"
++#line 2006 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -1991,7 +2025,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -2018,12 +2052,12 @@
+ for ac_func in strptime localtime_r
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2022: checking for $ac_func" >&5
++echo "configure:2056: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2027 "configure"
++#line 2061 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2046,7 +2080,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+diff -Naur cronolog-1.6.2/configure.in cronolog-1.6.2-new/configure.in
+--- cronolog-1.6.2/configure.in	Thu May  3 17:30:50 2001
++++ cronolog-1.6.2-new/configure.in	Mon Jun  3 00:38:32 2002
+@@ -56,6 +56,7 @@
+ AC_C_CONST
+ AC_TYPE_SIZE_T
+ AC_STRUCT_TM
++AC_TYPE_UID_T
+ 
+ dnl Checks for library functions.
+ 
+diff -Naur cronolog-1.6.2/doc/cronolog.1m cronolog-1.6.2-new/doc/cronolog.1m
+--- cronolog-1.6.2/doc/cronolog.1m	Fri May  4 09:44:55 2001
++++ cronolog-1.6.2-new/doc/cronolog.1m	Mon Jun  3 00:39:10 2002
+@@ -89,6 +89,20 @@
+ .IP --help
+ print a help message and then exit.
+ .\"
++.IP "-u \fIUSER\fP"
++.IP "--set-uid=\fIUSER\fP"
++sets the user ID of the cronolog process before any logs are opened.
++\fIUSER\fP can be a username or a numeric user ID. If \fIUSER\fP
++contains solely digits, it will be assumed to be a numeric user ID;
++otherwise, it will be assumed to be a username.
++.\"
++.IP "-g \fIGROUP\fP"
++.IP "--set-gid=\fIGROUP\fP"
++sets the group ID of the cronolog process before any logs are opened.
++\fIGROUP\fP can be a group name or a numeric group ID. If \fIGROUP\fP
++contains solely digits, it will be assumed to be a numeric group ID;
++otherwise, it will be assumed to be a group name.
++.\"
+ .IP "-p \fIPERIOD\fP"
+ .IP "--period=\fIPERIOD\fP"
+ specifies the period explicitly as an optional digit string followed
+diff -Naur cronolog-1.6.2/src/cronolog.c cronolog-1.6.2-new/src/cronolog.c
+--- cronolog-1.6.2/src/cronolog.c	Thu May  3 17:42:48 2001
++++ cronolog-1.6.2-new/src/cronolog.c	Mon Jun  3 00:38:32 2002
+@@ -100,6 +100,12 @@
+ #define VERSION_MSG      "cronolog version 0.1\n"
+ #endif
+ 
++#ifndef _WIN32
++#define SETUGID_USAGE	"   -u USER,   --set-uid=USER  change to USER before doing anything (name or UID)\n" \
++			"   -g GROUP,  --set-gid=GROUP change to GROUP before doing anything (name or GID)\n"
++#else
++#define SETUGID_USAGE	""
++#endif
+ 
+ #define USAGE_MSG 	"usage: %s [OPTIONS] logfile-spec\n" \
+ 			"\n" \
+@@ -117,12 +123,17 @@
+ 			"   -e,        --european         European date formats (default)\n" \
+ 			"   -s,    --start-time=TIME   starting time\n" \
+ 			"   -z TZ, --time-zone=TZ      use TZ for timezone\n" \
++			SETUGID_USAGE \
+ 			"   -V,      --version         print version number, then exit\n"
+ 
+ 
+ /* Definition of the short and long program options */
+ 
++#ifndef _WIN32
++char          *short_options = "ad:eop:s:z:H:P:S:l:hVx:u:g:";
++#else
+ char          *short_options = "ad:eop:s:z:H:P:S:l:hVx:";
++#endif        
+ 
+ #ifndef _WIN32
+ struct option long_options[] =
+@@ -137,6 +148,8 @@
+     { "link",      	required_argument, 	NULL, 'l' },
+     { "period",		required_argument,	NULL, 'p' },
+     { "delay",		required_argument,	NULL, 'd' },
++    { "set-uid",      	required_argument,     	NULL, 'u' },
++    { "set-gid",      	required_argument,     	NULL, 'g' },
+     { "once-only", 	no_argument,       	NULL, 'o' },
+     { "help",      	no_argument,       	NULL, 'h' },
+     { "version",   	no_argument,       	NULL, 'V' }
+@@ -160,6 +173,12 @@
+     char	*template;
+     char	*linkname = NULL;
+     char	*prevlinkname = NULL;
++#ifndef _WIN32
++    uid_t	new_uid = 0;
++    gid_t	new_gid = 0;
++    int		change_uid = 0;
++    int		change_gid = 0;
++#endif
+     mode_t	linktype = 0;
+     int 	n_bytes_read;
+     int		ch;
+@@ -234,6 +253,16 @@
+ 	    }		
+ 	    break;
+ 	    
++#ifndef _WIN32
++	case 'u':
++	    new_uid = parse_uid(optarg, argv[0]);
++	    change_uid = 1;
++	    break;
++	case 'g':
++	    new_gid = parse_gid(optarg, argv[0]);
++	    change_gid = 1;
++	    break;
++#endif
+ 	case 'o':
+ 	    periodicity = ONCE_ONLY;
+ 	    break;
+@@ -265,6 +294,17 @@
+ 	fprintf(stderr, USAGE_MSG, argv[0]);
+ 	exit(1);
+     }
++
++#ifndef _WIN32
++    if (change_gid && setgid(new_gid) == -1) {
++	fprintf(stderr, "setgid: unable to change to gid: %d\n", new_gid);
++       	exit(1);
++    }
++    if (change_uid && setuid(new_uid) == -1) {
++	fprintf(stderr, "setuid: unable to change to uid: %d\n", new_uid);
++       	exit(1);
++    }
++#endif
+ 
+     DEBUG((VERSION_MSG "\n"));
+ 
+diff -Naur cronolog-1.6.2/src/cronoutils.c cronolog-1.6.2-new/src/cronoutils.c
+--- cronolog-1.6.2/src/cronoutils.c	Thu May  3 17:43:21 2001
++++ cronolog-1.6.2-new/src/cronoutils.c	Mon Jun  3 00:38:32 2002
+@@ -710,4 +710,50 @@
+     return retval;
+ }
+ 
+-    
++
++#ifndef _WIN32
++/* Turn a string specifying either a username or UID into an actual
++ * uid_t for use in setuid(). A string is assumed to be a UID if
++ * it contains only decimal digits. */
++uid_t
++parse_uid(char *user, char *argv0)
++{
++    char		*probe = user;
++    struct passwd	*ent;
++
++    while (*probe && isdigit(*probe)) {
++	probe++;
++    }
++    if (!(*probe)) {
++	return atoi(user);
++    }
++    if (!(ent = getpwnam(user))) {
++	fprintf(stderr, "%s: Bad username %s\n", argv0, user);
++	exit(1);
++    }
++    return (ent->pw_uid);
++}
++
++
++/* Turn a string specifying either a group name or GID into an actual
++ * gid_t for use in setgid(). A string is assumed to be a GID if
++ * it contains only decimal digits. */
++gid_t
++parse_gid(char *group, char *argv0)
++{
++    char		*probe = group;
++    struct group	*ent;
++
++    while (*probe && isdigit(*probe)) {
++	probe++;
++    }
++    if (!(*probe)) {
++	return atoi(group);
++    }
++    if (!(ent = getgrnam(group))) {
++	fprintf(stderr, "%s: Bad group name %s\n", argv0, group);
++	exit(1);
++    }
++    return (ent->gr_gid);
++}
++#endif /* _WIN32 */
+diff -Naur cronolog-1.6.2/src/cronoutils.h cronolog-1.6.2-new/src/cronoutils.h
+--- cronolog-1.6.2/src/cronoutils.h	Thu May  3 17:40:12 2001
++++ cronolog-1.6.2-new/src/cronoutils.h	Mon Jun  3 00:38:32 2002
+@@ -84,6 +84,8 @@
+ #include <limits.h>
+ #ifndef _WIN32
+ #include <unistd.h>
++#include <pwd.h>
++#include <grp.h>
+ #else
+ #include <io.h>
+ #include <direct.h>
+@@ -172,7 +174,8 @@
+ void		print_debug_msg(char *msg, ...);
+ time_t		parse_time(char *time_str, int);
+ char 		*timestamp(time_t thetime);
+-
++uid_t		parse_uid(char *user, char *argv0);
++gid_t		parse_gid(char *group, char *argv0);
+ 
+ /* Global variables */
+ 
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-sigusr1.patch b/app-admin/cronolog/files/1.6.2-patches/cronolog-sigusr1.patch
new file mode 100644
index 000000000000..e7cc8be2c425
--- /dev/null
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-sigusr1.patch
@@ -0,0 +1,46 @@
+*** a/src/cronolog.c.orig	2001-05-03 17:42:48.000000000 +0100
+--- b/src/cronolog.c	2003-08-15 14:03:17.000000000 +0100
+***************
+*** 84,95 ****
+--- 84,97 ----
+  
+  #include "cronoutils.h"
+  #include "getopt.h"
++ #include <signal.h>
+  
+  
+  /* Forward function declaration */
+  
+  int	new_log_file(const char *, const char *, mode_t, const char *,
+  		     PERIODICITY, int, int, char *, size_t, time_t, time_t *);
++ void  terminate_self(int);
+  
+  
+  /* Definition of version and usage messages */
+***************
+*** 306,311 ****
+--- 308,317 ----
+      DEBUG(("Rotation period is per %d %s\n", period_multiple, periods[periodicity]));
+  
+  
++     /* set up signal handlers to catch USR1 and HUP when restarting Apache */
++     signal(SIGUSR1, terminate_self);
++     signal(SIGHUP, terminate_self);
++ 
+      /* Loop, waiting for data on standard input */
+  
+      for (;;)
+***************
+*** 416,418 ****
+--- 422,432 ----
+      }
+      return log_fd;
+  }
++ 
++ void terminate_self(int sig)
++ {
++     time_t time_now = time(NULL);
++     DEBUG(("%s (%d): received signal USR1; terminating.\n",
++ 		timestamp(time_now), time_now));
++     exit(6);
++ }
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-strftime.patch b/app-admin/cronolog/files/1.6.2-patches/cronolog-strftime.patch
new file mode 100644
index 000000000000..12d561776f8c
--- /dev/null
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-strftime.patch
@@ -0,0 +1,26 @@
+--- a/src/cronoutils.c	Mon Dec 20 00:34:44 1999
++++ b/src/cronoutils.c	Mon Feb 11 03:19:32 2002
+@@ -204,9 +204,21 @@
+     {
+ 	if (ch == '%')
+ 	{
+-	    ch = *spec++;
+-	    if (!ch) break;
++	    do {
++		ch = *spec++;
++		if (!ch) break;
+ 	    
++		switch(ch) {
++		case '_':
++		case '-':
++		case '0':
++		    continue;
++		}
++		break;
++	    } while(1);
++
++	    if(!ch) break;
++
+ 	    switch (ch)
+ 	    {
+ 	    case 'y':		/* two digit year */
diff --git a/app-admin/cronolog/files/cronolog-1.6.2-umask.patch b/app-admin/cronolog/files/cronolog-1.6.2-umask.patch
new file mode 100644
index 000000000000..446c1460bee1
--- /dev/null
+++ b/app-admin/cronolog/files/cronolog-1.6.2-umask.patch
@@ -0,0 +1,86 @@
+Add umask support to cronolog.
+
+Patch-by: Mike Doty <kingtaco@gentoo.org>
+Signed-off-By: Robin H. Johnson <robbat2@gentoo.org>
+
+--- a/src/cronolog.c.orig	2010-01-22 16:49:41.000000000 -0800
++++ b/src/cronolog.c	2010-01-22 17:31:50.000000000 -0800
+@@ -106,7 +106,8 @@
+ 
+ #ifndef _WIN32
+ #define SETUGID_USAGE	"   -u USER,   --set-uid=USER  change to USER before doing anything (name or UID)\n" \
+-			"   -g GROUP,  --set-gid=GROUP change to GROUP before doing anything (name or GID)\n"
++			"   -g GROUP,  --set-gid=GROUP change to GROUP before doing anything (name or GID)\n" \
++			"   -U OCTAL,  --umask=OCTAL   sets umask of file/directory creation\n"
+ #else
+ #define SETUGID_USAGE	""
+ #endif
+@@ -134,7 +135,7 @@
+ /* Definition of the short and long program options */
+ 
+ #ifndef _WIN32
+-char          *short_options = "ad:eop:s:z:H:P:S:l:hVx:u:g:";
++char          *short_options = "ad:eop:s:z:H:P:S:l:hVx:u:g:U:";
+ #else
+ char          *short_options = "ad:eop:s:z:H:P:S:l:hVx:";
+ #endif        
+@@ -157,10 +158,16 @@
+     { "once-only", 	no_argument,       	NULL, 'o' },
+     { "help",      	no_argument,       	NULL, 'h' },
+     { "version",   	no_argument,       	NULL, 'V' },
++    { "umask",     	required_argument, 	NULL, 'U' },
+     { NULL,		0,			NULL, 0 }
+ };
+ #endif
+ 
++#ifndef _WIN32
++static mode_t saved_umask = 0;
++static mode_t new_umask = 0;
++#endif
++
+ /* Main function.
+  */
+ int
+@@ -193,6 +200,11 @@
+     int 	log_fd = -1;
+ 
+ #ifndef _WIN32
++    new_umask=umask(0);
++    umask(new_umask);
++#endif
++
++#ifndef _WIN32
+     while ((ch = getopt_long(argc, argv, short_options, long_options, NULL)) != EOF)
+ #else
+     while ((ch = getopt(argc, argv, short_options)) != EOF)
+@@ -267,6 +279,9 @@
+ 	    new_gid = parse_gid(optarg, argv[0]);
+ 	    change_gid = 1;
+ 	    break;
++	case 'U':
++	  new_umask = (mode_t)strtol(optarg, NULL, 8);
++	  break;
+ #endif
+ 	case 'o':
+ 	    periodicity = ONCE_ONLY;
+@@ -443,6 +458,9 @@
+ 	   timestamp(*pnext_period), *pnext_period,
+ 	   *pnext_period - time_now));
+     
++#ifndef _WIN32
++    saved_umask=umask(new_umask);
++#endif
+     log_fd = open(pfilename, O_WRONLY|O_CREAT|O_APPEND|O_LARGEFILE, FILE_MODE);
+     
+ #ifndef DONT_CREATE_SUBDIRS
+@@ -459,6 +477,10 @@
+ 	exit(2);
+     }
+ 
++#ifndef _WIN32
++    umask(saved_umask);
++#endif
++
+     if (linkname)
+     {
+ 	create_link(pfilename, linkname, linktype, prevlinkname);
diff --git a/app-admin/cronolog/metadata.xml b/app-admin/cronolog/metadata.xml
new file mode 100644
index 000000000000..0e5ed8f4355e
--- /dev/null
+++ b/app-admin/cronolog/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		Cronolog is a simple filter program that reads log file entries from
+		standard input and writes each entry to the output file specified by a
+		filename template and the current date and time. When the expanded
+		filename changes, the current file is closed and a new one opened.
+		cronolog is intended to be used in conjunction with a Web server, such
+		as Apache, to split the access log into daily or monthly logs.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">fordmason/cronolog</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/denyhosts-2.9 b/app-admin/denyhosts-2.9
deleted file mode 100644
index c4894d390b4e..000000000000
--- a/app-admin/denyhosts-2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig
-DESCRIPTION=DenyHosts is a utility to help sys admins thwart ssh hackers
-EAPI=5
-HOMEPAGE=http://denyhost.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/denyhosts/denyhosts/archive/v2.9.tar.gz -> denyhosts-2.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e36ec6ddda1d4221a665185083c0e53e
diff --git a/app-admin/denyhosts-3.0 b/app-admin/denyhosts-3.0
deleted file mode 100644
index 8b697fccf223..000000000000
--- a/app-admin/denyhosts-3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig
-DESCRIPTION=DenyHosts is a utility to help sys admins thwart ssh hackers
-EAPI=5
-HOMEPAGE=https://github.com/denyhosts/denyhosts
-IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/denyhosts/denyhosts/archive/v3.0.tar.gz -> denyhosts-3.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=39ca360141575427014c961f9042e3c4
diff --git a/app-admin/denyhosts-3.0-r1 b/app-admin/denyhosts-3.0-r1
deleted file mode 100644
index 58f6f2fc0a89..000000000000
--- a/app-admin/denyhosts-3.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig
-DESCRIPTION=DenyHosts is a utility to help sys admins thwart ssh hackers
-EAPI=6
-HOMEPAGE=https://github.com/denyhosts/denyhosts
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm hppa ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/denyhosts/denyhosts/archive/v3.0.tar.gz -> denyhosts-3.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0eb116e1cb2532a0a76873473e84c81e
diff --git a/app-admin/denyhosts/Manifest b/app-admin/denyhosts/Manifest
new file mode 100644
index 000000000000..be8728e24df4
--- /dev/null
+++ b/app-admin/denyhosts/Manifest
@@ -0,0 +1,11 @@
+AUX denyhosts-2.6-hostname.patch 664 BLAKE2B b86f74d9eee9e47f96a1894eda227d0c437d45e4d2615d14f350179245a953022d3dd6e401babf6b9474092c77362f6aa56b1ec51b57310b5fed75d843945703 SHA512 0fc512f4a1691a90aba7d95b4757a363f3ff6bb893fdc719277c5dbec1904828be923f5ab21c5ba20e03a5e6bf61a5f7d35c6675b9ccfafd32dbd9e108dd5095
+AUX denyhosts-3.0-python2.7.patch 1502 BLAKE2B 7057613a62ebe718a6712e06b4ef1b3c875a644380ef97398cc9c2dd4d7e84d8887d3783cc853aaa7d04d97bf05bdb6f0929b2eb4a72d20ca5e63369bed22e04 SHA512 ee3c4f7f6a8126e4a9c30531cce2673f8c0eb4c4d2a011aa22a3aa4f0b9ee58f8278334cf9253619d999b8dadf4370d6c02f2535a0b6d794243e3050f3927e8f
+AUX denyhosts.init-r2 646 BLAKE2B b52a481376656aab7525e3f04ea7712137c132605e62e011f41b8c006341e223487a4702e7aa8dd8f2a1faa6f52d33937557eb2bc130c97c6e9e2333cfe0a9bd SHA512 ea20958c74ec34d4f8e2f165cda9d0c3e27d94fe7eef374548d74275d35dc7fc7c89395e36b0a00dfc7d2a83b198f179fd44e16f7dc51419f9af1e907616382c
+AUX denyhosts.logrotate-r2 272 BLAKE2B 9dd9bad7fd6d1b3fac06a331d2b2246697b70ebf7bef84fda0917d3cf925b3b7f6a30a66c67a7ef52c466096a2860ee8f177097ab44c3000169d879306668ae2 SHA512 43d379b5909937913ca78a11581f577a5d9fe52bb16627441311cdac7281f59a1f05fdb308f722f9c376d2e446111021d225b2033c5fe5f3399ab88771be2569
+AUX denyhosts.service 265 BLAKE2B 4ecccdf6f605936ffb7339c2ec2510f14b0817cf3ed3cf51b540456216b3877e561044973f1eda4a743f717bc4e0f36e9f8492b3fd2b365a243f5f7449ea575c SHA512 601b10e999dd2e16cec57035d025a883df77df272c6a72b4d39f2c118d983f308984aa9edd296f334e0e5062e8ca5ea21ba25ef58b606c9c7e4c09ed7b3ad4be
+DIST denyhosts-2.9.tar.gz 49472 BLAKE2B 94f18da3db9dd7e0d979d4fb536160114fe1dc95ac43ad1f7bf3f235702698210e62b3872bf7f3360945228b187d97a274797d535a9b12b552bddf649b5d1fdf SHA512 f41e2985e84f0eeaa493def6b8609de934889d02b124962b0bfd02ebe5e41d0670822124eb50ed84eb1c3b8a2a96775fbe09386cef48a3c3e04949fd6b1452c1
+DIST denyhosts-3.0.tar.gz 56283 BLAKE2B 1ecb8a13ec9511cb4ac65579aa8f88117264f231b586c30a61ad9c78abd17aeebc5642e70f162fa7e73fe81a99821d494efca213b1bf864fd0e2043fa4374e6a SHA512 8a1c796c259049ffab2c88cef780b175ec75c94216841421f831dfbf45f4ba0cdbcfbb0e3dab7200aa79eeb2416db5234ad5016d5770d8ab2f28ef4c9754e70d
+EBUILD denyhosts-2.9.ebuild 1860 BLAKE2B d1a3b4b0414fce7fd1eabf226e5fc46abfeae98cf313b2c32bc36a6447625bc3f31f0d0300c5d7b17a328a22aef934f914adf9265ffb15bdcec88fe87fefaf78 SHA512 170d31711fc00f51e6b177cfebcdbeff660a9d2b6cc3eb953d4082e7d3d265cf371da59890ee92b29fea8a2aa740cb25373c0ad6585e9e31db515fd87f512ff4
+EBUILD denyhosts-3.0-r1.ebuild 1780 BLAKE2B 6d4f599a686bc016f48f00aa7c8a666ab849b14043ee2a930e3ae9075bcba4feea50fc26edd1791d0a8f1ce5eb4ddeb069258c70886cd111998a07cb0f5938e8 SHA512 3c49e6abd5722035baa8d5545014f9d954749a6d75e7a7ad54299ad6df06cf294e405cc473d317e370d7215a6ae867ec1de79db7b2d6c1a3d58c326af7842661
+EBUILD denyhosts-3.0.ebuild 1672 BLAKE2B ffce8305ca9db71a456c8163a7bb1fdfcf7187b4433988c93e01f94407dcc0edf577b8d187ad017ff4e357e56d907aa4d34cd4f4d8b292365d46ea2a079be6aa SHA512 660bca4d0ca9fd4eea074cdfde7629d06cb4c6c48f3b0cf9674d6ad62ac931cf51624b67e52862b6b284157643f634495bbce7c6b927bc1b80274ed497a9aad0
+MISC metadata.xml 402 BLAKE2B df1bce989ad8c249f83b5ef00681d455ca645b9160456b615c5a18c1d564d3dff8f6021ed95b9c7ff0d5e6939fe2a99735b4ed16ea8360f021000377f981503b SHA512 0a232a4ee999ce021244cc19ad62e68c962fcfb1cbfda1aef306e6b3376e3944f233cff133c746aedc3f68c60a61511b0a749b434515b705f63d68a034951ed7
diff --git a/app-admin/denyhosts/denyhosts-2.9.ebuild b/app-admin/denyhosts/denyhosts-2.9.ebuild
new file mode 100644
index 000000000000..f9a579759fe2
--- /dev/null
+++ b/app-admin/denyhosts/denyhosts-2.9.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils readme.gentoo systemd
+
+DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
+HOMEPAGE="http://denyhost.sourceforge.net/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+>=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
+(see bug#531156) that means you either have patch openssh or use
+denyhosts' iptables feature to get any protection.
+
+You can configure DenyHosts to run as a daemon by running:
+# rc-update add denyhosts default
+or:
+# systemctl enable denyhosts.service
+(if you use systemd)
+
+To run DenyHosts as a cronjob instead of a daemon add the following
+to /etc/crontab
+# run DenyHosts every 10 minutes
+*/10  *  * * *    root    /usr/bin/denyhosts.py -c /etc/denyhosts.conf
+
+More information can be found at ${HOMEPAGE}faq.html"
+
+src_prepare() {
+	#systemd needs HOSTNAME
+	epatch "${FILESDIR}"/${PN}-2.6-hostname.patch
+
+	sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
+		-e '/^SECURE_LOG/s/^/#/' \
+		-e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
+		-i denyhosts.conf || die "sed failed"
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	dodoc CHANGELOG.txt README.txt PKG-INFO
+	distutils-r1_src_install
+
+	dodir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
+
+	newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	keepdir /var/lib/denyhosts
+}
+
+pkg_postinst() {
+	[[ -f "${EROOT}etc/hosts.deny" ]] || touch "${EROOT}etc/hosts.deny"
+
+	readme.gentoo_print_elog
+}
diff --git a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
new file mode 100644
index 000000000000..87800807c36d
--- /dev/null
+++ b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 eutils readme.gentoo-r1 systemd
+
+DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
+HOMEPAGE="https://github.com/denyhosts/denyhosts"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+>=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
+(see bug#531156) that means you either have patch openssh or use
+denyhosts' iptables feature to get any protection.
+
+You can configure DenyHosts to run as a daemon by running:
+# rc-update add denyhosts default
+or:
+# systemctl enable denyhosts.service
+(if you use systemd)
+
+To run DenyHosts as a cronjob instead of a daemon add the following
+to /etc/crontab
+# run DenyHosts every 10 minutes
+*/10  *  * * *    root    /usr/bin/denyhosts.py -c /etc/denyhosts.conf
+
+More information can be found at ${HOMEPAGE}faq.html"
+
+#bring back python-2.7 support  bug #577502
+PATCHES=( "${FILESDIR}"/"${P}"-python2.7.patch )
+
+src_prepare() {
+	sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
+		-e '/^SECURE_LOG/s/^/#/' \
+		-e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
+		-i denyhosts.conf || die "sed failed"
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	dodoc CHANGELOG.txt README.md
+	distutils-r1_src_install
+
+	dodir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
+
+	newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	keepdir /var/lib/denyhosts
+}
diff --git a/app-admin/denyhosts/denyhosts-3.0.ebuild b/app-admin/denyhosts/denyhosts-3.0.ebuild
new file mode 100644
index 000000000000..cd2c9fdeea38
--- /dev/null
+++ b/app-admin/denyhosts/denyhosts-3.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils readme.gentoo systemd
+
+DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
+HOMEPAGE="https://github.com/denyhosts/denyhosts"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+>=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
+(see bug#531156) that means you either have patch openssh or use
+denyhosts' iptables feature to get any protection.
+
+You can configure DenyHosts to run as a daemon by running:
+# rc-update add denyhosts default
+or:
+# systemctl enable denyhosts.service
+(if you use systemd)
+
+To run DenyHosts as a cronjob instead of a daemon add the following
+to /etc/crontab
+# run DenyHosts every 10 minutes
+*/10  *  * * *    root    /usr/bin/denyhosts.py -c /etc/denyhosts.conf
+
+More information can be found at ${HOMEPAGE}faq.html"
+
+src_prepare() {
+	sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
+		-e '/^SECURE_LOG/s/^/#/' \
+		-e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
+		-i denyhosts.conf || die "sed failed"
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	dodoc CHANGELOG.txt README.md
+	distutils-r1_src_install
+
+	dodir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
+
+	newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	keepdir /var/lib/denyhosts
+}
diff --git a/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch b/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch
new file mode 100644
index 000000000000..56d881319c5f
--- /dev/null
+++ b/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch
@@ -0,0 +1,21 @@
+diff -up ./denyhosts.py.orig ./denyhosts.py
+--- ./denyhosts.py.orig	2012-01-30 13:14:41.146715839 -0600
++++ ./denyhosts.py	2012-01-30 14:45:14.372539341 -0600
+@@ -1,5 +1,6 @@
+ #!/usr/bin/env python
+ import os
++import platform
+ import sys
+ 
+ import DenyHosts.python_version
+@@ -107,6 +108,10 @@ if __name__ == '__main__':
+             print "DenyHosts version:", VERSION
+             sys.exit(0)
+ 
++    # This is generally expected to be in the environment, but there's no
++    # non-hackish way to get systemd to set it, so just hack it in here.
++    os.environ['HOSTNAME'] = platform.node()
++
+     prefs = Prefs(config_file)    
+             
+     first_time = 0
diff --git a/app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch b/app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch
new file mode 100644
index 000000000000..4b727c7067d9
--- /dev/null
+++ b/app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch
@@ -0,0 +1,51 @@
+From b5611dfa0510ec8fbaa2db4b6834d0bd7ecf0909 Mon Sep 17 00:00:00 2001
+From: Jesse <jessefrgsmith@yahoo.ca>
+Date: Sat, 27 Jun 2015 20:24:44 -0300
+Subject: [PATCH] Fixed a type check which was causing syntax/undefined errors
+ in DenyHosts/report.py when switching between Python2 and Python3.
+
+---
+ CHANGELOG.txt       | 8 ++++++++
+ DenyHosts/report.py | 4 +++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/CHANGELOG.txt b/CHANGELOG.txt
+index ca173cb..b585332 100644
+--- a/CHANGELOG.txt
++++ b/CHANGELOG.txt
+@@ -1,5 +1,13 @@
+ DENYHOSTS CHANGELOG
+ 
++3.1
++======================
++
++Fixed a type check in DenyHosts/report.py which was causing
++problems when moving between Python2 and Python3.
++
++
++
+ 3.0
+ ======================
+ 
+diff --git a/DenyHosts/report.py b/DenyHosts/report.py
+index 05f3e3d..9560eab 100644
+--- a/DenyHosts/report.py
++++ b/DenyHosts/report.py
+@@ -3,6 +3,7 @@
+ import socket
+ # Removing this as it causes runtime errors on Python3.4
+ # from types import ListType, TupleType
++import types
+ from .util import is_true
+ try:
+     import syslog
+@@ -38,7 +39,8 @@ def get_report(self):
+     def add_section(self, message, iterable):
+         self.report += "%s:\n\n" % message
+         for i in iterable:
+-            if type(i) in (TupleType, ListType):
++            # if type(i) in (TupleType, ListType):
++            if (type(i) is types.ListType) or (type(i) is types.TupleType):
+                 extra = ": %d\n" % i[1]
+                 i = i[0]
+             else:
diff --git a/app-admin/denyhosts/files/denyhosts.init-r2 b/app-admin/denyhosts/files/denyhosts.init-r2
new file mode 100644
index 000000000000..9b2f24cbf21e
--- /dev/null
+++ b/app-admin/denyhosts/files/denyhosts.init-r2
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_stopped_commands="purge"
+
+purge() {
+	ebegin "Purging hosts.deny"
+	start-stop-daemon --start --exec /usr/bin/denyhosts.py --pidfile /var/run/denyhosts.pid -- --purge
+	eend $?
+}
+
+depend() {
+	use logger sshd
+}
+
+start() {
+	ebegin "Starting DenyHosts daemon"
+	start-stop-daemon --start --exec /usr/bin/denyhosts.py --pidfile /var/run/denyhosts.pid -- --daemon -c /etc/denyhosts.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping DenyHosts daemon"
+	start-stop-daemon --quiet --stop --pidfile /var/run/denyhosts.pid
+	eend $?
+}
diff --git a/app-admin/denyhosts/files/denyhosts.logrotate-r2 b/app-admin/denyhosts/files/denyhosts.logrotate-r2
new file mode 100644
index 000000000000..582e72f7a365
--- /dev/null
+++ b/app-admin/denyhosts/files/denyhosts.logrotate-r2
@@ -0,0 +1,10 @@
+/var/log/denyhosts {
+	missingok
+	notifempty
+	create 0640 root root
+	sharedscripts
+	postrotate
+		test -e /run/openrc/softlevel && /etc/init.d/denyhosts restart 1>/dev/null || true
+		test -e /run/systemd/system && systemctl restart denyhosts >/dev/null || true
+	endscript
+}
diff --git a/app-admin/denyhosts/files/denyhosts.service b/app-admin/denyhosts/files/denyhosts.service
new file mode 100644
index 000000000000..05a59dd27bfc
--- /dev/null
+++ b/app-admin/denyhosts/files/denyhosts.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=SSH log watcher
+Before=sshd.service
+
+[Service]
+Type=forking
+ExecStartPre=/bin/rm -f /var/run/denyhosts.pid
+ExecStart=/usr/bin/denyhosts.py --daemon --config=/etc/denyhosts.conf
+PIDFile=/var/run/denyhosts.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/denyhosts/metadata.xml b/app-admin/denyhosts/metadata.xml
new file mode 100644
index 000000000000..c193ef3b8e0a
--- /dev/null
+++ b/app-admin/denyhosts/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>junghans@gentoo.org</email>
+    <name>Christoph Junghans</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">denyhosts/denyhosts</remote-id>
+    <remote-id type="sourceforge">denyhost</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/diamond-4.0-r1 b/app-admin/diamond-4.0-r1
deleted file mode 100644
index a7c5fd861cb0..000000000000
--- a/app-admin/diamond-4.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/configobj dev-python/setproctitle mongo? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) snmp? ( dev-python/pysnmp ) redis? ( dev-python/redis-py ) !kernel_linux? ( >=dev-python/psutil-3 ) test? ( dev-python/mock ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python daemon that collects and publishes system metrics
-EAPI=5
-HOMEPAGE=https://github.com/python-diamond/Diamond
-IUSE=test mongo mysql snmp redis python_targets_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-python/configobj dev-python/setproctitle mongo? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) snmp? ( dev-python/pysnmp ) redis? ( dev-python/redis-py ) !kernel_linux? ( >=dev-python/psutil-3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/python-diamond/Diamond/archive/v4.0.tar.gz -> python-diamond-4.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=79acd89829e3c52c64172fd7922d7c57
diff --git a/app-admin/diamond-4.0.515 b/app-admin/diamond-4.0.515
deleted file mode 100644
index d988b825ac6c..000000000000
--- a/app-admin/diamond-4.0.515
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/configobj dev-python/setproctitle mongo? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) snmp? ( dev-python/pysnmp ) redis? ( dev-python/redis-py ) !kernel_linux? ( >=dev-python/psutil-3 ) test? ( dev-python/mock dev-python/pysnmp ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python daemon that collects and publishes system metrics
-EAPI=5
-HOMEPAGE=https://github.com/python-diamond/Diamond
-IUSE=test mongo mysql snmp redis python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-python/configobj dev-python/setproctitle mongo? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) snmp? ( dev-python/pysnmp ) redis? ( dev-python/redis-py ) !kernel_linux? ( >=dev-python/psutil-3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/python-diamond/Diamond/archive/v4.0.515.tar.gz -> python-diamond-4.0.515.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0d101b970f663be463a1d7b1f2c8df48
diff --git a/app-admin/diamond-9999 b/app-admin/diamond-9999
deleted file mode 100644
index 83a4f8203edc..000000000000
--- a/app-admin/diamond-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/configobj dev-python/setproctitle mongo? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) snmp? ( dev-python/pysnmp ) redis? ( dev-python/redis-py ) !kernel_linux? ( >=dev-python/psutil-3 ) test? ( dev-python/mock dev-python/pysnmp ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python daemon that collects and publishes system metrics
-EAPI=5
-HOMEPAGE=https://github.com/python-diamond/Diamond
-IUSE=test mongo mysql snmp redis python_targets_python2_7
-LICENSE=MIT
-RDEPEND=dev-python/configobj dev-python/setproctitle mongo? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) snmp? ( dev-python/pysnmp ) redis? ( dev-python/redis-py ) !kernel_linux? ( >=dev-python/psutil-3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7c0d4c9f143353de2b8bb0ceb484ef89
diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
new file mode 100644
index 000000000000..2a0572c7be40
--- /dev/null
+++ b/app-admin/diamond/Manifest
@@ -0,0 +1,9 @@
+AUX diamond-4.0-psutil.patch 1842 BLAKE2B 21774c34c5557c84b5ae217acfe468b7d55a4e3b818f501ee72cec43cc01d24e7121f9fe302bdc317d60c39e39e7d4587a5caee4ddc73dcc1e87e1605499be40 SHA512 4f59e7811df1419dcf29d231f62844de6db9e5a3f6e7600b11432d1bda994b62973172cce98d257d6ce03e940645df76dee2c3cd4fced18e960527bb23b1f1ea
+AUX diamond.confd 57 BLAKE2B 8a5e3f478d3eb948e262239a9a83026e067ed67f2a4878075c8ddb7d8d356a2482da0642e673b8b3f658de6c6f30a30c830bc68af3fe2d750b998dc896525942 SHA512 51b037902394b22f957a15ad1479ebdae5ac29384f2b7a5053ea8200bad05dc9c9060cc5c6c1a931e341e99b95327e55b06aaa9a828950533265f9c96a8dff55
+AUX diamond.initd 447 BLAKE2B 76354f66282325005f193d4ad51f3deb0358604a681cfe54a596037608bd794c3fd68a78a03659295ce2021b70809edc01340f5ee39348e35275cae0b00a5042 SHA512 004b305ba945fa313da4cd51226050cec955886405026baacb15f7ab586b7ba650492b0e2cd9621b3854ec83ee6192a7b86ad4fd8239008df3c6c8bb5c8c84f3
+DIST python-diamond-4.0.515.tar.gz 620337 BLAKE2B 8df675f7e91086dc6e98166c3f6c25c7837bd53f720cd0dfdf05a1dd2954aaa190bfe8844d01acfcdf46d5be917c29c0e231f2b433a648d6dcc1f34e2c617d91 SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5
+DIST python-diamond-4.0.tar.gz 491433 BLAKE2B ddf678b758b046b80fe347c2cd8ce2fec46f03e65415735d88969d66dc05466730e52df9e8efc27e3a3bff13862c4efcc393de6d05ec6d350e3912a706d298cb SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b
+EBUILD diamond-4.0-r1.ebuild 2007 BLAKE2B 25abec3a500ca23844dc17a7e987be99be9f2c5692c717269ee171de875850a665626cff0d2c17b990f90293adcd9da99b2e355a42328f8c7bbb22749a54236e SHA512 9385587aed2660c5872baa3a224e7a74be1b49c903b814fdf353a44401c79008e9f325b5b68eefc610b453dc91bee10730d87fca55397f1b94202441a73e6b4a
+EBUILD diamond-4.0.515.ebuild 2128 BLAKE2B e19b1e5cf4f88e92bcc46c620f5284fbe97d4b2988b498957b7d306a2780255d8ed48e2dd7f794c90df49f9c202fe0cb5a5a5593117df4ff25d8b96b2572e4bd SHA512 a05a1a5a48584a90d2384543d88520f1759cab46923eb028914f68c7b1246440fb8a80c7927ba2cefe4f4945871247124c551b17b68db3101fb1c7c113744152
+EBUILD diamond-9999.ebuild 1900 BLAKE2B cdd17d24f9817cf9110aa198ca8f11d468deb5b162215fa2b5ecc2c82072f4ebdeb6751ba047b6392b69b9a90c438912dabd627ce54ad088bafb4ccf62fc4a3d SHA512 f595d59ab69d2deb704e6a1ea739540a7760a37c786ba3d0da509029bf367ebd855e131bf187c423443bd107ea5db30489b17053c959955bf242607b3f1dc59e
+MISC metadata.xml 802 BLAKE2B d013e1b87c2f1d5f0f628766ed754a4ac50e9c9e710b7b2542081cd06988f7f577513a53165c54ff4d1d1de3bba92ec2089eaa15d16cbe946f7489d0345aeaaa SHA512 c455baa068661000d395e15f6952b3106cb3633f1a95395745c6a0d7cc5dbfb193d018af1341f27b250226bdc109e961bda4a612115d5805958f8e500108239a
diff --git a/app-admin/diamond/diamond-4.0-r1.ebuild b/app-admin/diamond/diamond-4.0-r1.ebuild
new file mode 100644
index 000000000000..90c4c2549e94
--- /dev/null
+++ b/app-admin/diamond/diamond-4.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
+	S=${WORKDIR}/diamond-${PV}
+else
+	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
+	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S=${WORKDIR}/Diamond-${PV}
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils prefix
+
+DESCRIPTION="Python daemon that collects and publishes system metrics"
+HOMEPAGE="https://github.com/python-diamond/Diamond"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test mongo mysql snmp redis"
+
+RDEPEND="dev-python/configobj
+	dev-python/setproctitle
+	mongo? ( dev-python/pymongo )
+	mysql? ( dev-python/mysql-python )
+	snmp? ( dev-python/pysnmp )
+	redis? ( dev-python/redis-py )
+	!kernel_linux? ( >=dev-python/psutil-3 )"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock )"
+
+src_prepare() {
+	# adjust for Prefix
+	hprefixify bin/diamond*
+
+	# fix necessary to make handlers honour their config, simple sed
+	# doing the same as upstream
+	# https://github.com/python-diamond/Diamond/commit/3cb29eedd117d2e4146823a5c5811d16cc77206a.patch
+	sed -i \
+		-e '/cls_name =/s/\.__class__//' \
+		src/diamond/utils/classes.py \
+		|| die
+
+	epatch "${FILESDIR}"/${P}-psutil.patch
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
+}
+
+python_install() {
+	export VIRTUAL_ENV=1
+	distutils-r1_python_install
+	mv "${ED}"/usr/etc "${ED}"/ || die
+	rm "${ED}"/etc/diamond/*.windows  # won't need these
+	sed -i \
+		-e '/pid_file =/s:/var/run:/run:' \
+		"${ED}"/etc/diamond/diamond.conf.example || die
+	hprefixify "${ED}"/etc/diamond/diamond.conf.example
+}
+
+src_install() {
+	distutils-r1_src_install
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	keepdir /var/log/diamond
+}
diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild
new file mode 100644
index 000000000000..6c874d48ed22
--- /dev/null
+++ b/app-admin/diamond/diamond-4.0.515.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
+	S=${WORKDIR}/diamond-${PV}
+else
+	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S=${WORKDIR}/Diamond-${PV}
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="Python daemon that collects and publishes system metrics"
+HOMEPAGE="https://github.com/python-diamond/Diamond"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test mongo mysql snmp redis"
+
+RDEPEND="dev-python/configobj
+	dev-python/setproctitle
+	mongo? ( dev-python/pymongo )
+	mysql? ( dev-python/mysql-python )
+	snmp? ( dev-python/pysnmp )
+	redis? ( dev-python/redis-py )
+	!kernel_linux? ( >=dev-python/psutil-3 )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock
+		dev-python/pysnmp
+	)"
+
+src_prepare() {
+	# adjust for Prefix
+	hprefixify bin/diamond*
+
+	# fix the version (not set in GitHub archive)
+	sed -i -e "s/__VERSIONTOKENHERE__/${PV}/" src/diamond/version.py.tmpl || die
+	# fix symlink out of place
+	rm README.md || die
+	cp docs/index.md README.md || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# don't want to depend on docker for just this
+	mv src/collectors/docker_collector/test/{test,no}docker_collector.py || die
+	# fails on binding ports
+	mv src/collectors/portstat/tests/{test,no}_portstat.py || die
+	"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
+}
+
+python_install() {
+	export VIRTUAL_ENV=1
+	distutils-r1_python_install
+	mv "${ED}"/usr/etc "${ED}"/ || die
+	rm "${ED}"/etc/diamond/*.windows  # won't need these
+	sed -i \
+		-e '/pid_file =/s:/var/run:/run:' \
+		"${ED}"/etc/diamond/diamond.conf.example || die
+	hprefixify "${ED}"/etc/diamond/diamond.conf.example
+}
+
+src_install() {
+	distutils-r1_src_install
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	keepdir /var/log/diamond
+}
diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild
new file mode 100644
index 000000000000..57df76bc0741
--- /dev/null
+++ b/app-admin/diamond/diamond-9999.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
+	S=${WORKDIR}/diamond-${PV}
+else
+	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S=${WORKDIR}/Diamond-${PV}
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="Python daemon that collects and publishes system metrics"
+HOMEPAGE="https://github.com/python-diamond/Diamond"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test mongo mysql snmp redis"
+
+RDEPEND="dev-python/configobj
+	dev-python/setproctitle
+	mongo? ( dev-python/pymongo )
+	mysql? ( dev-python/mysql-python )
+	snmp? ( dev-python/pysnmp )
+	redis? ( dev-python/redis-py )
+	!kernel_linux? ( >=dev-python/psutil-3 )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock
+		dev-python/pysnmp
+	)"
+
+src_prepare() {
+	# adjust for Prefix
+	hprefixify bin/diamond*
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# don't want to depend on docker for just this
+	mv src/collectors/docker_collector/test/{test,no}docker_collector.py || die
+	# fails on binding ports
+	mv src/collectors/portstat/tests/{test,no}_portstat.py || die
+	"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
+}
+
+python_install() {
+	export VIRTUAL_ENV=1
+	distutils-r1_python_install
+	mv "${ED}"/usr/etc "${ED}"/ || die
+	rm "${ED}"/etc/diamond/*.windows  # won't need these
+	sed -i \
+		-e '/pid_file =/s:/var/run:/run:' \
+		"${ED}"/etc/diamond/diamond.conf.example || die
+	hprefixify "${ED}"/etc/diamond/diamond.conf.example
+}
+
+src_install() {
+	distutils-r1_src_install
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	keepdir /var/log/diamond
+}
diff --git a/app-admin/diamond/files/diamond-4.0-psutil.patch b/app-admin/diamond/files/diamond-4.0-psutil.patch
new file mode 100644
index 000000000000..e5f5d3bfb392
--- /dev/null
+++ b/app-admin/diamond/files/diamond-4.0-psutil.patch
@@ -0,0 +1,48 @@
+From 21ca284ffe6901b06e1136ce57dc07e0effd2a3e Mon Sep 17 00:00:00 2001
+From: Fabian Groffen <grobian@gentoo.org>
+Date: Mon, 3 Aug 2015 19:40:59 +0200
+Subject: [PATCH 1/2] NetworkCollector: psutil.network_io_counters was renamed
+
+---
+ src/collectors/network/network.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/collectors/network/network.py b/src/collectors/network/network.py
+index d835162..90c2f59 100644
+--- a/src/collectors/network/network.py
++++ b/src/collectors/network/network.py
+@@ -96,7 +96,7 @@ def collect(self):
+                 self.log.error('No network metrics retrieved')
+                 return None
+ 
+-            network_stats = psutil.network_io_counters(True)
++            network_stats = psutil.net_io_counters(True)
+             for device in network_stats.keys():
+                 network_stat = network_stats[device]
+                 results[device] = {}
+
+From 314d6057ca95bae6d3e6369556522574eb905c3f Mon Sep 17 00:00:00 2001
+From: Fabian Groffen <grobian@gentoo.org>
+Date: Mon, 3 Aug 2015 19:41:20 +0200
+Subject: [PATCH 2/2] MemoryCollector: psutil renamed phymem_usage and
+ virtmem_usage
+
+---
+ src/collectors/memory/memory.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/collectors/memory/memory.py b/src/collectors/memory/memory.py
+index 7c9b1fb..9057115 100644
+--- a/src/collectors/memory/memory.py
++++ b/src/collectors/memory/memory.py
+@@ -103,8 +103,8 @@ def collect(self):
+                 self.log.error('No memory metrics retrieved')
+                 return None
+ 
+-            phymem_usage = psutil.phymem_usage()
+-            virtmem_usage = psutil.virtmem_usage()
++            phymem_usage = psutil.virtual_memory()
++            virtmem_usage = psutil.swap_memory()
+             units = 'B'
+ 
+             for unit in self.config['byte_unit']:
diff --git a/app-admin/diamond/files/diamond.confd b/app-admin/diamond/files/diamond.confd
new file mode 100644
index 000000000000..ad9939223182
--- /dev/null
+++ b/app-admin/diamond/files/diamond.confd
@@ -0,0 +1,2 @@
+# command line options for running diamond
+DIAMOND_OPTS=
diff --git a/app-admin/diamond/files/diamond.initd b/app-admin/diamond/files/diamond.initd
new file mode 100644
index 000000000000..168b175a788c
--- /dev/null
+++ b/app-admin/diamond/files/diamond.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/bin/diamond --pidfile /run/${SVCNAME}.pid -- -c /etc/diamond/${SVCNAME}.conf ${DIAMOND_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop -R 80 --pidfile /run/${SVCNAME}.pid
+	eend $?
+}
diff --git a/app-admin/diamond/metadata.xml b/app-admin/diamond/metadata.xml
new file mode 100644
index 000000000000..0198be759037
--- /dev/null
+++ b/app-admin/diamond/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<longdescription lang="en">
+		Diamond is a python daemon that collects system metrics and
+		publishes them to Graphite (and others). It is capable of
+		collecting cpu, memory, network, i/o, load and disk metrics.
+		Additionally, it features an API for implementing custom
+		collectors for gathering metrics from almost any source.
+	</longdescription>
+	<use>
+		<flag name="mongo">Enable MongoDB support</flag>
+		<flag name="redis">Enable Redis support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">python-diamond/Diamond</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/dio-1.5.2 b/app-admin/dio-1.5.2
deleted file mode 100644
index 35d16c4badbd..000000000000
--- a/app-admin/dio-1.5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-libs/ncurses:0
-DESCRIPTION=dio - Device I/O monitoring tool
-EAPI=5
-HOMEPAGE=https://github.com/donaldmcintosh/dio
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=sys-libs/ncurses:0
-SLOT=0
-SRC_URI=https://github.com/donaldmcintosh/dio/archive/1.5.2.tar.gz -> dio-1.5.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=16661dff8ed172332db22c2b58a13cf7
diff --git a/app-admin/dio/Manifest b/app-admin/dio/Manifest
new file mode 100644
index 000000000000..dc907a1ea49c
--- /dev/null
+++ b/app-admin/dio/Manifest
@@ -0,0 +1,3 @@
+DIST dio-1.5.2.tar.gz 44344 BLAKE2B 8e573cbf2ad1b717ffec09f20f8c7474841bc3e1635af35116d02b37af56ef3b4742e12725134d485f788e7abb595605640e19bd6f84bfd8f14289abf1695089 SHA512 366d2f2d25b8d16439c4a9aaa7cd775ddffb1022980675cdda8e2e4d4de3d3e5dcfa8d0c581b73fcfe4eff66ee8ef682f082c8788f514b7abdf1a2cb2159b9ba
+EBUILD dio-1.5.2.ebuild 549 BLAKE2B 3553d95a1b4f3b4c3b1ee239f063874149b1ddc46ad831908a32304f9a3c300d7eae3b0a793fbca25a9fc4c292e85435b95ae31f1930b3cc44b37b318c6e260d SHA512 4554efe518dc9a795a07751a85950bcc0b6edfa6cc35ce71cd0401ad84d63db832d9864a5f7144f9d28c320008ab06246b2dcaa7afbb37a29d213547e0399709
+MISC metadata.xml 474 BLAKE2B 927b087f58c120fe79c16595932d546ad071fe77968395877bb23f647fb0f996d790d795912f8a93d81c7063d5427af66987a59ca54c73ee5871ab0d7ddeb616 SHA512 259b13ae48c1e20d7d9a8d4c76cfcf375c69c2a55ffe78c231291bc745249cc9b51e3d6981ac52d7607b179d2f3b933434577eeaa1b06e602fdb1a65d7187d97
diff --git a/app-admin/dio/dio-1.5.2.ebuild b/app-admin/dio/dio-1.5.2.ebuild
new file mode 100644
index 000000000000..6087eb8c5354
--- /dev/null
+++ b/app-admin/dio/dio-1.5.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit toolchain-funcs
+
+DESCRIPTION="dio - Device I/O monitoring tool"
+HOMEPAGE="https://github.com/donaldmcintosh/dio"
+SRC_URI="https://github.com/donaldmcintosh/dio/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin dio
+	doman dio.1
+}
diff --git a/app-admin/dio/metadata.xml b/app-admin/dio/metadata.xml
new file mode 100644
index 000000000000..19a392ab5492
--- /dev/null
+++ b/app-admin/dio/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>donaldbmcintosh@yahoo.co.uk</email>
+    <name>Donald McIntosh</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">donaldmcintosh/dio</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/diradm-2.9.7.1 b/app-admin/diradm-2.9.7.1
deleted file mode 100644
index d19885f4aa60..000000000000
--- a/app-admin/diradm-2.9.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst test
-DEPEND=>=net-nds/openldap-2.3 sys-apps/gawk sys-apps/coreutils sys-apps/grep dev-lang/perl app-shells/bash:* sys-apps/sed virtual/perl-MIME-Base64 samba? ( dev-perl/Crypt-SmbHash >=net-fs/samba-3.0.6 ) test? ( dev-perl/Crypt-SmbHash >=net-fs/samba-3.0.6 dev-util/dejagnu net-nds/openldap[-minimal] )
-DESCRIPTION=A nearly complete nss/shadow suite for managing POSIX users/groups/data in LDAP
-EAPI=6
-HOMEPAGE=http://orbis-terrarum.net/~robbat2/
-IUSE=automount irixpasswd samba test
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-nds/openldap-2.3 sys-apps/gawk sys-apps/coreutils sys-apps/grep dev-lang/perl app-shells/bash:* sys-apps/sed virtual/perl-MIME-Base64 samba? ( dev-perl/Crypt-SmbHash >=net-fs/samba-3.0.6 )
-REQUIRED_USE=test? ( automount irixpasswd samba )
-SLOT=0
-SRC_URI=http://orbis-terrarum.net/~robbat2/diradm-2.9.7.1.tar.bz2
-_md5_=4ae03f2d62dea39d67eeddb383c2f861
diff --git a/app-admin/diradm/Manifest b/app-admin/diradm/Manifest
new file mode 100644
index 000000000000..8a28a9dfaea3
--- /dev/null
+++ b/app-admin/diradm/Manifest
@@ -0,0 +1,3 @@
+DIST diradm-2.9.7.1.tar.bz2 126172 BLAKE2B 23f18a7946187caf1e12ec9d1f67a2c5c06895d837add3c79dd0b043d4745f0fd9b405e5667ebe5480946e4741c7bbff2be8c4281afcb7636353f72904f7e39b SHA512 5052f7b7072cd61eb9c70d23057f6c0d2fa68a151792d7260ca52716c9588c06234d335af84b967df23da4b4a8650502cab3b18900dc15e71f71b0888224993f
+EBUILD diradm-2.9.7.1.ebuild 1707 BLAKE2B b006d5606650f6b1b11a165aa5f951d4593d6f2b479040b6d7955e731da352c6321c9b8bb654778742e9454df77e333a7413f3d8f1818b6bf369719bfd89ae6a SHA512 821bcdaaa0b0db69d658436e93ca400b57583b1081964ed199800c1b0ab04e9fc01052ae1ea0d038f6e0ee37f889db213b824fb5d1615e85cc770f09b190e147
+MISC metadata.xml 409 BLAKE2B 9228d543861d197474a3a1e7a698b4c14fa702cc1c7454b0ceb7fcbe3b6cccc5b4d3695efb917d0d65b6907c7447a93f63412a09496048dda0a716c65160a5a6 SHA512 e9324ac84f7909c5972a7bc60d81cccddf03509f2809387b9819c67d48dfaaf080377cd6d9c624f3315bf8548a3b764d077e42636d8f51695a1837a9ebb26fb2
diff --git a/app-admin/diradm/diradm-2.9.7.1.ebuild b/app-admin/diradm/diradm-2.9.7.1.ebuild
new file mode 100644
index 000000000000..2d6459346171
--- /dev/null
+++ b/app-admin/diradm/diradm-2.9.7.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A nearly complete nss/shadow suite for managing POSIX users/groups/data in LDAP"
+#HOMEPAGE="http://research.iat.sfu.ca/custom-software/diradm/"
+#SRC_URI="${HOMEPAGE}/${P}.tar.bz2"
+HOMEPAGE="http://orbis-terrarum.net/~robbat2/"
+SRC_URI="http://orbis-terrarum.net/~robbat2/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="automount irixpasswd samba test"
+REQUIRED_USE="test? ( automount irixpasswd samba )"
+
+RDEPEND=">=net-nds/openldap-2.3
+	sys-apps/gawk
+	sys-apps/coreutils
+	sys-apps/grep
+	dev-lang/perl
+	app-shells/bash:*
+	sys-apps/sed
+	virtual/perl-MIME-Base64
+	samba? (
+		dev-perl/Crypt-SmbHash
+		>=net-fs/samba-3.0.6
+	)"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-perl/Crypt-SmbHash
+		>=net-fs/samba-3.0.6
+		dev-util/dejagnu
+		net-nds/openldap[-minimal]
+	)"
+
+src_configure() {
+	econf \
+		$(use_enable automount) \
+		$(use_enable irixpasswd) \
+		$(use_enable samba)
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+	dodoc CHANGES.prefork KNOWN-BUGS
+
+	if use irixpasswd; then
+		insinto /etc/openldap/schema
+		doins irixpassword.schema
+	fi
+}
+
+pkg_postinst() {
+	elog "The new diradm pulls many settings from your LDAP configuration."
+	elog "But don't forget to customize /etc/diradm.conf for other settings."
+	elog "Please see the README to instructions if you problems."
+	elog "This package is primarily intended for use with nss_ldap & pam_ldap"
+	elog "and populates many default settings from the /etc/ldap.conf used by"
+	elog "those packages, with a further fallback to /etc/openldap/ldap.conf"
+	elog "for server connection settings only."
+}
diff --git a/app-admin/diradm/metadata.xml b/app-admin/diradm/metadata.xml
new file mode 100644
index 000000000000..151029fd4445
--- /dev/null
+++ b/app-admin/diradm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<use>
+		<flag name="automount">Support for automount data in LDAP</flag>
+		<flag name="irixpasswd">Support for storing separate IRIX passwords</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/doas-6.0 b/app-admin/doas-6.0
deleted file mode 100644
index 72173bb9a0ba..000000000000
--- a/app-admin/doas-6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=pam? ( virtual/pam ) virtual/yacc
-DESCRIPTION=Run commands as super user or another user, alternative to sudo from OpenBSD
-EAPI=6
-HOMEPAGE=https://github.com/Duncaen/OpenDoas
-IUSE=pam
-KEYWORDS=amd64 arm
-LICENSE=ISC
-RDEPEND=pam? ( virtual/pam )
-SLOT=0
-SRC_URI=https://github.com/Duncaen/OpenDoas/archive/v6.0.tar.gz -> OpenDoas-6.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=fe4b31d285c36202a7da3eb2f715e3e9
diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
new file mode 100644
index 000000000000..32d9bf7c67df
--- /dev/null
+++ b/app-admin/doas/Manifest
@@ -0,0 +1,3 @@
+DIST OpenDoas-6.0.tar.gz 28482 BLAKE2B 8d35a12f18609c9dd7746ff8ce7c39d16d7c5e595a05c0f1b91211d757029ae78311573228178f95ef92624f7a49d6ca1d1d0efd264104d66e1d20a8aa623241 SHA512 2bf5e00895a45d87785e7a494a1506844afd843ef5375e0b0e3795ebc24712bb941c6feeb87e426e41a240d40aca9b4c099f77220745bb7142a7a4b303441f60
+EBUILD doas-6.0.ebuild 759 BLAKE2B b464cbe922306990bbe10bf49cfb287a5be9f1bfc6e9508df7182c7daf5dc786276e4af63ad2723d2314e58a30acd3a0a7012697f679a6c6e59f8c9f7ec4f290 SHA512 28fc11ada8266651ac3f84eb084526ca8f7dfcb076467d06dec6af5ad6595263a3e781cb04b62d97242424873fcf99e72877c392e72301b68997e20b9636ac90
+MISC metadata.xml 435 BLAKE2B 63f345e2db83040c0cd34cce3dbc5f1f53495f3dc6c4b54ef9b09085eb32708a81dbe1e36f8702649cad0f2bae6f3affa4d95a5e996df5d66d6d0425136c09b6 SHA512 87342e8a10501960ff97fe359c4caa697269db4d95e5e008705aa23467b164a25c6cb8c7158530c39cd19a1840192815c3e336b09ce71938bc56dbd2819b18ec
diff --git a/app-admin/doas/doas-6.0.ebuild b/app-admin/doas/doas-6.0.ebuild
new file mode 100644
index 000000000000..0249bca14a16
--- /dev/null
+++ b/app-admin/doas/doas-6.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Run commands as super user or another user, alternative to sudo from OpenBSD"
+
+MY_PN=OpenDoas
+MY_P=${MY_PN}-${PV}
+HOMEPAGE="https://github.com/Duncaen/OpenDoas"
+SRC_URI="https://github.com/Duncaen/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64 arm"
+IUSE="pam"
+
+RDEPEND="pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	virtual/yacc"
+
+src_prepare()
+{
+	default
+	sed -i 's/-Werror //' Makefile || die
+}
+
+src_configure()
+{
+	tc-export CC AR
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		$(use_with pam) \
+		|| die
+}
diff --git a/app-admin/doas/metadata.xml b/app-admin/doas/metadata.xml
new file mode 100644
index 000000000000..90a63f874100
--- /dev/null
+++ b/app-admin/doas/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>felix.janda@posteo.de</email>
+	<name>Felix Janda</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<upstream>
+	<remote-id type="github">Duncaen/OpenDoas</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-admin/docker-bench-0_p20171206 b/app-admin/docker-bench-0_p20171206
deleted file mode 100644
index 4ef1798bcf2b..000000000000
--- a/app-admin/docker-bench-0_p20171206
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Docker Bench for Security runs the CIS Docker Benchmark
-EAPI=6
-HOMEPAGE=https://github.com/aquasecurity/docker-bench
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/aquasecurity/docker-bench/archive/8abecdea32bc3fe271eed1848b3e77ab46dd1971.tar.gz -> docker-bench-0_p20171206.tar.gz https://github.com/aquasecurity/bench-common/archive/fc47834ad19bafbba64ded876d82bee4dba50c40.tar.gz -> github.com-aquasecurity-bench-common-fc47834ad19bafbba64ded876d82bee4dba50c40.tar.gz https://github.com/fatih/color/archive/5df930a27be2502f99b292b7cc09ebad4d0891f4.tar.gz -> github.com-fatih-color-5df930a27be2502f99b292b7cc09ebad4d0891f4.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/spf13/cobra/archive/93959269ad99e80983c9ba742a7e01203a4c0e4f.tar.gz -> github.com-spf13-cobra-93959269ad99e80983c9ba742a7e01203a4c0e4f.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5.tar.gz -> github.com-spf13-viper-aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5.tar.gz https://github.com/fsnotify/fsnotify/archive/c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz -> github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mitchellh/mapstructure/archive/a4e142e9c047c904fa2f1e144d9a84e6133024bc.tar.gz -> github.com-mitchellh-mapstructure-a4e142e9c047c904fa2f1e144d9a84e6133024bc.tar.gz https://github.com/pelletier/go-toml/archive/acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz -> github.com-pelletier-go-toml-acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz https://github.com/spf13/afero/archive/bb8f1927f2a9d3ab41c9340aa034f6b803f4359c.tar.gz -> github.com-spf13-afero-bb8f1927f2a9d3ab41c9340aa034f6b803f4359c.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/golang/sys/archive/37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz -> github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz https://github.com/golang/text/archive/4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz -> github.com-golang-text-4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz https://github.com/go-yaml/yaml/archive/d670f9405373e636a5a2765eea47fac0c9bc91a4.tar.gz -> github.com-go-yaml-yaml-d670f9405373e636a5a2765eea47fac0c9bc91a4.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=af2a007e6403d85d3b131be474b60dcc
diff --git a/app-admin/docker-bench/Manifest b/app-admin/docker-bench/Manifest
new file mode 100644
index 000000000000..018ecede5f7f
--- /dev/null
+++ b/app-admin/docker-bench/Manifest
@@ -0,0 +1,20 @@
+DIST docker-bench-0_p20171206.tar.gz 17541 BLAKE2B ce6e68cab7e36a596c9b366ad6c7a6ff9ec735248f99dbb5b046bd9628f62ff392bb3c576c2a159d3403401e6d6cd4093632e47102c763f1c967bbdff2e4ee08 SHA512 fb9fbc1ccc54965c546bbba17865b803214824ef53e02d088e72a9bf3ae7c6ee7429e15507593b2ec8d33c52aab375878d9ea86b51a2518948bc0dfe969bec13
+DIST github.com-aquasecurity-bench-common-fc47834ad19bafbba64ded876d82bee4dba50c40.tar.gz 11587 BLAKE2B 832d7216340c71ce8ec201a0abb8f22dc73916a8bcc0d3657a7d12958f48142e6d729ce1f6403ed4a7b0b11a7cb53d45901f0a6e20f095d931c075e414373647 SHA512 20fb3a105af33096ed5e4a6b52e9793d9031ca5c2d2f37811e4be90abbc6cc3d7aa94e1d210ada703b61398f6bcf771ed20a9b9b9ad171fe88f66e78125bbc4f
+DIST github.com-fatih-color-5df930a27be2502f99b292b7cc09ebad4d0891f4.tar.gz 588446 BLAKE2B 0e3acbea72d4e6d14964c53a13eac4ddb4299f86045bc4751498c1e80ee997f3392b3236f1f7fa872ceef73edf0c4e87154d5cc1605d5637ae090979596f1906 SHA512 9c7a1f5d67e0c8da788624a24ec42a9a1504f497840590e50b8fe9204dde5511be00a94645c2e9326dba23a8514adffdc242192abb270021c37e231636bafc71
+DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz 31164 BLAKE2B 8ed43520ed7df3f52585b41358e2c89c55cd9bcea78affbf76d11cb2d3660e2de63d2debd91cd4da7c1a1fde3afac1086e616ab632460389cd4f10cc633a3e81 SHA512 809a90dcfbf565d335514257b577150a367e16ef871e2f44584a13fe3bc3ac87cbd789f7c7882a76cf7a7c546740c6552ec7382b4a6d18c4f0e845bcc3a7b0c8
+DIST github.com-go-yaml-yaml-d670f9405373e636a5a2765eea47fac0c9bc91a4.tar.gz 64859 BLAKE2B 211e51960673e78e9c802357dffb550c6d59692203040b2f3d0bc9ab15f8bf5ee479918a782931238e230f36f4c77228a44632883486370f0fb9266d8b2c7c14 SHA512 daa9d622d4b717ce54af884e1f5548d7ead93486d322f808bc6cf291011a5c418d33b464fd66161bef8c18da759aa1c6182b36fb2210c5f026110776e2195ac5
+DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
+DIST github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz 796903 BLAKE2B 4e31f27784cdc5781628ac082d7994a5559be59268003366a3185eac6eb514495f6d82ba13c3046f1061c6abc68712ae8d0505ab7567c8e6057b90f3217c272e SHA512 580bd4cfd26d82aa8c6870eabbd289b76f2ba529ed8496428b29e482ec39bc617cdbcd2f2f2d476ee93526bd18550dcd239085b9f74fb4d24ccb87a3b357bff6
+DIST github.com-golang-text-4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz 6112758 BLAKE2B 88f0ece79f03800d6482430d569fa9b65d8ec4b15d42f65706ca665349346961ab273d3a7d2d0676d0c6c05a12d08f75c1465fd0ef632611b7b606593466e5ae SHA512 9fc536d4971e8861c5b905dec44fc7eddfaf8b0dafd5f904929bc2b63a65ce3fa28108d3f9f954a9db8d4ed24be532a519bad41e09e8076f9b75e6564f75f7ce
+DIST github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz 69787 BLAKE2B e1d034d5863ae8bca85736e971e613e6821665861e35954a067e5d659029a8680b6902387848a318aee374cd4f6b810ae160046979b5bc86e64df0e1ff5d08f6 SHA512 751ea2fcea04ab2a9b61a45443a71cdee9cd09c2576af048108ccb56027b34f46b00e14aa664b966165b7d8cbb994e49f128bf54e3469c627d73f7ee2809ebf8
+DIST github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz 27761 BLAKE2B 0f39a63d3d19ad5d3ac367739d568dd3abe74a8a6aa0e60cf19ca8203412270fc45dd1fea07627290a85c42db6ead0229f72bfd845b9e4f645976db1585838e7 SHA512 493a7493e415b45abe2109c79e02ed7903de6a559911cff0323f9577fcf41134ab8f4ac26d776fdf9a891654f063bd2452c7e557c643d73de5f558b13533f62c
+DIST github.com-mitchellh-mapstructure-a4e142e9c047c904fa2f1e144d9a84e6133024bc.tar.gz 17997 BLAKE2B d2233557f40812a16fcb2b012f45afc7637fc8c64eb3e8e3d01ef78198dbf99d2a4caa9c749faac9b46d75c46a50ea5d0a6eb292924406a385533d3a47ac2eb8 SHA512 20b70a65cb700a2768dc643b2b2c86ea68927d417e9135e582a15f267f583637a01eec186a4fb1788c0ac421df1f8e0420d7b934d449fe7b66d572266d71f83a
+DIST github.com-pelletier-go-toml-acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz 56990 BLAKE2B 02a12c6c8ef85cdfacb6ab59406132c74cb0eb4fc270c680abd220210a7d0a5796bdc79c97c5623c4760e38cc143cf51e62fdbdc52d007241f2b61657fbf7d53 SHA512 cfce832c0a74dbc4f559600c846b8df8e94368785991a910169e1a535e2a57a72f7d20ec7c9fbd14a44b7b5a11b496af0bfd7705fd67a1c192e39819ca8aaa64
+DIST github.com-spf13-afero-bb8f1927f2a9d3ab41c9340aa034f6b803f4359c.tar.gz 43579 BLAKE2B e0953e8a7cb3383cccbc307443d5942a8642e0358a0408af8b991e719698e7746f6b5cd4b3e46a7f896823742c6ba58e4ef332aa92cd5f4376eae1396a06c677 SHA512 9ff4adaa3b525b7b18fc4d1fbbb9e3049938e81cf2f0890a1a7e35f19640793d90d53b104a4f9e87aeb066b8b641020f468ba37b7a7a4e1c14f0d7d2085cdccb
+DIST github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz 9594 BLAKE2B 4979fd23b48a6bcd2538357d33b7670326b9129b5de309548492d9597eace1320875e1b242b594c98777192c1e0c6abb0bda4ba946a43530cc68ec762d1949c6 SHA512 2b97f56aa83dd1302e02603a8fcbc8f2642ceff8bdc19cf8a26120801023c4a8a3fed689de0ac392f6a4144450ac85d32b00fbde200b22e972c31cbabd996cad
+DIST github.com-spf13-cobra-93959269ad99e80983c9ba742a7e01203a4c0e4f.tar.gz 100166 BLAKE2B 60304e434dbe9c3f7192f8c818371c02b5eb08a1777b244daf5fb6c53a1b7cbea019c70ad8e544fdf48fcfa3479f79d59ec5ab4da544a8afe2fd66c7e5de179c SHA512 8ba4b60e4b37a4efafcf8adfd609901d12c0f5a1f0bac88cb159f75d451d19622428f720bd22f929985b8259a6fb8720f02e187e7a684a8ee6324edabdefd8bc
+DIST github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz 6345 BLAKE2B dad5459a45bc35e28f9ed7473a02bbfdfcc8da06e17cee15a1876125829065fd4bcaad35b8ec489f3b308637a3fa9cd829c04836207620e61db1a7f706660c6c SHA512 f98c62d7e74ce3e35c29862244d46fb19fcd615e500713dd7c26b30ebedd7a846e419af6586031b748029b8b4d5e32baff6d36bb1ec35856bb6ad5625a407f14
+DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297
+DIST github.com-spf13-viper-aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5.tar.gz 32232 BLAKE2B 23602979412f6457f7d1b1ffd78feb3a595dcd813d2f231ba7e6d000135f6bd1a68700125cf271ad50483ff21d4ac09aa67f8cbc4228351683002f5d73cbe52f SHA512 45a10a14b20a60f3a3471a0a4e92e96bf30aa96e09d589acf55f1f96b2fd0e0d2de6beb936762d57ca8057d7512029bedce7059afed1793b1dd8c351214ef09e
+EBUILD docker-bench-0_p20171206.ebuild 2081 BLAKE2B 86c752360e7b948b1a73cd67b4f9981fe7cd1c54be28cf0f8cc4b4f09859934b1c2e20c7aacb6d74feeb26770ace16fb8e7862587703abe5cbbe65e6eeff48e5 SHA512 f370c1af5a9301d4e60b7d2cb8a632474dc4cc1e1ff872afac1ded02597aed3b5792f4925e02b6f25bb8f65c6fcef7cd5bdb302ecf57652e62c34a140f6f2b73
+MISC metadata.xml 335 BLAKE2B da5cd90d136df106dfcb334ed49459e5b69e470094fd259abfb2d402c7c9f363432013dbc5c64e04592de6a2d5dc535004e767aff6d9fe5c00c961cc8fb454c8 SHA512 079aa469e4bf9c79262feedcebf7ae1986224751d0667e502b0b66e1b2499f43177130a5fd1b37ece57713f49b2a7ce83c093e7b8b884ac995e4075a8edfea50
diff --git a/app-admin/docker-bench/docker-bench-0_p20171206.ebuild b/app-admin/docker-bench/docker-bench-0_p20171206.ebuild
new file mode 100644
index 000000000000..1e575d53fc4b
--- /dev/null
+++ b/app-admin/docker-bench/docker-bench-0_p20171206.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/aquasecurity/docker-bench"
+
+EGO_VENDOR=(
+"github.com/aquasecurity/bench-common fc47834ad19bafbba64ded876d82bee4dba50c40"
+"github.com/fatih/color 5df930a27be2502f99b292b7cc09ebad4d0891f4"
+"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+"github.com/spf13/cobra 93959269ad99e80983c9ba742a7e01203a4c0e4f"
+"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
+"github.com/spf13/viper aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5"
+"github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
+"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
+"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
+"github.com/mitchellh/mapstructure a4e142e9c047c904fa2f1e144d9a84e6133024bc"
+"github.com/pelletier/go-toml acdc4509485b587f5e675510c4f2c63e90ff68a8"
+"github.com/spf13/afero bb8f1927f2a9d3ab41c9340aa034f6b803f4359c"
+"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
+"github.com/spf13/jwalterweatherman 7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
+"golang.org/x/sys 37707fdb30a5b38865cfb95e5aab41707daec7fd github.com/golang/sys"
+"golang.org/x/text 4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1 github.com/golang/text"
+"gopkg.in/yaml.v2 d670f9405373e636a5a2765eea47fac0c9bc91a4 github.com/go-yaml/yaml"
+)
+EGIT_COMMIT="8abecdea32bc3fe271eed1848b3e77ab46dd1971"
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+ARCHIVE_URI="https://github.com/aquasecurity/docker-bench/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Docker Bench for Security runs the CIS Docker Benchmark"
+HOMEPAGE="https://github.com/aquasecurity/docker-bench"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o ${PN} . || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/${PN}
+	insinto /etc/docker-bench/
+	doins -r src/${EGO_PN}/cfg
+}
diff --git a/app-admin/docker-bench/metadata.xml b/app-admin/docker-bench/metadata.xml
new file mode 100644
index 000000000000..6105e885d555
--- /dev/null
+++ b/app-admin/docker-bench/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">aquasecurity/docker-bench</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/drush-6.7.0 b/app-admin/drush-6.7.0
deleted file mode 100644
index fdb916408c21..000000000000
--- a/app-admin/drush-6.7.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Command line shell and scripting interface for Drupal
-EAPI=5
-HOMEPAGE=https://github.com/drush-ops/drush
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[cli,ctype,json,simplexml] dev-php/PEAR-Console_Table
-SLOT=0
-SRC_URI=https://github.com/drush-ops/drush/archive/6.7.0.tar.gz -> drush-6.7.0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a9e55ada6830b22b6f3fa7e74ff03d2e
diff --git a/app-admin/drush-6.7.0-r1 b/app-admin/drush-6.7.0-r1
deleted file mode 100644
index 81805861eb10..000000000000
--- a/app-admin/drush-6.7.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Command line shell and scripting interface for Drupal
-EAPI=6
-HOMEPAGE=https://github.com/drush-ops/drush
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[cli,ctype,json,simplexml] dev-php/PEAR-Console_Table
-SLOT=0
-SRC_URI=https://github.com/drush-ops/drush/archive/6.7.0.tar.gz -> drush-6.7.0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=dd5140e38603c0c2a77bf83db96be809
diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest
new file mode 100644
index 000000000000..65e2a6cec52f
--- /dev/null
+++ b/app-admin/drush/Manifest
@@ -0,0 +1,5 @@
+AUX update-bash-completion-script-for-2.1.patch 1332 BLAKE2B a54fa2cab268542a37f1020012cf7744106966419d2ba8415a2e2ead882feb3f3dc9bd9b1ab17f8592e5d021855f5361b05304efcc810362224935069ef1b897 SHA512 2e19a6be652684c1b1a2a9d6605c1404272391950408cd6ae964b2bdd9f95b1e59deec5111c1eaa563a92837ea394fcb2315a3032b2ab02996509b98eb7d1cf0
+DIST drush-6.7.0.tar.gz 511581 BLAKE2B d3a589e3de35afe120d790f96ffa7e88b530da1e1d04815b1dea2f05cd081ad7dc6f4b39fa6f19b5620b9913b952ab289ec538f1b7c0c0f298d3cd0129eb7026 SHA512 203870190dd8987ad3da71f7625476c1f94bc75513447a740fd8c16268fb9705bcbc3b2bffc49a44045998e3fa49fd5ee9d4c0634a1fb39605ba8e10b7373fa5
+EBUILD drush-6.7.0-r1.ebuild 1716 BLAKE2B 6323bd830e199edbcf39a74b6ddaf0b38816678c43a6245565db2999236f496209859f88074920a86a8647ff653e3d603c032cd4cd79ca37efe893546d0baf83 SHA512 b766666dfce86612ae691db158f0ca340025cfca28e5d8ca55020bdc762cf0ccb73cb41d37318c962974df40695b3d8fab5fef6c9f1bd4a453806d0c79d7aab8
+EBUILD drush-6.7.0.ebuild 1705 BLAKE2B b53cf220834579345e124bc469aced5fafb5d609090db5c545436859d8107543807699440f39577ea95921a47c14e64d512ce90867945b07f0bae65e78f5de19 SHA512 1c6bd5d2c9af395751d9deefb08fcd35dbe38be0c7d9df2e5db68d6aa9a732dbb326da1b6d2f9b548a16c14120b2f7c6d59ed810c53f4f75c24ff02827da97f0
+MISC metadata.xml 531 BLAKE2B f28505f228108046c5a667d98863fe5b77e3ff8a994d3613a34bcc6666d041451c419a0f43b6792c376e2a0749dcf5dfd42e83781ad2db6b1ba6f084bee00b1a SHA512 27cfde1e0c618050f645abf589511ccf87675ac00da8eb147b6a38d1e48d0d688fef2310ec015d394a202b56b3f09aca32b6d6c9bedaab98e469139349472aa4
diff --git a/app-admin/drush/drush-6.7.0-r1.ebuild b/app-admin/drush/drush-6.7.0-r1.ebuild
new file mode 100644
index 000000000000..41d92ea52559
--- /dev/null
+++ b/app-admin/drush/drush-6.7.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="Command line shell and scripting interface for Drupal"
+HOMEPAGE="https://github.com/drush-ops/drush"
+SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php[cli,ctype,json,simplexml]
+	dev-php/PEAR-Console_Table"
+
+# Fixes the bash completion script, check the patch for Gentoo/upstream
+# bug numbers.
+PATCHES=( "${FILESDIR}/update-bash-completion-script-for-2.1.patch" )
+
+src_prepare() {
+	default
+
+	# dodoc compresses all of the documentation, so we fix the filenames
+	# in a few places.
+	#
+	# First, the README location in bootstrap.inc.
+	sed -i -e \
+		"s!/share/doc/drush!/share/doc/${PF}!" \
+		-e "s!README\.md!\0.bz2!g" \
+		includes/bootstrap.inc || die
+
+	# Next, the list of documentation in docs.drush.inc. Note that
+	# html files don't get compressed.
+	sed -i \
+		-e "s!\.bashrc'!.bashrc.bz2'!" \
+		-e "s!\.inc'!.inc.bz2'!" \
+		-e "s!\.ini'!.ini.bz2'!" \
+		-e "s!\.md'!.md.bz2'!" \
+		-e "s!\.php'!.php.bz2'!" \
+		-e "s!\.script'!.script.bz2'!" \
+		-e "s!\.txt'!.txt.bz2'!" \
+		commands/core/docs.drush.inc || die
+}
+
+src_install() {
+	# Always install the examples; they're referenced within the source
+	# code and too difficult to exorcise.
+	dodoc -r README.md docs examples
+
+	insinto /usr/share/drush
+	doins -r classes commands includes lib misc
+	doins drush_logo-black.png drush.info drush.php
+
+	exeinto /usr/share/drush
+	doexe drush
+	dosym ../share/drush/drush /usr/bin/drush
+
+	keepdir /etc/drush
+	newbashcomp drush.complete.sh drush
+}
diff --git a/app-admin/drush/drush-6.7.0.ebuild b/app-admin/drush/drush-6.7.0.ebuild
new file mode 100644
index 000000000000..9052c38c745c
--- /dev/null
+++ b/app-admin/drush/drush-6.7.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="Command line shell and scripting interface for Drupal"
+HOMEPAGE="https://github.com/drush-ops/drush"
+SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php[cli,ctype,json,simplexml]
+	dev-php/PEAR-Console_Table"
+
+src_prepare() {
+	# Fix the bash completion script, check the patch for Gentoo/upstream
+	# bug numbers.
+	epatch "${FILESDIR}/update-bash-completion-script-for-2.1.patch"
+
+	# dodoc compresses all of the documentation, so we fix the filenames
+	# in a few places.
+
+	# First, the README location in bootstrap.inc.
+	sed -i -e \
+		"s!/share/doc/drush!/share/doc/${PF}!" \
+		-e "s!README\.md!\0.bz2!g" \
+		includes/bootstrap.inc || die
+
+	# Next, the list of documentation in docs.drush.inc. Note that
+	# html files don't get compressed.
+	sed -i \
+		-e "s!\.bashrc'!.bashrc.bz2'!" \
+		-e "s!\.inc'!.inc.bz2'!" \
+		-e "s!\.ini'!.ini.bz2'!" \
+		-e "s!\.md'!.md.bz2'!" \
+		-e "s!\.php'!.php.bz2'!" \
+		-e "s!\.script'!.script.bz2'!" \
+		-e "s!\.txt'!.txt.bz2'!" \
+		commands/core/docs.drush.inc || die
+}
+
+src_install() {
+	# Always install the examples; they're referenced within the source
+	# code and too difficult to exorcise.
+	dodoc -r README.md docs examples
+
+	insinto /usr/share/drush
+	doins -r classes commands includes lib misc
+	doins drush_logo-black.png drush.info drush.php
+
+	exeinto /usr/share/drush
+	doexe drush
+	dosym ../share/drush/drush /usr/bin/drush
+
+	keepdir /etc/drush
+	newbashcomp drush.complete.sh drush
+}
diff --git a/app-admin/drush/files/update-bash-completion-script-for-2.1.patch b/app-admin/drush/files/update-bash-completion-script-for-2.1.patch
new file mode 100644
index 000000000000..a6a9b6a0ff43
--- /dev/null
+++ b/app-admin/drush/files/update-bash-completion-script-for-2.1.patch
@@ -0,0 +1,39 @@
+From e0f53949d35f32d251ab003d6e9e70a7f8c0e69a Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <mjo@gentoo.org>
+Date: Tue, 21 Oct 2014 19:48:37 -0400
+Subject: [PATCH 1/1] Update bash completion script for new
+ bash-completion-2.1 (Gentoo bug #526222).
+
+* Don't use `which drush ...` to detect the presence of drush in the
+  bash-completion script (https://github.com/drush-ops/drush/issues/521).
+
+* Don't install completions for commands that we don't "own"
+  (https://github.com/drush-ops/drush/issues/915).
+
+---
+ drush.complete.sh | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/drush.complete.sh b/drush.complete.sh
+index 067a67c..2f97317 100644
+--- a/drush.complete.sh
++++ b/drush.complete.sh
+@@ -5,9 +5,6 @@
+ # examples/example.bashrc instead, as it will automatically find and source
+ # this file.
+ 
+-# Ensure drush is available.
+-which drush > /dev/null || alias drush &> /dev/null || return
+-
+ __drush_ps1() {
+   f="${TMPDIR:-/tmp/}/drush-env/drush-drupal-site-$$"
+   if [ -f $f ]
+@@ -31,4 +28,4 @@ _drush_completion() {
+ }
+ 
+ # Register our completion function. We include common short aliases for Drush.
+-complete -o bashdefault -o default -o nospace -F _drush_completion d dr drush drush5 drush6 drush7 drush.php
++complete -o bashdefault -o default -o nospace -F _drush_completion drush
+-- 
+2.0.4
+
diff --git a/app-admin/drush/metadata.xml b/app-admin/drush/metadata.xml
new file mode 100644
index 000000000000..dade88fc1985
--- /dev/null
+++ b/app-admin/drush/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription lang="en">
+    Drush is a command line shell and scripting interface for Drupal,
+    a veritable Swiss Army knife designed to make life easier for
+    those of us who spend some of our working hours hacking away at
+    the command prompt.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">drush-ops/drush</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/durep-0.9-r4 b/app-admin/durep-0.9-r4
deleted file mode 100644
index 74ee2a52b4a8..000000000000
--- a/app-admin/durep-0.9-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=A perl script designed for monitoring disk usage in a more visual way than du
-EAPI=4
-HOMEPAGE=https://gentoo.org
-KEYWORDS=amd64 ppc x86
-LICENSE=Artistic
-RDEPEND=dev-lang/perl dev-perl/MLDBM virtual/perl-Getopt-Long virtual/perl-Term-ANSIColor
-SLOT=0
-SRC_URI=http://www.hibernaculum.net/download/durep-0.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=96460a6342741d9310eb12b7409f56b1
diff --git a/app-admin/durep/Manifest b/app-admin/durep/Manifest
new file mode 100644
index 000000000000..36f60e6542c2
--- /dev/null
+++ b/app-admin/durep/Manifest
@@ -0,0 +1,6 @@
+AUX durep-0.9-dirhandle.patch 848 BLAKE2B 71966b1b72740ecdd4178f93e09df9294039a59da088a00a93209d4ffc7f38f298791f71078afb420f145ceca50b98e429bb7db2a208e3218e703858d4669f72 SHA512 8e887393bab2c011cdf9ae096fc4f8b077c02c471203768c9f51b59df0a36f94aad797ffc017cf03ab0ddd2eed5e290d3ec65c90774bebacb5c35673ac3f176d
+AUX durep-0.9-gigabyte.patch 327 BLAKE2B 54838c927f77bb493489b4f63835f8c2e1b91f1d8bb3f77e5b8bc072617e04a27c82697e69879e0f8b650c5900deaa5ca3065ebab0b08f9bcb16988e550050cc SHA512 2bb28c5956cc6f8b301890f82eb86255f84ed6f93d1dc61e96bacb840ae0181feed76e992bca86249e9003701666784fdf7a40331c6c1731c55b3e3d2a4897b8
+AUX durep-0.9-r4-color-output.patch 3477 BLAKE2B 07bb50e252793664fd09d26e65abfddccf252259e712a7e239e8693ed4b0c03e6e308f899d38e2261d3204b7c06606978210393450376c7ba0e7fbf8f08f06ea SHA512 18bd766f706bf2036b1da35c0daf1add0adb6603a6cd0c68277efff8e1f2f8224cc2d79ca6c4afc70db9a01b5eec8a4ca7899c7c92b0bd38f709e7736731937a
+DIST durep-0.9.tar.gz 13713 BLAKE2B ac8cab90eeec1f9dcf1c5f6ba3043ee1de909cc288f3d1692d272b77c426932cb8b9c500fc7901c85a8eeeef3db4632b76c1ff5cf8a094c971867a3557052322 SHA512 a8a58cf4a77fa43e06eb22ce70e566fe9c5dd6921677dbe4691a6dd95e2fad3735778a9858e3b80957ba6efd20293fcd2ba4ddc9cfe29f5813997de0f9c96b6d
+EBUILD durep-0.9-r4.ebuild 746 BLAKE2B 78db882a49b4be171fdc1159adab160286f910e34e3e0b7051da43a1d615c2684ce36d8e620b8fd0a6d1ee43aa256e84d5cc07f20819c317a13d00e6f079ab2e SHA512 73458ffd706804959eddaabc0a06b879562e0855a4b75d47a8dcee0b1c24109740efede4d6c846192b6fe6b9ecea00306fe86abdf83261658f337da00b1fc138
+MISC metadata.xml 267 BLAKE2B 2496f74910a8e395abde0819a7f36ecc7fb7d10639cc3ddfbbf1645c5683c6352af932ec5538b19d4e21ddbd80cb5dc23a4a64f1618a7411129f33bf9dc54d81 SHA512 cbdeb6992e6acb977746b55685ae3d60dcf00915b48002a5e7eb47830207e7cad52ae212cd8831282274c454e45faa65422dcd5ac50185f429642fb34818609c
diff --git a/app-admin/durep/durep-0.9-r4.ebuild b/app-admin/durep/durep-0.9-r4.ebuild
new file mode 100644
index 000000000000..8a1b40e1159e
--- /dev/null
+++ b/app-admin/durep/durep-0.9-r4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="A perl script designed for monitoring disk usage in a more visual way than du"
+HOMEPAGE="https://gentoo.org"
+SRC_URI="http://www.hibernaculum.net/download/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-perl/MLDBM
+	virtual/perl-Getopt-Long
+	virtual/perl-Term-ANSIColor"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gigabyte.patch \
+		"${FILESDIR}"/${PF}-color-output.patch \
+		"${FILESDIR}"/${P}-dirhandle.patch
+}
+
+src_install() {
+	dobin durep
+	doman durep.1
+	dodoc BUGS CHANGES README THANKS
+	dohtml -A cgi *.cgi *.css *.png
+}
diff --git a/app-admin/durep/files/durep-0.9-dirhandle.patch b/app-admin/durep/files/durep-0.9-dirhandle.patch
new file mode 100644
index 000000000000..ee2930622370
--- /dev/null
+++ b/app-admin/durep/files/durep-0.9-dirhandle.patch
@@ -0,0 +1,31 @@
+--- durep       2007-09-08 11:44:05.000000000 -0500
++++ durep.new   2008-12-15 10:04:14.907825184 -0600
+@@ -175,6 +175,7 @@
+   my $coalesced_size = 0;
+   my $node = {};
+   my $temp;
++  my $dirhandle;
+
+   $node->{ID} = $next_id++;
+   if(defined $parent) {
+@@ -196,9 +197,9 @@
+
+   $node->{TYPE} &= $TYPE_COLLAPSED unless $store;
+
+-  opendir(DIR, $dir) or warn "Unable to open dir '$dir': $!\n" and return $node;
++  opendir($dirhandle, $dir) or warn "Unable to open dir '$dir': $!\n" and return $node;
+
+-  foreach(readdir(DIR)) {
++  foreach(readdir($dirhandle)) {
+     @stats = lstat "$dir/$_" or warn "Unable to lstat '$dir/$_': $!\n" and next;
+
+     $node->{MTIME} = $stats[9] if($_ eq ".");
+@@ -247,7 +248,7 @@
+     $file_count++;
+     $node->{FCOUNT}++;
+   }
+-  closedir(DIR);
++  closedir($dirhandle);
+
+   if($coalesced_count) {
+     if($store) {
diff --git a/app-admin/durep/files/durep-0.9-gigabyte.patch b/app-admin/durep/files/durep-0.9-gigabyte.patch
new file mode 100644
index 000000000000..315cb1c7c813
--- /dev/null
+++ b/app-admin/durep/files/durep-0.9-gigabyte.patch
@@ -0,0 +1,17 @@
+fix `durep -hs 1g` output
+
+Patch by Stephen Tallowitz
+
+http://bugs.gentoo.org/108942
+
+--- durep
++++ durep
+@@ -468,7 +468,7 @@
+     elsif ($temp =~ m/^[mM]/) {
+       return $size * 1048576;
+     }
+-    elsif ($temp =~ m/^[mM]/) {
++    elsif ($temp =~ m/^[gG]/) {
+       return $size * 1048576 * 1024;
+     }
+     return $size;
diff --git a/app-admin/durep/files/durep-0.9-r4-color-output.patch b/app-admin/durep/files/durep-0.9-r4-color-output.patch
new file mode 100644
index 000000000000..6b8956199406
--- /dev/null
+++ b/app-admin/durep/files/durep-0.9-r4-color-output.patch
@@ -0,0 +1,98 @@
+--- durep
++++ durep
+@@ -14,6 +14,8 @@
+ #############################################################################
+ 
+ use Getopt::Long;
++use feature 'switch';
++use Term::ANSIColor qw(:constants);
+ use File::Basename;
+ use MLDBM qw(DB_File Storable);
+ use Fcntl;
+@@ -27,6 +29,7 @@
+ our ($root_node, $filesystem_id, @stats);
+ our ($opt_help, $opt_version, $opt_textdepth, $opt_hidesize, $opt_showdate, $opt_nosort, $opt_quiet);
+ our ($opt_savefile, $opt_loadfile, $opt_desc, $opt_collate);
++our ($opt_nocolor);
+ our ($opt_files, $opt_onefilesystem, $opt_collapsepath, $opt_excludepath, $opt_coalescefiles);
+ our ($root_dir, $file_count, $dir_count, $next_id);
+ our ($TYPE_FILE, $TYPE_DIR, $TYPE_EMPTY, $TYPE_COALESCED, $TYPE_COLLAPSED);
+@@ -56,6 +59,8 @@
+ 	    "d|desc=s"            => \$opt_desc,
+ 	    "c|collate=s"         => \$opt_collate,
+ 
++	    "nc|nocolor" 	  => \$opt_nocolor,
++
+ 	    "f|files"             => \$opt_files,
+ 	    "x|one-file-system"   => \$opt_onefilesystem,
+ 	    "cp|collapse-path=s"  => \$opt_collapsepath,
+@@ -332,13 +337,58 @@
+     printf(" [%s%s] ", "#" x $numofchars, " " x (30-$numofchars));
+     printf("%6.2f%% ", $percent);
+     printf("%s ", shortDate($entry->{MTIME})) if $opt_showdate;
+-    printf("%s%s\n", $entry->{NAME}, $entry->{TYPE} & $TYPE_DIR ? "/" : "");
++   
++    printColor( $entry ) unless ( $opt_nocolor );
++    printNoColor( $entry ) if ( $opt_nocolor );
+     if($entry->{TYPE} & $TYPE_DIR) {
+       printDir($entry, $indent+1) if(!defined $opt_textdepth || ($opt_textdepth > $indent+1));
+     }
+   }
+ }
+ 
++sub printColor {
++    my $entry = shift;
++    
++    my @tmp = split /\./, $entry->{NAME};
++    
++    if ( $entry->{TYPE} & $TYPE_DIR ) {
++        print BLUE, BOLD, $entry->{NAME}."/\n", RESET
++    }
++    else {
++        given ($tmp[$#tmp]) {
++            #executable (bright green)
++            when([ qw(cmd exe com btm bat sh csh) ]) {
++                print BOLD, GREEN, $entry->{NAME}."\n", RESET
++            }
++            #archives / compressed (bright red)
++            when([ qw(tar tgz arj taz lzh zip z Z gz bz2 tbz2 tz deb rpm rar ace zoo cpio 7z rz) ]) {
++                print BOLD, RED, $entry->{NAME}."\n", RESET 
++            }
++            #image formats
++            when([ qw(jpg jpeg gif bmp ppm tga xbm xpm tif tiff png mng xcf pcx mpg mpeg m2v avi mkv
++                    ogm mp4 mp4v mov qt wmv asf rm rmvb flc fli gl dl) ]) {
++                print BOLD, MAGENTA, $entry->{NAME}."\n", RESET
++            }
++            #misc.
++            when([ qw(pdf ps txt patch diff log tex doc) ]) {
++                print GREEN, $entry->{NAME}."\n", RESET
++            }
++            when([ qw(mp3 wav mid midi au ogg flac aac) ]) {
++                print CYAN, $entry->{NAME}."\n", RESET
++            }
++            default {
++                print $entry->{NAME}."\n", RESET
++            }
++        }
++    }
++}
++
++sub printNoColor {
++    my $entry = shift;
++
++    printf("%s%s\n", $entry->{NAME}, $entry->{TYPE} & $TYPE_DIR ? "/" : "");
++}
++
+ sub processSizeOption {
+   my ($size, $temp);
+ 
+@@ -438,6 +488,9 @@
+    -d, --desc=<description>     give description of save file
+    -c, --collate=<dir>          collate save files in dir for web report
+ 
++Color Option:
++  -nc, --nocolor 		no color output
++  				By default durep color outpu
+ Inclusion Options:
+    -f, --files                  do not descend into subdirs, only report files
+    -x, --one-file-system        do not traverse file systems
diff --git a/app-admin/durep/metadata.xml b/app-admin/durep/metadata.xml
new file mode 100644
index 000000000000..a1d1cac5ab79
--- /dev/null
+++ b/app-admin/durep/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>A perl script designed for monitoring disk usage. Similar to du</longdescription>
+</pkgmetadata>
diff --git a/app-admin/dxf-7.1.1 b/app-admin/dxf-7.1.1
deleted file mode 100644
index 98a49c274e55..000000000000
--- a/app-admin/dxf-7.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Docker registry v2 client in Python
-EAPI=6
-HOMEPAGE=https://github.com/davedoesdev/dxf
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/jwcrypto-0.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tqdm-4.19.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/www-authenticate-0.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/davedoesdev/dxf/archive/v7.1.1.tar.gz -> dxf-7.1.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=733e3753e677d4263046b3e07a7605dc
diff --git a/app-admin/dxf-7.2.0 b/app-admin/dxf-7.2.0
deleted file mode 100644
index 4335875d292f..000000000000
--- a/app-admin/dxf-7.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Docker registry v2 client in Python
-EAPI=6
-HOMEPAGE=https://github.com/davedoesdev/dxf
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/jwcrypto-0.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tqdm-4.19.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/www-authenticate-0.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/davedoesdev/dxf/archive/v7.2.0.tar.gz -> dxf-7.2.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=733e3753e677d4263046b3e07a7605dc
diff --git a/app-admin/dxf-7.3.0 b/app-admin/dxf-7.3.0
deleted file mode 100644
index 81856779bafe..000000000000
--- a/app-admin/dxf-7.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Docker registry v2 client in Python
-EAPI=6
-HOMEPAGE=https://github.com/davedoesdev/dxf
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/jwcrypto-0.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tqdm-4.19.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/www-authenticate-0.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/davedoesdev/dxf/archive/v7.3.0.tar.gz -> dxf-7.3.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=733e3753e677d4263046b3e07a7605dc
diff --git a/app-admin/dxf/Manifest b/app-admin/dxf/Manifest
new file mode 100644
index 000000000000..3052d24fb712
--- /dev/null
+++ b/app-admin/dxf/Manifest
@@ -0,0 +1,7 @@
+DIST dxf-7.1.1.tar.gz 293629 BLAKE2B b6657e2b3b402e07a1f22dc5f8ece033fc8c7492e18a1654e7354420862c042ece359cdbb377dd9daefec606aaab865a22d26247d463097469c322d2877f4ea7 SHA512 9e9be7a69d885bfaf4f062ec601f33c7de2123c4c2910f046fc4b3f199608d08626e76ff47e2c9691149e6f3e0c6fb05e2264b83b3d74c06fe907f5bb7de5254
+DIST dxf-7.2.0.tar.gz 298396 BLAKE2B 2566f61ab4f621492b3f2c243a78bb02e25bc7278438c7698be4704724172605a5e1111a9f380e1de064c6d6ce35a95fee06ac4865e3c8f1318af4a6242ff1b9 SHA512 49f6a29d6d653f444d2f53b84a73b1282052c7ff7a87f65b59a87b5c2796ca37897b36b17d2252398d087377755ff9f474c6b271af80d955d79b6a971a2e124d
+DIST dxf-7.3.0.tar.gz 298408 BLAKE2B a8ba078d1bea8fed58df35562af678f902513f4da18123a3eabb52a707b7973358a7690d309b3b7d86fadc4086856580792177525b4e7e217da4542249e83663 SHA512 2bb16a41990f572c3352f708438e67550cc089c078296c765fcffec4ada60f40f097bfcdf4def3c57a0e6c1db31d2ab9020407b2c165509f132e51cc93af8205
+EBUILD dxf-7.1.1.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
+EBUILD dxf-7.2.0.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
+EBUILD dxf-7.3.0.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
+MISC metadata.xml 373 BLAKE2B e00f8cf7bc138cba4b3a9db1da273f85a90612578a89a8943bad5fd2bfe5f36d233b6b26764a2fff0c261890cafe34243845d12f6e9ed952daeab86c2e3aa70a SHA512 85d9b0ab4896713d2e796fede5635fc4bb80e402b2a6a7404fa1b7ba52e139a0ef27876dae39081c58a5ea8a5a78749b7fcc13c038b85c90c4286721931cb63c
diff --git a/app-admin/dxf/dxf-7.1.1.ebuild b/app-admin/dxf/dxf-7.1.1.ebuild
new file mode 100644
index 000000000000..f6e0099fdfe3
--- /dev/null
+++ b/app-admin/dxf/dxf-7.1.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Docker registry v2 client in Python"
+HOMEPAGE="https://github.com/davedoesdev/dxf"
+SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
+	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+# Require dockerd running
+
+python_test() {
+	emake test
+}
diff --git a/app-admin/dxf/dxf-7.2.0.ebuild b/app-admin/dxf/dxf-7.2.0.ebuild
new file mode 100644
index 000000000000..f6e0099fdfe3
--- /dev/null
+++ b/app-admin/dxf/dxf-7.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Docker registry v2 client in Python"
+HOMEPAGE="https://github.com/davedoesdev/dxf"
+SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
+	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+# Require dockerd running
+
+python_test() {
+	emake test
+}
diff --git a/app-admin/dxf/dxf-7.3.0.ebuild b/app-admin/dxf/dxf-7.3.0.ebuild
new file mode 100644
index 000000000000..f6e0099fdfe3
--- /dev/null
+++ b/app-admin/dxf/dxf-7.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Docker registry v2 client in Python"
+HOMEPAGE="https://github.com/davedoesdev/dxf"
+SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
+	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+# Require dockerd running
+
+python_test() {
+	emake test
+}
diff --git a/app-admin/dxf/metadata.xml b/app-admin/dxf/metadata.xml
new file mode 100644
index 000000000000..3dbf29ff0e73
--- /dev/null
+++ b/app-admin/dxf/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-dxf</remote-id>
+		<remote-id type="github">davedoesdev/dxf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/ec2-ami-tools-1.5.7 b/app-admin/ec2-ami-tools-1.5.7
deleted file mode 100644
index e9bba41f5eed..000000000000
--- a/app-admin/ec2-ami-tools-1.5.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=Command-line tools that serve as client interface to the Amazon EC2 web service
-EAPI=6
-HOMEPAGE=http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88
-KEYWORDS=~amd64 ~x86
-LICENSE=Amazon || ( Ruby GPL-2 )
-RDEPEND=|| ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems virtual/ruby-ssl net-misc/rsync net-misc/curl
-SLOT=0
-SRC_URI=http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools-1.5.7.zip
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=702057d13f2574567374494b5077069e
diff --git a/app-admin/ec2-ami-tools/Manifest b/app-admin/ec2-ami-tools/Manifest
new file mode 100644
index 000000000000..04b05e13336b
--- /dev/null
+++ b/app-admin/ec2-ami-tools/Manifest
@@ -0,0 +1,3 @@
+DIST ec2-ami-tools-1.5.7.zip 156611 BLAKE2B f3e4c05a1f25e1d47a6981981b92db551953028f0621e3f175e3ab5db8823d72f56d2145376c52dc6d134ec2a167c14d64997e969785991589f9c97b93277f78 SHA512 2754ded47cbe842f58e12207c4bb7f81c8cd366dc506cbadfa9bda74d91fd5f8e1cafbb117612b14833368ff5943c4943a072d1679f23f591c15f2f49b61b4c2
+EBUILD ec2-ami-tools-1.5.7.ebuild 1185 BLAKE2B f059d766b02cbfd94a8cb3aa02d32a5c214a89a23a15fd8d7443a874c70071d1f3f33251db415b10942d6f7c9e68d02a7f063bd972934cffe4b322abaf4d8319 SHA512 262a8bf922813cdbbcbbf22ba7456ef9e9f3829c73ebd36b2de481014280414612abf00ceb03485ac80d944559426b5c2d2350ab32a59c9856c599f3ea55564f
+MISC metadata.xml 299 BLAKE2B 3fb7a374afb6ce5b06c3272f2cb25ef4f05614ed59835b4d28b8e9f97a8027a349779215c26c6bccc1d26ef0413d9b662eddb9ba1e0b7dc6085818994fa72ac6 SHA512 32d0280896d9452574a1ca6ef923aee59cf559e2b9023a4b6986c735bc327df57eb2c73183f5cb660a991e2f41268f0477b24a7e68a81d283fd68c1d2a6ff6a8
diff --git a/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild b/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild
new file mode 100644
index 000000000000..5e2638f231a1
--- /dev/null
+++ b/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit ruby-single versionator
+
+DESCRIPTION="Command-line tools that serve as client interface to the Amazon EC2 web service"
+HOMEPAGE="http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88"
+SRC_URI="http://s3.amazonaws.com/ec2-downloads/${P}.zip"
+
+LICENSE="Amazon
+	|| ( Ruby GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	${RUBY_DEPS}
+	virtual/ruby-ssl
+	net-misc/rsync
+	net-misc/curl"
+
+src_prepare() {
+	# Remove a left behind license file.
+	rm -f lib/ec2/oem/LICENSE.txt || die 'Removal of LICENSE failed.'
+
+	eapply_user
+}
+
+src_install() {
+	dobin bin/*
+
+	insinto /usr
+	doins -r lib
+
+	insinto /etc/ec2/amitools
+	doins etc/ec2/amitools/*
+
+	dodir /etc/env.d
+	echo "EC2_AMITOOL_HOME=/usr" >> "${T}"/99${PN} || die "Can't write environment variable."
+	doenvd "${T}"/99${PN}
+}
+
+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)."
+}
diff --git a/app-admin/ec2-ami-tools/metadata.xml b/app-admin/ec2-ami-tools/metadata.xml
new file mode 100644
index 000000000000..73ba6fbc9254
--- /dev/null
+++ b/app-admin/ec2-ami-tools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription>
+    These command-line tools serve as the client interface to the Amazon EC2 web service.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-admin/eclean-kernel-0.4.2 b/app-admin/eclean-kernel-0.4.2
deleted file mode 100644
index 0a3091474ef3..000000000000
--- a/app-admin/eclean-kernel-0.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Remove outdated built kernels
-EAPI=5
-HOMEPAGE=https://github.com/mgorny/eclean-kernel/
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=kernel_linux? ( dev-python/pymountboot[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/eclean-kernel/releases/download/eclean-kernel-0.4.2/eclean-kernel-0.4.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=39b44f2e6723fd6fa40446294d8a216d
diff --git a/app-admin/eclean-kernel-1.99.4 b/app-admin/eclean-kernel-1.99.4
deleted file mode 100644
index 0cfb60ffd890..000000000000
--- a/app-admin/eclean-kernel-1.99.4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Clean up old and stale kernel files
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/eclean-kernel2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/mgorny/eclean-kernel2/releases/download/v1.99.4/eclean-kernel-1.99.4.tar.bz2
-_md5_=af4d5c3f48995e7f93c12e99104ca747
diff --git a/app-admin/eclean-kernel-9999 b/app-admin/eclean-kernel-9999
deleted file mode 100644
index 186fa5d3f67c..000000000000
--- a/app-admin/eclean-kernel-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Clean up old and stale kernel files
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/eclean-kernel2
-LICENSE=BSD
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=927afb1fdfe8427898776060b12c6402
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
new file mode 100644
index 000000000000..b881e8238045
--- /dev/null
+++ b/app-admin/eclean-kernel/Manifest
@@ -0,0 +1,6 @@
+DIST eclean-kernel-0.4.2.tar.bz2 9666 BLAKE2B 5c3dea084a39a0b84d4d99b43c397b6bd910700e6f9939c4618e7bf697d1984be1a4627e9cc8036ec296c0e1c24c0fb2b7232c6c5fbc11bf2c72a96891acb615 SHA512 6a69cfd54ee72a13a3a1a6ca460d73377170ef7731d3598b7cb1fc6263c95cd64dfbe0f260d1a8739d7c032e431523493a1fc8032bd92d1a537e672eb7436dec
+DIST eclean-kernel-1.99.4.tar.bz2 78909 BLAKE2B 0cac3a001c3180c57bdf9a63366d9950928690328fd560f984c1d35bcf88712e897462a153bc3f0250ebbbb42518798e3407c3533351543ff32bd68ecee2ee5e SHA512 f3263b83b36878104e21fe122eb96a16c5c5a930b062fdd62d6a574db597644222d5a19d7833cbb894a955076b06bcb1a22c94d5f87c2787420dd1de32d0f789
+EBUILD eclean-kernel-0.4.2.ebuild 484 BLAKE2B ab77f514ef70df8880aaaffe878a5133f9a4aea61fca095144b039d5fee27d61d3de1d0d61d81c2d55b1ac597cc5320dd75da9a9170b84e901bb6764776e67ad SHA512 c08956426b48fee7e5332d73384e7f89c9df2c3d705b0d770249e4de73342f7b6d3cde3837d87ea28eab2645fb506ecd6208fadb56777ab38379604e339efbd2
+EBUILD eclean-kernel-1.99.4.ebuild 362 BLAKE2B 20894519cc3270ab4880c0373894638d18ecfeb34fa49a7f801e4889d22f78702c87201c3cba929092b38149f3b14109b058f95f597eea8c1507011af37b14d8 SHA512 61b64ce5d1f0e842de988f1d62bb41af6e16ef73a05ab35b90d97410292c5409c3873fac6dbd9a09e4be033cd19e70a283cfd6be48183409822c29ef26abdc85
+EBUILD eclean-kernel-9999.ebuild 401 BLAKE2B 075d11ebda0764b47d16b0bf36174af6554ea42b1a62450890b7051f33a9fcc2691a6da8a1e73161e38879af2eedefb6b5bd7aceb01c5ed92050f505e805c75c SHA512 efef86fdb8d6d8f65f6be0693967449d6fb36bb45e9346de2ea60ef9ca0178bb61303b2415a0a589482ff0dfdd020812206dc0fdefb6ac97a6c2e6de880a3843
+MISC metadata.xml 539 BLAKE2B 23dbdae146e666b8698181642673dc708027ddac7c33a9f53edc9cbf1d1e1ce62e8d4531a6962098bdd6cd2029369b587823b2f9630e285b43c0db340b29e70f SHA512 2a74b715ba28178d042f907014b02fd181e0e481f4eb9230b15ef542be61b2e1fce17efba4819b6d06de09ed7988b39047b59182b6c4de86a2a05ad0350635dd
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild
new file mode 100644
index 000000000000..499b37919ec2
--- /dev/null
+++ b/app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Remove outdated built kernels"
+HOMEPAGE="https://github.com/mgorny/eclean-kernel/"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
diff --git a/app-admin/eclean-kernel/eclean-kernel-1.99.4.ebuild b/app-admin/eclean-kernel/eclean-kernel-1.99.4.ebuild
new file mode 100644
index 000000000000..ae41700c874d
--- /dev/null
+++ b/app-admin/eclean-kernel/eclean-kernel-1.99.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Clean up old and stale kernel files"
+HOMEPAGE="https://github.com/mgorny/eclean-kernel2"
+SRC_URI="https://github.com/mgorny/eclean-kernel2/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
new file mode 100644
index 000000000000..164b0f493958
--- /dev/null
+++ b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/mgorny/eclean-kernel2.git"
+inherit autotools git-r3
+
+DESCRIPTION="Clean up old and stale kernel files"
+HOMEPAGE="https://github.com/mgorny/eclean-kernel2"
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-admin/eclean-kernel/metadata.xml b/app-admin/eclean-kernel/metadata.xml
new file mode 100644
index 000000000000..06f88822457d
--- /dev/null
+++ b/app-admin/eclean-kernel/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>mgorny@gentoo.org</email>
+      <name>Michał Górny</name>
+    </maintainer>
+    <bugs-to>https://github.com/mgorny/eclean-kernel2/issues/</bugs-to>
+    <remote-id type="github">mgorny/eclean-kernel2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/elektra-0.8.16 b/app-admin/elektra-0.8.16
deleted file mode 100644
index 7e1e9183056f..000000000000
--- a/app-admin/elektra-0.8.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] augeas? ( app-admin/augeas ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8.0 ) qt5? ( dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 ) uname? ( sys-apps/coreutils ) systemd? ( sys-apps/systemd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) yajl? ( >=dev-libs/yajl-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen ) test? ( >=dev-cpp/gtest-1.7.0 ) sys-devel/make >=dev-util/cmake-3.9.6 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Framework to store config parameters in hierarchical key-value pairs
-EAPI=6
-HOMEPAGE=https://freedesktop.org/wiki/Software/Elektra
-IUSE=dbus doc qt5 static-libs test augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] augeas? ( app-admin/augeas ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8.0 ) qt5? ( dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 ) uname? ( sys-apps/coreutils ) systemd? ( sys-apps/systemd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) yajl? ( >=dev-libs/yajl-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-RESTRICT=test
-SLOT=0/0.8.16
-SRC_URI=ftp://ftp.markus-raab.org/elektra/releases/elektra-0.8.16.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cf469409a8f579d8804f55da7e6330d2
diff --git a/app-admin/elektra-0.8.20 b/app-admin/elektra-0.8.20
deleted file mode 100644
index c2b4e0a8133a..000000000000
--- a/app-admin/elektra-0.8.20
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] augeas? ( app-admin/augeas ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8.0 ) qt5? ( dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 ) uname? ( sys-apps/coreutils ) systemd? ( sys-apps/systemd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) yajl? ( >=dev-libs/yajl-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen ) test? ( >=dev-cpp/gtest-1.7.0 ) sys-devel/make >=dev-util/cmake-3.9.6 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Framework to store config parameters in hierarchical key-value pairs
-EAPI=6
-HOMEPAGE=https://www.libelektra.org
-IUSE=dbus doc qt5 static-libs test augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] augeas? ( app-admin/augeas ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8.0 ) qt5? ( dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 ) uname? ( sys-apps/coreutils ) systemd? ( sys-apps/systemd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) yajl? ( >=dev-libs/yajl-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-RESTRICT=test
-SLOT=0/0.8.20
-SRC_URI=https://www.libelektra.org/ftp/elektra/releases/elektra-0.8.20.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f3d8b00a3f8859cb52c4be963b9cefc
diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
new file mode 100644
index 000000000000..b71f58559d39
--- /dev/null
+++ b/app-admin/elektra/Manifest
@@ -0,0 +1,7 @@
+AUX elektra-0.8.15-conditional-glob-tests.patch 415 BLAKE2B 5f0d1b8cbdd88e032bad09064a17caae9ade647f747718cd1ff936c95a107c9323ff66b9c24fd4edb42655c9a180d967d3a8e70ca8e3ea40e85f431877f5c7f3 SHA512 e57b317716979a5cb94e11094db8eeaac2941640262eec011329d1f6b1cda27c19999099e0b9a5bc9a7131de730a7065ac9256d965bf8d553afbadb94172a27c
+AUX elektra-0.8.15-gcc-5.4.0.patch 639 BLAKE2B 35664032dbbea5926c8886313d87893a00b46304d8b3d69f4d88fc503a3105b32e94696126a0786a761414debfad5bc6cf3fc8734331a8b8c00fc50a8cd25a3b SHA512 8b6eeec8f46fc92db86e19f1401a49fa129c5658a7c63e1307e990be69b873d2c1099fce0bca8224ea20ae4ff30b71c4dd6b69dc5bc9fd12ec45add6d2e76960
+DIST elektra-0.8.16.tar.gz 2405443 BLAKE2B 221f254b240f4f38fb0975749003f8b4c9fbfbd28df2b42b99c8e1fa7795cb4a1565b77cc424b6180abd481326ccab4c8f554749150e36f0ab01146aa72575f8 SHA512 b225e61379907365a423ea75ec7138e5257bb78c526bb05a1ec21f66a52eb4bad9e6f1eb23209d700670b21b86166497b47c3bc46bc9d45f6d366cd544afc326
+DIST elektra-0.8.20.tar.gz 4740032 BLAKE2B e76ad93eadbbec9bb273da4f7bab5622d47deebdab6736c430543159c0754f3b96696954891962b60716d5b969e64bf5ef6886a6239abee8b98888aae09fcdd9 SHA512 11cc88329f84ad4d6337132d76479d26f2d9c12f7a939558a79ea96540129096ea0a26ffda3705c01a2c7c749453588bb1654a4c07cca3374e4076ce768c5848
+EBUILD elektra-0.8.16.ebuild 3622 BLAKE2B 2965fca55d877a08a22b1e9ddbbd766b28e23c8a7c44080f4230ddc5f9e68ee08dd82f16e125a94c710e9ba81bf634867a5e1daea9365b476dc734ff49787ad1 SHA512 f27a11d7298d202200356989cb22c8168ef54f67eee0a166e80453da6415392c290880f5001b159212c4d685ce9f59b3edcc095ef0fb265f0cd331276c9736bf
+EBUILD elektra-0.8.20.ebuild 3484 BLAKE2B dc46c7ae8750b51d5723dd6532291cb9cf8e35bdb2febc6370b87c96a1bcbadfcbeccd11e60629a472a643155fa37f09b21a92892ad94342d92a84b5165643a9 SHA512 eb3bb23a08f2cfa6b7cf3072df6384a2b6551c663651a5a9ba84414c7d8c09deff271f3ac7420cebc9882f2a151b997abdc05c1814cc8881f8754db6cdb7743b
+MISC metadata.xml 604 BLAKE2B 21568cf18684b7339416099a2d406729e65519a4dbcc1ba72696c04328274246929d90bf8133d1e683d23c58c7fabf8ed03735dcfd9ef1478d91e5487db703a3 SHA512 5bc058ef5858f1a2916c9fffa87fbd11b4e7017498db402dd0e782d098ef7f71f098184d9aa936023cfde538ce4c2fe93402b2d5f7ba12c7ea52700d3301ffe3
diff --git a/app-admin/elektra/elektra-0.8.16.ebuild b/app-admin/elektra/elektra-0.8.16.ebuild
new file mode 100644
index 000000000000..a87cd518643c
--- /dev/null
+++ b/app-admin/elektra/elektra-0.8.16.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib eutils java-pkg-opt-2
+
+DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
+HOMEPAGE="https://freedesktop.org/wiki/Software/Elektra"
+SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl";
+IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
+
+RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+	augeas? ( app-admin/augeas )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jdk-1.8.0 )
+	qt5? (
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+	)
+	uname? ( sys-apps/coreutils )
+	systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
+	yajl? ( >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-cpp/gtest-1.7.0 )"
+
+DOCS=( README.md doc/AUTHORS doc/CODING.md doc/NEWS.md doc/todo/TODO )
+# tries to write to user's home directory (and doesn't respect HOME)
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-0.8.15-conditional-glob-tests.patch
+	"${FILESDIR}/${PN}"-0.8.15-gcc-5.4.0.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	einfo remove bundled libs
+	# TODO: Remove bundled inih from src/plugins/ini (add to portage):
+	# https://code.google.com/p/inih/
+	rm -rf src/external || die
+
+	# move doc files to correct location
+	sed -e "s/elektra-api/${PF}/" \
+		-i cmake/ElektraCache.cmake || die
+
+	# avoid useless build time, nothing ends up installed
+	cmake_comment_add_subdirectory benchmarks
+	cmake_comment_add_subdirectory examples
+}
+
+multilib_src_configure() {
+	local my_plugins="ALL"
+
+	if multilib_is_native_abi ; then
+		use augeas || my_plugins+=";-augeas"
+		use java || my_plugins+=";-jni"
+	else
+		my_plugins+=";-augeas;-jni"
+	fi
+
+	use dbus      || my_plugins+=";-dbus"
+	use iconv     || my_plugins+=";-iconv"
+	use ini       || my_plugins+=";-ini"		# bundles inih
+	use simpleini || my_plugins+=";-simpleini"
+	use syslog    || my_plugins+=";-syslog"
+	use systemd   || my_plugins+=";-journald"
+	use tcl       || my_plugins+=";-tcl"
+	use uname     || my_plugins+=";-uname"
+	use xml       || my_plugins+=";-xmltool"
+	use yajl      || my_plugins+=";-yajl"
+
+	# Disabling for good (?):
+	# counter - Only useful for debugging the plugin framework
+	# doc - Explaining basic makeup of a function //bug #514402
+	# noresolver - Does not resolve, but can act as one
+	# template - Template for new plugin written in C
+	# wresolver - Resolver for non-POSIX, e.g. w32/w64 systems
+	my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver"
+
+	local my_tools
+
+	if multilib_is_native_abi ; then
+		my_tools="kdb"
+		use qt5 && my_tools+=";qt-gui"
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_PDF=OFF
+		-DBUILD_SHARED=ON
+		-DBUILD_STATIC=$(usex static-libs)
+		-DBUILD_TESTING=$(usex test)
+		-DENABLE_TESTING=$(usex test)
+		-DPLUGINS=${my_plugins}
+		-DTOOLS=${my_tools}
+		-DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no)
+		-DTARGET_CMAKE_FOLDER=share/cmake/Modules
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	einfo remove test_data
+	rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data"
+	einfo remove tool_exec
+	rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
+}
diff --git a/app-admin/elektra/elektra-0.8.20.ebuild b/app-admin/elektra/elektra-0.8.20.ebuild
new file mode 100644
index 000000000000..43f955bb844b
--- /dev/null
+++ b/app-admin/elektra/elektra-0.8.20.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib eutils java-pkg-opt-2
+
+DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
+HOMEPAGE="https://www.libelektra.org"
+SRC_URI="https://www.libelektra.org/ftp/elektra/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl";
+IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
+
+RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+	augeas? ( app-admin/augeas )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jdk-1.8.0 )
+	qt5? (
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+	)
+	uname? ( sys-apps/coreutils )
+	systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
+	yajl? ( >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-cpp/gtest-1.7.0 )"
+
+DOCS=( README.md doc/AUTHORS doc/CODING.md doc/todo/TODO )
+# tries to write to user's home directory (and doesn't respect HOME)
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	einfo remove bundled libs
+	# TODO: Remove bundled inih from src/plugins/ini (add to portage):
+	# https://code.google.com/p/inih/
+	rm -rf src/external || die
+
+	# move doc files to correct location
+	sed -e "s/elektra-api/${PF}/" \
+		-i cmake/ElektraCache.cmake || die
+
+	# avoid useless build time, nothing ends up installed
+	cmake_comment_add_subdirectory benchmarks
+	cmake_comment_add_subdirectory examples
+}
+
+multilib_src_configure() {
+	local my_plugins="ALL"
+
+	if multilib_is_native_abi ; then
+		use augeas || my_plugins+=";-augeas"
+		use java || my_plugins+=";-jni"
+	else
+		my_plugins+=";-augeas;-jni"
+	fi
+
+	use dbus      || my_plugins+=";-dbus"
+	use iconv     || my_plugins+=";-iconv"
+	use ini       || my_plugins+=";-ini"		# bundles inih
+	use simpleini || my_plugins+=";-simpleini"
+	use syslog    || my_plugins+=";-syslog"
+	use systemd   || my_plugins+=";-journald"
+	use tcl       || my_plugins+=";-tcl"
+	use uname     || my_plugins+=";-uname"
+	use xml       || my_plugins+=";-xmltool"
+	use yajl      || my_plugins+=";-yajl"
+
+	# Disabling for good (?):
+	# counter - Only useful for debugging the plugin framework
+	# doc - Explaining basic makeup of a function //bug #514402
+	# noresolver - Does not resolve, but can act as one
+	# template - Template for new plugin written in C
+	# wresolver - Resolver for non-POSIX, e.g. w32/w64 systems
+	my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver"
+
+	local my_tools
+
+	if multilib_is_native_abi ; then
+		my_tools="kdb"
+		use qt5 && my_tools+=";qt-gui"
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_PDF=OFF
+		-DBUILD_SHARED=ON
+		-DBUILD_STATIC=$(usex static-libs)
+		-DBUILD_TESTING=$(usex test)
+		-DENABLE_TESTING=$(usex test)
+		-DPLUGINS=${my_plugins}
+		-DTOOLS=${my_tools}
+		-DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no)
+		-DTARGET_CMAKE_FOLDER=share/cmake/Modules
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	einfo remove test_data
+	rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data"
+	einfo remove tool_exec
+	rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
+}
diff --git a/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch b/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch
new file mode 100644
index 000000000000..413515e05605
--- /dev/null
+++ b/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch
@@ -0,0 +1,15 @@
+--- elektra-0.8.15/src/libs/tools/tests/CMakeLists.txt
++++ elektra-0.8.15/src/libs/tools/tests/CMakeLists.txt
+@@ -4,6 +4,7 @@
+ add_cppheaders (HDR_FILES)
+ add_toolheaders (HDR_FILES)
+ 
++if (ENABLE_TESTING)
+ include (LibAddTest)
+ 
+ file (GLOB TESTS testtool_*.cpp)
+@@ -11,3 +12,4 @@
+ 	get_filename_component (name ${file} NAME_WE)
+ 	add_gtest (${name} LINK_TOOLS)
+ endforeach (file ${TESTS})
++endif (ENABLE_TESTING)
diff --git a/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch b/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch
new file mode 100644
index 000000000000..9bab2a61c9f5
--- /dev/null
+++ b/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch
@@ -0,0 +1,20 @@
+commit 05c925972224afd3fa28f34b9a762364a38f6850
+Author: Markus Raab <elektra@markus-raab.org>
+Date:   Tue May 3 14:25:54 2016 +0200
+
+    add vector kdbtimer
+    
+    fix http://build.libelektra.org:8080/job/elektra-gcc-configure-debian/lastFailedBuild/console
+
+diff --git a/src/bindings/cpp/include/kdbtimer.hpp b/src/bindings/cpp/include/kdbtimer.hpp
+index ae4c242..b7f731e 100644
+--- a/src/bindings/cpp/include/kdbtimer.hpp
++++ b/src/bindings/cpp/include/kdbtimer.hpp
+@@ -13,6 +13,7 @@
+ #include <sstream>
+ #include <string>
+ #include <sys/time.h>
++#include <vector>
+ 
+ #ifdef __GNUC__
+ #define TIMER_NOINLINE __attribute__ ((noinline))
diff --git a/app-admin/elektra/metadata.xml b/app-admin/elektra/metadata.xml
new file mode 100644
index 000000000000..0cc6943fa1fb
--- /dev/null
+++ b/app-admin/elektra/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<use>
+		<flag name="augeas">Enable plugin for reading and writing configuration files with help from Augeas</flag>
+		<flag name="ini">Enable new, advanced ini support</flag>
+		<flag name="simpleini">Enable simpleini support</flag>
+		<flag name="uname">Enable uname information for the key database</flag>
+		<flag name="yajl">Enable yajl support</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/emacs-updater-1.15 b/app-admin/emacs-updater-1.15
deleted file mode 100644
index 90a737953df0..000000000000
--- a/app-admin/emacs-updater-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=|| ( sys-apps/util-linux app-misc/getopt )
-DESCRIPTION=Rebuild Emacs packages
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=|| ( sys-apps/util-linux app-misc/getopt ) >=app-portage/portage-utils-0.3 virtual/emacs
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-updater-1.15.tar.xz
-_md5_=150bf667952ae30219736b89b1d91203
diff --git a/app-admin/emacs-updater/Manifest b/app-admin/emacs-updater/Manifest
new file mode 100644
index 000000000000..15a4aef100ea
--- /dev/null
+++ b/app-admin/emacs-updater/Manifest
@@ -0,0 +1,3 @@
+DIST emacs-updater-1.15.tar.xz 7020 BLAKE2B bb35103b328a57dcaeb11c258bddbd3a08141d1e245ac4943c7a5a8b815440db0cd06eaac01ad2a00e6e2aa0d23311d774d190fd761be66514856077b3c4e296 SHA512 8cc7dd3e0e28ae71030c7c5f29d54f24e12adcbd0615f3c598ad262bd233f028c2424c277aac7dff7b4201a2ac24bfab0e05d1fdc07edcee2c184a733f699b8a
+EBUILD emacs-updater-1.15.ebuild 969 BLAKE2B 9b77db09396e09d9c80f7f49a46bae2e202b0cfd1b43ff96f7cb762c6255565967265c6cafc24d5d6859195c77a6047eea70a5d437985fb5333a811f176148c9 SHA512 30e75f83c944a730a58ad8dbc36f640fe1e87d378db2ba4465678737f77e8f29156eb50b0ac6b07ba084f0b13d5ff216fb90d0db8a28301b81c4fdaaa03bf684
+MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-admin/emacs-updater/emacs-updater-1.15.ebuild b/app-admin/emacs-updater/emacs-updater-1.15.ebuild
new file mode 100644
index 000000000000..5f285a56dcac
--- /dev/null
+++ b/app-admin/emacs-updater/emacs-updater-1.15.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Rebuild Emacs packages"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
+RDEPEND="${DEPEND}
+	>=app-portage/portage-utils-0.3
+	virtual/emacs"
+
+src_prepare() {
+	default
+
+	if ! has_version sys-apps/util-linux; then
+		# BSD ships a dumb getopt(1), so use getopt-long instead
+		sed -i -e '/^GETOPT=/s/getopt/&-long/' emacs-updater || die
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		sed -i -e "1s:/:${EPREFIX%/}/:" \
+			-e "s:^\([[:upper:]]*=\)/:\1${EPREFIX%/}/:" \
+			emacs-updater || die
+	fi
+}
+
+src_install() {
+	dosbin emacs-updater
+	doman emacs-updater.8
+}
diff --git a/app-admin/emacs-updater/metadata.xml b/app-admin/emacs-updater/metadata.xml
new file mode 100644
index 000000000000..c438baf3b326
--- /dev/null
+++ b/app-admin/emacs-updater/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/entr-4.0 b/app-admin/entr-4.0
deleted file mode 100644
index 0b0278571c0f..000000000000
--- a/app-admin/entr-4.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure test unpack
-DESCRIPTION=Run arbitrary commands when files change
-EAPI=6
-HOMEPAGE=http://entrproject.org
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=ISC
-SLOT=0
-SRC_URI=http://entrproject.org/code/entr-4.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=9e85ef5aefa662a0bbf7fab013ad350b
diff --git a/app-admin/entr-4.1 b/app-admin/entr-4.1
deleted file mode 100644
index a5edfcf2ab6e..000000000000
--- a/app-admin/entr-4.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure test unpack
-DESCRIPTION=Run arbitrary commands when files change
-EAPI=6
-HOMEPAGE=http://entrproject.org
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=ISC
-SLOT=0
-SRC_URI=http://entrproject.org/code/entr-4.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=9e85ef5aefa662a0bbf7fab013ad350b
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
new file mode 100644
index 000000000000..12844604fc8e
--- /dev/null
+++ b/app-admin/entr/Manifest
@@ -0,0 +1,5 @@
+DIST entr-4.0.tar.gz 24758 BLAKE2B 6d57cb93d55bb362b8e771745c9333a5a5eaa156f36a7c9e7318d94f0056fc98b2071bcea7fd33b68ac1dc1d5332fc849e0ea89bc2582196acd51e1490fce96e SHA512 d803c27441448374a866636e0e592a8395488e162e2e8c031aafec3457d10041dc52e10d06cc1e209cd86f69ca021171ef105056206b9afe603a89958eef2707
+DIST entr-4.1.tar.gz 25265 BLAKE2B e90a50e7ac0917441db872fcc3b228bd2d16a77a7178810d004cb23510644843dbee1b9b47aedbe7b6b696501f994201f4eab404c6de950013c0b81b042382b0 SHA512 0a80aa9caa97f2603e43957b716bf5b5746cea8bfb2f2cc884aab8c97a34341d6223035fbb5d4bf86234ea1c9314c077cec9d59ba442a2730fcbd7151425a459
+EBUILD entr-4.0.ebuild 579 BLAKE2B caff26e939080b9fc895617b9ca76c3141a9bb2965a1fae7d8fd79e8b8d3075cb82cc635bc503a67c6438414b0f37a67ea9aec2dbd2564890c6069d244890e73 SHA512 806acd46a7f3d3c285d3f063a2e3a9b247a54dcb50020ebcc6a4fc1e3bbf1fb6f46987f0e6d0a6071d44613ab47a953a0ae21bc8cdaf024c05d456e34bbdc9be
+EBUILD entr-4.1.ebuild 579 BLAKE2B caff26e939080b9fc895617b9ca76c3141a9bb2965a1fae7d8fd79e8b8d3075cb82cc635bc503a67c6438414b0f37a67ea9aec2dbd2564890c6069d244890e73 SHA512 806acd46a7f3d3c285d3f063a2e3a9b247a54dcb50020ebcc6a4fc1e3bbf1fb6f46987f0e6d0a6071d44613ab47a953a0ae21bc8cdaf024c05d456e34bbdc9be
+MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-admin/entr/entr-4.0.ebuild b/app-admin/entr/entr-4.0.ebuild
new file mode 100644
index 000000000000..829cf311603a
--- /dev/null
+++ b/app-admin/entr/entr-4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs vcs-snapshot
+
+DESCRIPTION="Run arbitrary commands when files change"
+HOMEPAGE="http://entrproject.org"
+SRC_URI="http://entrproject.org/code/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="test"
+
+src_configure() {
+	sh configure || die
+	sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
+}
+
+src_compile() {
+	export CC=$(tc-getCC)
+	default
+}
+
+src_test() {
+	export CC=$(tc-getCC)
+	default
+}
diff --git a/app-admin/entr/entr-4.1.ebuild b/app-admin/entr/entr-4.1.ebuild
new file mode 100644
index 000000000000..829cf311603a
--- /dev/null
+++ b/app-admin/entr/entr-4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs vcs-snapshot
+
+DESCRIPTION="Run arbitrary commands when files change"
+HOMEPAGE="http://entrproject.org"
+SRC_URI="http://entrproject.org/code/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="test"
+
+src_configure() {
+	sh configure || die
+	sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
+}
+
+src_compile() {
+	export CC=$(tc-getCC)
+	default
+}
+
+src_test() {
+	export CC=$(tc-getCC)
+	default
+}
diff --git a/app-admin/entr/metadata.xml b/app-admin/entr/metadata.xml
new file mode 100644
index 000000000000..94248608af4d
--- /dev/null
+++ b/app-admin/entr/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/equo-302 b/app-admin/equo-302
deleted file mode 100644
index e1db1c9640d6..000000000000
--- a/app-admin/equo-302
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ~sys-apps/entropy-302[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/asciidoc
-DESCRIPTION=Entropy Package Manager text-based client
-EAPI=5
-HOMEPAGE=http://www.sabayon.org
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ~sys-apps/entropy-302[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-apps/file[python]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sabayon/sys-apps/entropy-302.tar.bz2
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=63e1f0a48cb2299cf510908acd9e1218
diff --git a/app-admin/equo/Manifest b/app-admin/equo/Manifest
new file mode 100644
index 000000000000..e1c884f95b91
--- /dev/null
+++ b/app-admin/equo/Manifest
@@ -0,0 +1,3 @@
+DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
+EBUILD equo-302.ebuild 937 BLAKE2B 3703b5d48d3744e05584c51e3ad961e436ebc0cd495d191645ddd898cfacfbb1038a6026f8e13af00072c1d3e3c223249af8adba1751c9f777b1f185024ce74b SHA512 4c9be7016d4a190812a8df5361ab3bea74a29b0a400275d7395c757867e6411c6915f723fca59a0ded43022407a61ec593487d9275f06b4b29d93c297902361b
+MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174
diff --git a/app-admin/equo/equo-302.ebuild b/app-admin/equo/equo-302.ebuild
new file mode 100644
index 000000000000..1c5924a18e98
--- /dev/null
+++ b/app-admin/equo/equo-302.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 bash-completion-r1
+
+DESCRIPTION="Entropy Package Manager text-based client"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+
+S="${WORKDIR}/entropy-${PV}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	~sys-apps/entropy-${PV}[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/file[python]"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_compile() {
+	cd "${S}"/client || die
+	emake || die "make failed"
+}
+
+src_install() {
+	cd "${S}"/client || die
+	emake DESTDIR="${D}" LIBDIR="usr/lib" install || die "make install failed"
+	newbashcomp "${S}/misc/equo-completion.bash" equo
+
+	python_optimize "${D}/usr/lib/entropy/client"
+}
diff --git a/app-admin/equo/metadata.xml b/app-admin/equo/metadata.xml
new file mode 100644
index 000000000000..d396d1b7e5a1
--- /dev/null
+++ b/app-admin/equo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mudler@gentoo.org</email>
+		<name>Ettore Di Giacinto</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/eselect-1.4.12 b/app-admin/eselect-1.4.12
deleted file mode 100644
index e6b49fdb224a..000000000000
--- a/app-admin/eselect-1.4.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) doc? ( dev-python/docutils )
-DESCRIPTION=Gentoo's multi-purpose configuration and management tool
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
-IUSE=doc emacs vim-syntax
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )
-PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
-RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.12.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9a8066df3759a2a22a8c502f295b4362
diff --git a/app-admin/eselect-1.4.13 b/app-admin/eselect-1.4.13
deleted file mode 100644
index 2e98f257c0ab..000000000000
--- a/app-admin/eselect-1.4.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) doc? ( dev-python/docutils )
-DESCRIPTION=Gentoo's multi-purpose configuration and management tool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
-IUSE=doc emacs vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )
-PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
-RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.13.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6c2990339b708051a3e331606bd12505
diff --git a/app-admin/eselect-9999 b/app-admin/eselect-9999
deleted file mode 100644
index 1029ba7907d3..000000000000
--- a/app-admin/eselect-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) doc? ( dev-python/docutils ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Gentoo's multi-purpose configuration and management tool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
-IUSE=doc emacs vim-syntax
-LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )
-PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
-RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d0045d887062e24987facb401077b959
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
new file mode 100644
index 000000000000..747a7a5d8020
--- /dev/null
+++ b/app-admin/eselect/Manifest
@@ -0,0 +1,6 @@
+DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
+DIST eselect-1.4.13.tar.xz 177848 BLAKE2B 70e5a793759e16119f5233b2c974e0fcc8d213b2033e2b3b76e0a047797b1a0f2feb21ad3beda72f644b498725b4d8ff5c221dcd0870adf5197eaf81c6f3c895 SHA512 5ce10bd288268bc5b52031703f8ac8f3cf07bb22039339bb00c92583ed226162ea8865788f5c1ff4e058d38f0bf25e3557273fb1e839e0391c1fafb9f702bc11
+EBUILD eselect-1.4.12.ebuild 1634 BLAKE2B e28298f0caa8e8751385c546d23bebbcf6839481a43a3752c5b1e35e7d62822dbf961c58f8c81b5d7eab01cfbb0ddecf88697670c2c6003ab73906078270b3d9 SHA512 22e4238d5ed8f6229236bdcd3cb6186a1fe80bbf5b51a356392d382fbe83839a5287bf212603214dbd2f40e155dc647c3a4fd366676a707339b4550c0223d8a9
+EBUILD eselect-1.4.13.ebuild 1647 BLAKE2B 5ed07b5808598e811053753f39bbc731eafa73ef1583857e62435dc1c051b26d03d2c760465e6fee9e29fbe02d182f6c5f61076dc3e5a464cc2a233c9df9db92 SHA512 dc09764b78881edd5d15aaa18332385668a8ee52994e57727f24f8bda1bc0b927600fc06555e57a27f4ff977bd9ab22a79b09b4a978e20d7a89811ce44ddd18c
+EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
+MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.12.ebuild b/app-admin/eselect/eselect-1.4.12.ebuild
new file mode 100644
index 000000000000..cfe033136423
--- /dev/null
+++ b/app-admin/eselect/eselect-1.4.12.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
+
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs vim-syntax"
+
+RDEPEND="sys-apps/sed
+	|| (
+		sys-apps/coreutils
+		sys-freebsd/freebsd-bin
+		app-misc/realpath
+	)"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/docutils )"
+RDEPEND="${RDEPEND}
+	sys-apps/file
+	sys-libs/ncurses:0"
+
+PDEPEND="emacs? ( app-emacs/eselect-mode )
+	vim-syntax? ( app-vim/eselect-syntax )"
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newbashcomp misc/${PN}.bashcomp ${PN}
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
+	if use doc; then
+		docinto html
+		dodoc *.html doc/*.html doc/*.css
+	fi
+
+	# needed by news module
+	keepdir /var/lib/gentoo/news
+	if ! use prefix; then
+		fowners root:portage /var/lib/gentoo/news
+		fperms g+w /var/lib/gentoo/news
+	fi
+}
+
+pkg_postinst() {
+	# fowners in src_install doesn't work for the portage group:
+	# merging changes the group back to root
+	if ! use prefix; then
+		chgrp portage "${EROOT}/var/lib/gentoo/news" \
+			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
+	fi
+}
diff --git a/app-admin/eselect/eselect-1.4.13.ebuild b/app-admin/eselect/eselect-1.4.13.ebuild
new file mode 100644
index 000000000000..0e087c1df2a8
--- /dev/null
+++ b/app-admin/eselect/eselect-1.4.13.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
+
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs vim-syntax"
+
+RDEPEND="sys-apps/sed
+	|| (
+		sys-apps/coreutils
+		sys-freebsd/freebsd-bin
+		app-misc/realpath
+	)"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/docutils )"
+RDEPEND="${RDEPEND}
+	sys-apps/file
+	sys-libs/ncurses:0"
+
+PDEPEND="emacs? ( app-emacs/eselect-mode )
+	vim-syntax? ( app-vim/eselect-syntax )"
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newbashcomp misc/${PN}.bashcomp ${PN}
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
+	if use doc; then
+		docinto html
+		dodoc *.html doc/*.html doc/*.css
+	fi
+
+	# needed by news module
+	keepdir /var/lib/gentoo/news
+	if ! use prefix; then
+		fowners root:portage /var/lib/gentoo/news
+		fperms g+w /var/lib/gentoo/news
+	fi
+}
+
+pkg_postinst() {
+	# fowners in src_install doesn't work for the portage group:
+	# merging changes the group back to root
+	if ! use prefix; then
+		chgrp portage "${EROOT}/var/lib/gentoo/news" \
+			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
+	fi
+}
diff --git a/app-admin/eselect/eselect-9999.ebuild b/app-admin/eselect/eselect-9999.ebuild
new file mode 100644
index 000000000000..238cf0896ada
--- /dev/null
+++ b/app-admin/eselect/eselect-9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/eselect.git"
+
+inherit autotools git-r3 bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
+SLOT="0"
+IUSE="doc emacs vim-syntax"
+
+RDEPEND="sys-apps/sed
+	|| (
+		sys-apps/coreutils
+		sys-freebsd/freebsd-bin
+		app-misc/realpath
+	)"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/docutils )"
+RDEPEND="${RDEPEND}
+	sys-apps/file
+	sys-libs/ncurses:0"
+
+PDEPEND="emacs? ( app-emacs/eselect-mode )
+	vim-syntax? ( app-vim/eselect-syntax )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newbashcomp misc/${PN}.bashcomp ${PN}
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
+	if use doc; then
+		docinto html
+		dodoc *.html doc/*.html doc/*.css
+	fi
+
+	# needed by news module
+	keepdir /var/lib/gentoo/news
+	if ! use prefix; then
+		fowners root:portage /var/lib/gentoo/news
+		fperms g+w /var/lib/gentoo/news
+	fi
+}
+
+pkg_postinst() {
+	# fowners in src_install doesn't work for the portage group:
+	# merging changes the group back to root
+	if ! use prefix; then
+		chgrp portage "${EROOT}/var/lib/gentoo/news" \
+			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
+	fi
+}
diff --git a/app-admin/eselect/metadata.xml b/app-admin/eselect/metadata.xml
new file mode 100644
index 000000000000..1935b3149bde
--- /dev/null
+++ b/app-admin/eselect/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>eselect@gentoo.org</email>
+	<name>eselect configuration and management tool</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/evtxtools-1.1.1-r1 b/app-admin/evtxtools-1.1.1-r1
deleted file mode 100644
index dbd88ad22dca..000000000000
--- a/app-admin/evtxtools-1.1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=app-arch/unzip dev-perl/DateTime dev-perl/Digest-CRC dev-perl/DateTime dev-perl/Carp-Assert dev-perl/Data-Hexify dev-lang/perl[-build(-)] dev-lang/perl[-build(-)]
-DESCRIPTION=Read, decode and dump Windows Vista/2008/7 event log file
-EAPI=5
-HOMEPAGE=http://computer.forensikblog.de/en/topics/windows/vista_event_log
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip dev-perl/DateTime dev-perl/Digest-CRC dev-perl/DateTime dev-perl/Carp-Assert dev-perl/Data-Hexify dev-lang/perl[-build(-)] dev-lang/perl[-build(-)]
-SLOT=0
-SRC_URI=http://computer.forensikblog.de/files/evtx/Parse-Evtx-1.1.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	4b65c2afee485a204b0b22518141ae47	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93d287488ba27c72ede2758eb27efada
diff --git a/app-admin/evtxtools/Manifest b/app-admin/evtxtools/Manifest
new file mode 100644
index 000000000000..9fc4713d8fb7
--- /dev/null
+++ b/app-admin/evtxtools/Manifest
@@ -0,0 +1,3 @@
+DIST Parse-Evtx-1.1.1.zip 71351 BLAKE2B 27e28a75e5a4ccce437f86a5924790d602cb7091c422a5f39e5a1ee0e785762b2f77999c84dd7f4fc52dbd58a90e03a80ca9de916e4df12c464959c8c8a5bfc5 SHA512 308fc3da4e9291f5f84cfbb0a2a17f92d45a2314d6b1806acb59e1a2d521041487a51a6e88e70c03a683df5a9442a30d8dc2483cf684cb96bb86f0a05f27e752
+EBUILD evtxtools-1.1.1-r1.ebuild 779 BLAKE2B 361a04fde07fcdba78795671a634eb6e1f653ade17e04f3a11d72d732418506a71be44f8c8336f45e1d5f212c855587aaa47120ec26fef1bfddaa2d590907c06 SHA512 80bf828201683d733564491eb27e6771c8b40e0068470b83c97fb8fbfe042c9b2d32a0e5430ab44660302a655fb2f18dd22bed246b2fb941b072005171c1f4f3
+MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3
diff --git a/app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild b/app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..972e084d7673
--- /dev/null
+++ b/app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-app perl-module
+
+MY_PN="Parse-Evtx"
+DESCRIPTION="Read, decode and dump Windows Vista/2008/7 event log file "
+HOMEPAGE="http://computer.forensikblog.de/en/topics/windows/vista_event_log"
+SRC_URI="http://computer.forensikblog.de/files/evtx/${MY_PN}-${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-arch/unzip
+	dev-perl/DateTime
+	dev-perl/Digest-CRC
+	dev-perl/DateTime
+	dev-perl/Carp-Assert
+	dev-perl/Data-Hexify"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_postinst() {
+	einfo "Consider the following as how-to:"
+	einfo "http://rwmj.wordpress.com/2011/04/17/decoding-the-windows-event-log-using-guestfish/"
+}
diff --git a/app-admin/evtxtools/metadata.xml b/app-admin/evtxtools/metadata.xml
new file mode 100644
index 000000000000..6698a4ab7883
--- /dev/null
+++ b/app-admin/evtxtools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/fam-2.7.0-r7 b/app-admin/fam-2.7.0-r7
deleted file mode 100644
index 0438f8c9ff65..000000000000
--- a/app-admin/fam-2.7.0-r7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 ) !app-admin/gamin >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=FAM, the File Alteration Monitor
-EAPI=5
-HOMEPAGE=http://oss.sgi.com/projects/fam/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 ) !app-admin/gamin
-SLOT=0
-SRC_URI=ftp://oss.sgi.com/projects/fam/download/stable/fam-2.7.0.tar.gz mirror://debian/pool/main/f/fam/fam_2.7.0-17.diff.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5231a33b16614b5f0a633505567f0bf3
diff --git a/app-admin/fam-2.7.0_p17_p2 b/app-admin/fam-2.7.0_p17_p2
deleted file mode 100644
index f86b5112264c..000000000000
--- a/app-admin/fam-2.7.0_p17_p2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!app-admin/gamin net-libs/libtirpc net-nds/rpcbind >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=FAM, the File Alteration Monitor
-EAPI=6
-HOMEPAGE=http://oss.sgi.com/projects/fam/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=!app-admin/gamin net-libs/libtirpc net-nds/rpcbind
-SLOT=0
-SRC_URI=ftp://oss.sgi.com/projects/fam/download/stable/fam-2.7.0.tar.gz mirror://debian/pool/main/f/fam/fam_2.7.0-17.2.diff.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9b31eff02610a54a01fec36e7e66fea7
diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
new file mode 100644
index 000000000000..38779a20a567
--- /dev/null
+++ b/app-admin/fam/Manifest
@@ -0,0 +1,11 @@
+AUX fam-2.7.0-AM_CONFIG_HEADER.patch 242 BLAKE2B dd0c34f6f4e1c7b9b1893001faf911f428dcf7949828f5ea1fa448aaadad98ea1e671ea49ef5e1e619396495f8a95c5e2874550e4aae5056e1fbf00ed600f5d8 SHA512 874c2242dd3b1300fd87da5e13674a25d426bba688fb4dc9d80914392f9934050a1c9f338cd5591c170bfb1fb30bcd12c85a5f75d1687fff61d41ba85b3ab5e2
+AUX fam-2.7.0-out-of-tree.patch 262 BLAKE2B 06a18408ce56a9502c6ff779ff48f884d77d4b33b4dbfc0e35fc4b2fbd41cb268f0bcb272dc2575c8acbccd4e426c5ad83ecb1c1bc4138c29c0314c4f8e8bfdb SHA512 20e92a60b67167aa29e699dd61731e5564a22243cbc0634903421545f6918033bce9849de2d3f665ecf3fd24406dd9fef98c98e3d49759b632293c773c4ac813
+AUX fam-2.7.0-patch-header.patch 3292 BLAKE2B f6e96ab2ac33ddfee2efb20fa32c010d1d554e83efe106191ace70001cdca9de80c0c845ad997cc1ee3efb007769032e2c7904c1acf18a3a56a75155f9898b22 SHA512 055ee28f30286f236436e84fde4b4c89736252216f3484d8f068c3b5f285adf9de78b87007c18f4d6752246b9595d9cf1d3e1ac4ab6cad6b96a3bb9e9f1ba334
+AUX fam-2.7.0-sysmacros.patch 343 BLAKE2B c4b1d4ff996517f9c7a9f17b3e4a7c12053fb4fde9af64e3dbf1a57e26db377951331fdd54fd46982776cad342c6836f09034292a8e198d814e6ed72b095850b SHA512 474ab9d24175d6b3a58d05bc463a53979dfafbd67cf92f892cbf0e9f9330cc8e4b5a34aff261c052fd1080c09c936c0195432404d608b669a824b455d243f3c3
+AUX famd 393 BLAKE2B 5e6fd2f1e7eb9c48fcae90da144a1b6953e2469d0e4f3c7124e5f71440ae2de5195179d0abc969ef11fb59cb2290d541518e36a983e98c735d36837ca0ae8e29 SHA512 ddad96e311a678c5907086b69a6478c5c6e735ff2614846585a2b26476a5049ab90f984d82eba5ba3f0175c3675d478e2abdf4ef2bf98c457a9e1304324979e1
+DIST fam-2.7.0.tar.gz 301974 BLAKE2B 9a915e61b2898717cac1b7bbe9b2049aee0701314710906c5c8323aafe0847a9f017d09c4d9345e1fba386ac3c1001ec013325f9841d716e8c91e35bcf1e3962 SHA512 62b6222ee925eb2af1e258097c9bb676191690f38f8504ae16b1883a1019e0ac6dc7116ac2c4c596a956b3b3cfc3ce3ee7b613c319654681afb13e3ad3f284e2
+DIST fam_2.7.0-17.2.diff.gz 28826 BLAKE2B 880f8614304b048a24be03231ec26a02901befd75c8c5d51abf07d5afb42f370f4d3702d0db790f2f651f040372791024d9cbfbea15a1932629fb13a7b6a5ec8 SHA512 295c954fcecb7357a72ecf3c7469bb37c29e8969fc7be3a0e92e40e79911c9578f44c42a0a6f900610c8a9886f1addc62e50f258105aaadb61c718f526608697
+DIST fam_2.7.0-17.diff.gz 28056 BLAKE2B 4db010fdf7a2548f5651e9da876df63d3bd0d1a5f184b26df99f7d4204bbcbadf4c7672d248d9d1af2e7297b0ec17a5ec80e6b57016774877465a957ae3c6ae8 SHA512 76b14e1d17713eb86d52cb804d34012e5369b5f4e8bcbdc73a063d2ad9219e0c4a261cef9e144ee07744a953a2e893bdf2ceeefcf21edc7a2ac5e70a51a8e209
+EBUILD fam-2.7.0-r7.ebuild 1477 BLAKE2B b105c2c3183f1a39a062d7e64ac507af7b1ab4b33f0e974ccf7f4c3d607db7b9284e85f5d570ab2536910f415f2a00b2a346dad6f8a693dda2a63ffcb67dbe81 SHA512 e3ab8591d5bb3cced1c603e1379195f7f0826a019e1cee7902239116d625db383023d9ee3581f0258477f88ea191f353425f817771303e5916dca1234d2a1ac8
+EBUILD fam-2.7.0_p17_p2.ebuild 1757 BLAKE2B 68b42c2d8f6873231a579f55c954ad39234cdd06c1842996cd5c20dd8ef65f87e4a8b94961249a4a8876af2e0b54eed0c76224616c92f890f490b3c340ff191d SHA512 1c5f7a100ddd09bc1472c8a267075465110d8e6b049907388791b4d0772b0f174f4671cc242d26619e18e1998859c86044f5fc9cf53ea3561ea81d42efd0bb20
+MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/app-admin/fam/fam-2.7.0-r7.ebuild b/app-admin/fam/fam-2.7.0-r7.ebuild
new file mode 100644
index 000000000000..9aea258bf7a3
--- /dev/null
+++ b/app-admin/fam/fam-2.7.0-r7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools multilib-minimal
+
+DEBIAN_PATCH="17"
+DESCRIPTION="FAM, the File Alteration Monitor"
+HOMEPAGE="http://oss.sgi.com/projects/fam/"
+SRC_URI="ftp://oss.sgi.com/projects/fam/download/stable/${P}.tar.gz
+	mirror://debian/pool/main/f/${PN}/${P/-/_}-${DEBIAN_PATCH}.diff.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="static-libs"
+
+DEPEND="|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 )
+	!app-admin/gamin"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO README )
+
+src_prepare() {
+	epatch "${WORKDIR}/${P/-/_}-${DEBIAN_PATCH}.diff"
+	edos2unix "${S}"/${P}/debian/patches/10_debianbug375967.patch
+	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${S}"/${P}/debian/patches
+	sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+
+	epatch "${FILESDIR}"/${P}-out-of-tree.patch
+	epatch "${FILESDIR}"/${P}-sysmacros.patch #580702
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
+
+	# These are thrown away later
+	if ! multilib_is_native_abi ; then
+		sed -i -e 's/src conf man//' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+	einstalldocs
+
+	sed -i "${D}"/etc/fam.conf \
+		-e "s:local_only = false:local_only = true:g" \
+		|| die "sed fam.conf"
+
+	doinitd "${FILESDIR}/famd"
+}
diff --git a/app-admin/fam/fam-2.7.0_p17_p2.ebuild b/app-admin/fam/fam-2.7.0_p17_p2.ebuild
new file mode 100644
index 000000000000..fa3fcc17b178
--- /dev/null
+++ b/app-admin/fam/fam-2.7.0_p17_p2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic ltprune multilib-minimal
+
+FAM_PV="${PV/_p*/}"
+DEBIAN_PATCH="${PV#*_p}"
+DEBIAN_PATCH="${DEBIAN_PATCH/_p/.}"
+DESCRIPTION="FAM, the File Alteration Monitor"
+HOMEPAGE="http://oss.sgi.com/projects/fam/"
+SRC_URI="
+	ftp://oss.sgi.com/projects/fam/download/stable/${PN}-${FAM_PV}.tar.gz
+	mirror://debian/pool/main/f/${PN}/${PN}_${FAM_PV}-${DEBIAN_PATCH}.diff.gz
+"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+IUSE="static-libs"
+
+DEPEND="
+	!app-admin/gamin
+	net-libs/libtirpc
+	net-nds/rpcbind
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO README )
+S=${WORKDIR}/${PN}-${FAM_PV}
+
+src_prepare() {
+	eapply "${WORKDIR}"/${PN}_${FAM_PV}-${DEBIAN_PATCH}.diff
+	edos2unix debian/patches/10_debianbug375967.patch
+	eapply "${FILESDIR}"/${PN}-${FAM_PV}-patch-header.patch
+
+	eapply debian/patches/*patch
+
+	eapply "${FILESDIR}"/${PN}-${FAM_PV}-AM_CONFIG_HEADER.patch
+	eapply "${FILESDIR}"/${PN}-${FAM_PV}-out-of-tree.patch
+	eapply "${FILESDIR}"/${PN}-${FAM_PV}-sysmacros.patch #580702
+
+	eapply_user
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	tc-export PKG_CONFIG
+	append-cppflags $(${PKG_CONFIG} --cflags libtirpc)
+	append-libs $(${PKG_CONFIG} --libs libtirpc)
+	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
+
+	# These are thrown away later
+	if ! multilib_is_native_abi ; then
+		sed -i -e 's/src conf man//' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+	einstalldocs
+
+	sed -i "${D}"/etc/fam.conf \
+		-e "s:local_only = false:local_only = true:g" \
+		|| die "sed fam.conf"
+
+	doinitd "${FILESDIR}/famd"
+}
diff --git a/app-admin/fam/files/fam-2.7.0-AM_CONFIG_HEADER.patch b/app-admin/fam/files/fam-2.7.0-AM_CONFIG_HEADER.patch
new file mode 100644
index 000000000000..5799fb3eff1b
--- /dev/null
+++ b/app-admin/fam/files/fam-2.7.0-AM_CONFIG_HEADER.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,7 +7,7 @@
+ AM_INIT_AUTOMAKE
+ AM_MAINTAINER_MODE
+ dnl AC_CONFIG_SRCDIR([acconfig.h])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_LANG(C++)
+ 
+ # Variables used by the FAM source.
diff --git a/app-admin/fam/files/fam-2.7.0-out-of-tree.patch b/app-admin/fam/files/fam-2.7.0-out-of-tree.patch
new file mode 100644
index 000000000000..51fdadf38fe6
--- /dev/null
+++ b/app-admin/fam/files/fam-2.7.0-out-of-tree.patch
@@ -0,0 +1,13 @@
+fix out of tree builds
+
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -7,7 +7,7 @@
+ 	Client.h \
+ 	fam.c++
+ 
+-libfam_la_LDFLAGS = -export-symbols fam.sym
++libfam_la_LDFLAGS = -export-symbols $(srcdir)/fam.sym
+ libfam_la_LIBADD = -lstdc++
+ 
+ EXTRA_DIST = fam.sym
diff --git a/app-admin/fam/files/fam-2.7.0-patch-header.patch b/app-admin/fam/files/fam-2.7.0-patch-header.patch
new file mode 100644
index 000000000000..808f4324db4a
--- /dev/null
+++ b/app-admin/fam/files/fam-2.7.0-patch-header.patch
@@ -0,0 +1,66 @@
+--- a/debian/patches/15-partial_send.patch
++++ b/debian/patches/15-partial_send.patch
+@@ -1,6 +1,6 @@
+ diff -Naur fam-2.7.0/fam-2.7.0/src/NetConnection.c++ fam-2.7.0-mod/fam-2.7.0/src/NetConnection.c++
+---- fam-2.7.0/fam-2.7.0/src/NetConnection.c++	2003-01-18 09:18:12.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/src/NetConnection.c++	2007-07-30 12:57:19.812380334 -0400
++--- a/src/NetConnection.c++	2003-01-18 09:18:12.000000000 -0500
+++++ b/src/NetConnection.c++	2007-07-30 12:57:19.812380334 -0400
+ @@ -213,6 +213,7 @@
+  
+      msgList_t * msg = new msgList_t;
+@@ -31,8 +31,8 @@
+              {
+                  /* Since the client library can close it's fd before
+ diff -Naur fam-2.7.0/fam-2.7.0/src/NetConnection.h fam-2.7.0-mod/fam-2.7.0/src/NetConnection.h
+---- fam-2.7.0/fam-2.7.0/src/NetConnection.h	2003-01-18 09:18:12.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/src/NetConnection.h	2007-07-30 12:53:46.746803625 -0400
++--- a/src/NetConnection.h	2003-01-18 09:18:12.000000000 -0500
+++++ b/src/NetConnection.h	2007-07-30 12:53:46.746803625 -0400
+ @@ -80,6 +80,7 @@
+      typedef struct msgList_s {
+          char msg[MAXMSGSIZE+5];  //  + 4 for 32-bit length, + 1 for overflow
+--- a/debian/patches/16-port_number.patch
++++ b/debian/patches/16-port_number.patch
+@@ -1,6 +1,6 @@
+ diff -Naur fam-2.7.0/fam-2.7.0/man/famd.8 fam-2.7.0-mod/fam-2.7.0/man/famd.8
+---- fam-2.7.0/fam-2.7.0/man/famd.8	2003-01-19 19:58:11.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/man/famd.8	2007-07-30 12:23:15.292527117 -0400
++--- a/man/famd.8	2003-01-19 19:58:11.000000000 -0500
+++++ b/man/famd.8	2007-07-30 12:23:15.292527117 -0400
+ @@ -51,6 +51,9 @@
+  Register with the portmapper using the specifed RPC program
+  and version numbers.
+@@ -12,8 +12,8 @@
+  Poll a remove NFS server every \fIperiod\fR seconds
+  to obtain file updates if the remove server is not running \fBfamd\fR.
+ diff -Naur fam-2.7.0/fam-2.7.0/src/Listener.c++ fam-2.7.0-mod/fam-2.7.0/src/Listener.c++
+---- fam-2.7.0/fam-2.7.0/src/Listener.c++	2003-01-19 19:37:29.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/src/Listener.c++	2007-07-26 16:32:03.863758810 -0400
++--- a/src/Listener.c++	2003-01-19 19:37:29.000000000 -0500
+++++ b/src/Listener.c++	2007-07-26 16:32:03.863758810 -0400
+ @@ -60,13 +60,14 @@
+  
+  static void cleanup_negotiation(void *closure);
+@@ -57,8 +57,8 @@
+  	if (listen(sock, 1) < 0)
+  	{
+ diff -Naur fam-2.7.0/fam-2.7.0/src/Listener.h fam-2.7.0-mod/fam-2.7.0/src/Listener.h
+---- fam-2.7.0/fam-2.7.0/src/Listener.h	2003-01-18 09:18:12.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/src/Listener.h	2007-07-26 16:32:50.682255289 -0400
++--- a/src/Listener.h	2003-01-18 09:18:12.000000000 -0500
+++++ b/src/Listener.h	2007-07-26 16:32:50.682255289 -0400
+ @@ -51,7 +51,9 @@
+  
+      Listener(bool started_by_inetd,
+@@ -79,8 +79,8 @@
+      //  Private Instance Methods
+  
+ diff -Naur fam-2.7.0/fam-2.7.0/src/main.c++ fam-2.7.0-mod/fam-2.7.0/src/main.c++
+---- fam-2.7.0/fam-2.7.0/src/main.c++	2003-01-19 01:15:51.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/src/main.c++	2007-05-08 16:42:35.618954322 -0400
++--- a/src/main.c++	2003-01-19 01:15:51.000000000 -0500
+++++ b/src/main.c++	2007-05-08 16:42:35.618954322 -0400
+ @@ -89,6 +89,7 @@
+      fprintf(stderr, "\t-d\t\tdebug\n");
+      fprintf(stderr, "\t-v\t\tverbose\n");
diff --git a/app-admin/fam/files/fam-2.7.0-sysmacros.patch b/app-admin/fam/files/fam-2.7.0-sysmacros.patch
new file mode 100644
index 000000000000..ac42dca3bea6
--- /dev/null
+++ b/app-admin/fam/files/fam-2.7.0-sysmacros.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/580702
+
+fix build with newer glibc where sys/sysmacros.h isn't implicitly included
+by sys/types.h
+
+--- a/src/DNotify.c++
++++ b/src/DNotify.c++
+@@ -32,6 +32,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <libgen.h>
diff --git a/app-admin/fam/files/famd b/app-admin/fam/files/famd
new file mode 100644
index 000000000000..da3d745b244a
--- /dev/null
+++ b/app-admin/fam/files/famd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+
+	need portmap
+
+}
+
+start() {
+
+	ebegin "Starting famd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/famd \
+		-- -T 0 -c /etc/fam.conf
+	eend $?
+
+}
+
+stop() {
+
+	ebegin "Stopping famd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/famd
+	eend $?
+
+}
diff --git a/app-admin/fam/metadata.xml b/app-admin/fam/metadata.xml
new file mode 100644
index 000000000000..f8bd6f3f34f9
--- /dev/null
+++ b/app-admin/fam/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/fetchlog-1.4-r1 b/app-admin/fetchlog-1.4-r1
deleted file mode 100644
index 0667e8f5ee42..000000000000
--- a/app-admin/fetchlog-1.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install preinst
-DESCRIPTION=Displays the last new messages of a logfile
-EAPI=6
-HOMEPAGE=http://fetchlog.sourceforge.net/
-IUSE=snmp
-KEYWORDS=amd64 ppc x86 ~ppc64
-LICENSE=GPL-2
-RDEPEND=snmp? ( >=dev-perl/Net-SNMP-4.0.1-r2 >=net-analyzer/net-snmp-5.0.6 )
-SLOT=0
-SRC_URI=mirror://sourceforge/fetchlog/fetchlog-1.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c451d7c39d813017e169ade66414e539
diff --git a/app-admin/fetchlog/Manifest b/app-admin/fetchlog/Manifest
new file mode 100644
index 000000000000..9e1c7b03b372
--- /dev/null
+++ b/app-admin/fetchlog/Manifest
@@ -0,0 +1,4 @@
+AUX fetchlog-1.4-fix-build-system.patch 631 BLAKE2B ebbc0d0e90c5183a2ac396ffc26356223b5b8072100a9a6dc2f7fd0c9c94287213f7f8f8749e3e54612f7c777848012f92fccfbb02295345d578dcbd974f3091 SHA512 480a30e040f56e3e1cf21172dc7f7f060fa81a8a0efb95e15a20b7762444b356547435f3eacc4cdb7a504f3049f6b05a7fab219f6cab9d3fe7901968a69c796e
+DIST fetchlog-1.4.tar.gz 32393 BLAKE2B 2741c536dfb17414ffaf90cebd9f8c7c1a1c80edb30bc726f15aa6acd610a07afb926c2566d27b30125e7f4733c1abde8eb81c68d81f609bc05328cf90755d44 SHA512 51590c0cdfa8f4a15fcb4a436375d960c25f35d84558ab46def58f83c97da30caee449eea7c62c539da786a613c2b1e51dbc223d70d56c21daad6e9faf8a51ad
+EBUILD fetchlog-1.4-r1.ebuild 901 BLAKE2B b63c8dedb7800b1d792ebaeefc371c92f1e4c0149814087a34c1621d28a59d84422a2e53c2f2a4fcaa5d9d9eed4ab214a888527efeba25a39c5eacc82a4c78ea SHA512 5dc6ccac654048c675b1d72f4ace6ce832dd79c5fb445257c4f0176d27d5f6a34460a9e3d879d949cb479fc9bae232d68388459b632dadfa859b72f1671e87dd
+MISC metadata.xml 250 BLAKE2B a7de32c64d6f141fafdc392101c9c7ddeabb84d3c2f452662c96e27aa5e5f9d3ce47336bc707eb61396b02bee553a624a75195b7bc84949aabb5b660b1800dab SHA512 c4bde4a741bd01c371d3a4dec51ba522ad6ccb2fb95214e41f93366bedd37d7ca1729e638a5aee8e6af9e2280ce6c06c80e404428516e6a5c86264a629e87fe9
diff --git a/app-admin/fetchlog/fetchlog-1.4-r1.ebuild b/app-admin/fetchlog/fetchlog-1.4-r1.ebuild
new file mode 100644
index 000000000000..c4313f546021
--- /dev/null
+++ b/app-admin/fetchlog/fetchlog-1.4-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Displays the last new messages of a logfile"
+HOMEPAGE="http://fetchlog.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fetchlog/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~ppc64"
+IUSE="snmp"
+
+RDEPEND="
+	snmp? (
+		>=dev-perl/Net-SNMP-4.0.1-r2
+		>=net-analyzer/net-snmp-5.0.6
+	)"
+DEPEND=""
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4-fix-build-system.patch )
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin fetchlog
+	einstalldocs
+	dodoc *cfg*
+	doman fetchlog.1
+}
+
+pkg_preinst() {
+	elog
+	elog "This utility can be used together with Nagios"
+	elog "To make use of these features you need to"
+	elog "install net-analyzer/nagios."
+	elog "This feature depends on SNMP, so make use you"
+	elog "have 'snmp' in your USE flags"
+	elog
+}
diff --git a/app-admin/fetchlog/files/fetchlog-1.4-fix-build-system.patch b/app-admin/fetchlog/files/fetchlog-1.4-fix-build-system.patch
new file mode 100644
index 000000000000..53c05d85f74c
--- /dev/null
+++ b/app-admin/fetchlog/files/fetchlog-1.4-fix-build-system.patch
@@ -0,0 +1,30 @@
+--- a/Makefile
++++ b/Makefile
+@@ -23,8 +23,8 @@
+ ### compiler
+ 
+ ### gcc
+-CC=gcc
+-CFLAGS= -O -Werror -Wall -Wcast-qual -Wstrict-prototypes \
++CC ?= gcc
++CFLAGS += -Wall -Wcast-qual -Wstrict-prototypes \
+ 	-Wmissing-prototypes -Wmissing-declarations -Winline -Wcast-align 
+ ### cc
+ #CC=cc
+@@ -72,7 +72,7 @@
+ 
+ # compiler stuff
+ # --------------
+-CC_OPT= $(CFLAGS) -DFETCHLOG_VERSION_NO=\"$(FETCHLOG_VERSION)\" \
++CPPFLAGS += -DFETCHLOG_VERSION_NO=\"$(FETCHLOG_VERSION)\" \
+ 	$(HAS_MADVISE) $(HAS_REGEX)
+ 
+ # all
+@@ -82,7 +82,6 @@
+ # fetchlog
+ # -------
+ fetchlog: fetchlog.c 
+-	$(CC) $(CC_OPT) fetchlog.c -o fetchlog
+ 
+ 
+ # install
diff --git a/app-admin/fetchlog/metadata.xml b/app-admin/fetchlog/metadata.xml
new file mode 100644
index 000000000000..f45d03726427
--- /dev/null
+++ b/app-admin/fetchlog/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="sourceforge">fetchlog</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/fifo-cronolog-1.1.1-r1 b/app-admin/fifo-cronolog-1.1.1-r1
deleted file mode 100644
index b290c664bf9b..000000000000
--- a/app-admin/fifo-cronolog-1.1.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=cronolog wrapper for use with dumb daemons like squid, varnish and so on
-EAPI=6
-HOMEPAGE=https://cgit.gentoo.org/proj/fifo-cronolog.git
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 GPL-2
-RDEPEND=app-admin/cronolog
-SLOT=0
-SRC_URI=mirror://gentoo/fifo-cronolog-1.1.1.tar.bz2
-_md5_=c170a6335c99eb8a54109216ab950867
diff --git a/app-admin/fifo-cronolog/Manifest b/app-admin/fifo-cronolog/Manifest
new file mode 100644
index 000000000000..513c506169d8
--- /dev/null
+++ b/app-admin/fifo-cronolog/Manifest
@@ -0,0 +1,3 @@
+DIST fifo-cronolog-1.1.1.tar.bz2 3124 BLAKE2B 6e9cb35e0ed1b54c3baed4451742840dc1144294fc675822c1260d4d7d885a52f8835e60dcbed57c714e40e94e6d51b3ba78af9b9892883f5f520a7c57d30df8 SHA512 3ac809d5cfc951764aaf31d50ee394b0dde9ced16f53daa91c81bdb218af2bab410ff945ebfdeb8307a55bda3292c0a55eb500c3cb73595e17228ef739455d90
+EBUILD fifo-cronolog-1.1.1-r1.ebuild 816 BLAKE2B ebb99339914cbde378d008b53a2da426faeb866b13e50cb06d03fbc75f42a5bb2c12aeb6161742bd22f9d0338c4e482b7fac69efa6314f203cef98c090736a72 SHA512 ace0fca2b8e11d99dc9b0ac51d10c9a06089c0aa6912804c0fa78ca51fc4786735eb6d6c8b0cd3f9887feff7112a1f6f9bba647b2585e72309bbb75a1ca943f3
+MISC metadata.xml 480 BLAKE2B f106319d18b4dd56223023bf22dd454222b4530ff3538baa005ec4d5c8a1cf33293a58eda300daa21ae7b72fcc2e2a601477832608e548308d4979e2ac546029 SHA512 5b40d5fec153d6883069f56d93397f9fdf664fb7c59a6c9ee8734d66aacc50be78ab7a76000292412e157ca79275e8b91bae7a133feef19f967c972b7f5ba793
diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r1.ebuild b/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..93447d0b0efb
--- /dev/null
+++ b/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="cronolog wrapper for use with dumb daemons like squid, varnish and so on"
+HOMEPAGE="https://cgit.gentoo.org/proj/fifo-cronolog.git"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-admin/cronolog"
+
+src_install() {
+	dosbin fifo-cronolog
+
+	newinitd fifo-cronolog.initd fifo-cronolog
+	newconfd fifo-cronolog.confd fifo-cronolog
+
+	dosym fifo-cronolog /usr/sbin/squid-cronolog
+}
+
+pkg_postinst() {
+	elog "Warning: app-admin/squid-cronolog has been renamed to app-admin/fifo-cronolog."
+	elog "This also applies to the binary 'squid-cronolog' but there is a symlink for now"
+	elog "Please fix your scripts/configs."
+}
diff --git a/app-admin/fifo-cronolog/metadata.xml b/app-admin/fifo-cronolog/metadata.xml
new file mode 100644
index 000000000000..479c97a41559
--- /dev/null
+++ b/app-admin/fifo-cronolog/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+		fifo-cronolog is based on app-admin/cronolog, but uses a FIFO for input
+		instead of stdin. This package is used for the Gentoo infrastructure.
+	</longdescription>
+	<maintainer type="person">
+		<email>idl0r@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/filebeat-5.5.2 b/app-admin/filebeat-5.5.2
deleted file mode 100644
index 289c2c15e6d7..000000000000
--- a/app-admin/filebeat-5.5.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst test unpack
-DEPEND=>=dev-lang/go-1.8.3
-DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
-EAPI=6
-HOMEPAGE=https://www.elastic.co/products/beats
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/filebeat-bin
-SLOT=0
-SRC_URI=https://github.com/elastic/beats/archive/v5.5.2.tar.gz -> filebeat-5.5.2.tar.gz
-_md5_=fcc49d132f53b09f8c4b271299589e27
diff --git a/app-admin/filebeat-5.6.10 b/app-admin/filebeat-5.6.10
deleted file mode 100644
index bfa06959e458..000000000000
--- a/app-admin/filebeat-5.6.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=dev-lang/go-1.9.2
-DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
-EAPI=6
-HOMEPAGE=https://www.elastic.co/products/beats
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/filebeat-bin
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/elastic/beats/archive/v5.6.10.tar.gz -> filebeat-5.6.10.tar.gz
-_md5_=7f473a65e4e8acb0edc2d27ae4443f27
diff --git a/app-admin/filebeat-6.1.1 b/app-admin/filebeat-6.1.1
deleted file mode 100644
index ae22900bf5ca..000000000000
--- a/app-admin/filebeat-6.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=dev-lang/go-1.9.2
-DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
-EAPI=6
-HOMEPAGE=https://www.elastic.co/products/beats
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/filebeat-bin
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/elastic/beats/archive/v6.1.1.tar.gz -> filebeat-6.1.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=eb8dbd909b57e1d34864f105b002c1b8
diff --git a/app-admin/filebeat-6.2.4 b/app-admin/filebeat-6.2.4
deleted file mode 100644
index 1d4f8ab08104..000000000000
--- a/app-admin/filebeat-6.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=dev-lang/go-1.9.2
-DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
-EAPI=6
-HOMEPAGE=https://www.elastic.co/products/beats
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/filebeat-bin
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/elastic/beats/archive/v6.2.4.tar.gz -> filebeat-6.2.4.tar.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f
-_md5_=38ea90023980c049e48a221f509e10ae
diff --git a/app-admin/filebeat-6.3.1 b/app-admin/filebeat-6.3.1
deleted file mode 100644
index d3b653db3883..000000000000
--- a/app-admin/filebeat-6.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=>=dev-lang/go-1.10.3
-DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
-EAPI=6
-HOMEPAGE=https://www.elastic.co/products/beats
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/filebeat-bin
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/elastic/beats/archive/v6.3.1.tar.gz -> filebeat-6.3.1.tar.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f
-_md5_=4e2a8b038419240abefc1f91726a2fd0
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
new file mode 100644
index 000000000000..45a8ec56f015
--- /dev/null
+++ b/app-admin/filebeat/Manifest
@@ -0,0 +1,14 @@
+AUX filebeat.confd 269 BLAKE2B f9cc2a3d96be870d755c41606a274e94d6f6a2a5be71aeb3fc10f989d58b1bb5cc3683b38ede75f7e34937daa4189eccdd30c306b20e219c91bc90ac22d21b40 SHA512 89f2a8ead476750b3fd9a94dcc84311503907e78e66c70d151f27c7fdc8835e7bae6667a6aed0b6470a8f9b42c850396973fd09b1b6aec2d170e3774c8cfddff
+AUX filebeat.initd 1388 BLAKE2B 2a427750a15e6910344dee1d2707773b01961360ae3a7e3337a761b759b2c9fcd9a914385e8ff6292841ad6c07781af3b5cf059f1338a6f2f33bda576bb125cc SHA512 9b08635b9ba6e180881780de0fa9d6c8c1b2e7496fc803c2b38127fee13d13ca5d00792132cdc8bd4073018e3f6e374d4164a86e450a1dbeb68b2694fa0dbb12
+AUX filebeat.initd.1 1388 BLAKE2B 6ca4f3f4d50bba2a036a35b8e74bfa92d5b03ccaf8548df215d3d68ba9a2eaf9e2996374d49011f9e4380bc59f6307e262eee1367801bfb8279eb0b1639b83c4 SHA512 374b466b39feb832b414d0491510190758007079b6c865823878db00d5c17235f657deb0822066f124e3f07616dc4ff3237e87f6f35785e071815ec4e533b1dd
+DIST filebeat-5.5.2.tar.gz 18075191 BLAKE2B 9786cb8f3db003c86e4bc6d56fcac660b615e7e6ad82d0912f70c545f2af3caab605be739481355466438a1769c20b28db576d208af6b0af9620ce6408068215 SHA512 ad92b41a9ceaad6c6e6fc80d0adccd7fe03a7056d121484bcf35c6a46b2061a5ef6d32121dd12d59b51e7678769da5c405b1d549fa130631ae3f1989b78fba48
+DIST filebeat-5.6.10.tar.gz 18211551 BLAKE2B 5ed3a3d63fc758757cdb30e999a10bee15c8a66d7b4b603f755ebdfad712f4b48c2a1b79612dcfe3ce89d29458e672276b26f188ea3509ce4c349e2bff8b7508 SHA512 cca193e0c03ca5451c6158ab8f0669bf24aa0d34d46f2a4808d27f4ce1ff701dca6ea2db7a72275a635ea4e091571aa73e0b51228750b140a5340d27cba0e982
+DIST filebeat-6.1.1.tar.gz 17061456 BLAKE2B 5a5d23618f8140f3815c499305d99ae3dc4c4caa49535043040387922f924ee49a9494b5139f34a70d74173d97332b92909fc74e2f91a2fc0f288ef5d1493ade SHA512 54e85cfce58ba724f6b2892f115ac9ef5b1bb89ce8dc6f2a977e50ccfc07cf95fc578e46e0cadd96acd90c59f4b01446851b93c519afa094ff6dcdb7e716219a
+DIST filebeat-6.2.4.tar.gz 19466271 BLAKE2B 417f1db19b7fdd9bcf66f2c3dcdf2aaa6be9ba5edff1c97a0b8f4a5d7953ef27bcbd860e097fb40e67b3b42b795b684dabb2995eee572243831f749a7184b625 SHA512 49293e28e4ca769a88f7b889ea888a559ae7e142698714e24bf5519d00c2030237cac591590aa284f17792906a6137333173716ddf5db4496217f8b5a054b19c
+DIST filebeat-6.3.1.tar.gz 20915568 BLAKE2B 048898bc4520c0dc2a0aa5257149ecb75abc0b52d9a8cae63fdfe9fc8c329b3fa30d7277ae0cb916a86477d60e82b63839956cfa7a1985961c5ee5f6622b9f83 SHA512 1c03cc8fd3b968ade678cf2290fd7bd8fed2f9daa64cd550455567296ff51517b502b54e1b2413820c25cf899b7759662c9c18278c78a2568c74a26841f5f525
+EBUILD filebeat-5.5.2.ebuild 1646 BLAKE2B 37f6ac540ed27b471021be5666233d00ceacdcbdf6a32954c5987fa85c957223d84536dd5c0e93bf6acd988b01a061008cffff005806d8b2d8cee7f722884f33 SHA512 4b36e36a4f95c893bca863c4510e903f6265e4950fa000cae61896915c558beb4d8c4b10d8aa78d154bef7eb67886628f499153f988ff66e5b1066cb949b2029
+EBUILD filebeat-5.6.10.ebuild 1496 BLAKE2B cd528a4a68ef61ae3f5fea941e8a71e72002cb5b18814b3d9b3bdfdd86520f42ac87818acaf313807a2b7cdc1eef1f6ffa26d06d5190b9446c3f95b614718158 SHA512 0a7de42d1408d5c3a54836ebea8450e27b57f42824dbb1e2ce3d705123df752d8f68e8c40de2b17a6dae93307856eaa3898925994839e6d5e13e7275a30988f9
+EBUILD filebeat-6.1.1.ebuild 1303 BLAKE2B 9e3c7601566336639171e69171b51d1a7ca33d8636de2cca01709d1c97a65a82fda7b650efd682fd4d4909587a5868a84c4ea4053798b1daa73f11a036951a82 SHA512 fa282f9c87f051c0f33f0344f34d81c8dc9d8beb7d8b8d74ca8490bfb4f727f557145d138f7397452635b96b9be1a0a82e52f6b894a9e0b48cff16a11065491b
+EBUILD filebeat-6.2.4.ebuild 1216 BLAKE2B f3b33fcbe8ac9fae7bffe893254eed1c8daccb095cc04a9b8f07160afe029e6d960910aa0fa4805d61bb1649fb8de9f8f5f0016cba2cc8175651734937ae953c SHA512 4bbed842b8b59e0ddfce1b2ba4118692f03189908e957328f9a6db00e42b5901d32cc7dec8ae449bfdef6bbd8fa1abf06cf428def31070fdb0321ee7d2a55b8a
+EBUILD filebeat-6.3.1.ebuild 1323 BLAKE2B 2a6d030c2254e603df514bad88411f9436b618aa04193bfe007067046bfba03673db0ca4f46cb137d1de7b70d49b5039fec1f9afbc5ae7a801110a53b440b191 SHA512 a8bd4772445873378bdce0aa6ae31e04671b9ea79dee78c7299f718ac6ae11f27f4fb86d4f6ab4276b221af4aa7a4219b58538a61c483726c8538731da058c2e
+MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-5.5.2.ebuild b/app-admin/filebeat/filebeat-5.5.2.ebuild
new file mode 100644
index 000000000000..b61d0fb18c21
--- /dev/null
+++ b/app-admin/filebeat/filebeat-5.5.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+DEPEND=">=dev-lang/go-1.8.3"
+RDEPEND="!app-admin/filebeat-bin"
+
+ELASTIC="${WORKDIR}/src/github.com/elastic"
+BEATS="${ELASTIC}/beats"
+S="${BEATS}"
+
+src_unpack() {
+	mkdir -p "${ELASTIC}" || die
+	unpack ${P}.tar.gz
+	mv beats-${PV} "${BEATS}" || die
+}
+
+src_compile() {
+	cd ${BEATS}/filebeat || die
+	GOPATH="${WORKDIR}" emake
+}
+
+src_test() {
+	cd ${BEATS}/filebeat || die
+	GOPATH="${WORKDIR}" emake check
+}
+
+src_install() {
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	insinto "/usr/share/doc/${PF}/examples"
+	doins ${PN}/{filebeat.yml,filebeat.full.yml}
+
+	insinto "/etc/${PN}"
+	doins ${PN}/{filebeat.template.json,filebeat.template-es2x.json,filebeat.template-es6x.json}
+
+	exeinto "/usr/share/${PN}"
+	doexe libbeat/scripts/migrate_beat_config_1_x_to_5_0.py
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/5.0/upgrading.html"
+		elog ""
+		elog "The migration script:"
+		elog "${EROOT%/}/usr/share/filebeat/migrate_beat_config_1_x_to_5_0.py"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT%/}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/filebeat/filebeat-5.6.10.ebuild b/app-admin/filebeat/filebeat-5.6.10.ebuild
new file mode 100644
index 000000000000..4537daa105ba
--- /dev/null
+++ b/app-admin/filebeat/filebeat-5.6.10.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.9.2"
+RDEPEND="!app-admin/filebeat-bin"
+
+S="${WORKDIR}/src/github.com/elastic/beats"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv beats-${PV} "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
+}
+
+src_install() {
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.full.yml}
+
+	insinto "/etc/${PN}"
+	doins ${PN}/{filebeat.template.json,filebeat.template-es2x.json,filebeat.template-es6x.json}
+
+	exeinto "/usr/share/${PN}"
+	doexe libbeat/scripts/migrate_beat_config_1_x_to_5_0.py
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/5.0/upgrading.html"
+		elog ""
+		elog "The migration script:"
+		elog "${EROOT%/}/usr/share/filebeat/migrate_beat_config_1_x_to_5_0.py"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT%/}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/filebeat/filebeat-6.1.1.ebuild b/app-admin/filebeat/filebeat-6.1.1.ebuild
new file mode 100644
index 000000000000..c50b43ae9724
--- /dev/null
+++ b/app-admin/filebeat/filebeat-6.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.9.2"
+RDEPEND="!app-admin/filebeat-bin"
+
+ELASTIC="${WORKDIR}/src/github.com/elastic"
+BEATS="${ELASTIC}/beats"
+S="${BEATS}"
+
+src_unpack() {
+	mkdir -p "${ELASTIC}" || die
+	unpack ${P}.tar.gz
+	mv beats-${PV} "${BEATS}" || die
+}
+
+src_compile() {
+	cd ${BEATS}/filebeat || die
+	GOPATH="${WORKDIR}" emake
+}
+
+src_install() {
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(get_version_component_range 1-2)/upgrading.html"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT%/}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/filebeat/filebeat-6.2.4.ebuild b/app-admin/filebeat/filebeat-6.2.4.ebuild
new file mode 100644
index 000000000000..cf379ba2e314
--- /dev/null
+++ b/app-admin/filebeat/filebeat-6.2.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.9.2"
+RDEPEND="!app-admin/filebeat-bin"
+
+S="${WORKDIR}/src/github.com/elastic/beats"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv beats-${PV} "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
+}
+
+src_install() {
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT%/}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/filebeat/filebeat-6.3.1.ebuild b/app-admin/filebeat/filebeat-6.3.1.ebuild
new file mode 100644
index 000000000000..ed1db863a864
--- /dev/null
+++ b/app-admin/filebeat/filebeat-6.3.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.10.3"
+RDEPEND="!app-admin/filebeat-bin"
+
+S="${WORKDIR}/src/github.com/elastic/beats"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv beats-${PV} "${S}" || die
+}
+
+src_prepare() {
+	default
+	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
+}
+
+src_install() {
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT%/}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/filebeat/files/filebeat.confd b/app-admin/filebeat/files/filebeat.confd
new file mode 100644
index 000000000000..2fcf41aa3322
--- /dev/null
+++ b/app-admin/filebeat/files/filebeat.confd
@@ -0,0 +1,15 @@
+# Run filebeat under this user/group
+#FILEBEAT_USER=""
+#FILEBEAT_GROUP=""
+
+# Configuration path
+#FILEBEAT_CONFIG=""
+
+# Path to data directory
+#FILEBEAT_DATADIR=""
+
+# Path to log directory
+#FILEBEAT_LOGDIR=""
+
+# Additional arguments passed to filebeat
+#FILEBEAT_OPTS=""
diff --git a/app-admin/filebeat/files/filebeat.initd b/app-admin/filebeat/files/filebeat.initd
new file mode 100644
index 000000000000..92b8369a41d7
--- /dev/null
+++ b/app-admin/filebeat/files/filebeat.initd
@@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+FILEBEAT_USER="${FILEBEAT_USER:-root}"
+FILEBEAT_GROUP="${FILEBEAT_GROUP:-root}"
+FILEBEAT_CONFIG="${FILEBEAT_CONFIG:-/etc/filebeat/filebeat.yml}"
+FILEBEAT_DATADIR="${FILEBEAT_DATADIR:-/var/lib/filebeat}"
+FILEBEAT_LOGDIR="${FILEBEAT_LOGDIR:-/var/log/filebeat}"
+FILEBEAT_OPTS="${FILEBEAT_OPTS:-}"
+
+command="/usr/bin/filebeat"
+command_args="-c ${FILEBEAT_CONFIG} ${FILEBEAT_OPTS} -path.config $(dirname $FILEBEAT_CONFIG) \
+	-path.data ${FILEBEAT_DATADIR} -path.home ${FILEBEAT_DATADIR} -path.logs ${FILEBEAT_LOGDIR}"
+command_background="true"
+command_user="${FILEBEAT_USER}:${FILEBEAT_GROUP}"
+extra_commands="checkconfig"
+pidfile="/run/filebeat.pid"
+retry="TERM/5/KILL/5"
+start_stop_daemon_args="--chdir ${FILEBEAT_DATADIR}"
+
+depend() {
+	use net
+	after elasticsearch
+}
+
+checkconfig() {
+	if [ ! -e ${FILEBEAT_CONFIG} ]; then
+		eend "Please create a configuration file at ${FILEBEAT_CONFIG}"
+		return 1
+	fi
+
+	ebegin "Checking your configuration"
+	${command} ${command_args} -configtest
+	eend $? "Configuration error. Please fix your configuration files."
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_DATADIR}"
+	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_LOGDIR}"
+}
diff --git a/app-admin/filebeat/files/filebeat.initd.1 b/app-admin/filebeat/files/filebeat.initd.1
new file mode 100644
index 000000000000..2cb33ba8ebc0
--- /dev/null
+++ b/app-admin/filebeat/files/filebeat.initd.1
@@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+FILEBEAT_USER="${FILEBEAT_USER:-root}"
+FILEBEAT_GROUP="${FILEBEAT_GROUP:-root}"
+FILEBEAT_CONFIG="${FILEBEAT_CONFIG:-/etc/filebeat/filebeat.yml}"
+FILEBEAT_DATADIR="${FILEBEAT_DATADIR:-/var/lib/filebeat}"
+FILEBEAT_LOGDIR="${FILEBEAT_LOGDIR:-/var/log/filebeat}"
+FILEBEAT_OPTS="${FILEBEAT_OPTS:-}"
+
+command="/usr/bin/filebeat"
+command_args="-c ${FILEBEAT_CONFIG} ${FILEBEAT_OPTS} -path.config $(dirname $FILEBEAT_CONFIG) \
+	-path.data ${FILEBEAT_DATADIR} -path.home ${FILEBEAT_DATADIR} -path.logs ${FILEBEAT_LOGDIR}"
+command_background="true"
+command_user="${FILEBEAT_USER}:${FILEBEAT_GROUP}"
+extra_commands="checkconfig"
+pidfile="/run/filebeat.pid"
+retry="TERM/5/KILL/5"
+start_stop_daemon_args="--chdir ${FILEBEAT_DATADIR}"
+
+depend() {
+	use net
+	after elasticsearch
+}
+
+checkconfig() {
+	if [ ! -e ${FILEBEAT_CONFIG} ]; then
+		eend "Please create a configuration file at ${FILEBEAT_CONFIG}"
+		return 1
+	fi
+
+	ebegin "Checking your configuration"
+	${command} ${command_args} test config
+	eend $? "Configuration error. Please fix your configuration files."
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_DATADIR}"
+	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_LOGDIR}"
+}
diff --git a/app-admin/filebeat/metadata.xml b/app-admin/filebeat/metadata.xml
new file mode 100644
index 000000000000..cd032aa33d27
--- /dev/null
+++ b/app-admin/filebeat/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hydrapolic@gmail.com</email>
+    <name>Tomáš Mózes</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">elastic/beats</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/filewatcher-2.4.6-r1 b/app-admin/filewatcher-2.4.6-r1
deleted file mode 100644
index fa721f63d9ca..000000000000
--- a/app-admin/filewatcher-2.4.6-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=File control configuration system and IDS
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/filewatcher/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/MailTools dev-vcs/rcs virtual/mta
-SLOT=0
-SRC_URI=mirror://sourceforge/filewatcher/filewatcher-2.4.6.tar.gz
-_md5_=d0e4ff36bfa67e6e552ae44c852239aa
diff --git a/app-admin/filewatcher/Manifest b/app-admin/filewatcher/Manifest
new file mode 100644
index 000000000000..d2993e2ec3cf
--- /dev/null
+++ b/app-admin/filewatcher/Manifest
@@ -0,0 +1,4 @@
+AUX filewatcher.conf 567 BLAKE2B af300ec8d7c4017bfdff12423e409ed853ab39a7cf4cb3496a9d128de80d6d45137b3dfdead346d9777fd45a86baacd69f76e1d4157c05bd745c8e4b1872f579 SHA512 74108243a29e3993cf2c1b6bc4821907918e978a0bd7e6ca76c62172485ac94587a685c504fbb0a32a326e5537ebe00d0418f56229dc2031e3142773571ced14
+DIST filewatcher-2.4.6.tar.gz 37459 BLAKE2B 41fc1a6a289247d428cc3101eb9b437ae99d4b11c6df51c712a825cadba8ff8bc00cffa3cc4c4554565cebe596a821cac20a273453a186f2092ef93cb1752f7b SHA512 a6e1d2fb11f54352f963c21a1cbb42ceadcf3aff0ebf2b0e629d7827fada12c03531ecc9b9400afc65937830f92a0f16c54abd1cc034392351b72326943d6442
+EBUILD filewatcher-2.4.6-r1.ebuild 890 BLAKE2B e6671bd369acdf1c1c28094abd33989fe65decdd0320cff2ca1aab3fb660e5967b39ce81d8ef6a99e8aba90f5c9087a146b55ec17462c04d69b57c1c4297c88a SHA512 b0c53b07b6291277346de663325a8a88a1782ef752efe7a36a34d5d6584a0c154095ccb2ff56c3afab0711bbe866977ae40ba9c4213048f59c3e65b3361d28d4
+MISC metadata.xml 248 BLAKE2B f0d0956727aed0e1f5f6fd3be70e28c9080db1cd1657fb1a2e5dee93bc015c81561bcc8f51704fbd2b348c356aa353c6e4fb70a0f2afc7bc75d9ae5462488b1f SHA512 b9359e11a093d5e57800889f12683be0fc228d18dc9a63bd258d428185d825475089911629a9e34c53ae27cea7591caeb8ab8dee92d9bfe05d7037f48c3ee75e
diff --git a/app-admin/filewatcher/files/filewatcher.conf b/app-admin/filewatcher/files/filewatcher.conf
new file mode 100644
index 000000000000..e3358242759a
--- /dev/null
+++ b/app-admin/filewatcher/files/filewatcher.conf
@@ -0,0 +1,24 @@
+option archive-root /var/lib/filewatcher/archive
+option state-file /var/lib/filewatcher/state
+option warn-if-missing true
+option include-autopush true
+option skip-binary true
+
+# default notify via email to sysadm address
+option notify mailto:root
+# scan for archived files deleted from the filesystem
+option scan-frequency 4h
+watch ARCHIVE
+
+# system security files
+option scan-frequency 5m
+watch /etc/passwd
+watch /etc/group
+watch /sudoers
+
+
+# filewatcher and its configuration files
+option scan-frequency 30m
+watch /etc/filewatcher.conf
+watch /usr/sbin/filewatcher
+
diff --git a/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild b/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild
new file mode 100644
index 000000000000..db9d3becf660
--- /dev/null
+++ b/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="File control configuration system and IDS"
+HOMEPAGE="https://sourceforge.net/projects/filewatcher/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-perl/MailTools
+	dev-vcs/rcs
+	virtual/mta"
+
+DOCS=( Changes README )
+
+src_install() {
+	keepdir /var/lib/filewatcher /var/lib/filewatcher/archive
+	dosbin filewatcher
+	doman filewatcher.1
+	insinto /etc
+	doins "${FILESDIR}"/filewatcher.conf
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog " A basic configuration has been provided in"
+	elog " /etc/filewatcher.conf.  It is strongly"
+	elog " recommended that you invoke filewatcher via"
+	elog " crontab."
+	elog
+	elog " 55,25,40 * * * * root /usr/sbin/filewatcher"
+	elog " --config=/etc/filewatcher.conf"
+}
diff --git a/app-admin/filewatcher/metadata.xml b/app-admin/filewatcher/metadata.xml
new file mode 100644
index 000000000000..78a26da23d19
--- /dev/null
+++ b/app-admin/filewatcher/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">filewatcher</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/fleet-1.0.0 b/app-admin/fleet-1.0.0
deleted file mode 100644
index fad293ee6d35..000000000000
--- a/app-admin/fleet-1.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.5:= test? ( dev-go/go-tools ) virtual/pkgconfig
-DESCRIPTION=A Distributed init System
-EAPI=5
-HOMEPAGE=https://github.com/coreos/fleet
-IUSE=doc examples test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/coreos/fleet/archive/v1.0.0.tar.gz -> fleet-1.0.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=290b209788c8409023a71ec64a58b5c1
diff --git a/app-admin/fleet-9999 b/app-admin/fleet-9999
deleted file mode 100644
index 46877d614a5d..000000000000
--- a/app-admin/fleet-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.3:= test? ( dev-go/go-tools ) >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
-DESCRIPTION=A Distributed init System
-EAPI=5
-HOMEPAGE=https://github.com/coreos/fleet
-IUSE=doc examples test
-LICENSE=Apache-2.0
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cb4dc1f9e22f693eb1aea9724150bd3a
diff --git a/app-admin/fleet/Manifest b/app-admin/fleet/Manifest
new file mode 100644
index 000000000000..6a86363d3c4c
--- /dev/null
+++ b/app-admin/fleet/Manifest
@@ -0,0 +1,6 @@
+AUX fleet.service 195 BLAKE2B 4d229f3ea79b9ab6c400703456881e6978c8c5d4976e6e91c02dd2a84ba57b46d5d628c4b17644d6075ca12a195885144b74020852339b8d4499b774dae88117 SHA512 a654cc4f72a5b49c2383713660acfbc127dbc21d363f063a88d0afe02a76c191100b18b6f93bbbce26452458d7afd532a24b44e20bbd321787a63b25178182e5
+AUX fleet.socket 42 BLAKE2B 4b9fc506da1a5910ab2f4ce9eb01f3be4348a9a533870ca884fb1a3e6b8f08803a0f1ca60b300a90750b052768a30bde245a7c20e2e6e6576e61696ef3705bfe SHA512 85a9bd9bd93c61726ee59e2d00fe3cc7abd91d2f20b1ef2fbb8ad7522f682a2a5376070fa360f3e8c1d19011050fe822445bda4015ed2838efd343242b778230
+DIST fleet-1.0.0.tar.gz 4865693 BLAKE2B 33991c25ff2f7bf4307a9a3d2a6274b08a358d8041f641eb33b68946a2e682caae8b20643ac2735f447398cd305b9e3a77370ad6fc2ebe26b12c2f290a03e1e6 SHA512 77f38b605e37499e31effd82c3c4f0efd6adda73e9ded86db68efcd19a34bdc44b9f6f88b7fc94f7ea4f55b2027a1270d3c87897bf12b121614384a91bd9a3cf
+EBUILD fleet-1.0.0.ebuild 892 BLAKE2B fa6dbe21f4b1133f6dec33e68d347207d8d81a704762af7545a302ca2539ce8d45f6e016fb905749052741dd1fefa66c78060db55e4324b2003b17da2f3f6b97 SHA512 770ca8ab09535293f0811072e0982dab8169ad20341ff4d50882fd3fdaf68aef0ed7f3f7c916e51f519da8878833ed641fce3969e4d6ff9f56d5d431c53848df
+EBUILD fleet-9999.ebuild 828 BLAKE2B a07823eb208b09d3a58b1d45d586371b3f58ac23e5031e61e6c7cddd201e8004a40f5f62da1c940372c65ee5327b040d4d29479f10fcf56027c9824096ecbbb1 SHA512 4b61f4138e8eb306f38a9cc1aaa637bb75d4d779e000cbe481313576151bd47a1d5f1bbdbe752b283ead3d0cfa0646db62d4e93f018763d9b5e2007b75a10e5a
+MISC metadata.xml 249 BLAKE2B 007ead1effe6366e0c4a08465f2bfb507cfe181aba96029dcb5ad4e46b7da6d954a6327200e3261d4cce93abc43b3da50040c818b1c16832b812d4c4f941b435 SHA512 a7cb996459f6adb6863fa7d51363ebcc5e4bee2a62b0416b1fc17767aa145442de6d3bceb69aa19cc59e3b5e7b51f06ee87bc4d2a4b1cc5f2b7c9c7caa60cac9
diff --git a/app-admin/fleet/files/fleet.service b/app-admin/fleet/files/fleet.service
new file mode 100644
index 000000000000..1f44fe9df62c
--- /dev/null
+++ b/app-admin/fleet/files/fleet.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=fleet daemon
+Wants=etcd.service
+
+Wants=fleet.socket
+After=fleet.socket
+
+[Service]
+ExecStart=/usr/bin/fleetd
+Restart=always
+RestartSec=10s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/fleet/files/fleet.socket b/app-admin/fleet/files/fleet.socket
new file mode 100644
index 000000000000..4fc446e8fe37
--- /dev/null
+++ b/app-admin/fleet/files/fleet.socket
@@ -0,0 +1,2 @@
+[Socket]
+ListenStream=/var/run/fleet.sock
diff --git a/app-admin/fleet/fleet-1.0.0.ebuild b/app-admin/fleet/fleet-1.0.0.ebuild
new file mode 100644
index 000000000000..9f43c632f33a
--- /dev/null
+++ b/app-admin/fleet/fleet-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_PN="github.com/coreos/fleet"
+
+inherit systemd vcs-snapshot
+
+DESCRIPTION="A Distributed init System"
+HOMEPAGE="https://github.com/coreos/fleet"
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples test"
+
+DEPEND="
+	>=dev-lang/go-1.5:=
+	test? ( dev-go/go-tools )
+"
+RDEPEND=""
+
+src_compile() {
+	./build || die 'Build failed'
+}
+
+src_test() {
+	./test || die 'Tests failed'
+}
+
+src_install() {
+	dobin "${S}"/bin/fleetd
+	dobin "${S}"/bin/fleetctl
+
+	systemd_dounit "${FILESDIR}"/fleet.service
+	systemd_dounit "${FILESDIR}"/fleet.socket
+
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	use examples && dodoc -r examples
+
+	insinto /etc/${PN}
+	newins "${PN}".conf.sample "${PN}".conf
+}
diff --git a/app-admin/fleet/fleet-9999.ebuild b/app-admin/fleet/fleet-9999.ebuild
new file mode 100644
index 000000000000..07945ac690b8
--- /dev/null
+++ b/app-admin/fleet/fleet-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit git-r3 systemd
+
+EGIT_REPO_URI="https://github.com/coreos/fleet.git"
+
+DESCRIPTION="A Distributed init System"
+HOMEPAGE="https://github.com/coreos/fleet"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc examples test"
+
+DEPEND=">=dev-lang/go-1.3:=
+	test? ( dev-go/go-tools )"
+RDEPEND=""
+
+src_compile() {
+	./build || die 'Build failed'
+}
+
+src_test() {
+	./test || die 'Tests failed'
+}
+
+src_install() {
+	dobin "${S}"/bin/fleetd
+	dobin "${S}"/bin/fleetctl
+
+	systemd_dounit "${FILESDIR}"/fleet.service
+	systemd_dounit "${FILESDIR}"/fleet.socket
+
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	use examples && dodoc -r examples
+
+	insinto /etc/${PN}
+	newins "${PN}".conf.sample "${PN}".conf
+}
diff --git a/app-admin/fleet/metadata.xml b/app-admin/fleet/metadata.xml
new file mode 100644
index 000000000000..f9232c26e479
--- /dev/null
+++ b/app-admin/fleet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="github">coreos/fleet</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/fluentd-1.1.3-r1 b/app-admin/fluentd-1.1.3-r1
deleted file mode 100644
index 577c0aff60fb..000000000000
--- a/app-admin/fluentd-1.1.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby23] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby23] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby23] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby24] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby24] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby24] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby25] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby25] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby25] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby25] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby25] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby25] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby25] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=data collector and unified logging layer (project under CNCF)
-EAPI=6
-HOMEPAGE=https://www.fluentd.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby23] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby23] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby23] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby24] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby24] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby24] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby25] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby25] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby25] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby25] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby25] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby25] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby25] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/fluentd-1.1.3.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=21001a14ba5d01467070d44d8910b4a5
diff --git a/app-admin/fluentd-1.2.0 b/app-admin/fluentd-1.2.0
deleted file mode 100644
index 29b177c36c4e..000000000000
--- a/app-admin/fluentd-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby23] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby23] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby23] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby24] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby24] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby24] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby25] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby25] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby25] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby25] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby25] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby25] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby25] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=data collector and unified logging layer (project under CNCF)
-EAPI=6
-HOMEPAGE=https://www.fluentd.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby23] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby23] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby23] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby24] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby24] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby24] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby25] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby25] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby25] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby25] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby25] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby25] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby25] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/fluentd-1.2.0.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=af2485b26d30f115972cb95db0a5f73c
diff --git a/app-admin/fluentd-1.2.2 b/app-admin/fluentd-1.2.2
deleted file mode 100644
index 1f391ef3e068..000000000000
--- a/app-admin/fluentd-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby23] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby23] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby23] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby24] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby24] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby24] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby25] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby25] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby25] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby25] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby25] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby25] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby25] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=data collector and unified logging layer (project under CNCF)
-EAPI=6
-HOMEPAGE=https://www.fluentd.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby23] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby23] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby23] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby24] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby24] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby24] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby25] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby25] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby25] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby25] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby25] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby25] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby25] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/fluentd-1.2.2.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c4aae0d97c76d46547b8052bc3ba3fa4
diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
new file mode 100644
index 000000000000..2c5319ad4e40
--- /dev/null
+++ b/app-admin/fluentd/Manifest
@@ -0,0 +1,10 @@
+AUX fluent.conf 2728 BLAKE2B 1986af0d4062e7d85590e044d47ec77e3a46d9d4e8e79e42a30db05f0c5b730ebdef3f5f233bf929ec05311e644ade0fa89144323fe5ed8a8089dea8e3c5b103 SHA512 b400910c76fe2286e7887643471a55dfbad4aceb8dce07fba33d34923dcc13a609b909394bab50d509719d76a231a77441431e2d6dad75dd62b69ad05a5a804e
+AUX fluentd.confd 85 BLAKE2B 742ae368e0a8dd99f2f697c9438fc0ae4814693ee547be39b3bd8c9956fcb9acd5b6cffcf2a033e987b9a6eb7557a628f360fdd3f0053d055faeb62cad3f1d6a SHA512 9774f8fb0c9db7a501011558ac0c6222bed42501be90ac1c70ae0333cb3dd5ee5bc38417cd5ec3d1e0d8769d7f90bcc230746aed3fd30f28ea643c97d54d1f09
+AUX fluentd.initd 389 BLAKE2B 224ae3df5f6f7406a7bb7c735baf164598d1a42f5bb18d1948738492012a46e547f1ed4ffb68ca9a53a84930040f4bb50c67adb487b78a58a8257000ca3f3d7f SHA512 47704319bebb56ea28bb1331794f7838291a1ec0f841765b5b907c014cd58286d90707c55c28b219e495c56bbe39d19c82fc81969de83fe9499e81cd0ff0cbd7
+DIST fluentd-1.1.3.gem 413184 BLAKE2B facda41a26f9fe4f55a4ae6f97336acaa818534b6ac8740badcb132a18497e8767723e931bb2506843b56208deaf41cdaf9ac81821618cb223b8035527d355d7 SHA512 0d17668c06e515219a39ddc7ecda6b5ec5d29e7d4d3799e3447034ad731568d870ac3d36d468be21b6ef7a4198353c3045872902c41a54c0c2eacad8ec12f357
+DIST fluentd-1.2.0.gem 430592 BLAKE2B 698666a5c1dfc3f90b6b1f5b9e58070b71caef859f5d41472185a6f9f1d1d2b1c3631ca0ad01fbac4b4f333484a539aedc70a90a4381fef90c5c4130ffd61b61 SHA512 928ad81381c024efa2ad1e5b0f3d3a74f4bf8e3373c8f835925e89739c6536048a8a16e6b59accf4719192118b86b2fb49b3e9536611381a8a236997fcc96651
+DIST fluentd-1.2.2.gem 431616 BLAKE2B 854f23908f10d0bbae1a48392f439ce33e1e3619eb887235b2018bc30166faec8c40d05b9fc1b4aac44befd7afea87b3547a7d458c6e471bde65616e92f41951 SHA512 2a582bfd54f290612cdfee5e3ff9e5adc894bc02639991ccfd551c90070167837288d33fecf1e4975165b6f6758d124ff0b0fed715c9276ef9def566057d9e57
+EBUILD fluentd-1.1.3-r1.ebuild 1173 BLAKE2B ba1b38a72d8830ad9b2b8232274929a21d645b2a3a6f3ce1f0c6e3c793a06d7d52bc0c9b6bade0850502bd0c72ec08e1ef15356183725d5d377c6b41404acd9f SHA512 5c1f89f3394bbfbf6a9de90a7d666eb288c055a0c0c2d605207083b9a1511b774729e24a96b20644265cdac884ef40967278cfae2fbf3e2d13c8c35e7d29f099
+EBUILD fluentd-1.2.0.ebuild 1175 BLAKE2B 89bdf7cbf46df0894f653b0de9064aed66d0d8fbe566dee7087ff431b3ee86884a017ba6199c3991187c30c9074257c22b606b0d5c7c880b030dd577a4a46dff SHA512 2b12a2adc48b4189006adc5ebdd34e99d7e5ddab4e65c8991aafe040cde4e72eb112971db180f390e19f35335d44ceb1eaca34c65647b22e377114912c002e31
+EBUILD fluentd-1.2.2.ebuild 1239 BLAKE2B 2e50f7ac980ca902390e2b5bdb63e48d8b95ac3a732f6cf3dee9d2489b2f6f370500781a0a51d380973f312cb5ca9f13aa6a9722ee903c2a758c33eea9e87f65 SHA512 775d02b67182d4fa78889c14ad4c45e702da064996623998822058ebaa5fe459f5c5668237b3f4fae631d6a37060429552ff477250b0947ad2dcb37059f654f0
+MISC metadata.xml 557 BLAKE2B a4f765631fe109d217f577b3de01c7fe4901e7b7ad92d38e2844720188f3316e0c6f288065aa1b4e27e53d4b1f562d65839502d755081423b55e239119beccac SHA512 214770043d1c60e385a509faa12f4b7c04bbe0137b9dd9082c49fa6adea2e1a4555e38695bdb7b14cffe6a700430202e2ab711ddcfe413c6a7986584010f133f
diff --git a/app-admin/fluentd/files/fluent.conf b/app-admin/fluentd/files/fluent.conf
new file mode 100644
index 000000000000..099d1b4af47d
--- /dev/null
+++ b/app-admin/fluentd/files/fluent.conf
@@ -0,0 +1,139 @@
+# In v1 configuration, type and id are @ prefix parameters.
+# @type and @id are recommended. type and id are still available for backward compatibility
+
+## built-in TCP input
+## $ echo <json> | fluent-cat <tag>
+#<source>
+#  @type forward
+#  @id forward_input
+#</source>
+
+## built-in UNIX socket input
+#<source>
+#  @type unix
+#</source>
+
+# HTTP input
+# http://localhost:8888/<tag>?json=<json>
+#<source>
+#  @type http
+#  @id http_input
+
+#  port 8888
+#</source>
+
+## File input
+## read apache logs with tag=apache.access
+#<source>
+#  @type tail
+#  format apache
+#  path /var/log/httpd-access.log
+#  tag apache.access
+#</source>
+
+## Mutating event filter
+## Add hostname and tag fields to apache.access tag events
+#<filter apache.access>
+#  @type record_transformer
+#  <record>
+#    hostname ${hostname}
+#    tag ${tag}
+#  </record>
+#</filter>
+
+## Selecting event filter
+## Remove unnecessary events from apache prefixed tag events
+#<filter apache.**>
+#  @type grep
+#  include1 method GET # pass only GET in 'method' field
+#  exclude1 message debug # remove debug event
+#</filter>
+
+# Listen HTTP for monitoring
+# http://localhost:24220/api/plugins
+# http://localhost:24220/api/plugins?type=TYPE
+# http://localhost:24220/api/plugins?tag=MYTAG
+#<source>
+#  @type monitor_agent
+#  @id monitor_agent_input
+
+#  port 24220
+#</source>
+
+# Listen DRb for debug
+#<source>
+#  @type debug_agent
+#  @id debug_agent_input
+
+#  bind 127.0.0.1
+#  port 24230
+#</source>
+
+## match tag=apache.access and write to file
+#<match apache.access>
+#  @type file
+#  path /var/log/fluent/access
+#</match>
+
+## match tag=debug.** and dump to console
+<match debug.**>
+  @type stdout
+  @id stdout_output
+</match>
+
+# match tag=system.** and forward to another fluent server
+#<match system.**>
+#  @type forward
+#  @id forward_output
+
+#  <server>
+#    host 192.168.0.11
+#  </server>
+#  <secondary>
+#    <server>
+#      host 192.168.0.12
+#    </server>
+#  </secondary>
+#</match>
+
+## match tag=myapp.** and forward and write to file
+#<match myapp.**>
+#  @type copy
+#  <store>
+#    @type forward
+#    buffer_type file
+#    buffer_path /var/log/fluent/myapp-forward
+#    retry_limit 50
+#    flush_interval 10s
+#    <server>
+#      host 192.168.0.13
+#    </server>
+#  </store>
+#  <store>
+#    @type file
+#    path /var/log/fluent/myapp
+#  </store>
+#</match>
+
+## match fluent's internal events
+#<match fluent.**>
+#  @type null
+#</match>
+
+## match not matched logs and write to file
+#<match **>
+#  @type file
+#  path /var/log/fluent/else
+#  compress gz
+#</match>
+
+## Label: For handling complex event routing
+#<label @STAGING>
+#  <match system.**>
+#    @type forward
+#    @id staging_forward_output
+#    <server>
+#      host 192.168.0.101
+#    </server>
+#  </match>
+#</label>
diff --git a/app-admin/fluentd/files/fluentd.confd b/app-admin/fluentd/files/fluentd.confd
new file mode 100644
index 000000000000..c693e6289b8a
--- /dev/null
+++ b/app-admin/fluentd/files/fluentd.confd
@@ -0,0 +1,2 @@
+# If  you need to pass any extra options to fluentd, set them here.
+#fluentd_opts=""
diff --git a/app-admin/fluentd/files/fluentd.initd b/app-admin/fluentd/files/fluentd.initd
new file mode 100644
index 000000000000..b2e39d55f60e
--- /dev/null
+++ b/app-admin/fluentd/files/fluentd.initd
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/bin/fluentd
+logfile=/var/log/fluentd/fluent.log
+pidfile=/var/run/fluentd.pid
+command_args="--daemon ${pidfile} --no-supervisor -o ${logfile} ${fluentd_opts}"
+command_background=yes
+command_user=fluentd:fluentd
+
+start_pre() {
+	fluentd -q --dry-run
+}
diff --git a/app-admin/fluentd/fluentd-1.1.3-r1.ebuild b/app-admin/fluentd/fluentd-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..68a253aeeff6
--- /dev/null
+++ b/app-admin/fluentd/fluentd-1.1.3-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit ruby-fakegem user
+
+DESCRIPTION="data collector and unified logging layer (project under CNCF)"
+HOMEPAGE="https://www.fluentd.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "
+	>=dev-ruby/msgpack-0.7.0
+	>=dev-ruby/yajl-ruby-1.0
+	>=dev-ruby/coolio-1.4.5
+	>=dev-ruby/serverengine-2.0.4
+	>=dev-ruby/http_parser_rb-0.5.1
+	>=dev-ruby/sigdump-0.2.2
+	>=dev-ruby/tzinfo-1.0
+	>=dev-ruby/strptime-0.2.2"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tzinfo-data/d' \
+		-e '/dig_rb/d' \
+		"${PN}".gemspec || die "'sed failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+	insinto /etc/fluent
+	doins "${FILESDIR}"/fluent.conf
+newconfd "${FILESDIR}"/${PN}.confd ${PN}
+newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "A default configuration file has been installed in"
+		elog "${EROOT}etc/fluent/fluent.conf. You will need to edit"
+		elog "this file to match your configuration."
+	fi
+}
diff --git a/app-admin/fluentd/fluentd-1.2.0.ebuild b/app-admin/fluentd/fluentd-1.2.0.ebuild
new file mode 100644
index 000000000000..997c6fefa335
--- /dev/null
+++ b/app-admin/fluentd/fluentd-1.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit ruby-fakegem user
+
+DESCRIPTION="data collector and unified logging layer (project under CNCF)"
+HOMEPAGE="https://www.fluentd.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "
+	>=dev-ruby/msgpack-0.7.0
+	>=dev-ruby/yajl-ruby-1.0
+	>=dev-ruby/coolio-1.4.5
+	>=dev-ruby/serverengine-2.0.4
+	>=dev-ruby/http_parser_rb-0.5.1
+	>=dev-ruby/sigdump-0.2.2
+	>=dev-ruby/tzinfo-1.0
+	>=dev-ruby/strptime-0.2.2"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tzinfo-data/d' \
+		-e '/dig_rb/d' \
+		"${PN}".gemspec || die "'sed failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+	insinto /etc/fluent
+	doins "${FILESDIR}"/fluent.conf
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "A default configuration file has been installed in"
+		elog "${EROOT}etc/fluent/fluent.conf. You will need to edit"
+		elog "this file to match your configuration."
+	fi
+}
diff --git a/app-admin/fluentd/fluentd-1.2.2.ebuild b/app-admin/fluentd/fluentd-1.2.2.ebuild
new file mode 100644
index 000000000000..5394c440e799
--- /dev/null
+++ b/app-admin/fluentd/fluentd-1.2.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit ruby-fakegem user
+
+DESCRIPTION="data collector and unified logging layer (project under CNCF)"
+HOMEPAGE="https://www.fluentd.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "
+	>=dev-ruby/msgpack-0.7.0
+	>=dev-ruby/yajl-ruby-1.0
+	>=dev-ruby/coolio-1.4.5
+	>=dev-ruby/serverengine-2.0.4
+	>=dev-ruby/http_parser_rb-0.5.1
+	>=dev-ruby/sigdump-0.2.2
+	>=dev-ruby/tzinfo-1.0
+	>=dev-ruby/strptime-0.2.2"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tzinfo-data/d' \
+		-e '/dig_rb/d' \
+		"${PN}".gemspec || die "'sed failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+	keepdir /var/log/fluentd
+	fowners fluentd:adm /var/log/fluentd
+	insinto /etc/fluent
+	doins "${FILESDIR}"/fluent.conf
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "A default configuration file has been installed in"
+		elog "${EROOT}etc/fluent/fluent.conf. You will need to edit"
+		elog "this file to match your configuration."
+	fi
+}
diff --git a/app-admin/fluentd/metadata.xml b/app-admin/fluentd/metadata.xml
new file mode 100644
index 000000000000..1fbe5854b306
--- /dev/null
+++ b/app-admin/fluentd/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Fluentd is an open source data collector which lets you unify
+		the data collection and consumption for a better use and
+		understanding of data.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/fsvs-1.2.5-r2 b/app-admin/fsvs-1.2.5-r2
deleted file mode 100644
index de018eea040c..000000000000
--- a/app-admin/fsvs-1.2.5-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=dev-vcs/subversion dev-libs/libpcre sys-libs/gdbm dev-libs/apr-util dev-util/ctags
-DESCRIPTION=Backup/restore for subversion backends
-EAPI=6
-HOMEPAGE=http://fsvs.tigris.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-vcs/subversion dev-libs/libpcre sys-libs/gdbm dev-libs/apr-util dev-util/ctags
-SLOT=0
-SRC_URI=http://download.fsvs-software.org/fsvs-1.2.5.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3c59126621dcd92953b07fa7a31ceea1
diff --git a/app-admin/fsvs/Manifest b/app-admin/fsvs/Manifest
new file mode 100644
index 000000000000..c3edd11803d2
--- /dev/null
+++ b/app-admin/fsvs/Manifest
@@ -0,0 +1,4 @@
+AUX fsvs-1.2.5-as-needed.patch 1125 BLAKE2B dc21f6df691f5baab4c0510ec5b70c8841034ee1ebeee387c8e4fc8dbbe737b2ca59c0fb4316de024905403e3132b9625e98ae3b11ca814e2d50b8027d47caa9 SHA512 b477dc3525eac7cf3d4377f61e7b471c16f346e2fd357969bf40141ebab7eff817a7d122ac0c707ba4b12177fa849f6f193a18540f0f7e8d251ec468a5435848
+DIST fsvs-1.2.5.tar.bz2 427494 BLAKE2B ac445bd6572ccdc589ec3d9e21127446a0553d29ac62b1e99e60b767cb1c06d8be13469bcdef03382fa6088bb3fdb740a10a0e39fc5707fbfba749472523bc12 SHA512 36ab5d04491d506b2891548f3ad458e7977bbd2e7d4b03e135b13d07adb22aedb261c28d5ddd3df895771806ef54c1bca6a1ef7bc5aa2e50e4b234ddf6cbe19c
+EBUILD fsvs-1.2.5-r2.ebuild 1420 BLAKE2B 08df50f4c875bca0e2fa0b570413fa54ffcd7610860268c8561e9714e3f635de061605035ff74ebe248288d00607a852029c6302f8efcb260401a53ff38f291c SHA512 822aba3587ec4871be28300ce3de3c2da7b4b5882a719aa6c2cbb4f97cdcc5e4d2c554e291125c795ccb746a886cfac49120a8070aec936b775a7e0af42769bc
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch b/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
new file mode 100644
index 000000000000..f06070f4beee
--- /dev/null
+++ b/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
@@ -0,0 +1,31 @@
+Fixes --as-needed support(bug #294834)
+Verbose build
+Fixes underlinking(bug #463684) - patch went upstream
+
+--- fsvs-1.2.5/src/Makefile.in.orig	2011-11-11 22:19:12.000000000 +0400
++++ fsvs-1.2.5/src/Makefile.in	2013-08-19 13:30:16.186082295 +0400
+@@ -18,7 +18,7 @@
+ CFLAGS	:= @CFLAGS@ @NEED_FNESTED_FUNCTIONS@
+ CFLAGS	+= -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"'
+ LDFLAGS	:= @LDFLAGS@
+-FSVS_LDFLAGS = $(LDFLAGS) -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm 
++FSVS_LIBS = -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm -ldl
+ EXTRALIBS	:= @EXTRALIBS@
+ WAA_CHARS?= @WAA_WC_MD5_CHARS@
+ 
+@@ -146,13 +146,13 @@
+ ################################ Rules ######################################
+ %.o:	%.c
+ 	@echo "     CC $<"
+-	@$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ # if the Makefile has changed, the output will (at least sometimes)
+ # change, too.
+ $(DEST): $(C_FILES:%.c=%.o)
+ 	@echo "     Link $@"
+-	@$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) $(EXTRALIBS) -o $@ $^
++	$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(LIBS) $(FSVS_LIBS) $(EXTRALIBS)
+ ifeq (@ENABLE_RELEASE@, 1)
+ 	-strip $@
+ endif
diff --git a/app-admin/fsvs/fsvs-1.2.5-r2.ebuild b/app-admin/fsvs/fsvs-1.2.5-r2.ebuild
new file mode 100644
index 000000000000..35d79e90877b
--- /dev/null
+++ b/app-admin/fsvs/fsvs-1.2.5-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Backup/restore for subversion backends"
+HOMEPAGE="http://fsvs.tigris.org/"
+SRC_URI="http://download.fsvs-software.org/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-vcs/subversion
+	dev-libs/libpcre
+	sys-libs/gdbm
+	dev-libs/apr-util
+	dev-util/ctags"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-as-needed.patch"
+)
+
+src_prepare() {
+	# fix #570596 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+	default
+}
+
+src_compile() {
+	# respect compiler
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin src/fsvs
+	dodir /etc/fsvs
+	keepdir /var/spool/fsvs
+	doman doc/*5 doc/*1
+	dodoc doc/{FAQ,IGNORING,PERFORMANCE,USAGE}
+}
+
+pkg_postinst() {
+	elog "Remember, this system works best when you're connecting to a remote"
+	elog "svn server."
+	elog
+	elog "Go to the base path for versioning:"
+	elog "    cd /"
+	elog "Tell fsvs which URL it should use:"
+	elog "    fsvs url svn+ssh://username@machine/path/to/repos"
+	elog "Define ignore patterns - all virtual filesystems (/proc, /sys, etc.),"
+	elog "and (assuming that you're in / currently) the temporary files in /tmp:"
+	elog "    fsvs ignore DEVICE:0 ./tmp/*"
+	elog "And you're ready to play!"
+	elog "Check your data in:"
+	elog "    fsvs commit -m \"First import\""
+}
diff --git a/app-admin/fsvs/metadata.xml b/app-admin/fsvs/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/fsvs/metadata.xml
@@ -0,0 +1,5 @@
+<?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/gam-server-0.1.10-r2 b/app-admin/gam-server-0.1.10-r2
deleted file mode 100644
index 69fc60e2c643..000000000000
--- a/app-admin/gam-server-0.1.10-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 !app-admin/fam !<app-admin/gamin-0.1.10 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library providing the FAM File Alteration Monitor API
-EAPI=5
-HOMEPAGE=https://www.gnome.org/~veillard/gamin/
-IUSE=debug kernel_linux
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 !app-admin/fam !<app-admin/gamin-0.1.10
-SLOT=0
-SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 https://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cd343d08056f0003ba853d4c191e4adc
diff --git a/app-admin/gam-server/Manifest b/app-admin/gam-server/Manifest
new file mode 100644
index 000000000000..8e0dc68ac21d
--- /dev/null
+++ b/app-admin/gam-server/Manifest
@@ -0,0 +1,10 @@
+AUX gam-server-0.1.10-G_CONST_RETURN-removal.patch 2470 BLAKE2B d4676b57dc28efba8be335a50a0e8d27c65da0998f6a533cbe89f7cc166eb4a6aee2375b181fdc7596ce60677b675a8597cf177cab0b3655d425a7282f7db849 SHA512 56cf8439d64c3856cc768a0d6aa67e00e82579b0db60b1f25b195024eec1628f61013718f3139910735eafa15e05f4fabe4373ebac053778abb1c89201c6cf0c
+AUX gam-server-0.1.10-armel-features.patch 1490 BLAKE2B 5fa50ed67cd357e5108db27e298f76f0b864f390a4b25d58c968697b67a46e6ad54ef4b799a448e86e44fddd61c90239745f7cbf56deb60e05371e85191fd5b1 SHA512 fe6365489428ca9206a36b8dea495d5c4beb381fe43dd49aa2fa022f8ea34d8068275ce42f41211ef7ce8bb2c1dce952673d4b2e72eec5be00161fa8f8bcb2a5
+AUX gam-server-0.1.10-crosscompile-fix.patch 764 BLAKE2B 7302b238724927ace5753b5103434533e60563e1d74d9ee9762b961d8e36ace465cb081639585dc7124be5bb0fb5c9f80832d1bfc09a3bb61869acec5abdbfca SHA512 11aca975f98d9364bfdd8e28162f922a96493012fb3c6c704115d33155b2a2e9bbd20aba64354db922f16c3589b88a07091590a5bd6aa806582b9b7875ba8e23
+AUX gam-server-0.1.10-ih_sub_cancel-deadlock.patch 2090 BLAKE2B 252b7551ca9ec48af631765ac0413c81c280c478cb9ed5b23efafc07f8c1dccd26305f4688842eed3e587c6bdc19b57c045922158026335e9c6af4abafc57287 SHA512 c0a4a318eb78b9666930e9d1a6fac5e7762f38796e5892d849c893df524310408020ea75fb02a4d79000be3440435ae640340cf2a3dd43fa031df5787762f8de
+AUX gam-server-0.1.10-noinst-lib.patch 2207 BLAKE2B 28ebca731a16fb10c0f186c3eb75d731a18fd72c239a380a7bf97afacab65792003b433c9030e06c8d7748c0dabe84a92bbad8221d40c9fa9d33c6c00b0dd40d SHA512 ba7ce391f4da1a6b4c75941b8440a72f483b6f2597592f64ddca720bf46b1269e64a20a27da9c35b134100a121990d84e28ac737cffef48e90974a017ba3a4cb
+DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fbab69f2417cc089b050a7e245d89701b0703a0916d6dc08a706785ee509ee4feed0375107f777fdf4248ff5f93b SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306
+DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
+DIST pkg-config-0.26.tar.gz 396399 BLAKE2B 5a88cf825d6ad99d198418798b28c779cfd4c0bcfaa023e915a818c141a504c49a6281ea0b2d04a7a9ec89f9924c87f8b1ddaa5a088952715397081383b3528a SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4
+EBUILD gam-server-0.1.10-r2.ebuild 2652 BLAKE2B 766c90d107c0133a11d97054713229138e8e1e371da59147342bf1b58b6766e9f780f6ce407c9ddd887f54f859d04332ea25fc754314223b7fd519a2376b733f SHA512 3ab8af16cd39aba455f12216dbae2c40b79e89876a8a3945bbb8b6d237b232375ec5a5379e504495090507607dbe63b671bd94ecc91fba4721402c26d38e6fd3
+MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-admin/gam-server/files/gam-server-0.1.10-G_CONST_RETURN-removal.patch b/app-admin/gam-server/files/gam-server-0.1.10-G_CONST_RETURN-removal.patch
new file mode 100644
index 000000000000..087312f5baae
--- /dev/null
+++ b/app-admin/gam-server/files/gam-server-0.1.10-G_CONST_RETURN-removal.patch
@@ -0,0 +1,67 @@
+From 2a9d32734a2e5125ae77de6c75789e1c6ee24dbe Mon Sep 17 00:00:00 2001
+From: Maciej Piechotka <uzytkownik2@gmail.com>
+Date: Tue, 13 Sep 2011 09:47:05 +0200
+Subject: [PATCH] Fix compilation of recent glib removing G_CONST_RETURN
+
+---
+ server/gam_node.c         |    2 +-
+ server/gam_node.h         |    2 +-
+ server/gam_subscription.c |    2 +-
+ server/gam_subscription.h |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/server/gam_node.c b/server/gam_node.c
+index 02358ba..d0302d2 100644
+--- a/server/gam_node.c
++++ b/server/gam_node.c
+@@ -122,7 +122,7 @@ gam_node_set_is_dir(GamNode * node, gboolean is_dir)
+  * it has finished with the string.  If it must keep it longer, it
+  * should makes its own copy.  The returned string must not be freed.
+  */
+-G_CONST_RETURN char *
++const char *
+ gam_node_get_path(GamNode * node)
+ {
+     g_assert(node);
+diff --git a/server/gam_node.h b/server/gam_node.h
+index 02c8692..83349a8 100644
+--- a/server/gam_node.h
++++ b/server/gam_node.h
+@@ -58,7 +58,7 @@ gboolean              gam_node_is_dir              (GamNode         *node);
+ void                  gam_node_set_is_dir          (GamNode         *node,
+ 						   gboolean        is_dir);
+ 	
+-G_CONST_RETURN char  *gam_node_get_path            (GamNode         *node);
++const char           *gam_node_get_path            (GamNode         *node);
+ 
+ GList                *gam_node_get_subscriptions   (GamNode         *node);
+ 
+diff --git a/server/gam_subscription.c b/server/gam_subscription.c
+index dfa3273..4675b34 100644
+--- a/server/gam_subscription.c
++++ b/server/gam_subscription.c
+@@ -141,7 +141,7 @@ gam_subscription_pathlen(GamSubscription * sub)
+  * @param sub the GamSubscription
+  * @returns The path being monitored.  It should not be freed.
+  */
+-G_CONST_RETURN char *
++const char *
+ gam_subscription_get_path(GamSubscription * sub)
+ {
+     if (sub == NULL)
+diff --git a/server/gam_subscription.h b/server/gam_subscription.h
+index d894fbe..e6b4e15 100644
+--- a/server/gam_subscription.h
++++ b/server/gam_subscription.h
+@@ -21,7 +21,7 @@ int                  gam_subscription_pathlen      (GamSubscription *sub);
+ 
+ int                  gam_subscription_get_reqno    (GamSubscription *sub);
+ 
+-G_CONST_RETURN char *gam_subscription_get_path     (GamSubscription *sub);
++const char          *gam_subscription_get_path     (GamSubscription *sub);
+ 
+ GamListener         *gam_subscription_get_listener (GamSubscription *sub);
+ 
+-- 
+1.7.6.1
+
diff --git a/app-admin/gam-server/files/gam-server-0.1.10-armel-features.patch b/app-admin/gam-server/files/gam-server-0.1.10-armel-features.patch
new file mode 100644
index 000000000000..fdfcbd7e6db6
--- /dev/null
+++ b/app-admin/gam-server/files/gam-server-0.1.10-armel-features.patch
@@ -0,0 +1,47 @@
+From 05dcfcd69848e119c6a30d363bc41e896029f8af Mon Sep 17 00:00:00 2001
+From: Sebastian Dröge <slomo@debian.org>
+Date: Tue, 15 Dec 2009 12:24:25 +0000
+Subject: Bug 588338 - Enable linux specific features on armel
+
+---
+diff --git a/configure.in b/configure.in
+index b0bbaec..e4b684e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -176,7 +176,7 @@ fi
+ 
+ dnl check what OS we're on
+ #AM_CONDITIONAL(HAVE_LINUX, test x$target_os = xlinux-gnu)
+-if test x$target_os = xlinux-gnu; then
++if test x$target_os = xlinux-gnu -o x$target_os = xlinux-gnueabi; then
+ 	AC_DEFINE([HAVE_LINUX],[],[Whether we are using linux or not])
+ fi
+ 
+@@ -223,7 +223,7 @@ fi
+ dnl check if inotify backend is enabled
+ AM_CONDITIONAL(ENABLE_INOTIFY, test x$inotify = xtrue)
+ 
+-if test x$os = xlinux-gnu; then
++if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi; then
+ 	AC_ARG_ENABLE(dnotify,
+ 		AC_HELP_STRING([--disable-dnotify], [Disable the DNotify backend]),
+ 		[dnotify="${enableval}"], [dnotify=true])
+@@ -297,10 +297,12 @@ else
+ fi
+ 
+ dnl Use weak symbols on linux/gcc to avoid imposing libpthreads to apps
+-if test x$os = xlinux-gnu -a x$WITH_THREADS = x1 ; then
+-    if test "${CC}" = "gcc" ; then
+-        echo Use weak symbols !
+-        THREAD_LIBS=
++if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi ; then
++    if test x$WITH_THREADS = x1 ; then
++      if test "${CC}" = "gcc" ; then
++          echo Use weak symbols !
++          THREAD_LIBS=
++      fi
+     fi
+ fi	
+ AC_SUBST(THREAD_LIBS)
+--
+cgit v0.9.0.2
diff --git a/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch b/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch
new file mode 100644
index 000000000000..ce3a15b5e160
--- /dev/null
+++ b/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch
@@ -0,0 +1,38 @@
+--- configure.in.orig	2009-04-26 23:00:43.445135823 +0300
++++ configure.in	2009-04-26 23:25:04.042489243 +0300
+@@ -389,8 +389,7 @@
+ 
+ AC_MSG_CHECKING(abstract socket namespace)
+ AC_LANG_PUSH(C)
+-AC_RUN_IFELSE([AC_LANG_PROGRAM(
+-[[
++AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -398,8 +397,8 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <errno.h>
+-]],
+-[[
++
++int main() {
+   int listen_fd;
+   struct sockaddr_un addr;
+   
+@@ -424,9 +423,11 @@
+     }
+   else 
+     exit (0);
+-]])],
+-              [have_abstract_sockets=yes],
+-              [have_abstract_sockets=no])
++}
++],
++have_abstract_sockets=yes,
++have_abstract_sockets=no,
++have_abstract_sockets=no)
+ AC_LANG_POP(C)
+ AC_MSG_RESULT($have_abstract_sockets)
+ 
diff --git a/app-admin/gam-server/files/gam-server-0.1.10-ih_sub_cancel-deadlock.patch b/app-admin/gam-server/files/gam-server-0.1.10-ih_sub_cancel-deadlock.patch
new file mode 100644
index 000000000000..9f2b2a5150bd
--- /dev/null
+++ b/app-admin/gam-server/files/gam-server-0.1.10-ih_sub_cancel-deadlock.patch
@@ -0,0 +1,65 @@
+From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001
+From: Anssi Hannula <anssi@mageia.org>
+Date: Wed, 4 Jan 2012 00:23:55 +0200
+Subject: [PATCH] fix possible server deadlock in ih_sub_cancel
+
+ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked.
+However, ih_sub_cancel() locks it again, and locking GMutex recursively
+causes undefined behaviour.
+
+Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach()
+is its only user. Also make the function static so that it won't
+accidentally get used by other files without locking (inotify-helper.h
+is an internal server header).
+
+This should fix the intermittent deadlocks I've been experiencing
+causing KDE applications to no longer start, and probably also
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
+---
+ server/inotify-helper.c |    7 ++-----
+ server/inotify-helper.h |    1 -
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/server/inotify-helper.c b/server/inotify-helper.c
+index d77203e..0789fa4 100644
+--- a/server/inotify-helper.c
++++ b/server/inotify-helper.c
+@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub)
+ 
+ /**
+  * Cancels a subscription which was being monitored.
++ * inotify_lock must be held when calling.
+  */
+-gboolean
++static gboolean
+ ih_sub_cancel (ih_sub_t * sub)
+ {
+-	G_LOCK(inotify_lock);
+-
+-
+ 	if (!sub->cancelled)
+ 	{
+ 		IH_W("cancelling %s\n", sub->pathname);
+@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub)
+ 		sub_list = g_list_remove (sub_list, sub);
+ 	}
+ 
+-	G_UNLOCK(inotify_lock);
+ 	return TRUE;
+ }
+ 
+diff --git a/server/inotify-helper.h b/server/inotify-helper.h
+index 5d3b6d0..d36b5fd 100644
+--- a/server/inotify-helper.h
++++ b/server/inotify-helper.h
+@@ -34,7 +34,6 @@ gboolean	 ih_startup		(event_callback_t ecb,
+ 					 found_callback_t fcb);
+ gboolean	 ih_running		(void);
+ gboolean	 ih_sub_add		(ih_sub_t *sub);
+-gboolean	 ih_sub_cancel		(ih_sub_t *sub);
+ 
+ /* Return FALSE from 'f' if the subscription should be cancelled */
+ void		 ih_sub_foreach		(void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata));
+-- 
+1.7.7.2
+
diff --git a/app-admin/gam-server/files/gam-server-0.1.10-noinst-lib.patch b/app-admin/gam-server/files/gam-server-0.1.10-noinst-lib.patch
new file mode 100644
index 000000000000..1f2fcff6f5b4
--- /dev/null
+++ b/app-admin/gam-server/files/gam-server-0.1.10-noinst-lib.patch
@@ -0,0 +1,76 @@
+From e68aacc084d65fd0780991265444061b24422bd0 Mon Sep 17 00:00:00 2001
+From: Remi Cardona <remi@gentoo.org>
+Date: Mon, 20 Oct 2008 19:17:36 +0200
+Subject: [PATCH] make libgamin_shared a "noinst" libtool helper lib
+
+---
+ lib/Makefile.am      |    4 ++--
+ libgamin/Makefile.am |   15 ++-------------
+ server/Makefile.am   |    2 +-
+ 3 files changed, 5 insertions(+), 16 deletions(-)
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 3e2289c..af2152a 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -7,9 +7,9 @@ if GAMIN_DEBUG
+ INCLUDES += -DGAM_DEBUG_ENABLED
+ endif
+ 
+-lib_LIBRARIES = libgamin_shared.a
++noinst_LTLIBRARIES = libgamin_shared.la
+ 
+-libgamin_shared_a_SOURCES =				\
++libgamin_shared_la_SOURCES =				\
+ 	gam_event.c					\
+ 	gam_event.h					\
+ 	gam_error.c					\
+diff --git a/libgamin/Makefile.am b/libgamin/Makefile.am
+index 35aa740..14fc06b 100644
+--- a/libgamin/Makefile.am
++++ b/libgamin/Makefile.am
+@@ -25,19 +25,9 @@ libgamin_1_la_SOURCES =					\
+ 	gam_data.h					\
+ 	gam_fork.c					\
+ 	gam_fork.h					\
+-	gam_protocol.h					\
+-	gam_error.c					\
+-	gam_event.c
++	gam_protocol.h
+ 
+-gam_error.c: $(top_srcdir)/lib/gam_error.c
+-	@(cp $(top_srcdir)/lib/gam_error.c gam_error.c)
+-
+-gam_event.c: $(top_srcdir)/lib/gam_event.c
+-	@(cp $(top_srcdir)/lib/gam_event.c gam_event.c)
+-
+-CLEANFILES=gam_error.c gam_event.c
+-
+-libgamin_1_la_LIBADD =
++libgamin_1_la_LIBADD = $(top_builddir)/lib/libgamin_shared.la
+ 
+ libgamin_1_la_LDFLAGS = -Wl,--version-script=$(srcdir)/gamin_sym.version \
+                         -version-info @GAMIN_VERSION_INFO@ @THREAD_LIBS@
+@@ -54,6 +44,5 @@ noinst_PROGRAMS= gamin
+ 
+ gamin_SOURCES = gamin.c
+ gamin_LDFLAGS =
+-gamin_DEPENDENCIES = $(DEPS) libgamin-1.la
+ gamin_LDADD= $(LDADDS) libgamin-1.la
+ 
+diff --git a/server/Makefile.am b/server/Makefile.am
+index 37aed8b..6aa5e02 100644
+--- a/server/Makefile.am
++++ b/server/Makefile.am
+@@ -80,7 +80,7 @@ endif
+ 
+ gam_server_LDFLAGS =
+ gam_server_DEPENDENCIES = $(DEPS)
+-gam_server_LDADD= $(top_builddir)/lib/libgamin_shared.a $(LDADDS) $(DAEMON_LIBS)
++gam_server_LDADD= $(top_builddir)/lib/libgamin_shared.la $(LDADDS) $(DAEMON_LIBS)
+ 
+ if ENABLE_HURD_MACH_NOTIFY
+ gam_server_LDADD += -lports -lthreads
+-- 
+1.6.0.2
+
diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
new file mode 100644
index 000000000000..856dcad4185f
--- /dev/null
+++ b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GNOME_ORG_MODULE="gamin"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit autotools eutils flag-o-matic libtool multilib gnome.org
+
+DESCRIPTION="Library providing the FAM File Alteration Monitor API"
+HOMEPAGE="https://www.gnome.org/~veillard/gamin/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
+	https://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
+IUSE="debug kernel_linux"
+
+RDEPEND=">=dev-libs/glib-2:2
+	>=dev-libs/libgamin-0.1.10
+	!app-admin/fam
+	!<app-admin/gamin-0.1.10"
+
+DEPEND="${RDEPEND}"
+
+#S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
+
+	# Fix compile warnings; bug #188923
+	epatch "${DISTDIR}/gamin-0.1.9-freebsd.patch.bz2"
+
+	# Fix file-collision due to shared library, upstream bug #530635
+	epatch "${FILESDIR}/${PN}-0.1.10-noinst-lib.patch"
+
+	# Fix compilation with latest glib, bug #382783
+	epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch"
+
+	# Fix crosscompilation issues, bug #267604
+	epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch"
+
+	# Enable linux specific features on armel, upstream bug #588338
+	epatch "${FILESDIR}/${P}-armel-features.patch"
+
+	# Fix deadlocks with glib-2.32, bug #413331, upstream #667230
+	epatch "${FILESDIR}/${P}-ih_sub_cancel-deadlock.patch"
+
+	# Drop DEPRECATED flags
+	sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
+
+	sed -i \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+		configure.in || die #466948
+
+	# autoconf is required as the user-cflags patch modifies configure.in
+	# however, elibtoolize is also required, so when the above patch is
+	# removed, replace the following call with a call to elibtoolize
+	AT_M4DIR="${WORKDIR}" eautoreconf
+}
+
+src_configure() {
+	# fixes bug 225403
+	#append-flags "-D_GNU_SOURCE"
+
+	# Solaris' patchs adds this to configure, but it conflicts with
+	# Gentoo's FreeBSD patch.
+	[[ ${CHOST} == *-solaris* ]] && append-libs socket nsl
+
+	if ! has_version virtual/pkgconfig; then
+		export DAEMON_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+		export DAEMON_LIBS="-lglib-2.0"
+	fi
+
+	econf \
+		--disable-debug \
+		--disable-libgamin \
+		--without-python \
+		$(use_enable kernel_linux inotify) \
+		$(use_enable debug debug-api)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}
diff --git a/app-admin/gam-server/metadata.xml b/app-admin/gam-server/metadata.xml
new file mode 100644
index 000000000000..f3cab85cf603
--- /dev/null
+++ b/app-admin/gam-server/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>freedesktop-bugs@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-admin/gamin-0.1.10-r1 b/app-admin/gamin-0.1.10-r1
deleted file mode 100644
index 7bab0dcf3b54..000000000000
--- a/app-admin/gamin-0.1.10-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package providing the File Alteration Monitor API & Server
-EAPI=5
-HOMEPAGE=https://www.gnome.org/~veillard/gamin/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2
-PDEPEND=>=app-admin/gam-server-0.1.10
-RDEPEND=!app-admin/fam >=dev-libs/libgamin-0.1.10-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f7a79d64e1e14b49130a7281f64e4854
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
new file mode 100644
index 000000000000..33eab152fba7
--- /dev/null
+++ b/app-admin/gamin/Manifest
@@ -0,0 +1,2 @@
+EBUILD gamin-0.1.10-r1.ebuild 615 BLAKE2B 68247a3c711fb6c343d02d8c0bed5248a5c1eac05df2458cfa52a8025bf26cc9c5f7c17e887e18aa7554564e845a6a57866a9ee526ec191726bd6755e8540507 SHA512 4103ebc7f6a5a64ac7a1625ac7f468c61f4612ae82a5838a74c243c6abfe6dd761acc3ae7b80992f81c2405a3ecb644be6c218d96593bcd33e61db3a8277c45b
+MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/app-admin/gamin/gamin-0.1.10-r1.ebuild b/app-admin/gamin/gamin-0.1.10-r1.ebuild
new file mode 100644
index 000000000000..141ea5442b52
--- /dev/null
+++ b/app-admin/gamin/gamin-0.1.10-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib-build
+
+DESCRIPTION="Meta package providing the File Alteration Monitor API & Server"
+HOMEPAGE="https://www.gnome.org/~veillard/gamin/"
+SRC_URI=""
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!app-admin/fam
+	>=dev-libs/libgamin-0.1.10-r4[${MULTILIB_USEDEP}]"
+DEPEND=""
+
+PDEPEND=">=app-admin/gam-server-0.1.10"
diff --git a/app-admin/gamin/metadata.xml b/app-admin/gamin/metadata.xml
new file mode 100644
index 000000000000..fb76b944f2da
--- /dev/null
+++ b/app-admin/gamin/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>freedesktop-bugs@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/genromfs-0.5.2 b/app-admin/genromfs-0.5.2
deleted file mode 100644
index 9cc7e555a017..000000000000
--- a/app-admin/genromfs-0.5.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile prepare
-DESCRIPTION=Create space-efficient, small, read-only romfs filesystems
-EAPI=4
-HOMEPAGE=http://romfs.sourceforge.net/
-KEYWORDS=amd64 arm64 ppc ~ppc64 s390 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/genromfs/genromfs-0.5.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=889d8ebf2e449070f4f3352728304c05
diff --git a/app-admin/genromfs/Manifest b/app-admin/genromfs/Manifest
new file mode 100644
index 000000000000..6a75dd3241b0
--- /dev/null
+++ b/app-admin/genromfs/Manifest
@@ -0,0 +1,4 @@
+AUX genromfs-0.5.2-build.patch 547 BLAKE2B c8963e68e03b0e559ea422ed9d0589f600eca3de18c69af68e11f40606e93f6a0045f440146eaece5e5a30562532e54d719d10fdabaf36a0d4fdabf3ea235aad SHA512 b4d0f162c5605f0dedef2a08c0f6abe0ffc78e66dd74d2b8f2df33bcc190b002384e0f2c1394502564906553412aa8ab688d359ba435f6c43af5abae1d9970e3
+DIST genromfs-0.5.2.tar.gz 21069 BLAKE2B 350ebf11b8ef068053217b75ac995af1199e4c4c11823df584e8169c260dbd851d4f44ba6d23ac1f5f4cd9c2ca7ae7fd268d02ba19529da90003a697efc3e06a SHA512 7fa2f362e4a61ab38f5262fc5a716119312d3029f93cf0a514313c5a3c956d687d777a826da2f4ad95edaf5eab014464635b0afbaaa11f9b495efb6f03fbec2f
+EBUILD genromfs-0.5.2.ebuild 568 BLAKE2B f990cb38e32ab90ccef01cf558ab5efa73798f63bf548045ce0494c26f8739d746a34b549be03dc09eb8c1d341b50673ae4da8c53fc4540c359086f6a7450d44 SHA512 50b3278bcb738b0a64ed6111299c184e9145f58dd7adccf42ce5b30cf1e1163e1e78d61dce36e6e49859db06ecfb7cf417b62132c41e8b27b251cebe271570d6
+MISC metadata.xml 349 BLAKE2B cab4bb0ef305ad6a0aa43ebfc701ec8b515f05cd3ff9bfe7ed518b4b8e5fcb239a6ac4b7ef719f3c394412ffb8eed203b7d66cbf89f5af7535fade7222dca7b1 SHA512 b86036d8e4288d5ae248bab2335ae74715950c2a6baf385c23b711a4700232961e504dcded46f39b57a520589e83c79c48111fa8c9635a63298acdcf21381912
diff --git a/app-admin/genromfs/files/genromfs-0.5.2-build.patch b/app-admin/genromfs/files/genromfs-0.5.2-build.patch
new file mode 100644
index 000000000000..1fbc29fb7d5c
--- /dev/null
+++ b/app-admin/genromfs/files/genromfs-0.5.2-build.patch
@@ -0,0 +1,28 @@
+--- Makefile
++++ Makefile
+@@ -5,9 +5,10 @@
+ 
+ PACKAGE = genromfs
+ VERSION = 0.5.2
+-CC = gcc
+-CFLAGS = -O2 -Wall -DVERSION=\"$(VERSION)\"#-g#
+-LDFLAGS = -s#-g
++CC ?= gcc
++CFLAGS ?= -O2
++CFLAGS += -Wall -DVERSION=\"$(VERSION)\"#-g#
++LDFLAGS ?= -s#-g
+ 
+ DISTDIR = $(PACKAGE)-$(VERSION)
+ 
+@@ -16,9 +17,9 @@
+  readme-kernel-patch genrommkdev romfs.txt \
+  checkdist
+ 
+-prefix = /usr
++prefix = $(DESTDIR)/usr
+ bindir = $(prefix)/bin
+-mandir = $(prefix)/man
++mandir = $(prefix)/share/man
+ 
+ genromfs: genromfs.o
+ 	$(CC) $(LDFLAGS) genromfs.o -o genromfs
diff --git a/app-admin/genromfs/genromfs-0.5.2.ebuild b/app-admin/genromfs/genromfs-0.5.2.ebuild
new file mode 100644
index 000000000000..3b3fd2b0b57b
--- /dev/null
+++ b/app-admin/genromfs/genromfs-0.5.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Create space-efficient, small, read-only romfs filesystems"
+HOMEPAGE="http://romfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm64 ppc ~ppc64 s390 x86"
+IUSE=""
+
+DOCS=( ChangeLog NEWS genromfs.lsm genrommkdev readme-kernel-patch romfs.txt )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
diff --git a/app-admin/genromfs/metadata.xml b/app-admin/genromfs/metadata.xml
new file mode 100644
index 000000000000..cf9dbee3a273
--- /dev/null
+++ b/app-admin/genromfs/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>A readonly filesystem designed to be small and very space
+	efficent</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">genromfs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/gentoo-perl-helpers-0.1.0 b/app-admin/gentoo-perl-helpers-0.1.0
deleted file mode 100644
index 30c20c3f8608..000000000000
--- a/app-admin/gentoo-perl-helpers-0.1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Introspection and Upgrade Assistance tools for Gentoo Perl
-EAPI=6
-HOMEPAGE=https://github.com/gentoo-perl/gentoo-perl-helpers
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-portage/portage-utils sys-apps/portage
-SLOT=0
-SRC_URI=https://github.com/gentoo-perl/gentoo-perl-helpers/releases/download/0.1.0/gentoo-perl-helpers-0.1.0.tar.xz
-_md5_=7b57ed9354ed87f4fff9a49e512389cc
diff --git a/app-admin/gentoo-perl-helpers-0.2.0 b/app-admin/gentoo-perl-helpers-0.2.0
deleted file mode 100644
index 4b944a6922a8..000000000000
--- a/app-admin/gentoo-perl-helpers-0.2.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Introspection and Upgrade Assistance tools for Gentoo Perl
-EAPI=6
-HOMEPAGE=https://github.com/gentoo-perl/gentoo-perl-helpers
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-portage/portage-utils sys-apps/portage
-SLOT=0
-SRC_URI=https://github.com/gentoo-perl/gentoo-perl-helpers/releases/download/0.2.0/gentoo-perl-helpers-0.2.0.tar.xz mirror://gentoo/gentoo-perl-helpers-0.2.0.tar.xz https://dev.gentoo.org/~kentnl/distfiles/gentoo-perl-helpers-0.2.0.tar.xz
-_md5_=b2d45eb3d17f8b2f1fba355fa421c75a
diff --git a/app-admin/gentoo-perl-helpers-0.2.1 b/app-admin/gentoo-perl-helpers-0.2.1
deleted file mode 100644
index cd591ff2b10a..000000000000
--- a/app-admin/gentoo-perl-helpers-0.2.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Introspection and Upgrade Assistance tools for Gentoo Perl
-EAPI=6
-HOMEPAGE=https://github.com/gentoo-perl/gentoo-perl-helpers
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-portage/portage-utils sys-apps/portage
-SLOT=0
-SRC_URI=https://github.com/gentoo-perl/gentoo-perl-helpers/releases/download/0.2.1/gentoo-perl-helpers-0.2.1.tar.xz mirror://gentoo/gentoo-perl-helpers-0.2.1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/gentoo-perl-helpers-0.2.1.tar.xz
-_md5_=e47771649f086fd1c80af23364003cef
diff --git a/app-admin/gentoo-perl-helpers-0.2.2-r1 b/app-admin/gentoo-perl-helpers-0.2.2-r1
deleted file mode 100644
index b8b0124fe79e..000000000000
--- a/app-admin/gentoo-perl-helpers-0.2.2-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Introspection and Upgrade Assistance tools for Gentoo Perl
-EAPI=6
-HOMEPAGE=https://github.com/gentoo-perl/gentoo-perl-helpers
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=app-portage/portage-utils-0.60 sys-apps/portage
-SLOT=0
-SRC_URI=https://github.com/gentoo-perl/gentoo-perl-helpers/releases/download/0.2.2/gentoo-perl-helpers-0.2.2.tar.xz mirror://gentoo/gentoo-perl-helpers-0.2.2.tar.xz https://dev.gentoo.org/~kentnl/distfiles/gentoo-perl-helpers-0.2.2.tar.xz
-_md5_=d298dc70bc9c4b34c72857fcaf6d02bf
diff --git a/app-admin/gentoo-perl-helpers-0.3.0 b/app-admin/gentoo-perl-helpers-0.3.0
deleted file mode 100644
index 5173481bce5a..000000000000
--- a/app-admin/gentoo-perl-helpers-0.3.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Introspection and Upgrade Assistance tools for Gentoo Perl
-EAPI=6
-HOMEPAGE=https://github.com/gentoo-perl/gentoo-perl-helpers
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=app-portage/portage-utils-0.60 sys-apps/portage
-SLOT=0
-SRC_URI=https://github.com/gentoo-perl/gentoo-perl-helpers/releases/download/0.3.0/gentoo-perl-helpers-0.3.0.tar.xz mirror://gentoo/gentoo-perl-helpers-0.3.0.tar.xz https://dev.gentoo.org/~kentnl/distfiles/gentoo-perl-helpers-0.3.0.tar.xz
-_md5_=d298dc70bc9c4b34c72857fcaf6d02bf
diff --git a/app-admin/gentoo-perl-helpers-0.3.1-r1 b/app-admin/gentoo-perl-helpers-0.3.1-r1
deleted file mode 100644
index e57c09fd5816..000000000000
--- a/app-admin/gentoo-perl-helpers-0.3.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Introspection and Upgrade Assistance tools for Gentoo Perl
-EAPI=6
-HOMEPAGE=https://github.com/gentoo-perl/gentoo-perl-helpers
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=app-portage/portage-utils-0.60 || ( sys-apps/portage sys-apps/portage-mgorny )
-SLOT=0
-SRC_URI=https://github.com/gentoo-perl/gentoo-perl-helpers/releases/download/0.3.1/gentoo-perl-helpers-0.3.1.tar.xz mirror://gentoo/gentoo-perl-helpers-0.3.1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/gentoo-perl-helpers-0.3.1.tar.xz
-_md5_=7dad2a785280e052ae83af8e01c3400d
diff --git a/app-admin/gentoo-perl-helpers/Manifest b/app-admin/gentoo-perl-helpers/Manifest
new file mode 100644
index 000000000000..28f21be4aace
--- /dev/null
+++ b/app-admin/gentoo-perl-helpers/Manifest
@@ -0,0 +1,13 @@
+DIST gentoo-perl-helpers-0.1.0.tar.xz 6692 BLAKE2B 46484aa35203d5bfd03a7bbeea12cb598842cf569502a03c94319d6b5399cfc8b1d1789eaf6e2d6e7c213d6d93b275b5a54f8a52d092d1e599a5d508d4637572 SHA512 929921c4584d990b53163413b58d4fd7a8868073c03095e90914c3565e65d5ee3e86e2c5269079b4c683c9db6fe5e035358539f62091fbc24af818e6330d414b
+DIST gentoo-perl-helpers-0.2.0.tar.xz 8876 BLAKE2B ccfcddfe3356b972c78900508fee3c1510623d42299a2558439a645cca3a6c74432b52b7f1366a1a322d04848cb081a5d49e439ef3905ec4c99c00e88191aec3 SHA512 f9c534436dc3ad7bc2c50e47491ef3a76bf949e2065c182391b3526e259ce93e9eb4ef1b9d981d6dbf3924394150b90ee6460f51f67d79505039b826af374d95
+DIST gentoo-perl-helpers-0.2.1.tar.xz 8904 BLAKE2B 8fb93a47beaef233a10c065368dcdee01d1b99340d710f0954210805af95b642b9728d5b725965d06c2b06eb7872ca2d0584d6679bc56d6557617a13bb0d5984 SHA512 f2815f0bc893faa815482333c79da0ea81eedb0919d9eec9d2403e0f6d886fa28561221a4f1b4b9d48b6182dea37a02ab79fcea2322a837817948428146a5ba3
+DIST gentoo-perl-helpers-0.2.2.tar.xz 9096 BLAKE2B fe53c1fc2742c256b5a62188f82ac257df9a67ddde95ce8ad760976cfb0bba956aebb915388b22ebe2899546a24dec1385a07521405758fbd7e14112cdf0e32e SHA512 97653cbcff01cb65b5aa8b5e56ecdafedddfed773b8f41120707066d8c3d837634b9d2996eeed069cf434175684ac38a0e829719dd88a3bfd14e2e0ab6f80a14
+DIST gentoo-perl-helpers-0.3.0.tar.xz 9392 BLAKE2B ef20955add23d834f85781c90de3c8d439c9659dca330a444a6041a0e1c99ca7a378bf88425f4ca021d4ef607fbffe0d7a6e43a92085f8d488179114b2d23a37 SHA512 3feaf287457d0b4fa29cc58878566b38674b0c112ba356727bbce2bcff9b9cca07cec34cfb960260a0a32542c43611b783f74ee4127c9c0aa33843a144544c13
+DIST gentoo-perl-helpers-0.3.1.tar.xz 9420 BLAKE2B dea001473832f4412ae090afbc458720ec1d40d19ac3db3a6a57b26115603f224f2f1c4155ecd3190866dfa0ab648fdd3a98a90e9ed576e7bd3ad8bdaf9a73c6 SHA512 dce6addfebbdfd16da3b580776c34346eb60b2eaef9cc7bed03d5ae0bf028de7a0175fbf7f68113d44b645c3d5ca7f5175389478655b08c115a5342ff930e096
+EBUILD gentoo-perl-helpers-0.1.0.ebuild 1055 BLAKE2B 9e9ea153fe4ca9d8e34492bf34ba30563326cd5d72052fe2ec2d2be795607f69f873f4b13739462f711486ebf9186db7014e576a211274148e45e950febef67f SHA512 78c626c5652693877c5cbeca909ecc2e93a798af83b1b6fef70b7be0a41b2e8ada39b752fe0c982670eb7cfc77525d94fe5c5294725848d339dba8d3b96adcd1
+EBUILD gentoo-perl-helpers-0.2.0.ebuild 1218 BLAKE2B 4baf35b2b995c5bacf1cccc464e752070f32ff2c9dd1bebedc25bbbcab2e7a26bfcb4f3ecb61f003874a74e6b6aea18d21cc569350b13fd2f23468683f42ac45 SHA512 6a3381deac08ecca97f24f3ff2d8582658998167d18f6267a2ea83eb312b433c37803e3004038e02a2085e853f840cbb8ed1b6135db7d7abb68260ff9f962324
+EBUILD gentoo-perl-helpers-0.2.1.ebuild 1225 BLAKE2B b8ae3e131353a8da9c3194ce8bae01c5c2d4593b3c842cfdf5acd15d0e99098056c16e9462b9eaf1e4c531bd4b512f951becf87742a00931baa8dba8302c62d3 SHA512 60a21a692d621e44e0592576112d66ba14fc01b86874678ff56ee843cc27dbf1ca95d849b6aec6040ee76e0a58add2d07445d2be9be4293e61821464f1c4e426
+EBUILD gentoo-perl-helpers-0.2.2-r1.ebuild 1255 BLAKE2B 117575619f67a68822e1e3f349447befc0f9b3e3b312297f1ba91a136904d4afb730eea2a170ba660a6441ccfdc92c8f44b42cdab7911e433a69b9499e94cf70 SHA512 62e682d07a9d61746378e7f56adcf7bf624b1f41a30065b2fb246ca008d39876cb03152bbbc23d5225895ff735d5479f53125d4b8f428eda6b8a7dfe2049673c
+EBUILD gentoo-perl-helpers-0.3.0.ebuild 1255 BLAKE2B 117575619f67a68822e1e3f349447befc0f9b3e3b312297f1ba91a136904d4afb730eea2a170ba660a6441ccfdc92c8f44b42cdab7911e433a69b9499e94cf70 SHA512 62e682d07a9d61746378e7f56adcf7bf624b1f41a30065b2fb246ca008d39876cb03152bbbc23d5225895ff735d5479f53125d4b8f428eda6b8a7dfe2049673c
+EBUILD gentoo-perl-helpers-0.3.1-r1.ebuild 1291 BLAKE2B d76e24b40ae645f75ca7108911f458ed28c855e4f05129c08cd7425be14f513b03066dbbae4e9594106b15b1105049b9052ee26aed26d4d5932a37c327cfbf72 SHA512 b3a6dd3eb1698d8549b71ae7503d3bc9c33ad034bb54562f20becfdd856b0f3921e1d74e1d5df8be9fd8cf25e89f7ffbca5a6f2beea7de0704e5028aef3496d6
+MISC metadata.xml 453 BLAKE2B 0a9ea49a54e1b0ac4c4d98615b15251770556bfe672eea650b8b52ac7dc9a0492d3456b894b8724c033aa272567bb0c7ad4847451ed3f29fd5aa365ea2e2d315 SHA512 a32d375d6aa0ac38a20cdec805c887be0d6493be5d47572a0e950e1f4a8b28018ab364cd06668ff59c52fe89487853c9c4bffdf05b79913c691d99fdc848b201
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.1.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.1.0.ebuild
new file mode 100644
index 000000000000..a5dad27b3230
--- /dev/null
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
+HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
+SRC_URI="https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Assumed System:
+# sys-apps/coreutils
+# sys-apps/grep
+# sys-apps/findutils
+# sys-apps/sed
+# app-shells/bash
+
+RDEPEND="
+	app-portage/portage-utils
+	sys-apps/portage
+"
+DEPEND=""
+
+S="${WORKDIR}"
+src_prepare() {
+	sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" 		\
+		   -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
+		   "${S}/bin/gentoo-perl"			|| die "Can't patch bin/gentoo-perl"
+	default
+}
+src_compile() { :; }
+src_install() {
+	exeinto /usr/bin
+	doexe "${S}/bin/"*
+
+	exeinto /usr/libexec/gentoo-perl-helpers
+	doexe "${S}/libexec/"*
+
+	insinto /usr/lib/gentoo-perl-helpers
+	doins "${S}/lib/"*
+
+	dodoc "${S}/README.mkdn"
+}
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.0.ebuild
new file mode 100644
index 000000000000..4a2b5e0ef725
--- /dev/null
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
+HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
+SRC_URI="
+	https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~kentnl/distfiles/${P}.tar.xz
+"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Assumed System:
+# sys-apps/coreutils
+# sys-apps/grep
+# sys-apps/findutils
+# sys-apps/sed
+# app-shells/bash
+# sys-apps/gawk
+# app-arch/tar
+
+RDEPEND="
+	app-portage/portage-utils
+	sys-apps/portage
+"
+DEPEND=""
+
+src_prepare() {
+	sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" 		\
+		   -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
+		   "${S}/bin/gentoo-perl"			\
+		   "${S}/lib/core-functions.sh"		\
+		   || die "Can't patch bin/gentoo-perl"
+	default
+}
+src_compile() { :; }
+src_install() {
+	exeinto /usr/bin
+	doexe "${S}/bin/"*
+
+	exeinto /usr/libexec/gentoo-perl-helpers
+	doexe "${S}/libexec/"*
+
+	insinto /usr/lib/gentoo-perl-helpers
+	doins -r "${S}/lib/"*
+
+	dodoc "${S}/README.mkdn" "${S}/Changes"
+}
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.1.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.1.ebuild
new file mode 100644
index 000000000000..573d0e36bc7c
--- /dev/null
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
+HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
+SRC_URI="
+	https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~kentnl/distfiles/${P}.tar.xz
+"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# Assumed System:
+# sys-apps/coreutils
+# sys-apps/grep
+# sys-apps/findutils
+# sys-apps/sed
+# app-shells/bash
+# sys-apps/gawk
+# app-arch/tar
+
+RDEPEND="
+	app-portage/portage-utils
+	sys-apps/portage
+"
+DEPEND=""
+
+src_prepare() {
+	sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" 		\
+		   -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
+		   "${S}/bin/gentoo-perl"			\
+		   "${S}/lib/core-functions.sh"		\
+		   || die "Can't patch bin/gentoo-perl"
+	default
+}
+src_compile() { :; }
+src_install() {
+	exeinto /usr/bin
+	doexe "${S}/bin/"*
+
+	exeinto /usr/libexec/gentoo-perl-helpers
+	doexe "${S}/libexec/"*
+
+	insinto /usr/lib/gentoo-perl-helpers
+	doins -r "${S}/lib/"*
+
+	dodoc "${S}/README.mkdn" "${S}/Changes"
+}
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.2-r1.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..b725db35e2e2
--- /dev/null
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
+HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
+SRC_URI="
+	https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~kentnl/distfiles/${P}.tar.xz
+"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# Assumed System:
+# sys-apps/coreutils
+# sys-apps/grep
+# sys-apps/findutils
+# sys-apps/sed
+# app-shells/bash
+# sys-apps/gawk
+# app-arch/tar
+
+RDEPEND="
+	$(: --format support)
+	>=app-portage/portage-utils-0.60
+	sys-apps/portage
+"
+DEPEND=""
+
+src_prepare() {
+	sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" 		\
+		   -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
+		   "${S}/bin/gentoo-perl"			\
+		   "${S}/lib/core-functions.sh"		\
+		   || die "Can't patch bin/gentoo-perl"
+	default
+}
+src_compile() { :; }
+src_install() {
+	exeinto /usr/bin
+	doexe "${S}/bin/"*
+
+	exeinto /usr/libexec/gentoo-perl-helpers
+	doexe "${S}/libexec/"*
+
+	insinto /usr/lib/gentoo-perl-helpers
+	doins -r "${S}/lib/"*
+
+	dodoc "${S}/README.mkdn" "${S}/Changes"
+}
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.0.ebuild
new file mode 100644
index 000000000000..b725db35e2e2
--- /dev/null
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
+HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
+SRC_URI="
+	https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~kentnl/distfiles/${P}.tar.xz
+"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# Assumed System:
+# sys-apps/coreutils
+# sys-apps/grep
+# sys-apps/findutils
+# sys-apps/sed
+# app-shells/bash
+# sys-apps/gawk
+# app-arch/tar
+
+RDEPEND="
+	$(: --format support)
+	>=app-portage/portage-utils-0.60
+	sys-apps/portage
+"
+DEPEND=""
+
+src_prepare() {
+	sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" 		\
+		   -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
+		   "${S}/bin/gentoo-perl"			\
+		   "${S}/lib/core-functions.sh"		\
+		   || die "Can't patch bin/gentoo-perl"
+	default
+}
+src_compile() { :; }
+src_install() {
+	exeinto /usr/bin
+	doexe "${S}/bin/"*
+
+	exeinto /usr/libexec/gentoo-perl-helpers
+	doexe "${S}/libexec/"*
+
+	insinto /usr/lib/gentoo-perl-helpers
+	doins -r "${S}/lib/"*
+
+	dodoc "${S}/README.mkdn" "${S}/Changes"
+}
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..345b7fdce83a
--- /dev/null
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
+HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
+SRC_URI="
+	https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~kentnl/distfiles/${P}.tar.xz
+"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# Assumed System:
+# sys-apps/coreutils
+# sys-apps/grep
+# sys-apps/findutils
+# sys-apps/sed
+# app-shells/bash
+# sys-apps/gawk
+# app-arch/tar
+
+RDEPEND="
+	$(: --format support)
+	>=app-portage/portage-utils-0.60
+	|| (
+		sys-apps/portage
+		sys-apps/portage-mgorny
+	)
+"
+DEPEND=""
+
+src_prepare() {
+	sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" 		\
+		   -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
+		   "${S}/bin/gentoo-perl"			\
+		   "${S}/lib/core-functions.sh"		\
+		   || die "Can't patch bin/gentoo-perl"
+	default
+}
+src_compile() { :; }
+src_install() {
+	exeinto /usr/bin
+	doexe "${S}/bin/"*
+
+	exeinto /usr/libexec/gentoo-perl-helpers
+	doexe "${S}/libexec/"*
+
+	insinto /usr/lib/gentoo-perl-helpers
+	doins -r "${S}/lib/"*
+
+	dodoc "${S}/README.mkdn" "${S}/Changes"
+}
diff --git a/app-admin/gentoo-perl-helpers/metadata.xml b/app-admin/gentoo-perl-helpers/metadata.xml
new file mode 100644
index 000000000000..ddfded172487
--- /dev/null
+++ b/app-admin/gentoo-perl-helpers/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kentnl@gentoo.org</email>
+		<name>Kent Fredric</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gentoo-perl/gentoo-perl-helpers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/gentoo-rsync-mirror-1.0-r5 b/app-admin/gentoo-rsync-mirror-1.0-r5
deleted file mode 100644
index 50ddd1303e82..000000000000
--- a/app-admin/gentoo-rsync-mirror-1.0-r5
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Ebuild for setting up a Gentoo rsync mirror
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Infrastructure/Rsync
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-_md5_=d04a092f456dae27a6b2c43936b9a59b
diff --git a/app-admin/gentoo-rsync-mirror/Manifest b/app-admin/gentoo-rsync-mirror/Manifest
new file mode 100644
index 000000000000..a57febeafe89
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/Manifest
@@ -0,0 +1,7 @@
+AUX gentoo-mirror.conf 467 BLAKE2B 7648f30259d97cc86297952bb63b445e3a1092e61aedf8ad44a6ec330c5ec81d544501f3e4e2c7adc71de8f5a1527813408a1c679710c5313c8f6eb68415c020 SHA512 9850e862b1795644bc376eef485bcfde8d72e06f40e587cf373e257a95383b95b64217263de62a92a8bc5b2b55adaea108d609803f71d708591b0d4ecdfed6ae
+AUX rsync-gentoo-portage.sh 332 BLAKE2B 1f060ffdb7b7a1116875804053e80896d36dad311c62b35c4d21023e79e46fe840dbac934692f1e549d81353cbc9319b15c9f971a44f31a8818e695c6dbb4da3 SHA512 588ea9757167ae5baa72a0542d723be8ae574e3ad487f1ab260de2a419f0d36d29fa2a0c80924292a81f2a69e325fa08729008964de24e0b01189b1e9a04618b
+AUX rsyncd.conf 611 BLAKE2B 2842f2fe86d3d84e6385d979337a523db12fa8f39316652d2cc0151431e033d7832d5299ec49e0fedd4d55e9faf67014ca32cf020f13adda5143b340f5f8988b SHA512 11af716d1741d482f11ec9a9a2d5edbf4c3c0bacd7ed357588f2a8398d313d47de880ae5c38f40ce940259cb741cd7695eab42249ca10e05c3f2654581ffc791
+AUX rsyncd.motd 44 BLAKE2B 764e92b05ece7c7c114106e3cb634cce9383b96b7e076b2cc95217aba5eff6a849e32da1acd2d1cb34316b81701ecf4c7b09bc304e43eff992014128048170bf SHA512 812c0e738274222e65e5bc57379ebc6150c232cd8bf98e72b500763828bfcfa45fb8e89c7cccd5e34685f4e5d4787d9cd2ab03ace64bc76f5c5416deb03c17f3
+AUX rsynclogparse-extended.pl 3476 BLAKE2B 230fc0a15cb5341f3bbf1455b86e5bd0a92bd12eaf5d8ece373bfcac0d1b45b310b0a3194d2200676b351e5b5931be51319801b1e5df87cb7d41c799447dca8a SHA512 60656deb0e501c51c4a37d2f9cce2829faea830ae42d1f33db52f37b337b71a125b7d350e893fb6098b405e1439cbde160d9e7ecda3ebd8a8f8c34b84acf80b3
+EBUILD gentoo-rsync-mirror-1.0-r5.ebuild 1980 BLAKE2B dcf660571e295a379908b47c50fc8a171035e01435456669796ef5ccf159ff165e10c692b4018dc3582d2123651a633b7abd394df5afac83f3621004ef778e0d SHA512 b4ac3ad7600cd26c68cea2952991b7b07d39e4361b34bcd7e676a4f4e9ac3d1a8f2ec190fee8d1966b6400858b4bbea83c386a38a84489f9231cb2118334ba58
+MISC metadata.xml 365 BLAKE2B e228fe06455e1d2619852d44b50a114e425c0cd1027877b01a4920186d50a6ee1ca39742f75d33cc3ea6fc7bc45744c9c0667582881534793090c974cfa8be72 SHA512 7fce97c62f40d7472b6fedb12be020aa53037a4049885c1ec6c2735b419b3f40462a848360fb33db65aedf2b829d491f2fa521b82ac158b1d15cec115b524115
diff --git a/app-admin/gentoo-rsync-mirror/files/gentoo-mirror.conf b/app-admin/gentoo-rsync-mirror/files/gentoo-mirror.conf
new file mode 100644
index 000000000000..d1af6ca014b7
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/files/gentoo-mirror.conf
@@ -0,0 +1,9 @@
+# Gentoo rsync mirror config
+
+RSYNC="/usr/bin/rsync"
+OPTS="--quiet --recursive --links --perms --times --devices --specials --delete --timeout=300"
+#Uncomment the following line only if you have been granted access to rsync1.us.gentoo.org
+#SRC="rsync://rsync1.us.gentoo.org/gentoo-portage"
+#If you are waiting for access to our master mirror, select one of our mirrors to mirror from:
+SRC="rsync://rsync.de.gentoo.org/gentoo-portage"
+DST="/opt/gentoo-rsync/portage/"
diff --git a/app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh b/app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh
new file mode 100644
index 000000000000..e053fadab1ed
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+source /etc/rsync/gentoo-mirror.conf
+
+echo "Started update at" `date` >> $0.log 2>&1
+logger -t rsync "re-rsyncing the gentoo-portage tree"
+${RSYNC} ${OPTS} ${SRC} ${DST} >> $0.log 2>&1
+logger -t rsync "deleting spurious Changelog files"
+find ${DST} -iname ".ChangeLog*" | xargs rm -rf
+
+echo "End: "`date` >> $0.log 2>&1
\ No newline at end of file
diff --git a/app-admin/gentoo-rsync-mirror/files/rsyncd.conf b/app-admin/gentoo-rsync-mirror/files/rsyncd.conf
new file mode 100644
index 000000000000..54cace847488
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/files/rsyncd.conf
@@ -0,0 +1,25 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+uid = nobody
+gid = nobody
+use chroot = yes 
+max connections = 20
+pid file = /var/run/rsyncd.pid
+motd file = /etc/rsync/rsyncd.motd
+transfer logging = no 
+log format = %t %a %m %f %b
+syslog facility = local3
+timeout = 300
+
+[gentoo-x86-portage]
+#this entry is for compatibility
+path = /opt/gentoo-rsync/portage
+comment = Gentoo Linux Portage tree
+
+[gentoo-portage]
+#modern versions of portage use this entry
+path = /opt/gentoo-rsync/portage
+comment = Gentoo Linux Portage tree mirror
+exclude = distfiles
+
diff --git a/app-admin/gentoo-rsync-mirror/files/rsyncd.motd b/app-admin/gentoo-rsync-mirror/files/rsyncd.motd
new file mode 100644
index 000000000000..35950dd898dd
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/files/rsyncd.motd
@@ -0,0 +1 @@
+This is rsync[number].[country].gentoo.org.
diff --git a/app-admin/gentoo-rsync-mirror/files/rsynclogparse-extended.pl b/app-admin/gentoo-rsync-mirror/files/rsynclogparse-extended.pl
new file mode 100644
index 000000000000..b0befc31c7ab
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/files/rsynclogparse-extended.pl
@@ -0,0 +1,128 @@
+#!/usr/bin/env perl
+
+#
+# rsynclogparse-extended.pl, version 1.0
+# Script for producing daily or hourly stats from an rsync.log, in
+# plain text or XML output formats
+#
+# (C) Tim Haynes <gentoo@stirfried.vegetable.org.uk>, February 2003
+# Redistributable under the terms of the BSD licence
+# <http://www.opensource.org/licenses/bsd-license.php>
+#
+
+$|=1;
+
+#Determine whether we have a commandline option or not
+$arg="";
+$arg=shift
+  if $ARGV[0]=~/^-/;
+
+#Hash of variables to be output and descriptions
+%outputVars=(
+	     "mirrorid" => "which mirror name this box is",
+	     "contact" => "email address to contact the server administrator",
+	     "read" => "total bytes read",
+	     "wrote" => "total bytes served",
+	     "total" => "total bytes both directions",
+	     "count" => "number of connections",
+	     "meanxfer" => "mean transfer size",
+	     "biggestXfer" => "biggest individual transfer",
+	     "speedupavg" => "mean speedup-a-like ratio for all conns",
+	     "avgbandwidth" => "mean bandwith reequirement over 1d",
+	     "interval" => "most recent n-seconds' worth of data",
+	     "maxconns" => "number of times max-conns reached",
+	     "percmaxconns" => "percentage of connections rejected",
+	     "configmaxconns" => "max concurrent connections configured",
+	     "timestamp" => "Current time these stats were generated"
+	    );
+
+#Initialise all the above to 0
+map { $$_ =0 ; } keys %outputVars;
+
+#Set fields for this specific server
+$mirrorid="rsync1.uk.gentoo.org";
+$contact="gentoo\@stirfried.vegetable.org.uk";
+$configmaxconns=5;
+
+$timestamp=time();
+
+#Determine if we're doing a daily or hourly thing
+$interval=3600;
+$interval=2600*24 
+  if $arg=~/d/;
+
+($sec,$min,$hour,$mday,$mon,$year,$wday,$yday) = gmtime(time);
+$now=dateToTstamp(sprintf("%04d/%02d/%02d %02d:%02d:%02d",
+			  $year+1900, $mon+1, $mday, $hour, $min, $sec));
+
+
+#Read in all remaining files on commandline and stdin
+while (<>) {
+  chomp;
+
+  if (m#^((\d+)/(\d+)/(\d+) (\d+):(\d+):(\d+))#) {  
+      $tstamp=dateToTstamp($1);
+    }
+
+    next			# skip too-old log entries
+      if $tstamp < ($now-$interval);
+
+  $maxconns++
+    if /max connections .\d+. reached/oi;
+
+  /wrote (\d+) bytes.*read (\d+) bytes.*size (\d+)/oi
+    or next;
+
+  $wrote+=$1;			#running total of outgoing
+  $read+=$2;			#running total of incoming
+  $volumesize=$3;        	#total size of the volume, serversize
+  $localtotal=$1 + $2;
+  $speedupsum+=$volumesize/$localtotal;	#running total of "speedup" ratios
+  $count++;
+  $biggestXfer=($localtotal>$biggestXfer)?$localtotal:$biggestXfer;
+}
+
+#Compute a few things
+$total=$read+$wrote;
+$speedupavg=$speedupsum/$count;	#average speedup ratio
+$meanxfer=$total/$count;	#mean-size xfer per connection
+$avgbandwidth=$total/$interval; #mean bandwith consumed over this interval
+$percmaxconns=100*$maxconns/($count+$maxconns);
+
+#Choice of output format
+$arg =~/xml/ ? &outputXML : &outputText;
+
+1;
+
+################
+
+sub outputText {
+  foreach $i ( keys %outputVars ) {
+    printf("%-20s: $$i\n", $i);
+  }
+}
+
+
+sub outputXML {
+  print "<xml>\n  <rsyncstats>\n";
+  foreach $i ( keys %outputVars ) {
+    if ($arg=~/v/o) {
+      print "    <$i desc=\"$outputVars{$i}\">$$i</$i>\n";
+    } else {
+      print "    <$i>$$i</$i>\n";
+    }
+  }
+  print "  </rsyncstats>\n</xml>\n";
+}
+
+
+sub dateToTstamp {
+  my $str=shift;
+
+  $str =~ m#^(\d+)/(\d+)/(\d+) (\d+):(\d+):(\d+)#;  
+
+  $tstamp=$6 + 60*$5 + 3600*$4 + 3600*24*$3 +
+    3600*24*31*$2 + 3600*24*365*($1-1975);
+
+  return $tstamp;
+}
diff --git a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
new file mode 100644
index 000000000000..f9643478717d
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Ebuild for setting up a Gentoo rsync mirror"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Infrastructure/Rsync"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+	exeinto /opt/gentoo-rsync
+	doexe "${FILESDIR}"/rsync-gentoo-portage.sh
+	doexe "${FILESDIR}"/rsynclogparse-extended.pl
+	insinto etc/rsync
+	doins "${FILESDIR}"/rsyncd.conf
+	doins "${FILESDIR}"/rsyncd.motd
+	doins "${FILESDIR}"/gentoo-mirror.conf
+	dodir /opt/gentoo-rsync/portage
+}
+
+pkg_postinst() {
+	elog "The rsync-mirror is now installed into /opt/gentoo-rsync"
+	elog "The local portage copy resides in      /opt/gentoo-rsync/portage"
+	elog "Please change /opt/gentoo-rsync/rsync-gentoo-portage.sh for"
+	elog "configuration of your main rsync server and use it to sync."
+	elog "Change /etc/rsync/rsyncd.motd to display your correct alias."
+	elog
+	elog "RSYNC_OPTS="--config=/etc/rsync/rsyncd.conf" needs"
+	elog "to be set in /etc/conf.d/rsyncd to make allow syncing."
+	elog
+	elog "The service can be started using /etc/init.d/rsyncd start"
+	elog "If you are setting up an official mirror, don't forget to add"
+	elog "00,30 * * * *      root    /opt/gentoo-rsync/rsync-gentoo-portage.sh"
+	elog "to your /etc/crontab to sync your tree every 30 minutes."
+	elog
+	elog "If you are setting up a private (unofficial) mirror, you can add"
+	elog "0 3 * * *	root	/opt/gentoo-rsync/rsync-gentoo-portage.sh"
+	elog "to your /etc/crontab to sync your tree once per day."
+	elog
+	elog "****IMPORTANT****"
+	elog "If you are setting up a private mirror, DO NOT sync against the"
+	elog "gentoo.org official rotations more than once a day.  Doing so puts"
+	elog "you at risk of having your IP address banned from the rotations."
+	elog
+	elog "For more information visit: https://wiki.gentoo.org/wiki/Project:Infrastructure/Rsync"
+}
diff --git a/app-admin/gentoo-rsync-mirror/metadata.xml b/app-admin/gentoo-rsync-mirror/metadata.xml
new file mode 100644
index 000000000000..45969df9b143
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rgkmg25@gmail.com</email>
+		<name>Robert Kowalski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/github-backup-utils-2.10.0 b/app-admin/github-backup-utils-2.10.0
deleted file mode 100644
index b64bca189c77..000000000000
--- a/app-admin/github-backup-utils-2.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.10.0.tar.gz -> github-backup-utils-2.10.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3d0f7b04a7d34f14e52974b1bea5bf11
diff --git a/app-admin/github-backup-utils-2.10.0-r1 b/app-admin/github-backup-utils-2.10.0-r1
deleted file mode 100644
index 27df068d5700..000000000000
--- a/app-admin/github-backup-utils-2.10.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.10.0.tar.gz -> github-backup-utils-2.10.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=0cdbb1e083eba12400e9dc7a6fc7c484
diff --git a/app-admin/github-backup-utils-2.11.0 b/app-admin/github-backup-utils-2.11.0
deleted file mode 100644
index 3e51e645d3dd..000000000000
--- a/app-admin/github-backup-utils-2.11.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.11.0.tar.gz -> github-backup-utils-2.11.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3d0f7b04a7d34f14e52974b1bea5bf11
diff --git a/app-admin/github-backup-utils-2.11.0-r1 b/app-admin/github-backup-utils-2.11.0-r1
deleted file mode 100644
index fbc7806cfc42..000000000000
--- a/app-admin/github-backup-utils-2.11.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.11.0.tar.gz -> github-backup-utils-2.11.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=0cdbb1e083eba12400e9dc7a6fc7c484
diff --git a/app-admin/github-backup-utils-2.11.1 b/app-admin/github-backup-utils-2.11.1
deleted file mode 100644
index 7877a1d6f4d8..000000000000
--- a/app-admin/github-backup-utils-2.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.11.1.tar.gz -> github-backup-utils-2.11.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3d0f7b04a7d34f14e52974b1bea5bf11
diff --git a/app-admin/github-backup-utils-2.11.1-r1 b/app-admin/github-backup-utils-2.11.1-r1
deleted file mode 100644
index 5214933a115c..000000000000
--- a/app-admin/github-backup-utils-2.11.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.11.1.tar.gz -> github-backup-utils-2.11.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=0cdbb1e083eba12400e9dc7a6fc7c484
diff --git a/app-admin/github-backup-utils-2.11.2 b/app-admin/github-backup-utils-2.11.2
deleted file mode 100644
index 2bd286b3348c..000000000000
--- a/app-admin/github-backup-utils-2.11.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.11.2.tar.gz -> github-backup-utils-2.11.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3d0f7b04a7d34f14e52974b1bea5bf11
diff --git a/app-admin/github-backup-utils-2.11.2-r1 b/app-admin/github-backup-utils-2.11.2-r1
deleted file mode 100644
index 5bd0797b8901..000000000000
--- a/app-admin/github-backup-utils-2.11.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.11.2.tar.gz -> github-backup-utils-2.11.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=0cdbb1e083eba12400e9dc7a6fc7c484
diff --git a/app-admin/github-backup-utils-2.13.0 b/app-admin/github-backup-utils-2.13.0
deleted file mode 100644
index b7f5a1f38d25..000000000000
--- a/app-admin/github-backup-utils-2.13.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.13.0.tar.gz -> github-backup-utils-2.13.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f2d554c9302fb1d58094d620446f0e5d
diff --git a/app-admin/github-backup-utils-2.13.2 b/app-admin/github-backup-utils-2.13.2
deleted file mode 100644
index 61b33dd43c9f..000000000000
--- a/app-admin/github-backup-utils-2.13.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.13.2.tar.gz -> github-backup-utils-2.13.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f2d554c9302fb1d58094d620446f0e5d
diff --git a/app-admin/github-backup-utils-2.5.0 b/app-admin/github-backup-utils-2.5.0
deleted file mode 100644
index 522998c62a74..000000000000
--- a/app-admin/github-backup-utils-2.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.5.0.tar.gz -> github-backup-utils-2.5.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=43cc84dab669778bc57dd847b0bce505
diff --git a/app-admin/github-backup-utils-2.6.0 b/app-admin/github-backup-utils-2.6.0
deleted file mode 100644
index d6cd6a6fac4e..000000000000
--- a/app-admin/github-backup-utils-2.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.6.0.tar.gz -> github-backup-utils-2.6.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=43cc84dab669778bc57dd847b0bce505
diff --git a/app-admin/github-backup-utils-2.6.3 b/app-admin/github-backup-utils-2.6.3
deleted file mode 100644
index 25cf157e6c73..000000000000
--- a/app-admin/github-backup-utils-2.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.6.3.tar.gz -> github-backup-utils-2.6.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=43cc84dab669778bc57dd847b0bce505
diff --git a/app-admin/github-backup-utils-2.6.4 b/app-admin/github-backup-utils-2.6.4
deleted file mode 100644
index bc83b131dfad..000000000000
--- a/app-admin/github-backup-utils-2.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.6.4.tar.gz -> github-backup-utils-2.6.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=43cc84dab669778bc57dd847b0bce505
diff --git a/app-admin/github-backup-utils-2.7.0 b/app-admin/github-backup-utils-2.7.0
deleted file mode 100644
index f17e26f51c76..000000000000
--- a/app-admin/github-backup-utils-2.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.7.0.tar.gz -> github-backup-utils-2.7.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=43cc84dab669778bc57dd847b0bce505
diff --git a/app-admin/github-backup-utils-2.7.0-r1 b/app-admin/github-backup-utils-2.7.0-r1
deleted file mode 100644
index 7d44f46f201e..000000000000
--- a/app-admin/github-backup-utils-2.7.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.7.0.tar.gz -> github-backup-utils-2.7.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=69673ee5b9817114e88faf723843804a
diff --git a/app-admin/github-backup-utils-2.7.1 b/app-admin/github-backup-utils-2.7.1
deleted file mode 100644
index 4260cf254945..000000000000
--- a/app-admin/github-backup-utils-2.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.7.1.tar.gz -> github-backup-utils-2.7.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=69673ee5b9817114e88faf723843804a
diff --git a/app-admin/github-backup-utils-2.8.2 b/app-admin/github-backup-utils-2.8.2
deleted file mode 100644
index d7682588c9ae..000000000000
--- a/app-admin/github-backup-utils-2.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.8.2.tar.gz -> github-backup-utils-2.8.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=69673ee5b9817114e88faf723843804a
diff --git a/app-admin/github-backup-utils-2.9.0 b/app-admin/github-backup-utils-2.9.0
deleted file mode 100644
index df112da1347a..000000000000
--- a/app-admin/github-backup-utils-2.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.9.0.tar.gz -> github-backup-utils-2.9.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3d0f7b04a7d34f14e52974b1bea5bf11
diff --git a/app-admin/github-backup-utils-2.9.0-r1 b/app-admin/github-backup-utils-2.9.0-r1
deleted file mode 100644
index a687caebc75d..000000000000
--- a/app-admin/github-backup-utils-2.9.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.9.0.tar.gz -> github-backup-utils-2.9.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=45021860661a5aa0ea3c93c4f7e5104a
diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
new file mode 100644
index 000000000000..c422aba7908f
--- /dev/null
+++ b/app-admin/github-backup-utils/Manifest
@@ -0,0 +1,37 @@
+AUX github-backup-utils-python27.patch 497 BLAKE2B 204708abe587590b2479783f5fc355ab035a08af8dd85ccec600828384917ca6806abe3d50ada9ce133435b797d698699d777432e49f8a63513b2ae21e59baaf SHA512 9eb416ea2a9847d84d56da84c6355942f3320f8ed97711e602ab74e81f9dca32eff54f68a83586403c415e63fb7d13a0b6b67aa7b01cd05732160df08b9164a7
+AUX github-backup-utils-tarball-fix.patch 1440 BLAKE2B 8b6ff7b996317de913f82670da1e688bfb2796b51db9cb515a6a2d33d2f690e24030b9213c0ebd08fab316aded4d561f9b0d5e2fb1fc5f20d0190234e59e64af SHA512 738227c94b8c9cb569258ce2573db0ff9c8a216c74d891944969173add6eb31c0c46696d20977d986b5c29a9cdb2b3934563ed220527ef798de1cbeb680f6533
+DIST github-backup-utils-2.10.0.tar.gz 73061 BLAKE2B 072a3cf8b3a775b368e4f5c89f7b9b29f7fec26bf4fd9abec58a6f1d4f02a981881a547bbdede8f8b64d0ed01dfba334193132a5d1363de3f4cd8f11d9047602 SHA512 e4ec432289da71e7c8d50023e4874b4aef5e99b27f67c42ebadc61473f5b0bce473f768ff19d1d611d91944ce887ad496535f1bc8d6557a31a99353e100f7776
+DIST github-backup-utils-2.11.0.tar.gz 75105 BLAKE2B f14f30db263cc304aac0d2a9a6d82883067b80bd69292018876fa1b01b1e47d9f8dd44bdafed0eb1198fdabe2b25ec8e6f20117ae905a2ae17bb9a17174642ea SHA512 7d96aff4c2e2bcce7b2b2d32854e759d561de8e683a13d3890bbbc5177cea861a666a60527b4b6ec4d4d7e8123bfff4618b6dfd0c3db73b1829cca0c43c0a9ec
+DIST github-backup-utils-2.11.1.tar.gz 79378 BLAKE2B d887cf6d3e41c1537816edc6073a85c66dcaae0db5882187f5c9202ecaef0c7ad6c3593145a6619cc27e106cacd5343f4b26615569890e112db4ec67f98293f6 SHA512 7bdd34386d8604bfddb07d958d6cc435ec3e00705a83e53730f44a82a02eb98be311b73bba299db80513169a0680641927d9e2e9583b936c4fffa86de2ce2cda
+DIST github-backup-utils-2.11.2.tar.gz 79492 BLAKE2B 0eeba783fda89c862d1b6ecb56bc51dcb5130cc3ae8b35f38bba2b6fd850ee086d0b808f5cebb74617a1dea2f4ea3843c60a6162ac97e3139211b3796cc052d9 SHA512 64a622b090c8fe02ffba3c50b213ca177cc87e6aa41991cc3ee5031fc07b707e5f108f32d9346d2cd727939d76779d1f46dc6733e399c70e58ff8cb54087ddb8
+DIST github-backup-utils-2.13.0.tar.gz 79173 BLAKE2B 567865ede11d200a9dbc4641d9820864d72a325aa6b6439f3633b5fccf2d2a55fdd8f9351a280321d0ee5a1bc7f331369ed09b2e8e5274a9442f98227c82963c SHA512 e78c299b0131d76bd9f5d916f72a1a361a8ea706789c93d60b1980d348c4dad75e371ad84c725d8d8b05c45984d0edcf612d1a9e69e63657c212a848d359ad28
+DIST github-backup-utils-2.13.2.tar.gz 83126 BLAKE2B f79d378a1126a16f366930a40ca6db43865c2615edb65b13a3b4a1ac693f3f3419f6b821ec4454cd2b4858fd13038ca66e158c37338b671f69f14aca2e36c6de SHA512 b394dfde420d2f1adbaad6b61a665fa99e6a35007fd5162114ec01629a04be31780f3f36e9133456bbb015c6a3939430b5d65572e580d8757f023a2309d104ca
+DIST github-backup-utils-2.5.0.tar.gz 40850 BLAKE2B 34f16e290619a21edef11410a583357a15b57c9a6a0d20b188863f5c41a7a30bcc168a2337ff7203de6f5659c611178bed0e0cff3d802c1ec923d7c4d8e1ee3a SHA512 ecd5b85e0e2e300a9f40ecb8f545868554c7b48bdf800a21cf111ead80c185c96d475c67487c9b9e8af676f8c71a001730084abde79e05860b3e24004888292d
+DIST github-backup-utils-2.6.0.tar.gz 45970 BLAKE2B 855c7e93aa4db136629db8ba109328d51b9e9ca82aef1190a9703be2cc456ac006cd6bacaf1d3ffe9ccd8d43fb83c15c30c9b514abd37fb2104e62b2e1ed51fa SHA512 a795e439f9d28e27b457c5b6eb42f35d6aea1527c2a01a26b81d6e86829db14a0b27a366d9358214bbe1c16540fe524fb0010d5f509c78ba5398c6bdbf04182e
+DIST github-backup-utils-2.6.3.tar.gz 50884 BLAKE2B 43e8c398da11f891230a7910fc29d9fc702f5985c8bda5388f8415446e12a3408383ee5a76a26f2519625be3bf442600e4281a4e10e24b5a1143ac4ca1934442 SHA512 dff092325ad6f3502c8c0afbea90a53469af0ab4b98eaa39a950022c5b4e199cd3b48b5ec0585e3ea39b9bbd707dd037e8e0ed00ed8c6858276ba1a8e1075290
+DIST github-backup-utils-2.6.4.tar.gz 51270 BLAKE2B 84d880d71b92d1b92f52dc3b749cb984a6f2e2e98eee1ecb4efc48dabf54fbb48a8a936d0422f7391adf3ea27265f6ea266045cf4ed509fd675ba2ac908abda7 SHA512 be2ef9811e20fd9be03d1b57e75151089817bbdd87fa487462a8fe6186195581ad6b1c62b1b930bd64689e89dcf33c2228df7d77a12790404f09b679b1ecf377
+DIST github-backup-utils-2.7.0.tar.gz 51409 BLAKE2B 5e1c5d55376af6f053b634ffbef4b97bd8f5a5126e6180bc95e21d372e311f863f653b630f4ecf2cf0c589b3b059e0a60e63ebeaa79d55c6333f7d34632adb35 SHA512 16112e8d05001146a182e225c1bb5bdfbe210ddb3993d989a9fe88b88bbf222196a66f1f48b262b198675af8e4b3e3a10120e7dafa7b244137bf29cd879efaaf
+DIST github-backup-utils-2.7.1.tar.gz 68793 BLAKE2B e65ac6c4e0018947be34d27bcf428d81ebdd138137fdbd1d15b6d77a7f2bc4b95a5ef00e0db1462b61b3015e2d2a54e1cd4e610857b7a156cbac9f5f912ad2ed SHA512 950c24b3fef8775c2a90789c469a81256323c1ede67b3f6691920e78c1489533adf5616f2ac09f9b844382778b5b2b5106f8c467be7d65b47ee06bf732591880
+DIST github-backup-utils-2.8.2.tar.gz 71392 BLAKE2B b45939693f2b545562b77abc897b54c4d980638c7e2b605d84deb4b251f8d702543829fe7138222aa25f740a033a73d52fbde6f735e3d510ca61c00be99ec82d SHA512 d3801d37f18b41594bfee83b891ce1eb9f1a15972839bd9dfb6469d311484ef94f635da4319b0b9f2d6778d87b935ca5c0bd42ddbf009f292e05b6a654464bf4
+DIST github-backup-utils-2.9.0.tar.gz 72512 BLAKE2B 3bb97609284dca1b3682d17e1c60e24a2169574691eb8463141951e2d5f93558ffbda3c7bec7f22c7a63dabe6bdf410c347f7512a09303653e5f939197d4faef SHA512 81af0842c021c49be8acca775d1ab375e98c2b725893f45d65b670e671892d779408677dfe6ed415101bf88fe549d117957bffef0aa372a74bcd7c6f87c1d12b
+EBUILD github-backup-utils-2.10.0-r1.ebuild 1165 BLAKE2B 0789a905aabb2e370d35868f89223bcd9b0ccb0100f186410f72c026747cbef9ed68b4346f37c3349e2da5a34db21ff711db8d24230d8a58f2105c2dfc3009df SHA512 fe99dae0e4dc7e7c66c33ea61488f10c62ca656829f809b7d69dc83565183dbd7528f682df71c66e9f2ad2008e7a499abe3991cbfffa53d17bcb1cf4c3057c34
+EBUILD github-backup-utils-2.10.0.ebuild 893 BLAKE2B 70055ac1dc8372d877d4f0e4361b94d3ba60334b0bea5ce284a537f137641e09a6d14fbce96a62dd9a109d48b3b76b49810cb8a8554b9882d5915b8f159c1a26 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1
+EBUILD github-backup-utils-2.11.0-r1.ebuild 1165 BLAKE2B 0789a905aabb2e370d35868f89223bcd9b0ccb0100f186410f72c026747cbef9ed68b4346f37c3349e2da5a34db21ff711db8d24230d8a58f2105c2dfc3009df SHA512 fe99dae0e4dc7e7c66c33ea61488f10c62ca656829f809b7d69dc83565183dbd7528f682df71c66e9f2ad2008e7a499abe3991cbfffa53d17bcb1cf4c3057c34
+EBUILD github-backup-utils-2.11.0.ebuild 893 BLAKE2B 70055ac1dc8372d877d4f0e4361b94d3ba60334b0bea5ce284a537f137641e09a6d14fbce96a62dd9a109d48b3b76b49810cb8a8554b9882d5915b8f159c1a26 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1
+EBUILD github-backup-utils-2.11.1-r1.ebuild 1165 BLAKE2B 0789a905aabb2e370d35868f89223bcd9b0ccb0100f186410f72c026747cbef9ed68b4346f37c3349e2da5a34db21ff711db8d24230d8a58f2105c2dfc3009df SHA512 fe99dae0e4dc7e7c66c33ea61488f10c62ca656829f809b7d69dc83565183dbd7528f682df71c66e9f2ad2008e7a499abe3991cbfffa53d17bcb1cf4c3057c34
+EBUILD github-backup-utils-2.11.1.ebuild 893 BLAKE2B 70055ac1dc8372d877d4f0e4361b94d3ba60334b0bea5ce284a537f137641e09a6d14fbce96a62dd9a109d48b3b76b49810cb8a8554b9882d5915b8f159c1a26 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1
+EBUILD github-backup-utils-2.11.2-r1.ebuild 1165 BLAKE2B 0789a905aabb2e370d35868f89223bcd9b0ccb0100f186410f72c026747cbef9ed68b4346f37c3349e2da5a34db21ff711db8d24230d8a58f2105c2dfc3009df SHA512 fe99dae0e4dc7e7c66c33ea61488f10c62ca656829f809b7d69dc83565183dbd7528f682df71c66e9f2ad2008e7a499abe3991cbfffa53d17bcb1cf4c3057c34
+EBUILD github-backup-utils-2.11.2.ebuild 893 BLAKE2B 70055ac1dc8372d877d4f0e4361b94d3ba60334b0bea5ce284a537f137641e09a6d14fbce96a62dd9a109d48b3b76b49810cb8a8554b9882d5915b8f159c1a26 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1
+EBUILD github-backup-utils-2.13.0.ebuild 930 BLAKE2B 185c34081fd6caa7343747e0ac870f18a24c6d580250774815fbc2d1df9b3c3a24823018f00bfb80d2b038a4c1dca32da50824daf558d77d27afe84c2681b348 SHA512 f6c25a3358217c0090a52e076eb138cdd82a349a8f32f1530a6cb1ce02e52acee765ad139244ba7c13c0930eacd7212706bfa00702dc089778e430e53bed6655
+EBUILD github-backup-utils-2.13.2.ebuild 930 BLAKE2B 185c34081fd6caa7343747e0ac870f18a24c6d580250774815fbc2d1df9b3c3a24823018f00bfb80d2b038a4c1dca32da50824daf558d77d27afe84c2681b348 SHA512 f6c25a3358217c0090a52e076eb138cdd82a349a8f32f1530a6cb1ce02e52acee765ad139244ba7c13c0930eacd7212706bfa00702dc089778e430e53bed6655
+EBUILD github-backup-utils-2.5.0.ebuild 868 BLAKE2B 36bdc6369b2b535dac992641bcfa4c323325e5811d9a581742d5c06079a10c75220f7b11557b983e77ca83cdb9757f38a11ebb421d2fa9fdce5bc0e82c5a3f70 SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274
+EBUILD github-backup-utils-2.6.0.ebuild 868 BLAKE2B 36bdc6369b2b535dac992641bcfa4c323325e5811d9a581742d5c06079a10c75220f7b11557b983e77ca83cdb9757f38a11ebb421d2fa9fdce5bc0e82c5a3f70 SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274
+EBUILD github-backup-utils-2.6.3.ebuild 868 BLAKE2B 36bdc6369b2b535dac992641bcfa4c323325e5811d9a581742d5c06079a10c75220f7b11557b983e77ca83cdb9757f38a11ebb421d2fa9fdce5bc0e82c5a3f70 SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274
+EBUILD github-backup-utils-2.6.4.ebuild 868 BLAKE2B 36bdc6369b2b535dac992641bcfa4c323325e5811d9a581742d5c06079a10c75220f7b11557b983e77ca83cdb9757f38a11ebb421d2fa9fdce5bc0e82c5a3f70 SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274
+EBUILD github-backup-utils-2.7.0-r1.ebuild 893 BLAKE2B 7765fe74f2a68cec46e692b458639e3af4736844dc69e5023ee137ff0e3fec18211948edc96126cfcbf56a7fc8df25ee538b8ba62f0aeb4786c35125a8d7b54e SHA512 7ddc82153106396b2b450d062c735257aa961b4329f5d5337db5391d5ebc57835e56755d600ec9923a4ca66569a3c590e05a8571a9484e2b67692a5769da3cfb
+EBUILD github-backup-utils-2.7.0.ebuild 868 BLAKE2B 36bdc6369b2b535dac992641bcfa4c323325e5811d9a581742d5c06079a10c75220f7b11557b983e77ca83cdb9757f38a11ebb421d2fa9fdce5bc0e82c5a3f70 SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274
+EBUILD github-backup-utils-2.7.1.ebuild 893 BLAKE2B 7765fe74f2a68cec46e692b458639e3af4736844dc69e5023ee137ff0e3fec18211948edc96126cfcbf56a7fc8df25ee538b8ba62f0aeb4786c35125a8d7b54e SHA512 7ddc82153106396b2b450d062c735257aa961b4329f5d5337db5391d5ebc57835e56755d600ec9923a4ca66569a3c590e05a8571a9484e2b67692a5769da3cfb
+EBUILD github-backup-utils-2.8.2.ebuild 893 BLAKE2B 7765fe74f2a68cec46e692b458639e3af4736844dc69e5023ee137ff0e3fec18211948edc96126cfcbf56a7fc8df25ee538b8ba62f0aeb4786c35125a8d7b54e SHA512 7ddc82153106396b2b450d062c735257aa961b4329f5d5337db5391d5ebc57835e56755d600ec9923a4ca66569a3c590e05a8571a9484e2b67692a5769da3cfb
+EBUILD github-backup-utils-2.9.0-r1.ebuild 1145 BLAKE2B 0b23e1a2d1505180be708b88f38b97a0c685490427555d68da01c786e44e5eb0772c69279906e4ff6111a68ac25af199f584b5809d62722f5fc7d95b657f7b03 SHA512 8b82f71361d6ad56ed36e733ad563ecbc736021de5cedeff77e5f9c574f3fa7ce2f99a81770372c55378dcf54bd1a542905ea1eee1dce6fc86ed064e262c6d94
+EBUILD github-backup-utils-2.9.0.ebuild 893 BLAKE2B 70055ac1dc8372d877d4f0e4361b94d3ba60334b0bea5ce284a537f137641e09a6d14fbce96a62dd9a109d48b3b76b49810cb8a8554b9882d5915b8f159c1a26 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1
+MISC metadata.xml 566 BLAKE2B e34ff45fefc466f7fc17c64ef41d72aa5560df6ce4f2a6b758129c3d2d5ffbe4323e4d64a6d01069195a2236f5288823214f4c8310e252c4699de7e5f0282990 SHA512 35a0eb37cedfcd41573c13655d87be23b68af3d3636fe06397565c06a2b78c767f41702ff1487134a3f52169492a1345be2d42a79520a16046a84428e4bf0677
diff --git a/app-admin/github-backup-utils/files/github-backup-utils-python27.patch b/app-admin/github-backup-utils/files/github-backup-utils-python27.patch
new file mode 100644
index 000000000000..c305b688ceca
--- /dev/null
+++ b/app-admin/github-backup-utils/files/github-backup-utils-python27.patch
@@ -0,0 +1,13 @@
+diff --git a/test/bin/python b/test/bin/python
+index c79b0a4..a9c2991 100755
+--- a/test/bin/python
++++ b/test/bin/python
+@@ -18,7 +18,7 @@ cat >/dev/null
+ # verify the python compiles at least. if this fails then the python code passed
+ # to -c failed basic syntax checks.
+ echo "$2" |
+-/usr/bin/python -c "import sys; __import__('compiler').parse(sys.stdin.read())"
++/usr/bin/python2.7 -c "import sys; __import__('compiler').parse(sys.stdin.read())"
+ 
+ # pretend we found zero processes.
+ echo 0
diff --git a/app-admin/github-backup-utils/files/github-backup-utils-tarball-fix.patch b/app-admin/github-backup-utils/files/github-backup-utils-tarball-fix.patch
new file mode 100644
index 000000000000..b0f0b8de3140
--- /dev/null
+++ b/app-admin/github-backup-utils/files/github-backup-utils-tarball-fix.patch
@@ -0,0 +1,39 @@
+commit ef6709b5e3510a7d0bcf0db91dbf5af5bc27b001
+Author: Austin English <austinenglish@gmail.com>
+Date:   Tue Nov 28 16:36:39 2017 -0600
+
+    test/test-ghe-backup.sh: skip test if not in a git checkout
+
+diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
+index 296429e..08bced2 100755
+--- a/test/test-ghe-backup.sh
++++ b/test/test-ghe-backup.sh
+@@ -475,14 +475,20 @@ begin_test "ghe-backup stores version when not run from a clone"
+   # Make sure this doesn't exist
+   rm -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version"
+ 
+-  tmpdir=$(mktemp -d $TRASHDIR/foo.XXXXXX)
+-  git clone $ROOTDIR $tmpdir/backup-utils
+-  cd $tmpdir/backup-utils
+-  rm -rf .git
+-  ./bin/ghe-backup
+-
+-  # verify that ghe-backup wrote its version information to the host
+-  [ -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version" ]
++  tmpdir=$(mktemp -d "$TRASHDIR/foo.XXXXXX")
++
++  # If user is running the tests extracted from a release tarball, git clone will fail.
++  if GIT_DIR="$ROOTDIR/.git" git rev-parse --is-inside-work-tree > /dev/null 2>&1; then
++      git clone "$ROOTDIR" "$tmpdir/backup-utils"
++      cd "$tmpdir/backup-utils"
++      rm -rf .git
++      ./bin/ghe-backup
++
++      # Verify that ghe-backup wrote its version information to the host
++      [ -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version" ]
++  else
++      echo ".git directory not found, skipping ghe-backup not from a clone test"
++  fi
+ )
+ end_test
+ 
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild
new file mode 100644
index 000000000000..ffe55dede38c
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	sys-apps/moreutils
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
+	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
+
+	# Fix for python3 systems
+	eapply "${FILESDIR}/github-backup-utils-python27.patch"
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
new file mode 100644
index 000000000000..586f3c415df5
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild
new file mode 100644
index 000000000000..ffe55dede38c
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	sys-apps/moreutils
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
+	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
+
+	# Fix for python3 systems
+	eapply "${FILESDIR}/github-backup-utils-python27.patch"
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
new file mode 100644
index 000000000000..586f3c415df5
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild
new file mode 100644
index 000000000000..ffe55dede38c
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	sys-apps/moreutils
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
+	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
+
+	# Fix for python3 systems
+	eapply "${FILESDIR}/github-backup-utils-python27.patch"
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild
new file mode 100644
index 000000000000..586f3c415df5
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild
new file mode 100644
index 000000000000..ffe55dede38c
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	sys-apps/moreutils
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
+	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
+
+	# Fix for python3 systems
+	eapply "${FILESDIR}/github-backup-utils-python27.patch"
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild
new file mode 100644
index 000000000000..586f3c415df5
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild
new file mode 100644
index 000000000000..ef2c730c8778
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	sys-apps/moreutils
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+
+dodoc -r docs/*
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild
new file mode 100644
index 000000000000..ef2c730c8778
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	sys-apps/moreutils
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+
+dodoc -r docs/*
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.5.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.5.0.ebuild
new file mode 100644
index 000000000000..6c89280fa665
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.5.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.6.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.6.0.ebuild
new file mode 100644
index 000000000000..6c89280fa665
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.6.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.6.3.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.6.3.ebuild
new file mode 100644
index 000000000000..6c89280fa665
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.6.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.6.4.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.6.4.ebuild
new file mode 100644
index 000000000000..6c89280fa665
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.6.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.7.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.7.0-r1.ebuild
new file mode 100644
index 000000000000..ae86106fc4c4
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.7.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.7.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.7.0.ebuild
new file mode 100644
index 000000000000..6c89280fa665
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.7.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.7.1.ebuild
new file mode 100644
index 000000000000..ae86106fc4c4
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.7.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.8.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.8.2.ebuild
new file mode 100644
index 000000000000..ae86106fc4c4
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.8.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.9.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.9.0-r1.ebuild
new file mode 100644
index 000000000000..4cf72e6606ef
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.9.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
+	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
+
+	# Fix for python3 systems
+	eapply "${FILESDIR}/github-backup-utils-python27.patch"
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.9.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.9.0.ebuild
new file mode 100644
index 000000000000..586f3c415df5
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.9.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/metadata.xml b/app-admin/github-backup-utils/metadata.xml
new file mode 100644
index 000000000000..3bac2658b1ef
--- /dev/null
+++ b/app-admin/github-backup-utils/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>wizardedit@gentoo.org</email>
+    <name>Austin English</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>williamh@gentoo.org</email>
+    <name>William Hubbs</name>
+  </maintainer>
+  <longdescription>
+  Provides backup utilities for Github Enterprise installations.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">github/backup-utils</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/gixy-0.1.5 b/app-admin/gixy-0.1.5
deleted file mode 100644
index 977aacf9da26..000000000000
--- a/app-admin/gixy-0.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Nginx configuration static analyzer
-EAPI=6
-HOMEPAGE=https://github.com/yandex/gixy
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/g/gixy/gixy-0.1.5.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5d2c6f22910b5bf7470a31f5d8cff987
diff --git a/app-admin/gixy-0.1.8 b/app-admin/gixy-0.1.8
deleted file mode 100644
index 6b319701ff8c..000000000000
--- a/app-admin/gixy-0.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Nginx configuration static analyzer
-EAPI=6
-HOMEPAGE=https://github.com/yandex/gixy
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/g/gixy/gixy-0.1.8.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5d2c6f22910b5bf7470a31f5d8cff987
diff --git a/app-admin/gixy/Manifest b/app-admin/gixy/Manifest
new file mode 100644
index 000000000000..0bcab67a73e3
--- /dev/null
+++ b/app-admin/gixy/Manifest
@@ -0,0 +1,5 @@
+DIST gixy-0.1.5.tar.gz 32594 BLAKE2B c92b95e4c17e07b2367337ab8dfa742d0eb995b6c979c4ba25e9f83e446d95dc8c89013b6f45e467c0dcad275b8f0ca4a163a7eb6ae0c2867e4102fe4765a8be SHA512 63c41a16f1a1d16664c660150bf1603b87d2a2b474db58bb13af79e123b372a666b94aa96ef081af89fb5608c7f9a43e03750afb80d52c212c06d3407c413e38
+DIST gixy-0.1.8.tar.gz 35176 BLAKE2B 3e875f63044244b19a7b881c0082c6ce91a2cdc9d0245c741e1b3f4cbcff70e0787d212c09ce2ef157c5a37942a87f9868975c43102df54f79f0b29721cd4acd SHA512 fe45522dbee238282f05f11fc22bdff6f04df117d9b909aa3a9c7ff0aef3c376e65119e91e8e562a2ea5d9c2e85a1e43462eb3ce14f30c171235bd44097c7a94
+EBUILD gixy-0.1.5.ebuild 788 BLAKE2B 40f8bca747a06fbbca06aeeeff196a0d0674e6fe7060b2bc1410ce8fab59821c9e331b0c2fcc9ff721dd13467b18f4ce0b1396a50584112d88fa3f5c3b54c29a SHA512 558ba5a26aeaaaa75717ca22d133fa2fc63d7dad47335105982d8e193bab49b3b7dd0b30a3a135a53417c7ba86da0eeffeb25982f06419fdb062233e3f9890fd
+EBUILD gixy-0.1.8.ebuild 788 BLAKE2B 40f8bca747a06fbbca06aeeeff196a0d0674e6fe7060b2bc1410ce8fab59821c9e331b0c2fcc9ff721dd13467b18f4ce0b1396a50584112d88fa3f5c3b54c29a SHA512 558ba5a26aeaaaa75717ca22d133fa2fc63d7dad47335105982d8e193bab49b3b7dd0b30a3a135a53417c7ba86da0eeffeb25982f06419fdb062233e3f9890fd
+MISC metadata.xml 248 BLAKE2B f2e59d4d05a017ebeeed31b36a72a279974f8fa64886873d23671f1fa91bcf3152acf9652624f2b1a2f5d9524bb24ec7dab734ce43e8cb6475ccfef67af40697 SHA512 c0d402a47544d8f31d1fc9f23fef5d84bf000f2a9a8a07c8b23899306818152aa71844f1d9310e0c32a354189be1f53ae8c89cde90464176ab9b861e62084822
diff --git a/app-admin/gixy/gixy-0.1.5.ebuild b/app-admin/gixy/gixy-0.1.5.ebuild
new file mode 100644
index 000000000000..4ade6ac258d8
--- /dev/null
+++ b/app-admin/gixy/gixy-0.1.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx configuration static analyzer"
+HOMEPAGE="https://github.com/yandex/gixy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.1.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+python_prepare() {
+	sed -i -e "/argparse/d" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/app-admin/gixy/gixy-0.1.8.ebuild b/app-admin/gixy/gixy-0.1.8.ebuild
new file mode 100644
index 000000000000..4ade6ac258d8
--- /dev/null
+++ b/app-admin/gixy/gixy-0.1.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx configuration static analyzer"
+HOMEPAGE="https://github.com/yandex/gixy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.1.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+python_prepare() {
+	sed -i -e "/argparse/d" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/app-admin/gixy/metadata.xml b/app-admin/gixy/metadata.xml
new file mode 100644
index 000000000000..ae702b778adb
--- /dev/null
+++ b/app-admin/gixy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="github">yandex/gixy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/gkrellm-2.3.10-r1 b/app-admin/gkrellm-2.3.10-r1
deleted file mode 100644
index f1dcc39ec90c..000000000000
--- a/app-admin/gkrellm-2.3.10-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango ) virtual/pkgconfig nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=Single process stack of various system monitors
-EAPI=6
-HOMEPAGE=http://www.gkrellm.net/
-IUSE=gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
-SLOT=2
-SRC_URI=http://gkrellm.srcbox.net/gkrellm-2.3.10.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7dfb250c865e93fc21aaa727a3ef441e
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
new file mode 100644
index 000000000000..1dcca2a5129b
--- /dev/null
+++ b/app-admin/gkrellm/Manifest
@@ -0,0 +1,11 @@
+AUX gkrellm-2.3.5-cifs.patch 496 BLAKE2B 5a60994bc651e76467fb3cf75e20e4802ac4371f8e5eac52fd6a74dd362220e67019ea67a5a15e6b890faac6e9a1c2ea675809117390cd0dabd25f0f3d27cdc2 SHA512 feffaf5a561bbc47d42061ae3b2acc9d6cb6fc93d43448a2ac9ede89051c34bbec4b1ff0d77e1a2dd634fa78742a105ba66131a1cdb7a59ceb21abaa32f558d5
+AUX gkrellm-2.3.5-config.patch 1530 BLAKE2B 4e672d58a680c7c0d3f660a2ff26fd5340d14e39d1fb9f824464a5a89b593a9f1b915cc8735c215d27c198147a2a4a438b506e27e5c5469ccbc80534867dc380 SHA512 c8259770dd088a119c349d2f19728f4874a24c407273edbf7129a531589e908ef37fbdf7bdbaaaf51ae6fa527d88601749a9e358746bff514082535b355d2ad0
+AUX gkrellm-2.3.5-sansfont.patch 688 BLAKE2B 679912990141a5758b14f67712ec154e46b0fd8d1fd3fe5a1eb14c9d95ce8113cdf887b72290f9045bb9d37bb6ba132240b74dc3262a6d99fb54b0f204e81100 SHA512 7f404c8f57091f00e66435b0cd311611b40fc6e3f3e953476a40e9a4521e91f7bbd3b19094d88a74b9d8cef20b00c1b5289197df5219455a84ab68e5271ce11f
+AUX gkrellm-2.3.5-width.patch 350 BLAKE2B 94b3690a464b6bfcfe6b88cf7b73880680b33b389ea3ec9f299518aadfc1e9161f7ae8046b3ba484a1a0ff5f4b4d8b3d81a604b4ccc63c546156e8dfa81d687a SHA512 4324fad0b59b482b8a2bea489373a280bc6a5a647f0863f9b1c5929454f7786b94f8293731c3de94ddbef0e8cfbe6018b721fc223dade3d23feb598e4569f3ed
+AUX gkrellmd 536 BLAKE2B 6d6cf06ef51a1afc7c943b78041c9d21a9630eec0a8f598c17013868085ae06d65fdac32a4abc5bfdffb1faa33010deb9e109ccd660064a5e474402c65b55008 SHA512 7a0fa7f32f2aa5739747bec37bdcf2fd5fffffd36fdcfc4c10a36dddbf3987f003d6f8ad367d4e8b9a2d50fbef618dbb9812fc65eeed3d8e70dcf2a1da587495
+AUX gkrellmd.conf 250 BLAKE2B 2b0cfcd1940cd695c67db32c13bbb7f372936b1f88938a2e43aa27d5eeeacf746e5df3367a3c6f68c4f4470633e52a08611dc65e41a9342b98b6d4e80da81064 SHA512 257e13405bc5ce7b61b7a18e7456d1ae22d6fc2052e0e65e3b53c352a43aad2bedb4660dfd7cb95709b51f54b8949f6ff114de310be1ce49d70b074b3b8f8ef5
+AUX gkrellmd.initd 345 BLAKE2B 922967be33dcc733c55cfffa59addc01bbe2ba0298be14541925e88bac16f2310f226448545263527a96499454007baf04272fc5ce136628f03587bbc322f74b SHA512 197ad175f8e8afbc9bb81957d594ee2190c7fb3e251cfda5e987c140174a6a08e485ce2fa4e3d7a21b9bb19979c853e4c04f33021beb497f084f0ddfb2c725ba
+AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
+DIST gkrellm-2.3.10.tar.bz2 782794 BLAKE2B c0aac7df866d40c79667551ca4b25346da4267a0aad8853776425a08097dcfe3a24082e7e5d17db6d3936b59d10c29afa11e8a425319c19696141c02f7d95f25 SHA512 3ae0baa0d51729e1bac7b8f10e008bd7ed9d93d48cd894630e3a027565266e6458df0dcb3171fb271ca7766f4030149e3e6aa234ec191e8e223ae4dee1feb295
+EBUILD gkrellm-2.3.10-r1.ebuild 3251 BLAKE2B 86226ac8f2db195390acfcd5813103b82ab97e1b54771dc413535554d24444549b1d31241e5861915fe58f7e0aefed2d4e259cdb785920b69c7e8924fffbe62c SHA512 e2195ee72694798f537cb04c5b71ec6600bbfca10a6ddbf2a72d4427dae9a3f5e46093e35caa764fc937ecffdcd51394508a4a726c431ea14f666c08f6b4a822
+MISC metadata.xml 917 BLAKE2B 34cca38c9abfdd920abe9bf75e8569d652f3575e3c9f81e40f90255464021cb9f1768f742f30a8e6469a9e74342231380b9bc465a95ee1963e03d87238725e86 SHA512 8896a7f487c9089202c78589eb62c47f1705d41000a562b40a08eea660d0fe4fec422026329dedb4a33bd0dd63da5249e8dfd03590cadcf7088c0b31d55a34af
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch
new file mode 100644
index 000000000000..fa35ef672798
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch
@@ -0,0 +1,24 @@
+--- gkrellm-2.3.5.old/server/monitor.c	2010-10-06 03:46:59.000000000 +1100
++++ gkrellm-2.3.5/server/monitor.c	2011-11-24 02:01:30.871402778 +1100
+@@ -1329,7 +1329,8 @@
+ static gchar *remote_fs_types[] =
+ 	{
+ 	"nfs",
+-	"smbfs"
++	"smbfs",
++	"cifs"
+ 	};
+ 
+ void
+--- gkrellm-2.3.5.old/src/fs.c	2010-09-15 02:25:51.000000000 +1000
++++ gkrellm-2.3.5/src/fs.c	2011-11-24 02:00:17.347088370 +1100
+@@ -163,7 +163,8 @@
+ static gchar *remote_fs_types[]	=
+ 	{
+ 	"nfs",
+-	"smbfs"
++	"smbfs",
++	"cifs"
+ 	};
+ 
+ 
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-config.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-config.patch
new file mode 100644
index 000000000000..c6230598c80e
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-config.patch
@@ -0,0 +1,43 @@
+diff -up gkrellm-2.3.5/server/gkrellmd.conf.config gkrellm-2.3.5/server/gkrellmd.conf
+--- gkrellm-2.3.5/server/gkrellmd.conf.config	2010-09-14 17:26:19.000000000 +0300
++++ gkrellm-2.3.5/server/gkrellmd.conf	2011-06-19 19:17:56.398591498 +0300
+@@ -22,16 +22,17 @@
+ # List of hosts allowed to connect.  If no hosts are specified in a
+ # gkrellmd.conf file or on the command line, all hosts will be allowed.
+ #
+-#allow-host	localhost
+-#allow-host	127.0.0.1
++allow-host	localhost
++allow-host	127.0.0.1
++allow-host	::ffff:127.0.0.1
+ #allow-host	::1
+ #allow-host	192.168.0.*
+ 
+ # Drop privileges after startup (you must start gkrellmd as root to do it).
+ # NOTE: Option ignored on Windows
+ #
+-#user	nobody
+-#group	proc
++user	gkrellmd
++group	gkrellmd
+ 
+ # Create a PID file for the running gkrellmd.  Default is no PID file.
+ # NOTE: Option ignored on Windows
+@@ -76,7 +77,7 @@
+ # Minimum is 2 (less than 2 for no I/O disconnecting and is the default).
+ # Requires at least 2.1.8 versions of both gkrellmd and gkrellm.
+ #
+-#io-timeout 5
++io-timeout 5
+ 
+ # Configure gkrellm clients to attempt automatic reconnects to a
+ # gkrellmd server every reconnect-timeout seconds after a disconnected
+@@ -85,7 +86,7 @@
+ # Minimum is 2 (less than 2 for no automatic reconnecting and is the default).
+ # Requires at least 2.1.8 versions of both gkrellmd and gkrellm.
+ #
+-#reconnect-timeout 5
++reconnect-timeout 5
+ 
+ # Server side local mailbox counts can be sent to gkrellm clients.  List here
+ # paths to mbox, MH mail, or Maildir style mailboxes.
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-sansfont.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-sansfont.patch
new file mode 100644
index 000000000000..460eb5ebc29a
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-sansfont.patch
@@ -0,0 +1,17 @@
+--- gkrellm-2.2.4/src/gui.c.font	2005-05-17 15:37:16.000000000 +0200
++++ gkrellm-2.2.4/src/gui.c	2005-05-17 15:37:46.000000000 +0200
+@@ -1575,11 +1575,11 @@
+ 	if (!_GK.theme_path || !g_file_test(_GK.theme_path, G_FILE_TEST_IS_DIR))
+ 		gkrellm_dup_string(&_GK.theme_path, "");
+ 	if (!large_font.string)
+-		gkrellm_dup_string(&large_font.string, "Serif 11");
++		gkrellm_dup_string(&large_font.string, "Sans 11");
+ 	if (!normal_font.string)
+-		gkrellm_dup_string(&normal_font.string, "Serif 9");
++		gkrellm_dup_string(&normal_font.string, "Sans 9");
+ 	if (!small_font.string)
+-		gkrellm_dup_string(&small_font.string, "Serif 8");
++		gkrellm_dup_string(&small_font.string, "Sans 8");
+ 	}
+ 
+ 
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-width.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-width.patch
new file mode 100644
index 000000000000..c7fc22060b85
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-width.patch
@@ -0,0 +1,11 @@
+--- gkrellm-2.2.7/src/gkrellm.h.width	2005-06-09 12:48:34.000000000 +0200
++++ gkrellm-2.2.7/src/gkrellm.h	2005-06-09 12:48:37.000000000 +0200
+@@ -518,7 +518,7 @@
+ 	GkrellmCallback;
+ 
+ 
+-#define CHART_WIDTH_MAX	1000
++#define CHART_WIDTH_MAX	1600
+ #define CHART_WIDTH_MIN	25
+ 
+   /* Each chart must have a GkrellmChartconfig struct associated with it.
diff --git a/app-admin/gkrellm/files/gkrellmd b/app-admin/gkrellm/files/gkrellmd
new file mode 100644
index 000000000000..93743c57b7df
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellmd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	after lm_sensors
+	after hddtemp
+}
+
+start() {
+	ebegin "Starting GNU Krell Monitor daemon"
+	start-stop-daemon --start --quiet --background --pidfile /var/run/gkrellmd.pid --make-pidfile --exec /usr/bin/gkrellmd -- ${GKRELLMD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping GNU Krell Monitor daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/gkrellmd.pid --name gkrellmd
+	eend $?
+}
diff --git a/app-admin/gkrellm/files/gkrellmd.conf b/app-admin/gkrellm/files/gkrellmd.conf
new file mode 100644
index 000000000000..6b0d90df1092
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellmd.conf
@@ -0,0 +1,8 @@
+# Config file for gkrellmd init script
+
+# If you need to pass extra options to gkrellmd, you may set them here.
+# See 'gkrellmd --help' for a list of options.
+#
+# Note: Many options can be configured in /etc/gkrellmd.conf as well
+#
+#GKRELLMD_OPTS=""
diff --git a/app-admin/gkrellm/files/gkrellmd.initd b/app-admin/gkrellm/files/gkrellmd.initd
new file mode 100644
index 000000000000..fe295128e4ea
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellmd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="gkrell system monitor daemon"
+pidfile="/var/run/gkrellmd.pid"
+command="/usr/bin/gkrellmd"
+command_args="${GKRELLMD_OPTS}"
+command_background="true"
+
+depend() {
+	need net
+	after lm_sensors
+	after hddtemp
+}
diff --git a/app-admin/gkrellm/files/gkrellmd.service b/app-admin/gkrellm/files/gkrellmd.service
new file mode 100644
index 000000000000..f1df0c6420ad
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellmd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=GNU Krell Monitors server
+Documentation=man:gkrellmd(1)
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/gkrellmd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
new file mode 100644
index 000000000000..0dea33e32b53
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib user systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.net/"
+# Upstream named their xz compressed tarball tar.bz2 (*sigh*)
+SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+
+RDEPEND="
+	dev-libs/glib:2
+	hddtemp? ( app-admin/hddtemp )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? (
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	lm_sensors? ( sys-apps/lm_sensors )
+	nls? ( virtual/libintl )
+	ntlm? ( net-libs/libntlm )
+	X? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/pango
+		)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.5-cifs.patch
+	"${FILESDIR}"/${PN}-2.3.5-config.patch
+	"${FILESDIR}"/${PN}-2.3.5-width.patch
+	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog CREDITS README )
+
+pkg_setup() {
+	enewgroup gkrellmd
+	enewuser gkrellmd -1 -1 -1 gkrellmd
+	TARGET=
+	use kernel_FreeBSD && TARGET="freebsd"
+}
+
+src_prepare() {
+	sed -e 's:-O2 ::' \
+		-e 's:override CC:CFLAGS:' \
+		-e 's:-L/usr/X11R6/lib::' \
+		-i */Makefile || die "sed Makefile(s) failed"
+
+	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+		-i src/${PN}.h || die "sed ${PN}.h failed"
+
+	default
+}
+
+src_compile() {
+	if use X ; then
+		local sslopt=""
+		if use gnutls; then
+			sslopt="without-ssl=yes"
+		elif use ssl; then
+			sslopt="without-gnutls=yes"
+		else
+			sslopt="without-ssl=yes without-gnutls=yes"
+		fi
+
+		emake \
+			${TARGET} \
+			CC="$(tc-getCC)" \
+			STRIP="" \
+			INSTALLROOT="${EPREFIX}/usr" \
+			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+			LOCALEDIR="${EPREFIX}/usr/share/locale" \
+			$(usex nls "" "enable_nls=0") \
+			$(usex lm_sensors "" "without-libsensors=yes") \
+			$(usex ntlm "" "without-ntlm=yes") \
+			${sslopt}
+	else
+		cd server || die
+		emake \
+			${TARGET} \
+			CC="$(tc-getCC)" \
+			LINK_FLAGS="$LDFLAGS -Wl,-E" \
+			STRIP="" \
+			$(usex nls "" "enable_nls=0") \
+			$(usex lm_sensors "" "without-libsensors=yes")
+	fi
+}
+
+src_install() {
+	if use X ; then
+		emake \
+			install${TARGET:+_}${TARGET} \
+			$(usex nls "" "enable_nls=0") \
+			STRIP="" \
+			INSTALLDIR="${ED}/usr/bin" \
+			INCLUDEDIR="${ED}/usr/include" \
+			LOCALEDIR="${ED}/usr/share/locale" \
+			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+			MANDIR="${ED}/usr/share/man/man1"
+
+		docinto html
+		dodoc *.html
+
+		newicon src/icon.xpm ${PN}.xpm
+		make_desktop_entry ${PN} GKrellM ${PN}
+	else
+		dobin server/gkrellmd
+
+		insinto /usr/include/gkrellm2
+		doins server/gkrellmd.h
+		doins shared/log.h
+	fi
+
+	newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
+	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
+
+	systemd_dounit "${FILESDIR}"/gkrellmd.service
+
+	insinto /etc
+	doins server/gkrellmd.conf
+
+	einstalldocs
+}
diff --git a/app-admin/gkrellm/metadata.xml b/app-admin/gkrellm/metadata.xml
new file mode 100644
index 000000000000..5e32bfdba9d3
--- /dev/null
+++ b/app-admin/gkrellm/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<use>
+		<flag name="hddtemp">Enable monitoring harddrive temperatures via <pkg>app-admin/hddtemp</pkg></flag>
+		<flag name="gnutls">Enable SSL support for mail checking with <pkg>net-libs/gnutls</pkg> (overrides 'ssl' USE flag)</flag>
+		<flag name="ssl">Enable SSL support for mail checking with <pkg>dev-libs/openssl</pkg></flag>
+		<flag name="lm_sensors">Enable monitoring sensors via <pkg>sys-apps/lm_sensors</pkg></flag>
+		<flag name="X">Build both the X11 gui (gkrellm) and the server (gkrellmd). Disabling this flag builds the server only</flag>
+		<flag name="ntlm">Enable NTLM authentication for mail checking with <pkg>net-libs/libntlm</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/glance-15.0.1 b/app-admin/glance-15.0.1
deleted file mode 100644
index f235a86b1401..000000000000
--- a/app-admin/glance-15.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Services for discovering, registering, and retrieving VM images
-EAPI=6
-HOMEPAGE=https://launchpad.net/glance
-IUSE=doc mysql postgres +sqlite +swift python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-sqlparse-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/alembic-0.8.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/futurist-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/futurist-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/taskflow-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/WSME-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.23.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/glance_store-0.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cursive-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://tarballs.openstack.org/glance/glance-15.0.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4a3683e15449336fad88022f61587dea
diff --git a/app-admin/glance-16.0.1 b/app-admin/glance-16.0.1
deleted file mode 100644
index 4a8439f1303d..000000000000
--- a/app-admin/glance-16.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Services for discovering, registering, and retrieving VM images
-EAPI=6
-HOMEPAGE=https://launchpad.net/glance
-IUSE=doc mysql postgres +sqlite +swift python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-sqlparse-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/alembic-0.8.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-concurrency-3.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/futurist-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/taskflow-2.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/WSME-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prettytable-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-16.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/glance_store-0.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://tarballs.openstack.org/glance/glance-16.0.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=766dc06da77a6016223887a703a666e5
diff --git a/app-admin/glance-2017.2.9999 b/app-admin/glance-2017.2.9999
deleted file mode 100644
index daab3ecb4914..000000000000
--- a/app-admin/glance-2017.2.9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Services for discovering, registering, and retrieving VM images
-EAPI=6
-HOMEPAGE=https://launchpad.net/glance
-IUSE=doc mysql postgres +sqlite +swift python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-sqlparse-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/alembic-0.8.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/futurist-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/futurist-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/taskflow-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/WSME-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prettytable-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-db-4.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-middleware-3.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-policy-1.23.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/glance_store-0.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cursive-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eff6d6b54e09d7d7e5a20914523ff3e3
diff --git a/app-admin/glance-2018.1.9999 b/app-admin/glance-2018.1.9999
deleted file mode 100644
index 1d0c531b5281..000000000000
--- a/app-admin/glance-2018.1.9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Services for discovering, registering, and retrieving VM images
-EAPI=6
-HOMEPAGE=https://launchpad.net/glance
-IUSE=doc mysql postgres +sqlite +swift python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-sqlparse-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/alembic-0.8.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-concurrency-3.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/futurist-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/taskflow-2.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/WSME-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prettytable-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-16.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/glance_store-0.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8f13d58eff61446c6946cec8cf688bb8
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
new file mode 100644
index 000000000000..80bf2afcfe8a
--- /dev/null
+++ b/app-admin/glance/Manifest
@@ -0,0 +1,8 @@
+AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f3078cea66bc6086e80a530729b6484f110c02e23375fddde7f0ddfd22a6451ef84d9ec3caaa9d6cc SHA512 c6c433334bb337c708e31fac7869bf29e89516b857800d7cb77d264766483f54976dda6d83460078eed0dee14f0770a31adce344ec7fca04c2040b21dcf239b5
+DIST glance-15.0.1.tar.gz 1815463 BLAKE2B ec6e51340fc4d737e2bd777baf03163a0b515d19c1dc8e5203918e07b304a9539f47ba763207e26def985c6a384d21250ffe1386b433d8b606b55d3d70e4431a SHA512 2da3ada256424a7817d0c49aac0940443cbefcfff3df77a623d7099badf356808b5df59f109ac233f84ac561b7310d3b8d53cafd6c9955a8e2b296a1655cedd3
+DIST glance-16.0.1.tar.gz 1957403 BLAKE2B a58a37b1926432ff227ebbd2b8538d25276085c4183244f930cdb6432ce00ed3927130ede24faeb9ebd25489f649c7f6542d71b9fe9614859ed3953bded13ab2 SHA512 dad883c308cfa6799bd5fc4111585af2bd7f2c5a20126976d1044e2bf573f94756f2ecea87f3b04fe611f80602709e0501c0efceed5061d0c752416b6255a2a2
+EBUILD glance-15.0.1.ebuild 5275 BLAKE2B 4f8c013b81327ce5020b5a2ad63b707e79939fe979ff5d7c07fbd95680dee369f2e30402c7303d3e9c521fc92a8093cf5149a7a431c7f50180db41d51a90bbf6 SHA512 9a59f6431a047dbea53eb17c09b3363ca50e8c1e93d4c565d28e96dcebacd00b43f18403753ab28427f87813d1e0f9f4cc57776486bcbae21138313ceed6e554
+EBUILD glance-16.0.1.ebuild 5035 BLAKE2B e73f1ec4e0c1cad9cfdb1fc23b861777d2a3d06f342ad2c9033c1bdd3de861d9897d917358839dde473582666a30bfd7cf7dbb4cf1bcb4290adc5e2ca4def46c SHA512 ad9a52e79f3319174bb23b259df77fcc6e89739047a51eb58175570a36e7884b3447132cd5572e75e82facd663b823bc5a9f6dc1b27f1fb538b3931dfb814381
+EBUILD glance-2017.2.9999.ebuild 5273 BLAKE2B 9cc4c20436e36b04a04c0b20c1947f28d673e5ad4ce91dd721664ed2d6ffcfc75b7070cf05a6647f620be55b969c338f6103c7458b459393c4e667c88eea7829 SHA512 5fbdf1a2f1c59cc939baab5baa7425e616b3ab01dfededc6bea7c61a9053bf40bbc65eea2563cba150daf1ce74f5b779cfe68d505f9d02bc0dd8641a1f2cf18e
+EBUILD glance-2018.1.9999.ebuild 5037 BLAKE2B 5c9ca39b7d71b3516a6cbce648608285f433c2db33e2bfb81d67062c34c3fd33ff80575e2b5bf264da6d7a1bc2e7f381457769efe7fb336fa4c33032d79e65ce SHA512 28a7f46b5fd8e790a2d9447ef21059f6779531a761e1fad3e94395cc394e04a1dc907768c42cc52ad018d6588048fefc52748d94ced32cc8a941eb6d371e4338
+MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/files/glance.initd b/app-admin/glance/files/glance.initd
new file mode 100644
index 000000000000..57274ac2dfee
--- /dev/null
+++ b/app-admin/glance/files/glance.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Starts ${SVCNAME} service for OpenStack"
+
+command=/usr/bin/${RC_SVCNAME}
+command_user="${GLANCE_USER:-glance}"
+command_background=yes
+pidfile=/run/${RC_SVCNAME}.pid
+required_files=/etc/glance/${RC_SVCNAME}.conf
+
+depend() {
+	need net
+}
diff --git a/app-admin/glance/glance-15.0.1.ebuild b/app-admin/glance/glance-15.0.1.ebuild
new file mode 100644
index 000000000000..affe9f8be82a
--- /dev/null
+++ b/app-admin/glance/glance-15.0.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/glance.git"
+	EGIT_BRANCH="stable/pike"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 ~arm64 x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	${CDEPEND}
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}/glance.initd" glance-api
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/glance-16.0.1.ebuild b/app-admin/glance/glance-16.0.1.ebuild
new file mode 100644
index 000000000000..46eec10bb8db
--- /dev/null
+++ b/app-admin/glance/glance-16.0.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/glance.git"
+	EGIT_BRANCH="stable/queens"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 ~arm64 x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}/glance.initd" glance-api
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/glance-2017.2.9999.ebuild b/app-admin/glance/glance-2017.2.9999.ebuild
new file mode 100644
index 000000000000..b62d4fbb8e4c
--- /dev/null
+++ b/app-admin/glance/glance-2017.2.9999.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/glance.git"
+	EGIT_BRANCH="stable/pike"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	${CDEPEND}
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}/glance.initd" glance-api
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/glance-2018.1.9999.ebuild b/app-admin/glance/glance-2018.1.9999.ebuild
new file mode 100644
index 000000000000..a986be6542e7
--- /dev/null
+++ b/app-admin/glance/glance-2018.1.9999.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/glance.git"
+	EGIT_BRANCH="stable/queens"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}/glance.initd" glance-api
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/metadata.xml b/app-admin/glance/metadata.xml
new file mode 100644
index 000000000000..080766e81a18
--- /dev/null
+++ b/app-admin/glance/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    Provides services for discovering, registering, and retrieving virtual 
+    machine images. Glance has a RESTful API that allows querying of VM image 
+    metadata as well as retrieval of the actual image.
+  </longdescription>
+  <use>
+    <flag name="swift">Adds swift storage support</flag>
+  </use>
+  <upstream>
+    <remote-id type="launchpad">glance</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/gnome-abrt-1.2.6 b/app-admin/gnome-abrt-1.2.6
deleted file mode 100644
index cc89571a3d97..000000000000
--- a/app-admin/gnome-abrt-1.2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/gtk+:3 >=dev-libs/libreport-2.0.20[python] >=app-admin/abrt-2.10.10-r1 dev-python/pygobject:3 x11-libs/libX11 >=dev-python/pyxdg-0.19 app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=A utility for viewing problems that have occurred with the system
-EAPI=6
-HOMEPAGE=https://github.com/abrt/abrt/wiki/ABRT-Project
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/gtk+:3 >=dev-libs/libreport-2.0.20[python] >=app-admin/abrt-2.10.10-r1 dev-python/pygobject:3 x11-libs/libX11 >=dev-python/pyxdg-0.19
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/abrt/gnome-abrt/archive/1.2.6.tar.gz -> gnome-abrt-1.2.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cd4f981f808c9ee58d22cf8097d4b13c
diff --git a/app-admin/gnome-abrt/Manifest b/app-admin/gnome-abrt/Manifest
new file mode 100644
index 000000000000..03efa0c28e3f
--- /dev/null
+++ b/app-admin/gnome-abrt/Manifest
@@ -0,0 +1,4 @@
+AUX 0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch 4329 BLAKE2B 408bd52cd8a7ae8ae60a938da810a2af35556111791f330887d7c6f9af1f27eb50a4efa4f646144fb3e2483398f7e4af21afb4b587f6068a5764004d0efdfca4 SHA512 e7c505da3355a721c38d043fd0dc7397f664d90f1c243203a5055dfeefde7b8aafe02a8bd3acb22ba32941740e4aab38873fa75178ee1d4776a2da182e6b2033
+DIST gnome-abrt-1.2.6.tar.gz 340308 BLAKE2B 5221fe43fd72fe8798f2c11275863e6936e616632641448c53dd24118d3b6b808fc373fe98b8775f1f1c58820c06195a665f6d417c95eaa7cc333cd7660b2d0b SHA512 12bcdeefa481b7caa04da046ee11d6adc9fd582b32f709d79a2d94cf61ca02643edd418cd9257c0f732a30aa5714fe83a282a4c794ff4260ddad038f7721ff2c
+EBUILD gnome-abrt-1.2.6.ebuild 1306 BLAKE2B 27f2fafdb5fea0dbda5679ec9dcc75826e7a7a54af261f66c66466b85ec3a6bf271f3d16b2e745cf4d2e2b87215bfbb1d11aec7b095cad69d2072e67faca41c4 SHA512 b8efc525446bd3148f7a7059388e6c2ef90005e0b79a5fe282b46b635824f71bcb9e26347a61b366ea594e1ab559cbdd6b003c572b4f93ae474372a87ebfe026
+MISC metadata.xml 333 BLAKE2B 7dfc442159eac1c4501c5bfaeec34615e2e8dd63b982759f30a0835143a1d5b661cce8e85868be70115c93c26f7ed70389b9f7ad6ae88f93b081f126c42beef3 SHA512 8c2e01101d19e3cd8ade5da1921864d2103eaa2f140c0eccb398e2567254d839311ba1384e25e0bea316345943c0649aee92aabb3ec2092d1a9e0728436fadc4
diff --git a/app-admin/gnome-abrt/files/0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch b/app-admin/gnome-abrt/files/0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch
new file mode 100644
index 000000000000..21d088efab4f
--- /dev/null
+++ b/app-admin/gnome-abrt/files/0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch
@@ -0,0 +1,108 @@
+From ab72d64818a5d88ceb4ab94f1eaae04268519e73 Mon Sep 17 00:00:00 2001
+From: Rafal Luzynski <digitalfreak@lingonborough.com>
+Date: Mon, 21 Aug 2017 11:55:41 +0200
+Subject: [PATCH] Remove Expert mode and the remaining Analyze code
+
+The Expert mode was originally introduced together with the Analyze
+feature by the commit 532cbd4. The Expert mode was intended to hide
+the Analyze feature by default and show in only when the Expert mode
+is on. Later the commit f5eb93f removed most of the Analyze feature
+although some of its code still remained and was unused. At the same
+time, probably by mistake, the Expert mode was switched to control
+the visibility of the Details context menu item.
+
+This commit removes the Expert mode which is unused and implemented
+incorrectly and any remains of the Analyze feature. Closes #182.
+---
+ src/gnome-abrt                  | 3 ---
+ src/gnome_abrt/controller.py.in | 7 -------
+ src/gnome_abrt/oops.glade       | 8 --------
+ src/gnome_abrt/views.py         | 7 -------
+ 4 files changed, 25 deletions(-)
+
+diff --git a/src/gnome-abrt b/src/gnome-abrt
+index f8e96e8..b1044d3 100755
+--- a/src/gnome-abrt
++++ b/src/gnome-abrt
+@@ -401,8 +401,6 @@ if __name__ == "__main__":
+             help=_('Be verbose'))
+     CMDARGS.add_argument('-p', '--problem',
+             help=_('Selected problem ID'))
+-    CMDARGS.add_argument('-x', '--expert', action='store_true',
+-            help=_('Expert mode'))
+ 
+     OPTIONS = CMDARGS.parse_args()
+ 
+@@ -414,7 +412,6 @@ if __name__ == "__main__":
+     CONF = get_configuration()
+     # TODO : mark this option as hidden or something like that
+     CONF.add_option('problemid', default_value=None)
+-    CONF.add_option('expert', default_value=(OPTIONS.expert))
+ 
+     APP_CMDLINE = []
+     if 'problem' in VARS:
+diff --git a/src/gnome_abrt/controller.py.in b/src/gnome_abrt/controller.py.in
+index fc16dc2..86db419 100644
+--- a/src/gnome_abrt/controller.py.in
++++ b/src/gnome_abrt/controller.py.in
+@@ -45,13 +45,6 @@ class Controller(object):
+ 
+         problem.delete()
+ 
+-    def analyze(self, problem):
+-        if not problem:
+-            logging.error("BUG: Controller: Can't open detail of None problem")
+-            return
+-
+-        self.run_event_fn("open-gui", problem)
+-
+     def _refresh_sources(self):
+         for name, src in self.sources:
+             try:
+diff --git a/src/gnome_abrt/oops.glade b/src/gnome_abrt/oops.glade
+index bbb732b..b8ddb42 100644
+--- a/src/gnome_abrt/oops.glade
++++ b/src/gnome_abrt/oops.glade
+@@ -23,14 +23,6 @@
+       <accelerator key="Return"/>
+     </child>
+     <child>
+-      <object class="GtkAction" id="gac_analyze">
+-        <property name="label" translatable="yes">Analy_ze</property>
+-        <property name="tooltip" translatable="yes">Open selected problem for analysis</property>
+-        <signal name="activate" handler="on_gac_analyze_activate" swapped="no"/>
+-      </object>
+-      <accelerator key="Return" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK"/>
+-    </child>
+-    <child>
+       <object class="GtkAction" id="gac_detail">
+         <property name="label" translatable="yes">D_etails</property>
+         <property name="tooltip" translatable="yes">Show technical details</property>
+diff --git a/src/gnome_abrt/views.py b/src/gnome_abrt/views.py
+index 82b606f..ec7b211 100644
+--- a/src/gnome_abrt/views.py
++++ b/src/gnome_abrt/views.py
+@@ -527,7 +527,6 @@ class OopsWindow(Gtk.ApplicationWindow):
+         conf.set_watch('T_FMT', self._options_observer)
+         conf.set_watch('D_T_FMT', self._options_observer)
+         self._options_observer.option_updated(conf, 'problemid')
+-        self._builder.mi_detail.set_visible(conf['expert'])
+ 
+         # enable observer
+         self._source_observer.enable()
+@@ -1002,12 +1001,6 @@ _("This problem has been reported, but a <i>Bugzilla</i> ticket has not"
+                     selected[0].problem_id, self)
+ 
+     @handle_problem_and_source_errors
+-    def on_gac_analyze_activate(self, action):
+-        selected = self._get_selected(self.lss_problems)
+-        if selected:
+-            self._controller.analyze(selected[0])
+-
+-    @handle_problem_and_source_errors
+     def on_gac_report_activate(self, action):
+         selected = self._get_selected(self.lss_problems)
+         if selected and not selected[0]['not-reportable']:
+-- 
+2.13.6
+
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild
new file mode 100644
index 000000000000..5121f602279e
--- /dev/null
+++ b/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools gnome2-utils python-single-r1
+
+DESCRIPTION="A utility for viewing problems that have occurred with the system"
+HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
+SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	x11-libs/gtk+:3
+	>=dev-libs/libreport-2.0.20[python]
+	>=app-admin/abrt-2.10.10-r1
+	dev-python/pygobject:3
+	x11-libs/libX11
+	>=dev-python/pyxdg-0.19
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17
+"
+
+PATCHES=(
+	# From Fedora (fixed in next release)
+	"${FILESDIR}"/0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch
+)
+
+src_prepare() {
+	default
+	./gen-version > gnome-abrt-version || die
+	eautoreconf
+}
+
+src_configure() {
+	myeconfargs=(
+		--localstatedir="${EPREFIX}/var"
+		--with-nopylint
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-admin/gnome-abrt/metadata.xml b/app-admin/gnome-abrt/metadata.xml
new file mode 100644
index 000000000000..fec665753243
--- /dev/null
+++ b/app-admin/gnome-abrt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">abrt/gnome-abrt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/gnome-system-log-3.9.90 b/app-admin/gnome-system-log-3.9.90
deleted file mode 100644
index 8878f686fba2..000000000000
--- a/app-admin/gnome-system-log-3.9.90
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.31:2 sys-libs/zlib:= >=x11-libs/gtk+-3.9.11:3 x11-libs/pango >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=System log viewer for GNOME
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Apps/Attic/GnomeUtils
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.31:2 sys-libs/zlib:= >=x11-libs/gtk+-3.9.11:3 x11-libs/pango gnome-base/gsettings-desktop-schemas !<gnome-extra/gnome-utils-3.4
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-system-log/3.9/gnome-system-log-3.9.90.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ca52f1934b9ebeaa5f34208c9fbbf245
diff --git a/app-admin/gnome-system-log/Manifest b/app-admin/gnome-system-log/Manifest
new file mode 100644
index 000000000000..a64ef545b994
--- /dev/null
+++ b/app-admin/gnome-system-log/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-system-log-3.9.90.tar.xz 1350788 BLAKE2B 3325bb071a0a5c9b472ba1b570e8962ca4f00840127c757f482e4d0b25723eab4d96d83da168984f785c2c52b011c18fae718013ce94f146f3b68498d212bc7d SHA512 1500c62fed7babf2b1cc0f95e23d490bf8065bacf68c44095d882d4f429548b179df9276e3f2ff0bf03bb4db0bb5cd525e3210a5ea04f23a34e547a13f3dc2b7
+EBUILD gnome-system-log-3.9.90.ebuild 822 BLAKE2B 85a07afb95d785af44395d07a98bb98d7002b2c6218f43395b88db9a38a9dbe9ac1ec52d8bad2fd7430894ab472abb93519ffd648edb08c3d678fc8db21a8ef2 SHA512 1cfabe019b57a1aae41161f76a5383f9188ed0abc4a56fa3b8aeec0c83f7b4f57bce671fa9e9844a7d91e082aad64e3be66f66acd519a4f7afcd6dc4917be61b
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild b/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild
new file mode 100644
index 000000000000..c82379d3ce5f
--- /dev/null
+++ b/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="System log viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31:2
+	sys-libs/zlib:=
+	>=x11-libs/gtk+-3.9.11:3
+	x11-libs/pango
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	!<gnome-extra/gnome-utils-3.4"
+# ${PN} was part of gnome-utils before 3.4
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-zlib \
+		ITSTOOL=$(type -P true)
+}
diff --git a/app-admin/gnome-system-log/metadata.xml b/app-admin/gnome-system-log/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/app-admin/gnome-system-log/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/go-updater-0.1.0 b/app-admin/go-updater-0.1.0
deleted file mode 100644
index 01d69ec35093..000000000000
--- a/app-admin/go-updater-0.1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Checks if Gentoo go packages are compiled with the system's golang version
-EAPI=6
-HOMEPAGE=https://github.com/mrueg/go-updater
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-go/goversion
-SLOT=0
-SRC_URI=https://github.com/mrueg/go-updater/archive/0.1.0.tar.gz -> go-updater-0.1.0.tar.gz
-_md5_=e083ea3b63174d33f086a15ad529a601
diff --git a/app-admin/go-updater-0.2.0 b/app-admin/go-updater-0.2.0
deleted file mode 100644
index 404183ee3bc1..000000000000
--- a/app-admin/go-updater-0.2.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Checks if Gentoo go packages are compiled with the system's golang version
-EAPI=6
-HOMEPAGE=https://github.com/mrueg/go-updater
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-go/goversion
-SLOT=0
-SRC_URI=https://github.com/mrueg/go-updater/archive/0.2.0.tar.gz -> go-updater-0.2.0.tar.gz
-_md5_=e083ea3b63174d33f086a15ad529a601
diff --git a/app-admin/go-updater/Manifest b/app-admin/go-updater/Manifest
new file mode 100644
index 000000000000..d6f832b0260a
--- /dev/null
+++ b/app-admin/go-updater/Manifest
@@ -0,0 +1,5 @@
+DIST go-updater-0.1.0.tar.gz 1754 BLAKE2B 720a328e8f28d2f0b28400053776ff8dbe52e24be7b20812d01b148bde72eda948acb5867b8ca16af7b40d20e36d36d3ffbd846c4992bb1dbe2af6db0069e765 SHA512 321f7faaec62b653c2b01f6f2e2c0104b536e63dfeb6aacd72c493d3fdc7b3bc5b96d6eff02ec1603adde1879dacbd51f4ced37c3cd94361120cc482432cb8a5
+DIST go-updater-0.2.0.tar.gz 2183 BLAKE2B 0afdd1442916a1def1de4d45eb3cb89c5634b275912b7c8c451ecd6b911e82ad5e8a9715e39404c4d3eb006e7b1822c9f23d02e871379f66536bc5eff15c2f05 SHA512 9c81ded9cdbb825872e0224634f7876a598086870a101e8c2f70fbebcfff964d4ff2f0778607c2110dad1a08160628a8943e9ac902df0b6cd70a58d5ca9e6dca
+EBUILD go-updater-0.1.0.ebuild 484 BLAKE2B 7a8413ef6a49557411bd98527880b63bd1e06ab26b3da010dbc02105de4216cf697e428d9e6d60181872a7279dd428689424363bd9a85d916b1d5b15521303ae SHA512 ffaf2957d335ebde1c981d0593d0f239740fbc155d5f28b8fd744a3c1ab193bbf6cb1ce35d5beea40ffe45a5461582be38d7c336ec235b1026cc1dd2e3f269a4
+EBUILD go-updater-0.2.0.ebuild 484 BLAKE2B 7a8413ef6a49557411bd98527880b63bd1e06ab26b3da010dbc02105de4216cf697e428d9e6d60181872a7279dd428689424363bd9a85d916b1d5b15521303ae SHA512 ffaf2957d335ebde1c981d0593d0f239740fbc155d5f28b8fd744a3c1ab193bbf6cb1ce35d5beea40ffe45a5461582be38d7c336ec235b1026cc1dd2e3f269a4
+MISC metadata.xml 326 BLAKE2B 6da205ed08b301f995aefb59116b618e24495abd172c9a152acb99d9d3e118500c9c3e55a5abb8987f33bb7d334516fa1595829e35ca9835df6622b4318d8a88 SHA512 55cfe9cb2c45438ace6fa2915828d032dfb377af270f024d78008bf5912e2527d88662f79b4b6aedbe2e9870cb52262b25624a4c598f94c4e0e4cb9f649aec92
diff --git a/app-admin/go-updater/go-updater-0.1.0.ebuild b/app-admin/go-updater/go-updater-0.1.0.ebuild
new file mode 100644
index 000000000000..78dc6698a598
--- /dev/null
+++ b/app-admin/go-updater/go-updater-0.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Checks if Gentoo go packages are compiled with the system's golang version"
+HOMEPAGE="https://github.com/mrueg/go-updater"
+SRC_URI="https://github.com/mrueg/go-updater/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-go/goversion"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README.md
+}
diff --git a/app-admin/go-updater/go-updater-0.2.0.ebuild b/app-admin/go-updater/go-updater-0.2.0.ebuild
new file mode 100644
index 000000000000..78dc6698a598
--- /dev/null
+++ b/app-admin/go-updater/go-updater-0.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Checks if Gentoo go packages are compiled with the system's golang version"
+HOMEPAGE="https://github.com/mrueg/go-updater"
+SRC_URI="https://github.com/mrueg/go-updater/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-go/goversion"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README.md
+}
diff --git a/app-admin/go-updater/metadata.xml b/app-admin/go-updater/metadata.xml
new file mode 100644
index 000000000000..f2eeaac7c70e
--- /dev/null
+++ b/app-admin/go-updater/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mrueg/go-updater</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/graylog2-2.1.2 b/app-admin/graylog2-2.1.2
deleted file mode 100644
index 43c9bf47a16a..000000000000
--- a/app-admin/graylog2-2.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DESCRIPTION=Free and open source log management
-EAPI=6
-HOMEPAGE=https://graylog.org
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=virtual/jdk:1.8
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://packages.graylog2.org/releases/graylog/graylog-2.1.2.tgz
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=92b2d4dd275445feef1d3167fe0bb14a
diff --git a/app-admin/graylog2-2.2.2 b/app-admin/graylog2-2.2.2
deleted file mode 100644
index d4b41f740e8d..000000000000
--- a/app-admin/graylog2-2.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DESCRIPTION=Free and open source log management
-EAPI=6
-HOMEPAGE=https://graylog.org
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=virtual/jdk:1.8
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://packages.graylog2.org/releases/graylog/graylog-2.2.2.tgz
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=3efcc2b6cb2ad16e8979965513194e4e
diff --git a/app-admin/graylog2-2.2.3 b/app-admin/graylog2-2.2.3
deleted file mode 100644
index b90e7cb349d6..000000000000
--- a/app-admin/graylog2-2.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DESCRIPTION=Free and open source log management
-EAPI=6
-HOMEPAGE=https://graylog.org
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=virtual/jdk:1.8
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://packages.graylog2.org/releases/graylog/graylog-2.2.3.tgz
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=53a5ac53d909b7abeb53c7ae0559d4e8
diff --git a/app-admin/graylog2-2.4.5-r1 b/app-admin/graylog2-2.4.5-r1
deleted file mode 100644
index 7a535fae8bd3..000000000000
--- a/app-admin/graylog2-2.4.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DESCRIPTION=Free and open source log management
-EAPI=6
-HOMEPAGE=https://graylog.org
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=virtual/jdk:1.8
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://packages.graylog2.org/releases/graylog/graylog-2.4.5.tgz
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=21eb1a1b1e32a82ba3f53a9ed7cf454a
diff --git a/app-admin/graylog2/Manifest b/app-admin/graylog2/Manifest
new file mode 100644
index 000000000000..f8d77c8ec0ff
--- /dev/null
+++ b/app-admin/graylog2/Manifest
@@ -0,0 +1,15 @@
+AUX confd 391 BLAKE2B 35b7806d977b6cde07d4b8b9d6b41771110c5bbbe7037003392238850fcd8c36b5e561ef4e8d94dcc063c51b684650a932e3eb9b786f076bc2ba1bbb2c0d9842 SHA512 5adfb7b72488bd25e26fd7ddee90f50a244d2a90b3dff63fc9791fb213cf14da09e0ead75eeb33e540218b343564d7b56552414c090b517e4abdd8bc7cd58f68
+AUX confd-r1 521 BLAKE2B 4fa7105f843a4e2df8d610ece2601caef641c6a29026e89c0e6180dd0a47444fb73f4d17f3b811c624f02749703bed260757999fab2cdf534c75472a70e6fc39 SHA512 a1fc50cbab0960cea36bf77b052284d52ec7bdd23e56d90fcb1712dcee608c4c0555557c4cfaa5fb0ce6165f0cf1a88888e705e9c64104af79a18be525ec9725
+AUX confd-r2 542 BLAKE2B 83a8b2a3bf1fc60a2a9475d823efe39febb961d0aaee12b7b18f1d2752427e401fe2f68c83f777fba1d2f585540f4d9b422befcc959aa082a26eeef2be093b2b SHA512 fde38b6813f40633db5d5cbcb3d93fd17e8705d6f2c5805fdc900858fe2b0cf0c0c219345dc741cc2573b1f80b42fdf5714e71fa31938329355556503492bbb8
+AUX initd 1418 BLAKE2B 5075e527e83fbe50dae812b07f5b80a09936062ce4d51f2c2e287018b89adc392ee8839903e1ee11899176d39d67b7b8d526b26438243d70b9f5a6622361c98a SHA512 69017bc9679e710a100fa71f651d619c485954515883116287135a52c05335fb6f868eeda2bac4ea877ed8464a7cc2ac34df355189986aba172495aecc9a5379
+AUX initd-r1 1580 BLAKE2B 23b234ddc3bb2ab1e0f23795ab79fb82abda2b695c1f6fd2f1977999df51a8e4b998ca8d0e1e954c68d4c057eadec3cbe0b0309ec8b8898d7b005499675a743c SHA512 871085b5b50ca473451c42a39181ba4a626475abfc7160f7308e6fae9fe78b6bcdef397c0f5a44d9949adcbaacdb0c50fe236b54e95e1602896f4339c71c3b10
+AUX initd-r2 872 BLAKE2B 500a428a0f479dc79b1d8b7d6a1acfafe9a205a65adfacd10aa6f5e89c105c30e095e69799acd8739d9ed2b7dee0ed6d053497a74495a986b6d9b24122c29a75 SHA512 43632bd345bb3772018ce1fe32a97c85a1ad812dca2ae229dccb65302e686597dad4b62ecbc0cc5358c34761f354d51de2c9fe81bd3db71af5fdc0a6cbc0e95e
+DIST graylog-2.1.2.tgz 94284738 BLAKE2B d4971bb6fb073f575d20204b49e7edf24773f42e4c9b84f0e1d2a5834bf8d95120ef1fa6391b22714923fa1f62e623f02a6788c82b1f48fc86f4953d484de36f SHA512 df636143ff90b0aedcb6db78e20125c10da2428b6e474e925d6fc011fdc3a0b88414ec914981a71a0e08c4916cb5cd18a8eeda28e01d9edf3b3ae4a8fb0a90dc
+DIST graylog-2.2.2.tgz 99956086 BLAKE2B 55499d11d9f9a81df8670521f62a45323941f7acac1b87a4df96dfbe0f14a63640cd536ab1c8affa69fe1c774d37b75ca8d0d4bc6194622267a6f5640cf05cc7 SHA512 341548b5d48e3a2008a1264128a604320b566b8f0e8da4d2fca54a69e1412a69839d09698e13d97dd399652611a3e24dd54dc81f56bc4ca00278afbd61ba9c2c
+DIST graylog-2.2.3.tgz 99971278 BLAKE2B 981568151fa22b3b180a451075c9c66c1e9148d737e4683fdbeb505fccb54729619fce554ee3efd423f971081005e73e481f69d9b81676e80f1276b4a982cd6e SHA512 19ad14bdee733b4ceed526af7f446fc74a4ac5bc6a0b4784618edd84a84aa00378c203d4051a3232c17caaf47f3ffe684cb8b17ce88c8d98e7b29bc22c0058e8
+DIST graylog-2.4.5.tgz 122974260 BLAKE2B 0f04713fcee112f1018a78bea7c39b456ae167ec46c29b1b3c60326563d405a92a4d4d341860b0341a3ce2c7ad105a8ebf5068cae5b29b312d01a4fd036f277f SHA512 bfcf879ab01142894ada2639f9d191aef640fa17e7c0a5935347291e99109fa677ae9caacada6cd3b94295a290eb710c20710621376c04222d6012492331b9af
+EBUILD graylog2-2.1.2.ebuild 1862 BLAKE2B a029af6558cb63476c97d6eebdc796145bdbc99dcbfbf428396bcb2d53a66cb04c01e890f47f7ee84c2ede0b5b04d77cdfb7cdda8e9f107baa0c6e5695381b99 SHA512 43efdd7b105a59ce897beda8d49c4797ccee133929df87903a47c4d22faea1e5bec8ba2e80519ea5d635afdd2f8933fc35dda022078ddc2c251c6db43f45f157
+EBUILD graylog2-2.2.2.ebuild 2199 BLAKE2B b923e54efdc27566bdb33115e97a924976022eb7c7d15420c599a0f2705cae5079dcaab64f339a6af3ced35a15bc3efe211b66da82a199ad1c067659c3211a49 SHA512 d8fc5fbd3a09adb4dc0904e501103e9e6da18f1ab80a19908190a91cf271fcf997f73fbfdecd6a28acafa763643335c76c653a2759fde581025e1af5ff77255f
+EBUILD graylog2-2.2.3.ebuild 2206 BLAKE2B 5cc4fd2c40d7f0548b47931e013d99650d2fdf33931c95e2132721bba7393f817f7f2ba0d58d1f5f9a752667ea2dcbcb632fa5d1309c3c3113b8d4ca2c75917f SHA512 a7e6ddf34c75c835cc85fc6b5b58aed0005f88b4e0488d35832930db11d57d7c7896ccf495e3b04dad9d9330f4c98da906916c0e0cdab96956b04f3b941a9016
+EBUILD graylog2-2.4.5-r1.ebuild 2289 BLAKE2B c1b21ab668e1c0877b3cfcadf63538de1a3eaf9a85b043b34d56774f73e436454e499f22f8d7cc3f2262a01866d8e55ef9ea3be9195fe48755ebfb015fbb992d SHA512 864b58319a8ff84bd6a94490eea9d89de800dcad678302df1ea4f834f27b5b18a5f8c0ac8ae57bd0c23d3c0904e99a90a0d363abfc39442bef5b55a70783ec1e
+MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
diff --git a/app-admin/graylog2/files/confd b/app-admin/graylog2/files/confd
new file mode 100644
index 000000000000..58291368f353
--- /dev/null
+++ b/app-admin/graylog2/files/confd
@@ -0,0 +1,7 @@
+GRAYLOG_CONFIG_FILE="/etc/graylog2/graylog.conf"
+GRAYLOG_GROUP="graylog"
+GRAYLOG_LOG_DIR="/var/log/graylog2"
+GRAYLOG_USER="graylog"
+GRAYLOG_OPTIONS=""
+GRAYLOG_PID_FILE="/run/graylog2/graylog.pid"
+JAVA_OPTS="-Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseParNewGC -XX:-OmitStackTraceInFastThrow"
diff --git a/app-admin/graylog2/files/confd-r1 b/app-admin/graylog2/files/confd-r1
new file mode 100644
index 000000000000..23b632ac4338
--- /dev/null
+++ b/app-admin/graylog2/files/confd-r1
@@ -0,0 +1,9 @@
+GRAYLOG_CONFIG_FILE="/etc/graylog2/graylog.conf"
+GRAYLOG_GROUP="graylog"
+GRAYLOG_LOG_DIR="/var/log/graylog2"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog2"
+GRAYLOG_DATA_DIR="/var/lib/graylog2"
+GRAYLOG_USER="graylog"
+GRAYLOG_OPTIONS=""
+GRAYLOG_PID_FILE="/run/graylog2/graylog.pid"
+JAVA_OPTS="-Djava.library.path=$GRAYLOG_INSTALL_DIR/lib/sigar -Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseParNewGC -XX:-OmitStackTraceInFastThrow"
diff --git a/app-admin/graylog2/files/confd-r2 b/app-admin/graylog2/files/confd-r2
new file mode 100644
index 000000000000..97eac6ac77fa
--- /dev/null
+++ b/app-admin/graylog2/files/confd-r2
@@ -0,0 +1,12 @@
+GRAYLOG_CONFIG_FILE="/etc/graylog2/graylog.conf"
+GRAYLOG_DATA_DIR="/var/lib/graylog2"
+GRAYLOG_GROUP="graylog"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog2"
+GRAYLOG_LOG_DIR="/var/log/graylog2"
+GRAYLOG_OPTIONS=""
+GRAYLOG_USER="graylog"
+
+JAVA_OPTS="-Djava.library.path=$GRAYLOG_INSTALL_DIR/lib/sigar -Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseParNewGC -XX:-OmitStackTraceInFastThrow"
+
+# Please adjust according to your bind address
+rc_need="net.lo"
diff --git a/app-admin/graylog2/files/initd b/app-admin/graylog2/files/initd
new file mode 100644
index 000000000000..20c2143e96c9
--- /dev/null
+++ b/app-admin/graylog2/files/initd
@@ -0,0 +1,54 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+export JAVA_HOME=`java-config --jre-home`
+
+checkconfig() {
+  if [ ! -r "${GRAYLOG_CONFIG_FILE}" ]; then
+    eerror "GRAYLOG_CONFIG_FILE doesn't point to a readable config file"
+  fi
+}
+
+depend() {
+  need net
+}
+
+start() {
+  checkconfig || return 1
+
+  [ -e `dirname "$GRAYLOG_PID_FILE"` ] || \
+    install -d -o${GRAYLOG_USER} -g${GRAYLOG_GROUP} -m750 `dirname "$GRAYLOG_PID_FILE"`
+
+  [ -e "$GRAYLOG_LOG_DIR" ] || \
+    install -d -o${GRAYLOG_USER} -g${GRAYLOG_GROUP} -m750 "$GRAYLOG_LOG_DIR"
+  
+  CLASSPATH="$(java-config -r)"
+  CLASSPATH="${CLASSPATH}:$(java-config -d --classpath sigar)"
+
+  ebegin "Starting Graylog"
+
+  start-stop-daemon \
+    --start \
+    --exec "${JAVA_HOME}/bin/java" \
+    --user ${GRAYLOG_USER} \
+    --group ${GRAYLOG_GROUP} \
+    --env CLASSPATH="${CLASSPATH}" \
+    --background \
+    --chdir /usr/share/graylog2 \
+    --stdout ${GRAYLOG_LOG_DIR}/graylog.stdout.log \
+    --stderr ${GRAYLOG_LOG_DIR}/graylog.stderr.log \
+    -- ${JAVA_OPTS} -Djava.library.path=`java-config --lib sigar` -classpath "${CLASSPATH}" -jar /usr/share/graylog2/graylog.jar server -f "${GRAYLOG_CONFIG_FILE}" -p "${GRAYLOG_PID_FILE}" ${GRAYLOG_OPTIONS}
+
+  eend $?
+}
+
+stop() {
+  ebegin "Stopping Graylog"
+
+  start-stop-daemon \
+    --stop \
+    --pidfile "${GRAYLOG_PID_FILE}"
+
+  eend $?
+}
diff --git a/app-admin/graylog2/files/initd-r1 b/app-admin/graylog2/files/initd-r1
new file mode 100644
index 000000000000..cc068808ebf3
--- /dev/null
+++ b/app-admin/graylog2/files/initd-r1
@@ -0,0 +1,55 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+export JAVA_HOME=`java-config --jre-home`
+
+checkconfig() {
+  if [ ! -r "${GRAYLOG_CONFIG_FILE}" ]; then
+    eerror "GRAYLOG_CONFIG_FILE doesn't point to a readable config file"
+  fi
+}
+
+depend() {
+  need net
+}
+
+start() {
+  checkconfig || return 1
+
+  [ -e `dirname "$GRAYLOG_PID_FILE"` ] || \
+    install -d -o${GRAYLOG_USER} -g${GRAYLOG_GROUP} -m750 `dirname "$GRAYLOG_PID_FILE"`
+
+  [ -e "$GRAYLOG_LOG_DIR" ] || \
+    install -d -o${GRAYLOG_USER} -g${GRAYLOG_GROUP} -m750 "$GRAYLOG_LOG_DIR"
+
+  ebegin "Starting Graylog"
+
+  checkpath -d -o "${GRAYLOG_USER}:${GRAYLOG_GROUP}" -m750 "${GRAYLOG_DATA_DIR}"
+  checkpath -d -o "${GRAYLOG_USER}:${GRAYLOG_GROUP}" -m750 "${GRAYLOG_DATA_DIR}/data"
+  checkpath -d -o "${GRAYLOG_USER}:${GRAYLOG_GROUP}" -m750 "${GRAYLOG_DATA_DIR}/data/contentpacks"
+  checkpath -d -o "${GRAYLOG_USER}:${GRAYLOG_GROUP}" -m750 "${GRAYLOG_DATA_DIR}/data/journal"
+
+  start-stop-daemon \
+    --start \
+    --exec "${JAVA_HOME}/bin/java" \
+    --user ${GRAYLOG_USER} \
+    --group ${GRAYLOG_GROUP} \
+    --background \
+    --chdir ${GRAYLOG_INSTALL_DIR} \
+    --stdout ${GRAYLOG_LOG_DIR}/graylog.stdout.log \
+    --stderr ${GRAYLOG_LOG_DIR}/graylog.stderr.log \
+    -- ${JAVA_OPTS} -jar ${GRAYLOG_INSTALL_DIR}/graylog.jar server -f "${GRAYLOG_CONFIG_FILE}" -p "${GRAYLOG_PID_FILE}" ${GRAYLOG_OPTIONS}
+  
+  eend $?
+}
+
+stop() {
+  ebegin "Stopping Graylog"
+
+  start-stop-daemon \
+    --stop \
+    --pidfile "${GRAYLOG_PID_FILE}"
+
+  eend $?
+}
diff --git a/app-admin/graylog2/files/initd-r2 b/app-admin/graylog2/files/initd-r2
new file mode 100644
index 000000000000..c6177eef41d0
--- /dev/null
+++ b/app-admin/graylog2/files/initd-r2
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/java"
+command_args="${JAVA_OPTS} -jar ${GRAYLOG_INSTALL_DIR}/graylog.jar server -f ${GRAYLOG_CONFIG_FILE} --no-pid-file ${GRAYLOG_OPTIONS}"
+command_background="true"
+command_user="${GRAYLOG_USER}:${GRAYLOG_GROUP}"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+output_log="${GRAYLOG_LOG_DIR}/graylog.stdout.log"
+error_log="${GRAYLOG_LOG_DIR}/graylog.stderr.log"
+directory="${GRAYLOG_INSTALL_DIR}"
+required_files="${GRAYLOG_CONFIG_FILE}"
+
+depend() {
+	use dns
+}
+
+start_pre() {
+	local d
+	for d in \
+		"${GRAYLOG_DATA_DIR}" \
+		"${GRAYLOG_DATA_DIR}/data" \
+		"${GRAYLOG_DATA_DIR}/data/contentpacks" \
+		"${GRAYLOG_DATA_DIR}/data/journal" \
+		"${GRAYLOG_LOG_DIR}"; do
+
+		checkpath -d -o "${GRAYLOG_USER}":"${GRAYLOG_GROUP}" -m750 "${d}"
+	done
+}
diff --git a/app-admin/graylog2/graylog2-2.1.2.ebuild b/app-admin/graylog2/graylog2-2.1.2.ebuild
new file mode 100644
index 000000000000..d6c214a10d01
--- /dev/null
+++ b/app-admin/graylog2/graylog2-2.1.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Free and open source log management"
+HOMEPAGE="https://graylog.org"
+SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+MY_PN="graylog"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+QA_PREBUILT="/usr/share/graylog2/lib/sigar/libsigar*"
+RESTRICT="strip"
+
+DEPEND=""
+RDEPEND="virtual/jdk:1.8"
+
+INSTALL_DIR="/usr/share/graylog2"
+
+pkg_setup() {
+	enewgroup graylog
+	enewuser graylog -1 -1 -1 graylog
+}
+
+src_prepare() {
+	default
+	# graylogctl is replaced by our own initd
+	rm -r bin
+	# Stick to architecture of build host
+	if ! use amd64; then
+		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
+	fi
+	if ! use ppc64; then
+		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
+	fi
+	if ! use x86; then
+		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
+	fi
+	# Currently unsupported platforms
+	# QA warning galore but testing/patches welcome
+	rm -r lib/sigar/libsigar-ia64-*.so || die "Failed in removing IA64 support libraries"
+	rm -r lib/sigar/libsigar-ppc-*.so || die "Failed in removing PPC support libraries"
+	rm -r lib/sigar/libsigar-*-freebsd-*.so || die "Failed in removing FreeBSD support libraries"
+	rm -r lib/sigar/libsigar-pa-*.sl || die "Failed in removing HPPA support libraries"
+	rm -r lib/sigar/libsigar-*-solaris.so || die "Failed in removing Solaris support libraries"
+}
+
+src_compile() {
+	einfo "Nothing to compile; upstream supplies JAR only"
+}
+
+src_install() {
+	insinto /etc/graylog2
+	doins graylog.conf.example
+	insinto "${INSTALL_DIR}"
+	doins *
+	newinitd "${FILESDIR}/initd" graylog2
+	newconfd "${FILESDIR}/confd" graylog2
+}
diff --git a/app-admin/graylog2/graylog2-2.2.2.ebuild b/app-admin/graylog2/graylog2-2.2.2.ebuild
new file mode 100644
index 000000000000..b61f58667285
--- /dev/null
+++ b/app-admin/graylog2/graylog2-2.2.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Free and open source log management"
+HOMEPAGE="https://graylog.org"
+SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+MY_PN="graylog"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+INSTALL_DIR="/usr/share/graylog2"
+DATA_DIR="/var/lib/graylog2"
+
+QA_PREBUILT="${INSTALL_DIR}/lib/sigar/libsigar*"
+RESTRICT="strip"
+
+RDEPEND="virtual/jdk:1.8"
+
+pkg_setup() {
+	enewgroup graylog
+	enewuser graylog -1 -1 -1 graylog
+}
+
+src_prepare() {
+	default
+
+	# graylogctl is replaced by our own initd
+	rm -r bin
+
+	# Stick to architecture of build host
+	if ! use amd64; then
+		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
+	fi
+	if ! use ppc64; then
+		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
+	fi
+	if ! use x86; then
+		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
+	fi
+	# Currently unsupported platforms
+	# QA warning galore but testing/patches welcome
+	rm lib/sigar/libsigar-*freebsd*so \
+		lib/sigar/libsigar-*solaris*so \
+		lib/sigar/libsigar-*hpux*.sl \
+		lib/sigar/libsigar-*macosx*.dylib \
+		lib/sigar/libsigar-ia64-*.so \
+		lib/sigar/libsigar-ppc-*.so \
+		lib/sigar/libsigar-s390x*.so \
+		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
+
+	# remove plugins
+	rm plugin/graylog-plugin-anonymous-usage-statistics-${PV}.jar || die
+
+	# gentoo specific paths
+	sed -i "s@\(node_id_file = \).*@\1${DATA_DIR}/node-id@g; \
+		s@\(message_journal_dir = \).*@\1${DATA_DIR}/data/journal@g; \
+		s@#\(content_packs_dir = \).*@\1/${DATA_DIR}/data/contentpacks@g" \
+		graylog.conf.example || die
+}
+
+src_compile() {
+	einfo "Nothing to compile; upstream supplies JAR only"
+}
+
+src_install() {
+	insinto /etc/graylog2
+	doins graylog.conf.example
+
+	insinto ${DATA_DIR}/data/contentpacks
+	doins data/contentpacks/grok-patterns.json
+
+	insinto "${INSTALL_DIR}"
+	doins *
+
+	doins -r lib plugin
+
+	newinitd "${FILESDIR}/initd-r1" graylog2
+	newconfd "${FILESDIR}/confd-r1" graylog2
+}
diff --git a/app-admin/graylog2/graylog2-2.2.3.ebuild b/app-admin/graylog2/graylog2-2.2.3.ebuild
new file mode 100644
index 000000000000..a7b8cd7ab679
--- /dev/null
+++ b/app-admin/graylog2/graylog2-2.2.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Free and open source log management"
+HOMEPAGE="https://graylog.org"
+SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+MY_PN="graylog"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+INSTALL_DIR="/usr/share/graylog2"
+DATA_DIR="/var/lib/graylog2"
+
+QA_PREBUILT="${INSTALL_DIR}/lib/sigar/libsigar*"
+RESTRICT="strip"
+
+RDEPEND="virtual/jdk:1.8"
+
+pkg_setup() {
+	enewgroup graylog
+	enewuser graylog -1 -1 -1 graylog
+}
+
+src_prepare() {
+	default
+
+	# graylogctl is replaced by our own initd
+	rm -r bin || die
+
+	# Stick to architecture of build host
+	if ! use amd64; then
+		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
+	fi
+	if ! use ppc64; then
+		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
+	fi
+	if ! use x86; then
+		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
+	fi
+	# Currently unsupported platforms
+	# QA warning galore but testing/patches welcome
+	rm lib/sigar/libsigar-*freebsd*so \
+		lib/sigar/libsigar-*solaris*so \
+		lib/sigar/libsigar-*hpux*.sl \
+		lib/sigar/libsigar-*macosx*.dylib \
+		lib/sigar/libsigar-ia64-*.so \
+		lib/sigar/libsigar-ppc-*.so \
+		lib/sigar/libsigar-s390x*.so \
+		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
+
+	# remove plugins
+	rm plugin/graylog-plugin-anonymous-usage-statistics-${PV}.jar || die
+
+	# gentoo specific paths
+	sed -i "s@\(node_id_file = \).*@\1${DATA_DIR}/node-id@g; \
+		s@\(message_journal_dir = \).*@\1${DATA_DIR}/data/journal@g; \
+		s@#\(content_packs_dir = \).*@\1/${DATA_DIR}/data/contentpacks@g" \
+		graylog.conf.example || die
+}
+
+src_compile() {
+	einfo "Nothing to compile; upstream supplies JAR only"
+}
+
+src_install() {
+	insinto /etc/graylog2
+	doins graylog.conf.example
+
+	insinto ${DATA_DIR}/data/contentpacks
+	doins data/contentpacks/grok-patterns.json
+
+	insinto "${INSTALL_DIR}"
+	doins *
+
+	doins -r lib plugin
+
+	newinitd "${FILESDIR}/initd-r1" graylog2
+	newconfd "${FILESDIR}/confd-r1" graylog2
+}
diff --git a/app-admin/graylog2/graylog2-2.4.5-r1.ebuild b/app-admin/graylog2/graylog2-2.4.5-r1.ebuild
new file mode 100644
index 000000000000..91ea75e61cb4
--- /dev/null
+++ b/app-admin/graylog2/graylog2-2.4.5-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Free and open source log management"
+HOMEPAGE="https://graylog.org"
+SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+RESTRICT="strip"
+
+RDEPEND="virtual/jdk:1.8"
+
+DOCS=(
+	COPYING README.markdown UPGRADING.rst
+)
+
+GRAYLOG_DATA_DIR="/var/lib/graylog2"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog2"
+QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
+
+S="${WORKDIR}/graylog-${PV}"
+
+pkg_setup() {
+	enewgroup graylog
+	enewuser graylog -1 -1 -1 graylog
+}
+
+src_prepare() {
+	default
+
+	# Stick to architecture of build host
+	if ! use amd64; then
+		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
+	fi
+	if ! use ppc64; then
+		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
+	fi
+	if ! use x86; then
+		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
+	fi
+	# Currently unsupported platforms
+	# QA warning galore but testing/patches welcome
+	rm lib/sigar/libsigar-*freebsd*so \
+		lib/sigar/libsigar-*solaris*so \
+		lib/sigar/libsigar-*hpux*.sl \
+		lib/sigar/libsigar-*macosx*.dylib \
+		lib/sigar/libsigar-ia64-*.so \
+		lib/sigar/libsigar-ppc-*.so \
+		lib/sigar/libsigar-s390x*.so \
+		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
+
+	# gentoo specific paths
+	sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
+		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g; \
+		s@#\(content_packs_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/contentpacks@g" \
+		graylog.conf.example || die
+}
+
+src_install() {
+	default
+
+	insinto /etc/graylog2
+	doins graylog.conf.example
+
+	insinto "${GRAYLOG_DATA_DIR}/data/contentpacks"
+	doins data/contentpacks/grok-patterns.json
+
+	insinto "${GRAYLOG_INSTALL_DIR}"
+	doins graylog.jar
+	doins -r lib plugin
+
+	newconfd "${FILESDIR}/confd-r2" graylog2
+	newinitd "${FILESDIR}/initd-r2" graylog2
+}
+
+pkg_postinst() {
+	ewarn "Graylog does not depend on need.net any more (#439092)."
+	ewarn
+	ewarn "Please configure rc_need according to your binding address in:"
+	ewarn "/etc/conf.d/graylog2"
+}
diff --git a/app-admin/graylog2/metadata.xml b/app-admin/graylog2/metadata.xml
new file mode 100644
index 000000000000..5087760546f6
--- /dev/null
+++ b/app-admin/graylog2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-admin/grubconfig-1.28-r2 b/app-admin/grubconfig-1.28-r2
deleted file mode 100644
index 369d18019618..000000000000
--- a/app-admin/grubconfig-1.28-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Simple Tool to configure Grub-Bootloader
-EAPI=6
-HOMEPAGE=https://web.archive.org/web/20100410042718/http://www.tux.org/pub/people/kent-robotti/looplinux
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-util/dialog-0.7
-SLOT=0
-SRC_URI=http://gentoo/grubconfig-1.28.tar.gz
-_md5_=be4ff88be3fa125e1d49f744f8e15ebf
diff --git a/app-admin/grubconfig/Manifest b/app-admin/grubconfig/Manifest
new file mode 100644
index 000000000000..b8efabaf0fcc
--- /dev/null
+++ b/app-admin/grubconfig/Manifest
@@ -0,0 +1,3 @@
+DIST grubconfig-1.28.tar.gz 11715 BLAKE2B e3b40a2f0419e2e2f106328a63a0ea5666665454485c463cf7e36d896df083599556520c832b06a35553e4398958ca0fef34a5057b3435f3cdfc6dad1eb68df2 SHA512 1a2d864dd4d20162c55c2adf728040f1498035f04d544847f7e141bb749ab0ea9e40aaf6888e151dc8a9712d937c7f5b3630b73488f6d495199ea1041b76c2cd
+EBUILD grubconfig-1.28-r2.ebuild 566 BLAKE2B 13a8861761df7baf1e9cbe4a9c4b2c022a6482696cf0205485eacf5d4dbe925bf5da78995d42ae803b1eef692ca08a975089cc1e934a70bc9488cbe8c6e680ae SHA512 65b6f19ad12e32d8f3e3afff4efe7fc8e02ee659504e9f0fd804ddc0009863f627661e060df6067890a3eb3238a119bd221c571c3d24bfedeeae8e2651c692ed
+MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-admin/grubconfig/grubconfig-1.28-r2.ebuild b/app-admin/grubconfig/grubconfig-1.28-r2.ebuild
new file mode 100644
index 000000000000..62c8d0e125b6
--- /dev/null
+++ b/app-admin/grubconfig/grubconfig-1.28-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Simple Tool to configure Grub-Bootloader"
+HOMEPAGE="https://web.archive.org/web/20100410042718/http://www.tux.org/pub/people/kent-robotti/looplinux"
+SRC_URI="http://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-util/dialog-0.7"
+
+src_prepare() {
+	sed -i \
+		-e "s:/usr/lib/grub:/$(get_libdir)/grub:g" \
+		grubconfig || die
+	eapply_user
+}
+
+src_install() {
+	dosbin grubconfig
+	dodoc README
+}
diff --git a/app-admin/grubconfig/metadata.xml b/app-admin/grubconfig/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/app-admin/grubconfig/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/gtkdiskfree-2.0.1-r1 b/app-admin/gtkdiskfree-2.0.1-r1
deleted file mode 100644
index 36639131f484..000000000000
--- a/app-admin/gtkdiskfree-2.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/gtk+:3 virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Graphical tool to show free disk space
-EAPI=5
-HOMEPAGE=https://gitlab.com/mazes_80/gtkdiskfree
-IUSE=nls
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=x11-libs/gtk+:3
-SLOT=0
-SRC_URI=mirror://gentoo/gtkdiskfree-2.0.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=89d1eb65209f61a55248a35d8d28cca7
diff --git a/app-admin/gtkdiskfree-2.0.3 b/app-admin/gtkdiskfree-2.0.3
deleted file mode 100644
index 29eced4d1cc2..000000000000
--- a/app-admin/gtkdiskfree-2.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure unpack
-DEPEND=gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Graphical tool to show free disk space like df
-EAPI=6
-HOMEPAGE=https://gitlab.com/mazes_80/gtkdiskfree
-IUSE=gtk2
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 )
-SLOT=0
-SRC_URI=https://gitlab.com/mazes_80/gtkdiskfree/repository/archive.tar.bz2?ref=2.0.3 -> gtkdiskfree-2.0.3.tar.bz2
-_eclasses_=vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=81d57e833063a6b9f9293f732cd09e75
diff --git a/app-admin/gtkdiskfree/Manifest b/app-admin/gtkdiskfree/Manifest
new file mode 100644
index 000000000000..0e65faf6359c
--- /dev/null
+++ b/app-admin/gtkdiskfree/Manifest
@@ -0,0 +1,6 @@
+AUX gtkdiskfree-2.0.1-desktop-file.patch 625 BLAKE2B 10b93171126c229a6ac4cbf832e90f7a839dfeca74068f61c4c779e001a4c10fc2fdc77fec9a25b19ae60b81488e130ee2e6a0e3b42d015eafbc823472d53fe9 SHA512 f32414d978a9f12d21828024bcfdbaa9046ca68bfe7e197563a32372d892e3562bba8e32756b7fc42891ed49b3a7ee111ae96c5a8e453a1bf8edc22bc53825c8
+DIST gtkdiskfree-2.0.1.tar.gz 354661 BLAKE2B 39731b38eedf92554303fa8f6784c1cc9c6f1843f5c62c8b6e269856198440a0818a913a7cefedc8b8667167974e3b2d269dc35a1465213b5d6cb4db62399ce8 SHA512 ec202cc79dc80fb66fdf028b6a89610344bb76d7cbe09563f5f47ae072bed791e395d9d1389954046c25e882587d3685b14db4e871e26244045beabb8b579de8
+DIST gtkdiskfree-2.0.3.tar.bz2 216189 BLAKE2B 146dae89b0f66328840f22bd7b9e8ad751759dea3a67c332d71e513388be46122cb761fec6229258b63e85c726ee889e04a56d405437904f1eb8060ea31ee88a SHA512 c6f093ff023cb8c67090b3bd3660a998163e786b08386f346bdc1aa7b29e030a31cfb0ef54c55f109f211bf045f90afd20558b91849a4f82d041c99532f170fe
+EBUILD gtkdiskfree-2.0.1-r1.ebuild 920 BLAKE2B 7ec5ce54e5a949d75ba8836162d2361340d1c115d028fce633815ce19b4aa8f0e3283f2e3b03e8b8069d498f4d6fad454151dd4505e18acf17f8620d359b3e02 SHA512 23d755ed23fcebe32e44de66bbdf92048eb80ca0e7060130c74ebd6444d944e1f906bf4f2b013c35f2545dbe69db8bd7976c00af3b23bce5eaf82cd13dfa03b3
+EBUILD gtkdiskfree-2.0.3.ebuild 606 BLAKE2B 7e437ee97362a5b8152cc036b8f92854efb9eaa3871f3a694795603b4375fa1e52f2eb70c5cfd8ce18b25606185d45dc74164e8b0d178d5c6ad2d1673f4c06f7 SHA512 b40217538674ee82af7902d25144acdfb4a3940aed487c2030687271e2107103fba230e611d57c23f6998c7194047b0707e0b98a7701bd843491221930da4962
+MISC metadata.xml 691 BLAKE2B 779f040306522d07f46279e074c83763a51bff2f994a132f9b8994f5ad51fd0625c371c161819777bff5cf0b75af17383bf8553d1b8dd38f3042fe66286e9bd5 SHA512 03a0399885deda4dc74e710ab00c8123222da16b8e690b755a5d737ff7d500676dd79c865d6ea77e44d584925c38f72232c66ad4669eeabc95d213d744ae177a
diff --git a/app-admin/gtkdiskfree/files/gtkdiskfree-2.0.1-desktop-file.patch b/app-admin/gtkdiskfree/files/gtkdiskfree-2.0.1-desktop-file.patch
new file mode 100644
index 000000000000..ca2858904e33
--- /dev/null
+++ b/app-admin/gtkdiskfree/files/gtkdiskfree-2.0.1-desktop-file.patch
@@ -0,0 +1,19 @@
+--- gtkdiskfree.desktop.orig	2012-04-05 21:59:26.000000000 +0400
++++ gtkdiskfree.desktop	2013-08-19 20:26:50.127669805 +0400
+@@ -1,13 +1,9 @@
+-
+ [Desktop Entry]
+ Name=GtkDiskFree
+-Name[ru_RU.CP1251]=GtkDiskFree
+-Name[ru_RU.KOI8-R]=GtkDiskFree
+ Comment=Free space monitor
+-Comment[ru_RU.CP1251]=��������� ���������� ����� �� �����.
+-Comment[ru_RU.KOI8-R]=��������� ���������� ����� �� �����.
++Comment[ru]=Индикатор свободного места на диске
+ Exec=gtkdiskfree 
+-Icon=/usr/share/pixmaps/gtkdiskfree.png
++Icon=gtkdiskfree
+ Terminal=false
+-MultipleArgs=false
++X-MultipleArgs=false
+ Type=Application
diff --git a/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..d6cdb81631ea
--- /dev/null
+++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils flag-o-matic
+
+DESCRIPTION="Graphical tool to show free disk space"
+HOMEPAGE="https://gitlab.com/mazes_80/gtkdiskfree"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${PN}-master"
+
+PATCHES=( "${FILESDIR}/${P}-desktop-file.patch" )
+
+src_prepare() {
+	sed -i \
+		-e '/^CFLAGS=/s:=" -Wall -O2 :+=" :' \
+		configure.in || die "sed on configure.in failed"
+
+	# Fix underlinking, bug #463578
+	append-libs -lm
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--without-gtk2
+		$(use_enable nls)
+	)
+	autotools-utils_src_configure
+}
diff --git a/app-admin/gtkdiskfree/gtkdiskfree-2.0.3.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.3.ebuild
new file mode 100644
index 000000000000..25ff319c3ea1
--- /dev/null
+++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vcs-snapshot
+
+DESCRIPTION="Graphical tool to show free disk space like df"
+HOMEPAGE="https://gitlab.com/mazes_80/gtkdiskfree"
+SRC_URI="https://gitlab.com/mazes_80/${PN}/repository/archive.tar.bz2?ref=${PV} -> ${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk2"
+
+RDEPEND="
+	gtk2? ( x11-libs/gtk+:2 )
+	!gtk2? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf $(use_with gtk2)
+}
diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml
new file mode 100644
index 000000000000..bae1c66e0447
--- /dev/null
+++ b/app-admin/gtkdiskfree/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>BM-2cTVBXjxdVtEQCycBQjMxszLsgTNVujvM5@bitmessage.ch</email>
+		<name>Samuel Bauer</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>gtkdiskfree is a gtk extension to the cli tool df, does the same and more
+	</longdescription>
+	<use>
+		<flag name="gtk2">Support GTK+ 2.x instead of GTK+ 3.x</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/hardening-check-2.5 b/app-admin/hardening-check-2.5
deleted file mode 100644
index 289eb0c73e88..000000000000
--- a/app-admin/hardening-check-2.5
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Report the hardening characterists of a set of binaries
-EAPI=5
-HOMEPAGE=https://wiki.debian.org/Hardening https://packages.debian.org/source/jessie/hardening-wrapper
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=mirror://debian/pool/main/h/hardening-wrapper/hardening-wrapper_2.5.tar.gz
-_md5_=933b3dbfeb2d069d008361fa811c4a4d
diff --git a/app-admin/hardening-check-2.6 b/app-admin/hardening-check-2.6
deleted file mode 100644
index 72b1537d7ba6..000000000000
--- a/app-admin/hardening-check-2.6
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Report the hardening characterists of a set of binaries
-EAPI=5
-HOMEPAGE=https://wiki.debian.org/Hardening https://packages.debian.org/source/jessie/hardening-wrapper
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=mirror://debian/pool/main/h/hardening-wrapper/hardening-wrapper_2.6.tar.xz
-_md5_=e3d1dabb19b231b105d2199c0a7cb510
diff --git a/app-admin/hardening-check-2.7 b/app-admin/hardening-check-2.7
deleted file mode 100644
index 977bc54b4c6b..000000000000
--- a/app-admin/hardening-check-2.7
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Report the hardening characterists of a set of binaries
-EAPI=5
-HOMEPAGE=https://wiki.debian.org/Hardening https://packages.debian.org/source/jessie/hardening-wrapper
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/main/h/hardening-wrapper/hardening-wrapper_2.7.tar.xz
-_md5_=aca90d0db6af1b64d5f2ca8530f7d053
diff --git a/app-admin/hardening-check/Manifest b/app-admin/hardening-check/Manifest
new file mode 100644
index 000000000000..194e328e60b2
--- /dev/null
+++ b/app-admin/hardening-check/Manifest
@@ -0,0 +1,7 @@
+DIST hardening-wrapper_2.5.tar.gz 21157 BLAKE2B 9976de519667e3816be0ccee446dd81ed67beb331e59badfceed61bdb323644af502d3b280c70b0ec3638569cfda751dd68ebd4ca23f4cf09ce170d300ea0751 SHA512 e2c183736e9f1dd1b39ecde7d2bf2c22d4c87c69cb158d98bb527b8325d88ea86bceb6087633cc761e973a22d0cf97c6266464d117e408ed2aee2e67c8ab5565
+DIST hardening-wrapper_2.6.tar.xz 19436 BLAKE2B 61b04985f1511470640f1631af3d95613a5f9ff843b95fa53557cc183ff1e3be384c2af473f5c936697b7c70a573ab6b32c6a36d62ef9298729c079c95f4d7ee SHA512 924d9d816148bc5f2d25d66fd24c7b2a77fef8d62eb7656d4c9b0ee50c767789f25aaa3b776138103682366ff7c2266be4a207d4b11361655b5097131033283e
+DIST hardening-wrapper_2.7.tar.xz 19604 BLAKE2B fc6e17867708f9ecd5d430035f5142ae7a42d525adbe55bfc14c3cad767b0fed86df00c2a8e1c5099e1320167aa1ba7454c1dbca1210b431841e191f0be3392d SHA512 834242b28e06f32d6e899f13fcfc66f560e4137267f8cb46fab21337240fec612ea2803345012308af50c0fc4af92f52a28a18803ba330998ad7cb1321023121
+EBUILD hardening-check-2.5.ebuild 556 BLAKE2B efc8969e237ad22dd969666f2dcf71c8dbac9c92b6cd2ba6816f05e3de3f0cdeaefe8308111f0888ffa1f9880817c04f74016498fe84f97b994950885a068e0e SHA512 5694da1316e087986930237f4fd5e752768be07235f6c9c2fc4c95ed89514588a9773fe374225ea4216c3a493172823fb3b9e05478e8a5f0f36203834ca2ac55
+EBUILD hardening-check-2.6.ebuild 571 BLAKE2B efbd82f61d84c70e17b7be358b1798c57500f2cb0b30914ebdaf1ed76e18c2066cba53ff9e8155658e3c09e7875727dab960f302b163e9b5f56c1e8f3e8ead9f SHA512 9a34d79a769ce49efdbc448d0c6daa65ee118ff335c8cf774e058291a14871fdc8d44283c53da9ad4db6888be5b5552d7098a9910d895440809c299a6f31401b
+EBUILD hardening-check-2.7.ebuild 588 BLAKE2B 74236a0133aa2a99e6def70fca4fbc89dec13183a3418214ca2e2dd3f40d8d6bc224d7b7c58d304a4abeb722933d6b7d236381034e48c110ed11307843b827e1 SHA512 009c7b2eb86d6ae882c097dde72d9d1ae055db7db3be19a4224d74f0f1d4035c918f68f3b23a5da98b66a06ca6b7133d5ffcb12d5df2da8d92d0bf02c056384a
+MISC metadata.xml 429 BLAKE2B 86726d5832d656d7f1a794571c01da95476a41f39a5b3df953e17b1387255420743064972f43d5ef10fccad23dfe76e206ab6c9f693f78ca1f8d720d19f0cab7 SHA512 f70c83d5ca8dc1582a416cd3ae51c98bbe039d9d0c1ad1e1f2fc70775f8aac89ef1e4b9dddf65525556e6255796e8bcfc16ddb1d9c2fb6f15aedd44053c7cf7b
diff --git a/app-admin/hardening-check/hardening-check-2.5.ebuild b/app-admin/hardening-check/hardening-check-2.5.ebuild
new file mode 100644
index 000000000000..d52c84c63f0f
--- /dev/null
+++ b/app-admin/hardening-check/hardening-check-2.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PN="hardening-wrapper"
+
+DESCRIPTION="Report the hardening characterists of a set of binaries"
+HOMEPAGE="https://wiki.debian.org/Hardening https://packages.debian.org/source/jessie/hardening-wrapper"
+SRC_URI="mirror://debian/pool/main/h/${MY_PN}/${MY_PN}_${PV}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+LICENSE="GPL-2+"
+SLOT="0"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}"
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.sh ${PN}
+}
diff --git a/app-admin/hardening-check/hardening-check-2.6.ebuild b/app-admin/hardening-check/hardening-check-2.6.ebuild
new file mode 100644
index 000000000000..89d34e65467c
--- /dev/null
+++ b/app-admin/hardening-check/hardening-check-2.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PN="hardening-wrapper"
+
+DESCRIPTION="Report the hardening characterists of a set of binaries"
+HOMEPAGE="https://wiki.debian.org/Hardening https://packages.debian.org/source/jessie/hardening-wrapper"
+SRC_URI="mirror://debian/pool/main/h/${MY_PN}/${MY_PN}_${PV}.tar.xz"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+LICENSE="GPL-2+"
+SLOT="0"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}"
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.sh ${PN}
+	dodoc AUTHORS
+}
diff --git a/app-admin/hardening-check/hardening-check-2.7.ebuild b/app-admin/hardening-check/hardening-check-2.7.ebuild
new file mode 100644
index 000000000000..48aab59373bd
--- /dev/null
+++ b/app-admin/hardening-check/hardening-check-2.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PN="hardening-wrapper"
+
+DESCRIPTION="Report the hardening characterists of a set of binaries"
+HOMEPAGE="https://wiki.debian.org/Hardening https://packages.debian.org/source/jessie/hardening-wrapper"
+SRC_URI="mirror://debian/pool/main/h/${MY_PN}/${MY_PN}_${PV}.tar.xz"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+LICENSE="GPL-2+"
+SLOT="0"
+
+DEPEND=""
+RDEPEND=""
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.sh ${PN}
+	dodoc AUTHORS
+}
diff --git a/app-admin/hardening-check/metadata.xml b/app-admin/hardening-check/metadata.xml
new file mode 100644
index 000000000000..a2db75c7084a
--- /dev/null
+++ b/app-admin/hardening-check/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ago@gentoo.org</email>
+		<name>Agostino Sarubbo</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>kees@outflux.net</email>
+		<name>Kees Cook</name>
+		<description>Upstream - please CC on bugs that concerns upstream</description>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/hardinfo-0.5.2_pre20130823 b/app-admin/hardinfo-0.5.2_pre20130823
deleted file mode 100644
index 1247b6d38268..000000000000
--- a/app-admin/hardinfo-0.5.2_pre20130823
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A system information and benchmark tool for Linux systems
-EAPI=5
-HOMEPAGE=http://hardinfo.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/hardinfo-0.5.2_pre20130823.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=46c76cb0926af77de0d38248afe47e02
diff --git a/app-admin/hardinfo/Manifest b/app-admin/hardinfo/Manifest
new file mode 100644
index 000000000000..34ee94252156
--- /dev/null
+++ b/app-admin/hardinfo/Manifest
@@ -0,0 +1,3 @@
+DIST hardinfo-0.5.2_pre20130823.tar.xz 280472 BLAKE2B d72883e7e57234b3328d03daf4d81cc478b383b51f4de08981792c42b3278ede81731ca831fbc285a594aa7f00f861c870aa6d784b7c282960f5541f04f9ce45 SHA512 e36bd4eec0090461de5fdb6c17dccf76937ee8fa9cb3411068fc568847f519023037999278bbb8b9a24608ed5b1d7fd2bebfe7115c631ccca1c35fa259cb20b1
+EBUILD hardinfo-0.5.2_pre20130823.ebuild 499 BLAKE2B a89e52813f78ad50dd308fdfda68773dc1391b5051bdd517c9ec6fd835a9715ffd758342175adfde840dd06c062faaf530e4a77edefe990b1d11f0ea211082a1 SHA512 e8848107b3caf8c2673cab5b36889f82c5f2310649545356e676ec59ee3f390b085210aedfcd3925069f213a34475188d811b83ee8c26bff4c3de734fe5290aa
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
new file mode 100644
index 000000000000..bd0e475811f1
--- /dev/null
+++ b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="A system information and benchmark tool for Linux systems"
+HOMEPAGE="http://hardinfo.org/"
+SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	net-libs/libsoup
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/app-admin/hardinfo/metadata.xml b/app-admin/hardinfo/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/hardinfo/metadata.xml
@@ -0,0 +1,5 @@
+<?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/haskell-updater-1.2.10 b/app-admin/haskell-updater-1.2.10
deleted file mode 100644
index bb9ff5ad7926..000000000000
--- a/app-admin/haskell-updater-1.2.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-6.12.1
-DESCRIPTION=Rebuild Haskell dependencies in Gentoo
-EAPI=5
-HOMEPAGE=http://haskell.org/haskellwiki/Gentoo#haskell-updater
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore sys-apps/paludis )
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/haskell-updater/1.2.10/haskell-updater-1.2.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2555be824ca698f6fa34e4314ffc44cf
diff --git a/app-admin/haskell-updater-1.2.12-r1 b/app-admin/haskell-updater-1.2.12-r1
deleted file mode 100644
index 367c44271fbf..000000000000
--- a/app-admin/haskell-updater-1.2.12-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-6.12.1
-DESCRIPTION=Rebuild Haskell dependencies in Gentoo
-EAPI=6
-HOMEPAGE=http://haskell.org/haskellwiki/Gentoo#haskell-updater
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/portage-mgorny sys-apps/pkgcore sys-apps/paludis )
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/haskell-updater/1.2.12/haskell-updater-1.2.12.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b1b12abe96a57dfcda0281ecfaabec64
diff --git a/app-admin/haskell-updater-1.2.9 b/app-admin/haskell-updater-1.2.9
deleted file mode 100644
index 534458f0a6d7..000000000000
--- a/app-admin/haskell-updater-1.2.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-6.12.1
-DESCRIPTION=Rebuild Haskell dependencies in Gentoo
-EAPI=5
-HOMEPAGE=http://haskell.org/haskellwiki/Gentoo#haskell-updater
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore sys-apps/paludis )
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/haskell-updater/1.2.9/haskell-updater-1.2.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=202f990b70bf3ab4d2a84abf35eaf430
diff --git a/app-admin/haskell-updater-1.3.1 b/app-admin/haskell-updater-1.3.1
deleted file mode 100644
index a23afbc81b65..000000000000
--- a/app-admin/haskell-updater-1.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-6.12.1
-DESCRIPTION=Rebuild Haskell dependencies in Gentoo
-EAPI=6
-HOMEPAGE=http://haskell.org/haskellwiki/Gentoo#haskell-updater
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore sys-apps/paludis )
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/haskell-updater/1.3.1/haskell-updater-1.3.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=92001e1ddf4d3bef702ccadae53a652d
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
new file mode 100644
index 000000000000..d27ea366eb96
--- /dev/null
+++ b/app-admin/haskell-updater/Manifest
@@ -0,0 +1,9 @@
+DIST haskell-updater-1.2.10.tar.gz 26586 BLAKE2B adc46f85118fa55e530aa079ef2df0663b178b15311f4f2ff6474db75aacf1277238a27a2bb98841fc1fe50b556d7f01a677861b3ce9559fe809a02db401ef8d SHA512 c0a72ae77362e5ed4ea0e244449175454119b1284756adeb43534bf58b661f3cabb88e08bd5903d415a9f95a6de309753dedf974ddd853b300fd215250e0ad7c
+DIST haskell-updater-1.2.12.tar.gz 26708 BLAKE2B d0b040cb3b6211b3c5c60f8cfa3dbccbf9cb15d246b21609a21aac746a8a034e284fe0b99891b5035980252a7aa8b376ad943f32882dc29e16226d95583cb053 SHA512 f3a993cb556919bf2e57fdaca7eea9146abc59096e779cbffb69a5c29fc5f6ef889c8ccf4d8331dbd9279919ea91bb05a16d83ad70085d5ef5a44d61120fe7e7
+DIST haskell-updater-1.2.9.tar.gz 26675 BLAKE2B a3d11cdcee886a07d87cd2888a9deea1d963b7234b4a10a6b78e9467fae4e9382c92f14a6ba0593f86bf9422ab2cb4bec823de96f34b463590ae18429c118edb SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da
+DIST haskell-updater-1.3.1.tar.gz 26573 BLAKE2B 68e5357e8f24b9b372dba4feac76595cbf35602d9d9094d616497c9d0040177b5f1def5833770041b693220717f3a4976877e0608858d5d8d4dddd26620c71e5 SHA512 39c36c4a8997806bb4d64625bc9ed72334a68e57f8c32f75d0c3704ab52b3b68605444c89480e5186c04bb275b3608ea9544366ebc5a00e010cc5fb4ae8296df
+EBUILD haskell-updater-1.2.10.ebuild 1095 BLAKE2B 3e75b0bcb4953fe1725eb240165ccb8d4189d4b8c958143b60c26f97166d2ad512d8eeb5d52e06458ecfd32715338be1a7aa3ceadd75041e6a75a97353cb1e07 SHA512 7c634de327d5c3e5254e84ca936e09d9f7063b5aec64e6d62c2b97c19caed1f2f389bcecbb5997cb95e59bd76eea3d7ae461ee55a08842eb59bf4c56f67a62aa
+EBUILD haskell-updater-1.2.12-r1.ebuild 1138 BLAKE2B 2b2369ec6480adac5fa663d0b7276a6ab9b038d92d9d94ccd057331e06025cb48de92653d8d836fb1dd7d5f4d8dbf2ba75fd035659d6a4b8c815538d3c08bed7 SHA512 0fd46c083d40b83d4dfc7370d1ef3777520c778b66f38a6a887eaa3477b94368fab92ed86066bc98285da45fc46ec342498d8242be94061b2a814ceab46e661e
+EBUILD haskell-updater-1.2.9.ebuild 1095 BLAKE2B c6980be308f42bacc8c0613d13182a03c03bd2b99d32e6a3d92fa31aaa25e9990ec10be8c3a4ac531aa242b4f02e41158bcb74217805b94435bcb0e97e021b9e SHA512 8f4e469c4f971a678fe35df8223beff476fa5ef5d02f471fec2a751a6fa553d484206d4b9507473d7d613080789271d1f0c3e2fb479b769fe3aa14dc2e15da34
+EBUILD haskell-updater-1.3.1.ebuild 1112 BLAKE2B 65817cb50717ba9ebdf564e06edb34bcadfba21d0bedab33c1bc7d7b8ed8a39c8432ac3cbfefcbb4d0c066a2b1f1dead4b98fa1fab98dffe2cf73985d6db7b08 SHA512 e5fe27f19e242c6ed60adad1f0892ca004f4cfa9f409d287090a3824c776cea4a3cae7937c05507e69495a465ef9dcc3433b31960c5eef90cd9f29b13a644c60
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
new file mode 100644
index 000000000000..5b32badf0183
--- /dev/null
+++ b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+CABAL_FEATURES="bin nocabaldep"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
+HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.12.1"
+
+# Need a lower version for portage to get --keep-going
+RDEPEND="|| ( >=sys-apps/portage-2.1.6
+		sys-apps/pkgcore
+		sys-apps/paludis )"
+
+src_prepare() {
+	if use prefix; then
+		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
+			"${S}/Distribution/Gentoo/Packages.hs" || die
+
+		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
+			"${S}/Distribution/Gentoo/GHC.hs" || die
+	fi
+}
+
+src_configure() {
+	cabal_src_configure \
+		--bindir="${EPREFIX}/usr/sbin" \
+		--constraint="Cabal == $(cabal-version)"
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc TODO
+}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
new file mode 100644
index 000000000000..42a7b7d3e1ca
--- /dev/null
+++ b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CABAL_FEATURES="bin nocabaldep"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
+HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.12.1"
+
+# Need a lower version for portage to get --keep-going
+RDEPEND="|| ( >=sys-apps/portage-2.1.6
+		sys-apps/portage-mgorny
+		sys-apps/pkgcore
+		sys-apps/paludis )"
+
+src_prepare() {
+	default
+
+	if use prefix; then
+		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
+			"${S}/Distribution/Gentoo/Packages.hs" || die
+
+		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
+			"${S}/Distribution/Gentoo/GHC.hs" || die
+	fi
+}
+
+src_configure() {
+	cabal_src_configure \
+		--bindir="${EPREFIX}/usr/sbin" \
+		--constraint="Cabal == $(cabal-version)"
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc TODO
+}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
new file mode 100644
index 000000000000..b9e1932fd81a
--- /dev/null
+++ b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+CABAL_FEATURES="bin nocabaldep"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
+HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.12.1"
+
+# Need a lower version for portage to get --keep-going
+RDEPEND="|| ( >=sys-apps/portage-2.1.6
+		sys-apps/pkgcore
+		sys-apps/paludis )"
+
+src_prepare() {
+	if use prefix; then
+		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
+			"${S}/Distribution/Gentoo/Packages.hs" || die
+
+		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
+			"${S}/Distribution/Gentoo/GHC.hs" || die
+	fi
+}
+
+src_configure() {
+	cabal_src_configure \
+		--bindir="${EPREFIX}/usr/sbin" \
+		--constraint="Cabal == $(cabal-version)"
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc TODO
+}
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
new file mode 100644
index 000000000000..5d51680239c9
--- /dev/null
+++ b/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CABAL_FEATURES="bin nocabaldep"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
+HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.12.1"
+
+# Need a lower version for portage to get --keep-going
+RDEPEND="|| ( >=sys-apps/portage-2.1.6
+		sys-apps/pkgcore
+		sys-apps/paludis )"
+
+src_prepare() {
+	default
+
+	if use prefix; then
+		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
+			"${S}/Distribution/Gentoo/Packages.hs" || die
+
+		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
+			"${S}/Distribution/Gentoo/GHC.hs" || die
+	fi
+}
+
+src_configure() {
+	cabal_src_configure \
+		--bindir="${EPREFIX}/usr/sbin" \
+		--constraint="Cabal == $(cabal-version)"
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc TODO
+}
diff --git a/app-admin/haskell-updater/metadata.xml b/app-admin/haskell-updater/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/app-admin/haskell-updater/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/hddtemp-0.3_beta15-r26 b/app-admin/hddtemp-0.3_beta15-r26
deleted file mode 100644
index 4e90ff57fa15..000000000000
--- a/app-admin/hddtemp-0.3_beta15-r26
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=config configure install postinst prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=A simple utility to read the temperature of SMART capable hard drives
-EAPI=5
-HOMEPAGE=https://savannah.nongnu.org/projects/hddtemp/
-IUSE=network-cron nls selinux
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ~ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-hddtemp )
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2 mirror://gentoo/hddtemp-20080531.db.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2685c28e91e8dc880cbeebf4f0d27dc9
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
new file mode 100644
index 000000000000..9f8f65838521
--- /dev/null
+++ b/app-admin/hddtemp/Manifest
@@ -0,0 +1,17 @@
+AUX hddgentoo.db 19464 BLAKE2B 82577371ce2f8702a400bf10eb0a9300506a10c5cb780b72503b908c8129c14f78f0ef339b97d86e2bef96f889a6f43e82739d810add817cf94a731b73a7b591 SHA512 03aa8c528988a1d602cd17f2d3a02e00142634dd87f92af7cb2ceab30f1d525a5954300c74e61e6614043a0636f63151e641e57aa860ed878eb339a51db8b72b
+AUX hddtemp-0.3_beta15-byteswap.patch 1037 BLAKE2B 5e0df7da8f67facd8f5d466c502b44aa1e58822ec6b91992b973aea0d3e70fdba0812746fd697341419b670a984e14c1c44a1b952d27ffc82df56b06bf6a27a3 SHA512 4d37b31129be7f767a416d4b15e3eaf94af297a7d2f4ed57f900fc48775bbb389ca1259c13dd048d670f32fe53f8d0e06c6f1c02485cb95a08d2a80aac4f76a8
+AUX hddtemp-0.3_beta15-dontwake.patch 515 BLAKE2B 56061289e8d247a11a3172eebf3ed7f04f6b55b6021c9d79dbc41553828d4b265dc049ac139473dfd48c8e904d3cd4023405f9c787a21537872c6e2185395ee4 SHA512 ff5cfeb9fcd6a17ab3937212a85076fafa9abfde72a1b602ada09b5fb71f89a200e91398e9682a17034f630b90e57559e550c0f1565d12ca642af0c2e10a99e1
+AUX hddtemp-0.3_beta15-execinfo.patch 751 BLAKE2B 955e4d3501f7a8669036168740d67574f912197110cb2a156b3aef884596346bd1cbc32279248bc91f8e94993139092b80db02fe4cc42124ada99915fcb0b899 SHA512 cd320985142df5f07cb8c56613aa4110a63fed34e2e08f95272f3d43b75289d298e9dc61e86a42e0be5f15f9a76007d894d515d4d09c8a9deb41b16aa4ea3bc6
+AUX hddtemp-0.3_beta15-iconv.patch 780 BLAKE2B 568a920c7f43a53031212cf059148e618235292fdf6de157b4a3440a06e03c2be66f4e90c72d87da7ffd122fea4a0f37df56a8465966e58e8b142fa61c86e633 SHA512 53f988655d59dff675bb5a103b5688b1d564032350eb915c364e5aabd562d643e6fc9a9eb6bececba886d50b07162fb36d78702e1378f6cdb4a3f67f57209dce
+AUX hddtemp-0.3_beta15-nls.patch 414 BLAKE2B e488ab41496786676920b946e9aab4cf40c959f9799238da65586d0f3391060650ab2aca93b634519404b15279469579a573834e54bbcf170edb9c8284a72a15 SHA512 bbed2015e4a1ff44f0daa5591502d15cb02b9f3e7da8ab490d1ce761db823855c12d2889d9a5abf3924aecb522f9f27167e798ace3147c85ab50983457a480a6
+AUX hddtemp-0.3_beta15-satacmds.patch 986 BLAKE2B f1e1ce21a270baa7853d431c5af9f68e3d636c60d833182b5371993a7f69f825f66330f987a2a51b3f059d47b540a18f5dcfe43f19bb8ee667b2364acc29750a SHA512 436e4e8370ef5d1946559ed6625d435b01c71019e0d39afb10305814825e8fb4cd98f23bbd860c8a94490285bb54cab2db84a8693255223cf44a7bcf77b60d2f
+AUX hddtemp-conf.d 304 BLAKE2B 76c717b744b0539c74bf2e8d0423a0b85c43156d34c170dd69442e5b7f5b800a27324ab556f41077eb5240adba21f42522061e57483796743edfecf2bf315172 SHA512 b82d4be9edceac534bdb953b9ae5b49f4eb717fad8de8847bf43678451361438397b98280c291c638f93dc7d3b4dbb9d7cfae9c8263be007f908eaf6473b198d
+AUX hddtemp-init 434 BLAKE2B d7ae9e8dc490d7ba49725567926d34b1f22688e20a3df169db5e271367638ff382cf60ed58df0752639823477e3f2929758f9b90cd96db751dd57414f4b9b74b SHA512 cb08834efd0e8f1a69bb07d7eb8ae75997072c0c1c04ac4ef1f10d561a29b56593efe52a30346b2fd88e0a50baa791c2a10655415a1ce97afd50a39effbaed64
+AUX hddtemp.service 283 BLAKE2B 825bb353f806b4ebbb7373e60aa8a15e46a39417dbb07aca2586fcb22b87bc25a8b17f262162521f9e25d94b61848862393709bb92ff6051519a16ce103f2283 SHA512 7a67da016027a96cc3aa18796f6fd499a5ec75de45d33a90cbecd3904a730cd9231337763c1b8c7e322dbeaaf60ec8299dd721ed1d0c68d645f19ca3a0ac8420
+AUX hddtemp.service-r1 214 BLAKE2B 201eeeb152e80c9f5579f5e52e475f061bfe587e2025d6e2824a3118d079089e56b34ed2895e7a1d0db8f21158409dd7247408368a2c1684e6657412abce6e10 SHA512 2218864bead8a0cc0f99d5125940f397fc1396d2e3f7afaf276c3bae0d6c2b2d23ebc51d3a93d3a492d055c8dcdaf44c56ed289d0343b9e264de48971d9153fd
+AUX hddtemp.service.conf 88 BLAKE2B 310463288da0fdee89d914c70aed0175b62d53a382851b9f65702c1137cbeb803a80f5d186a2d0a81ec3dd94fe9733501b28399647fdc864db1f11ab12f21b71 SHA512 dac10db31111623f20580d36b49f2d9b292df39991a4b2590085c08b7a8dbda3903d5dc268d328a71c0bd8d02e781949ab2abde243ae35da8f79bef21aa3fae3
+AUX update-hddtemp.db 819 BLAKE2B 2322abe8bc4c4f49a4c16267783d9d7ee46666e1e11b70438914d3c770b75f5b4912ddb17dff0555d9847b43d1e43b19a5a54598778b97bfb4c6829f7424f09f SHA512 7d923d582da2e8012de4ebb4243a4fccd6135cfca7d06f02f50b290c5984af288942f7588da7c8c57b91e362a8febc76f14b489798af14f66e3ec7bec9518ba4
+DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd05007f4b4b8d74eb378ba810ea9aad96951b7a9b3b0f872130677fca1f294d86f855327dcfa5a263c9f3c7d58fbbba502e SHA512 7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d
+DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059
+EBUILD hddtemp-0.3_beta15-r26.ebuild 2972 BLAKE2B f273cee116ed77f85fdedaab31f82c6a7bd109b306a9d56745767050cc65ed79c2b28875f934b02fbdde87db6e8e1185605525f1562d930d3b5eadf8bc4edd0c SHA512 64c30191b0103c410b9d8461c283738a56ccdc09b7fd2f9d8ee3f4e05f1a16768d2e94fe74f7638e1ed8c3852976a19fe9f3766581c49ed884f686495eca1bf5
+MISC metadata.xml 260 BLAKE2B 41040f0f9342dec7a3993d99bd9fb49f624c8fc8a0be036b3c2e3f2f20d4182d23c5b98a5451f5d2d6906d749b7756b7ec10b1e135bfa7b1633234ebdae1370a SHA512 480d8cf7f249c083d64b11e13bd93b42856531860afa935a9265bfcf9491fbd3997a9b9d8e90630daba103402fc9aa08c63ef18091cd6ee68310c0a8f3c38af3
diff --git a/app-admin/hddtemp/files/hddgentoo.db b/app-admin/hddtemp/files/hddgentoo.db
new file mode 100644
index 000000000000..539a88a4917d
--- /dev/null
+++ b/app-admin/hddtemp/files/hddgentoo.db
@@ -0,0 +1,263 @@
+#############################################
+############# Misc drives, added by Gentoo
+#############################################
+
+"ST9160821AS"							194 C "Seagate ST9160821AS"
+"ST3400620A"							194 C "Seagate Barracuda 7200.10 ST3400620A"
+"MAXTOR STM3160212A"						194 C "Maxtor STM3160212A"
+"WDC WD2500JS-23MHB0"						194 C "Western Digital 250GB, 8MB cache"
+"WDC WD740ADFD-00NLR1"						194 C "Western Digital SATA Raptor 74GB 16MB"
+"ST3320620AS"							194 C "Seagate ST3320620AS"
+"WDC WD3200AAKS-00SBA0"						194 C "Western Digital WD3200AAKS-00SBA0"
+"ST3120813AS"							194 C "Seagate ST3120813AS"
+"ST3250620AS"							194 C "Seagate ST3250620AS"
+"ST3808110AS"							194 C "Seagate Barracuda 7200.9 SATA2 80GB 8MB"
+"ST3250824AS"							194 C "Seagate Barracuda 7200.9 SATA2 250GB 8MB"
+"ST3250310AS"							194 C "Seagate Barracuda 7200.10 SATA 250GB 8MB"
+"ST3500320AS"							194 C "Seagate Barracuda 7200.11 SATA 500GB 32MB"
+"ST3320613AS"							194 C "Seagate Barracuda 7200.11 SATA 320GB 16MB"
+"ST3500320AS"							194 C "Seagate Barracuda 7200.11 SATA 500GB 32MB"
+"ST3500620AS"							194 C "Seagate Barracuda 7200.11 SATA 500GB 16MB"
+"ST3640323AS"							194 C "Seagate Barracuda 7200.11 SATA 64GB 32MB"
+"ST3750330AS"							194 C "Seagate Barracuda 7200.11 SATA 750GB 32MB"
+"ST3750630AS"							194 C "Seagate Barracuda 7200.11 SATA 750GB 16MB"
+"ST31000340AS"							194 C "Seagate Barracuda 7200.11 SATA 1000GB 32MB"
+"SAMSUNG HD403LJ"						194 C "Samsung HD403LJ"
+"SAMSUNG HD250HJ"						194 C "Samsung SpinPoint SpinPoint S250"
+"ST3320620NS"							194 C "Seagate 320GB 7200rpm 16MB SATAII"
+"FUJITSU MHZ2250BJ FFS G2"					194 C "FUJITSU MHZ2250BJ FFS G2"
+"ST3500630A"							194 C "Seagate Barracuda 7200.10 PATA 500GB 16MB"
+"WDC WD740ADFD-00NLR5"						194 C "Western Digital SATA Raptor 74GB 16MB"
+"Hitachi HDP725032GLA360"					194 C "Hitachi Deskstar P7K500	 - 320GB 7200RPM 16MB SATA II"
+"Hitachi HDT721050SLA360"					194 C "Hitachi Deskstar 7K1000.B - 500GB 7200RPM 16MB SATA II"
+"Hitachi HDT725025VLAT80"					194 C "Hitachi Deskstar T7K500	 - 250GB 7200RPM 8MB PATA"
+"SAMSUNG HD322HJ"						194 C "Samsung HD322HJ 320GB 7200RPM 16MB SATA"
+"WDC WD2500BEVS-75UST0"						194 C "Western Digital WD2500BEVS-75UST0 - 250GB 5400RPM SATA"
+"SAMSUNG HD103UJ"						194 C "Samsung Spinpoint F1 1000GB 32MB"
+"SAMSUNG HD103SJ"						194 C "Samsung Spinpoint F3 1000GB 32MB"
+"ST9250421ASG"							194 C "Seagate Momentus 7200.3 SATA 250GB 16MB"
+"SAMSUNG HD401LJ"						194 C "SAMSUNG SpinPoint T133 series, 400GB"
+"SAMSUNG HD753LJ"						194 C "SAMSUNG F1 series, 750 GB"
+"SAMSUNG HD103SI"						194 C "Samsung Spinpoint F2 EcoGreen 1TB 5400RPM"
+"WDC WD7500AACS-00ZJB0"						194 C "Western Digital Caviar Green 750 GB"
+"WDC WD1002FAEX-00Z3A0"						194 C "Western Digital Caviar Black 1 TB"
+"ST31500341AS"							194 C "Seagate Barracuda 7200.11 1500GB SATA2 7200RPM 32MB"
+"ST31500541AS"							194 C "Seagate Barracuda Green 1500GB SATA2 5900RPM 32MB"
+"SAMSUNG HD502IJ"						194 C "Samsung HD502IJ"
+"Hitachi HTS545050B9SA00"					194 C "Hitachi Travelstar 500GB, SATA150, 2.5, 5400RPM, NCQ, 7MB Cache"
+"ST3500418AS"							194 C "Seagate Barracuda 7200.12 SATA 500GB 16MB"
+"ST9500420AS"							194 C "Seagate Momentus 7200.4 SATA 500GB 16MB"
+"WDC WD5000AAKS-00A7B0"						194 C "Western Digital WD5000AAKS-00A7B0"
+"ST9320325AS"							194 C "Seagate Momentus 5400.6 SATA 320GB 8MB"
+"MAXTOR STM3250310AS"						194 C "Seagate DiamondMax 21 SATA 250GB"
+"FUJITSU MHT2080AT PL"						194 C "Fujitsu MHT2080AT PL IDE/ATA 80GB"
+"FUJITSU MHV2120AH"						194 C "FUJITSU MHV2120AH"
+"WDC WD2001FASS-00W2B0"						194 C "Western Digital Caviar Black WD2001FASS"
+"WDC WD1000BB-00CAA1"						0 C "Western Digital Caviar WD1000BB"
+"WDC WD5000AADS-00S9B0"						194 C "Western Digital Caviar GP 500GB 32MB"
+"WDC WD5000AVDS-63U7B0"						194 C "Western Digital Caviar AV GP 500GB 32MB"
+"WDC WD5000AVJB-63YUA0"						194 C "Western Digital Caviar AV 500GB 8MB"
+"WDC WD20EVDS-63T3B0"						194 C "Western Digital Caviar AV GP 2TB 32MB"
+"WDC WD20EURS-63S48Y0"						194 C "Western Digital Caviar AV GP 2TB 64MB"
+"WDC WD3202ABYS-02B7A0"						194 C "Western Digital Caviar WD3202ABYS"
+"FUJITSU MHY2200BH"						194 C "FUJITSU MHY2200BH"
+"ST3320418AS"							194 C "Seagate Barracuda 7200.12 SATA 320GB"
+"TOSHIBA MK7559GSXP"						194 C "Toshiba MK7559GSXP"
+"TOSHIBA MK1637GSX"						194 C "Toshiba MK1637GSX 160GB SATA2 5200RPM"
+"TOSHIBA MG03ACA300"						194 C "Toshiba MG03ACA300 3TB SATA3 7200RPM"
+"TOSHIBA MD04ACA400"						194 C "Toshiba MD04ACA400 4TB SATA3 7200RPM Enterprise HDD"
+"OCZ-VERTEX2"							194 C "OCZ Vertex 2"
+"SAMSUNG HD204UI"						194 C "Samsung Spinpoint F4EG 2TB SATA2 5400RPM 32MB"
+"SAMSUNG HD154UI"						194 C "Samsung Spinpoint F2EG 1.5TB SATA2 5400RPM 32MB"
+"WDC WD10EADS-00M2B0"						194 C "Western Digital Caviar Green 1TB SATA2 5400RPM 32MB"
+"WDC WD20EARS-00S8B1"						194 C "Western Digital Caviar Green 2TB SATA2 IntelliPower 64MB"
+"WDC WD3200BEKT-00F3T0"						194 C "Western Digital Scorpio Black 320GB SATA2 7200RPM 16MB"
+"WDC WD3200BEKT-75A25T0"					194 C "Western Digital Scorpio Black 320GB SATA2 7200RPM 16MB"
+"WDC WD6400AACS-00M3B0"						194 C "Western Digital Caviar Green 640GB SATA2 7200RPM 16MB"
+"WDC WD5000AADS"						194 C "Western Digital Caviar Green 500GB SATA2 IntelliPower 32MB"
+"WDC WD7500AARX"						194 C "Western Digital Caviar Green 750GB SATA3 IntelliPower 64MB"
+"WDC WD3200AZDX"						194 C "Western Digital Caviar Green 320GB SATA3 IntelliPower 32MB"
+"WDC WD5000AZDX"						194 C "Western Digital Caviar Green 500GB SATA3 IntelliPower 32MB"
+"WDC WD5000AZRX-00A8LB0"					194 C "Western Digital Caviar Green 500GB SATA3 IntelliPower 64MB"
+"WDC WD7500AZRX"						194 C "Western Digital Caviar Green 750GB SATA3 IntelliPower 64MB"
+"WDC WD10EARS"							194 C "Western Digital Caviar Green 1TB SATA2 IntelliPower 64MB"
+"WDC WD15EARS"							194 C "Western Digital Caviar Green 1.5TB SATA2 IntelliPower 64MB"
+"WDC WD20EARS"							194 C "Western Digital Caviar Green 2TB SATA2 IntelliPower 64MB"
+"WDC WD10EZRX"							194 C "Western Digital Caviar Green 1TB SATA3 IntelliPower 64MB"
+"WDC WD25EZRX"							194 C "Western Digital Caviar Green 2.5TB SATA3 IntelliPower 64MB"
+"WDC WD30EZRX"							194 C "Western Digital Caviar Green 3TB SATA3 IntelliPower 64MB"
+"WDC WD10EARX"							194 C "Western Digital Caviar Green 1TB SATA3 IntelliPower 64MB"
+"WDC WD15EARX"							194 C "Western Digital Caviar Green 1.5TB SATA3 IntelliPower 64MB"
+"WDC WD20EARX"							194 C "Western Digital Caviar Green 2TB SATA3 IntelliPower 64MB"
+"WDC WD7500AADS-11M2B1"						194 C "Western Digital Caviar Green 750GB SATA2 IntelliPower 32MB"
+"WDC WD3200AABB"						194 C "Western Digital Caviar Blue 320GB PATA 7200RPM 2MB"
+"WDC WD3200BB"							194 C "Western Digital Caviar Blue 320GB PATA 7200RPM 2MB"
+"WDC WD3000BB"							194 C "Western Digital Caviar Blue 300GB PATA 7200RPM 2MB"
+"WDC WD2500AABB"						194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 2MB"
+"WDC WD2500BB"							194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 2MB"
+"WDC WD2500LB"							194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 2MB"
+"WDC WD2000BB"							194 C "Western Digital Caviar Blue 200GB PATA 7200RPM 2MB"
+"WDC WD2000LB"							194 C "Western Digital Caviar Blue 200GB PATA 7200RPM 2MB"
+"WDC WD1800BB"							194 C "Western Digital Caviar Blue 180GB PATA 7200RPM 2MB"
+"WDC WD1750BB"							194 C "Western Digital Caviar Blue 180GB PATA 7200RPM 2MB"
+"WDC WD1600AABB"						194 C "Western Digital Caviar Blue 160GB PATA 7200RPM 2MB"
+"WDC WD1600BB"							194 C "Western Digital Caviar Blue 160GB PATA 7200RPM 2MB"
+"WDC WD1200BB"							194 C "Western Digital Caviar Blue 120GB PATA 7200RPM 2MB"
+"WDC WD1200LB"							194 C "Western Digital Caviar Blue 120GB PATA 7200RPM 2MB"
+"WDC WD1000BB"							194 C "Western Digital Caviar Blue 100GB PATA 7200RPM 2MB"
+"WDC WD800BB"							194 C "Western Digital Caviar Blue 80GB PATA 7200RPM 2MB"
+"WDC WD800BB-00JHC0"						194 C "Western Digital Caviar Blue 80GB PATA 7200RPM 2MB"
+"WDC WD800LB"							194 C "Western Digital Caviar Blue 80GB PATA 7200RPM 2MB"
+"WDC WD800PB"							194 C "Western Digital Caviar Blue 80GB PATA 7200RPM 2MB"
+"WDC WD600BB"							194 C "Western Digital Caviar Blue 60GB PATA 7200RPM 2MB"
+"WDC WD400BB"							194 C "Western Digital Caviar Blue 40GB PATA 7200RPM 2MB"
+"WDC WD400LB"							194 C "Western Digital Caviar Blue 40GB PATA 7200RPM 2MB"
+"WDC WD300BB"							194 C "Western Digital Caviar Blue 30GB PATA 7200RPM 2MB"
+"WDC WD200BB"							194 C "Western Digital Caviar Blue 20GB PATA 7200RPM 2MB"
+"WDC WD100BB"							194 C "Western Digital Caviar Blue 10GB PATA 7200RPM 2MB"
+"WDC WD5000AAKB"						194 C "Western Digital Caviar Blue 500GB PATA 7200RPM 16MB"
+"WDC WD5000AAJB"						194 C "Western Digital Caviar Blue 500GB PATA 7200RPM 8MB"
+"WDC WD5000JB"							194 C "Western Digital Caviar Blue 500GB PATA 7200RPM 8MB"
+"WDC WD4000AAKB"						194 C "Western Digital Caviar Blue 400GB PATA 7200RPM 16MB"
+"WDC WD4000AAJB"						194 C "Western Digital Caviar Blue 400GB PATA 7200RPM 8MB"
+"WDC WD4000JB"							194 C "Western Digital Caviar Blue 400GB PATA 7200RPM 8MB"
+"WDC WD3200AAKB"						194 C "Western Digital Caviar Blue 320GB PATA 7200RPM 16MB"
+"WDC WD3200AAJB"						194 C "Western Digital Caviar Blue 320GB PATA 7200RPM 8MB"
+"WDC WD3200JB"							194 C "Western Digital Caviar Blue 320GB PATA 7200RPM 8MB"
+"WDC WD3000JB"							194 C "Western Digital Caviar Blue 300GB PATA 7200RPM 8MB"
+"WDC WD2500AAKB"						194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 16MB"
+"WDC WD2500AAJB"						194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 8MB"
+"WDC WD2500JB"							194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 8MB"
+"WDC WD2500PB"							194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 8MB"
+"WDC WD2000JB"							194 C "Western Digital Caviar Blue 200GB PATA 7200RPM 8MB"
+"WDC WD2000PB"							194 C "Western Digital Caviar Blue 200GB PATA 7200RPM 8MB"
+"WDC WD1800JB"							194 C "Western Digital Caviar Blue 180GB PATA 7200RPM 8MB"
+"WDC WD1600AAJB"						194 C "Western Digital Caviar Blue 160GB PATA 7200RPM 8MB"
+"WDC WD1600JB"							194 C "Western Digital Caviar Blue 160GB PATA 7200RPM 8MB"
+"WDC WD1200JB"							194 C "Western Digital Caviar Blue 120GB PATA 7200RPM 8MB"
+"WDC WD1200PB"							194 C "Western Digital Caviar Blue 120GB PATA 7200RPM 8MB"
+"WDC WD1000JB"							194 C "Western Digital Caviar Blue 100GB PATA 7200RPM 8MB"
+"WDC WD800JB"							194 C "Western Digital Caviar Blue 80GB PATA 7200RPM 8MB"
+"WDC WD600JB"							194 C "Western Digital Caviar Blue 60GB PATA 7200RPM 8MB"
+"WDC WD400JB"							194 C "Western Digital Caviar Blue 40GB PATA 7200RPM 8MB"
+"WDC WD2002FAEX"						194 C "Western Digital Caviar Black 2TB SATA3 7200RPM 64MB"
+"WDC WD1502FAEX"						194 C "Western Digital Caviar Black 1.5TB SATA3 7200RPM 64MB"
+"WDC WD1002FAEX"						194 C "Western Digital Caviar Black 1TB SATA3 7200RPM 64MB"
+"WDC WD7502AAEX"						194 C "Western Digital Caviar Black 750GB SATA3 7200RPM 64MB"
+"WDC WD6402AAEX"						194 C "Western Digital Caviar Black 640GB SATA3 7200RPM 64MB"
+"WDC WD5002AALX"						194 C "Western Digital Caviar Black 500GB SATA3 7200RPM 32MB"
+"WDC WD2001FASS"						194 C "Western Digital Caviar Black 2TB SATA2 7200RPM 64MB"
+"WDC WD1001FALS"						194 C "Western Digital Caviar Black 1TB SATA2 7200RPM 32MB"
+"WDC WD7501AALS"						194 C "Western Digital Caviar Black 750GB SATA2 7200RPM 32MB"
+"WDC WD6401AALS"						194 C "Western Digital Caviar Black 640GB SATA2 7200RPM 32MB"
+"WDC WD5001AALS"						194 C "Western Digital Caviar Black 500GB SATA2 7200RPM 32MB"
+"WDC WD10EALX"							194 C "Western Digital Caviar Blue 1TB SATA3 7200RPM 32MB"
+"WDC WD7500AALX"						194 C "Western Digital Caviar Blue 750GB SATA3 7200RPM 32MB"
+"WDC WD5000AAKX"						194 C "Western Digital Caviar Blue 500GB SATA3 7200RPM 16MB"
+"WDC WD3200AAKX"						194 C "Western Digital Caviar Blue 320GB SATA3 7200RPM 16MB"
+"WDC WD2500AAKX"						194 C "Western Digital Caviar Blue 250GB SATA3 7200RPM 16MB"
+"WDC WD10EALS"							194 C "Western Digital Caviar Blue 1TB SATA2 7200RPM 32MB"
+"WDC WD6400AAKS"						194 C "Western Digital Caviar Blue 640GB SATA2 7200RPM 16MB"
+"WDC WD5000AAKS"						194 C "Western Digital Caviar Blue 500GB SATA2 7200RPM 16MB"
+"WDC WD3200AAKS"						194 C "Western Digital Caviar Blue 320GB SATA2 7200RPM 16MB"
+"WDC WD2500AAKS"						194 C "Western Digital Caviar Blue 250GB SATA2 7200RPM 16MB"
+"WDC WD2500AAKS-00VSA0"						194 C "Western Digital Caviar Blue 250GB SATA2 7200RPM 16MB"
+"WDC WD3200AAJS"						194 C "Western Digital Caviar Blue 320GB SATA2 7200RPM 8MB"
+"WDC WD2500AAJS"						194 C "Western Digital Caviar Blue 250GB SATA2 7200RPM 8MB"
+"WDC WD1600AAJS"						194 C "Western Digital Caviar Blue 160GB SATA2 7200RPM 8MB"
+"WDC WD800AAJS"							194 C "Western Digital Caviar Blue 80GB SATA2 7200RPM 8MB"
+"WDC WD10JPVT"							194 C "1TB SATA2 5400RPM 8MB"
+"WDC WD10TPVT"							194 C "1TB SATA2 5200RPM 8MB"
+"WDC WD7500BPVT"						194 C "750GB SATA2 5400RPM 8MB"
+"WDC WD6400BPVT"						194 C "640GB SATA2 5400RPM 8MB"
+"WDC WD5000BPVT"						194 C "500GB SATA2 5400RPM 8MB"
+"WDC WD3200BPVT"						194 C "320GB SATA2 5400RPM 8MB"
+"WDC WD2500BPVT"						194 C "250GB SATA2 5400RPM 8MB"
+"WDC WD3200BEVE"						194 C "320GB PATA6 5400RPM 8MB"
+"WDC WD2500BEVE"						194 C "250GB PATA6 5400RPM 8MB"
+"WDC WD1600BEVE"						194 C "160GB PATA6 5400RPM 8MB"
+"WDC WD1200BEVE"						194 C "120GB PATA6 5400RPM 8MB"
+"WDC WD800BEVE"							194 C "80GB PATA6 5400RPM 8MB"
+"WDC WD5000LPVT"						194 C "500GB SATA2 5400RPM 8MB"
+"WDC WD3200LPVT"						194 C "320GB SATA2 5400RPM 8MB"
+"WDC WD2500LPVT"						194 C "250GB SATA2 5400RPM 8MB"
+"ST320LT007-9ZV142"						194 C "Seagate 320GB SATA2 7200RPM 16MB"
+"ST250DM000"							194 C "Seagate Barracuda 7200.14 250GB SATA3 7200RPM 16MB"
+"ST320DM000"							194 C "Seagate Barracuda 7200.14 320GB SATA3 7200RPM 16MB"
+"ST500DM002"							194 C "Seagate Barracuda 7200.14 500GB SATA3 7200RPM 16MB"
+"ST750DM003"							194 C "Seagate Barracuda 7200.14 750GB SATA3 7200RPM 64MB"
+"ST1000DM003"							194 C "Seagate Barracuda 7200.14 1TB SATA3 7200RPM 64MB"
+"ST1500DM003"							194 C "Seagate Barracuda 7200.14 1.5TB SATA3 7200RPM 64MB"
+"ST2000DM001"							194 C "Seagate Barracuda 7200.14 2TB SATA3 7200RPM 64MB"
+"ST3000DM001"							194 C "Seagate Barracuda 7200.14 3TB SATA3 7200RPM 64MB"
+"ST32000641AS"							194 C "Seagate Barracuda XT ST32000641AS 2TB SATA3 7200RPM 64MB"
+"ST500LM000-1EJ16"						194 C "Seagate 500GB SSHD"
+"Hitachi HTS725050A9A364"					190 C "Hitachi Travelstar 7K500 500GB SATA2 7200RPM 16MB"
+"HTE721080G9AT00"						194 C "Hitachi Travelstar E7K100 80GB PATA6 7200RPM 8MB"
+"ST9250315AS"							194 C "Seagate Momentus 5400.6 250GB SATA2 5400RPM 8MB"
+"ST9750420AS"							194 C "Seagate Momentus 7200.4 750GB SATA2 7200RPM 16MB"
+"ST9500423AS"							194 C "Seagate Momentus 7200.4 500GB SATA2 7200RPM 16MB"
+"TOSHIBA MK3252GSX"						194 C "Toshiba MK3252GSX"
+"SAMSUNG HM160HC"						194 C "Samsung HM160HC"
+"WDC WD1003FBYX-01Y7B1"						194 C "Western Digital RE4 1TB SATA2 7200RPM 64MB"
+"WDC WD3003FZEX-00Z4SA0"					194 C "Western Digital Caviar Black 3TB SATA3 7200RPM 64MB"
+"WDC WD3000FYYZ-01UL1B2"					194 C "Western Digital WD3000FYYZ 3TB SATA3 7200RPM"
+"TOSHIBA DT01ACA050"						194 C "Toshiba 500GB SATA3 7200RPM 32MB"
+"WDC WD10JFCX-68N6GN0"						194 C "Western Digital Red 1TB SATA3 IntelliPower 64MB"
+"WDC WD40EFRX"							194 C "Western Digital Red 4TB SATA3 IntelliPower 64MB"
+"WDC WD40EZRX"							194 C "Western Digital Green 4TB SATA3 IntelliPower 64MB"
+"WDC WD20EARS"							194 C "Western Digital Green 2TB SATA2 IntelliPower 64MB"
+"WDC WD5000BEVT"						194 C "Western Digital Scorpio Blue 500GB SATA2 5400RPM 8MB"
+"WDC WD5000BPKT-00PK4T0"					194 C "Western Digital Scorpio Black 500GB SATA2 7200RPM 16MB"
+"SanDisk SD6SB1M256G1022I"					194 C "Sandisk SSD X110 256GB"
+"Hitachi HTS542512K9SA00"					194 C "Hitachi Travelstar 5K250 120GB SATA2 5400RPM 8MB"
+"Hitachi HTS542516K9SA00"					194 C "Hitachi Travelstar 5K250 160GB SATA2 5400RPM 8MB"
+"Hitachi HDS721680PLA380"					194 C "Hitachi Deskstar 7K160 80GB SATA2 7200RPM 8MB"
+"Hitachi HDS721010CLA332"					194 C "Hitachi Deskstar 7K1000.C 1TB SATA2 7200RPM"
+"HGST HDS724040ALE640"						194 C "HGST Deskstar 7K4000 4TB SATA3 7200RPM"
+"ST9120822AS"							194 C "Seagate Momentus 5400.3 120GB SATA 5400RPM 8MB"
+"ST32000542AS"							194 C "Seagate Barracuda LP 2000GB SATA2 5900RPM 32MB"
+"ST2000DL003-9VT166"						194 C "Seagate Barracuda LP 2000GB SATA3 5900RPM 64MB"
+"ST4000VN000-1H4168"						194 C "Seagate NAS HDD 4TB SATA3 64MB"
+"Hitachi HTS545050B9A300"					194 C "Hitachi Travelstar 500GB SATA2 2.5 5400RPM 8MB"
+"ST9500325AS"							194 C "Seagate Momentus 5400.6 500GB SATA2 5400RPM 8MB"
+"WDC WD30EFRX-68AX9N0"						194 C "Western Digital Red 3TB SATA3 64MB"
+"Toshiba DT01ACA300"						194 C "Toshiba DT01ACA300 3TB SATA3 7200RPM 64MB"
+"TOSHIBA DT01ACA300"						194 C "Toshiba DT01ACA300 3TB SATA3 7200RPM 64MB"
+"TOSHIBA HDWD130"						194 C "Toshiba P300 3TB SATA3 7200RPM 64MB"
+"Samsung SSD 850 EVO"						190 C "Samsung SSD 850 EVO Series"
+"Samsung SSD 840 Series"					190 C "Samsung SSD 840 Series"
+"Samsung SSD 840 PRO Serise"					190 C "Samsung SSD 840 Pro Series"
+"Samsung SSD 840 EVO"						190 C "Samsung SSD 840 EVO Series"
+"SAMSUNG HD203WI"						194 C "Samsung SpinPoint F3 EcoGreen 2TB SATA2 5400RPM 32MB"
+"SAMSUNG SSD 830 Series"					190 C "Samsung SSD 830 Series"
+"SanDisk SDSSDH2128G"						194 C "Sandisk SSD Ultra Plus 128GB"
+"SanDisk SDSSDH2256G"						194 C "Sandisk SSD Ultra Plus 256GB"
+"OCZ-VERTEX3"							194 C "OCZ Vertex 3 120GB SATA3"
+"Crucial_CT240M500SSD3"						194 C "Crucial M500 240GB SATA3 256MB"
+"WDC WD5003ABYX-01WERA2"					194 C "Western Digital RE4 500GB"
+"WDC WD5002ABYS-02B1B0"						194 C "Western Digital RE3 500GB"
+"WDC WD20EZRX"							194 C "Western Digital Green 2TB"
+"ST4000DM000"							194 C "Seagate Desktop 4TB"
+"STM3160815AS"							194 C "Maxtor DiamondMax 21 - 160GB - 8MB Cache SATA"
+"6G160E0"							194 C "Maxtor DiamondMax 17 - 160GB - 8MB Cache SATA"
+"WDC WD7500BFCX-68N6GN0"					194 C "Western Digital Red 750GB SATA"
+"Hitachi HTS547575A9E384"					190 C "Hitachi Travelstar 5K750 750GB SATA2 5400RPM 8MB"
+"WDC WD30PURX-64P6ZY0"						194 C "Western Digital Purple 3TB 64MB Cache"
+"WDC WD10EZEX-00BN5A0"						194 C "Western Digital Blue 1TB SATA3 7200RPM 64MB"
+"WDC WD1003FZEX-00MK2A0"					194 C "Western Digital Black 1TB SATA3 7200RPM 64MB"
+"SAMSUNG MZHPV128HDGM-00000"					194 C "Samsung SSD 128 GB PCIe Gen3 8Gb/s x4 M.2"
+"CT960BX200SSD1"						194 C "Crucial BX200 960GB SSD"
+"CT480BX200SSD1"						194 C "Crucial BX200 480GB SSD"
+"CT240BX200SSD1"						194 C "Crucial BX200 240GB SSD"
+"Crucial_CT256M550SSD1"						194 C "Crucial M550 256GB SSD"
+"WDC WD80EFZX-68UW8N0"						194 C "Western Digital Red 8TB SATA3 5400RPM 128MB"
+"WDC WD60EFRX-68MYMN1"						194 C "Western Digital Red 6TB SATA3 5700RPM 64MB"
+"WDC WD1003FBYZ-010FB0"						194 C "Western Digital WD RE 1TB SATA3 7200RPM 64MB"
+"WDC WD1002FBYS-02A6B0"						194 C "Western Digital WD RE3 1TB SATA3 7200RPM 32MB"
+"ST2000DM006-2DM164"						194 C "Seagate Barracuda 2TB SATA3 7200RPM 64MB"
+"Samsung SSD 850 PRO 128G"					190 C "Samsung SSD 850 PRO 128G"
+"WDC WD1600BEVS-08RST2"						194 C "Western Digital Scorpio Blue SATA 160GB 5400RPM 8MB"
+"WDC WD30EZRZ-00Z5HB0"						194 C "Western Digital Blue 3TB SATA3 5400RPM 64MB"
+"ST31000528AS"							194 C "Seagate Barracuda 7200.12 1TB SATA2 7200RPM 32MB"
+"HITACHI HTS727550A9E364"                                       194 C "Hitachi Travelstar 7K500 500GB SATA2 7200RPM 16MB"
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-byteswap.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-byteswap.patch
new file mode 100644
index 000000000000..7b0dddc2ae47
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-byteswap.patch
@@ -0,0 +1,28 @@
+diff -Nuar --exclude '*~' hddtemp-0.3-beta15.orig/src/sata.c hddtemp-0.3-beta15/src/sata.c
+--- hddtemp-0.3-beta15.orig/src/sata.c	2006-05-14 02:09:55.579437498 -0700
++++ hddtemp-0.3-beta15/src/sata.c	2006-05-14 02:06:08.495948437 -0700
+@@ -88,7 +88,9 @@
+     return strdup(_("unknown"));
+   else
+   {
++		//fprintf(stderr,"sata_model1=%s\n",identify + 54);
+     sata_fixstring(identify + 54, 24);
++		//fprintf(stderr,"sata_model2=%s\n",identify + 54);
+     return strdup(identify + 54);
+   }
+ }
+diff -Nuar --exclude '*~' hddtemp-0.3-beta15.orig/src/satacmds.c hddtemp-0.3-beta15/src/satacmds.c
+--- hddtemp-0.3-beta15.orig/src/satacmds.c	2006-05-14 02:09:40.983470339 -0700
++++ hddtemp-0.3-beta15/src/satacmds.c	2006-05-14 02:09:02.319557333 -0700
+@@ -98,7 +98,10 @@
+   /* convert from big-endian to host byte order */
+   for (p = end ; p != s;) {
+     unsigned short *pp = (unsigned short *) (p -= 2);
+-    *pp = ntohs(*pp);
++		char tmp = p[0];
++		p[0] = p[1];
++		p[1] = tmp;
++    //*pp = ntohs(*pp);
+   }
+ 
+   /* strip leading blanks */
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-dontwake.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-dontwake.patch
new file mode 100644
index 000000000000..969da7a70e40
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-dontwake.patch
@@ -0,0 +1,20 @@
+--- hddtemp-0.3-beta15/src/sata.c	2012-07-01 16:35:01.681708074 +0200
++++ hddtemp-0.3-beta15/src/sata.c	2012-07-01 16:33:58.172109699 +0200
+@@ -125,6 +125,17 @@
+     dsk->fd = -1;
+     return GETTEMP_NOSENSOR;
+   }
++
++  switch(ata_get_powermode(dsk->fd)) {
++  case PWM_STANDBY:
++  case PWM_SLEEPING:
++    if (!wakeup)
++      return GETTEMP_DRIVE_SLEEP;
++  case PWM_UNKNOWN:
++  case PWM_ACTIVE: /* active or idle */
++  default:
++    break;
++  }
+   
+   /* get SMART values */
+   if(sata_enable_smart(dsk->fd) != 0) {
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-execinfo.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-execinfo.patch
new file mode 100644
index 000000000000..1e7239535d4d
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-execinfo.patch
@@ -0,0 +1,21 @@
+--- hddtemp-0.3-beta15/configure.in~	2005-10-17 19:14:19 +0000
++++ hddtemp-0.3-beta15/configure.in	2006-12-11 18:23:22 +0000
+@@ -18,6 +18,7 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(fcntl.h)
+ AC_CHECK_HEADERS(netinet/in.h)
++AC_CHECK_HEADERS(execinfo.h)
+ AC_CHECK_TYPE(in_addr_t, ,[AC_DEFINE_UNQUOTED([in_addr_t], [uint32_t], [Define to 'uint32_t' if <netinet/in.h> does not define.])], [#include <netinet/in.h>])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+--- hddtemp-0.3-beta15/src/backtrace.c-orig	2006-12-11 18:20:41 +0000
++++ hddtemp-0.3-beta15/src/backtrace.c	2006-12-11 18:23:28 +0000
+@@ -18,7 +18,7 @@
+ 
+ #include <features.h>
+ 
+-#if defined(__i386__) && defined(__GLIBC__)
++#ifdef HAS_EXECINFO_H
+ 
+ #include <execinfo.h>
+ 
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-iconv.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-iconv.patch
new file mode 100644
index 000000000000..621e7549aa0b
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-iconv.patch
@@ -0,0 +1,28 @@
+--- hddtemp-0.3-beta15/src/utf8.c~	2007-03-27 09:09:59.000000000 +0200
++++ hddtemp-0.3-beta15/src/utf8.c	2007-03-27 09:10:06.000000000 +0200
+@@ -23,7 +23,9 @@
+ 
+ // Standard includes
+ #include <stdlib.h>
++#ifdef HAVE_ICONV
+ #include <iconv.h>
++#endif
+ #include <langinfo.h>
+ #include <locale.h>
+ #include <string.h>
+@@ -34,6 +36,7 @@
+ 
+ static char *iconv_from_utf8_to_locale(const char *string, const char* fallback_string)
+ {
++#ifdef HAVE_ICONV
+   const size_t buffer_inc = 80;	// Increment buffer size in 80 bytes step
+   const char *charset;
+   iconv_t cd;
+@@ -93,6 +96,7 @@
+   if (dest_buffer != NULL)
+     free(dest_buffer);  		// free buffer
+   free(src_buffer);			// free string
++#endif // HAVE_ICONV
+   return strdup(fallback_string); 	// and return fallback string
+ }
+ 
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-nls.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-nls.patch
new file mode 100644
index 000000000000..86567aeb8c39
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-nls.patch
@@ -0,0 +1,14 @@
+--- hddtemp-0.3-beta15/src/hddtemp.c~	2006-04-19 02:37:35 +0000
++++ hddtemp-0.3-beta15/src/hddtemp.c	2007-03-26 08:14:17 +0000
+@@ -275,9 +275,11 @@
+   backtrace_sigill();
+   backtrace_sigbus();
+ 
++#if ENABLE_NLS
+   setlocale (LC_ALL, "");
+   bindtextdomain (PACKAGE, LOCALEDIR);
+   textdomain (PACKAGE);
++#endif
+   
+   show_db = debug = numeric = quiet = wakeup = af_hint = syslog_interval = 0;
+   unit = DEFAULT;
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch
new file mode 100644
index 000000000000..d67e0681f33f
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch
@@ -0,0 +1,26 @@
+diff -Naurp hddtemp-0.3-beta15-orig/src/satacmds.c hddtemp-0.3-beta15/src/satacmds.c
+--- hddtemp-0.3-beta15-orig/src/satacmds.c	2007-02-10 14:25:15.000000000 +0100
++++ hddtemp-0.3-beta15/src/satacmds.c	2007-02-10 14:26:53.000000000 +0100
+@@ -54,7 +54,6 @@ int sata_pass_thru(int device, unsigned 
+   unsigned char cdb[16];
+   unsigned char sense[32];
+   int dxfer_direction;
+-  int ret;
+   
+   memset(cdb, 0, sizeof(cdb));
+   cdb[0] = ATA_16;
+@@ -78,13 +77,7 @@ int sata_pass_thru(int device, unsigned 
+     cdb[6] = cmd[1];
+   cdb[14] = cmd[0];
+ 
+-  ret = scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction);
+- 
+-  /* Verify SATA magics */
+-  if (sense[0] != 0x72 || sense[7] != 0x0e || sense[9] != 0x0e || sense[10] != 0x00)
+-    return 1;		  
+-  else 
+-    return ret;
++  return scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction);
+ }
+ 
+ void sata_fixstring(unsigned char *s, int bytecount)
diff --git a/app-admin/hddtemp/files/hddtemp-conf.d b/app-admin/hddtemp/files/hddtemp-conf.d
new file mode 100644
index 000000000000..f2f34d93b6e1
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-conf.d
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# the hddtemp executable
+HDDTEMP_EXEC=/usr/sbin/hddtemp
+
+# various options to pass to the daemon
+HDDTEMP_OPTS="--listen=127.0.0.1"
+
+# a list of drives to check
+HDDTEMP_DRIVES="/dev/sda /dev/sdb"
+
diff --git a/app-admin/hddtemp/files/hddtemp-init b/app-admin/hddtemp/files/hddtemp-init
new file mode 100644
index 000000000000..39a640997cfe
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-init
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+}
+
+start() {
+	ebegin "Starting hddtemp daemon"
+	/sbin/start-stop-daemon --start --quiet --exec ${HDDTEMP_EXEC} \
+	-- -d ${HDDTEMP_OPTS} ${HDDTEMP_DRIVES}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping hddtemp daemon"
+	start-stop-daemon --stop --quiet --exec ${HDDTEMP_EXEC}
+	eend $?
+}
+
+
diff --git a/app-admin/hddtemp/files/hddtemp.service b/app-admin/hddtemp/files/hddtemp.service
new file mode 100644
index 000000000000..b2fca4214bca
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Hard drive temperature monitor daemon
+Documentation=man:hddtemp(8)
+
+[Service]
+Environment=HDDTEMP_OPTIONS=--listen=127.0.0.1
+EnvironmentFile=-/etc/conf.d/hddtemp
+ExecStart=/usr/sbin/hddtemp -d $HDDTEMP_OPTIONS $HDDTEMP_DRIVES
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/hddtemp/files/hddtemp.service-r1 b/app-admin/hddtemp/files/hddtemp.service-r1
new file mode 100644
index 000000000000..8105bfc50cce
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp.service-r1
@@ -0,0 +1,10 @@
+[Unit]
+Description=Hard drive temperature monitor daemon
+Documentation=man:hddtemp(8)
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/hddtemp -d --listen=127.0.0.1 $HDDTEMP_DRIVES
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/hddtemp/files/hddtemp.service.conf b/app-admin/hddtemp/files/hddtemp.service.conf
new file mode 100644
index 000000000000..a2a6c7fbd7f4
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp.service.conf
@@ -0,0 +1,3 @@
+# Set a list of drives to check
+[Service]
+Environment="HDDTEMP_DRIVES=/dev/sda /dev/sdb"
\ No newline at end of file
diff --git a/app-admin/hddtemp/files/update-hddtemp.db b/app-admin/hddtemp/files/update-hddtemp.db
new file mode 100644
index 000000000000..bc29b3ec0caa
--- /dev/null
+++ b/app-admin/hddtemp/files/update-hddtemp.db
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+update_db() {
+	local src=$1
+	local dst=$2
+
+	while read line ; do
+		if [[ -z $(echo "${line}" | sed -re 's/(^#.*|^\w*$)//') ]]; then
+			echo "${line}" >> "${dst}"
+		fi
+
+		id=$(echo "${line}" | grep -o '"[^"]*"')
+
+		grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}"
+	done < "${src}"
+}
+
+die() {
+	echo "$*"
+	exit 1
+}
+
+cd /usr/share/hddtemp
+wget http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db -O hddtemp.db -q || die "Failed to download new hddtemp.db file"
+
+# Try to get the Gentoo HDD DB from WebCVS.  If that fails, just use the Gentoo HDD database
+# that was installed by the ebuild.
+if wget https://gitweb.gentoo.org/repo/gentoo.git/plain/app-admin/hddtemp/files/hddgentoo.db -O hddtmp.db -q; then
+	mv -f hddtmp.db hddgentoo.db
+fi
+
+update_db "hddgentoo.db" "hddtemp.db"
+
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild
new file mode 100644
index 000000000000..3d5ce71a8247
--- /dev/null
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools readme.gentoo-r1 systemd
+
+MY_P=${P/_beta/-beta}
+DBV=20080531
+
+DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
+HOMEPAGE="https://savannah.nongnu.org/projects/hddtemp/"
+SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirror://gentoo/hddtemp-${DBV}.db.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ~ppc64 sparc x86"
+IUSE="network-cron nls selinux"
+
+DEPEND=""
+RDEPEND="selinux? ( sec-policy/selinux-hddtemp )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(README TODO ChangeLog)
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="In order to update your hddtemp database, run:
+emerge --config =${CATEGORY}/${PF} or update-hddtemp.db (if USE
+network-cron is enabled)
+
+If your hard drive is not recognized by hddtemp, please consider
+submitting your HDD info for inclusion into the Gentoo hddtemp
+database by filing a bug at https://bugs.gentoo.org/
+
+If hddtemp complains but finds your HDD temperature sensor, use the
+--quiet option to suppress the warning.
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-satacmds.patch
+	"${FILESDIR}"/${P}-byteswap.patch
+	"${FILESDIR}"/${P}-execinfo.patch
+	"${FILESDIR}"/${P}-nls.patch
+	"${FILESDIR}"/${P}-iconv.patch
+	"${FILESDIR}"/${P}-dontwake.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	mv "${S}"/configure.{in,ac} || die
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db"
+	# disabling nls breaks compiling
+	use nls || myconf="--disable-nls ${myconf}"
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/hddtemp
+	newins "${WORKDIR}/hddtemp-${DBV}.db" hddtemp.db
+	doins "${FILESDIR}"/hddgentoo.db
+
+	update_db "${D}/usr/share/hddtemp/hddgentoo.db" "${D}/usr/share/hddtemp/hddtemp.db"
+	newconfd "${FILESDIR}"/hddtemp-conf.d hddtemp
+	newinitd "${FILESDIR}"/hddtemp-init hddtemp
+	systemd_newunit "${FILESDIR}"/hddtemp.service-r1 "${PN}.service"
+	systemd_install_serviced "${FILESDIR}"/hddtemp.service.conf
+
+	readme.gentoo_create_doc
+
+	if use network-cron; then
+		dosbin "${FILESDIR}"/update-hddtemp.db
+		exeinto /etc/cron.monthly
+		echo -e "#!/bin/sh\n/usr/sbin/update-hddtemp.db" > "${T}"/hddtemp.cron
+		newexe "${T}"/hddtemp.cron update-hddtemp.db
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+update_db() {
+	local src=$1
+	local dst=$2
+
+	while read line ; do
+		if [[ -z $(echo "${line}" | sed -re 's/(^#.*|^\w*$)//') ]]; then
+			echo "${line}" >> "${dst}"
+		fi
+
+		id=$(echo "${line}" | grep -o '"[^"]*"')
+
+		grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}"
+	done < "${src}"
+}
+
+pkg_config() {
+	cd "${ROOT}"/usr/share/hddtemp || die
+
+	einfo "Trying to download the latest hddtemp.db file"
+	wget http://www.guzu.net/linux/hddtemp.db -O hddtemp.db \
+		|| die "failed to download hddtemp.db"
+
+	update_db "hddgentoo.db" "hddtemp.db"
+}
diff --git a/app-admin/hddtemp/metadata.xml b/app-admin/hddtemp/metadata.xml
new file mode 100644
index 000000000000..fa25feea165c
--- /dev/null
+++ b/app-admin/hddtemp/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="network-cron">
+		Monthly cronjob to update hddtemp.db.
+	</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/helm-2.10.0_rc1 b/app-admin/helm-2.10.0_rc1
deleted file mode 100644
index fab2969f3706..000000000000
--- a/app-admin/helm-2.10.0_rc1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Package Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/helm https://helm.sh
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/helm/archive/v2.10.0-rc.1.tar.gz -> helm-2.10.0_rc1.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/aokoli/goutils/archive/9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz -> github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz https://github.com/asaskevich/govalidator/archive/7664702784775e51966f0885f5cd27435916517b.tar.gz -> github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz https://github.com/Azure/go-ansiterm/archive/19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz -> github.com-Azure-go-ansiterm-19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz https://github.com/Azure/go-autorest/archive/d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab.tar.gz -> github.com-Azure-go-autorest-d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/cpuguy83/go-md2man/archive/71acacd42f85e5e82f70a55327789582a5200a90.tar.gz -> github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz https://github.com/cyphar/filepath-securejoin/archive/06bda8370f45268db985f7af15732444d94ed51c.tar.gz -> github.com-cyphar-filepath-securejoin-06bda8370f45268db985f7af15732444d94ed51c.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz -> github.com-docker-docker-4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz https://github.com/docker/go-connections/archive/3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz -> github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz https://github.com/docker/go-units/archive/9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz -> github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/evanphx/json-patch/archive/94e38aa1586e8a6c8a75770bddf5ff84c48a106b.tar.gz -> github.com-evanphx-json-patch-94e38aa1586e8a6c8a75770bddf5ff84c48a106b.tar.gz https://github.com/exponent-io/jsonpath/archive/d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz -> github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz https://github.com/fatih/camelcase/archive/f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz -> github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz -> github.com-go-openapi-spec-1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz https://github.com/go-openapi/swag/archive/f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz -> github.com-go-openapi-swag-f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz -> github.com-golang-protobuf-1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/google/uuid/archive/064e2069ce9c359c118179501254f67d7d37ba24.tar.gz -> github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/6da026c32e2d622cc242d32984259c77237aefe1.tar.gz -> github.com-gophercloud-gophercloud-6da026c32e2d622cc242d32984259c77237aefe1.tar.gz https://github.com/gosuri/uitable/archive/36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz -> github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz -> github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/huandu/xstrings/archive/3959339b333561bf62a38b424fd41517c2c90f40.tar.gz -> github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/json-iterator/go/archive/13f86432b882000a51c6e610c620974462691a97.tar.gz -> github.com-json-iterator-go-13f86432b882000a51c6e610c620974462691a97.tar.gz https://github.com/mailru/easyjson/archive/2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz -> github.com-mailru-easyjson-2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz https://github.com/MakeNowJust/heredoc/archive/bb23615498cded5e105af4ce27de75b089cbe851.tar.gz -> github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz https://github.com/Masterminds/semver/archive/517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz -> github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz https://github.com/Masterminds/sprig/archive/6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c.tar.gz -> github.com-Masterminds-sprig-6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c.tar.gz https://github.com/Masterminds/vcs/archive/3084677c2c188840777bff30054f2b553729d329.tar.gz -> github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz https://github.com/mattn/go-runewidth/archive/d6bea18f789704b5f83375793155289da36a3c7f.tar.gz -> github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mitchellh/go-wordwrap/archive/ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz -> github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz https://github.com/opencontainers/go-digest/archive/a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz -> github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz https://github.com/opencontainers/image-spec/archive/372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz -> github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/pkg/errors/archive/645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz -> github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/russross/blackfriday/archive/300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz -> github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz -> github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz https://github.com/sirupsen/logrus/archive/89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz -> github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz https://github.com/spf13/cobra/archive/f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz -> github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/technosophos/moniker/archive/a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz -> github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz https://github.com/golang/crypto/archive/81e90905daefcd6fd217b62423c0908922eadb30.tar.gz -> github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/43eea11bc92608addb41b8a406b0407495c106f6.tar.gz -> github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/time/archive/f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz -> github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz https://github.com/golang/appengine/archive/12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz -> github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz -> github.com-grpc-grpc-go-5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/square/go-jose/archive/f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz -> github.com-square-go-jose-f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz https://github.com/go-yaml/yaml/archive/670d4cfef0544295bc27a114dbac37980d83185a.tar.gz -> github.com-go-yaml-yaml-670d4cfef0544295bc27a114dbac37980d83185a.tar.gz https://github.com/kubernetes/api/archive/8b7507fac302640dd5f1efbf9643199952cc58db.tar.gz -> github.com-kubernetes-api-8b7507fac302640dd5f1efbf9643199952cc58db.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz -> github.com-kubernetes-apiextensions-apiserver-898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz https://github.com/kubernetes/apimachinery/archive/f6313580a4d36c7c74a3d845dda6e116642c4f90.tar.gz -> github.com-kubernetes-apimachinery-f6313580a4d36c7c74a3d845dda6e116642c4f90.tar.gz https://github.com/kubernetes/apiserver/archive/f7914ed3085badf66a1b6f3a5218ada28f7bd084.tar.gz -> github.com-kubernetes-apiserver-f7914ed3085badf66a1b6f3a5218ada28f7bd084.tar.gz https://github.com/kubernetes/client-go/archive/23781f4d6632d88e869066eaebb743857aa1ef9b.tar.gz -> github.com-kubernetes-client-go-23781f4d6632d88e869066eaebb743857aa1ef9b.tar.gz https://github.com/kubernetes/kube-openapi/archive/39cb288412c48cb533ba4be5d6c28620b9a0c1b4.tar.gz -> github.com-kubernetes-kube-openapi-39cb288412c48cb533ba4be5d6c28620b9a0c1b4.tar.gz https://github.com/kubernetes/kubernetes/archive/32ac1c9073b132b8ba18aa830f46b77dcceb0723.tar.gz -> github.com-kubernetes-kubernetes-32ac1c9073b132b8ba18aa830f46b77dcceb0723.tar.gz https://github.com/kubernetes/utils/archive/aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz -> github.com-kubernetes-utils-aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz https://github.com/fvbommel/util/archive/db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz -> github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=dad99d0394e206a5de5922bd9d922080
diff --git a/app-admin/helm-2.9.1 b/app-admin/helm-2.9.1
deleted file mode 100644
index 99ba573ce5fa..000000000000
--- a/app-admin/helm-2.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Package Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/helm https://helm.sh
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/helm/archive/v2.9.1.tar.gz -> helm-2.9.1.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/aokoli/goutils/archive/9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz -> github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz https://github.com/asaskevich/govalidator/archive/7664702784775e51966f0885f5cd27435916517b.tar.gz -> github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz https://github.com/Azure/go-ansiterm/archive/19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz -> github.com-Azure-go-ansiterm-19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz https://github.com/Azure/go-autorest/archive/d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab.tar.gz -> github.com-Azure-go-autorest-d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/cpuguy83/go-md2man/archive/71acacd42f85e5e82f70a55327789582a5200a90.tar.gz -> github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz -> github.com-docker-docker-4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz https://github.com/docker/go-connections/archive/3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz -> github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz https://github.com/docker/go-units/archive/9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz -> github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/evanphx/json-patch/archive/944e07253867aacae43c04b2e6a239005443f33a.tar.gz -> github.com-evanphx-json-patch-944e07253867aacae43c04b2e6a239005443f33a.tar.gz https://github.com/exponent-io/jsonpath/archive/d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz -> github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz https://github.com/fatih/camelcase/archive/f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz -> github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz -> github.com-go-openapi-spec-1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz https://github.com/go-openapi/swag/archive/f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz -> github.com-go-openapi-swag-f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz -> github.com-golang-protobuf-1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/google/uuid/archive/064e2069ce9c359c118179501254f67d7d37ba24.tar.gz -> github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/6da026c32e2d622cc242d32984259c77237aefe1.tar.gz -> github.com-gophercloud-gophercloud-6da026c32e2d622cc242d32984259c77237aefe1.tar.gz https://github.com/gosuri/uitable/archive/36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz -> github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz -> github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/huandu/xstrings/archive/3959339b333561bf62a38b424fd41517c2c90f40.tar.gz -> github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/json-iterator/go/archive/13f86432b882000a51c6e610c620974462691a97.tar.gz -> github.com-json-iterator-go-13f86432b882000a51c6e610c620974462691a97.tar.gz https://github.com/mailru/easyjson/archive/2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz -> github.com-mailru-easyjson-2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz https://github.com/MakeNowJust/heredoc/archive/bb23615498cded5e105af4ce27de75b089cbe851.tar.gz -> github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz https://github.com/Masterminds/semver/archive/517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz -> github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz https://github.com/Masterminds/sprig/archive/6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c.tar.gz -> github.com-Masterminds-sprig-6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c.tar.gz https://github.com/Masterminds/vcs/archive/3084677c2c188840777bff30054f2b553729d329.tar.gz -> github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz https://github.com/mattn/go-runewidth/archive/d6bea18f789704b5f83375793155289da36a3c7f.tar.gz -> github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mitchellh/go-wordwrap/archive/ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz -> github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz https://github.com/opencontainers/go-digest/archive/a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz -> github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz https://github.com/opencontainers/image-spec/archive/372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz -> github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/russross/blackfriday/archive/300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz -> github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz -> github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz https://github.com/sirupsen/logrus/archive/89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz -> github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz https://github.com/spf13/cobra/archive/f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz -> github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/technosophos/moniker/archive/ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz -> github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz https://github.com/golang/crypto/archive/81e90905daefcd6fd217b62423c0908922eadb30.tar.gz -> github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/43eea11bc92608addb41b8a406b0407495c106f6.tar.gz -> github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/time/archive/f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz -> github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz https://github.com/golang/appengine/archive/12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz -> github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz -> github.com-grpc-grpc-go-5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/square/go-jose/archive/f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz -> github.com-square-go-jose-f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/c699ec51538f0cfd4afa8bfcfe1e0779cafbe666.tar.gz -> github.com-kubernetes-api-c699ec51538f0cfd4afa8bfcfe1e0779cafbe666.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz -> github.com-kubernetes-apiextensions-apiserver-898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz https://github.com/kubernetes/apimachinery/archive/54101a56dda9a0962bc48751c058eb4c546dcbb9.tar.gz -> github.com-kubernetes-apimachinery-54101a56dda9a0962bc48751c058eb4c546dcbb9.tar.gz https://github.com/kubernetes/apiserver/archive/ea53f8588c655568158b4ff53f5ec6fa4ebfc332.tar.gz -> github.com-kubernetes-apiserver-ea53f8588c655568158b4ff53f5ec6fa4ebfc332.tar.gz https://github.com/kubernetes/client-go/archive/23781f4d6632d88e869066eaebb743857aa1ef9b.tar.gz -> github.com-kubernetes-client-go-23781f4d6632d88e869066eaebb743857aa1ef9b.tar.gz https://github.com/kubernetes/kube-openapi/archive/50ae88d24ede7b8bad68e23c805b5d3da5c8abaf.tar.gz -> github.com-kubernetes-kube-openapi-50ae88d24ede7b8bad68e23c805b5d3da5c8abaf.tar.gz https://github.com/kubernetes/kubernetes/archive/a22f9fd34871d9dc9e5db2c02c713821d18ab2cd.tar.gz -> github.com-kubernetes-kubernetes-a22f9fd34871d9dc9e5db2c02c713821d18ab2cd.tar.gz https://github.com/kubernetes/utils/archive/aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz -> github.com-kubernetes-utils-aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz https://github.com/fvbommel/util/archive/db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz -> github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=90eceaa8601bd1754d1b085962e6e9cf
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
new file mode 100644
index 000000000000..381b0fc647bd
--- /dev/null
+++ b/app-admin/helm/Manifest
@@ -0,0 +1,102 @@
+DIST github.com-Azure-go-ansiterm-19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz 20757 BLAKE2B fb024665eb8d49579b9ae67f706e524dfedab3b0f212f18516ba720e5f5d991609fb3a37eb6c960881d4dfeb83a001c8a345de222978222f276232a742a55224 SHA512 a70922a199719936c0d7801a5750bd6893f5e119bd7c592af096d9d82a3f4aab859649126eae60faf70a908e8a28c0cb7b54e8288365276eecf7ce8c6dabdbf4
+DIST github.com-Azure-go-autorest-d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab.tar.gz 105565 BLAKE2B a6db0d05102de0ff49470de5c8936d6f327ccd65c92bea6e7e7ddc0b4f15fc8b2baccc0aa929ccd8b4ec0b07e42f15ffbcd49e22e88eb2e334c193daf78e2256 SHA512 2e6992dbdf57f9d87d3e0525b29b0423e0678caeb699cc3b332b0942d8efb9ad79140b1b72ffcf649ed5d40d44210314e70dbf65484f456933bd12dc0e07ec52
+DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
+DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
+DIST github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz 3384 BLAKE2B 5eb9bb3c88a3bee70cd64f30afcc039f2f43b68be23f39c72f9091765388229a8f5bdbfba8d11d1916d18e9c785e15959c000337461e44940df0ea40ecce40db SHA512 b877b8b0e67f300ed9773b32593a1edec2fb6df3b0d5026cc7b67490ec9a4cb0d9630fb30dc3dee6b7081f81c3fbf1399809c4bb171a5afab665ff93a9f3a034
+DIST github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz 15744 BLAKE2B c5ebbc22c9d995a9bea44742bdc513dea977276d43306f1c9edd2c59eb9844c1e6f304ba4fa5f340b6052abea5294314049bd9055154af2d6f3e2ddac3d6cdaa SHA512 321734efb1dc3d7c6e5795c991511340330c0ecd44571f84fe6d5f6e36945c68b3fe2c47c8bceb4c80d0eaeb21b7a2e45f856b65e942a74434e1f28892120460
+DIST github.com-Masterminds-sprig-6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c.tar.gz 39054 BLAKE2B f730fe75f18e1706e9c15db3ff37ca63e8c66276595b6b6dc253b1f0d23859944e2b4d633ba2e4c64def17454e4dd2535984c4f39c786393318a829f9769b2ec SHA512 04f6d5e969b9c4dcc9f2ca40c3f475c09ecb0f7f196736d4e5fde384fe8f79227334b9b3299449024b639fd740c65c08b8b0c63427def6ccf7462e5844f3dfde
+DIST github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz 27278 BLAKE2B 072014886aba809af343bd5b5a2cf21ef95a5712ed80662f62591fb58dde6e71f075d74d93b755845cab571f510ce1e59b0cdcbf61fd8a485738acab14345c29 SHA512 77a2d594f7da607c9c1502e9ad64414c177450a40853d6928c690df2ff6adce0fa79627ea437e07e7459b1956b00db9d1fb8b0e08bff2c0e2c1f98420b36ee53
+DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
+DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
+DIST github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz 13236 BLAKE2B 2d3e63d314dce19c07f056fc2691595e0509819c244393964a4f792fc6b0512dc9989cb147aa6c174504034d30548cadddc6f42c0d0001e46153c35f394335c7 SHA512 1276f5284433e748b870215c11422cc632fca84d3d05466374516ecaea135e9595240a93d5b2e2e9bb4846ef3c2523452a876d369f0c7316a3e1a7b2a0370e41
+DIST github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz 35759 BLAKE2B b9406a926df5f8b27e27711ced93c9749a0d69c35f1d65c1edab7682fb039741e3825ee62f5b08bdf62d17d2373b17c974ed2653e39cc8910878a94f81b1331d SHA512 c7e5d4497201398cdb2314f8f863d717f91d52815da32abc3d3a1af00ca35696d612c64b1c2a862eb3822f555e2df5a671f2e446be7f5b5cce0e8153b9a5e878
+DIST github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz 10440 BLAKE2B 99000b207d72067f49d17d6a4370c2a4d6f5f4bc0d74eb805811e3927e00f6cb5bad71a4d60f20582fac6998902e695793a2a0a3bc34bfd8586a69cfb67bace8 SHA512 36a53a1a253bf9a62bf0f48be19a1af55c210eceadb7439bbd39444d65c6a809c1fc871136cf357ffad57b2031662d9b2051651e6a48d739d7654f9ddd953edf
+DIST github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz 3393 BLAKE2B a63a65e8dac54a2220aed0c23024b0c2897c72f172f55c9ba319cd913bfd3f8be87935735e1b42c96f6f7abedde09c84b5eea4adc1fca0b13c018276d52eb04a SHA512 b6e5eb124d073a22e6177b80dfadc835baae69ea88061d761b0ccdbe28f43614d74ce11025fbe8b8d9fd63107606e411b1f6305e8ecc28e9038dcffa3b78e0d3
+DIST github.com-cyphar-filepath-securejoin-06bda8370f45268db985f7af15732444d94ed51c.tar.gz 10815 BLAKE2B 2fdb7af9f8b31a5bfea7b71a2c1dab85b4cff869fb04639c0fe8d0c0ce48f978a1cdf4ad09d64e3d28b307509a145166276de91245421e9219903f90cad7b17a SHA512 8d16b30049d66d8fcbe0f248d9eca2fde2782538b7246f84e9f7d5471d39929a530a0d0661826c4a6096f9ef1641f3e3e6e2ff740a2c7496fa3e0a9a34d89650
+DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz 42385 BLAKE2B 6c9addcfc48296c3c19b47a6187501de588889468c5ebd616c1603d2b2dcf9686524574e9fc8e53f9a033aa31f69b96aced8898429a01c9bc8585916aa97843e SHA512 3d48bc77e250cbb48db5d9a1a22b4f8bba708170fdc55cc99d9bf2470f6864d095990154506b15fca19afe41a60f9eae6886201d4371e02dc97c148421a6eadc
+DIST github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz 33510 BLAKE2B 71d08f6e4c6b3684c5f3aaef503f326c63b1b68f7ea9668ca252ded573b337fcdfe972ae22d63ec9068a78eed6ca9f069f3b9c619bfbcec4fd1b3317796d7191 SHA512 dcfa6d84c6be331e6f22e9ef304c54a97b4227b1474fcc4f7dcb533a78d43649c0e82e24c9860154fbe48c676af9ca20a84622487113bc68ca44360d7c8311aa
+DIST github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz 1769777 BLAKE2B 235216295ebfcf61e6fe3cd8f81ac66a0bfd9a67da6b8c6ead4c778e0fcd7ecb519bbb67711d502f5f253a4e98604fba3b055458931ab7a03b4d61fb380c8169 SHA512 05caa27ac0c8e16c7a7c1d0de0f3c0f560be51d0bf5f487f370a0b99971f88e3134448a2fd34af694f124f60515ce38923686ca4fedc8141c5bf4d74f85b0141
+DIST github.com-docker-docker-4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz 6364312 BLAKE2B bd4cd06f9a98bf83285f3047e899d175b61bf5c33b272b3f592f4e4811b99f977b64eed5551a318b6449ce85fa3365a8ba425655efbcd496b02eb29ef8c9d322 SHA512 6eef641e3ca214686521c50ba0eafb6d4424b076db1048f995a3bf4d597247e52a74e0f2d866b6eaa67287d5dc01a6df9baa7cab9705b76afbeaf8d0a867484e
+DIST github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz 29802 BLAKE2B 60514b59195e988e236db3bac4e3a75991ee24d2e4fc404f60d6dbc332479d91564e30d7f3e8080bc251aaf532be47f242b2ee06c6c44668d14f52db9985d96d SHA512 67e1b3bdda441127e2aa72a3d7552e9a9477324db35d706c0ea84fa37953ad50b4770eb49c6cb56b9765ff57f9a47e8313941d29527224cbf587a6856d0762ca
+DIST github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz 11094 BLAKE2B efc28ea5f3db552cacd9c48d7ec4de65a4f50a9463ac964d98782d62ae8c6103c119bf443d3219a39e0ed4658228a04b4a388c29ee38a05ffc3c78c25456abf0 SHA512 baf231424d453bf889e8614c54cf28f0f37f8b8e06e841c2b42ef82729afc4036018b1ca0116da33a8452a2d2345bebef5e8c66be489896db813abaac79d668b
+DIST github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz 35378 BLAKE2B dab00cf2ff22077187532a66abdd609a9101a0ca4b0fb6bcd31647e72dc491ba6ad2c2f82d3780d687dc8a95c3f499bd457abc7ca4b98cc0d08c726f13d58593 SHA512 754efd869559f96eb244a603bf575e1b439d8aa4ad34485121c76c4900150ac8a81f7fcdde4b2af49bcd317eba2212ed60a16a10cff973c9f87516bf50ad0d2f
+DIST github.com-evanphx-json-patch-944e07253867aacae43c04b2e6a239005443f33a.tar.gz 10453 BLAKE2B 9aa008b347c27a66bd6fb84c4ee219bddb71dc8063975beb7e8d2d01b41589e9f9caebf81c878ae1122ebda9afffcc0d242ae29c69b25e33e0b1a773f764da7d SHA512 34b0aba157e3b51ff88bfecf55dcf1119a4da86a5dfa3e4ffd802d693691dfaa02c238a34e4fd32f668aca801af60d50eea13b95724946b4f66f29de4b9dad6c
+DIST github.com-evanphx-json-patch-94e38aa1586e8a6c8a75770bddf5ff84c48a106b.tar.gz 13162 BLAKE2B 6367f3dee190d32d6f8d7a86f5928d738aec24aec85f41c896fa1bc896a62e9ed68700db7b23fd5285bc85254e0c5b9c9b675debfe47513650b9e1cc748797fa SHA512 481945473f954c9e2a618bfd95687121d28ea33e46c360adcf2c9315e42f0b655da65d544740bf38a14a2e02dfc799036da210b9925cf25a622ecdc1c9ec8948
+DIST github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz 8224 BLAKE2B 8997719d55e4c051d7addc41bffbb11092df5dbfbcb35de6cbbd464c8232661c714bcf83eb652143b6cdf5e868b1df233d23c17c0341399410bc4f18d3188158 SHA512 1db86023b693c41a2bb80ac3e3a26f54aeb741b417ae2af81f5d4ca44772ba45a02cdb2c928cfcaca425212717ac3501b627a39fa5794b41d93976ba65c24602
+DIST github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz 2994 BLAKE2B 2c684342854093e6fea90287d6cd2e56cd5e180f2e452a9d56a73d0c51df3649bb3c15771b6274a200cd1928424298cd119ea3849f279f3a6094fd84e6a73c18 SHA512 a27f645aaeb46891568f1ea0223fae23d00a46918947446fa9e452fdb0b5d1f20bef543ba0be536f586eccd23e0bb413a33bc74b932cc05c6fcb74aa94ce80e7
+DIST github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz 18976 BLAKE2B bfdcc567253a24f882f5e524ad7516356024f8d0a1f81958161cc9f450438d26f6df8d5db55bf9e9fb62b88a2339e09cbb4b0594fbfa8ded12c4cf3c72034eff SHA512 e2faaf999792a930991cb99b8bea916dda5a4d0ee8503fc597581a1caefd9835e513555844d7d8a7818dd3b17fb532dd2387b9277fd4adda34fa7881f397247a
+DIST github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz 11681 BLAKE2B 324d15744ed3c966870108c6a55ad41a275c05457738dcf9be94e8be5c0a17d198a3347b858f788ec60ca1dca0bf0d5b65bca7010aac49cee90fe199f22bf5db SHA512 b8b3d46f3b3a6bb7c59db4623a44c938d6e9ccf521fe271342778261590c5f702af743a845c29d17d4e8c83e7c68228a7c93e3f43af536d6239ea6b4cfb7d2e0
+DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb
+DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac
+DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a
+DIST github.com-go-openapi-spec-1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz 83793 BLAKE2B 48404746fb453ca8b2da12a14c89c2ca96f326be17c023bd5c7f9a53b4fc20ab4e68affc7896aff7fcf213ce788a8ca8500f4588a3288f301d50194dd0c52d1c SHA512 8798188e5037d1b28c4376c05776c107ffca09a4932ce5936306fc7a87d3121aaaf810c3dbabbba8ff20e52ed665e00df30061199b5ef1021e2fc974455830aa
+DIST github.com-go-openapi-swag-f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz 25710 BLAKE2B 4ea4a7ebe3193b3da07551bf0bf78750a467ab18fb80fdd2c37be25c31252200f1e414faf37876a0b43ec6dbd56526713a83b636cd713b909538e777973ef02a SHA512 6450fd254866eb541c903a007c573666334cbe5d93aea5281d83c1f81896eb2dc0d1c5a55ab11e4d4683749c078c39603d6ef1b4f2b0e7a3719ba1286c075e47
+DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5
+DIST github.com-go-yaml-yaml-670d4cfef0544295bc27a114dbac37980d83185a.tar.gz 61351 BLAKE2B 78103165ce41b2185f103d62cffc0fbc410aa05928a574b0cba2caa9e2f3d2868dec8f8220657e01edd4b86eb33e412512dc8b4275c918e6a55dc2d240720657 SHA512 d7ab43b219828773ecb8fc5be0a52ed83c9c8e195bd318e68fb741b487c4ec20847f04e828737196360fca7f62ff04839c676ff6cc181890d725bea457342ce0
+DIST github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz 25955 BLAKE2B d6c9b20f80800396ebc3eba2b08ad48522d297bd0da90ed32d6ea2ea4e575e9feea112513332a3c55bbeae2569770433466536698084e787127866efaf0d25c2 SHA512 e5767898e8aaeff59219e0a0578586b63717d5c8507c74ecb813e8e8a7b02470b10df0452cc378c7f0a4b9bec030be22deb3c3ce7c5ae88fd739271cf05e36ad
+DIST github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz 2444654 BLAKE2B 592a01beb3b9ab843786768f97c6e416ec1d167f1afc27ec1a60921b6ed038052190adedd97b635390a2386488c5a080b01d438dfa5a3fb87966b238e091b978 SHA512 97957c4162e542f0cbada090a38220e33e107259a68ad6b4453a593e7add4d725ecbd18a61506062d27d61a697654a2ef1a0b7410789275b20f20d42a704c459
+DIST github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz 213923 BLAKE2B a53b177f8b31b8927b923c5bcfc4ee4a1f48725e6652f38e20bcf1147a646411771bde259ed7917ad12913734375f880e7c4cc9b49b370e738928286b432a877 SHA512 903ded0a887db7a6b6783bea7d6af82087449ff05ac34367f3472f23c80965a4f6b4883e6983e57560a80a6b81eecbf285729d4c38b505cf1e99274d1d87c1a7
+DIST github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz 1431151 BLAKE2B 09738718227b69635d6cab53397f3ba09295a683e7b8175829259381b232a8e56f4035710a2882c7edfbae61d94f673aa3e7301a343d1b1938413023b3c9f823 SHA512 ff5eaf61e7dc133a56a90d100c4b48fd2775145b457febdd1eb9ec39c15ce6bc73665873bbe658d6b4bb94a008d7246317d751a41b5a62b43d2055ed3cb01e02
+DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
+DIST github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz 25244 BLAKE2B bbfd67b7c9d34fe1cddab77a372fc53c899424122c46dd637186bb571e1a12dda7f0d6991bb5ad85cd0162803832e5843af6b184f861fa5dd1ac0a5cd8c7ed86 SHA512 e7ecb5c64bbb9e1fd2555ed496abb1e65f836b8017f21010dc853f8c527826eb6c315744ce991725d85e3500a6c877b3f25ba22090584c4c75dec6e6cbdc938d
+DIST github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz 916090 BLAKE2B d6e9cd2d0a0cdb59fc38f3ecbefddd289b3d78cc88c4b558c90ac27f75db7e59004d277e4194e5c9a0d56b5daa98e6e85d291f59ac79df314a53d803aa5a296b SHA512 40c070ab27ba31bbf0f0555e2b90b12100246caef36d7bf48d543e432272b0eca6e0deaf49e1e31ff6974b06d6476924818862a9243a8646d0f38b344a09633c
+DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a
+DIST github.com-golang-protobuf-1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz 268489 BLAKE2B 76035d1202d11428885d94937f1616e62441f83a3af46de0c0b8a17227b9e6a04fa8161269ffd1894992e6b5a914848dda66f1b7f9f91d5f1a4a8b45ecd08fb7 SHA512 adb706f73ce1a0a9d369a556258494913f1760c2ffb509797330768d112fb4f70b55d80db59d41c933b27aa862a6c044a9d6d2c5de95f540b86a46a0eec99901
+DIST github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz 771129 BLAKE2B 592e1af8d74e77807a65901b576bebacfca5b2331c6943031720a873bc7782ef35cf3300e5307c79164ded89394df97e7342f73168f4e2354b13cca9260785a8 SHA512 96d1b7254d16c107a5496766ddfc2e56b56a31fe9c4bd34c23ee814911036145d8327203302fbdcb6bcb9af1022073608ea123c6df661132392ecb611e427c96
+DIST github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz 4604452 BLAKE2B db401ddda5fe4ad1504a520707fb19053b36d99a3c47101e682ce9be8aaf7e216af586816cde01a3328f09d02e9d3c8adec35ea1f74299106b47853102de9206 SHA512 c613d40866803ea36cc43507fdd33dec8581bc6bf0bccdc53efac2fbb1f5903c94ffeea6deb18928fadb09aee673648d322bb7b8db34a7f630500248cc9fc87d
+DIST github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz 9005 BLAKE2B 5ad1988c9bd3a632ea4b248e32f6223a79d54b68b1c95bddcace042c22c20d3aee6192bf3d72def729292ed50e4d423935c3ec7004398e03037f91b7f401fd77 SHA512 65a69bfc6044de4ecacfad1c9c8add6312745bd2ba3dc46f522f1e7a424aac49b5e18aca60f8daabc340d50d73675cd5c06de9441060d86009a092feb4f5c9f7
+DIST github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz 11748 BLAKE2B 997de087a8e0a8a97668e954f1f8ab5ac5aefb32a8fd303b13fb2e062594febe1326716e91e6433fba5e88e22fd9e30ff6168296b1d563c3d49a43b054552c77 SHA512 9cba507c12bb1a7434411290b44457b9ad9421c2a6c0b78670e0f1bc641b7c302c7bb0a92af747954e5caf3d8c15dbf820522fb468a7e40088eda764477493b9
+DIST github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz 954349 BLAKE2B 563f54c912499af269379e4d21b82cdb6040d363d327c9ca88aab8609a68b33d5d7e591346cd4f15544a347ce9a6648a5668cf327b556410e31c0e7ebdca3eea SHA512 d1c62a01e1cdd1e4f60603fc873d781f78a3a0b6ab0f43a028853911f80c6303b1aa2e9e7be4868f89068c7d20e5c4363df8e035a260f7d9b472e66b1c4566c4
+DIST github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz 12668 BLAKE2B 01b0f7b14690c4c2b45d789773e4cd8bfd3e94d66ad08b43bd06511535deda5b6b3ea611ec1023cefbf272153fc37cffabeb45d714d72ded6fb95cba77a47ca1 SHA512 312a5a60e11c3dffe9099a033a4f2349d6caae14139e9b6b25429a42bf3f88dde08dd81c2443f2a7ec44505c990d50e059002e0d81fa105bd68c2a221bacb557
+DIST github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz 12733 BLAKE2B fb29066f37f5f7d6aa5c7e0cf4a90b9b16de012d809034aaaf10ed4a43b5941e68c8925fe991ce5b25fde56995e8e66317fcab2caf97a722b12cc03825190488 SHA512 d3c2b411793681cf5b55438e3ba23512b6edbc48677c2efdbaea02d226519690525aba848cfde45205dafa39fda9f2868960b39f744aec80222b61dc42b77da7
+DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz 300660 BLAKE2B 7f3bf228cdb0566d0226daf05fd107f79b135ceaadc55a84a30d5d595a2254282bc33646284ab48e0459d48abc977f30957df8c3c9bab26c435c611e81ec6e0f SHA512 0c888ba583a7320ff0b3e55e7543b96ce4f16069bdd3c6319cbbbd36325fe28e96c1464bcc989aa3573021f9a8644d692ee943cf9cf9fefe391ba313e76e1136
+DIST github.com-gophercloud-gophercloud-6da026c32e2d622cc242d32984259c77237aefe1.tar.gz 514142 BLAKE2B 6ed841cc143be653a75af99b6d68f10410c957752a7f2fd315b744df5d492da0e1ad4083620b155a374fdf647739685d31b1fa9c8940dd6c692abb89127ad684 SHA512 0341f076ef430d544a15302269d16a788a1e47a8f2e35c01cf9c8fb9f710b58d3a3e5554429f5e747406484d7d7682e46590e5575bfa3b90f44b7a89ebf78f9c
+DIST github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz 6864 BLAKE2B 71816efd7996458a90b192780fb720b9a0f7ee8bb01df6d1fa0e079ee56a426310f632839e921ffb89403145e63a34e90e985099221c4253bdc1c316f1aed37c SHA512 7cc647e6347258b9fc455cda220da8f59c3ea92f975369ce5901289102d5db8c45ea6fe24a587cc4dc95a502c4fc203c3503f9db0c427cca702418478eb25f25
+DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
+DIST github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz 20764 BLAKE2B cb5d2ef073be0df0b185cede4c4fd924d160a4beed06fe6ed748734865272ca958cd69208684492932cd4ecb5b36c07413cd0cda3fa43ac4cc1b0e8337407eb7 SHA512 6b8b8b980ee9b98b7508045c4dfb5be38dac586d0bc2fb3b9118824336e8a32b2428265e9aac427bea68cb7ed5079cf1ef910de284862b1845f05c23e09dcbc3
+DIST github.com-grpc-grpc-go-5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz 334844 BLAKE2B 6b1025e0248b427840eace218538e34a21338990436a74f6e7c29da7415ddaa343a262b8f9b87a2f6c82d91d66dc192465a8ab4f283b4427f63e0bc98020df62 SHA512 124bf026d11a15aeb512f94807765e0b8f12815f551eaed14d634e0966122c1b18c0b9a2e06330aa6911ec9d923ae2e9e88ecac94d77874bc2ff850f2708fb0e
+DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995
+DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
+DIST github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz 16077 BLAKE2B 876bad301ff0e8074442a7f375533113c93d5f58d61969f7455a3aa653d2083fd9abccc0410a8c46325328c4616d1beed2cddccd379ce21fbf4a8bfe8c322cac SHA512 3100ead162c3339b07786ae40a27c880ec9309b4dd45af94d686cacaa85f0cd41d87e3509103789122fdea787e501235ff5f9c770fb1d3df50f1dedc80629359
+DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c
+DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
+DIST github.com-json-iterator-go-13f86432b882000a51c6e610c620974462691a97.tar.gz 101395 BLAKE2B 336dd30f7906023e87f835df12becacd8e3e4c0a57b4897b277b4bb04272440257ad150268d5cfb4ed69665f1a168d919d7a746b1da00691afe9e7669f6f3a45 SHA512 8497d6578a78ef575834350c2eba15d11ef6273c472cda9016181c044e034ea002d4039b99852a9837425c791f199d121b19edd701b9a9c47c19a155a19baa81
+DIST github.com-kubernetes-api-8b7507fac302640dd5f1efbf9643199952cc58db.tar.gz 681931 BLAKE2B 3c26af4d821fd63157d522a63371c168769c3bccb5ae02ea484554fc416f405932e8d534f109cc6b6ac233393ab99a06456abf65b4896a44f635f033a12d0b32 SHA512 006b8b4be9611550efbf258d3960060bbdcf12cad1b35104274f92fab94aa7f568dd88a901d50020c9ba63662318c1cd63d04e7b5dbabfb23dfe72d0153f55d7
+DIST github.com-kubernetes-api-c699ec51538f0cfd4afa8bfcfe1e0779cafbe666.tar.gz 681854 BLAKE2B 036aec7004f00fa62b9e330d52a427b945b9455a55049f6c6620110374e1928aee66d31d82dee97d264d231f8c83b52e91f6ed5ed9953e57ab86f31d586b85e8 SHA512 66dd666c5cd0eef845eb1c31ee051cacb7b260f68804b5b58482bc5565693b4072dba7aae6fea9e58ba3729428eae2d03bf89b8a8b6b624f67ecd43f561d045b
+DIST github.com-kubernetes-apiextensions-apiserver-898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz 6322992 BLAKE2B 18d636098012e2fac47bbed778d4b1e2c6b6c996044aa46d429e9297a8cf6504ddf6126098dd879bead50dfc22cdb3a46af062234b486a4574f10b841ed04f59 SHA512 a8a0ec14df38cb25c09b2800da1ed6cec66ebf38e42cd883e2c0852181a7ad7fe5ac4b8e618fc5a6adb168f2fb822db80e0fbd14ba008e041182394599c41ff0
+DIST github.com-kubernetes-apimachinery-54101a56dda9a0962bc48751c058eb4c546dcbb9.tar.gz 446533 BLAKE2B 709ecdba91821a3533d85ab73a6392ebaaa549e4fe78b9d0510bb987e275a174e621ec92c4ec38cd137f60922b8f2a81fc093e18cab9fe050bffdf5d9deb576f SHA512 97ba85121dcf5b7effce14d2c5e2d67597afeb1d438ed450396ca94d46dfcd5be772af300d37d339e5ef39408fead8b8f77731a0823a270d0ee44dfb7b88e671
+DIST github.com-kubernetes-apimachinery-f6313580a4d36c7c74a3d845dda6e116642c4f90.tar.gz 446523 BLAKE2B 5d24d4dab4999714d1fd205b34358661eed4a3c0bbf83b08118fbe11d3024cc1ff5e9f0470acc80050a7f809dc8cf21cba0264e5a1ee011a6ad4768514cd4df8 SHA512 0f97dbd621fe197f2f640b1692ccebe687347585b5885f1f366aaccd92f6c2fc08ed7bbdf84ff13c3c597cb60f3b062dccc81e659684d5352394f97ecc025846
+DIST github.com-kubernetes-apiserver-ea53f8588c655568158b4ff53f5ec6fa4ebfc332.tar.gz 1128422 BLAKE2B 21897cc3baa81ff35fe04fe8e13a652e9f308d04043d49756e2a144bafc61063758fff7c51dbd795f8c395824df51656d5e58626aa52d3c7bb1c66ec18287139 SHA512 6ba081a066ec9e31623345a91df4dc85216576b9c945f4e514790a944451d082d72ce5c5599beb6a3bdb55114cdc118f283a35276de85e78190698dbb560be98
+DIST github.com-kubernetes-apiserver-f7914ed3085badf66a1b6f3a5218ada28f7bd084.tar.gz 1133144 BLAKE2B 0660bf2ac97d14c5eb99161d466821c5466ab143e9aa3da076239ddabd4e0d48ad0aa410ebae4b777719dca93e7073e9a228697e758df1eac9288ee2bc022226 SHA512 737047222f6a10c0437957cc63a97ee1f7b6d5406eac5ca8e012b49bae1ef23c9ffb69c8e39674d7fb3a47b70740e01ee992bd60a10531436c3b2d2f82164515
+DIST github.com-kubernetes-client-go-23781f4d6632d88e869066eaebb743857aa1ef9b.tar.gz 487299 BLAKE2B 3f40b7173a62414dddb7ada2d21b9cbc541e4bdeff9ad8cb501cde47af49859540a1c2af1992ff2dea2bea7fd93f02f9e932b7f6ca5a2078d68807cb46496040 SHA512 b1482dee5a512aca81c901a031db9d7e26875560ebacfd8b5a70ab78ae7b7941bd39e7b0cdbdff2d759e5c8f15909ed16f8bf993d2623d849198e271d27ea139
+DIST github.com-kubernetes-kube-openapi-39cb288412c48cb533ba4be5d6c28620b9a0c1b4.tar.gz 88363 BLAKE2B 32330bc4a8c31e21662ebff637eb3f9594db2f22e824c7b90437b6bb54708227b3c9b25deb077972b18f0d63014fd5feda609f790cd578a5cc4b53fb30109412 SHA512 b28d72a7ce8229da2bca4a4d35d951fb383035e54ef7c1ad1669ccde546040f39f9b1024d9bc9eed9f56517e91c3c8b8c6b61fa49f938c13169ddabfe9862ff8
+DIST github.com-kubernetes-kube-openapi-50ae88d24ede7b8bad68e23c805b5d3da5c8abaf.tar.gz 88141 BLAKE2B e96d61f9c784e4428723d1dc28315f2400cdc2102b10178c8a93cbb4fa56e1b07f5a34671bc75e17d5d028ecb0b0661abec6edb86ab33e385b72388ba593cd24 SHA512 37aa7397a8ff203ba53931f19b676c996e3712145f1729ba8a1b7981295049783912d49ce83bb932ccd0ffadd4d1ebe727a1b7118f4d411b44148ef649d26ad6
+DIST github.com-kubernetes-kubernetes-32ac1c9073b132b8ba18aa830f46b77dcceb0723.tar.gz 25047883 BLAKE2B efbd9c495139f9711167491b16339edfba653ae84c6c5957bb6e8070f60b7029be6aacceffe202f44dc4519676fe34e0d191bf8a15794db31d43fe067cb48955 SHA512 061eaf34bfc6d9af8bc129b8a8736f3c66b3826307d334ddfc221dcba453ff92a18c0e79ade7b2c5112caabe3bdaf4c473b3b5ba831ee5860ecbb20959ee7f3f
+DIST github.com-kubernetes-kubernetes-a22f9fd34871d9dc9e5db2c02c713821d18ab2cd.tar.gz 24697736 BLAKE2B 8d735570cdb30bb3d833fabb6a6f5c7d5d458ddbfc5d3b5b6f40748129aca13878ad3cfccc70d6e601f62233b88be2f5b040ac535e0971e1c2a3ba1b87f69f4f SHA512 06d05f214c5d6a839f04eef655f66b225af8fb32d514e7b81d75d5f7656de418e8ce3d91a3acb860f1aaa6b64570843f516be9f59d0a5cd4ed955b340debe6af
+DIST github.com-kubernetes-utils-aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz 13650 BLAKE2B 7ef52334585300d4faf98a02324380ba5dcdaf708b8027ca9fdae43d0b0a43c5d495162f1e69d4f9f9b8dbc2e22dfaefd66eb479bace78bbbfcf84145613c174 SHA512 91f525cc68ec01f394da926eb3fcd7bd95b62609721c86f22c02d852b42913eba659a97bb9ceb19f4b6aab5a967e5f385d732b81284871c82c740fb102a09368
+DIST github.com-mailru-easyjson-2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz 70478 BLAKE2B 19c135401f34f8a8285c8bc315e6197c156de85fe9f4e65de7b71fbb73e37d57031915c2632930d5e76bf01e9038ba380150bdc78ec2cdac959e2cdb9571bc11 SHA512 319a7bd61ae490353a939a412dd00ffed9b6acd55bb739e8c259caed7904ec3407493888798addf89a15474053e125abe8818618240a55402b4351270cebfbdb
+DIST github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz 5884 BLAKE2B 62f6d7217043f77a41e038c3f69c4fd20f71a9b203b29946b7dea5b9ddbcbb08b83ee40533c73cea681700c04ce2f15361eb43f6c9e86bff85318792e12f0968 SHA512 15e7ccac112c78e4fc8fc06f32c6b5864a945b0cea885856f12ab694020adef0af92b0f6a0d5e873891c3f68dfa0dae4c1f2de1ac7946ce570b155e6c5286d84
+DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
+DIST github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz 2740 BLAKE2B 10127381356aff4d25d3b5da3d2db5f4565c8e5c4e16ffae18e481fcedc0616039cf3907fdb3c204d5f743bb5163bf437d549dea9fd46cc9141d8ef88cb36e21 SHA512 39cd6786782e3a29ad448db3ec815a6da029bc22fbe543fb04e0e869d8b4a698f20434bb24c09bd18b5d2cdb992fc28e21b7ae16b3e585412cede7b4eed2b26c
+DIST github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz 18386 BLAKE2B c484694b778f0e71b94628ffebcaff6fec311f033540d2a27202b8e1bc6224b1a48a8670f6f7ecf10bc2f406a9cfed98f0c9565215e4a297786f041e940996d6 SHA512 3061c0372815652836db5245519ec2b0a2f71eac1af7c23a419edfa64063e6f39e91a1aae2ee1ccf1e97a96de620e15684ee660f9039e694c7b9b4ffac27879d
+DIST github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz 136692 BLAKE2B 99eecdd38938c9ca5febb494e1a102ae60fefa9b8074ca9422c7b10295caa09a50f66dd6a02c6c8bfc61513d23144ba660f383684c077caf5791111ec1c9c92d SHA512 cfddcfc6863fc9ee9fe5ea59ed0da8bce7c8299117155e404f135b4ed2f7cec00881b8d70273a865ab84a0bed601f191f328b357b7c50d204016e81ac8c47fb5
+DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052
+DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
+DIST github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz 11345 BLAKE2B 9f25872e040b5e0602e658fa728e93a300c00ed1064966370e1b676eea6a94d6bca491b2f6c33a9f2c4d1c522a3ceee540aede2dc638eed238de8485500821e9 SHA512 fa82643f622150b44b198451c1e41e042fd7ceefad9d68e32238d48c9a29c6fb14780fca9d9a7dec660365062d4089c638196960fac056b685e7543410774228
+DIST github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz 75589 BLAKE2B b739cbfdbdc070aeae55f25d263ae74fa07cb4af0b8d7b9504ccb954c4df7c8bd40f6e2392f16f63cb0f3f41c282e16655ab0d04ffddab241e3472cb6ef04faa SHA512 5fe34c1cbd9aee1d1e50424aec83a1e72d834b25208e35c1af8b30519f6db26a6d54adeacf40006f4d04539c1d2e8f577641c8d796314cd71e9b87b20847b2d7
+DIST github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz 54855 BLAKE2B 2a7fd47a9e1dbc794f5de84d5ee3512b282f5f94d044dd9b471ab5ad138ebf2940c4441e6b4d89404f3443f0ba466fdab8fcf58c92d9c85798f23b5a0c57a6fd SHA512 9d4d52142888edff091f23496aad70ab2924dff3a27930cb6df81c5452ca897b9d61eff74fbd092372ecb4bb005b4d362ea6b0602e1764ea4f2a30e23048a81d
+DIST github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz 58775 BLAKE2B 05173a41bfaa944e2096b4360e0974f921934b6e6ec8b34cb7322158cabaa73e60ab091d4a5bcc9696b29995e7f71bdf55cb832af140a153452cf66c85c9a3cd SHA512 9d4a937d12a738a7802102415cb061e0009ed43f901420560637e13f7952c26dab52e67011d8b1f8ffe474e223198a23becb65a6eb07cee1be9f6b1add566fd4
+DIST github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz 34890 BLAKE2B f0284354e3782e07371825b3fd6136a5fc516dae97218c90ac333ce749f87b435a55c6545691a7b71f90b98563fdba5f96c238007ee8187d98297edce1124cd5 SHA512 47cafa8b7a4f9496e1cfd6e2d24ae882ed3ac21a2417eb2ece2cfaa2e391d32b60d2ec8c3860988d8fe3af8bfa6d1430e938e5da1331a7e1df2828753dac82bd
+DIST github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz 69591 BLAKE2B af6a9dd3e0a9186bb6f96b73faf03ce69d15083fd664f212cee1aea8288094dd9a3a158da07d4a27a44a0c14f03fab50837f3cb517b0727b77ba8297651805be SHA512 616af6fc95fc5e4825413ec6590fded0cc837af3887cbab814828ffe9a55f27d212f0a67080b867d7051cca2a45266da8f8886360249451fd983cefd340f0023
+DIST github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz 1941 BLAKE2B 7ef4ed22d34a9dbc56396a0b04fdf75e5384f941588116a44ecbb7b19f070fb2f4930b93b364b97c784e3f0a60832a9ea4c8d2007623548f12c93928cb36682c SHA512 06b8bf3f8d89a93c565de9b4219211ad08c91b2442ba31ef8bffa02c7ee823ae4f57ed8b39b4ac1eb326e5d12c65b56b16833c28fc97623c732bb6ea685a3c2a
+DIST github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz 28245 BLAKE2B 2f37d14ee529db80301ffcc2c9c88e18cb21b0398333e5528494d143006ec9adc1ceac31d0de3ad30c30c442354220393fccf13fec251ff2cb27994435242f87 SHA512 85023d0442b05ac280d67f43443cbbd40cd4e21da10a6fc9f6f9395fc53e730c73591c9f5a74b910f4190fd8f52843836049ab62fc388bfd8e60338cdb1297a5
+DIST github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz 71311 BLAKE2B f908877fb77bbc63a213647f068966f771cc2d299fad21da2b7b096b3253102c9f334f8709960a33841a2b441fee2b9ddb23bccd1fb745268fa41303b25b50f2 SHA512 69ed1d5202af46c685821b914f8ca8bc77b9bfbcfb68a2f388f141d35fc2e673f27bf99d5f9dff285f974a363aa0f3fed1eaacb19910dca080c6e1fa388dcb38
+DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
+DIST github.com-square-go-jose-f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz 278276 BLAKE2B dfb467b318f0a6661c5ae910f32bc5337d9677ff60b55dea4706193b4acb815f7e087debc92cf9347ae54db13f512c4a2dc1cc05ea031201bf119caaffa6c6e7 SHA512 4230ba34fe8f45ed7e4a0f7ffc60781b1b4fbaa6877212a8d5ab5a8b088d0d3151f76868929e270c5ca71769ae366976a25de65716e8c0e6289a4f720055f02f
+DIST github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz 7860 BLAKE2B 947a33bd0363cfa5333e4e41b59c8c758fab173bb9e0eef5560caca74f4321041ca69f6c2c5fe02ab36c8946038866033d8df9b7f9ed36be9f3fb1eff6dad182 SHA512 8b372ceba1a16acc8553c74d4872b042ca352d4128abc1e9f4aeb90f8489b7871d7fa7f97a6c4e8f472779d3a082f00e6d2ea30048a7b1bf4eb07fb544e45613
+DIST github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz 7897 BLAKE2B a2b6f62fea8cb724ebbc9658e37985ed27fd1c395a838b6f8f89bc3e05106cd3e89b86753223bccc50de210461c89b01d8e3095ae1c6dcb6bc9a655c462981f0 SHA512 460b1cbef7d5236b099a67b27e902f9077fd42d6aa3772c13c1c3ab20fca87719a770478a068bf150e1224612fe4e1eadb1ec7cdfa60ca9cc81e3f6de62ee9c4
+DIST helm-2.10.0_rc1.tar.gz 1151238 BLAKE2B a33fa6c547824ae1497e04110e9f3d74b1ab4bb6e7e1b7a598e8756ed76993bf969ae3d066d5d006393ea095e75c06b3ea5d8ef360111a2804bd5ee63b8b1bff SHA512 05b40169c0c0920cdb339a17526f080db25bde095c89415d0229220c0e19fca05e60cbddc7d3f66f5e701c52417d76251266bceb7293327985912510bb03b2b7
+DIST helm-2.9.1.tar.gz 1136941 BLAKE2B 57e319df56d60b1285df99ee6c0213e9700b80aa4117f11ab3e37493d552481875a42acd200d2183c2e587dc13130b9c47cbacee7dd7bfeaaf4dc9bb0a17dcc5 SHA512 c9830ae3de76e219dc4effad749fa6f80d24f47f034bd7150afc5817700947b678db64a0889fe1e3c3c69ed0932933ebf9bb893c065d7d77c2953190ab15b033
+EBUILD helm-2.10.0_rc1.ebuild 8581 BLAKE2B 4398d05cd3dacee15e455549013f383b397b81147ad4e0ab1fe565b977bb3f3973b2aed098603ff7b33ef06efba225efb054178f8ac8e63922d4788da29a8118 SHA512 f9de15ae8b44f1b9ca941c0ed697e76b832c59d05f0a8b10f1c8f99266bd5e79e4253e4223b62fef466f86b040e90404160da7bbccbd37fc2ceeb4472557b3b5
+EBUILD helm-2.9.1.ebuild 8410 BLAKE2B 266d13ec9488fbc344e29c577238d5980d10a8c6094cb6f41c6127065ff7b899bc609b530bc0cd87816d71424492c87634848ce26002954a09fe60aa99578e42 SHA512 b21df5a0c6f9a1d13404a128c1466301848216386c74e143a04f1567bac648efaf727d22ac7cdb1a943c8edcdaa3ed3b5cc440c8cd664ddaab803514b4ba44c8
+MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4
diff --git a/app-admin/helm/helm-2.10.0_rc1.ebuild b/app-admin/helm/helm-2.10.0_rc1.ebuild
new file mode 100644
index 000000000000..dc1a3fec1acb
--- /dev/null
+++ b/app-admin/helm/helm-2.10.0_rc1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+MY_PV=${PV/_rc/-rc.}
+
+EGO_VENDOR=(
+"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
+"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
+"github.com/Azure/go-ansiterm 19f72df4d05d31cbe1c56bfc8045c96babff6c7e"
+"github.com/Azure/go-autorest d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab"
+"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
+"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
+"github.com/cyphar/filepath-securejoin 06bda8370f45268db985f7af15732444d94ed51c"
+"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+"github.com/docker/docker 4f3616fb1c112e206b88cb7a9922bf49067a7756"
+"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
+"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+"github.com/evanphx/json-patch 94e38aa1586e8a6c8a75770bddf5ff84c48a106b"
+"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
+"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 1de3e0542de65ad8d75452a595886fdd0befb363"
+"github.com/go-openapi/swag f3f9494671f93fcff853e3c6e9e948b3eb71e590"
+"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
+"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud 6da026c32e2d622cc242d32984259c77237aefe1"
+"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
+"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
+"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
+"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
+"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+"github.com/json-iterator/go 13f86432b882000a51c6e610c620974462691a97"
+"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
+"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
+"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
+"github.com/Masterminds/sprig 6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c"
+"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
+"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
+"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
+"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
+"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
+"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
+"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
+"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
+"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
+"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
+"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
+"github.com/spf13/cobra f62e98d28ab7ad31d707ba837a966378465c7b57"
+"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
+"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
+"golang.org/x/crypto 81e90905daefcd6fd217b62423c0908922eadb30 github.com/golang/crypto"
+"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
+"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
+"golang.org/x/sys 43eea11bc92608addb41b8a406b0407495c106f6 github.com/golang/sys"
+"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
+"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
+"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc 5ffe3083946d5603a0578721101dc8165b1d5b5f github.com/grpc/grpc-go"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/square/go-jose.v2 f8f38de21b4dcd69d0413faf231983f5fd6634b1 github.com/square/go-jose"
+"gopkg.in/yaml.v2 670d4cfef0544295bc27a114dbac37980d83185a github.com/go-yaml/yaml"
+"k8s.io/api 8b7507fac302640dd5f1efbf9643199952cc58db github.com/kubernetes/api"
+"k8s.io/apiextensions-apiserver 898b0eda132e1aeac43a459785144ee4bf9b0a2e github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery f6313580a4d36c7c74a3d845dda6e116642c4f90 github.com/kubernetes/apimachinery"
+"k8s.io/apiserver f7914ed3085badf66a1b6f3a5218ada28f7bd084 github.com/kubernetes/apiserver"
+"k8s.io/client-go 23781f4d6632d88e869066eaebb743857aa1ef9b github.com/kubernetes/client-go"
+"k8s.io/kube-openapi 39cb288412c48cb533ba4be5d6c28620b9a0c1b4 github.com/kubernetes/kube-openapi"
+"k8s.io/kubernetes 32ac1c9073b132b8ba18aa830f46b77dcceb0723 github.com/kubernetes/kubernetes"
+"k8s.io/utils aedf551cdb8b0119df3a19c65fde413a13b34997 github.com/kubernetes/utils"
+"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+GIT_COMMIT="aa98e7e3dd2356bce72e8e367e8c87e8085c692b"
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
+
+	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
+	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+	popd || die
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN} bin/tiller
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-admin/helm/helm-2.9.1.ebuild b/app-admin/helm/helm-2.9.1.ebuild
new file mode 100644
index 000000000000..7b1e12736337
--- /dev/null
+++ b/app-admin/helm/helm-2.9.1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+EGO_VENDOR=(
+"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
+"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
+"github.com/Azure/go-ansiterm 19f72df4d05d31cbe1c56bfc8045c96babff6c7e"
+"github.com/Azure/go-autorest d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab"
+"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
+"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
+"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+"github.com/docker/docker 4f3616fb1c112e206b88cb7a9922bf49067a7756"
+"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
+"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+"github.com/evanphx/json-patch 944e07253867aacae43c04b2e6a239005443f33a"
+"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
+"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 1de3e0542de65ad8d75452a595886fdd0befb363"
+"github.com/go-openapi/swag f3f9494671f93fcff853e3c6e9e948b3eb71e590"
+"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
+"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud 6da026c32e2d622cc242d32984259c77237aefe1"
+"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
+"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
+"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
+"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
+"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+"github.com/json-iterator/go 13f86432b882000a51c6e610c620974462691a97"
+"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
+"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
+"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
+"github.com/Masterminds/sprig 6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c"
+"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
+"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
+"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
+"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
+"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
+"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
+"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
+"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
+"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
+"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
+"github.com/spf13/cobra f62e98d28ab7ad31d707ba837a966378465c7b57"
+"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
+"github.com/technosophos/moniker ab470f5e105a44d0c87ea21bacd6a335c4816d83"
+"golang.org/x/crypto 81e90905daefcd6fd217b62423c0908922eadb30 github.com/golang/crypto"
+"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
+"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
+"golang.org/x/sys 43eea11bc92608addb41b8a406b0407495c106f6 github.com/golang/sys"
+"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
+"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
+"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc 5ffe3083946d5603a0578721101dc8165b1d5b5f github.com/grpc/grpc-go"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/square/go-jose.v2 f8f38de21b4dcd69d0413faf231983f5fd6634b1 github.com/square/go-jose"
+"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
+"k8s.io/api c699ec51538f0cfd4afa8bfcfe1e0779cafbe666 github.com/kubernetes/api"
+"k8s.io/apiextensions-apiserver 898b0eda132e1aeac43a459785144ee4bf9b0a2e github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery 54101a56dda9a0962bc48751c058eb4c546dcbb9 github.com/kubernetes/apimachinery"
+"k8s.io/apiserver ea53f8588c655568158b4ff53f5ec6fa4ebfc332 github.com/kubernetes/apiserver"
+"k8s.io/client-go 23781f4d6632d88e869066eaebb743857aa1ef9b github.com/kubernetes/client-go"
+"k8s.io/kube-openapi 50ae88d24ede7b8bad68e23c805b5d3da5c8abaf github.com/kubernetes/kube-openapi"
+"k8s.io/kubernetes a22f9fd34871d9dc9e5db2c02c713821d18ab2cd github.com/kubernetes/kubernetes"
+"k8s.io/utils aedf551cdb8b0119df3a19c65fde413a13b34997 github.com/kubernetes/utils"
+"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+GIT_COMMIT="20adb27c7c5868466912eebdf6664e7390ebe710"
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
+
+	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
+	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+	popd || die
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN} bin/tiller
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-admin/helm/metadata.xml b/app-admin/helm/metadata.xml
new file mode 100644
index 000000000000..0eea3165859f
--- /dev/null
+++ b/app-admin/helm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kubernetes/helm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/ide-smart-1.4-r1 b/app-admin/ide-smart-1.4-r1
deleted file mode 100644
index 4efac5ac414e..000000000000
--- a/app-admin/ide-smart-1.4-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=A tool to read SMART information from harddiscs
-EAPI=6
-HOMEPAGE=http://www.linalco.com/comunidad.html http://www.linux-ide.org/smart.html
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.linalco.com/ragnar/ide-smart-1.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d0f607d1c25207382d2d553e52394d0c
diff --git a/app-admin/ide-smart-1.4-r2 b/app-admin/ide-smart-1.4-r2
deleted file mode 100644
index dccf333134c1..000000000000
--- a/app-admin/ide-smart-1.4-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A tool to read SMART information from harddiscs
-EAPI=6
-HOMEPAGE=http://www.linalco.com/comunidad.html http://www.linux-ide.org/smart.html
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.linalco.com/ragnar/ide-smart-1.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c601b31ef31a42bfa1ce5800003d9948
diff --git a/app-admin/ide-smart/Manifest b/app-admin/ide-smart/Manifest
new file mode 100644
index 000000000000..ead0b6dbe7ce
--- /dev/null
+++ b/app-admin/ide-smart/Manifest
@@ -0,0 +1,5 @@
+AUX ide-smart-1.4-fix-build-system.patch 280 BLAKE2B feac0eeafdc202a7f0074c6ca8c102f5602bcd1b9ec734e605d122464c9e782db1efd502677d415b1620090a82b5ee70755e25bf478700eb6b89d059a9ba5bf4 SHA512 7b27a8842d0ac7834d660f1ef46563a210a37e737c469cfae0ec07d18ae6fa523b6482f8fcba3f63247742c86215e01a35294ea664a416e7ffa92184c91b8c03
+DIST ide-smart-1.4.tar.gz 19739 BLAKE2B d9c94b53855628ea10ea563f709754e7f79e50d43e24f76ac3c6dc9b5bdee81a547e63c4583c3506cc899c7e761b59dfbea6bb121f39053cefcac20a984b8d3b SHA512 9ac5cd03b67731aba5371ec9edb3aabb7d3e3b3680552b14741106d8d5ffe5a1705ad379dd8df60b972f3e23f66ed35b98341544feb4b856912138ccac109660
+EBUILD ide-smart-1.4-r1.ebuild 691 BLAKE2B 365faf918071ed12a596f8cf029c6b9fdb5e76dee3e6dc0c0ba11fadf868aa2ab7c8ed8af06aa25b559e6a65f71dbecd606b9e3065aca481d8db49bfd679285e SHA512 6a54fb402a507937358b6ada716caf88e9335dd02c83cee489bb2c2dd026521361a2df821a1bea13dbd025929d318036ec1648135dbbee703b7c9e9d07f13ae1
+EBUILD ide-smart-1.4-r2.ebuild 578 BLAKE2B 3e2a0f1117551cf82bb72af0f43f942ecf50aaaf624f772860f290cd708c5c6da12fb30c7a3eba05cbed211da60d7dbff94ede73a4e6b37c240e78425240e830 SHA512 73367fa4439efb9d52688da838416762119314f7545cde96973c1e14cb090d0497f4f8391bd9398cbbff0d8a15ad9fe409fb77fe341b4dae1fd568cb805571a8
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/ide-smart/files/ide-smart-1.4-fix-build-system.patch b/app-admin/ide-smart/files/ide-smart-1.4-fix-build-system.patch
new file mode 100644
index 000000000000..ad523e36b3f9
--- /dev/null
+++ b/app-admin/ide-smart/files/ide-smart-1.4-fix-build-system.patch
@@ -0,0 +1,17 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,13 +2,10 @@
+ 
+ #CC      = gcc
+ PROF    = -g0 -O2
+-CFLAGS  = $(PROF) -Wall
+-LDFLAGS = $(PROF)
++CFLAGS += -Wall
+ TARGET  = ide-smart
+ OBJECTS = ide-smart.o
+ 		
+-ide-smart: $(OBJECTS)
+-	$(CC) $(LDFLAGS) -o $(TARGET) $(OBJECTS)
+ 
+ all: ide-smart
+ 
diff --git a/app-admin/ide-smart/ide-smart-1.4-r1.ebuild b/app-admin/ide-smart/ide-smart-1.4-r1.ebuild
new file mode 100644
index 000000000000..5ffb6e04cbb2
--- /dev/null
+++ b/app-admin/ide-smart/ide-smart-1.4-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A tool to read SMART information from harddiscs"
+HOMEPAGE="http://www.linalco.com/comunidad.html http://www.linux-ide.org/smart.html"
+SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4-fix-build-system.patch )
+
+src_prepare() {
+	default
+
+	# yes, the tarball includes pre-compiled
+	# object files and binaries
+	rm ${PN}{,.o} || die
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin ide-smart
+	doman ide-smart.8
+	einstalldocs
+}
diff --git a/app-admin/ide-smart/ide-smart-1.4-r2.ebuild b/app-admin/ide-smart/ide-smart-1.4-r2.ebuild
new file mode 100644
index 000000000000..d6ec39958880
--- /dev/null
+++ b/app-admin/ide-smart/ide-smart-1.4-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A tool to read SMART information from harddiscs"
+HOMEPAGE="http://www.linalco.com/comunidad.html http://www.linux-ide.org/smart.html"
+SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} -Wall ${LDFLAGS} -o ${PN} ${PN}.c || die "compile"
+}
+
+src_install() {
+	dobin ide-smart || die
+	doman ide-smart.8
+	dodoc README
+}
diff --git a/app-admin/ide-smart/metadata.xml b/app-admin/ide-smart/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/ide-smart/metadata.xml
@@ -0,0 +1,5 @@
+<?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/installer-0.1.1_beta b/app-admin/installer-0.1.1_beta
deleted file mode 100644
index 6753c701445a..000000000000
--- a/app-admin/installer-0.1.1_beta
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A software for Gentoo installation
-EAPI=6
-HOMEPAGE=https://github.com/ChrisADR/installer
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/ChrisADR/installer/archive/v0.1.1-beta.tar.gz -> installer-0.1.1_beta.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=049422e998c0d1ab0241318bcf70717c
diff --git a/app-admin/installer/Manifest b/app-admin/installer/Manifest
new file mode 100644
index 000000000000..706920095904
--- /dev/null
+++ b/app-admin/installer/Manifest
@@ -0,0 +1,3 @@
+DIST installer-0.1.1_beta.tar.gz 49946 BLAKE2B 845df010036446e65479affc3d901fe114248130627ce76583c42adc9ecf9c0e2585600106c1559c8d3dac8c086553fed1d48d00002ede9e9be509fc98632662 SHA512 940272cefed17bd6c370fe26b2941da611cbd0aa8fb1c7f51bfaef483c7f9189f10754fb7e3d84dc099ac687f4644e24ae22e7ec09c41f39efba30d5743c9163
+EBUILD installer-0.1.1_beta.ebuild 512 BLAKE2B b93b2f2fcd04f5a1780586bd031dafa942093605a531020e29531c81541589ce4f584bdd2ad738e78fd09bc356de295cb3b2fded1b4ade719a430b0e4928d02e SHA512 19698b48f8d34be506c2386473f3b552498ebf8283c6e4b09297612aa952c5c758ac0a4524262bde471ed703a2199be1a1b153e97dce1823a443749df596eb7d
+MISC metadata.xml 650 BLAKE2B 85405d55a8203f929a0a11864b7df6ddb9763160da824a1a1f037c1ea3e52f3a1fd1540316142f47af0ed575f90deab90fc71a90085ac1ba3f571954d079f541 SHA512 d1c0b0a1fe0b4aa0fb00595d7c46c73254ee22bd801b81a9895e176a0577ae64174dd587bacd3ac5ca17fe6c56f771274d508f9249a990608e6b515bc8aabef2
diff --git a/app-admin/installer/installer-0.1.1_beta.ebuild b/app-admin/installer/installer-0.1.1_beta.ebuild
new file mode 100644
index 000000000000..17bc218aa0e4
--- /dev/null
+++ b/app-admin/installer/installer-0.1.1_beta.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_REQ_USE="ncurses(+)"
+
+inherit distutils-r1
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A software for Gentoo installation"
+HOMEPAGE="https://github.com/ChrisADR/installer"
+SRC_URI="https://github.com/ChrisADR/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+DOCS=( README.md CONTRIBUTING.md )
diff --git a/app-admin/installer/metadata.xml b/app-admin/installer/metadata.xml
new file mode 100644
index 000000000000..b6fd5038e019
--- /dev/null
+++ b/app-admin/installer/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chrisadr@gentoo.org</email>
+		<name>Christopher Díaz Riveros</name>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		installer is designed to aid users during the installation
+		process of Gentoo Linux. It is capable of walk a beginner 
+		user through the regular installation process following key
+		topics from the Gentoo Handbook.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/integrit-4.1-r1 b/app-admin/integrit-4.1-r1
deleted file mode 100644
index 28615898a0f1..000000000000
--- a/app-admin/integrit-4.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=file integrity verification program
-EAPI=6
-HOMEPAGE=http://integrit.sourceforge.net/
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/integrit/integrit-4.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b1d9df4ebf481d503dd38340af3625d7
diff --git a/app-admin/integrit/Manifest b/app-admin/integrit/Manifest
new file mode 100644
index 000000000000..83a96c76cac2
--- /dev/null
+++ b/app-admin/integrit/Manifest
@@ -0,0 +1,4 @@
+AUX integrit-4.1-fix-build-system.patch 1169 BLAKE2B 36b13162ea3a583968bda35ece1b4b1cc83871d4c2352ebcbffd079a9265d84b15e72d5e93f10e2404cd26e0622c666cb8b60e1cd53f207f0149a55814e10477 SHA512 4ed15ee8383e280b2d16d353f3401a058ad03c4ad84e4d0932ceec74391e04d266c2468270d2a08d299c57ee105f504c917fcf04b4ac07639bcba42e0fde84f6
+DIST integrit-4.1.tar.gz 271626 BLAKE2B 538a34c8e5c00e1be66ba35095be4d61402372ea7fd9ba9bfff9149c9a82c43d625ffb345fe84b7561100b31f2a2a1ba319e8b9a7d2b78e44a81d1ed6ae64f3a SHA512 599ae66a193fd87971994f59422e148e1ae01a5ff0fea93a0f2555c972f5254f0213116950766e72c87a57b1bd490f04afd3e0557d25a366c41dbbacc80b6842
+EBUILD integrit-4.1-r1.ebuild 1264 BLAKE2B 208f5ff74d53a189f7eabd131e3f032cff73d467e4622d317148d9a17c4b7db55335815ec6e59ba85794794bac1bff901dbd7d21b04e32ea0714fd3c7c54d5f1 SHA512 8cbb22064be0107ae5fa363185ccdecf347e7078a0d455d0af8af59b504282005816c1c52e3a01999568bb39a89e30043c48c556b6e78579c25dbc72afe8a5f4
+MISC metadata.xml 245 BLAKE2B 8edad0fa1051f1c6b28fa61e95cbde797389dcae4a23b953e0b77198a5557e068e09cdb6b2e32ca4e25ea07789c406529094d25fa74182656a4c59f4f7a42178 SHA512 e7052ee3572f1a5546b02087b7de95803a2e8b023aa24bc701eebb0bdd47b294d9634f4e78abfa10764e88397a067b1f1f8e431cddf5f8b260693f56ebd88b8b
diff --git a/app-admin/integrit/files/integrit-4.1-fix-build-system.patch b/app-admin/integrit/files/integrit-4.1-fix-build-system.patch
new file mode 100644
index 000000000000..64b3d47e59f8
--- /dev/null
+++ b/app-admin/integrit/files/integrit-4.1-fix-build-system.patch
@@ -0,0 +1,43 @@
+--- a/configure.in
++++ b/configure.in
+@@ -26,7 +26,6 @@
+ 
+ # ----- you can override these values by setting environment variables
+ # CC=my-compiler ./configure
+-CC=${CC:-"gcc"}
+ # CFLAGS="-g foo -x bar" ./configure
+ CFLAGS=${CFLAGS-"-g -Wall -O2"}
+ STATIC=${STATIC-"-static"}
+@@ -53,10 +52,9 @@
+ dnl AC_PROG_LEX
+ AC_PROG_MAKE_SET
+ AC_PROG_AWK
+-AC_PROGRAM_PATH(RM, rm , rm)
+ dnl syncing is the job of the O.S., and users can always do "make; sync"
+ dnl AC_PROGRAM_PATH(SYNC, sync, sync)
+-AC_PROGRAM_PATH(AR, ar, ar)
++AM_PROG_AR
+ AC_PROG_RANLIB
+ 
+ dnl ---------- let users override the install that configure finds
+--- a/hashtbl/configure.in
++++ b/hashtbl/configure.in
+@@ -25,17 +25,15 @@
+ 
+ # ----- you can override these values by setting environment variables
+ # CC=my-compiler ./configure
+-CC=${CC:-"gcc"}
+ # CFLAGS="-g foo -x bar" ./configure
+ CFLAGS=${CFLAGS:-"-g -Wall -O2"}
+ STATIC=${STATIC:-"-static"}
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+-AC_PROGRAM_PATH(RM, rm , rm)
+ dnl syncing is the job of the O.S., and users can always do "make; sync"
+ dnl AC_PROGRAM_PATH(SYNC, sync, sync)
+-AC_PROGRAM_PATH(AR, ar, ar)
++AM_PROG_AR
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ 
diff --git a/app-admin/integrit/integrit-4.1-r1.ebuild b/app-admin/integrit/integrit-4.1-r1.ebuild
new file mode 100644
index 000000000000..bac0fe23c099
--- /dev/null
+++ b/app-admin/integrit/integrit-4.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="file integrity verification program"
+HOMEPAGE="http://integrit.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${PN}-4.1-fix-build-system.patch )
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	mv hashtbl/configure.{in,ac} || die
+
+	# tests are not executable
+	chmod +x test/test || die
+
+	eautoreconf
+}
+
+src_compile() {
+	emake
+	emake utils
+
+	emake -C doc
+	emake -C hashtbl hashtest
+}
+
+src_install() {
+	dosbin integrit
+	dolib.a libintegrit.a
+	dodoc Changes HACKING README todo.txt
+
+	# utils
+	dosbin utils/i-viewdb
+	dobin utils/i-ls
+
+	# hashtbl
+	dolib.a hashtbl/libhashtbl.a
+	doheader hashtbl/hashtbl.h
+	dobin hashtbl/hashtest
+	newdoc hashtbl/README README.hashtbl
+
+	# doc
+	doman doc/{i-ls.1,i-viewdb.1,integrit.1}
+	doinfo doc/integrit.info
+
+	# examples
+	dodoc -r examples
+}
+
+pkg_postinst() {
+	elog "It is recommended that the integrit binary is copied to a secure"
+	elog "location and re-copied at runtime or run from a secure medium."
+	elog "You should also create a configuration file (see examples)."
+}
diff --git a/app-admin/integrit/metadata.xml b/app-admin/integrit/metadata.xml
new file mode 100644
index 000000000000..fa14c9a7ea90
--- /dev/null
+++ b/app-admin/integrit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">integrit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/keepass-2.38 b/app-admin/keepass-2.38
deleted file mode 100644
index 7599b62c1a13..000000000000
--- a/app-admin/keepass-2.38
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-lang/mono app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=A free, open source, light-weight and easy-to-use password manager
-EAPI=6
-HOMEPAGE=https://keepass.info/
-IUSE=aot
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
-SLOT=0
-SRC_URI=mirror://sourceforge/keepass/KeePass-2.38-Source.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e051d8e91b7713454d1f76e57104d526
diff --git a/app-admin/keepass-2.39.1 b/app-admin/keepass-2.39.1
deleted file mode 100644
index 57076664f077..000000000000
--- a/app-admin/keepass-2.39.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-lang/mono app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=A free, open source, light-weight and easy-to-use password manager
-EAPI=6
-HOMEPAGE=https://keepass.info/
-IUSE=aot
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
-SLOT=0
-SRC_URI=mirror://sourceforge/keepass/KeePass-2.39.1-Source.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e3b851df940e57fa81a0340c992c8627
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
new file mode 100644
index 000000000000..8bde63ecefd3
--- /dev/null
+++ b/app-admin/keepass/Manifest
@@ -0,0 +1,7 @@
+AUX keepass-2.36-xsl-path-detection.patch 1446 BLAKE2B 15c9d15b44b0748bc114ff45dadb5824f369a454a1126cb61293d55f86f9f01fb659932729dbc205a522aab32343dd87b74662927d60edc50750af602a959cc9 SHA512 6e1279363bf355be8846c012840271525dcbeccfaa9dc9d1bc4b39068ed58dae4fc421fed4f0fd5d0d2311436d35648f04539fa122066222cb15a66c3383ceae
+AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb747a2f09a64f63360f95df12043a97262fde8fd1b6882fe86d07d4ec483cf30788391be8f940 SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb
+DIST KeePass-2.38-Source.zip 5091900 BLAKE2B 22e3f7046984204a3e0c4a1c6d8303661048bc0fee4bcdb7999b521d0ed6e5463d89044d2897cfec0c932349cc80a7b43d4c8dfbceb4f2e88041c642e0c0d231 SHA512 42fa7274874d4858da360a6772eb25adbf3a6dafe375093459d9a25903d8c159360ea722e969fe8b330bccf62ee5d381e131bd0ba075445932d8019eee19bf20
+DIST KeePass-2.39.1-Source.zip 5109228 BLAKE2B 0b1214ac70d3d615e029c89abe63176f31e29a3fb800d84b6102220d2d39ebba848e3100e85e6f3d5cd4965461c68798ba880d5b229e8f8e6a20b0d65c2c632c SHA512 9f2b5f6c86b00932f132f8eea24fc35f08c217ed3feb047afe585592761f5297b76140c3154fb519dc5c9137718227a0bc4b6a45d22d1eb0ac95d08c73a70314
+EBUILD keepass-2.38.ebuild 3037 BLAKE2B 3fe5b971d8336ffdc3f9b520ac3c4530cdee3555c3e20cf7658ddb6fc874b28d1ee5710d76de2282128e83c84f05b5b2435db657e9be278ce4ed7ea107b6829a SHA512 f2f473c7fcde5e11711c3519c72ad78f2853ac6e7c242da2be9aa34e74e8d7962e2416e48a827b5a6d6e9b6f91314b426e662cbdc2e01e9c2d8e9331120f10a7
+EBUILD keepass-2.39.1.ebuild 3044 BLAKE2B 9585f72e1556fd9d033ee8dafb3a6baeca0e1aad2c318367f6dcadb102a0557890e422679529b3f3d61ebdf5120a49eda13553326f5b5a919d6245edeb927e77 SHA512 143239c46dc87d69859beaf7b3ef621d4793c6341871e7c325058529b00c4a1a5da297b42d1e4dc0788eb7e80a2b27d47f02bbdd9758050aab1615f02de8245d
+MISC metadata.xml 651 BLAKE2B 058fa70fb6ce35fb52464a84cf506ad117343a1376a40b003c4f55bdf94369136276d8bbb67f30490eb73cba4df6b03d78e8c2a65cf8141dd6cf64654c9b6358 SHA512 6251f546e631decbc7692ab00900d722031ce638f3d878771a2bcfebedba8e1fee9b3e54dfd4c3ae3c711006099fc5a772555ea7cc018d012de164755ba8b52c
diff --git a/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch b/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch
new file mode 100644
index 000000000000..c17b654d3f35
--- /dev/null
+++ b/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch
@@ -0,0 +1,43 @@
+KeePass looks for some resources (XSL files) in the executable directory,
+however under UNIX system this not a good idea, so we look into the
+CommonApplicationData SpecialFolder, which usually maps to "/usr/share/".
+So the final search path should be "/usr/share/KeePass/XSL/".
+
+--- a/KeePass/forms/AboutForm.cs
++++ b/KeePass/Forms/AboutForm.cs
+@@ -31,9 +31,11 @@
+ using KeePass.Resources;

+ using KeePass.UI;

+ using KeePass.Util;

++using KeePass.Native;

+ 

+ using KeePassLib;

+ using KeePassLib.Utility;

++using KeePassLib.Native;

+ 

+ namespace KeePass.Forms

+ {

+@@ -98,8 +100,21 @@
+ 			m_lvComponents.Items.Add(lvi);

+ 

+ 			lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);

+-			string strPath = WinUtil.GetExecutable();

+-			strPath = UrlUtil.GetFileDirectory(strPath, true, false);

++

++			string strPath;

++			if (NativeLib.IsUnix())

++			{

++				strPath = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);

++				strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);

++				strPath += PwDefs.ShortProductName.ToLower();

++				strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);

++			}

++			else

++			{

++				strPath = WinUtil.GetExecutable();

++				strPath = UrlUtil.GetFileDirectory(strPath, true, false);

++			}

++

+ 			strPath += AppDefs.XslFilesDir;

+ 			strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);

+ 			bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlFull);

diff --git a/app-admin/keepass/files/keepass.xml b/app-admin/keepass/files/keepass.xml
new file mode 100644
index 000000000000..5e3d80dcae7b
--- /dev/null
+++ b/app-admin/keepass/files/keepass.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+	<mime-type type="application/x-keepass2">
+		<comment>KeePass database</comment>
+		<glob pattern="*.kdbx"/>
+		<icon name="keepass" />
+	</mime-type>
+</mime-info>
+
diff --git a/app-admin/keepass/keepass-2.38.ebuild b/app-admin/keepass/keepass-2.38.ebuild
new file mode 100644
index 000000000000..4b997c59a7eb
--- /dev/null
+++ b/app-admin/keepass/keepass-2.38.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils xdg-utils
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="https://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="aot"
+
+COMMON_DEPEND="dev-lang/mono"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-dotnet/libgdiplus[cairo]
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
+
+src_prepare() {
+	# KeePass looks for some XSL files in the same folder as the executable,
+	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+	# This XSL file will not be upstreamed since the KeePass creator said that
+	# including this patch would break the Portable USB version of KeePass
+	# (which keeps/looks for xsl files in its own folder)
+	default
+
+	# Switch into build dir so the mono prepration script works correctly
+	cd Build || die
+	source PrepMonoDev.sh || die
+	cd ../ || die
+}
+
+src_compile() {
+	# Build with Release target
+	xbuild /target:KeePass /property:Configuration=Release || die
+
+	# Run Ahead Of Time compiler on the binary
+	if use aot; then
+		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
+		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+	fi
+}
+
+src_install() {
+	# Wrapper script to launch mono
+	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+	# Some XSL files
+	insinto "/usr/share/${PN}/XSL"
+	doins Ext/XSL/*
+
+	insinto "/usr/$(get_libdir)/${PN}/"
+	exeinto "/usr/$(get_libdir)/${PN}/"
+
+	doins Ext/KeePass.exe.config
+
+	# Default configuration, simply says to use user-specific configuration
+	doins Ext/KeePass.config.xml
+
+	# The actual executable
+	doexe Build/KeePass/Release/KeePass.exe
+
+	# Copy the AOT compilation result
+	if use aot; then
+		doexe Build/KeePass/Release/KeePass.exe.so
+	fi
+
+	# Prepare the icons
+	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+	# Create a desktop entry and associate it with the KeePass mime type
+	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;"
+
+	# MIME descriptor for .kdbx files
+	insinto /usr/share/mime/packages/
+	doins "${FILESDIR}/${PN}.xml"
+
+	# sed, because patching this really sucks
+	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if ! has_version x11-misc/xdotool ; then
+		elog "Optional dependencies:"
+		elog "	x11-misc/xdotool (enables autotype/autofill)"
+	fi
+
+	elog "Some systems may experience issues with copy and paste operations."
+	elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-admin/keepass/keepass-2.39.1.ebuild b/app-admin/keepass/keepass-2.39.1.ebuild
new file mode 100644
index 000000000000..e1e03bb233e9
--- /dev/null
+++ b/app-admin/keepass/keepass-2.39.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils xdg-utils
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="https://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND="dev-lang/mono"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-dotnet/libgdiplus[cairo]
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
+
+src_prepare() {
+	# KeePass looks for some XSL files in the same folder as the executable,
+	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+	# This XSL file will not be upstreamed since the KeePass creator said that
+	# including this patch would break the Portable USB version of KeePass
+	# (which keeps/looks for xsl files in its own folder)
+	default
+
+	# Switch into build dir so the mono prepration script works correctly
+	pushd Build || die
+	source PrepMonoDev.sh || die
+	popd || die
+}
+
+src_compile() {
+	# Build with Release target
+	xbuild /target:KeePass /property:Configuration=Release || die
+
+	# Run Ahead Of Time compiler on the binary
+	if use aot; then
+		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
+		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+	fi
+}
+
+src_install() {
+	# Wrapper script to launch mono
+	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+	# Some XSL files
+	insinto "/usr/share/${PN}/XSL"
+	doins Ext/XSL/*
+
+	insinto "/usr/$(get_libdir)/${PN}"
+	exeinto "/usr/$(get_libdir)/${PN}"
+
+	doins Ext/KeePass.exe.config
+
+	# Default configuration, simply says to use user-specific configuration
+	doins Ext/KeePass.config.xml
+
+	# The actual executable
+	doexe Build/KeePass/Release/KeePass.exe
+
+	# Copy the AOT compilation result
+	if use aot; then
+		doexe Build/KeePass/Release/KeePass.exe.so
+	fi
+
+	# Prepare the icons
+	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+	# Create a desktop entry and associate it with the KeePass mime type
+	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;"
+
+	# MIME descriptor for .kdbx files
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}/${PN}.xml"
+
+	# sed, because patching this really sucks
+	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if ! has_version x11-misc/xdotool ; then
+		elog "Optional dependencies:"
+		elog "	x11-misc/xdotool (enables autotype/autofill)"
+	fi
+
+	elog "Some systems may experience issues with copy and paste operations."
+	elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-admin/keepass/metadata.xml b/app-admin/keepass/metadata.xml
new file mode 100644
index 000000000000..edf5dcda279a
--- /dev/null
+++ b/app-admin/keepass/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ale@clearmind.me</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>kensington@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="aot">Generate native code at build time, rather than runtime.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">keepass</remote-id>
+		<bugs-to>https://sourceforge.net/p/keepass/bugs/</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/keepassxc-2.2.4 b/app-admin/keepassxc-2.2.4
deleted file mode 100644
index e856c1f531be..000000000000
--- a/app-admin/keepassxc-2.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
-EAPI=6
-HOMEPAGE=https://keepassxc.org
-IUSE=autotype debug http test yubikey
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1 GPL-2 GPL-3
-RDEPEND=dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) yubikey? ( sys-auth/ykpers )
-SLOT=0
-SRC_URI=https://github.com/keepassxreboot/keepassxc/archive/2.2.4.tar.gz -> keepassxc-2.2.4.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3c6877bedd87cd9e25bbf70d2e8b5475
diff --git a/app-admin/keepassxc-2.3.1 b/app-admin/keepassxc-2.3.1
deleted file mode 100644
index e6e5f66761e8..000000000000
--- a/app-admin/keepassxc-2.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
-EAPI=6
-HOMEPAGE=https://keepassxc.org
-IUSE=autotype browser debug network test yubikey
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 GPL-2 GPL-3
-RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers )
-SLOT=0
-SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.3.1/keepassxc-2.3.1-src.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=74b8625ac0bfb0918acb11fd15c974b4
diff --git a/app-admin/keepassxc-2.3.3 b/app-admin/keepassxc-2.3.3
deleted file mode 100644
index eace580ba0e1..000000000000
--- a/app-admin/keepassxc-2.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
-EAPI=6
-HOMEPAGE=https://keepassxc.org
-IUSE=autotype browser debug network test yubikey
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 GPL-2 GPL-3
-RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers )
-SLOT=0
-SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.3.3/keepassxc-2.3.3-src.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7368b4b98720551ebf6882bd48c0da8e
diff --git a/app-admin/keepassxc-9999 b/app-admin/keepassxc-9999
deleted file mode 100644
index 42e9e88703f4..000000000000
--- a/app-admin/keepassxc-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
-EAPI=6
-HOMEPAGE=https://keepassxc.org
-IUSE=autotype browser debug network test yubikey
-LICENSE=LGPL-2.1 GPL-2 GPL-3
-RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers )
-SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=74b8625ac0bfb0918acb11fd15c974b4
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
new file mode 100644
index 000000000000..7dc6ca9609c4
--- /dev/null
+++ b/app-admin/keepassxc/Manifest
@@ -0,0 +1,9 @@
+AUX keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch 249 BLAKE2B 52875492ce10a1ee9c33d213a4c72ac72ffbe9fb9ba46cfb57d7de9d97011643ad9bcf4b106a7cc909c81e55542740c5ad3626789f3d0de12ba48493b43cb955 SHA512 8734ddcbe9f5432939d6d0c1a9c16ef9a192b00efab20bb5f50a1dab12b475090d4028625194978872dd801a0b7ceb6bac4102401b054eeca15054667b9aa9b9
+DIST keepassxc-2.2.4.tar.gz 3895421 BLAKE2B 0de35f394dae8cf8d70f75d73783965826cc03ac9f0921afa547d02e61cb04be167891d92aa0db09f007c47e96a5a7e5793772c50de14bf65a7f80a603ca6611 SHA512 f3308138d63b65a8b384a52f4723507be921d7bbf19031724886fcd12266bf2683326f5531c8f665b0e98ff63cd97251694199ef748191e59a5a8cceb3710025
+DIST keepassxc-2.3.1-src.tar.xz 4085284 BLAKE2B 87ffb8a266056a147e84f97980eb19df64947fc56a6e39733269f4b88287c01dd8508792c22f247b05918f8beb98ea651c3bf91b642f863be2a4742e3e425fd0 SHA512 06c1b42e699b21c0cc2a6e7340649fa8964d8a0c880efad512f3ba16e12ee07a1b2b5ff13e0b3dc8d3f58fdf4f523cee3d1ef477a83ea434d97690dfea0633c9
+DIST keepassxc-2.3.3-src.tar.xz 4113768 BLAKE2B 7c599471b775ff8612968596765d05f2862ae21adc0bb0d595b5366ce55354c156e1df3940549bb955dd9e6609cbebbae3f108ae3eb8ccb0e85c83e9183a60d8 SHA512 155dda3c81ecb3be4638c634fe2dd7f96a54076b371a1f6ab95c33319ff2a50eaf941a1415f42724444749a40d7fbcb3972604199f6a0445df4a22a4bac73c0b
+EBUILD keepassxc-2.2.4.ebuild 1542 BLAKE2B 63efe9d8d0b4f52d74c8b7d192163d731c338585fd9fc00b51af2aeda9d47b17ec8989b292c6c65add2fe09d5172c9f66a9447a7525d50463ce1128ea8d07119 SHA512 9ffed685b6d159f5db669b199b0984af19e90e4ed7759e67f52865a97983533524f3f800d4611a5e4efdf27e0f3cf1d2a177d8f3c3bbbeab0b71fda7fe168cdf
+EBUILD keepassxc-2.3.1.ebuild 1749 BLAKE2B f40cfce681a8fddbbdc39b727fc5d36bf45e533a5cd36d0fbca4853928d27e945bac88a9ef84af0b5c2a3bfed1b2603543584c4bdaafedc9cc003da1afa20869 SHA512 1a40422bb5e84a7f6a57ae72ea8dd1252fbd865fcfc8da243b1a87ca5b2d399bf481ed160726ce30a2cad5fa1de5135c0a7feffd48b1bd7e759d857049a23c10
+EBUILD keepassxc-2.3.3.ebuild 1831 BLAKE2B 89dc950d6e3eb89f316180ba7ad79c44f4ad454bc94dd9539d9d0d6ca3d6e094c67742b64345bf22881cfb176fda2cf9be94712d094e01a071aca64c0c930936 SHA512 fa3b20a12bd648c442f6f8c10baa99aeb983732200ac17d6390bfd987e11c52d2fc6b108741793fcdccad3d35947ce6f398c79797fdb43344629af6cc9896fc4
+EBUILD keepassxc-9999.ebuild 1749 BLAKE2B f40cfce681a8fddbbdc39b727fc5d36bf45e533a5cd36d0fbca4853928d27e945bac88a9ef84af0b5c2a3bfed1b2603543584c4bdaafedc9cc003da1afa20869 SHA512 1a40422bb5e84a7f6a57ae72ea8dd1252fbd865fcfc8da243b1a87ca5b2d399bf481ed160726ce30a2cad5fa1de5135c0a7feffd48b1bd7e759d857049a23c10
+MISC metadata.xml 937 BLAKE2B 21a284b7ee94184c22cdb740d9a24f8371cfb6f62d97361cb3a2f853409b3044e8ddad30f58f4f8ad27277739533972d22c7009808c7ae9e6a1c4b8e02003d7b SHA512 bd2e47e2ba3911323f0b5bee78e9e394edef7722e934c70a1e7d3509044d566b2e6d46fd77bde2c303d0c97a8ce4f756e0b32b476af253274a3a941b059da3f9
diff --git a/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch b/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch
new file mode 100644
index 000000000000..c382db5873fc
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch
@@ -0,0 +1,10 @@
+--- a/src/gui/entry/EditEntryWidget.cpp
++++ b/src/gui/entry/EditEntryWidget.cpp
+@@ -32,6 +32,7 @@
+ #include <QMimeData>
+ #include <QEvent>
+ #include <QColorDialog>
++#include <QButtonGroup>
+ 
+ #include "autotype/AutoType.h"
+ #include "core/Config.h"
diff --git a/app-admin/keepassxc/keepassxc-2.2.4.ebuild b/app-admin/keepassxc/keepassxc-2.2.4.ebuild
new file mode 100644
index 000000000000..9cd93a341e8a
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.2.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" == 9999 ]] && SCM="git-r3"
+inherit cmake-utils gnome2-utils xdg-utils ${SCM}
+unset SCM
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+else
+	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype debug http test yubikey"
+
+RDEPEND="
+	dev-libs/libgcrypt:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	autotype? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXtst
+	)
+	yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+	test? ( dev-qt/qttest:5 )
+"
+
+src_prepare() {
+	 use test || \
+		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+	 cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_GUI_TESTS=OFF
+		-DWITH_TESTS="$(usex test)"
+		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_HTTP="$(usex http)"
+		-DWITH_XC_YUBIKEY="$(usex yubikey)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-admin/keepassxc/keepassxc-2.3.1.ebuild b/app-admin/keepassxc/keepassxc-2.3.1.ebuild
new file mode 100644
index 000000000000..69a100508278
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.3.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org"
+
+if [[ "${PV}" != 9999 ]] ; then
+	#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype browser debug network test yubikey"
+
+RDEPEND="
+	app-crypt/argon2:=
+	dev-libs/libgcrypt:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	autotype? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXtst
+	)
+	browser? ( >=dev-libs/libsodium-1.0.12 )
+	yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	dev-qt/qtconcurrent:5
+"
+
+src_prepare() {
+	 use test || \
+		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+	 cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_GUI_TESTS=OFF
+		-DWITH_TESTS="$(usex test)"
+		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_HTTP=OFF
+		-DWITH_XC_NETWORKING="$(usex network)"
+		-DWITH_XC_SSHAGENT=ON
+		-DWITH_XC_YUBIKEY="$(usex yubikey)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-admin/keepassxc/keepassxc-2.3.3.ebuild b/app-admin/keepassxc/keepassxc-2.3.3.ebuild
new file mode 100644
index 000000000000..3641f74e736c
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.3.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org"
+
+if [[ "${PV}" != 9999 ]] ; then
+	#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype browser debug network test yubikey"
+
+RDEPEND="
+	app-crypt/argon2:=
+	dev-libs/libgcrypt:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	autotype? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXtst
+	)
+	browser? ( >=dev-libs/libsodium-1.0.12 )
+	yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	dev-qt/qtconcurrent:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.11-edit-entry-widget-includes.patch" #655844
+)
+
+src_prepare() {
+	 use test || \
+		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+	 cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_GUI_TESTS=OFF
+		-DWITH_TESTS="$(usex test)"
+		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_HTTP=OFF
+		-DWITH_XC_NETWORKING="$(usex network)"
+		-DWITH_XC_SSHAGENT=ON
+		-DWITH_XC_YUBIKEY="$(usex yubikey)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
new file mode 100644
index 000000000000..69a100508278
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org"
+
+if [[ "${PV}" != 9999 ]] ; then
+	#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype browser debug network test yubikey"
+
+RDEPEND="
+	app-crypt/argon2:=
+	dev-libs/libgcrypt:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	autotype? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXtst
+	)
+	browser? ( >=dev-libs/libsodium-1.0.12 )
+	yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	dev-qt/qtconcurrent:5
+"
+
+src_prepare() {
+	 use test || \
+		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+	 cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_GUI_TESTS=OFF
+		-DWITH_TESTS="$(usex test)"
+		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_HTTP=OFF
+		-DWITH_XC_NETWORKING="$(usex network)"
+		-DWITH_XC_SSHAGENT=ON
+		-DWITH_XC_YUBIKEY="$(usex yubikey)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-admin/keepassxc/metadata.xml b/app-admin/keepassxc/metadata.xml
new file mode 100644
index 000000000000..ad767a50b284
--- /dev/null
+++ b/app-admin/keepassxc/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <use>
+    <flag name="autotype">Add support to autotype the passwords into other applications</flag>
+    <flag name="browser">Enables browser plugin support</flag>
+    <flag name="http">Add http support</flag>
+    <flag name="network">Enable network support</flag>
+    <flag name="yubikey">Enable database unlocking via YubiKey.</flag>
+  </use>
+  <longdescription>
+    KeePassXC provides a safe location for your passwords and similar
+    data.  It encrypts its databasee with AES either by passphrase or a key
+    file, compatible with a PDA and Windows version.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">keepassxreboot/keepassxc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/killproc-2.13-r1 b/app-admin/killproc-2.13-r1
deleted file mode 100644
index ec79e33b4251..000000000000
--- a/app-admin/killproc-2.13-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=killproc and assorted tools for boot scripts
-EAPI=5
-HOMEPAGE=http://ftp.suse.com/pub/projects/init/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://ftp.suse.com/pub/projects/init/killproc-2.13.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0591b7c828ec605aeb9916fe70a63afd
diff --git a/app-admin/killproc/Manifest b/app-admin/killproc/Manifest
new file mode 100644
index 000000000000..0cad9917483b
--- /dev/null
+++ b/app-admin/killproc/Manifest
@@ -0,0 +1,5 @@
+AUX killproc-2.13-argz.patch 195 BLAKE2B c4d91eba1d2d2a5638384fff6d103babad55061b833ed980a0d36a7f7ebf52d5334a1e344b6b574a5e2191b9d8eec75e0dea6ab8a7226af6b4b3a27fda2d8922 SHA512 a6f4c0fc6b211af04f6e9137f52c4f911f989dffcb20d3c5069ea3716469ed23f08774f8dfe1aa2ce4f1ac2ef828b440fdcddfd8c77fe2891574145af0a02340
+AUX killproc-2.13-makefile.patch 1212 BLAKE2B 3a7d96e7e96b33b19493c68163119c01bbe104d9328c4aba5663d837d7b5c65b31a87178ccdc6a56c6d47b4b71bba03541e9ce07ed4e5734d3bd8484bcb71190 SHA512 c471361ca0fb4e4cb3d2e74c29115cf441b6129c2cbf54540ee7af40e818f1b6df169344c5f44ae8d9a1769aa0bf26bc00d5c6348546e9e37dff5e505b767e68
+DIST killproc-2.13.tar.gz 37953 BLAKE2B 57ee8eab39810a1cc9a0d7a4e53d4912e6288b7b4c41d05fd3b6a241e90dbb2b220792d7bd07691d11cc4ceb264d682ed3c59dda2eb751f777e9caec6c82fd6f SHA512 2ba8daa10d78c7e6df80f6fc5bff24807571bd8bcecf4674c1dac180da5c462b326c1fd45e31b4974937d47871b48c9e5b215a7b323e65d98fe0a66b171e9d2d
+EBUILD killproc-2.13-r1.ebuild 677 BLAKE2B 57c22c7d40e4df66da47d5297591fe80989a152955ead479b5a40e08f71097eb88e3174f39695345819148472559868315d1d78a43170a25b72471eda9192543 SHA512 494ca6278bab48389c5d0a5610637289b911de9ef824561eabe6814a779a63056af6430bf190f1f6ac26a410f26d6af2f10de4eaf726f2ec324d9d753d40356f
+MISC metadata.xml 237 BLAKE2B 43fdb41b8b9fc4c7870059f296014f77cf77fe08cef7092da23a2a7a2e09c8cc2fb5476e73a0b9781f3b7b108a11aeb1fd88ba22bea203523aa3ea0f769412ee SHA512 ec2a39c9baa1516733bfbe39044a2fb2b9742b0ddb1b1eebab2ce7cd1027f92ef9c2c48a3e0f7362ea897160818f214542f82bdf8ba7b2a5034c0c5090f137e8
diff --git a/app-admin/killproc/files/killproc-2.13-argz.patch b/app-admin/killproc/files/killproc-2.13-argz.patch
new file mode 100644
index 000000000000..6ea0cc5f8f2c
--- /dev/null
+++ b/app-admin/killproc/files/killproc-2.13-argz.patch
@@ -0,0 +1,10 @@
+--- a/startproc.c
++++ b/startproc.c
+@@ -25,7 +25,6 @@
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <sys/ioctl.h>
+-#include <argz.h>
+ #include <grp.h>
+ 
+ #define USAGE		"Usage:\n"\
diff --git a/app-admin/killproc/files/killproc-2.13-makefile.patch b/app-admin/killproc/files/killproc-2.13-makefile.patch
new file mode 100644
index 000000000000..4eb8131448ee
--- /dev/null
+++ b/app-admin/killproc/files/killproc-2.13-makefile.patch
@@ -0,0 +1,42 @@
+--- a/Makefile
++++ b/Makefile
+@@ -27,9 +27,7 @@
+ #
+ # egcs used with -O2 includes -fno-force-mem which is/was buggy (1998/10/08)
+ #
+-	 CFLAGS = $(RPM_OPT_FLAGS) $(COPTS) $(DEBUG) $(INC) -D_GNU_SOURCE -Wall -pipe
+-	  CLOOP = -funroll-loops
+-	     CC = gcc
++	 CFLAGS = $(RPM_OPT_FLAGS) $(COPTS) $(DEBUG) $(INC) -D_GNU_SOURCE -Wall
+ 	     RM = rm -f
+ 	  MKDIR = mkdir -p
+ 	  RMDIR = rm -rf
+@@ -59,22 +57,22 @@
+ all: $(SBINPRG) $(UBINPRG)
+ 
+ libinit.o:	libinit.c libinit.h
+-	$(CC) $(CFLAGS) $(CLOOP) -DINITDIR=\"$(INITDIR)\" -c $<
++	$(CC) $(CFLAGS) -DINITDIR=\"$(INITDIR)\" -c $<
+ 
+ killproc:	killproc.c libinit.o
+-	$(CC) $(CFLAGS) $(CLOOP) -o $@ $^ $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ startproc:	startproc.c libinit.o
+-	$(CC) $(CFLAGS) $(CLOOP) -o $@ $^ $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ checkproc:	checkproc.c libinit.o
+-	$(CC) $(CFLAGS) $(CLOOP) -o $@ $^ $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ usleep:		usleep.c
+-	$(CC) $(CFLAGS) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ fsync:		fsync.c
+-	$(CC) $(CFLAGS) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ clean:
+ 	$(RM) *.o *~ killproc startproc checkproc pidofproc start_daemon usleep fsync
diff --git a/app-admin/killproc/killproc-2.13-r1.ebuild b/app-admin/killproc/killproc-2.13-r1.ebuild
new file mode 100644
index 000000000000..9b0d6572dcd3
--- /dev/null
+++ b/app-admin/killproc/killproc-2.13-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="killproc and assorted tools for boot scripts"
+HOMEPAGE="http://ftp.suse.com/pub/projects/init/"
+SRC_URI="ftp://ftp.suse.com/pub/projects/init/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-makefile.patch" \
+		"${FILESDIR}/${P}-argz.patch"
+
+	tc-export CC
+	export COPTS=${CFLAGS}
+}
+
+src_install() {
+	into /
+	dosbin checkproc fsync killproc startproc usleep
+	into /usr
+	doman *.8 *.1
+	dodoc README *.lsm
+}
diff --git a/app-admin/killproc/metadata.xml b/app-admin/killproc/metadata.xml
new file mode 100644
index 000000000000..1f15fbbf8995
--- /dev/null
+++ b/app-admin/killproc/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">                         
+  <email>jer@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/kpcli-3.0 b/app-admin/kpcli-3.0
deleted file mode 100644
index c50e9ccfbbb8..000000000000
--- a/app-admin/kpcli-3.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=A command line interface to KeePass database files
-EAPI=5
-HOMEPAGE=http://kpcli.sourceforge.net
-IUSE=X
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl dev-perl/Clone dev-perl/Crypt-Rijndael dev-perl/TermReadKey dev-perl/Sort-Naturally dev-perl/Term-ShellUI >=dev-perl/File-KeePass-0.30.0 virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Data-Dumper virtual/perl-Term-ANSIColor virtual/perl-Carp X? ( dev-perl/Clipboard )
-SLOT=0
-SRC_URI=http://downloads.sourceforge.net/project/kpcli/kpcli-3.0.pl
-_md5_=c416df6019ed17d0ad034f9986fd0d0b
diff --git a/app-admin/kpcli-3.1 b/app-admin/kpcli-3.1
deleted file mode 100644
index a373c996376e..000000000000
--- a/app-admin/kpcli-3.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=A command line interface to KeePass database files
-EAPI=6
-HOMEPAGE=http://kpcli.sourceforge.net
-IUSE=X
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl dev-perl/Clone dev-perl/Crypt-Rijndael dev-perl/TermReadKey dev-perl/Sort-Naturally dev-perl/Term-ShellUI >=dev-perl/File-KeePass-0.30.0 virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Data-Dumper virtual/perl-Term-ANSIColor virtual/perl-Time-Piece virtual/perl-Carp X? ( dev-perl/Capture-Tiny dev-perl/Clipboard )
-SLOT=0
-SRC_URI=http://downloads.sourceforge.net/project/kpcli/kpcli-3.1.pl
-_md5_=7b96a7a515d961e6d2e3fc642f6df15f
diff --git a/app-admin/kpcli-3.2 b/app-admin/kpcli-3.2
deleted file mode 100644
index 1bfea1aa7d14..000000000000
--- a/app-admin/kpcli-3.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=A command line interface to KeePass database files
-EAPI=6
-HOMEPAGE=http://kpcli.sourceforge.net
-IUSE=X
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl dev-perl/Clone dev-perl/Crypt-Rijndael dev-perl/TermReadKey dev-perl/Sort-Naturally dev-perl/Term-ShellUI >=dev-perl/File-KeePass-0.30.0 virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Data-Dumper virtual/perl-Term-ANSIColor virtual/perl-Time-Piece virtual/perl-Carp X? ( dev-perl/Capture-Tiny dev-perl/Clipboard )
-SLOT=0
-SRC_URI=http://downloads.sourceforge.net/project/kpcli/kpcli-3.2.pl
-_md5_=712b72580213ae58fa7f7b75d2bcf411
diff --git a/app-admin/kpcli/Manifest b/app-admin/kpcli/Manifest
new file mode 100644
index 000000000000..6292ff0c9a54
--- /dev/null
+++ b/app-admin/kpcli/Manifest
@@ -0,0 +1,7 @@
+DIST kpcli-3.0.pl 181841 BLAKE2B f55db76dc9036ccd2031a7f5f379e18aad8b52758fa7567547f79e0d1c0ae9f97b60d9a68f0587fe4d38d97dde2d89d9ea768ad14fbf4a398422befd00455c9d SHA512 fb1243ed81408507090ce6e7b06e958f923ac9c64e6994b104605bb85deb08e1b63b28fdb2c5a4eb24e128734b65ecb0209000f08ec9a7644f3d6a8fbb781587
+DIST kpcli-3.1.pl 193792 BLAKE2B 6574916b020885443e68d2daa111e376847c6e0c5d5f4273293cc591bb5e31b8b1a2a43f984e22d2b959f71ed952936a00ea7cbf17fb047929004bce193b3d9e SHA512 2bcfaa4535fd35d7bbf512e704392e207237efa669bf5d6845d1657e44511f04b80fddd4404f3a8d409f330f8bfbb5cf9f1e09fb8a425685b3d7309a8040df5e
+DIST kpcli-3.2.pl 197369 BLAKE2B 17a449c1727e8c9e79a5c45327debec1391e58012b2f94979a9431dfc45a0909b23f2e61717aaa2ea18153f420d8d8eba9fd4a5afa860b8478d58e044049322a SHA512 72374da627075a2a0a18932f0f4d48c77e23a8a3ac13599d7cebb6b3b685c2d1678bf8035651adeb471538b4da3825443a9e2a9a393e85be175637b0bfa611b9
+EBUILD kpcli-3.0.ebuild 881 BLAKE2B 6badb5ef50f5c3324aa13cc6f1a3fe858dcd85a6b6a7cfaa8a103de303c50c546ae69797872be7f326020f8e34f98323714d3895dd7ae3cf806e07e01e03c670 SHA512 db94cfba8b4ab9ea55a405d95cf2bec7836ee563c2ca1599850b422b20c81984c345798b20c94471466ed1c25dfd083309c89a1573621dfea8ba3e91018aee7c
+EBUILD kpcli-3.1.ebuild 933 BLAKE2B 948ea48b0e27fc2304b97b0de3ec5ffc96ce45f9780df71e3d8580c6f990faff3fd8d05466d9847c80d12275ae3f1d6e9e0dc7444913f392ef2091228bff945b SHA512 7aed92ec74ae4f429de373b0a2246c84fd1e31a08077890f08e5e6c7cbb199f15a985e64976aec26d5fc627b34031e8e48252d3304fcc97458d839735cb84743
+EBUILD kpcli-3.2.ebuild 933 BLAKE2B e9a6198c62dcbe4a4c26aa6ae2421dfae0b0b149bb2d8c0c6cd802d4d432df699e8dc64baa415be77a530f3e95df74fc5c967ced9ae014487f9756429d1af032 SHA512 b8d077b1369186be0fd3edd9120980e6169596a6d27ee2e92e9f256feb714e43eefb30133e82df525cda29acea81be86f26457f016cc81c44b16f6b1018a8edd
+MISC metadata.xml 336 BLAKE2B 5716721c6343ab66c74fb4c86e8d9e46d333d918dd3cd99e037221ad55a3b5ae6b3b1edff21775cc602eaa84a1c8246fcea23ca2cfacbd56243aa0a013707397 SHA512 0d14658777d24fe70a871694ef722f49bd02b138658316470f4a8d5bf83c068d7c9ace11c34423a3a73aefdf590e43f2b56d2578a08c67cbac179ef3b59ca42b
diff --git a/app-admin/kpcli/kpcli-3.0.ebuild b/app-admin/kpcli/kpcli-3.0.ebuild
new file mode 100644
index 000000000000..22e49477c1e0
--- /dev/null
+++ b/app-admin/kpcli/kpcli-3.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A command line interface to KeePass database files"
+HOMEPAGE="http://kpcli.sourceforge.net"
+SRC_URI="http://downloads.sourceforge.net/project/kpcli/${P}.pl"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND=""
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Clone
+	dev-perl/Crypt-Rijndael
+	dev-perl/TermReadKey
+	dev-perl/Sort-Naturally
+	dev-perl/Term-ShellUI
+	>=dev-perl/File-KeePass-0.30.0
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Digest-MD5
+	virtual/perl-Digest-SHA
+	virtual/perl-Data-Dumper
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Carp
+	X? ( dev-perl/Clipboard )
+"
+
+src_unpack() {
+	mkdir "${S}" || die
+	cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin kpcli
+}
diff --git a/app-admin/kpcli/kpcli-3.1.ebuild b/app-admin/kpcli/kpcli-3.1.ebuild
new file mode 100644
index 000000000000..8283bf2ccefa
--- /dev/null
+++ b/app-admin/kpcli/kpcli-3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A command line interface to KeePass database files"
+HOMEPAGE="http://kpcli.sourceforge.net"
+SRC_URI="http://downloads.sourceforge.net/project/kpcli/${P}.pl"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND=""
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Clone
+	dev-perl/Crypt-Rijndael
+	dev-perl/TermReadKey
+	dev-perl/Sort-Naturally
+	dev-perl/Term-ShellUI
+	>=dev-perl/File-KeePass-0.30.0
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Digest-MD5
+	virtual/perl-Digest-SHA
+	virtual/perl-Data-Dumper
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Time-Piece
+	virtual/perl-Carp
+	X? (
+		dev-perl/Capture-Tiny
+		dev-perl/Clipboard
+	)
+"
+
+src_unpack() {
+	mkdir "${S}" || die
+	cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin kpcli
+}
diff --git a/app-admin/kpcli/kpcli-3.2.ebuild b/app-admin/kpcli/kpcli-3.2.ebuild
new file mode 100644
index 000000000000..3218845456ac
--- /dev/null
+++ b/app-admin/kpcli/kpcli-3.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A command line interface to KeePass database files"
+HOMEPAGE="http://kpcli.sourceforge.net"
+SRC_URI="http://downloads.sourceforge.net/project/kpcli/${P}.pl"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND=""
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Clone
+	dev-perl/Crypt-Rijndael
+	dev-perl/TermReadKey
+	dev-perl/Sort-Naturally
+	dev-perl/Term-ShellUI
+	>=dev-perl/File-KeePass-0.30.0
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Digest-MD5
+	virtual/perl-Digest-SHA
+	virtual/perl-Data-Dumper
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Time-Piece
+	virtual/perl-Carp
+	X? (
+		dev-perl/Capture-Tiny
+		dev-perl/Clipboard
+	)
+"
+
+src_unpack() {
+	mkdir "${S}" || die
+	cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin kpcli
+}
diff --git a/app-admin/kpcli/metadata.xml b/app-admin/kpcli/metadata.xml
new file mode 100644
index 000000000000..ad8e967f1f82
--- /dev/null
+++ b/app-admin/kpcli/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">kpcli</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/ksonnet-0.10.2 b/app-admin/ksonnet-0.10.2
deleted file mode 100644
index cde9c13da6fa..000000000000
--- a/app-admin/ksonnet-0.10.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=CLI-supported framework for extensible Kubernetes configurations
-EAPI=6
-HOMEPAGE=https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.10.2.tar.gz -> ksonnet-0.10.2.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=de0c7b9182f84d4511d2d64c3ce0846a
diff --git a/app-admin/ksonnet-0.11.0 b/app-admin/ksonnet-0.11.0
deleted file mode 100644
index 4d5df22345d5..000000000000
--- a/app-admin/ksonnet-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=CLI-supported framework for extensible Kubernetes configurations
-EAPI=6
-HOMEPAGE=https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.11.0.tar.gz -> ksonnet-0.11.0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=de0c7b9182f84d4511d2d64c3ce0846a
diff --git a/app-admin/ksonnet-0.8.0 b/app-admin/ksonnet-0.8.0
deleted file mode 100644
index 41cddb8cb3b0..000000000000
--- a/app-admin/ksonnet-0.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=CLI-supported framework for extensible Kubernetes configurations
-EAPI=6
-HOMEPAGE=https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.8.0.tar.gz -> ksonnet-0.8.0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=de0c7b9182f84d4511d2d64c3ce0846a
diff --git a/app-admin/ksonnet-0.9.2 b/app-admin/ksonnet-0.9.2
deleted file mode 100644
index 8b480d7f98c7..000000000000
--- a/app-admin/ksonnet-0.9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=CLI-supported framework for extensible Kubernetes configurations
-EAPI=6
-HOMEPAGE=https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.9.2.tar.gz -> ksonnet-0.9.2.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=de0c7b9182f84d4511d2d64c3ce0846a
diff --git a/app-admin/ksonnet/Manifest b/app-admin/ksonnet/Manifest
new file mode 100644
index 000000000000..42bdb2ff0118
--- /dev/null
+++ b/app-admin/ksonnet/Manifest
@@ -0,0 +1,9 @@
+DIST ksonnet-0.10.2.tar.gz 9312418 BLAKE2B 5e097250a8f1c7887d1949a84d6b768619508b0557ae15220cb31b933a40fcf025200a1d5a60e3fed8e37226faf9b5fdfaa18c87ac56ff4187968efb73b8cef7 SHA512 d4ea1b9b5feb90b345997d8546df276c3e9b171cbe6b648133615ae89fd0fadedb6f98128f4c8b5a40005de3f08ccd0a4de46c7d9c7d0f20e62baa5727c11065
+DIST ksonnet-0.11.0.tar.gz 11228264 BLAKE2B 2c5be1124f2976b6f38b23c9f871bc67a1b88fdf851339893525a4f42a8b3a8ac37b18454e2d281ae3ff71008744a60683910d4864b158fd428b76d28cd73e9b SHA512 4b80b16e4b2cbf79f043e38c6668fad51ec958264a85262f16b1f44c66af80f93d51809c713360758392d4689f350748b5ec55bc2bd3bee01bd42ce4030ffeeb
+DIST ksonnet-0.8.0.tar.gz 5260937 BLAKE2B 3b14618d9e40e0f71f966a0acd1ac121040ddfbd378b363236f98c4ecc6d2a2b688988816cd56801bc127b41ac56f4a8446bf152b0ffbdc3f64bce879bfa7cc4 SHA512 c80bbb0d6959045c2de0bf3a21b8a869b53a397e2e31b4b273ccd4f16afceb4038c6263a34d8e0934234cea5997949202e58dd7603902b221a140be737924aec
+DIST ksonnet-0.9.2.tar.gz 6552479 BLAKE2B 46aa62fe5c647d87f11b0c35db1e494d7c045d65bd98a0cc81bcb9c5a1890739a6f782dd04735781cb11aff70e4ec6f04ab97ff51b567385fa1e72bd2d835f15 SHA512 fd9c3c966ed27799f5c7e29e031270406e901c16089f354984d5aed62ebc53f1fc3be0f7623c1dff4231e7a5676b3bed879448845e35d6c1db5104ec28669a48
+EBUILD ksonnet-0.10.2.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
+EBUILD ksonnet-0.11.0.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
+EBUILD ksonnet-0.8.0.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
+EBUILD ksonnet-0.9.2.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
+MISC metadata.xml 324 BLAKE2B 89e56104008d1d0adfc928707dc011c96d3169f299d4b8b7dde1bf4fad5221728ed3d2b5a4cda9aed69f3ff16ba202c3bf445946ccaa169ebedb22e001251602 SHA512 9f554c4509d955b3d88f15dab2f0bfbf9862b52bea5aab36fea37c4b863080a5378a76087baa2f3be7e8ade5a7fd519d80deecb394d3ead642d1c943faba8809
diff --git a/app-admin/ksonnet/ksonnet-0.10.2.ebuild b/app-admin/ksonnet/ksonnet-0.10.2.ebuild
new file mode 100644
index 000000000000..48881fd39b62
--- /dev/null
+++ b/app-admin/ksonnet/ksonnet-0.10.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/ksonnet/ksonnet"
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
+HOMEPAGE="https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/EXTRA_GO_FLAGS =/EXTRA_GO_FLAGS = -v /"\
+		-e "s/VERSION =.*/VERSION = ${PV}/" src/${EGO_PN}/Makefile || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" emake ks
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin ks
+	dodoc README.md
+	popd || die
+}
diff --git a/app-admin/ksonnet/ksonnet-0.11.0.ebuild b/app-admin/ksonnet/ksonnet-0.11.0.ebuild
new file mode 100644
index 000000000000..48881fd39b62
--- /dev/null
+++ b/app-admin/ksonnet/ksonnet-0.11.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/ksonnet/ksonnet"
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
+HOMEPAGE="https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/EXTRA_GO_FLAGS =/EXTRA_GO_FLAGS = -v /"\
+		-e "s/VERSION =.*/VERSION = ${PV}/" src/${EGO_PN}/Makefile || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" emake ks
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin ks
+	dodoc README.md
+	popd || die
+}
diff --git a/app-admin/ksonnet/ksonnet-0.8.0.ebuild b/app-admin/ksonnet/ksonnet-0.8.0.ebuild
new file mode 100644
index 000000000000..48881fd39b62
--- /dev/null
+++ b/app-admin/ksonnet/ksonnet-0.8.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/ksonnet/ksonnet"
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
+HOMEPAGE="https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/EXTRA_GO_FLAGS =/EXTRA_GO_FLAGS = -v /"\
+		-e "s/VERSION =.*/VERSION = ${PV}/" src/${EGO_PN}/Makefile || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" emake ks
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin ks
+	dodoc README.md
+	popd || die
+}
diff --git a/app-admin/ksonnet/ksonnet-0.9.2.ebuild b/app-admin/ksonnet/ksonnet-0.9.2.ebuild
new file mode 100644
index 000000000000..48881fd39b62
--- /dev/null
+++ b/app-admin/ksonnet/ksonnet-0.9.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/ksonnet/ksonnet"
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
+HOMEPAGE="https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/EXTRA_GO_FLAGS =/EXTRA_GO_FLAGS = -v /"\
+		-e "s/VERSION =.*/VERSION = ${PV}/" src/${EGO_PN}/Makefile || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" emake ks
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin ks
+	dodoc README.md
+	popd || die
+}
diff --git a/app-admin/ksonnet/metadata.xml b/app-admin/ksonnet/metadata.xml
new file mode 100644
index 000000000000..317ede0369bd
--- /dev/null
+++ b/app-admin/ksonnet/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">heptio/ksonnet</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/kube-bench-0.0.16 b/app-admin/kube-bench-0.0.16
deleted file mode 100644
index 40dbcd529255..000000000000
--- a/app-admin/kube-bench-0.0.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Bench for Security runs the CIS Kubernetes Benchmark
-EAPI=6
-HOMEPAGE=https://github.com/aquasecurity/kube-bench
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/aquasecurity/kube-bench/archive/v0.0.16.tar.gz -> kube-bench-0.0.16.tar.gz https://github.com/fatih/color/archive/570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz -> github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jinzhu/gorm/archive/5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz -> github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz https://github.com/jinzhu/inflection/archive/1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz -> github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz https://github.com/lib/pq/archive/83612a56d3dd153a94a629cd64925371c9adad78.tar.gz -> github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/pelletier/go-toml/archive/0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz -> github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz https://github.com/spf13/afero/archive/57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz -> github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/cobra/archive/7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz -> github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz https://github.com/golang/sys/archive/e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz -> github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz https://github.com/golang/text/archive/e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz -> github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz https://github.com/go-yaml/yaml/archive/c95af922eae69f190717a0b7148960af8c55a072.tar.gz -> github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cbb6ab07c39aa906a4225af1367b7c11
diff --git a/app-admin/kube-bench-0.0.17 b/app-admin/kube-bench-0.0.17
deleted file mode 100644
index c8fb8e7b005e..000000000000
--- a/app-admin/kube-bench-0.0.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Bench for Security runs the CIS Kubernetes Benchmark
-EAPI=6
-HOMEPAGE=https://github.com/aquasecurity/kube-bench
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/aquasecurity/kube-bench/archive/v0.0.17.tar.gz -> kube-bench-0.0.17.tar.gz https://github.com/fatih/color/archive/570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz -> github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jinzhu/gorm/archive/5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz -> github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz https://github.com/jinzhu/inflection/archive/1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz -> github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz https://github.com/lib/pq/archive/83612a56d3dd153a94a629cd64925371c9adad78.tar.gz -> github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/pelletier/go-toml/archive/0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz -> github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz https://github.com/spf13/afero/archive/57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz -> github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/cobra/archive/7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz -> github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz https://github.com/golang/sys/archive/e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz -> github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz https://github.com/golang/text/archive/e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz -> github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz https://github.com/go-yaml/yaml/archive/c95af922eae69f190717a0b7148960af8c55a072.tar.gz -> github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cbb6ab07c39aa906a4225af1367b7c11
diff --git a/app-admin/kube-bench-0.0.19 b/app-admin/kube-bench-0.0.19
deleted file mode 100644
index 2187534fe0b8..000000000000
--- a/app-admin/kube-bench-0.0.19
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Bench for Security runs the CIS Kubernetes Benchmark
-EAPI=6
-HOMEPAGE=https://github.com/aquasecurity/kube-bench
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/aquasecurity/kube-bench/archive/v0.0.19.tar.gz -> kube-bench-0.0.19.tar.gz https://github.com/fatih/color/archive/570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz -> github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jinzhu/gorm/archive/5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz -> github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz https://github.com/jinzhu/inflection/archive/1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz -> github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz https://github.com/lib/pq/archive/83612a56d3dd153a94a629cd64925371c9adad78.tar.gz -> github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/pelletier/go-toml/archive/0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz -> github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz https://github.com/spf13/afero/archive/57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz -> github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/cobra/archive/7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz -> github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz https://github.com/golang/sys/archive/e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz -> github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz https://github.com/golang/text/archive/e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz -> github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz https://github.com/go-yaml/yaml/archive/c95af922eae69f190717a0b7148960af8c55a072.tar.gz -> github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cbb6ab07c39aa906a4225af1367b7c11
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
new file mode 100644
index 000000000000..37803a5a66cd
--- /dev/null
+++ b/app-admin/kube-bench/Manifest
@@ -0,0 +1,29 @@
+DIST github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz 588432 BLAKE2B 0ea1b91d459a9708896d8e6fda386924d0dd8aeb44cf58de4a1c7d51185e9ad106333029fc807f6221db0decf7e8da883d98ba390250dc5fa47474fa951836f7 SHA512 a24eb00104b7763d7b711a4e555f00464fd19d117fe7d5c6bf0c007167dcad1b893a7130abc46619f29136fef4ee080662d4622d5f15019d41c24ae55a804a3d
+DIST github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz 30624 BLAKE2B ced6ca6f115eedc954f6b583b28e470ec5dcfe0c279d55a63c00ee942acde095e9eef8fb4c3fa289f34871f43a7562fb71142d070a54398bc5d91122e64b4ad0 SHA512 cff467ffbed22edf4cde7a52e0f0d7a5b4a06446a6140ad7fa018dfcce3b400342223d888a0389042d2e6fd7abe261d0e515adc6e4c03a74e3cf074e88af17ab
+DIST github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz 64831 BLAKE2B 23c8a4141bcfb9c4b4e384a9ad372cc0761c006705384eef8a05c5491e62997df13aa19318f500d6dc39ae95e61298d1a9b491b7ea9a6f0ac51d9f28359d2c0f SHA512 3bf310558b53a724f93d228947cb5f1fe152313e90e78559d4b57b9b6db2e668ffe0358dcb74a40159dce9057e4872d905f8490bba4c19cd7a8e0301439df96b
+DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
+DIST github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz 670015 BLAKE2B b457c61f036bab4bb9ed035855607027552a6ddce89f0725cd6615362f12bcd478966e4e4b287c05bc6d055ebb21032f5993e00fb772dc18ef9804e3b0e9978a SHA512 f1c7aac5ddb1ebd9bfb91bae24c78840f2d31a5305c8d2cc4e2f3a1fded0c4432a340d92f753e3aee717f7e5643f5187eb16ac645eb6ef86df1beabcfb97d761
+DIST github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz 6112971 BLAKE2B 46e4358a177a6253797177a31d0509e63c2986645c61fb833c479498fcf3a8cb2304a81c47c562340087dc7eba5273690cfc86bdb978e72b1183715c8e9cc662 SHA512 555dfd99a41705b0e1aa7ee5a6465fbe53d1dedeeccc226a26edafb1f41d5f7a137cd4ed6ad02146d112055ca324569ccbe2863933dd363e5ed002cdbda6fa90
+DIST github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz 69787 BLAKE2B e1d034d5863ae8bca85736e971e613e6821665861e35954a067e5d659029a8680b6902387848a318aee374cd4f6b810ae160046979b5bc86e64df0e1ff5d08f6 SHA512 751ea2fcea04ab2a9b61a45443a71cdee9cd09c2576af048108ccb56027b34f46b00e14aa664b966165b7d8cbb994e49f128bf54e3469c627d73f7ee2809ebf8
+DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
+DIST github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz 70487 BLAKE2B 28c780726bbd8589beccce79f5af4a71a1ecec8438fbe77af846f79a1f8879cb8d6920b52367ff5c63bf9100c19e3c5a48ce77aa1a13ed1f17eff84529259626 SHA512 04c6a2d2c32e9a020f47f88a5e58dec47b500f387d798b98ebaada905d85ad014f78fe8683d662c61fa0c6286da1c0bc733b03f7f7ad912640cf01a4a7e4de49
+DIST github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz 4506 BLAKE2B bf66be135369acdef3c356310de015f9b0f3eeaaf9273e315d52ef21fad3d93d27a90535252a846e5f0c7d2680dccd1080c7f4c56d3d48ba38ef0cffba18129d SHA512 bf30d10b9e101c9fde9079b12b519e8bdeb5f40bc964109940b58a2bccdb2f9775c6bf25dfe47ae7b8bc7e34a0b9109a0d9f1f5b4e70cc4093264758bdce749d
+DIST github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz 90080 BLAKE2B e411640c603f1bffc0966c748393ef33172e326b452b5736288b720a14b6d6311f8265aaae958ef9a56c0c81cce53882f4ee88aa51b975ba8c57a9477bfa372e SHA512 f275a8d2b8705ad6e2e57a81072c16e4ce058fe658a57b6e4846c306363ffd5c675b3e6aaf9104a4fa5b7112e1f18e84474a7a494ffbee58d4d51e7e3dbef12b
+DIST github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz 27761 BLAKE2B 0f39a63d3d19ad5d3ac367739d568dd3abe74a8a6aa0e60cf19ca8203412270fc45dd1fea07627290a85c42db6ead0229f72bfd845b9e4f645976db1585838e7 SHA512 493a7493e415b45abe2109c79e02ed7903de6a559911cff0323f9577fcf41134ab8f4ac26d776fdf9a891654f063bd2452c7e557c643d73de5f558b13533f62c
+DIST github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz 6670 BLAKE2B 97161231d163ac1e196ef4038a77952e9258e256baaede2abd32d5ddaf2d9f06dd31764d59ee72c36953a9f423bd1338e0251145f1c6f55f02086a273f92b28b SHA512 a9f0dbb97686e819f1982406ae3a990c855116e60b18809ca926f040d426ca984613ce01461832369a96bcc61fb09e7e63a28d543feeccfe4935d848e8fcf543
+DIST github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz 3323 BLAKE2B b7f8fcc57dd652cc4c320237e3287286aa3dfc8cd5d6115b49835a4fa7f1d507963feaaf0103712b03a0ae09195aa863da31caedef549d9b29dde9f0daf82ab3 SHA512 30ef451bf1f85c7489464e367a95a7f558c2c1a424ff49c5148393d631ceb98c58edef23fcb2b4f1bed0e7c1b3fdd8b5273874ba9304e6f29e83c0d9e127d34d
+DIST github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz 15601 BLAKE2B c2212f4c34ae15eefa1a681b2beaa8cbf3f63fb2317a8fd95f21df54eb6a05b2d312d96848deb1afdd47aefdeecadd20920ae25a0d865f31c16b6a5da4ac6dbd SHA512 30b6f8f902ab7d4dad899c19687b6ec0e8c51655a04163c37ed1fa36cb420695631534097d4de0f342dbe649b412d38d0254b40bbb2970c3a70adc0244a6e800
+DIST github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz 56608 BLAKE2B fbe29d5ff5dabf6c6bc123c41fb341966c5d8b41582e3dbd241e26e6e1e6b2afe7f66927e84dd9233704b766d5f72acb451359e9034466de8700d30d09f50166 SHA512 5d1b21d5af4d148451ad040a80e8c9523c0553b3fda84bc3e079881bda06dde7cf00c2daaf790bbab12f2afd2bbe794b1b7982d8a3c84411f6af99c92ececeea
+DIST github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz 43598 BLAKE2B d7fe3fff67b37002696f6672a95bacd9a8cc30783162eb4fced93bd86e91e10cde84f94a53a3af488ec032e42e1ea21d7e3f4f215b3e2b50c7add042579b749e SHA512 8563490cbab569c9bd065ea4e530a1cb47f3159100af0ad21501f66f60316a12e8e5b497829250d4b64993baddbd542996ce073b68674172ab3fb7213106771b
+DIST github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz 9594 BLAKE2B 4979fd23b48a6bcd2538357d33b7670326b9129b5de309548492d9597eace1320875e1b242b594c98777192c1e0c6abb0bda4ba946a43530cc68ec762d1949c6 SHA512 2b97f56aa83dd1302e02603a8fcbc8f2642ceff8bdc19cf8a26120801023c4a8a3fed689de0ac392f6a4144450ac85d32b00fbde200b22e972c31cbabd996cad
+DIST github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz 101642 BLAKE2B 9d0ea2e12e915d79a3c8351357cc0ec564910dc145be7d0b8eced6422e4e841e66f28f211e369d5639fcacc201af553e70a740dab76354f9b3b256bf08c3d100 SHA512 5618be996d70382efa9a84d0d06fe866b0fc955ea79240f37132588d0f793988ed4ed1584e716d2644a774d5b4e0e80b77a04d8740cab313107929eb413e25c2
+DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz 6347 BLAKE2B a1e62d37f3f736086ba5b198ca33e243f4650571d42448c593ba7c0970883aea401e8ddfc90975686bb5c992e5133294662a05b245620ca52c254b2a7e866d29 SHA512 04522be3439a2c3a06f38f764e275d8d093b935d610386bb99364f105d7d805a6a7e7a928796682955549a88d43b21f385404c1401ee66374d324f954bd4769c
+DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297
+DIST github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz 30849 BLAKE2B 8e66dbb5c90c47e66ea72848d86602861791fe3198ce6cde5ea87330f15dd19cdd249788bebc31b2a66577c20edeef01c8beb59a4140d57167c4b13d33118a04 SHA512 4acd37411683d753d81d839e83c2257bc424c42b8e295868da84cb045db131be063b0e5a0fb88c587332582f356186659d5a181e65ae1838e868576543c1fecd
+DIST kube-bench-0.0.16.tar.gz 196341 BLAKE2B c0cf32f99401729c8c064a6d48e41908c75904099a5f3bd500815502c1b9361a58546cb0751e554a0f89cddb9b25d7362b39b3a0b2000b4ab65ed2e52b98e496 SHA512 4cb0a1c5d6bd9991acbfe12d367db3d552e273cef472c11f81065be6fba93631d6c3859c247f6af7defc90e5aa716e1888a7501e5f5b024041ad81072a53c878
+DIST kube-bench-0.0.17.tar.gz 197158 BLAKE2B 458a7ee61cde654359002060ca05ef376c0f0cd43c48b6faa5faee307c367bce1ecbd827ab9634d07f805c706e1ed68968b1b73c3bb3952b52d15074c019acd8 SHA512 c07a7c58551ebe4633fb6a8cf08b8b81c63579a1406ac8b2cb889b2b6e06015fc22c205b873c79b40c228b7bd104fe427766271a1d3bd840386249c84f48e857
+DIST kube-bench-0.0.19.tar.gz 197836 BLAKE2B 86fd5d43d45fb2fa98e542a2a2385fecf2ec2a024bede34d5d9a9e33e04967b7dadab34651734361bb5f273eb8da824ca6d73fe46e8944b14ae0ba4c4e64341a SHA512 dfe82bcce482c88effffad772b17874bc2c80423d47f2dc7c02b5c9425b915ec2405d9f97b88b4aff2a54d33b7bfafd3f89c43ee4c32956d27cef4f11833a178
+EBUILD kube-bench-0.0.16.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
+EBUILD kube-bench-0.0.17.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
+EBUILD kube-bench-0.0.19.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
+MISC metadata.xml 333 BLAKE2B c8437977b6a07e36929b13f767af0f09158bedd1ea7a0bee1da52dd1b83acb2929248c3c385a5fba14362721ab6871d399ddfba53d15bbe84a87af0ad771b73b SHA512 295cae435555436e9091195ac585fd30d022aba0b76244c85927f19f14b38dde95fb14192c832f00f52e3cf71aa3d95f7527b22a90690f85206178c49d620c8d
diff --git a/app-admin/kube-bench/kube-bench-0.0.16.ebuild b/app-admin/kube-bench/kube-bench-0.0.16.ebuild
new file mode 100644
index 000000000000..01b95b2a0ede
--- /dev/null
+++ b/app-admin/kube-bench/kube-bench-0.0.16.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/aquasecurity/kube-bench"
+
+EGO_VENDOR=(
+	"github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
+	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
+	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+	"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
+	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+	"github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
+	"github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
+	"github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
+	"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
+	"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
+	"github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
+	"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
+	"github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
+	"github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
+	"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
+	"github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
+	"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
+	"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
+	"github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
+	"golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
+	"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
+	"gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
+HOMEPAGE="https://github.com/aquasecurity/kube-bench"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o ${PN} . || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/${PN}
+	insinto /etc/kube-bench
+	doins -r src/${EGO_PN}/cfg
+}
diff --git a/app-admin/kube-bench/kube-bench-0.0.17.ebuild b/app-admin/kube-bench/kube-bench-0.0.17.ebuild
new file mode 100644
index 000000000000..01b95b2a0ede
--- /dev/null
+++ b/app-admin/kube-bench/kube-bench-0.0.17.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/aquasecurity/kube-bench"
+
+EGO_VENDOR=(
+	"github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
+	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
+	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+	"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
+	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+	"github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
+	"github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
+	"github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
+	"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
+	"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
+	"github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
+	"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
+	"github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
+	"github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
+	"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
+	"github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
+	"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
+	"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
+	"github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
+	"golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
+	"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
+	"gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
+HOMEPAGE="https://github.com/aquasecurity/kube-bench"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o ${PN} . || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/${PN}
+	insinto /etc/kube-bench
+	doins -r src/${EGO_PN}/cfg
+}
diff --git a/app-admin/kube-bench/kube-bench-0.0.19.ebuild b/app-admin/kube-bench/kube-bench-0.0.19.ebuild
new file mode 100644
index 000000000000..01b95b2a0ede
--- /dev/null
+++ b/app-admin/kube-bench/kube-bench-0.0.19.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/aquasecurity/kube-bench"
+
+EGO_VENDOR=(
+	"github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
+	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
+	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+	"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
+	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+	"github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
+	"github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
+	"github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
+	"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
+	"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
+	"github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
+	"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
+	"github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
+	"github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
+	"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
+	"github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
+	"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
+	"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
+	"github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
+	"golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
+	"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
+	"gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
+HOMEPAGE="https://github.com/aquasecurity/kube-bench"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o ${PN} . || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/${PN}
+	insinto /etc/kube-bench
+	doins -r src/${EGO_PN}/cfg
+}
diff --git a/app-admin/kube-bench/metadata.xml b/app-admin/kube-bench/metadata.xml
new file mode 100644
index 000000000000..9e426ff1b44b
--- /dev/null
+++ b/app-admin/kube-bench/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">aquasecurity/kube-bench</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/kubectx-0.5.0 b/app-admin/kubectx-0.5.0
deleted file mode 100644
index 820e4d635f6a..000000000000
--- a/app-admin/kubectx-0.5.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Fast way to switch between clusters and namespaces in kubectl
-EAPI=6
-HOMEPAGE=https://github.com/ahmetb/kubectx
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-cluster/kubectl
-SLOT=0
-SRC_URI=https://github.com/ahmetb/kubectx/archive/v0.5.0.tar.gz -> kubectx-0.5.0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=7d3d6cc8bcab4613546c3f14cd9b5d37
diff --git a/app-admin/kubectx/Manifest b/app-admin/kubectx/Manifest
new file mode 100644
index 000000000000..2c038c9e35a3
--- /dev/null
+++ b/app-admin/kubectx/Manifest
@@ -0,0 +1,3 @@
+DIST kubectx-0.5.0.tar.gz 398389 BLAKE2B 6eb5a91667e62e029bc9810e4e5833acdb99a73201713f9eb3fcee991001546fbcb7a381e3b1a568952b1a224975a238c41f65382cf384ea266f3dad55a79949 SHA512 0a587a0260960dfc69c3a30c3e73d2b2ac83937ef8a05df345445f1dc64adc725d42f7652ec2c65a02becdc40a7de3e49b402d7991f8dc970ee60b913b3ae5df
+EBUILD kubectx-0.5.0.ebuild 695 BLAKE2B 7d577b4d94e9deb6ce514fc3997052526670ce9c4d9df60d90136388b04f80c360957ed46d3ca83093d73fe6ab696433d099ad853e3299ad897cd4d7460d2419 SHA512 ac6b600bbdb46ddb0bb2d4d4fffe25bd41217d231ccef053169bac0e5f5e8b0ff0ec85fa67bc73996c590845b6768dddea4cbc2b3afa53077a93a5f341597a40
+MISC metadata.xml 324 BLAKE2B 78b22be6aaf9e018d9e75f572304e37680db02da78e20dd603c0c0c1eaaafdf37ae7b4d1534c743581e319cede030c25ce77fc701b10e4359522fe1cfe48ce04 SHA512 0361b6396f21c195af41c0f2fac3030071ad28d736ec3b7b731346b4cde955be334deb1ab0974f9b273d4dec63e6fffcaf288aa707e517bea6971cfc9e07b551
diff --git a/app-admin/kubectx/kubectx-0.5.0.ebuild b/app-admin/kubectx/kubectx-0.5.0.ebuild
new file mode 100644
index 000000000000..bcdb869a0ef6
--- /dev/null
+++ b/app-admin/kubectx/kubectx-0.5.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vcs-snapshot bash-completion-r1
+
+DESCRIPTION="Fast way to switch between clusters and namespaces in kubectl"
+HOMEPAGE="https://github.com/ahmetb/kubectx"
+SRC_URI="https://github.com/ahmetb/kubectx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="sys-cluster/kubectl"
+
+src_install() {
+	dobin kubectx kubens
+
+	insinto /usr/share/zsh/site-functions
+	newins completion/kubectx.zsh _kubectx
+	newins completion/kubens.zsh _kubens
+
+	newbashcomp completion/kubectx.bash kubectx
+	newbashcomp completion/kubens.bash kubens
+}
diff --git a/app-admin/kubectx/metadata.xml b/app-admin/kubectx/metadata.xml
new file mode 100644
index 000000000000..ee148200ef0c
--- /dev/null
+++ b/app-admin/kubectx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ahmetb/kubectx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/lastpass-binary-component-4.1.44_p20171210 b/app-admin/lastpass-binary-component-4.1.44_p20171210
deleted file mode 100644
index 1e158d01767d..000000000000
--- a/app-admin/lastpass-binary-component-4.1.44_p20171210
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Binary component required by the LastPass Password Manager browser extension
-EAPI=6
-HOMEPAGE=https://helpdesk.lastpass.com/downloading-and-installing/#h5
-KEYWORDS=-* ~x86 ~amd64
-LICENSE=LastPass
-RDEPEND=!!app-admin/lastpass
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=https://lastpass.com/lplinux.tar.bz2 -> lastpass-binary-component-4.1.44_p20171210.tar.bz2
-_md5_=093d713efc82e9736d8c1782563733b4
diff --git a/app-admin/lastpass-binary-component/Manifest b/app-admin/lastpass-binary-component/Manifest
new file mode 100644
index 000000000000..bf1f3ea2528f
--- /dev/null
+++ b/app-admin/lastpass-binary-component/Manifest
@@ -0,0 +1,3 @@
+DIST lastpass-binary-component-4.1.44_p20171210.tar.bz2 1625075 BLAKE2B 90812cfae90c90ab7f91ac293e501e9b8c6d0b4fca9e1f05e88865eb85042286308d2ce6eb90d306583aa9481de7588746a3402c3b4b9f29e2e540e4a4c2b287 SHA512 16ceebd054fe807975f838305044bf5e75ccbba2c592f7bf08af18d1209067c7e8b0e00457092242c3869de2ec5c59bfdfdb3ff06f801dbb2108b7dac1a7adbf
+EBUILD lastpass-binary-component-4.1.44_p20171210.ebuild 3659 BLAKE2B 3c5b5e500329013a373f05d94862fe6f1181ff6853623b709fd7385c985e7e7d61542df3d1fbff6f4d571ed328e306718e0401ecc55b4dfe5006c728f172d59e SHA512 7003c1bad71275ec8e1cebfd933b0087702ac65c3d8a5daa2655c7e65150986f8de1f1bfb89fb795a1ec72b0a86dae0138469e5e34023c2a3c03174a18c46f79
+MISC metadata.xml 816 BLAKE2B ea7163f64706263e360241192a07e1e12eabc6fb196e5029cec931c53dacad20a9a4d851402f8942120328aa551159e2ba340257d50a5fcc36f7a72145e13a18 SHA512 71eb5c8aa836f75a5bfed79d7398e30628a274586a019d094a114d582ae2011d148cae325eb79b67e64035822cd18f154b9626142a7b2cc4c57f1e40f2f15b6b
diff --git a/app-admin/lastpass-binary-component/lastpass-binary-component-4.1.44_p20171210.ebuild b/app-admin/lastpass-binary-component/lastpass-binary-component-4.1.44_p20171210.ebuild
new file mode 100644
index 000000000000..beff308bc57f
--- /dev/null
+++ b/app-admin/lastpass-binary-component/lastpass-binary-component-4.1.44_p20171210.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Binary component required by the LastPass Password Manager browser extension"
+HOMEPAGE="https://helpdesk.lastpass.com/downloading-and-installing/#h5"
+# sadly, upstream has no versioned distfiles
+SRC_URI="https://lastpass.com/lplinux.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LastPass"
+SLOT="0"
+KEYWORDS="-* ~x86 ~amd64"
+RESTRICT="strip mirror" # We can't mirror it, but we can fetch it
+
+RDEPEND="
+	!!app-admin/lastpass
+"
+
+LASTPASS_EXEDIR=/opt/lastpass/
+
+QA_PREBUILT="
+	${LASTPASS_EXEDIR}nplastpass*
+"
+
+S="${WORKDIR}"
+
+src_install() {
+	# This is based on the upstream installer script that's in the tarball
+	bin=nplastpass
+	use amd64 && bin="${bin}64"
+	exeinto ${LASTPASS_EXEDIR}
+	doexe "${S}"/${bin}
+
+	# Generate the policy file for Chrome/Chromium/Opera
+	cat >"${T}"/lastpass_policy.json <<-EOF || die
+	{
+		"ExtensionInstallSources": [
+			"https://lastpass.com/*",
+			"https://*.lastpass.com/*",
+			"https://d1jxck0p3rkj0.cloudfront.net/lastpass/*"
+		]
+	}
+	EOF
+	# Install the policy file for Chrome/Chromium/Opera
+	for d in /etc/chromium /etc/opt/chrome; do
+		insinto ${d}/policies/managed
+		doins "${T}"/lastpass_policy.json
+	done
+
+	# Generate the app manifest for Chrome/Opera
+	cat >"${T}"/com.lastpass.nplastpass.json <<-EOF || die
+	{
+		"name": "com.lastpass.nplastpass",
+		"description": "LastPass",
+		"path": "${LASTPASS_EXEDIR}${bin}",
+		"type": "stdio",
+		"allowed_origins": [
+			"chrome-extension://hdokiejnpimakedhajhdlcegeplioahd/",
+			"chrome-extension://debgaelkhoipmbjnhpoblmbacnmmgbeg/",
+			"chrome-extension://hnjalnkldgigidggphhmacmimbdlafdo/",
+			"chrome-extension://hgnkdfamjgnljokmokheijphenjjhkjc/"
+		]
+	}
+	EOF
+	# Install the app manifest for Chrome/Opera
+	# https://developer.chrome.com/apps/nativeMessaging
+	# https://dev.opera.com/extensions/message-passing/
+	insinto /etc/opt/chrome/native-messaging-hosts
+	doins "${T}"/com.lastpass.nplastpass.json
+
+	# Generate the app manifest for Chromium
+	cat >"${T}"/com.lastpass.nplastpass.json <<-EOF || die
+	{
+		"name": "com.lastpass.nplastpass",
+		"description": "LastPass",
+		"path": "${LASTPASS_EXEDIR}${bin}",
+		"type": "stdio",
+		"allowed_origins": [
+			"chrome-extension://hdokiejnpimakedhajhdlcegeplioahd/",
+			"chrome-extension://debgaelkhoipmbjnhpoblmbacnmmgbeg/",
+			"chrome-extension://hgnkdfamjgnljokmokheijphenjjhkjc/"
+		]
+	}
+	EOF
+	# Install the app manifest for Chromium
+	# https://developer.chrome.com/apps/nativeMessaging
+	insinto /etc/chromium/native-messaging-hosts/
+	doins "${T}"/com.lastpass.nplastpass.json
+
+	# Generate the app manifest for Firefox
+	cat >"${T}"/com.lastpass.nplastpass.json <<-EOF || die
+	{
+		"name": "com.lastpass.nplastpass",
+		"description": "LastPass",
+		"path": "${LASTPASS_EXEDIR}${bin}",
+		"type": "stdio",
+		"allowed_extensions": [
+			"support@lastpass.com"
+		]
+	}
+	EOF
+	# Install the app manifest for Firefox
+	# https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Native_manifests#Manifest_location
+	insinto /usr/lib/mozilla/native-messaging-hosts/
+	doins "${T}"/com.lastpass.nplastpass.json
+}
+
+pkg_postinst() {
+	einfo "This package only installs the components required by the browser extension."
+	einfo "Visit the links below for your browser to install the extension itself:"
+	einfo "Chrome/Chromium: https://lastpass.com/dl/inline/?full=1"
+	einfo "Firefox: https://lastpass.com/lastpassffx/"
+	einfo "Opera: https://lastpass.com/dl/"
+	einfo
+	einfo "Chrome, Chromium and Opera users need to manually enable the binary component."
+	einfo "For more info, visit: https://lastpass.com/support.php?cmd=showfaq&id=5576"
+}
diff --git a/app-admin/lastpass-binary-component/metadata.xml b/app-admin/lastpass-binary-component/metadata.xml
new file mode 100644
index 000000000000..6f4f533e3c35
--- /dev/null
+++ b/app-admin/lastpass-binary-component/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gokturk@gentoo.org</email>
+    <name>Göktürk Yüksek</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+  <longdescription lang="en">
+    The binary features for Lastpass include faster encryption/decryption,
+    clipboard integration, smart card authentication and more for
+    <pkg>www-client/google-chrome</pkg>, <pkg>www-client/chromium</pkg>,
+    and <pkg>www-client/opera</pkg> web browsers. For
+    <pkg>www-client/firefox</pkg> this package is not required as the
+    extension bundles the binary components already.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-admin/lastpass-cli-1.0.0 b/app-admin/lastpass-cli-1.0.0
deleted file mode 100644
index ecbeb9c4e188..000000000000
--- a/app-admin/lastpass-cli-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry ) app-text/asciidoc virtual/pkgconfig
-DESCRIPTION=Interfaces with LastPass.com from the command line.
-EAPI=6
-HOMEPAGE=https://github.com/lastpass/lastpass-cli
-IUSE=libressl X +pinentry
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry )
-SLOT=0
-SRC_URI=https://github.com/lastpass/lastpass-cli/archive/v1.0.0.tar.gz -> lastpass-cli-1.0.0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4fb7673cd9f4b3d9ec2b422a1285148b
diff --git a/app-admin/lastpass-cli-1.1.2 b/app-admin/lastpass-cli-1.1.2
deleted file mode 100644
index f117d04fa348..000000000000
--- a/app-admin/lastpass-cli-1.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry ) app-text/asciidoc virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Interfaces with LastPass.com from the command line.
-EAPI=6
-HOMEPAGE=https://github.com/lastpass/lastpass-cli
-IUSE=libressl X +pinentry
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry )
-SLOT=0
-SRC_URI=https://github.com/lastpass/lastpass-cli/archive/v1.1.2.tar.gz -> lastpass-cli-1.1.2.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3c973f8e97b73346409c29eacc3d86b6
diff --git a/app-admin/lastpass-cli-1.2.1 b/app-admin/lastpass-cli-1.2.1
deleted file mode 100644
index 091e50532e4f..000000000000
--- a/app-admin/lastpass-cli-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry ) app-text/asciidoc virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Interfaces with LastPass.com from the command line.
-EAPI=6
-HOMEPAGE=https://github.com/lastpass/lastpass-cli
-IUSE=libressl X +pinentry test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry )
-SLOT=0
-SRC_URI=https://github.com/lastpass/lastpass-cli/archive/v1.2.1.tar.gz -> lastpass-cli-1.2.1.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2b1c056f29f5c0f738275ceb9e0aba8d
diff --git a/app-admin/lastpass-cli-1.2.2 b/app-admin/lastpass-cli-1.2.2
deleted file mode 100644
index f2e8865f862a..000000000000
--- a/app-admin/lastpass-cli-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry ) app-text/asciidoc virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Interfaces with LastPass.com from the command line.
-EAPI=6
-HOMEPAGE=https://github.com/lastpass/lastpass-cli
-IUSE=libressl X +pinentry test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry )
-SLOT=0
-SRC_URI=https://github.com/lastpass/lastpass-cli/archive/v1.2.2.tar.gz -> lastpass-cli-1.2.2.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2aab55d4cfd979751921ce0d84c358c6
diff --git a/app-admin/lastpass-cli-1.3.0 b/app-admin/lastpass-cli-1.3.0
deleted file mode 100644
index b877df0759f5..000000000000
--- a/app-admin/lastpass-cli-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry ) app-text/asciidoc virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Interfaces with LastPass.com from the command line.
-EAPI=6
-HOMEPAGE=https://github.com/lastpass/lastpass-cli
-IUSE=libressl X +pinentry test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ GPL-2+-with-openssl-exception
-RDEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry )
-SLOT=0
-SRC_URI=https://github.com/lastpass/lastpass-cli/archive/v1.3.0.tar.gz -> lastpass-cli-1.3.0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d81b72b5ace4383c8ee716d58fea175c
diff --git a/app-admin/lastpass-cli-1.3.1-r1 b/app-admin/lastpass-cli-1.3.1-r1
deleted file mode 100644
index 38ec221263a4..000000000000
--- a/app-admin/lastpass-cli-1.3.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Interfaces with LastPass.com from the command line.
-EAPI=6
-HOMEPAGE=https://github.com/lastpass/lastpass-cli
-IUSE=libressl X +pinentry test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ GPL-2+-with-openssl-exception
-RDEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry )
-SLOT=0
-SRC_URI=https://github.com/lastpass/lastpass-cli/archive/v1.3.1.tar.gz -> lastpass-cli-1.3.1.tar.gz https://dev.gentoo.org/~gokturk/distfiles/app-admin/lastpass-cli/lastpass-cli-man-1.3.1.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=215682311a7d4f4367ed920284708c7c
diff --git a/app-admin/lastpass-cli/Manifest b/app-admin/lastpass-cli/Manifest
new file mode 100644
index 000000000000..2049f6a0eb43
--- /dev/null
+++ b/app-admin/lastpass-cli/Manifest
@@ -0,0 +1,14 @@
+DIST lastpass-cli-1.0.0.tar.gz 92311 BLAKE2B a5351fb203ce3532572ac52fad5f6a6312c3378918b5100011fe4947c1fe7ca09d41e327e85b7a9d5c9ddd58ac29d3b790494570dda0d970a3c1c18bcc0ca5db SHA512 4709b3e4d6064c8c5cb593344e6417355d7df570240dce8eb77a19f3377ea38585280a9602cf8ab926c55c6afd84b297f261b0c8a40d355734d5cc542d46f610
+DIST lastpass-cli-1.1.2.tar.gz 102796 BLAKE2B 7c6a19698616e9a3ab6286b2eaaaed1b4a810cb35464c70f3930ed0903d5f63cce6f0d5bcbb3b07fb5ad846b58581a93aaf8d6d63a7246b7bb51985362fb856e SHA512 8115cb07cfca15ef402bdbd8ce943352e1534ddb781274e21cb0fafa4bcd9ab7abe4ddba57c4ebbce326f09cc9249f244607d16cac5597e61cf21c73417e7d9c
+DIST lastpass-cli-1.2.1.tar.gz 108780 BLAKE2B 82ebae9a6a707bb75025cf98b53bccd2403eb0a3855d7f6ca7c5fdbf55465f929df529100da7933ce73ab7ece35275e0ffd96e6463eb1ecbd81dcccca3b80047 SHA512 c7c9f20dbc083873b815834320828a30a1c488571efbfc5aea47c3bd2073819d713810c785855d4c0c208e1b95aa0e5fc550a0b6b5c0f787eca1f54589e18e62
+DIST lastpass-cli-1.2.2.tar.gz 110045 BLAKE2B 96fcfd8f6e974edb5bd8701e18e73b46c0bcbcc14c38debd50be922a25ece9397bb6b641d4f2ce3057e57af0114a263eaab03e86b74e61d89a745411051bb172 SHA512 7d211c7669fe2de3e3f34cf00025376fd39a7f96c8573a0eaff64f322daab03de21e25d5875d3286a794580ac75d330c7bfe1005b377afc2b13e4ded9d78012c
+DIST lastpass-cli-1.3.0.tar.gz 113969 BLAKE2B 5570567b17f043200f6b4eca72735d26d153a91cb4f0551a856532101ac610d2505bc90677735a8bbafe68f1a1b7ac0a026ac642a9f3786cceb7638ea29394fb SHA512 7a147e08ac4b8e4e895744f80c484db9da895f4439bccbc141fe17e480285c76479753c2b879c60258d740af39775a3fae225ad193b5e6379a1cae8862c2a3ae
+DIST lastpass-cli-1.3.1.tar.gz 114843 BLAKE2B 7983d4090092ef3443d8c502d157934fa2384426f0be22c796795cdf664be3ba396f64daa81cdf896cb6901d4063f93e54b62cda4349b14fa4d312a21c5bb76d SHA512 092d28dc459719e662fbb2c5e92e8cc75be108aa9d7b62569ee44cb34dd9588e78151fdc5ad114c30e8de21c0b8803edc41db9295548c7cbfe6e537c9a52aad2
+DIST lastpass-cli-man-1.3.1.tar.xz 5700 BLAKE2B 736ab71ad55cfcb657c727f3dc9dc15775dab1a0232d1ffc51b8794e49911531c96a841b4a5ac0b31f0516cd7aa54027ac7d0eb096816730cdfd192c04d99449 SHA512 e60807683ecd681b3937ef447d3e6a487d25418fe99f51ba99e54bf643c5254dd18427a03e7f035198ef34ff578bbb6116baf04eb554f54d85e7d059b6bfed7e
+EBUILD lastpass-cli-1.0.0.ebuild 1012 BLAKE2B 9c0bc0d6b795f2c01838c09ca05b3a7e5fae9c09f60b65239e8d0fff49f2b244258781cd66c44eaa3795c978bf817b28dced02fe11ed4dd0d4de39d75ebe73d1 SHA512 d319bd79f9281f4ef9c6dce9ae68e58ac628addf7218b1bce38d983731a8e21cb9f4e112bb74fe2a0a598767c3381917c27191fc91834f5c1bd15fc22c92564f
+EBUILD lastpass-cli-1.1.2.ebuild 937 BLAKE2B e9b7f4264bec259d4abe5789114e0a4c64dbaba89d43a2ae0618719a7eb3ef6ecaea8f57b5eba8d477604a528c27f7cd3f7c64bf2322021c81311af079cd2a8d SHA512 f25a76711dbb73d592a3d2b325f3de0eae899ce2db7f21948624c7a846de88bfd5ee2b6bc46a4f973674df043eb0ab22817774c724145bec4975650d55f645be
+EBUILD lastpass-cli-1.2.1.ebuild 1273 BLAKE2B c60f42829455207808dabbc6304f99c02f13fb6bc01cdf378ca382d305740a8c66ebebeefc892d81325742d87f2c4ef2c2bfc55f7921bb0e59d5904271cea4c6 SHA512 7da1fb209fec0057d70cc2eff410cfcd410be6b6fba183bab5ccb8279e729df3a8acc3e1cfe2b339e6bbfd346c4d2eecee924a2c8fe15a6ebf5a502efc7fc16c
+EBUILD lastpass-cli-1.2.2.ebuild 1280 BLAKE2B b06a35c163f277bdbbc20f2366f93d4ad6ae20ebbd39317e91424db7a0828b6d664008f4e8bf8bf3dac39fb540439dae1ac5f92756dda2744918d024bee42d7b SHA512 a2455060f8ba03105c704217d23086c2f04380a63dfb6b02bdac1065cfc0559e83fd0eee2a6e3a1ea6ca9b64c9f477b4dd857b62058a49eb5fa0df997d825fd1
+EBUILD lastpass-cli-1.3.0.ebuild 1310 BLAKE2B 61bc2fb9f4b3d260f647b9265f7616bdb97dbe048d2d5699f66c8816691ff8e06653c81e28f4908eba7513814e9c619fe3b8f9e88b45c1701457efe592f0f521 SHA512 daf6a5a270b750b9f95e3b1a06c57cd7112982901d0d49c16bb4a51da92ac6db95996d427a6a8d6709ad1d2a4bbe57dd74e5261bdadfe479fa7f49b14c936bf1
+EBUILD lastpass-cli-1.3.1-r1.ebuild 1393 BLAKE2B 07a272e7f33dcfc0ce64b8b48c4ea6196880320af304554aa567f968290a591c02ddec799ea0239e0ac4e6176e4cf76ff791daaa4629272e085927a2b46d334f SHA512 bf226f2be2c70f61c631a655bcf3f1d9ef733a3b9989c1288019e84734660e183a8b5980c6d147c55e08c5c02dd4377b39d091933eeb1e15010de52ec8ff8338
+MISC metadata.xml 643 BLAKE2B a5a01a1dbcc257692bd14369470d69eef33a00a9910ed5006c62f1f5fec2a9a261dd6ece42bcaa68345a21f6e26958f965f90459501324b0e7a168f3fcc4f7f9 SHA512 6b1a7f6566687384d328260576dad306dd07add06001b3746b4f37f05ff91b6ee72e1e2ecfd35463a5b78b4ba8dd1a7757503bdf992372dbd474967e4bf0e9f3
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.0.0.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.0.0.ebuild
new file mode 100644
index 000000000000..a33a27661666
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="amd64 x86"
+IUSE="libressl X +pinentry"
+
+RDEPEND="
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-misc/curl
+	dev-libs/libxml2
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Do not include headers from /usr/local/include
+	sed -i -e 's:-I/usr/local/include::' Makefile || die
+	default
+	tc-export CC
+}
+
+src_compile() {
+	emake PREFIX="${EPREFIX}/usr" COMPDIR="$(get_bashcompdir)" all doc-man
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install install-doc
+}
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.1.2.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.1.2.ebuild
new file mode 100644
index 000000000000..d81e760b556d
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-1.1.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry"
+
+RDEPEND="
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-misc/curl
+	dev-libs/libxml2
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all doc-man
+}
+
+src_install() {
+	cmake-utils_src_install install install-doc
+}
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.2.1.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.2.1.ebuild
new file mode 100644
index 000000000000..4a4ee2d8677a
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-1.2.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry test"
+
+RDEPEND="
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-misc/curl
+	dev-libs/libxml2
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all doc-man $(usex test lpass-test '')
+}
+
+src_install() {
+	cmake-utils_src_install install install-doc
+}
+
+src_test() {
+	local myctestargs=(
+		-j1 # Parallel tests fail
+	)
+
+	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
+	# which is incorrect for our out-of-source build
+	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
+		-i "${S}"/test/include.sh
+
+	cmake-utils_src_test
+}
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.2.2.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.2.2.ebuild
new file mode 100644
index 000000000000..2822408086a3
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-1.2.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry test"
+
+RDEPEND="
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-misc/curl
+	dev-libs/libxml2
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all doc-man $(usex test lpass-test '')
+}
+
+src_install() {
+	cmake-utils_src_install install install-doc
+}
+
+src_test() {
+	local myctestargs=(
+		-j1 # Parallel tests fail
+	)
+
+	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
+	# which is incorrect for our out-of-source build
+	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
+		-i "${S}"/test/include.sh || die
+
+	cmake-utils_src_test
+}
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.0.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.0.ebuild
new file mode 100644
index 000000000000..2c34bdeb3291
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry test"
+
+RDEPEND="
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-misc/curl
+	dev-libs/libxml2
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all doc-man $(usex test lpass-test '')
+}
+
+src_install() {
+	cmake-utils_src_install install install-doc
+}
+
+src_test() {
+	local myctestargs=(
+		-j1 # Parallel tests fail
+	)
+
+	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
+	# which is incorrect for our out-of-source build
+	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
+		-i "${S}"/test/include.sh || die
+
+	cmake-utils_src_test
+}
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..57454b36ac9e
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~gokturk/distfiles/app-admin/lastpass-cli/${PN}-man-${PV}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry test"
+
+RDEPEND="
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-misc/curl
+	dev-libs/libxml2
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all $(usex test lpass-test '')
+}
+
+src_install() {
+	cmake-utils_src_install install
+
+	doman "${WORKDIR}"/man/lpass.1
+}
+
+src_test() {
+	local myctestargs=(
+		-j1 # Parallel tests fail
+	)
+
+	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
+	# which is incorrect for our out-of-source build
+	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
+		-i "${S}"/test/include.sh || die
+
+	cmake-utils_src_test
+}
diff --git a/app-admin/lastpass-cli/metadata.xml b/app-admin/lastpass-cli/metadata.xml
new file mode 100644
index 000000000000..837ad12e8308
--- /dev/null
+++ b/app-admin/lastpass-cli/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gokturk@gentoo.org</email>
+		<name>Göktürk Yüksek</name>
+	</maintainer>
+	<use>
+		<flag name="X">
+			Use <pkg>x11-misc/xclip</pkg> or <pkg>x11-misc/xsel</pkg> to copy passwords to the clipboard.
+		</flag>
+		<flag name="pinentry">
+			Use <pkg>app-crypt/pinentry</pkg> to prompt for passwords.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">lastpass/lastpass-cli</remote-id>
+		<bugs-to>https://github.com/lastpass/lastpass-cli/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/lib_users-0.10 b/app-admin/lib_users-0.10
deleted file mode 100644
index 1989d5e29a3e..000000000000
--- a/app-admin/lib_users-0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/backports-unittest-mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-DESCRIPTION=Check for mapped libs and open files that are marked as deleted
-EAPI=6
-HOMEPAGE=https://github.com/klausman/lib_users
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/klausman/lib_users/archive/v0.10.tar.gz -> lib_users-0.10.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d782ebe6fbf26ce0d32ed0dd7272443f
diff --git a/app-admin/lib_users-0.11 b/app-admin/lib_users-0.11
deleted file mode 100644
index b9f3e025c5be..000000000000
--- a/app-admin/lib_users-0.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/backports-unittest-mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-DESCRIPTION=Check for mapped libs and open files that are marked as deleted
-EAPI=6
-HOMEPAGE=https://github.com/klausman/lib_users
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/klausman/lib_users/archive/v0.11.tar.gz -> lib_users-0.11.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=404e7fe43755eda37676d9ee25aab49b
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
new file mode 100644
index 000000000000..a2ba079a443a
--- /dev/null
+++ b/app-admin/lib_users/Manifest
@@ -0,0 +1,5 @@
+DIST lib_users-0.10.tar.gz 25636 BLAKE2B 6e660b80ef75f71d47f4783dc741e8b0c17f3cfe31296c5624adcfed5836a0b86964f042eafb5b34e259a824c79efb537558d625bc16d07fb388d61ece7c6329 SHA512 dee8203457570f686df69dc91d71614b462845c848a3445fd9b9f94047fdba8171cc2555fa4299bc4c361905d488c1f17cee4ab0e99899f37995377d6011805a
+DIST lib_users-0.11.tar.gz 25660 BLAKE2B 8f5a827840d4074a0e8abd77e43f60eb09f199f58a2bde0c2bce7613d6ba1d9b12dd46adffa528ff351f54933c304f274abef9c35550d7af3519101dcec69d0a SHA512 a54fc8f57cffcd08e77e86eaf50ec6e68e45e1e9458e25e035af90e14be13980a400c4d264f70ef67e141e1d54581b0487b2b70dd084dc5840424221b46f644a
+EBUILD lib_users-0.10.ebuild 1117 BLAKE2B 511c6cc9302552d0f0c70221ed81079f64b8a8fc9bf35541d03130769981f5d96a2243fccaf122b9d2875d5fbc794e094ebbdd3a56a33ccbdf1f8b0ccd844033 SHA512 d5e8f63944f2b7e6cc6bb34b170f59b534cc5c6c8346ade237110a621e27dc2253969ec969321d5567e6d0e70dc9a3d57219321d41cbe27462e109b590c2a605
+EBUILD lib_users-0.11.ebuild 1123 BLAKE2B a598c57cb898438aa386a80b9a9445ecae5372ee8617ef5c2447a3319bb4af87fe78ad361a9a0d2dfb8067811d3fde8f6f28b6de23a6ab9ef55044e19f96d6a2 SHA512 f1f0a4725a1897951f9f61099b810c846419689c00e6dccbac5efaeace57f31cfb03c042f53ccb652f7be75fdcab5308a9106094e04bc3802f4f6de96f145740
+MISC metadata.xml 454 BLAKE2B c545fd1db330988ad139de08b1890cfd9d6aac98947b954fb761515d314d8ebb941829e7767fe4fad6beb41caf3409111505d1a6378c852f15907933678ddd48 SHA512 c897ea5b6bed9fcc8715380a1b2756f376a095925a2c99a78ce6729cc9839683f40ce53f5faf0fb784169db5ef9162f1659ea6f24304bcc7cd47f90d49ec97dd
diff --git a/app-admin/lib_users/lib_users-0.10.ebuild b/app-admin/lib_users/lib_users-0.10.ebuild
new file mode 100644
index 000000000000..89d0f323c9a8
--- /dev/null
+++ b/app-admin/lib_users/lib_users-0.10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit python-r1
+
+DESCRIPTION="Check for mapped libs and open files that are marked as deleted"
+HOMEPAGE="https://github.com/klausman/lib_users"
+SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${PYTHON_DEPS}"
+
+src_test() {
+	python_foreach_impl nosetests --verbosity=2
+}
+
+my_install() {
+	python_newscript lib_users.py lib_users
+	python_newscript fd_users.py fd_users
+	# lib_users_util/ contains a test script we don't want, so do things by hand
+	python_moduleinto lib_users_util
+	python_domodule lib_users_util/common.py
+	python_domodule lib_users_util/__init__.py
+}
+
+src_install() {
+	python_foreach_impl my_install
+	dodoc README.md TODO
+}
diff --git a/app-admin/lib_users/lib_users-0.11.ebuild b/app-admin/lib_users/lib_users-0.11.ebuild
new file mode 100644
index 000000000000..32a7d7827f37
--- /dev/null
+++ b/app-admin/lib_users/lib_users-0.11.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit python-r1
+
+DESCRIPTION="Check for mapped libs and open files that are marked as deleted"
+HOMEPAGE="https://github.com/klausman/lib_users"
+SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${PYTHON_DEPS}"
+
+src_test() {
+	python_foreach_impl nosetests --verbosity=2
+}
+
+my_install() {
+	python_newscript lib_users.py lib_users
+	python_newscript fd_users.py fd_users
+	# lib_users_util/ contains a test script we don't want, so do things by hand
+	python_moduleinto lib_users_util
+	python_domodule lib_users_util/common.py
+	python_domodule lib_users_util/__init__.py
+}
+
+src_install() {
+	python_foreach_impl my_install
+	dodoc README.md TODO
+}
diff --git a/app-admin/lib_users/metadata.xml b/app-admin/lib_users/metadata.xml
new file mode 100644
index 000000000000..3497f56287b0
--- /dev/null
+++ b/app-admin/lib_users/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>jer@gentoo.org</email>
+    <name>Jeroen Roovers</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>klausman@gentoo.org</email>
+    <name>Tobias Klausman</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">klausman/lib_users</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/lnav-0.8.1 b/app-admin/lnav-0.8.1
deleted file mode 100644
index 43cdb268c5b1..000000000000
--- a/app-admin/lnav-0.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure
-DEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/libpcre[cxx] >=net-misc/curl-7.23.0 sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= sys-libs/zlib
-DESCRIPTION=A curses-based tool for viewing and analyzing log files
-EAPI=6
-HOMEPAGE=http://lnav.org
-IUSE=unicode
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/libpcre[cxx] >=net-misc/curl-7.23.0 sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/tstack/lnav/releases/download/v0.8.1/lnav-0.8.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=fffe62a0d01912151765a24945608d86
diff --git a/app-admin/lnav-0.8.2 b/app-admin/lnav-0.8.2
deleted file mode 100644
index 60c246f19b18..000000000000
--- a/app-admin/lnav-0.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/libpcre[cxx] >=net-misc/curl-7.23.0 sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= sys-libs/zlib
-DESCRIPTION=A curses-based tool for viewing and analyzing log files
-EAPI=6
-HOMEPAGE=http://lnav.org
-IUSE=unicode
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/libpcre[cxx] >=net-misc/curl-7.23.0 sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/tstack/lnav/releases/download/v0.8.2/lnav-0.8.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e4d9a8debd1add9c46b83ff56c89fdfa
diff --git a/app-admin/lnav-0.8.3 b/app-admin/lnav-0.8.3
deleted file mode 100644
index 752378e1deb8..000000000000
--- a/app-admin/lnav-0.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/libpcre[cxx] >=net-misc/curl-7.23.0 sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= sys-libs/zlib >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A curses-based tool for viewing and analyzing log files
-EAPI=6
-HOMEPAGE=http://lnav.org
-IUSE=unicode
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/libpcre[cxx] >=net-misc/curl-7.23.0 sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/tstack/lnav/releases/download/v0.8.3/lnav-0.8.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a19333b8e6b2302a4788643d8de47a64
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
new file mode 100644
index 000000000000..5a2e7b591b58
--- /dev/null
+++ b/app-admin/lnav/Manifest
@@ -0,0 +1,8 @@
+AUX lnav-0.8.3-disable-tests.patch 673 BLAKE2B f966d6d2bb2f0a4e888b0a286c01d898cfa07c848d39f6d74c865dd489b4a4a3dd36f177873cf41d1f63ac6f4d25956fab54d4b932b170adc795bce4da1fd174 SHA512 fba61b037e01d4bc91101b24ff706b51f0fd3541756add7f7e3f4240a803c76eca808073423531a70c2700359fe36b360a79de3766a8fea7e2ef276db2ef4930
+DIST lnav-0.8.1.tar.gz 616105 BLAKE2B fe37599426c606ec186cd3feac5f9b1023d939a13a03f51a53f64db681c2c42a68152895d3afe17c02804d18735310d48d63338e301732fe3228465dd1d20b3b SHA512 b3514834f42ed647f40c501ad22b68a52755b0c8a558d29305c357b39e598c1386ec9e37d71e8b7e2b5833df41e5f7f398b50b84611d3e6accfb2feb2cdba952
+DIST lnav-0.8.2.tar.gz 693219 BLAKE2B b58133cc54e8c1cdbaa461bef96a87b7d991de2c6d8b626243181d42719ed16c7c10f26a86fafa9aa30cc8b52982af233deb387a19a8442b426462189ffc95c0 SHA512 75c7014e013567e9a0ee78e28a6648d756de7cba3c103b10ddb974c61066db3a1c2efbd14636cb3729bd7c6a4ab534d1999d44e127b8a6728d12bd5be23f30c4
+DIST lnav-0.8.3.tar.gz 785911 BLAKE2B 47800f27de0ad585082abaa2af3139d79506bc74d86c175040792eeaa89268711d8fd4b3737412a3dc59a566bb880f9c9fa248e48d665d25f24e1f139f9a1375 SHA512 21d0229abf9b572dcc426b6a5e87b8c84f4eb0a7f37ed62d0c08b7bd7c88868a13262f9c78b6af3f3a492b5853b68c8cf8f09ca8d24e77aaa2f2ad0f0f128022
+EBUILD lnav-0.8.1.ebuild 715 BLAKE2B 867408f0093ba8f81cf1315675d8c04c0315d3715627401063b63787e6a42a87a14a43b6f18d200e885ba4c342338fb01e2b97fe3717a104993c149fdaf54053 SHA512 27fefba75e2149e09668f807e6978556b12842c8b20e2bad505ce382898a3deac21e74ab47604635cc289e85b6ee4552947d5e54460eade962e78bccb52752a0
+EBUILD lnav-0.8.2.ebuild 672 BLAKE2B 311c8148acc03de25836f0830b4bcd5db5969ccb562db3cabd14992064088590dc126082677a2a05cdf432f9e94ae41e48bc102901ffa291afc310c43822c363 SHA512 58bbf5568efc25df9be91dbc7a233e5b5ec47ed35a1688438f05ae3d489d5f3aa39223a9c49053dc2151ff1e5680a475a1489d738f0792e8106f1176b0c45c03
+EBUILD lnav-0.8.3.ebuild 774 BLAKE2B f34a27225f2ecd9716a27de2d231a8c25df5bb70aec763803980c2c54a573867265667eb2b0b84fc3aaca6d124f5fb6eccf1af4677c2fdb2699702a29c27fa43 SHA512 6fa91129af3860d4b47ebf342d633048aae4395558ea81173fbd86c5313b19eec3cf94addc9e131ce0f03c2b9a0a75c479ae314dabc29cd2a9237243ef8120fd
+MISC metadata.xml 332 BLAKE2B 2c99546c3e0f0ed5241279bcb00e56c7104b70b28991c50763ad3664d1d7ea2441a1b3f973c44f267c80dbc98eb3593579fa49092a0ed77d34d04503942338ac SHA512 38280dd0af700835f8fdb73eb9085f5c0a027ba9111377253a29f174bc63547f59ddb2025d35a72faeee7f1e9ee3c57f2411242df1c46c5d07d3a8b5211cf9b7
diff --git a/app-admin/lnav/files/lnav-0.8.3-disable-tests.patch b/app-admin/lnav/files/lnav-0.8.3-disable-tests.patch
new file mode 100644
index 000000000000..1f442afc3fdd
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.8.3-disable-tests.patch
@@ -0,0 +1,32 @@
+Disable failing tests for bug #630916.
+
+--- lnav-0.8.3/test/Makefile.am
++++ lnav-0.8.3/test/Makefile.am
+@@ -374,7 +374,6 @@
+ 	test_concise \
+ 	test_line_buffer2 \
+ 	test_line_buffer.sh \
+-	test_listview.sh \
+ 	test_grep_proc.sh \
+ 	test_grep_proc2 \
+ 	test_hist_source \
+@@ -388,18 +387,15 @@
+ 	test_scripts.sh \
+ 	test_sessions.sh \
+ 	test_shlexer.sh \
+-	test_sql.sh \
+ 	test_sql_coll_func.sh \
+ 	test_sql_json_func.sh \
+ 	test_sql_fs_func.sh \
+ 	test_sql_str_func.sh \
+ 	test_sql_time_func.sh \
+-	test_view_colors.sh \
+ 	test_vt52_curses.sh \
+ 	test_top_status \
+ 	test_data_parser.sh \
+-	test_yajlpp \
+-	test_pretty_print.sh
++	test_yajlpp
+ 
+ if HAVE_LIBCURL
+ TESTS += \
diff --git a/app-admin/lnav/lnav-0.8.1.ebuild b/app-admin/lnav/lnav-0.8.1.ebuild
new file mode 100644
index 000000000000..c11649613fee
--- /dev/null
+++ b/app-admin/lnav/lnav-0.8.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A curses-based tool for viewing and analyzing log files"
+HOMEPAGE="http://lnav.org"
+SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-db/sqlite:3
+	dev-libs/libpcre[cxx]
+	>=net-misc/curl-7.23.0
+	sys-libs/ncurses:0=[unicode?]
+	sys-libs/readline:0=
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with unicode ncursesw)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
diff --git a/app-admin/lnav/lnav-0.8.2.ebuild b/app-admin/lnav/lnav-0.8.2.ebuild
new file mode 100644
index 000000000000..c7ce22bb4de3
--- /dev/null
+++ b/app-admin/lnav/lnav-0.8.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A curses-based tool for viewing and analyzing log files"
+HOMEPAGE="http://lnav.org"
+SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-db/sqlite:3
+	dev-libs/libpcre[cxx]
+	>=net-misc/curl-7.23.0
+	sys-libs/ncurses:0=[unicode?]
+	sys-libs/readline:0=
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with unicode ncursesw)
+}
diff --git a/app-admin/lnav/lnav-0.8.3.ebuild b/app-admin/lnav/lnav-0.8.3.ebuild
new file mode 100644
index 000000000000..4cc902a0eb99
--- /dev/null
+++ b/app-admin/lnav/lnav-0.8.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs autotools
+
+DESCRIPTION="A curses-based tool for viewing and analyzing log files"
+HOMEPAGE="http://lnav.org"
+SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-db/sqlite:3
+	dev-libs/libpcre[cxx]
+	>=net-misc/curl-7.23.0
+	sys-libs/ncurses:0=[unicode?]
+	sys-libs/readline:0=
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+PATCHES=( "${FILESDIR}"/${P}-disable-tests.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with unicode ncursesw)
+}
diff --git a/app-admin/lnav/metadata.xml b/app-admin/lnav/metadata.xml
new file mode 100644
index 000000000000..a78cad49a983
--- /dev/null
+++ b/app-admin/lnav/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">tstack/lnav</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/localepurge-0.5.4-r2 b/app-admin/localepurge-0.5.4-r2
deleted file mode 100644
index 4f82e9a65243..000000000000
--- a/app-admin/localepurge-0.5.4-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Script to recover diskspace on unneeded locale files & localized man pages
-EAPI=6
-HOMEPAGE=https://gentoo.org https://cgit.gentoo.org/proj/localepurge.git
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=app-shells/bash
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~hwoarang/distfiles/localepurge-0.5.4.tbz2
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=1b5a9d0eca8609cb21f5cc2c4c1a8572
diff --git a/app-admin/localepurge/Manifest b/app-admin/localepurge/Manifest
new file mode 100644
index 000000000000..ba9bb5eb2d9e
--- /dev/null
+++ b/app-admin/localepurge/Manifest
@@ -0,0 +1,7 @@
+AUX localepurge-0.5.4-directorysum.patch 726 BLAKE2B ededf92eb7b11dce7b1b7a46ce879f180ccfef64d2b6e503391350d32af7e502f0ebf27341f3e4345e0d944184e291b8df12daf0d863af9c11126b30dda309a1 SHA512 2b7c2284d26ad2ab254faf9c976ee2d53e0b5e46bf3696164e21772304ae28a8de13662099f492146674e50a8dfc49b799a4be25a3e8e0c42a6e47a085dfd522
+AUX localepurge-0.5.4-evaltotal.patch 289 BLAKE2B 05029aebc3e5a808b42188f0759b45c5bff534dd962374986fb49e7713c70353e7607c91ef8e045f89185dbc6cd24b672824c53e3f7b9f8b096843e1f8c40390 SHA512 d3326631ada71ed930aae1b7e9338fdff2e216d9130a735b431d37f0da5691f087d57e8cb5851b27514a43bf5b00cf3881e1e02f5d8899da186baa2cb771cf4f
+AUX localepurge-0.5.4-parentdir.patch 657 BLAKE2B ace728b65f9e1ce6f8c449f75cdec0313c3ba6168e5baeb64adf7a76fe7cd92774e7a8d345492c4f4c633854672278f91a4c3eb0cab8d30817a3b4af3ed6dc2d SHA512 246d7865eb0645e71b607a523c49d9ae39a31b3371d7042045dadaf4939b6c5a7dd1bc13bc9eabef46ebdebabdb07669b3636a498e9e8059196206b32c38484e
+AUX localepurge-0.5.4-prefix.patch 2799 BLAKE2B 167d9fae44e9351526a103b6fe2d91b0a825a9aa096f02cbede29ddb72a1c42acf849b1a0f19afce0b303e2966668ecdfaa23b9a99a49ef3ca0971eb46723563 SHA512 cdff18f4387919f1ac1376f843b3ce65645cb6c4837401d00bbb3293108833ceded1a5f0e02b23f4024164ee10d2d03fe798d3ce591401a2816c8b61a9999c21
+DIST localepurge-0.5.4.tbz2 5038 BLAKE2B 32a2155761d3cc8d8c1b0ad62ef324b7c7c768d75395ba6d4d6100382e83becba1d69fa15ac2839dabeeae15f1d2bb3bb947c62d5cbcb3d496cf68b140ae2bc8 SHA512 246acb8ef497a2f607ee8545c4d46fd5a1957189eb0b705bf6bcd1cd35ba5b48c7e090db480519c8e3a7427b5ad5a2c020b40232a8fbd0840f9677a6c7af600e
+EBUILD localepurge-0.5.4-r2.ebuild 1014 BLAKE2B 6e65605b6e478bc8e1cc09c01cbd65f5af572566cf7a741cf7591f332246c7f36f9f1c5aaa057e8ab62052c2c9ed502c73f5e708eb6662d08acccb873a4610a9 SHA512 8c00d1fe5b1ee8d95b6666e27e43b43d3dd32682d99f8c9f5f81f12f438cd4cb2d787dbf6fd818d903b44fd049a3138daaf5b0fd1a31f51fcb9b5c9d9715c756
+MISC metadata.xml 295 BLAKE2B b7de6495b5128fc39975ccef8917e8b997649cfb1d96bce9c969b1cc99d1aa01de5ad9b3992594c3e26a4753f9cb83ba87e33c0d5ffbd2c3b341e993c2e6825d SHA512 1828b9bd1dc81e15ab98d4dd17aa1dd165739824cd3c56c32872cee9b42ea6a4d4a110be9dcc21df889341402d1b1bc74c71e84572aa7892f81321e8a74d9cf5
diff --git a/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch b/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch
new file mode 100644
index 000000000000..ebca3b755aec
--- /dev/null
+++ b/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch
@@ -0,0 +1,20 @@
+--- a/localepurge
++++ b/localepurge
+@@ -198,7 +198,7 @@
+ 
+         if [ "$SHOWFREEDSPACE" = "enabled" ]; then
+            if test $SPACETMP -gt 0 ; then
+-               LOCALETOTAL=$SPACETMP
++               LOCALETOTAL=$(($LOCALETOTAL + $SPACETMP))
+                einfo "localepurge: Disk space freed in $LOCALEDIR: ${BOLD}"$SPACETMP"K${NORMAL}"
+            fi
+            SPACETMP=0
+@@ -230,7 +230,7 @@
+ 
+         if [ "$SHOWFREEDSPACE" = "enabled" ]; then
+            if test $SPACETMP -gt 0 ; then
+-               MANTOTAL=$SPACETMP
++               MANTOTAL=$(($MANTOTAL + $SPACETMP))
+                einfo "localepurge: Disk space freed in $MANPAGEDIR: ${BOLD}"$SPACETMP"K${NORMAL}"
+            fi
+            SPACETMP=0
diff --git a/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch b/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch
new file mode 100644
index 000000000000..aed408283343
--- /dev/null
+++ b/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch
@@ -0,0 +1,11 @@
+--- a/localepurge
++++ b/localepurge
+@@ -254,7 +254,7 @@
+ 
+ # Calculating and reporting total disk space freed:
+ if [ "$SHOWFREEDSPACE" = "enabled" ]; then
+-    let TOTAL=$LOCALETOTAL+$MANTOTAL
++    TOTAL=$(($LOCALETOTAL+$MANTOTAL))
+     if test $TOTAL -lt 0; then
+         TOTAL=0
+     fi
diff --git a/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch b/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch
new file mode 100644
index 000000000000..2d8d6dac5720
--- /dev/null
+++ b/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch
@@ -0,0 +1,18 @@
+--- a/localepurge
++++ b/localepurge
+@@ -165,7 +165,14 @@
+     ${ACTION} `find ${REMOVEPATH} -type f -o -type l`
+ 
+     if [ "$SHOWFREEDSPACE" = "enabled" ]; then
+-        SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}')
++        # if symlink, REMOVEPATH could be removed
++        # check from parentdir then
++        if [ -d ${REMOVEPATH} ]; then
++            SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}')
++        else
++            SPACEAFTER=$(df -P ${REMOVEPATH%/*} | awk '{if ( NR==2 ) { print $3 }}')
++        fi
++
+         SPACESUM=$(($SPACEBEFORE - $SPACEAFTER))
+ 
+         if test $SPACESUM -gt 0 ; then
diff --git a/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch b/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch
new file mode 100644
index 000000000000..488871381aed
--- /dev/null
+++ b/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch
@@ -0,0 +1,58 @@
+--- a/localepurge
++++ b/localepurge
+@@ -1,14 +1,14 @@
+-#!/bin/bash
++#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
+ 
+ # Deleting all locale files on system
+ # *not* listed in /etc/locale.nopurge
+ 
+ set -e
+ 
+-LOCALEDIRS="/usr/share/locale /usr/local/share/locale /usr/kde/?.?/share/locale /opt/sun-jdk-*/jre/lib/locale /opt/sun-jre-bin-*/lib/locale /usr/lib/locale /usr/share/binutils-data/*/*/locale /usr/share/gcc-data/*/*/locale"
+-MANPAGEDIRS="/usr/share/man /usr/man /usr/local/share/man /usr/kde/?.?/share/man /usr/kde/?.?/man /opt/sun-jdk-*/man /opt/sun-jre-bin-*/man"
+-LOCALELIST="/var/cache/localepurge/localelist"
+-CONFIGFILE="/etc/locale.nopurge"
++LOCALEDIRS="@GENTOO_PORTAGE_EPREFIX@/usr/share/locale @GENTOO_PORTAGE_EPREFIX@/usr/local/share/locale @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/share/locale @GENTOO_PORTAGE_EPREFIX@/opt/sun-jdk-*/jre/lib/locale @GENTOO_PORTAGE_EPREFIX@/opt/sun-jre-bin-*/lib/locale @GENTOO_PORTAGE_EPREFIX@/usr/lib/locale @GENTOO_PORTAGE_EPREFIX@/usr/share/binutils-data/*/*/locale @GENTOO_PORTAGE_EPREFIX@/usr/share/gcc-data/*/*/locale"
++MANPAGEDIRS="@GENTOO_PORTAGE_EPREFIX@/usr/share/man @GENTOO_PORTAGE_EPREFIX@/usr/man @GENTOO_PORTAGE_EPREFIX@/usr/local/share/man @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/share/man @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/man @GENTOO_PORTAGE_EPREFIX@/opt/sun-jdk-*/man @GENTOO_PORTAGE_EPREFIX@/opt/sun-jre-bin-*/man"
++LOCALELIST="@GENTOO_PORTAGE_EPREFIX@/var/cache/localepurge/localelist"
++CONFIGFILE="@GENTOO_PORTAGE_EPREFIX@/etc/locale.nopurge"
+ VERSION="0.5.4"
+ 
+ LOCALETOTAL=0
+@@ -23,7 +23,7 @@
+ BRACKET=$'\e[34;01m'
+ BOLD=$'\e[1m'
+ 
+-ACTION="/bin/rm -vf"
++ACTION="@GENTOO_PORTAGE_EPREFIX@/bin/rm -vf"
+ 
+ eerror () {
+     echo -e " ${BAD}*${NORMAL} $*" 2> /dev/stderr
+@@ -43,7 +43,7 @@
+ print() {
+     for x in $@; do
+         if [ "${x}" = "" ]; then return 0
+-        else /bin/echo $x
++        else @GENTOO_PORTAGE_EPREFIX@/bin/echo $x
+         fi
+     done
+ }
+@@ -184,7 +184,7 @@
+             einfo "localepurge: processing locale files in ${LOCALEDIR} ..."
+         fi
+ 
+-        for LOCALE in `/bin/ls ${LOCALEDIR}`; do
++        for LOCALE in `@GENTOO_PORTAGE_EPREFIX@/bin/ls ${LOCALEDIR}`; do
+             if echo "${PURGELIST}" | grep -xq ${LOCALE}; then
+                 if [ -d ${LOCALEDIR}/${LOCALE}/LC_MESSAGES ]; then
+                     if [ "${LIST}" = "enabled" ]; then 
+@@ -216,7 +216,7 @@
+             einfo "localepurge: processing man pages in ${MANPAGEDIR} ..."
+         fi
+ 
+-        for LOCALE in `/bin/ls ${MANPAGEDIR} | grep -v ^man[1-9]`; do
++        for LOCALE in `@GENTOO_PORTAGE_EPREFIX@/bin/ls ${MANPAGEDIR} | grep -v ^man[1-9]`; do
+             if echo "${PURGELIST}" | grep -xq ${LOCALE}; then
+                 if [ -d ${MANPAGEDIR}/${LOCALE} ]; then
+                     if [ "${LIST}" = "enabled" ]; then
diff --git a/app-admin/localepurge/localepurge-0.5.4-r2.ebuild b/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
new file mode 100644
index 000000000000..2375b29b4a0a
--- /dev/null
+++ b/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="Script to recover diskspace on unneeded locale files & localized man pages"
+HOMEPAGE="https://gentoo.org
+https://cgit.gentoo.org/proj/localepurge.git"
+SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.4-prefix.patch
+	"${FILESDIR}"/${PN}-0.5.4-directorysum.patch # 164544
+	"${FILESDIR}"/${PN}-0.5.4-parentdir.patch #445910
+	"${FILESDIR}"/${PN}-0.5.4-evaltotal.patch #452208
+)
+
+src_prepare() {
+	default
+	eprefixify ${PN}
+}
+
+src_install() {
+	insinto /var/cache/${PN}
+	doins defaultlist
+	dosym defaultlist /var/cache/${PN}/localelist
+	insinto /etc
+	doins locale.nopurge
+	dobin ${PN}
+	doman ${PN}.8
+}
diff --git a/app-admin/localepurge/metadata.xml b/app-admin/localepurge/metadata.xml
new file mode 100644
index 000000000000..779ea9e0804e
--- /dev/null
+++ b/app-admin/localepurge/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>Just a simple tool to erase all uneeded locale and man files 
+usually generated for USE="nls"</longdescription>
+</pkgmetadata>
diff --git a/app-admin/logcheck-1.3.18-r1 b/app-admin/logcheck-1.3.18-r1
deleted file mode 100644
index 7f7e51c9bc65..000000000000
--- a/app-admin/logcheck-1.3.18-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DESCRIPTION=Mails anomalies in the system logfiles to the administrator
-EAPI=6
-HOMEPAGE=https://packages.debian.org/sid/logcheck
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=!app-admin/logsentry app-misc/lockfile-progs dev-lang/perl dev-perl/mime-construct virtual/mailx
-SLOT=0
-SRC_URI=mirror://debian/pool/main/l/logcheck/logcheck_1.3.18.tar.xz
-_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=28c1e4f3e54d7917cbcdb4e231c2a254
diff --git a/app-admin/logcheck/Manifest b/app-admin/logcheck/Manifest
new file mode 100644
index 000000000000..efa05d3680f1
--- /dev/null
+++ b/app-admin/logcheck/Manifest
@@ -0,0 +1,4 @@
+AUX logcheck.cron 184 BLAKE2B 5b773a77dace97e78efa565d8edf3bd715f564721ba0097e82a3894009fa86b6faffd3018a5270e224de2aefaaf07afa76c40b507d6ddffcf5ca4fb137ac6c09 SHA512 fd0b1bc8c836b766bfbb6102012996d27e378475571167b4d4df98301793624483aca2bd51ec19a2aa367e78b062ddde67355452db8dc1d69fe84a20a2081c30
+DIST logcheck_1.3.18.tar.xz 131252 BLAKE2B 024259d965c02d5f27a82f1df1e947d48e4b1bad705882243c4b743a1c061012f2437ecab1a97265f5a330fdec2f813a36c078dca282f54fdfaab03833340320 SHA512 3ab75969f732efa123d9df2c8b44557e4a7eddef8332a8357463930714148a13130c763c22e562bd60e106abf5e18cf39b3572e0c048727a117fbc67430b7e3f
+EBUILD logcheck-1.3.18-r1.ebuild 1366 BLAKE2B 3860c10cdb145ae50d9025117d38b7f330fb3cb730e37e86904bc57b860bf83c3cb90cf52af3b2cbc2566a851a02361148da4d049c48bdc017df34005780944e SHA512 fe6b92b43f853bdc1b61e05f8d0c1b1de4ced21e9160a99122bd588ed58711ebde62f9d5aba5f8cecba0ee9b550ce77f44e3373f271aa06c995826899421b2ed
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/logcheck/files/logcheck.cron b/app-admin/logcheck/files/logcheck.cron
new file mode 100644
index 000000000000..3b3f4fcf62bd
--- /dev/null
+++ b/app-admin/logcheck/files/logcheck.cron
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+if [ ! -d /var/lock/logcheck ]; then
+	mkdir -p /var/lock/logcheck
+fi
+chown -R logcheck:logcheck /var/lock/logcheck
+
+su -s /bin/bash -c /usr/sbin/logcheck logcheck
diff --git a/app-admin/logcheck/logcheck-1.3.18-r1.ebuild b/app-admin/logcheck/logcheck-1.3.18-r1.ebuild
new file mode 100644
index 000000000000..eae9a3e73278
--- /dev/null
+++ b/app-admin/logcheck/logcheck-1.3.18-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit readme.gentoo-r1 user
+
+DESCRIPTION="Mails anomalies in the system logfiles to the administrator"
+HOMEPAGE="https://packages.debian.org/sid/logcheck"
+SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	!app-admin/logsentry
+	app-misc/lockfile-progs
+	dev-lang/perl
+	dev-perl/mime-construct
+	virtual/mailx
+"
+
+DOC_CONTENTS="
+	Please read the guide at https://wiki.gentoo.org/wiki/Logcheck
+	for installation instructions.
+"
+
+pkg_setup() {
+	enewgroup logcheck
+	enewuser logcheck -1 -1 -1 logcheck
+}
+
+src_prepare() {
+	default
+	# Add /var/log/messages support, bug #531524
+	echo "/var/log/messages" >> etc/logcheck.logfiles
+}
+
+src_install() {
+	default
+
+	# Do not install /var/lock, bug #449968 . Use rmdir to make sure
+	# the directories removed are empty.
+	rmdir "${D}/var/lock/logcheck" || die
+	rmdir "${D}/var/lock" || die
+
+	keepdir /var/lib/logcheck
+
+	readme.gentoo_create_doc
+	dodoc AUTHORS CHANGES CREDITS TODO docs/README.*
+	doman docs/logtail.8 docs/logtail2.8
+
+	exeinto /etc/cron.hourly
+	doexe "${FILESDIR}/${PN}.cron"
+}
+
+pkg_postinst() {
+	chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
+	readme.gentoo_print_elog
+}
diff --git a/app-admin/logcheck/metadata.xml b/app-admin/logcheck/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/app-admin/logcheck/metadata.xml
@@ -0,0 +1,5 @@
+<?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/logmon-0.4.4-r1 b/app-admin/logmon-0.4.4-r1
deleted file mode 100644
index 1bb52f94a25f..000000000000
--- a/app-admin/logmon-0.4.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Split-screen terminal/ncurses based log viewer
-EAPI=5
-HOMEPAGE=http://www.edespot.com/code/LogMon/
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=Artistic
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=http://www.edespot.com/code/LogMon/LogMon-0.4.4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f53eb39775b0e940ddd0ed23503a0973
diff --git a/app-admin/logmon/Manifest b/app-admin/logmon/Manifest
new file mode 100644
index 000000000000..a9f9b5c57de7
--- /dev/null
+++ b/app-admin/logmon/Manifest
@@ -0,0 +1,7 @@
+AUX logmon-0.4.4-char2int.diff 169 BLAKE2B a4408e7ed72b4e035f7becbbcf57e43751a33b22e78ee0d2b9ca3cedca3b25b5b485e4386543893981fbbc503cc76e6620623cce8071a53bd4e5bf17f96ea515 SHA512 49e7c6564cda45c70007efab6a94f64d2b50dc157c535b1260c63d9e391e526bbf911850558ad9299c8422d6349bc0c25d9a30030d88b45dc3e8b644e6ec2e2e
+AUX logmon-0.4.4-gcc43.patch 211 BLAKE2B baf51fb3464d371cd884f6951fb5889df46efe36e0e5ff94012d31cff291bb83c40f9b5f178e16bbd27bb1a5d5b2ef601e0fd49c5936769dcd7f2d6bbaff7ab5 SHA512 8e5594fc769b1fe3807cc296e50dd2ae6f5035d60d6dc2faf586467d8693c1d7565f671025e2b588948abf27b2942d02f5afcdbeb02f4c60a3ce02f6acdfcd08
+AUX logmon-0.4.4-maintainer-mode.patch 284 BLAKE2B aecdf044dd1a91911edf87343a55718008db8d63eca95755fa71ae65175b8cca858cbddf1147b9f4e241adec18c59911f7d96bd27e81c65a610626644ccf58e9 SHA512 5720b1db0f9c449f02aee075cc677e83e0393b33ae990e6b88aa5d0b637b28d69d11b7813360f899510cf1a7d39b30d17117fccc1ceae2cf88aebb509eadb600
+AUX logmon-0.4.4-tinfo.patch 247 BLAKE2B ba5a762c187940fc86f7ae6845d221451a0158bbef85314f24a418d02f426460f5c8a5194eff9d6e413b41291444d7638c859ff7e9409540b6b0eb1152daa152 SHA512 3d11e8c19aff181a6886c6dd14cfe3956d1bc60c3919e9c1a1ce693111c407f9c631113386381c4391ccf4d81bdd6625fc255c7608c7f688880e22e84e9e1af7
+DIST LogMon-0.4.4.tar.bz2 65975 BLAKE2B 67f7dee996d18ef398dfbdf56c9092d2906f562aa245de0dc481eaa5c17edd8c9b300f234363641d6911cfe7b6d8c736a354e5f424eec948f0d520bb01e047ca SHA512 9ddbccfea0cae3d7fa6ffa9576f0030b6fb66e0dca152fb5242e7bd19ce319e922264720fa44f6b65319f8b25ad9e208a01434b94c629fa737bdd82ea22a4fac
+EBUILD logmon-0.4.4-r1.ebuild 853 BLAKE2B e6acec32ed26ed9f941820b6d6aa4e1495563871f8d07b4c0699822562181b95a8f4db9df69ddca9d3ee4b561810ab4829a2f0fae2c06755be9db4daa8ca6ce3 SHA512 64f74a0213a3129ad40333544fe30ae802101a5ca7c6c065ebb1431a0371d287f325f9ee185a995671e1a09bb6b265a9ea9f1073c42f49ece83de8b98b7e3367
+MISC metadata.xml 336 BLAKE2B 3cf4d66d0fd8c7d621a650d43fbed617006fc02f44f5cc515041b8746d9eb9f3f4336db6e2dd6b543aea3c5734bf5d8b275ad4258d5bd59a74cf6661e84f96a2 SHA512 e4d5565793ec2c2b9993f9561c8c84069afd5c7111ebc55339a545c146fc408c9f2ccd952d18152a07d12009634f27647295d4616f189ea5062b5db8bb6a8a59
diff --git a/app-admin/logmon/files/logmon-0.4.4-char2int.diff b/app-admin/logmon/files/logmon-0.4.4-char2int.diff
new file mode 100644
index 000000000000..f460d182ed00
--- /dev/null
+++ b/app-admin/logmon/files/logmon-0.4.4-char2int.diff
@@ -0,0 +1,11 @@
+--- a/Main.cc
++++ b/Main.cc
+@@ -264,7 +264,7 @@
+ {
+     (void) signal(SIGINT, sig_int);
+ 
+-    char c;
++    int c;
+ 
+ #ifdef __DEBUG__
+     ferr = fopen("err.txt","w");
diff --git a/app-admin/logmon/files/logmon-0.4.4-gcc43.patch b/app-admin/logmon/files/logmon-0.4.4-gcc43.patch
new file mode 100644
index 000000000000..de58b5a35798
--- /dev/null
+++ b/app-admin/logmon/files/logmon-0.4.4-gcc43.patch
@@ -0,0 +1,14 @@
+--- a/LineManip.cc
++++ b/LineManip.cc
+@@ -3,10 +3,11 @@
+ // 
+ 
+ #include <unistd.h>
+ #include <ncurses.h>
+ #include <ctype.h>
++#include <cstdlib>
+ 
+ #include "LineManip.h"
+ #include "Util.h"
+ 
+ #ifdef __DEBUG__
diff --git a/app-admin/logmon/files/logmon-0.4.4-maintainer-mode.patch b/app-admin/logmon/files/logmon-0.4.4-maintainer-mode.patch
new file mode 100644
index 000000000000..6f19ade7c9ad
--- /dev/null
+++ b/app-admin/logmon/files/logmon-0.4.4-maintainer-mode.patch
@@ -0,0 +1,15 @@
+--- a/configure.in
++++ b/configure.in
+@@ -1,11 +1,11 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(Main.cc)
+ 
+ 
+ AM_INIT_AUTOMAKE(logmon, 0.4.4)
+-
++AM_MAINTAINER_MODE
+ AC_CONFIG_HEADER(config.h)
+ 
+ dnl Checks for programs.
+ AC_PROG_AWK
+ AC_PROG_CXX 
diff --git a/app-admin/logmon/files/logmon-0.4.4-tinfo.patch b/app-admin/logmon/files/logmon-0.4.4-tinfo.patch
new file mode 100644
index 000000000000..4aa37b881ed2
--- /dev/null
+++ b/app-admin/logmon/files/logmon-0.4.4-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -16,6 +16,7 @@
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -lncurses:
+ AC_CHECK_LIB(ncurses, initscr)
++AC_SEARCH_LIBS(halfdelay, tinfo)
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
diff --git a/app-admin/logmon/logmon-0.4.4-r1.ebuild b/app-admin/logmon/logmon-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..f83eab27f8b8
--- /dev/null
+++ b/app-admin/logmon/logmon-0.4.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils autotools
+
+MY_P="LogMon-${PV}"
+DESCRIPTION="Split-screen terminal/ncurses based log viewer"
+HOMEPAGE="http://www.edespot.com/code/LogMon/"
+SRC_URI="http://www.edespot.com/code/LogMon/${MY_P}.tar.bz2"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Bug 119403 - should be in upstream next release
+	epatch "${FILESDIR}"/${P}-char2int.diff
+
+	# Bug 250602, gcc43 fix
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+
+	# Fixes maintainer-mode detected.
+	epatch "${FILESDIR}"/${P}-maintainer-mode.patch
+
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+
+	eautoreconf
+}
+
+src_install() {
+	dobin logmon
+
+	dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/app-admin/logmon/metadata.xml b/app-admin/logmon/metadata.xml
new file mode 100644
index 000000000000..9d1727e6bd92
--- /dev/null
+++ b/app-admin/logmon/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<longdescription>
+		Split-screen terminal/ncurses based log viewer.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/logrotate-3.13.0 b/app-admin/logrotate-3.13.0
deleted file mode 100644
index 3b82da6209cc..000000000000
--- a/app-admin/logrotate-3.13.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=Rotates, compresses, and mails system logs
-EAPI=6
-HOMEPAGE=https://github.com/logrotate/logrotate
-IUSE=acl +cron selinux
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron )
-SLOT=0
-SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.13.0/logrotate-3.13.0.tar.gz -> logrotate-3.13.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cf2e6dc1c26df125198bc0e3dec26af6
diff --git a/app-admin/logrotate-3.14.0 b/app-admin/logrotate-3.14.0
deleted file mode 100644
index 2be7c3950994..000000000000
--- a/app-admin/logrotate-3.14.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=Rotates, compresses, and mails system logs
-EAPI=6
-HOMEPAGE=https://github.com/logrotate/logrotate
-IUSE=acl +cron selinux
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron )
-SLOT=0
-SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.14.0/logrotate-3.14.0.tar.gz -> logrotate-3.14.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5cdaadece59da1a204899a063b57bc75
diff --git a/app-admin/logrotate-3.9.1 b/app-admin/logrotate-3.9.1
deleted file mode 100644
index 14be7c262189..000000000000
--- a/app-admin/logrotate-3.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Rotates, compresses, and mails system logs
-EAPI=5
-HOMEPAGE=https://github.com/logrotate/logrotate
-IUSE=acl +cron selinux
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron )
-SLOT=0
-SRC_URI=mirror://gentoo/logrotate-3.9.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=73d865f5efae3460303a9e80a119da8a
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
new file mode 100644
index 000000000000..c682ad8e6823
--- /dev/null
+++ b/app-admin/logrotate/Manifest
@@ -0,0 +1,17 @@
+AUX logrotate-3.13.0-fbsd.patch 855 BLAKE2B 48494caecc49d7b819f889bc7acf6bd29e71583625a0638b39c1f2d535396a88c205534353430d70fbb577093ab43bee4bec0325443cf3c233f5f28dcb20cb12 SHA512 5343814545554392f1ee1be5b35866ebce0d8f2f580cb7807940e3a5b2092025f1b9619fa0ff3bdf4b99aada4c46a602d6c34c6e3c1e42b15ce51cf9d879a3ed
+AUX logrotate-3.13.0-ignore-hidden.patch 542 BLAKE2B 01c6e92306eaa2356090e5539555711ff09c7bdc6042aad7f3c5d9faacf449f00bb3040132bd00774104f8c0a8cb40073cb7c26323978ef199847a88eee26e45 SHA512 88bd9dd906171d45877e4c21e40cfc9a729742825b4c5d583fd9364d3943aa604e037e4b58e053a1fc7c0b77bd5ed6171f741778716ef753ecbb02ebaf012589
+AUX logrotate-3.14.0-ignore-hidden.patch 548 BLAKE2B 29a8efd36b000cc670a8a2db46cac3ad12ca49c5900409c3e1b456da88acc869e66a479481fcb24731d44d7d1815fce54068542afaa4737093a65a35ea7cd79e SHA512 2f08e4b1b483d301e2c6f9a5440957f43d336d44b3393c4408a02b5491826f887d53c782a6c7472bdb1ede9baacf2d1608d7385a576da0a8441a4b5a48ee5113
+AUX logrotate-3.9.1-Werror.patch 344 BLAKE2B 6f132592ec2446943cb4f6426b7e25b432e9e44d82d080b3773ab7f5c34de019594ef77fa74cd74e026605e775ee2b119ab39c2eeb50a092dec1a1c502409b4a SHA512 6ae8b49d1f29ce1c32603716555085b7fa2d865177558abe92c84867c69ca84b8174563db07537801ad01572717670478b273acb34b5885b9170354d1cc02493
+AUX logrotate-3.9.1-atomic-create.patch 1253 BLAKE2B 2e3486f31991ea351300241fe2ea64ad8bea952c4faf7fbdf363b594a7823312c6c9497397abaf051c760e9fe93bb8b592ebb78ac85a23bba2f5db619de6c35f SHA512 92fa8e04522f9bf06840befcb019a498d465f2d8afa3475f97e953b4e8abf2cf63f2fa27d8c89c5620da59468f753d94720f5f3a604376d7e51b86c9eb156c99
+AUX logrotate-3.9.1-fbsd.patch 1393 BLAKE2B 27f82ffb51644ce117d53a0e484779692b0b8d547d14c944c87a41862127cf05c31477c73721bd2729dfc2c22264305ce60738063640dfef47c06bcdd9dd78e1 SHA512 dd8bc024eb280e5bcb2869682bedaf5c8db6d18976e412de3283f32bc5d9ad370fdda27194eae11fa3da53339d83ff20fe541e99eb8ed183997ecb85a606f822
+AUX logrotate-3.9.1-ignore-hidden.patch 551 BLAKE2B ed2a533ca01b99fa29b5a1fc4c51d5122e027f96d549dc2d453be963df990372b2b5a6ff994c62767657f49b46a950830ed43718f454f22283555ff1f7327486 SHA512 8a2060b4f3a92f7920090b4d02b4f66b7320c068936028f07dfefc0411b0f78b1477565cef627ce131d2cd5e98ead04b7d0289c4961e68da36a69a81d8b40acb
+AUX logrotate-3.9.1-noasprintf.patch 1263 BLAKE2B 5f145d46e3c372d3999d58bb8e01ea07d7c81559f576a783548588b823abe33142fddb0bfbed51ddb4986aad0655a6c2b6c5f092866612af80aa2ed4c24368a6 SHA512 c84be7ef011fe09a2fae67fa918080c1b0c098f0000e6cacdfcc34311f17c0131e68bc1e337559391ae7272fd326ac7ba6ba1cca20f99a9cc51367ac35a924e6
+AUX logrotate.conf 743 BLAKE2B d623d150d9959ae57e61af2c442434f81636521c133479aecbad8731662ee3743cb3db858ed8326ff87d61262d20893ab6141fe09d12979785e8c52c428f5964 SHA512 c0357a432a4619392895d8180db3c593239a96f62aba7cfd981c76e9d1dfd9d93d63860655025b1e9473374c2a51068028c3a3f316cb5cbb71562ca4a61d8d24
+AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe8d0bd1703e5075671dd1e13a030ec06fa269214bff9552670d3e0932e3dbde2e3673d59b7a50a2458b SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36
+DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a1623cf1aae2444e818339361c7b7762ce51fcbd124fefafbe47d529dd21ef346a6c9a267da20547914388db99dce003 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76
+DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
+DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
+EBUILD logrotate-3.13.0.ebuild 2543 BLAKE2B d79fec2304b6b52ec1cc064fc40aed2054edecf4abeb8dbd0d5df7f8bbb27e1a17a384cf4d44042197eac0c8ac7d5e6e888ef689fe2794ae206d946661b6196a SHA512 2f6b6caef77088ff1aee15f8a289f1b3559180034b5f2bfa5520b2c3627bb0f92e0f5555cbe914f4877b50729f84e3ca3f0353c6e1b63442e156b530819294a4
+EBUILD logrotate-3.14.0.ebuild 2512 BLAKE2B e4dad0f671460525797eb9ebcecb1cbd7bd45a9b7bb3032060a27ac4721893e06202a1e2d4708e1d6634e1b04133a929681b932ea1b9e437aecca4155f5a24d5 SHA512 7bc2005fa2562cb5e1dc722ce8ffb3067c2eefc26992bd46f2466d894dc8e245da645e98fccae4998c1cc390df5677f7e4999c7652a0d2289f1e4a42b17299cc
+EBUILD logrotate-3.9.1.ebuild 1767 BLAKE2B a59f23a8a0a24b416f23a087c60fe046260cc24521f68f2551bb2a2821d12e94307e2d620ec4b625cd1b6be21cafa3d2c0f044468dbc2760897e5bb7854ac7af SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03
+MISC metadata.xml 1119 BLAKE2B ddb2266925506c260c4b3f67e4dd906d9446a17a54b5a0ffce547d3c942750ead45dd1cfdcbae548a096d87ee1e247fcda9bcb81e83b829f0526d4bfd7b4a01d SHA512 99725d54d1cf68b257446ef8afc43d4bfe05cc789c818222d603012ae1e636624962c23a845f8858f4fc7aaf5a7e7f8085a7b173185ba66d7e390012dbceef79
diff --git a/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch b/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch
new file mode 100644
index 000000000000..028dc0551f17
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch
@@ -0,0 +1,36 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2017-10-14 18:52:56.829467653 +0200
++++ b/config.c	2017-10-14 18:54:57.049467139 +0200
+@@ -25,6 +25,10 @@
+ #include <sys/mman.h>
+ #include <libgen.h>
+ 
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "log.h"
+ #include "logrotate.h"
+ 
+diff -Nuar a/logrotate.c b/logrotate.c
+--- a/logrotate.c	2017-10-12 17:19:41.000000000 +0200
++++ b/logrotate.c	2017-10-14 18:56:23.419466769 +0200
+@@ -1,6 +1,6 @@
+ #include "queue.h"
+ /* alloca() is defined in stdlib.h in NetBSD */
+-#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <limits.h>
+@@ -27,6 +27,10 @@
+ #include <limits.h>
+ #endif
+ 
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "log.h"
+ #include "logrotate.h"
+ 
diff --git a/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch
new file mode 100644
index 000000000000..f3ade248d38c
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch
@@ -0,0 +1,14 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2017-10-12 16:05:41.000000000 +0200
++++ b/config.c	2017-10-14 18:52:56.829467653 +0200
+@@ -432,7 +432,9 @@
+ 	int i;
+ 
+ 	/* Check if fname is '.' or '..'; if so, return false */
+-	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
++  /* Don't include 'hidden' files either; this breaks Gentoo
++     portage config file management http://bugs.gentoo.org/87683 */
++  if (fname[0] == '.')
+ 		return 0;
+ 
+ 	/* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch
new file mode 100644
index 000000000000..6745126259be
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch
@@ -0,0 +1,14 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2018-03-09 17:47:08.000000000 +0100
++++ b/config.c	2018-03-09 19:47:42.274696766 +0100
+@@ -440,7 +440,9 @@
+ 	int i;
+ 
+ 	/* Check if fname is '.' or '..'; if so, return false */
+-	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
++    /* Don't include 'hidden' files either; this breaks Gentoo
++       portage config file management http://bugs.gentoo.org/87683 */
++    if (fname[0] == '.')
+ 		return 0;
+ 
+ 	/* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch b/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch
new file mode 100644
index 000000000000..b8cecc4ebfb2
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2015-04-03 09:39:35.000000000 +0200
++++ b/Makefile.am	2015-06-28 14:03:12.429999875 +0200
+@@ -1,7 +1,7 @@
+ MAN = logrotate.8
+ MAN5 = logrotate.conf.5
+ 
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ sbin_PROGRAMS = logrotate
+ logrotate_SOURCES = logrotate.c log.c config.c basenames.c
+ 
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch
new file mode 100644
index 000000000000..fdad8b6ea002
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch
@@ -0,0 +1,43 @@
+diff -Nuar a/logrotate.c b/logrotate.c
+--- a/logrotate.c	2015-06-28 13:57:18.449999884 +0200
++++ b/logrotate.c	2015-06-28 14:02:20.799999876 +0200
+@@ -371,15 +371,18 @@
+ int createOutputFile(char *fileName, int flags, struct stat *sb, acl_type acl, int force_mode)
+ {
+     int fd;
+-	struct stat sb_create;
+-	int acl_set = 0;
+-
+-	fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW),
+-		(S_IRUSR | S_IWUSR) & sb->st_mode);
++    int acl_set = 0;
++    struct stat sb_create;
++    char template[PATH_MAX + 1];
++    mode_t umask_value;
++    snprintf(template, PATH_MAX, "%s/logrotate_temp.XXXXXX", ourDirName(fileName));
++    umask_value = umask(0000);
++    fd = mkostemp(template, (flags | O_EXCL | O_NOFOLLOW));
++    umask(umask_value);
+ 
+     if (fd < 0) {
+-	message(MESS_ERROR, "error creating output file %s: %s\n",
+-		fileName, strerror(errno));
++	message(MESS_ERROR, "error creating unique temp file: %s\n",
++		strerror(errno));
+ 	return -1;
+     }
+     if (fchmod(fd, (S_IRUSR | S_IWUSR) & sb->st_mode)) {
+@@ -430,6 +433,13 @@
+ 		}
+ 	}
+ 
++    if (rename(template, fileName)) {
++        message(MESS_ERROR, "error renaming temp file to %s: %s\n",
++        fileName, strerror(errno));
++        close(fd);
++        return -1;
++    }
++
+     return fd;
+ }
+ 
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch b/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch
new file mode 100644
index 000000000000..6e329d6149f3
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch
@@ -0,0 +1,57 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2015-06-28 13:54:18.309999889 +0200
++++ b/config.c	2015-06-28 13:56:49.599999885 +0200
+@@ -1,6 +1,6 @@
+ #include "queue.h"
+ /* Alloca is defined in stdlib.h in NetBSD */
+-#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <limits.h>
+@@ -24,6 +24,10 @@
+ #include <fnmatch.h>
+ #include <sys/mman.h>
+ 
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "basenames.h"
+ #include "log.h"
+ #include "logrotate.h"
+diff -Nuar a/logrotate.c b/logrotate.c
+--- a/logrotate.c	2015-04-03 09:39:35.000000000 +0200
++++ b/logrotate.c	2015-06-28 13:57:18.449999884 +0200
+@@ -1,6 +1,6 @@
+ #include "queue.h"
+ /* alloca() is defined in stdlib.h in NetBSD */
+-#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <limits.h>
+@@ -26,6 +26,10 @@
+ #include <limits.h>
+ #endif
+ 
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "basenames.h"
+ #include "log.h"
+ #include "logrotate.h"
+diff -Nuar a/Makefile b/Makefile
+--- a/Makefile	2015-04-03 09:39:35.000000000 +0200
++++ b/Makefile	2015-06-28 13:58:05.729999883 +0200
+@@ -22,7 +22,9 @@
+ 
+ ifeq ($(WITH_ACL),yes)
+ CFLAGS += -DWITH_ACL
++ifneq ($(OS_NAME),FreeBSD)
+ LOADLIBES += -lacl
++endif
+ # See pretest
+ TEST_ACL=1
+ else
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch
new file mode 100644
index 000000000000..31d9298779c2
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch
@@ -0,0 +1,15 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2015-04-03 09:39:35.000000000 +0200
++++ b/config.c	2015-06-28 13:54:18.309999889 +0200
+@@ -359,7 +359,10 @@
+ 	char *pattern;
+ 
+ 	/* Check if fname is '.' or '..'; if so, return false */
+-	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
++	/* Don't include 'hidden' files either; this breaks Gentoo 
++	   portage config file management http://bugs.gentoo.org/87683 */
++	if (fname[0] == '.')
++
+ 		return 0;
+ 
+ 	/* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch
new file mode 100644
index 000000000000..7983943ca89b
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch
@@ -0,0 +1,55 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2015-06-28 13:56:49.599999885 +0200
++++ b/config.c	2015-06-28 13:59:34.799999880 +0200
+@@ -49,39 +49,6 @@
+ #include "asprintf.c"
+ #endif
+
+-#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
+-#include <stdarg.h>
+-
+-int asprintf(char **string_ptr, const char *format, ...)
+-{
+-	va_list arg;
+-	char *str;
+-	int size;
+-	int rv;
+-
+-	va_start(arg, format);
+-	size = vsnprintf(NULL, 0, format, arg);
+-	size++;
+-	va_start(arg, format);
+-	str = malloc(size);
+-	if (str == NULL) {
+-		va_end(arg);
+-		/*
+-		 * Strictly speaking, GNU asprintf doesn't do this,
+-		 * but the caller isn't checking the return value.
+-		 */
+-		fprintf(stderr, "failed to allocate memory\\n");
+-		exit(1);
+-	}
+-	rv = vsnprintf(str, size, format, arg);
+-	va_end(arg);
+-
+-	*string_ptr = str;
+-	return (rv);
+-}
+-
+-#endif
+-
+ #if !defined(strndup)
+ char *strndup(const char *s, size_t n)
+ {
+diff -Nuar a/logrotate.h b/logrotate.h
+--- a/logrotate.h	2015-04-03 09:39:35.000000000 +0200
++++ b/logrotate.h	2015-06-28 13:59:47.429999880 +0200
+@@ -80,8 +80,5 @@
+ extern int debug;
+ 
+ int readAllConfigPaths(const char **paths);
+-#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
+-int asprintf(char **string_ptr, const char *format, ...);
+-#endif
+ 
+ #endif
diff --git a/app-admin/logrotate/files/logrotate.conf b/app-admin/logrotate/files/logrotate.conf
new file mode 100644
index 000000000000..ff3319fd8351
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate.conf
@@ -0,0 +1,42 @@
+#
+# Default logrotate(8) configuration file for Gentoo Linux.
+# See "man logrotate" for details.
+
+# rotate log files weekly.
+weekly
+#daily
+
+# keep 4 weeks worth of backlogs.
+rotate 4
+
+# create new (empty) log files after rotating old ones.
+create
+
+# use date as a suffix of the rotated file.
+dateext
+
+# compress rotated log files.
+compress
+
+notifempty
+nomail
+noolddir
+
+# packages can drop log rotation information into this directory.
+include /etc/logrotate.d
+
+# no packages own wtmp and btmp -- we'll rotate them here.
+/var/log/wtmp {
+    monthly
+    create 0664 root utmp
+    minsize 1M
+    rotate 1
+}
+/var/log/btmp {
+    missingok
+    monthly
+    create 0600 root utmp
+    rotate 1
+}
+
+# system-specific logs may be also be configured here.
diff --git a/app-admin/logrotate/files/logrotate.tmpfiles b/app-admin/logrotate/files/logrotate.tmpfiles
new file mode 100644
index 000000000000..dfb4ab66c132
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/misc
diff --git a/app-admin/logrotate/logrotate-3.13.0.ebuild b/app-admin/logrotate/logrotate-3.13.0.ebuild
new file mode 100644
index 000000000000..3e708af36c72
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.13.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+	>=dev-libs/popt-1.5
+	selinux? ( sys-libs/libselinux )
+	acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+	>=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-logrotate )
+	cron? ( virtual/cron )"
+
+STATEFILE="/var/lib/misc/logrotate.status"
+OLDSTATEFILE="/var/lib/logrotate.status"
+
+move_old_state_file() {
+	elog "logrotate state file is now located at ${STATEFILE}"
+	elog "See bug #357275"
+	if [[ -e "${OLDSTATEFILE}" ]] ; then
+		elog "Moving your current state file to new location: ${STATEFILE}"
+		mv -n "${OLDSTATEFILE}" "${STATEFILE}"
+	fi
+}
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+	"${FILESDIR}/${P}-ignore-hidden.patch"
+	"${FILESDIR}/${P}-fbsd.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
+}
+
+src_configure() {
+	econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	insinto /usr
+	dobin logrotate
+	doman logrotate.8
+	dodoc ChangeLog.md examples/logrotate-default
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	systemd_dounit examples/logrotate.{service,timer}
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	elog
+	elog "The ${PN} binary is now installed under /usr/bin. Please"
+	elog "update your links"
+	elog
+	move_old_state_file
+	elog "If you are running systemd you might need to run:"
+	elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
+	elog "in order to create the new location of the logrotate state file"
+	elog
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs. See man logrotate for details."
+	fi
+}
diff --git a/app-admin/logrotate/logrotate-3.14.0.ebuild b/app-admin/logrotate/logrotate-3.14.0.ebuild
new file mode 100644
index 000000000000..2a41a2fa759d
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.14.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+	>=dev-libs/popt-1.5
+	selinux? ( sys-libs/libselinux )
+	acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+	>=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-logrotate )
+	cron? ( virtual/cron )"
+
+STATEFILE="/var/lib/misc/logrotate.status"
+OLDSTATEFILE="/var/lib/logrotate.status"
+
+move_old_state_file() {
+	elog "logrotate state file is now located at ${STATEFILE}"
+	elog "See bug #357275"
+	if [[ -e "${OLDSTATEFILE}" ]] ; then
+		elog "Moving your current state file to new location: ${STATEFILE}"
+		mv -n "${OLDSTATEFILE}" "${STATEFILE}"
+	fi
+}
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+	"${FILESDIR}/${P}-ignore-hidden.patch"
+)
+
+src_prepare() {
+	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
+	default
+}
+
+src_configure() {
+	econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	insinto /usr
+	dobin logrotate
+	doman logrotate.8
+	dodoc ChangeLog.md examples/logrotate-default
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	systemd_dounit examples/logrotate.{service,timer}
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	elog
+	elog "The ${PN} binary is now installed under /usr/bin. Please"
+	elog "update your links"
+	elog
+	move_old_state_file
+	elog "If you are running systemd you might need to run:"
+	elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
+	elog "in order to create the new location of the logrotate state file"
+	elog
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs. See man logrotate for details."
+	fi
+}
diff --git a/app-admin/logrotate/logrotate-3.9.1.ebuild b/app-admin/logrotate/logrotate-3.9.1.ebuild
new file mode 100644
index 000000000000..060e11be388f
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.9.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+	>=dev-libs/popt-1.5
+	selinux? (
+		sys-libs/libselinux
+	)
+	acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+	>=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-logrotate )
+	cron? ( virtual/cron )"
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-ignore-hidden.patch \
+		"${FILESDIR}"/${P}-fbsd.patch \
+		"${FILESDIR}"/${P}-noasprintf.patch \
+		"${FILESDIR}"/${P}-atomic-create.patch \
+		"${FILESDIR}"/${P}-Werror.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with acl) $(use_with selinux)
+}
+
+src_compile() {
+	emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	insinto /usr
+	dosbin logrotate
+	doman logrotate.8
+	dodoc CHANGES examples/logrotate*
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs.  See man logrotate for details."
+	fi
+}
diff --git a/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
new file mode 100644
index 000000000000..e5648d41d70a
--- /dev/null
+++ b/app-admin/logrotate/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nimiux@gentoo.org</email>
+		<name>Chema Alonso</name>
+	</maintainer>
+	<longdescription lang="en">
+		Logrotate allows for the automatic rotation compression, removal
+		and mailing of log files. Logrotate can be set to handle a log
+		file daily, weekly, monthly or when the log file gets to a certain
+		size. 
+	</longdescription>
+	<longdescription lang="es">
+		Logrotate permite la rotación, compresión, eliminación y
+		notificación por correo electrónico de forma automática de ficheros
+		de registro (logs). Logrotate se puede configurar para gestionar
+		estos ficheros diariamente, semanalmente, mensualmente o cuando
+		su tamaño alcanza cierto valor.
+	</longdescription>
+	<use>
+		<flag name="acl">Installs acl support</flag>
+		<flag name="cron">Installs cron file</flag>
+		<flag name="selinux">Installs Security Enhanced Linux support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">logrotate/logrotate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/logsentry-1.1.1-r2 b/app-admin/logsentry-1.1.1-r2
deleted file mode 100644
index e5ee28b99a06..000000000000
--- a/app-admin/logsentry-1.1.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Automatically monitor system logs and mail security violations
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/sentrytools/
-KEYWORDS=amd64 arm ~mips ppc ~s390 ~sh sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/mailx
-SLOT=0
-SRC_URI=mirror://gentoo/logsentry-1.1.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=1ea176a3d6f6bf77ccc92fcc0e90e4e7
diff --git a/app-admin/logsentry/Manifest b/app-admin/logsentry/Manifest
new file mode 100644
index 000000000000..8b5990801421
--- /dev/null
+++ b/app-admin/logsentry/Manifest
@@ -0,0 +1,3 @@
+DIST logsentry-1.1.1.tar.gz 30267 BLAKE2B e81fb68484fb05f40d61e2d34bc6e0953e99a46b299f4384592bb4a5a1b53874ca382dfaf68f60ee232d56a9c23ec4840ddc71033fb20b88f653d2fc00384869 SHA512 4be045289259655e7b4da05dd1a07c649b2289fbc6f15dd424dc48ab980478f3ae49501f0e9e2035fddb9a40acaf2f4ab310ff8d95355196d82d41d6fc860143
+EBUILD logsentry-1.1.1-r2.ebuild 1672 BLAKE2B 2fe664d750585d2c9bf6ed4917a8f75e5c9d2fba637d5b216328ed9030bc1bc35bab12a55f3b0f87eff6d4a35095a5eed3c58a8dbcd3b0d0555373cd0fe6c4d0 SHA512 037e49a772278c28745bbe72c5d8cdae5bdb3f77476bf0a55c1b26fa3f9aeb321f33be358c13dd07a0d3186860c6beb85f9678fd81d1d76ab269caeeee0cad48
+MISC metadata.xml 248 BLAKE2B 495eba242dfadfd944d3f74a526162dc04de2d8fcebcb6d5dce43c20500407485c24fe61d537f8015739463543b53ed6fbd9d07242a45782df2c2a8d68e053ab SHA512 52d286d2ecc5d8b66e2468683db28439cdcbcc96c88d8dba8a415049def3c53bc130783853aee9918c6b0dc4ae295aba44d601687d440196399903b25e92b5f9
diff --git a/app-admin/logsentry/logsentry-1.1.1-r2.ebuild b/app-admin/logsentry/logsentry-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..f21b1a952619
--- /dev/null
+++ b/app-admin/logsentry/logsentry-1.1.1-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Automatically monitor system logs and mail security violations"
+# Seems that the project has been discontinued by CISCO?
+HOMEPAGE="https://sourceforge.net/projects/sentrytools/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ~s390 ~sh sparc x86"
+IUSE=""
+
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="virtual/mailx"
+
+S="${WORKDIR}"/logcheck-${PV}
+
+src_compile() {
+	einfo "compile and install mixed in the package makefile"
+}
+
+src_install() {
+	dodir /usr/bin /var/tmp/logcheck /etc/logcheck
+	cp systems/linux/logcheck.sh{,.orig} || die
+	sed -i \
+		-e 's:/usr/local/bin:/usr/bin:' \
+		-e 's:/usr/local/etc:/etc/logcheck:' \
+		-e 's:/etc/logcheck/tmp:/var/tmp/logcheck:' \
+		systems/linux/logcheck.sh || \
+			die "sed logcheck.sh failed"
+	sed -i \
+		-e "s:/usr/local/bin:${D}/usr/bin:" \
+		-e "s:/usr/local/etc:${D}/etc/logcheck:" \
+		-e "s:/etc/logcheck/tmp:/var/tmp/logcheck:" \
+		-e "s:\$(CC):& \$(LDFLAGS):" \
+		Makefile || die "sed Makefile failed"
+	make CC="$(tc-getCC)" CFLAGS="${CFLAGS}" linux || die
+
+	dodoc README* CHANGES CREDITS
+	dodoc systems/linux/README.*
+
+	cat << EOF > "${S}"/logsentry.cron || die
+#!/bin/sh
+#
+# Uncomment the following if you want
+# logsentry (logcheck) to run hourly
+#
+# this is part of the logsentry package
+#
+#
+
+#/bin/sh /etc/logcheck/logcheck.sh
+EOF
+
+	exeinto /etc/cron.hourly
+	doexe logsentry.cron
+}
+
+pkg_postinst() {
+	elog
+	elog "Uncomment the logcheck line in /etc/cron.hourly/logsentry.cron,"
+	elog "or add directly to root's crontab"
+	elog
+}
diff --git a/app-admin/logsentry/metadata.xml b/app-admin/logsentry/metadata.xml
new file mode 100644
index 000000000000..83faec9523ff
--- /dev/null
+++ b/app-admin/logsentry/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">sentrytools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/logstalgia-1.0.7 b/app-admin/logstalgia-1.0.7
deleted file mode 100644
index e4cce22aa792..000000000000
--- a/app-admin/logstalgia-1.0.7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-libs/libpcre media-libs/freetype:2 media-libs/glew:0= media-libs/libsdl2[opengl,threads] media-libs/libpng:0= media-libs/sdl2-image[jpeg,png] virtual/glu virtual/opengl dev-libs/boost media-libs/glm virtual/pkgconfig
-DESCRIPTION=Replays or streams an access_log as a retro arcade game-like simulation
-EAPI=6
-HOMEPAGE=http://logstalgia.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libpcre media-libs/freetype:2 media-libs/glew:0= media-libs/libsdl2[opengl,threads] media-libs/libpng:0= media-libs/sdl2-image[jpeg,png] virtual/glu virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/acaudwell/Logstalgia/releases/download/logstalgia-1.0.7/logstalgia-1.0.7.tar.gz
-_md5_=ef26d854dce57a2262c938efdd114d19
diff --git a/app-admin/logstalgia/Manifest b/app-admin/logstalgia/Manifest
new file mode 100644
index 000000000000..c5c96baf293f
--- /dev/null
+++ b/app-admin/logstalgia/Manifest
@@ -0,0 +1,3 @@
+DIST logstalgia-1.0.7.tar.gz 902050 BLAKE2B 1ba368134c6335949e19a64b4b9167337a7475eac423fc14a3b906c89fa5a84e0062e1e123ef4c2b998c7596710df1844c5e7a46792d0f075b001ccaaa9c6c8d SHA512 862950ec387e27d72fe127fcccd37d1e6a0ed8b77fb243c119ef8b48b5bc45092d1b6881b9afbc016969e80a427fa4e210aa5d35524baf191d0c4fad5f91e3a9
+EBUILD logstalgia-1.0.7.ebuild 673 BLAKE2B 8e33b2c46c87b28b3b2bcb7beda36e76774bb110f894b8617093f032ebb578e9a70064d3823ebad7e48467668e87aee392202fc39dd798464c9a6ff9150517e8 SHA512 96f12f71f73dcc569712d9a9c888078786c28c3892cef7a370c88709696bfaec69c7a7a4614e22018079f62430178c9489974b53beee609b64c8af4ff1624e59
+MISC metadata.xml 399 BLAKE2B f6f66afb0eb1ddbca766a65035c4af929cf91714c18f4e0cb022ae04fda33bab7dd00739cfd4c1ac3413422dd6ab65d7ee3e5e8d05f0ddf360257212cdefa102 SHA512 0af3dd67c742ed83c332389f6ca3709d3382fe4bca940b6ce05b0271a08b2a5a7ee3d49789db4b8fb66831d17cc01acdff60d5064cb9ab4540e5b2f965ff2b41
diff --git a/app-admin/logstalgia/logstalgia-1.0.7.ebuild b/app-admin/logstalgia/logstalgia-1.0.7.ebuild
new file mode 100644
index 000000000000..91fcf17890cc
--- /dev/null
+++ b/app-admin/logstalgia/logstalgia-1.0.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Replays or streams an access_log as a retro arcade game-like simulation"
+HOMEPAGE="http://logstalgia.io/"
+SRC_URI="https://github.com/acaudwell/Logstalgia/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/libpcre
+	media-libs/freetype:2
+	media-libs/glew:0=
+	media-libs/libsdl2[opengl,threads]
+	media-libs/libpng:0=
+	media-libs/sdl2-image[jpeg,png]
+	virtual/glu
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	media-libs/glm
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog INSTALL README THANKS )
diff --git a/app-admin/logstalgia/metadata.xml b/app-admin/logstalgia/metadata.xml
new file mode 100644
index 000000000000..788aa1a7159b
--- /dev/null
+++ b/app-admin/logstalgia/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>pinkbyte@gentoo.org</email>
+    <name>Sergey Popov</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">logstalgia</remote-id>
+    <remote-id type="github">acaudwell/Logstalgia</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/logstash-bin-5.6.9 b/app-admin/logstash-bin-5.6.9
deleted file mode 100644
index e35869c59664..000000000000
--- a/app-admin/logstash-bin-5.6.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Tool for managing events and logs
-EAPI=6
-HOMEPAGE=https://www.elastic.co/products/logstash
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 MIT
-RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://artifacts.elastic.co/downloads/logstash/logstash-5.6.9.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8fcd8f5bec7f335cc19057ed6606a935
diff --git a/app-admin/logstash-bin-6.2.4 b/app-admin/logstash-bin-6.2.4
deleted file mode 100644
index ba16697ece53..000000000000
--- a/app-admin/logstash-bin-6.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Tool for managing events and logs
-EAPI=6
-HOMEPAGE=https://www.elastic.co/products/logstash
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 MIT
-RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://artifacts.elastic.co/downloads/logstash/logstash-6.2.4.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8fcd8f5bec7f335cc19057ed6606a935
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
new file mode 100644
index 000000000000..1e7f28bb8dc3
--- /dev/null
+++ b/app-admin/logstash-bin/Manifest
@@ -0,0 +1,11 @@
+AUX agent.conf.sample 409 BLAKE2B c97d35ccecedf47c234e2cb1b3bc20b5aea9254bed08f06e744f44e3567eaa88d232f487a8c185375fc8ba4ad9cc9b15f750649286f1e1c4431d732dc5847550 SHA512 fd9a5fc56d7329113b589f71de030e02c0e1d5575b4ac9fe340fdde6d65d44bc0408f67cc36b6ddb248beb22cb7059727a99f5dc5d92ba2f59816a023a915fd0
+AUX logstash-plugin.eselect 1768 BLAKE2B 539246fb1c6e00fa0928af146d3c32ef69f61e3d419ebba97e688ba151fc34b1cb4a77180c36cd02348616a5069d4c013302270c0127fbe7e836e3f866569d1d SHA512 c80c0f2942643dbdb56c21d2ae0679ac92fb5c84b4f51cb426108c1030434fb32bcadc7131bdaabfe34a458e2bf35965c4acccfb42b99c790a26c2b9ae2a24eb
+AUX logstash.confd 775 BLAKE2B fdcf55e1155c746764aa765350367c421f9ba84b6a1a1cdba94f482bbb3afc904af0995929d75326947e5fc0cfd51bc7608c19a04dd52018cb696d602c39094b SHA512 f0d9270f9158e39ee6b3f0a0e626c252e425246fa76098055161e97c9b4cbe14a9f4db2ea9c64636ef5adba7dd72ac3451af63cfcf4598517c29f8c5efcba14a
+AUX logstash.confd-r1 837 BLAKE2B dd8362a386c865b44e05dd4a244146c5b593e4497d876c23c64e2f2811155355fac51e1af7ec079a8dad7141c2ad3e0eecf3b58971efe3352d4e61d210b46400 SHA512 7a7dcbfe2a8f80804083099a942ca51b235440cd356c1e2310ed060c9260ca0ee7d970b0f5293c67290b17bab4e9c8e0669bdef98f51ed1a97f83ae444c7861e
+AUX logstash.initd 2091 BLAKE2B 980722c1c3cd0cc60cf440d5a06185c66ac4348c0e8990036812ad8f5cbd4e2561affab3ef1de2482990635169afdd10c0841167494d2bf024b28101a0df45fc SHA512 5592918e82182f638a02f6446f9103f70274fdf615573aa4463fde1dfcfa7955c715b0fdcb1f98de9c19ab86268b439d253a696b27f32e55d830cc3839231e30
+AUX logstash.initd-r1 2176 BLAKE2B 37c05148d3789c69805ae5151bed5e297d71b9d60d71ff98ed411ac59b73c4a2a9462e6223a2c960301c6228c84879460ae0f793a24806768fb727b01d982709 SHA512 392c8297c6429e0384dd75073773e1f8f51dd62fd155b2a524efd9e862df114b13cc63cf37237526aebe838b5ff26a8f26a3ad08058a56a723e25025df9a16af
+DIST logstash-5.6.9.zip 108563466 BLAKE2B 9225b823ac1f746481b34894c181aedabb0e69eb4242527271240448504f46aa68ba72f63e3752a6a13c3d567bca89df272a09cacc62739a526e3cb24ca90072 SHA512 f5506b2f2bb2da4b2a8d7b199cc328de6625f623b9498f4f2e5505aa8b4082efa207a06d1df8af7b7c21c400268e51d7ae8b9200afdaa191b8e8644e033a9b6b
+DIST logstash-6.2.4.zip 153969993 BLAKE2B 989f631484be14014b8230e09fa049a0e470078fed938f2df55134a27d5f4f2d8670187126d32c4933b77b496a6ed96e12d180922c2c318c67fb3dbeec5a5a3b SHA512 65f6e5accc4441cb930e5c45723edeea54ba034a25680ca34114296af5a2c456d4152f9b38469475e600fce27a27b0d9c1d206039d12f2ec9cfeb02942a5c189
+EBUILD logstash-bin-5.6.9.ebuild 2219 BLAKE2B 7ddc549eabf27143b5951e0e92777609f5d14b76c80ee2b6f794679ef8af73d4a97e59ab106ee196b1df5ed1a1199427e9218db8efaf67d495c84594647e7aa2 SHA512 3fdf9156fe2d3baecf3a4599890a07e7aa572c08b72d173c79dc415ab7339d6e0c9050c73a4c74da0f6bcd412484f6534aea784bb9028ff661d1a700f0b4b18c
+EBUILD logstash-bin-6.2.4.ebuild 2219 BLAKE2B 7ddc549eabf27143b5951e0e92777609f5d14b76c80ee2b6f794679ef8af73d4a97e59ab106ee196b1df5ed1a1199427e9218db8efaf67d495c84594647e7aa2 SHA512 3fdf9156fe2d3baecf3a4599890a07e7aa572c08b72d173c79dc415ab7339d6e0c9050c73a4c74da0f6bcd412484f6534aea784bb9028ff661d1a700f0b4b18c
+MISC metadata.xml 578 BLAKE2B 739149a851fd22460a5cf86deaa74732e44ef44c9edfcba880e7734a8660c92d18df33728939addff8e95241c0475cafed5b0df77d0b9acde609b163f8e7eb0f SHA512 ce9ff07c8fa8edf104692b2736dd7e1a4b2d456dfd2f2cebc2a3dec28d7c11020abf21dad583663266ed5ab26670959bd4650a411524581019e0b27504fba049
diff --git a/app-admin/logstash-bin/files/agent.conf.sample b/app-admin/logstash-bin/files/agent.conf.sample
new file mode 100644
index 000000000000..85c9b5c93d2a
--- /dev/null
+++ b/app-admin/logstash-bin/files/agent.conf.sample
@@ -0,0 +1,29 @@
+input {
+    beats {
+      port => 5044
+    }
+
+    # may need root privileges
+    file {
+        type => "syslog"
+        path => [ "/var/log/*.log", "/var/log/debug", "/var/log/messages", "/var/log/syslog" ]
+    }
+
+    redis {
+      key => logstash
+      data_type => list
+    }
+
+    stdin {
+        type => "stdin"
+    }
+}
+
+output {
+    stdout {
+        codec => rubydebug
+    }
+
+    elasticsearch {
+    }
+}
diff --git a/app-admin/logstash-bin/files/logstash-plugin.eselect b/app-admin/logstash-bin/files/logstash-plugin.eselect
new file mode 100644
index 000000000000..29678309f411
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash-plugin.eselect
@@ -0,0 +1,85 @@
+# -*-eselect-*-  vim: ft=eselect
+# Copyright 2005-2017 Gentoo Foundation
+# Distributed under the terms of the GNU GPL version 2 or later
+
+DESCRIPTION="Manage user installed plugins of logstash"
+MAINTAINER="hydrapolic@gmail.com"
+
+PLUGINS="/var/lib/logstash/plugins-list.txt"
+LS_INSTALL_DIR="/opt/logstash"
+
+ls_plugin_wrapper() {
+  JARS_SKIP=true "${LS_INSTALL_DIR}/bin/logstash-plugin" "${1}" "${2}" || die
+}
+
+### install action
+describe_install() {
+  echo "Install plugin"
+}
+
+describe_install_parameters() {
+  echo "<plugin>"
+}
+
+do_install() {
+  [[ ${#} -lt 1 ]] && die "Please specify at least one plugin"
+
+  local plugin
+  for plugin; do
+    ls_plugin_wrapper install "${plugin}"
+    echo "${plugin}" >> "${PLUGINS}" || die
+  done
+
+  sort -u "${PLUGINS}" > "${PLUGINS}.tmp" || die
+  mv "${PLUGINS}.tmp" "${PLUGINS}" || die
+}
+
+### list action
+describe_list() {
+  echo "List user installed plugins"
+}
+
+do_list() {
+  if [[ -f "${PLUGINS}" ]]; then
+    write_list_start "Installed plugins:"
+
+    local plugin
+    while read -r plugin; do
+      write_kv_list_entry "${plugin}"
+    done < "${PLUGINS}"
+  fi
+}
+
+### reinstall action
+describe_reinstall() {
+  echo "Reinstall plugins"
+}
+
+do_reinstall() {
+  if [[ -f "${PLUGINS}" ]]; then
+    local plugin
+    while read -r plugin; do
+      ls_plugin_wrapper install "${plugin}"
+    done < "${PLUGINS}"
+  fi
+}
+
+### uninstall action
+describe_uninstall() {
+  echo "Uninstall plugin"
+}
+
+describe_uninstall_parameters() {
+  echo "<plugin>"
+}
+
+do_uninstall() {
+  if [[ -f "${PLUGINS}" ]]; then
+    local plugin
+    for plugin; do
+      grep "^${plugin}\$" "${PLUGINS}" || write_warning_msg "Plugin ${plugin} not recorded"
+      sed -i "/^${plugin}\$/d" "${PLUGINS}" || die
+      ls_plugin_wrapper remove "${plugin}"
+    done
+  fi
+}
diff --git a/app-admin/logstash-bin/files/logstash.confd b/app-admin/logstash-bin/files/logstash.confd
new file mode 100644
index 000000000000..6dbbe627a5ad
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.confd
@@ -0,0 +1,37 @@
+###############################
+# Default settings for logstash
+###############################
+
+# Set a home directory
+#LS_HOME=/var/lib/logstash
+
+# Set data directory
+#LS_DATA_DIR=${LS_HOME}/data
+
+# Arguments to pass to logstash agent
+#LS_OPTS=""
+
+# Arguments to pass to java
+#LS_HEAP_SIZE="500m"
+#LS_JAVA_OPTS="-Djava.io.tmpdir=$HOME"
+
+# user id to be invoked as
+#LS_USER=logstash
+#LS_GROUP=logstash
+
+# logstash logging
+#LS_LOG_DIR=/var/log/logstash
+#LS_USE_GC_LOGGING="true"
+
+# logstash configuration directory
+#LS_CONF_DIR=/etc/logstash/conf.d
+
+# Open file limit
+#LS_OPEN_FILES=16384
+
+# Nice level
+#LS_NICE=19
+
+# If this is set to 1, then when `stop` is called, if the process has
+# not exited within a reasonable time, SIGKILL will be sent next.
+KILL_ON_STOP_TIMEOUT=0
diff --git a/app-admin/logstash-bin/files/logstash.confd-r1 b/app-admin/logstash-bin/files/logstash.confd-r1
new file mode 100644
index 000000000000..5f59b606fed2
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.confd-r1
@@ -0,0 +1,40 @@
+###############################
+# Default settings for logstash
+###############################
+
+# Set a home directory
+#LS_HOME=/var/lib/logstash
+
+# Set data directory
+#LS_DATA_DIR=${LS_HOME}/data
+
+# Arguments to pass to logstash agent
+#LS_OPTS=""
+
+# Arguments to pass to java
+#LS_HEAP_SIZE="500m"
+#LS_JAVA_OPTS="-Djava.io.tmpdir=$HOME"
+
+# user id to be invoked as
+#LS_USER=logstash
+#LS_GROUP=logstash
+
+# logstash logging
+#LS_LOG_DIR=/var/log/logstash
+#LS_USE_GC_LOGGING="true"
+
+# logstash settings directory
+#LS_SETTINGS_DIR=/etc/logstash
+
+# logstash configuration directory
+#LS_CONF_DIR=/etc/logstash/conf.d
+
+# Open file limit
+#LS_OPEN_FILES=16384
+
+# Nice level
+#LS_NICE=19
+
+# If this is set to 1, then when `stop` is called, if the process has
+# not exited within a reasonable time, SIGKILL will be sent next.
+KILL_ON_STOP_TIMEOUT=0
diff --git a/app-admin/logstash-bin/files/logstash.initd b/app-admin/logstash-bin/files/logstash.initd
new file mode 100644
index 000000000000..2133421377d6
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.initd
@@ -0,0 +1,74 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LS_USER=${LS_USER:-logstash}
+LS_GROUP=${LS_GROUP:-$LS_USER}
+LS_LOG_DIR=${LS_LOG_DIR:-/var/log/logstash}
+LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
+LS_HOME=${LS_HOME:-/var/lib/logstash}
+LS_DATA_DIR=${LS_DATA_DIR:-$LS_HOME/data}
+LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
+LS_NICE=${LS_NICE:-19}
+LS_JAVA_OPTS=${LS_JAVA_OPTS:-"-Djava.io.tmpdir=${LS_HOME}"}
+LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING:-false}
+LS_OPEN_FILES=${LS_OPEN_FILES:-16384}
+KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0}
+
+LS_INSTALL_DIR="/opt/logstash"
+
+command="${LS_INSTALL_DIR}/bin/logstash"
+command_args="--path.config ${LS_CONF_DIR} --path.logs ${LS_LOG_DIR} --path.data ${LS_DATA_DIR} ${LS_OPTS}"
+command_background="true"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
+	--chdir ${LS_HOME}
+	--nicelevel ${LS_NICE}
+	--env LS_HEAP_SIZE=${LS_HEAP_SIZE}
+	--env LS_JAVA_OPTS=${LS_JAVA_OPTS}
+	--env LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING}"
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+checkconfig() {
+	if [ ! -f ${LS_CONF_DIR}/* ]; then
+		eerror "Please put your configuration in ${LS_CONF_DIR}"
+		exit 1
+	fi
+
+	ebegin "Checking your configuration"
+	${command} ${command_args} --path.logs "${LS_LOG_DIR}/configcheck" --config.test_and_exit
+	eend $? "Configuration error. Please fix your configuration files."
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading configuration"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	rc_ulimit="-n ${LS_OPEN_FILES}"
+
+	local d
+	for d in "${LS_HOME}" "${LS_DATA_DIR}" "${LS_DATA_DIR}/queue" "${LS_DATA_DIR}/dead_letter_queue" "${LS_LOG_DIR}"; do
+		checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$d"
+	done
+}
+
+stop() {
+	ebegin "Stopping logstash"
+	if [ "${KILL_ON_STOP_TIMEOUT}" = "1" ]; then
+		start-stop-daemon --stop \
+			--pidfile=${pidfile} \
+			--retry=TERM/5/KILL/5
+	else
+		start-stop-daemon --stop \
+			--pidfile=${pidfile}
+	fi
+}
diff --git a/app-admin/logstash-bin/files/logstash.initd-r1 b/app-admin/logstash-bin/files/logstash.initd-r1
new file mode 100644
index 000000000000..2e7350d06f5a
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.initd-r1
@@ -0,0 +1,75 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LS_USER=${LS_USER:-logstash}
+LS_GROUP=${LS_GROUP:-$LS_USER}
+LS_LOG_DIR=${LS_LOG_DIR:-/var/log/logstash}
+LS_SETTINGS_DIR=${LS_SETTINGS_DIR:-/etc/logstash}
+LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
+LS_HOME=${LS_HOME:-/var/lib/logstash}
+LS_DATA_DIR=${LS_DATA_DIR:-$LS_HOME/data}
+LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
+LS_NICE=${LS_NICE:-19}
+LS_JAVA_OPTS=${LS_JAVA_OPTS:-"-Djava.io.tmpdir=${LS_HOME}"}
+LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING:-false}
+LS_OPEN_FILES=${LS_OPEN_FILES:-16384}
+KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0}
+
+LS_INSTALL_DIR="/opt/logstash"
+
+command="${LS_INSTALL_DIR}/bin/logstash"
+command_args="--path.config ${LS_CONF_DIR} --path.data ${LS_DATA_DIR} --path.logs ${LS_LOG_DIR} --path.settings ${LS_SETTINGS_DIR} ${LS_OPTS}"
+command_background="true"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
+	--chdir ${LS_HOME}
+	--nicelevel ${LS_NICE}
+	--env LS_HEAP_SIZE=${LS_HEAP_SIZE}
+	--env LS_JAVA_OPTS=${LS_JAVA_OPTS}
+	--env LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING}"
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+checkconfig() {
+	if [ ! -f ${LS_CONF_DIR}/* ]; then
+		eerror "Please put your configuration in ${LS_CONF_DIR}"
+		exit 1
+	fi
+
+	ebegin "Checking your configuration"
+	${command} ${command_args} --path.logs "${LS_LOG_DIR}/configcheck" --config.test_and_exit
+	eend $? "Configuration error. Please fix your configuration files."
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading configuration"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	rc_ulimit="-n ${LS_OPEN_FILES}"
+
+	local d
+	for d in "${LS_HOME}" "${LS_DATA_DIR}" "${LS_DATA_DIR}/queue" "${LS_DATA_DIR}/dead_letter_queue" "${LS_LOG_DIR}"; do
+		checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$d"
+	done
+}
+
+stop() {
+	ebegin "Stopping logstash"
+	if [ "${KILL_ON_STOP_TIMEOUT}" = "1" ]; then
+		start-stop-daemon --stop \
+			--pidfile=${pidfile} \
+			--retry=TERM/5/KILL/5
+	else
+		start-stop-daemon --stop \
+			--pidfile=${pidfile}
+	fi
+}
diff --git a/app-admin/logstash-bin/logstash-bin-5.6.9.ebuild b/app-admin/logstash-bin/logstash-bin-5.6.9.ebuild
new file mode 100644
index 000000000000..d1ce6cfb92d7
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-5.6.9.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 user
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+DEPEND="app-arch/unzip"
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/lib/${MY_PN}"
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/startup.options || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "The default pidfile directory has been changed from /run/logstash to /run."
+	ewarn "Please ensure any running logstash processes are shut down cleanly."
+	ewarn
+	ewarn "The default data directory has been moved from /opt/logstash/data to"
+	ewarn "/var/lib/logstash/data. Please check and move its contents as necessary."
+	ewarn
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	elog
+	elog "Installing plugins:"
+	elog "eselect logstash-plugin install logstash-output-gelf"
+	elog
+
+	elog "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	elog
+	elog "Sample configuration:"
+	elog "${EROOT%/}/usr/share/${MY_PN}"
+}
diff --git a/app-admin/logstash-bin/logstash-bin-6.2.4.ebuild b/app-admin/logstash-bin/logstash-bin-6.2.4.ebuild
new file mode 100644
index 000000000000..d1ce6cfb92d7
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-6.2.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 user
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+DEPEND="app-arch/unzip"
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/lib/${MY_PN}"
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/startup.options || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "The default pidfile directory has been changed from /run/logstash to /run."
+	ewarn "Please ensure any running logstash processes are shut down cleanly."
+	ewarn
+	ewarn "The default data directory has been moved from /opt/logstash/data to"
+	ewarn "/var/lib/logstash/data. Please check and move its contents as necessary."
+	ewarn
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	elog
+	elog "Installing plugins:"
+	elog "eselect logstash-plugin install logstash-output-gelf"
+	elog
+
+	elog "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	elog
+	elog "Sample configuration:"
+	elog "${EROOT%/}/usr/share/${MY_PN}"
+}
diff --git a/app-admin/logstash-bin/metadata.xml b/app-admin/logstash-bin/metadata.xml
new file mode 100644
index 000000000000..d4758fc50621
--- /dev/null
+++ b/app-admin/logstash-bin/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hydrapolic@gmail.com</email>
+    <name>Tomáš Mózes</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>erkiferenc@gmail.com</email>
+    <name>Ferenc Erki</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">elastic/logstash</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/logsurfer+-1.8-r3 b/app-admin/logsurfer+-1.8-r3
deleted file mode 100644
index a74e8c44e53a..000000000000
--- a/app-admin/logsurfer+-1.8-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst
-DESCRIPTION=Real Time Log Monitoring and Alerting
-EAPI=6
-HOMEPAGE=https://www.crypt.gen.nz/logsurfer/
-KEYWORDS=amd64 x86
-LICENSE=freedist GPL-2+
-RESTRICT=bindist
-SLOT=0
-SRC_URI=mirror://sourceforge/logsurfer/logsurfer-1.8.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=38b43bdb88cbb21a00fdba34d9c3ca06
diff --git a/app-admin/logsurfer+/Manifest b/app-admin/logsurfer+/Manifest
new file mode 100644
index 000000000000..9108dca546da
--- /dev/null
+++ b/app-admin/logsurfer+/Manifest
@@ -0,0 +1,6 @@
+AUX logsurfer-1.8.initd 1049 BLAKE2B 00fa6b696561805d014586679f3d1f36a98a006aa8759855f35505cb30f4cb6e9ff110e4e89d731ac203ace4190bec1f1854b98fbb7b7f4dbaa43c32c466ad6d SHA512 c7fa4f0bf37125562ba3bd6594a84121f4ac47b71f33a73cf1856ba6c0e728523fa9d29dc778f3f613c477b640143d0c8ee608096aabfc0d11046cc4e838fa03
+AUX logsurfer-1.8.initd-r1 785 BLAKE2B c221acc6d565c6bef69e2b0e107d1d7e5b2fd03d7a645cbcf72b04ec903d3dd4fd031f3ba1f310b8cb0b6f1f8c936a1d3c605602a65682d09a3c4b86ced98f22 SHA512 dc02f6f317437adfe216992a0095912e73f9ad5abcbd2912bb4cdf0d71c4e0653eaeb14f3ff7164d20f1dee168c7b5352a3db96b9520a711e5f7ef04eca9e800
+AUX logsurfer.confd 106 BLAKE2B 3b43cc5e0782c3b34dca3ae607cf38db2128d09a11770efc013501368483134a4e6741c14533dfd59b05cce06e5498ba3a1321c330fe43915f588c5fef4bd3d1 SHA512 872004ae1aedc3adb550da30ebc544ccbf11af5ad399bb9788a4db336138c3f5ec03c3704eaaa2cecb0559de6a2bcab9e96da062e6af9a6daa22afdec709a43a
+DIST logsurfer-1.8.tar.gz 197507 BLAKE2B caa824ef486d8f48f39e6e1309d2dbccace4e91910b94267d50ab9dc022371bade87c251d87c4818d900ce2a72141f2ac4d0b4cccf4b2850e594951c77df2c0e SHA512 975b1353d067cee3a47fb555013ad86cf404863bcd044a46a7b8314670613b89720e4c21ac9c1389f930be964e4694ee6863ce72e289054ffacf9c62565ffa30
+EBUILD logsurfer+-1.8-r3.ebuild 806 BLAKE2B 68e9677be2f8e88b90bd2919c02b3ae0ab7aac3b3d263b864130c25d8c40399108f6b298ee4e0c522ab4b2e384495b85716a21b2f715c1e670fa61f3ce9bc4fa SHA512 324eecf181f83cafac5874dfbf7753fc95fea5cce31f458ae1ec3e3c02b3ca139efece2275b84c90effe6aba696905fbac549281a8117f7669479fab21cff55a
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/logsurfer+/files/logsurfer-1.8.initd b/app-admin/logsurfer+/files/logsurfer-1.8.initd
new file mode 100644
index 000000000000..9ef420cfad30
--- /dev/null
+++ b/app-admin/logsurfer+/files/logsurfer-1.8.initd
@@ -0,0 +1,50 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/logsurfer.pid"
+command="/usr/bin/logsurfer"
+command_args="-D -p ${pidfile} ${LOGSURFER_OPTS}"
+extra_started_commands="reload dump"
+
+conffile="/etc/logsurfer.conf"
+
+depend() {
+	use logger
+}
+
+checkconfig() {
+	if [ ! -f /etc/logsurfer.conf ] ; then
+		eerror "Please create /etc/logsurfer.conf"
+		return 1
+	fi
+	return 0
+}
+
+start_pre() {
+	checkconfig || return $?
+
+	checkpath --file --owner logsurfer --mode 0644 "${pidfile}"
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon \
+		--start \
+		--user logsurfer \
+		--exec ${command} \
+		-- ${command_args}
+	eend $? "Failed to start ${SVCNAME}"
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $? "Failed to reload ${SVCNAME}"
+}
+
+dump() {
+	ebegin "Dumping ${SVCNAME} internal state"
+	start-stop-daemon --signal USR1 --pidfile "${pidfile}"
+	eend $? "Failed to dump ${SVCNAME} internal state"
+}
diff --git a/app-admin/logsurfer+/files/logsurfer-1.8.initd-r1 b/app-admin/logsurfer+/files/logsurfer-1.8.initd-r1
new file mode 100644
index 000000000000..03b87a4868fa
--- /dev/null
+++ b/app-admin/logsurfer+/files/logsurfer-1.8.initd-r1
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/logsurfer.pid"
+command="/usr/bin/logsurfer"
+command_args="${LOGSURFER_OPTS}"
+command_user="logsurfer"
+command_background=true
+extra_started_commands="reload dump"
+
+depend() {
+	use logger
+}
+
+start_pre() {
+	# logsurfer won't start without a config file, but
+	# it doesn't mind an empty one.
+	checkpath --file /etc/logsurfer.conf
+}
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $? "Failed to reload ${RC_SVCNAME}"
+}
+
+dump() {
+	ebegin "Dumping ${RC_SVCNAME} internal state"
+	start-stop-daemon --signal USR1 --pidfile "${pidfile}"
+	eend $? "Failed to dump ${RC_SVCNAME} internal state"
+}
diff --git a/app-admin/logsurfer+/files/logsurfer.confd b/app-admin/logsurfer+/files/logsurfer.confd
new file mode 100644
index 000000000000..cb4e596bf543
--- /dev/null
+++ b/app-admin/logsurfer+/files/logsurfer.confd
@@ -0,0 +1,4 @@
+# /etc/conf.d/logsurfer
+
+# Options to pass to the logsurfer process
+LOGSURFER_OPTS="-f /var/log/messages"
diff --git a/app-admin/logsurfer+/logsurfer+-1.8-r3.ebuild b/app-admin/logsurfer+/logsurfer+-1.8-r3.ebuild
new file mode 100644
index 000000000000..6bd3a96d4632
--- /dev/null
+++ b/app-admin/logsurfer+/logsurfer+-1.8-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs user
+
+MY_P="logsurfer-${PV}"
+DESCRIPTION="Real Time Log Monitoring and Alerting"
+HOMEPAGE="https://www.crypt.gen.nz/logsurfer/"
+SRC_URI="mirror://sourceforge/logsurfer/${MY_P}.tar.gz"
+
+LICENSE="freedist GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RESTRICT="bindist" #444330
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf --with-etcdir=/etc
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin src/logsurfer
+	doman man/logsurfer.1 man/logsurfer.conf.4
+
+	newinitd "${FILESDIR}"/logsurfer-1.8.initd-r1 logsurfer
+	newconfd "${FILESDIR}"/logsurfer.confd logsurfer
+	dodoc ChangeLog README TODO
+}
+
+pkg_postinst() {
+	enewuser logsurfer -1 -1 -1 daemon
+}
diff --git a/app-admin/logsurfer+/metadata.xml b/app-admin/logsurfer+/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/logsurfer+/metadata.xml
@@ -0,0 +1,5 @@
+<?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/longrun-0.9-r4 b/app-admin/longrun-0.9-r4
deleted file mode 100644
index 23e3283253c3..000000000000
--- a/app-admin/longrun-0.9-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=sys-apps/groff
-DESCRIPTION=A utility to control Transmeta's Crusoe and Efficeon processors
-EAPI=6
-HOMEPAGE=http://freshmeat.net/projects/longrun/
-IUSE=kernel_linux
-KEYWORDS=-ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/cpu/crusoe/longrun-0.9.tar.bz2 mirror://debian/pool/main/l/longrun/longrun_0.9-19.diff.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e8dc922d1cbe5bf03d864f2e05fc3afb
diff --git a/app-admin/longrun/Manifest b/app-admin/longrun/Manifest
new file mode 100644
index 000000000000..016068bc56a5
--- /dev/null
+++ b/app-admin/longrun/Manifest
@@ -0,0 +1,6 @@
+AUX 0.9-makefile_cflags.patch 305 BLAKE2B 7b2c0df4162b44c723286b86f1cdff3de6761def2139d737c3dc7ac754b6e8b9f5674528a12334316fbc922f4b9d961d2e53e0e7c085f69a16952395feaef36e SHA512 3aaf8b9a21364264734de21505a5c2e5327bc443a25e26db55af87b49bec6b9a767bce9abdcf24ee0af2e43579460a36caaffa1d6d57b7420192685194f4979d
+AUX 0.9-replace-loff_t.patch 992 BLAKE2B 81c94054ba9ab75cd6c9f71e10c78b6f921695e9b0273aa35a394bade52d1183e588a3a5c8b894c1c16cf5c3c620f1777ab56e591fdb68ed6e70927c4aa89f2c SHA512 6eb0e828afcd6265babd4cefd50191610095c8d6309b75089ecf3f34363231bf8a2b68c3db0d3938904951035232b9bafcb2029de832e9c7515922dad3ceac1b
+DIST longrun-0.9.tar.bz2 11539 BLAKE2B a308dc7f350399da0bf593e2eee8109a90103b298d943976f0da143c52105362aa100763dcdd3cacd4c3244cdd5a7eb9a1b355aa803a69a2225ea18c6e5a60dd SHA512 6b38160f54d0cb9124c46c0e3ba22faf4ba4376ef58f7db40aabbab20836b1551dd839d28e5bf49540a5ce0e13312bd1d7332cc59ce45fa49f81d0b9746ef055
+DIST longrun_0.9-19.diff.gz 14697 BLAKE2B 98a7497679df5be0346a37b6119a9418c7fba80672eb2c345784628c3517c6f1fbc8d953abe2696a3b576310cd489e5c1d3595153bbfa9d82dfb44697c246116 SHA512 591519183017dd84d6f78554eea9f215be9346efc3f30889f5a25d01c6b68bd5a949507b9a0c871f9aca0b49e415c4fa261821d4158b24c93481394403b83e35
+EBUILD longrun-0.9-r4.ebuild 1766 BLAKE2B 6e0cece68b00d87f1d8d96059aea5f964c3215d90a48493f88358374ce09bc1798e53e4df6a9e613d918f790ffb26be3cb718ecf8550ac39de2a141f11a321e8 SHA512 447e4e55c29db55c4b105681a485e682bc7158f1a1caf4b7e3b95a572014a893ead7170290ec50b95d6fc5eda42de2ee6d81ccb501e97e532956dc368f05ff4d
+MISC metadata.xml 437 BLAKE2B 932878fe62012a5285dfc19f3e2a2d8a3f0eff2809dca919e58b81e2c82e256c1cf7fd4a8b477919973ed76ec0481ec00f25de43b78f054ae6f016948f5969d0 SHA512 1962bfa09950f194062baddd9996a84ba6264c1ed76e4e93d376a9935500a35377ea36c24fc55668d59f8488b9d3cdfe56139b91cc179d52e184f7f164d23ab9
diff --git a/app-admin/longrun/files/0.9-makefile_cflags.patch b/app-admin/longrun/files/0.9-makefile_cflags.patch
new file mode 100644
index 000000000000..8848dc667866
--- /dev/null
+++ b/app-admin/longrun/files/0.9-makefile_cflags.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,8 +2,8 @@
+ 
+ all: longrun README stamp-po
+ 
+-longrun: longrun.c
+-	gcc -DLOCALEDIR=\"$(LOCALEDIR)\" -g -O2 -W -Wall -o longrun longrun.c
++CFLAGS += -W -Wall
++CPPFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\"
+ 
+ README: longrun.1
+ 	groff -Tascii -man longrun.1 | col -bx > README
diff --git a/app-admin/longrun/files/0.9-replace-loff_t.patch b/app-admin/longrun/files/0.9-replace-loff_t.patch
new file mode 100644
index 000000000000..589c0947b155
--- /dev/null
+++ b/app-admin/longrun/files/0.9-replace-loff_t.patch
@@ -0,0 +1,35 @@
+Use off_t instead of loff_t.  Both pread() and pwrite() take
+off_t not loff_t types.  This breaks the build on musl.  See
+
+https://bugs.gentoo.org/show_bug.cgi?id=541694
+
+diff -Naur longrun.orig/longrun.c longrun/longrun.c
+--- longrun.orig/longrun.c	2015-03-07 19:05:19.166652462 +0000
++++ longrun/longrun.c	2015-03-07 19:06:05.419651899 +0000
+@@ -181,7 +181,7 @@
+ }
+ 
+ /* note: if an output is NULL, then don't set it */
+-void read_msr(loff_t address, int *lower, int *upper)
++void read_msr(off_t address, int *lower, int *upper)
+ {
+ 	uint32_t data[2];
+ 
+@@ -193,7 +193,7 @@
+ 	if (upper) *upper = data[1];
+ }
+ 
+-void write_msr(loff_t address, int lower, int upper)
++void write_msr(off_t address, int lower, int upper)
+ {
+ 	uint32_t data[2];
+ 
+@@ -206,7 +206,7 @@
+ }
+ 
+ /* note: if an output is NULL, then don't set it */
+-void read_cpuid(loff_t address, int *eax, int *ebx, int *ecx, int *edx)
++void read_cpuid(off_t address, int *eax, int *ebx, int *ecx, int *edx)
+ {
+ 	uint32_t data[4];
+ 
diff --git a/app-admin/longrun/longrun-0.9-r4.ebuild b/app-admin/longrun/longrun-0.9-r4.ebuild
new file mode 100644
index 000000000000..0508c52ea188
--- /dev/null
+++ b/app-admin/longrun/longrun-0.9-r4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="A utility to control Transmeta's Crusoe and Efficeon processors"
+HOMEPAGE="http://freshmeat.net/projects/longrun/"
+
+DEBIAN_PATCH_VERSION="19"
+DEBIAN_PATCH="${PN}_${PV}-${DEBIAN_PATCH_VERSION}.diff"
+SRC_URI="
+	mirror://kernel/linux/utils/cpu/crusoe/${P}.tar.bz2
+	mirror://debian/pool/main/l/${PN}/${DEBIAN_PATCH}.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-ppc x86"
+IUSE=""
+
+DEPEND="sys-apps/groff"
+
+S=${WORKDIR}/${PN}
+
+CONFIG_CHECK="~X86_MSR ~X86_CPUID"
+ERROR_X86_MSR="
+Longrun needs a MSR device to function. Please select
+MSR under Processor type and features. It can be build
+directly into the kernel or as a module."
+ERROR_X86_CPUID="
+Longrun needs a CPUID device to function. Please select
+CPUID under Processor type and features. It can be
+build directly into the kernel or as a module."
+
+PATCHES=(
+	"${WORKDIR}"/${DEBIAN_PATCH}
+	"${FILESDIR}"/${PV}-makefile_cflags.patch
+	"${FILESDIR}"/${PV}-replace-loff_t.patch
+)
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	default
+	dodoc MAKEDEV-cpuid-msr
+}
+
+pkg_postinst() {
+	if linux_config_exists; then
+		if linux_chkconfig_module X86_MSR; then
+			elog "You have compiled MSR as a module."
+			elog "You need to load it before using Longrun."
+			elog "The module is called msr."
+			elog
+		fi
+
+		if linux_chkconfig_module X86_CPUID; then
+			elog "You have compiled CPUID as a module."
+			elog "You need to load it before using Longrun."
+			elog "The module is called cpuid."
+		fi
+	else
+		elog "You have no kernel configuration available."
+		elog "Longrun needs both CPUID and MSR capabilites,"
+		elog "in the kernel you intend to run it under."
+	fi
+}
diff --git a/app-admin/longrun/metadata.xml b/app-admin/longrun/metadata.xml
new file mode 100644
index 000000000000..fcfeedac0c13
--- /dev/null
+++ b/app-admin/longrun/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+		Longrun is a user space utility program for controlling the Longrun
+		thermal and power save functionalities found in the processors made
+		by Transmeta.
+	</longdescription>
+	<upstream>
+		<remote-id type="freshmeat">longrun</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/lsat-0.9.7.1-r2 b/app-admin/lsat-0.9.7.1-r2
deleted file mode 100644
index 65a0ae02250c..000000000000
--- a/app-admin/lsat-0.9.7.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=The Linux Security Auditing Tool
-EAPI=6
-HOMEPAGE=http://usat.sourceforge.net/
-IUSE=minimal
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl !minimal? ( app-portage/portage-utils net-analyzer/nmap sys-apps/iproute2 sys-apps/which sys-process/lsof )
-SLOT=0
-SRC_URI=http://usat.sourceforge.net/code/lsat-0.9.7.1.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bd8f1f12b4b158ace29c3421277318a2
diff --git a/app-admin/lsat/Manifest b/app-admin/lsat/Manifest
new file mode 100644
index 000000000000..78628970c9c3
--- /dev/null
+++ b/app-admin/lsat/Manifest
@@ -0,0 +1,5 @@
+AUX lsat-0.9.7.1-gentoo.patch 1484 BLAKE2B 98182a2732d424ec1069c53f5cc247492704099148f3fa8e0e4d8fb5da01ba8840a17a9b3fad08ffcb7bba196934474d9d9d9c87b60915c7c60d9724061d1393 SHA512 55d0806addabf5b431ac18016f1f1737a30994b3558dc511a850d747f7b11f344c2070c0ea239c24a11511bccdb0693f54701586561d4b018934fa7ffd63ef69
+AUX lsat-0.9.7.1-segfault-fix.patch 1695 BLAKE2B ecebddf3535a45c09fc379c76ac81fb06c2fedd19159f0adea52b1ca73efd7fad64f2cf09b9b61e731b9ddee2d45ca1be562b650f6b324e6c3de0f141f7b871b SHA512 8be007761729ed7b0162cdba3d90a86ccb4caa10064f64a0fe3c10434227b3a5e185c9ca4509ea877a605161bd0482d8ce8758c1cb853756fe81ac37d41832b2
+DIST lsat-0.9.7.1.tgz 86077 BLAKE2B 609eb2a3345d147f03d03eea31fc34834ab2c0f95cf8b348ae0289020e092a991ab215160dcb1bee06ec07186fc2b9ee61af59dcff140dbda0fa91ebc7f8574e SHA512 fa67b5ebb03d11e3ee023c921977ddb64ea1fafca1d4cdb4b0fc5dbfa6edf46d57e488e9702175afbbde360a63d02ee5839fdf6576d974354a3b1d57f8860ffb
+EBUILD lsat-0.9.7.1-r2.ebuild 1002 BLAKE2B d3efec21d4cb30580f0a3d91f9e21b16793045c940dfb3d46de46e966865ee5809eddac8699297a558811b5b6d540b4c942e596e361b9f1b4294464b67c0dcc7 SHA512 da7eb95c87693dc617a272714eb99dc8b7562c1543ec75b81e7643f2f6a65b2df7a95fe0cf9303c10a73e8752a17c6450bb1b27d22880063c32c7348840d29fa
+MISC metadata.xml 608 BLAKE2B 7492ab0cc9545ce95a721aff6d1f9c5fd56cd94f4627d4bf70dd82349d8c3dff917e9d9e078d075d9c370a13314c865960fcf42b1603b76e5caf40fefe828b1d SHA512 05e9c4d8f92ce5ffabefe6ecab78023c2b0df2c6cc83e7e9c6db837b94b5c3c0f8248d5a3179641eec3513cd646557d2a1028283a03059c722be42c2f230481a
diff --git a/app-admin/lsat/files/lsat-0.9.7.1-gentoo.patch b/app-admin/lsat/files/lsat-0.9.7.1-gentoo.patch
new file mode 100644
index 000000000000..631dcd7322f7
--- /dev/null
+++ b/app-admin/lsat/files/lsat-0.9.7.1-gentoo.patch
@@ -0,0 +1,42 @@
+diff -Naur lsat-0.9.6.orig/Makefile.in lsat-0.9.6/Makefile.in
+--- lsat-0.9.6.orig/Makefile.in	2007-05-22 11:38:28.000000000 +0900
++++ lsat-0.9.6/Makefile.in	2007-05-25 18:55:25.000000000 +0900
+@@ -12,6 +12,7 @@
+ PROGRAM= lsat
+ INSTALL = /usr/bin/install -c
+ prefix = @prefix@
++exec_prefix = @exec_prefix@
+ BINDIR = @bindir@
+ DATADIR = @datadir@
+ MANDIR = @mandir@
+@@ -38,9 +39,7 @@
+ 	rm -f $(PROGRAM) $(OBJECTS) Makefile config.*  lsat.old lsatmd5.out lsatmd5.old
+ 
+ manpage:
+-	pod2man $(PROGRAM).pod > $(PROGRAM).tmp
+-	sed 's/perl v5.6.1/LSAT/g' $(PROGRAM).tmp| \
+-sed 's/Perl/LSAT/g'\
++	pod2man $(PROGRAM).pod -r LSAT -c 'User Contributed LSAT Documentation' \
+ > $(PROGRAM).1
+ 	rm -f  $(PROGRAM).tmp
+ #	cp -vf $(PROGRAM).1 debian/manpage.1.ex	
+diff -Naur lsat-0.9.6.orig/checkpkgs.c lsat-0.9.6/checkpkgs.c
+--- lsat-0.9.6.orig/checkpkgs.c	2007-04-27 00:48:31.000000000 +0900
++++ lsat-0.9.6/checkpkgs.c	2007-05-25 18:46:00.000000000 +0900
+@@ -113,14 +113,14 @@
+     }
+ 
+ 
+-    /* if distro = gentoo, use pkglist */
++    /* if distro = gentoo, use qpkg */
+     if (distribution == 4)
+     {
+         if (verbose > 0)
+         {
+             printf(" Generating list of pkgs on system.\n");
+         }
+-        shellcode = "/usr/lib/portage/bin/pkglist 2>/dev/null >>/tmp/lsat1.lsat";
++        shellcode = "/usr/bin/qpkg -I -nc 2>/dev/null >>/tmp/lsat1.lsat";
+         if ((dostuff(tempfile, 0, shellcode, 0, html)) < 0)
+         {
+             /* rhut-rho...something bad happened */
diff --git a/app-admin/lsat/files/lsat-0.9.7.1-segfault-fix.patch b/app-admin/lsat/files/lsat-0.9.7.1-segfault-fix.patch
new file mode 100644
index 000000000000..558c8de60321
--- /dev/null
+++ b/app-admin/lsat/files/lsat-0.9.7.1-segfault-fix.patch
@@ -0,0 +1,45 @@
+--- lsat-0.9.7.1/lsatmain.c.orig	2008-12-29 11:09:04.000000000 -0500
++++ lsat-0.9.7.1/lsatmain.c	2008-12-29 13:31:00.000000000 -0500
+@@ -232,7 +232,7 @@ int versions(char release[], char kernel
+     } /* end while (fgets...) */
+     close(fileval);
+     /* clean up even though we will rm it */
+-    close(infile);
++    close((int)infile);
+ 
+     if ( (system("rm -f /tmp/lsat1.lsat")) < 0)
+     {
+@@ -308,9 +308,9 @@ int main(int argc, char *argv[])
+     */ 
+     char release[50]; /* array for release level		*/
+     char kernel[50];  /* what kernel user is running	*/
+-    static char *man_distro; /* if the user specifies a distribution */
++    static char man_distro[10]; /* if the user specifies a distribution */
+     const char * header   =NULL;   /* to print out the header */
+-    static char *out_file = "lsat.out";  /* output filename var  */
++    static char out_file[255] = "lsat.out";  /* output filename var  */
+     char xlist[100]; /* modules to exclude */
+     int xarray[33] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; 
+     int  somethinginxlist = 0;
+@@ -350,10 +350,10 @@ int main(int argc, char *argv[])
+ 			  diff = 1; 
+ 			  break;
+ 		case 'm': 
+-			  strcpy(man_distro, argv[i]+3);
++			  strncpy(man_distro, argv[i]+3,sizeof(man_distro));
+ 			  break;
+ 		case 'o': 
+-			  strcpy(out_file, argv[i]+3);
++			  strncpy(out_file, argv[i]+3,sizeof(out_file));
+ 			  break;
+ 		case 'r': 
+ 			  rpmmodule = 1; 
+@@ -366,7 +366,7 @@ int main(int argc, char *argv[])
+ 			  break;
+ 		case 'w': 
+ 			  html = 1; 
+-			  out_file="lsat.html"; 
++			  strcpy(out_file,"lsat.html");
+ 			  break;
+ 		case 'x': strcpy(xlist,argv[i]+3);
+ 			  somethinginxlist = 1;
diff --git a/app-admin/lsat/lsat-0.9.7.1-r2.ebuild b/app-admin/lsat/lsat-0.9.7.1-r2.ebuild
new file mode 100644
index 000000000000..c1285e7e6de2
--- /dev/null
+++ b/app-admin/lsat/lsat-0.9.7.1-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="The Linux Security Auditing Tool"
+HOMEPAGE="http://usat.sourceforge.net/"
+SRC_URI="http://usat.sourceforge.net/code/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="minimal"
+
+DEPEND="dev-lang/perl" # pod2man
+RDEPEND="
+	${DEPEND}
+	!minimal? (
+		app-portage/portage-utils
+		net-analyzer/nmap
+		sys-apps/iproute2
+		sys-apps/which
+		sys-process/lsof
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gentoo.patch"
+	"${FILESDIR}/${P}-segfault-fix.patch"
+)
+
+HTML_DOCS=( modules.html changelog/changelog.html )
+
+src_prepare() {
+	default
+
+	# patch for segmentation fault see bug #184488
+	sed -i Makefile.in \
+		-e '/^LDFLAGS=/d' \
+		-e '/^CFLAGS=/d' \
+		|| die "sed Makefile.in"
+}
+
+src_compile() {
+	tc-export CC
+	emake CFLAGS="${CFLAGS}" all manpage
+}
+
+src_install() {
+	emake DESTDIR="${D}" install installman
+	dodoc README* *.txt
+	einstalldocs
+}
diff --git a/app-admin/lsat/metadata.xml b/app-admin/lsat/metadata.xml
new file mode 100644
index 000000000000..301bfd358039
--- /dev/null
+++ b/app-admin/lsat/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		Linux Security Auditing Tool (LSAT) is a post install security auditing
+		tool. It is modular in design, so new features can be added quickly. It
+		checks inetd entries and scans for unneeded RPM packages. It is being
+		expanded to work with Linux distributions other than Red Hat, and checks
+		for kernel versions.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">usat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/lsyncd-2.2.0 b/app-admin/lsyncd-2.2.0
deleted file mode 100644
index f3526cda23c5..000000000000
--- a/app-admin/lsyncd-2.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/lua-5.1[deprecated] app-text/asciidoc virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Live Syncing (Mirror) Daemon
-EAPI=6
-HOMEPAGE=https://github.com/axkibe/lsyncd
-KEYWORDS=amd64 x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1[deprecated] net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/axkibe/lsyncd/archive/release-2.2.0.tar.gz -> lsyncd-2.2.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ccf4b257930b1c1cb08d13be61fc4f3d
diff --git a/app-admin/lsyncd-2.2.1 b/app-admin/lsyncd-2.2.1
deleted file mode 100644
index b6cd21f8f09f..000000000000
--- a/app-admin/lsyncd-2.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/lua-5.1[deprecated] app-text/asciidoc virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Live Syncing (Mirror) Daemon
-EAPI=6
-HOMEPAGE=https://github.com/axkibe/lsyncd
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1[deprecated] net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/axkibe/lsyncd/archive/release-2.2.1.tar.gz -> lsyncd-2.2.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=120f6b1dbcfa15eb5ce04efbbab4eef3
diff --git a/app-admin/lsyncd-2.2.2 b/app-admin/lsyncd-2.2.2
deleted file mode 100644
index 00a32239000e..000000000000
--- a/app-admin/lsyncd-2.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/lua-5.1[deprecated] app-text/asciidoc virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Live Syncing (Mirror) Daemon
-EAPI=6
-HOMEPAGE=https://github.com/axkibe/lsyncd
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1[deprecated] net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/axkibe/lsyncd/archive/release-2.2.2.tar.gz -> lsyncd-2.2.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=120f6b1dbcfa15eb5ce04efbbab4eef3
diff --git a/app-admin/lsyncd/Manifest b/app-admin/lsyncd/Manifest
new file mode 100644
index 000000000000..189f4e0ad3fc
--- /dev/null
+++ b/app-admin/lsyncd/Manifest
@@ -0,0 +1,8 @@
+AUX lsyncd-2.2.0-mandir.patch 284 BLAKE2B b133a436c6c1b3186fc1c4c8f01ec87423cd63620e54589913d35bbe1ff2867c807fb7ce3eabade31936c70c54e7b1c115e1ee20591c82073396f029068e36b9 SHA512 c46043b4938b42bc4bd8d0f9387dff4561ee103e9a7847825a57415aa2c91b7902059f3f103834958bcf1c0132785c44e729cfb0af82d63cf94d3782f1b6f501
+DIST lsyncd-2.2.0.tar.gz 81034 BLAKE2B 26666d04729e31d60ec340c207d5c22b2f53571a146d3f548bf7a33061bcec59aabafae40242f79a971297780fb7de56b5ff1fbccdb4c2152878f1b318a058b9 SHA512 75a138c2e85c4c5a3d6b215cb8df1668e5ffb6c8099f79caf555369d12348e2bdff29c1b01d62613bddd5b5a67f2a44e2fe86412048bc622088912e3fa783e81
+DIST lsyncd-2.2.1.tar.gz 81005 BLAKE2B 797c225b484139df53d3d1173d0cc3b4ba632a076e937902799247e422643f0bcefe22570d311afb4c8fb98151467a1ab624a97f728c851c02bc0dbc601f2238 SHA512 c07c322fb802911a2bb78221ff20ac1c0658cea27a23d34a95de45902211784d3bdc79c246ce0809e6167ddd20a3573c1ca6a81cabc46a29622a200c8d3ddfa5
+DIST lsyncd-2.2.2.tar.gz 82231 BLAKE2B 44cb269e1b726595b4332471335dc2a600efa2ebd39d7857d9c0c4adebefed923f60b177511e9e06113a4ff3400e45a979315bcd61169a7a2b9945b1aa944a86 SHA512 489d4fc91787a53f1480749fce6a281406aedb7e3617cd5f383b30c47870b2a8a912317a3faee5ad5f6358c10a136a69e07ee854f753846be1e11023cea5fed0
+EBUILD lsyncd-2.2.0.ebuild 649 BLAKE2B 32a62cfa6c93fbb7e485358a54408d1bc3dcdfcdfcf9970945f7c69744e5f86119b9870be828454c87bf5a17ee916f23d72b2ca141df008081dbc76bd8e77ef9 SHA512 c892f63e274ef4ace17fbfa5b45692013c3b0e4058ccb70a040d49db024308c31338b9c7658294d2068729dd8f0729116baf082fbb4007826b1437e63740c410
+EBUILD lsyncd-2.2.1.ebuild 658 BLAKE2B 02cdcfa644eb1aa4d2aa9a25da5bb8828ea06607ecce69f3003aac8e2cc07c5cf3f9e3fe0fa014eca8bf4a227b0a0225df713e60c42bacaf7803660cc86e9a27 SHA512 11317953b16f5b0f59e7d8f27a2c35d8523bfa078bc50cbb2ad51f901a738c730d1b00eb0b23de6562d15125a776bd6c903029b19f3a4deb68b6d43c8e02fac5
+EBUILD lsyncd-2.2.2.ebuild 658 BLAKE2B 02cdcfa644eb1aa4d2aa9a25da5bb8828ea06607ecce69f3003aac8e2cc07c5cf3f9e3fe0fa014eca8bf4a227b0a0225df713e60c42bacaf7803660cc86e9a27 SHA512 11317953b16f5b0f59e7d8f27a2c35d8523bfa078bc50cbb2ad51f901a738c730d1b00eb0b23de6562d15125a776bd6c903029b19f3a4deb68b6d43c8e02fac5
+MISC metadata.xml 376 BLAKE2B 17c9b5e1f29ac7b0ced5031f797ed2d85bdb25df6af44a1d257b75256325371a8290e0e1c20cb535c58326fcd67372a727cf170ca200803ca693670f2c729511 SHA512 1d7d76eea9ec7bb6d1e453675d56610abdcd78801b3d12eee37f082698cdb03aa7775d160b473ec4f67d8e95c6dded3319b74449f4aad97fbb6c91fab5bcd641
diff --git a/app-admin/lsyncd/files/lsyncd-2.2.0-mandir.patch b/app-admin/lsyncd/files/lsyncd-2.2.0-mandir.patch
new file mode 100644
index 000000000000..76e01d5bcacb
--- /dev/null
+++ b/app-admin/lsyncd/files/lsyncd-2.2.0-mandir.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -92,4 +92,4 @@
+ target_link_libraries( lsyncd ${LUA_LIBRARIES} )
+ 
+ install( TARGETS lsyncd RUNTIME DESTINATION bin )
+-install( FILES doc/manpage/lsyncd.1 DESTINATION man )
++install( FILES doc/manpage/lsyncd.1 DESTINATION share/man/man1 )
diff --git a/app-admin/lsyncd/lsyncd-2.2.0.ebuild b/app-admin/lsyncd/lsyncd-2.2.0.ebuild
new file mode 100644
index 000000000000..7f8661b1a697
--- /dev/null
+++ b/app-admin/lsyncd/lsyncd-2.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG"
+inherit cmake-utils
+
+DESCRIPTION="Live Syncing (Mirror) Daemon"
+HOMEPAGE="https://github.com/axkibe/lsyncd"
+SRC_URI="https://github.com/axkibe/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~arm-linux ~x86-linux"
+
+CDEPEND=">=dev-lang/lua-5.1[deprecated]"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	net-misc/rsync"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-mandir.patch
+)
+
+S=${WORKDIR}/${PN}-release-${PV}
diff --git a/app-admin/lsyncd/lsyncd-2.2.1.ebuild b/app-admin/lsyncd/lsyncd-2.2.1.ebuild
new file mode 100644
index 000000000000..4e14745a58b4
--- /dev/null
+++ b/app-admin/lsyncd/lsyncd-2.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG"
+inherit cmake-utils
+
+DESCRIPTION="Live Syncing (Mirror) Daemon"
+HOMEPAGE="https://github.com/axkibe/lsyncd"
+SRC_URI="https://github.com/axkibe/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+
+CDEPEND=">=dev-lang/lua-5.1[deprecated]"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	net-misc/rsync"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.0-mandir.patch
+)
+
+S=${WORKDIR}/${PN}-release-${PV}
diff --git a/app-admin/lsyncd/lsyncd-2.2.2.ebuild b/app-admin/lsyncd/lsyncd-2.2.2.ebuild
new file mode 100644
index 000000000000..4e14745a58b4
--- /dev/null
+++ b/app-admin/lsyncd/lsyncd-2.2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG"
+inherit cmake-utils
+
+DESCRIPTION="Live Syncing (Mirror) Daemon"
+HOMEPAGE="https://github.com/axkibe/lsyncd"
+SRC_URI="https://github.com/axkibe/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+
+CDEPEND=">=dev-lang/lua-5.1[deprecated]"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	net-misc/rsync"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.0-mandir.patch
+)
+
+S=${WORKDIR}/${PN}-release-${PV}
diff --git a/app-admin/lsyncd/metadata.xml b/app-admin/lsyncd/metadata.xml
new file mode 100644
index 000000000000..50d67664f488
--- /dev/null
+++ b/app-admin/lsyncd/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">lsyncd</remote-id>
+		<remote-id type="github">axkibe/lsyncd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/makepasswd-1.10 b/app-admin/makepasswd-1.10
deleted file mode 100644
index f4311412f552..000000000000
--- a/app-admin/makepasswd-1.10
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Random password generator
-EAPI=6
-HOMEPAGE=https://packages.debian.org/stable/admin/makepasswd
-KEYWORDS=alpha amd64 ~arm ia64 ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=mirror://debian/dists/potato/main/source/admin/makepasswd_1.10.orig.tar.gz
-_md5_=16d1721988e6a3d3ecff7ae21555bda7
diff --git a/app-admin/makepasswd/Manifest b/app-admin/makepasswd/Manifest
new file mode 100644
index 000000000000..fa2fcf681d91
--- /dev/null
+++ b/app-admin/makepasswd/Manifest
@@ -0,0 +1,3 @@
+DIST makepasswd_1.10.orig.tar.gz 12382 BLAKE2B f38e181da077650af760123e86cdbc2f39259db82d06198280ac37f5391a7de00ca7009a69b491a150ec9e542c25b7538141941819ef540714e2a6cd75ddd4c2 SHA512 215b8c3941f395c02be43044aed972425db8fe8472ec9f4f39f7f574d9f36c5a1af5bba495dd10570363e923bfe42c26d7571741ae2ef350e660c9973ac0a5ac
+EBUILD makepasswd-1.10.ebuild 553 BLAKE2B 66f890ab98431b7c34119b72691d8be66a145a91f6f45382348bc5e646fa50872659e9df640bb7d9ce8cb53d240df21f607f3d06552a26b8248c510ed091212e SHA512 fd9ed23da2b80d71fd483076e6646f84f7522fe694529fe8af5148f29e5baff3bda4f1cc56d37423350a6150b2406b32da23f2b1601ac844465e660ec25cd488
+MISC metadata.xml 359 BLAKE2B fa76c590cdc7361bf05ff444616592b7da08379af98d0296aec906efa6a985b573aa738ef8bd8d0f33ff09aa9aa96008e31e1d0fd8d1d9ad52605e2adca71634 SHA512 e0770ad04371f82e5d005229b1c5f04a3d4e6343c380ea230d4f0bfaf8306aa04fc11fac75149da0f80410f72771c840fa4f8ecea1a40ec6273fdeb829207c71
diff --git a/app-admin/makepasswd/makepasswd-1.10.ebuild b/app-admin/makepasswd/makepasswd-1.10.ebuild
new file mode 100644
index 000000000000..6b03b64a3aa2
--- /dev/null
+++ b/app-admin/makepasswd/makepasswd-1.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Random password generator"
+HOMEPAGE="https://packages.debian.org/stable/admin/makepasswd"
+SRC_URI="mirror://debian/dists/potato/main/source/admin/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+
+src_install() {
+	dobin makepasswd
+	doman makepasswd.1
+	einstalldocs
+}
diff --git a/app-admin/makepasswd/metadata.xml b/app-admin/makepasswd/metadata.xml
new file mode 100644
index 000000000000..00668f1a86d9
--- /dev/null
+++ b/app-admin/makepasswd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<longdescription lang="en">
+		A random password generator, for all your secure password needs.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/matter-302 b/app-admin/matter-302
deleted file mode 100644
index 959560a83af4..000000000000
--- a/app-admin/matter-302
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=Automated Packages Builder for Portage and Entropy
-EAPI=5
-HOMEPAGE=http://www.sabayon.org
-IUSE=+entropy python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=entropy? ( ~sys-apps/entropy-302[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) sys-apps/file[python] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sabayon/sys-apps/entropy-302.tar.bz2
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b24b10a633fd7597ad076aefd8ac447b
diff --git a/app-admin/matter/Manifest b/app-admin/matter/Manifest
new file mode 100644
index 000000000000..69f8f243f0a4
--- /dev/null
+++ b/app-admin/matter/Manifest
@@ -0,0 +1,3 @@
+DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
+EBUILD matter-302.ebuild 903 BLAKE2B c1970417d8565c4d51b1aa6bc91e7e53a3303cbf0373a6f62aba3197b5796d19ea355d96b3d2c97923ed79976a2de4126560f9feeb3a6e39095248e6e7a9412b SHA512 5726e57bb3a94c9ca263a5be2aaf83ae2894f54b9a1f8958ceb286d13af609798f4928a498d6ade9f445d9554cbcf6d1449f303aa2c13f4e0e69058139f8c331
+MISC metadata.xml 316 BLAKE2B a4b75b27426512d6fdcc5c82017121dbbd1e2a3438ade9329957bdce4c54b1d6f4c3404c577f50cbfcf8d03c41187b9efab14189a169c655bc2f98a6f9e82495 SHA512 f4ba14f543d1d69eb89eb098013f40a1cd7d872525e7ad683a6e4f6d6f4bb9a96ed81adb32aad5011c33dfebe694e10e429440343c16ed5497f03a4515ccffe4
diff --git a/app-admin/matter/matter-302.ebuild b/app-admin/matter/matter-302.ebuild
new file mode 100644
index 000000000000..47f0521d6aab
--- /dev/null
+++ b/app-admin/matter/matter-302.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 bash-completion-r1
+
+DESCRIPTION="Automated Packages Builder for Portage and Entropy"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+entropy"
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+
+S="${WORKDIR}/entropy-${PV}/${PN}"
+
+DEPEND=""
+RDEPEND="entropy? ( ~sys-apps/entropy-${PV}[${PYTHON_USEDEP}] )
+	sys-apps/file[python]
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" base-install || die "make base-install failed"
+	if use entropy; then
+		emake DESTDIR="${D}" entropysrv-install || die "make base-install failed"
+	fi
+
+	python_optimize "${D}/usr/lib/matter"
+}
diff --git a/app-admin/matter/metadata.xml b/app-admin/matter/metadata.xml
new file mode 100644
index 000000000000..975adc49c8bd
--- /dev/null
+++ b/app-admin/matter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mudler@gentoo.org</email>
+		<name>Ettore Di Giacinto</name>
+	</maintainer>
+	<use>
+		<flag name="entropy">Add Entropy support</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/mcelog-154 b/app-admin/mcelog-154
deleted file mode 100644
index aceed37845bb..000000000000
--- a/app-admin/mcelog-154
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare pretend setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A tool to log and decode Machine Check Exceptions
-EAPI=6
-HOMEPAGE=http://mcelog.org/
-IUSE=selinux kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-mcelog )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/andikleen/mcelog/archive/v154.tar.gz -> mcelog-154.tar.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8e83de01998ea0fd06e33b0a340c7d22
diff --git a/app-admin/mcelog-157 b/app-admin/mcelog-157
deleted file mode 100644
index 90de96c71ef7..000000000000
--- a/app-admin/mcelog-157
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare pretend setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A tool to log and decode Machine Check Exceptions
-EAPI=6
-HOMEPAGE=http://mcelog.org/
-IUSE=selinux kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-mcelog )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/andikleen/mcelog/archive/v157.tar.gz -> mcelog-157.tar.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8b7525d95dc6ffdfb39b349410f4bc81
diff --git a/app-admin/mcelog-159 b/app-admin/mcelog-159
deleted file mode 100644
index df57a8b52846..000000000000
--- a/app-admin/mcelog-159
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare pretend setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A tool to log and decode Machine Check Exceptions
-EAPI=6
-HOMEPAGE=http://mcelog.org/
-IUSE=selinux kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-mcelog )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/andikleen/mcelog/archive/v159.tar.gz -> mcelog-159.tar.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8b7525d95dc6ffdfb39b349410f4bc81
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
new file mode 100644
index 000000000000..42d4a4953339
--- /dev/null
+++ b/app-admin/mcelog/Manifest
@@ -0,0 +1,11 @@
+AUX mcelog-0.8_pre1-timestamp-mcelog.patch 425 BLAKE2B 5952e26c668fb71f712fc70b3419dbb7b3e418f8903f3104fcf8d525cb117ce278f4669551a6cbeadd7f03d3bd022781a88c335c6ac84600d3bdf02a3d8277d3 SHA512 77312f9346c7e16141a57a5e44964d0b2cab77a428403d19cfc9558af55b250be7c9fadaecf87c8d78075251a7fc3ab309e0cbbdbb30ddc4423717cb3979a1db
+AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de41215890cb4b6431ad694c2684f498d13287e385119304a816270f470ff26529967701c92bfc845a8aac698a0aa0f67271 SHA512 cda86c3e74f56fcd9d8771b26ca91c32ccc33e6bcd6dd0fcf856c14096daa619257d237e1e187e7820d6a0a0553ae6fd9ec160ea59e237b4e05ebca4e6656e20
+AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
+AUX mcelog.service 213 BLAKE2B 08da6eac0afe17a04948f5ff958aba5c64ff491f6842a0b84e914a82cce16782b2c9dfdc83123d609cabd4e9e60eb38a9e43fe7a22a2afca8f53c3dc8e65ac87 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75
+DIST mcelog-154.tar.gz 297148 BLAKE2B 80b2b6b13222d0194d63516607b3132e2146894189e2c3c793c953dc43705a5b386ecb76ae3c8b7b345f8d440f547b3e566b16bf0802d17188cce978e1ad2fc1 SHA512 8a160aaa8a0ed736cb81082321e199e6a6e4f7f6528915752af545db28918e89dcb6bf321a92472d776c61914d08c613900273b3d265a375684e3212547abe38
+DIST mcelog-157.tar.gz 297194 BLAKE2B f34e57f282828941b7023b6f043084dec4591b071f4e23fff318ea4ff49c8be2c0eab3279d7803d3cf029351f51d2acdf16d4eb1998042a8002f6667c81df90d SHA512 831835058ab820497aed5640a424908e3ee138431041b1c70e2d4f601a242e0437d240a842de1c0bc10f41790f1ddff64054e79ff2a6de1c814710acd9210bbd
+DIST mcelog-159.tar.gz 301033 BLAKE2B fb2cebc6f87429c5d8ba734ab5ab008552da1c492ccba53cec7a51e88e6a9ffaca14cf797ada952dbd24f0d17e52b45958defd82d46da533c9d97dbff96c67a7 SHA512 f5828f9b675eb091f297a2176e2b709a8180e9b29ad11438880a2f5a5a98a410413f20ad2fbb7ac06fe7e7980e1ea7fcb8c8ca5d90a04ed2d7dcd553a9b76b49
+EBUILD mcelog-154.ebuild 1370 BLAKE2B 3ba5600340047d02065bf402c29bdc96059865758b0d4cfc72c1251f85f7de20b37253bfc0d1f988d93f8dd9b7453e341f30e2e45c6f67401afea1463dbb8e8f SHA512 40cbe04aa5aba05eaedd1c1c9a3da4ea309be834864d405e532a20ba1190ec2aa44fc40cb968e43f37ddebb2698d380774b6601aaf4b0ad48559a929d4c526d7
+EBUILD mcelog-157.ebuild 1372 BLAKE2B 8f76fa2b653872ebf5362b7b3497732f02c2592f2356fdc417ce9b35f4a18b7f6ca12df960ffb2228d0bec5b8e4af5641f766c300d3d8ef99aea5c0b6c210840 SHA512 de8e5340fb345789fb4e5255e3a15997b387bab2b834db81f5682d8e043ae4f91bf034e4965bad82a963b055ffbe1294ab49dd7ab0598dbfbe43fbfced1a2db6
+EBUILD mcelog-159.ebuild 1372 BLAKE2B 8f76fa2b653872ebf5362b7b3497732f02c2592f2356fdc417ce9b35f4a18b7f6ca12df960ffb2228d0bec5b8e4af5641f766c300d3d8ef99aea5c0b6c210840 SHA512 de8e5340fb345789fb4e5255e3a15997b387bab2b834db81f5682d8e043ae4f91bf034e4965bad82a963b055ffbe1294ab49dd7ab0598dbfbe43fbfced1a2db6
+MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6
diff --git a/app-admin/mcelog/files/mcelog-0.8_pre1-timestamp-mcelog.patch b/app-admin/mcelog/files/mcelog-0.8_pre1-timestamp-mcelog.patch
new file mode 100644
index 000000000000..d24afdbfe00e
--- /dev/null
+++ b/app-admin/mcelog/files/mcelog-0.8_pre1-timestamp-mcelog.patch
@@ -0,0 +1,8 @@
+diff -Nuar mcelog-0.8pre.orig/mcelog.cron mcelog-0.8pre/mcelog.cron
+--- mcelog-0.8pre.orig/mcelog.cron	2006-02-08 05:09:03.000000000 -0800
++++ mcelog-0.8pre/mcelog.cron	2008-02-22 11:32:06.717012502 -0800
+@@ -1,2 +1,3 @@
+ #!/bin/bash
+-/usr/sbin/mcelog --ignorenodev --filter >> /var/log/mcelog
++header="$(date +"%b %d %H:%M:%S") $(hostname) "
++/usr/sbin/mcelog --ignorenodev --filter | sed "s,^,$header,g" >> /var/log/mcelog
diff --git a/app-admin/mcelog/files/mcelog-129-debugflags.patch b/app-admin/mcelog/files/mcelog-129-debugflags.patch
new file mode 100644
index 000000000000..eb46439a62dc
--- /dev/null
+++ b/app-admin/mcelog/files/mcelog-129-debugflags.patch
@@ -0,0 +1,22 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Oct 24 15:41:33 UTC 2012
+Subject: build system
+
+don't overwrite system CFLAGS, only append "-g -Os" if DEBUG=1 is passed
+as argument
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,11 @@
+-CFLAGS := -g -Os
++CC ?= gcc
++
++# set to 1 to enable debug flags
++DEBUG = 0
++ifeq ($(DEBUG),1)
++CFLAGS += -g -Os
++endif
++
+ prefix := /usr
+ etcprefix :=
+ MANDIR := ${prefix}/share/man
diff --git a/app-admin/mcelog/files/mcelog.init-r1 b/app-admin/mcelog/files/mcelog.init-r1
new file mode 100644
index 000000000000..bddafa1f12d5
--- /dev/null
+++ b/app-admin/mcelog/files/mcelog.init-r1
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description='Start/stop mcelog in daemon mode'
+
+pidfile="/var/run/mcelog.pid"
+command="/usr/sbin/mcelog"
+command_args="--daemon --pidfile ${pidfile} ${MCELOG_OPTS}"
+
+depend() {
+	after udev 
+	need localmount
+	use logging
+}
diff --git a/app-admin/mcelog/files/mcelog.service b/app-admin/mcelog/files/mcelog.service
new file mode 100644
index 000000000000..4bd553012c95
--- /dev/null
+++ b/app-admin/mcelog/files/mcelog.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Machine Check Exception Logging Daemon
+After=syslog.target
+
+[Service]
+ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground 
+StandardOutput=syslog
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/mcelog/mcelog-154.ebuild b/app-admin/mcelog/mcelog-154.ebuild
new file mode 100644
index 000000000000..46cdf051cd4f
--- /dev/null
+++ b/app-admin/mcelog/mcelog-154.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~X86_MCE"
+		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+		"${FILESDIR}"/${PN}-129-debugflags.patch
+	eapply_user
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	insinto /etc/cron.daily
+	newins ${PN}.cron ${PN}
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodoc *.pdf
+}
+
+pkg_postinst() {
+	einfo "The default configuration set is now installed in /etc/${PN}"
+	einfo "you might want to edit those files."
+	einfo
+	einfo "A sample cronjob is installed into /etc/cron.daily"
+	einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/mcelog/mcelog-157.ebuild b/app-admin/mcelog/mcelog-157.ebuild
new file mode 100644
index 000000000000..22442f62abb9
--- /dev/null
+++ b/app-admin/mcelog/mcelog-157.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~X86_MCE"
+		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+		"${FILESDIR}"/${PN}-129-debugflags.patch
+	eapply_user
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	insinto /etc/cron.daily
+	newins ${PN}.cron ${PN}
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodoc *.pdf
+}
+
+pkg_postinst() {
+	einfo "The default configuration set is now installed in /etc/${PN}"
+	einfo "you might want to edit those files."
+	einfo
+	einfo "A sample cronjob is installed into /etc/cron.daily"
+	einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/mcelog/mcelog-159.ebuild b/app-admin/mcelog/mcelog-159.ebuild
new file mode 100644
index 000000000000..22442f62abb9
--- /dev/null
+++ b/app-admin/mcelog/mcelog-159.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~X86_MCE"
+		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+		"${FILESDIR}"/${PN}-129-debugflags.patch
+	eapply_user
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	insinto /etc/cron.daily
+	newins ${PN}.cron ${PN}
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodoc *.pdf
+}
+
+pkg_postinst() {
+	einfo "The default configuration set is now installed in /etc/${PN}"
+	einfo "you might want to edit those files."
+	einfo
+	einfo "A sample cronjob is installed into /etc/cron.daily"
+	einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/mcelog/metadata.xml b/app-admin/mcelog/metadata.xml
new file mode 100644
index 000000000000..12e16a23806d
--- /dev/null
+++ b/app-admin/mcelog/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mattst88@gentoo.org</email>
+		<name>Matt Turner</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
+	<longdescription lang="en">
+		Starting with version 2.6.4, the Linux kernel for x86-64 no longer
+		decodes and logs recoverable Machine Check Exception events to the
+		kernel log on its own.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">andikleen/mcelog</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/mcollective-2.12.1 b/app-admin/mcollective-2.12.1
deleted file mode 100644
index 0f64b6d042ab..000000000000
--- a/app-admin/mcollective-2.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-DESCRIPTION=Framework to build server orchestration or parallel job execution systems
-EAPI=6
-HOMEPAGE=https://docs.puppet.com/mcollective/
-IUSE=doc +client elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ruby/stomp-1.4.4 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.12.1.tar.gz -> mcollective-2.12.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ce71483d8b7aea890f432cef44bbd4fb
diff --git a/app-admin/mcollective-2.12.2 b/app-admin/mcollective-2.12.2
deleted file mode 100644
index 823d742c0467..000000000000
--- a/app-admin/mcollective-2.12.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-DESCRIPTION=Framework to build server orchestration or parallel job execution systems
-EAPI=6
-HOMEPAGE=https://docs.puppet.com/mcollective/
-IUSE=doc +client elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ruby/stomp-1.4.4 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.12.2.tar.gz -> mcollective-2.12.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ce71483d8b7aea890f432cef44bbd4fb
diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
new file mode 100644
index 000000000000..0a91ee75d8dd
--- /dev/null
+++ b/app-admin/mcollective/Manifest
@@ -0,0 +1,6 @@
+AUX mcollectived.initd 497 BLAKE2B 1fe966f49117f9ea1b8c8ca4f5c92d5ddd7f8fb28658e4c3b016c193b69d1c42d35da85ace176279d09778c12fcc664748ea743c9b88219cb0fec2292ca867d4 SHA512 dc77a522e3ab6af3e23c559bfcb385033f2200b58b50db59000e7f56b2a789e8fbd83340f8ee494a1a9fdbdd1bd737a2b17ae4743823794264723fdc931ea6b0
+DIST mcollective-2.12.1.tar.gz 1517946 BLAKE2B 785acc53a4854f47caebe1d6a5f9cc850c3c33fd21e1b6e57d0d9761b2a7a3bbab2f2df398aa5344d90bc11397a545c8663d60ff3b2f6ff835fdc619d874928e SHA512 2398fb0202d8d5669a6efa81d96a87ee7e9221c1bc1b2e5be1917f2fec2527879b34be8df8c3052acf0ed58074b2da185f0837889d9300bde190bc95e8237d9a
+DIST mcollective-2.12.2.tar.gz 1517725 BLAKE2B e5f2b94843b95fa0749ed7e3e1ae52aeb485bf6644b64d971efd7d7a0e7bc806de0d2b00997c7e36d004fd78c479b9cf19b927e717ad0f3e4c13e820e5481637 SHA512 83be835499adf836797a67adda9be6d1bbf32524560ae51533875a1e2507599c7a0a1d2a76513669b919cf1eeceabdf13162eedb8972c74ecdeba5427b1701e4
+EBUILD mcollective-2.12.1.ebuild 1649 BLAKE2B b9fafb43c324d42bce01b95452bace880809ed327170098fb81c36fcc7c0505464624166ebcee596a9068742e1a6958e727052f553693db5e0275764180ca4aa SHA512 9ae9e1b5f0e5b31cd1dc44edc844253bfca1c80e8b626ec06a2e0a66eb08c0d935747a097f2f516d8e85f0ce79f28a675d1866b866789af47706048c92ad6c2f
+EBUILD mcollective-2.12.2.ebuild 1649 BLAKE2B b9fafb43c324d42bce01b95452bace880809ed327170098fb81c36fcc7c0505464624166ebcee596a9068742e1a6958e727052f553693db5e0275764180ca4aa SHA512 9ae9e1b5f0e5b31cd1dc44edc844253bfca1c80e8b626ec06a2e0a66eb08c0d935747a097f2f516d8e85f0ce79f28a675d1866b866789af47706048c92ad6c2f
+MISC metadata.xml 534 BLAKE2B e8866ac769b65ccc61dfe79fe5883bee78ea4066187b7136b899a1a16fa74952f88fd2b81376033d36418dc670d5669d9b65fc3195720ad95adf30bfe49729b1 SHA512 e94dd85f11b4f8b838e928220cb887eeb70860e6d04f03e904ddd4332baddd3b01221305e7229fb575585235436d0d942c116f821ef37adae636a7d5c6193199
diff --git a/app-admin/mcollective/files/mcollectived.initd b/app-admin/mcollective/files/mcollectived.initd
new file mode 100644
index 000000000000..8e295ceaa41c
--- /dev/null
+++ b/app-admin/mcollective/files/mcollectived.initd
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the Apache License, Version 2.0
+
+mcollectived="/usr/sbin/mcollectived"
+pidfile="/var/run/mcollectived"
+
+depend() {
+    need net
+}
+
+start() {
+    ebegin "Starting mcollectived"
+    ${mcollectived} --pid=${pidfile} --config="/etc/mcollective/server.cfg"
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping mcollectived"
+    kill `cat ${pidfile}`
+    eend $?
+}
+
+restart() {
+    svc_stop
+    sleep 2
+    svc_start
+}
diff --git a/app-admin/mcollective/mcollective-2.12.1.ebuild b/app-admin/mcollective/mcollective-2.12.1.ebuild
new file mode 100644
index 000000000000..e5ded06a8259
--- /dev/null
+++ b/app-admin/mcollective/mcollective-2.12.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit ruby-ng
+
+DESCRIPTION="Framework to build server orchestration or parallel job execution
+systems"
+HOMEPAGE="https://docs.puppet.com/mcollective/"
+SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/all/marionette-collective-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc +client"
+
+DEPEND=""
+RDEPEND=">=dev-ruby/stomp-1.4.4"
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+each_ruby_install() {
+	cd "marionette-collective-${PV}"
+	doruby -r lib/*
+	insinto /usr/share/mcollective
+	use client && dosbin bin/mco
+	dosbin bin/mcollectived
+	if use doc ; then
+		dohtml -r doc/*
+		insinto /usr/share/doc/${P}/ext
+		doins -r ext/*
+	fi
+	newinitd "${FILESDIR}"/mcollectived.initd mcollectived
+	insinto /etc/mcollective
+	cd etc
+	for cfg in *.dist ; do
+		newins "${cfg}" "${cfg%%.dist}"
+		sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
+			"${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
+	done
+	insinto /etc/mcollective/plugin.d
+}
+
+pkg_postinst() {
+	einfo "Mcollective requires a stomp server installed and functioning before"
+	einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
+	einfo "any other stomp compatible server should work."
+	einfo
+	einfo "It is recommended you read the \'getting started\' guide [2] if this"
+	einfo "is a new installation"
+	einfo
+	einfo "[1] https://activemq.apache.org/"
+	einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
+}
diff --git a/app-admin/mcollective/mcollective-2.12.2.ebuild b/app-admin/mcollective/mcollective-2.12.2.ebuild
new file mode 100644
index 000000000000..e5ded06a8259
--- /dev/null
+++ b/app-admin/mcollective/mcollective-2.12.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit ruby-ng
+
+DESCRIPTION="Framework to build server orchestration or parallel job execution
+systems"
+HOMEPAGE="https://docs.puppet.com/mcollective/"
+SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/all/marionette-collective-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc +client"
+
+DEPEND=""
+RDEPEND=">=dev-ruby/stomp-1.4.4"
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+each_ruby_install() {
+	cd "marionette-collective-${PV}"
+	doruby -r lib/*
+	insinto /usr/share/mcollective
+	use client && dosbin bin/mco
+	dosbin bin/mcollectived
+	if use doc ; then
+		dohtml -r doc/*
+		insinto /usr/share/doc/${P}/ext
+		doins -r ext/*
+	fi
+	newinitd "${FILESDIR}"/mcollectived.initd mcollectived
+	insinto /etc/mcollective
+	cd etc
+	for cfg in *.dist ; do
+		newins "${cfg}" "${cfg%%.dist}"
+		sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
+			"${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
+	done
+	insinto /etc/mcollective/plugin.d
+}
+
+pkg_postinst() {
+	einfo "Mcollective requires a stomp server installed and functioning before"
+	einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
+	einfo "any other stomp compatible server should work."
+	einfo
+	einfo "It is recommended you read the \'getting started\' guide [2] if this"
+	einfo "is a new installation"
+	einfo
+	einfo "[1] https://activemq.apache.org/"
+	einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
+}
diff --git a/app-admin/mcollective/metadata.xml b/app-admin/mcollective/metadata.xml
new file mode 100644
index 000000000000..bbf72aa5c8c7
--- /dev/null
+++ b/app-admin/mcollective/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="client">Install client utilities</flag>
+	</use>
+	<longdescription lang="en">
+	mcollective is a framework to build server orchestration or parallel job
+	execution systems.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">puppetlabs/marionette-collective</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/mei-amt-check-0_p20170515 b/app-admin/mei-amt-check-0_p20170515
deleted file mode 100644
index e058260184c3..000000000000
--- a/app-admin/mei-amt-check-0_p20170515
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DESCRIPTION=AMT status checker
-EAPI=6
-HOMEPAGE=https://github.com/mjg59/mei-amt-check/
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/mjg59/mei-amt-check/archive/d07672120ce7a0c79e949e537f3d19efecec1700.tar.gz -> mei-amt-check-0_p20170515.tar.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=84a83d459cb2c0fefb1aa1a67ec433ff
diff --git a/app-admin/mei-amt-check/Manifest b/app-admin/mei-amt-check/Manifest
new file mode 100644
index 000000000000..ccf7083a790e
--- /dev/null
+++ b/app-admin/mei-amt-check/Manifest
@@ -0,0 +1,3 @@
+DIST mei-amt-check-0_p20170515.tar.gz 10793 BLAKE2B 78244b1d7c31d30d4d3da8964628c867dbb1425f015ec96b595adfbdf182b8a6277556c1ddddeda62955ff6f052fdc19fc1925a15fd2f730234cdd7859423b93 SHA512 62ac6d3b2cacfc4770a076bffad1a4f8ba9233acef09b2e7bc77da545a67886b86e4076cceecd5ca8aab38c661cf8a1ddb178e7caf181b2da6171c467fbd8988
+EBUILD mei-amt-check-0_p20170515.ebuild 703 BLAKE2B 9d5a1a57bfd07406a101e412817a20d095cb7ffc02a01f11822b2a6798a523d8d50d3347e516b45fe4f7428569e58579495526f1cf79e1f27215138b254d567c SHA512 bcec63bb7edecfc74bffde92433775d900a9946609c1c7a11044efc57d42ec90717bf08a8b8c856c10de8c4252536cbe26eba74ec1fa9b4af2983d29214e9668
+MISC metadata.xml 256 BLAKE2B 6b975ce904624cce2160659a3719e4bd99de6c1383f8af2922973d5f5e11744cd4e8aeeb99a87ad887760d02606ed971e1eb32784824c8581ca00fa5c3be0a2b SHA512 e157b88fb4a80a7efd644e78794f964897ddfd949d41ccd6e62c989927f165081533bd07e9685b2aa31e3268a87568bde6af02649cb887dcfce913af930a483f
diff --git a/app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild b/app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild
new file mode 100644
index 000000000000..e6400ff43960
--- /dev/null
+++ b/app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vcs-snapshot linux-info toolchain-funcs
+
+DESCRIPTION="AMT status checker"
+HOMEPAGE="https://github.com/mjg59/mei-amt-check/"
+COMMIT="d07672120ce7a0c79e949e537f3d19efecec1700"
+SRC_URI="https://github.com/mjg59/mei-amt-check/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CONFIG_CHECK="~INTEL_MEI_ME"
+ERROR_INTEL_MEI_ME="Need to activate INTEL_MEI_ME to run the tool"
+
+src_prepare() {
+	default
+	sed -i -e "/CC :=/d" Makefile || die
+}
+
+src_compile() {
+	CC=$(tc-getCC) emake all
+}
+
+src_install() {
+	dosbin ${PN}
+	dodoc README.md
+}
diff --git a/app-admin/mei-amt-check/metadata.xml b/app-admin/mei-amt-check/metadata.xml
new file mode 100644
index 000000000000..91fd90ac48e9
--- /dev/null
+++ b/app-admin/mei-amt-check/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="github">mjg59/mei-amt-check</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/metadata.xml b/app-admin/metadata.xml
new file mode 100644
index 000000000000..b15417f502c1
--- /dev/null
+++ b/app-admin/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-admin category contains non-core applications which relate to
+		system administration.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-admin contiene aplicaciones para la administración
+		del sistema.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-admin enthält Applikationen zur Systemadministration,
+		die nicht Bestandteil des Basissystems sind.
+	</longdescription>
+	<longdescription lang="ja">
+		app-adminカテゴリにはnon-corシステム管理に関連したアプリケーションが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De app-admin categorie bevat applicaties met betrekking tot systeem
+		administratie.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-admin category chứa các ứng dụng liên quan
+		đến quản trị hệ thống (không tính các ứng dụng lõi).
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-admin contiene applicazioni per l'amministrazione del sistema.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria app-admin contém aplicações para a administração
+		do sistema.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-admin zawiera aplikacje dla administratorów systemu.
+	</longdescription>
+</catmetadata>
+
diff --git a/app-admin/metalog-3-r2 b/app-admin/metalog-3-r2
deleted file mode 100644
index 2fedb7c56312..000000000000
--- a/app-admin/metalog-3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst
-DEPEND=>=dev-libs/libpcre-3.4 virtual/pkgconfig app-arch/xz-utils virtual/pkgconfig
-DESCRIPTION=A highly configurable replacement for syslogd/klogd
-EAPI=6
-HOMEPAGE=http://metalog.sourceforge.net/
-IUSE=unicode
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libpcre-3.4
-SLOT=0
-SRC_URI=mirror://sourceforge/metalog/metalog-3.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1aa49d2b093efe66cc3cef64006ec9ab
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
new file mode 100644
index 000000000000..689636fb2799
--- /dev/null
+++ b/app-admin/metalog/Manifest
@@ -0,0 +1,8 @@
+AUX consolelog.sh 269 BLAKE2B 83aefc979d30847eb2d0b588232361cf129dec5a01ff8fafea7dd14daf4e2376c7381ce43e715e1093f13083d0e42cb037fcd65ae83f13b964c946f147e42cb9 SHA512 4cbf2145480d67b46db8a291137f5d953ce07d5d35b7c011e3dec13e4e5ab729f81666884c23db568065cb0b16fddba7178570c04777428861107aeb7c48f332
+AUX metalog-0.9-metalog-conf.patch 269 BLAKE2B ed59aa36a7388b4f91be80731fcfda0c806fc8bb90b86ca6357fea949ff6f231b42b37fdf2f044541c07fbbc4b0a67db4d6dcdcb18c9cd5091e2c3106bb4fc34 SHA512 0c95e8461e89d9469452d2ef66fa52f469b61578b12a6c72adb73e48807f998f8fb58cf0b3f1bc5caa38296fd59c8f8d1fc209beec81790387816d1c497a07df
+AUX metalog.confd 393 BLAKE2B 326653a23ff4e6bc78a4ddebf8af7c517f7b67973063ce1ac642195c7566667c7a330a4113acdd451522c907aa0814195ed5124aa92184bfca08eddc670b2d3f SHA512 4fea6b7f48e55d5f69a9c9a69f54623bb9d515e2fd2eda6829f8b769eec85e3de448eb42feb6bf65645400480169b3d70d56dff090103cfc95a3810515c42b2e
+AUX metalog.initd 701 BLAKE2B 9cb211b887b7294a11649710d45c104603fa9b9c27469f33c20613b58d0eede015cc7faa7d489530150bacc9ae5c4f4ecdee69ac2a9fbd4eb7157296413d0594 SHA512 45eb2f4c5a99723ac24bdb90726a81efef422aab7c991d1502a0bb728a4138cda74b2f8efb4cc70f1375b21b92039639e8bd5ab01af310991a81fce668f6f096
+AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8
+DIST metalog-3.tar.xz 360784 BLAKE2B 951841d423769cd97e14985e15d5a2499ca351e082c0effe28dc16d46db91235b7ef0448fe32d38b2ed5b53011d04b3375dc87c2a859c49bede2ae177ec16954 SHA512 2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289
+EBUILD metalog-3-r2.ebuild 1471 BLAKE2B 5da0f4866c405bd0d7073a1d98a8ad9acef166ff67af57c3330aafd68aacc7bc6ae8c81d28e402554ee637d26f5ce3aa14adfcdcb5a4cad3422a44f849e5bdb9 SHA512 91abf5ae5b73cd63246672d6bffe3ecbef91c271556958f7d1488bece9445109030752d5c932050e0413541aa240b3f09afd881f0a7350b58bfcf8dafe76bf70
+MISC metadata.xml 334 BLAKE2B 2d9ae46fcede549cabba6654513afcb6bee8ea22ba48bdc910c7b136e4d27bf6e223db5b13501b275790ecbf4fcbcb4ebf5ac9b6b81c6fa098e2f2c402793b0b SHA512 14ef6878732ffc5d14d1d27cec55ec886e76969e016ce8a009cafffa0b8d4e470c1b0f2480da5aaf0ed885c101b20d5edd7ce333efb9bc6f0bf56462e7260b37
diff --git a/app-admin/metalog/files/consolelog.sh b/app-admin/metalog/files/consolelog.sh
new file mode 100644
index 000000000000..90fb38e9921a
--- /dev/null
+++ b/app-admin/metalog/files/consolelog.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# consolelog.sh
+# For metalog -- log to a console
+
+set -f
+
+. /etc/conf.d/metalog
+if [ -z "${CONSOLE}" ] ; then
+	CONSOLE="/dev/console"
+fi
+
+if [ -z "${FORMAT}" ] ; then
+	FORMAT='$1 [$2] $3'
+fi
+
+for d in ${CONSOLE} ; do
+	eval echo ${FORMAT} > ${d}
+done
+
+exit 0
diff --git a/app-admin/metalog/files/metalog-0.9-metalog-conf.patch b/app-admin/metalog/files/metalog-0.9-metalog-conf.patch
new file mode 100644
index 000000000000..efb794de5454
--- /dev/null
+++ b/app-admin/metalog/files/metalog-0.9-metalog-conf.patch
@@ -0,0 +1,11 @@
+--- a/metalog.conf
++++ b/metalog.conf
+@@ -21,6 +21,8 @@
+ # merely write $@ to some device (your console for messages):
+ # echo "$@" > /dev/tty10
+ #
++# Hint: you can control the consolelog.sh behavior in /etc/conf.d/metalog
++#
+ #console logging :
+ #
+ #  facility  = "*"
diff --git a/app-admin/metalog/files/metalog.confd b/app-admin/metalog/files/metalog.confd
new file mode 100644
index 000000000000..ec7e64edae2b
--- /dev/null
+++ b/app-admin/metalog/files/metalog.confd
@@ -0,0 +1,18 @@
+# /etc/conf.d/metalog
+
+# Some useful options:
+#  -a   Log with buffering
+#  -s   Log without buffering
+# See `metalog --help` for more
+
+METALOG_OPTS=""
+
+
+# Options used by /usr/sbin/consolelog.sh
+
+# Space delimited list of devices to write "console" messages to
+#CONSOLE="/dev/console /dev/tty10"
+CONSOLE="/dev/tty10"
+
+# Format of logging (make sure you use single quotes)
+FORMAT='$1 [$2] $3'
diff --git a/app-admin/metalog/files/metalog.initd b/app-admin/metalog/files/metalog.initd
new file mode 100644
index 000000000000..f81e9eec51ca
--- /dev/null
+++ b/app-admin/metalog/files/metalog.initd
@@ -0,0 +1,41 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="buffer unbuffer"
+
+PIDFILE=/var/run/metalog.pid
+
+depend() {
+	need localmount
+	use clock hostname
+	after bootmisc
+	provide logger
+}
+
+ssd() { start-stop-daemon --exec /usr/sbin/metalog --pidfile "${PIDFILE}" "$@" ; }
+
+start() {
+	ebegin "Starting metalog"
+	ssd --start -- \
+	    --daemonize --pidfile="${PIDFILE}" ${METALOG_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping metalog"
+	ssd --stop
+	eend $?
+}
+
+buffer() {
+	ebegin "Enabling log buffering"
+	ssd --signal USR2
+	eend $?
+}
+
+unbuffer() {
+	ebegin "Disabling log buffering"
+	ssd --signal USR1
+	eend $?
+}
diff --git a/app-admin/metalog/files/metalog.service-r1 b/app-admin/metalog/files/metalog.service-r1
new file mode 100644
index 000000000000..862881aee165
--- /dev/null
+++ b/app-admin/metalog/files/metalog.service-r1
@@ -0,0 +1,10 @@
+[Unit]
+Description=System Logger Daemon
+
+[Service]
+ExecStart=/usr/sbin/metalog
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+Alias=syslog.service
diff --git a/app-admin/metalog/metadata.xml b/app-admin/metalog/metadata.xml
new file mode 100644
index 000000000000..cf5328e7d009
--- /dev/null
+++ b/app-admin/metalog/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">metalog</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/metalog/metalog-3-r2.ebuild b/app-admin/metalog/metalog-3-r2.ebuild
new file mode 100644
index 000000000000..a3b3bc3dceb9
--- /dev/null
+++ b/app-admin/metalog/metalog-3-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils systemd
+
+DESCRIPTION="A highly configurable replacement for syslogd/klogd"
+HOMEPAGE="http://metalog.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="unicode"
+
+RDEPEND=">=dev-libs/libpcre-3.4"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-arch/xz-utils"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9-metalog-conf.patch )
+
+src_configure() {
+	econf $(use_with unicode)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README NEWS metalog.conf
+
+	into /
+	dosbin "${FILESDIR}"/consolelog.sh
+
+	newinitd "${FILESDIR}"/metalog.initd metalog
+	newconfd "${FILESDIR}"/metalog.confd metalog
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+}
+
+pkg_preinst() {
+	if [[ -d "${ROOT}"/etc/metalog ]] && [[ ! -e "${ROOT}"/etc/metalog.conf ]] ; then
+		mv -f "${ROOT}"/etc/metalog/metalog.conf "${ROOT}"/etc/metalog.conf
+		rmdir "${ROOT}"/etc/metalog
+		export MOVED_METALOG_CONF=true
+	else
+		export MOVED_METALOG_CONF=false
+	fi
+}
+
+pkg_postinst() {
+	if ${MOVED_METALOG_CONF} ; then
+		ewarn "The default metalog.conf file has been moved"
+		ewarn "from /etc/metalog/metalog.conf to just"
+		ewarn "/etc/metalog.conf.  If you had a standard"
+		ewarn "setup, the file has been moved for you."
+	fi
+}
diff --git a/app-admin/mktwpol-0.2.6 b/app-admin/mktwpol-0.2.6
deleted file mode 100644
index e723b246893d..000000000000
--- a/app-admin/mktwpol-0.2.6
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=postinst prepare
-DESCRIPTION=Bash scripts to install tripwire and generate tripwire policy files
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/mktwpol
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=CC-BY-SA-3.0
-RDEPEND=app-admin/tripwire
-SLOT=0
-SRC_URI=mirror://sourceforge/mktwpol/mktwpol-0.2.6.tar.gz
-_md5_=40a4df102eb4838b58bddf49e1436bec
diff --git a/app-admin/mktwpol-1.0.0 b/app-admin/mktwpol-1.0.0
deleted file mode 100644
index 707ac52d8b8d..000000000000
--- a/app-admin/mktwpol-1.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=postinst prepare
-DESCRIPTION=Bash scripts to install tripwire and generate tripwire policy files
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/mktwpol
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=CC-BY-SA-3.0
-RDEPEND=app-admin/tripwire
-SLOT=0
-SRC_URI=mirror://sourceforge/mktwpol/mktwpol-1.0.0.tar.gz
-_md5_=40a4df102eb4838b58bddf49e1436bec
diff --git a/app-admin/mktwpol/Manifest b/app-admin/mktwpol/Manifest
new file mode 100644
index 000000000000..f25df5ddaff2
--- /dev/null
+++ b/app-admin/mktwpol/Manifest
@@ -0,0 +1,5 @@
+DIST mktwpol-0.2.6.tar.gz 55328 BLAKE2B a5998dcdd947288c0761fb4ef53cfca9de5b022a53f07fbfa7cb8023d0086471cd9a1ef822a3ff45931098acaedb2b94df2f882cc3bbadc18942293679d6816d SHA512 58d739bf789f7e25678adb19cc2d05bf98920d4f42a761f2c1fc45c72ac9080def9f2533f63c10dfea50f5d8428f7d4a19760a38dcc34bff9aaeb6fdd7e89434
+DIST mktwpol-1.0.0.tar.gz 59748 BLAKE2B 954d86774bf5e88612dc67f0ee29b637da188f64a8203b8aa84511e940db059afce0e993f4a703429688e29e964e5efc53a21b32f1ead3cee70bb7f056fc62a4 SHA512 f7a04bb3acdada6407e3e422e26ba2c0c454f10011a2848d0c8e962996e135a381c893f7fcdea67e1a3a23f503eb2071448beca05b7ca90e179d2a28173a973e
+EBUILD mktwpol-0.2.6.ebuild 1327 BLAKE2B e526b80f8c99b1d6f899f71d4284189ed3c6e5b5bd45a80ecc1fd735376c3d7f8b2607917e84bd3e93e87c04850f1db76aee721992fcf40708d9e5802b5ff966 SHA512 5af5b285e3cd9cf4197d7b30c485339dac7dcd0ecb7499e320e1df24514827995d2d951b53b669dee688bad0577aa004d9fed27dce7c0bc6b66a0b57a71179fc
+EBUILD mktwpol-1.0.0.ebuild 1327 BLAKE2B e526b80f8c99b1d6f899f71d4284189ed3c6e5b5bd45a80ecc1fd735376c3d7f8b2607917e84bd3e93e87c04850f1db76aee721992fcf40708d9e5802b5ff966 SHA512 5af5b285e3cd9cf4197d7b30c485339dac7dcd0ecb7499e320e1df24514827995d2d951b53b669dee688bad0577aa004d9fed27dce7c0bc6b66a0b57a71179fc
+MISC metadata.xml 1814 BLAKE2B 40c3405ca2533e816785d8fc2549895f42e2748d2826a5bde48cd9d7ec6370d5f306609e2032db287ed74ff7224711cc6a508d9afb4d80a85dffa02e1a3b4d58 SHA512 861a3e0c87dee0750caff734aa96708c72d6cb8a79b33a29b8aff5442b11e3e9855beb3d80428f3d6ab91542b3d1df033f55dc6942150d1eabc02fff46139e50
diff --git a/app-admin/mktwpol/metadata.xml b/app-admin/mktwpol/metadata.xml
new file mode 100644
index 000000000000..e635c47b95a4
--- /dev/null
+++ b/app-admin/mktwpol/metadata.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nimiux@gentoo.org</email>
+		<name>Chema Alonso</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>c.cboldt@gmail.com</email>
+			<name>Chuck Seyboldt</name>
+		</maintainer>
+		<changelog>https://sourceforge.net/p/mktwpol/code/ci/master/tree/CHANGES</changelog>
+		<doc>https://sourceforge.net/p/mktwpol/code/ci/master/tree/README</doc>
+		<bugs-to>https://sourceforge.net/p/mktwpol/discussion/bugs/</bugs-to>
+		<remote-id type="sourceforge">mktwpol</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		mktwpol is a tool that aids system administrators in the 
+		set-up and maintenance of tripwire (an Intrusion 
+		Detection System).  It contains a pair of bash scripts, 
+		mktwpol.sh and twsetup.sh.  mktwpol.sh generates a 
+		tripwire policy file that is tailored to the packages 
+		installed on any given sytem.  twsetup.sh steps through 
+		the initial set-up of tripwire, including the generating 
+		of encryption keys and encrypting the files that are 
+		necessary for tripwire to perform its function.
+	</longdescription>
+	<longdescription lang="es">
+		mktwpol es una herramienta que ayuda a los administradores
+		de sistemas en la configuración y el mantenimiento de
+		tripwire (un Sistema de Detección de Intrusos). Contiene
+		dos guiones bash: mktwpol.sh y twsetup.sh. mktwpol.sh
+		genera un fichero de directriz para tripwire ajustada
+		a los paquetes instalados en un sistema. twsetup.sh realiza
+		la configuración inicial de tripwire, incluyendo la
+		generación de las claves de cifrado y realiza el
+		cifrado de los ficheros necesitados por tripwire para
+		realizar su función.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/mktwpol/mktwpol-0.2.6.ebuild b/app-admin/mktwpol/mktwpol-0.2.6.ebuild
new file mode 100644
index 000000000000..daa6b71b8e59
--- /dev/null
+++ b/app-admin/mktwpol/mktwpol-0.2.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Bash scripts to install tripwire and generate tripwire policy files"
+HOMEPAGE="https://sourceforge.net/projects/mktwpol"
+SRC_URI="mirror://sourceforge/mktwpol/${P}.tar.gz"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="app-admin/tripwire"
+
+src_prepare() {
+	default
+	sed -i -e 's|/usr/local|/usr|' Makefile || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Installation and setup of tripwire ..."
+	elog " - Run: \`twsetup.sh\`"
+	elog
+	elog "Maintenance of tripwire as packages are added and/or deleted ..."
+	elog " - Run: \`mktwpol.sh -u\` to update tripwire policy and database"
+	elog
+	elog "Mktwpol is packaged with multiple policy-rules-generating files."
+	elog "The default \"rules file\" is installed in /etc/tripwire"
+	elog "Alternatives are installed in /usr/share/doc/${P}"
+	elog "To use an alternative \"rules file\" ..."
+	elog "copy it to /etc/tripwire, uncompress it, and \`touch\` it ..."
+	elog
+	elog "\`cp /usr/share/doc/${P}/mktwpol*.rules.bz2 /etc/tripwire\`"
+	elog "\`bunzip2 /etc/tripwire/mktwpol*.rules.bz2\`"
+	elog
+	elog "mktwpol.sh uses the rules file with the most recent date."
+	elog "Use \`touch\` to choose between multiple rules files."
+	elog
+}
diff --git a/app-admin/mktwpol/mktwpol-1.0.0.ebuild b/app-admin/mktwpol/mktwpol-1.0.0.ebuild
new file mode 100644
index 000000000000..daa6b71b8e59
--- /dev/null
+++ b/app-admin/mktwpol/mktwpol-1.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Bash scripts to install tripwire and generate tripwire policy files"
+HOMEPAGE="https://sourceforge.net/projects/mktwpol"
+SRC_URI="mirror://sourceforge/mktwpol/${P}.tar.gz"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="app-admin/tripwire"
+
+src_prepare() {
+	default
+	sed -i -e 's|/usr/local|/usr|' Makefile || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Installation and setup of tripwire ..."
+	elog " - Run: \`twsetup.sh\`"
+	elog
+	elog "Maintenance of tripwire as packages are added and/or deleted ..."
+	elog " - Run: \`mktwpol.sh -u\` to update tripwire policy and database"
+	elog
+	elog "Mktwpol is packaged with multiple policy-rules-generating files."
+	elog "The default \"rules file\" is installed in /etc/tripwire"
+	elog "Alternatives are installed in /usr/share/doc/${P}"
+	elog "To use an alternative \"rules file\" ..."
+	elog "copy it to /etc/tripwire, uncompress it, and \`touch\` it ..."
+	elog
+	elog "\`cp /usr/share/doc/${P}/mktwpol*.rules.bz2 /etc/tripwire\`"
+	elog "\`bunzip2 /etc/tripwire/mktwpol*.rules.bz2\`"
+	elog
+	elog "mktwpol.sh uses the rules file with the most recent date."
+	elog "Use \`touch\` to choose between multiple rules files."
+	elog
+}
diff --git a/app-admin/mms-agent-3.7.0.212_p1 b/app-admin/mms-agent-3.7.0.212_p1
deleted file mode 100644
index d41114ab4332..000000000000
--- a/app-admin/mms-agent-3.7.0.212_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=!<dev-db/mongodb-3.0.0[mms-agent]
-DESCRIPTION=MongoDB MMS agents
-EAPI=5
-HOMEPAGE=http://mms.mongodb.com
-IUSE=+monitoring
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=!<dev-db/mongodb-3.0.0[mms-agent]
-REQUIRED_USE=|| ( monitoring )
-SLOT=0
-SRC_URI=monitoring? ( amd64? ( https://mms.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-3.7.0.212-1.linux_x86_64.tar.gz ) x86? ( https://mms.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-3.7.0.212-1.linux_i386.tar.gz ) )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c53d989341730befe78e7fd6f3824464
diff --git a/app-admin/mms-agent-6.0.0.381_p1 b/app-admin/mms-agent-6.0.0.381_p1
deleted file mode 100644
index 157767b29b40..000000000000
--- a/app-admin/mms-agent-6.0.0.381_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=!<dev-db/mongodb-3.0.0[mms-agent]
-DESCRIPTION=MongoDB MMS agents
-EAPI=6
-HOMEPAGE=http://cloud.mongodb.com
-IUSE=+monitoring
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!<dev-db/mongodb-3.0.0[mms-agent]
-REQUIRED_USE=|| ( monitoring )
-SLOT=0
-SRC_URI=monitoring? ( https://cloud.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-6.0.0.381-1.linux_x86_64.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24e8bca0de858aadbf5bb368e4989081
diff --git a/app-admin/mms-agent/Manifest b/app-admin/mms-agent/Manifest
new file mode 100644
index 000000000000..b89723703026
--- /dev/null
+++ b/app-admin/mms-agent/Manifest
@@ -0,0 +1,7 @@
+AUX mms-monitoring-agent.initd 577 BLAKE2B 2a2df2f4179a8be766897fa97b543eb2e1166714d7caa3110bac3c4c2f19294b2f0a1df9a2845058d6386d73d17edacd0d7371727271856279541e2fe6b78f55 SHA512 5d03ae75fcd08fe3d7cb40ba940b0a5e3d72a48e8adb010349d0c93153409cc7e02cb5eeb9134742e8d62fbdfaad61cdbab76c0e7395cd4ba6ec19c541a1d12f
+DIST mongodb-mms-monitoring-agent-3.7.0.212-1.linux_i386.tar.gz 2554037 BLAKE2B be5f8d64da4aade086d6487067b5ca3961752ad832d4a5ca63fcaf8db38d92eb7ff40d8704622c68e9ee6ee14d3973911c594a7d8829a407cd2d8fdc2ca23ed5 SHA512 532d1c2dee00ee2b64654f43ded1cd8b40da8401ea0edb24c81cee80a46289ebde47697c43cb3ffbf6ce3ef88e8d6b78c6ba1e0a615a7488efe1c42f1d827897
+DIST mongodb-mms-monitoring-agent-3.7.0.212-1.linux_x86_64.tar.gz 2643320 BLAKE2B 8f532f9a3ffc17a7cf9109660cde232babf8256dbeb9a0c0034e5231bd84a2ce9e5cc679306d2800baf9b642e2299a4fcd5eef3c6bdeb79ea6c2ad862a6daf7c SHA512 c4c0d10bca91485680760d25b0cd9dde2081af60fe7bd5528fea13b12676cb10bb069dab5acfac645cf56001a4579df32d34b268b99f449a59d314c6e3ffaa21
+DIST mongodb-mms-monitoring-agent-6.0.0.381-1.linux_x86_64.tar.gz 3618281 BLAKE2B 9c036707aacad3cdbaeb72817a010df5dd91c1c4160dd95dc026c77471c5a7eff7047a93c5b9097a7fc89db96c88eb2c1c83489fde7f132cb4d14ac446333634 SHA512 79366c8ec0aaa3209d7e54942a375185312c491ffc825d9bf70d1fca36b93ab819dccf12e8f1a54c8dbd24ff501a3e3547a5a453e80308d6d638e7c3cf866f9c
+EBUILD mms-agent-3.7.0.212_p1.ebuild 1505 BLAKE2B 8339ce11955f18b83215d992c8d6ac9d963f49ae000dd9661b57c3c1195a6dc243a26769d97fae80baa6c2172899f6f098b5948dca8f573446047682581b9fec SHA512 04098333aa796f7c7de91ba4f9707bb00bf54c902562dde7dfcea34b3d0534c93cc2c314aa08fea8b346c3db899511f708ff3dcb0bca82731e477a9e559767b1
+EBUILD mms-agent-6.0.0.381_p1.ebuild 1282 BLAKE2B 685f9f590f4445af2cd262f8758345d1775d691733247bc1f99c61c6e9c11b9a2c554b22f88fc9a5cd3312f1029ad15915845869c6b3ff1279c309e290fcdea6 SHA512 90cfeb0f2f965a2a2814a28024cd4ccd91d0172dce9679335f195584259dd052b24e83feda90193b4d6237e2fb2be73e15d1fa5199dc2fbc359fd907433fddc8
+MISC metadata.xml 405 BLAKE2B ede71b3fd6b42c475b1f03b3fee1a715ef25c016645231b863fc3c6bdb7cb9b6a0c9d0ccedcd940198666ac6124f5037e918df2c9a315a588015b7ccd68b74b6 SHA512 1f2c0cf7a01e344fb2cf327b9a6619ca6e9d67e6a6e7e1a191b86a788f11826e72e0f2b96333e1270c91e2692d0733ad0fb64671d8d778b236f9c1b00d7a55b2
diff --git a/app-admin/mms-agent/files/mms-monitoring-agent.initd b/app-admin/mms-agent/files/mms-monitoring-agent.initd
new file mode 100644
index 000000000000..df0a6b54badd
--- /dev/null
+++ b/app-admin/mms-agent/files/mms-monitoring-agent.initd
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+logfile=/var/log/mongodb/mms-monitoring-agent.log
+run_dir=${run_dir:-/run/mongodb}
+
+command="./mongodb-mms-monitoring-agent &>${logfile}"
+command_background="true"
+
+pidfile=${run_dir}/${SVCNAME}.pid
+user=${user:-mongodb}
+group=${group:-mongodb}
+start_stop_daemon_args="--user ${user} --group ${group}"
+
+depend() {
+	need net
+	use syslog
+}
+
+start_pre() {
+    checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
+    cd /opt/mms-monitoring-agent
+}
diff --git a/app-admin/mms-agent/metadata.xml b/app-admin/mms-agent/metadata.xml
new file mode 100644
index 000000000000..153f98e5eac6
--- /dev/null
+++ b/app-admin/mms-agent/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ultrabug@gentoo.org</email>
+		<name>Alexys Jacob</name>
+	</maintainer>
+	<longdescription lang="en">
+	MongoDB MMS agents collection.
+	</longdescription>
+	<use>
+		<flag name="monitoring">Install the monitoring agent</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild b/app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild
new file mode 100644
index 000000000000..af3f9b652cfb
--- /dev/null
+++ b/app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+MY_PV=${PV/_p/-}
+
+DESCRIPTION="MongoDB MMS agents"
+HOMEPAGE="http://mms.mongodb.com"
+SRC_URI="
+	monitoring? (
+		amd64? ( https://mms.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-${MY_PV}.linux_x86_64.tar.gz )
+		x86? ( https://mms.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-${MY_PV}.linux_i386.tar.gz )
+	)
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+monitoring"
+
+REQUIRED_USE="|| ( monitoring )"
+
+RDEPEND="!<dev-db/mongodb-3.0.0[mms-agent]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+}
+
+src_install() {
+	if use amd64; then
+		local arch="x86_64"
+	else
+		local arch="i386"
+	fi
+
+	if use monitoring; then
+		local MY_PN="mms-monitoring-agent"
+		local MY_D="/opt/${MY_PN}"
+
+		pushd "${S}/mongodb-mms-monitoring-agent-${MY_PV}.linux_${arch}"
+
+		insinto ${MY_D}
+		doins mongodb-mms-monitoring-agent
+		fperms +x "${MY_D}"/mongodb-mms-monitoring-agent
+
+		insinto /etc
+		doins monitoring-agent.config
+		rm monitoring-agent.config
+		dosym ../../etc/monitoring-agent.config ${MY_D}/monitoring-agent.config
+
+		fowners -R mongodb:mongodb ${MY_D}
+		newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
+
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if use monitoring; then
+		elog "MMS Monitoring Agent configuration file :"
+		elog "  /etc/monitoring-agent.config"
+	fi
+}
diff --git a/app-admin/mms-agent/mms-agent-6.0.0.381_p1.ebuild b/app-admin/mms-agent/mms-agent-6.0.0.381_p1.ebuild
new file mode 100644
index 000000000000..e597d7f41fee
--- /dev/null
+++ b/app-admin/mms-agent/mms-agent-6.0.0.381_p1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user
+
+MY_PV=${PV/_p/-}
+
+DESCRIPTION="MongoDB MMS agents"
+HOMEPAGE="http://cloud.mongodb.com"
+SRC_URI="
+	monitoring? (
+		https://cloud.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-${MY_PV}.linux_x86_64.tar.gz
+	)
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+monitoring"
+
+REQUIRED_USE="|| ( monitoring )"
+
+RDEPEND="!<dev-db/mongodb-3.0.0[mms-agent]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/mongodb-mms-monitoring-agent-${MY_PV}.linux_x86_64"
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+}
+
+src_install() {
+	if use monitoring; then
+		local MY_PN="mms-monitoring-agent"
+		local MY_D="/opt/${MY_PN}"
+
+		insinto ${MY_D}
+		doins mongodb-mms-monitoring-agent
+		fperms +x "${MY_D}"/mongodb-mms-monitoring-agent
+
+		insinto /etc
+		doins monitoring-agent.config
+		rm monitoring-agent.config
+		dosym ../../etc/monitoring-agent.config ${MY_D}/monitoring-agent.config
+
+		fowners -R mongodb:mongodb ${MY_D}
+		newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
+	fi
+}
+
+pkg_postinst() {
+	if use monitoring; then
+		elog "MMS Monitoring Agent configuration file :"
+		elog "  /etc/monitoring-agent.config"
+	fi
+}
diff --git a/app-admin/mongo-tools-3.0.14 b/app-admin/mongo-tools-3.0.14
deleted file mode 100644
index 65b993cf66e0..000000000000
--- a/app-admin/mongo-tools-3.0.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!<dev-db/mongodb-3.0.0 dev-lang/go:= sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl )
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=5
-HOMEPAGE=http://www.mongodb.org
-IUSE=sasl ssl
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=!<dev-db/mongodb-3.0.0
-SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.0.14.tar.gz -> mongo-tools-3.0.14.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2738665484d8d98bdde62a14984a1480
diff --git a/app-admin/mongo-tools-3.0.15 b/app-admin/mongo-tools-3.0.15
deleted file mode 100644
index c5bf16e9a82b..000000000000
--- a/app-admin/mongo-tools-3.0.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!<dev-db/mongodb-3.0.0 dev-lang/go:= sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl )
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=5
-HOMEPAGE=http://www.mongodb.org
-IUSE=sasl ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!<dev-db/mongodb-3.0.0
-SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.0.15.tar.gz -> mongo-tools-3.0.15.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d146e55bc1aea5a66ad8d9d87b361e60
diff --git a/app-admin/mongo-tools-3.2.17 b/app-admin/mongo-tools-3.2.17
deleted file mode 100644
index 4aed014928ac..000000000000
--- a/app-admin/mongo-tools-3.2.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!<dev-db/mongodb-3.0.0 dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.org
-IUSE=sasl ssl
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!<dev-db/mongodb-3.0.0
-SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.2.17.tar.gz -> mongo-tools-3.2.17.tar.gz
-_md5_=e04037b2c5b8cc3e5d4a276ca284d857
diff --git a/app-admin/mongo-tools-3.4.10 b/app-admin/mongo-tools-3.4.10
deleted file mode 100644
index 8806bc5c6628..000000000000
--- a/app-admin/mongo-tools-3.4.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!<dev-db/mongodb-3.0.0 dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.org
-IUSE=sasl ssl
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!<dev-db/mongodb-3.0.0
-SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.4.10.tar.gz -> mongo-tools-3.4.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=383ab11da03e4e878d2336223f98f5b3
diff --git a/app-admin/mongo-tools-3.4.13 b/app-admin/mongo-tools-3.4.13
deleted file mode 100644
index 86548df2e890..000000000000
--- a/app-admin/mongo-tools-3.4.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!<dev-db/mongodb-3.0.0 dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.org
-IUSE=sasl ssl
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!<dev-db/mongodb-3.0.0
-SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.4.13.tar.gz -> mongo-tools-3.4.13.tar.gz
-_md5_=041f317c982aa9e77c256fe9e36b6976
diff --git a/app-admin/mongo-tools-3.4.14 b/app-admin/mongo-tools-3.4.14
deleted file mode 100644
index 746c54edc21a..000000000000
--- a/app-admin/mongo-tools-3.4.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!<dev-db/mongodb-3.0.0 dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.org
-IUSE=sasl ssl
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!<dev-db/mongodb-3.0.0
-SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.4.14.tar.gz -> mongo-tools-3.4.14.tar.gz
-_md5_=041f317c982aa9e77c256fe9e36b6976
diff --git a/app-admin/mongo-tools-3.4.15 b/app-admin/mongo-tools-3.4.15
deleted file mode 100644
index 5a5329fdaa22..000000000000
--- a/app-admin/mongo-tools-3.4.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!<dev-db/mongodb-3.0.0 dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.com
-IUSE=sasl ssl
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!<dev-db/mongodb-3.0.0
-SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.4.15.tar.gz -> mongo-tools-3.4.15.tar.gz
-_md5_=f47d8b694071bbfd12c815163e4a9970
diff --git a/app-admin/mongo-tools-3.6.2 b/app-admin/mongo-tools-3.6.2
deleted file mode 100644
index 4b2947ba2e6a..000000000000
--- a/app-admin/mongo-tools-3.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!<dev-db/mongodb-3.0.0 dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.org
-IUSE=sasl ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!<dev-db/mongodb-3.0.0
-SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.6.2.tar.gz -> mongo-tools-3.6.2.tar.gz
-_md5_=01b15c131a54266a7cbe53b179944048
diff --git a/app-admin/mongo-tools-3.6.3 b/app-admin/mongo-tools-3.6.3
deleted file mode 100644
index 26290a38c6a0..000000000000
--- a/app-admin/mongo-tools-3.6.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!<dev-db/mongodb-3.0.0 dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.org
-IUSE=sasl ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!<dev-db/mongodb-3.0.0
-SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.6.3.tar.gz -> mongo-tools-3.6.3.tar.gz
-_md5_=01b15c131a54266a7cbe53b179944048
diff --git a/app-admin/mongo-tools-3.6.4 b/app-admin/mongo-tools-3.6.4
deleted file mode 100644
index 49fcd6b99bcb..000000000000
--- a/app-admin/mongo-tools-3.6.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!<dev-db/mongodb-3.0.0 dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.org
-IUSE=sasl ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!<dev-db/mongodb-3.0.0
-SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.6.4.tar.gz -> mongo-tools-3.6.4.tar.gz
-_md5_=01b15c131a54266a7cbe53b179944048
diff --git a/app-admin/mongo-tools-3.6.5 b/app-admin/mongo-tools-3.6.5
deleted file mode 100644
index 4719663695a3..000000000000
--- a/app-admin/mongo-tools-3.6.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!<dev-db/mongodb-3.0.0 dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.com
-IUSE=sasl ssl
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!<dev-db/mongodb-3.0.0
-SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.6.5.tar.gz -> mongo-tools-3.6.5.tar.gz
-_md5_=13c899ccfeda7f5b9088a8b3bf9c360a
diff --git a/app-admin/mongo-tools-4.0.0 b/app-admin/mongo-tools-4.0.0
deleted file mode 100644
index a3458b1902d4..000000000000
--- a/app-admin/mongo-tools-4.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!<dev-db/mongodb-3.0.0 dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.com
-IUSE=sasl ssl
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!<dev-db/mongodb-3.0.0
-SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-tools/archive/r4.0.0.tar.gz -> mongo-tools-4.0.0.tar.gz
-_md5_=13c899ccfeda7f5b9088a8b3bf9c360a
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
new file mode 100644
index 000000000000..28c805fa096b
--- /dev/null
+++ b/app-admin/mongo-tools/Manifest
@@ -0,0 +1,26 @@
+AUX mongo-tools-3.2.10-pie.patch 551 BLAKE2B 74fc48378747c5d9a0a9ac0c14a6747d05cadcce91b97eb9392a95a3b59037268a7a76eb38706e7ed5be1fe0442e8b939e1a2466e5a02832b94d9937039f8030 SHA512 9a309e8d4d3776fef5209bdaedf416f3a43d51ffacff8fa602dacc288b1413dfb7eeca2cbd88a976a1648161bd671321e8f333a6843ee0477ea41cfcad040d1b
+DIST mongo-tools-3.0.14.tar.gz 2413148 BLAKE2B a085b452019f7354a8f2fcb4d7a493746fd6504dc836b3bc522bca6dfd054dc4940db1b07021b305c52bc12da076220c3e137507b656a00ca1330ba336532458 SHA512 0e77417b2c36080515a2ff611427cb18f6d6c2432159c2a09af8d6ff14ae7f25ecbfe0a6631eeb7de084fdfe517a09364d731f5b63923404b6319fc1ca44b840
+DIST mongo-tools-3.0.15.tar.gz 2413131 BLAKE2B 5f971d6b47685ef8db246a71f59a31a722e84b8191639fe7da849162701c944325bc4cbdb9a27b7a6ae32f1a8ccedac91d6a485dfbe54dd17b8735d5b32e4f2c SHA512 b5baeea89f5287e055c43c58cfc31e4618df2b7b7fffd7d77248131daf503522b1d041253df8d3ad2ffa22efff344334dc05e3a3462cf7c646d4e83040bd95dc
+DIST mongo-tools-3.2.17.tar.gz 2719970 BLAKE2B 666b67d8abdd10f7fa7c557e3c3906fb3cc6bcfa0b97a05e39e5f1ea923d2beb5ec249b3b0a521c4cce4bd595bf18672d8bce38152f84825bb3fffb058fd3b29 SHA512 62c2540027e07b8276621e08d13657864d16021030e3c8f9bc0d351454319d448f889cf6a48b8467ea3270365376ed0c3beb42ceae3f28357910148c6b4054b2
+DIST mongo-tools-3.4.10.tar.gz 4719399 BLAKE2B 8165248bf58f2ea2b02e365a3609c72b72e98dd5902f176e251fa2add1ad26e90900e06c35dc6db4dbe161e541bedfc1776f5e15bbb41dcc9a7be17800424362 SHA512 b861bb3fb1a32c3aa2efefcf6a13bb6d4783ac1a9b006c477fd04deb338cbf6b7adc3944bc6919513b92bd96b8500813ff4af49c9dec0719ebd2fdaa99bc39a5
+DIST mongo-tools-3.4.13.tar.gz 4719488 BLAKE2B 27c7716b21f1a23408d0f31aee111c5877f5172121a987c234ff01eb2690bbc71bca4e00fc13b701ca6b91dce0c9aaae43c2239a60a52e130e1390bf5bafef60 SHA512 c233268328ef868ec06c9a9d83009141b39c84ba642e7de7dece3210717ba8de600f39896a30ed23d1577db9f4697c3a8d720cf35248bca2b00a17642b043237
+DIST mongo-tools-3.4.14.tar.gz 4719370 BLAKE2B 2add25ddf9b5b7d2ebecdd647dfb2c818643b16f623fd1faba36a8d6f5a181e80ad47de45fc56e462290f61f6c16c27a6b0587542315981537627256e69b4958 SHA512 a0d715fe36769740ba25e92b742b157dc264b141ddd56d64ca4c6f8ffea11df291ce871aaa723acdb8b7f5318ac1edb8c5fb9dd7bf2edfe08d4e7cef343abea7
+DIST mongo-tools-3.4.15.tar.gz 4697188 BLAKE2B 690ec3187cb781c9cae903a27eca9d1d504e2e52cc7f48790b5d5b5a1dfe18cff95dd52f8fa03854548a2e634d2aed56e626b8702f2fcd27a10952a37dff9120 SHA512 f7c8655f56a1f5fedad00fbadd26b150d6fea071edccaa7ac18e80c9051ed2324691e98e799e6a9ca09e944ebe340b63a2ac0b9caeffbcc8c8dee0744cba1af7
+DIST mongo-tools-3.6.2.tar.gz 4693924 BLAKE2B 61c44d579f6eb4013ee6c0118ebe89a2d454ef8cf6ad933479885cb71d169185272b03d9c63fa738d67bbd1b9efd4bc964eb17adcc5002508589d198cdb17752 SHA512 5ac2b1d2b33271f63c406c69bd8a576a21f4dcaa6f75839e0f907ebc9968f0e121eb3800e88da050c120856e7ddda4f12d551bb731d4acac0f5cf09f66fc948a
+DIST mongo-tools-3.6.3.tar.gz 4693833 BLAKE2B fc7139984cf3dcb7b4ce6f6c2028296651aa59ac68d7068bdf748e28eeb65b1fd9b07580d0c93f3f41dbb01030a12433a07a04deadf28e0ff792387fa78ae4aa SHA512 7dba782c84a728aa9ceb28cbd9934f58b615dccfb238a9dbd63b18661ba4e74ddba21f93d9f12e6d80d293ebe42a82d31fa64448aacdba75bd07d964a5f631fc
+DIST mongo-tools-3.6.4.tar.gz 4693872 BLAKE2B 5d72b32fa8ad7bc106c6ea3c09a27a093b9a1ae2392b4fa534042c5461fdc2b958dcbbf32e0ed596be234921e2ee21cc8f6132d57ae870a234abfc7adbb3b2e9 SHA512 53d06fa4a1b58de8001d6bf6e85f7edc97ce2cfbbb69c1ab05219deaa05ad9dd77d93f98c5526b4f58644a766e1b0f123686358095f059c71a4277634603f23f
+DIST mongo-tools-3.6.5.tar.gz 4720814 BLAKE2B 5dd064f70557ec1ab979d08523f3dd305fb310c533b69bc99be3ad3d006036354f62b9f3d61c242e1481a254bed538a5e1cf5662f0e35705f1c50a76f31fddbb SHA512 dd2d7cc64043b42a70b5de0ea493f94722a4476248bfd77d6892861e4be6ab20175992367965dfd687bf8b7ebece6113b7f7a3e59256497e3ecd7e2678875965
+DIST mongo-tools-4.0.0.tar.gz 10872217 BLAKE2B 84e92178c0e4827926de525a70d6124635d59e270a3d37e23ec8653cc64d99bb7489fa6266917437ca45aa3ca5e00bc59b81e65c5b72e717db2701c6f7327bec SHA512 d67c4aca9b41266109adc39bb1a642206738fda393e1f9f05570c02a00a02e29ec71c71e67ad232c72d66543ae7e7bfe07fbcf26958d48ed0e631da452c1904d
+EBUILD mongo-tools-3.0.14.ebuild 1096 BLAKE2B c5cc1d28947e0453483d2429c1b1556e880c84e62d563505e420ba5ddf2b64ee1e54b9bdb609ae43091aec967d24cdd2c350c67f9b2f55347cbf334edd7c2004 SHA512 55b66e2872741425cccb75b367e37b4fca28404d63e77a39920246b6a946bf75335d55ea15c7878eb4382ade2cd95bedec4da9a647968a5e27e577073ff7e82f
+EBUILD mongo-tools-3.0.15.ebuild 1098 BLAKE2B ff13b5f35493bead934b47f56a302467346e50d3c6bbfe5958ece13d223da85aae0fa3dcaf991c79dd6694facd4a58657960260352ffa9ff395e4b0ec8dad6b4 SHA512 a36184581a7cff9543a4a63c13549e9096321c558a983a46bb4248541b777a5e4a2e1323f3c140b3fc2b8176a480042d2140e44b488ac69403524410b4115d8d
+EBUILD mongo-tools-3.2.17.ebuild 1221 BLAKE2B 7943f052ee8a6b2fefb1c84233d87f7b3189ba6eee59d764cd2af46d9350d697ee3379405b40be77cc751fdcfccbf0f3aa61640d0e5fd0aafbfe5bac34ae7519 SHA512 1bb25c1e8c72fcc6fe0374ea3469634dfbdf3fa37d41a91bf9e562d16031a23ec227d3a402a0eeb1e66742773db983e823f68f7334c734638620f1040cefe87f
+EBUILD mongo-tools-3.4.10.ebuild 1237 BLAKE2B 27690fa59a8165db8200ec332171396d23ab2084a4b42382b592622030e6b4a9e148b652b412448a1897b90beab3c684aeb570b7facac3d1f6047063b8f29312 SHA512 252ec56015e29597eb8f5cd1c5b63939276734f0459ed6b16fba1faf3eb82b4a88d707324c8010453c791b911a2bdfe14325b4604d6ddcd4259e160d0677dbd8
+EBUILD mongo-tools-3.4.13.ebuild 1217 BLAKE2B b0a7490c786d39639f0b018887f5e9b111279bc80d440a6c49fe8d6444642c61d7700b5865a3e8b9ce28c5af187e47b57a0f79240ea8582a2663f02d01fa2d76 SHA512 f4f00020f3cc9250078770423d40dabfc8054b4205b946c9fc10d580ef5dfcc9a0fec86173c12f3942e332d5c5cac882fc9a23b0fa4944446402a87cd68e77a4
+EBUILD mongo-tools-3.4.14.ebuild 1217 BLAKE2B b0a7490c786d39639f0b018887f5e9b111279bc80d440a6c49fe8d6444642c61d7700b5865a3e8b9ce28c5af187e47b57a0f79240ea8582a2663f02d01fa2d76 SHA512 f4f00020f3cc9250078770423d40dabfc8054b4205b946c9fc10d580ef5dfcc9a0fec86173c12f3942e332d5c5cac882fc9a23b0fa4944446402a87cd68e77a4
+EBUILD mongo-tools-3.4.15.ebuild 1217 BLAKE2B 36dbc749a3052b6d3ac3c55205078f8c7fb9d60f6dc403850d7d32f36b64aeb69de12f1ee689e7b9611695e9ce5896d1b63bfc93abb2026f27aa7f52b007fe72 SHA512 e3d3376f48844f46178d7652df941faa7d8306c370b267478e2439d81ac94842d1682ec4dc7c9acaf1d90516b406b48d9300fa893b90b446c31b8ee2d1067e11
+EBUILD mongo-tools-3.6.2.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
+EBUILD mongo-tools-3.6.3.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
+EBUILD mongo-tools-3.6.4.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
+EBUILD mongo-tools-3.6.5.ebuild 1252 BLAKE2B af486064720907f298f0e22b075284696dd78c01a84fcf9e7a5a5767d11aeed929d57d2f6e6539934ad8083b271606aec522dde38cdb865cf917384e02646315 SHA512 94709a1740d7894b3143daf193c8f067d3e52ca4f7f3f4ae98aea4c63ea65c62178ff9db9f3a82cdd7ddea3e0cdb26162e5954a7b089434960eade7b39ae0b39
+EBUILD mongo-tools-4.0.0.ebuild 1252 BLAKE2B af486064720907f298f0e22b075284696dd78c01a84fcf9e7a5a5767d11aeed929d57d2f6e6539934ad8083b271606aec522dde38cdb865cf917384e02646315 SHA512 94709a1740d7894b3143daf193c8f067d3e52ca4f7f3f4ae98aea4c63ea65c62178ff9db9f3a82cdd7ddea3e0cdb26162e5954a7b089434960eade7b39ae0b39
+MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/files/mongo-tools-3.2.10-pie.patch b/app-admin/mongo-tools/files/mongo-tools-3.2.10-pie.patch
new file mode 100644
index 000000000000..6a80d75b2cb9
--- /dev/null
+++ b/app-admin/mongo-tools/files/mongo-tools-3.2.10-pie.patch
@@ -0,0 +1,12 @@
+diff -uNr mongo-tools-r3.2.10.ORIG/build.sh mongo-tools-r3.2.10/build.sh
+--- mongo-tools-r3.2.10.ORIG/build.sh	2016-11-15 16:15:09.487441283 +0000
++++ mongo-tools-r3.2.10/build.sh	2016-11-15 16:15:23.127235064 +0000
+@@ -22,7 +22,7 @@
+ 
+ for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do
+         echo "Building ${i}..."
+-        go build -o "bin/$i" -tags "$tags" "$i/main/$i.go"
++        go build -buildmode=pie -o "bin/$i" -tags "$tags" "$i/main/$i.go"
+         ./bin/$i --version
+ done
+ 
diff --git a/app-admin/mongo-tools/metadata.xml b/app-admin/mongo-tools/metadata.xml
new file mode 100644
index 000000000000..7a01cd8f7c90
--- /dev/null
+++ b/app-admin/mongo-tools/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ultrabug@gentoo.org</email>
+		<name>Alexys Jacob</name>
+	</maintainer>
+	<longdescription lang="en">
+	MongoDB operation tools such as mongodump, mongoexport, mongorestore, bsondump...
+	</longdescription>
+	<upstream>
+		<remote-id type="github">mongodb/mongo-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/mongo-tools/mongo-tools-3.0.14.ebuild b/app-admin/mongo-tools/mongo-tools-3.0.14.ebuild
new file mode 100644
index 000000000000..bca9db8974e9
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.0.14.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="sasl ssl"
+
+# Maintainer note:
+# openssl DEPEND constraint, see:
+# https://github.com/mongodb/mongo-tools/issues/11
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# ensure we use bash wrt #582906
+	sed -e 's@/bin/sh@/bin/bash@g' -i build.sh || die
+
+	# see #608292
+	epatch "${FILESDIR}/${PN}-3.2.10-pie.patch"
+}
+
+src_compile() {
+	local myconf
+
+	if use sasl; then
+	  myconf="${myconf} sasl"
+	fi
+
+	if use ssl; then
+	  myconf="${myconf} ssl"
+	fi
+
+	./build.sh ${myconf} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.0.15.ebuild b/app-admin/mongo-tools/mongo-tools-3.0.15.ebuild
new file mode 100644
index 000000000000..221680a90f84
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.0.15.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl"
+
+# Maintainer note:
+# openssl DEPEND constraint, see:
+# https://github.com/mongodb/mongo-tools/issues/11
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# ensure we use bash wrt #582906
+	sed -e 's@/bin/sh@/bin/bash@g' -i build.sh || die
+
+	# see #608292
+	epatch "${FILESDIR}/${PN}-3.2.10-pie.patch"
+}
+
+src_compile() {
+	local myconf
+
+	if use sasl; then
+	  myconf="${myconf} sasl"
+	fi
+
+	if use ssl; then
+	  myconf="${myconf} ssl"
+	fi
+
+	./build.sh ${myconf} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.2.17.ebuild b/app-admin/mongo-tools/mongo-tools-3.2.17.ebuild
new file mode 100644
index 000000000000..9616e9801418
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.2.17.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# do not substitute version because it uses git
+	sed -i '/^sed/,+3d' build.sh || die
+	sed -i '/^mv/d' build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+
+	# ensure we use bash wrt #582906
+	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
+
+	default
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+	  myconf+=(sasl)
+	fi
+
+	if use ssl; then
+	  myconf+=(ssl)
+	fi
+
+	./build.sh ${myconf[@]} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.4.10.ebuild b/app-admin/mongo-tools/mongo-tools-3.4.10.ebuild
new file mode 100644
index 000000000000..0fd4699fdadb
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.4.10.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# do not substitute version because it uses git
+	sed -i '/^sed/,+3d' build.sh || die
+	sed -i '/^mv/d' build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+
+	# ensure we use bash wrt #582906
+	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
+
+	default
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+	  myconf+=(sasl)
+	fi
+
+	if use ssl; then
+	  myconf+=(ssl)
+	fi
+
+	./build.sh ${myconf[@]} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.4.13.ebuild b/app-admin/mongo-tools/mongo-tools-3.4.13.ebuild
new file mode 100644
index 000000000000..de23914b1110
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.4.13.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# do not substitute version because it uses git
+	sed -i '/^sed/,+3d' build.sh || die
+	sed -i '/^mv/d' build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+
+	# ensure we use bash wrt #582906
+	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+	  myconf+=(sasl)
+	fi
+
+	if use ssl; then
+	  myconf+=(ssl)
+	fi
+
+	./build.sh ${myconf[@]} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.4.14.ebuild b/app-admin/mongo-tools/mongo-tools-3.4.14.ebuild
new file mode 100644
index 000000000000..de23914b1110
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.4.14.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# do not substitute version because it uses git
+	sed -i '/^sed/,+3d' build.sh || die
+	sed -i '/^mv/d' build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+
+	# ensure we use bash wrt #582906
+	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+	  myconf+=(sasl)
+	fi
+
+	if use ssl; then
+	  myconf+=(ssl)
+	fi
+
+	./build.sh ${myconf[@]} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.4.15.ebuild b/app-admin/mongo-tools/mongo-tools-3.4.15.ebuild
new file mode 100644
index 000000000000..509a9eb6a0ed
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.4.15.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# do not substitute version because it uses git
+	sed -i '/^sed/,+3d' build.sh || die
+	sed -i '/^mv/d' build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+
+	# ensure we use bash wrt #582906
+	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+	  myconf+=(sasl)
+	fi
+
+	if use ssl; then
+	  myconf+=(ssl)
+	fi
+
+	./build.sh ${myconf[@]} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.2.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.2.ebuild
new file mode 100644
index 000000000000..f8c4a23a746a
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.6.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# do not substitute version because it uses git
+	sed -i '/^sed/,+3d' build.sh || die
+	sed -i '/^stty/d' build.sh || die
+	sed -i '/^mv/d' build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+
+	# ensure we use bash wrt #582906
+	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+	  myconf+=(sasl)
+	fi
+
+	if use ssl; then
+	  myconf+=(ssl)
+	fi
+
+	./build.sh ${myconf[@]} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.3.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.3.ebuild
new file mode 100644
index 000000000000..f8c4a23a746a
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.6.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# do not substitute version because it uses git
+	sed -i '/^sed/,+3d' build.sh || die
+	sed -i '/^stty/d' build.sh || die
+	sed -i '/^mv/d' build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+
+	# ensure we use bash wrt #582906
+	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+	  myconf+=(sasl)
+	fi
+
+	if use ssl; then
+	  myconf+=(ssl)
+	fi
+
+	./build.sh ${myconf[@]} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.4.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.4.ebuild
new file mode 100644
index 000000000000..f8c4a23a746a
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.6.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# do not substitute version because it uses git
+	sed -i '/^sed/,+3d' build.sh || die
+	sed -i '/^stty/d' build.sh || die
+	sed -i '/^mv/d' build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+
+	# ensure we use bash wrt #582906
+	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+	  myconf+=(sasl)
+	fi
+
+	if use ssl; then
+	  myconf+=(ssl)
+	fi
+
+	./build.sh ${myconf[@]} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.5.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.5.ebuild
new file mode 100644
index 000000000000..3589981cbd8e
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.6.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# do not substitute version because it uses git
+	sed -i '/^sed/,+3d' build.sh || die
+	sed -i '/^stty/d' build.sh || die
+	sed -i '/^mv/d' build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+
+	# ensure we use bash wrt #582906
+	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+	  myconf+=(sasl)
+	fi
+
+	if use ssl; then
+	  myconf+=(ssl)
+	fi
+
+	./build.sh ${myconf[@]} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.0.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.0.ebuild
new file mode 100644
index 000000000000..3589981cbd8e
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.0.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# do not substitute version because it uses git
+	sed -i '/^sed/,+3d' build.sh || die
+	sed -i '/^stty/d' build.sh || die
+	sed -i '/^mv/d' build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+
+	# ensure we use bash wrt #582906
+	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+	  myconf+=(sasl)
+	fi
+
+	if use ssl; then
+	  myconf+=(ssl)
+	fi
+
+	./build.sh ${myconf[@]} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/monit-5.23.0 b/app-admin/monit-5.23.0
deleted file mode 100644
index 386a8b30dfcf..000000000000
--- a/app-admin/monit-5.23.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-devel/flex sys-devel/bison pam? ( virtual/pam ) virtual/pkgconfig
-DESCRIPTION=Monitoring and managing daemons or similar programs running on a Unix system
-EAPI=6
-HOMEPAGE=http://mmonit.com/monit/
-IUSE=libressl pam ssl
-KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux
-LICENSE=AGPL-3
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=http://mmonit.com/monit/dist/monit-5.23.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dad05236f811ca71513deb8a0c7c4f47
diff --git a/app-admin/monit-5.25.1 b/app-admin/monit-5.25.1
deleted file mode 100644
index a0ab27b27b28..000000000000
--- a/app-admin/monit-5.25.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-devel/flex sys-devel/bison pam? ( virtual/pam ) virtual/pkgconfig
-DESCRIPTION=Monitoring and managing daemons or similar programs running on a Unix system
-EAPI=6
-HOMEPAGE=http://mmonit.com/monit/
-IUSE=libressl pam ssl
-KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux
-LICENSE=AGPL-3
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=http://mmonit.com/monit/dist/monit-5.25.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a9740664a03287f1033d154c539fbeeb
diff --git a/app-admin/monit-5.25.2-r1 b/app-admin/monit-5.25.2-r1
deleted file mode 100644
index 4129e2231401..000000000000
--- a/app-admin/monit-5.25.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-devel/flex sys-devel/bison pam? ( virtual/pam ) virtual/pkgconfig
-DESCRIPTION=Monitoring and managing daemons or similar programs running on a Unix system
-EAPI=6
-HOMEPAGE=http://mmonit.com/monit/
-IUSE=ipv6 libressl pam ssl
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=AGPL-3
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=http://mmonit.com/monit/dist/monit-5.25.2.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d0351322e0474b073513229764bb8fd5
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
new file mode 100644
index 000000000000..6c74fd10c181
--- /dev/null
+++ b/app-admin/monit/Manifest
@@ -0,0 +1,10 @@
+AUX monit.initd-5.0-r1 798 BLAKE2B 3596494122e9746157e86379f204e54d5ad7c0eb378323f3cd2ef7019e9f7a7fba0d8567afe71da8dc2a8b6e17be5fc4162211d36f227183a1557b9b33021f3c SHA512 5e0e2ae2bd1b7e1153a24a51f10b11b7006c43c5b4d68008b477dd0a4cdf97e2109cdb48b1165b79e6f5ad8e98c24a86ff0688f9aecc9297a46d82dd402e0554
+AUX monit.pamd 120 BLAKE2B 76744f79babaa99fa2961f73158ca755f885e9ea8e20b76dcb29f8fd10be6b5804b09b3c90f59ada7ce81eab90713ba43d2b2f28a6abc278fdfc75b356af4e67 SHA512 75c5fbad1c04fc5c9c0de224df245d64f4e59e23f79f4037edcc94623795852900318747e8a71946cab406009834643e84e1cd40b27854951d5462e740712b5c
+AUX monit.service 226 BLAKE2B 3b3041900987acd5bb6faa770c6631f6554b2e4360520252369951b3f7f87a3dd96440a58c9d2c4973ce9980a00ab7085c92af1e6542ae10d679ba352d170b19 SHA512 3ca0499ebd21aee812b78883c144c0a346a8cb6106392544836bf76d594e96b7e77be4b32b8c3170273e8236b25000c268724148252d98a4b99131f8b0ce4e88
+DIST monit-5.23.0.tar.gz 1298472 BLAKE2B 8cc580c1a9947e43703eff3593992d6ad53380918ccab17e0294c195469953f2ae617b8f8360d16b77264012da0aba99dc072d7ff3e3fc66429b3b8f33adb098 SHA512 6ca3de51c7fdb8a677feafb684dc459f4064539fe5501dfa53a2027bb7b1e6f6121b7fa593c9e373f009d2fd0eeca2b9dd659c337f056dfe769908a3aa7ec5b8
+DIST monit-5.25.1.tar.gz 1353855 BLAKE2B 5abef9c97088b12ab376e67f2524534ad1b0e2e3dfa98d5f5fdd8a6fc2331ead57d77aa1d8229a0825cbb36871b063006b74dc98dd780baef8aaca1da5c6c74c SHA512 b21b18302aed602f9371f7dee29f7306dbccd355df333bc6d868acdb6c054cef877dee72e261383938fe1d10121cd07e820e040ea80ed70260fdda8b451f6ab1
+DIST monit-5.25.2.tar.gz 1354704 BLAKE2B 503660146edba988d0c52d1773dc3d3d6f495b3e3f0ae147be6a4297bf118ad6b5f7289868ad4b61226cf499bd8d6e3aed8f5fec91ff8ff699968f4262f1fd01 SHA512 e9b6ce60bf82c2564a084fc42b65ef432ee35855cad038fe6ae209047abaa1c54cabb4cd75c8a85c1102844a1b90c3c5f8ddbbd56711665b9bea616bcc02ec86
+EBUILD monit-5.23.0.ebuild 1101 BLAKE2B 8083ac591d7e3131e053c25a1b50ee6ddc90882bec2c706321c044922b6070b021dde5480c224dab4ef58afb55cc6d69f135e4b0aa3f15e8529e303cea66020d SHA512 c49e39d635cff50eb1708ed61741b6200ae22646889af29a29a01d90bb51ba19e9bc81bf0b731e100369e8201def512753ee35dd352137991a1c6eb2032a9ef3
+EBUILD monit-5.25.1.ebuild 1101 BLAKE2B 8cb885879cb8ad000a9978091df84c2eba145d72b0838c12eed5f7de2891107e0973e8b07bdcc3ff20ddc8188072f65d1f9fc45444e3e124ed2f4adf533c3d83 SHA512 f80d2c48d1bfd011eb4ddd71e65af8d7148104d1607eb741afcca1bd66ff4604cffd32bbc045a1fee24bd64b5637ccaed6e3655275dd2a925d65319069d26753
+EBUILD monit-5.25.2-r1.ebuild 1226 BLAKE2B d1efe3c4501795e124ea3895fa21bfa2264d5bb5d153748b94efcccee38cfeb269cc5d769dcd792cf7167508bc0a23a05c36885cce0f9a99f729303be4b368e8 SHA512 7816aa95fcccdd7d27dd428cdc98f4f6a646aeef875dc02919503cbe1536b8dd2b8b473cd04236317c99f8fece3bb3aab30285424b5d4ea50c40153975584147
+MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-admin/monit/files/monit.initd-5.0-r1 b/app-admin/monit/files/monit.initd-5.0-r1
new file mode 100644
index 000000000000..4589cf41bfef
--- /dev/null
+++ b/app-admin/monit/files/monit.initd-5.0-r1
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_commands="configtest"
+extra_started_commands="reload"
+
+command="/usr/bin/monit"
+
+depend() {
+	use net
+}
+
+configtest() {
+        ${command} -t 1>/dev/null 2>&1
+        ret=$?
+        if [ $ret -ne 0 ]; then
+                eerror "${SVCNAME} has detected an error in your setup:"
+                ${command} -t
+        fi
+        return $ret
+}
+
+start() {
+	ebegin "Starting monit"
+	start-stop-daemon --start --quiet --exec ${command} >/dev/null 2>&1
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping monit"
+	start-stop-daemon --stop --quiet --exec ${command}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading monit"
+	${command} -c /etc/monitrc reload >/dev/null 2>&1
+	eend $?
+}
diff --git a/app-admin/monit/files/monit.pamd b/app-admin/monit/files/monit.pamd
new file mode 100644
index 000000000000..6322e259c745
--- /dev/null
+++ b/app-admin/monit/files/monit.pamd
@@ -0,0 +1,4 @@
+auth	sufficient	pam_securityserver.so
+auth	sufficient	pam_unix.so
+auth	required	pam_deny.so
+auth	required	pam_permit.so
diff --git a/app-admin/monit/files/monit.service b/app-admin/monit/files/monit.service
new file mode 100644
index 000000000000..268825285d05
--- /dev/null
+++ b/app-admin/monit/files/monit.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Pro-active monitoring utility for unix systems
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/monit -I
+ExecStop=/usr/bin/monit quit
+ExecReload=/usr/bin/monit reload
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/monit/metadata.xml b/app-admin/monit/metadata.xml
new file mode 100644
index 000000000000..40aa45df2b01
--- /dev/null
+++ b/app-admin/monit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/monit/monit-5.23.0.ebuild b/app-admin/monit/monit-5.23.0.ebuild
new file mode 100644
index 000000000000..b3fe1c1e4950
--- /dev/null
+++ b/app-admin/monit/monit-5.23.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit pam systemd
+
+DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
+IUSE="libressl pam ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	pam? ( virtual/pam )"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+	econf $(use_with ssl) $(use_with pam)
+}
+
+src_install() {
+	default
+
+	dodoc README
+
+	insinto /etc; insopts -m600; doins monitrc
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-admin/monit/monit-5.25.1.ebuild b/app-admin/monit/monit-5.25.1.ebuild
new file mode 100644
index 000000000000..0e8c407fcd1d
--- /dev/null
+++ b/app-admin/monit/monit-5.25.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit pam systemd
+
+DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
+IUSE="libressl pam ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	pam? ( virtual/pam )"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+	econf $(use_with ssl) $(use_with pam)
+}
+
+src_install() {
+	default
+
+	dodoc README
+
+	insinto /etc; insopts -m600; doins monitrc
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-admin/monit/monit-5.25.2-r1.ebuild b/app-admin/monit/monit-5.25.2-r1.ebuild
new file mode 100644
index 000000000000..8897263d608b
--- /dev/null
+++ b/app-admin/monit/monit-5.25.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit bash-completion-r1 pam systemd
+
+DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="ipv6 libressl pam ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	pam? ( virtual/pam )"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with ipv6)
+		$(use_with pam)
+		$(use_with ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	dodoc README
+
+	insinto /etc; insopts -m600; doins monitrc
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+
+	dobashcomp system/bash/monit
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-admin/mtail-3.0.0_rc4 b/app-admin/mtail-3.0.0_rc4
deleted file mode 100644
index d13c074f71eb..000000000000
--- a/app-admin/mtail-3.0.0_rc4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A tool for extracting metrics from application logs
-EAPI=6
-HOMEPAGE=https://github.com/google/mtail
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!app-misc/mtail
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/google/mtail/archive/v3.0.0-rc4.tar.gz -> mtail-3.0.0_rc4.tar.gz https://github.com/golang/tools/archive/f57adc18217d779aa42266ea71a545827755a77b.tar.gz -> github.com-golang-tools-f57adc18217d779aa42266ea71a545827755a77b.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/pkg/errors/archive/2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb.tar.gz -> github.com-pkg-errors-2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb.tar.gz https://github.com/spf13/afero/archive/e67d870304c4bca21331b02f414f970df13aa694.tar.gz -> github.com-spf13-afero-e67d870304c4bca21331b02f414f970df13aa694.tar.gz https://github.com/golang/sys/archive/43eea11bc92608addb41b8a406b0407495c106f6.tar.gz -> github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz https://github.com/golang/text/archive/825fc78a2fd6fa0a5447e300189e3219e05e1f25.tar.gz -> github.com-golang-text-825fc78a2fd6fa0a5447e300189e3219e05e1f25.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=fc901649c24d7a7e608c1ccf36215191
diff --git a/app-admin/mtail-3.0.0_rc5 b/app-admin/mtail-3.0.0_rc5
deleted file mode 100644
index 5b0336339c38..000000000000
--- a/app-admin/mtail-3.0.0_rc5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A tool for extracting metrics from application logs
-EAPI=6
-HOMEPAGE=https://github.com/google/mtail
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!app-misc/mtail
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/google/mtail/archive/v3.0.0-rc5.tar.gz -> mtail-3.0.0_rc5.tar.gz https://github.com/golang/tools/archive/a4ae70923768403983fdab4e1d612d79c08ba465.tar.gz -> github.com-golang-tools-a4ae70923768403983fdab4e1d612d79c08ba465.tar.gz https://github.com/fsnotify/fsnotify/archive/c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz -> github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/pkg/errors/archive/30136e27e2ac8d167177e8a583aa4c3fea5be833.tar.gz -> github.com-pkg-errors-30136e27e2ac8d167177e8a583aa4c3fea5be833.tar.gz https://github.com/spf13/afero/archive/bbf41cb36dffe15dff5bf7e18c447801e7ffe163.tar.gz -> github.com-spf13-afero-bbf41cb36dffe15dff5bf7e18c447801e7ffe163.tar.gz https://github.com/golang/sys/archive/37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz -> github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz https://github.com/golang/text/archive/4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz -> github.com-golang-text-4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=9a2f9a14f6baa50ec76bb66c18d3dc87
diff --git a/app-admin/mtail/Manifest b/app-admin/mtail/Manifest
new file mode 100644
index 000000000000..29f55ab0d71f
--- /dev/null
+++ b/app-admin/mtail/Manifest
@@ -0,0 +1,18 @@
+DIST github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz 30624 BLAKE2B ced6ca6f115eedc954f6b583b28e470ec5dcfe0c279d55a63c00ee942acde095e9eef8fb4c3fa289f34871f43a7562fb71142d070a54398bc5d91122e64b4ad0 SHA512 cff467ffbed22edf4cde7a52e0f0d7a5b4a06446a6140ad7fa018dfcce3b400342223d888a0389042d2e6fd7abe261d0e515adc6e4c03a74e3cf074e88af17ab
+DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz 31164 BLAKE2B 8ed43520ed7df3f52585b41358e2c89c55cd9bcea78affbf76d11cb2d3660e2de63d2debd91cd4da7c1a1fde3afac1086e616ab632460389cd4f10cc633a3e81 SHA512 809a90dcfbf565d335514257b577150a367e16ef871e2f44584a13fe3bc3ac87cbd789f7c7882a76cf7a7c546740c6552ec7382b4a6d18c4f0e845bcc3a7b0c8
+DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
+DIST github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz 796903 BLAKE2B 4e31f27784cdc5781628ac082d7994a5559be59268003366a3185eac6eb514495f6d82ba13c3046f1061c6abc68712ae8d0505ab7567c8e6057b90f3217c272e SHA512 580bd4cfd26d82aa8c6870eabbd289b76f2ba529ed8496428b29e482ec39bc617cdbcd2f2f2d476ee93526bd18550dcd239085b9f74fb4d24ccb87a3b357bff6
+DIST github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz 771129 BLAKE2B 592e1af8d74e77807a65901b576bebacfca5b2331c6943031720a873bc7782ef35cf3300e5307c79164ded89394df97e7342f73168f4e2354b13cca9260785a8 SHA512 96d1b7254d16c107a5496766ddfc2e56b56a31fe9c4bd34c23ee814911036145d8327203302fbdcb6bcb9af1022073608ea123c6df661132392ecb611e427c96
+DIST github.com-golang-text-4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz 6112758 BLAKE2B 88f0ece79f03800d6482430d569fa9b65d8ec4b15d42f65706ca665349346961ab273d3a7d2d0676d0c6c05a12d08f75c1465fd0ef632611b7b606593466e5ae SHA512 9fc536d4971e8861c5b905dec44fc7eddfaf8b0dafd5f904929bc2b63a65ce3fa28108d3f9f954a9db8d4ed24be532a519bad41e09e8076f9b75e6564f75f7ce
+DIST github.com-golang-text-825fc78a2fd6fa0a5447e300189e3219e05e1f25.tar.gz 4624908 BLAKE2B ca7357d28720c08199b206ac0b88ce28ce281767683503a1d09de002d9c97f10360e274d17405d23d565b1f62d42f2f7fa4387138fb5188052c110037cd16114 SHA512 6b2e721540b1f7ad8dc5c0a7ce45d7631721f223f484e58e561ed482bfefca7a8e4068c68abe33ba08e1db9293d7f99223859d8ba525c868798ecb61995c3f93
+DIST github.com-golang-tools-a4ae70923768403983fdab4e1d612d79c08ba465.tar.gz 2255154 BLAKE2B 45597a951f6c1c678a10fe3fb968cf5eca3b9328f78c57335ee9a45801138b8f169b953190fe293a271efa70c6f1419587cc5aa737f87b217c7b2bd6cabc7c9d SHA512 8a8ca4fab9a691bea505c2953974f29c95c488e81f794daba2edd7b9211b8a309db5ca93a008cbeacc0c967760a7b5182f10ac33da1902cd342461348fca56bc
+DIST github.com-golang-tools-f57adc18217d779aa42266ea71a545827755a77b.tar.gz 2246529 BLAKE2B c6a683b6e490b34c219d8210654d87623aae6f2f2fdb8c716daa54927cbf4250d8522dac00c42dde6c1178e5a843f1fcfe15b30e550c57ac7a5175a152e97353 SHA512 147c4541c56f31b030a45eacd6c87afeccd1b8039bcfbc8882b6a4466cf3fcaba504214938085861a9253c36dbb544bd41b3fb4b2be7f2de5712e823c375890e
+DIST github.com-pkg-errors-2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb.tar.gz 11481 BLAKE2B ee1048ff0b0bdbf77b0c6c2102c32b3691efd5bc75a69d327d6c1e7c19b2ebdd2da7cba383fc312a16122fc89d85ad56265f02847adae8b21674e1c200b364cb SHA512 6e8ce6cc7f3e3065fdb3f53da9be99771e7d3981fc091bad6e6f436c44f7891838a879fc6267bc5349fc73a8c896aa1eaf7cb1b17fafb5d7dee39962b6269c6a
+DIST github.com-pkg-errors-30136e27e2ac8d167177e8a583aa4c3fea5be833.tar.gz 10912 BLAKE2B 189f7fc6a465a4841f242f8222681f0a80bc251151407d14abd585c65f84204c0ce80c7f0bfd6ea5b03c8790021b7436bc180d3571440ef98a85dbffd5cfd60d SHA512 c38f35def5c4ddba089250f2fde423c53d1f0b33dbba4495bacf2fe772b1216672305ada0b353882a296e4b7fc49c72e99633ed7465b03c31854f762e2890277
+DIST github.com-spf13-afero-bbf41cb36dffe15dff5bf7e18c447801e7ffe163.tar.gz 43576 BLAKE2B b3eb215e8ae38ded0c85405e63fab7876f23948dce8272e8a3fc4d710c8617982b62aca0f57c97953340f8eecd87eb7eafce63a1d860d2fdc19d3f433b519d3f SHA512 8e200be7a5b8816f5b6ebf7df4ad61a7e0bacad56fc9f269a16a32c83cd0d293530e71fccd671545c812b27e70eb5e947faddaf4d765b67ce8f2eecb9eebbd9c
+DIST github.com-spf13-afero-e67d870304c4bca21331b02f414f970df13aa694.tar.gz 43416 BLAKE2B 0cc5f646df68a0b2cb4625810b730ec49f984e050084933f2686d2d433ee7c9abdf2e37838c8b8e1970ffc630eca10dca142ec112686493664e32ef6ab39c965 SHA512 6b428a8599c132ddda18b6b6fd1ae6dfc8d11b39e4b3e3e0e9b763571339c2a5e0a2c95a54a6953b82c45b92775ed3ccc0b152e9d9a2fc649f10dd754b3fe2f7
+DIST mtail-3.0.0_rc4.tar.gz 425781 BLAKE2B c957e8ae735395ce197d805f2e5228511074fda08427f180e7b6110a45b74af2fb6bff9670b3d452c0561b7fa4d93105804c631df03c5d73197a81e44a4a35f8 SHA512 6354d36303e37e440636f965ffe5685cc30a886ac348ad85f33e384e4cf0a3616328857362361fdf0f1759d361323d08f6052d481f76f6dd8454b1efe3a24e8a
+DIST mtail-3.0.0_rc5.tar.gz 432769 BLAKE2B 2098fca72a7ca1564885a6c4d7a0a1b30ceee74d3fc310b0b18542b5e7bdf14dd17d40d4f3cd1bf62d7613375a470fef632bb9b185cc082b5633481e126e0481 SHA512 74c8fe536bde628cb9874a36a4693eb55e2e490d5e6d80a60d7f1f17fea66f8cf7a95345da406b4d4eeca9e6a42d614086d92ed2f8fc9180019f49f8ddccb055
+EBUILD mtail-3.0.0_rc4.ebuild 1538 BLAKE2B e571750ebdfea77312619632ee2a9d1aaee6cee63f1889feed375a3c15ccbed122a01dbe5e3dc266ea4b1916327c638dff14605f657ae73220dfd3f40c15c693 SHA512 3ddae954b727c0023096633a0a98e31bf392a11d615c62a97412e2373b1b7dbb9f9cf6de5cbd97a443ef38ee1f6fe85f44bd3c874699ca68b339c2d0baf6595a
+EBUILD mtail-3.0.0_rc5.ebuild 1539 BLAKE2B c058b720caa435d2e257c7ded3f1c5c95347ed30a8339439450da5d01b17961151b8787e15c0cd01519ed13dbd1dc633cfaf5d7e1b81e2f3bcec9edfc60cad18 SHA512 0f5ac027289adc7f911990c24c3bb20ef58caa5116fabbc965dd646e6dae0b7576eed5ee5f6d3674e626bf014b8cdea7003aaf6a76ace1b8206df450acf4134d
+MISC metadata.xml 295 BLAKE2B 83cc868475f40ef5e6bd8fa8824e8959615d7589fe4985273026ed4ce02b5eee2c631cbdce4f69e67f9a019252385bf4e0bcbef0e2f5083770955ca351be5961 SHA512 ed1a9cc5e20a4063111ebae0942a1f23b30363c91e22099046c9628d8636b9500cd204a11b22744c3e881d04ebcef9515f47efe636bc6a8a7d992fed9e2c6f95
diff --git a/app-admin/mtail/metadata.xml b/app-admin/mtail/metadata.xml
new file mode 100644
index 000000000000..4b625a3a0493
--- /dev/null
+++ b/app-admin/mtail/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">google/mtail</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/mtail/mtail-3.0.0_rc4.ebuild b/app-admin/mtail/mtail-3.0.0_rc4.ebuild
new file mode 100644
index 000000000000..673d711107a9
--- /dev/null
+++ b/app-admin/mtail/mtail-3.0.0_rc4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "golang.org/x/tools f57adc18217d779aa42266ea71a545827755a77b github.com/golang/tools"
+	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
+	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+	"github.com/pkg/errors 2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb"
+	"github.com/spf13/afero e67d870304c4bca21331b02f414f970df13aa694"
+	"golang.org/x/sys 43eea11bc92608addb41b8a406b0407495c106f6 github.com/golang/sys"
+	"golang.org/x/text 825fc78a2fd6fa0a5447e300189e3219e05e1f25 github.com/golang/text"
+	)
+
+inherit golang-build golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGIT_COMMIT="d9f2afc03ae86e203892f25d66cce8c76df8c649"
+EGO_PN="github.com/google/mtail"
+SRC_URI="https://${EGO_PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+DESCRIPTION="A tool for extracting metrics from application logs"
+HOMEPAGE="https://github.com/google/mtail"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+RDEPEND="!app-misc/mtail"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e '/^[[:space:]]*go get .*/d'\
+		-e "s/git describe --tags/echo ${PV}/"\
+		-e "s/git rev-parse HEAD/echo ${EGIT_COMMIT}/"\
+		"src/${EGO_PN}/Makefile" || die
+}
+
+src_compile() {
+	export GOPATH="${S}"
+	go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/vendor/golang.org/x/tools/cmd/goyacc" || die
+	emake -C "src/${EGO_PN}"
+}
+
+src_install() {
+	dobin bin/mtail
+	dodoc "src/${EGO_PN}/"{CONTRIBUTING.md,README.md,TODO}
+}
diff --git a/app-admin/mtail/mtail-3.0.0_rc5.ebuild b/app-admin/mtail/mtail-3.0.0_rc5.ebuild
new file mode 100644
index 000000000000..8297bf1eec38
--- /dev/null
+++ b/app-admin/mtail/mtail-3.0.0_rc5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=(
+	"golang.org/x/tools a4ae70923768403983fdab4e1d612d79c08ba465 github.com/golang/tools"
+	"github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
+	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+	"github.com/pkg/errors 30136e27e2ac8d167177e8a583aa4c3fea5be833"
+	"github.com/spf13/afero bbf41cb36dffe15dff5bf7e18c447801e7ffe163"
+	"golang.org/x/sys 37707fdb30a5b38865cfb95e5aab41707daec7fd github.com/golang/sys"
+	"golang.org/x/text 4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1 github.com/golang/text"
+	)
+
+inherit golang-build golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGIT_COMMIT="04017b5a1241b4e78b0a2dab84e5a332228b54d2"
+EGO_PN="github.com/google/mtail"
+SRC_URI="https://${EGO_PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+DESCRIPTION="A tool for extracting metrics from application logs"
+HOMEPAGE="https://github.com/google/mtail"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+RDEPEND="!app-misc/mtail"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e '/^[[:space:]]*go get .*/d'\
+		-e "s/git describe --tags/echo ${PV}/"\
+		-e "s/git rev-parse HEAD/echo ${EGIT_COMMIT}/"\
+		"src/${EGO_PN}/Makefile" || die
+}
+
+src_compile() {
+	export GOPATH="${S}"
+	go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/vendor/golang.org/x/tools/cmd/goyacc" || die
+	emake -C "src/${EGO_PN}"
+}
+
+src_install() {
+	dobin bin/mtail
+	dodoc "src/${EGO_PN}/"{CONTRIBUTING.md,README.md,TODO}
+}
diff --git a/app-admin/multilog-watch-1.12-r1 b/app-admin/multilog-watch-1.12-r1
deleted file mode 100644
index 9dd7f0bc15fd..000000000000
--- a/app-admin/multilog-watch-1.12-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Watches a multilog file for irregularities
-EAPI=6
-HOMEPAGE=https://www.eyrie.org/~eagle/software/multilog-watch/
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic GPL-2
-RDEPEND=dev-lang/perl virtual/qmail
-SLOT=0
-SRC_URI=https://archives.eyrie.org/software/system/multilog-watch https://www.eyrie.org/%7Eeagle/software/multilog-watch/sample.filter
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6c3f5805d38aaab97621719bd0f7545
diff --git a/app-admin/multilog-watch/Manifest b/app-admin/multilog-watch/Manifest
new file mode 100644
index 000000000000..4626b55f15cc
--- /dev/null
+++ b/app-admin/multilog-watch/Manifest
@@ -0,0 +1,4 @@
+DIST multilog-watch 12291 BLAKE2B 3526d532e51ee9d33f5bb7a15b84255669e315ce3f0490193cd1f58af74d10c3893cbd026576a824cc9641c15ea44cad2a84ee5b1dae5c11ee887f30d0c58fca SHA512 e28933b005243261a9f92c2a3a19e15ac4da2c3a505422e3521f2f1888a6cf5cdac2ee1161449334d27f4a7669b1f266d6760f12641ecf066629e26c98fcd041
+DIST sample.filter 1041 BLAKE2B 19e7fd8b7f547996f51d7f9217bee42ed4adefbf8740931e0db0da3284d7ef6b097ba69950447a6e1a04fef94945875789375ab1dc703bf5fc7e748120e0cf8b SHA512 5164461010629f22c9c19d3341251d3723f5dbc02719e19f7f94c5c4154c0e246b365d9d555f88c9589c95b0fbeabb1408137d4782b1c360325460a008192ed5
+EBUILD multilog-watch-1.12-r1.ebuild 991 BLAKE2B 16c8d2ab97aa43c186adcfae4f51af1242fc8794abe5c7f21025c48a0f7bff6f7c65f489b7c47ecf3143e6950290709a3bd85616745a440968e83098b3c23b24 SHA512 9eedc4f57f714517f4a04602214c87f64347e23ec0a73e6a9b74c98dedaa0be0a7470c5c28b16ea97417b20c336f62008b51a4456a63f39710c844452374074a
+MISC metadata.xml 613 BLAKE2B 74a8a6e2c96de9927f3381b4facd47aa3dac52302f39ec30a7daff1a69ecddbae374ce53d8bdc579dfe5fac1eb70b7621b21a884adb9b55cb08d2b1ed2d66b88 SHA512 819de14285bb2c8bef1ba833e8e49ad7ed65034caecdf2becdfc2bfd5c9caa33ed8dc1c026d9c9a8ddffc125be8cc1f7537b9c1279415ced2f36777582099005
diff --git a/app-admin/multilog-watch/metadata.xml b/app-admin/multilog-watch/metadata.xml
new file mode 100644
index 000000000000..e514910935bc
--- /dev/null
+++ b/app-admin/multilog-watch/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription lang="en">This program reads logs written by multilog (part of the
+daemontools package by Dan Bernstein), discards any lines matching regular
+expressions in its configuration file, and mails the rest to a configured e-mail
+address. The e-mail is sent using qmail-remote directly, which requires qmail be
+installed on the system but which allows multilog-watch to send mail even if the
+local mail system is down.</longdescription>
+</pkgmetadata>
diff --git a/app-admin/multilog-watch/multilog-watch-1.12-r1.ebuild b/app-admin/multilog-watch/multilog-watch-1.12-r1.ebuild
new file mode 100644
index 000000000000..a8298e04e6c0
--- /dev/null
+++ b/app-admin/multilog-watch/multilog-watch-1.12-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Watches a multilog file for irregularities"
+HOMEPAGE="https://www.eyrie.org/~eagle/software/multilog-watch/"
+SRC_URI="https://archives.eyrie.org/software/system/multilog-watch
+https://www.eyrie.org/%7Eeagle/software/multilog-watch/sample.filter"
+
+LICENSE="Artistic GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+		virtual/qmail"
+
+src_unpack() {
+	mkdir "${S}" || die
+	cp "${DISTDIR}"/multilog-watch "${S}" || die
+	cp "${DISTDIR}"/sample.filter "${S}" || die
+}
+
+src_compile() {
+	mv multilog-watch multilog-watch.orig || die
+	sed -e 's/\/etc\/leland/\/etc\/multilog-watch/' multilog-watch.orig > multilog-watch || die
+	/usr/bin/pod2man -s 1 multilog-watch multilog-watch.1 || die
+}
+
+src_install() {
+	dodir /etc/multilog-watch
+	insinto /etc/multilog-watch
+	doins sample.filter
+
+	dobin multilog-watch
+	doman multilog-watch.1
+}
diff --git a/app-admin/needrestart-2.11 b/app-admin/needrestart-2.11
deleted file mode 100644
index 7a133e182473..000000000000
--- a/app-admin/needrestart-2.11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-devel/gettext
-DESCRIPTION=Restart daemons after library updates
-EAPI=6
-HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey
-SLOT=0
-SRC_URI=https://github.com/liske/needrestart/archive/v2.11.tar.gz -> needrestart-2.11.tar.gz
-_md5_=39cb184d297a58ba8488c670fe7f7675
diff --git a/app-admin/needrestart-2.11-r1 b/app-admin/needrestart-2.11-r1
deleted file mode 100644
index 69912540533f..000000000000
--- a/app-admin/needrestart-2.11-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-devel/gettext
-DESCRIPTION=Restart daemons after library updates
-EAPI=6
-HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers
-SLOT=0
-SRC_URI=https://github.com/liske/needrestart/archive/v2.11.tar.gz -> needrestart-2.11.tar.gz
-_md5_=9a2dab53d70ba2d12004431ca7e70adb
diff --git a/app-admin/needrestart-3.0 b/app-admin/needrestart-3.0
deleted file mode 100644
index 4559aaf1983b..000000000000
--- a/app-admin/needrestart-3.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-devel/gettext
-DESCRIPTION=Restart daemons after library updates
-EAPI=6
-HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers
-SLOT=0
-SRC_URI=https://github.com/liske/needrestart/archive/v3.0.tar.gz -> needrestart-3.0.tar.gz
-_md5_=86d38303f6a223070e03364f1f4dd607
diff --git a/app-admin/needrestart-3.1 b/app-admin/needrestart-3.1
deleted file mode 100644
index 35aac1055590..000000000000
--- a/app-admin/needrestart-3.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-devel/gettext
-DESCRIPTION=Restart daemons after library updates
-EAPI=6
-HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers
-SLOT=0
-SRC_URI=https://github.com/liske/needrestart/archive/v3.1.tar.gz -> needrestart-3.1.tar.gz
-_md5_=86d38303f6a223070e03364f1f4dd607
diff --git a/app-admin/needrestart-3.1-r1 b/app-admin/needrestart-3.1-r1
deleted file mode 100644
index 7b0848102ce3..000000000000
--- a/app-admin/needrestart-3.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-devel/gettext
-DESCRIPTION=Restart daemons after library updates
-EAPI=6
-HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers
-SLOT=0
-SRC_URI=https://github.com/liske/needrestart/archive/v3.1.tar.gz -> needrestart-3.1.tar.gz
-_md5_=ae2c7709247d1428eeabf520bb0dd7a3
diff --git a/app-admin/needrestart-3.2 b/app-admin/needrestart-3.2
deleted file mode 100644
index b339b652cb31..000000000000
--- a/app-admin/needrestart-3.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-devel/gettext
-DESCRIPTION=Restart daemons after library updates
-EAPI=6
-HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers
-SLOT=0
-SRC_URI=https://github.com/liske/needrestart/archive/v3.2.tar.gz -> needrestart-3.2.tar.gz
-_md5_=86d38303f6a223070e03364f1f4dd607
diff --git a/app-admin/needrestart-3.3 b/app-admin/needrestart-3.3
deleted file mode 100644
index 972f0790029f..000000000000
--- a/app-admin/needrestart-3.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-devel/gettext
-DESCRIPTION=Restart daemons after library updates
-EAPI=6
-HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers
-SLOT=0
-SRC_URI=https://github.com/liske/needrestart/archive/v3.3.tar.gz -> needrestart-3.3.tar.gz
-_md5_=66039d1d5e141b79e801557a050e766e
diff --git a/app-admin/needrestart-9999 b/app-admin/needrestart-9999
deleted file mode 100644
index 48be591c9afe..000000000000
--- a/app-admin/needrestart-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-devel/gettext >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Restart daemons after library updates
-EAPI=6
-HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
-LICENSE=GPL-2+
-RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
-_md5_=9a2dab53d70ba2d12004431ca7e70adb
diff --git a/app-admin/needrestart/Manifest b/app-admin/needrestart/Manifest
new file mode 100644
index 000000000000..42330c6a8942
--- /dev/null
+++ b/app-admin/needrestart/Manifest
@@ -0,0 +1,15 @@
+AUX needrestart-3.1-gentoo-kernel-detection.patch 870 BLAKE2B 9d56a445bdda0af61fa0303c0b3dcc04f241687727f1fd94ac74d3f1f25583c9b0248a1d06a9007b31032fb01244246f8bec4d9a40e66de5f1b06a76de4ade19 SHA512 ddbda09aa655beb918883029b5137cc50f4bf2ad225ed2096551a13c6ccba352a04b96257da6c60085a86ecb4106569ed323d2beac924e76e37baf4810745857
+DIST needrestart-2.11.tar.gz 52156 BLAKE2B fb3ffbf6f7876625ad0b7db4feb629c80f0798b7b117f5c94058533e8ed53e695fca5de76670a184245e23720886c79b97c3cfdcc5e9400c1e6988fdb2f64459 SHA512 e987ebafe77aba6920645088fa12e609b52f55edfd545ede1c0a93ee1d6b91ed3ea84cb8db69cd067aaabe8ba973b366da61301b5527ec176a29e3ba30605311
+DIST needrestart-3.0.tar.gz 58437 BLAKE2B 6f3b79f793dab85af2a68f3796926b958c077b16c357969943db867dead470cef20aadb076a12a0e3161efc64c82cd1df7f6cdbc70f73cce563a11dec472f69a SHA512 6b653e29b10e497563e67102e11833f7c97d2bde697a99130ff89d5fcd2e616fec279328656f44ccdbb62a2c533bf10827b035efad7785ef5d0556c7f37e625f
+DIST needrestart-3.1.tar.gz 58882 BLAKE2B c29d7a56905b047f73743075f520116004a8eed8d88ca402e958fc6a4a430213c9ba4dec469dd1221cbad5b8c6123a9e1acb451f63c6dfdfcd11dc27bce147af SHA512 a55f4e83be676d26d815f28df2a7d56c17bd74d6c1a801f5d1ee05344853d7272dda018b3c19b7753dd6f256e793261d5581df49449c4c9577309add15d4bb70
+DIST needrestart-3.2.tar.gz 59702 BLAKE2B 9eb8073a4dc6f7a402ee9ce055960663a08d3d4b11805ef4189c8416d59bda53e02f4b07f43f49b73a99eb9b82d8e94ca5757cd6c7463dcfa34949ca7e6521da SHA512 56e881d73b1bf1cbee8a94ae871c2fe350d6b31e4701fdc256bbedb0d9934111f5f201d3d7b7f25ff54f78fd450c95f4c2bad6f06de5e9ce379a393fd73280d5
+DIST needrestart-3.3.tar.gz 59814 BLAKE2B bfba00dee7c0f225efcaaa80b301eb38d0ea82645f253c8bef9294102f9f4183433ed1b6efe71a9dc34c65f76364ff3fc2344e840b34f97361f3ddcd0dc9ab4b SHA512 ea2f3cbe228a6b879905bd3b3de8b5e0bb2362e8d3cd566817d2e7d519d54207ff5923eb8e49cbd8ffe8ed50729f4da04bf4d55268e806f49157860584058d50
+EBUILD needrestart-2.11-r1.ebuild 855 BLAKE2B cf57592733872915455d20c0c10ce8f0e6438fbeae4bf998efb7d5613d3968f33369f3e37406fdb02d913ced830905bb34761db7cffd711663df16a207bdb6cc SHA512 dd8451935fd7e9ae0d80bf8d78193e0ae5eb1a9ad2babf895b223271024fe8fb968e2b2e0c153744fb9bece1a7d82d0864bdb093642504c061d225a5a4d2ce33
+EBUILD needrestart-2.11.ebuild 825 BLAKE2B 42e2af640eb7aa73c5012e05de007554612b9c915d04e24bce1f7d9866e0072b799a5725782db0d743c8ca0e958b9f923ae46657e0f9172d936cd834de2c2d50 SHA512 feeeaf8e9f7644db79f63735677d21c14e9c047ee392b1ab342c7174fd701ad098d4c5d9e903a9f5a1d0575537261e5526970c3fe287320b5985c1b8aacd714d
+EBUILD needrestart-3.0.ebuild 855 BLAKE2B e1c5709c7a1891b7719606258337def8a0bc67c7afa23983e583433c664efeab7b555751fdac08ac74230015fde860abd14f57cea297a0e98b89b1205d74682e SHA512 08ce4d08db3de0d76c57f1ae89d7827d2a34483a28125a0d627b9d57aee3d1da6a3d5c13e19d25df9a7481541bdec4147881c6cc1fb2953050f0d054861ee5f0
+EBUILD needrestart-3.1-r1.ebuild 918 BLAKE2B 776c121b6e60ba62d84de3c5fe19a431ebce26567e194ca68f2f085b0fd82a1302b6602726ca9951e65a436505626061c0beec0139217e35e517d4b5271b90bc SHA512 e3f335c3111e497f8102930b0a28f4fee5f1fb418f2cfdeebeea3982053f560942cda52b83486898efca38d1d041d9b0e4fd25e5e9e5cfaca50a1cb09d430b68
+EBUILD needrestart-3.1.ebuild 855 BLAKE2B e1c5709c7a1891b7719606258337def8a0bc67c7afa23983e583433c664efeab7b555751fdac08ac74230015fde860abd14f57cea297a0e98b89b1205d74682e SHA512 08ce4d08db3de0d76c57f1ae89d7827d2a34483a28125a0d627b9d57aee3d1da6a3d5c13e19d25df9a7481541bdec4147881c6cc1fb2953050f0d054861ee5f0
+EBUILD needrestart-3.2.ebuild 855 BLAKE2B e1c5709c7a1891b7719606258337def8a0bc67c7afa23983e583433c664efeab7b555751fdac08ac74230015fde860abd14f57cea297a0e98b89b1205d74682e SHA512 08ce4d08db3de0d76c57f1ae89d7827d2a34483a28125a0d627b9d57aee3d1da6a3d5c13e19d25df9a7481541bdec4147881c6cc1fb2953050f0d054861ee5f0
+EBUILD needrestart-3.3.ebuild 862 BLAKE2B c7b40d4ad4875a39f2e214c1544b77627b8b2c09648fe8d92dcc18a8f3dbd9de60715ffd285c9d18a8350427ab5d915f67da90e40f545a4b7a8e20e23b59253c SHA512 83fba7bd0aa4f3b157b352b309698d0abc3ce06ea4c07b4fa59aa0a57d3d157dbd63d1e2bac0037304871a384d9300307210a36b6d15d55cd8977ea9cdcb4d86
+EBUILD needrestart-9999.ebuild 855 BLAKE2B cf57592733872915455d20c0c10ce8f0e6438fbeae4bf998efb7d5613d3968f33369f3e37406fdb02d913ced830905bb34761db7cffd711663df16a207bdb6cc SHA512 dd8451935fd7e9ae0d80bf8d78193e0ae5eb1a9ad2babf895b223271024fe8fb968e2b2e0c153744fb9bece1a7d82d0864bdb093642504c061d225a5a4d2ce33
+MISC metadata.xml 461 BLAKE2B 28793d229fbcb27f6ad2bf256bfae268236133d14302a72693b90e319af2bc2dc4c1928546b9f3c5e5fc657fa4013fb28acedb1762b84bed60850e5ba0852c23 SHA512 6b8877f41545dafdb30cc0ed3664e568901cc13c68c5221817631be63d454ef30d1b2e923f3a8fd9b0d77be825e1f183601e7a7d474a1d196b2a8eef099095b4
diff --git a/app-admin/needrestart/files/needrestart-3.1-gentoo-kernel-detection.patch b/app-admin/needrestart/files/needrestart-3.1-gentoo-kernel-detection.patch
new file mode 100644
index 000000000000..6b8c221098b3
--- /dev/null
+++ b/app-admin/needrestart/files/needrestart-3.1-gentoo-kernel-detection.patch
@@ -0,0 +1,24 @@
+From bbd98c32fb5d33f42d1b9257f55a07d62b8de164 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Mon, 7 May 2018 11:28:33 -0400
+Subject: [PATCH] [Kernel] Include /boot/kernel* while looking for linux kernel
+ images
+
+Fixes kernel detection on Gentoo
+---
+ perl/lib/NeedRestart/Kernel/Linux.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/perl/lib/NeedRestart/Kernel/Linux.pm b/perl/lib/NeedRestart/Kernel/Linux.pm
+index 6f284f3..69a919c 100644
+--- a/perl/lib/NeedRestart/Kernel/Linux.pm
++++ b/perl/lib/NeedRestart/Kernel/Linux.pm
+@@ -131,7 +131,7 @@ sub nr_kernel_check_real($$) {
+     } grep {
+ 	# filter initrd images
+ 	(!m@^/boot/init@);
+-    } (</boot/vmlinu*>, </boot/*.img>);
++    } (</boot/vmlinu*>, </boot/*.img>, </boot/kernel*>);
+ 
+     $ui->progress_prep(scalar keys %kfiles, __ 'Scanning linux images...');
+ 
diff --git a/app-admin/needrestart/metadata.xml b/app-admin/needrestart/metadata.xml
new file mode 100644
index 000000000000..c7f0a8e203d9
--- /dev/null
+++ b/app-admin/needrestart/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>candrews@gentoo.org</email>
+        <name>Craig Andrews</name>
+    </maintainer>
+    <longdescription lang="en">
+        Restart daemons after library updates
+    </longdescription>
+    <upstream>
+        <remote-id type="github">liske/needrestart</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/app-admin/needrestart/needrestart-2.11-r1.ebuild b/app-admin/needrestart/needrestart-2.11-r1.ebuild
new file mode 100644
index 000000000000..3019c0bacfe7
--- /dev/null
+++ b/app-admin/needrestart/needrestart-2.11-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+	>=sys-apps/sed-4.2.2
+	dev-lang/perl:=
+	dev-perl/libintl-perl
+	dev-perl/Module-Find
+	dev-perl/Module-ScanDeps
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/TermReadKey
+	sys-apps/init-system-helpers
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_install() {
+	default
+	doman man/*.1
+	dodoc -r ex
+}
diff --git a/app-admin/needrestart/needrestart-2.11.ebuild b/app-admin/needrestart/needrestart-2.11.ebuild
new file mode 100644
index 000000000000..c0f3cada3106
--- /dev/null
+++ b/app-admin/needrestart/needrestart-2.11.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+	>=sys-apps/sed-4.2.2
+	dev-lang/perl:=
+	dev-perl/libintl-perl
+	dev-perl/Module-Find
+	dev-perl/Module-ScanDeps
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/TermReadKey
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_install() {
+	default
+	doman man/*.1
+	dodoc -r ex
+}
diff --git a/app-admin/needrestart/needrestart-3.0.ebuild b/app-admin/needrestart/needrestart-3.0.ebuild
new file mode 100644
index 000000000000..062247caf71e
--- /dev/null
+++ b/app-admin/needrestart/needrestart-3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+	>=sys-apps/sed-4.2.2
+	dev-lang/perl:=
+	dev-perl/libintl-perl
+	dev-perl/Module-Find
+	dev-perl/Module-ScanDeps
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/TermReadKey
+	sys-apps/init-system-helpers
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_install() {
+	default
+	doman man/*.1
+	dodoc -r ex
+}
diff --git a/app-admin/needrestart/needrestart-3.1-r1.ebuild b/app-admin/needrestart/needrestart-3.1-r1.ebuild
new file mode 100644
index 000000000000..d3e017750bdd
--- /dev/null
+++ b/app-admin/needrestart/needrestart-3.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+	>=sys-apps/sed-4.2.2
+	dev-lang/perl:=
+	dev-perl/libintl-perl
+	dev-perl/Module-Find
+	dev-perl/Module-ScanDeps
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/TermReadKey
+	sys-apps/init-system-helpers
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gentoo-kernel-detection.patch"
+)
+
+src_install() {
+	default
+	doman man/*.1
+	dodoc -r ex
+}
diff --git a/app-admin/needrestart/needrestart-3.1.ebuild b/app-admin/needrestart/needrestart-3.1.ebuild
new file mode 100644
index 000000000000..062247caf71e
--- /dev/null
+++ b/app-admin/needrestart/needrestart-3.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+	>=sys-apps/sed-4.2.2
+	dev-lang/perl:=
+	dev-perl/libintl-perl
+	dev-perl/Module-Find
+	dev-perl/Module-ScanDeps
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/TermReadKey
+	sys-apps/init-system-helpers
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_install() {
+	default
+	doman man/*.1
+	dodoc -r ex
+}
diff --git a/app-admin/needrestart/needrestart-3.2.ebuild b/app-admin/needrestart/needrestart-3.2.ebuild
new file mode 100644
index 000000000000..062247caf71e
--- /dev/null
+++ b/app-admin/needrestart/needrestart-3.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+	>=sys-apps/sed-4.2.2
+	dev-lang/perl:=
+	dev-perl/libintl-perl
+	dev-perl/Module-Find
+	dev-perl/Module-ScanDeps
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/TermReadKey
+	sys-apps/init-system-helpers
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_install() {
+	default
+	doman man/*.1
+	dodoc -r ex
+}
diff --git a/app-admin/needrestart/needrestart-3.3.ebuild b/app-admin/needrestart/needrestart-3.3.ebuild
new file mode 100644
index 000000000000..2ba6e13ba342
--- /dev/null
+++ b/app-admin/needrestart/needrestart-3.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS="amd64 x86"
+else
+	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+	>=sys-apps/sed-4.2.2
+	dev-lang/perl:=
+	dev-perl/libintl-perl
+	dev-perl/Module-Find
+	dev-perl/Module-ScanDeps
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/TermReadKey
+	sys-apps/init-system-helpers
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_install() {
+	default
+	doman man/*.1
+	dodoc -r ex
+}
diff --git a/app-admin/needrestart/needrestart-9999.ebuild b/app-admin/needrestart/needrestart-9999.ebuild
new file mode 100644
index 000000000000..3019c0bacfe7
--- /dev/null
+++ b/app-admin/needrestart/needrestart-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+	>=sys-apps/sed-4.2.2
+	dev-lang/perl:=
+	dev-perl/libintl-perl
+	dev-perl/Module-Find
+	dev-perl/Module-ScanDeps
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/TermReadKey
+	sys-apps/init-system-helpers
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_install() {
+	default
+	doman man/*.1
+	dodoc -r ex
+}
diff --git a/app-admin/newsyslog-1.1-r1 b/app-admin/newsyslog-1.1-r1
deleted file mode 100644
index f12c918875d5..000000000000
--- a/app-admin/newsyslog-1.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-apps/groff
-DESCRIPTION=a highly configurable program for managing and archiving log files
-EAPI=6
-HOMEPAGE=http://www.weird.com/~woods/projects/newsyslog.html
-KEYWORDS=alpha amd64 hppa ~mips ppc ppc64 ~sparc x86
-LICENSE=MIT
-RDEPEND=virtual/cron app-arch/gzip
-SLOT=0
-SRC_URI=ftp://ftp.weird.com/pub/local/newsyslog-1.1.tar.gz
-_md5_=098cbc26f6aa099300e1e4031dffa7c3
diff --git a/app-admin/newsyslog-1.1.0.81 b/app-admin/newsyslog-1.1.0.81
deleted file mode 100644
index 8679c7acbce3..000000000000
--- a/app-admin/newsyslog-1.1.0.81
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-apps/groff
-DESCRIPTION=a highly configurable program for managing and archiving log files
-EAPI=6
-HOMEPAGE=http://www.weird.com/~woods/projects/newsyslog.html
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=virtual/cron app-arch/gzip
-SLOT=0
-SRC_URI=http://download.openpkg.org/components/cache/newsyslog/newsyslog-1.1.0.81.tar.gz
-_md5_=322f62aa53124f8296b67c04272dddac
diff --git a/app-admin/newsyslog/Manifest b/app-admin/newsyslog/Manifest
new file mode 100644
index 000000000000..45edf97846d1
--- /dev/null
+++ b/app-admin/newsyslog/Manifest
@@ -0,0 +1,7 @@
+AUX newsyslog-1.1-html.patch 478 BLAKE2B 305c1ab0f22358fe3e60aa75c8978007a30d474529c770a06a4bdc799be9c0b2b9ba50c4aba361db09e1e3dca499f50c9c7bc5f21053bbca814d51290f7848f7 SHA512 fa818e19752a84def2386ff796f52d6ebbb110e632fe63f53f3a8a33cee330270d1bb2537cdfeba815dfdeed02daadfd51f271574c504be0f571dc3bc25ad473
+AUX newsyslog-1.1.0.81-html.patch 500 BLAKE2B 734f264da0de2b612ba489e9ca27519bd775ef1a13f62c3e31dc037a593aa6d9b765d866e4d1726d4207358c6d3cf7c003da25ede55aed9c41f280c35d3508ee SHA512 4d4d3464a4a3892ce65770bcf07bbf25e985f93df9be360703ea3aede7c54860f9d77af93f927c8b479ea0d298b8e4ff65a4fdd7225a1290baee2b19bd00eeb4
+DIST newsyslog-1.1.0.81.tar.gz 174411 BLAKE2B d7916396ecf7dda9928891c3bd1020be45354c9623e53d9a52170567c811b3cad3e82efec8145f51a68ed851c46a6c3fb6e8bf944bedf935f2a6589e4b45d3e1 SHA512 de7ae2f71fb5a2a3fad0eaaa793da1ff2b36bc5757a30c70e8f740da8ea2647aea0422c13c1cc1a5e082e41938cbb590c8bb0ecf46d5d584466069f319db47c2
+DIST newsyslog-1.1.tar.gz 156371 BLAKE2B f9ac2de3059e377e61963af70591ca19bc335ffc96d1aa94770fec96cad7b8200d10edc6ac4ab115b697eb0527a998dd457ea1c0d5a1b529d5cbf5285d5ec138 SHA512 b321ae47ecacf6905858bedfaa5ca8c4230f7b6e5a715f8481331940c0ae53795769524a62d1670b4df27f9e263b407be83527a64ccd54b3ba75d55d3c5149b1
+EBUILD newsyslog-1.1-r1.ebuild 932 BLAKE2B e13c975cda484c75773fa1dd3252df107300dddfe8bc397eb10a4d33fe5a4b9cfd0ba70401e50bc326a64f0b0542aaa1eb2df53359641a6e484f4e30a2c32c9e SHA512 daea4bb7fcd5402995b98708ca927b64c9bb1e0d63919f3977ad52b116d805ccd2604f182bfd467669489645a5c3d78118c9b5a64096322a1394e29e11bea261
+EBUILD newsyslog-1.1.0.81.ebuild 959 BLAKE2B 635d50774f8f53b1ea98946e0d0ad337e8ce706b8910770073e14bdf37735880b68dbb03827c5af4a286cd0f5342600252df0e14289e33e9ce581b23996c9669 SHA512 5eceaed73affe0a824e74c12ffae5f914689a9c8d598490f3ea19feb072a94c1337d9ecfd50d9cddebfabcfb1bf1e5b795e8fd0841bc21498d5b71a5a13eba7d
+MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/app-admin/newsyslog/files/newsyslog-1.1-html.patch b/app-admin/newsyslog/files/newsyslog-1.1-html.patch
new file mode 100644
index 000000000000..265858e74e4b
--- /dev/null
+++ b/app-admin/newsyslog/files/newsyslog-1.1-html.patch
@@ -0,0 +1,20 @@
+--- a/Makefile.in	Tue May 21 14:08:11 2002
++++ b/Makefile.in	Sun Aug 18 22:06:23 2002
+@@ -591,7 +591,7 @@
+ 
+ .8.8.html:
+ 	@rm -f $@
+-	($(TBL) $< | $(NROFF) -mdoc2html > $@) || (rm -f $@; exit 1)
++	($(TBL) $< | $(NROFF) -mhtml > $@) || (rm -f $@; exit 1)
+ 
+ .5.5.ps:
+ 	@rm -f $@
+@@ -599,7 +599,7 @@
+ 
+ .5.5.html:
+ 	@rm -f $@
+-	($(TBL) $< | $(NROFF) -mdoc2html > $@) || (rm -f $@; exit 1)
++	($(TBL) $< | $(NROFF) -mhtml > $@) || (rm -f $@; exit 1)
+ 
+ .cat5.cat5-dist:
+ 	@rm -f $@
diff --git a/app-admin/newsyslog/files/newsyslog-1.1.0.81-html.patch b/app-admin/newsyslog/files/newsyslog-1.1.0.81-html.patch
new file mode 100644
index 000000000000..873cfc10991a
--- /dev/null
+++ b/app-admin/newsyslog/files/newsyslog-1.1.0.81-html.patch
@@ -0,0 +1,20 @@
+--- a/Makefile.in	2018-06-24 14:36:18.647850208 +0000
++++ b/Makefile.in	2018-06-24 14:37:50.216321235 +0000
+@@ -763,7 +763,7 @@
+ 
+ .8.8.html:
+ 	@rm -f $@
+-	($(TBL) $< | $(NROFF) -mdoc2html > $@) || (rm -f $@; exit 1)
++	($(TBL) $< | $(NROFF) -mhtml > $@) || (rm -f $@; exit 1)
+ 
+ .5.5.ps:
+ 	@rm -f $@
+@@ -771,7 +771,7 @@
+ 
+ .5.5.html:
+ 	@rm -f $@
+-	($(TBL) $< | $(NROFF) -mdoc2html > $@) || (rm -f $@; exit 1)
++	($(TBL) $< | $(NROFF) -mhtml > $@) || (rm -f $@; exit 1)
+ 
+ .cat5.cat5-dist:
+ 	@rm -f $@
diff --git a/app-admin/newsyslog/metadata.xml b/app-admin/newsyslog/metadata.xml
new file mode 100644
index 000000000000..58c1077b82e4
--- /dev/null
+++ b/app-admin/newsyslog/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/newsyslog/newsyslog-1.1-r1.ebuild b/app-admin/newsyslog/newsyslog-1.1-r1.ebuild
new file mode 100644
index 000000000000..7cbf10ee80e0
--- /dev/null
+++ b/app-admin/newsyslog/newsyslog-1.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="a highly configurable program for managing and archiving log files"
+HOMEPAGE="http://www.weird.com/~woods/projects/newsyslog.html"
+SRC_URI="ftp://ftp.weird.com/pub/local/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 ~sparc x86"
+
+DEPEND="sys-apps/groff"
+
+RDEPEND="
+	virtual/cron
+	app-arch/gzip"
+
+PATCHES=( "${FILESDIR}/${P}-html.patch" )
+
+DOCS=( newsyslog.conf AUTHORS ChangeLog INSTALL NEWS ToDo )
+
+src_configure() {
+	local myconf="--with-syslogd_pid=/var/run/syslog.pid"
+
+	has_version 'app-admin/syslog-ng' \
+	    && myconf="--with-syslogd_pid=/var/run/syslog-ng.pid"
+
+	econf \
+	    --with-gzip \
+	    --with-newsyslog_conf=/etc/newsyslog.conf \
+	    ${myconf}
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		catmandir="${T}"/dont-install \
+		install
+	einstalldocs
+}
diff --git a/app-admin/newsyslog/newsyslog-1.1.0.81.ebuild b/app-admin/newsyslog/newsyslog-1.1.0.81.ebuild
new file mode 100644
index 000000000000..a52dcc25d1f2
--- /dev/null
+++ b/app-admin/newsyslog/newsyslog-1.1.0.81.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="a highly configurable program for managing and archiving log files"
+HOMEPAGE="http://www.weird.com/~woods/projects/newsyslog.html"
+SRC_URI="http://download.openpkg.org/components/cache/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="sys-apps/groff"
+
+RDEPEND="
+	virtual/cron
+	app-arch/gzip"
+
+PATCHES=( "${FILESDIR}/${P}-html.patch" )
+
+DOCS=( newsyslog.conf AUTHORS ChangeLog INSTALL NEWS ToDo )
+
+src_configure() {
+	local myconf="--with-syslogd_pid=/var/run/syslog.pid"
+
+	has_version 'app-admin/syslog-ng' \
+	    && myconf="--with-syslogd_pid=/var/run/syslog-ng.pid"
+
+	econf \
+	    --with-gzip \
+	    --with-newsyslog_conf=/etc/newsyslog.conf \
+	    ${myconf}
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		catmandir="${T}"/dont-install \
+		install
+	einstalldocs
+}
diff --git a/app-admin/ngxtop-0.0.2-r1 b/app-admin/ngxtop-0.0.2-r1
deleted file mode 100644
index cfd19e330352..000000000000
--- a/app-admin/ngxtop-0.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/tabulate[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=real-time metrics for nginx server (and others)
-EAPI=5
-HOMEPAGE=https://github.com/lebinh/ngxtop
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/tabulate[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://github.com/lebinh/ngxtop/archive/0.0.2.tar.gz -> ngxtop-0.0.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=976c6b7cfef73c9aa1a6ac26923b5983
diff --git a/app-admin/ngxtop-0.0.3_pre141201 b/app-admin/ngxtop-0.0.3_pre141201
deleted file mode 100644
index 5a447a32a684..000000000000
--- a/app-admin/ngxtop-0.0.3_pre141201
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/tabulate[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=real-time metrics for nginx server (and others)
-EAPI=6
-HOMEPAGE=https://github.com/lebinh/ngxtop
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/tabulate[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/ngxtop-0.0.3_pre141201.tar.xz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a8931f58b8f568a626c90d32185b1582
diff --git a/app-admin/ngxtop/Manifest b/app-admin/ngxtop/Manifest
new file mode 100644
index 000000000000..f4739ebfdd27
--- /dev/null
+++ b/app-admin/ngxtop/Manifest
@@ -0,0 +1,6 @@
+AUX ngxtop-0.0.2-py3.patch 1816 BLAKE2B 1f19b6143bc5eab4786043d1641f17a370cc07b72c3e61329e9b3255fb6a0c66d00d94b371aae5e0d5747e99964a102d7ea630a235ebad4df0cd3ff015917c95 SHA512 47127c5ba26d0d6319ca74f21370bf01ce3a74676066bf7476f862de8165c2d62d90e5cad1cb2369e5743db4fa51090e8bdf59da04f9dcfafec62edc44122f8f
+DIST ngxtop-0.0.2.tar.gz 9668 BLAKE2B becd0ba58490ad26dce2166ddf39d2064e797bc26da64b70e38e137078130f5c21a95fffccf656fcaa35ca595fe769bd4b59036e9e0993afa75d062b49714f10 SHA512 49cd0f43bb7dae79253a13c4011a5bb92a33c137d0ce7a8de7d57ba18624ec1e10bf462a32fe96d1045ed85ba9c273260a846fb1983e189884e65c1621a39d43
+DIST ngxtop-0.0.3_pre141201.tar.xz 9012 BLAKE2B 9e8a7d2c3aadb302e0923fc7cb5b0219a56489993fdcf83fb7b38ba67036f2b5cae7e5bba2c9efc81d858c58b0f1e25f17fa8cc600e77f76b45aafd9d5a3354e SHA512 ce0c6d027eacfe553752a4a66b7d5823de45ef847d4db1a50d9677126a1d574c22e17b5a60f073bf74eb93d56d15d88d6201353324b201b77c1dd5bede6d7cde
+EBUILD ngxtop-0.0.2-r1.ebuild 651 BLAKE2B 972956525ec3f24e35bfa4287ff3fa6404330047336269ff647acad3a48a5373514ccb4fc550673218e8993596fded2ae4f9a25b92d9ce01bf1483e9cfa2078b SHA512 77bad90097cb535f8e610a2498ec23e6c665adb943d7df7dfc1a20be8b938aa43fea0e295f97fb3219716c2652c9bddb33059f4df2c4dd6b4b2f50b33c7f2d99
+EBUILD ngxtop-0.0.3_pre141201.ebuild 728 BLAKE2B 1825345d92cf5f119af84477614bd910afaa251efc59318ea1fdfc60a361efdfece77d0d91aadf9cd45c9acbcc1dd7b155edf2c5a9827a1161ce424bac12a150 SHA512 b857066578c5c46f2bcbe0413f11e0996e0e4a9fdd932d3c2ebf9e4e24a9e003f54237b884d8b9588fd8d37ae21485476c4d7053c3c4bfcdb380e3f69809887c
+MISC metadata.xml 335 BLAKE2B e7a3dadd0a07d8bae375095732fd23ea9f95886f26acdf7fed053a2a75a799d37a6c64eb5ccf584fffc53a102ccf4925e10d95b146c8060275332f82858a1456 SHA512 6d525ce3c5a1efa8da1913ace611f778d2e0b7470521a970e26547ea921529a952576369f8fcfb19d39dea6222c0929ab475e5f7b0375d5ddf794a0303504ead
diff --git a/app-admin/ngxtop/files/ngxtop-0.0.2-py3.patch b/app-admin/ngxtop/files/ngxtop-0.0.2-py3.patch
new file mode 100644
index 000000000000..b86361584798
--- /dev/null
+++ b/app-admin/ngxtop/files/ngxtop-0.0.2-py3.patch
@@ -0,0 +1,45 @@
+diff --git a/ngxtop/config_parser.py b/ngxtop/config_parser.py
+index f6999cf..7c0d79a 100644
+--- a/ngxtop/config_parser.py
++++ b/ngxtop/config_parser.py
+@@ -106,7 +106,7 @@ def detect_log_config(arguments):
+ 
+     log_formats = dict(get_log_formats(config_str))
+     if len(access_logs) == 1:
+-        log_path, format_name = access_logs.items()[0]
++        log_path, format_name = list(access_logs.items())[0]
+         if format_name == 'combined':
+             return log_path, LOG_FORMAT_COMBINED
+         if format_name not in log_formats:
+@@ -115,7 +115,7 @@ def detect_log_config(arguments):
+ 
+     # multiple access logs configured, offer to select one
+     print('Multiple access logs detected in configuration:')
+-    log_path = choose_one(access_logs.keys(), 'Select access log file to process: ')
++    log_path = choose_one(list(access_logs.keys()), 'Select access log file to process: ')
+     format_name = access_logs[log_path]
+     if format_name not in log_formats:
+         error_exit('Incorrect format name set in config for access log file "%s"' % log_path)
+diff --git a/ngxtop/ngxtop.py b/ngxtop/ngxtop.py
+old mode 100755
+new mode 100644
+diff --git a/ngxtop/utils.py b/ngxtop/utils.py
+index ef61072..7bd9a2a 100644
+--- a/ngxtop/utils.py
++++ b/ngxtop/utils.py
+@@ -5,6 +5,8 @@ def choose_one(choices, prompt):
+     for idx, choice in enumerate(choices):
+         print('%d. %s' % (idx + 1, choice))
+     selected = None
++    if sys.version[0] == '3':
++        raw_input = input
+     while not selected or selected <= 0 or selected > len(choices):
+         selected = raw_input(prompt)
+         try:
+@@ -16,4 +18,4 @@ def choose_one(choices, prompt):
+ 
+ def error_exit(msg, status=1):
+     sys.stderr.write('Error: %s\n' % msg)
+-    sys.exit(status)
+\ No newline at end of file
++    sys.exit(status)
diff --git a/app-admin/ngxtop/metadata.xml b/app-admin/ngxtop/metadata.xml
new file mode 100644
index 000000000000..629c4b1c7e91
--- /dev/null
+++ b/app-admin/ngxtop/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mattm@gentoo.org</email>
+    <name>Matthew Marlowe</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">lebinh/ngxtop</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild b/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild
new file mode 100644
index 000000000000..e187ef559f43
--- /dev/null
+++ b/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="real-time metrics for nginx server (and others)"
+HOMEPAGE="https://github.com/lebinh/ngxtop"
+SRC_URI="https://github.com/lebinh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/tabulate[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}"/${P}-py3.patch )
diff --git a/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild b/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild
new file mode 100644
index 000000000000..6bf6aa1b02f1
--- /dev/null
+++ b/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="real-time metrics for nginx server (and others)"
+HOMEPAGE="https://github.com/lebinh/ngxtop"
+#SRC_URI="https://github.com/lebinh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/tabulate[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.0.2-py3.patch )
diff --git a/app-admin/openrc-settingsd-1.0.1 b/app-admin/openrc-settingsd-1.0.1
deleted file mode 100644
index 034a2a045730..000000000000
--- a/app-admin/openrc-settingsd-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=dev-libs/glib-2.30:2 dev-libs/libdaemon sys-apps/dbus sys-apps/openrc:= sys-auth/polkit app-arch/xz-utils dev-util/gdbus-codegen virtual/pkgconfig
-DESCRIPTION=System settings D-Bus service for OpenRC
-EAPI=5
-HOMEPAGE=https://gnome.gentoo.org/openrc-settingsd.xml
-IUSE=systemd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.30:2 dev-libs/libdaemon sys-apps/dbus sys-apps/openrc:= sys-auth/polkit systemd? ( >=sys-apps/systemd-197 ) !systemd? ( sys-auth/nss-myhostname !sys-apps/systemd )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tetromino/distfiles/openrc-settingsd/openrc-settingsd-1.0.1.tar.xz
-_md5_=3fbe7cf6cc847e30c4cca0024279ceb6
diff --git a/app-admin/openrc-settingsd/Manifest b/app-admin/openrc-settingsd/Manifest
new file mode 100644
index 000000000000..1cb3a5ffaca1
--- /dev/null
+++ b/app-admin/openrc-settingsd/Manifest
@@ -0,0 +1,3 @@
+DIST openrc-settingsd-1.0.1.tar.xz 243552 BLAKE2B 2abf084c59ef310ca72bf2d528c6f8f04b3a502ea421247989e5356e759f2850f1749ffae7592ff30c92a0496db01e9d5e55c2a4ae9dbd3a9954414d4eabd31b SHA512 1f04a4b078a5fb659573daec0962f819af7eaff17a6213c4881726833cf32becd71dd820cd63767e2933465df26b3e4a3475d94f23e203a6977298965c709b21
+EBUILD openrc-settingsd-1.0.1.ebuild 1318 BLAKE2B b2c6e2d8e24600bc262a8560d88643e088a1136249e2de289d9f4cf184ec7ac24a89b36fda046803187babfbc22c9a7b4a1ec81c86d7d2d5973ead2369a37951 SHA512 8bd54bc1ff1f1adc6020224d58c72833c2f804f4d1f1d43f38664b52bc3e08fbf37c8c65517aea089f3acb4a5f1afa895aa60e61a8d6da26c19330e0f562b7b6
+MISC metadata.xml 488 BLAKE2B 9c5343c770ffe757e60a0137609ea51584caeaf250323c6df562f70b79560a9b895c49c7fcfe5270c29e10970059a0de5ba10ecdb7cdd9849e6e74b2f6ad03e2 SHA512 0e73f3f4231bebdf2c317d2737782e35e66cd08aead5b8192211857842d9c5d8ff62f6d0654940daccd444dc6884ecdcb2c4ffb0aa51bf999c09cacb3af1be15
diff --git a/app-admin/openrc-settingsd/metadata.xml b/app-admin/openrc-settingsd/metadata.xml
new file mode 100644
index 000000000000..fae0fa87a25c
--- /dev/null
+++ b/app-admin/openrc-settingsd/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>tetromino@gentoo.org</email>
+	<name>Alexandre Rostovtsev</name>
+</maintainer>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="systemd">Use the versions of dbus and polkit files provided by
+		<pkg>sys-apps/systemd</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild
new file mode 100644
index 000000000000..239c59db23ab
--- /dev/null
+++ b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="System settings D-Bus service for OpenRC"
+HOMEPAGE="https://gnome.gentoo.org/openrc-settingsd.xml"
+SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="systemd"
+
+COMMON_DEPEND=">=dev-libs/glib-2.30:2
+	dev-libs/libdaemon
+	sys-apps/dbus
+	sys-apps/openrc:=
+	sys-auth/polkit"
+RDEPEND="${COMMON_DEPEND}
+	systemd? ( >=sys-apps/systemd-197 )
+	!systemd? ( sys-auth/nss-myhostname !sys-apps/systemd )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	dev-util/gdbus-codegen
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--with-pidfile="${EPREFIX}"/var/run/openrc-settingsd.pid
+}
+
+src_install() {
+	default
+	if use systemd; then
+		# Avoid file collision with systemd
+		rm -vr "${ED}"usr/share/{dbus-1,polkit-1} "${ED}"etc/dbus-1 || die "rm failed"
+	fi
+}
+
+pkg_postinst() {
+	if use systemd; then
+		elog "You installed ${PN} with USE=systemd. In this mode,"
+		elog "${PN} will not start via simple dbus activation, so you"
+		elog "will have to manually enable it as an rc service:"
+		elog " # /etc/init.d/openrc-settingsd start"
+		elog " # rc-update add openrc-settingsd default"
+	fi
+}
diff --git a/app-admin/packagekit-1.1.7 b/app-admin/packagekit-1.1.7
deleted file mode 100644
index f3bcfff25dfd..000000000000
--- a/app-admin/packagekit-1.1.7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=gtk? ( ~app-admin/packagekit-gtk-1.1.7 ) qt5? ( >=app-admin/packagekit-qt-0.9.6 )
-DESCRIPTION=PackageKit Package Manager interface (meta package)
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/software/PackageKit/
-IUSE=gtk qt5
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=metapackage
-RDEPEND=gtk? ( ~app-admin/packagekit-gtk-1.1.7 ) qt5? ( >=app-admin/packagekit-qt-0.9.6 )
-SLOT=0
-_md5_=8f3a3ae7893eff25532a1f467f792277
diff --git a/app-admin/packagekit-base-1.1.7-r1 b/app-admin/packagekit-base-1.1.7-r1
deleted file mode 100644
index afc3043db187..000000000000
--- a/app-admin/packagekit-base-1.1.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=app-shells/bash-completion-2 dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.46.0:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-auth/polkit-0.98 >=sys-apps/dbus-1.3.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.9:= ) systemd? ( >=sys-apps/systemd-204 ) >=dev-cpp/glibmm-2.4 dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/vala-common >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Manage packages in a secure way using a cross-distro and cross-architecture API
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/software/PackageKit/
-IUSE=cron command-not-found elogind +introspection entropy systemd test vala python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-shells/bash-completion-2 dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.46.0:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-auth/polkit-0.98 >=sys-apps/dbus-1.3.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.9:= ) systemd? ( >=sys-apps/systemd-204 ) >=app-portage/layman-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( >=sys-apps/portage-2.2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) entropy? ( >=sys-apps/entropy-234[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !systemd? ( !elogind? ( sys-auth/consolekit ) )
-REQUIRED_USE=python_targets_python2_7 ?? ( elogind systemd ) vala? ( introspection )
-SLOT=0/18
-SRC_URI=https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.1.7.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4d06a865172b019053dace2627027bdd
diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest
new file mode 100644
index 000000000000..68f5e5c125d7
--- /dev/null
+++ b/app-admin/packagekit-base/Manifest
@@ -0,0 +1,5 @@
+AUX packagekit-base-1.1.1-cache-qafix.patch 469 BLAKE2B fb0666e27d2908236a0adf31adcc9dbcaab94bdb1d4b253369b2bf92e18279e289ea8b486285ce9b19abfc79c81e308675019777f49b98ce6aca1e341695cfb6 SHA512 7efb79f5b25f4b1b3db22247c695e13d748908c6802667bd8dc322c247881bd133aa8787192598b384ce8080ac986031e5fee64201f17e4e8af7e15fc7d18424
+AUX packagekit-base-1.1.7-elogind-support.patch 5872 BLAKE2B a18f2e6016781b043d34cc82e76970a8fd18a4e08fb5516b2f332f6a3213e4fbb90311d6bd54a11b82b98e84d90598648562473aa497c8c4c69ad99a4cbd474e SHA512 26b6f163e44a1a837e8c9ac43b8f6ec9733962d746d0081e05d1691099c953e16055d530e7de5558aacd985b1690dcbea9c6087755d037d8029f34b158d74a45
+DIST PackageKit-1.1.7.tar.xz 1431648 BLAKE2B 0cc64e7ac38d6641a1fbd98ffad2e7920eb7b3c86ea36d3ad036541886191c38deeeb7241f81ec3d29f8268b1c84ec500511895312c29c706403607215117d5e SHA512 0d0277e24feb63e94aeb5fec2c4306ccdf5935c2f62d5eef3be8db9f534eb302eff09ea0e020db48b2dd0af9ba6b31f7960d661d1040774dccf650ebf04c4f83
+EBUILD packagekit-base-1.1.7-r1.ebuild 3676 BLAKE2B 33081996cac6656b7aa0cc729ff60de69263a710d35c37e01b2eb37e8ffc72e5b39ce14ba105e08c52105cc6716546dd6380bea8d96c3d40899eeccb41158d5a SHA512 3d104fe8464249496c2bc001b907d3f36533abc50643d6b002e03ce9e2b4c08c9b13b9a3eb68923d655c5933b5b6a04f82be870882ade4c2a2b2a5dd29dcb7fa
+MISC metadata.xml 664 BLAKE2B 4dcdb79a089d9ec0734d9af4c2b6206ad1add7b17f8c8984b2e7763672fc334000749b4332e92224d11b0382fe22a2ca0f83ced4da218fbd1e85d8b101fd3e1f SHA512 9b80a98e97af44ab81b497b2c71c73db41da7f250734d6b032e80151719a0a82e2c1e295b068a5e3657a509dbd74d1f65f6e49fc211f77d0623eb7bdcd32b323
diff --git a/app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch b/app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch
new file mode 100644
index 000000000000..d7ec4b268c84
--- /dev/null
+++ b/app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch
@@ -0,0 +1,15 @@
+--- a/src/~Makefile.am	2016-06-29 10:59:14.178918032 +0200
++++ b/src/Makefile.am	2016-06-29 11:02:50.739929627 +0200
+@@ -175,11 +175,7 @@ pk_self_test_CFLAGS =					\
+ TESTS = pk-self-test
+ 
+ install-data-hook:
+-	if test -w $(DESTDIR)$(prefix)/; then \
+-		mkdir -p $(DESTDIR)$(localstatedir)/cache/PackageKit/downloads; \
+-		mkdir -p $(DESTDIR)$(localstatedir)/cache/PackageKit/metadata; \
+-		mkdir -p $(DESTDIR)$(localstatedir)/log; \
+-	fi
++
+ 
+ clean-local:
+ 	rm -f *~
diff --git a/app-admin/packagekit-base/files/packagekit-base-1.1.7-elogind-support.patch b/app-admin/packagekit-base/files/packagekit-base-1.1.7-elogind-support.patch
new file mode 100644
index 000000000000..bb6b6103dde2
--- /dev/null
+++ b/app-admin/packagekit-base/files/packagekit-base-1.1.7-elogind-support.patch
@@ -0,0 +1,184 @@
+--- a/config.h.in	2017-06-07 16:38:45.046910693 +0200
++++ b/config.h.in	2017-06-07 16:39:06.973911120 +0200
+@@ -78,8 +78,8 @@
+ /* Define to 1 if you have the <string.h> header file. */
+ #undef HAVE_STRING_H
+ 
+-/* Build systemd code */
+-#undef HAVE_SYSTEMD
++/* Build systemd-login code */
++#undef HAVE_SYSTEMD_SD_LOGIN_H
+ 
+ /* Define to 1 if you have the <sys/stat.h> header file. */
+ #undef HAVE_SYS_STAT_H
+--- a/configure.ac	2017-06-06 09:03:57.171355965 +0200
++++ b/configure.ac	2017-06-06 09:55:11.242384458 +0200
+@@ -254,7 +254,6 @@
+ 		    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ 		    [has_systemdsystemunitdir=$with_systemdsystemunitdir],
+ 		    [has_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+-	AC_DEFINE(HAVE_SYSTEMD,1,[Build systemd code])
+ 	AC_SUBST([systemdsystemunitdir], [$has_systemdsystemunitdir])
+ fi
+ AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$has_systemdsystemunitdir"])
+@@ -267,6 +266,24 @@
+ AM_CONDITIONAL(ENABLE_OFFLINE_UPDATE, [test x$enable_systemd = xyes -a x$enable_offline_update = xyes])
+ 
+ dnl ---------------------------------------------------------------------------
++dnl - Use elogind instead of systemd-login
++dnl ---------------------------------------------------------------------------
++AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[enable elogind session tracker]),
++	      enable_elogind=$enableval,enable_elogind=no)
++if test x$enable_elogind = xyes; then
++	PKG_CHECK_MODULES(ELOGIND, [libelogind >= 229.4], [have_elogind=yes], [have_elogind=no])
++else
++	have_elogind=no
++fi
++
++dnl ---------------------------------------------------------------------------
++dnl --- Is systemd/sd-login.h, either from systemd or elogind, available?
++dnl ---------------------------------------------------------------------------
++if test -n "$has_systemdsystemunitdir" -o "x$have_elogind" != "xno" ; then
++		AC_DEFINE(HAVE_SYSTEMD_SD_LOGIN_H,1,[Build systemd-login code])
++fi
++
++dnl ---------------------------------------------------------------------------
+ dnl - Generate man pages ? (default enabled)
+ dnl ---------------------------------------------------------------------------
+ AC_ARG_ENABLE(man_pages, AS_HELP_STRING([--disable-man-pages],[Disable man pages generation]), enable_man_pages=$enableval)
+@@ -629,6 +644,7 @@
+         cflags:                    ${CFLAGS}
+         cppflags:                  ${CPPFLAGS}
+         Able to run locally:       ${enable_local}
++        Use elogind:               ${enable_elogind}
+         Use systemd:               ${enable_systemd}
+         Enable offline update:     ${enable_offline_update}
+         Networking stacks:         ${networking_apis}
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -9,6 +9,7 @@ AM_CPPFLAGS =						\
+ 	$(SQLITE_CFLAGS)				\
+ 	$(POLKIT_CFLAGS)				\
+ 	$(PYTHON_CFLAGS)				\
++	$(ELOGIND_CFLAGS)				\
+ 	$(SYSTEMD_CFLAGS)				\
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"		\
+ 	-DBINDIR=\"$(bindir)\"				\
+@@ -100,6 +101,7 @@ packagekit_direct_LDADD =				\
+ 	$(POLKIT_LIBS)					\
+ 	$(GIO_LIBS)					\
+ 	$(ARCHIVE_LIBS)					\
++	$(ELOGIND_LIBS)					\
+ 	$(SYSTEMD_LIBS)
+ 
+ packagekit_direct_LDFLAGS =				\
+@@ -128,6 +130,7 @@ packagekitd_LDADD =					\
+ 	$(POLKIT_LIBS)					\
+ 	$(GIO_LIBS)					\
+ 	$(ARCHIVE_LIBS)					\
++	$(ELOGIND_LIBS)					\
+ 	$(SYSTEMD_LIBS)
+ 
+ packagekitd_LDFLAGS =					\
+@@ -153,6 +156,7 @@ pk_self_test_LDADD =					\
+ 	$(POLKIT_LIBS)					\
+ 	$(GIO_LIBS)					\
+ 	$(ARCHIVE_LIBS)					\
++	$(ELOGIND_LIBS)					\
+ 	$(SYSTEMD_LIBS)
+ 
+ pk_self_test_CPPFLAGS =					\
+--- a/src/pk-engine.c	2017-06-06 09:12:23.828371176 +0200
++++ b/src/pk-engine.c	2017-06-06 09:55:47.426385545 +0200
+@@ -98,7 +98,7 @@
+ 	guint			 owner_id;
+ 	GDBusNodeInfo		*introspection;
+ 	GDBusConnection		*connection;
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ 	GDBusProxy		*logind_proxy;
+ 	gint			 logind_fd;
+ #endif
+@@ -281,7 +281,7 @@
+ static void
+ pk_engine_inhibit (PkEngine *engine)
+ {
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ 	g_autoptr(GError) error = NULL;
+ 	g_autoptr(GUnixFDList) out_fd_list = NULL;
+ 	g_autoptr(GVariant) res = NULL;
+@@ -331,7 +331,7 @@
+ static void
+ pk_engine_uninhibit (PkEngine *engine)
+ {
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ 	if (engine->priv->logind_fd == 0)
+ 		return;
+ 	g_debug ("closed logind fd %i", engine->priv->logind_fd);
+@@ -1830,7 +1830,7 @@
+ 	}
+ }
+ 
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ /**
+  * pk_engine_proxy_logind_cb:
+  **/
+@@ -1872,7 +1872,7 @@
+ 	/* save copy for emitting signals */
+ 	engine->priv->connection = g_object_ref (connection);
+ 
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ 	/* connect to logind */
+ 	g_dbus_proxy_new (connection,
+ 			  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+@@ -2031,7 +2031,7 @@
+ 	if (engine->priv->connection != NULL)
+ 		g_object_unref (engine->priv->connection);
+ 
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ 	/* uninhibit */
+ 	if (engine->priv->logind_fd != 0)
+ 		close (engine->priv->logind_fd);
+--- a/src/pk-dbus.c	2017-06-06 09:12:13.254370858 +0200
++++ b/src/pk-dbus.c	2017-06-06 10:09:17.249409857 +0200
+@@ -27,7 +27,7 @@
+ #include <glib.h>
+ #include <gio/gio.h>
+ 
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+  #include <systemd/sd-login.h>
+ #endif
+ 
+@@ -177,7 +177,7 @@
+ 	return cmdline;
+ }
+ 
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ /**
+  * pk_dbus_get_session_systemd:
+  **/
+@@ -220,7 +220,7 @@
+ pk_dbus_get_session (PkDbus *dbus, const gchar *sender)
+ {
+ 	gchar *session = NULL;
+-#ifndef HAVE_SYSTEMD
++#ifndef HAVE_SYSTEMD_SD_LOGIN_H
+ 	g_autoptr(GError) error = NULL;
+ #endif
+ 	guint pid;
+@@ -250,7 +250,7 @@
+ 	}
+ 
+ 	/* get session from systemd or ConsoleKit */
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ 	session = pk_dbus_get_session_systemd (pid);
+ #else
+ 	/* get session from ConsoleKit */
diff --git a/app-admin/packagekit-base/metadata.xml b/app-admin/packagekit-base/metadata.xml
new file mode 100644
index 000000000000..1036ab84868f
--- /dev/null
+++ b/app-admin/packagekit-base/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mudler@gentoo.org</email>
+		<name>Ettore Di Giacinto</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="command-not-found">Enable packagekit support on shell "command not found"</flag>
+		<flag name="cron">Install cron script for auto-update</flag>
+		<flag name="elogind">Enable elogind support to get user session</flag>
+		<flag name="entropy">Enable Entropy backend</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.7-r1.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.7-r1.ebuild
new file mode 100644
index 000000000000..4281826ad53c
--- /dev/null
+++ b/app-admin/packagekit-base/packagekit-base-1.1.7-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# PackageKit supports 3.2+, but entropy and portage backends are untested
+# Future note: use --enable-python3
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 multilib python-single-r1 systemd vala xdg
+
+MY_PN="PackageKit"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
+HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
+SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/18"
+KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86"
+IUSE="cron command-not-found elogind +introspection entropy systemd test vala"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	?? ( elogind systemd )
+	vala? ( introspection )
+"
+
+# While not strictly needed, consolekit is the alternative to systemd-login
+# or elogind to get current session's user.
+COMMON_DEPEND="
+	>=app-shells/bash-completion-2
+	dev-db/sqlite:3
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.46.0:2[${PYTHON_USEDEP}]
+	>=sys-auth/polkit-0.98
+	>=sys-apps/dbus-1.3.0
+	${PYTHON_DEPS}
+	elogind? ( >=sys-auth/elogind-229.4 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.9:= )
+	systemd? ( >=sys-apps/systemd-204 )
+"
+# vala-common needed for eautoreconf
+DEPEND="${COMMON_DEPEND}
+	>=dev-cpp/glibmm-2.4
+	dev-libs/libxslt[${PYTHON_USEDEP}]
+	dev-libs/vala-common
+	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=app-portage/layman-2[${PYTHON_USEDEP}]
+	|| (
+		>=sys-apps/portage-2.2[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)
+	entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] )
+	!systemd? ( !elogind? ( sys-auth/consolekit ) )
+"
+
+PATCHES=(
+	# Fixes QA Notices:
+	# - https://github.com/gentoo/gentoo/pull/1760
+	# - https://github.com/hughsie/PackageKit/issues/143
+	"${FILESDIR}"/${PN}-1.1.1-cache-qafix.patch
+
+	# Adds elogind support:
+	# - https://bugs.gentoo.org/show_bug.cgi?id=620948
+	"${FILESDIR}"/${P}-elogind-support.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Disable unittests not working with portage backend
+	# console: requires terminal input
+	sed -e 's:^\(.*/packagekit-glib2/control\)://\1:' \
+		-e 's:^\(.*/packagekit-glib2/transaction-list\)://\1:' \
+		-e 's:^\(.*/packagekit-glib2/client"\)://\1:' \
+		-e 's:^\(.*/packagekit-glib2/package-sack\)://\1:' \
+		-e 's:^\(.*/packagekit-glib2/task\)://\1:' \
+		-e 's:^\(.*/packagekit-glib2/console\)://\1:' \
+		-i lib/packagekit-glib2/pk-test-daemon.c || die
+	sed -e 's:^\(.*/packagekit/spawn\)://\1:' \
+	    -e 's:^\(.*/packagekit/transaction-db\)://\1:' \
+	    -e 's:^\(.*/packagekit/backend\)://\1:' \
+		-i src/pk-self-test.c || die
+
+	eapply_user
+	use vala && vala_src_prepare
+	xdg_src_prepare
+
+	# Needed by elogind patch:
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-gstreamer-plugin \
+		--disable-gtk-doc \
+		--disable-gtk-module \
+		--disable-schemas-compile \
+		--disable-static \
+		--enable-bash-completion \
+		--enable-man-pages \
+		--enable-nls \
+		--enable-portage \
+		--localstatedir=/var \
+		$(use_enable command-not-found) \
+		$(use_enable cron) \
+		$(use_enable elogind) \
+		$(use_enable entropy) \
+		$(use_enable introspection) \
+		$(use_enable systemd) \
+		$(use_enable test daemon-tests) \
+		$(use_enable test local) \
+		$(use_enable vala) \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files --all
+
+	dodoc AUTHORS ChangeLog MAINTAINERS NEWS README
+}
diff --git a/app-admin/packagekit-gtk-1.1.7 b/app-admin/packagekit-gtk-1.1.7
deleted file mode 100644
index 5b37b1764c0c..000000000000
--- a/app-admin/packagekit-gtk-1.1.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-libs/glib-2.46:2 media-libs/fontconfig >=x11-libs/gtk+-2:2 >=x11-libs/gtk+-3:3 x11-libs/pango ~app-admin/packagekit-base-1.1.7[introspection] virtual/pkgconfig
-DESCRIPTION=Gtk3 PackageKit backend library
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/software/PackageKit/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.46:2 media-libs/fontconfig >=x11-libs/gtk+-2:2 >=x11-libs/gtk+-3:3 x11-libs/pango ~app-admin/packagekit-base-1.1.7[introspection]
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.1.7.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e2fed8603f09217ef5262768c4fd81ea
diff --git a/app-admin/packagekit-gtk/Manifest b/app-admin/packagekit-gtk/Manifest
new file mode 100644
index 000000000000..bd6e34b0d492
--- /dev/null
+++ b/app-admin/packagekit-gtk/Manifest
@@ -0,0 +1,3 @@
+DIST PackageKit-1.1.7.tar.xz 1431648 BLAKE2B 0cc64e7ac38d6641a1fbd98ffad2e7920eb7b3c86ea36d3ad036541886191c38deeeb7241f81ec3d29f8268b1c84ec500511895312c29c706403607215117d5e SHA512 0d0277e24feb63e94aeb5fec2c4306ccdf5935c2f62d5eef3be8db9f534eb302eff09ea0e020db48b2dd0af9ba6b31f7960d661d1040774dccf650ebf04c4f83
+EBUILD packagekit-gtk-1.1.7.ebuild 1166 BLAKE2B 22ee861bbb6f346badbf1c053c43c02cdb532fdd25c1db4e4a2aba2c1933c21ffcb01b9882a1d98aff5ce8f083d4c1ad901d7a14cde5e1f15bcb3a79c4772ad8 SHA512 027a88ea2fefb7364acb76e2e7963d2e0dd3794f41da8419d4aebdcbf6e930a78d5e6e25cb4d924a68d7025c610e306ded4ba6321a6e9c01b35503e5ff3054a6
+MISC metadata.xml 365 BLAKE2B 56b0b07f000f1e0960650c60d41063585322a4d4c6067db315c85ae2fb113b747c46e6f89f99183bc607007f9d625d9e45c12d4bb81f82f002eab046e16b3f48 SHA512 7efd2e5bf58f32e97348200e6a891143009398504480ec30a8ee4f71bef600065094a8cb451bf8d5a86342add5251c5b54cd522b9f8b458501dc21fb3190bb69
diff --git a/app-admin/packagekit-gtk/metadata.xml b/app-admin/packagekit-gtk/metadata.xml
new file mode 100644
index 000000000000..66d2c6253543
--- /dev/null
+++ b/app-admin/packagekit-gtk/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mudler@gentoo.org</email>
+		<name>Ettore Di Giacinto</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/packagekit-gtk/packagekit-gtk-1.1.7.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.1.7.ebuild
new file mode 100644
index 000000000000..9fd918b69635
--- /dev/null
+++ b/app-admin/packagekit-gtk/packagekit-gtk-1.1.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils
+
+MY_PN="PackageKit"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Gtk3 PackageKit backend library"
+HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
+SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	media-libs/fontconfig
+	>=x11-libs/gtk+-2:2
+	>=x11-libs/gtk+-3:3
+	x11-libs/pango
+	~app-admin/packagekit-base-${PV}[introspection]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		--disable-bash-completion \
+		--disable-command-not-found \
+		--disable-cron \
+		--disable-gstreamer-plugin \
+		--disable-gtk-doc \
+		--disable-local \
+		--disable-man-pages \
+		--disable-static \
+		--disable-systemd \
+		--disable-vala \
+		--enable-dummy \
+		--enable-gtk-module \
+		--enable-introspection=yes \
+		--localstatedir=/var
+}
+
+src_compile() {
+	emake -C contrib/gtk-module
+}
+
+src_install() {
+	emake -C contrib/gtk-module DESTDIR="${D}" install
+	prune_libtool_files --all
+}
diff --git a/app-admin/packagekit-qt-1.0.0 b/app-admin/packagekit-qt-1.0.0
deleted file mode 100644
index 38abbc8cd6cf..000000000000
--- a/app-admin/packagekit-qt-1.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-admin/packagekit-base-0.9 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-libs/libxslt virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt PackageKit backend library
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/software/PackageKit/
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=>=app-admin/packagekit-base-0.9 dev-qt/qtcore:5 dev-qt/qtdbus:5
-SLOT=0/1
-SRC_URI=https://github.com/hughsie/PackageKit-Qt/archive/v1.0.0.tar.gz -> packagekit-qt-1.0.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=10178129970797c789e89ce615db9593
diff --git a/app-admin/packagekit-qt-1.0.1 b/app-admin/packagekit-qt-1.0.1
deleted file mode 100644
index dc0118ebfe1a..000000000000
--- a/app-admin/packagekit-qt-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-admin/packagekit-base-0.9 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-libs/libxslt virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt PackageKit backend library
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/software/PackageKit/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=app-admin/packagekit-base-0.9 dev-qt/qtcore:5 dev-qt/qtdbus:5
-SLOT=0/1
-SRC_URI=https://github.com/hughsie/PackageKit-Qt/archive/v1.0.1.tar.gz -> packagekit-qt-1.0.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a0c7502f26fd69c8f4674395e051a50
diff --git a/app-admin/packagekit-qt/Manifest b/app-admin/packagekit-qt/Manifest
new file mode 100644
index 000000000000..2726c28b29f5
--- /dev/null
+++ b/app-admin/packagekit-qt/Manifest
@@ -0,0 +1,5 @@
+DIST packagekit-qt-1.0.0.tar.gz 53495 BLAKE2B a19ff095ec42bc16e498455323a4046365f6ae144fdfc998dee799df9f4ea022696ab30682316b6417c8a96e80e75db31704e36e43c1a5eddd0a7d86309adada SHA512 4109117a94c47180cff0f073c03820ac39a139b6b3ac88dec82758fffe01271f7a3dae85d94e86a4a1167f4660326adc1d58dc6eb0fd164bd0aefee2e412dad4
+DIST packagekit-qt-1.0.1.tar.gz 53503 BLAKE2B af96899e520f4139d6025746c2a2e7a65c67c2900cdf4fbdb410c12e33f494343d078ec24e7dcdb33749b1d5206b0bf622809827ed64beae162888e48d0aaec0 SHA512 e1291545b496571c00a6a24586c45b7173e85e3704d419af6a0ec47ea5ce256c8ec7e887721b1bf8038cb967ceb82726925800ab06aa784b2bdd560e49be724a
+EBUILD packagekit-qt-1.0.0.ebuild 593 BLAKE2B da4d9255ac6569cae36ba9527248fcef33970d0bbc4e210835aaff48fe65262dfd9da204d80ca9faf2833d3130fe5281eeea67d19e4dffa00a71f80239f9ca17 SHA512 b536a04eefaea32a7931851527c296220934718edb1788fe97df4bbe03179d87ba8a92c4808a658de1a1c92621fce670b9b189bc47aa53c4f2a0781091016688
+EBUILD packagekit-qt-1.0.1.ebuild 595 BLAKE2B b96b636dd409d4bc62570c71e5da02febdbb43288ac24e56f7967bb431079669e7710ea9d3c98822b2899c311829e10ff06293289ebac8ce152843a42a0060ca SHA512 2df4c524a82ca80ecedb5905d63925a70a56007bfeade0977ee4e85648d6897a2a061a8916e5efb6bbd8821c1c8c80784a093afca7f128e0df6245df0053a637
+MISC metadata.xml 443 BLAKE2B 83c6d5495baf3a9909dbb0ea06f912b92f6faf6f48e6f1da7610a16cca3770c097516a748b44fc0aef99985929e16b7dc20de131bf5404bfd72895acca56f04b SHA512 f63f424329b0ffeac0dcfb50841e94644bd3a44852bebd0834fc36bedbbe4bbbb13bfdfd46e065ca3ddd9cffac1ba86590310267939c486f108913db84e1d093
diff --git a/app-admin/packagekit-qt/metadata.xml b/app-admin/packagekit-qt/metadata.xml
new file mode 100644
index 000000000000..3056c869ef34
--- /dev/null
+++ b/app-admin/packagekit-qt/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mudler@gentoo.org</email>
+		<name>Ettore Di Giacinto</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hughsie/PackageKit-Qt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/packagekit-qt/packagekit-qt-1.0.0.ebuild b/app-admin/packagekit-qt/packagekit-qt-1.0.0.ebuild
new file mode 100644
index 000000000000..8e125d096722
--- /dev/null
+++ b/app-admin/packagekit-qt/packagekit-qt-1.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="PackageKit-Qt"
+MY_P=${MY_PN}-${PV}
+inherit cmake-utils
+
+DESCRIPTION="Qt PackageKit backend library"
+HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
+SRC_URI="https://github.com/hughsie/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+RDEPEND="
+	>=app-admin/packagekit-base-0.9
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/app-admin/packagekit-qt/packagekit-qt-1.0.1.ebuild b/app-admin/packagekit-qt/packagekit-qt-1.0.1.ebuild
new file mode 100644
index 000000000000..5306a1ae4e73
--- /dev/null
+++ b/app-admin/packagekit-qt/packagekit-qt-1.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="PackageKit-Qt"
+MY_P=${MY_PN}-${PV}
+inherit cmake-utils
+
+DESCRIPTION="Qt PackageKit backend library"
+HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
+SRC_URI="https://github.com/hughsie/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-admin/packagekit-base-0.9
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/app-admin/packagekit/Manifest b/app-admin/packagekit/Manifest
new file mode 100644
index 000000000000..3ffb673de7cc
--- /dev/null
+++ b/app-admin/packagekit/Manifest
@@ -0,0 +1,2 @@
+EBUILD packagekit-1.1.7.ebuild 443 BLAKE2B bfd8b839f250c3aa17f1eddf1d63c2de14add3da03a9d0215a6672fc417ba789f17568c8735e12bf53e1684c5e458aa320c42dff6c0b001b79c239ba9253eb15 SHA512 a4c9ed4b7efac6398ac6a77487e5ec74a5e612f461356d141fde90e3325ae98cfd31e9887942e8a737f18cbfcd5c2927493424b76a7e4b712c56239f9cf597e0
+MISC metadata.xml 365 BLAKE2B 56b0b07f000f1e0960650c60d41063585322a4d4c6067db315c85ae2fb113b747c46e6f89f99183bc607007f9d625d9e45c12d4bb81f82f002eab046e16b3f48 SHA512 7efd2e5bf58f32e97348200e6a891143009398504480ec30a8ee4f71bef600065094a8cb451bf8d5a86342add5251c5b54cd522b9f8b458501dc21fb3190bb69
diff --git a/app-admin/packagekit/metadata.xml b/app-admin/packagekit/metadata.xml
new file mode 100644
index 000000000000..66d2c6253543
--- /dev/null
+++ b/app-admin/packagekit/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mudler@gentoo.org</email>
+		<name>Ettore Di Giacinto</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/packagekit/packagekit-1.1.7.ebuild b/app-admin/packagekit/packagekit-1.1.7.ebuild
new file mode 100644
index 000000000000..7b3d8c9972a8
--- /dev/null
+++ b/app-admin/packagekit/packagekit-1.1.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="PackageKit Package Manager interface (meta package)"
+HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk qt5"
+
+RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
+	qt5? ( >=app-admin/packagekit-qt-0.9.6 )"
+
+DEPEND="${RDEPEND}"
diff --git a/app-admin/pass-1.7.2 b/app-admin/pass-1.7.2
deleted file mode 100644
index 87b19f2d7728..000000000000
--- a/app-admin/pass-1.7.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely
-EAPI=6
-HOMEPAGE=https://www.passwordstore.org/
-IUSE=+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin
-KEYWORDS=amd64 ~arm x86 ~x86-macos
-LICENSE=GPL-2
-RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( virtual/emacs )
-SLOT=0
-SRC_URI=https://git.zx2c4.com/password-store/snapshot/password-store-1.7.2.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=228f6eaf592d7c1a8e4a83154d8edc70
diff --git a/app-admin/pass-9999 b/app-admin/pass-9999
deleted file mode 100644
index 1149e82b1160..000000000000
--- a/app-admin/pass-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely
-EAPI=5
-HOMEPAGE=https://www.passwordstore.org/
-IUSE=+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin
-LICENSE=GPL-2
-RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( virtual/emacs )
-SLOT=0
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=82137570a84e2a7bc7799d6deb238e7a
diff --git a/app-admin/pass-otp-1.1.0 b/app-admin/pass-otp-1.1.0
deleted file mode 100644
index 194bc4978ed7..000000000000
--- a/app-admin/pass-otp-1.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile
-DEPEND=test? ( dev-tcltk/expect:* )
-DESCRIPTION=A pass extension for managing one-time-password (OTP) tokens.
-EAPI=6
-HOMEPAGE=https://github.com/tadfisher/pass-otp
-IUSE=qrcode test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=app-admin/pass-1.7 sys-auth/oath-toolkit qrcode? ( media-gfx/qrencode )
-SLOT=0
-SRC_URI=https://github.com/tadfisher/pass-otp/releases/download/v1.1.0/pass-otp-1.1.0.tar.gz
-_md5_=ed82a328c7a1ef41a1a6221a2a2b591a
diff --git a/app-admin/pass-otp/Manifest b/app-admin/pass-otp/Manifest
new file mode 100644
index 000000000000..4ed702175ffe
--- /dev/null
+++ b/app-admin/pass-otp/Manifest
@@ -0,0 +1,3 @@
+DIST pass-otp-1.1.0.tar.gz 32857 BLAKE2B 97ca197b251d9748c0ace5b40aca2547cd278e9eee9768b8882cdfbb23bd440792101ab82d2ade276cfc34de1364460a066adc8395336380b1ef6759f51804eb SHA512 3c880bcb7e7e984494796bc7a0c0fb5f70b052938f6ce5c0b1cbb745d0b30febab2ca51c264fac02f884699dc685400076f0065db0c3d08da436e93c27f075ce
+EBUILD pass-otp-1.1.0.ebuild 543 BLAKE2B 818e82a2b19c22c304a42a16136a74c21b8b5e3d292c86dd4584e05805f43152d292889a561d1a7c085a23f7d3e667962438f699cfb6485c00db04cc9687d471 SHA512 164665c079243858e8332bf54741f5d4fd59522903cb239c6dac151cefd718aaaeb7c7fa1abe9cda0c43a677bfaf9c5eb3e9d2fadefdf6c4fc8de9cd6dd49b1b
+MISC metadata.xml 661 BLAKE2B 32c5c45b7d5d47f3c2b77ce0ec52f99008e1da1df5b30ae7b7085dd75fefff6327a6674de0325a14fd9bcebb35f4adb60d31e117374e43ddc7e26ac9f8290161 SHA512 7d1c902d9ea60b42a8497c7ce7ca4d5d56fc522e46e412d91c6e50205a1e5ba8b68e59bb14c997d6db9fbca88c24693ccf0fb31e81f8404771adcf4aa651eb62
diff --git a/app-admin/pass-otp/metadata.xml b/app-admin/pass-otp/metadata.xml
new file mode 100644
index 000000000000..d585cca5c34c
--- /dev/null
+++ b/app-admin/pass-otp/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<name>Haelwenn (lanodan) Monnier</name>
+	<email>contact@hacktivis.me</email>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<longdescription lang="en">
+A pass extension for managing one-time-password (OTP) tokens.
+</longdescription>
+<use>
+	<flag name="qrcode">Add support for qtcodes using <pkg>media-gfx/qrencode</pkg></flag>
+</use>
+<upstream>
+	<remote-id type="github">tadfisher/pass-otp</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-admin/pass-otp/pass-otp-1.1.0.ebuild b/app-admin/pass-otp/pass-otp-1.1.0.ebuild
new file mode 100644
index 000000000000..40e37ea67994
--- /dev/null
+++ b/app-admin/pass-otp/pass-otp-1.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A pass extension for managing one-time-password (OTP) tokens."
+HOMEPAGE="https://github.com/tadfisher/pass-otp"
+SRC_URI="https://github.com/tadfisher/pass-otp/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qrcode test"
+
+DEPEND="test? ( dev-tcltk/expect:* )"
+
+RDEPEND=">=app-admin/pass-1.7
+	sys-auth/oath-toolkit
+	qrcode? ( media-gfx/qrencode )"
+
+src_compile() {
+	:
+}
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
new file mode 100644
index 000000000000..d77642cd8165
--- /dev/null
+++ b/app-admin/pass/Manifest
@@ -0,0 +1,5 @@
+AUX 50pass-gentoo.el 491 BLAKE2B 30c24a820e877e74d4308b42fab036c3c670353af6eb79454c18b471ab62134074765c313be5633e5fc8d1d9105a51d4dc648e3e08f200487ea62e3b9cd4e4a1 SHA512 eaba952f7b080bb44f1a415ee3fa1e71469177a993116b890a0788b177ec70948c1ea6923f17ddddf5f1c01af2fca03e98a71e06a5dff32ff6ebe0b73a79f659
+DIST password-store-1.7.2.tar.xz 63620 BLAKE2B a1fe0b7ee1fdb94d2b76773653462d14c07c8fb239ffbcae210cc3c9c829fc5c0bd0bf85d8d44343a0cec50aae953b13a70d67aa7c94abf6c02f84bfd0d7c4ff SHA512 e6719a7125af6ecd80fdbeb38b4e2e89e7358ff16e18739d68a04b72dfdf860294b54f7ec0ec9676a62d2e270db8f54784a357c82217a478694472f8136e3657
+EBUILD pass-1.7.2.ebuild 2056 BLAKE2B 45beac312a1acc149c67dac9801377f6722f5eff67a834e84e1a44fd5c7687a9f0c4f7e69fdca21b9cc070018ff2bf4e7dca1827222ce5261e5ed451c567b531 SHA512 27c994e62a3917be3ab836bff56e380cc3573a87ae62fabd8deba8c7e5b9b195812677799f378ff1290c39ef92e22922082761da59f7f24176fbcd811c73f918
+EBUILD pass-9999.ebuild 1960 BLAKE2B e06b86833158fb55e9656a1bbc2168bbdfb0cc1fa48924437e2a05b81dc79c0f110cc2edf664610b43b29cb67c4563db568bbbf3cb6edd7f135b5db0d027751f SHA512 b170aaa7a41a628684735cd24994f40a95abd8e7c1ffa9bd52d381f4d94be246c7465cb617404eb61bc6221fede56f43dc76f18517329b83d00c0ebff02e4580
+MISC metadata.xml 881 BLAKE2B 59fee6aeadb16d050eeaedc6d5081963e3ffa8316ddd00afb67661d721fa60b80483c16348e0c3d6c20fdb6513fd5840552c3a95724b619e07122d8755c4e7c1 SHA512 49df1e24751818d46a0c23fcdc9e41d965dca29f9964f7d142e4dba9b076b472c860d9b3eafc15b04a983f49d2cd78eb6b529742469549209c7e4160a15f1323
diff --git a/app-admin/pass/files/50pass-gentoo.el b/app-admin/pass/files/50pass-gentoo.el
new file mode 100644
index 000000000000..122d813af1e7
--- /dev/null
+++ b/app-admin/pass/files/50pass-gentoo.el
@@ -0,0 +1,9 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'password-store-edit "password-store" nil t)
+(autoload 'password-store-copy "password-store" nil t)
+(autoload 'password-store-init "password-store" nil t)
+(autoload 'password-store-insert "password-store" nil t)
+(autoload 'password-store-generate "password-store" nil t)
+(autoload 'password-store-remove "password-store" nil t)
+(autoload 'password-store-rename "password-store" nil t)
+(autoload 'password-store-version "password-store" nil t)
diff --git a/app-admin/pass/metadata.xml b/app-admin/pass/metadata.xml
new file mode 100644
index 000000000000..97bcbb1882f7
--- /dev/null
+++ b/app-admin/pass/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<longdescription>
+		Stores, retrieves, generates, and synchronizes passwords securely using gpg, pwgen, and git.
+	</longdescription>
+	<use>
+		<flag name="X">
+			Use <pkg>x11-misc/xclip</pkg> to copy passwords to the clipboard.
+		</flag>
+		<flag name="git">
+			Use <pkg>dev-vcs/git</pkg> for password revisions.
+		</flag>
+		<flag name="fish-completion">
+			Enable fish completion support.
+		</flag>
+		<flag name="dmenu">
+			Add support for x11-misc/dmenu with the 'passmenu' program.
+		</flag>
+		<flag name="importers">
+			Allow importing passwords from other password managers using various contributed scripts.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/pass/pass-1.7.2.ebuild b/app-admin/pass/pass-1.7.2.ebuild
new file mode 100644
index 000000000000..477672132803
--- /dev/null
+++ b/app-admin/pass/pass-1.7.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 elisp-common
+
+DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
+HOMEPAGE="https://www.passwordstore.org/"
+SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~arm x86 ~x86-macos"
+IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
+
+RDEPEND="
+	app-crypt/gnupg
+	media-gfx/qrencode
+	>=app-text/tree-1.7.0
+	git? ( dev-vcs/git )
+	X? ( x11-misc/xclip )
+	elibc_Darwin? ( app-misc/getopt )
+	zsh-completion? ( app-shells/gentoo-zsh-completions )
+	fish-completion? ( app-shells/fish )
+	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
+	emacs? ( virtual/emacs )
+"
+
+S="${WORKDIR}/password-store-${PV}"
+
+src_prepare() {
+	default
+
+	use elibc_Darwin || return
+	# use coreutils'
+	sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
+	# host getopt isn't cool, and we aren't brew (rip out brew reference)
+	sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die
+	# make sure we can find "mount"
+	sed -i -e 's:mount -t:/sbin/mount -t:' src/platform/darwin.sh || die
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		BASHCOMPDIR="$(get_bashcompdir)" \
+		WITH_BASHCOMP=yes \
+		WITH_ZSHCOMP=$(usex zsh-completion) \
+		WITH_FISHCOMP=$(usex fish-completion)
+	use dmenu && dobin contrib/dmenu/passmenu
+	if use emacs; then
+		elisp-install ${PN} contrib/emacs/*.el
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	fi
+	if use importers; then
+		exeinto /usr/share/${PN}/importers
+		doexe contrib/importers/*
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use importers; then
+		einfo "To import passwords from other password managers, you may use the"
+		einfo "various importer scripts found in:"
+		einfo "    ${EROOT%/}/usr/share/${PN}/importers/"
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-admin/pass/pass-9999.ebuild b/app-admin/pass/pass-9999.ebuild
new file mode 100644
index 000000000000..ee7cbd58172d
--- /dev/null
+++ b/app-admin/pass/pass-9999.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1 git-r3 elisp-common
+
+DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
+HOMEPAGE="https://www.passwordstore.org/"
+EGIT_REPO_URI="https://git.zx2c4.com/password-store"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
+
+RDEPEND="
+	app-crypt/gnupg
+	media-gfx/qrencode
+	>=app-text/tree-1.7.0
+	git? ( dev-vcs/git )
+	X? ( x11-misc/xclip )
+	elibc_Darwin? ( app-misc/getopt )
+	zsh-completion? ( app-shells/gentoo-zsh-completions )
+	fish-completion? ( app-shells/fish )
+	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
+	emacs? ( virtual/emacs )
+"
+
+src_prepare() {
+	use elibc_Darwin || return
+	# use coreutils'
+	sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
+	# host getopt isn't cool, and we aren't brew (rip out brew reference)
+	sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die
+	# make sure we can find "mount"
+	sed -i -e 's:mount -t:/sbin/mount -t:' src/platform/darwin.sh || die
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		BASHCOMPDIR="$(get_bashcompdir)" \
+		WITH_BASHCOMP=yes \
+		WITH_ZSHCOMP=$(usex zsh-completion) \
+		WITH_FISHCOMP=$(usex fish-completion)
+	use dmenu && dobin contrib/dmenu/passmenu
+	if use emacs; then
+		elisp-install ${PN} contrib/emacs/*.el
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	fi
+	if use importers; then
+		exeinto /usr/share/${PN}/importers
+		doexe contrib/importers/*
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use importers; then
+		einfo "To import passwords from other password managers, you may use the"
+		einfo "various importer scripts found in:"
+		einfo "    ${EROOT%/}/usr/share/${PN}/importers/"
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-admin/passook-20121001 b/app-admin/passook-20121001
deleted file mode 100644
index c3f7c817fd1f..000000000000
--- a/app-admin/passook-20121001
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Password generator capable of generating pronounceable and/or secure passwords
-EAPI=4
-HOMEPAGE=https://github.com/mackers/passook
-KEYWORDS=amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl sys-apps/miscfiles
-SLOT=0
-SRC_URI=mirror://gentoo/passook-20121001.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2a4c8f4b807b9298d45d23e138e70f7f
diff --git a/app-admin/passook/Manifest b/app-admin/passook/Manifest
new file mode 100644
index 000000000000..2ea8de9df8bc
--- /dev/null
+++ b/app-admin/passook/Manifest
@@ -0,0 +1,4 @@
+AUX passook.patch 778 BLAKE2B cf0e4af5987f70e3bee262d3a11f3bdd8c96686b0f28de3eeff7b248c0b8ade17efe5b1da8f165113d4231e1ebc67abd8b1053916b95022f4e7b24e49b449171 SHA512 cbba3e7b7353acb43056db909ec868eaa741dc81eba3596c4c51e88f7b0922f7637d0a3a862377eba0f20eef52ca43314e3964cb011bd3fc7e3436724d9289d6
+DIST passook-20121001.tar.gz 13992 BLAKE2B c253fafa45c1f3ff30c91bc697ffece20fd6a58f36075909043041b281d558ab0a9e4352d867e00404bed81bdf44a5bf236bfeb72b9f41fd5ffe78a3b33a9900 SHA512 8c3c72f3001fc3c88060f77685b4f238d42dd65d599522604cf3f3fede2c3b94f4a12622e006d10a4f026283b885f90e4f2e2fa9282a48e181480bec4e2d13cb
+EBUILD passook-20121001.ebuild 669 BLAKE2B f6af186354f31c7d6e5d272f29ef05fd108ce2fadc24b0be9ccfa77400268d702b7412e6cff8bdaa92a273883fc1851a8deff60dc911bb264af0cae6ed11b53d SHA512 f1f9b5b48155eef9999e6d5f0fe54f4bb6a178879b5000d3b047763a200f63f1b063778b2be038a21a47ba29d2e84c860a80e25c03c51b985482a375244ebb59
+MISC metadata.xml 393 BLAKE2B 024b68ca2ae37df6718088689b79d3d70546681a051deeedd6012f7cc2d987208437831ad8423f8bddd40fa894cb2f27b96ed2be65ac3776a5be4a8aa86e60d0 SHA512 f08f94a5ae03e1b89f218db3b462bd595905ac95336be3cf1eb43b3e018101c5b2dfb5d526f285c1a51388214463d6676d770ae805be21b2bc1463069c93467f
diff --git a/app-admin/passook/files/passook.patch b/app-admin/passook/files/passook.patch
new file mode 100644
index 000000000000..db14e6ec817c
--- /dev/null
+++ b/app-admin/passook/files/passook.patch
@@ -0,0 +1,26 @@
+--- passook.orig
++++ passook
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl
+ 
+ srand;
+ $p = 3; #default pronouce level
+@@ -38,7 +38,7 @@
+ }
+ 
+ sub fourletterword {
+-	my $grepstring = 'egrep "^....$" /usr/dict/words';
++	my $grepstring = 'egrep "^....$" @GENTOO_PORTAGE_EPREFIX@/usr/share/dict/words';
+ 	my @fourletters = split(/\n/,`$grepstring`); 
+ 	my $word = $fourletters[rand(@fourletters)];
+         $word = &tangle($word) if ($p<5);
+@@ -46,7 +46,7 @@
+ }
+ 
+ sub threeletterword {
+-	my $grepstring = 'egrep "^...$" /usr/dict/words';
++	my $grepstring = 'egrep "^...$" @GENTOO_PORTAGE_EPREFIX@/usr/share/dict/words';
+ 	my @threeletters = split(/\n/,`$grepstring`);
+ 	my $word = $threeletters[rand(@threeletters)];
+ 	$word = &tangle($word) if ($p<5);
diff --git a/app-admin/passook/metadata.xml b/app-admin/passook/metadata.xml
new file mode 100644
index 000000000000..f7a29ccaa787
--- /dev/null
+++ b/app-admin/passook/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>Passook is a perl script that generates passwords. You can
+	customize the security of the password generated.</longdescription>
+	<upstream>
+		<remote-id type="github">mackers/passook</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/passook/passook-20121001.ebuild b/app-admin/passook/passook-20121001.ebuild
new file mode 100644
index 000000000000..4cbd2bae4926
--- /dev/null
+++ b/app-admin/passook/passook-20121001.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils prefix
+
+DESCRIPTION="Password generator capable of generating pronounceable and/or secure passwords"
+HOMEPAGE="https://github.com/mackers/passook"
+# snapshot of https://github.com/mackers/passook.git
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="dev-lang/perl
+	sys-apps/miscfiles"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/passook.patch
+	eprefixify passook
+}
+
+src_install() {
+	dobin passook
+	dodoc README passook.cgi
+}
diff --git a/app-admin/passwordsafe-1.02.1_beta b/app-admin/passwordsafe-1.02.1_beta
deleted file mode 100644
index 10192c4b3df4..000000000000
--- a/app-admin/passwordsafe-1.02.1_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=xml? ( dev-libs/xerces-c ) sys-apps/util-linux x11-libs/libXt x11-libs/libXtst x11-libs/wxGTK:3.0[X] !minimal? ( !!app-misc/pwsafe ) yubikey? ( sys-auth/ykpers ) app-arch/zip sys-devel/gettext test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Password manager with wxGTK based frontend
-EAPI=6
-HOMEPAGE=https://pwsafe.org/ https://github.com/pwsafe/pwsafe/
-IUSE=minimal test yubikey +xml
-KEYWORDS=~amd64
-LICENSE=Artistic-2
-RDEPEND=xml? ( dev-libs/xerces-c ) sys-apps/util-linux x11-libs/libXt x11-libs/libXtst x11-libs/wxGTK:3.0[X] !minimal? ( !!app-misc/pwsafe ) yubikey? ( sys-auth/ykpers )
-SLOT=0
-SRC_URI=https://github.com/pwsafe/pwsafe/archive/1.02.1BETA.tar.gz -> passwordsafe-1.02.1_beta.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bb06154c5ba44ff011ce5b0893662dc8
diff --git a/app-admin/passwordsafe-1.04_beta b/app-admin/passwordsafe-1.04_beta
deleted file mode 100644
index d4596d040428..000000000000
--- a/app-admin/passwordsafe-1.04_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=xml? ( dev-libs/xerces-c ) qr? ( media-gfx/qrencode ) sys-apps/util-linux x11-libs/libXt x11-libs/libXtst x11-libs/wxGTK:3.0-gtk3[X] !minimal? ( !!app-misc/pwsafe ) yubikey? ( sys-auth/ykpers ) app-arch/zip sys-devel/gettext test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Password manager with wxGTK based frontend
-EAPI=6
-HOMEPAGE=https://pwsafe.org/ https://github.com/pwsafe/pwsafe/
-IUSE=minimal test qr yubikey +xml
-KEYWORDS=~amd64
-LICENSE=Artistic-2
-RDEPEND=xml? ( dev-libs/xerces-c ) qr? ( media-gfx/qrencode ) sys-apps/util-linux x11-libs/libXt x11-libs/libXtst x11-libs/wxGTK:3.0-gtk3[X] !minimal? ( !!app-misc/pwsafe ) yubikey? ( sys-auth/ykpers )
-SLOT=0
-SRC_URI=https://github.com/pwsafe/pwsafe/archive/1.04BETA.tar.gz -> passwordsafe-1.04_beta.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d5db3716246d42180d88d12048a06570
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
new file mode 100644
index 000000000000..4db6022f3fcc
--- /dev/null
+++ b/app-admin/passwordsafe/Manifest
@@ -0,0 +1,5 @@
+DIST passwordsafe-1.02.1_beta.tar.gz 14068085 BLAKE2B 7a1bff0f2db798e08377436020473a8c6c46f9e64fa85629b6545f70954a3ad05735ee101bea021308589d523724f70fce24447837ee25cf1b897a7703873757 SHA512 c83a0c757f9f74906ffaebf650fd3f422a29f838c7f5430b3d3e32852b35dd92dc413a1c920320af9812d7960f0648e8df8a9d145828f8669e824e9972038067
+DIST passwordsafe-1.04_beta.tar.gz 14329263 BLAKE2B 17f4b0cd0b34f8907530a7da43dfbceab56c9aefd65f2d0ba0356b5a1820e8b4273c68655229a07947693fd6d320bc654065f790c86daff31679b565a57145fe SHA512 5f2d0634be3d3932991f77e96b7b40fee3984407ec8620d82caea089bba49df69444cdf8d2cf431aace43636c5034892a672c338ee98df06473d2569953bdab3
+EBUILD passwordsafe-1.02.1_beta.ebuild 2276 BLAKE2B 51d55af680ca670d0747b809b5db84aafc85eab319e6f902dcad0a30962b9289639037739df54154818d91a242e9093752b478e5fa802c97d576430e1c489d0c SHA512 6ac4ec9137b7e246237d12714d1700a0e0d877c8f4d1ff0556349ef8d2fb384a72d270715e80e32ac82e077adc3e520b3e8edabf4bfd9a512970118cf8f38039
+EBUILD passwordsafe-1.04_beta.ebuild 2238 BLAKE2B 8488518028d38ecfabbf6a67c420bbe9454e6214a11743fb0e0739980b457ef7c87f963bf50875f11d8d1871a62efa924efef303f58d3331b90e01a3e7ba63cb SHA512 4c0e09150fe4f24dc49e2955c3bb790f7ab61a4143c3cff9ddc7b9266f48d6b1f0b574bf83ccef84c7c2b9b62d0dd1d582bea82e67965135bb8b0035e80d7ab1
+MISC metadata.xml 778 BLAKE2B 5387ae1a60b8de35a2a845146c8016d8677e2b7381d9f1f2f7eb8c18b794969f2d1448b591885b978c7641a7b9ebf751c660fffe8780fbcd5089111c88918674 SHA512 29e765d326b3c165c0a649da8ba5e6be57a0dfdaa12a5b25ba8bac44c868638a24a6a9c8bbb27638d7f215841548577658e139d9abee0f3c61d1e96c3dffdacf
diff --git a/app-admin/passwordsafe/metadata.xml b/app-admin/passwordsafe/metadata.xml
new file mode 100644
index 000000000000..cd092820b048
--- /dev/null
+++ b/app-admin/passwordsafe/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hendrik@consetetur.de</email>
+		<name>Hendrik v. Raven (lorem_ipsum)</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="minimal">Avoid collision with <pkg>app-misc/pwsafe</pkg></flag>
+		<flag name="qr">Enable QR code password display</flag>
+		<flag name="yubikey">Enable support for Yubikey</flag>
+		<flag name="xml">Enable XML import support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">pwsafe/pwsafe</remote-id>
+		<remote-id type="sourceforge">passwordsafe</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/passwordsafe/passwordsafe-1.02.1_beta.ebuild b/app-admin/passwordsafe/passwordsafe-1.02.1_beta.ebuild
new file mode 100644
index 000000000000..a31827651c2f
--- /dev/null
+++ b/app-admin/passwordsafe/passwordsafe-1.02.1_beta.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+inherit eutils flag-o-matic wxwidgets cmake-utils
+
+MY_PV="${PV/_beta/BETA}"
+DESCRIPTION="Password manager with wxGTK based frontend"
+HOMEPAGE="https://pwsafe.org/ https://github.com/pwsafe/pwsafe/"
+SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="minimal test yubikey +xml"
+
+RDEPEND="xml? ( dev-libs/xerces-c )
+	sys-apps/util-linux
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	!minimal? ( !!app-misc/pwsafe )
+	yubikey? ( sys-auth/ykpers )"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	sys-devel/gettext
+	test? ( dev-cpp/gtest )"
+
+S=${WORKDIR}/pwsafe-${MY_PV}
+
+pkg_pretend() {
+	einfo "Checking for -std=c++11 support in compiler"
+	test-flags-CXX -std=c++11 > /dev/null || die
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# binary name pwsafe is in use by app-misc/pwsafe, we use passwordsafe
+	# instead. Perform required changes in linking files
+	sed -i install/desktop/pwsafe.desktop -e "s/pwsafe/${PN}/g" || die
+	sed -i docs/pwsafe.1 \
+		-e 's/PWSAFE/PASSWORDSAFE/' \
+		-e "s/^.B pwsafe/.B ${PN}/" || die
+	use test || sed -i -e '/find_package(GTest REQUIRED)/s/^/#/' \
+		-e '/add_subdirectory (src\/test)/s/^/#/' CMakeLists.txt || die
+}
+
+src_configure() {
+	need-wxwidgets unicode
+
+	local mycmakeargs=( $(usex yubikey '' '-DNO_YUBI=ON')
+		$(usex xml '' '-DNO_XML=ON') )
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" || die
+	if use minimal; then
+		newbin pwsafe ${PN}
+	else
+		dobin pwsafe
+		dosym pwsafe /usr/bin/${PN}
+	fi
+	insinto /usr/share/locale
+	doins -r src/ui/wxWidgets/I18N/mos/*
+
+	# The upstream Makefile builds this .zip file from html source material for
+	# use by the package's internal help system. Must prevent
+	# Portage from applying additional compression.
+	docompress -x /usr/share/doc/${PN}/help
+	insinto /usr/share/doc/${PN}/help
+	doins help/*.zip
+
+	popd || die
+
+	newman docs/pwsafe.1 ${PN}.1
+
+	dodoc README.txt docs/{ReleaseNotes.txt,ChangeLog.txt}
+
+	insinto /usr/share/pwsafe/xml
+	doins xml/*
+
+	newicon install/graphics/pwsafe.png ${PN}.png
+	newmenu install/desktop/pwsafe.desktop ${PN}.desktop
+}
diff --git a/app-admin/passwordsafe/passwordsafe-1.04_beta.ebuild b/app-admin/passwordsafe/passwordsafe-1.04_beta.ebuild
new file mode 100644
index 000000000000..14da0d36f2c9
--- /dev/null
+++ b/app-admin/passwordsafe/passwordsafe-1.04_beta.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit eutils flag-o-matic wxwidgets cmake-utils
+
+MY_PV="${PV/_beta/BETA}"
+DESCRIPTION="Password manager with wxGTK based frontend"
+HOMEPAGE="https://pwsafe.org/ https://github.com/pwsafe/pwsafe/"
+SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="minimal test qr yubikey +xml"
+
+RDEPEND="xml? ( dev-libs/xerces-c )
+	qr? ( media-gfx/qrencode )
+	sys-apps/util-linux
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	!minimal? ( !!app-misc/pwsafe )
+	yubikey? ( sys-auth/ykpers )"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	sys-devel/gettext
+	test? ( dev-cpp/gtest )"
+
+S=${WORKDIR}/pwsafe-${MY_PV}
+
+pkg_pretend() {
+	einfo "Checking for -std=c++11 support in compiler"
+	test-flags-CXX -std=c++11 > /dev/null || die
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# binary name pwsafe is in use by app-misc/pwsafe, we use passwordsafe
+	# instead. Perform required changes in linking files
+	sed -i install/desktop/pwsafe.desktop -e "s/pwsafe/${PN}/g" || die
+	sed -i docs/pwsafe.1 \
+		-e 's/PWSAFE/PASSWORDSAFE/' \
+		-e "s/^.B pwsafe/.B ${PN}/" || die
+}
+
+src_configure() {
+	need-wxwidgets unicode
+
+	local mycmakeargs=(
+		-DNO_QR=$(usex !qr)
+		-DNO_GTEST=$(usex !test)
+		-DXML_XERCESC=$(usex xml)
+		-DNO_YUBI=$(usex !yubikey)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" || die
+	if use minimal; then
+		newbin pwsafe ${PN}
+	else
+		dobin pwsafe
+		dosym pwsafe /usr/bin/${PN}
+	fi
+	insinto /usr/share/locale
+	doins -r src/ui/wxWidgets/I18N/mos/*
+
+	# The upstream Makefile builds this .zip file from html source material for
+	# use by the package's internal help system. Must prevent
+	# Portage from applying additional compression.
+	docompress -x /usr/share/doc/${PN}/help
+	insinto /usr/share/doc/${PN}/help
+	doins help/*.zip
+
+	popd || die
+
+	newman docs/pwsafe.1 ${PN}.1
+
+	dodoc README.md README.LINUX.* docs/{ReleaseNotes.txt,ChangeLog.txt}
+
+	insinto /usr/share/pwsafe/xml
+	doins xml/*
+
+	newicon install/graphics/pwsafe.png ${PN}.png
+	newmenu install/desktop/pwsafe.desktop ${PN}.desktop
+}
diff --git a/app-admin/paxtest-0.9.15-r1 b/app-admin/paxtest-0.9.15-r1
deleted file mode 100644
index 78d8bac962aa..000000000000
--- a/app-admin/paxtest-0.9.15-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-apps/paxctl
-DESCRIPTION=PaX regression test suite
-EAPI=6
-HOMEPAGE=https://pax.grsecurity.net
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://grsecurity.net/~spender/paxtest-0.9.15.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f4978f271a6d19dee61952f8340d4b3f
diff --git a/app-admin/paxtest/Manifest b/app-admin/paxtest/Manifest
new file mode 100644
index 000000000000..350672a0525a
--- /dev/null
+++ b/app-admin/paxtest/Manifest
@@ -0,0 +1,4 @@
+AUX paxtest-0.9.13-Makefile.patch 508 BLAKE2B dddbe4e9c2cf761c4abcff5f2d708a90750a0f11dc685cd99d162ef4a90a3beaa9a3c12f01994ff34202ba33b8a04554c59213d4bbcb48491528ca957c443c10 SHA512 ed28fc2d852ef0f4da5268c8f66e9a5c5f2b75509cb67627ab1afbd9c3b89609a0e88686cb317f3e6e48874e02d5593b7a7661160ef849859cb9e77be375a6fc
+DIST paxtest-0.9.15.tar.gz 37929 BLAKE2B 0b0290212fa27b8f27bea62c209423b6ea57e9c3e7d972fd069f0213b3963eb7a65921c669ac402b5d83f6556ba9ede90375b58f0f7ec6daf6cc3a293372edf5 SHA512 e152f5ada943f69b3745b51ac6d80f35a4c1aff777e93360287ef18b117d07861216d9d0d2075d2511d33e2cb4ea07168bb9ff2f00e79de6060e546b6806c487
+EBUILD paxtest-0.9.15-r1.ebuild 942 BLAKE2B 87d557f82a0e54ddc70f1505c3b693f31beb307afb8603c67f70cf2bbfed2d788180f84358ef430a083faa8e2a76c98d77166316cd6f29962442e5aa628d1775 SHA512 c9bf34adbd5935fd323bc20fbf8e53a0c3fa436b0fe38cb1d347de9612a1b7019f26ce99afb12a4e66c9562e123f78fe52e68068d9f9c9b4893826c841d05199
+MISC metadata.xml 1140 BLAKE2B 4ba22a2a46b61986421373ff6a401f6c056bdb47b89b38552faa0e7b761b1bc171f253f238b59659183678590632d1f414f1108df2ad6ece17ffdb8eb32d45c1 SHA512 8abd1878f49a3e0fb560c0547555140f369d419b07ac05def097deaf386a162a4ce9fc7263dcf417e2909985900a8e01f517fcc3282c93c156c3339fe6a9f6ed
diff --git a/app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch b/app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch
new file mode 100644
index 000000000000..4dd4831eb453
--- /dev/null
+++ b/app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch
@@ -0,0 +1,20 @@
+--- a/Makefile
++++ b/Makefile
+@@ -52,12 +52,14 @@
+ endif
+ 
+ # for some reason the .c files need it, else GNU_STACK=RWE
+-OPT_FLAGS  := -O2 $(ASFLAGS)
++# Gentoo's CFLAGS should be honored
++OPT_FLAGS  := $(CFLAGS) $(ASFLAGS)
+ PTHREAD := -lpthread
+ # define stripping of binaries/libs here, or set these on make's commandline,
+ # else you'll loose the chpax flags!
+-LDFLAGS :=
+-SHLDFLAGS :=
++# Gentoo's LDFLAGS should be honored
++LDFLAGS := $(LDFLAGS)
++SHLDFLAGS := $(LDFLAGS)
+ ifndef RUNDIR
+ RUNDIR := .
+ endif
diff --git a/app-admin/paxtest/metadata.xml b/app-admin/paxtest/metadata.xml
new file mode 100644
index 000000000000..78cd07dfc29d
--- /dev/null
+++ b/app-admin/paxtest/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
+	<longdescription>Test suite for the PaX kernel patch
+		PaX is a Linux kernel patch which adds much stricter control on how memory
+		is being used by applications. A normal Linux kernel leaves the control to the
+		application and does not implement any enforcement. Especially buffer overflow
+		attacks benefit from the absense of kernel enforced memory control. PaX tries
+		to do its best to enforce this control of memory used by applications, thereby
+		making it harder to succesfully exploit buffer overflows.
+
+		Furthermore, it adds several randomisations, which also make it harder for
+		buffer overflows to succeed.
+
+		The test programs test all this functionality, but not all PaX functionality
+		is covered.
+
+		For more information about PaX, see http://pageexec.virtualave.net/.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
new file mode 100644
index 000000000000..4fe8a445c276
--- /dev/null
+++ b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="PaX regression test suite"
+HOMEPAGE="https://pax.grsecurity.net"
+SRC_URI="https://grsecurity.net/~spender/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	sys-apps/paxctl"
+
+# EI_PAX flags are not strip safe.
+RESTRICT="strip"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.13-Makefile.patch"
+)
+
+src_prepare() {
+	mv Makefile.psm Makefile
+	default
+	sed -i "s/^CC := gcc/CC := $(tc-getCC)/" Makefile
+	sed -i "s/^LD := ld/LD := $(tc-getLD)/" Makefile
+}
+
+src_compile() {
+	emake RUNDIR=/usr/$(get_libdir)/paxtest || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install || die
+
+	newman debian/manpage.1.ex paxtest.1 || die
+	dodoc ChangeLog README || die
+}
diff --git a/app-admin/perl-cleaner-2.20 b/app-admin/perl-cleaner-2.20
deleted file mode 100644
index 42a092e799d0..000000000000
--- a/app-admin/perl-cleaner-2.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=User land tool for cleaning up old perl installs
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
-SLOT=0
-SRC_URI=mirror://gentoo/perl-cleaner-2.20.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.20.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6099af1564da5540bc4892eb9d93318b
diff --git a/app-admin/perl-cleaner-2.23 b/app-admin/perl-cleaner-2.23
deleted file mode 100644
index 52f757389a7c..000000000000
--- a/app-admin/perl-cleaner-2.23
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=User land tool for cleaning up old perl installs
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
-SLOT=0
-SRC_URI=mirror://gentoo/perl-cleaner-2.23.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.23.tar.bz2
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=ec9797d0a39ce1d4aba2dbc101ece0e0
diff --git a/app-admin/perl-cleaner-2.24 b/app-admin/perl-cleaner-2.24
deleted file mode 100644
index f1c1a588ffd0..000000000000
--- a/app-admin/perl-cleaner-2.24
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=User land tool for cleaning up old perl installs
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
-SLOT=0
-SRC_URI=mirror://gentoo/perl-cleaner-2.24.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.24.tar.bz2
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=ec9797d0a39ce1d4aba2dbc101ece0e0
diff --git a/app-admin/perl-cleaner-2.25 b/app-admin/perl-cleaner-2.25
deleted file mode 100644
index 37bd14afb189..000000000000
--- a/app-admin/perl-cleaner-2.25
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=User land tool for cleaning up old perl installs
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
-SLOT=0
-SRC_URI=mirror://gentoo/perl-cleaner-2.25.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.25.tar.bz2
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=a0d25ce4446c2a953754503bab2986e7
diff --git a/app-admin/perl-cleaner-2.26-r1 b/app-admin/perl-cleaner-2.26-r1
deleted file mode 100644
index c7854aee62a5..000000000000
--- a/app-admin/perl-cleaner-2.26-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=User land tool for cleaning up old perl installs
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) ( sys-apps/portage-mgorny app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
-SLOT=0
-SRC_URI=mirror://gentoo/perl-cleaner-2.26.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.26.tar.bz2
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=fed58b2036b66fda2cdd2e8fbb8f5436
diff --git a/app-admin/perl-cleaner-9999 b/app-admin/perl-cleaner-9999
deleted file mode 100644
index 097741af9d2c..000000000000
--- a/app-admin/perl-cleaner-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=sys-apps/help2man >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=User land tool for cleaning up old perl installs
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-LICENSE=GPL-2
-RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) ( sys-apps/portage-mgorny app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=fed58b2036b66fda2cdd2e8fbb8f5436
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
new file mode 100644
index 000000000000..fdad5334b772
--- /dev/null
+++ b/app-admin/perl-cleaner/Manifest
@@ -0,0 +1,13 @@
+AUX perl-cleaner-2.20-prefix.patch 4874 BLAKE2B cf598a2e1aa03959ac1f1a799daaf33ceb640e99652da386e4a15e58fd02a06d4462251a347431ca943dad2cd3945942d4a9d3e95bb9cd607bda61c1843018cc SHA512 217ab3c7958e791c7e71ede8763ff98db7479d7eaeaa5fc9b0eb8607ed4a28ee1e7bb648a8e6fbc05913755b6eb0555fb70cd81c9124ebf562119b24ce66cb6f
+DIST perl-cleaner-2.20.tar.bz2 6704 BLAKE2B f5a5e431382300d2fff474f15744d992da1cc55536168d476fe73837443d97a331c1c40d92e706559bc6bdbc69fff9ebbf0cf532a0b5533e4f11c5c0db660cba SHA512 29888b4ee19a186ddaa1209d893ac57bed683b551546f63aeb874f8cc1fcab4ea0b0401247968aed0fb3b9a7d7196a803d6713e85b44cb94bc6642a44fbc4cf1
+DIST perl-cleaner-2.23.tar.bz2 6495 BLAKE2B 4e0b4dcbe22c0642e753dc999ba3fec4daa40a90d7955dc4e10d2d9222d1a22b3b5ff3ed50552a820b07c7b3be572bda00de3a60b876cb8631aa0805b7e9c0bb SHA512 e0879f75737746479cd1032acfed50f20aad183d834e1e0e9b847edeb14577b32ac8fd4b0f5ff54c03937f181d8f5702c3bd009587a5930d40eee59a13fe6624
+DIST perl-cleaner-2.24.tar.bz2 7161 BLAKE2B 41f7b02a7de3f0b5dd1e6c28e9db51df6f4d5e3a36ecb924ffc93d8a3883a2133ece40eb3133faef6e5adf5b26f4cf3638741b586d874a193995e55704f78ed5 SHA512 c6e32aa3123064e9e2fb02823a8b228e3c77720f5c471e9be51f2a4b2765a6c83dcc2ac24fbffae077f4882c70054eb0a3ca0243677a5ac970cb7a64e8b9c265
+DIST perl-cleaner-2.25.tar.bz2 7435 BLAKE2B 348f5429874bf7b1db5c9ba5b1479c3d5fbce68fc9ef91aa44dad3325ab2287d4bfda9221063dd643ec3b6df465443bb9a024705ec46f15c50ccd618ef193ce6 SHA512 5ef5682872ce840c0df98de82a6cf622120435f542206a00bb8fe0f9d5e46fb9898a89ab576b08a74b0d69d57a90a930d9f8d7d0b527fa3a928a6e4ddbad6ee9
+DIST perl-cleaner-2.26.tar.bz2 7462 BLAKE2B 3e651503da847275b452d7eedcecc820b9572890d7ef1b3c421ac170a1daf8ae712a9b62f6c9fd4705d973566b59190638f980962f145741f5ae47eefed836f9 SHA512 5c3fa164a2b5e84e5520276e4f3ff4872298cf53aa973afd6c8755e71884f1591c7cd5cc99d399d343ca01cb9ece8ee3e8e3aaf1908d22afc31ae08fab1e5821
+EBUILD perl-cleaner-2.20.ebuild 1205 BLAKE2B d327574484b14e3576dade1325862c5b757796b6b06540801523b83ea754f6658788feb4822af64934b8584e4565e2a2bad3611ef81cccf5dbf8fcc45a1c46bb SHA512 66c007b244ee7bb36f888330c88cb29efb99892e013a3f34a3e68642b3802cef3c49fb23642cf8976af84e2916678844b99715565aad466b44c4f73f6105c15e
+EBUILD perl-cleaner-2.23.ebuild 1065 BLAKE2B f30cc85033cedcee4f02bf062e7331864fa10f74988950b1cfa4324dc867f3c0cd84f529c6b62d00153beb16fc8466c8cb9b8633b2b0aab0eb9d9e63c58beb7b SHA512 ee6b24eaed7a26e8a9247d75bab9e3e24f761d6c48a04b2afa7a4a259f1204b7747b4894a76b61808f4ab6430a5a16039ab2ea4f870e5162f45b6248bbe33179
+EBUILD perl-cleaner-2.24.ebuild 1065 BLAKE2B f30cc85033cedcee4f02bf062e7331864fa10f74988950b1cfa4324dc867f3c0cd84f529c6b62d00153beb16fc8466c8cb9b8633b2b0aab0eb9d9e63c58beb7b SHA512 ee6b24eaed7a26e8a9247d75bab9e3e24f761d6c48a04b2afa7a4a259f1204b7747b4894a76b61808f4ab6430a5a16039ab2ea4f870e5162f45b6248bbe33179
+EBUILD perl-cleaner-2.25.ebuild 1052 BLAKE2B 9ec3cfc3c17e3ea15805c9587d4120eee87cafbe8664300f7bf1ccf871ceecee63cd5c83fc6c3fd63e4f1750dc0bbc3aa0f786c3b33731f4e8211edd989c40db SHA512 5cf28cf372371dfc165d64ea4fdfc989ea153357ff678b6f97716d7870df4d2a8e0140e33ba02762c62befb0bb647b1b0655e3cdcc0ea9c7f231f9be4b00e04c
+EBUILD perl-cleaner-2.26-r1.ebuild 1121 BLAKE2B d7a35aad10f2da2ac07c49824d5a64c4a4ed4ad490d57e6a3187757feaff228f726f9563f926b23fa895ed25ce2544e6a17db10e06bbf4ab51c3d2075e31d365 SHA512 43484532b8b93ebc67c5003ed94d4d3a524cd38dfbf78cc889b52e260fc55e45d2bfff2bccb8917b34d6080dcc7b1fc4bb79a41ac578481199f95c425485c2ac
+EBUILD perl-cleaner-9999.ebuild 1121 BLAKE2B d7a35aad10f2da2ac07c49824d5a64c4a4ed4ad490d57e6a3187757feaff228f726f9563f926b23fa895ed25ce2544e6a17db10e06bbf4ab51c3d2075e31d365 SHA512 43484532b8b93ebc67c5003ed94d4d3a524cd38dfbf78cc889b52e260fc55e45d2bfff2bccb8917b34d6080dcc7b1fc4bb79a41ac578481199f95c425485c2ac
+MISC metadata.xml 248 BLAKE2B 7e969e31666e369b4b1826230eb9c103e51962ac23701a7d5e49d211d6da6ee2f6a8372d72b3ba454140d2c1fb7ab6d122f011e9c8144e95a9cc11f01d2e6481 SHA512 53fd9b61e8fd7f18f9493861896a34938e5f6ee4efb3d2c71703dfa81587d0943f0d439fac0e0c106966dabba08d6aeb4b0a2ff85addf30d992c9b7c78ab6314
diff --git a/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch b/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch
new file mode 100644
index 000000000000..27d5b1dd73dd
--- /dev/null
+++ b/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch
@@ -0,0 +1,111 @@
+add Prefix and Darwin support
+
+--- perl-cleaner
++++ perl-cleaner
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
+ # vim: set et sw=4 sts=4 tw=80:
+ # Copyright 2005-2014 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+@@ -22,13 +22,13 @@
+ PKGS_EXCEPTIONS="dev-lang/perl sys-devel/libperl app-emulation/emul-linux-x86-baselibs"
+ PKGS_MANUAL=""
+ 
+-PKG_DBDIR=/var/db/pkg
++PKG_DBDIR="@GENTOO_PORTAGE_EPREFIX@/var/db/pkg"
+ 
+ # See bug 504116 for details
+-if [ -e /lib/gentoo/functions.sh ]; then
+-    . /lib/gentoo/functions.sh
+-elif [ -e /etc/init.d/functions.sh ]; then
+-    . /etc/init.d/functions.sh
++if [ -e "@GENTOO_PORTAGE_EPREFIX@/lib/gentoo/functions.sh" ]; then
++    . "@GENTOO_PORTAGE_EPREFIX@/lib/gentoo/functions.sh"
++elif [ -e "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh" ]; then
++    . "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh"
+ else
+     echo "$0: Unable to find functions.sh"
+     exit 1
+@@ -157,7 +157,7 @@
+ 
+     veinfo 1 "Locating ph files for removal"
+     eindent ""
+-    for i in /usr/lib{,64,x32}/perl5 ; do
++    for i in "@GENTOO_PORTAGE_EPREFIX@"/usr/lib{,64,x32}/perl5 ; do
+         [[ ! -d ${i} ]] && continue
+         veinfo 4 "...in ${i}"
+         while IFS= read -r -d $'\0' file ; do
+@@ -183,13 +183,13 @@
+         veinfo 1 "Pretend. Nothing to do."
+         return
+     fi
+-    pushd /usr/include > /dev/null
++    pushd "@GENTOO_PORTAGE_EPREFIX@"/usr/include > /dev/null
+     if [[ ${version} =~ ^5.(8|10) ]] ; then
+         eindent
+-        veinfo 2 "...in /usr/include"
++        veinfo 2 "...in @GENTOO_PORTAGE_EPREFIX@/usr/include"
+         h2ph ${option} * 2>/dev/null
+         for dir in sys arpa netinet bits security asm gnu linux ; do
+-            veinfo 2 "...in /usr/include/$dir/"
++            veinfo 2 "...in @GENTOO_PORTAGE_EPREFIX@/usr/include/$dir/"
+             h2ph ${option} -r $dir/*
+         done
+         eoutdent
+@@ -220,13 +220,16 @@
+         veinfo 1 "Locating ebuilds linked against libperl"
+     fi
+ 
++    local scanelf=scanelf
++    [[ -e "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libperl.dylib ]] \
++        && scanelf=scanmacho
+     if ${LIBPERL} ; then
+-        if ! type -P scanelf >/dev/null 2>&1; then
+-            ewarn "scanelf not found! Install app-misc/pax-utils."
++        if ! type -P ${scanelf} >/dev/null 2>&1; then
++            ewarn "${scanelf} not found! Install app-misc/pax-utils."
+             ewarn "--libperl is disbled."
+             LIBPERL=false
+         else
+-            SONAME="$(scanelf -qBS "$(realpath /usr/lib/libperl.so 2>/dev/null )" | awk '{ print $1 }')"
++            SONAME="$(${scanelf} -qBS "$(realpath "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libperl.{so,dylib} 2>/dev/null )" | awk '{ print $1 }')"
+             veinfo 4 SONAME="${SONAME}"
+         fi
+     fi
+@@ -268,7 +271,7 @@
+             while read -r type file ; do
+                 shopt -s extglob
+                 [[ ${type} == obj ]] || [[ ${type} == sym ]] || continue
+-                [[ ${file} =~ ^/usr/(share|lib(32|64|x32)?)/perl5 ]] || continue
++                [[ ${file} =~ ^"@GENTOO_PORTAGE_EPREFIX@"/usr/(share|lib(32|64|x32)?)/perl5 ]] || continue
+                 file=${file% +(!([[:space:]])) +([[:digit:]])}
+                 shopt -u extglob
+                 if ${FORCE} || outdated_path "${file}" ; then
+@@ -302,7 +305,7 @@
+ 
+         if ${LIBPERL} ; then
+             # We assume the broken libs have all bin or lib in their path
+-            broken_libs="$(scanelf -qBn < <(awk '/^(obj|sym) [^ ]*\/(s?bin|lib(32|64|x32)?)\// && ! /^obj [^ ]*\/usr\/lib\/debug\//{ print $2 }' ${content} ) | grep -o 'libperl\.so\.[0-9.]*' | sort -u )"
++            broken_libs="$(${scanelf} -qBn < <(awk '/^(obj|sym) [^ ]*\/(s?bin|lib(32|64|x32)?)\// && ! /^obj [^ ]*\/usr\/lib\/debug\//{ print $2 }' ${content} ) | grep -o 'libperl\.\(so\|dylib\)\.[0-9.]*' | sort -u )"
+             if [[ -n "${broken_libs}" ]] ; then
+                 if ${FORCE} || [[ ${broken_libs} != ${SONAME} ]] ; then
+                     PKGS_TO_REMERGE+=" ${CATPKGVER}"
+@@ -327,7 +330,7 @@
+         exit $?
+     fi
+ 
+-    if [[ ${PMS_COMMAND[${PMS_INDEX}]} == emerge && -x /usr/bin/portageq ]] ; then
++    if [[ ${PMS_COMMAND[${PMS_INDEX}]} == emerge && -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq ]] ; then
+         # Filter out --getbinpkg, --getbinpkgonly, --usepkg and --usepkgonly options in EMERGE_DEFAULT_OPTS
+         emerge_default_opts=""
+         for option in $(portageq envvar EMERGE_DEFAULT_OPTS ) ; do
+@@ -383,7 +386,7 @@
+     veinfo 1 "or edited. This script cannot deal with them."
+     vecho 1
+ 
+-    for i in /usr/{share,lib{,32,64,x32}}/perl5 ; do
++    for i in "@GENTOO_PORTAGE_EPREFIX@"/usr/{share,lib{,32,64,x32}}/perl5 ; do
+         [[ -d $i ]] && perlpath[${#perlpath[*]}]="$(realpath $i 2>/dev/null )"
+     done
+     [[ ${#perlpath[*]} == 0 ]] && return
diff --git a/app-admin/perl-cleaner/metadata.xml b/app-admin/perl-cleaner/metadata.xml
new file mode 100644
index 000000000000..408ad0201f65
--- /dev/null
+++ b/app-admin/perl-cleaner/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild
new file mode 100644
index 000000000000..7ec93d91073c
--- /dev/null
+++ b/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils prefix
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+
+RDEPEND="app-shells/bash
+	dev-lang/perl
+	|| (
+		( sys-apps/portage app-portage/portage-utils )
+		sys-apps/pkgcore
+		sys-apps/paludis
+	)
+"
+
+src_prepare() {
+	if use prefix ; then
+		# I don't dare to throw non Prefix users for the bus, but this
+		# patch should be safe for them
+		epatch "${FILESDIR}"/${P}-prefix.patch
+		eprefixify ${PN}
+	fi
+}
+
+src_install() {
+	dosbin perl-cleaner
+	doman perl-cleaner.1
+}
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild
new file mode 100644
index 000000000000..c0b5fb735ad6
--- /dev/null
+++ b/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+
+RDEPEND="app-shells/bash
+	dev-lang/perl
+	|| (
+		( sys-apps/portage app-portage/portage-utils )
+		sys-apps/pkgcore
+		sys-apps/paludis
+	)
+"
+
+src_prepare() {
+	default
+	eprefixify ${PN}
+}
+
+src_install() {
+	dosbin perl-cleaner
+	doman perl-cleaner.1
+}
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.24.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.24.ebuild
new file mode 100644
index 000000000000..c0b5fb735ad6
--- /dev/null
+++ b/app-admin/perl-cleaner/perl-cleaner-2.24.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+
+RDEPEND="app-shells/bash
+	dev-lang/perl
+	|| (
+		( sys-apps/portage app-portage/portage-utils )
+		sys-apps/pkgcore
+		sys-apps/paludis
+	)
+"
+
+src_prepare() {
+	default
+	eprefixify ${PN}
+}
+
+src_install() {
+	dosbin perl-cleaner
+	doman perl-cleaner.1
+}
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild
new file mode 100644
index 000000000000..07906d19f3bc
--- /dev/null
+++ b/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+
+RDEPEND="app-shells/bash
+	dev-lang/perl
+	|| (
+		( sys-apps/portage app-portage/portage-utils )
+		sys-apps/pkgcore
+		sys-apps/paludis
+	)
+"
+
+src_prepare() {
+	default
+	eprefixify ${PN}
+}
+
+src_install() {
+	dosbin perl-cleaner
+	doman perl-cleaner.1
+}
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.26-r1.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.26-r1.ebuild
new file mode 100644
index 000000000000..13029ade666c
--- /dev/null
+++ b/app-admin/perl-cleaner/perl-cleaner-2.26-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+
+RDEPEND="app-shells/bash
+	dev-lang/perl
+	|| (
+		( sys-apps/portage app-portage/portage-utils )
+		( sys-apps/portage-mgorny app-portage/portage-utils )
+		sys-apps/pkgcore
+		sys-apps/paludis
+	)
+"
+
+src_prepare() {
+	default
+	eprefixify ${PN}
+}
+
+src_install() {
+	dosbin perl-cleaner
+	doman perl-cleaner.1
+}
diff --git a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
new file mode 100644
index 000000000000..13029ade666c
--- /dev/null
+++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+
+RDEPEND="app-shells/bash
+	dev-lang/perl
+	|| (
+		( sys-apps/portage app-portage/portage-utils )
+		( sys-apps/portage-mgorny app-portage/portage-utils )
+		sys-apps/pkgcore
+		sys-apps/paludis
+	)
+"
+
+src_prepare() {
+	default
+	eprefixify ${PN}
+}
+
+src_install() {
+	dosbin perl-cleaner
+	doman perl-cleaner.1
+}
diff --git a/app-admin/petrovich-1.0.0-r1 b/app-admin/petrovich-1.0.0-r1
deleted file mode 100644
index 1d563cadf4c7..000000000000
--- a/app-admin/petrovich-1.0.0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Filesystem Integrity Checker
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/petrovich
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/perl-Digest-MD5
-SLOT=0
-SRC_URI=mirror://sourceforge/petrovich/petrovich-1.0.0.tar.gz
-_md5_=0c6d651cdb17f6219bc3a58339b5901d
diff --git a/app-admin/petrovich/Manifest b/app-admin/petrovich/Manifest
new file mode 100644
index 000000000000..f59a9c8469fc
--- /dev/null
+++ b/app-admin/petrovich/Manifest
@@ -0,0 +1,5 @@
+AUX petrovich-1.0.0-gentoo.diff 1135 BLAKE2B cfb4a284f943e6e7dd97f63ff14641ef0c1c5a962926f3220640d8b76804bfb4e754a62c11988b7352b796b1646739a969690336316f657b98e831fde5804a53 SHA512 cccefe0f88bdc0c4665e38c7e9760e273c5a40dfbbff086839128f2f3556e1e9c1094c2d7380045899d02e5c56aa84280c578a91cef86776e06841a40581b3df
+AUX petrovich.conf 135 BLAKE2B 37e803f0a90805af7f2888d24ca64fb5eb25e2795ac8fb6bbd52e4cd0614b1005b5ebb8cb401054f7ff77703f957ccb41ccfa9e9fa0033e2dbddc2ee216c99b7 SHA512 eaede98ec4921e5b9dae0c79f685d71c1001eed313529ff5c20a55f956d4eb2682880aebb56717f40c090feb92eeba6060aa96ecf45b94fb764cf76993febce1
+DIST petrovich-1.0.0.tar.gz 17844 BLAKE2B 31815188d72656c0dcb4a49f7c1511213ebaf049c2f3961e6aa0ce8ba74f7705b38b414745a73b9c78f05b6e164940e6eea92a8f885b96ad1afbe0f811411734 SHA512 5f30cffffba670ee6c6b53b93427f380c389ba60ee5717cb6ac632aacbd81fba514c0843db4d8e093e164fd8cf275f280a9da5a184b27c077789f2e359b05b5d
+EBUILD petrovich-1.0.0-r1.ebuild 621 BLAKE2B 70ad5a70796983199e5fe5398abd6e7ec3589190d162b2b0d5f1c2f341dcd6a865238a3f879fe1c5bd07b26fa14c2f2531f6b1b27b6f0bfec4f3aa7aadad8940 SHA512 d5f5210399fc709679412554e9842a90846d3de8bac0abd212cdc87580fafc1f04670980709111795b067a2e48b0b96932052bbc18f29925b14360112b4c89cc
+MISC metadata.xml 246 BLAKE2B ff9ff7817a0afb6186b910f53aecbb49c38bb17ee4c210d6e2c178afe63c388709bdcfa6fb9419ba50f94cf54372b2c5672b7f4450627f775ef7ffdddedff5fe SHA512 4d51d21df3e15db124014390bae632822966de5d93b522bb12d23471b3f27b8e097a0c5b32d742c8a15ff0d98609a76da416698b09d625eef6edaa4e3b965f60
diff --git a/app-admin/petrovich/files/petrovich-1.0.0-gentoo.diff b/app-admin/petrovich/files/petrovich-1.0.0-gentoo.diff
new file mode 100644
index 000000000000..9dd32968b249
--- /dev/null
+++ b/app-admin/petrovich/files/petrovich-1.0.0-gentoo.diff
@@ -0,0 +1,32 @@
+diff -r -C2 petrovich.orig/petrovich.pl petrovich/petrovich.pl
+*** a/petrovich.pl	Mon Jul 16 12:34:55 2001
+--- b/petrovich.pl	Sun Aug  5 22:22:54 2001
+***************
+*** 278,285 ****
+      

+  #    undef $db_hash_verifier; # for now cuz it's not working    

+!     $config_file = "petrovich.conf" unless defined($config_file);

+      $hash_type = "md5" unless defined($hash_type);

+      @stuff = ("filename", "mode","uid","gid","size","mtime","ctime","$hash_type");

+!     $db_file = "petrovich.db" unless defined($db_file);

+      

+  # if running under windows lowercase everything

+--- 278,285 ----
+      

+  #    undef $db_hash_verifier; # for now cuz it's not working    

+!     $config_file = "/etc/petrovich.conf" unless defined($config_file);

+      $hash_type = "md5" unless defined($hash_type);

+      @stuff = ("filename", "mode","uid","gid","size","mtime","ctime","$hash_type");

+!     $db_file = "/var/db/petrovich/petrovich.db" unless defined($db_file);

+      

+  # if running under windows lowercase everything

+***************
+*** 324,326 ****
+  }

+  

+! }
+\ No newline at end of file
+--- 324,326 ----
+  }

+  

+! }

diff --git a/app-admin/petrovich/files/petrovich.conf b/app-admin/petrovich/files/petrovich.conf
new file mode 100644
index 000000000000..03da7c1535fa
--- /dev/null
+++ b/app-admin/petrovich/files/petrovich.conf
@@ -0,0 +1,6 @@
+# petrovich.conf
+# to include directories to be checked include a line like the following:
+# +/sbin
+#
+# to exclude directories
+# -/var
diff --git a/app-admin/petrovich/metadata.xml b/app-admin/petrovich/metadata.xml
new file mode 100644
index 000000000000..d57dcbd89db6
--- /dev/null
+++ b/app-admin/petrovich/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">petrovich</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/petrovich/petrovich-1.0.0-r1.ebuild b/app-admin/petrovich/petrovich-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..f5ca36fa2d0a
--- /dev/null
+++ b/app-admin/petrovich/petrovich-1.0.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Filesystem Integrity Checker"
+SRC_URI="mirror://sourceforge/petrovich/${P}.tar.gz"
+HOMEPAGE="https://sourceforge.net/projects/petrovich"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+
+RDEPEND="virtual/perl-Digest-MD5"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}/${P}-gentoo.diff" )
+HTML_DOCS=( CHANGES.HTML LICENSE.HTML README.HTML TODO.HTML USAGE.HTML )
+
+src_install() {
+	dosbin "${PN}.pl"
+
+	insinto /etc
+	doins "${FILESDIR}/${PN}.conf"
+
+	dodir "/var/db/${PN}"
+
+	einstalldocs
+}
diff --git a/app-admin/pprocm-1.0-r2 b/app-admin/pprocm-1.0-r2
deleted file mode 100644
index 6667de4ee7a9..000000000000
--- a/app-admin/pprocm-1.0-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-perl/POE dev-perl/Sys-Statistics-Linux dev-perl/IO-Pipely dev-lang/perl
-DESCRIPTION=ncurses-based program to monitor CPU, disk, network and memory usage
-EAPI=6
-HOMEPAGE=http://www.fusedcreations.com/PProcM/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/POE dev-perl/Sys-Statistics-Linux dev-perl/IO-Pipely dev-lang/perl
-SLOT=0
-SRC_URI=http://www.fusedcreations.com/PProcM/PProcM-1.0.tar.gz
-_md5_=c9d3e79aacad275fa8439b89d26a3499
diff --git a/app-admin/pprocm/Manifest b/app-admin/pprocm/Manifest
new file mode 100644
index 000000000000..e5d3fe100f25
--- /dev/null
+++ b/app-admin/pprocm/Manifest
@@ -0,0 +1,3 @@
+DIST PProcM-1.0.tar.gz 29007 BLAKE2B 511934eedb0f2269d505affbe15d9ba151ba4e6647885787caf045bdb52080ca26072f5a8986e8fdbd12fc8a0516d9c35f0d0dfd1d42ec268777c1288c55b00f SHA512 d592455719babb9dd55c0d63ea097fb110747eb481e81b237779543f7bc90c8fcc0a4e7ecb94e3287afe9ac9f707e1e90c28ab634dd8d0e2bd7708aee8e79277
+EBUILD pprocm-1.0-r2.ebuild 618 BLAKE2B cfa998d54cd7f680456b4407a09f2217f0c7b746d171dd6b5e5a5d4c826231ca96c643c8a5a5c2ce37b81d11cc35193cb4232274a012a91dc84f1f9a8d3521e4 SHA512 c384fcbfa1870d8eb54269431168462d743da0a0c35ae0f40f8784208132b2e0dc64562863623ba02518469434df4de42a81e79fffd694b35e864dda3df7c6c9
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/pprocm/metadata.xml b/app-admin/pprocm/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/pprocm/metadata.xml
@@ -0,0 +1,5 @@
+<?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/pprocm/pprocm-1.0-r2.ebuild b/app-admin/pprocm/pprocm-1.0-r2.ebuild
new file mode 100644
index 000000000000..a91f192678ca
--- /dev/null
+++ b/app-admin/pprocm/pprocm-1.0-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="PProcM"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="ncurses-based program to monitor CPU, disk, network and memory usage"
+HOMEPAGE="http://www.fusedcreations.com/PProcM/"
+SRC_URI="http://www.fusedcreations.com/PProcM/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	dev-perl/POE
+	dev-perl/Sys-Statistics-Linux
+	dev-perl/IO-Pipely
+	dev-lang/perl"
+
+RDEPEND="
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS README )
+
+src_install() {
+	newbin "${MY_PN}" "${PN}"
+	einstalldocs
+}
diff --git a/app-admin/prelude-manager-3.0.0 b/app-admin/prelude-manager-3.0.0
deleted file mode 100644
index f9aa931301b8..000000000000
--- a/app-admin/prelude-manager-3.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-libs/gnutls dev-libs/libprelude dbx? ( dev-libs/libpreludedb ) tcpwrapper? ( sys-apps/tcp-wrappers ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Bus communication for all Prelude modules
-EAPI=6
-HOMEPAGE=https://www.prelude-siem.org
-IUSE=tcpwrapper xml geoip dbx
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=net-libs/gnutls dev-libs/libprelude dbx? ( dev-libs/libpreludedb ) tcpwrapper? ( sys-apps/tcp-wrappers ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb )
-SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/3.0.0/prelude-manager-3.0.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8402eeb5487e1f766c2d5263663f7c91
diff --git a/app-admin/prelude-manager-3.1.0 b/app-admin/prelude-manager-3.1.0
deleted file mode 100644
index dd467de740bd..000000000000
--- a/app-admin/prelude-manager-3.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-libs/gnutls:= ~dev-libs/libprelude-3.1.0 dbx? ( ~dev-libs/libpreludedb-3.1.0 ) tcpwrapper? ( sys-apps/tcp-wrappers ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Bus communication for all Prelude modules
-EAPI=6
-HOMEPAGE=https://www.prelude-siem.org
-IUSE=tcpwrapper xml geoip dbx
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=net-libs/gnutls:= ~dev-libs/libprelude-3.1.0 dbx? ( ~dev-libs/libpreludedb-3.1.0 ) tcpwrapper? ( sys-apps/tcp-wrappers ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb )
-SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/3.1.0/prelude-manager-3.1.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=bef2f737cbc35e4caf10bb3b66e51b73
diff --git a/app-admin/prelude-manager-4.0.0 b/app-admin/prelude-manager-4.0.0
deleted file mode 100644
index 13a6e73bceba..000000000000
--- a/app-admin/prelude-manager-4.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-libs/gnutls:= ~dev-libs/libprelude-4.0.0 dbx? ( ~dev-libs/libpreludedb-4.0.0 ) geoip? ( dev-libs/libmaxminddb ) tcpwrapper? ( sys-apps/tcp-wrappers ) xml? ( dev-libs/libxml2 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Bus communication for all Prelude modules
-EAPI=6
-HOMEPAGE=https://www.prelude-siem.org
-IUSE=dbx geoip tcpwrapper xml
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=net-libs/gnutls:= ~dev-libs/libprelude-4.0.0 dbx? ( ~dev-libs/libpreludedb-4.0.0 ) geoip? ( dev-libs/libmaxminddb ) tcpwrapper? ( sys-apps/tcp-wrappers ) xml? ( dev-libs/libxml2 )
-SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/4.0.0/prelude-manager-4.0.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4fbcc924e8801864a37b27fb20d61325
diff --git a/app-admin/prelude-manager/Manifest b/app-admin/prelude-manager/Manifest
new file mode 100644
index 000000000000..dbb263404759
--- /dev/null
+++ b/app-admin/prelude-manager/Manifest
@@ -0,0 +1,14 @@
+AUX prelude-manager-3.0.0-conf.patch 479 BLAKE2B dce40c09a9ca4cae0ba962463b86afd130700e56026eeef26ce232d72ccf77b6effbcaf14029837e388fbe859ac274fbaa6cd884a2ed1aecae55aa5e679b051d SHA512 085f46e905e5c4d0d838f11e4cd8462ede754c5009c69c623c841528dc204082ef08d18696f52eec1d220060d7ce3e5007079ebe918465fd797a5e76f68725bf
+AUX prelude-manager-3.0.0-configure.patch 2683 BLAKE2B 90db4c3c49e988c28c61ccd5c8811f53093862c2199318347bac9eb0901a05afe8846cd52403e45c74e1ae7259908078713e148d772f51d0654e4fe1a07e2a74 SHA512 41dc4eb1ece15d42a21e6da611b4b8bb855b7c7fb1f75621499dc0ad33043e8f08ebadd4402855e850a2b603bc71fbbee09682c9ef40fda51b31d15038180099
+AUX prelude-manager-3.0.0-run.patch 552 BLAKE2B b11803cab6cf01d1501759c3c7a759ebc7f6bcb806d6e2330a826ce4117bb285e35a8519ea260892cb16124dce3115d9a506a68ffceae304fd41f0e49a5877c7 SHA512 2442f6e1436ef3cf9a2b572ca0c4402a67109555e56fb51355d3187386b2be69644d95b7f6e42264a2fce7db92f3d7e1274ead9c6a283f80ace040359afab88b
+AUX prelude-manager-3.1.0-run.patch 570 BLAKE2B 9690826651d7a747d282cdc1591ad1ac2fadfa791b38e0ea09eea8bc2efae56e55bcd5b127087f94876982009a7821dd8f91b910ac8ab0b52ba1b7c8d75153e2 SHA512 6e8d59b49de65c00abf756c823acb43d65af065bae363f83c3f8d9b6b8743b6a449f517d129cd7d98054ded94faccf33d29e1570462e73ffd51d070da0d081c5
+AUX prelude-manager.initd 591 BLAKE2B 495b56179aedd0ec3c925d6e269c9d114d9fc5ef968aa9b1c10736ea1ffeb2a4895222e282627a186b248faf4e71808e548cb9cc24b2a645dfcf3d70072cc1f1 SHA512 0115c313fd1e964508951a9074aeb9cd5b63a14d2a63d5f205dd141d22b806955c1852d9291945725dc6d9474210700edaeb444962fd7e2f673a7adf51a8c902
+AUX prelude-manager.run 133 BLAKE2B b91c630c269ff09327da88cbcaaca6108121a5ae16d499a889a2cdb7e6dd7b844b3c89799fa60cb71deb9609210abbb08b059f9fbef2def7d06c7ce506225c19 SHA512 f129cc45efb710d336dd177ba465f542aaac767579dafbbacbdc88b56fcf3b95eb219a9dff7863ca47475748b93d001218ff28a7e49b3060c62278a72666986e
+AUX prelude-manager.service 398 BLAKE2B b409fd283baa3d85c0b25149e2912483e29f090338cc659c3444e2f51ca228b50cf2d5172ecf85b16a40c50f515def2ed178c6a2d85caeaa8b7b75b5ac5ddf45 SHA512 b3700ef920e739f521c87477a8752f787345971cd7077a4a0722b3d4069ca2ba55df3db87da4b544f559cd2e4faf2ef3b068e1c5dead6003f580dc04b4590495
+DIST prelude-manager-3.0.0.tar.gz 1286459 BLAKE2B 0909b0d7501909de51cd580b6ce22a66b1900a3b5b7376d3aeb4136bf41128ab766a025d69d33c414a9623dabb0de144e2f21190c3c3cccb9c067db359aab1bd SHA512 4c16a353495179265375686ce9592c8cd044b4255060b78286466bd25f9b38634233c95af058e1c0b81e1b574ec9ada5b2db92d6d1f5594dfcddce572fd0fd67
+DIST prelude-manager-3.1.0.tar.gz 1301799 BLAKE2B 938937d2752ad47630b36c3a546f2493a964fde01e3df694e4a9fbddfa1efc3ddc9d864f8c1169e8ae8f3b414c4cd1983bbbd015f192ee065e2531489a23ba8b SHA512 75df43f9db81d2b6bd87c649eda7bb30ee10510576473bea83cb5cce44f576e9d69d775b5d76dcea8841eee61730a97cdae51e6c8b3a426d2442c5183d0e0d10
+DIST prelude-manager-4.0.0.tar.gz 1353116 BLAKE2B 20aaa28797a67fd310807735bb08f0c21c3bd95950598a86c45144ee2474785aef0c7d569732c817509ae8ae52ffce5f43f3c071931f2960578681f91a8c9504 SHA512 793ed37c71eb4884cbbb49b11c7388ee291a35252255458ceadb4ce10d1392e8bad423f95e31bff4550a9cf1d04139e43729352554fd847048b6c8d14f813a8a
+EBUILD prelude-manager-3.0.0.ebuild 1349 BLAKE2B 1e57326c02b41d39ed7cf9ef7372dffd8ed0357e1d390b73e2f143460c2d7dc907bd4d9086c351b5b69f4a9f5a7d18890a3de8774a427691e56d660bd5a21dac SHA512 404cd27a552a6eb9bc8ae005ddacd9734f26f52897f7d9a21568b7cb2ba1cfe82a5a9cda32f591043c65124faf5322d0dcff95b1b0cca5cb60c75331c3e8b322
+EBUILD prelude-manager-3.1.0.ebuild 1235 BLAKE2B 131b01c6315a1bf7fc411dde32dede5278a7d8da4e1dc62f9df106b94669df5d0e7ddcc1d367be3a5979e89c2aa71b2bc1b01eef9f9512a6b7d5654b3d965ea0 SHA512 280a181934c56049823297b749b4b0de5f1f819e1c057f910bd208cbb5ebb8928a17d70969e32768ac7e6be624e314607f1b11fdba8daa375a12df443dc1a28a
+EBUILD prelude-manager-4.0.0.ebuild 1253 BLAKE2B 8d9e17b92b16090bb437fe53389598128f249e2b4f16c8da6724f370df5bab1aea34c1824b024839bc0f3a573a56d19bc54c31cdf0744b54c581fcdefeb76d97 SHA512 3a0d79d24de4d97ba73be7cdf62f4d2d158225cdf35945e51de3854b7465a23eddc9315204a303c833e73a8965826ea18cf09951aa79697bfdc9523f0149025f
+MISC metadata.xml 1037 BLAKE2B 2e4a2d969eac348834aa8f78859b7b4456585ab11985c6083640a6cc0d32269952a78063b5aa11c6228d9c67e04b50b58247b5c2787f7d484390721af0de4ef5 SHA512 d18f203c6feadc632fee701cc7563c60d10febf11873fd9a6498cdaa47c2fa44b1a7ca50d5f6af99f3cc678fb88442c8e71d7eb0185b9972585c2d52371d9c34
diff --git a/app-admin/prelude-manager/files/prelude-manager-3.0.0-conf.patch b/app-admin/prelude-manager/files/prelude-manager-3.0.0-conf.patch
new file mode 100644
index 000000000000..246ce7d921e5
--- /dev/null
+++ b/app-admin/prelude-manager/files/prelude-manager-3.0.0-conf.patch
@@ -0,0 +1,11 @@
+--- a/prelude-manager.conf.in
++++ b/prelude-manager.conf.in
+@@ -361,7 +361,7 @@
+ # (same source, target and classification combination) every 2 minutes
+ # to reporting plugins (eg. to the database).
+ [thresholding]
+-path = alert.classification.text, alert.source.node.address.address, alert.target.node.address.address
++path = alert.classification.text, alert.source(0).node.address(0).address, alert.target(0).node.address(0).address
+ limit = 120
+ count = 100
+ hook = reporting
diff --git a/app-admin/prelude-manager/files/prelude-manager-3.0.0-configure.patch b/app-admin/prelude-manager/files/prelude-manager-3.0.0-configure.patch
new file mode 100644
index 000000000000..bc1949f01510
--- /dev/null
+++ b/app-admin/prelude-manager/files/prelude-manager-3.0.0-configure.patch
@@ -0,0 +1,57 @@
+When : when you try to use enable with libmaxmind, libpreludedb, xml, libwrap, they are not working
+Why : Needed if you want to use useflags
+--- a/configure.in
++++ b/configure.in
+@@ -110,7 +110,10 @@
+ dnl **************************************************
+ LIBMAXMINDDB_MIN_VERSION=1.0.0
+ 
+-PKG_CHECK_MODULES([LIBMAXMINDDB], [libmaxminddb >= $LIBMAXMINDDB_MIN_VERSION], enable_libmaxminddb=yes, enable_libmaxminddb=no)
++AC_ARG_ENABLE(libmaxminddb, AC_HELP_STRING(--enable-libmaxminddb, Define whether libmaxminddb is available), , enable_libmaxminddb="yes")
++if test x$enable_libmaxminddb = xyes; then
++	PKG_CHECK_MODULES([LIBMAXMINDDB], [libmaxminddb >= $LIBMAXMINDDB_MIN_VERSION], enable_libmaxminddb=yes, enable_libmaxminddb=no)
++fi
+ if test x$enable_libmaxminddb = xyes; then
+ 	AC_CHECK_HEADER(maxminddb.h, enable_libmaxminddb=yes, enable_libmaxminddb=no)
+ fi
+@@ -126,11 +129,14 @@
+ dnl * Check for libpreludedb                         *
+ dnl **************************************************
+ 
+-AM_PATH_LIBPRELUDEDB(3.0.0, enable_libpreludedb=yes, enable_libpreludedb=no, no)
+-AM_CONDITIONAL(HAVE_LIBPRELUDEDB, test x$enable_libpreludedb = xyes)
++AC_ARG_ENABLE(libpreludedb, AC_HELP_STRING(--enable-libpreludedb, Define whether libpreludedb is available), , enable_libpreludedb="yes")
++if test x$enable_libpreludedb = xyes; then
++	AM_PATH_LIBPRELUDEDB(3.0.0, enable_libpreludedb=yes, enable_libpreludedb=no, no)
++fi
+ if test x$enable_libpreludedb = xyes; then
+         AC_DEFINE_UNQUOTED(HAVE_LIBPRELUDEDB, , Define whether libpreludedb is available)
+ fi
++AM_CONDITIONAL(HAVE_LIBPRELUDEDB, test x$enable_libpreludedb = xyes)
+ 
+ 
+ 
+@@ -138,7 +144,10 @@
+ dnl * Check for the Libxml2                                *
+ dnl ********************************************************
+ 
+-AM_PATH_XML2(, enable_xmlmod=yes, enable_xmlmod=no)
++AC_ARG_ENABLE(xmlmod, AC_HELP_STRING(--enable-xmlmod, Enable XML), , enable_xmlmod="yes")
++if test x$enable_xmlmod = xyes; then
++	AM_PATH_XML2(, enable_xmlmod=yes, enable_xmlmod=no)
++fi
+ AM_CONDITIONAL(HAVE_XML2, test x$enable_xmlmod = xyes)
+ 
+ 
+@@ -147,9 +156,10 @@
+ dnl * TCP WRAPPER CHECK                              *
+ dnl **************************************************
+ 
++AC_ARG_WITH(libwrap, AC_HELP_STRING(--with-libwrap, Compile in libwrap (tcp_wrappers) support.), , with_libwrap="yes")
+ AC_ARG_WITH(libwrap-prefix, AC_HELP_STRING(--with-libwrap-prefix@<:@=PFX@:>@,
+                                     Compile in libwrap (tcp_wrappers) support @<:@default=auto@:>@.),
+-            libwrap_required=true, with_libwrap="yes")
++            libwrap_required=true, )
+ 
+ if test x$with_libwrap != xno; then
+    LIBWRAP_INCLUDE="tcpd.h"
diff --git a/app-admin/prelude-manager/files/prelude-manager-3.0.0-run.patch b/app-admin/prelude-manager/files/prelude-manager-3.0.0-run.patch
new file mode 100644
index 000000000000..ef6d553a3d27
--- /dev/null
+++ b/app-admin/prelude-manager/files/prelude-manager-3.0.0-run.patch
@@ -0,0 +1,13 @@
+When : everytime
+Why : since systemd, run dir has changed
+--- a/configure.in
++++ b/configure.in
+@@ -304,7 +304,7 @@
+ 
+ manager_failover_dir=$LOCALSTATEDIR/spool/prelude-manager/failover
+ manager_scheduler_dir=$LOCALSTATEDIR/spool/prelude-manager/scheduler
+-manager_run_dir=$LOCALSTATEDIR/run/prelude-manager
++manager_run_dir=/run/prelude-manager
+ 
+ AC_DEFINE_UNQUOTED(REPORT_PLUGIN_DIR, "$report_plugin_dir", Prelude-Manager report plugin directory)
+ AC_DEFINE_UNQUOTED(DECODE_PLUGIN_DIR, "$decode_plugin_dir", Prelude-Manager decode plugin directory)
diff --git a/app-admin/prelude-manager/files/prelude-manager-3.1.0-run.patch b/app-admin/prelude-manager/files/prelude-manager-3.1.0-run.patch
new file mode 100644
index 000000000000..4012c6c4b794
--- /dev/null
+++ b/app-admin/prelude-manager/files/prelude-manager-3.1.0-run.patch
@@ -0,0 +1,13 @@
+When : everytime
+Why : Fix the run dir to comply with the Gentoo FS layout.
+--- a/configure.ac
++++ b/configure.ac
+@@ -337,7 +337,7 @@
+ 
+ manager_failover_dir=$LOCALSTATEDIR/spool/prelude-manager/failover
+ manager_scheduler_dir=$LOCALSTATEDIR/spool/prelude-manager/scheduler
+-manager_run_dir=$LOCALSTATEDIR/run/prelude-manager
++manager_run_dir=/run/prelude-manager
+ 
+ AC_DEFINE_UNQUOTED(REPORT_PLUGIN_DIR, "$report_plugin_dir", Prelude-Manager report plugin directory)
+ AC_DEFINE_UNQUOTED(DECODE_PLUGIN_DIR, "$decode_plugin_dir", Prelude-Manager decode plugin directory)
diff --git a/app-admin/prelude-manager/files/prelude-manager.initd b/app-admin/prelude-manager/files/prelude-manager.initd
new file mode 100644
index 000000000000..14a39ba415e8
--- /dev/null
+++ b/app-admin/prelude-manager/files/prelude-manager.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+BIN_MANAGER=/usr/bin/prelude-manager
+PID_MANAGER=/run/prelude-manager/prelude-manager.pid
+
+depend() {
+  need net
+}
+
+start() {
+  ebegin "Starting prelude-manager"
+  checkpath -d -m 0755 -o root:root /run/prelude-manager
+  start-stop-daemon --start --exec $BIN_MANAGER \
+    --pidfile $PID_MANAGER -- -d -P $PID_MANAGER
+  eend $?
+}
+
+stop() {
+  ebegin "Stopping prelude-manager"
+  start-stop-daemon --stop --exec $BIN_MANAGER \
+    --pidfile $PID_MANAGER
+  eend $?
+}
diff --git a/app-admin/prelude-manager/files/prelude-manager.run b/app-admin/prelude-manager/files/prelude-manager.run
new file mode 100644
index 000000000000..739808485129
--- /dev/null
+++ b/app-admin/prelude-manager/files/prelude-manager.run
@@ -0,0 +1,4 @@
+# Configuration to create /run/prelude-manager directory
+# Used as part of systemd's tmpfiles
+
+d /run/prelude-manager 0755 root root
diff --git a/app-admin/prelude-manager/files/prelude-manager.service b/app-admin/prelude-manager/files/prelude-manager.service
new file mode 100644
index 000000000000..15eee91b8aa7
--- /dev/null
+++ b/app-admin/prelude-manager/files/prelude-manager.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Prelude-Manager service
+DefaultDependencies=no
+After=remote_fs.target
+Before=prelude-lml.service prelude-correlator.service
+
+[Service]
+ExecStart=/usr/bin/prelude-manager -d -P /run/prelude-manager/prelude-manager.pid
+Type=forking
+PIDFile=/run/prelude-manager/prelude-manager.pid
+Restart=always
+
+[Install]
+WantedBy=prelude-lml.service prelude-correlator.service multi-user.target
diff --git a/app-admin/prelude-manager/metadata.xml b/app-admin/prelude-manager/metadata.xml
new file mode 100644
index 000000000000..5990a2a5fbd3
--- /dev/null
+++ b/app-admin/prelude-manager/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>thomas.andrejak@gmail.com</email>
+		<name>Thomas Andrejak</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Prelude-Manager is a high availability server that
+		accepts secured connections from distributed sensors
+		and saves received events to a media specified by the user
+		(database, log file, mail etc.). The server schedules and
+		establishes the priorities of treatment according to the
+		critical character and the source of the alerts.
+	</longdescription>
+	<use>
+		<flag name="tcpwrapper">Enables Prelude Manager using
+		tcp wrapper. It requires <pkg>sys-apps/tcp-wrappers</pkg>
+		.</flag>
+		<flag name="dbx">Enables Prelude Manager storing Prelude
+		alerts into database through <pkg>dev-libs/libpreludedb</pkg>
+		.</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/prelude-manager/prelude-manager-3.0.0.ebuild b/app-admin/prelude-manager/prelude-manager-3.0.0.ebuild
new file mode 100644
index 000000000000..c9aec56bed73
--- /dev/null
+++ b/app-admin/prelude-manager/prelude-manager-3.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils systemd
+
+DESCRIPTION="Bus communication for all Prelude modules"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tcpwrapper xml geoip dbx"
+
+RDEPEND="net-libs/gnutls
+	dev-libs/libprelude
+	dbx? ( dev-libs/libpreludedb )
+	tcpwrapper? ( sys-apps/tcp-wrappers )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( dev-libs/libmaxminddb )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-conf.patch"
+	"${FILESDIR}/${P}-configure.patch"
+	"${FILESDIR}/${P}-run.patch"
+)
+
+src_prepare() {
+	default_src_prepare
+
+	mv "${S}/configure.in" "${S}/configure.ac" || die "mv failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		$(use_enable dbx libpreludedb) \
+		$(use_with tcpwrapper libwrap) \
+		$(use_enable xml xmlmod) \
+		$(use_enable geoip libmaxminddb)
+}
+
+src_install() {
+	default_src_install
+
+	rm -rv "${D}/run" || die "rm failed"
+	keepdir /var/spool/prelude-manager{,/failover,/scheduler}
+
+	prune_libtool_files --modules
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/app-admin/prelude-manager/prelude-manager-3.1.0.ebuild b/app-admin/prelude-manager/prelude-manager-3.1.0.ebuild
new file mode 100644
index 000000000000..45047c38dbc8
--- /dev/null
+++ b/app-admin/prelude-manager/prelude-manager-3.1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd
+
+DESCRIPTION="Bus communication for all Prelude modules"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tcpwrapper xml geoip dbx"
+
+RDEPEND="net-libs/gnutls:=
+	~dev-libs/libprelude-${PV}
+	dbx? ( ~dev-libs/libpreludedb-${PV} )
+	tcpwrapper? ( sys-apps/tcp-wrappers )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( dev-libs/libmaxminddb )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-run.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_with dbx libpreludedb-prefix) \
+		$(use_with tcpwrapper libwrap) \
+		$(use_with xml xml-prefix) \
+		$(use_enable geoip libmaxminddb)
+}
+
+src_install() {
+	default
+
+	rm -rv "${ED%/}/run" || die "rm failed"
+	keepdir /var/spool/prelude-manager{,/failover,/scheduler}
+
+	find "${D}" -name '*.la' -delete || die
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/app-admin/prelude-manager/prelude-manager-4.0.0.ebuild b/app-admin/prelude-manager/prelude-manager-4.0.0.ebuild
new file mode 100644
index 000000000000..30855a48ed97
--- /dev/null
+++ b/app-admin/prelude-manager/prelude-manager-4.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd
+
+DESCRIPTION="Bus communication for all Prelude modules"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbx geoip tcpwrapper xml"
+
+RDEPEND="net-libs/gnutls:=
+	~dev-libs/libprelude-${PV}
+	dbx? ( ~dev-libs/libpreludedb-${PV} )
+	geoip? ( dev-libs/libmaxminddb )
+	tcpwrapper? ( sys-apps/tcp-wrappers )
+	xml? ( dev-libs/libxml2 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.0-run.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_with dbx libpreludedb-prefix) \
+		$(use_enable geoip libmaxminddb) \
+		$(use_with tcpwrapper libwrap) \
+		$(usex xml '' '--without-xml-prefix')
+}
+
+src_install() {
+	default
+
+	rm -rv "${ED%/}/run" || die "rm failed"
+	keepdir /var/spool/prelude-manager{,/failover,/scheduler}
+
+	find "${D}" -name '*.la' -delete || die
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/app-admin/procinfo-ng-2.0.304-r1 b/app-admin/procinfo-ng-2.0.304-r1
deleted file mode 100644
index 67f7f24af051..000000000000
--- a/app-admin/procinfo-ng-2.0.304-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=sys-libs/ncurses:0= !app-admin/procinfo virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Completely rewrite of the old system monitoring app procinfo
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/procinfo-ng/
-KEYWORDS=amd64 hppa x86
-LICENSE=|| ( GPL-2 LGPL-2.1 )
-RDEPEND=sys-libs/ncurses:0= !app-admin/procinfo
-SLOT=0
-SRC_URI=mirror://sourceforge/procinfo-ng/procinfo-ng-2.0.304.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7adf7a2592f702ec5af7a30c9377c88d
diff --git a/app-admin/procinfo-ng/Manifest b/app-admin/procinfo-ng/Manifest
new file mode 100644
index 000000000000..09404a5c59aa
--- /dev/null
+++ b/app-admin/procinfo-ng/Manifest
@@ -0,0 +1,5 @@
+AUX procinfo-ng-2.0.304-as-needed.patch 441 BLAKE2B a9abe2b26ef8932f944ce93547afea7876906a28e813221a6afa76e69f9301dfe9c1d3391ccc9235644a6b817b441251b048e5cb8fdb6e2fe9c13472c267d5d5 SHA512 70a95c828a7a9bcea8559e1709bfcb2a88fd53a9aaf3c58c51faa04f32b50ec2f0db2705f6093e06ae0efdf2aafa7854b9f7aadf072ee8cd667fb2dce48e5ba0
+AUX procinfo-ng-2.0.304-man.patch 243 BLAKE2B c2fb0f07d440e4101717dfbc20b4f16947b4b40c770c9e72feb6a2af6eb94b2d3e8d05b9c3da14a040530ec67390ee36850f97cb3439e45e164175833c53f2c6 SHA512 2541b4738e6323627625e7d65ee2ddc88d61e76f7b5bfbd382472d048ad21e3b63eb8a92feb7af6e62ac54045aa25ffbdfe36d67c1a4dc0c7a7be9abeb5ba9ed
+DIST procinfo-ng-2.0.304.tar.bz2 62469 BLAKE2B fc08cc69ebb4f21c52a314c19eea820bc69408d609e59f122c939c14c9159e4348c4ccc07f39f63e96ec046d8af79abd6456a56397eb952d2fff1dd31f89a3e5 SHA512 db336d2ff3bb3b31ac83a51a9d273fae8d16d36bd805f548eda06cb501699473fd8e4b4f9b722165fbf685d76c3fc09bfea9e516eabc37a888e2fae7679c08cf
+EBUILD procinfo-ng-2.0.304-r1.ebuild 932 BLAKE2B fd1d929924cdc3ecdcd7a8c34ce8600b178c617c02e1c186781d2f66625564750df88a3ad300dcdc3879b1a6fa2211e02b69f95c108b2c899afb5c14eb65ff18 SHA512 66eb0269634e24a485465d267988ef4ba31872635a06ace7d624c2c1af5b7ae7de484d82d775f913a9002f4378dc0b292deeb6a10bac166adfd917ddcb982979
+MISC metadata.xml 356 BLAKE2B afc57b07ed4eea867d788e4d860b9a115d34cfcee6925b81527401556f2d68d1bb94deb1bd4dbf11183c62945caa6584dcf6bb2f02021aaffc6deef5cb9091ec SHA512 3b442e3aff5a26f504f930a0698b376cb0091daa868579ea436aad142222b101c88ace8faaf8fdf9e79dfdb2c7feaeb44f863c0b0d43e7ec85237c56e892255e
diff --git a/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-as-needed.patch b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-as-needed.patch
new file mode 100644
index 000000000000..a489f5337879
--- /dev/null
+++ b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-as-needed.patch
@@ -0,0 +1,11 @@
+--- Makefile.in	2009-04-27 05:33:50.000000000 +0200
++++ Makefile.in.new	2009-10-11 15:22:23.458985416 +0200
+@@ -44,7 +44,7 @@
+ cygwin_procstat.cpp cygwin_rendercpupagestat.cpp \
+ lib/routines.cpp lib/timeRoutines.cpp lib/prettyPrint.cpp \
+ Makefile
+-	$(CXX) $(CFLAGS) $(LDFLAGS) procinfo.cpp -o $@
++	$(CXX) $(CFLAGS) $(LDFLAGS) procinfo.cpp -o $@ $(LIBS)
+ 
+ #procinfo.o: procinfo.cpp procinfo.h
+ #	$(XX) $(CFLAGS) procinfo.cpp -o procinfo.o
diff --git a/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-man.patch b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-man.patch
new file mode 100644
index 000000000000..ce818fcd3e77
--- /dev/null
+++ b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-man.patch
@@ -0,0 +1,11 @@
+--- procinfo-ng-2.0.217/procinfo.8.orig	2009-01-11 11:21:23.000000000 +0100
++++ procinfo-ng-2.0.217/procinfo.8	2009-01-11 11:21:48.000000000 +0100
+@@ -6,7 +6,7 @@
+ .SH SYNOPSIS
+ .B procinfo
+ [
+-.IR \-fdDSbrhv
++.IR \-dDSbrhv
+ ] [
+ .IR \-n N
+ ]
diff --git a/app-admin/procinfo-ng/metadata.xml b/app-admin/procinfo-ng/metadata.xml
new file mode 100644
index 000000000000..91691a0324a8
--- /dev/null
+++ b/app-admin/procinfo-ng/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">procinfo-ng</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
new file mode 100644
index 000000000000..791cfbd4c7fb
--- /dev/null
+++ b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Completely rewrite of the old system monitoring app procinfo"
+HOMEPAGE="https://sourceforge.net/projects/procinfo-ng/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+IUSE=""
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	!app-admin/procinfo"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-man.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	# removing -s flag as portage does the stripping part and add support
+	# for custom LDFLAGS. Plus correct for --as-needed
+	sed \
+		-e 's:-s -lncurses:${LDFLAGS}:' \
+		-i configure.in || die "sed configure.in failed"
+	eautoreconf
+}
+
+src_compile() {
+	emake LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)"
+}
diff --git a/app-admin/profile-cleaner-2.36 b/app-admin/profile-cleaner-2.36
deleted file mode 100644
index 4a2bd47b6252..000000000000
--- a/app-admin/profile-cleaner-2.36
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Vacuum and reindex browser sqlite databases
-EAPI=6
-HOMEPAGE=https://github.com/graysky2/profile-cleaner
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=app-shells/bash sys-devel/bc sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-process/parallel dev-db/sqlite:3
-SLOT=0
-SRC_URI=https://github.com/graysky2/profile-cleaner/archive/v2.36.tar.gz -> profile-cleaner-2.36.tar.gz
-_md5_=c5b1d7a84666225564678d0957440d05
diff --git a/app-admin/profile-cleaner/Manifest b/app-admin/profile-cleaner/Manifest
new file mode 100644
index 000000000000..ed36bbc1a72d
--- /dev/null
+++ b/app-admin/profile-cleaner/Manifest
@@ -0,0 +1,3 @@
+DIST profile-cleaner-2.36.tar.gz 7757 BLAKE2B 32f7b690763f83771048b00dc102da1ca5cfc3d29c7bb3d36eff14db53bf7692b8ac4867d55e7313317635a09c59a959291835f4b614c042227e976b23043b78 SHA512 c56e92f816276d55e298dfac529e8195cf05f1a441aae40d25665d1db6d03b5ca741b99136e9f6fc93eabaa56dfcd8f2856a2dd5c37728c72befc756ff28ac75
+EBUILD profile-cleaner-2.36.ebuild 501 BLAKE2B afcfbe09e3dfbd7bb960b05cf57eb7194c742ffb01e41fc8eddfc1ff77e49919421e78793455b4953980fb818c7d57a76189fa4baf20fbf28a2d9a9a7a05d84e SHA512 de4e1b361be03eaa01f7b6512269d957f7e5789ad4ab3ce6ec957e886c8cd5614de4f2902a9bc41cf166e7294f44c141ee457490814429846b088afcf0980287
+MISC metadata.xml 518 BLAKE2B f74e9840fabe821487af53f3c3f0a9a502afb245fb40ee147758848dfbaede2bc5b18fbef8bcbf850f16b70599dac31e52b486c81b40509b0d780177625d4c74 SHA512 7d1f584b8e989fd94abaea851c83c7734eb654f1d98e950724a6f72b50b8a1c7e0167ba99067dcfdec32a9ca5036bbdde7c46256214bf395de70a4d6b79f974f
diff --git a/app-admin/profile-cleaner/metadata.xml b/app-admin/profile-cleaner/metadata.xml
new file mode 100644
index 000000000000..739dde6ad582
--- /dev/null
+++ b/app-admin/profile-cleaner/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>fdsfgs@krutt.org</email>
+		<name>soredake</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/graysky2/profile-cleaner/issues</bugs-to>
+		<remote-id type="github">graysky2/profile-cleaner</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/profile-cleaner/profile-cleaner-2.36.ebuild b/app-admin/profile-cleaner/profile-cleaner-2.36.ebuild
new file mode 100644
index 000000000000..3095e8c606e6
--- /dev/null
+++ b/app-admin/profile-cleaner/profile-cleaner-2.36.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Vacuum and reindex browser sqlite databases"
+HOMEPAGE="https://github.com/graysky2/profile-cleaner"
+SRC_URI="https://github.com/graysky2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-shells/bash
+	sys-devel/bc
+	sys-apps/coreutils
+	sys-apps/findutils
+	sys-apps/grep
+	sys-apps/sed
+	sys-process/parallel
+	dev-db/sqlite:3"
diff --git a/app-admin/ps_mem-3.12 b/app-admin/ps_mem-3.12
deleted file mode 100644
index f8281cb97cea..000000000000
--- a/app-admin/ps_mem-3.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A utility to report core memory usage per program
-EAPI=6
-HOMEPAGE=https://github.com/pixelb/ps_mem
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/pixelb/ps_mem/archive/v3.12.tar.gz -> ps_mem-3.12.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=098ab9657e2fac614f78e7ec3b2fe68a
diff --git a/app-admin/ps_mem-3.12-r1 b/app-admin/ps_mem-3.12-r1
deleted file mode 100644
index 1f2799df01a8..000000000000
--- a/app-admin/ps_mem-3.12-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-DESCRIPTION=A utility to report core memory usage per program
-EAPI=6
-HOMEPAGE=https://github.com/pixelb/ps_mem
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/pixelb/ps_mem/archive/v3.12.tar.gz -> ps_mem-3.12.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b3456933e54e067c32e967e8e1ef1542
diff --git a/app-admin/ps_mem/Manifest b/app-admin/ps_mem/Manifest
new file mode 100644
index 000000000000..b878da859c8e
--- /dev/null
+++ b/app-admin/ps_mem/Manifest
@@ -0,0 +1,4 @@
+DIST ps_mem-3.12.tar.gz 18074 BLAKE2B 98861120b09b3a25b29b5b461d50d8e6a8a684fe76685a7b032f769896dba4b8fa6cd1b1de2644488bf8b4568b960f2949eac2a72a6225cd19682a9c08803baa SHA512 aeba7573b651ffbe6bb263ecc257716cc91219aac232694a628b0e5b1e45235149d7dcf68f6b9ee669bd005adf68693cd09f32e378934690270b0b72c38abea4
+EBUILD ps_mem-3.12-r1.ebuild 665 BLAKE2B b63af8599f99ab56b3cfdb89e97d49bb12369ba4fd5178df3ba89ab7060748333c13da80c7657833fec7808aa2e8d78aeffc60ea81d3bf98a706437bd2f4354a SHA512 1b404e315f03428488a01489dec513e20bc5458eee9b05ac07716ff2137bf0292ee473a8af51af263bbdebfea5a9933361e1d601849154bcfda159c2b568718e
+EBUILD ps_mem-3.12.ebuild 658 BLAKE2B b21e5495cc82e6b2ff1033c3013e94a08b05e662dd0e9942a07ab4987b73655e4f68d375e873986f0376fce51a001cc8e1388775a6188ab4667be888e6096dd3 SHA512 8b7f19f11032a6152fcdd57fca9b1a46c4fa320364a2cfacbc9c3e08068cb7a1995ecc720c1e4e3863c464ec093a6385fdb7f93117e2b93a00ba0fbcef9be14f
+MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-admin/ps_mem/metadata.xml b/app-admin/ps_mem/metadata.xml
new file mode 100644
index 000000000000..435234188908
--- /dev/null
+++ b/app-admin/ps_mem/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>bkohler@gentoo.org</email>
+	<name>Ben Kohler</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/ps_mem/ps_mem-3.12-r1.ebuild b/app-admin/ps_mem/ps_mem-3.12-r1.ebuild
new file mode 100644
index 000000000000..82174961a3b7
--- /dev/null
+++ b/app-admin/ps_mem/ps_mem-3.12-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1
+
+DESCRIPTION="A utility to report core memory usage per program"
+HOMEPAGE="https://github.com/pixelb/${PN}"
+SRC_URI="https://github.com/pixelb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install() {
+	distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman ${PN}.1
+}
diff --git a/app-admin/ps_mem/ps_mem-3.12.ebuild b/app-admin/ps_mem/ps_mem-3.12.ebuild
new file mode 100644
index 000000000000..a60e22bad8fc
--- /dev/null
+++ b/app-admin/ps_mem/ps_mem-3.12.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="A utility to report core memory usage per program"
+HOMEPAGE="https://github.com/pixelb/${PN}"
+SRC_URI="https://github.com/pixelb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${PYTHON_DEPS}"
+
+python_install() {
+	distutils-r1_python_install --install-scripts="/usr/sbin"
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman ${PN}.1
+}
diff --git a/app-admin/psmon-1.39-r1 b/app-admin/psmon-1.39-r1
deleted file mode 100644
index ffebf4626bbe..000000000000
--- a/app-admin/psmon-1.39-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=dev-lang/perl-5.6.0 dev-perl/Config-General dev-perl/Proc-ProcessTable dev-perl/Unix-Syslog virtual/perl-Getopt-Long dev-lang/perl[-build(-)]
-DESCRIPTION=Monitors process table to slay aggressive, and spawn dead, processes
-EAPI=5
-HOMEPAGE=http://www.psmon.com/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl[-build(-)]
-SLOT=0
-SRC_URI=http://www.psmon.com/psmon-1.39.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	4b65c2afee485a204b0b22518141ae47	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4703bc263d86b5a65a7051dcfc997f57
diff --git a/app-admin/psmon/Manifest b/app-admin/psmon/Manifest
new file mode 100644
index 000000000000..7631cc7649ab
--- /dev/null
+++ b/app-admin/psmon/Manifest
@@ -0,0 +1,3 @@
+DIST psmon-1.39.tar.gz 57475 BLAKE2B 37998dabcfe5b329f74b7f6996fe3e8a350cc756a064e98549a38ade997115c3f03c57bf8b145c732edb021fe615be2a1210419f8b77666ad5caa79b74ccdc75 SHA512 08992023af29433da0fe8c48b610df3008b9ea14e197b52bc9582895275fc65cd0faca7e29f36356344219d6a61ef9350713aaa60377ce7ae49a882044b91e32
+EBUILD psmon-1.39-r1.ebuild 695 BLAKE2B 0dd013438894ea6a1fd4aa6851c59c611dffe6aef97aba66c36ebefd45a1ac13898d05e0f0755d975af79a3a3ed98e669b44f75c088edf5f91c79b04ff0a0bea SHA512 54a8b473acd59f2f75851ff5e67d6113632f9d11f5f61cc0d1939d6e800a14ec1781e34dbb287c938cee00057161d9f44f99d009e598d5d664bb044778f98cc0
+MISC metadata.xml 375 BLAKE2B 74e5f745053591b49f00e4040f0e06afd9133c3d26fdff1047e591f06babb50e1af8616c7416de01793ff8294986b56937ae9c3fa244e7493f0a3e926ccd34ba SHA512 450413515ed27e78edeec89a59c27cb83efb6c5be58cf5321d1212ca191c5d87c6982e7d8cfb8f28a79383c529ecbaa7b02219d695dc5712b5566afada6fcf08
diff --git a/app-admin/psmon/metadata.xml b/app-admin/psmon/metadata.xml
new file mode 100644
index 000000000000..fb1a2d3c2106
--- /dev/null
+++ b/app-admin/psmon/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		A perl script that monitors processes to make sure they are running as
+		the user has intended. Will respawn dead processes and/or kill illegal
+		processes.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/psmon/psmon-1.39-r1.ebuild b/app-admin/psmon/psmon-1.39-r1.ebuild
new file mode 100644
index 000000000000..c1f5927344ec
--- /dev/null
+++ b/app-admin/psmon/psmon-1.39-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit perl-app
+
+DESCRIPTION="Monitors process table to slay aggressive, and spawn dead, processes"
+HOMEPAGE="http://www.psmon.com/"
+SRC_URI="http://www.psmon.com/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.6.0
+	dev-perl/Config-General
+	dev-perl/Proc-ProcessTable
+	dev-perl/Unix-Syslog
+	virtual/perl-Getopt-Long"
+
+src_install() {
+	perl-module_src_install
+	insinto /etc
+	doins etc/psmon.conf
+}
+
+pkg_postinst() {
+	einfo "NOTICE: Please modify at least the NotifyEmail parameter found in"
+	einfo "the /etc/psmon.conf file"
+}
diff --git a/app-admin/puppet-4.10.11 b/app-admin/puppet-4.10.11
deleted file mode 100644
index a11021774f77..000000000000
--- a/app-admin/puppet-4.10.11
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A system automation and configuration management software.
-EAPI=6
-HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.11.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=433f7645d88c46b8ee153bbdb15b3b63
diff --git a/app-admin/puppet-4.10.12 b/app-admin/puppet-4.10.12
deleted file mode 100644
index 0d746f298dfb..000000000000
--- a/app-admin/puppet-4.10.12
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A system automation and configuration management software.
-EAPI=6
-HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.12.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=a0d22866b9b56311adef5dde7603cc5e
diff --git a/app-admin/puppet-5.5.1 b/app-admin/puppet-5.5.1
deleted file mode 100644
index a14af59c82be..000000000000
--- a/app-admin/puppet-5.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A system automation and configuration management software.
-EAPI=6
-HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.5.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c75e31a164eeeb52a162cecf7266581f
diff --git a/app-admin/puppet-5.5.2 b/app-admin/puppet-5.5.2
deleted file mode 100644
index f690b2d56264..000000000000
--- a/app-admin/puppet-5.5.2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) test? ( dev-ruby/mocha[ruby_targets_ruby25] dev-ruby/rack[ruby_targets_ruby25] dev-ruby/rspec-its[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A system automation and configuration management software.
-EAPI=6
-HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.5.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a999ff5a4fe9ee46f92c727a51b3214d
diff --git a/app-admin/puppet-agent-1.10.12 b/app-admin/puppet-agent-1.10.12
deleted file mode 100644
index f0ddc0efe0ec..000000000000
--- a/app-admin/puppet-agent-1.10.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup unpack
-DEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what virtual/pkgconfig
-DESCRIPTION=general puppet client utils along with mcollective hiera and facter
-EAPI=6
-HOMEPAGE=https://puppetlabs.com/
-IUSE=experimental puppetdb selinux
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what app-portage/eix sys-apps/dmidecode sys-libs/glibc >=sys-libs/readline-6.0 <sys-libs/readline-7.0 selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/PC1/p/puppet-agent/puppet-agent_1.10.12-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/PC1/p/puppet-agent/puppet-agent_1.10.12-1stretch_i386.deb )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7d4837a268069ee9fe0b662b3ae611b2
diff --git a/app-admin/puppet-agent-5.5.1 b/app-admin/puppet-agent-5.5.1
deleted file mode 100644
index 19ceb8aa6c81..000000000000
--- a/app-admin/puppet-agent-5.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup unpack
-DEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what virtual/pkgconfig
-DESCRIPTION=general puppet client utils along with mcollective hiera and facter
-EAPI=6
-HOMEPAGE=https://puppetlabs.com/
-IUSE=puppetdb selinux
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what app-portage/eix sys-apps/dmidecode sys-libs/glibc sys-libs/readline:0/7 sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet5/p/puppet-agent/puppet-agent_5.5.1-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet5/p/puppet-agent/puppet-agent_5.5.1-1stretch_i386.deb )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=07c048384fe5f8ef3d7e5b499c1dd6a6
diff --git a/app-admin/puppet-agent-5.5.3 b/app-admin/puppet-agent-5.5.3
deleted file mode 100644
index 82dddf4c62c6..000000000000
--- a/app-admin/puppet-agent-5.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup unpack
-DEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what virtual/pkgconfig
-DESCRIPTION=general puppet client utils along with mcollective hiera and facter
-EAPI=6
-HOMEPAGE=https://puppetlabs.com/
-IUSE=puppetdb selinux
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what app-portage/eix sys-apps/dmidecode sys-libs/glibc sys-libs/readline:0/7 sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet5/p/puppet-agent/puppet-agent_5.5.3-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet5/p/puppet-agent/puppet-agent_5.5.3-1stretch_i386.deb )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=07c048384fe5f8ef3d7e5b499c1dd6a6
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
new file mode 100644
index 000000000000..b0c982f2fb85
--- /dev/null
+++ b/app-admin/puppet-agent/Manifest
@@ -0,0 +1,16 @@
+AUX 43e2c935252b995134ce353e5e6312cf77aea480.patch 13696 BLAKE2B 5ec41526e04402a38b33d5f106f63810e5295e1f8016fe4e9bc20a83ec36435d0d5d3b75ae6fc4cbede8644176c0fb4692bb17996926f512f8787a6d88f20f1b SHA512 f2f76fe892c8f83a85285b34fc6177db7198af4289e4f3350784a6f08fc50a69e74a5bc714aacae3c8a1fed6a3be930c9f517b354ac49108a4ec185f17bcd513
+AUX mcollective.initd 469 BLAKE2B caf0474a121950d72d6e6edac6ccc2ad12f47e916970cea005a29680078d560ef67b277c1308e3d62435b4aee1d264bc8774bd4e4a6e3047079b35f87c72f6c4 SHA512 f8356e70bdc879f1ca9e8528c0109db890e26e2b843bd454a08350fd3bfeafabfcf30ba6b5d39e0b843e3d063221a220fc8af80f42d2360a73b5f7bd95e6d462
+AUX mcollective.service 390 BLAKE2B 3d032bfbcc0499af0beafae05c008b420f3b598c4906e57a587e9a400f76a9d918d7d7c4c8543e3abd61f68e29e5e1b8a6ecb99e9bbdfaa34aae7b1a54d5c71f SHA512 28fdc1f094d8995c806e2bfbd5b5ba8299603e19d379270be009f69b5ae186abfde65d1b7d0c0213e686f0c1cf944731a22b1ebbef1bb8c12edaf298b6c05901
+AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04e585b47941dbddcf2aab14d83af741e41c6f9e2ab359d6f4004bcd4f9215b34a6ac556882de4c12bb92da8f89b4 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5
+AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
+AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
+DIST puppet-agent_1.10.12-1stretch_amd64.deb 15443166 BLAKE2B 74c8465fd8cc98ca114acdc600c3f259072d64765cdd8308092b7177233d44656f429407520ead2e02494951f57f1c79b5dfe8c76b2dd7bba7c1316426746df8 SHA512 1391530be340ad0439260f7bd3df8ad251ffaa02fc2f358e4ff2189b8c64a0b2d0caab9f84b84b26ebe2176decef2a39d3114f6433ba6eacd962ff45e1e04c43
+DIST puppet-agent_1.10.12-1stretch_i386.deb 16308082 BLAKE2B 6606c15aac51b28e9e8011168563dff9069b6b065f861c01f4fc768064fe266f83211fbc8fefebfe4bdf81c6220b5daa19f66a9214bd1f2ff53a3b1a2e87128a SHA512 fce0a3ac12afcc293fbdf3cc990407b82592228ed8ed609f4b98c17cea35c8e5ff5f47287880601fa80ac2f7fa608dfe00b3594a906d52bc2bd2e04117ccb856
+DIST puppet-agent_5.5.1-1stretch_amd64.deb 17325604 BLAKE2B 1fab815d5d238cb6a05da91a4a9645644915493b2117ff29b8ba258edab18084394c8054f37c5bcbee9bf903dabce5741d7ef4be0a94a0ec8c13ac4b825b8bca SHA512 c4c7ce50cf576a6b12ecee8b9a6c7969512b3625e7ea0f16cc4cd367cebee5271cdaf7cc084fe4d344b42ab6e200664fe7b167acd9cd0da23d2ff3cd9028d6f7
+DIST puppet-agent_5.5.1-1stretch_i386.deb 18063690 BLAKE2B ea7c7068e57da1249c1b1c7232e1af673840b0c8c7e5795574ffcb1861c68683ac9f21f8f4216272130b12a61bb8b324e49d6bf7f0c3d314857fd2591a7ad6ff SHA512 1a64616191a5143b150fe1d145ea786233ab763e87d5fe86bd1b3306fa73bab60d2f3d5c0bb7fcb6fe7c700a47a4c94c72eef1509732b18a5caf0fcd7f060602
+DIST puppet-agent_5.5.3-1stretch_amd64.deb 17272112 BLAKE2B 5e052f837184b1d1dd5965ccb18e3a52dc88ea6ba85c0c3c5222ffe50e32e0a72a6f14274f5dd6c1bd63b3a160affa8a6b3399ac75e27d9cc2c267a1e1c0e89d SHA512 1629b3535b900081676647f64c17e3c0d23df38525d90d5f3993877d0749d18cf55f72fb20c47e20a63d18c2c7ad95cc0f179449c386ce3b8ec8a6d0f40243e7
+DIST puppet-agent_5.5.3-1stretch_i386.deb 18189670 BLAKE2B a8791926a5ce08edad363670ab5269fcef208c3137db4126f33295fd7fdd447620578445eb0a9396e263fed8612981581cef0c5f6d3e51634722c01c79e2c9dc SHA512 83a1f472c4af97a48703ca61a00740fc7806155732bd488d3f9d757f969dca0a19cec014dad0bb5e6d8b5384d32c2d906ad0e8438efeeae5fdd39524cc11f6f8
+EBUILD puppet-agent-1.10.12.ebuild 3479 BLAKE2B 6db65113a8203216068167672257270fefdcad43a897c6b25400be1949beb573b335feca32c268223ab288e340ae2edf53e4fc39a445d1c9bfc5ad37f9c7340a SHA512 1be819f7fb14d2d3aa47d23919feba678445cd605fe31f43b090bfbe3ab9a3ee4db7868553f7cf3a5c85b49d5cca0caa2580e1347ec278df91fe8495df42873c
+EBUILD puppet-agent-5.5.1.ebuild 2481 BLAKE2B 763dc1a03051af2be4472342dcfad9304649f7fde6d83889c93cae0b7b7521d6c28cf17cf8227f553a0a409a705678070b8e83161871f5d116302803868c92d2 SHA512 b1811874ca9c554896a16c8f134a8b4b84217192924f999a5a0c9d72630776c50de5f0ef16be82559e6f97548332a23ca0e68618b64bdc623bc27745c70229a0
+EBUILD puppet-agent-5.5.3.ebuild 2481 BLAKE2B 763dc1a03051af2be4472342dcfad9304649f7fde6d83889c93cae0b7b7521d6c28cf17cf8227f553a0a409a705678070b8e83161871f5d116302803868c92d2 SHA512 b1811874ca9c554896a16c8f134a8b4b84217192924f999a5a0c9d72630776c50de5f0ef16be82559e6f97548332a23ca0e68618b64bdc623bc27745c70229a0
+MISC metadata.xml 502 BLAKE2B 9eaaec32ba54988999831d4d873dff6c525b42ede2da3cc9a5b67359299233f2ffdafa04a949df6aa58d764e36beaf8ce64c053a306f6e055a245b207e8f2aaa SHA512 aedf4322173910c202b105d904e4528c6b6bb949fc05ed95c4a8d9a74133f5c7391ae30d7675bfa36a3f85880c971aff6e4a57ffdcde57b3b63c02dbed083a95
diff --git a/app-admin/puppet-agent/files/43e2c935252b995134ce353e5e6312cf77aea480.patch b/app-admin/puppet-agent/files/43e2c935252b995134ce353e5e6312cf77aea480.patch
new file mode 100644
index 000000000000..619c5dd68cba
--- /dev/null
+++ b/app-admin/puppet-agent/files/43e2c935252b995134ce353e5e6312cf77aea480.patch
@@ -0,0 +1,329 @@
+diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
+index 374667c..12160c6 100644
+--- a/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/provider/package/portage.rb
++++ b/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/provider/package/portage.rb
+@@ -2,14 +2,19 @@
+ require 'fileutils'
+ 
+ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Package do
+-  desc "Provides packaging support for Gentoo's portage system."
++  desc "Provides packaging support for Gentoo's portage system.
+ 
+-  has_features :versionable, :reinstallable
++    This provider supports the `install_options` and `uninstall_options` attributes, which allows command-line
++    flags to be passed to emerge.  These options should be specified as a string (e.g. '--flag'), a hash
++    (e.g. {'--flag' => 'value'}), or an array where each element is either a string or a hash."
++
++  has_features :install_options, :purgeable, :reinstallable, :uninstall_options, :versionable, :virtual_packages
+ 
+   {
+-    :emerge => "/usr/bin/emerge",
+-    :eix => "/usr/bin/eix",
+-    :update_eix => "/usr/bin/eix-update",
++    :emerge => '/usr/bin/emerge',
++    :eix => '/usr/bin/eix',
++    :qatom_bin => '/usr/bin/qatom',
++    :update_eix => '/usr/bin/eix-update',
+   }.each_pair do |name, path|
+     has_command(name, path) do
+       environment :HOME => '/'
+@@ -24,15 +29,18 @@ def self.instances
+     result_format = self.eix_result_format
+     result_fields = self.eix_result_fields
+ 
++    limit = self.eix_limit
+     version_format = self.eix_version_format
+     slot_versions_format = self.eix_slot_versions_format
++    installed_versions_format = self.eix_installed_versions_format
++    installable_versions_format = self.eix_install_versions_format
+     begin
+-      eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
++      eix_file = File.directory?('/var/cache/eix') ? '/var/cache/eix/portage.eix' : '/var/cache/eix'
+       update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
+ 
+       search_output = nil
+-      Puppet::Util.withenv :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format do
+-        search_output = eix *(self.eix_search_arguments + ["--installed"])
++      Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
++        search_output = eix *(self.eix_search_arguments + ['--installed'])
+       end
+ 
+       packages = []
+@@ -57,65 +65,123 @@ def self.instances
+ 
+   def install
+     should = @resource.should(:ensure)
+-    name = package_name
+-    unless should == :present or should == :latest
+-      # We must install a specific version
+-      name = package_atom_with_version(should)
++    cmd = %w{}
++    name = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
++    name = qatom[:pfx] + name if qatom[:pfx]
++    name = name + '-' + qatom[:pv] if qatom[:pv]
++    name = name + '-' + qatom[:pr] if qatom[:pr]
++    name = name + qatom[:slot] if qatom[:slot]
++    cmd << '--update' if [:latest].include?(should)
++    cmd += install_options if @resource[:install_options]
++    cmd << name
++    emerge *cmd
++  end
++
++  def uninstall
++    should = @resource.should(:ensure)
++    cmd = %w{--rage-clean}
++    name = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
++    name = qatom[:pfx] + name if qatom[:pfx]
++    name = name + '-' + qatom[:pv] if qatom[:pv]
++    name = name + '-' + qatom[:pr] if qatom[:pr]
++    name = name + qatom[:slot] if qatom[:slot]
++    cmd += uninstall_options if @resource[:uninstall_options]
++    cmd << name
++    if [:purged].include?(should)
++      Puppet::Util.withenv :CONFIG_PROTECT => "-*" do
++        emerge *cmd
++      end
++    else
++      emerge *cmd
+     end
+-    emerge name
+   end
+ 
+-  # The common package name format.
+-  def package_name
+-    @resource[:category] ? "#{@resource[:category]}/#{@resource[:name]}" : @resource[:name]
++  def reinstall
++    self.install
+   end
+ 
+-  def package_name_without_slot
+-    package_name.sub(self.class.slot_pattern, '')
++  def update
++    self.install
+   end
+ 
+-  def package_slot
+-    if match = package_name.match(self.class.slot_pattern)
+-      match[1]
++  def qatom
++    output_format = self.qatom_output_format
++    result_format = self.qatom_result_format
++    result_fields = self.qatom_result_fields
++    @atom ||= begin
++      search_output = nil
++      package_info = {}
++      # do the search
++      search_output = qatom_bin *([@resource[:name], '--format', output_format])
++      # verify if the search found anything
++      match = result_format.match(search_output)
++      if match
++        result_fields.zip(match.captures) do |field, value|
++          # some fields can be empty or (null) (if we are not passed a category in the package name for instance)
++          if value == '(null)'
++            package_info[field] = nil
++          elsif !value or value.empty?
++            package_info[field] = nil
++          else
++            package_info[field] = value
++          end
++        end
++      end
++      @atom = package_info
++    rescue Puppet::ExecutionFailure => detail
++      raise Puppet::Error.new(detail)
+     end
+   end
+ 
+-  def package_atom_with_version(version)
+-    if slot = package_slot
+-      "=#{package_name_without_slot}-#{version}:#{package_slot}"
+-    else
+-      "=#{package_name}-#{version}"
+-    end
++  def qatom_output_format
++    '"[%{CATEGORY}] [%{PN}] [%{PV}] [%[PR]] [%[SLOT]] [%[pfx]] [%[sfx]]"'
+   end
+ 
+-  def uninstall
+-    emerge "--unmerge", package_name
++  def qatom_result_format
++    /^\"\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\](.*)\"$/
+   end
+ 
+-  def reinstall
+-    self.install
++  def qatom_result_fields
++    [:category, :pn, :pv, :pr, :slot, :pfx, :sfx]
+   end
+ 
+-  def update
+-    self.install
++  def self.get_sets
++    @sets ||= begin
++      @sets = emerge *(['--list-sets'])
++    end
+   end
+ 
+   def query
++    limit = self.class.eix_limit
+     result_format = self.class.eix_result_format
+     result_fields = self.class.eix_result_fields
+ 
+     version_format = self.class.eix_version_format
+     slot_versions_format = self.class.eix_slot_versions_format
+-    search_field = package_name_without_slot.count('/') > 0 ? "--category-name" : "--name"
+-    search_value = package_name_without_slot
++    installed_versions_format = self.class.eix_installed_versions_format
++    installable_versions_format = self.class.eix_install_versions_format
++    search_field = qatom[:category] ? '--category-name' : '--name'
++    search_value = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
++
++    @eix_result ||= begin
++      # package sets
++      package_sets = []
++      self.class.get_sets.each_line do |package_set|
++        package_sets << package_set.to_s.strip
++      end
+ 
+-    begin
+-      eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
++      if @resource[:name].match(/^@/)
++         if package_sets.include?(@resource[:name][1..-1].to_s)
++           return({:name => "#{@resource[:name]}", :ensure => '9999', :version_available => nil, :installed_versions => nil, :installable_versions => "9999,"})
++        end
++      end
++
++      eix_file = File.directory?('/var/cache/eix') ? '/var/cache/eix/portage.eix' : '/var/cache/eix'
+       update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
+ 
+       search_output = nil
+-      Puppet::Util.withenv :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format do
+-        search_output = eix *(self.class.eix_search_arguments + ["--exact",search_field,search_value])
++      Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
++        search_output = eix *(self.class.eix_search_arguments + ['--exact',search_field,search_value])
+       end
+ 
+       packages = []
+@@ -127,10 +193,19 @@ def query
+           result_fields.zip(match.captures) do |field, value|
+             package[field] = value unless !value or value.empty?
+           end
+-          if package_slot
+-            package[:version_available] = eix_get_version_for_slot(package[:slot_versions_available], package_slot)
+-            package[:ensure] = eix_get_version_for_slot(package[:installed_slots], package_slot)
++          # dev-lang python [3.4.5] [3.5.2] [2.7.12:2.7,3.4.5:3.4] [2.7.12:2.7,3.4.5:3.4,3.5.2:3.5] https://www.python.org/ An interpreted, interactive, object-oriented programming language
++          # version_available is what we CAN install / update to
++          # ensure is what is currently installed
++          # This DOES NOT choose to install/upgrade or not, just provides current info
++          # prefer checking versions to slots as versions are finer grained
++          if qatom[:pv]
++            package[:version_available] = eix_get_version_for_versions(package[:installable_versions], qatom[:pv])
++            package[:ensure] = eix_get_version_for_versions(package[:installed_versions], qatom[:pv])
++          elsif qatom[:slot]
++            package[:version_available] = eix_get_version_for_slot(package[:slot_versions_available], qatom[:slot])
++            package[:ensure] = eix_get_version_for_slot(package[:installed_slots], qatom[:slot])
+           end
++
+           package[:ensure] = package[:ensure] ? package[:ensure] : :absent
+           packages << package
+         end
+@@ -138,10 +213,9 @@ def query
+ 
+       case packages.size
+         when 0
+-          not_found_value = "#{@resource[:category] ? @resource[:category] : "<unspecified category>"}/#{@resource[:name]}"
+-          raise Puppet::Error.new("No package found with the specified name [#{not_found_value}]")
++          raise Puppet::Error.new("No package found with the specified name [#{@resource[:name]}]")
+         when 1
+-          return packages[0]
++          @eix_result = packages[0]
+         else
+           raise Puppet::Error.new("More than one package with the specified name [#{search_value}], please use the category parameter to disambiguate")
+       end
+@@ -155,39 +229,73 @@ def latest
+   end
+ 
+   private
++  def eix_get_version_for_versions(versions, target)
++    # [2.7.10-r1,2.7.12,3.4.3-r1,3.4.5,3.5.2] 3.5.2
++    return nil if versions.nil?
++    versions = versions.split(',')
++    # [2.7.10-r1 2.7.12 3.4.3-r1 3.4.5 3.5.2]
++    versions.find { |version| version == target }
++    # 3.5.2
++  end
++
++  private
+   def eix_get_version_for_slot(versions_and_slots, slot)
++    # [2.7.12:2.7 3.4.5:3.4 3.5.2:3.5] 3.5
+     return nil if versions_and_slots.nil?
+-    versions_and_slots = versions_and_slots.split(",")
+-    versions_and_slots.map! { |version_and_slot| version_and_slot.split(":") }
+-    version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot }
++    versions_and_slots = versions_and_slots.split(',')
++    # [2.7.12:2.7 3.4.5:3.4 3.5.2:3.5]
++    versions_and_slots.map! { |version_and_slot| version_and_slot.split(':') }
++    # [2.7.12: 2.7
++    #  3.4.5:  3.4
++    #  3.5.2:  3.5]
++    version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot[1..-1] }
++    # [3.5.2:  3.5]
+     version_for_slot.first if version_for_slot
+-  end
+-
+-  def self.slot_pattern
+-    /:([\w+.\/*=-]+)$/
++    # 3.5.2
+   end
+ 
+   def self.eix_search_format
+-    "'<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] [<installedversions:LASTSLOTVERSIONS>] [<bestslotversions:LASTSLOTVERSIONS>] <homepage> <description>\n'"
++    "'<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] [<installedversions:LASTSLOTVERSIONS>] [<installedversions:INSTALLEDVERSIONS>] [<availableversions:STABLEVERSIONS>] [<bestslotversions:LASTSLOTVERSIONS>] <homepage> <description>\n'"
+   end
+ 
+   def self.eix_result_format
+-    /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+(\S+)\s+(.*)$/
++    /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+(\S+)\s+(.*)$/
+   end
+ 
+   def self.eix_result_fields
+-    [:category, :name, :ensure, :version_available, :installed_slots, :slot_versions_available, :vendor, :description]
++    # ensure:[3.4.5], version_available:[3.5.2], installed_slots:[2.7.12:2.7,3.4.5:3.4], installable_versions:[2.7.10-r1,2.7.12,3.4.3-r1,3.4.5,3.5.2] slot_versions_available:[2.7.12:2.7,3.4.5:3.4,3.5.2:3.5]
++    [:category, :name, :ensure, :version_available, :installed_slots, :installed_versions, :installable_versions, :slot_versions_available, :vendor, :description]
+   end
+ 
+   def self.eix_version_format
+-    "{last}<version>{}"
++    '{last}<version>{}'
+   end
+ 
+   def self.eix_slot_versions_format
+-    "{!first},{}<version>:<slot>"
++    '{!first},{}<version>:<slot>'
++  end
++
++  def self.eix_installed_versions_format
++    '{!first},{}<version>'
++  end
++
++  def self.eix_install_versions_format
++    '{!first}{!last},{}{}{isstable}<version>{}'
++  end
++
++  def self.eix_limit
++    '0'
+   end
+ 
+   def self.eix_search_arguments
+-    ["--nocolor", "--pure-packages", "--format",self.eix_search_format]
++    ['--nocolor', '--pure-packages', '--format', self.eix_search_format]
++  end
++
++  def install_options
++    join_options(@resource[:install_options])
++  end
++
++  def uninstall_options
++    join_options(@resource[:uninstall_options])
+   end
+ end
diff --git a/app-admin/puppet-agent/files/mcollective.initd b/app-admin/puppet-agent/files/mcollective.initd
new file mode 100644
index 000000000000..6500cd878815
--- /dev/null
+++ b/app-admin/puppet-agent/files/mcollective.initd
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+MCOLLECTIVE_PID_DIR="${MCOLLECTIVE_PID_DIR:-/var/run/puppetlabs}"
+
+command="/usr/sbin/mcollectived"
+pidfile="${MCOLLECTIVE_PID_DIR}/mcollectived.pid"
+
+command_args="--pidfile ${pidfile} --config=/etc/puppetlabs/mcollective/server.cfg --daemonize"
+
+depend() {
+    need net
+}
+
+start_pre() {
+    checkpath --directory "${MCOLLECTIVE_PID_DIR}"
+}
diff --git a/app-admin/puppet-agent/files/mcollective.service b/app-admin/puppet-agent/files/mcollective.service
new file mode 100644
index 000000000000..9a6fdefb8ca8
--- /dev/null
+++ b/app-admin/puppet-agent/files/mcollective.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=The Marionette Collective
+After=network.target
+
+[Service]
+Type=forking
+StandardOutput=syslog
+StandardError=syslog
+ExecStart=/usr/sbin/mcollectived --config=/etc/puppetlabs/mcollective/server.cfg --pidfile=/var/run/puppetlabs/mcollective.pid --daemonize
+ExecReload=/bin/kill -USR1 $MAINPID
+PIDFile=/var/run/puppetlabs/mcollective.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/puppet-agent/files/puppet-agent.conf.tmpfilesd b/app-admin/puppet-agent/files/puppet-agent.conf.tmpfilesd
new file mode 100644
index 000000000000..42d082111940
--- /dev/null
+++ b/app-admin/puppet-agent/files/puppet-agent.conf.tmpfilesd
@@ -0,0 +1 @@
+d /var/run/puppetlabs 0755 root root -
diff --git a/app-admin/puppet-agent/files/puppet.initd b/app-admin/puppet-agent/files/puppet.initd
new file mode 100644
index 000000000000..1c366bcf9641
--- /dev/null
+++ b/app-admin/puppet-agent/files/puppet.initd
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}"
+
+pidfile="${PUPPET_PID_DIR}/puppet.pid"
+PUPPET_LOG_DIR="/var/log/puppetlabs/puppet"
+
+command="/usr/bin/puppet"
+extra_started_commands="reload"
+
+command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPET_EXTRA_OPTS}"
+
+depend() {
+	need localmount
+	use dns logger puppetserver netmount nfsmount
+}
+
+start_pre() {
+	checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
+	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+}
+
+reload() {
+	ebegin "Reloading $RC_SVCNAME"
+  start-stop-daemon --signal HUP --pidfile "${pidfile}"
+  eend $?
+}
diff --git a/app-admin/puppet-agent/files/puppet.service b/app-admin/puppet-agent/files/puppet.service
new file mode 100644
index 000000000000..61b03134b331
--- /dev/null
+++ b/app-admin/puppet-agent/files/puppet.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Puppet agent
+Wants=basic.target
+After=basic.target network.target
+
+[Service]
+EnvironmentFile=-/etc/sysconfig/puppetagent
+EnvironmentFile=-/etc/sysconfig/puppet
+EnvironmentFile=-/etc/default/puppet
+ExecStart=/opt/puppetlabs/puppet/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/puppet-agent/metadata.xml b/app-admin/puppet-agent/metadata.xml
new file mode 100644
index 000000000000..423c18e429e6
--- /dev/null
+++ b/app-admin/puppet-agent/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<use>
+		<flag name="puppetdb">Adds puppetdb support</flag>
+		<flag name="experimental">Add patches for things in testing</flag>
+	</use>
+	<longdescription lang="en">
+		Collection of puppet utils, clients and batteries included.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild b/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild
new file mode 100644
index 000000000000..22bc1d19c4ac
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/stretch/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="experimental puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/mcollective
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/glibc
+	>=sys-libs/readline-6.0
+	<sys-libs/readline-7.0
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+	/opt/puppetlabs/puppet
+	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/engines/*
+	/opt/puppetlabs/puppet/lib/virt-what/*
+	/opt/puppetlabs/puppet/lib/*
+	/opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_prepare() {
+	if use experimental; then
+		epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
+	fi
+	eapply_user
+}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/mcollective
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	newinitd "${FILESDIR}/mcollective.initd" mcollective
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/mcollective.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+	dosym ../../opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild
new file mode 100644
index 000000000000..784b06891e1d
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/mcollective
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/glibc
+	sys-libs/readline:0/7
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/mcollective
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	newinitd "${FILESDIR}/mcollective.initd" mcollective
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/mcollective.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+}
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.3.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.3.ebuild
new file mode 100644
index 000000000000..784b06891e1d
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-5.5.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/mcollective
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/glibc
+	sys-libs/readline:0/7
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/mcollective
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	newinitd "${FILESDIR}/mcollective.initd" mcollective
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/mcollective.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+}
diff --git a/app-admin/puppet-lint-2.3.3 b/app-admin/puppet-lint-2.3.3
deleted file mode 100644
index f2d28aada8b8..000000000000
--- a/app-admin/puppet-lint-2.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby24] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby24] dev-ruby/rspec-json_expectations[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A linter for puppet DSL
-EAPI=6
-HOMEPAGE=http://puppet-lint.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/puppet-lint-2.3.3.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=64cf3c5c33759c629e42dd9f96c45be2
diff --git a/app-admin/puppet-lint-2.3.5 b/app-admin/puppet-lint-2.3.5
deleted file mode 100644
index d5ca1fd6692f..000000000000
--- a/app-admin/puppet-lint-2.3.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby24] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby24] dev-ruby/rspec-json_expectations[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby25] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby25] dev-ruby/rspec-json_expectations[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A linter for puppet DSL
-EAPI=6
-HOMEPAGE=http://puppet-lint.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/puppet-lint-2.3.5.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f88d73e0075db46ef95095ce73c027bf
diff --git a/app-admin/puppet-lint-2.3.6 b/app-admin/puppet-lint-2.3.6
deleted file mode 100644
index ce7c12ee454f..000000000000
--- a/app-admin/puppet-lint-2.3.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby24] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby24] dev-ruby/rspec-json_expectations[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby25] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby25] dev-ruby/rspec-json_expectations[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A linter for puppet DSL
-EAPI=6
-HOMEPAGE=http://puppet-lint.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/puppet-lint-2.3.6.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f88d73e0075db46ef95095ce73c027bf
diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
new file mode 100644
index 000000000000..f7f4eaa0ebd6
--- /dev/null
+++ b/app-admin/puppet-lint/Manifest
@@ -0,0 +1,7 @@
+DIST puppet-lint-2.3.3.gem 84992 BLAKE2B 57b6d6332b7d26daf193ba983ff1e5d560cf4f902f1b476de3b1f7254755851397685d7b435dd7365f81e1427d91ca47ffa889a9d87a14e1c4720e44aa2b7996 SHA512 9203e8d29cb4a5c5abf8279598599db4a9063d33d7b7d6c76f8ebf09c3ba539f6035083b5438bae2b0fda1d16880ffcb69a2776ebce7f54bc1a1430c2ceb0d68
+DIST puppet-lint-2.3.5.gem 86528 BLAKE2B 7455c729cb0512cb26838439c854c70d2581f2102594ac60d76a34f9839b0bb7dbab65beb87369419dc0e66583bfac1ad9f22d65ee3ee9bf35aa3c37e8f0d1b9 SHA512 5e1978c5438869c12c2151e76fe6cea12c447d9f59f1fbbc90fb80e61c7ff9c220be85f70cf95dec2380cd35205ffec0473cc7eda0db21b94a30b533d4214707
+DIST puppet-lint-2.3.6.gem 87552 BLAKE2B 0a2f4b9c2ef76c06bc4fb6eb0f737af406bf3949e7c9001685c6522714b550c0f2c5680d5d39f5d3994496a497664e912eadc44bdb7aa4c27635d23b36a90776 SHA512 d162307e66bb5f1dd923f2f9fab55de7b4c5fad6264d7a1bae8df20bd45c5a786b66d9f5b3bd235230fea959c67242462e711212f65807040048f4c0be7122b9
+EBUILD puppet-lint-2.3.3.ebuild 620 BLAKE2B 8f3a4952c092b4ed4bc1a0fdb400a170faf7aa5f3dcb6a94a38a36dfd3c493c6f8c5fc2bfbc2f15dedf84fab404bcfa70124b7cefb68c845aea2cf222153e180 SHA512 a4cb6b8dedfc02d929c7b78bbba4eab2099cf5b3d81628f994c1e5389c76ac52171e376aa9bd470facd5d26b82f4d41cbd7c04d81af0c393bd1fa543f07dc736
+EBUILD puppet-lint-2.3.5.ebuild 620 BLAKE2B 399b76cf047bc8fb99c005d1be3835ad189365d72da45d27bd8ebe47ee4022d7aa9b0f2ac31948214dedf1cf608971716bcf0425a593801a2538bc196fc5304b SHA512 57c3880b02b0febe9c94da09e7e7710730e75f4fb4b92e674c86dbcb5bd0b1864d7df79f032b634063b94fdf46a28d79d9b556c2605731cb91f0ca9571c078b2
+EBUILD puppet-lint-2.3.6.ebuild 620 BLAKE2B 399b76cf047bc8fb99c005d1be3835ad189365d72da45d27bd8ebe47ee4022d7aa9b0f2ac31948214dedf1cf608971716bcf0425a593801a2538bc196fc5304b SHA512 57c3880b02b0febe9c94da09e7e7710730e75f4fb4b92e674c86dbcb5bd0b1864d7df79f032b634063b94fdf46a28d79d9b556c2605731cb91f0ca9571c078b2
+MISC metadata.xml 453 BLAKE2B 4fb00983f98c8c178fa1dc667f966b0f1fd54861ef71e37211fb46edceb8f91c15d55add637a50eda53ccaff8a1d3a6dcbdd02afe2ae32cf0f69797427897d6a SHA512 bd9238c56ddcdcb124df5d7530343756b865d2f279b719fb0ce7bf4e37565709194cb7f564811be6376fd4d3b61403d76eb9542aac3a267c2eb08f1bade21524
diff --git a/app-admin/puppet-lint/metadata.xml b/app-admin/puppet-lint/metadata.xml
new file mode 100644
index 000000000000..78dad76cdc2f
--- /dev/null
+++ b/app-admin/puppet-lint/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sysadmin@gentoo.org</email>
+	<name>Gentoo Sysadmin Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
+<longdescription>Tim Sharpe's Puppet Linter. Enforces puppetlabs style.</longdescription>
+</pkgmetadata>
diff --git a/app-admin/puppet-lint/puppet-lint-2.3.3.ebuild b/app-admin/puppet-lint/puppet-lint-2.3.3.ebuild
new file mode 100644
index 000000000000..e672004b0fd5
--- /dev/null
+++ b/app-admin/puppet-lint/puppet-lint-2.3.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit eutils ruby-fakegem
+
+DESCRIPTION="A linter for puppet DSL"
+HOMEPAGE="http://puppet-lint.com/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec-its:1
+	dev-ruby/rspec-collection_matchers:1
+	dev-ruby/rspec-json_expectations )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/app-admin/puppet-lint/puppet-lint-2.3.5.ebuild b/app-admin/puppet-lint/puppet-lint-2.3.5.ebuild
new file mode 100644
index 000000000000..c86bd234ccc4
--- /dev/null
+++ b/app-admin/puppet-lint/puppet-lint-2.3.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit eutils ruby-fakegem
+
+DESCRIPTION="A linter for puppet DSL"
+HOMEPAGE="http://puppet-lint.com/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec-its:1
+	dev-ruby/rspec-collection_matchers:1
+	dev-ruby/rspec-json_expectations )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/app-admin/puppet-lint/puppet-lint-2.3.6.ebuild b/app-admin/puppet-lint/puppet-lint-2.3.6.ebuild
new file mode 100644
index 000000000000..c86bd234ccc4
--- /dev/null
+++ b/app-admin/puppet-lint/puppet-lint-2.3.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit eutils ruby-fakegem
+
+DESCRIPTION="A linter for puppet DSL"
+HOMEPAGE="http://puppet-lint.com/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec-its:1
+	dev-ruby/rspec-collection_matchers:1
+	dev-ruby/rspec-json_expectations )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
new file mode 100644
index 000000000000..b71c56b88173
--- /dev/null
+++ b/app-admin/puppet/Manifest
@@ -0,0 +1,19 @@
+AUX 43e2c935252b995134ce353e5e6312cf77aea480.patch 13618 BLAKE2B 91727c30b968b41dc8f6bb2ca217d5b9ccc2b5d08872be5a65a45b7f8bc37130255df139a17b7ca09b39b5b1a0b9ddcd6c54d2448148495cf493e7a085d2f0f5 SHA512 65b303c957a29bb5782a2b849944fba029dea3a533c25d4c17830391b5e4963fef304c0be876f5e7892b1a0eb4da16390d4ab1e39f459c05ecbb7100c9c0a9ca
+AUX 50puppet-mode-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952ccd6aaa301a463c629c5dd6320c847e9f05425bd5882681a471761d0fe501ccf6860faa33b9e5458a761dad40a1 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a
+AUX puppet-fix-tests-4.7.0.patch 1102 BLAKE2B e5c98627620f9f76f1421a13969dba3b1d279a63cdb65fc28713a9a2849c8e8cd0e42a30c9058e341d5bbabd3d24ae17c050fa551566e6c61301b83396a0b80a SHA512 81485af1a218b5616195ed80b3fc963c42d56265477be9a636c0e915a18771ff93e12cdbded45ce90da17ce72be4ea4881b5ad8e9d5a997be271df3cd2e8a2c8
+AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c81531709b27981ee61f6f5dea63d2487d49761ff84e7590b608c170bcd369fe7ef3700a5df1bd03b29c66ec71 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97
+AUX puppet.init 917 BLAKE2B 0ebbcdd8c9d4154984130ba3f597969f5f070f65f246770583663df4f192052a0ed666d09d4d417864457814d6a680ac4f327dc2a83b774da3a3c0d4efea1c8d SHA512 6bd2e1c21abaa5149b853f1732a6bb84335a8b4ae4129db52da463597691fd983d347bc04aad69724034d37f953f50c6aa5316d517b9efed2414db8e3d94d7bf
+AUX puppet.init-4.x 764 BLAKE2B 997fef3e95718f3e0f46fa2ab5994ac994a585bcfe728a9dcdfb3ccd5b76e6fd879a4160dce1402803713344fc2082b43e3116b468e9b49fd1b17a043040f860 SHA512 170100981c7e24284a12a208cede1a73afbaeab73315fd15a7337d416825c6d26a29ee272244d39764ad4086bc6a6f99cdc56ed6a600282d6ff9ed74794bfaf8
+AUX puppetmaster.confd 640 BLAKE2B 78d85ee9b2c413c59eadef3498a8a2e2ee6c6d029bf76655a4897fdf128fb38950ff8e62abfa806785906fdae648c544310b75f9a33694ce1fbc0c31fe4f04a8 SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d
+AUX puppetmaster.init 1090 BLAKE2B 367b678860b955003ff8d79e69cd8c4a6d652ae738bec3c3314a3586b485ddafbfd9609e6f589472cd7c12b234e9ca1fa3cf492c1649b03c371ad29384df6555 SHA512 cb8b63aecee163c680449edfa63f9070582d3c1c924e3692dc7c18a7f84e166e9e4d88abae44d6e828eb3d4ab57b0d3a1f64e3a69453fa30d5559e4ae1716975
+AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
+AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
+DIST puppet-4.10.11.tar.gz 3022878 BLAKE2B d3eec840bb1c46e0dfbbc9dad598b362049a76c7ee60b4ff314e7ba2ce19613f834baced94afbbf499b513391107c4229be5f40c275d0724b200358722db0e96 SHA512 5eaac8bd973d0013e7774c9bda81524332f2b3b0177c04e78554bfb0815697b4b296d5dd11a04f7fad782ad975b350b149b1cd97fc5f06974952314f163f1b40
+DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
+DIST puppet-5.5.1.tar.gz 3035639 BLAKE2B 2930ca9eb928d7c6a69ea76673fc4d002e230bf6dbcd28764e8d5bd504ae11326dc856ed64480e13c9eb1d683ad5e8ef64fc9e217942b59d90c6a0bc98e0197c SHA512 20bf7094193f30cfc7a91244275fc79eef0296036ffbc6bbe405e9ca75123b722be6855c746ef8cd35f80bd7a7308408a9205d064f0f910e11877e4db0ebdabc
+DIST puppet-5.5.2.tar.gz 3036714 BLAKE2B 8be2c2fa7b66a2fd8d413f01afad22f7e0724c31a0a92b777f1b61e2139f14f3284a11cfb52fea8833556208d8bb3e99f20b1ed4fa2816809eaa4b92fa730cd5 SHA512 4995b6b6d1b75d68dd4c8eba37585c0afa88f9c6b78857e837886ea72b373c884182adf8791e0c9f2a5079f22681a40073e512e6b727ecfcaff463c8024cf5db
+EBUILD puppet-4.10.11.ebuild 5633 BLAKE2B f75ee3a7cb27288448f341a560e20b3b1246c37a690846bfda63d0ee9ea41600606a986160bb1967ad7c279a4d2204b54af1e45204e43725b4c1438ceb81e7a4 SHA512 90e2636f668b3227ece18ff03a16c28e7791c6ec192a87ca89395a03bc9182abdabb43ac6fc5261da7c4afd68caefaabe81549d39e7fd018cc0b5f307baded2f
+EBUILD puppet-4.10.12.ebuild 5628 BLAKE2B bfca2da4591b9589a1b3e42e8a06d91d75a77ca05a57910544caad33b540fd1c8c0b7fa6be4b11ab67ee693daf7486fee9f63115679a513c09ef1e15b3727152 SHA512 e5fd6431a729d205ba1f6360cb2f46f877de7f27a7bc1cf299f1ec2a487a2d2a374d0c059294b1bf08d31b7187b420297b368d474fc0dcc243787b8cea19a431
+EBUILD puppet-5.5.1.ebuild 3833 BLAKE2B 1fe39216139f93fc68ae0965596931a4d1ad1114d78353001a710d790a9fbdbe041f14ca3a04e7393c4355da33d3b2501e3e168d306aa0232bdc4fcd2547e134 SHA512 553ed1eea1b8acd1da19be01a7ff7f9d420c9c8b03b38bcdab125f1f02dde6b164caea44019fc3557f8d61ae3f22da925e30dd858402841714d6c17462cff98e
+EBUILD puppet-5.5.2.ebuild 3833 BLAKE2B 8a69323f2c1edf94a9dd384a695e3c2d2ba20fff0956cdda51ed853ca9e730c2c051324d0867baea4f71672337e41ec6c42b504edcdaf3f459d120080b3bea5e SHA512 b66520e6d78a3fe5bc8ae5151074133340db60eb402ac4d6f92f4add28b28b3d8280befc0aa74bb4935c9347e35ec240a6afa1bd67db23b1f15a46ad81b2d8ad
+MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/files/43e2c935252b995134ce353e5e6312cf77aea480.patch b/app-admin/puppet/files/43e2c935252b995134ce353e5e6312cf77aea480.patch
new file mode 100644
index 000000000000..09b345e8bc97
--- /dev/null
+++ b/app-admin/puppet/files/43e2c935252b995134ce353e5e6312cf77aea480.patch
@@ -0,0 +1,329 @@
+diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
+index 374667c..12160c6 100644
+--- a/lib/puppet/provider/package/portage.rb
++++ b/lib/puppet/provider/package/portage.rb
+@@ -2,14 +2,19 @@
+ require 'fileutils'
+ 
+ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Package do
+-  desc "Provides packaging support for Gentoo's portage system."
++  desc "Provides packaging support for Gentoo's portage system.
+ 
+-  has_features :versionable, :reinstallable
++    This provider supports the `install_options` and `uninstall_options` attributes, which allows command-line
++    flags to be passed to emerge.  These options should be specified as a string (e.g. '--flag'), a hash
++    (e.g. {'--flag' => 'value'}), or an array where each element is either a string or a hash."
++
++  has_features :install_options, :purgeable, :reinstallable, :uninstall_options, :versionable, :virtual_packages
+ 
+   {
+-    :emerge => "/usr/bin/emerge",
+-    :eix => "/usr/bin/eix",
+-    :update_eix => "/usr/bin/eix-update",
++    :emerge => '/usr/bin/emerge',
++    :eix => '/usr/bin/eix',
++    :qatom_bin => '/usr/bin/qatom',
++    :update_eix => '/usr/bin/eix-update',
+   }.each_pair do |name, path|
+     has_command(name, path) do
+       environment :HOME => '/'
+@@ -24,15 +29,18 @@ def self.instances
+     result_format = self.eix_result_format
+     result_fields = self.eix_result_fields
+ 
++    limit = self.eix_limit
+     version_format = self.eix_version_format
+     slot_versions_format = self.eix_slot_versions_format
++    installed_versions_format = self.eix_installed_versions_format
++    installable_versions_format = self.eix_install_versions_format
+     begin
+-      eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
++      eix_file = File.directory?('/var/cache/eix') ? '/var/cache/eix/portage.eix' : '/var/cache/eix'
+       update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
+ 
+       search_output = nil
+-      Puppet::Util.withenv :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format do
+-        search_output = eix *(self.eix_search_arguments + ["--installed"])
++      Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
++        search_output = eix *(self.eix_search_arguments + ['--installed'])
+       end
+ 
+       packages = []
+@@ -57,65 +65,123 @@ def self.instances
+ 
+   def install
+     should = @resource.should(:ensure)
+-    name = package_name
+-    unless should == :present or should == :latest
+-      # We must install a specific version
+-      name = package_atom_with_version(should)
++    cmd = %w{}
++    name = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
++    name = qatom[:pfx] + name if qatom[:pfx]
++    name = name + '-' + qatom[:pv] if qatom[:pv]
++    name = name + '-' + qatom[:pr] if qatom[:pr]
++    name = name + qatom[:slot] if qatom[:slot]
++    cmd << '--update' if [:latest].include?(should)
++    cmd += install_options if @resource[:install_options]
++    cmd << name
++    emerge *cmd
++  end
++
++  def uninstall
++    should = @resource.should(:ensure)
++    cmd = %w{--rage-clean}
++    name = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
++    name = qatom[:pfx] + name if qatom[:pfx]
++    name = name + '-' + qatom[:pv] if qatom[:pv]
++    name = name + '-' + qatom[:pr] if qatom[:pr]
++    name = name + qatom[:slot] if qatom[:slot]
++    cmd += uninstall_options if @resource[:uninstall_options]
++    cmd << name
++    if [:purged].include?(should)
++      Puppet::Util.withenv :CONFIG_PROTECT => "-*" do
++        emerge *cmd
++      end
++    else
++      emerge *cmd
+     end
+-    emerge name
+   end
+ 
+-  # The common package name format.
+-  def package_name
+-    @resource[:category] ? "#{@resource[:category]}/#{@resource[:name]}" : @resource[:name]
++  def reinstall
++    self.install
+   end
+ 
+-  def package_name_without_slot
+-    package_name.sub(self.class.slot_pattern, '')
++  def update
++    self.install
+   end
+ 
+-  def package_slot
+-    if match = package_name.match(self.class.slot_pattern)
+-      match[1]
++  def qatom
++    output_format = self.qatom_output_format
++    result_format = self.qatom_result_format
++    result_fields = self.qatom_result_fields
++    @atom ||= begin
++      search_output = nil
++      package_info = {}
++      # do the search
++      search_output = qatom_bin *([@resource[:name], '--format', output_format])
++      # verify if the search found anything
++      match = result_format.match(search_output)
++      if match
++        result_fields.zip(match.captures) do |field, value|
++          # some fields can be empty or (null) (if we are not passed a category in the package name for instance)
++          if value == '(null)'
++            package_info[field] = nil
++          elsif !value or value.empty?
++            package_info[field] = nil
++          else
++            package_info[field] = value
++          end
++        end
++      end
++      @atom = package_info
++    rescue Puppet::ExecutionFailure => detail
++      raise Puppet::Error.new(detail)
+     end
+   end
+ 
+-  def package_atom_with_version(version)
+-    if slot = package_slot
+-      "=#{package_name_without_slot}-#{version}:#{package_slot}"
+-    else
+-      "=#{package_name}-#{version}"
+-    end
++  def qatom_output_format
++    '"[%{CATEGORY}] [%{PN}] [%{PV}] [%[PR]] [%[SLOT]] [%[pfx]] [%[sfx]]"'
+   end
+ 
+-  def uninstall
+-    emerge "--unmerge", package_name
++  def qatom_result_format
++    /^\"\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\](.*)\"$/
+   end
+ 
+-  def reinstall
+-    self.install
++  def qatom_result_fields
++    [:category, :pn, :pv, :pr, :slot, :pfx, :sfx]
+   end
+ 
+-  def update
+-    self.install
++  def self.get_sets
++    @sets ||= begin
++      @sets = emerge *(['--list-sets'])
++    end
+   end
+ 
+   def query
++    limit = self.class.eix_limit
+     result_format = self.class.eix_result_format
+     result_fields = self.class.eix_result_fields
+ 
+     version_format = self.class.eix_version_format
+     slot_versions_format = self.class.eix_slot_versions_format
+-    search_field = package_name_without_slot.count('/') > 0 ? "--category-name" : "--name"
+-    search_value = package_name_without_slot
++    installed_versions_format = self.class.eix_installed_versions_format
++    installable_versions_format = self.class.eix_install_versions_format
++    search_field = qatom[:category] ? '--category-name' : '--name'
++    search_value = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
++
++    @eix_result ||= begin
++      # package sets
++      package_sets = []
++      self.class.get_sets.each_line do |package_set|
++        package_sets << package_set.to_s.strip
++      end
+ 
+-    begin
+-      eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
++      if @resource[:name].match(/^@/)
++         if package_sets.include?(@resource[:name][1..-1].to_s)
++           return({:name => "#{@resource[:name]}", :ensure => '9999', :version_available => nil, :installed_versions => nil, :installable_versions => "9999,"})
++        end
++      end
++
++      eix_file = File.directory?('/var/cache/eix') ? '/var/cache/eix/portage.eix' : '/var/cache/eix'
+       update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
+ 
+       search_output = nil
+-      Puppet::Util.withenv :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format do
+-        search_output = eix *(self.class.eix_search_arguments + ["--exact",search_field,search_value])
++      Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
++        search_output = eix *(self.class.eix_search_arguments + ['--exact',search_field,search_value])
+       end
+ 
+       packages = []
+@@ -127,10 +193,19 @@ def query
+           result_fields.zip(match.captures) do |field, value|
+             package[field] = value unless !value or value.empty?
+           end
+-          if package_slot
+-            package[:version_available] = eix_get_version_for_slot(package[:slot_versions_available], package_slot)
+-            package[:ensure] = eix_get_version_for_slot(package[:installed_slots], package_slot)
++          # dev-lang python [3.4.5] [3.5.2] [2.7.12:2.7,3.4.5:3.4] [2.7.12:2.7,3.4.5:3.4,3.5.2:3.5] https://www.python.org/ An interpreted, interactive, object-oriented programming language
++          # version_available is what we CAN install / update to
++          # ensure is what is currently installed
++          # This DOES NOT choose to install/upgrade or not, just provides current info
++          # prefer checking versions to slots as versions are finer grained
++          if qatom[:pv]
++            package[:version_available] = eix_get_version_for_versions(package[:installable_versions], qatom[:pv])
++            package[:ensure] = eix_get_version_for_versions(package[:installed_versions], qatom[:pv])
++          elsif qatom[:slot]
++            package[:version_available] = eix_get_version_for_slot(package[:slot_versions_available], qatom[:slot])
++            package[:ensure] = eix_get_version_for_slot(package[:installed_slots], qatom[:slot])
+           end
++
+           package[:ensure] = package[:ensure] ? package[:ensure] : :absent
+           packages << package
+         end
+@@ -138,10 +213,9 @@ def query
+ 
+       case packages.size
+         when 0
+-          not_found_value = "#{@resource[:category] ? @resource[:category] : "<unspecified category>"}/#{@resource[:name]}"
+-          raise Puppet::Error.new("No package found with the specified name [#{not_found_value}]")
++          raise Puppet::Error.new("No package found with the specified name [#{@resource[:name]}]")
+         when 1
+-          return packages[0]
++          @eix_result = packages[0]
+         else
+           raise Puppet::Error.new("More than one package with the specified name [#{search_value}], please use the category parameter to disambiguate")
+       end
+@@ -155,39 +229,73 @@ def latest
+   end
+ 
+   private
++  def eix_get_version_for_versions(versions, target)
++    # [2.7.10-r1,2.7.12,3.4.3-r1,3.4.5,3.5.2] 3.5.2
++    return nil if versions.nil?
++    versions = versions.split(',')
++    # [2.7.10-r1 2.7.12 3.4.3-r1 3.4.5 3.5.2]
++    versions.find { |version| version == target }
++    # 3.5.2
++  end
++
++  private
+   def eix_get_version_for_slot(versions_and_slots, slot)
++    # [2.7.12:2.7 3.4.5:3.4 3.5.2:3.5] 3.5
+     return nil if versions_and_slots.nil?
+-    versions_and_slots = versions_and_slots.split(",")
+-    versions_and_slots.map! { |version_and_slot| version_and_slot.split(":") }
+-    version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot }
++    versions_and_slots = versions_and_slots.split(',')
++    # [2.7.12:2.7 3.4.5:3.4 3.5.2:3.5]
++    versions_and_slots.map! { |version_and_slot| version_and_slot.split(':') }
++    # [2.7.12: 2.7
++    #  3.4.5:  3.4
++    #  3.5.2:  3.5]
++    version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot[1..-1] }
++    # [3.5.2:  3.5]
+     version_for_slot.first if version_for_slot
+-  end
+-
+-  def self.slot_pattern
+-    /:([\w+.\/*=-]+)$/
++    # 3.5.2
+   end
+ 
+   def self.eix_search_format
+-    "'<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] [<installedversions:LASTSLOTVERSIONS>] [<bestslotversions:LASTSLOTVERSIONS>] <homepage> <description>\n'"
++    "'<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] [<installedversions:LASTSLOTVERSIONS>] [<installedversions:INSTALLEDVERSIONS>] [<availableversions:STABLEVERSIONS>] [<bestslotversions:LASTSLOTVERSIONS>] <homepage> <description>\n'"
+   end
+ 
+   def self.eix_result_format
+-    /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+(\S+)\s+(.*)$/
++    /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+(\S+)\s+(.*)$/
+   end
+ 
+   def self.eix_result_fields
+-    [:category, :name, :ensure, :version_available, :installed_slots, :slot_versions_available, :vendor, :description]
++    # ensure:[3.4.5], version_available:[3.5.2], installed_slots:[2.7.12:2.7,3.4.5:3.4], installable_versions:[2.7.10-r1,2.7.12,3.4.3-r1,3.4.5,3.5.2] slot_versions_available:[2.7.12:2.7,3.4.5:3.4,3.5.2:3.5]
++    [:category, :name, :ensure, :version_available, :installed_slots, :installed_versions, :installable_versions, :slot_versions_available, :vendor, :description]
+   end
+ 
+   def self.eix_version_format
+-    "{last}<version>{}"
++    '{last}<version>{}'
+   end
+ 
+   def self.eix_slot_versions_format
+-    "{!first},{}<version>:<slot>"
++    '{!first},{}<version>:<slot>'
++  end
++
++  def self.eix_installed_versions_format
++    '{!first},{}<version>'
++  end
++
++  def self.eix_install_versions_format
++    '{!first}{!last},{}{}{isstable}<version>{}'
++  end
++
++  def self.eix_limit
++    '0'
+   end
+ 
+   def self.eix_search_arguments
+-    ["--nocolor", "--pure-packages", "--format",self.eix_search_format]
++    ['--nocolor', '--pure-packages', '--format', self.eix_search_format]
++  end
++
++  def install_options
++    join_options(@resource[:install_options])
++  end
++
++  def uninstall_options
++    join_options(@resource[:uninstall_options])
+   end
+ end
diff --git a/app-admin/puppet/files/50puppet-mode-gentoo.el b/app-admin/puppet/files/50puppet-mode-gentoo.el
new file mode 100644
index 000000000000..64c38ae5a31d
--- /dev/null
+++ b/app-admin/puppet/files/50puppet-mode-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; puppet-mode site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests")
+(add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode))
diff --git a/app-admin/puppet/files/puppet-fix-tests-4.7.0.patch b/app-admin/puppet/files/puppet-fix-tests-4.7.0.patch
new file mode 100644
index 000000000000..7d62e0c1f786
--- /dev/null
+++ b/app-admin/puppet/files/puppet-fix-tests-4.7.0.patch
@@ -0,0 +1,18 @@
+--- spec/unit/network/http/api/indirected_routes_spec.rb  2016-10-11 13:24:09.500955469 -0500
++++ spec/unit/network/http/api/indirected_routes_spec.rb.new  2016-10-11 13:24:00.501700977 -0500
+@@ -139,15 +139,6 @@
+       indirection, _, _, _ = handler.uri2indirection("GET", uri_escaped, params)
+     end
+ 
+-    it "should not pass through an environment to check_authorization and fail if the environment is unknown" do
+-      handler.expects(:check_authorization).with(anything,
+-                                                 anything,
+-                                                 Not(has_entry(:environment)))
+-      expect(lambda { handler.uri2indirection("GET",
+-                                              "#{master_url_prefix}/node/bar",
+-                                              {:environment => 'bogus'}) }).to raise_error(not_found_error)
+-    end
+-
+     it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
+       handler.expects(:check_authorization).with(anything,
+                                                  anything,
diff --git a/app-admin/puppet/files/puppet-systemd.patch b/app-admin/puppet/files/puppet-systemd.patch
new file mode 100644
index 000000000000..72d7d69a2f77
--- /dev/null
+++ b/app-admin/puppet/files/puppet-systemd.patch
@@ -0,0 +1,10 @@
+--- ext/systemd/puppet.service	2017-02-02 18:28:58.000000000 -0600
++++ ext/systemd/puppet.service	2017-03-09 10:56:59.091489324 -0600
+@@ -17,7 +17,7 @@
+ EnvironmentFile=-/etc/sysconfig/puppetagent
+ EnvironmentFile=-/etc/sysconfig/puppet
+ EnvironmentFile=-/etc/default/puppet
+-ExecStart=/opt/puppetlabs/puppet/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
++ExecStart=/usr/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init
new file mode 100644
index 000000000000..d30367ad3fb2
--- /dev/null
+++ b/app-admin/puppet/files/puppet.init
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount net
+	use dns logger puppetmaster netmount nfsmount
+}
+
+checkconfig() {
+	if [ ! -d "${PUPPET_PID_DIR}" ] ; then
+		eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory"
+		return 1
+	fi
+
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+
+	local options=""
+	[ -n "${PUPPET_EXTRA_OPTS}" ] && options="${options} ${PUPPET_EXTRA_OPTS}"
+
+	ebegin "Starting puppet"
+	start-stop-daemon --start --quiet \
+		--pidfile "${PUPPET_PID_DIR}/agent.pid" \
+		--exec /usr/bin/puppetd -- ${options}
+	eend $? "Failed to start puppet"
+}
+
+stop() {
+	ebegin "Stopping puppet"
+	start-stop-daemon --stop --quiet \
+		--pidfile "${PUPPET_PID_DIR}/agent.pid"
+	local ret=$?
+	eend ${ret} "Failed to stop puppet"
+	rm -f "${PUPPET_PID_DIR}/agent.pid"
+	return ${ret}
+}
diff --git a/app-admin/puppet/files/puppet.init-4.x b/app-admin/puppet/files/puppet.init-4.x
new file mode 100644
index 000000000000..f7106e6f0294
--- /dev/null
+++ b/app-admin/puppet/files/puppet.init-4.x
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}"
+
+pidfile="${PUPPET_PID_DIR}/puppet.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
+
+command="/usr/bin/puppet"
+extra_started_commands="reload"
+
+command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPET_EXTRA_OPTS}"
+
+depend() {
+	need localmount
+	use dns logger puppetmaster netmount nfsmount
+}
+
+start_pre() {
+	checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
+	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+}
+
+reload() {
+    ebegin "Reloading $RC_SVCNAME"
+    start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+    eend $?
+}
diff --git a/app-admin/puppet/files/puppetmaster.confd b/app-admin/puppet/files/puppetmaster.confd
new file mode 100644
index 000000000000..afecf479a6a1
--- /dev/null
+++ b/app-admin/puppet/files/puppetmaster.confd
@@ -0,0 +1,18 @@
+# Location of PID files
+PUPPETMASTER_PID_DIR="/var/run/puppet"
+
+# Where to log general messages to.
+# Specify syslog to send log messages to the system log.
+#PUPPETMASTER_LOG="syslog"
+
+# You may specify other parameters to the puppetmaster here
+#PUPPETMASTER_EXTRA_OPTS="--noca"
+
+# You may specify an alternate port on which puppetmaster should listen.
+# Default is: 8140
+#PUPPETMASTER_PORT="8140"
+
+# To start multiple servers:
+# # cp /etc/conf.d/puppetmaster /etc/conf.d/puppetmaster.master_8141
+# # ln -s puppetmaster /etc/init.d/puppetmaster.master_8141
+# # ${EDITOR} /etc/conf.d/puppetmaster.master_8141 (set 8141 to PUPPETMASTER_PORT)
diff --git a/app-admin/puppet/files/puppetmaster.init b/app-admin/puppet/files/puppetmaster.init
new file mode 100644
index 000000000000..687003752329
--- /dev/null
+++ b/app-admin/puppet/files/puppetmaster.init
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "puppetmaster" ] ; then
+	PUPPETMASTER_PID="master"
+else
+	PUPPETMASTER_PID="${SVCNAME#*.}"
+fi
+PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}"
+pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
+
+command_args="master --pidfile ${pidfile} ${PUPPETMASTER_EXTRA_OPTS}"
+if [ -n "${PUPPETMASTER_PORT}" ] ; then
+	command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
+fi
+
+command="/usr/bin/puppet"
+extra_started_commands="reload"
+
+depend() {
+	need localmount
+	use dns logger slapd netmount nfsmount
+}
+
+start_pre() {
+	checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
+	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+	checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $? "Failed to stop ${SVCNAME}"
+}
diff --git a/app-admin/puppet/files/puppetmaster.init-4.x b/app-admin/puppet/files/puppetmaster.init-4.x
new file mode 100644
index 000000000000..286f7e67579a
--- /dev/null
+++ b/app-admin/puppet/files/puppetmaster.init-4.x
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "puppetmaster" ] ; then
+	PUPPETMASTER_PID="master"
+else
+	PUPPETMASTER_PID="${SVCNAME#*.}"
+fi
+PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}"
+pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
+
+command_args="master --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPETMASTER_EXTRA_OPTS}"
+if [ -n "${PUPPETMASTER_PORT}" ] ; then
+	command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
+fi
+
+command="/usr/bin/puppet"
+extra_started_commands="reload"
+
+depend() {
+	need localmount
+	use dns logger slapd netmount nfsmount
+}
+
+start_pre() {
+	checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
+	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+	checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
+}
+
+reload() {
+    ebegin "Reloading $RC_SVCNAME"
+    start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+    eend $?
+}
diff --git a/app-admin/puppet/files/tmpfiles.d b/app-admin/puppet/files/tmpfiles.d
new file mode 100644
index 000000000000..cd33231df7f7
--- /dev/null
+++ b/app-admin/puppet/files/tmpfiles.d
@@ -0,0 +1 @@
+D /var/run/puppet 0755 puppet puppet -
diff --git a/app-admin/puppet/metadata.xml b/app-admin/puppet/metadata.xml
new file mode 100644
index 000000000000..fcc0764c44d5
--- /dev/null
+++ b/app-admin/puppet/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+	<email>prometheanfire@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Centralised configuration management for networks
+		Puppet lets you centrally manage every important aspect of your system
+		using a cross-platform specification language that manages all the
+		separate elements normally aggregated in different files, like users,
+		cron jobs, and hosts, along with obviously discrete elements like
+		packages, services, and files.
+
+		Puppet's simple declarative specification language provides powerful
+		classing abilities for drawing out the similarities between hosts while
+		allowing them to be as specific as necessary, and it handles dependency
+		and prerequisite relationships between objects clearly and explicitly.
+	</longdescription>
+	<use>
+<!--		<flag name='puppetdb'>Enable puppetdb support</flag> -->
+		<flag name="augeas">Enable augeas support</flag>
+		<flag name="diff">Enable diff support</flag>
+		<flag name="rrdtool">Enable rrdtool support</flag>
+		<flag name="shadow">Enable shadow support</flag>
+		<flag name="experimental">Add patches for things in testing</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/puppet/puppet-4.10.11.ebuild b/app-admin/puppet/puppet-4.10.11.ebuild
new file mode 100644
index 000000000000..81ed04a87ac6
--- /dev/null
+++ b/app-admin/puppet/puppet-4.10.11.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/gettext-setup-0.10:0
+	>=dev-ruby/hiera-2.0
+	>=dev-ruby/locale-2.1
+	>=dev-ruby/rgen-0.6.5
+	dev-ruby/json:=
+	>=dev-ruby/facter-3.0.0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+
+# ruby_add_bdepend "
+# 	test? (
+# 		dev-ruby/mocha:0.14
+# 		=dev-ruby/rack-1*
+# 		dev-ruby/rspec-its
+# 		dev-ruby/rspec-collection_matchers
+# 		>=dev-ruby/vcr-2.9:2
+# 		>=dev-ruby/webmock-1.24:0
+# 	)"
+
+DEPEND+=" ${DEPEND}
+	xemacs? ( app-editors/xemacs )"
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	if use experimental; then
+		epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
+	fi
+
+	# Use working version of mocha
+	sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing specs that need further investigation.
+	sed -i -e '/should resolve external facts/,/^    end/ s:^:#:' \
+		spec/integration/indirector/facts/facter_spec.rb || die
+	sed -i -e "/describe 'cfacter'/,/^  end/ s:^:#:" spec/unit/defaults_spec.rb || die
+	rm -f spec/unit/indirector/ldap_spec.rb \
+		spec/unit/parser/functions/create_resources_spec.rb || die
+
+	# Avoid specs that rely on tools from other OSs
+	rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
+	   spec/unit/provider/user/directoryservice_spec.rb || die
+
+	# Avoid specs that depend on hiera-eyaml to avoid circular
+	# dependencies
+	rm -f spec/unit/functions/lookup_spec.rb || die
+
+	# Avoid specs that fail due to an unpackaged file
+	sed -i -e '/when loading pp resource types using auto loading/,/^  end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
+}
+
+all_ruby_compile() {
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
+	fi
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "3" ]; then
+			elog
+			elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+			elog "/etc/puppetlabs/puppet"
+			elog "Also, puppet now uses config directories for modules and manifests."
+			elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+			elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+			elog "for more information."
+			elog
+		fi
+	done
+
+	use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+	use xemacs && xemacs-elisp-site-regen
+}
diff --git a/app-admin/puppet/puppet-4.10.12.ebuild b/app-admin/puppet/puppet-4.10.12.ebuild
new file mode 100644
index 000000000000..3fe620df7b36
--- /dev/null
+++ b/app-admin/puppet/puppet-4.10.12.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby23 ruby24"
+
+#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/gettext-setup-0.10:0
+	>=dev-ruby/hiera-2.0
+	>=dev-ruby/locale-2.1
+	>=dev-ruby/rgen-0.6.5
+	dev-ruby/json:=
+	>=dev-ruby/facter-3.0.0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+
+# ruby_add_bdepend "
+# 	test? (
+# 		dev-ruby/mocha:0.14
+# 		=dev-ruby/rack-1*
+# 		dev-ruby/rspec-its
+# 		dev-ruby/rspec-collection_matchers
+# 		>=dev-ruby/vcr-2.9:2
+# 		>=dev-ruby/webmock-1.24:0
+# 	)"
+
+DEPEND+=" ${DEPEND}
+	xemacs? ( app-editors/xemacs )"
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	if use experimental; then
+		epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
+	fi
+
+	# Use working version of mocha
+	sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing specs that need further investigation.
+	sed -i -e '/should resolve external facts/,/^    end/ s:^:#:' \
+		spec/integration/indirector/facts/facter_spec.rb || die
+	sed -i -e "/describe 'cfacter'/,/^  end/ s:^:#:" spec/unit/defaults_spec.rb || die
+	rm -f spec/unit/indirector/ldap_spec.rb \
+		spec/unit/parser/functions/create_resources_spec.rb || die
+
+	# Avoid specs that rely on tools from other OSs
+	rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
+	   spec/unit/provider/user/directoryservice_spec.rb || die
+
+	# Avoid specs that depend on hiera-eyaml to avoid circular
+	# dependencies
+	rm -f spec/unit/functions/lookup_spec.rb || die
+
+	# Avoid specs that fail due to an unpackaged file
+	sed -i -e '/when loading pp resource types using auto loading/,/^  end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
+}
+
+all_ruby_compile() {
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
+	fi
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "3" ]; then
+			elog
+			elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+			elog "/etc/puppetlabs/puppet"
+			elog "Also, puppet now uses config directories for modules and manifests."
+			elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+			elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+			elog "for more information."
+			elog
+		fi
+	done
+
+	use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+	use xemacs && xemacs-elisp-site-regen
+}
diff --git a/app-admin/puppet/puppet-5.5.1.ebuild b/app-admin/puppet/puppet-5.5.1.ebuild
new file mode 100644
index 000000000000..646ad4fb5351
--- /dev/null
+++ b/app-admin/puppet/puppet-5.5.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	>=dev-ruby/facter-3.0.0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "4" ]; then
+			elog
+			elog "Please see the following url for the release notes for puppet-5"
+			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+			elog
+		fi
+	done
+}
diff --git a/app-admin/puppet/puppet-5.5.2.ebuild b/app-admin/puppet/puppet-5.5.2.ebuild
new file mode 100644
index 000000000000..8aa23c0b2c8c
--- /dev/null
+++ b/app-admin/puppet/puppet-5.5.2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	>=dev-ruby/facter-3.0.0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "4" ]; then
+			elog
+			elog "Please see the following url for the release notes for puppet-5"
+			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+			elog
+		fi
+	done
+}
diff --git a/app-admin/puppetdb-5.2.1 b/app-admin/puppetdb-5.2.1
deleted file mode 100644
index b635dd1eb4dd..000000000000
--- a/app-admin/puppetdb-5.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=PuppetDB collects data generated by Puppet.
-EAPI=6
-HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.7.0
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-5.2.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=09671bf19447d8e42efb550690c1a103
diff --git a/app-admin/puppetdb-5.2.2 b/app-admin/puppetdb-5.2.2
deleted file mode 100644
index 50a5487abe06..000000000000
--- a/app-admin/puppetdb-5.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=PuppetDB collects data generated by Puppet.
-EAPI=6
-HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.7.0
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-5.2.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=09671bf19447d8e42efb550690c1a103
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
new file mode 100644
index 000000000000..59d7d32aff62
--- /dev/null
+++ b/app-admin/puppetdb/Manifest
@@ -0,0 +1,6 @@
+AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
+DIST puppetdb-5.2.1.tar.gz 25435195 BLAKE2B aed0e6175df0a603ea0aaf792c31b4933d408a4f7a037b557a8acb4b237e4c639a06f954232e049efe4b486d780a3af129c8a6a48833019168cd70f38e5bf403 SHA512 6d0b06f083093394f74e952112c6b388fd6c94452cf2954172dafc5dc42c7a0b45f6a9a7afcb6196f12316e15653943c3faed8a06ba7a7bd75a31db8515e0103
+DIST puppetdb-5.2.2.tar.gz 25436396 BLAKE2B e30d80b7da29c8cf3b00c9cda3d6e0a4c5635b3bb3a4e6d3e2bf284531509828df6d845a0d30b2a7a454ec35ab4879019fc4c68fc3aa8b6a72c3d0896b9e75f7 SHA512 cc598539801bedd4ef0052f50013320be5dc1eaf8098db8898a0759609d6d4e26aa094550bc1a45c041f9fe65ee99b0c00c00586d3cc93003836f1415bd92456
+EBUILD puppetdb-5.2.1.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
+EBUILD puppetdb-5.2.2.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
+MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/files/puppetdb.initd b/app-admin/puppetdb/files/puppetdb.initd
new file mode 100644
index 000000000000..29a634e47a9e
--- /dev/null
+++ b/app-admin/puppetdb/files/puppetdb.initd
@@ -0,0 +1,64 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+
+LOGDIR="/var/log/puppetlabs/puppetdb"
+RUNDIR="/run/puppetlabs/puppetdb"
+
+checkconfig() {
+    if [ ! -x $JAVA_BIN ]; then
+        eerror "Missing JAVA_BIN."
+        eend 1
+    fi
+    if [ ! -d $INSTALL_DIR ]; then
+        eerror "Missing INSTALL_DIR."
+        eend 1
+    fi
+    if [ ! -e $BOOTSTRAP_CONFIG ]; then
+        eerror "Missing BOOTSTRAP_CONFIG."
+        eend 1
+    fi
+    if [ ! -e $CONFIG ]; then
+        eerror "Missing CONFIG."
+        eend 1
+    fi
+    if [ ! -n $USER ]; then
+        eerror "Missing USER."
+        eend 1
+    fi
+    if [ ! -n $GROUP ]; then
+        eerror "Missing GROUP."
+        eend 1
+    fi
+
+    checkpath -d -m 0755 "${LOGDIR%/*}"
+    checkpath -d -m 0755 "${RUNDIR%/*}"
+    checkpath -d -m 0700 -o "${USER}:${GROUP}" "${LOGDIR}"
+    checkpath -d -m 0755 -o "${USER}:${GROUP}" "${RUNDIR}"
+
+    JAVA_ARGS="${JAVA_ARGS} -cp '${INSTALL_DIR}/puppetdb.jar' clojure.main -m puppetlabs.puppetdb.main --config ${CONFIG} -b '${BOOTSTRAP_CONFIG}'"
+    EXEC="${JAVA_BIN} -XX:OnOutOfMemoryError=\"kill -9 %p\" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/puppetlabs/puppetdb -Djava.security.egd=/dev/urandom ${JAVA_ARGS}"
+}
+
+start() {
+    checkconfig || return 1
+
+    ebegin "Starting PuppetDB"
+    start-stop-daemon --start -u "${USER}" -g "${GROUP}" \
+        -m --pidfile "${RUNDIR}/puppetdb.pid" \
+        -b --exec "/bin/bash" \
+        -- -c "exec ${EXEC} >> ${LOGDIR}/daemon.log 2>&1"
+    local retval=$?
+    if [ $retval -ne 0 ]; then
+        ewarn "Error starting puppetdb."
+    fi
+    eend $retval
+}
+
+stop() {
+    ebegin "Stopping PuppetDB"
+    start-stop-daemon --stop --pidfile "${RUNDIR}/puppetdb.pid"
+    eend $?
+}
diff --git a/app-admin/puppetdb/metadata.xml b/app-admin/puppetdb/metadata.xml
new file mode 100644
index 000000000000..df9a6a6a1c9d
--- /dev/null
+++ b/app-admin/puppetdb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		PuppetDB collects data generated by Puppet. It enables advanced Puppet features like exported resources, and can be the foundation for other applications that use Puppet’s data.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/puppetdb/puppetdb-5.2.1.ebuild b/app-admin/puppetdb/puppetdb-5.2.1.ebuild
new file mode 100644
index 000000000000..e2e9e4db500f
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-5.2.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib systemd user
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="amd64 x86"
+
+RDEPEND+=">=virtual/jdk-1.7.0"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppetdb
+	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetdb/puppetdb-5.2.2.ebuild b/app-admin/puppetdb/puppetdb-5.2.2.ebuild
new file mode 100644
index 000000000000..e2e9e4db500f
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-5.2.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib systemd user
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="amd64 x86"
+
+RDEPEND+=">=virtual/jdk-1.7.0"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppetdb
+	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver-5.3.0 b/app-admin/puppetserver-5.3.0
deleted file mode 100644
index 3b802cf180e6..000000000000
--- a/app-admin/puppetserver-5.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
-EAPI=6
-HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
-IUSE=puppetdb
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-5.3.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=b84af374ead41af6acd604c5cb319caa
diff --git a/app-admin/puppetserver-5.3.1 b/app-admin/puppetserver-5.3.1
deleted file mode 100644
index 7b47d3d32ce0..000000000000
--- a/app-admin/puppetserver-5.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
-EAPI=6
-HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
-IUSE=puppetdb
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-5.3.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=b84af374ead41af6acd604c5cb319caa
diff --git a/app-admin/puppetserver-5.3.3 b/app-admin/puppetserver-5.3.3
deleted file mode 100644
index 666a5a320aee..000000000000
--- a/app-admin/puppetserver-5.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
-EAPI=6
-HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
-IUSE=puppetdb
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-5.3.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=b84af374ead41af6acd604c5cb319caa
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
new file mode 100644
index 000000000000..c8819401c43b
--- /dev/null
+++ b/app-admin/puppetserver/Manifest
@@ -0,0 +1,8 @@
+AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
+DIST puppetserver-5.3.0.tar.gz 66913938 BLAKE2B ed24e0c5a8ad14c2c63f7a88deca6a020121fa53890a68b83f3608081c6480540056d483a00df5c1b0d5a008216f27b5d72efa54d885c55f09b1f40441469b39 SHA512 5f08f0adba257947ec61eae91b7a417e9055510e278e444ce7c88358163b9bb00f2bf02580ace6064e508c43f8b60ca21d12aa3d1525814754e6259791b34bc5
+DIST puppetserver-5.3.1.tar.gz 67239406 BLAKE2B 0aca973ad039d51877926459f935e48cb9ee6ed60792ca67af3a65800fc8fd9de8e6cadd3edc83ac83385f8dfba4f0cd83c9a6db665578f3d1d235ccc00e6547 SHA512 3d618c351299f4cc038682ab43eb4686bd1baf8f88390c8ac41eb3be9fdf8a7a3a501f0ab8713e45bee0ed02d7a9fd1ed1b7252ebb640ee52aa5da638f0b2ce2
+DIST puppetserver-5.3.3.tar.gz 67238194 BLAKE2B 0a0b235f26ab15c8f461f6663c26531d3ae469c4467ae33caa98f70d94a02fb89eb0399405be6b1f65f65b2fe4add7a24129f367ae1ab028189d250b087d0915 SHA512 dced3a7b7b3acb8966e4eb6f35aa82c84d0bba81487fa0cffc60fa0751b5d5c633be925471145a3e21b8f74bcffaa74f02310644ecc8bf8ebef0222d967fa86a
+EBUILD puppetserver-5.3.0.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
+EBUILD puppetserver-5.3.1.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
+EBUILD puppetserver-5.3.3.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
+MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/files/puppetserver.init b/app-admin/puppetserver/files/puppetserver.init
new file mode 100644
index 000000000000..34126ed8b1e5
--- /dev/null
+++ b/app-admin/puppetserver/files/puppetserver.init
@@ -0,0 +1,72 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig reload"
+
+LOGDIR="/var/log/puppetlabs/puppetserver"
+RUNDIR="/run/puppetlabs/puppetserver"
+
+checkconfig() {
+    if [ ! -x $JAVA_BIN ]; then
+        eerror "Missing JAVA_BIN."
+        eend 1
+    fi
+    if [ ! -d $INSTALL_DIR ]; then
+        eerror "Missing INSTALL_DIR."
+        eend 1
+    fi
+    if [ ! -e $BOOTSTRAP_CONFIG ]; then
+        eerror "Missing BOOTSTRAP_CONFIG."
+        eend 1
+    fi
+    if [ ! -e $CONFIG ]; then
+        eerror "Missing CONFIG."
+        eend 1
+    fi
+    if [ ! -n $USER ]; then
+        eerror "Missing USER."
+        eend 1
+    fi
+    if [ ! -n $GROUP ]; then
+        eerror "Missing GROUP."
+        eend 1
+    fi
+
+    checkpath -d -m 0755 "${LOGDIR%/*}"
+    checkpath -d -m 0755 "${RUNDIR%/*}"
+    checkpath -d -m 0700 -o "${USER}:${GROUP}" "${LOGDIR}"
+    checkpath -d -m 0755 -o "${USER}:${GROUP}" "${RUNDIR}"
+
+    PUPPETSERVER_ARGS="-Djava.security.egd=/dev/urandom -XX:OnOutOfMemoryError=\"kill -9 %p\" -cp ${INSTALL_DIR}/puppet-server-release.jar:${INSTALL_DIR}/jruby-1_7.jar clojure.main -m puppetlabs.trapperkeeper.main"
+    PUPPETSERVER_OPTS="--config /etc/puppetlabs/puppetserver/conf.d --bootstrap-config ${BOOTSTRAP_CONFIG} --restart-file /opt/puppetlabs/server/data/puppetserver/restartcounter"
+    EXEC="${JAVA_BIN} ${JAVA_ARGS} ${PUPPETSERVER_ARGS} ${PUPPETSERVER_OPTS}"
+}
+
+start() {
+    checkconfig || return 1
+
+    ebegin "Starting Puppet Server"
+    start-stop-daemon --start -u "${USER}" -g "${GROUP}" \
+        -m --pidfile "${RUNDIR}/puppetserver.pid" \
+        -b --exec "/bin/bash" \
+        -- -c "exec ${EXEC} >> ${LOGDIR}/daemon.log 2>&1"
+    local retval=$?
+    if [ $retval -ne 0 ]; then
+        ewarn "Error starting puppetserver."
+    fi
+    eend $retval
+}
+
+stop() {
+    ebegin "Stopping Puppet Server"
+    start-stop-daemon --stop --pidfile "${RUNDIR}/puppetserver.pid"
+    eend $?
+}
+
+reload() {
+    ebegin "Reloading Puppet Server"
+    start-stop-daemon --signal HUP --pidfile "${RUNDIR}/puppetserver.pid"
+    eend $?
+}
+
diff --git a/app-admin/puppetserver/metadata.xml b/app-admin/puppetserver/metadata.xml
new file mode 100644
index 000000000000..13a741219359
--- /dev/null
+++ b/app-admin/puppetserver/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<use>
+		<flag name="puppetdb">Adds support for connecting to puppetdb</flag>
+	</use>
+	<longdescription lang="en">
+		Puppet Server is the next-generation application for managing Puppet agents.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/puppetserver/puppetserver-5.3.0.ebuild b/app-admin/puppetserver/puppetserver-5.3.0.ebuild
new file mode 100644
index 000000000000..20133466d29d
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-5.3.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib systemd tmpfiles user
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="amd64 x86"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	doins jruby-9k.jar
+	doins jruby-1_7.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	dodir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt
+	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf"
+	elog "while read LINE"
+	elog "do"
+	elog "	java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
+}
diff --git a/app-admin/puppetserver/puppetserver-5.3.1.ebuild b/app-admin/puppetserver/puppetserver-5.3.1.ebuild
new file mode 100644
index 000000000000..20133466d29d
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-5.3.1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib systemd tmpfiles user
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="amd64 x86"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	doins jruby-9k.jar
+	doins jruby-1_7.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	dodir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt
+	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf"
+	elog "while read LINE"
+	elog "do"
+	elog "	java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
+}
diff --git a/app-admin/puppetserver/puppetserver-5.3.3.ebuild b/app-admin/puppetserver/puppetserver-5.3.3.ebuild
new file mode 100644
index 000000000000..20133466d29d
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-5.3.3.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib systemd tmpfiles user
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="amd64 x86"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	doins jruby-9k.jar
+	doins jruby-1_7.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	dodir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt
+	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf"
+	elog "while read LINE"
+	elog "do"
+	elog "	java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
+}
diff --git a/app-admin/pwcrypt-1.2.2-r1 b/app-admin/pwcrypt-1.2.2-r1
deleted file mode 100644
index d5f9e3397e15..000000000000
--- a/app-admin/pwcrypt-1.2.2-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=An improved version of cli-crypt (encrypts data sent to it from the cli)
-EAPI=4
-HOMEPAGE=http://xjack.org/pwcrypt/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://xjack.org/pwcrypt/downloads/pwcrypt-1.2.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4e61aec6c54e8a251d6805fe04d8b1f4
diff --git a/app-admin/pwcrypt-1.2.2-r2 b/app-admin/pwcrypt-1.2.2-r2
deleted file mode 100644
index 426bc3f0daee..000000000000
--- a/app-admin/pwcrypt-1.2.2-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=An improved version of cli-crypt (encrypts data sent to it from the cli)
-EAPI=7
-HOMEPAGE=http://xjack.org/pwcrypt/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://xjack.org/pwcrypt/downloads/pwcrypt-1.2.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=61118fcdc72d7384148c7fbbb98d240f
diff --git a/app-admin/pwcrypt/Manifest b/app-admin/pwcrypt/Manifest
new file mode 100644
index 000000000000..4ac5d333c40c
--- /dev/null
+++ b/app-admin/pwcrypt/Manifest
@@ -0,0 +1,4 @@
+DIST pwcrypt-1.2.2.tar.gz 36902 BLAKE2B 3cb63bf2a907f4394a7bb5317c7c0bf9ac493de41a54f7107c01a46dea41d32c8e24631f5197e3c62c62d6d44d959f505874e0a3d6ab7c0fc04863165b37ec56 SHA512 41644e82f8306003e9346900d7a961e87a5b8103ebc411cf09b5e0e40d8253b4c38a83db57c60f09d2dd2663ecc2e2edc10ea2b6d095c102ee10ae251b471ddf
+EBUILD pwcrypt-1.2.2-r1.ebuild 600 BLAKE2B 7ea7ff450ce343bfd8555478448c6cfa17d41b9563c60571d73836bb80fb72b8ad7c5c47696b12b18a0f185bb87a085f1e52b8d41dbf713649b5a2f5f6dafe26 SHA512 c25aec3737c58ce888455c64615cf478b4e4e868534ea0b5f4e060491c48a9789c6b9072295d98c9092301242513b737a7e200ee96c03145dd348ec0b8f98a37
+EBUILD pwcrypt-1.2.2-r2.ebuild 610 BLAKE2B 5b28efb087478dbbbb6fe76298e1267c4abb567c9972a4fb47fbf286443f6c12a75135bd686439378a4cdac410fea614456b3668155d760358ba46bbb2d6776d SHA512 2e922e6fd9cfc0dd94243b1f2e7b12f92a0013b0cca86cb02feaa2f7199ee9637805265677816cd12edc24222a6987e6e56eaab952ddd0d7ac1eda444aec2950
+MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/app-admin/pwcrypt/metadata.xml b/app-admin/pwcrypt/metadata.xml
new file mode 100644
index 000000000000..21dc8fdf43ff
--- /dev/null
+++ b/app-admin/pwcrypt/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hattya@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-admin/pwcrypt/pwcrypt-1.2.2-r1.ebuild b/app-admin/pwcrypt/pwcrypt-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..bd467dcf45c8
--- /dev/null
+++ b/app-admin/pwcrypt/pwcrypt-1.2.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="An improved version of cli-crypt (encrypts data sent to it from the cli)"
+HOMEPAGE="http://xjack.org/pwcrypt/"
+SRC_URI="http://xjack.org/pwcrypt/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DOCS=( CREDITS README )
+
+src_prepare()  {
+	sed -i "s/make\( \|$\)/\$(MAKE)\1/g" Makefile.in || die
+	sed -i \
+		-e "/^LDFLAGS/s/= /= @LDFLAGS@ /" \
+		-e "/-install/s/ -s//" \
+		src/Makefile.in || die
+
+	tc-export CC
+}
diff --git a/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild b/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..0e60b33f530b
--- /dev/null
+++ b/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An improved version of cli-crypt (encrypts data sent to it from the cli)"
+HOMEPAGE="http://xjack.org/pwcrypt/"
+SRC_URI="http://xjack.org/pwcrypt/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DOCS=( CREDITS README )
+
+src_prepare()  {
+	default
+	sed -i "s/make\( \|$\)/\$(MAKE)\1/g" Makefile.in || die
+	sed -i \
+		-e "/^LDFLAGS/s/= /= @LDFLAGS@ /" \
+		-e "/-install/s/ -s//" \
+		src/Makefile.in || die
+
+	tc-export CC
+}
diff --git a/app-admin/pwgen-2.07 b/app-admin/pwgen-2.07
deleted file mode 100644
index af5d340bcd55..000000000000
--- a/app-admin/pwgen-2.07
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Password Generator
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/pwgen/
-IUSE=livecd
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/pwgen/pwgen-2.07.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9a7600470fd4a5d5c92496ade908b8c7
diff --git a/app-admin/pwgen-2.08 b/app-admin/pwgen-2.08
deleted file mode 100644
index 8443176256ed..000000000000
--- a/app-admin/pwgen-2.08
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Password Generator
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/pwgen/
-IUSE=livecd
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/pwgen/pwgen-2.08.tar.gz
-_md5_=aed42cef1396e47419e2aea2a0604a30
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
new file mode 100644
index 000000000000..e9498df0f78b
--- /dev/null
+++ b/app-admin/pwgen/Manifest
@@ -0,0 +1,7 @@
+AUX 2.06-special-char.patch 252 BLAKE2B d5ca276a37d144f09888d08fcdee22033fb005cc3c2d5535b0639bc40ec00422770fb1944cd8539b0645101b2f68dc5b61df47a1e610ec8fe215289ce4ae2db6 SHA512 67b2fe0d146b395445cc2cfd1c7721132f3986e964edab41582f0061fc3c9ff6eee8833628230a58a9a9f4a30ad95c7b685082982d62d0e240430072baaea2b9
+AUX pwgen.rc 389 BLAKE2B d8a3af8df9be2a78e18aaddd7d17269ecb0c61a4c77252a77bb2d492edfe5b8c31279de616c4b0bf92ef6ec4763235b18931edc333121c543cae3e839927bedc SHA512 5d2bdf0dfbaf8fc31cd8217495fccccfefb383779c8a03faedcfaa830851b3bbdccb63fdf8d1bf8aa8a96759ea90a31da6b7a4e0cf5368e62ed10b8db8b0382d
+DIST pwgen-2.07.tar.gz 53513 BLAKE2B c5d3a548ef1fab3b246b7ad9ffdc18d572136b3addd2a23e375e45d82af0f45f0e19e747d20d4e4cf7138f7121890460e82a85ffe17c451160c6c0f08bed4422 SHA512 9c56ff04ca2f6f60126608a25f395ddbc4a3ac59585a6f233c87d993b6388e30b1867d43a6bc5b0f9f1f4064b12ea450eac4f7c9ac2844707a99fad1bbd2664d
+DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255
+EBUILD pwgen-2.07.ebuild 699 BLAKE2B e85ba0d3f6f4f432a2df5de6d8193c63cdf3a13ca6502ffc3378a9cfbf95c0d5ae5f195169ca7360ef531630fe9f913a28a768703ceea3cd2ab2fae4061ed934 SHA512 076cc779fff3df62668cce9fcfd58a98ce0f30fb535f1452f96233c96420f3893bb61f92d370cfded1dc49e2e32d89ba059a071db93d67d78d2ec12a65c13bc3
+EBUILD pwgen-2.08.ebuild 627 BLAKE2B f735419fcfa2c5234ff61d7155a481a94d26e2ed8ca80b014c2d2eb1ba19a656baf7e0d61e87e1810102bd7fc4b7e20d07ac0c03c4cdcec4d57655ca5dd9b59c SHA512 496b99be5baf7587ac5f0effaf6d39a040cb2cfc50b3a8a812e698aa3a559f6a96c3665fa877f5373d6fbc0488697e4e18ebfbffd4bbac91b1710f89033b8b38
+MISC metadata.xml 765 BLAKE2B 133e60da10e57e53ea3013d7615aae83d8d38bf18b8e92c1a081d43524551180e2654233e0a2b2207dd11f31114cd221f33fa5eb4c1486c87ea0bd031c613f2f SHA512 5a6e7e1b7e8fc44e9f39e5d0f349a27360d94778522131c749748690fd6db5278a5a9354242b2030bdfc8db7890e340621a1d939364bd40d3d96b018cc6e443f
diff --git a/app-admin/pwgen/files/2.06-special-char.patch b/app-admin/pwgen/files/2.06-special-char.patch
new file mode 100644
index 000000000000..3d014fa4bf11
--- /dev/null
+++ b/app-admin/pwgen/files/2.06-special-char.patch
@@ -0,0 +1,11 @@
+--- a/pwgen.c
++++ b/pwgen.c
+@@ -138,7 +138,7 @@ int main(int argc, char **argv)
+ 			break;
+ 		case 's':
+ 			pwgen = pw_rand;
+-			pwgen_flags = PW_DIGITS | PW_UPPERS;
++			pwgen_flags |= PW_DIGITS | PW_UPPERS;
+ 			break;
+ 		case 'C':
+ 			do_columns = 1;
diff --git a/app-admin/pwgen/files/pwgen.rc b/app-admin/pwgen/files/pwgen.rc
new file mode 100644
index 000000000000..94c4067e2faf
--- /dev/null
+++ b/app-admin/pwgen/files/pwgen.rc
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	before local
+}
+
+start() {
+	ebegin "Auto-scrambling root password for security"
+	echo root:`pwgen -s 16` | chpasswd  > /dev/null 2>&1
+	eend $? "Failed to scramble root password."
+}
+
+stop() {
+	ebegin "Stopping pwgen"
+	eend $? "Failed to stop pwgen."
+}
diff --git a/app-admin/pwgen/metadata.xml b/app-admin/pwgen/metadata.xml
new file mode 100644
index 000000000000..22f8ea147c80
--- /dev/null
+++ b/app-admin/pwgen/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>julian@simioni.org</email>
+		<name>Julian Simioni</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>livecd@gentoo.org</email>
+		<name>Gentoo LiveCD Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="livecd">Install init script for root password scrambling on boot</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">pwgen</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/pwgen/pwgen-2.07.ebuild b/app-admin/pwgen/pwgen-2.07.ebuild
new file mode 100644
index 000000000000..9df81de14409
--- /dev/null
+++ b/app-admin/pwgen/pwgen-2.07.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Password Generator"
+HOMEPAGE="https://sourceforge.net/projects/pwgen/"
+SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="livecd"
+
+src_prepare() {
+	epatch "${FILESDIR}"/2.06-special-char.patch
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/etc/pwgen
+}
+
+src_install() {
+	default
+	use livecd && newinitd "${FILESDIR}"/pwgen.rc pwgen
+}
diff --git a/app-admin/pwgen/pwgen-2.08.ebuild b/app-admin/pwgen/pwgen-2.08.ebuild
new file mode 100644
index 000000000000..e7712ee76083
--- /dev/null
+++ b/app-admin/pwgen/pwgen-2.08.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Password Generator"
+HOMEPAGE="https://sourceforge.net/projects/pwgen/"
+SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="livecd"
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/etc/pwgen
+}
+
+src_install() {
+	default
+
+	use livecd && newinitd "${FILESDIR}"/pwgen.rc pwgen
+}
diff --git a/app-admin/pydf-12-r1 b/app-admin/pydf-12-r1
deleted file mode 100644
index bbd79e3a7673..000000000000
--- a/app-admin/pydf-12-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Enhanced df with colors
-EAPI=6
-HOMEPAGE=http://kassiopeia.juls.savba.sk/~garabik/software/pydf/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm ppc ppc64 x86 ~arm64 ~x86-fbsd ~amd64-linux ~x86-linux ~amd64-fbsd
-LICENSE=public-domain
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://kassiopeia.juls.savba.sk/~garabik/software/pydf/pydf_12.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4d5fe058698a64fca8260b934dcc26ae
diff --git a/app-admin/pydf/Manifest b/app-admin/pydf/Manifest
new file mode 100644
index 000000000000..232820ea5097
--- /dev/null
+++ b/app-admin/pydf/Manifest
@@ -0,0 +1,3 @@
+DIST pydf_12.tar.gz 14207 BLAKE2B 9bd972529c38380b474fbbd82069e880d950cb5b9ef659f82cfb19417447abd16ecb049e0f6df3354e39c404b06dd7546296289633a4d77b61c41a5378a301f5 SHA512 5a5819b83fe2425cb951a139b38b1b639d17e1d17c4e3e4a80fc4eb6d5632c42b03a2767e1864c8bee13dbd72ebb91ec79fefde1ba448e2af9fc4a314821a3d0
+EBUILD pydf-12-r1.ebuild 792 BLAKE2B cd3013d3331d70e5dee739cc02b5dcf96a41bc56acc7dc3f85fc78eadb8073cc13d6961ef521a92984982ae7a8968ce7fd7b68315b7fd6c2ab76ea92520ba2a9 SHA512 313a19860ce36df2d4aeafec6e62b13764656f740ac2f8bd94cc21726a2878349b9e4597ee827888de8fb1f37d1bbdca2bbd38a55fbf732afdac4f3dccc3cd81
+MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/app-admin/pydf/metadata.xml b/app-admin/pydf/metadata.xml
new file mode 100644
index 000000000000..58c1077b82e4
--- /dev/null
+++ b/app-admin/pydf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/pydf/pydf-12-r1.ebuild b/app-admin/pydf/pydf-12-r1.ebuild
new file mode 100644
index 000000000000..8dd3d13d971e
--- /dev/null
+++ b/app-admin/pydf/pydf-12-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit python-r1
+
+DESCRIPTION="Enhanced df with colors"
+HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/"
+SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/${PN}_${PV}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~arm64 ~x86-fbsd ~amd64-linux ~x86-linux ~amd64-fbsd"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e "s:/etc/pydfrc:${EPREFIX}/etc/pydfrc:" "${PN}" || die
+}
+
+src_install() {
+	python_foreach_impl python_doscript "${PN}"
+	insinto /etc
+	doins "${PN}rc"
+	doman "${PN}.1"
+	einstalldocs
+}
diff --git a/app-admin/qpage-3.3 b/app-admin/qpage-3.3
deleted file mode 100644
index 3e033dc1e36c..000000000000
--- a/app-admin/qpage-3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=tcpd? ( sys-apps/tcp-wrappers )
-DESCRIPTION=Sends messages to an alphanumeric pager via TAP protocol
-EAPI=6
-HOMEPAGE=http://www.qpage.org/
-IUSE=tcpd
-KEYWORDS=alpha amd64 x86
-LICENSE=qpage
-RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) virtual/mta
-SLOT=0
-SRC_URI=http://www.qpage.org/download/qpage-3.3.tar.Z
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=dd24ca2ebb39a2b6060232cd61b938ce
diff --git a/app-admin/qpage/Manifest b/app-admin/qpage/Manifest
new file mode 100644
index 000000000000..3472383cfa14
--- /dev/null
+++ b/app-admin/qpage/Manifest
@@ -0,0 +1,7 @@
+AUX qpage 568 BLAKE2B a1e0e53332af86dd63339e3c8353f8e4c454ebe38ad9df0d3a9c141bca7db8fbfbb8773f58e8ae97efdbd9d6a56a1fda896d64f8d633de4fe9a81e3ff1f6cbfd SHA512 3153cab39730cf1173a1cdb3fa61dead6f767650427b03e7f69173969272eda683fb9aee79b69b1bb879f3c6a30266d6842ceb7f438c09806e35886d923832b4
+AUX qpage-3.3-fix-build-system.patch 603 BLAKE2B e6bde35536561397c6aba4cc7e5f2523beb74e59732ddbe6f8c5672bcefaf4781494d37b7aaecbbe3a81239093c0b0f58034577378313e1ccaaeb21da092b4c4 SHA512 efd9ef6ea9c9df9ce52c53cd962b55170a49a0e8cdeb82aca05e8cb70c79b8afc930b9678f718305fe28e4ef9b359c1d6bffb09f3a23758b1328d0a393a6516a
+AUX qpage-3.3-fix-warning.patch 450 BLAKE2B 4947c7b7aa7bcb05f63f371a1a06211fd63582af4d492b8541828bd124ac71a458266e49fad21da34efc854d34ca5a3395d4b76bbac6a17f1678f43f9afd3b00 SHA512 c2b0ad552ff60471171693eca90e51470072c73961bf30406e59c7929f02f093d754d5f1e278a43e0aac8d1031dafcbd085b0b59a1d9634f6f631c2a84e7a7c1
+AUX qpage-3.3-gentoo.patch 1472 BLAKE2B 804be08ec654aab34d338cf1d3d1f69d7d2984b8b931e06d5117e449e19a6ee80cb1bedc71dffe070e2e44326881702b0aea2fd4fc2f67130c315a2fe3101294 SHA512 a9e0a1793a8af41340c5593420eecf54fdc405600f71704efd3cdb9f70d9bdfacdff636cea5839c5ca024be27f90c84a7a2c1c95e078af2fffdd7cbc6ae7e5f4
+DIST qpage-3.3.tar.Z 225689 BLAKE2B 25ac50bbe1e5a623a95f0ca8ad53255693647ca49763d80bb571ce36cf941618b6cbecc1681035d5d56d559a30e2da2a8d3621588925b00b9cac7ad278ec4a44 SHA512 d6062fb9e9cd6cfd60cadb923d29d36fd649c27adff2a36fd4e768798b90780153b78e7d0d1a13dcad94971ac98b32c1c5a3b415d5a1b4aa1cfbac564514a3e9
+EBUILD qpage-3.3.ebuild 1581 BLAKE2B ec7511f5b27714f621f308872514bff98f014bc9eda7d2244b88efa223a73a0ac25a60d5e15182aa51ca8cfdce9f61522be7ae5bcea1baf0b7f1edbd4b8652f7 SHA512 3733207dbaa4e98861bffe500ac69dc366c76f3662a59ee7ef78090d08533a311ba268605a32b882e0013093bf8540933abf89732a51f2cf40333cf97ed8615e
+MISC metadata.xml 636 BLAKE2B 35f51043f98eb59d371ec414588cc51f056522bcf8fd02a516c7f523cff009f55fb162a964516a35e7cccd8c942ea3545b42d623764d467d5465913a8b047859 SHA512 9d45fd5a3361b6ffc1548df05595df91726d0037043c0443601b7bd1588218adccfecb38de8ae961a6e1ff5e618b14dc1e249f94657ec98fab914f1a70f13dad
diff --git a/app-admin/qpage/files/qpage b/app-admin/qpage/files/qpage
new file mode 100644
index 000000000000..81ffe86d9950
--- /dev/null
+++ b/app-admin/qpage/files/qpage
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -e /etc/qpage/qpage.cf ] ; then
+		eerror "You need a /etc/qpage/qpage.cf file first."
+		eerror "There is a sample file in /etc/qpage/."
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting qpage"
+	start-stop-daemon --start --quiet --exec /usr/bin/qpage -- -q 10
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping qpage"
+	start-stop-daemon --stop --quiet --exec /usr/bin/qpage
+	eend $?
+}
diff --git a/app-admin/qpage/files/qpage-3.3-fix-build-system.patch b/app-admin/qpage/files/qpage-3.3-fix-build-system.patch
new file mode 100644
index 000000000000..0fd091df8e0e
--- /dev/null
+++ b/app-admin/qpage/files/qpage-3.3-fix-build-system.patch
@@ -0,0 +1,21 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -65,12 +65,12 @@
+ 		@exit 1
+ 
+ install:	all
+-		$(RM) $(bindir)/$(PROG)
+-		$(MKDIR) -p $(bindir)
+-		$(CP) $(PROG) $(bindir)
+-		$(RM) $(mandir)/man1/$(PROG).1
+-		$(MKDIR) -p $(mandir)/man1
+-		$(CP) $(PROG).man $(mandir)/man1/$(PROG).1
++		$(RM) $(DESTDIR)$(bindir)/$(PROG)
++		$(MKDIR) -p $(DESTDIR)$(bindir)
++		$(CP) $(PROG) $(DESTDIR)$(bindir)
++		$(RM) $(DESTDIR)$(mandir)/man1/$(PROG).1
++		$(MKDIR) -p $(DESTDIR)$(mandir)/man1
++		$(CP) $(PROG).man $(DESTDIR)$(mandir)/man1/$(PROG).1
+ 
+ #		$(INSTALL) S99qpage /etc/rc3.d
+ #		ln /etc/rc3.d/S99qpage /etc/init.d/qpage
diff --git a/app-admin/qpage/files/qpage-3.3-fix-warning.patch b/app-admin/qpage/files/qpage-3.3-fix-warning.patch
new file mode 100644
index 000000000000..722677648250
--- /dev/null
+++ b/app-admin/qpage/files/qpage-3.3-fix-warning.patch
@@ -0,0 +1,12 @@
+diff -urN qpage-3.3.orig/srvrsnpp.c qpage-3.3/srvrsnpp.c
+--- qpage-3.3.orig/srvrsnpp.c	1998-10-25 14:55:05.000000000 -0500
++++ qpage-3.3/srvrsnpp.c	2006-01-25 15:49:57.000000000 -0500
+@@ -1061,7 +1061,7 @@
+ 		if (ptr && strcmp(ptr, STRING_UNKNOWN) != 0)
+ 			p->ident = strdup(ptr);
+ 
+-		ptr = eval_hostinfo(&request.client);
++		ptr = eval_hostinfo(&request.client[0]);
+ 
+ 		if (ptr && strcmp(ptr, STRING_UNKNOWN) != 0)
+ 			p->hostname = strdup(ptr);
diff --git a/app-admin/qpage/files/qpage-3.3-gentoo.patch b/app-admin/qpage/files/qpage-3.3-gentoo.patch
new file mode 100644
index 000000000000..72baf899764e
--- /dev/null
+++ b/app-admin/qpage/files/qpage-3.3-gentoo.patch
@@ -0,0 +1,72 @@
+--- a/config.input
++++ b/config.input
+@@ -20,7 +20,7 @@
+ # See the QuickPage documentation for complete details about
+ # the syntax of the configuration file.
+ #
+-QPAGE_CONFIG="/etc/qpage.cf"
++QPAGE_CONFIG="/etc/qpage/qpage.cf"
+ 
+ 
+ #
+@@ -41,7 +41,7 @@
+ # copies of the configuration file.  Only one filename
+ # may be specified.
+ #
+-SNPP_SERVER_FILE="/etc/qpage.servers"
++SNPP_SERVER_FILE="/etc/qpage/qpage.servers"
+ 
+ 
+ #
+--- a/qpage.man
++++ b/qpage.man
+@@ -867,7 +867,7 @@
+ must be able to detect when it's safe to send dial commands to the modem.
+ .LP
+ .SH FILES
+-/etc/qpage.cf
++/etc/qpage/qpage.cf
+ .SH SEE ALSO
+ .B RFC-1861
+ .SH KNOWN BUGS
+--- a/example.cf
++++ b/example.cf
+@@ -21,7 +21,7 @@
+ #
+ #	modem=<modem name>
+ #		text=<optional text, no whitespace allowed>
+-#		device=<modem device e.g. /dev/ttya>
++#		device=<modem device e.g. /dev/tts/0>
+ #		initcmd=<modem initialization command>
+ #		dialcmd=<modem dial command not including phone number>
+ #
+@@ -64,14 +64,15 @@
+ 
+ queuedir=/var/spool/qpage
+ 
++lockdir=/var/lock/subsys/qpage
++
+ identtimeout=5
+ snpptimeout=60
+ 
+-modem=ttya device=/dev/cua/a
+-modem=ttyb device=/dev/cua/b
++modem=ttyS0 device=/dev/tts/0
+ 
+ service=default
+-	device=ttya,ttyb
++	device=ttyS0
+ 	baudrate=1200
+ 	parity=even
+ 	allowpid=yes
+--- a/ixo.c
++++ b/ixo.c
+@@ -192,7 +192,7 @@
+ 		if ((i = read_modem(fd, seconds)) < 0)
+ 			return(NULL);
+ 
+-		if (i == '\r') {
++		if (i == '\r' || i == '\n') {
+ 			*ptr = '\0';
+ 			got_full_packet++;
+ 		}
diff --git a/app-admin/qpage/metadata.xml b/app-admin/qpage/metadata.xml
new file mode 100644
index 000000000000..6ab99be94028
--- /dev/null
+++ b/app-admin/qpage/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<longdescription lang="en">
+		QuickPage is a client/server software package that enables you to send messages
+		to an alphanumeric pager. The client accepts a message from the user and
+		forwards it to a server using SNPP. The server uses a modem to transmit the
+		message to the recipient's paging service using the TAP protocol (also known as
+		the IXO protocol).
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/qpage/qpage-3.3.ebuild b/app-admin/qpage/qpage-3.3.ebuild
new file mode 100644
index 000000000000..9231daae0add
--- /dev/null
+++ b/app-admin/qpage/qpage-3.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Sends messages to an alphanumeric pager via TAP protocol"
+HOMEPAGE="http://www.qpage.org/"
+SRC_URI="http://www.qpage.org/download/${P}.tar.Z"
+
+LICENSE="qpage"
+SLOT="0"
+KEYWORDS="alpha amd64 x86"
+IUSE="tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}
+	virtual/mta"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-fix-warning.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
+
+src_configure() {
+	tc-export CC
+	default
+
+	# There doesn't seem to be a clean way to disable tcp wrappers in
+	# this package if you have it installed, but don't want to use it.
+	if ! use tcpd ; then
+		sed -i 's/-lwrap//g; s/-DTCP_WRAPPERS//g' Makefile || die
+		echo '#undef TCP_WRAPPERS' >> config.h || die
+	fi
+}
+
+src_install() {
+	default
+
+	dodir /var/spool/qpage
+	fowners daemon:daemon /var/spool/qpage
+	fperms 770 /var/spool/qpage
+
+	dodir /var/lock/subsys/qpage
+	fowners daemon:daemon /var/lock/subsys/qpage
+	fperms 770 /var/lock/subsys/qpage
+
+	insinto /etc/qpage
+	doins example.cf
+
+	doinitd "${FILESDIR}"/qpage
+}
+
+pkg_postinst() {
+	elog
+	elog "Post-installation tasks:"
+	elog
+	elog "1. Create /etc/qpage/qpage.cf (see example.cf in that dir)."
+	elog "2. Insure that the serial port selected in qpage.cf"
+	elog "   is writable by user or group daemon."
+	elog "3. Set automatic startup with rc-update add qpage default"
+	elog "4. Send mail to tomiii@qpage.org telling him how"
+	elog "   you like qpage! :-)"
+	elog
+}
diff --git a/app-admin/qtpass-1.2.1 b/app-admin/qtpass-1.2.1
deleted file mode 100644
index a524b323ad1d..000000000000
--- a/app-admin/qtpass-1.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-admin/pass dev-qt/qtcore:5 dev-qt/qtgui:5[xcb] dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/x11-ssh-askpass dev-qt/linguist-tools:5
-DESCRIPTION=multi-platform GUI for pass, the standard unix password manager
-EAPI=6
-HOMEPAGE=https://qtpass.org/
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-3
-RDEPEND=app-admin/pass dev-qt/qtcore:5 dev-qt/qtgui:5[xcb] dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/x11-ssh-askpass
-SLOT=0
-SRC_URI=https://github.com/IJHack/qtpass/archive/v1.2.1.tar.gz -> qtpass-1.2.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4b93aef4a1b6aba81add3a02f5617c1a
diff --git a/app-admin/qtpass-1.2.2 b/app-admin/qtpass-1.2.2
deleted file mode 100644
index 89b6d180cae8..000000000000
--- a/app-admin/qtpass-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-admin/pass dev-qt/qtcore:5 dev-qt/qtgui:5[xcb] dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/x11-ssh-askpass dev-qt/linguist-tools:5 dev-qt/qtsvg:5 test? ( dev-qt/qttest:5 )
-DESCRIPTION=multi-platform GUI for pass, the standard unix password manager
-EAPI=6
-HOMEPAGE=https://qtpass.org/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-admin/pass dev-qt/qtcore:5 dev-qt/qtgui:5[xcb] dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/x11-ssh-askpass
-SLOT=0
-SRC_URI=https://github.com/IJHack/qtpass/archive/v1.2.2.tar.gz -> qtpass-1.2.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=31914f1080ea2cdfa067f77bd149ed9d
diff --git a/app-admin/qtpass-1.2.3 b/app-admin/qtpass-1.2.3
deleted file mode 100644
index 8be05871b579..000000000000
--- a/app-admin/qtpass-1.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=app-admin/pass dev-qt/qtcore:5 dev-qt/qtgui:5[xcb] dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/x11-ssh-askpass dev-qt/linguist-tools:5 dev-qt/qtsvg:5 test? ( dev-qt/qttest:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=multi-platform GUI for pass, the standard unix password manager
-EAPI=6
-HOMEPAGE=https://qtpass.org/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-admin/pass dev-qt/qtcore:5 dev-qt/qtgui:5[xcb] dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/x11-ssh-askpass
-SLOT=0
-SRC_URI=https://github.com/IJHack/qtpass/archive/v1.2.3.tar.gz -> qtpass-1.2.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=770229486550ffd38738ca9093958801
diff --git a/app-admin/qtpass/Manifest b/app-admin/qtpass/Manifest
new file mode 100644
index 000000000000..8a474ef73fdc
--- /dev/null
+++ b/app-admin/qtpass/Manifest
@@ -0,0 +1,7 @@
+DIST qtpass-1.2.1.tar.gz 361147 BLAKE2B f46ce4362d4d3e0c0b0a425e5a40cf013181b899d5b1a2efc03cc5c4a3eca2d3ce1cdca78fdb95e8fecae23ffe56c01dbe65c9d07e2fff48934e995a710aac40 SHA512 3621a46aab5db5a41e80aea10bc6baf662510bcb249a1f56d33492aa66c824d9f018164f2d6a70256a7b3d59a9b73c4c8459b5d3fbe19886a607f8f0dc7410c1
+DIST qtpass-1.2.2.tar.gz 366601 BLAKE2B 7b06926465e7d7cbb837cf87b47a89b114b9ae9c508aa558695744c84a00a58a8922155eda3f91a6350354668b381381be757db07f201798a2ee25685e034871 SHA512 cb480357b161573054b752af25f20757057de5c5b2e55619e3fa594c5d9b63c7036b72c0ae7735f8ec197ac8aa43b7fdfbc836b29fbe4c85de8dc5d93ce7bbd2
+DIST qtpass-1.2.3.tar.gz 369412 BLAKE2B 55e8f5e7967b264b20aa044979620631f319e2ff38edcc4e1390ab5d9f35e1e90ff8ff00c94cd35a9b5c05a5ccd8d8fdfc97214e9bd9f564bae1bd80efe0f224 SHA512 d6c3af5b92042a38afecb40689d41c08105dd2a39555f78ebc585a6db6dd65cd8fd6dc637542dd3b5b4ce18f1a852768ffa298b5a461a2d0e4ef4950c58d1649
+EBUILD qtpass-1.2.1.ebuild 1016 BLAKE2B 3ee5b9d94395092a92f71bf20f2392c8a4cbc36fbefd7a61ec8568913b1c52acf3bc7f4ba5ee1d347de187ae4e5dd8b031c58163987a2dd444ac59650e65f49c SHA512 2b12c48a02a6bd43fb3e105d26390cbb7fca23999634f04f4cf5f02a06aa7a583f9e120f1c9ee32f84982c99edb0bbb6832ccec6cede8c76a6536ea3ffcd2e26
+EBUILD qtpass-1.2.2.ebuild 1164 BLAKE2B 400440859cb33c5951b3a549e9261f256d89f83d6a214adb9565c7fbc234b44de93d8109ec410b5f1cc6ff92253efe4b5170ed4ad1c3f516f6fa11bcbc3f6d26 SHA512 cc500df9101cffe40fdfaa4f91a461c2ab699f4643e73692399add2d0b6a5bad1caeac8ba9f506caaee384cc1df2370c0f893b321e7c0a57898c9ed7dcae54d8
+EBUILD qtpass-1.2.3.ebuild 1201 BLAKE2B bfc8f9e4c0e83a656fc4cf94e4b6c759e50b1d88016459e46853f0dacbf7ac0d2af0e2f1e9c9b9ce38f9e5755535c664d13e3f4434e511bbf7536ee1a17e037d SHA512 695b4362cb5138c965e142c58f08f91f2e613bfb0dc0e9d63fb892f9376a60d094e5e34afae727d76b9a871ef9bd73a5829b33c4f6708acfb521894344316c7d
+MISC metadata.xml 571 BLAKE2B 1fec9b040ae2b49beec1b99abd0853f631275d3c7f22584a42b503d008ff9403edcd451194881d09224ab0d41ff0598dea2dc7a403aea0227adc4909d02deaad SHA512 937b219855427d7423067037b05ea3b7f19c01eca32fa38e3d6bad9354da039bf2be63a6450f0ebd71fcbd7b6b15b8ca1f993b89391597b1bfb7e3db3d3c04ae
diff --git a/app-admin/qtpass/metadata.xml b/app-admin/qtpass/metadata.xml
new file mode 100644
index 000000000000..e85fad13c2a6
--- /dev/null
+++ b/app-admin/qtpass/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+	QtPass is a multi-platform GUI for pass, the standard unix password manager.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">IJHack/qtpass</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/qtpass/qtpass-1.2.1.ebuild b/app-admin/qtpass/qtpass-1.2.1.ebuild
new file mode 100644
index 000000000000..dc949c150fc4
--- /dev/null
+++ b/app-admin/qtpass/qtpass-1.2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="QtPass-${PV}"
+
+inherit qmake-utils desktop
+
+DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
+HOMEPAGE="https://qtpass.org/"
+SRC_URI="https://github.com/IJHack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+DOCS=( FAQ.md README.md CONTRIBUTING.md )
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="app-admin/pass
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[xcb]
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	net-misc/x11-ssh-askpass"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+src_prepare() {
+	default
+
+	sed -i 's/SUBDIRS += src tests main/SUBDIRS += src main/' "${S}"/qtpass.pro || die
+	sed -i '/main\.depends = tests/d' "${S}"/qtpass.pro || die
+}
+src_configure() {
+	eqmake5 PREFIX="${D}"/usr
+}
+
+src_install() {
+	default
+
+	doman ${PN}.1
+
+	insinto /usr/share/applications
+	doins "${PN}.desktop"
+
+	newicon artwork/icon.svg "${PN}-icon.svg"
+}
diff --git a/app-admin/qtpass/qtpass-1.2.2.ebuild b/app-admin/qtpass/qtpass-1.2.2.ebuild
new file mode 100644
index 000000000000..044673645d98
--- /dev/null
+++ b/app-admin/qtpass/qtpass-1.2.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="QtPass-${PV}"
+inherit desktop qmake-utils
+
+DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
+HOMEPAGE="https://qtpass.org/"
+SRC_URI="https://github.com/IJHack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="app-admin/pass
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[xcb]
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	net-misc/x11-ssh-askpass"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtsvg:5
+	test? ( dev-qt/qttest:5 )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( {CHANGELOG,CONTRIBUTING,FAQ,README}.md )
+
+src_prepare() {
+	default
+
+	if ! use test ; then
+		sed -i '/SUBDIRS += src /s/tests //' \
+			qtpass.pro || die "sed for qtpass.pro failed"
+	fi
+}
+
+src_configure() {
+	eqmake5 PREFIX="${D}"/usr
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/"${PN}"/translations
+	doins localization/*.qm
+
+	doman "${PN}".1
+	insinto /usr/share/applications
+	doins "${PN}".desktop
+	newicon artwork/icon.png "${PN}"-icon.png
+	insinto /usr/share/appdata
+	doins qtpass.appdata.xml
+}
diff --git a/app-admin/qtpass/qtpass-1.2.3.ebuild b/app-admin/qtpass/qtpass-1.2.3.ebuild
new file mode 100644
index 000000000000..c51253b0847f
--- /dev/null
+++ b/app-admin/qtpass/qtpass-1.2.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="QtPass-${PV}"
+
+inherit desktop qmake-utils virtualx
+
+DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
+HOMEPAGE="https://qtpass.org/"
+SRC_URI="https://github.com/IJHack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-admin/pass
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[xcb]
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	net-misc/x11-ssh-askpass"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtsvg:5
+	test? ( dev-qt/qttest:5 )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( {CHANGELOG,CONTRIBUTING,FAQ,README}.md )
+
+src_prepare() {
+	default
+
+	if ! use test ; then
+		sed -i '/SUBDIRS += src /s/tests //' \
+			qtpass.pro || die "sed for qtpass.pro failed"
+	fi
+}
+
+src_configure() {
+	eqmake5 PREFIX="${D}"/usr
+}
+
+src_test() {
+	virtx default
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/"${PN}"/translations
+	doins localization/*.qm
+
+	doman "${PN}".1
+	insinto /usr/share/applications
+	doins "${PN}".desktop
+	newicon artwork/icon.png "${PN}"-icon.png
+	insinto /usr/share/appdata
+	doins qtpass.appdata.xml
+}
diff --git a/app-admin/quickswitch-1.05 b/app-admin/quickswitch-1.05
deleted file mode 100644
index a8dce8dae3a8..000000000000
--- a/app-admin/quickswitch-1.05
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/perl-5.6.0
-DESCRIPTION=Utility to switch network profiles on the fly
-EAPI=6
-HOMEPAGE=http://quickswitch.sf.net
-IUSE=ncurses
-KEYWORDS=x86 ppc sparc s390 amd64
-LICENSE=GPL-2
-RDEPEND=ncurses? ( dev-perl/CursesWidgets )
-SLOT=0
-SRC_URI=mirror://sourceforge/quickswitch/quickswitch-1.05.tar.gz
-_md5_=0a72e435579658f8d40db3e97c715faa
diff --git a/app-admin/quickswitch/Manifest b/app-admin/quickswitch/Manifest
new file mode 100644
index 000000000000..e350ec648feb
--- /dev/null
+++ b/app-admin/quickswitch/Manifest
@@ -0,0 +1,4 @@
+AUX quickswitch-1.05-fix-paths.patch 1924 BLAKE2B b10ea8e626248963b8acfbbd0631f7cbde6cbd6c05d429c9a28ac163389809c1d211dd9f4bdf614d3f0ca5f50779152a7737a83cbb33eb7f51f96052ba4b4c1b SHA512 1df3e97dc223be657efa17637b7bfb541b3fb116856662d06c4be97bffadfc43e8b6242791b6918ff3b7cbc02ce5e01008efc2856269ff0ed1e40216bd33d13c
+DIST quickswitch-1.05.tar.gz 20218 BLAKE2B 9a17132e07c838dd0d39eb887502ee70fd35206d38d795e5f49307eafa756cbf78b7ffdb0c7de19197560adedff902f09bf52a4c7db9359185ecc37f42abb6c7 SHA512 dfb6b952e06d03834b22ad1abe415499bc3f231dcfee0b551ceadc4c020604b2574b70fff03ffb7099913d77e49c545ee44d51f9f7651c4fba113b0503c3bd26
+EBUILD quickswitch-1.05.ebuild 628 BLAKE2B bf33cf3a209b8ad8531326c8f08497d32f0c54d619d019f1d447663a430617b40fe69eee64b7c3484b0e6b537cb52852bb567bd93cc3085bdcf2713b6bac7980 SHA512 874076e10e7dd9c94d4e96bddb0b30663f14be113c0e40db0b8ac4b1f871ba90fbedca03868a69e861b0da9381d703379ff8ad9913d5ccf659b8527d0585da78
+MISC metadata.xml 377 BLAKE2B c17495cc30293086a7a85a9a278ed134e4e7d47169e8ffb1e6d94dcd2f3f81372aa90e5e628ab322e1d3d9bb98af194445764399573231e604e3b51562d359f2 SHA512 05f90b3b4a18647e32f7c3f3029822fefb7aef4cbdbd2f6e74a8f2799e5a42f7f5546307c792aa4bf366536b4d7c1eeef6b4cc1a6b4d6f84d0ac16e5e77a8c88
diff --git a/app-admin/quickswitch/files/quickswitch-1.05-fix-paths.patch b/app-admin/quickswitch/files/quickswitch-1.05-fix-paths.patch
new file mode 100644
index 000000000000..707a355c09f9
--- /dev/null
+++ b/app-admin/quickswitch/files/quickswitch-1.05-fix-paths.patch
@@ -0,0 +1,62 @@
+--- a/switcher
++++ b/switcher
+@@ -67,7 +67,7 @@
+ 
+ ### load quickswitch package
+ $_SWITCHTO = '/usr/bin/switchto'; # default location
+-$CONF_FILE = '/etc/switchto.conf';
++$CONF_FILE = '/etc/quickswitch/switchto.conf';
+ $SWITCHTO = find_switchto($CONF_FILE);
+ $ENV{RUNNING_FROM_SWITCHER} = 1;
+ require $SWITCHTO;
+--- a/switchto
++++ b/switchto
+@@ -26,7 +26,7 @@
+ #
+ # Send bug-reports, comments, women to bugs@muthanna.com
+ #
+-# Also see /etc/switchto.conf for further docs.
++# Also see /etc/quickswitch/switchto.conf for further docs.
+ #
+ # Release: 0.16
+ #
+@@ -143,8 +143,8 @@
+ $AUTHOR    = "Mohit Muthanna, Paul Seamons";
+ $DATE      = '2002';
+ 
+-### I would suggest renaming this /etc/switchto.conf
+-$CONF_FILE = "/etc/switchto.conf";
++### I would suggest renaming this /etc/quickswitch/switchto.conf
++$CONF_FILE = "/etc/quickswitch/switchto.conf";
+ %DEFAULTS  = (
+               autoconfig      => 0,
+               device          => "eth0",
+@@ -165,7 +165,7 @@
+               nfsexportall    => "/usr/sbin/exportfs -a",
+               nfsexportsfile  => "/etc/exports",
+               niscommand      => "/bin/nisdomainname",
+-              servicefilename => "/etc/switchto.last",
++              servicefilename => "/etc/quickswitch/switchto.last",
+               execpre         => undef,
+               execpost        => undef,
+ 
+--- a/switchto.conf
++++ b/switchto.conf
+@@ -43,7 +43,7 @@
+ device=eth0
+ 
+ # Path to save last good known configuration...
+-servicefilename=/etc/switchto.last
++servicefilename=/etc/quickswitch/switchto.last
+ 
+ # Path and arguments to switchto. This is for the switcher GUI
+ # switchtopath=/usr/bin/switchto -b
+@@ -52,7 +52,7 @@
+ # Uncomment theses and change them if needed.
+ # ------------------------------------------
+ # ifconfig=/sbin/ifconfig
+-# iwconfig=/usr/local/sbin/iwconfig
++# iwconfig=/sbin/iwconfig
+ # netstat=/bin/netstat
+ # route=/sbin/route
+ # hostnamecmd=/bin/hostname
diff --git a/app-admin/quickswitch/metadata.xml b/app-admin/quickswitch/metadata.xml
new file mode 100644
index 000000000000..5438d3107a0d
--- /dev/null
+++ b/app-admin/quickswitch/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>A utility for linux laptop users to use multiple network
+	profiles, and switch effortlessly.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">quickswitch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/quickswitch/quickswitch-1.05.ebuild b/app-admin/quickswitch/quickswitch-1.05.ebuild
new file mode 100644
index 000000000000..24b21cea6b25
--- /dev/null
+++ b/app-admin/quickswitch/quickswitch-1.05.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Utility to switch network profiles on the fly"
+SRC_URI="mirror://sourceforge/quickswitch/${P}.tar.gz"
+HOMEPAGE="http://quickswitch.sf.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc s390 amd64"
+IUSE="ncurses"
+
+DEPEND=">=dev-lang/perl-5.6.0"
+RDEPEND="ncurses? ( dev-perl/CursesWidgets )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.05-fix-paths.patch )
+
+src_install() {
+	dobin switchto
+	use ncurses && dobin switcher
+
+	insinto /etc/quickswitch
+	newins switchto.conf switchto.conf.sample
+
+	einstalldocs
+}
diff --git a/app-admin/r10k-1.5.1-r2 b/app-admin/r10k-1.5.1-r2
deleted file mode 100644
index 2d0ca44dde33..000000000000
--- a/app-admin/r10k-1.5.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] =dev-ruby/cri-2.7*[ruby_targets_ruby23] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby23] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[ruby_targets_ruby23] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby23] >=dev-ruby/json-1.8:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] =dev-ruby/cri-2.7*[ruby_targets_ruby24] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby24] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby24] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby24] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby24] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby24] >=dev-ruby/multi_json-1.10[ruby_targets_ruby24] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby24] >=dev-ruby/json-1.8:0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Puppet environment and module deployment
-EAPI=5
-HOMEPAGE=https://github.com/puppetlabs/r10k
-IUSE=+git test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] =dev-ruby/cri-2.7*[ruby_targets_ruby23] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby23] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[ruby_targets_ruby23] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby23] >=dev-ruby/json-1.8:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] =dev-ruby/cri-2.7*[ruby_targets_ruby24] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby24] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby24] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby24] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby24] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby24] >=dev-ruby/multi_json-1.10[ruby_targets_ruby24] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby24] >=dev-ruby/json-1.8:0[ruby_targets_ruby24] ) git? ( >=dev-vcs/git-1.6.6 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/r10k-1.5.1.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=09a6adf9c32d6bb438ee68fa103c31ba
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
new file mode 100644
index 000000000000..7d3e6c4ba4c8
--- /dev/null
+++ b/app-admin/r10k/Manifest
@@ -0,0 +1,3 @@
+DIST r10k-1.5.1.gem 164864 BLAKE2B 398f656913b9c0b3835d782dec3aa0d7a475dc49ac6fba7734239a795e209048969c1e66575029eae5ac19513ac57e24adbfc839c9f5c0537c82fe0fe65def30 SHA512 4440a893aaa6ec0337f9347b620f92afd93099465c148bfe90cd44c2c6fe29cc8411b8c225044a9547d24a8857b580dcf2ea190bf64fe9ba180d1c5c3832d1dd
+EBUILD r10k-1.5.1-r2.ebuild 2127 BLAKE2B fb14e3b0dc36d26e168d7986e1c421d8e8098e25a513f1fcad8de0dabfbd2d4b4fa0ceae16c1795342dd0de617d7f7fad996d5375ce772304fc862dd891f8b5b SHA512 94eb12be84982b760c32635d0fb74b2e262c6585d87292468caf6b22f60a980a75c2665a923c63cffdf2fbaf7814c78ecec37a3c9b2cd9fb6411928614410b8f
+MISC metadata.xml 696 BLAKE2B 13606b1e280dd0e75f1871c7c749eb67a8e0b455a9f357bf65ffca50547c0811c050a31858fec52c97f3fbc9234222f34372f087660ca65e5a13fd1561d098f1 SHA512 1158620e00396d313aeda263aa479ac878a42162f5c122ca69b26a8fb41d84cbeae688b0c3cda77658edc12056ec17cd12a0c84b95422442ab1bb6aba3cc16df
diff --git a/app-admin/r10k/metadata.xml b/app-admin/r10k/metadata.xml
new file mode 100644
index 000000000000..685e7874f384
--- /dev/null
+++ b/app-admin/r10k/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vikraman@gentoo.org</email>
+		<name>Vikraman Choudhury</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		r10k provides a general purpose toolset for deploying Puppet environments and modules. It implements the Puppetfile format and provides a native implementation of Puppet dynamic environments.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">puppetlabs/r10k</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/r10k/r10k-1.5.1-r2.ebuild b/app-admin/r10k/r10k-1.5.1-r2.ebuild
new file mode 100644
index 000000000000..26d06ae24c0c
--- /dev/null
+++ b/app-admin/r10k/r10k-1.5.1-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Puppet environment and module deployment"
+HOMEPAGE="https://github.com/puppetlabs/r10k"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+git"
+
+ruby_add_rdepend "
+	>=dev-ruby/colored-1.2
+	=dev-ruby/cri-2.7*
+	>=dev-ruby/systemu-2.5.2
+	>=dev-ruby/log4r-1.1.10
+	>=dev-ruby/faraday-0.9.0
+	>=dev-ruby/faraday_middleware-0.9.0
+	>=dev-ruby/faraday_middleware-multi_json-0.0.6
+	>=dev-ruby/multi_json-1.10
+	>=dev-ruby/semantic_puppet-0.1.1
+	>=dev-ruby/json-1.8:0"
+
+ruby_add_bdepend "test? (
+	dev-ruby/archive-tar-minitar
+)"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+	sed -i -e 's/json_pure/json/' \
+		-e '/cri/ s/2\.6\../2.7/' \
+		-e '/systemu/ s/2.5.2/2.5/' \
+		-e '/faraday/ s/0.9.0/0.9/' \
+		-e '/semantic_puppet/ s/~>/>/' \
+		-e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "If you are upgrading from 1.1.0 and are using multiple sources, please read"
+	ewarn "this. (If not, feel free to continue with your regularly scheduled day.)"
+	ewarn
+	ewarn "GH-48 (https://github.com/puppetlabs/r10k/issues/48) introduced the ability"
+	ewarn "for environments to be prefixed with the source name so that multiple sources"
+	ewarn "installed into the same directory would not overwrite each other. However"
+	ewarn "prefixing was automatically enabled and would break existing setups where"
+	ewarn "multiple sources were cloned into different directories."
+	ewarn
+	ewarn "Because this introduced a breaking change, SemVer dictates that the automatic"
+	ewarn "prefixing has to be rolled back. Prefixing can be enabled but always defaults"
+	ewarn "to off. If you are relying on this behavior you will need to update your r10k.yaml"
+	ewarn "to enable prefixing on a per-source basis."
+	ewarn
+	ewarn "Please see the issue (https://github.com/puppetlabs/r10k/issues/48) for more"
+	ewarn "information."
+}
diff --git a/app-admin/radmind-1.14.1-r1 b/app-admin/radmind-1.14.1-r1
deleted file mode 100644
index 2f3e432499bf..000000000000
--- a/app-admin/radmind-1.14.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=command-line tools and server to remotely administer multiple Unix filesystems
-EAPI=5
-HOMEPAGE=http://rsug.itd.umich.edu/software/radmind/
-IUSE=libressl
-KEYWORDS=amd64 x86
-LICENSE=HPND
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-util/repo
-SLOT=0
-SRC_URI=mirror://sourceforge/radmind/radmind-1.14.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b0958b1dcf6e897fd715235677950316
diff --git a/app-admin/radmind/Manifest b/app-admin/radmind/Manifest
new file mode 100644
index 000000000000..5f1d4ef6ca12
--- /dev/null
+++ b/app-admin/radmind/Manifest
@@ -0,0 +1,7 @@
+AUX radmind-1.14.0-parallel-make.patch 1447 BLAKE2B 875034aeadbd247e2578f3bcedb8384782b1825d9e8c92e48af51fd6216faede28d5c4d89888103468f2056f3955ec31f8fcfd8335419b3111791524c30e9f06 SHA512 6fc839a6a626dd4a3366fc85b185f4f0e944e21a8ad3ab4763f290d15c0ed8dbba3919f19f74f7b2a9e59709b017c6ec9e9c2baab7b31b24fc4c212e3b504c4a
+AUX radmind-1.14.1-glibc225.patch 709 BLAKE2B 48890c31f0b2f4a8945f8cbf9c02cf842744949be10355f3f2b6aee0f56bfe9847b7293524151c72a5ed93e1fa1ca1957261c8b7d000668e4d10fed8bd5154b8 SHA512 faba25648305e3c5374f37037cf61f22bc2e6d1a3f40395e988f00f6c2335cd22fe962d0a9a6ae3ccfd879afb05965916f8f333fb677e89e7b7080f5c977a3b0
+AUX radmind-1.7.0-gentoo.patch 850 BLAKE2B 3ad977b414913caa868e6bb967f73fb0920c2a59fe91f22617f27aec89a7750e0b3b67cf8eaa383d3b3a5326f1033346b507ec46bfdb48fafda0a1551da549e5 SHA512 9eb98ce293fa9c1dae22ec596353deae2e9262427ead062890ef7848fb5fdff1e061b4bacef681465eee2b17d06c371b01c12e547538e0b9385ebfffb9b46a72
+AUX radmind-1.7.1-dnssd.patch 493 BLAKE2B 8c431769b3908b6961380d5da1b54a64cc10ed00c77900f08a680a5782df0b204cf63be9155ba62fea1d637e4ae7ffe84ce1e2745ae0488e4fcab2ff3faad6f1 SHA512 95577070b42d8abc754c1ae235a8d40bd15acbea71b560a8defd69f2becf8c89b592420d872b93409eb142731b7ea0a5180394218ed440d7d633a6e004b7aaa7
+DIST radmind-1.14.1.tar.gz 403553 BLAKE2B ea89c7c28714134df3d9f9ab522c4499590f5f08f3b5d6c0d02c750ee896922720d66e4f08dac70fe93933da0fa5d8776fdf0f7d32b926d76ece27cbcedb87ad SHA512 bccf9681a6899be3b500065237dd1e04cd83ffb6f9be0e355412e7b0c556325f7d13435cec65a8a5e156e4411da915744f01a615472f6361d52c4d54d8be20eb
+EBUILD radmind-1.14.1-r1.ebuild 827 BLAKE2B d2165ad597c05eb169f8ed4b45bf6e7baae6c02a5b4c463c39e5724ce34a5b1dfcb716faa42e52626b3305c29fd3147fa5a92d3bfcaeb6be45eef833aa2e736e SHA512 d98f6ad920a8fc0e0c61979af4414877a6a0318842e13c27337dd55229b4ee6137a425858881b7fa46e7b8f7cd06f6fcf9e343220a6e60a9df384af43b68780a
+MISC metadata.xml 404 BLAKE2B 365cee5ab102123ebee500dc96ba31bc9b47b9e415c1a6b5f682adc011d62f460a09174888f444ecdd6136b86843a55aa64ab15dd9e7af00ffa628099b87b261 SHA512 cac73072027c59e6e34a3eee8cb602d72601306e5f1d8d4b4214d12b900320f0f7cc7f4a8f0a6590e2f6286799d0f96d3edf5c14d85b4f586ae9ad1293138577
diff --git a/app-admin/radmind/files/radmind-1.14.0-parallel-make.patch b/app-admin/radmind/files/radmind-1.14.0-parallel-make.patch
new file mode 100644
index 000000000000..63c52ba33066
--- /dev/null
+++ b/app-admin/radmind/files/radmind-1.14.0-parallel-make.patch
@@ -0,0 +1,50 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -204,37 +204,37 @@
+ radmind : libsnet/libsnet.la ${RADMIND_OBJ} Makefile
+ 	${CC} ${CFLAGS} -o radmind ${RADMIND_OBJ} ${LDFLAGS}
+ 
+-fsdiff : ${FSDIFF_OBJ}
++fsdiff : libsnet/libsnet.la ${FSDIFF_OBJ}
+ 	${CC} ${CFLAGS} -o fsdiff ${FSDIFF_OBJ} ${LDFLAGS}
+ 
+-ktcheck: ${KTCHECK_OBJ}
++ktcheck: libsnet/libsnet.la ${KTCHECK_OBJ}
+ 	${CC} ${CFLAGS} -o ktcheck ${KTCHECK_OBJ} ${LDFLAGS}
+ 
+-lapply: ${LAPPLY_OBJ}
++lapply: libsnet/libsnet.la ${LAPPLY_OBJ}
+ 	${CC} ${CFLAGS} -o lapply ${LAPPLY_OBJ} ${LDFLAGS}
+ 
+-lcksum: ${LCKSUM_OBJ}
++lcksum: libsnet/libsnet.la ${LCKSUM_OBJ}
+ 	${CC} ${CFLAGS} -o lcksum ${LCKSUM_OBJ} ${LDFLAGS}
+ 
+-lcreate: ${LCREATE_OBJ}
++lcreate: libsnet/libsnet.la ${LCREATE_OBJ}
+ 	${CC} ${CFLAGS} -o lcreate ${LCREATE_OBJ} ${LDFLAGS}
+ 
+-lmerge: ${LMERGE_OBJ}
++lmerge: libsnet/libsnet.la ${LMERGE_OBJ}
+ 	${CC} ${CFLAGS} -o lmerge ${LMERGE_OBJ} ${LDFLAGS}
+ 
+-lfdiff: ${LFDIFF_OBJ}
++lfdiff: libsnet/libsnet.la ${LFDIFF_OBJ}
+ 	${CC} ${CFLAGS} -o lfdiff ${LFDIFF_OBJ} ${LDFLAGS}
+ 
+-repo : ${REPO_OBJ}
++repo: libsnet/libsnet.la ${REPO_OBJ}
+ 	${CC} ${CFLAGS} -o repo ${REPO_OBJ} ${LDFLAGS}
+ 
+ t2pkg: ${T2PKG_OBJ}
+ 	${CC} ${CFLAGS} -o t2pkg ${T2PKG_OBJ} ${LDFLAGS}
+ 
+-twhich: ${TWHICH_OBJ}
++twhich: libsnet/libsnet.la ${TWHICH_OBJ}
+ 	${CC} ${CFLAGS} -o twhich ${TWHICH_OBJ} ${LDFLAGS}
+ 
+-lsort: ${LSORT_OBJ}
++lsort: libsnet/libsnet.la ${LSORT_OBJ}
+ 	${CC} ${CFLAGS} -o lsort ${LSORT_OBJ} ${LDFLAGS}
+ 
+ FRC :
diff --git a/app-admin/radmind/files/radmind-1.14.1-glibc225.patch b/app-admin/radmind/files/radmind-1.14.1-glibc225.patch
new file mode 100644
index 000000000000..60ff5925ae11
--- /dev/null
+++ b/app-admin/radmind/files/radmind-1.14.1-glibc225.patch
@@ -0,0 +1,22 @@
+diff -ruN radmind-1.14.1.orig/transcript.c radmind-1.14.1/transcript.c
+--- radmind-1.14.1.orig/transcript.c	2010-12-13 04:42:49.000000000 +0100
++++ radmind-1.14.1/transcript.c	2017-10-20 23:07:47.126110238 +0200
+@@ -6,6 +6,7 @@
+ #include "config.h"
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/param.h>
+ #ifdef sun
+ #include <sys/mkdev.h>
+diff -ruN radmind-1.14.1.orig/update.c radmind-1.14.1/update.c
+--- radmind-1.14.1.orig/update.c	2010-12-13 04:42:49.000000000 +0100
++++ radmind-1.14.1/update.c	2017-10-20 23:07:29.173898776 +0200
+@@ -6,6 +6,7 @@
+ #include "config.h"
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/param.h>
+ #ifdef sun
diff --git a/app-admin/radmind/files/radmind-1.7.0-gentoo.patch b/app-admin/radmind/files/radmind-1.7.0-gentoo.patch
new file mode 100644
index 000000000000..1734abdb51be
--- /dev/null
+++ b/app-admin/radmind/files/radmind-1.7.0-gentoo.patch
@@ -0,0 +1,29 @@
+diff -Naur radmind-1.5.0/radmind.conf radmind-1.5.0-r1/radmind.conf
+--- radmind-1.5.0/radmind.conf	1970-01-01 01:00:00.000000000 +0100
++++ radmind-1.5.0-r1/radmind.conf	2005-02-24 23:04:12.379193384 +0100
+@@ -0,0 +1,3 @@
++# chose server dir here 
++# RADMIND_PATH="/srv/radmind"
++# RADMIND_OPTS="-D ${RADMIND_PATH} -p 6666"
+diff -Naur radmind-1.5.0/rc.radmind radmind-1.5.0-r1/rc.radmind
+--- radmind-1.5.0/rc.radmind	1970-01-01 01:00:00.000000000 +0100
++++ radmind-1.5.0-r1/rc.radmind	2005-02-24 23:04:12.379193384 +0100
+@@ -0,0 +1,18 @@
++#!/sbin/openrc-run
++
++depend (){
++  need net
++}
++
++start(){
++  ebegin "Starting radmind server"
++  start-stop-daemon --start --quiet --exec /usr/sbin/radmind \
++  -- ${RADMIND_OPTS}
++  eend $?
++}
++
++stop() {
++  ebegin "Stopping radmind"
++  start-stop-daemon --stop --quiet --exec /usr/sbin/radmind
++  eend $?
++}
diff --git a/app-admin/radmind/files/radmind-1.7.1-dnssd.patch b/app-admin/radmind/files/radmind-1.7.1-dnssd.patch
new file mode 100644
index 000000000000..fe71ee013d1b
--- /dev/null
+++ b/app-admin/radmind/files/radmind-1.7.1-dnssd.patch
@@ -0,0 +1,22 @@
+diff -ru radmind-1.7.1~/configure radmind-1.7.1/configure
+--- radmind-1.7.1~/configure	2007-02-10 19:20:01.000000000 +0100
++++ radmind-1.7.1/configure	2007-02-10 19:22:04.000000000 +0100
+@@ -5265,12 +5265,12 @@
+ echo "${ECHO_T}$ac_cv_header_dns_sd_h" >&6
+ 
+ fi
+-if test $ac_cv_header_dns_sd_h = yes; then
+-  cat >>confdefs.h <<\_ACEOF
+-#define HAVE_DNSSD 1
+-_ACEOF
+-
+-fi
++#if test $ac_cv_header_dns_sd_h = yes; then
++#  cat >>confdefs.h <<\_ACEOF
++##define HAVE_DNSSD 1
++#_ACEOF
++#
++#fi
+ 
+ 
+ 
diff --git a/app-admin/radmind/metadata.xml b/app-admin/radmind/metadata.xml
new file mode 100644
index 000000000000..482e81520aa1
--- /dev/null
+++ b/app-admin/radmind/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>A suite of Unix command-line tools and a server designed to remotely administer
+the file systems of multiple Unix machines.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">radmind</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/radmind/radmind-1.14.1-r1.ebuild b/app-admin/radmind/radmind-1.14.1-r1.ebuild
new file mode 100644
index 000000000000..f571df699003
--- /dev/null
+++ b/app-admin/radmind/radmind-1.14.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="command-line tools and server to remotely administer multiple Unix filesystems"
+HOMEPAGE="http://rsug.itd.umich.edu/software/radmind/"
+SRC_URI="mirror://sourceforge/radmind/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libressl"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+	!dev-util/repo"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7.0-gentoo.patch
+	# remove dnssd as it doesn't compile
+	epatch "${FILESDIR}"/${PN}-1.7.1-dnssd.patch
+	epatch "${FILESDIR}"/${PN}-1.14.0-parallel-make.patch
+	epatch "${FILESDIR}"/${PN}-1.14.1-glibc225.patch
+}
+
+src_install() {
+	default
+	dodoc README VERSION COPYRIGHT
+}
diff --git a/app-admin/ranpwd-1.2 b/app-admin/ranpwd-1.2
deleted file mode 100644
index b81a1540c6cb..000000000000
--- a/app-admin/ranpwd-1.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install test
-DESCRIPTION=Generate random passwords using the in-kernel cryptographically
-EAPI=6
-HOMEPAGE=https://www.kernel.org/pub/software/utils/admin/ranpwd/
-KEYWORDS=amd64 ~ia64 ppc ppc64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://kernel/software/utils/admin/ranpwd/ranpwd-1.2.tar.gz
-_md5_=cc345d09fd8eaddbfe77e100dab5fddb
diff --git a/app-admin/ranpwd/Manifest b/app-admin/ranpwd/Manifest
new file mode 100644
index 000000000000..cd693ac4dcd4
--- /dev/null
+++ b/app-admin/ranpwd/Manifest
@@ -0,0 +1,3 @@
+DIST ranpwd-1.2.tar.gz 41018 BLAKE2B 787907c5ed7541f24846e4574c4e40005b85d33667d4ac2a85633085976d047271de797c2f1de3bb0e34cdd56b8b2b60ea8ae80b478c3f1d1124a413a01e351b SHA512 7ae8ff593623a2102e50fbb3356889291408263100a358de14bd44b13c1d2931bf0e1e8ec972a620b8328a179a38a0d614099ffea2473079f9ed2425809a922f
+EBUILD ranpwd-1.2.ebuild 587 BLAKE2B 878584c6678c6466143bea5081f75ea06ea92669cf319645a03691ca5c34c72385de6aae45ec86b94bc5ce31a5412aae021e56dfb7e6e17cf86bae71e5136164 SHA512 bf023072d578df154a95dda6907cbe7c2967cc493206e020dac9d555c88877d90aa41f33ea8cd8ae4c9f539094724d82062011130ce9fa2336ee2a68ca5e4f44
+MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-admin/ranpwd/metadata.xml b/app-admin/ranpwd/metadata.xml
new file mode 100644
index 000000000000..f1c3d59fb213
--- /dev/null
+++ b/app-admin/ranpwd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/ranpwd/ranpwd-1.2.ebuild b/app-admin/ranpwd/ranpwd-1.2.ebuild
new file mode 100644
index 000000000000..14866c580ca2
--- /dev/null
+++ b/app-admin/ranpwd/ranpwd-1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Generate random passwords using the in-kernel cryptographically"
+HOMEPAGE="https://www.kernel.org/pub/software/utils/admin/ranpwd/"
+SRC_URI="mirror://kernel/software/utils/admin/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_test() {
+	einfo "generating random passwords"
+	for a in 1 2 3 4 5 6 7 8 9
+	do
+		./ranpwd $(($a * 10))
+	done
+}
+
+src_install() {
+	emake INSTALLROOT="${D}" install
+}
diff --git a/app-admin/rasdaemon-0.6.0 b/app-admin/rasdaemon-0.6.0
deleted file mode 100644
index b53037577f1d..000000000000
--- a/app-admin/rasdaemon-0.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Reliability, Availability and Serviceability logging tool
-EAPI=6
-HOMEPAGE=http://www.infradead.org/~mchehab/rasdaemon/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-devel/gettext dev-db/sqlite sys-apps/dmidecode
-SLOT=0
-SRC_URI=http://www.infradead.org/~mchehab/rasdaemon/rasdaemon-0.6.0.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cc823e441deb55a010cc641d53f6c74f
diff --git a/app-admin/rasdaemon-0.6.0-r1 b/app-admin/rasdaemon-0.6.0-r1
deleted file mode 100644
index 627bf5e7e31d..000000000000
--- a/app-admin/rasdaemon-0.6.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Reliability, Availability and Serviceability logging tool
-EAPI=6
-HOMEPAGE=http://www.infradead.org/~mchehab/rasdaemon/
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-devel/gettext dev-db/sqlite sys-apps/dmidecode
-SLOT=0
-SRC_URI=http://www.infradead.org/~mchehab/rasdaemon/rasdaemon-0.6.0.tar.bz2
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=80cf1dd4948e254307b5e5dc3e923266
diff --git a/app-admin/rasdaemon-0.6.1 b/app-admin/rasdaemon-0.6.1
deleted file mode 100644
index b5c44d33dbb5..000000000000
--- a/app-admin/rasdaemon-0.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Reliability, Availability and Serviceability logging tool
-EAPI=6
-HOMEPAGE=http://www.infradead.org/~mchehab/rasdaemon/
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-devel/gettext dev-db/sqlite sys-apps/dmidecode
-SLOT=0
-SRC_URI=http://www.infradead.org/~mchehab/rasdaemon/rasdaemon-0.6.1.tar.bz2
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=15391b7cd0fc06200251aaad42fbaa81
diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
new file mode 100644
index 000000000000..065ec9818416
--- /dev/null
+++ b/app-admin/rasdaemon/Manifest
@@ -0,0 +1,6 @@
+DIST rasdaemon-0.6.0.tar.bz2 361721 BLAKE2B af992c810024df4f553727b4aff4f4f1d41cb3f7e458ac91916ccbac6815b6ade697f0c49bf1e072205c7f872cfc9c2f7223fe0d3f090064ffaa0bab002d4f67 SHA512 cb363ee9968dab10951077edea6558adc235c2ba1a57294ccf2d483c49af3366bcec0a5857fe2b475a5407de850f706c44bfe4d8a80bcfb53b1c7e2d101ba72f
+DIST rasdaemon-0.6.1.tar.bz2 363201 BLAKE2B bdc7ec3c2e7e4b2fee02dddc55b5afd82df64717f45da15dbfd5fee87721b80ac425af5806ee7462cad29c6ab2953a2e649c4b1e455983d8821a1f633d76c85d SHA512 a221a7ea0e4555befbf8acb9d4ce22d5cc7861a0da458111a24905fa06be0e8f3b18d8de5334310a423657febc0532d2705236de89cb1788302bf487ede29f60
+EBUILD rasdaemon-0.6.0-r1.ebuild 906 BLAKE2B 90cff87350e41d02fec42bcd123023d974e5cc08a79c5e1a8b87516c5b4d8f5b86f280d7891097dbc57d0d94aa227d95b8391b2d300321b902f13794a124c88e SHA512 975cd7e0555bcf6a9c685d3822a83e70b20bc0085a552556f0304470c6a1c5e78381182d45d9d50c4b59266aaff44719632f09e0ab1c264a90492c9ed837056f
+EBUILD rasdaemon-0.6.0.ebuild 723 BLAKE2B 03c921e0ef2eb1047410c4c15299a1141325fa00ed6f3145197189baa9b4461527718e14b258da0ad4ab5b0fc4abeec0ecaf50ebdfb83bcdb507e2afed59346c SHA512 492b51108bd5349a88e71b78c76125ed2ba1c020d8e96eef161d763ad798238bc8e03dd852ccb6c266acb5255c32599754c4c917f7a000e7d2257594b48128c4
+EBUILD rasdaemon-0.6.1.ebuild 910 BLAKE2B 0fc242674ee2d56ca5cc2aa99443c50fa04d28aac5ed2a07dba275b88b2aee63d26af63306ff799367e7ed24eb1fc682cdb2207b161cf08a8502bed1f5e7482a SHA512 a783ad0757afa54967ac51a94841f608a2b51e243f823c3be0afb87a08afc5188b5c3949da89ed2be8cd28a8b5ae2d28264c942711b02e82f9119b6ad723fdea
+MISC metadata.xml 871 BLAKE2B c9b484c2fd3019681f9c335fc046c7718c35bcafd9fa46f59328c68fb4404571818b861cb938bcb00fa08a164688a58735d7db27e73120597cd114a3a39acaba SHA512 1815bc3a92340071b40de8129441bbf55fee7edbec94f5337d6a9b42311cc3c1d898598d0756b60b56d804629700a2c0109362933acf5442a74097e752b24935
diff --git a/app-admin/rasdaemon/metadata.xml b/app-admin/rasdaemon/metadata.xml
new file mode 100644
index 000000000000..2e59b91513af
--- /dev/null
+++ b/app-admin/rasdaemon/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		Rasdaemon is a RAS (Reliability, Availability and Serviceability) logging tool.
+It currently records memory errors, using the EDAC tracing events.
+EDAC is drivers in the Linux kernel that handle detection of ECC errors
+from memory controllers for most chipsets on i386 and x86_64 architectures.
+EDAC drivers for other architectures like arm also exists.
+This userspace component consists of an init script which makes sure
+EDAC drivers and DIMM labels are loaded at system startup, as well as
+an utility for reporting current error counts from the EDAC sysfs files.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.0-r1.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..aa124a97770d
--- /dev/null
+++ b/app-admin/rasdaemon/rasdaemon-0.6.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd
+
+DESCRIPTION="Reliability, Availability and Serviceability logging tool"
+HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
+SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	sys-devel/gettext
+	dev-db/sqlite
+	sys-apps/dmidecode
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	local CONFIG_CHECK="FUNCTION_TRACER FUNCTION_GRAPH_TRACER STACK_TRACER DYNAMIC_FTRACE"
+	check_extra_config
+}
+
+src_configure() {
+	econf --enable-abrt-report \
+		--enable-aer \
+		--enable-arm \
+		--enable-extlog \
+		--enable-hisi-ns-decode \
+		--enable-mce \
+		--enable-non-standard \
+		--enable-sqlite3 \
+		--localstatedir=/var
+}
+
+src_install() {
+	default
+	systemd_dounit misc/*.service
+}
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.0.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.0.ebuild
new file mode 100644
index 000000000000..7bb3e34c6e73
--- /dev/null
+++ b/app-admin/rasdaemon/rasdaemon-0.6.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Reliability, Availability and Serviceability logging tool"
+HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
+SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	sys-devel/gettext
+	dev-db/sqlite
+	sys-apps/dmidecode
+"
+
+src_configure() {
+	econf --enable-mce \
+		--enable-aer \
+		--enable-sqlite3 \
+		--enable-extlog \
+		--enable-abrt-report \
+		--enable-non-standard \
+		--enable-hisi-ns-decode \
+		--enable-arm
+}
+
+src_install() {
+	default
+	systemd_dounit misc/*.service
+}
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.1.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.1.ebuild
new file mode 100644
index 000000000000..fd97b294f4e1
--- /dev/null
+++ b/app-admin/rasdaemon/rasdaemon-0.6.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd
+
+DESCRIPTION="Reliability, Availability and Serviceability logging tool"
+HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
+SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	sys-devel/gettext
+	dev-db/sqlite
+	sys-apps/dmidecode
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	local CONFIG_CHECK="~FUNCTION_TRACER ~FUNCTION_GRAPH_TRACER ~STACK_TRACER ~DYNAMIC_FTRACE"
+	check_extra_config
+}
+
+src_configure() {
+	econf --enable-abrt-report \
+		--enable-aer \
+		--enable-arm \
+		--enable-extlog \
+		--enable-hisi-ns-decode \
+		--enable-mce \
+		--enable-non-standard \
+		--enable-sqlite3 \
+		--localstatedir=/var
+}
+
+src_install() {
+	default
+	systemd_dounit misc/*.service
+}
diff --git a/app-admin/rcm-1.3.1 b/app-admin/rcm-1.3.1
deleted file mode 100644
index 4331bdf40a84..000000000000
--- a/app-admin/rcm-1.3.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=test
-DEPEND=test? ( dev-util/cram )
-DESCRIPTION=rc file (dotfile) management
-EAPI=6
-HOMEPAGE=https://github.com/thoughtbot/rcm
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://thoughtbot.github.io/rcm/dist/rcm-1.3.1.tar.gz
-_md5_=a74aa869a1cc5d020ff480ebffb27581
diff --git a/app-admin/rcm/Manifest b/app-admin/rcm/Manifest
new file mode 100644
index 000000000000..ee626fb860f0
--- /dev/null
+++ b/app-admin/rcm/Manifest
@@ -0,0 +1,3 @@
+DIST rcm-1.3.1.tar.gz 89437 BLAKE2B d897b793158da3a5e3975e283bd209f43f98eeb085bfb235802e8f1e3249ce2e09de2d8c391f89f4684afb78adc6c0b2bd91267cc32dcfe87b6b22296b47f309 SHA512 1fd8ad6f8bee16177444469bddbef8d9b99f0b2bedc82c9833523370dfda4583c425f1ab8f2195f11236d1385553a2a49ead6d4c5f0803deeb56737b6836a0d9
+EBUILD rcm-1.3.1.ebuild 392 BLAKE2B 4bf90269b4c48782b17c6e92028956440dd4124baacd40f6bf78bd33e6d8d13ddc4a740ce1019e475827397d8ee267e1ca8f1810c50bbf57286461300133c08e SHA512 3aff0141d76288a814629fac6cdaed172627a64d4dac09291cce8cc56930943e09502ff3c6b74d22f7ca654eb25952f4a765c7f97a153f8b7474c730c89f2eba
+MISC metadata.xml 531 BLAKE2B bb5ebe54ebd4d547828eaa5c57b814c9ce235b1b38fbc1397e89a92ae2b7614595737b24594baa33f6d9c574b2a95edae3698b349a8481ea3f71fd3248dae057 SHA512 e78508053a0554f9ff72a04a5fbc7adf0b3d9a8f1b060361f58b15ff39b7fc2c2a7b50b44396b1a76a58c8896529932a80492df50e16ff4043ed51a26a74dff9
diff --git a/app-admin/rcm/metadata.xml b/app-admin/rcm/metadata.xml
new file mode 100644
index 000000000000..7fddc63a170e
--- /dev/null
+++ b/app-admin/rcm/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>fgtham@gmail.com</email>
+		<name>Florian Tham</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">thoughtbot/rcm</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		rcm is a management suite for dotfiles.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/rcm/rcm-1.3.1.ebuild b/app-admin/rcm/rcm-1.3.1.ebuild
new file mode 100644
index 000000000000..e068009d9cee
--- /dev/null
+++ b/app-admin/rcm/rcm-1.3.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="rc file (dotfile) management"
+HOMEPAGE="https://github.com/thoughtbot/rcm"
+SRC_URI="https://thoughtbot.github.io/${PN}/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-util/cram )"
+
+src_test() {
+	emake -j1 check
+}
diff --git a/app-admin/recursos-2.0-r1 b/app-admin/recursos-2.0-r1
deleted file mode 100644
index a021b1b89c41..000000000000
--- a/app-admin/recursos-2.0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Script to create html and text report about your system
-EAPI=4
-HOMEPAGE=http://www.josealberto.org
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-shells/bash net-analyzer/rrdtool[graph] virtual/imagemagick-tools
-SLOT=0
-SRC_URI=mirror://gentoo/recursos-2.0.tbz2
-_md5_=b0c71a9a0ab32d8809e71d8b422eb1c4
diff --git a/app-admin/recursos/Manifest b/app-admin/recursos/Manifest
new file mode 100644
index 000000000000..c1e47f92feb7
--- /dev/null
+++ b/app-admin/recursos/Manifest
@@ -0,0 +1,3 @@
+DIST recursos-2.0.tbz2 29480 BLAKE2B d7b5a4954349d6e2c940634057d4f47623ba91c62874ec4fac881060fe4687ecc606672d478717d06967f66d4cd0b65baf49fccd17984eb030b0b37eaf6a6a4f SHA512 391bd253b62cbc2afbf054baa368bef5f7847624889188829557244f132bf484d4d4652a8c524da95ae3b39909fbdc37796eb325839bcd5e8982f7dcb6cd89e4
+EBUILD recursos-2.0-r1.ebuild 1345 BLAKE2B 0587497ecbb7b4ebd3aaad19963312ac31d7a13b47bf807e6915c4278f7409e6132d4dbd2444f9386272f32597d69fd49a2d30d3791f89128d2ce46d0a3cde3f SHA512 e888a9380a30d0233e5462409e150e5ef6e8ffe82f08c3c0bd5e1ae87dfabf44a32fa9171d7d5b80e524d4a2237f0587864a82ac5d68094cfc4376503e01788e
+MISC metadata.xml 343 BLAKE2B 271d06ca6fc2950630d47ed10426768fb786a16a97d81fabc08733ee8dea9b9323700cb0997f3b118d13589b89fb901b444bfd8c128f07c418a36df3322c7ea3 SHA512 c22fa6dbdbf662e83e78a9aba6a66c72e4649cb11bf0261aaef8f068e14db18b96546a7271fbab3e5ed7caf3fbde6eba2a91affa44141e26e4c7546ba37d1635
diff --git a/app-admin/recursos/metadata.xml b/app-admin/recursos/metadata.xml
new file mode 100644
index 000000000000..06396fb885b9
--- /dev/null
+++ b/app-admin/recursos/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+		A set of script to extrac usefull info about your system and report it
+		in plain text or html. It can generate Grpahs using rrdtools.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/recursos/recursos-2.0-r1.ebuild b/app-admin/recursos/recursos-2.0-r1.ebuild
new file mode 100644
index 000000000000..7da26bdf3a76
--- /dev/null
+++ b/app-admin/recursos/recursos-2.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Script to create html and text report about your system"
+HOMEPAGE="http://www.josealberto.org"
+SRC_URI="mirror://gentoo/${P}.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash
+	net-analyzer/rrdtool[graph]
+	virtual/imagemagick-tools"
+
+S=${WORKDIR}/r2
+
+src_install() {
+	WWWDIR="/var/www/localhost/htdocs/R2"
+
+	insinto /etc
+	doins recursos2.conf
+
+	dobin R2createrrd.sh R2generarrd.sh R2updaterrd.sh Recursos2.sh
+
+	dodir ${WWWDIR}
+	insinto ${WWWDIR}
+	doins R2/*.html
+
+	dodir ${WWWDIR}/common
+	insinto ${WWWDIR}/common
+	doins R2/common/*
+
+	dodir ${WWWDIR}/rrd/mini
+}
+
+pkg_postinst() {
+	elog "Fist you must configure /etc/recursos2.conf"
+	elog "Then follow these steps:"
+	elog
+	elog "1. Run R2createrrd.sh"
+	elog
+	elog "2. Add crontab jobs (this is an example):"
+	elog "*/2 * * * *     root    /usr/bin/R2updaterrd.sh"
+	elog "*/5 * * * *     root    /usr/bin/R2generarrd.sh"
+	elog "*/10 * * * *    root    /usr/bin/Recursos2.sh \ "
+	elog "    title general system disks net \ "
+	elog "    > /var/www/localhost/htdocs/recursos.html"
+	elog
+	elog "You can use Recursos2.sh to extract info about your system"
+	elog "in html or plain text and mail the file or whatever."
+	elog
+}
diff --git a/app-admin/reportmagic-2.21 b/app-admin/reportmagic-2.21
deleted file mode 100644
index 686254326740..000000000000
--- a/app-admin/reportmagic-2.21
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=sys-libs/zlib media-libs/libpng media-libs/gd truetype? ( media-libs/freetype ) virtual/jpeg dev-perl/GD dev-perl/Config-IniFiles virtual/perl-File-Spec dev-perl/HTML-Tagset dev-perl/HTML-Parser dev-perl/GDGraph virtual/perl-File-Temp dev-perl/GD-Graph3d
-DESCRIPTION=Makes usable statistics from your web site log file analysis
-EAPI=5
-HOMEPAGE=http://www.reportmagic.org/
-IUSE=truetype
-KEYWORDS=x86 ppc amd64
-LICENSE=Artistic
-SLOT=0
-SRC_URI=http://www.reportmagic.org/rmagic-2.21.tar.gz
-_md5_=59d4cf1e2110241a173fa0fd2a88a4fa
diff --git a/app-admin/reportmagic/Manifest b/app-admin/reportmagic/Manifest
new file mode 100644
index 000000000000..7eecadbe4798
--- /dev/null
+++ b/app-admin/reportmagic/Manifest
@@ -0,0 +1,3 @@
+DIST rmagic-2.21.tar.gz 451179 BLAKE2B b52d8dc7473d8679c0698a4d053a9740e72242b5e4de75b9ac44b9f38709c81f61da3b2dda814f5ed1e503192891fe33f070fc037e88fe7cc26c542fc67da02a SHA512 ed9f4e6f8d6160afbe138125c4cb65010a08b95390117ebf07ccde289ff42b78664b1fe677e23f46a221d153889f807c545329936829fceeae4690b00732a637
+EBUILD reportmagic-2.21.ebuild 918 BLAKE2B 3218bd5697f4f2460a0f544d83d872209861e36b3ba7f7aa1b30ed7fc4073b7697302fdbe1863bfd0c2d0acb1b829fbf7d6ffc4e0be9fa66c5e6bdc2e8535297 SHA512 fc577503bb423740b65b3517c727810d2d762a6eba4b1b83e1c2dffeab3ca208d498126492ac96d459fe062f4cb197ef2dc69a0b04a87b81ae682c44529709d9
+MISC metadata.xml 275 BLAKE2B 3d57550415af007a55b63e9043ab4d6a6e77c51dbfd7e1e9368e18c0078e7a9f096ef3d5dbaf4d65ed3cf1bde0d32b184724ad06c93e654d07f9c4b83b1d04fd SHA512 8c3747aa12bd26e790ea267481292eb4ebfc2d27b7acb498547aae3d8479654ac9d13aecd61a49be21de831924ee3fb809d4da5a4c765127af10e13a9cb32fd2
diff --git a/app-admin/reportmagic/metadata.xml b/app-admin/reportmagic/metadata.xml
new file mode 100644
index 000000000000..9f889449d4a0
--- /dev/null
+++ b/app-admin/reportmagic/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		A report generating applicaton from web site log files.
+	</longdescription>
+	</pkgmetadata>
diff --git a/app-admin/reportmagic/reportmagic-2.21.ebuild b/app-admin/reportmagic/reportmagic-2.21.ebuild
new file mode 100644
index 000000000000..4f1aae122699
--- /dev/null
+++ b/app-admin/reportmagic/reportmagic-2.21.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Makes usable statistics from your web site log file analysis"
+HOMEPAGE="http://www.reportmagic.org/"
+SRC_URI="http://www.reportmagic.org/rmagic-${PV}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="x86 ppc amd64"
+IUSE="truetype"
+
+DEPEND="sys-libs/zlib
+	media-libs/libpng
+	media-libs/gd
+	truetype? ( media-libs/freetype )
+	virtual/jpeg
+	dev-perl/GD
+	dev-perl/Config-IniFiles
+	virtual/perl-File-Spec
+	dev-perl/HTML-Tagset
+	dev-perl/HTML-Parser
+	dev-perl/GDGraph
+	virtual/perl-File-Temp
+	dev-perl/GD-Graph3d"
+
+S="${WORKDIR}/rmagic-${PV}"
+
+src_unpack() {
+	unpack ${A} ; cd "${S}"
+
+	sed -i \
+		-e "s:^\$DEST.*:\$DEST='${D}/usr/share/reportmagic';:g" \
+		-e "s:^\$DOC.*:\$DOC='${D}/usr/share/doc/${PF}';:g" \
+		Install.PL \
+		|| die "sed failed"
+}
+
+src_install() {
+	perl Install.PL -no_modules
+}
diff --git a/app-admin/restart-services-0.14.1 b/app-admin/restart-services-0.14.1
deleted file mode 100644
index 50c6663f3f55..000000000000
--- a/app-admin/restart-services-0.14.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Tool to manage OpenRC services that need to be restarted
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mschiff/restart-services/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=app-admin/lib_users sys-apps/openrc
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mschiff/src/restart-services/restart-services-0.14.1.tgz
-_md5_=fe15888d8184ff66b98c706c67eb9020
diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
new file mode 100644
index 000000000000..381332c254ea
--- /dev/null
+++ b/app-admin/restart-services/Manifest
@@ -0,0 +1,3 @@
+DIST restart-services-0.14.1.tgz 20909 BLAKE2B 2f6b74fc6094be83e1872d2a6ca7abb02a49b5db65d81cd37f8161bac148e5fe0614502f1f06356ff9cd6c6ba03c416dae1eec3a86f48dc011bc6e28c1b076e3 SHA512 3434c4b6cdf9d02b035eba2cc67cebe8e06a2cf31c2d8627063b84224dcb6d44e276e1fcb82221ad77ab7ee7e16fa7ee58fb94b7849d40e6786d3fcfb6087866
+EBUILD restart-services-0.14.1.ebuild 2285 BLAKE2B 7eb13e920790aae88e74b10cce100923aa490726011cdc33f96d0a38be957a0cbdc44e13a52b51a8b3c8d30e33464f72073f49888ffc4c573a65287ed49624c7 SHA512 841a1c6fa9d4c8b435f015c1785dd7c39929c808d771b7095f89a2d2832664a5b8915b3dfe56db5d9e4898a3d21b93e2c8ae01fa4502f33e5396ec6508c55a53
+MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/app-admin/restart-services/metadata.xml b/app-admin/restart-services/metadata.xml
new file mode 100644
index 000000000000..ea6b59e79026
--- /dev/null
+++ b/app-admin/restart-services/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mschiff@gentoo.org</email>
+		<name>Marc Schiffbauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/restart-services/restart-services-0.14.1.ebuild b/app-admin/restart-services/restart-services-0.14.1.ebuild
new file mode 100644
index 000000000000..d83a7fafc540
--- /dev/null
+++ b/app-admin/restart-services/restart-services-0.14.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Tool to manage OpenRC services that need to be restarted"
+HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/"
+SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-admin/lib_users
+	sys-apps/openrc
+"
+
+src_install() {
+	dosbin restart-services
+	doman restart-services.1
+	keepdir /etc/restart-services.d
+	insinto /etc
+	doins restart-services.conf
+	dodoc README CHANGES
+
+	# remove after 2018/07/01
+	dosym restart-services /usr/sbin/restart_services
+
+	sed -i 's/^#include/include/' "${D}"/etc/restart-services.conf
+	cat>"${D}"/etc/restart-services.d/00-local.conf<<-EOF
+	# You may put your local changes here or in any other *.conf file
+	# in this directory so you can leave /etc/restart-services.conf as is.
+	# Example:
+	# *extend* SV_ALWAYS to match 'myservice'
+	# SV_ALWAYS+=( myservice )
+	EOF
+}
+
+pkg_postinst() {
+	local MAJOR MINOR
+	# migrate config data for versions < 0.13.2
+	if [[ $REPLACING_VERSIONS ]]; then
+		MAJOR=${REPLACING_VERSIONS%%.*}
+		MINOR=${REPLACING_VERSIONS%.*}
+		MINOR=${MINOR#*.}
+
+		if [[ $MAJOR -eq 0 && $MINOR -lt 14 ]]; then
+			einfo "Migrating config"
+			if [[ -e /etc/restart-services.d ]]; then
+				ewarn "/etc/restart-services.d already exists?!"
+				return
+			fi
+			if [[ -e /etc/restart-services.conf ]]; then
+				ewarn "/etc/restart-services.conf already exists?!"
+				return
+			fi
+
+			if [[ -f /etc/restart_services.d/00-local.conf ]]; then
+				sed -i 's/restart_services/restart-services/g' \
+					/etc/restart_services.d/00-local.conf
+			fi
+			if [[ $(ls /etc/restart_services.d/) ]]; then
+				mv -v /etc/restart_services.d/* /etc/restart-services.d/
+			fi
+			if [[ -f /etc/restart_services.d/.keep_app-admin_restart_services-0 ]]; then
+				rm -v /etc/restart_services.d/.keep_app-admin_restart_services-0
+			fi
+			if [[ -d /etc/restart_services.d ]]; then
+				rmdir -v /etc/restart_services.d
+			fi
+
+			if [[ -f /etc/restart_services.conf ]]; then
+				sed -i 's/restart_services/restart-services/g' \
+					/etc/restart_services.conf
+				mv /etc/restart_services.conf /etc/restart-services.conf
+			fi
+			einfo "done"
+		fi
+	fi
+}
diff --git a/app-admin/rex-1.3.3 b/app-admin/rex-1.3.3
deleted file mode 100644
index 24cc8894f3c0..000000000000
--- a/app-admin/rex-1.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/DBI dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes test? ( dev-perl/Test-UseAllModules virtual/perl-File-Temp ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=(R)?ex is a small script to ease the execution of remote commands
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/rex/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/DBI dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/F/FE/FERKI/Rex-1.3.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0643541b8039fff52cb9fc89a885a68c
diff --git a/app-admin/rex-1.4.0-r1 b/app-admin/rex-1.4.0-r1
deleted file mode 100644
index 40fea4f64f75..000000000000
--- a/app-admin/rex-1.4.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes test? ( dev-perl/Test-UseAllModules virtual/perl-File-Temp ) dev-lang/perl:=
-DESCRIPTION=(R)?ex is a small script to ease the execution of remote commands
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Rex/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/F/FE/FERKI/Rex-1.4.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=14164613f98e4a303e2340e5278d77c4
diff --git a/app-admin/rex-1.4.1 b/app-admin/rex-1.4.1
deleted file mode 100644
index 4a73d8ac8fed..000000000000
--- a/app-admin/rex-1.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes test? ( dev-perl/Test-UseAllModules virtual/perl-File-Temp ) dev-lang/perl:=
-DESCRIPTION=(R)?ex is a small script to ease the execution of remote commands
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Rex/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JF/JFRIED/Rex-1.4.1.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=bae67bc70ad4804119a8af9e982d071c
diff --git a/app-admin/rex-1.5.0 b/app-admin/rex-1.5.0
deleted file mode 100644
index b36a981dd7ee..000000000000
--- a/app-admin/rex-1.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Data-Validate-IP dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes test? ( dev-perl/Test-UseAllModules virtual/perl-File-Temp ) dev-lang/perl:=
-DESCRIPTION=(R)?ex is a small script to ease the execution of remote commands
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Rex/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Data-Validate-IP dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JF/JFRIED/Rex-1.5.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=91de31a3751359471f668ed92cfc6b07
diff --git a/app-admin/rex-1.6.0 b/app-admin/rex-1.6.0
deleted file mode 100644
index 0f630a157a77..000000000000
--- a/app-admin/rex-1.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Data-Validate-IP dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes test? ( dev-perl/JSON-MaybeXS dev-perl/Test-UseAllModules virtual/perl-File-Temp ) dev-lang/perl:=
-DESCRIPTION=(R)?ex is a small script to ease the execution of remote commands
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Rex/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Data-Validate-IP dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JF/JFRIED/Rex-1.6.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=bd2809e2eba7eae36bc20d59b7a53cba
diff --git a/app-admin/rex-9999 b/app-admin/rex-9999
deleted file mode 100644
index 60e05e66bae4..000000000000
--- a/app-admin/rex-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Data-Validate-IP dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes test? ( dev-perl/Test-UseAllModules virtual/perl-File-Temp ) dev-perl/Dist-Zilla dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome dev-perl/Dist-Zilla-Plugin-MetaProvides-Package dev-perl/Dist-Zilla-Plugin-OSPrereqs dev-perl/Dist-Zilla-Plugin-OurPkgVersion dev-perl/Dist-Zilla-Plugin-Test-MinimumVersion dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic dev-lang/perl:= >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=(R)?ex is a small script to ease the execution of remote commands
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/rex/
-IUSE=test
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Data-Validate-IP dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes dev-lang/perl:=
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=91de31a3751359471f668ed92cfc6b07
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
new file mode 100644
index 000000000000..d50f3f7eb0e0
--- /dev/null
+++ b/app-admin/rex/Manifest
@@ -0,0 +1,12 @@
+DIST Rex-1.3.3.tar.gz 274725 BLAKE2B a87576a136baac488a040098f2089412e6b53bb9bc4da94b5d8233adce37d20f75d39960da5bd94dda99bac6c69b51d8834e9481aaef0afdd9d728b2c15b24eb SHA512 b2331e400027568f59496ff52f0a19bd009f66fea2a5b80ed9055859f59f0057afa50f61934cccd5af434c6f60dfa99700bc3904127b822a5ae684cb8bb6c70c
+DIST Rex-1.4.0.tar.gz 289330 BLAKE2B 70d74753e5b04b05ea7a5507f5c8c19ae953b4cc28e55e4d52dd57bbe2b3084ec00195d9f65f1a4c0ba712238ba8efe0cc4b33f236a7c4f9bb429ad2f98af652 SHA512 d14489157860df1b32dd2b4af7ce8148a9693d66f59bc0ee228c7c4ff57f38f7b308212c18fc7c0aff7a585a76028a9de0a7a96f8eb58c2455d19bd6b2713eab
+DIST Rex-1.4.1.tar.gz 317358 BLAKE2B 8c12d54e86684ec224a75693f82fd4728af32a986f166d530bccc2d06c5087fdb29f067d4419f3160244d37c12ace6cd29ba1322992bcc9f4a481c06e00efa51 SHA512 07e7d950326aaa60e05977f2acb2ac90f07efe0d56411ba202a4c60a890c37e984c6786383623ac67f8e36052cf8436e8430fd024dde282a7d2530425b420e8e
+DIST Rex-1.5.0.tar.gz 327424 BLAKE2B ea735ebeef7a4d879ec61783c7ee803f198b4091882bbdbaee1b415330fcb20ba408f082e7ecaaa5c63664d905690bd6b5601d2d726ff20f5dc9d1f8c6d470a4 SHA512 43a1e147e5d2dccdc641479f2bf5449b0051651d152823738caf946bb3ceecb444011c3273f0c70ca5feab737702f6cd609f5b211eec8261e1facd80c82b6c73
+DIST Rex-1.6.0.tar.gz 331330 BLAKE2B cb3a2895c1b7fd775aa762e8af7fbfdf3d14aac0d4ed5cd32bc65f4eb2b7794e438015daf9602cea3a852ed17dd207c9647303a106d8fff2cc89b5ce7a5ff0a2 SHA512 8e4421e034ddf7337266ce2002e96cad12a632ff37742991685d2919e3b11a4f6f3348097fd36717ab83a38e2e46aa974d0e56c67568a857c30f7ea673a51cda
+EBUILD rex-1.3.3.ebuild 1141 BLAKE2B 605593249d74463ab84d33b3c678176ab3ef1884387ddd72d98ad970c3d511f64df35c08035c7d5117dd2a94cd3b286b6669a1c4c07f8f15df72a66d682d9601 SHA512 f2ed11f8acf92f45b0fa649f84d4849b8cac068cfeeac93010383e2f8463f820cf50da99b9f1f7c76bc7cc268728e26800e97ae99ac28ae2e2d56da4783cb3e4
+EBUILD rex-1.4.0-r1.ebuild 1129 BLAKE2B c8ecaff070f15ebf7e521368d32949f1421d0d033f865c85a8f3939c57501affa45c5bee769ee1a87a56a5d8365823d447cf8bd11b2fe868ab5f7609d503d54e SHA512 56e4de394eadb91801dfb686b56f4e2e84908cb4f5ef358c88e6f25f94512e6497d923a71d7ac8bfa3713ab7db26e22108f6a2260bee310c514a5e7407381be2
+EBUILD rex-1.4.1.ebuild 1130 BLAKE2B ceb39e880a747e3ac7c5ce2e3169c0568eb129d012a8a8e9e229812c9d9c892321b8d1444bff2bfd25a30fc474255b2f0468df694334b3df3ecf52779df295b0 SHA512 0dc625298b996064fbfdc389fda95b7bcc6bcee7d9321da2e0c54a658e6fe741a11d345472f2d19f331bd89c0bb1d1262d694229d1f48bac6310b03202e18784
+EBUILD rex-1.5.0.ebuild 3642 BLAKE2B ad40f99c572a599b4779aed76fb2176fd2e488c34063d1a440cdc9d3c5d45cb71bdaa5aa3be292ec086dc5f47036a4056a8ad53afaf46856479cc143c9f5b6f2 SHA512 10806ed105703e4a8eac0c85b9bb6d7176943e8aa7ff744cc681af6eb9e042eb1b08832ab79c27016b1157bd62c0fa60a3415bdc7847c96f168bcc1e3e14573a
+EBUILD rex-1.6.0.ebuild 3666 BLAKE2B c6c91980826f316f658cfba66ffcd6ea87a74063c5bc6643df6e2941bf9d3bbbecc49fd7baac7f0057ab1e9649d96d4a0c1bef35225c57e7159d43791ab24ac3 SHA512 7b366e5f94d555dc61748d4d085a546edd092b0d435e3308ff264908e7a528585ca665eb7d0f5baa823b9b6d842c029372324def3e68c9028a2dff89a9f638cc
+EBUILD rex-9999.ebuild 3642 BLAKE2B ad40f99c572a599b4779aed76fb2176fd2e488c34063d1a440cdc9d3c5d45cb71bdaa5aa3be292ec086dc5f47036a4056a8ad53afaf46856479cc143c9f5b6f2 SHA512 10806ed105703e4a8eac0c85b9bb6d7176943e8aa7ff744cc681af6eb9e042eb1b08832ab79c27016b1157bd62c0fa60a3415bdc7847c96f168bcc1e3e14573a
+MISC metadata.xml 23689 BLAKE2B 5aa6d9627f8f5b5564e231338a4b31893232a6593ba63278fdecf7cd345f1d7eadf756c4f0c77077c3b11b4b26646f9f1492c442cafb6f253d46cb3f72370e33 SHA512 136db3e5b2495b8e3b08feafeb4426c7692ee13d7366bec18e56e231d30823c3e36066a70538f0c3c972ec06955f746e8400819c22751caa164e1a72331a6148
diff --git a/app-admin/rex/metadata.xml b/app-admin/rex/metadata.xml
new file mode 100644
index 000000000000..8ff646c52b5c
--- /dev/null
+++ b/app-admin/rex/metadata.xml
@@ -0,0 +1,359 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>erkiferenc@gmail.com</email>
+		<name>Ferenc Erki</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>kentnl@gentoo.org</email>
+		<name>Kent Fredric</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">RexOps/Rex</remote-id>
+		<remote-id type="cpan">Rex</remote-id>
+		<remote-id type="cpan-module">Rex</remote-id>
+		<remote-id type="cpan-module">Rex::Args</remote-id>
+		<remote-id type="cpan-module">Rex::Args::Integer</remote-id>
+		<remote-id type="cpan-module">Rex::Args::Single</remote-id>
+		<remote-id type="cpan-module">Rex::Args::String</remote-id>
+		<remote-id type="cpan-module">Rex::Batch</remote-id>
+		<remote-id type="cpan-module">Rex::Box</remote-id>
+		<remote-id type="cpan-module">Rex::Box::Amazon</remote-id>
+		<remote-id type="cpan-module">Rex::Box::Base</remote-id>
+		<remote-id type="cpan-module">Rex::Box::KVM</remote-id>
+		<remote-id type="cpan-module">Rex::Box::VBox</remote-id>
+		<remote-id type="cpan-module">Rex::CLI</remote-id>
+		<remote-id type="cpan-module">Rex::CMDB</remote-id>
+		<remote-id type="cpan-module">Rex::CMDB::Base</remote-id>
+		<remote-id type="cpan-module">Rex::CMDB::YAML</remote-id>
+		<remote-id type="cpan-module">Rex::Cloud</remote-id>
+		<remote-id type="cpan-module">Rex::Cloud::Amazon</remote-id>
+		<remote-id type="cpan-module">Rex::Cloud::Base</remote-id>
+		<remote-id type="cpan-module">Rex::Cloud::Jiffybox</remote-id>
+		<remote-id type="cpan-module">Rex::Cloud::OpenStack</remote-id>
+		<remote-id type="cpan-module">Rex::Commands</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Augeas</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Box</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Cloud</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Cron</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::DB</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Download</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::File</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Fs</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Gather</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Host</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Inventory</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Iptables</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::JobControl</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Kernel</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::LVM</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::MD5</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Mkfs</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Network</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Notify</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Partition</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Pkg</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::PkgConf</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Process</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Rsync</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Run</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::SCM</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Service</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::SimpleCheck</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Sync</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Sysctl</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Tail</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Upload</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::User</remote-id>
+		<remote-id type="cpan-module">Rex::Commands::Virtualization</remote-id>
+		<remote-id type="cpan-module">Rex::Config</remote-id>
+		<remote-id type="cpan-module">Rex::Constants</remote-id>
+		<remote-id type="cpan-module">Rex::Cron</remote-id>
+		<remote-id type="cpan-module">Rex::Cron::Base</remote-id>
+		<remote-id type="cpan-module">Rex::Cron::FreeBSD</remote-id>
+		<remote-id type="cpan-module">Rex::Cron::Linux</remote-id>
+		<remote-id type="cpan-module">Rex::Cron::SunOS</remote-id>
+		<remote-id type="cpan-module">Rex::Exporter</remote-id>
+		<remote-id type="cpan-module">Rex::FS::File</remote-id>
+		<remote-id type="cpan-module">Rex::File::Parser::Data</remote-id>
+		<remote-id type="cpan-module">Rex::File::Parser::Ini</remote-id>
+		<remote-id type="cpan-module">Rex::Fork::Manager</remote-id>
+		<remote-id type="cpan-module">Rex::Fork::Task</remote-id>
+		<remote-id type="cpan-module">Rex::Group</remote-id>
+		<remote-id type="cpan-module">Rex::Group::Entry::Server</remote-id>
+		<remote-id type="cpan-module">Rex::Group::Lookup::Command</remote-id>
+		<remote-id type="cpan-module">Rex::Group::Lookup::DBI</remote-id>
+		<remote-id type="cpan-module">Rex::Group::Lookup::File</remote-id>
+		<remote-id type="cpan-module">Rex::Group::Lookup::INI</remote-id>
+		<remote-id type="cpan-module">Rex::Group::Lookup::XML</remote-id>
+		<remote-id type="cpan-module">Rex::Group::Lookup::YAML</remote-id>
+		<remote-id type="cpan-module">Rex::Hardware</remote-id>
+		<remote-id type="cpan-module">Rex::Hardware::Host</remote-id>
+		<remote-id type="cpan-module">Rex::Hardware::Kernel</remote-id>
+		<remote-id type="cpan-module">Rex::Hardware::Memory</remote-id>
+		<remote-id type="cpan-module">Rex::Hardware::Network</remote-id>
+		<remote-id type="cpan-module">Rex::Hardware::Network::Darwin</remote-id>
+		<remote-id type="cpan-module">Rex::Hardware::Network::FreeBSD</remote-id>
+		<remote-id type="cpan-module">Rex::Hardware::Network::Linux</remote-id>
+		<remote-id type="cpan-module">Rex::Hardware::Network::NetBSD</remote-id>
+		<remote-id type="cpan-module">Rex::Hardware::Network::OpenBSD</remote-id>
+		<remote-id type="cpan-module">Rex::Hardware::Network::Solaris</remote-id>
+		<remote-id type="cpan-module">Rex::Hardware::Swap</remote-id>
+		<remote-id type="cpan-module">Rex::Hardware::VirtInfo</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::Array</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::DBI</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::Encode</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::File::Spec</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::File::Stat</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::File::Stat::Unix</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::File::Stat::Win32</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::Hash</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::INI</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::IP</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::Misc</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::Path</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::Rexfile::ParamLookup</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::Run</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::SSH2</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::SSH2::Expect</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::System</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::URI</remote-id>
+		<remote-id type="cpan-module">Rex::Helper::UserAgent</remote-id>
+		<remote-id type="cpan-module">Rex::Hook</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Cache</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Cache::Base</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Cache::YAML</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Connection</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Connection::Base</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Connection::Fake</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Connection::HTTP</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Connection::HTTPS</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Connection::Local</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Connection::OpenSSH</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Connection::SSH</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Exec</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Exec::Base</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Exec::HTTP</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Exec::IOReader</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Exec::Local</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Exec::OpenSSH</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Exec::SSH</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Exec::Sudo</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Executor</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Executor::Base</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Executor::Default</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::File</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::File::Base</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::File::HTTP</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::File::Local</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::File::OpenSSH</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::File::SSH</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::File::Sudo</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Fs</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Fs::Base</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Fs::HTTP</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Fs::Local</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Fs::OpenSSH</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Fs::SSH</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Fs::Sudo</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Shell</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Shell::Ash</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Shell::Base</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Shell::Bash</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Shell::Csh</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Shell::Default</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Shell::Idrac</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Shell::Ksh</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Shell::Sh</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Shell::Tcsh</remote-id>
+		<remote-id type="cpan-module">Rex::Interface::Shell::Zsh</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::Bios</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::DMIDecode</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::DMIDecode::BaseBoard</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::DMIDecode::Bios</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::DMIDecode::CPU</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::DMIDecode::Memory</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::DMIDecode::MemoryArray</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::DMIDecode::Section</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::DMIDecode::SystemInformation</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::HP::ACU</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::Hal</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::Hal::Object</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::Hal::Object::Net</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::Hal::Object::Storage</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::Hal::Object::Volume</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::Proc</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::Proc::Cpuinfo</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::SMBios</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::SMBios::BaseBoard</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::SMBios::Bios</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::SMBios::CPU</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::SMBios::Memory</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::SMBios::MemoryArray</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::SMBios::Section</remote-id>
+		<remote-id type="cpan-module">Rex::Inventory::SMBios::SystemInformation</remote-id>
+		<remote-id type="cpan-module">Rex::Logger</remote-id>
+		<remote-id type="cpan-module">Rex::Notify</remote-id>
+		<remote-id type="cpan-module">Rex::Output</remote-id>
+		<remote-id type="cpan-module">Rex::Output::Base</remote-id>
+		<remote-id type="cpan-module">Rex::Output::JUnit</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg::ALT</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg::Arch</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg::Base</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg::Debian</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg::FreeBSD</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg::Gentoo</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg::Mageia</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg::NetBSD</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg::OpenBSD</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg::OpenWrt</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg::Redhat</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg::SuSE</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg::SunOS</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg::SunOS::OpenCSW</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg::SunOS::pkg</remote-id>
+		<remote-id type="cpan-module">Rex::Pkg::Ubuntu</remote-id>
+		<remote-id type="cpan-module">Rex::PkgConf</remote-id>
+		<remote-id type="cpan-module">Rex::PkgConf::Base</remote-id>
+		<remote-id type="cpan-module">Rex::PkgConf::Debian</remote-id>
+		<remote-id type="cpan-module">Rex::Profiler</remote-id>
+		<remote-id type="cpan-module">Rex::Report</remote-id>
+		<remote-id type="cpan-module">Rex::Report::Base</remote-id>
+		<remote-id type="cpan-module">Rex::Report::YAML</remote-id>
+		<remote-id type="cpan-module">Rex::Require</remote-id>
+		<remote-id type="cpan-module">Rex::Resource</remote-id>
+		<remote-id type="cpan-module">Rex::Resource::Common</remote-id>
+		<remote-id type="cpan-module">Rex::Resource::firewall</remote-id>
+		<remote-id type="cpan-module">Rex::Resource::firewall::Provider::base</remote-id>
+		<remote-id type="cpan-module">Rex::Resource::firewall::Provider::iptables</remote-id>
+		<remote-id type="cpan-module">Rex::Resource::firewall::Provider::ufw</remote-id>
+		<remote-id type="cpan-module">Rex::RunList</remote-id>
+		<remote-id type="cpan-module">Rex::SCM::Git</remote-id>
+		<remote-id type="cpan-module">Rex::SCM::Subversion</remote-id>
+		<remote-id type="cpan-module">Rex::Service</remote-id>
+		<remote-id type="cpan-module">Rex::Service::ALT</remote-id>
+		<remote-id type="cpan-module">Rex::Service::ALT::systemd</remote-id>
+		<remote-id type="cpan-module">Rex::Service::Arch::systemd</remote-id>
+		<remote-id type="cpan-module">Rex::Service::Base</remote-id>
+		<remote-id type="cpan-module">Rex::Service::Debian</remote-id>
+		<remote-id type="cpan-module">Rex::Service::Debian::systemd</remote-id>
+		<remote-id type="cpan-module">Rex::Service::FreeBSD</remote-id>
+		<remote-id type="cpan-module">Rex::Service::Gentoo</remote-id>
+		<remote-id type="cpan-module">Rex::Service::Gentoo::systemd</remote-id>
+		<remote-id type="cpan-module">Rex::Service::Mageia</remote-id>
+		<remote-id type="cpan-module">Rex::Service::Mageia::systemd</remote-id>
+		<remote-id type="cpan-module">Rex::Service::NetBSD</remote-id>
+		<remote-id type="cpan-module">Rex::Service::OpenBSD</remote-id>
+		<remote-id type="cpan-module">Rex::Service::OpenWrt</remote-id>
+		<remote-id type="cpan-module">Rex::Service::Redhat</remote-id>
+		<remote-id type="cpan-module">Rex::Service::Redhat::systemd</remote-id>
+		<remote-id type="cpan-module">Rex::Service::SuSE</remote-id>
+		<remote-id type="cpan-module">Rex::Service::SuSE::systemd</remote-id>
+		<remote-id type="cpan-module">Rex::Service::SunOS</remote-id>
+		<remote-id type="cpan-module">Rex::Service::SunOS::svcadm</remote-id>
+		<remote-id type="cpan-module">Rex::Service::Ubuntu</remote-id>
+		<remote-id type="cpan-module">Rex::Shared::Var</remote-id>
+		<remote-id type="cpan-module">Rex::Shared::Var::Array</remote-id>
+		<remote-id type="cpan-module">Rex::Shared::Var::Common</remote-id>
+		<remote-id type="cpan-module">Rex::Shared::Var::Hash</remote-id>
+		<remote-id type="cpan-module">Rex::Shared::Var::Scalar</remote-id>
+		<remote-id type="cpan-module">Rex::Sudo::File</remote-id>
+		<remote-id type="cpan-module">Rex::Task</remote-id>
+		<remote-id type="cpan-module">Rex::TaskList</remote-id>
+		<remote-id type="cpan-module">Rex::TaskList::Base</remote-id>
+		<remote-id type="cpan-module">Rex::TaskList::Parallel_ForkManager</remote-id>
+		<remote-id type="cpan-module">Rex::Template</remote-id>
+		<remote-id type="cpan-module">Rex::Template::NG</remote-id>
+		<remote-id type="cpan-module">Rex::Test</remote-id>
+		<remote-id type="cpan-module">Rex::Test::Base</remote-id>
+		<remote-id type="cpan-module">Rex::Test::Base::has_content</remote-id>
+		<remote-id type="cpan-module">Rex::Test::Base::has_cron</remote-id>
+		<remote-id type="cpan-module">Rex::Test::Base::has_cron_env</remote-id>
+		<remote-id type="cpan-module">Rex::Test::Base::has_dir</remote-id>
+		<remote-id type="cpan-module">Rex::Test::Base::has_file</remote-id>
+		<remote-id type="cpan-module">Rex::Test::Base::has_file_content</remote-id>
+		<remote-id type="cpan-module">Rex::Test::Base::has_output</remote-id>
+		<remote-id type="cpan-module">Rex::Test::Base::has_output_matching</remote-id>
+		<remote-id type="cpan-module">Rex::Test::Base::has_package</remote-id>
+		<remote-id type="cpan-module">Rex::Test::Base::has_service_running</remote-id>
+		<remote-id type="cpan-module">Rex::Test::Base::has_service_stopped</remote-id>
+		<remote-id type="cpan-module">Rex::Test::Base::has_stat</remote-id>
+		<remote-id type="cpan-module">Rex::Transaction</remote-id>
+		<remote-id type="cpan-module">Rex::User</remote-id>
+		<remote-id type="cpan-module">Rex::User::Base</remote-id>
+		<remote-id type="cpan-module">Rex::User::FreeBSD</remote-id>
+		<remote-id type="cpan-module">Rex::User::Linux</remote-id>
+		<remote-id type="cpan-module">Rex::User::NetBSD</remote-id>
+		<remote-id type="cpan-module">Rex::User::OpenBSD</remote-id>
+		<remote-id type="cpan-module">Rex::User::OpenWrt</remote-id>
+		<remote-id type="cpan-module">Rex::User::SunOS</remote-id>
+		<remote-id type="cpan-module">Rex::Value</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Base</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Docker</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Docker::create</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Docker::daemon</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Docker::delete</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Docker::destroy</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Docker::info</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Docker::list</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Docker::reboot</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Docker::shutdown</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Docker::start</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::blklist</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::clone</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::create</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::delete</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::destroy</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::dumpxml</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::guestinfo</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::hypervisor</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::iflist</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::import</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::info</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::list</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::option</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::reboot</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::shutdown</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::start</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::status</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::LibVirt::vncdisplay</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Lxc</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Lxc::attach</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Lxc::copy</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Lxc::create</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Lxc::destroy</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Lxc::info</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Lxc::list</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Lxc::start</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::Lxc::stop</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::VBox</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::VBox::bridge</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::VBox::create</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::VBox::delete</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::VBox::destroy</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::VBox::forward_port</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::VBox::guestinfo</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::VBox::import</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::VBox::info</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::VBox::list</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::VBox::option</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::VBox::reboot</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::VBox::share_folder</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::VBox::shutdown</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::VBox::start</remote-id>
+		<remote-id type="cpan-module">Rex::Virtualization::VBox::status</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/rex/rex-1.3.3.ebuild b/app-admin/rex/rex-1.3.3.ebuild
new file mode 100644
index 000000000000..6081b372fac1
--- /dev/null
+++ b/app-admin/rex/rex-1.3.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MODULE_AUTHOR=FERKI
+MODULE_A=Rex-${PV}.tar.gz
+
+inherit perl-module
+
+DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/DBI
+	dev-perl/Digest-HMAC
+	dev-perl/Digest-SHA1
+	dev-perl/Expect
+	dev-perl/Hash-Merge
+	dev-perl/IO-String
+	dev-perl/IO-Tty
+	dev-perl/IPC-Shareable
+	dev-perl/JSON-XS
+	dev-perl/List-MoreUtils
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SFTP-Foreign
+	dev-perl/Parallel-ForkManager
+	dev-perl/Sort-Naturally
+	dev-perl/String-Escape
+	dev-perl/TermReadKey
+	dev-perl/Text-Glob
+	dev-perl/URI
+	dev-perl/XML-LibXML
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl
+	dev-perl/YAML
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Digest-MD5
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+	virtual/perl-MIME-Base64
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Storable
+	virtual/perl-Time-HiRes
+"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-perl/Test-UseAllModules
+		virtual/perl-File-Temp
+	)
+"
+
+SRC_TEST="do"
+
+S="${WORKDIR}/Rex-${PV}"
diff --git a/app-admin/rex/rex-1.4.0-r1.ebuild b/app-admin/rex/rex-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..7fdb6b904a41
--- /dev/null
+++ b/app-admin/rex/rex-1.4.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=FERKI
+DIST_NAME=Rex
+
+inherit perl-module
+
+DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/DBI
+	dev-perl/Devel-Caller
+	dev-perl/Digest-HMAC
+	dev-perl/Digest-SHA1
+	dev-perl/Expect
+	dev-perl/Hash-Merge
+	dev-perl/IO-String
+	dev-perl/IO-Tty
+	dev-perl/IPC-Shareable
+	dev-perl/JSON-XS
+	dev-perl/List-MoreUtils
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SFTP-Foreign
+	dev-perl/Parallel-ForkManager
+	dev-perl/Sort-Naturally
+	dev-perl/String-Escape
+	dev-perl/TermReadKey
+	dev-perl/Test-Deep
+	dev-perl/Text-Glob
+	dev-perl/URI
+	dev-perl/XML-LibXML
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl
+	dev-perl/YAML
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Digest-MD5
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+	virtual/perl-MIME-Base64
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Storable
+	virtual/perl-Time-HiRes
+"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-perl/Test-UseAllModules
+		virtual/perl-File-Temp
+	)
+"
diff --git a/app-admin/rex/rex-1.4.1.ebuild b/app-admin/rex/rex-1.4.1.ebuild
new file mode 100644
index 000000000000..acaf671c78bd
--- /dev/null
+++ b/app-admin/rex/rex-1.4.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=JFRIED
+DIST_NAME=Rex
+
+inherit perl-module
+
+DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/DBI
+	dev-perl/Devel-Caller
+	dev-perl/Digest-HMAC
+	dev-perl/Digest-SHA1
+	dev-perl/Expect
+	dev-perl/Hash-Merge
+	dev-perl/IO-String
+	dev-perl/IO-Tty
+	dev-perl/IPC-Shareable
+	dev-perl/JSON-XS
+	dev-perl/List-MoreUtils
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SFTP-Foreign
+	dev-perl/Parallel-ForkManager
+	dev-perl/Sort-Naturally
+	dev-perl/String-Escape
+	dev-perl/TermReadKey
+	dev-perl/Test-Deep
+	dev-perl/Text-Glob
+	dev-perl/URI
+	dev-perl/XML-LibXML
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl
+	dev-perl/YAML
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Digest-MD5
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+	virtual/perl-MIME-Base64
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Storable
+	virtual/perl-Time-HiRes
+"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-perl/Test-UseAllModules
+		virtual/perl-File-Temp
+	)
+"
diff --git a/app-admin/rex/rex-1.5.0.ebuild b/app-admin/rex/rex-1.5.0.ebuild
new file mode 100644
index 000000000000..d7c75b836fb6
--- /dev/null
+++ b/app-admin/rex/rex-1.5.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	GITHUB_USER=RexOps
+	GITHUB_REPO=Rex
+	EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}.git"
+	EGIT_BRANCH="development-1.x"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
+	VCS_ECLASS="git-r3"
+else
+	# This is intentional to stop perl-module.eclass doing magic things when it
+	# shouldn't. Like making ${S} contain "Rex" when the git clone has "rex"
+	# Also prevents perl-module.eclass provisioning SRC_URI
+	DIST_AUTHOR=JFRIED
+	DIST_NAME=Rex
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit perl-module ${VCS_ECLASS}
+
+DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
+
+SLOT="0"
+IUSE="test"
+
+DZIL_DEPENDS="
+	dev-perl/Dist-Zilla
+	dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome
+	dev-perl/Dist-Zilla-Plugin-MetaProvides-Package
+	dev-perl/Dist-Zilla-Plugin-OSPrereqs
+	dev-perl/Dist-Zilla-Plugin-OurPkgVersion
+	dev-perl/Dist-Zilla-Plugin-Test-MinimumVersion
+	dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic
+"
+
+RDEPEND="
+	dev-perl/Data-Validate-IP
+	dev-perl/DBI
+	dev-perl/Devel-Caller
+	dev-perl/Digest-HMAC
+	dev-perl/Digest-SHA1
+	dev-perl/Expect
+	dev-perl/Hash-Merge
+	dev-perl/IO-String
+	dev-perl/IO-Tty
+	dev-perl/IPC-Shareable
+	dev-perl/JSON-XS
+	dev-perl/List-MoreUtils
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SFTP-Foreign
+	dev-perl/Parallel-ForkManager
+	dev-perl/Sort-Naturally
+	dev-perl/String-Escape
+	dev-perl/TermReadKey
+	dev-perl/Test-Deep
+	dev-perl/Text-Glob
+	dev-perl/URI
+	dev-perl/XML-LibXML
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl
+	dev-perl/YAML
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Digest-MD5
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+	virtual/perl-MIME-Base64
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Storable
+	virtual/perl-Time-HiRes
+"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-perl/Test-UseAllModules
+		virtual/perl-File-Temp
+	)
+"
+
+[[ ${PV} == 9999 ]] && DEPEND+=" ${DZIL_DEPENDS}"
+
+src_unpack() {
+	if [[ $PV == 9999 ]]; then
+		"${VCS_ECLASS}"_src_unpack
+		mkdir -p "${S}" || die "Can't make ${S}"
+	else
+		default
+	fi
+}
+
+dzil_to_distdir() {
+	local dzil_root dest has_missing modname dzil_version
+	dzil_root="$1"
+	dest="$2"
+
+	cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
+
+	dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
+	einfo "Generating CPAN dist with ${dzil_version}"
+
+	has_missing=""
+
+	einfo "Checking dzil authordeps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+		has_missing=1
+			eerror "'dzil authordeps' indicates missing build dependencies"
+			eerror "These will prevent building, please report a bug"
+			eerror "Missing:"
+		fi
+		eerror "  ${modname}"
+	done < <( dzil authordeps --missing --versions )
+
+	[[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first"
+
+	einfo "Checking dzil build deps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+			has_missing=1
+			ewarn "'dzil listdeps' indicates missing build dependencies"
+			ewarn "These may prevent building, please report a bug if they do"
+			ewarn "Missing:"
+		fi
+		ewarn "  ${modname}"
+	done < <( dzil listdeps --missing --versions --author )
+
+	einfo "Generating release"
+	dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'"
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999 ]]; then
+		# Uses git sources in WORKDIR/rex-git
+		# to generate a CPAN-style tree in ${S}
+		# before letting perl-module.eclass do the rest
+		dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
+	fi
+	cd "${S}" || die "Can't enter build dir"
+	perl-module_src_prepare
+}
diff --git a/app-admin/rex/rex-1.6.0.ebuild b/app-admin/rex/rex-1.6.0.ebuild
new file mode 100644
index 000000000000..5a34558d4efe
--- /dev/null
+++ b/app-admin/rex/rex-1.6.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	GITHUB_USER=RexOps
+	GITHUB_REPO=Rex
+	EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}.git"
+	EGIT_BRANCH="development-1.x"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
+	VCS_ECLASS="git-r3"
+else
+	# This is intentional to stop perl-module.eclass doing magic things when it
+	# shouldn't. Like making ${S} contain "Rex" when the git clone has "rex"
+	# Also prevents perl-module.eclass provisioning SRC_URI
+	DIST_AUTHOR=JFRIED
+	DIST_NAME=Rex
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit perl-module ${VCS_ECLASS}
+
+DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
+
+SLOT="0"
+IUSE="test"
+
+DZIL_DEPENDS="
+	dev-perl/Dist-Zilla
+	dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome
+	dev-perl/Dist-Zilla-Plugin-MetaProvides-Package
+	dev-perl/Dist-Zilla-Plugin-OSPrereqs
+	dev-perl/Dist-Zilla-Plugin-OurPkgVersion
+	dev-perl/Dist-Zilla-Plugin-Test-MinimumVersion
+	dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic
+"
+
+RDEPEND="
+	dev-perl/Data-Validate-IP
+	dev-perl/DBI
+	dev-perl/Devel-Caller
+	dev-perl/Digest-HMAC
+	dev-perl/Digest-SHA1
+	dev-perl/Expect
+	dev-perl/Hash-Merge
+	dev-perl/IO-String
+	dev-perl/IO-Tty
+	dev-perl/IPC-Shareable
+	dev-perl/JSON-XS
+	dev-perl/List-MoreUtils
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SFTP-Foreign
+	dev-perl/Parallel-ForkManager
+	dev-perl/Sort-Naturally
+	dev-perl/String-Escape
+	dev-perl/TermReadKey
+	dev-perl/Test-Deep
+	dev-perl/Text-Glob
+	dev-perl/URI
+	dev-perl/XML-LibXML
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl
+	dev-perl/YAML
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Digest-MD5
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+	virtual/perl-MIME-Base64
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Storable
+	virtual/perl-Time-HiRes
+"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-perl/JSON-MaybeXS
+		dev-perl/Test-UseAllModules
+		virtual/perl-File-Temp
+	)
+"
+
+[[ ${PV} == 9999 ]] && DEPEND+=" ${DZIL_DEPENDS}"
+
+src_unpack() {
+	if [[ $PV == 9999 ]]; then
+		"${VCS_ECLASS}"_src_unpack
+		mkdir -p "${S}" || die "Can't make ${S}"
+	else
+		default
+	fi
+}
+
+dzil_to_distdir() {
+	local dzil_root dest has_missing modname dzil_version
+	dzil_root="$1"
+	dest="$2"
+
+	cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
+
+	dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
+	einfo "Generating CPAN dist with ${dzil_version}"
+
+	has_missing=""
+
+	einfo "Checking dzil authordeps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+		has_missing=1
+			eerror "'dzil authordeps' indicates missing build dependencies"
+			eerror "These will prevent building, please report a bug"
+			eerror "Missing:"
+		fi
+		eerror "  ${modname}"
+	done < <( dzil authordeps --missing --versions )
+
+	[[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first"
+
+	einfo "Checking dzil build deps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+			has_missing=1
+			ewarn "'dzil listdeps' indicates missing build dependencies"
+			ewarn "These may prevent building, please report a bug if they do"
+			ewarn "Missing:"
+		fi
+		ewarn "  ${modname}"
+	done < <( dzil listdeps --missing --versions --author )
+
+	einfo "Generating release"
+	dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'"
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999 ]]; then
+		# Uses git sources in WORKDIR/rex-git
+		# to generate a CPAN-style tree in ${S}
+		# before letting perl-module.eclass do the rest
+		dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
+	fi
+	cd "${S}" || die "Can't enter build dir"
+	perl-module_src_prepare
+}
diff --git a/app-admin/rex/rex-9999.ebuild b/app-admin/rex/rex-9999.ebuild
new file mode 100644
index 000000000000..d7c75b836fb6
--- /dev/null
+++ b/app-admin/rex/rex-9999.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	GITHUB_USER=RexOps
+	GITHUB_REPO=Rex
+	EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}.git"
+	EGIT_BRANCH="development-1.x"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
+	VCS_ECLASS="git-r3"
+else
+	# This is intentional to stop perl-module.eclass doing magic things when it
+	# shouldn't. Like making ${S} contain "Rex" when the git clone has "rex"
+	# Also prevents perl-module.eclass provisioning SRC_URI
+	DIST_AUTHOR=JFRIED
+	DIST_NAME=Rex
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit perl-module ${VCS_ECLASS}
+
+DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
+
+SLOT="0"
+IUSE="test"
+
+DZIL_DEPENDS="
+	dev-perl/Dist-Zilla
+	dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome
+	dev-perl/Dist-Zilla-Plugin-MetaProvides-Package
+	dev-perl/Dist-Zilla-Plugin-OSPrereqs
+	dev-perl/Dist-Zilla-Plugin-OurPkgVersion
+	dev-perl/Dist-Zilla-Plugin-Test-MinimumVersion
+	dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic
+"
+
+RDEPEND="
+	dev-perl/Data-Validate-IP
+	dev-perl/DBI
+	dev-perl/Devel-Caller
+	dev-perl/Digest-HMAC
+	dev-perl/Digest-SHA1
+	dev-perl/Expect
+	dev-perl/Hash-Merge
+	dev-perl/IO-String
+	dev-perl/IO-Tty
+	dev-perl/IPC-Shareable
+	dev-perl/JSON-XS
+	dev-perl/List-MoreUtils
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SFTP-Foreign
+	dev-perl/Parallel-ForkManager
+	dev-perl/Sort-Naturally
+	dev-perl/String-Escape
+	dev-perl/TermReadKey
+	dev-perl/Test-Deep
+	dev-perl/Text-Glob
+	dev-perl/URI
+	dev-perl/XML-LibXML
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl
+	dev-perl/YAML
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Digest-MD5
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+	virtual/perl-MIME-Base64
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Storable
+	virtual/perl-Time-HiRes
+"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-perl/Test-UseAllModules
+		virtual/perl-File-Temp
+	)
+"
+
+[[ ${PV} == 9999 ]] && DEPEND+=" ${DZIL_DEPENDS}"
+
+src_unpack() {
+	if [[ $PV == 9999 ]]; then
+		"${VCS_ECLASS}"_src_unpack
+		mkdir -p "${S}" || die "Can't make ${S}"
+	else
+		default
+	fi
+}
+
+dzil_to_distdir() {
+	local dzil_root dest has_missing modname dzil_version
+	dzil_root="$1"
+	dest="$2"
+
+	cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
+
+	dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
+	einfo "Generating CPAN dist with ${dzil_version}"
+
+	has_missing=""
+
+	einfo "Checking dzil authordeps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+		has_missing=1
+			eerror "'dzil authordeps' indicates missing build dependencies"
+			eerror "These will prevent building, please report a bug"
+			eerror "Missing:"
+		fi
+		eerror "  ${modname}"
+	done < <( dzil authordeps --missing --versions )
+
+	[[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first"
+
+	einfo "Checking dzil build deps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+			has_missing=1
+			ewarn "'dzil listdeps' indicates missing build dependencies"
+			ewarn "These may prevent building, please report a bug if they do"
+			ewarn "Missing:"
+		fi
+		ewarn "  ${modname}"
+	done < <( dzil listdeps --missing --versions --author )
+
+	einfo "Generating release"
+	dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'"
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999 ]]; then
+		# Uses git sources in WORKDIR/rex-git
+		# to generate a CPAN-style tree in ${S}
+		# before letting perl-module.eclass do the rest
+		dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
+	fi
+	cd "${S}" || die "Can't enter build dir"
+	perl-module_src_prepare
+}
diff --git a/app-admin/rsyslog-8.28.0-r1 b/app-admin/rsyslog-8.28.0-r1
deleted file mode 100644
index 0b5d1e377ae4..000000000000
--- a/app-admin/rsyslog-8.28.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.3:= >=dev-libs/libestr-0.1.9 >=dev-libs/liblogging-1.0.1:=[stdlog] >=sys-libs/zlib-1.2.5 dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) uuid? ( sys-apps/util-linux:0= ) zeromq? ( >=net-libs/zeromq-4.1.1:= >=net-libs/czmq-3.0.0 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig test? ( sys-libs/libfaketime ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=6
-HOMEPAGE=https://www.rsyslog.com/
-IUSE=dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq kernel_linux
-KEYWORDS=hppa
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.3:= >=dev-libs/libestr-0.1.9 >=dev-libs/liblogging-1.0.1:=[stdlog] >=sys-libs/zlib-1.2.5 dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) uuid? ( sys-apps/util-linux:0= ) zeromq? ( >=net-libs/zeromq-4.1.1:= >=net-libs/czmq-3.0.0 )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.28.0.tar.gz -> rsyslog-8.28.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.28.0.tar.gz -> rsyslog-docs-8.28.0.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1163a1557c2464a1d15d22eac2212511
diff --git a/app-admin/rsyslog-8.32.0-r4 b/app-admin/rsyslog-8.32.0-r4
deleted file mode 100644
index a093d0c5664f..000000000000
--- a/app-admin/rsyslog-8.32.0-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=dev-libs/liblogging-1.0.1:=[stdlog] >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) zeromq? ( >=net-libs/czmq-3.0.2 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=6
-HOMEPAGE=https://www.rsyslog.com/
-IUSE=curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq kernel_linux
-KEYWORDS=amd64 arm ~arm64 ~hppa x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=dev-libs/liblogging-1.0.1:=[stdlog] >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) zeromq? ( >=net-libs/czmq-3.0.2 )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.32.0.tar.gz -> rsyslog-8.32.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.32.0.tar.gz -> rsyslog-docs-8.32.0.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c21570bbe6b6a6da30dc984c88bc9f94
diff --git a/app-admin/rsyslog-8.33.1-r1 b/app-admin/rsyslog-8.33.1-r1
deleted file mode 100644
index 1585190a469f..000000000000
--- a/app-admin/rsyslog-8.33.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=dev-libs/liblogging-1.0.1:=[stdlog] >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) zeromq? ( >=net-libs/czmq-3.0.2 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=6
-HOMEPAGE=https://www.rsyslog.com/
-IUSE=curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=dev-libs/liblogging-1.0.1:=[stdlog] >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) zeromq? ( >=net-libs/czmq-3.0.2 )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.33.1.tar.gz -> rsyslog-8.33.1.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.33.1.tar.gz -> rsyslog-docs-8.33.1.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4fcd099bd8dfe8f4969856ac838de840
diff --git a/app-admin/rsyslog-8.34.0 b/app-admin/rsyslog-8.34.0
deleted file mode 100644
index 2405a1e8f383..000000000000
--- a/app-admin/rsyslog-8.34.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=dev-libs/liblogging-1.0.1:=[stdlog] >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) zeromq? ( >=net-libs/czmq-3.0.2 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=6
-HOMEPAGE=https://www.rsyslog.com/
-IUSE=curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq kernel_linux
-KEYWORDS=amd64 arm ~arm64 ~hppa x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=dev-libs/liblogging-1.0.1:=[stdlog] >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) zeromq? ( >=net-libs/czmq-3.0.2 )
-REQUIRED_USE=kubernetes? ( normalize )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.34.0.tar.gz -> rsyslog-8.34.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.34.0.tar.gz -> rsyslog-docs-8.34.0.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=913b94bf7e26a8999cb7b993ccc7b0bf
diff --git a/app-admin/rsyslog-8.35.0-r1 b/app-admin/rsyslog-8.35.0-r1
deleted file mode 100644
index 00fdea400e14..000000000000
--- a/app-admin/rsyslog-8.35.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=dev-libs/liblogging-1.0.1:=[stdlog] >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) zeromq? ( >=net-libs/czmq-3.0.2 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=6
-HOMEPAGE=https://www.rsyslog.com/
-IUSE=curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 ~hppa x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=dev-libs/liblogging-1.0.1:=[stdlog] >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) zeromq? ( >=net-libs/czmq-3.0.2 )
-REQUIRED_USE=kubernetes? ( normalize )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.35.0.tar.gz -> rsyslog-8.35.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.35.0.tar.gz -> rsyslog-docs-8.35.0.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=afef9d819d10f6fe5ecb695e05405f33
diff --git a/app-admin/rsyslog-8.36.0-r1 b/app-admin/rsyslog-8.36.0-r1
deleted file mode 100644
index 3092a9b9632e..000000000000
--- a/app-admin/rsyslog-8.36.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-3.0.2 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=6
-HOMEPAGE=https://www.rsyslog.com/
-IUSE=curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql normalize omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-3.0.2 )
-REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.36.0.tar.gz -> rsyslog-8.36.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.36.0.tar.gz -> rsyslog-docs-8.36.0.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c37417d7b33c5d2b444a085e2d54b2a7
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
new file mode 100644
index 000000000000..51193ce08206
--- /dev/null
+++ b/app-admin/rsyslog/Manifest
@@ -0,0 +1,32 @@
+AUX 8-stable/50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46672ce647e84a7de4b3a0dc5bfaf43f7317eddb902c4987266ae67f88b43375a51e82a3ffefbb61c4d099 SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3
+AUX 8-stable/50-default.conf 1701 BLAKE2B b14c89f70d405b206818d077190cf8fefd1a01db4cdd38f5012b09b4e3440e16b6a3ca7ff20cfa616622565b3477e7f4d44252d72d1c3cdf148a1b59f629442a SHA512 33e4e63239b9112fec1a37115ac80ab8dbd6e7189d9d29b1bc743c433e0124ea0d1a4cf6f7ada9e5b92e9b0025b6617a1a16f4c491e743bbf4327a5f376a1ea9
+AUX 8-stable/README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
+AUX 8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch 509 BLAKE2B e50fd76f239be9fe15a0a7c8dd2b5984af69487c5ffe5a4f12e415f9c4040e600c5552dbe66c32879729c0f497bf74f1f63730b2f4c6a9a658fd385cb684cf05 SHA512 70bfe4f95b23e4e88e5b7535a1b86742a02438f2eadc6fd2e82c66ebdc9d59d983c1ded7d4902dd5d7ef9413847398c1318df82bace3b7e5b1ca8bd23ca9e8e4
+AUX 8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch 3878 BLAKE2B 9f1a030807a312801ce6c66bb5120029b935bf5ba2029b4d7297713f865f509fd1761595ba05c479a1aa860c8564fe38bdebe51c3c36ab278aa518de0f2285dd SHA512 19765cbd9aa13cce9590ab08c4a626eba06b94fd4345b3fc3b77149ed9401ea91c41f00b105a5b7f15bae611f5b718abdac23fff9ec205c3385686203e6aa701
+AUX 8-stable/rsyslog-8.34.0-fix-issue2612.patch 558 BLAKE2B ad05cd0a3b3570821465faf9f01541164eb18b1355363ad2208d9ee148971e1b86fb47fa2a81da2050a13c750342b3643e24dcb4db78149e6495353805180e10 SHA512 5249be1b70070ae30a41feacce83feea1a97f76eda0b5b60c29e4db6d50f4d27be8ab66de6187343d5b881eaf19414c2b8766fc99523c52e51f6a7c9b62e7d94
+AUX 8-stable/rsyslog-8.35.0-fix-issue2719.patch 7561 BLAKE2B 4adc0643dcb42bcc33ba3f8fc878ea4996d22e06865680fad6c9f0bff9da27d55293732e17678a36ce33d4ff1d76049d8b9b55bd0eb6b4987c893b48bf5daddc SHA512 54ad784c328a4def4c46777ba3b4ebe3d451d9a5a6883e3e6bd912070c52aaf2e85fefd938d64cbbd87ef9ae4ac0b4685ad1c0e74ad2bdf02bfa247ddcca939d
+AUX 8-stable/rsyslog-8.35.0-fix-issue2726.patch 1726 BLAKE2B 3b406319098637b81f85127494fb921529eb2704ae9ac6a90e89e4655412220748bba6584f010de1ca17c0a19fbd01b5c56314f43c7eec329b71884d24f3df93 SHA512 421a6b67372b1b4cac459f6fae7a6e839d96c363f8cb5fa4d38b7c64b53752a9a6ae2c050dd8cc18464475a0601d5451ac51719bd85df9ac40eaebb498a4c23c
+AUX 8-stable/rsyslog-r1.logrotate 994 BLAKE2B 36dee881c2cb79ce69678c7cb12c71fb70d970e5e10728a8d2b8acf2c08f613cea9c2a74d78ed7b75333147a6b1a553fe281956990e044a9db651c7486690dee SHA512 5ca68b4eec5bebaed48edb69c85f8338273db847ab1cc6999ce7cfe06644dc3854c3040e0ebd8a4900c213b267b2a081e7901ceb4e58f9dfdc7dc036aff02b6c
+AUX 8-stable/rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
+AUX 8-stable/rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
+AUX 8-stable/rsyslog.initd-r1 1758 BLAKE2B 1af0e2371067ac2c51bff7b9c4442abba8d8a14714b7604e2f49d244fb08bef7614e73cbad201e6f4902504abd78ab32fdd093acb5714d53238353c8a9bd977e SHA512 0ddd385e77759370344032f52f945b1e90d4961140db63e2562e4be78dfc2bae16ac9439d40fe078110593999b5c5efd7680b402fc0771b1261ff28b1725e265
+AUX 8-stable/rsyslog.logrotate 682 BLAKE2B cb6a4a00895c5801c15621e52fb16c4b046a46f27bd21c5e76c253e62421f07826f603ab529e8a95f260925d58948a78c89f41c9b9f61e142217403ab454c02f SHA512 6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912
+DIST rsyslog-8.28.0.tar.gz 2471122 BLAKE2B 48ed55cbf02eca22591c3d1d59db8f956e4d852cbabb4ae8837767a2c843209a53becbe2a9f595290b44d79c8813414c20954ce1ccaa08bf0786423df79344e3 SHA512 e27ba0ff22e945393536abc5bc6e234d8849db291a5056429b59b47abe15fb060fc5c26efedcfe347b386d438b3f8a029ae4577a1d803666701431677f628cb1
+DIST rsyslog-8.32.0.tar.gz 2478990 BLAKE2B 21bfc93b55da107bec2eddb89cb42d76990ced2675caeb6e73183a109f9bc8293bde43f202bb56007f9ea4e49de385b004c158059cb13e8d3d376bf050ca445a SHA512 eea85d77bf3624fbad6f0838fa2a4af7c14d853c8f120f14cf697cdfda7f7e0692dab684d2ddd07fe44a0bcd50cf91baf69af1bb63dc9d60e19146f1150155ac
+DIST rsyslog-8.33.1.tar.gz 2494338 BLAKE2B 680ad2c062386e4e3e6c6e1a83cf0001d63da305edae9df527d1079a2fa13b8715e3cbfa211ca908e0005f1762becfd88369a7cd1488134564980137f0e98d86 SHA512 c4b426409e89463a8e8f7f9d0267f2fa1df1a84e947ce7bf91255db88b4cad5b7e607c476ba2db0543af069c44cdbb35330e0839696bf83668200e8ac009c6a0
+DIST rsyslog-8.34.0.tar.gz 2545544 BLAKE2B 66caf277a814563027183ecf267d76067c384adf8d6d7b8543203df9a7c37242722dd35445e4446aacf1e680f5f3957cea40ece8a284ef2a393b4a71e3a2b49c SHA512 69eaececa2f8b98799deac8e6cb2cf635a5117da7a21cbb0b880b7df1d83c6ccf16133dab099a6e5fb865f34c2dad164a1bf1952d16ca116af3b1dd35d15065e
+DIST rsyslog-8.35.0.tar.gz 2590108 BLAKE2B e201c1366b8ab96c070829d51de079212e82216a793eb7622aa91c66e2330981de8be547b1ee7f102ed7d8c8de054d58ba151e95238146a61fba8fe908c5f929 SHA512 3b8845fc057147c2dd740b3bb432e7fb101ad60be5c6bc86a2c2796bcd3f3526c617d45b9e8301388d51047a125ca18ba4ac54f8be2a13eabbbe8fb9361beecc
+DIST rsyslog-8.36.0.tar.gz 2639477 BLAKE2B 9c7343d853f79e2955a8999e2871a2a9b008cb3ef75b94e2381a3a0ff3e49445593d852d7de3819851dc0d4c17a91d966ca2fbfd52e8215ebdbaf6b7ccd68bdf SHA512 b0c8689374b5b0fb5ad9675ad8983ce67bd04d34ad07d39cf8f91498fd2fd21a173f1077e5fa1b66a89a9d93ab011fc6345ac1a3be9961f4794fc9e152c32a50
+DIST rsyslog-docs-8.28.0.tar.gz 4424901 BLAKE2B 9753b1a48b9d3bb045f2d088de5df0bbe5bc9045a82a5cab98b27c2df7648ac312929a173ec34c81ced46cb0eba336d708204b73b57413686769afa882dceaa5 SHA512 c085e09149cfc27ce0cd22edf9ad3f81b111f491fbea79afbc3172882065bd8324e366e3b5d09c885c1a3aa63fe8fbbe154d66488319d4ffc0867f938e1ab07d
+DIST rsyslog-docs-8.32.0.tar.gz 5368254 BLAKE2B 6d1efb191698bb1cfb03660167e5dcf9eea8f2fd2e459c350cd55aa24afcc5fb44d2bc0ef5590c6951326fbd0215aecbd59a6122e88ff449f566b37d1ee00d56 SHA512 e64eba3c40eab35e266826fb7e183418f38eb008f2a21ddf2c523d1e42aacaa20f882a561e5df67a979463048b58232fa82759645a21dc6962f6836ac8f57bce
+DIST rsyslog-docs-8.33.1.tar.gz 6770438 BLAKE2B e076688d7559c16986241149c00f6df603e2c90771222f4f91dc944fbdeace3dbc6e47fc82602f852a7407e064fe31df0a1c2940d521ae6ae21f5663518bfeb7 SHA512 fcc8ffee372c0b0dc2ab1b76dcf68a66ce820996cf2d46a2b5c6fd40e6fad5ef3c33da97a2e88956751597c20cf0c4a9b6537c22db0b3b46d1a734a9d9f95df5
+DIST rsyslog-docs-8.34.0.tar.gz 7419160 BLAKE2B 928e6a4044d6d2161483f934e6c2cd5e489a3ec95b823419d7d57b98a7dd6c73f4d28d17c238471592fe1c692b626b57c7bf647e926c1c38ff5a774e5d2defd5 SHA512 edf9aa63c777624c3dc27dfd64b38893b9b4c9b56941df1d7a8c6bc3cb4cbbfb83e8c356cbefeab7c688ecb6017b66ed99931cb71b69b7c927b4743548dd40d4
+DIST rsyslog-docs-8.35.0.tar.gz 7427270 BLAKE2B 5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1 SHA512 f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6
+DIST rsyslog-docs-8.36.0.tar.gz 7570338 BLAKE2B 031f94b88fb97e6c8b01d224279138c371a5f54ecc5d7a9298b4ec6351c5d380065877888ab1969386b76b9e715937b7335bee59c3d5b8ddd4910392a58d08cb SHA512 a93f56c9c9464a9ca87f61169c6fcfaa94608f31210eaac77e882e64bf5f514c887765db6bb57e4defafeb2a6e552506f0274c1ed275306efc1656f5520b5efa
+EBUILD rsyslog-8.28.0-r1.ebuild 12496 BLAKE2B 6389d72e3018fc1df8c7fa1f2a511360f1cd708534eaa2969a8418abdc92cee03934a5e2f9865bfe0ae462a6f3b49e17acf0434403e402f5ed149ae05203a366 SHA512 54e9cdef851779a9b2f8034474fb5c17e66a27679f24c50c6cc74fbdd8ff92a06a30998a40c5264ac4123b9f8860487b6e2a87607d00f38591fe7ac251623bc0
+EBUILD rsyslog-8.32.0-r4.ebuild 12716 BLAKE2B 9bbfe2d1395a6b298dded2c36d0393e1b11f8b11b0b05c87d2fbe7d1d72d52956b46b2a1a65048daed2a21ba2ed897023dc419f7dca242febbc70b54f4dc0112 SHA512 b8b14edcc03b268699a2e727a942ba34706d95a953426c8a9e2fde33f2aab44a4588d8b8c21627b0b8bd2fa95c295d5e1d84f83ccb3de857c46a768a72093451
+EBUILD rsyslog-8.33.1-r1.ebuild 12634 BLAKE2B efd3e3c908e293ff50a3ff7102c42068627403b912393edfd970271e2974083280839a16bce4175ce4cc946f2d01ff2d516428c18c5f157b541d24c2b316e38e SHA512 ac770033e43c6f5d7d9f93c5586a29389436bc4b479ff1d2a81f7b63121ccd3bff3f9726b7395244a5384d4a3844968b9c8f0bd11ea1f56a381616d231b66fbf
+EBUILD rsyslog-8.34.0.ebuild 12867 BLAKE2B 87c372d138bda89e41a32e9732c733d03ea9a7da8e296e127a843568a9d6b58bc068dd5273a1d627b91b6062c8eab9a0dab2293cef950a3d4ac69eb59a3323d8 SHA512 14058cf62a65e191098e034c2e061112203b1dcb01658684dfbf178d2d26c2a390b4a3b40acfb01dd62363d8dfe87e86e040541341f3125c422a04e3bf464010
+EBUILD rsyslog-8.35.0-r1.ebuild 12933 BLAKE2B c1a1a25566fe6a0da7e4461cea3c2c004cad7ad3136d1b902f1d46e498b4efb86f267eaf9bc480ec91146d6dd2df7def6bc2dc01bdec3a76d22f155ae20d5602 SHA512 6a85e6b19d05b8f720d1625e2c74648d4c8c5901d2c9783cd4f6e229771c7f0ee2d628c82dde94965d870c4fb421324446c178112125b7b83cd623e91b1941d3
+EBUILD rsyslog-8.36.0-r1.ebuild 13028 BLAKE2B 35fc40fbdd8eae6f8868e70a42efc35f0f2393f533b13584180991fc4d567fce8af361eb30a91e2c49366392aefaa103035f4087b8b423a39f75488c26bf546d SHA512 d4d9a7c1fc4af8bedf6daec4ab7b0be21864e0a9924593bf13b5bb52fd06e22d31e076ee79c9cbdc5809232eee8a654d28741d92421e9b5fe2c7ba717d8c7f1f
+MISC metadata.xml 3850 BLAKE2B 1de60aef00ce700d8d2c05d93d3237170399c65ddfbd37f86e95dd0ef89c7910335b6fdbfc0e806345bb3dbd52212f0bdab45b57acf31b2241ed7d3bf52a64d4 SHA512 c66217bd3a1dd613d49fca4d42267e276bb4f085b14a452da0484ec508cfd45eb36049006cdb6ad58c7c74d88dd6512e922c8bdf07ac01602fbbaf7606215b82
diff --git a/app-admin/rsyslog/files/8-stable/50-default-r1.conf b/app-admin/rsyslog/files/8-stable/50-default-r1.conf
new file mode 100644
index 000000000000..920c214ff6ca
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/50-default-r1.conf
@@ -0,0 +1,107 @@
+#######################
+### DEFAULT ACTIONS ###
+#######################
+
+auth,authpriv.* action(
+	name="action_auth"
+	type="omfile"
+	File="/var/log/auth.log"
+	FileCreateMode="0600"
+	FileOwner="root"
+	FileGroup="adm"
+	Sync="off"
+)
+
+cron.* action(
+	name="action_cron"
+	type="omfile"
+	File="/var/log/cron.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+daemon.* action(
+	name="action_daemon"
+	type="omfile"
+	File="/var/log/daemon.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+kern.* action(
+	name="action_kern"
+	type="omfile"
+	File="/var/log/kern.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+lpr.* action(
+	name="action_lpr"
+	type="omfile"
+	File="/var/log/lpr.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+mail.* action(
+	name="action_mail"
+	type="omfile"
+	File="/var/log/mail.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+news.* action(
+	name="action_news"
+	type="omfile"
+	File="/var/log/news.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+user.* action(
+	name="action_user"
+	type="omfile"
+	File="/var/log/user.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+*.=debug;auth,authpriv,news,mail.none action(
+	name="action_debug"
+	type="omfile"
+	File="/var/log/debug.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action(
+	name="action_messages"
+	type="omfile"
+	File="/var/log/messages"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+# Uncomment the following directive to re-enable the
+# deprecated "/var/log/syslog" log file (don't forget to re-enable log
+# rotation in "/etc/logrotate.d/rsyslog" if you do that!)
+#*.*;auth,authpriv.none action(
+#	name="action_syslog"
+#	type="omfile"
+#	File="/var/log/syslog"
+#	FileOwner="root"
+#	FileGroup="adm"
+#)
+
+*.emerg action(
+	name="action_emerge"
+	type="omusrmsg"
+	Users="*"
+	action.execOnlyOnceEveryInterval="10"
+)
+
+# Create an additional socket for the default chroot location
+# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744)
+input(type="imuxsock" Socket="/var/empty/dev/log")
diff --git a/app-admin/rsyslog/files/8-stable/50-default.conf b/app-admin/rsyslog/files/8-stable/50-default.conf
new file mode 100644
index 000000000000..9ae8578215bb
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/50-default.conf
@@ -0,0 +1,95 @@
+#######################
+### DEFAULT ACTIONS ###
+#######################
+
+auth,authpriv.* action(
+	type="omfile"
+	File="/var/log/auth.log"
+	FileCreateMode="0600"
+	FileOwner="root"
+	FileGroup="adm"
+	Sync="off"
+)
+
+cron.* action(
+	type="omfile"
+	File="/var/log/cron.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+daemon.* action(
+	type="omfile"
+	File="/var/log/daemon.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+kern.* action(
+	type="omfile"
+	File="/var/log/kern.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+lpr.* action(
+	type="omfile"
+	File="/var/log/lpr.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+mail.* action(
+	type="omfile"
+	File="/var/log/mail.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+news.* action(
+	type="omfile"
+	File="/var/log/news.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+user.* action(
+	type="omfile"
+	File="/var/log/user.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+*.=debug;auth,authpriv,news,mail.none action(
+	type="omfile"
+	File="/var/log/debug.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action(
+	type="omfile"
+	File="/var/log/messages"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+# Uncomment the following directive to re-enable the
+# deprecated "/var/log/syslog" log file (don't forget to re-enable log
+# rotation in "/etc/logrotate.d/rsyslog" if you do that!)
+#*.*;auth,authpriv.none action(
+#	type="omfile"
+#	File="/var/log/syslog"
+#	FileOwner="root"
+#	FileGroup="adm"
+#)
+
+*.emerg action(
+	type="omusrmsg"
+	Users="*"
+	action.execOnlyOnceEveryInterval="10"
+)
+
+# Create an additional socket for the default chroot location
+# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744)
+input(type="imuxsock" Socket="/var/empty/dev/log")
diff --git a/app-admin/rsyslog/files/8-stable/README.gentoo b/app-admin/rsyslog/files/8-stable/README.gentoo
new file mode 100644
index 000000000000..9f0666c86b0a
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/README.gentoo
@@ -0,0 +1,36 @@
+Introduction
+============
+
+Since rsyslog version 7.6 we are shipping a new default Gentoo
+configuration. See bug #501982 to learn more about what we were trying to
+achieve by rewriting the entire configuration.
+
+
+Important changes
+=================
+
+1. "/var/log/syslog" log file is now deprecated
+
+   Beginning with rsyslog-7.6, the "/var/log/syslog" log file will no
+   longer being written per default. We are considering this file as
+   deprecated/obsolet for the typical user/system.
+   The content from this log file is still availble through other
+   (dedicated) log files, see
+   
+     - /var/log/cron.log
+     - /var/log/daemon.log
+     - /var/log/mail.log
+     - /var/log/messages
+   
+   If you really need the old "/var/log/syslog" log file, all you have to
+   do is uncommenting the corresponding configuration directive in
+   "/etc/rsyslog.d/50-default.conf".
+   
+   If you do so, don't forget to re-enable log rotation in
+   "/etc/logrotate.d/rsyslog", too.
+
+
+2. An additional input socket in "/var/empty/dev/log" (default chroot
+   location) will be created per default
+
+   See bug #490744 for further details.
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch
new file mode 100644
index 000000000000..6ef7e6426287
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch
@@ -0,0 +1,23 @@
+https://github.com/rsyslog/rsyslog/pull/1791
+---
+ tests/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -498,7 +498,6 @@ TESTS += msgvar-concurrency-array.sh \
+ 	mmnormalize_processing_test2.sh \
+ 	mmnormalize_processing_test3.sh \
+ 	mmnormalize_processing_test4.sh
+-endif
+ 
+ if ENABLE_IMPTCP
+ TESTS +=  \
+@@ -512,6 +511,7 @@ if LOGNORM_REGEX_SUPPORTED
+ TESTS += \
+ 	mmnormalize_regex.sh
+ endif
++endif
+ 
+ if ENABLE_MMJSONPARSE
+ TESTS += \
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch
new file mode 100644
index 000000000000..534183a8ca29
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch
@@ -0,0 +1,137 @@
+https://github.com/rsyslog/rsyslog/commit/d9475f133e3c79875a7c4ccd92038b7123c1f155
+https://github.com/rsyslog/rsyslog/commit/468eeb79b8da91fb71dfef6bfb25476b2a37f446
+https://github.com/rsyslog/rsyslog/commit/50205ced0fc22e74f26f2a07b557b69c5d30e168
+
+--- a/grammar/rainerscript.c
++++ b/grammar/rainerscript.c
+@@ -1935,6 +1935,7 @@ num2ipv4(struct svar *__restrict__ const sourceVal) {
+ 	return(estr);
+ }
+ 
++#ifdef HAVE_LIBCURL
+ /* curl callback for doFunc_http_request */
+ static size_t
+ curlResult(void *ptr, size_t size, size_t nmemb, void *userdata)
+@@ -2010,6 +2011,7 @@ doFunc_http_request(struct cnffunc *__restrict__ const func,
+ 	}
+ 	RETiRet;
+ }
++#endif
+ 
+ static int ATTR_NONNULL(1,3,4)
+ doFunc_is_time(const char *__restrict__ const str,
+@@ -2513,11 +2515,16 @@ doFuncCall(struct cnffunc *__restrict__ const func, struct svar *__restrict__ co
+ 		if(bMustFree2) free(str2);
+ 		break;
+ 	case CNFFUNC_HTTP_REQUEST:
++#ifdef HAVE_LIBCURL
+ 		cnfexprEval(func->expr[0], &r[0], usrptr, pWti);
+ 		str = (char*) var2CString(&r[0], &bMustFree);
+ 		doFunc_http_request(func, ret, str);
+ 		if(bMustFree) free(str);
+ 		varFreeMembers(&r[0]);
++#else
++		LogError(0, RS_RET_INTERNAL_ERROR,
++			"rainerscript: internal error: HTTP_Fetch not supported, not built with libcurl support");
++#endif
+ 		break;
+ 	default:
+ 		if(Debug) {
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -454,6 +454,8 @@ if test "$enable_libcurl" = "yes"; then
+ 	)
+ fi
+ 
++AM_CONDITIONAL(ENABLE_LIBCURL, test "x${enable_libcurl}" = "xyes")
++
+ # klog
+ AC_ARG_ENABLE(klog,
+         [AS_HELP_STRING([--enable-klog],[Integrated klog functionality @<:@default=yes@:>@])],
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -226,7 +226,6 @@ TESTS +=  \
+ 	rscript_contains.sh \
+ 	rscript_bare_var_root.sh \
+ 	rscript_bare_var_root-empty.sh \
+-	rscript_http_request.sh \
+ 	rscript_ipv42num.sh \
+ 	rscript_field.sh \
+ 	rscript_stop.sh \
+@@ -305,7 +304,11 @@ TESTS +=  \
+ 	lookup_table_rscript_reload.sh \
+ 	lookup_table_rscript_reload_without_stub.sh \
+ 	multiple_lookup_tables.sh
+-endif
++if ENABLE_LIBCURL
++TESTS +=  \
++	rscript_http_request.sh
++endif # ENABLE_LIBCURL
++endif # ENABLE_TESTBENCH2
+ 
+ if HAVE_VALGRIND
+ TESTS +=  \
+@@ -313,7 +316,6 @@ TESTS +=  \
+ 	mmexternal-InvldProg-vg.sh \
+ 	internal-errmsg-memleak-vg.sh \
+ 	rscript_set_memleak-vg.sh \
+-	rscript_http_request-vg.sh \
+ 	no-parser-vg.sh \
+ 	discard-rptdmsg-vg.sh \
+ 	discard-allmark-vg.sh \
+@@ -338,6 +340,10 @@ TESTS +=  \
+ 	multiple_lookup_tables-vg.sh \
+ 	fac_local0-vg.sh \
+ 	rscript_trim-vg.sh
++if ENABLE_LIBCURL
++TESTS +=  \
++	rscript_http_request-vg.sh
++endif # ENABLE_LIBCURL
+ endif # HAVE_VALGRIND
+ 
+ if ENABLE_ROOT_TESTS
+
+--- a/grammar/Makefile.am
++++ b/grammar/Makefile.am
+@@ -12,8 +12,11 @@ libgrammar_la_SOURCES = \
+ 	parserif.h \
+ 	grammar.h
+ libgrammar_la_CPPFLAGS =  $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
+-#libgrammar_la_LIBADD = $(CURL_LIBS) $(RSRT_LIBS) $(SOL_LIBS)
+-libgrammar_la_LIBADD = $(CURL_LIBS)
++libgrammar_la_LIBADD =
++if ENABLE_LIBCURL
++libgrammar_la_CPPFLAGS += $(CURL_CFLAGS)
++libgrammar_la_LIBADD += $(CURL_LIBS)
++endif
+ 
+ #testdriver_SOURCES = testdriver.c libgrammar.la
+ #testdriver_CPPFLAGS =  $(RSRT_CFLAGS)
+
+--- a/plugins/omelasticsearch/Makefile.am
++++ b/plugins/omelasticsearch/Makefile.am
+@@ -1,7 +1,7 @@
+ pkglib_LTLIBRARIES = omelasticsearch.la
+ 
+ omelasticsearch_la_SOURCES = omelasticsearch.c
+-omelasticsearch_la_CPPFLAGS =  $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
++omelasticsearch_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) $(CURL_CFLAGS)
+ omelasticsearch_la_LDFLAGS = -module -avoid-version
+ omelasticsearch_la_LIBADD =  $(CURL_LIBS) $(LIBM)
+ 
+--- a/grammar/rainerscript.c
++++ b/grammar/rainerscript.c
+@@ -36,7 +36,11 @@
+ #include <sys/types.h>
+ #include <libestr.h>
+ #include <time.h>
++
++#ifdef HAVE_LIBCURL
+ #include <curl/curl.h>
++#endif
++
+ #include "rsyslog.h"
+ #include "rainerscript.h"
+ #include "conf.h"
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.34.0-fix-issue2612.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.34.0-fix-issue2612.patch
new file mode 100644
index 000000000000..4e9e566e84c7
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.34.0-fix-issue2612.patch
@@ -0,0 +1,13 @@
+https://github.com/rsyslog/rsyslog/issues/2612
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -254,7 +254,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(, return __builtin_expect(main != 0, 1))],
+ # speeds up processig.
+ # note that when automic operations are enabled but not available, they
+ # will silently NOT be used!
+-AC_ARG_ENABLE(regexp,
++AC_ARG_ENABLE(atomic_operations,
+         [AS_HELP_STRING([--enable-atomic-operations],[Enable atomic operation support @<:@default=yes@:>@])],
+         [case "${enableval}" in
+          yes) enable_atomic_operations="yes" ;;
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2719.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2719.patch
new file mode 100644
index 000000000000..8996acd27e88
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2719.patch
@@ -0,0 +1,241 @@
+Add missing files for mmkubernetes tests
+
+Upstream bug: https://github.com/rsyslog/rsyslog/pull/2719
+
+--- /dev/null
++++ b/tests/mmkubernetes-basic.out.json
+@@ -0,0 +1,110 @@
++[{
++  "kubernetes": {
++    "namespace_id": "namespace-name2-id",
++    "namespace_labels": {
++      "label_1_key": "label 1 value",
++      "label_with_empty_value": "",
++      "label_2_key": "label 2 value"
++    },
++    "creation_timestamp": "2018-04-09T21:56:39Z",
++    "pod_id": "pod-name2-id",
++    "labels": {
++      "custom_label": "pod-name2-label-value",
++      "deploymentconfig": "pod-name2-dc",
++      "component": "pod-name2-component",
++      "label_with_empty_value": "",
++      "deployment": "pod-name2-deployment"
++    },
++    "pod_name": "pod-name2",
++    "namespace_name": "namespace-name2",
++    "container_name": "container-name2",
++    "master_url": "http://localhost:18443"
++  },
++  "docker": {
++    "container_id": "id2"
++  }
++},
++{
++  "message": "a message from container 4",
++  "CONTAINER_NAME": "some-prefix_container-name4_pod-name4_namespace-name4_unused4_unused44",
++  "CONTAINER_ID_FULL": "id4",
++  "kubernetes": {
++    "namespace_id": "namespace-name4-id",
++    "namespace_labels": {
++      "label_1_key": "label 1 value",
++      "label_with_empty_value": "",
++      "label_2_key": "label 2 value"
++    },
++    "creation_timestamp": "2018-04-09T21:56:39Z",
++    "pod_id": "pod-name4-id",
++    "labels": {
++      "custom_label": "pod-name4-label-value",
++      "deploymentconfig": "pod-name4-dc",
++      "component": "pod-name4-component",
++      "label_with_empty_value": "",
++      "deployment": "pod-name4-deployment"
++    },
++    "pod_name": "pod-name4",
++    "namespace_name": "namespace-name4",
++    "container_name": "container-name4",
++    "master_url": "http://localhost:18443"
++  },
++  "docker": {
++    "container_id": "id4"
++  }
++},
++{
++  "kubernetes": {
++    "namespace_id": "namespace-name1-id",
++    "namespace_labels": {
++      "label_1_key": "label 1 value",
++      "label_with_empty_value": "",
++      "label_2_key": "label 2 value"
++    },
++    "creation_timestamp": "2018-04-09T21:56:39Z",
++    "pod_id": "pod-name1-id",
++    "labels": {
++      "custom_label": "pod-name1-label-value",
++      "deploymentconfig": "pod-name1-dc",
++      "component": "pod-name1-component",
++      "label_with_empty_value": "",
++      "deployment": "pod-name1-deployment"
++    },
++    "pod_name": "pod-name1",
++    "namespace_name": "namespace-name1",
++    "container_name": "container-name1",
++    "master_url": "http://localhost:18443"
++  },
++  "docker": {
++    "container_id": "id1"
++  }
++},
++{
++  "message": "a message from container 3",
++  "CONTAINER_NAME": "some-prefix_container-name3.container-hash3_pod-name3_namespace-name3_unused3_unused33",
++  "CONTAINER_ID_FULL": "id3",
++  "kubernetes": {
++    "namespace_id": "namespace-name3-id",
++    "namespace_labels": {
++      "label_1_key": "label 1 value",
++      "label_with_empty_value": "",
++      "label_2_key": "label 2 value"
++    },
++    "creation_timestamp": "2018-04-09T21:56:39Z",
++    "pod_id": "pod-name3-id",
++    "labels": {
++      "custom_label": "pod-name3-label-value",
++      "deploymentconfig": "pod-name3-dc",
++      "component": "pod-name3-component",
++      "label_with_empty_value": "",
++      "deployment": "pod-name3-deployment"
++    },
++    "pod_name": "pod-name3",
++    "namespace_name": "namespace-name3",
++    "container_name": "container-name3",
++    "master_url": "http://localhost:18443"
++  },
++  "docker": {
++    "container_id": "id3"
++  }
++}]
+--- /dev/null
++++ b/tests/mmkubernetes_test_server.py
+@@ -0,0 +1,121 @@
++# Used by the mmkubernetes tests
++# This is a simple http server which responds to kubernetes api requests
++# and responds with kubernetes api server responses
++# added 2018-04-06 by richm, released under ASL 2.0
++import os
++import json
++import sys
++
++try:
++    from http.server import HTTPServer, BaseHTTPRequestHandler
++except ImportError:
++    from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
++
++ns_template = '''{{
++  "kind": "Namespace",
++  "apiVersion": "v1",
++  "metadata": {{
++    "name": "{namespace_name}",
++    "selfLink": "/api/v1/namespaces/{namespace_name}",
++    "uid": "{namespace_name}-id",
++    "resourceVersion": "2988",
++    "creationTimestamp": "2018-04-09T21:56:39Z",
++    "labels": {{
++      "label.1.key":"label 1 value",
++      "label.2.key":"label 2 value",
++      "label.with.empty.value":""
++    }},
++    "annotations": {{
++      "k8s.io/description": "",
++      "k8s.io/display-name": "",
++      "k8s.io/node-selector": "",
++      "k8s.io/sa.scc.mcs": "s0:c9,c4",
++      "k8s.io/sa.scc.supplemental-groups": "1000080000/10000",
++      "k8s.io/sa.scc.uid-range": "1000080000/10000",
++      "quota.k8s.io/cluster-resource-override-enabled": "false"
++    }}
++  }},
++  "spec": {{
++    "finalizers": [
++      "openshift.io/origin",
++      "kubernetes"
++    ]
++  }},
++  "status": {{
++    "phase": "Active"
++  }}
++}}'''
++
++pod_template = '''{{
++  "kind": "Pod",
++  "apiVersion": "v1",
++  "metadata": {{
++    "name": "{pod_name}",
++    "generateName": "{pod_name}-prefix",
++    "namespace": "{namespace_name}",
++    "selfLink": "/api/v1/namespaces/{namespace_name}/pods/{pod_name}",
++    "uid": "{pod_name}-id",
++    "resourceVersion": "3486",
++    "creationTimestamp": "2018-04-09T21:56:39Z",
++    "labels": {{
++      "component": "{pod_name}-component",
++      "deployment": "{pod_name}-deployment",
++      "deploymentconfig": "{pod_name}-dc",
++      "custom.label": "{pod_name}-label-value",
++      "label.with.empty.value":""
++    }},
++    "annotations": {{
++      "k8s.io/deployment-config.latest-version": "1",
++      "k8s.io/deployment-config.name": "{pod_name}-dc",
++      "k8s.io/deployment.name": "{pod_name}-deployment",
++      "k8s.io/custom.name": "custom value",
++      "annotation.with.empty.value":""
++    }}
++  }},
++  "status": {{
++    "phase": "Running",
++    "hostIP": "172.18.4.32",
++    "podIP": "10.128.0.14",
++    "startTime": "2018-04-09T21:57:39Z"
++  }}
++}}'''
++
++class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
++
++    def do_GET(self):
++        # "http://localhost:18443/api/v1/namespaces/namespace-name2"
++        # parse url - either /api/v1/namespaces/$ns_name
++        # or
++        # /api/v1/namespaces/$ns_name/pods/$pod_name
++        comps = self.path.split('/')
++        status = 400
++        if len(comps) >= 5 and comps[1] == 'api' and comps[2] == 'v1':
++            if len(comps) == 5 and comps[3] == 'namespaces': # namespace
++                resp = ns_template.format(namespace_name=comps[4])
++                status = 200
++            elif len(comps) == 7 and comps[3] == 'namespaces' and comps[5] == 'pods':
++                resp = pod_template.format(namespace_name=comps[4], pod_name=comps[6])
++                status = 200
++            else:
++                resp = '{{"error":"do not recognize {0}"}}'.format(self.path)
++        else:
++            resp = '{{"error":"do not recognize {0}"}}'.format(self.path)
++        if not status == 200:
++            self.log_error(resp)
++        self.send_response(status)
++        self.end_headers()
++        self.wfile.write(json.dumps(json.loads(resp), separators=(',',':')))
++
++port = int(sys.argv[1])
++
++httpd = HTTPServer(('localhost', port), SimpleHTTPRequestHandler)
++
++# write "started" to file named in argv[3]
++with open(sys.argv[3], "w") as ff:
++    ff.write("started\n")
++
++# write pid to file named in argv[2]
++with open(sys.argv[2], "w") as ff:
++    ff.write('{0}\n'.format(os.getpid()))
++
++httpd.serve_forever()
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch
new file mode 100644
index 000000000000..eaec239c3839
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch
@@ -0,0 +1,41 @@
+From c1791ee90fdd8adf219ae3d2b849f5f041284b7c Mon Sep 17 00:00:00 2001
+From: Rich Megginson <rmeggins@redhat.com>
+Date: Thu, 17 May 2018 18:38:25 -0600
+Subject: [PATCH] mmkubernetes test python must encode response
+
+https://github.com/rsyslog/rsyslog/issues/2721
+Was not working on python3 - must use `encode()` to convert the
+string to a `bytes` object.
+Also run the server with python -u to make sure we get the log
+output from the kubernetes test server.
+---
+ tests/mmkubernetes-basic.sh       | 2 +-
+ tests/mmkubernetes_test_server.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/mmkubernetes-basic.sh b/tests/mmkubernetes-basic.sh
+index 0bbfd08ca..d320c343f 100755
+--- a/tests/mmkubernetes-basic.sh
++++ b/tests/mmkubernetes-basic.sh
+@@ -4,7 +4,7 @@
+ . $srcdir/diag.sh init
+ 
+ testsrv=mmk8s-test-server
+-python ./mmkubernetes_test_server.py 18443 rsyslog${testsrv}.pid rsyslogd${testsrv}.started > mmk8s_srv.log 2>&1 &
++python -u ./mmkubernetes_test_server.py 18443 rsyslog${testsrv}.pid rsyslogd${testsrv}.started > mmk8s_srv.log 2>&1 &
+ BGPROCESS=$!
+ . $srcdir/diag.sh wait-startup $testsrv
+ echo background mmkubernetes_test_server.py process id is $BGPROCESS
+diff --git a/tests/mmkubernetes_test_server.py b/tests/mmkubernetes_test_server.py
+index 0de215603..24f4e1b0e 100644
+--- a/tests/mmkubernetes_test_server.py
++++ b/tests/mmkubernetes_test_server.py
+@@ -104,7 +104,7 @@ def do_GET(self):
+             self.log_error(resp)
+         self.send_response(status)
+         self.end_headers()
+-        self.wfile.write(json.dumps(json.loads(resp), separators=(',',':')))
++        self.wfile.write(json.dumps(json.loads(resp), separators=(',',':')).encode())
+ 
+ port = int(sys.argv[1])
+ 
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-r1.logrotate b/app-admin/rsyslog/files/8-stable/rsyslog-r1.logrotate
new file mode 100644
index 000000000000..3a92ba37bdec
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-r1.logrotate
@@ -0,0 +1,45 @@
+# Uncomment the following directive if you have re-enabled
+# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf"
+#/var/log/syslog
+#{
+#	rotate 7
+#	daily
+#	missingok
+#	notifempty
+#	delaycompress
+#	compress
+#	postrotate
+#		if type -p systemctl 2>&1 1>/dev/null && systemctl is-system-running 2>&1 1>/dev/null ; then
+#			systemctl kill -s HUP rsyslog.service
+#		else
+#			test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) 2>&1 1>/dev/null
+#		fi
+#	endscript
+#}
+
+/var/log/auth.log
+/var/log/cron.log
+/var/log/daemon.log
+/var/log/kern.log
+/var/log/lpr.log
+/var/log/mail.log
+/var/log/news.log
+/var/log/user.log
+/var/log/debug.log
+/var/log/messages
+{
+	rotate 4
+	weekly
+	missingok
+	notifempty
+	compress
+	delaycompress
+	sharedscripts
+	postrotate
+		if type -p systemctl 2>&1 1>/dev/null && systemctl is-system-running 2>&1 1>/dev/null ; then
+			systemctl kill -s HUP rsyslog.service
+		else
+			test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) 2>&1 1>/dev/null
+		fi
+	endscript
+}
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.conf b/app-admin/rsyslog/files/8-stable/rsyslog.conf
new file mode 100644
index 000000000000..da484598a652
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.conf
@@ -0,0 +1,61 @@
+# /etc/rsyslog.conf
+# 
+# This configuration is based on RainerScript, the new recommended syntax
+# for RSYSLOG. See http://www.rsyslog.com/doc/rainerscript.html for further
+# details.
+# 
+# But if you don't want to learn something new at moment, don't worry: The
+# legacy syntax is still supported.
+# 
+# You may want to use the new RSYSLOG configuration builder to create your
+# own more advanced configuration: http://www.rsyslog.com/rsyslog-configuration-builder/
+
+# Check config syntax on startup and abort if unclean (default: off)
+#$AbortOnUncleanConfig on
+
+
+###############
+### MODULES ###
+###############
+
+# Read syslog messages from default Unix socket /dev/log (e.g. via logger command)
+module(load="imuxsock")
+
+# Read messages from the kernel log and submits them to the syslog engine
+module(load="imklog")
+
+# Inject "--MARK--" messages every $Interval (seconds)
+#module(load="immark" Interval="600")
+
+# Read syslog messages from UDP
+#module(load="imudp")
+#input(type="imudp" port="514")
+
+# Read syslog messages from TCP
+#module(load="imtcp")
+#input(type="imtcp" port="514")
+
+
+#########################
+### GLOBAL DIRECTIVES ###
+#########################
+
+# Where to place spool and state files
+$WorkDirectory /var/spool/rsyslog
+
+# Reduce repeating messages (default: off)
+#$RepeatedMsgReduction on
+
+# Set defaults for every output file
+$Umask 0022
+
+module(
+	load="builtin:omfile"
+	Template="RSYSLOG_TraditionalFileFormat"
+	FileCreateMode="0644"
+	DirCreateMode="0755"
+)
+
+
+# Include all conf files in /etc/rsyslog.d/
+$IncludeConfig /etc/rsyslog.d/*.conf
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.confd-r1 b/app-admin/rsyslog/files/8-stable/rsyslog.confd-r1
new file mode 100644
index 000000000000..da48c01cd407
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.confd-r1
@@ -0,0 +1,30 @@
+# /etc/conf.d/rsyslog
+
+# Configuration file
+#RSYSLOG_CONFIGFILE="/etc/rsyslog.conf"
+
+# PID file
+# If you should ever change this, remember to update
+# "/etc/logrotate.d/rsyslog", too.
+#RSYSLOG_PIDFILE="/run/rsyslogd.pid"
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we wait 1000ms after we have started the service to ensure
+# that the daemon is really up and running.
+#RSYSLOG_SSDARGS="--wait 1000"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (60 + 5 seconds
+# per default) when you are stopping the service.
+# You need to increase the value when you are working with a large queue.
+# See http://www.rsyslog.com/doc/queues.html for further information.
+#RSYSLOG_TERMTIMEOUT="TERM/60/KILL/5"
+
+
+# Options to rsyslogd
+# See rsyslogd(8) for more details
+# Notes:
+# * Do not specify another PIDFILE but use the variable above to change the location
+# * Do not specify another CONFIGFILE but use the variable above to change the location
+#RSYSLOG_OPTS=""
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1 b/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1
new file mode 100644
index 000000000000..7d7aa4bc9313
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1
@@ -0,0 +1,72 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"}
+RSYSLOG_PIDFILE=${RSYSLOG_PIDFILE:-"/run/rsyslogd.pid"}
+RSYSLOG_SSDARGS=${RSYSLOG_SSDARGS:-"--wait 1000"}
+RSYSLOG_TERMTIMEOUT=${RSYSLOG_TERMTIMEOUT:-"TERM/60/KILL/5"}
+RSYSLOG_OPTS=${RSYSLOG_OPTS:-""}
+
+command="/usr/sbin/rsyslogd"
+command_args="${RSYSLOG_OPTS} -f \"${RSYSLOG_CONFIGFILE}\" -i \"${RSYSLOG_PIDFILE}\""
+start_stop_daemon_args="${RSYSLOG_SSDARGS}"
+pidfile="${RSYSLOG_PIDFILE}"
+retry="${RSYSLOG_TERMTIMEOUT}"
+
+required_files="${RSYSLOG_CONFIGFILE}"
+
+description="RSYSLOG is the rocket-fast system for log processing (syslog replacement)."
+
+extra_commands="configtest"
+extra_started_commands="rotate"
+
+description_configtest="Run rsyslogd's internal config check."
+
+description_rotate="Sends rsyslogd a signal to re-open its log files."
+
+depend() {
+	need clock hostname localmount
+	provide logger
+}
+
+start_pre() {
+	if [ "${RC_CMD}" != "restart" ]; then
+		configtest || return 1
+	fi
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ]; then
+		configtest || return 1
+	fi
+}
+
+stop_post() {
+	if [ -f "${RSYSLOG_PIDFILE}" ]; then
+		vebegin "Removing stale PID file"
+		rm --force "${RSYSLOG_PIDFILE}"
+		veend $?
+	fi
+}
+
+configtest() {
+	local _command_args="-N 999 -f \"${RSYSLOG_CONFIGFILE}\""
+	local _retval=0
+
+	ebegin "Checking rsyslogd's configuration"
+	eval ${command} ${_command_args} >/dev/null 2>&1
+	_retval=$?
+
+	if [ ${_retval} -ne 0 ]; then
+		eval ${command} ${_command_args}
+	fi
+
+	eend ${_retval} "failed, please correct errors above"
+}
+
+rotate() {
+	ebegin "Re-opening rsyslogd logs"
+	start-stop-daemon --signal SIGHUP --pidfile "${RSYSLOG_PIDFILE}"
+	eend $?
+}
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.logrotate b/app-admin/rsyslog/files/8-stable/rsyslog.logrotate
new file mode 100644
index 000000000000..1eae30e0d741
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.logrotate
@@ -0,0 +1,37 @@
+# Uncomment the following directive if you have re-enabled
+# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf"
+#/var/log/syslog
+#{
+#	rotate 7
+#	daily
+#	missingok
+#	notifempty
+#	delaycompress
+#	compress
+#	postrotate
+#		test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+#	endscript
+#}
+
+/var/log/auth.log
+/var/log/cron.log
+/var/log/daemon.log
+/var/log/kern.log
+/var/log/lpr.log
+/var/log/mail.log
+/var/log/news.log
+/var/log/user.log
+/var/log/debug.log
+/var/log/messages
+{
+	rotate 4
+	weekly
+	missingok
+	notifempty
+	compress
+	delaycompress
+	sharedscripts
+	postrotate
+		test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+	endscript
+}
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
new file mode 100644
index 000000000000..5075171a3708
--- /dev/null
+++ b/app-admin/rsyslog/metadata.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<use>
+		<flag name="curl">Enable http_request() function in RainerScript (requires <pkg>net-misc/curl</pkg>)</flag>
+		<flag name="dbi">Build the general database output module (requires <pkg>dev-db/libdbi</pkg>)</flag>
+		<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
+		<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
+		<flag name="gnutls">Build the GnuTLS network stream driver (requires <pkg>net-libs/gnutls</pkg>)</flag>
+		<flag name="grok">Build the grok modify module (requires <pkg>dev-libs/grok</pkg>)</flag>
+		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
+		<flag name="kafka">Build the Apache Kafka input/output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag>
+		<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
+		<flag name="kubernetes">Build the kubernetes modify plugin (requires <pkg>net-misc/curl</pkg>)</flag>
+		<flag name="libressl">Use <pkg>dev-libs/libressl</pkg> instead of <pkg>dev-libs/openssl</pkg> (you still need to enable functionality which requires OpenSSL)</flag>
+		<flag name="mdblookup">Build the MaxMind DB lookup message modify plugin using <pkg>dev-libs/libmaxminddb</pkg></flag>
+		<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/libmongo-client</pkg>)</flag>
+		<flag name="mysql">Build the MySQL database output module (requires <pkg>virtual/mysql</pkg>)</flag>
+		<flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag>
+		<flag name="omhttpfs">Build the httpfs output module (requires <pkg>net-misc/curl</pkg>)</flag>
+		<flag name="omudpspoof">Build the udpspoof output module (requires <pkg>net-libs/libnet</pkg>)</flag>
+		<flag name="openssl">Build the OpenSSL network stream driver (requires <pkg>dev-libs/openssl</pkg>)</flag>
+		<flag name="postgres">Build the PostgreSQL database output module (requires <pkg>dev-db/postgresql</pkg>)</flag>
+		<flag name="rabbitmq">Build the RabbitMQ output module (requires <pkg>net-libs/rabbitmq-c</pkg>)</flag>
+		<flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag>
+		<flag name="relp">Build the Reliable Event Logging Protocol (RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag>
+		<flag name="rfc3195">Build the rfc3195 input module (requires <pkg>dev-libs/liblogging</pkg>)</flag>
+		<flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg> or <pkg>dev-libs/libressl</pkg>)</flag>
+		<flag name="snmp">Build the snmp modify and output module (requires <pkg>net-analyzer/net-snmp</pkg>)</flag>
+		<flag name="ssl">Add support for encrypted client/server communication (requires <pkg>net-libs/gnutls</pkg>)</flag>
+		<flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag>
+		<flag name="uuid">Include UUIDs in messages (requires <pkg>sys-apps/util-linux</pkg>)</flag>
+		<flag name="usertools">Installs the user tools (rsgtutil, rscryutil...) corresponding to the set USE flags</flag>
+		<flag name="xxhash">Enable xxHash support in fmhash module (requires <pkg>dev-libs/xxhash</pkg>)</flag>
+		<flag name="zeromq">Build the ZeroMQ input and output modules (requires <pkg>net-libs/czmq</pkg>)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://github.com/rsyslog/rsyslog/issues</bugs-to>
+		<remote-id type="cpe">cpe:/a:rsyslog:rsyslog</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/rsyslog/rsyslog-8.28.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.28.0-r1.ebuild
new file mode 100644
index 000000000000..7a47099a780b
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.28.0-r1.ebuild
@@ -0,0 +1,451 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils linux-info systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	MY_PV=${PV%_rc*}
+	MY_FILENAME="${PN}-${PV}.tar.gz"
+	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	# Upstream URL schema:
+	# RC:      http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
+	#          http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
+	# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
+
+	MY_URL_PREFIX=
+	if [[ ${PV} = *_rc* ]]; then
+		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
+		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
+		if [[ ${_tmp_suffix} = *rc* ]]; then
+			MY_URL_PREFIX="${_tmp_suffix}/"
+		fi
+
+		# Cleaning up temporary variables
+		unset _tmp_last_index
+		unset _tmp_suffix
+	else
+		KEYWORDS="hppa"
+	fi
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+	"
+
+	PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch )
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
+IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.3:=
+	>=dev-libs/libestr-0.1.9
+	>=dev-libs/liblogging-1.0.1:=[stdlog]
+	>=sys-libs/zlib-1.2.5
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	grok? ( >=dev-libs/grok-0.9.2 )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
+	mysql? ( virtual/libmysqlclient:= )
+	normalize? (
+		>=dev-libs/libee-0.4.0
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.14:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? ( >=net-libs/gnutls-2.12.23:0= )
+	systemd? ( >=sys-apps/systemd-208 )
+	uuid? ( sys-apps/util-linux:0= )
+	zeromq? (
+		>=net-libs/zeromq-4.1.1:=
+		>=net-libs/czmq-3.0.0
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	test? ( sys-libs/libfaketime )"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${MY_FILENAME_DOCS}
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		$(use_enable test testbench)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug memcheck)
+		$(use_enable debug rtinst)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable grok mmgrok)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable ssl gnutls)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq imzmq3)
+		$(use_enable zeromq omczmq)
+		$(use_enable zeromq omzmq3)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/${BRANCH}/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	doins "${FILESDIR}/${BRANCH}/50-default.conf"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild b/app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild
new file mode 100644
index 000000000000..8174b04b23ed
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	MY_PV=${PV%_rc*}
+	MY_FILENAME="${PN}-${PV}.tar.gz"
+	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	# Upstream URL schema:
+	# RC:      http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
+	#          http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
+	# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
+
+	MY_URL_PREFIX=
+	if [[ ${PV} = *_rc* ]]; then
+		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
+		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
+		if [[ ${_tmp_suffix} = *rc* ]]; then
+			MY_URL_PREFIX="${_tmp_suffix}/"
+		fi
+
+		# Cleaning up temporary variables
+		unset _tmp_last_index
+		unset _tmp_suffix
+	else
+		KEYWORDS="amd64 arm ~arm64 ~hppa x86"
+	fi
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+	"
+
+	PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r3.patch )
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
+IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=dev-libs/liblogging-1.0.1:=[stdlog]
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	grok? ( >=dev-libs/grok-0.9.2 )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( virtual/libmysqlclient:= )
+	normalize? (
+		>=dev-libs/libee-0.4.0
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.14:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? ( >=net-libs/gnutls-2.12.23:0= )
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	zeromq? (
+		>=net-libs/czmq-3.0.2
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${MY_FILENAME_DOCS}
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		$(use_enable test testbench)
+		$(use_enable curl libcurl)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug memcheck)
+		$(use_enable debug rtinst)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable grok mmgrok)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable ssl gnutls)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/${BRANCH}/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild b/app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild
new file mode 100644
index 000000000000..c9aecb5b0713
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild
@@ -0,0 +1,457 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	MY_PV=${PV%_rc*}
+	MY_FILENAME="${PN}-${PV}.tar.gz"
+	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	# Upstream URL schema:
+	# RC:      http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
+	#          http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
+	# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
+
+	MY_URL_PREFIX=
+	if [[ ${PV} = *_rc* ]]; then
+		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
+		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
+		if [[ ${_tmp_suffix} = *rc* ]]; then
+			MY_URL_PREFIX="${_tmp_suffix}/"
+		fi
+
+		# Cleaning up temporary variables
+		unset _tmp_last_index
+		unset _tmp_suffix
+	else
+		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	fi
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
+IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=dev-libs/liblogging-1.0.1:=[stdlog]
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	grok? ( >=dev-libs/grok-0.9.2 )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( virtual/libmysqlclient:= )
+	normalize? (
+		>=dev-libs/libee-0.4.0
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.14:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? ( >=net-libs/gnutls-2.12.23:0= )
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	zeromq? (
+		>=net-libs/czmq-3.0.2
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${MY_FILENAME_DOCS}
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		$(use_enable test testbench)
+		$(use_enable curl libcurl)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug memcheck)
+		$(use_enable debug rtinst)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable grok mmgrok)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable ssl gnutls)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/${BRANCH}/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.34.0.ebuild b/app-admin/rsyslog/rsyslog-8.34.0.ebuild
new file mode 100644
index 000000000000..e13267969512
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.34.0.ebuild
@@ -0,0 +1,464 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	MY_PV=${PV%_rc*}
+	MY_FILENAME="${PN}-${PV}.tar.gz"
+	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	# Upstream URL schema:
+	# RC:      https://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
+	#          https://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
+	# Release: https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
+
+	MY_URL_PREFIX=
+	if [[ ${PV} = *_rc* ]]; then
+		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
+		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
+		if [[ ${_tmp_suffix} = *rc* ]]; then
+			MY_URL_PREFIX="${_tmp_suffix}/"
+		fi
+
+		# Cleaning up temporary variables
+		unset _tmp_last_index
+		unset _tmp_suffix
+	else
+		KEYWORDS="amd64 arm ~arm64 ~hppa x86"
+	fi
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+	"
+
+	PATCHES=( "${FILESDIR}"/${BRANCH}/${PN}-8.34.0-fix-issue2612.patch )
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql"
+IUSE+=" normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=dev-libs/liblogging-1.0.1:=[stdlog]
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	grok? ( >=dev-libs/grok-0.9.2 )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( virtual/libmysqlclient:= )
+	normalize? (
+		>=dev-libs/libee-0.4.0
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.14:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? ( >=net-libs/gnutls-2.12.23:0= )
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	zeromq? (
+		>=net-libs/czmq-3.0.2
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="kubernetes? ( normalize )"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${MY_FILENAME_DOCS}
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		$(use_enable test testbench)
+		$(use_enable curl libcurl)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug memcheck)
+		$(use_enable debug rtinst)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable grok mmgrok)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable ssl gnutls)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/${BRANCH}/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
new file mode 100644
index 000000000000..88d35b15d840
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
@@ -0,0 +1,467 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	MY_PV=${PV%_rc*}
+	MY_FILENAME="${PN}-${PV}.tar.gz"
+	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	# Upstream URL schema:
+	# RC:      https://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
+	#          https://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
+	# Release: https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
+
+	MY_URL_PREFIX=
+	if [[ ${PV} = *_rc* ]]; then
+		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
+		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
+		if [[ ${_tmp_suffix} = *rc* ]]; then
+			MY_URL_PREFIX="${_tmp_suffix}/"
+		fi
+
+		# Cleaning up temporary variables
+		unset _tmp_last_index
+		unset _tmp_suffix
+	else
+		KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
+	fi
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+	"
+
+	PATCHES=(
+		"${FILESDIR}"/${BRANCH}/${PN}-8.35.0-fix-issue2719.patch
+		"${FILESDIR}"/${BRANCH}/${PN}-8.35.0-fix-issue2726.patch
+	)
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql"
+IUSE+=" normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=dev-libs/liblogging-1.0.1:=[stdlog]
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	grok? ( >=dev-libs/grok-0.9.2 )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( virtual/libmysqlclient:= )
+	normalize? (
+		>=dev-libs/libee-0.4.0
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.14:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? ( >=net-libs/gnutls-2.12.23:0= )
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	zeromq? (
+		>=net-libs/czmq-3.0.2
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="kubernetes? ( normalize )"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${MY_FILENAME_DOCS}
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		$(use_enable test testbench)
+		$(use_enable curl libcurl)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug memcheck)
+		$(use_enable debug rtinst)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable grok mmgrok)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable ssl gnutls)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/${BRANCH}/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${BRANCH}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild
new file mode 100644
index 000000000000..27d2078ef8fd
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild
@@ -0,0 +1,476 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	MY_PV=${PV%_rc*}
+	MY_FILENAME="${PN}-${PV}.tar.gz"
+	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	# Upstream URL schema:
+	# RC:      https://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
+	#          https://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
+	# Release: https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
+
+	MY_URL_PREFIX=
+	if [[ ${PV} = *_rc* ]]; then
+		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
+		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
+		if [[ ${_tmp_suffix} = *rc* ]]; then
+			MY_URL_PREFIX="${_tmp_suffix}/"
+		fi
+
+		# Cleaning up temporary variables
+		unset _tmp_last_index
+		unset _tmp_suffix
+	else
+		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	fi
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+	"
+
+	PATCHES=()
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac"
+IUSE+=" snmp ssl systemd test usertools +uuid xxhash zeromq"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	grok? ( >=dev-libs/grok-0.9.2 )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( virtual/libmysqlclient:= )
+	normalize? (
+		>=dev-libs/libee-0.4.0
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.14:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-3.0.2
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${MY_FILENAME_DOCS}
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		$(use_enable test testbench)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug memcheck)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable grok mmgrok)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/${BRANCH}/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${BRANCH}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/sagan-0.2.3 b/app-admin/sagan-0.2.3
deleted file mode 100644
index 17617ded9258..000000000000
--- a/app-admin/sagan-0.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/pkgconfig dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Sagan is a multi-threaded, real time system and event log monitoring system
-EAPI=5
-HOMEPAGE=http://sagan.quadrantsec.com/
-IUSE=+libdnet +lognorm mysql +pcap postgres smtp snort
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 )
-SLOT=0
-SRC_URI=http://sagan.quadrantsec.com/download/sagan-0.2.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f8137960323090eea13b02136f2e7e7b
diff --git a/app-admin/sagan-1.0.0_rc3 b/app-admin/sagan-1.0.0_rc3
deleted file mode 100644
index 72fb2078dc9a..000000000000
--- a/app-admin/sagan-1.0.0_rc3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/pkgconfig dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) lognorm? ( dev-libs/liblognorm dev-libs/json-c:= dev-libs/libee dev-libs/libestr ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 ) geoip? ( dev-libs/geoip ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Sagan is a multi-threaded, real time system and event log monitoring system
-EAPI=5
-HOMEPAGE=http://sagan.quadrantsec.com/
-IUSE=geoip +libdnet +lognorm mysql +pcap smtp snort
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) lognorm? ( dev-libs/liblognorm dev-libs/json-c:= dev-libs/libee dev-libs/libestr ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 ) geoip? ( dev-libs/geoip )
-SLOT=0
-SRC_URI=http://sagan.quadrantsec.com/download/sagan-1.0.0RC3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=84ae7993f93af0d6a9b864773ffbe0e9
diff --git a/app-admin/sagan-rules-20130430 b/app-admin/sagan-rules-20130430
deleted file mode 100644
index d3848deaf9b1..000000000000
--- a/app-admin/sagan-rules-20130430
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Rules for Sagan log analyzer
-EAPI=6
-HOMEPAGE=http://sagan.softwink.com/
-IUSE=+lognorm
-KEYWORDS=amd64 x86
-LICENSE=BSD
-PDEPEND=app-admin/sagan
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~maksbotan/sagan/sagan-rules-20130430.tar.gz
-_md5_=f6b032b13609790492affb8cd5708371
diff --git a/app-admin/sagan-rules-20140617 b/app-admin/sagan-rules-20140617
deleted file mode 100644
index af6b41f83334..000000000000
--- a/app-admin/sagan-rules-20140617
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Rules for Sagan log analyzer
-EAPI=6
-HOMEPAGE=http://sagan.softwink.com/
-IUSE=+lognorm
-KEYWORDS=amd64 x86
-LICENSE=BSD
-PDEPEND=app-admin/sagan
-SLOT=0
-SRC_URI=http://sagan.quadrantsec.com/rules/sagan-rules-06172014.tar.gz
-_md5_=552208e92e20bbe31a86a3bd57c50ba8
diff --git a/app-admin/sagan-rules-99999999 b/app-admin/sagan-rules-99999999
deleted file mode 100644
index 1006401520f3..000000000000
--- a/app-admin/sagan-rules-99999999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Rules for Sagan log analyzer
-EAPI=6
-HOMEPAGE=http://sagan.softwink.com/
-IUSE=+lognorm
-LICENSE=BSD
-PDEPEND=app-admin/sagan
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
-_md5_=0bfa8f18da81fb433b1e89a10703d388
diff --git a/app-admin/sagan-rules/Manifest b/app-admin/sagan-rules/Manifest
new file mode 100644
index 000000000000..27ee603a7fe0
--- /dev/null
+++ b/app-admin/sagan-rules/Manifest
@@ -0,0 +1,6 @@
+DIST sagan-rules-06172014.tar.gz 273531 BLAKE2B f78a2203013c3ca4d0f33421b750a6f03f7929193f122df5504b6919ecbc24302bf10a2c65390ebaf6d7f6c4e12a1ef8e2c4d457bd2dd14cd79a7f0313a2c6a5 SHA512 824e3b159fae10876f59e50b1c751e509b04e6ee347e74afb19c1a5f935fe41b8d8874d6379bea477fea5a9c5754b1917f9b78da3009203fe23a0c600e03da23
+DIST sagan-rules-20130430.tar.gz 240975 BLAKE2B 26032d61e3933bfebe6eee14e78b6d9cd54dcc1b5acdca833859f3648aa0ea9fe9e590b19ed6febcd93491e8576842c011b3a2e11f1dd75f8f57d642252216ee SHA512 bc31f043a0e14542665d9e1469d85427fea395bb86b833200dfa3c8f4cbd2591f6268f26a478c768ad8784aeb1a102e01e3bbfc63636a0384b2092193bbb9bdb
+EBUILD sagan-rules-20130430.ebuild 540 BLAKE2B 28ab045f38db9d1584e3ec8d54cd93ec43a415ef206be72e1230707e0d43868d220206e8084a50eb09c1acd4b0aa026cbaf6945c7e96d413557e72bc829171a6 SHA512 7cd0bbe2b893a61c69e6c188f2831f8370d2b8eea85c35b53268b0316bdd79e6823bbd78097a8b24a8438c2dc501c4a2eebcec26abf33cfaf98e28648b56b670
+EBUILD sagan-rules-20140617.ebuild 550 BLAKE2B 96583666ae4e4c01ed92e0e835ad819a2965b8fd69220abbd61de592b02548ce88c25dfa7c6c15e32094a339b65aa72669490e1d5b889afdd47b60448f69985a SHA512 b560a5422eb9559f85e057f6681b1d9cdda344a07cd07d59c5f2374c51ada996428070accf8144b79cf740f75878f6e23dab56597552c495e151cc64ac942737
+EBUILD sagan-rules-99999999.ebuild 512 BLAKE2B d2204bcfe47b1547941727b3f9afd0362d20b27d88b0299b0dec9d2f9b53ca2da57228b871ea73d6d26b3196d956f65cc40881bc5e89d0a5b803cbfc0c504f6a SHA512 ef9fa5e4c4c306d8b8e4c593b517c480cff2ccf2a7324ad0ef4bc03ebcabaef669126d93dc0b8b722925bbbd7da9a800a21a6c1d40f01180ab20057b424d26b0
+MISC metadata.xml 333 BLAKE2B 6669cb8a1ffcf80841f4a2ff0c243bd3fb524553675fd9b5d26af20d27ff80559d79b9a303e30ff899ea2535e819d09e81486c7a9acf39251a42b12ec11dec5c SHA512 f5629f04c280240b0e32a34806aac532556af940c87240ef15f669762ef289c23d5ae622e139243e6c1e230a79e275eeb9521fe9956efd5471575bc4862ff33c
diff --git a/app-admin/sagan-rules/metadata.xml b/app-admin/sagan-rules/metadata.xml
new file mode 100644
index 000000000000..543da96a8fe4
--- /dev/null
+++ b/app-admin/sagan-rules/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="lognorm">Install normalize rules support with <pkg>dev-libs/liblognorm</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/sagan-rules/sagan-rules-20130430.ebuild b/app-admin/sagan-rules/sagan-rules-20130430.ebuild
new file mode 100644
index 000000000000..792a5e255308
--- /dev/null
+++ b/app-admin/sagan-rules/sagan-rules-20130430.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Rules for Sagan log analyzer"
+HOMEPAGE="http://sagan.softwink.com/"
+SRC_URI="https://dev.gentoo.org/~maksbotan/sagan/sagan-rules-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+lognorm"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+PDEPEND="app-admin/sagan"
+
+S=${WORKDIR}/rules
+
+src_install() {
+	insinto /etc/sagan-rules
+	doins *.config
+	doins *rules
+	if use lognorm ; then
+		doins *normalize.rulebase
+	fi
+}
diff --git a/app-admin/sagan-rules/sagan-rules-20140617.ebuild b/app-admin/sagan-rules/sagan-rules-20140617.ebuild
new file mode 100644
index 000000000000..f96f36790f2e
--- /dev/null
+++ b/app-admin/sagan-rules/sagan-rules-20140617.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Rules for Sagan log analyzer"
+HOMEPAGE="http://sagan.softwink.com/"
+SRC_URI="http://sagan.quadrantsec.com/rules/sagan-rules-06172014.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+lognorm"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+PDEPEND="app-admin/sagan"
+
+S=${WORKDIR}/rules
+
+src_install() {
+	insinto /etc/sagan-rules
+	doins *.config
+	doins *rules
+	doins *map
+	if use lognorm ; then
+		doins *normalize.rulebase
+	fi
+}
diff --git a/app-admin/sagan-rules/sagan-rules-99999999.ebuild b/app-admin/sagan-rules/sagan-rules-99999999.ebuild
new file mode 100644
index 000000000000..b1f8d1514eb4
--- /dev/null
+++ b/app-admin/sagan-rules/sagan-rules-99999999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3
+
+DESCRIPTION="Rules for Sagan log analyzer"
+HOMEPAGE="http://sagan.softwink.com/"
+EGIT_REPO_URI="https://github.com/beave/sagan-rules.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="+lognorm"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+PDEPEND="app-admin/sagan"
+
+src_install() {
+	insinto /etc/sagan-rules
+	doins *.config
+	doins *rules
+	if use lognorm; then
+		doins *normalization.rulebase
+	fi
+}
diff --git a/app-admin/sagan/Manifest b/app-admin/sagan/Manifest
new file mode 100644
index 000000000000..d7072151a276
--- /dev/null
+++ b/app-admin/sagan/Manifest
@@ -0,0 +1,10 @@
+AUX mysql_check.patch 944 BLAKE2B 81fa58f1d60d81c6ec8c9e5b2f4d0a41aa67f51792f439205fb4a9016e989fc58035ac9878c27043aff8512ee490108e79b7627e052e1a222494a43d8b7a1475 SHA512 5758990b9c85a73d38c00d03a0ff9812e3ffe18a8831daebc01329c2db9253d75467b341aeffe563adcbd4fc907c510991ccf2e9bd8d9c6e7b6b353e7d2a4412
+AUX sagan-1.0.0-liblognorm-json-c.patch 2840 BLAKE2B 569957ec95bf5fc5bb1e844ba1d5f6a1c68415bd877551dbef03c62afbe66cde528fc4a2b80c3ca5faa92a3e97d2824a0e77b54add21e4a8092f6022b3e4c273 SHA512 1aa092351d317c373416a98ca6bbab19a070e43d0d4b82fe6dd1ac5a7cbb67741247ca2655e905a682ef5527fbf139c70a469a960be1dfdaa05c643a9749a4e9
+AUX sagan.confd 239 BLAKE2B 2ca76c1bd5bdb7b29f007a4d93602f020f76b10d6e4313e138e09b49de0b0c6796bc729f32e88831881bdcd52637bfb3a8e42481d89a09648a2833a000570ace SHA512 7ee746984d3bb3361e3155860d54e307f9b94b9e3f98c09c29b4259cd37d7aefe969b5b942c04048328ec23265a2689b22403c32e3552b8062201aca2ef3ac34
+AUX sagan.init 432 BLAKE2B 561344909a8f6610504f91bf72ba6fa89ac03fdacacd3189372f466b690b3421c3f1a8ce4750b747c53613c75f9b61696ec7b3c490597eb0eca36ebece23a26e SHA512 c5ec82e48ac33785a0e63deb6b2079e97a2f9b5f96682ccbf646b4deae5782cbceb5756b17fdff7af8cafd4e561e298d842c4c4f4aa5229ccc58f5f0fc06e6f7
+AUX sagan.init-r1 424 BLAKE2B e6fdd676e772d2abfca02215026a95321edecb41fcbeec3aa45afe15abd667e323ec2f21375d41c692b9648017002c0b410d551034dcbd3f060f5bb1e2f95026 SHA512 341754a9b18fa4b4082a852cec2eaa5ea78be33eb9d8cdef5b7ec61a9d67d3b264b2c6a2aef030bd85d3644539447345c88fd23ebe99145e40f990f565706809
+DIST sagan-0.2.3.tar.gz 231774 BLAKE2B b385a4b22f2fe7567dbb0c52ec022794eacf057a0dc797daa0432ef4bdfc344473a500298825f56a32513025e9c7cee3ff70fc577d7a9454e87022510a71edb4 SHA512 2110f3d34db69cb5c453b8e37d06debeea7531ebf15a9b78954ac1657ddce34feaaff87d14695759c3deb2eed5ecc0e6fec5881fb5037af8efa6c3c9600242cc
+DIST sagan-1.0.0RC3.tar.gz 285207 BLAKE2B 7322ffc73a8e86f07ef106b04feb9140ba94a51b9e286ef0c0b0d3fa609e8e03cef4c75e1d32502c1b70a4c078d8601d2a1c58058137bb793c8a52cecc4be20b SHA512 29388a339b290bb4de2359c0c54b9e1d43ef207b223a499a1a4faa36de4d9590a777a796dd773948e995d052b71f3ef47ca5bad5c133116c4dbb53b4fe336123
+EBUILD sagan-0.2.3.ebuild 2024 BLAKE2B c3d9db48c8aa738f812ce22b5c3c1ab4ed436b8130480a30f7daad2f64dca7d425fccfec0668c96bcd18ee2fd5a4f3b49b8c1f785eaa9d4030c8865f0327cc69 SHA512 892c84a08c01258e6cafb52c8e5b12fcd38b4644c9160645baf39cf37dd1e270b951e9dcdc8aa1c720445b89f9848fb3905cbe7b806ad4e292be3f0f1d72be40
+EBUILD sagan-1.0.0_rc3.ebuild 2080 BLAKE2B a82272fc36cbd9eafa62cf7da9bd0b412c06f4d235861be44be21fd811fddcbe299e75dcdd56370787a3f9f35c47592a3dcc2d9608457e532ce1c0ee3dc68c44 SHA512 3dcc104b0f36a134cc0217c7c5f6373d13a6b479f8f97545953b8c551d28c330515176914c9f3447211a5c6882c68b90e656e53d61a9221489e1229f6302344f
+MISC metadata.xml 711 BLAKE2B 19677ce6a88bd62ae22cc1383a8f671082c0f2b844d3e75344e5ff3aa01bc51e4826b3c02f30221af0f9b2b620e9bc9ccb2a6c55944d1b34de072c7f985531eb SHA512 0ddee4d50afea4e3813b9ffc57d444b95c56773f58a469e28d99a85bda787143a23f4adae995632283b2ec5269cbe38e3ffecd294448c675169c4ef10033afb6
diff --git a/app-admin/sagan/files/mysql_check.patch b/app-admin/sagan/files/mysql_check.patch
new file mode 100644
index 000000000000..d2247aab571e
--- /dev/null
+++ b/app-admin/sagan/files/mysql_check.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.in b/configure.ac
+rename from configure.in
+rename to configure.ac
+--- a/configure.in
++++ b/configure.ac
+@@ -215,13 +215,17 @@
+ AC_CHECK_LIB(pthread, main,,AC_MSG_ERROR(Sagan needs pthreads!))
+ AC_CHECK_LIB(m, main,,AC_MSG_ERROR(Sagan needs libm!))
+ 
++save_LIBS=$LIBS
+ if test "$MYSQL" = "yes"; then
+ 	AC_MSG_RESULT([------- MySQL support is enabled -------])
++	AC_CHECK_PROGS(MYSQL_CONFIG, mysql_config)
+ 	AC_CHECK_HEADER([mysql/mysql.h])
+ 	AC_CHECK_HEADER([mysql/errmsg.h])
+-	AC_CHECK_LIB(mysqlclient_r, main,,AC_MSG_ERROR(The MySQL library libmysqlclient_r is missing!
+-If you're not interested in MySQL support use the --disable-mysql flag.))
+-	fi
++	LIBS=$(mysql_config --libs_r) 
++	AC_CHECK_LIB(mysqlclient_r, main,,AC_MSG_ERROR(The MySQL library libmysqlclient_r is missing!))
++fi
++LIBS="$save_LIBS $LIBS"
++
+ 
+ if test "$POSTGRES" = "yes"; then
+        AC_MSG_RESULT([------- PostgreSQL support is enabled -------])
diff --git a/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch b/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch
new file mode 100644
index 000000000000..f9540652717a
--- /dev/null
+++ b/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch
@@ -0,0 +1,55 @@
+diff -rupN old/sagan-1.0.0RC3/configure.ac new/sagan-1.0.0RC3/configure.ac
+--- old/sagan-1.0.0RC3/configure.ac	2014-06-16 22:23:22.000000000 +0200
++++ new/sagan-1.0.0RC3/configure.ac	2015-10-11 21:04:26.493632624 +0200
+@@ -192,29 +192,15 @@ If you're not interested in libesmtp sup
+        fi
+ 
+ if test "$LOGNORM" = "yes"; then
+-       AC_MSG_RESULT([------- liblognorm support is enabled -------])
+-       AC_CHECK_HEADER([liblognorm.h])
+-       AC_CHECK_HEADERS([json/json.h json.h], [break], [AC_MSG_ERROR([json-c headers not found or not usable.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag.])]) 
+-       AC_CHECK_LIB(estr, main,,AC_MSG_ERROR(The libestr library cannot be found.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag. ))
+-       AC_CHECK_LIB(ee, main,,AC_MSG_ERROR(The libee library cannot be found.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag. ))
+-       AC_CHECK_LIB(lognorm, main,,AC_MSG_ERROR(The liblognorm library cannot be found.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag. ))
+-       AC_CHECK_LIB(json, json_object_put,, [ AC_CHECK_LIB(json-c, json_object_put,,AC_MSG_ERROR(The json library cannot be found.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag.)) ],)
+-       fi
++	AC_MSG_RESULT([------- liblognorm support is enabled -------])
++
++	PKG_CHECK_MODULES(LIBEE, libee >= 0.3.2)
++	PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9)
++	PKG_CHECK_MODULES([JSON_C], [json-c],, [
++		PKG_CHECK_MODULES([JSON_C], [json],,)
++	])
++	PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 1.0.2)
++fi
+ 
+ if test "$LIBPCAP" = "yes"; then
+        AC_MSG_RESULT([------- libpcap support is enabled -------])
+diff -rupN old/sagan-1.0.0RC3/src/Makefile.am new/sagan-1.0.0RC3/src/Makefile.am
+--- old/sagan-1.0.0RC3/src/Makefile.am	2014-06-16 22:23:22.000000000 +0200
++++ new/sagan-1.0.0RC3/src/Makefile.am	2015-10-11 21:05:28.754492699 +0200
+@@ -2,6 +2,9 @@ AUTOMAKE_OPIONS=foreign no-dependencies
+ 
+ bin_PROGRAMS = sagan
+ 
++sagan_CFLAGS = $(JSON_C_CFLAGS) $(LIBESTR_CFLAGS) $(LIBLOGNORM_CFLAGS)
++sagan_LDFLAGS = $(JSON_C_LIBS) $(LIBESTR_LIBS) $(LIBLOGNORM_LIBS)
++
+ sagan_SOURCES = sagan.c \
+ sagan-classifications.c \
+ sagan-config.c \
diff --git a/app-admin/sagan/files/sagan.confd b/app-admin/sagan/files/sagan.confd
new file mode 100644
index 000000000000..cab6db55ccf0
--- /dev/null
+++ b/app-admin/sagan/files/sagan.confd
@@ -0,0 +1,9 @@
+# Copyright 1999-2011 Gentoo Foundation
+# # Distributed under the terms of the GNU General Public License v2
+
+# Sagan daemon configuration file
+# Make debug mode
+# SAGAN_OPTS = " --debug "
+#
+# Run as user, default sagan
+SAGAN_USER="sagan"
diff --git a/app-admin/sagan/files/sagan.init b/app-admin/sagan/files/sagan.init
new file mode 100644
index 000000000000..99f1f24e3bfa
--- /dev/null
+++ b/app-admin/sagan/files/sagan.init
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/sagan/sagan.pid"
+command="/usr/bin/sagan"
+command_args="-D \"${SAGAN_OPTS}\" -u \"${SAGAN_USER}\""
+
+depend() {
+      use logger mysql postgresql
+      need localmount
+}
+
+start_pre() {
+    checkpath -d -o sagan /var/run/sagan
+    checkpath -p -o sagan -m 0644 /var/run/sagan/sagan.fifo
+}
diff --git a/app-admin/sagan/files/sagan.init-r1 b/app-admin/sagan/files/sagan.init-r1
new file mode 100644
index 000000000000..f0d556583c43
--- /dev/null
+++ b/app-admin/sagan/files/sagan.init-r1
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/sagan/sagan.pid"
+command="/usr/bin/sagan"
+command_args="-D \"${SAGAN_OPTS}\" -u \"${SAGAN_USER}\""
+
+depend() {
+      use logger mysql postgresql
+      need localmount
+}
+
+start_pre() {
+    checkpath -d -o sagan /run/sagan
+    checkpath -p -o sagan -m 0644 /run/sagan/sagan.fifo
+}
diff --git a/app-admin/sagan/metadata.xml b/app-admin/sagan/metadata.xml
new file mode 100644
index 000000000000..3e12feb4a2b3
--- /dev/null
+++ b/app-admin/sagan/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<use>
+		<flag name="smtp">Build witch SMTP (E-Mail) support</flag>
+		<flag name="lognorm">Add support for log/rules normalizations via <pkg>dev-libs/liblognorm</pkg></flag>
+		<flag name="pcap">Add support for network packet capture via <pkg>net-libs/libpcap</pkg></flag>
+		<flag name="libdnet">Add support for <pkg>dev-libs/libdnet</pkg></flag>
+		<flag name="snort">Add support to interact with Snort IDE using  <pkg>net-analyzer/snortsam</pkg>'</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/sagan/sagan-0.2.3.ebuild b/app-admin/sagan/sagan-0.2.3.ebuild
new file mode 100644
index 000000000000..64c6a49c8ba3
--- /dev/null
+++ b/app-admin/sagan/sagan-0.2.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit eutils autotools-utils user
+
+DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
+HOMEPAGE="http://sagan.quadrantsec.com/"
+SRC_URI="http://sagan.quadrantsec.com/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+libdnet +lognorm mysql +pcap postgres smtp snort"
+
+RDEPEND="dev-libs/libpcre
+	app-admin/sagan-rules[lognorm?]
+	smtp? ( net-libs/libesmtp )
+	pcap? ( net-libs/libpcap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	lognorm? ( dev-libs/liblognorm )
+	libdnet? ( dev-libs/libdnet )
+	snort? ( >=net-analyzer/snortsam-2.50 )
+	"
+
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
+PATCHES=( "${FILESDIR}"/mysql_check.patch )
+
+pkg_setup() {
+	enewgroup sagan
+	enewuser sagan -1 -1 /dev/null sagan
+}
+
+src_configure() {
+	 local myeconfargs=(
+		$(use_enable mysql)
+		$(use_enable postgres postgresql)
+		$(use_enable smtp esmtp)
+		$(use_enable lognorm)
+		$(use_enable libdnet)
+		$(use_enable pcap libpcap)
+		$(use_enable snort snortsam)
+		--disable-prelude
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	diropts -g sagan -o sagan -m 775
+
+	dodir /var/log/sagan
+
+	keepdir /var/log/sagan
+
+	touch "${ED}"/var/log/sagan/sagan.log
+	chown sagan.sagan "${ED}"/var/log/sagan/sagan.log
+
+	newinitd "${FILESDIR}"/sagan.init sagan
+	newconfd "${FILESDIR}"/sagan.confd sagan
+
+	insinto /usr/share/doc/${PF}/examples
+	doins -r extra/*
+}
+
+pkg_postinst() {
+	if use smtp; then
+		ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
+		ewarn "email, create valid writable home directory for user 'sagan'"
+		ewarn "For security reasons it was created with /dev/null home directory"
+	fi
+
+	einfo "For configuration assistance see"
+	einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
+}
diff --git a/app-admin/sagan/sagan-1.0.0_rc3.ebuild b/app-admin/sagan/sagan-1.0.0_rc3.ebuild
new file mode 100644
index 000000000000..da136ef46dc2
--- /dev/null
+++ b/app-admin/sagan/sagan-1.0.0_rc3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit eutils autotools-utils user
+
+DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
+HOMEPAGE="http://sagan.quadrantsec.com/"
+SRC_URI="http://sagan.quadrantsec.com/download/sagan-1.0.0RC3.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="geoip +libdnet +lognorm mysql +pcap smtp snort"
+
+RDEPEND="dev-libs/libpcre
+	app-admin/sagan-rules[lognorm?]
+	smtp? ( net-libs/libesmtp )
+	pcap? ( net-libs/libpcap )
+	mysql? ( virtual/mysql )
+	lognorm? (
+		dev-libs/liblognorm
+		dev-libs/json-c:=
+		dev-libs/libee
+		dev-libs/libestr
+			)
+	libdnet? ( dev-libs/libdnet )
+	snort? ( >=net-analyzer/snortsam-2.50 )
+	geoip? ( dev-libs/geoip )
+	"
+
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
+PATCHES=( "${FILESDIR}"/${PN}-1.0.0-liblognorm-json-c.patch )
+S="${WORKDIR}/sagan-1.0.0RC3/"
+
+pkg_setup() {
+	enewgroup sagan
+	enewuser sagan -1 -1 /dev/null sagan
+}
+
+src_configure() {
+	 local myeconfargs=(
+		$(use_enable smtp esmtp)
+		$(use_enable lognorm)
+		$(use_enable libdnet)
+		$(use_enable pcap libpcap)
+		$(use_enable snort snortsam)
+		$(use_enable geoip)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	diropts -g sagan -o sagan -m 775
+
+	dodir /var/log/sagan
+
+	keepdir /var/log/sagan
+
+	touch "${ED}"/var/log/sagan/sagan.log
+	chown sagan.sagan "${ED}"/var/log/sagan/sagan.log
+
+	newinitd "${FILESDIR}"/sagan.init-r1 sagan
+	newconfd "${FILESDIR}"/sagan.confd sagan
+
+	insinto /usr/share/doc/${PF}/examples
+	doins -r extra/*
+}
+
+pkg_postinst() {
+	if use smtp; then
+		ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
+		ewarn "email, create valid writable home directory for user 'sagan'"
+		ewarn "For security reasons it was created with /dev/null home directory"
+	fi
+
+	einfo "For configuration assistance see"
+	einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
+}
diff --git a/app-admin/salt-2016.11.9-r2 b/app-admin/salt-2016.11.9-r2
deleted file mode 100644
index 75ef13918e99..000000000000
--- a/app-admin/salt-2016.11.9-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !x86? ( dev-python/boto3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/moto-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/SaltTesting-2016.5.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Salt is a remote execution and configuration manager
-EAPI=6
-HOMEPAGE=https://saltstack.com/community/
-IUSE=cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova openssl portage profile redis selinux test timelib raet +zeromq vim-syntax python_targets_python2_7
-KEYWORDS=~x86 ~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python2_7 )
-RESTRICT=x86? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/salt/salt-2016.11.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a0f5134fe7bd62880a685e22b2439673
diff --git a/app-admin/salt-2017.7.7 b/app-admin/salt-2017.7.7
deleted file mode 100644
index 376d064f7be5..000000000000
--- a/app-admin/salt-2017.7.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/pytest-salt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !x86? ( >=dev-python/boto3-1.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/moto-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/SaltTesting-2016.5.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <www-servers/tornado-5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( || ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Salt is a remote execution and configuration manager
-EAPI=6
-HOMEPAGE=http://saltstack.org/
-IUSE=cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova openssl portage profile redis selinux test timelib raet +zeromq vim-syntax python_targets_python2_7
-KEYWORDS=~x86 ~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <www-servers/tornado-5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( || ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python2_7 )
-RESTRICT=x86? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/salt/salt-2017.7.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ac02b82a216f598c0f031ac14a44c20f
diff --git a/app-admin/salt-2018.3.2 b/app-admin/salt-2018.3.2
deleted file mode 100644
index f482563bdbb2..000000000000
--- a/app-admin/salt-2018.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest-salt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-catchlog[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pip[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] !x86? ( >=dev-python/boto3-1.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) >=dev-python/moto-0.3.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/SaltTesting-2016.5.11[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/libnacl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/markupsafe[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] <www-servers/tornado-5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) portage? ( || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) vim-syntax? ( app-vim/salt-vim ) ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Salt is a remote execution and configuration manager
-EAPI=6
-HOMEPAGE=http://saltstack.org/
-IUSE=cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova openssl portage profile redis selinux test timelib raet +zeromq vim-syntax python_targets_python2_7 python_targets_python3_6
-KEYWORDS=~x86 ~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/libnacl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/markupsafe[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] <www-servers/tornado-5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) portage? ( || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) vim-syntax? ( app-vim/salt-vim ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python2_7 python_targets_python3_6 )
-RESTRICT=x86? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/salt/salt-2018.3.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=96885f21e8a44b083c93c2a23b16c168
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
new file mode 100644
index 000000000000..fb4c87cb007e
--- /dev/null
+++ b/app-admin/salt/Manifest
@@ -0,0 +1,27 @@
+AUX api-confd-1 188 BLAKE2B 8ac416a7ff64c73556f07a08268ea7d91547e242becd345ac35da7b64f6b2e4aba276e8920e7353bd2caeaffa3034349496b00622191793994bbd4d25faa3c3c SHA512 c58fc025a3654b59f79c6e23fe135d75ebad8b166bc5214f4842c3dd92192e3598480f9fd6960ad2dc36d3ee45ff971650c5e0156353c1c045650f86c9a68db9
+AUX api-initd-4 302 BLAKE2B 385e678ea2fe06f413e68a3812350df823318a2807805373377e747c3a82e524af114aeccab8a6e6e36b1419a3e0a6bf025749db585483906487767e76274376 SHA512 098fb6e1ba83270abd31f9cc3afdc159149276962fcf73ce0ae943df87ec26d0883990652614cdeef48912778780731f91efc972a22a75c4b10f3bd79a251a90
+AUX master-confd-1 188 BLAKE2B 8ac416a7ff64c73556f07a08268ea7d91547e242becd345ac35da7b64f6b2e4aba276e8920e7353bd2caeaffa3034349496b00622191793994bbd4d25faa3c3c SHA512 c58fc025a3654b59f79c6e23fe135d75ebad8b166bc5214f4842c3dd92192e3598480f9fd6960ad2dc36d3ee45ff971650c5e0156353c1c045650f86c9a68db9
+AUX master-initd-4 311 BLAKE2B 302e71b0328d47addd1508e1992ee56c719463d4b99af37b626835fefd28f9c3184e8441035f055992489b1084f1fdd45542466b359c206305e8174fef853478 SHA512 d44ea9fdf962ded6d0c6ac5a1f89ec8729a9a70517ba0f132c54696d32bc96030c64af09f48037867006bd3acdf4b6db759ca873717cd5a88701e42d06885bcc
+AUX minion-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
+AUX minion-initd-4 317 BLAKE2B 4c207bd26a72d5dded38e40f7869f46263272a841b978f138248d016a06e837c3aebebabd15314e3896b404058c3f5dd5e6a1cca48450b07b88b6edef6a8d7d2 SHA512 80790ed1b5f86b713ca6384d60253676b16b10c122810ed07b7119c3860bedfe40102f6b7de86d832f084d84f87bf9405ec282629f981767a534d2a53144845f
+AUX salt-2016.11.0-broken-tests.patch 1092 BLAKE2B 5ab3cccc024b5cdc4e6eecd5f164c9f931aa25b23264151ef15645e63e1586f2a093f29a9835685482d831b98e131a385799d39b9158c865af83724a994bbdb1 SHA512 d23c16a5ed8c0fbd4287d73e45b700d465224c5f3b32c47bb2994703a4b4c261053b9c79444973cfaf86afa2850b8499a6b7923317fde3de43840a575ada74b4
+AUX salt-2016.11.0-remove-file-tree-test.patch 1480 BLAKE2B ad2285dd37d5a727feac291c5598b4dc56c98674566c3816fb17577ce44da4d20ddb60c1f0b8a8c8f7d2fe6f33918d00e5010c47c4441728f6a1a9ca94cf4015 SHA512 0503b4ecd16c2f67b53f1ce52b5f77cacf8de420024c5c7751d3caa06de2d1e685eef8d4021dfe86a5850ac23f58705a375e87922b3c5fbeb8c11290690624bc
+AUX salt-2016.11.0-tmpdir.patch 1480 BLAKE2B c5501459ba32a5ef08317f4e1a247a7ac2ad563be100f80bfb97a14821af43134dce76d46d9c9431f8b2866eec0272e6de62e281c9a469f8177f214e7c5f6a7e SHA512 ef654d871178618dab68ad9b4062560cfa57fa421834b142639a11d12679ebc97afc27fa572dd77b74d86ba722bb8575b64045bbf3cab9f2d0e2cefeca38c4bd
+AUX salt-2016.3.1-dont-realpath-tmpdir.patch 853 BLAKE2B e78c50d1050adad0d21523229034a24f1fd2c977172f3135dbf09440ed6d7e292f0dd9c267c3277edfe8528bf38d269939d068b4af8671da08c64f5712c0d7e1 SHA512 a6bc22959975ac25df84c54437a1638e95d78c057920ced38b0accddca11eb33ad39f2a43dd05648584cd10b140f7ee509a8c6739c4d89d30500452c91795b79
+AUX salt-2016.3.4-test-nonexist-dirs.patch 1655 BLAKE2B 5e7907e0a10c4ee78b599ec98d38088c97889ae2002602db0c207fb210e2960e7b4b92c08f027854e6dd9205b000bb09e7b243346af755e6824561752e3ef2e9 SHA512 ee81b8104f066e1d161207fe82d8349eb8c40701544784a2b6e66842fe9e07d7edffa24cad8c5d2037e2e7fa0368c614ed177fdf7359c89255d068767968e8fd
+AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17
+AUX salt-2017.7.3-tests.patch 3096 BLAKE2B bde978ec7d9ca3f303e859d8ecc728ee16e6b1753afe2325f95b0938ed2828ac5b3f80ac92451f6ab4bf7f08f141b71df88641da9694828657dd358059df9826 SHA512 0db8e8dffeabd9f7c0c619480425c58f4b58a486e1866062c8a482489bb79fd6f31c06020ed83e1903a346cbacb221ba541a2363d4e983e583313adb4652d22f
+AUX salt-2018.3.2-skip-zeromq-test-that-hangs.patch 2820 BLAKE2B e531bddf576322f8417e7e362bfed7aa21ce8f1edc1702074f250efc9118c755664bd2976282399b725c1f56362e37fa07064b9e4ac2a72c413a56b13d325cdd SHA512 72cbc1e7c8d59883bcbe8130fdbae6e1ccecfabe74069a7389e63f797609930036c593204ab441cff92933d3d35a24feb7db0dc76804d76608190e93a8bc6ed4
+AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
+AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
+AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed
+AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0
+AUX syndic-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
+AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4e887c1e6487682efce7f5b75d3bcf366ef706a9fb1578dce537ac5b50324239378cecbd0715ad5d SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef
+DIST salt-2016.11.9.tar.gz 10062996 BLAKE2B 5176d04d07a69de21c9c136c201d334614c5675fd78e306a0160fae829b633441cd859f4ba1a0822dfbb9ae716475c53f6eb058187d4acc8a5770dd4ceace577 SHA512 896fd27c111e926e246b51d00b69d41c8f4d25ec0c034c9ff3dc5414f5e93592fd637cdeaecf02b3b98a4e5a7ce478bfda86b15497961078374608d76516593d
+DIST salt-2017.7.7.tar.gz 11131480 BLAKE2B ea01c8894433cf96697c830d58184bfefca52dcd1be9b1c398270acc229886eeb41edf83d1498fc500f23209fc4e56ba8471da88383bd4c1a9338262423477fb SHA512 01cba364e2dcb5021b2b3b738462645c84332bbf31c0fa82f017fc583a097dccde308fd86be54d2b429921f34c89a4a40b942385c3bc139eb11753d155664063
+DIST salt-2018.3.2.tar.gz 12996445 BLAKE2B 8411fb0891e23ce8e35157662a0a45c0c5b13b62f3fd21cc4bbe5152f923a98b27cb5bee4fb8cb3e6ec5c9daed1afa27baf4b570b94f9f40eddc0891f72829e9 SHA512 142ebe13638d7e6dd0aecc9f0325002d30e115fe8688f5f74cbeb7ff21020327d65ded0dcd845e55362b97568b696887fa22243d66d5eadef65f97152d4775d3
+EBUILD salt-2016.11.9-r2.ebuild 4813 BLAKE2B 63f1878b36fd4119ee145b799818fdcb33c8d1dc8c8b81627b03de4141a148d7457a63f6fe7b4b8c9fa00d8a2a3b09e2c844fe0f98252709c13ddfa78be96666 SHA512 40459666f806112619a1326547dfadd6aebf68e275b195744a5d113d92aed707048925467318ee753451cd0856e015b2fb7879bc0e27a7475572d6c99a1489a1
+EBUILD salt-2017.7.7.ebuild 4621 BLAKE2B cdf19dd14e998384dd0ef852ef6b3b8bd7d003c1fd7f63bd0cb7b0386aafdeb71825dbfdea5ebb76f594dca8865d93e350b621d8506f7fa8d4bb2db5e5055e6e SHA512 d93a6c6064af04b1562e67e207c187c31bdb05b7a23808a9e31557a09c445f9ba7ad449d4893c98b031876fa5ae8dc3542f6db12cf898b820bee8c31f16b60fd
+EBUILD salt-2018.3.2.ebuild 4905 BLAKE2B dc24d8c71e442b803a22190ccc3987f3fe4d8c79be3b283ed9d453e8d05a1db4ad483b283a9b39d9886cb076c58efa906e6fae8289091f9ad3916d42125d3128 SHA512 bdaf27fec5d8b3267b22bfd887939397efa36e43d59b7605f8a0a76c606005606eb459c43b0cba37cf6d4f4c67fabf8ea24fce92a4bed0aa786a6fcbceeeac30
+MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969
diff --git a/app-admin/salt/files/api-confd-1 b/app-admin/salt/files/api-confd-1
new file mode 100644
index 000000000000..c70e8e766da0
--- /dev/null
+++ b/app-admin/salt/files/api-confd-1
@@ -0,0 +1,5 @@
+# /etc/conf.d/salt-master: config file for /etc/init.d/salt-master
+
+# see man pages for salt-minion or run `salt-master --help`
+# for valid cmdline options
+SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/api-initd-4 b/app-admin/salt/files/api-initd-4
new file mode 100644
index 000000000000..a0cb8265047d
--- /dev/null
+++ b/app-admin/salt/files/api-initd-4
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-api"
+command_args="${SALT_OPTS}"
+command_background="1"
+pidfile="/var/run/salt-api.pid"
+name="SALT API daemon"
+retry="20"
+
+depend() {
+	use net logger
+}
diff --git a/app-admin/salt/files/master-confd-1 b/app-admin/salt/files/master-confd-1
new file mode 100644
index 000000000000..c70e8e766da0
--- /dev/null
+++ b/app-admin/salt/files/master-confd-1
@@ -0,0 +1,5 @@
+# /etc/conf.d/salt-master: config file for /etc/init.d/salt-master
+
+# see man pages for salt-minion or run `salt-master --help`
+# for valid cmdline options
+SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/master-initd-4 b/app-admin/salt/files/master-initd-4
new file mode 100644
index 000000000000..e07e72b0dae7
--- /dev/null
+++ b/app-admin/salt/files/master-initd-4
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-master"
+command_args="${SALT_OPTS}"
+command_background="1"
+pidfile="/var/run/salt-master.pid"
+name="SALT master daemon"
+retry="20"
+
+depend() {
+	use net logger
+}
diff --git a/app-admin/salt/files/minion-confd-1 b/app-admin/salt/files/minion-confd-1
new file mode 100644
index 000000000000..d69d83fcd60d
--- /dev/null
+++ b/app-admin/salt/files/minion-confd-1
@@ -0,0 +1,5 @@
+# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion
+
+# see man pages for salt-minion or run `salt-minion --help`
+# for valid cmdline options
+SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/minion-initd-4 b/app-admin/salt/files/minion-initd-4
new file mode 100644
index 000000000000..c658ccf5c1df
--- /dev/null
+++ b/app-admin/salt/files/minion-initd-4
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-minion"
+command_args="${SALT_OPTS}"
+command_background="1"
+pidfile="/var/run/salt-minion.pid"
+name="SALT minion daemon"
+retry="20"
+
+depend() {
+	need net
+	use logger
+}
diff --git a/app-admin/salt/files/salt-2016.11.0-broken-tests.patch b/app-admin/salt/files/salt-2016.11.0-broken-tests.patch
new file mode 100644
index 000000000000..5bb7a8e4c46b
--- /dev/null
+++ b/app-admin/salt/files/salt-2016.11.0-broken-tests.patch
@@ -0,0 +1,23 @@
+diff --git a/tests/unit/utils/extend_test.py b/tests/unit/utils/extend_test.py
+index f63a4896f7..54bf443d9a 100644
+--- a/tests/unit/utils/extend_test.py
++++ b/tests/unit/utils/extend_test.py
+@@ -38,18 +38,6 @@ class ExtendTestCase(TestCase):
+                 shutil.rmtree(self.out, True)
+         os.chdir(self.starting_dir)
+ 
+-    @patch('sys.exit', MagicMock)
+-    def test_run(self):
+-        out = salt.utils.extend.run('test', 'test', 'this description', integration.CODE_DIR, False)
+-        self.out = out
+-        year = date.today().strftime('%Y')
+-        self.assertTrue(os.path.exists(out))
+-        self.assertFalse(os.path.exists(os.path.join(out, 'template.yml')))
+-        self.assertTrue(os.path.exists(os.path.join(out, 'directory')))
+-        self.assertTrue(os.path.exists(os.path.join(out, 'directory', 'test.py')))
+-        with salt.utils.fopen(os.path.join(out, 'directory', 'test.py'), 'r') as test_f:
+-            self.assertEqual(test_f.read(), year)
+-
+ if __name__ == '__main__':
+     from unit import run_tests
+     run_tests(ExtendTestCase, needs_daemon=False)
diff --git a/app-admin/salt/files/salt-2016.11.0-remove-file-tree-test.patch b/app-admin/salt/files/salt-2016.11.0-remove-file-tree-test.patch
new file mode 100644
index 000000000000..47d3257df671
--- /dev/null
+++ b/app-admin/salt/files/salt-2016.11.0-remove-file-tree-test.patch
@@ -0,0 +1,34 @@
+diff --git a/tests/unit/modules/inspect_collector_test.py b/tests/unit/modules/inspect_collector_test.py
+index 9105670526..e077bc3f44 100644
+--- a/tests/unit/modules/inspect_collector_test.py
++++ b/tests/unit/modules/inspect_collector_test.py
+@@ -52,29 +52,6 @@ class InspectorCollectorTestCase(TestCase):
+         self.assertEqual(inspector.pidfile, '/foo/pid/bar.pid')
+ 
+     @patch("os.mkdir", MagicMock())
+-    def test_file_tree(self):
+-        '''
+-        Test file tree.
+-
+-        :return:
+-        '''
+-
+-        inspector = Inspector(cachedir='/test', piddir='/test', pidfilename='bar.pid')
+-        tree_root = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'inspectlib', 'tree_test')
+-        expected_tree = (['/a/a/dummy.a', '/a/b/dummy.b', '/b/b.1', '/b/b.2', '/b/b.3'],
+-                         ['/a', '/a/a', '/a/b', '/a/c', '/b', '/c'],
+-                         ['/a/a/dummy.ln.a', '/a/b/dummy.ln.b', '/a/c/b.1', '/b/b.4',
+-                          '/b/b.5', '/c/b.1', '/c/b.2', '/c/b.3'])
+-        tree_result = []
+-        for chunk in inspector._get_all_files(tree_root):
+-            buff = []
+-            for pth in chunk:
+-                buff.append(pth.replace(tree_root, ''))
+-            tree_result.append(buff)
+-        tree_result = tuple(tree_result)
+-        self.assertEqual(expected_tree, tree_result)
+-
+-    @patch("os.mkdir", MagicMock())
+     def test_get_unmanaged_files(self):
+         '''
+         Test get_unmanaged_files.
diff --git a/app-admin/salt/files/salt-2016.11.0-tmpdir.patch b/app-admin/salt/files/salt-2016.11.0-tmpdir.patch
new file mode 100644
index 000000000000..1cccb158aff0
--- /dev/null
+++ b/app-admin/salt/files/salt-2016.11.0-tmpdir.patch
@@ -0,0 +1,34 @@
+diff --git a/tests/unit/modules/qemu_nbd_test.py b/tests/unit/modules/qemu_nbd_test.py
+index 615e6b5670..fbd24aab86 100644
+--- a/tests/unit/modules/qemu_nbd_test.py
++++ b/tests/unit/modules/qemu_nbd_test.py
+@@ -77,6 +77,7 @@ class QemuNbdTestCase(TestCase):
+         Test if it mount the named image via qemu-nbd
+         and return the mounted roots
+         '''
++        tmpdir = os.environ.get('TMPDIR', '/tmp')
+         mock = MagicMock(return_value=True)
+         with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}):
+             self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '')
+@@ -89,7 +90,7 @@ class QemuNbdTestCase(TestCase):
+                                  'mount.mount': mock,
+                                  'cmd.retcode': MagicMock(side_effect=[1, 0])}):
+                     self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'),
+-                                         {'/tmp/nbd/nbd0/nbd0': '/dev/nbd0'})
++                                         {os.path.join(tmpdir, 'nbd/nbd0/nbd0'): '/dev/nbd0'})
+ 
+     # 'clear' function tests: 1
+ 
+diff --git a/tests/unit/utils/context_test.py b/tests/unit/utils/context_test.py
+index 5249d56747..a27ee9ab61 100644
+--- a/tests/unit/utils/context_test.py
++++ b/tests/unit/utils/context_test.py
+@@ -18,7 +18,7 @@ import salt.payload
+ import salt.utils
+ 
+ __context__ = {'a': 'b'}
+-__opts__ = {'cachedir': '/tmp'}
++__opts__ = {'cachedir': os.environ.get('TMPDIR', '/tmp')}
+ 
+ 
+ @skipIf(NO_MOCK, NO_MOCK_REASON)
diff --git a/app-admin/salt/files/salt-2016.3.1-dont-realpath-tmpdir.patch b/app-admin/salt/files/salt-2016.3.1-dont-realpath-tmpdir.patch
new file mode 100644
index 000000000000..3e4fa31c9042
--- /dev/null
+++ b/app-admin/salt/files/salt-2016.3.1-dont-realpath-tmpdir.patch
@@ -0,0 +1,18 @@
+diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
+index fc13bb6..6316fb5 100644
+--- a/tests/integration/__init__.py
++++ b/tests/integration/__init__.py
+@@ -77,12 +77,7 @@ if salt.utils.is_windows():
+     import win32api
+ 
+ 
+-SYS_TMP_DIR = os.path.realpath(
+-    # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
+-    # for unix sockets: ``error: AF_UNIX path too long``
+-    # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
+-    os.environ.get('TMPDIR', tempfile.gettempdir()) if not salt.utils.is_darwin() else '/tmp'
+-)
++SYS_TMP_DIR = os.environ.get('TMPDIR', tempfile.gettempdir()) if not salt.utils.is_darwin() else '/tmp'
+ TMP = os.path.join(SYS_TMP_DIR, 'salt-tests-tmpdir')
+ FILES = os.path.join(INTEGRATION_TEST_DIR, 'files')
+ PYEXEC = 'python{0}.{1}'.format(*sys.version_info)
diff --git a/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch b/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch
new file mode 100644
index 000000000000..dd542d630adf
--- /dev/null
+++ b/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch
@@ -0,0 +1,32 @@
+diff --git a/tests/unit/conf_test.py b/tests/unit/conf_test.py
+index cce0023423..c1324f4a61 100644
+--- a/tests/unit/conf_test.py
++++ b/tests/unit/conf_test.py
+@@ -140,6 +140,8 @@ class ConfTest(TestCase):
+         commented out. This test loops through all of the files in that directory to check
+         for any lines that are not commented or blank.
+         '''
++        if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.profiles.d/'):
++            return
+         cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.profiles.d/')
+         for conf_file in cloud_sample_files:
+             profile_conf = SAMPLE_CONF_DIR + 'cloud.profiles.d/' + conf_file
+@@ -158,6 +160,8 @@ class ConfTest(TestCase):
+         commented out. This test loops through all of the files in that directory to check
+         for any lines that are not commented or blank.
+         '''
++        if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.providers.d/'):
++            return
+         cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.providers.d/')
+         for conf_file in cloud_sample_files:
+             provider_conf = SAMPLE_CONF_DIR + 'cloud.providers.d/' + conf_file
+@@ -176,6 +180,9 @@ class ConfTest(TestCase):
+         commented out. This test loops through all of the files in that directory to check
+         for any lines that are not commented or blank.
+         '''
++        if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.maps.d/'):
++            return
++
+         cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.maps.d/')
+         for conf_file in cloud_sample_files:
+             map_conf = SAMPLE_CONF_DIR + 'cloud.maps.d/' + conf_file
diff --git a/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch b/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch
new file mode 100644
index 000000000000..90a48a662998
--- /dev/null
+++ b/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch
@@ -0,0 +1,19 @@
+diff --git a/tests/support/paths.py b/tests/support/paths.py
+index da93c8e1e3..895c636fef 100644
+--- a/tests/support/paths.py
++++ b/tests/support/paths.py
+@@ -40,12 +40,12 @@ if CODE_DIR not in sys.path:
+ if TESTS_DIR not in sys.path:
+     sys.path.insert(1, TESTS_DIR)
+ 
+-SYS_TMP_DIR = os.path.abspath(os.path.realpath(
++SYS_TMP_DIR = os.path.abspath(
+     # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
+     # for unix sockets: ``error: AF_UNIX path too long``
+     # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
+     os.environ.get('TMPDIR', tempfile.gettempdir()) if not sys.platform.startswith('darwin') else '/tmp'
+-))
++)
+ TMP = os.path.join(SYS_TMP_DIR, 'salt-tests-tmpdir')
+ FILES = os.path.join(INTEGRATION_TEST_DIR, 'files')
+ PYEXEC = 'python{0}.{1}'.format(*sys.version_info)
diff --git a/app-admin/salt/files/salt-2017.7.3-tests.patch b/app-admin/salt/files/salt-2017.7.3-tests.patch
new file mode 100644
index 000000000000..9399bf873349
--- /dev/null
+++ b/app-admin/salt/files/salt-2017.7.3-tests.patch
@@ -0,0 +1,66 @@
+diff --git a/tests/unit/fileserver/test_roots.py b/tests/unit/fileserver/test_roots.py
+index cc9c8dbce9..a50a240c25 100644
+--- a/tests/unit/fileserver/test_roots.py
++++ b/tests/unit/fileserver/test_roots.py
+@@ -164,12 +164,6 @@ class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMix
+         ret = roots.dir_list({'saltenv': 'base'})
+         self.assertIn('empty_dir', ret)
+ 
+-    def test_symlink_list(self):
+-        if self.test_symlink_list_file_roots:
+-            self.opts['file_roots'] = self.test_symlink_list_file_roots
+-        ret = roots.symlink_list({'saltenv': 'base'})
+-        self.assertDictEqual(ret, {'dest_sym': 'source_sym'})
+-
+ 
+ class RootsLimitTraversalTest(TestCase, AdaptedConfigurationTestCaseMixin):
+ 
+diff --git a/tests/unit/modules/test_inspect_collector.py b/tests/unit/modules/test_inspect_collector.py
+index 0d37519a9e..c18be8d592 100644
+--- a/tests/unit/modules/test_inspect_collector.py
++++ b/tests/unit/modules/test_inspect_collector.py
+@@ -59,44 +59,6 @@ class InspectorCollectorTestCase(TestCase):
+             inspector.pidfile,
+             os.sep + os.sep.join(['foo', 'pid', 'bar.pid']))
+ 
+-    def test_file_tree(self):
+-        '''
+-        Test file tree.
+-
+-        :return:
+-        '''
+-
+-        inspector = Inspector(cachedir=os.sep + 'test',
+-                              piddir=os.sep + 'test',
+-                              pidfilename='bar.pid')
+-        tree_root = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'inspectlib', 'tree_test')
+-        expected_tree = ([os.sep + os.sep.join(['a', 'a', 'dummy.a']),
+-                          os.sep + os.sep.join(['a', 'b', 'dummy.b']),
+-                          os.sep + os.sep.join(['b', 'b.1']),
+-                          os.sep + os.sep.join(['b', 'b.2']),
+-                          os.sep + os.sep.join(['b', 'b.3'])],
+-                         [os.sep + 'a',
+-                          os.sep + os.sep.join(['a', 'a']),
+-                          os.sep + os.sep.join(['a', 'b']),
+-                          os.sep + os.sep.join(['a', 'c']),
+-                          os.sep + 'b',
+-                          os.sep + 'c'],
+-                         [os.sep + os.sep.join(['a', 'a', 'dummy.ln.a']),
+-                          os.sep + os.sep.join(['a', 'b', 'dummy.ln.b']),
+-                          os.sep + os.sep.join(['a', 'c', 'b.1']),
+-                          os.sep + os.sep.join(['b', 'b.4']),
+-                          os.sep + os.sep.join(['b', 'b.5']),
+-                          os.sep + os.sep.join(['c', 'b.1']),
+-                          os.sep + os.sep.join(['c', 'b.2']),
+-                          os.sep + os.sep.join(['c', 'b.3'])])
+-        tree_result = []
+-        for chunk in inspector._get_all_files(tree_root):
+-            buff = []
+-            for pth in chunk:
+-                buff.append(pth.replace(tree_root, ''))
+-            tree_result.append(buff)
+-        tree_result = tuple(tree_result)
+-        self.assertEqual(expected_tree, tree_result)
+ 
+     def test_get_unmanaged_files(self):
+         '''
diff --git a/app-admin/salt/files/salt-2018.3.2-skip-zeromq-test-that-hangs.patch b/app-admin/salt/files/salt-2018.3.2-skip-zeromq-test-that-hangs.patch
new file mode 100644
index 000000000000..7b94fafd447d
--- /dev/null
+++ b/app-admin/salt/files/salt-2018.3.2-skip-zeromq-test-that-hangs.patch
@@ -0,0 +1,79 @@
+diff --git a/tests/unit/transport/test_zeromq.py b/tests/unit/transport/test_zeromq.py
+index ccb337462e..97d2962e5e 100644
+--- a/tests/unit/transport/test_zeromq.py
++++ b/tests/unit/transport/test_zeromq.py
+@@ -45,6 +45,10 @@ ON_SUSE = False
+ if 'SuSE' in linux_distribution(full_distribution_name=False):
+     ON_SUSE = True
+ 
++ON_GENTOO = False
++if 'Gentoo' in linux_distribution(full_distribution_name=False):
++    ON_GENTOO = True
++
+ 
+ class BaseZMQReqCase(TestCase, AdaptedConfigurationTestCaseMixin):
+     '''
+@@ -122,63 +126,6 @@ class BaseZMQReqCase(TestCase, AdaptedConfigurationTestCaseMixin):
+         return payload, {'fun': 'send_clear'}
+ 
+ 
+-class ClearReqTestCases(BaseZMQReqCase, ReqChannelMixin):
+-    '''
+-    Test all of the clear msg stuff
+-    '''
+-    def setUp(self):
+-        self.channel = salt.transport.client.ReqChannel.factory(self.minion_config, crypt='clear')
+-
+-    def tearDown(self):
+-        del self.channel
+-
+-    @classmethod
+-    @tornado.gen.coroutine
+-    def _handle_payload(cls, payload):
+-        '''
+-        TODO: something besides echo
+-        '''
+-        raise tornado.gen.Return((payload, {'fun': 'send_clear'}))
+-
+-
+-@flaky
+-@skipIf(ON_SUSE, 'Skipping until https://github.com/saltstack/salt/issues/32902 gets fixed')
+-class AESReqTestCases(BaseZMQReqCase, ReqChannelMixin):
+-    def setUp(self):
+-        self.channel = salt.transport.client.ReqChannel.factory(self.minion_config)
+-
+-    def tearDown(self):
+-        del self.channel
+-
+-    @classmethod
+-    @tornado.gen.coroutine
+-    def _handle_payload(cls, payload):
+-        '''
+-        TODO: something besides echo
+-        '''
+-        raise tornado.gen.Return((payload, {'fun': 'send'}))
+-
+-    # TODO: make failed returns have a specific framing so we can raise the same exception
+-    # on encrypted channels
+-    #
+-    #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+-    #
+-    # WARNING: This test will fail randomly on any system with > 1 CPU core!!!
+-    #
+-    #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+-    def test_badload(self):
+-        '''
+-        Test a variety of bad requests, make sure that we get some sort of error
+-        '''
+-        # TODO: This test should be re-enabled when Jenkins moves to C7.
+-        # Once the version of salt-testing is increased to something newer than the September
+-        # release of salt-testing, the @flaky decorator should be applied to this test.
+-        msgs = ['', [], tuple()]
+-        for msg in msgs:
+-            with self.assertRaises(salt.exceptions.AuthenticationError):
+-                ret = self.channel.send(msg, timeout=5)
+-
+-
+ class BaseZMQPubCase(AsyncTestCase, AdaptedConfigurationTestCaseMixin):
+     '''
+     Test the req server/client pair
diff --git a/app-admin/salt/files/salt-api.service b/app-admin/salt/files/salt-api.service
new file mode 100644
index 000000000000..fd9f665fff09
--- /dev/null
+++ b/app-admin/salt/files/salt-api.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=The Salt Master Server
+After=syslog.target network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/salt-api
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/salt/files/salt-master.service b/app-admin/salt/files/salt-master.service
new file mode 100644
index 000000000000..4f3827ede6df
--- /dev/null
+++ b/app-admin/salt/files/salt-master.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=The Salt Master Server
+After=syslog.target network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/salt-master
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/salt/files/salt-minion.service b/app-admin/salt/files/salt-minion.service
new file mode 100644
index 000000000000..2f199f998eca
--- /dev/null
+++ b/app-admin/salt/files/salt-minion.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=The Salt Minion
+After=syslog.target network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/salt-minion
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/salt/files/salt-syndic.service b/app-admin/salt/files/salt-syndic.service
new file mode 100644
index 000000000000..922eef35af8b
--- /dev/null
+++ b/app-admin/salt/files/salt-syndic.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=The Salt Master Server
+After=syslog.target network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/salt-syndic
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/salt/files/syndic-confd-1 b/app-admin/salt/files/syndic-confd-1
new file mode 100644
index 000000000000..d69d83fcd60d
--- /dev/null
+++ b/app-admin/salt/files/syndic-confd-1
@@ -0,0 +1,5 @@
+# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion
+
+# see man pages for salt-minion or run `salt-minion --help`
+# for valid cmdline options
+SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/syndic-initd-4 b/app-admin/salt/files/syndic-initd-4
new file mode 100644
index 000000000000..8908f2cfa850
--- /dev/null
+++ b/app-admin/salt/files/syndic-initd-4
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-syndic"
+command_args="${SALT_OPTS}"
+command_background="1"
+pidfile="/var/run/salt-syndic.pid"
+name="SALT syndic daemon"
+retry="20"
+
+depend() {
+	use net logger
+}
diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml
new file mode 100644
index 000000000000..00b55f2c20e0
--- /dev/null
+++ b/app-admin/salt/metadata.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <longdescription lang="en">
+Salt is a powerful remote execution manager that can be used to administer
+servers in a fast and efficient way.
+
+Salt allows commands to be executed across large groups of servers. This means
+systems can be easily managed, but data can also be easily gathered. Quick
+introspection into running systems becomes a reality.
+
+Remote execution is usually used to set up a certain state on a remote system.
+Salt addresses this problem as well, the salt state system uses salt state
+files to define the state a server needs to be in.
+
+Between the remote execution system, and state management Salt addresses the
+backbone of cloud and data center management.
+  </longdescription>
+  <use>
+    <flag name="cherrypy">Enable support for using cherrypy.</flag>
+    <flag name="libcloud">Enable salt-cloud support via libcloud.</flag>
+    <flag name="libvirt">Support managing virtual machines with app-emulation/libvirt.</flag>
+    <flag name="gnupg">Enable support for gnupg via python-gnupg.</flag>
+    <flag name="keyring">Enable support for keyrings via python-keyring.</flag>
+    <flag name="mako">Add support for using the mako template engine for parsing salt states.</flag>
+    <flag name="mongodb">Support returning data to a mongodb server.</flag>
+    <flag name="neutron">Support the OpenStack neutron network service.</flag>
+    <flag name="nova">Enable support for the OpenStack Nova API</flag>
+    <flag name="openssl">Add support for using TLS via OpenSSL.</flag>
+    <flag name="portage">Add support for package state enforcement using sys-apps/portage</flag>
+    <flag name="raet">Add support for the new RAET transport.</flag>
+    <flag name="redis">Support returning data to a redis database.</flag>
+    <flag name="timelib">Use timelib to parse english textual date descriptions.</flag>
+    <flag name="zeromq">Add support for the zeromq transport.</flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">salt</remote-id>
+    <remote-id type="github">saltstack/salt-vim</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/salt/salt-2016.11.9-r2.ebuild b/app-admin/salt/salt-2016.11.9-r2.ebuild
new file mode 100644
index 000000000000..7647ba045387
--- /dev/null
+++ b/app-admin/salt/salt-2016.11.9-r2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://saltstack.com/community/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:*[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		|| (
+			dev-python/pycryptodome[${PYTHON_USEDEP}]
+			>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+		)
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		!x86? ( dev-python/boto3[${PYTHON_USEDEP}] )
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2016.11.0-tmpdir.patch"
+	"${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch"
+	"${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch"
+	"${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch"
+	"${FILESDIR}/${PN}-2016.11.0-broken-tests.patch"
+)
+
+python_prepare() {
+	# this test fails because it trys to "pip install distribute"
+	rm tests/unit/{modules,states}/zcbuildout_test.py \
+		tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die
+	rm tests/unit/states/pip_test.py || die
+
+	# https://github.com/saltstack/salt/issues/39095
+	rm tests/unit/utils/parsers_test.py
+
+	# apparently libcloud does not know about this?
+	rm tests/unit/cloud/clouds/dimensiondata_test.py || die
+
+	# seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
+	rm tests/unit/cloud/clouds/gce_test.py || die
+
+	# allow the use of the renamed msgpack
+	sed -i '/^msgpack/d' requirements/base.txt || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -dup /tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+
+	(
+		cleanup() { rm -f "${tempdir}"; }
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose
+
+	) || die "testing failed"
+}
diff --git a/app-admin/salt/salt-2017.7.7.ebuild b/app-admin/salt/salt-2017.7.7.ebuild
new file mode 100644
index 000000000000..bb76353c1a4d
--- /dev/null
+++ b/app-admin/salt/salt-2017.7.7.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="http://saltstack.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	<www-servers/tornado-5.0[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:*[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? (
+		|| (
+			sys-apps/portage[${PYTHON_USEDEP}]
+			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+		)
+	)
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-salt[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
+	"${FILESDIR}/${PN}-2017.7.3-tests.patch"
+)
+
+python_prepare() {
+	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+	rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+	rm tests/unit/modules/test_kubernetes.py || die
+	# allow the use of the renamed msgpack
+	sed -i '/^msgpack/d' requirements/base.txt || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+
+	(
+		cleanup() {
+			rm -f "${tempdir}"
+			rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+		}
+
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose
+
+	) || die "testing failed"
+}
diff --git a/app-admin/salt/salt-2018.3.2.ebuild b/app-admin/salt/salt-2018.3.2.ebuild
new file mode 100644
index 000000000000..fff0c84f2aca
--- /dev/null
+++ b/app-admin/salt/salt-2018.3.2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_6 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="http://saltstack.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	<www-servers/tornado-5.0[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:*[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? (
+		|| (
+			sys-apps/portage[${PYTHON_USEDEP}]
+			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+		)
+	)
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[$(python_gen_usedep 'python2*')] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-salt[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/timelib[$(python_gen_usedep 'python2*')]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
+	"${FILESDIR}/${PN}-2017.7.3-tests.patch"
+	"${FILESDIR}/${PN}-2018.3.2-skip-zeromq-test-that-hangs.patch"
+)
+
+python_prepare() {
+	# remove tests with external dependencies that may not be available
+	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+	rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+	rm tests/unit/modules/test_{kubernetes,vsphere}.py || die
+
+	# allow the use of the renamed msgpack
+	sed -i '/^msgpack/d' requirements/base.txt || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+
+	(
+		cleanup() {
+			rm -f "${tempdir}"
+			rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+		}
+
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose
+
+	) || die "testing failed"
+}
diff --git a/app-admin/serf-0.8.1-r1 b/app-admin/serf-0.8.1-r1
deleted file mode 100644
index 9d880337c993..000000000000
--- a/app-admin/serf-0.8.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.6:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=Service orchestration and management tool
-EAPI=6
-HOMEPAGE=https://www.serfdom.io/
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/serf/archive/v0.8.1.tar.gz -> serf-0.8.1.tar.gz https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> github.com-mitchellh-gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=019100a5cfecb8bdd5b8b5e4e1ff4a34
diff --git a/app-admin/serf/Manifest b/app-admin/serf/Manifest
new file mode 100644
index 000000000000..57c1e967b311
--- /dev/null
+++ b/app-admin/serf/Manifest
@@ -0,0 +1,9 @@
+AUX serf.confd 240 BLAKE2B 1eda4261a82a35e8b70cd0192180b4f3cf534656fc96092643b524f63bcf58c0f2621a0a4fac8b0ed1551fe6b23a136e11bfaf1059f1dcb6f43c0036159bd8c5 SHA512 9bb726725a6116d23f4095a3e8f7d401d854c80ee9a5993d718c4aebef77f36a597d7a2e504e3dc95f0a177f2184d79fd253f330fb48b9c028d3bdf2db90b7d9
+AUX serf.initd 683 BLAKE2B 3e6fcda3250eabcec44daa3b51b36fff0cdb49b4b232123d69b1e29b8100874c4e126f5e3aaffebcac898651f4f84a8515308422b867e55a79f189c4d9a322b9 SHA512 a223d1e002eae3f91b941eb75a2741bb5fc22c78f4ab8ada430ee5e34f85f28410acc26e503eae672911161fab6847c6a7733b51cdad29fa4b4f67cfdc879597
+AUX serf.logrotated 81 BLAKE2B 7f09c81d7efa52d1e970b0603fa2c89809aca99166efb1026e0794957dfd4229a961a345e27da045c2f34ab1785e6e2bd5e796d32814787244656e97ad5cb518 SHA512 9d3664c123e846de81a2f574a9c2610e254d5ddad1c23b67ef7b8841e933c7aea93a419becaf45af9594ea98ac36d23883bebf3d344205c4756f3e1df9e87518
+AUX serf.service 286 BLAKE2B d0a7157101e18f80047688318a16995d24f0d06d444104ace3aaea9cb4c43b3ea164804f105dc94a03aa8e800228db9d2007510885cddb82e50b41d7aa8927ed SHA512 928dfca39afd79b113b299e4de25635fc9f68c64c77951d690797ed5796515d060fc36286f0dc1da63923042e3d8612ca8b1696dd511cb2fbd06550151d2a05b
+DIST github.com-mitchellh-gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz 15772 BLAKE2B ce589f986762768fc22148963a35a152a48c17aa55b9db5d5cf41e4e349be63ed0cea2afe3f916479bfc82bc951e4d427d223122ec6c472e58de02e55290ca07 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d
+DIST github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 BLAKE2B fdb82b106446b0fe5d5c6c9cca2c8303fbef305ae1c45a82ca7ba5bbc9ce4db3708d7680bfe95099e73a5f5a3d687f25d77c7b535f3e1dc71e5fe8915eb9642e SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c
+DIST serf-0.8.1.tar.gz 1445011 BLAKE2B 5fcf1e3e87c777852656426529daab4ceb3e997d70ac54d81f48bbea37ebe2dab9c27d0b2fff3c4e031a7995eaaa25378ccbbd359ef0cc265cc58db4ddb25c21 SHA512 81a4bc2e1659324980fd59464af021ad5ec80431dc1b49b875bb0c97c8f92766dfee9b204bd8c9ab4e175a281bc23815f5e3008ecfb2848c7354c33603bb5514
+EBUILD serf-0.8.1-r1.ebuild 2087 BLAKE2B c47a6caed4484374dc31448990f81ecbbeb7ddb9c1605d001d95f10389f3b506c7af042b63d88ea98af76bd3a205ba0833175ffb91bb8043277ad2c54c02ccf9 SHA512 7fa41ac143f3532bfe612492ca084aa998c072f346e9897f441f31d55d41468615673ced32ef43c01a5e9962822a3b340997fbf167c34260f7083413faa81731
+MISC metadata.xml 297 BLAKE2B 0d2ca75df2b4667d5b2cfcc0b17ef36c88d2996e661d3393eed3ea61c256a760c4844d9f99c4b280a8409e288392689ab17f46adc40188134307b7ea6060f9b9 SHA512 a4e75bdd3c86842ac3de4852d00f264e877c9784754eb9b2d4d38c39123115ded6beae61628b5315d7c19bfbefd1e0360491b37656e34a87b33498b246521e76
diff --git a/app-admin/serf/files/serf.confd b/app-admin/serf/files/serf.confd
new file mode 100644
index 000000000000..f5aeaeddf7e7
--- /dev/null
+++ b/app-admin/serf/files/serf.confd
@@ -0,0 +1,7 @@
+# you can change the init script behavior by setting those parameters
+# - group (default: serf)
+# - pidfile (default: /run/serf/serf.pid)
+# - user (default: serf)
+
+# extra arguments for the serf agent
+command_args="-config-dir=/etc/serf.d"
diff --git a/app-admin/serf/files/serf.initd b/app-admin/serf/files/serf.initd
new file mode 100644
index 000000000000..042e4f8018a8
--- /dev/null
+++ b/app-admin/serf/files/serf.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="serf agent"
+extra_started_commands="reload"
+group=${group:-${RC_SVCNAME}}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+
+command="/usr/bin/${RC_SVCNAME}"
+command_args="agent ${command_args:-config-dir=/etc/serf.d}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+stopsig="SIGINT"
+
+depend() {
+	need net
+}
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME}"
+	${command} reload
+	eend $?
+}
diff --git a/app-admin/serf/files/serf.logrotated b/app-admin/serf/files/serf.logrotated
new file mode 100644
index 000000000000..e35d7331b247
--- /dev/null
+++ b/app-admin/serf/files/serf.logrotated
@@ -0,0 +1,7 @@
+/var/log/serf/serf.log {
+	missingok
+	size 5M
+	rotate 3
+	compress
+	copytruncate
+}
diff --git a/app-admin/serf/files/serf.service b/app-admin/serf/files/serf.service
new file mode 100644
index 000000000000..f2d390fe8222
--- /dev/null
+++ b/app-admin/serf/files/serf.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=serf agent
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=serf
+Environment=SERF_AGENT_OPTS="-config-dir=/etc/serf.d"
+ExecStart=/usr/bin/serf agent $SERF_AGENT_OPTS
+Restart=on-failure
+KillSignal=SIGINT
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/serf/metadata.xml b/app-admin/serf/metadata.xml
new file mode 100644
index 000000000000..213d2fe2fa81
--- /dev/null
+++ b/app-admin/serf/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hashicorp/serf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/serf/serf-0.8.1-r1.ebuild b/app-admin/serf/serf-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..963e9bcc99ef
--- /dev/null
+++ b/app-admin/serf/serf-0.8.1-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=(
+	"github.com/mitchellh/gox c9740af9c6574448fd48eb30a71f964014c7a837"
+	"github.com/mitchellh/iochan 87b45ffd0e9581375c491fef3d32130bb15c5bd7"
+)
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/serf"
+DESCRIPTION="Service orchestration and management tool"
+HOMEPAGE="https://www.serfdom.io/"
+SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="
+	>=dev-lang/go-1.6:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup serf
+	enewuser serf -1 -1 /var/lib/${PN} serf
+}
+
+src_prepare() {
+	eapply_user
+	# Avoid the need to have a git checkout
+	sed -e 's:^GIT.*::' \
+		-e 's:-X main.GitCommit.*:" \\:' \
+		-i "${S}/src/${EGO_PN}/scripts/build.sh" || die
+
+	# go install golang.org/x/tools/cmd/stringer: mkdir /usr/lib/go-gentoo/bin/: permission denied
+	sed -e 's:go get -u -v $(GOTOOLS)::' \
+		-e 's:^GIT.*::' \
+		-i "${S}/src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+	export GOPATH="${S}"
+	mkdir "${S}/src/github.com/mitchellh" || die
+	mv "${S}/src/${EGO_PN}/vendor/github.com/mitchellh/"{gox,iochan} \
+		"${S}/src/github.com/mitchellh" || die
+	go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	PATH=${PATH}:${S}/bin \
+		emake -C "${S}/src/${EGO_PN}" dev
+}
+
+src_test() {
+	emake -C "${S}/src/${EGO_PN}" test
+}
+
+src_install() {
+	local x
+
+	dobin "${S}/bin/${PN}"
+
+	keepdir /etc/serf.d
+	insinto /etc/serf.d
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners serf:serf "${x}"
+	done
+
+	newinitd "${FILESDIR}/serf.initd" "${PN}"
+	newconfd "${FILESDIR}/serf.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/serf.service"
+}
diff --git a/app-admin/setools-4.1.1 b/app-admin/setools-4.1.1
deleted file mode 100644
index 0c6b120601c7..000000000000
--- a/app-admin/setools-4.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-libs/libsepol-2.7:= >=sys-libs/libselinux-2.7:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/networkx-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libpcre:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-lang/swig-2.0.12:0 sys-devel/bison sys-devel/flex >=sys-libs/libsepol-2.5 test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/checkpolicy ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Policy Analysis Tools for SELinux
-EAPI=6
-HOMEPAGE=https://github.com/TresysTechnology/setools/wiki
-IUSE=X debug test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-libs/libsepol-2.7:= >=sys-libs/libselinux-2.7:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/networkx-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libpcre:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/TresysTechnology/setools/archive/4.1.1.tar.gz -> setools-4.1.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f419304217c72f505e88ec9a7b963343
diff --git a/app-admin/setools-9999 b/app-admin/setools-9999
deleted file mode 100644
index 9d552edf67ad..000000000000
--- a/app-admin/setools-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-libs/libsepol-2.7:= >=sys-libs/libselinux-2.7:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/networkx-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libpcre:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-lang/swig-2.0.12:0 sys-devel/bison sys-devel/flex >=sys-libs/libsepol-2.5 test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/checkpolicy ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Policy Analysis Tools for SELinux
-EAPI=6
-HOMEPAGE=https://github.com/TresysTechnology/setools/wiki
-IUSE=X debug test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-libs/libsepol-2.7:= >=sys-libs/libselinux-2.7:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/networkx-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libpcre:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8763de99817340694fc96ea13f579200
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
new file mode 100644
index 000000000000..5020d88fa5b1
--- /dev/null
+++ b/app-admin/setools/Manifest
@@ -0,0 +1,5 @@
+AUX setools-4.1.1-remove-gui.patch 890 BLAKE2B 70c7a7fb4b6bb31d8735d4b938ff848000c3181e590e557413011ebd5db650f79dfad270f6506128ef9971975ec2b26323b18f793bb914759449679bc34f388c SHA512 c30d7fa3624164d3ec5574b1ae36cc896fb5132ed875f232e9e84cf080e7081dadce61f6d88b55aefa45e417a081622acf7aa2d9f10406d23be7646905dfb3e6
+DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04
+EBUILD setools-4.1.1.ebuild 1488 BLAKE2B 462d30b33838dc2c548baff9bb32ca2f978df8a62d5a6e936dfc3bab4dd2522513a90635d64244c6750587cb061380a92a4158bc8e38bddcd2065987463ce9ca SHA512 074263f51282f81cd723ad261c286d46a93a8e13be2fec152adf61a8618685ad43460751d152077d22f395ed854d3362d49c47476ff1fc8b92fe1b62d7351fe5
+EBUILD setools-9999.ebuild 1490 BLAKE2B 1ee40697229d0164b92c75242a8659dd6abef5e0462b9d8154c98f75271a42062bf04cc525a14a4a2a243623f5b5c962c31527928e134f3ba5d2ce7f9bee593c SHA512 d3dd0829d41ed81f927409c0fb1c86077004f58b5853c419b887febe562c36d6dbdc7f9c10d17c286aa6bad71c9a49043050ebb981115242cdad6be3a6200d36
+MISC metadata.xml 403 BLAKE2B 954bfb344e48933f43c746ed626da3851b9e887b9d1c68541fa97356992c2e80f0626198d2170b431d32489347bb6e5ee46d2577a5d672940892ec5d5fd87e4e SHA512 be645abfaf1149e2f2a9b7f0613b61f015df81a16bc6dde593513aa2ba7b4a9a8fba65520b53a2511ba65c022258f48bcd2aed3f85c273a35c94359e358a8fa6
diff --git a/app-admin/setools/files/setools-4.1.1-remove-gui.patch b/app-admin/setools/files/setools-4.1.1-remove-gui.patch
new file mode 100644
index 000000000000..1bb78f5fd964
--- /dev/null
+++ b/app-admin/setools/files/setools-4.1.1-remove-gui.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index 2ca44c9..0c8a0d9 100644
+--- a/setup.py
++++ b/setup.py
+@@ -180,10 +180,10 @@ setup(name='setools',
+                 'build_lex': LexCommand,
+                 'build_ext': BuildExtCommand,
+                 'build_qhc': QtHelpCommand},
+-      packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'],
+-      scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
++      packages=['setools', 'setools.diff', 'setools.policyrep'],
++      scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+       data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))],
+-      package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
++      package_data={'setools': ['perm_map']},
+       ext_modules=ext_py_mods,
+       test_suite='tests',
+       license='GPLv2+, LGPLv2.1+',
diff --git a/app-admin/setools/metadata.xml b/app-admin/setools/metadata.xml
new file mode 100644
index 000000000000..8e9f11ed8b4c
--- /dev/null
+++ b/app-admin/setools/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
+	<longdescription>SELinux policy analysis tools.</longdescription>
+	<upstream>
+		<remote-id type="github">TresysTechnology/setools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild
new file mode 100644
index 000000000000..560eee70d249
--- /dev/null
+++ b/app-admin/setools/setools-4.1.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
+else
+	SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm64 x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="X debug test"
+
+RDEPEND="${PYTHON_DEPS}
+	>=sys-libs/libsepol-2.7:=
+	>=sys-libs/libselinux-2.7:=[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.8[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	dev-libs/libpcre:=
+	X? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-2.0.12:0
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-libs/libsepol-2.5
+	test? (
+		python_targets_python2_7? ( dev-python/mock[${PYTHON_USEDEP}] )
+		dev-python/tox[${PYTHON_USEDEP}]
+		sys-apps/checkpolicy
+	)"
+
+python_prepare_all() {
+	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
+	sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@g" "${S}"/setup.py || \
+		die "failed to set base_lib_dirs"
+
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch )
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
new file mode 100644
index 000000000000..d0836619d13f
--- /dev/null
+++ b/app-admin/setools/setools-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
+else
+	SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="X debug test"
+
+RDEPEND="${PYTHON_DEPS}
+	>=sys-libs/libsepol-2.7:=
+	>=sys-libs/libselinux-2.7:=[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.8[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	dev-libs/libpcre:=
+	X? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-2.0.12:0
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-libs/libsepol-2.5
+	test? (
+		python_targets_python2_7? ( dev-python/mock[${PYTHON_USEDEP}] )
+		dev-python/tox[${PYTHON_USEDEP}]
+		sys-apps/checkpolicy
+	)"
+
+python_prepare_all() {
+	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
+	sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@g" "${S}"/setup.py || \
+		die "failed to set base_lib_dirs"
+
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch )
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-admin/socklog-2.1.0 b/app-admin/socklog-2.1.0
deleted file mode 100644
index 6dd8b978a4ac..000000000000
--- a/app-admin/socklog-2.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=small secure replacement for syslogd with automatic log rotation
-EAPI=6
-HOMEPAGE=http://smarden.org/socklog/
-IUSE=static
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=sys-process/runit-1.4.0
-SLOT=0
-SRC_URI=http://smarden.org/socklog/socklog-2.1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e2f5d69a8f23ab15e51b4e3969b12b2e
diff --git a/app-admin/socklog/Manifest b/app-admin/socklog/Manifest
new file mode 100644
index 000000000000..e8186f4a28a7
--- /dev/null
+++ b/app-admin/socklog/Manifest
@@ -0,0 +1,4 @@
+AUX socklog-2.1.0-headers.patch 925 BLAKE2B f1f283e27a1e4e260e5c9313304090a9b62d8f0f4854be19e1fcfcb8af764346c650cb28e610779020ff7183d16d32a0e61745addcdcec52031057398b8d3d94 SHA512 d522a421a592813992646d9d2679b26c7c70a87645e06705ba212b26decd6f7dd969b4a35f54732b0b383783956c1b9ab2fc3cd402f6f5ff1a941ef1863c1419
+DIST socklog-2.1.0.tar.gz 56942 BLAKE2B 4f88044bb075dc8e503956f0ddf50fd4e748bf090e62acd34701e716d1dd34a639590b319b4377de06d3b0305d865652abd303210745e355ae67f5dff41cb895 SHA512 920ce5e661a6a3d970fa77ee3c228d48699ea03530be2b43b7517458b25e31a0a7f352ece2d076c715b6d34dbb26b424b48eb0f55b9bcd0355b74d3e34c77ac7
+EBUILD socklog-2.1.0.ebuild 897 BLAKE2B 1ebffb5b23cddbf5a2796d53d883d9336e8aa6e28a34681793026801ca1826a415cab791b6a63fc55569312a29d1a0298c3e91a2b82c4845e77b43156cdc5607 SHA512 9bc1780369034e44693e96c63163b31d2e5c308953a4664ad09876b15657962465d029cac8d66f6169fd7e1a845f0c655799ee6780cf6411c2567287a025a0fc
+MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-admin/socklog/files/socklog-2.1.0-headers.patch b/app-admin/socklog/files/socklog-2.1.0-headers.patch
new file mode 100644
index 000000000000..b7c10e3da606
--- /dev/null
+++ b/app-admin/socklog/files/socklog-2.1.0-headers.patch
@@ -0,0 +1,54 @@
+add missing headers for misc funcs and types
+
+--- a/chkshsgr.c
++++ b/chkshsgr.c
+@@ -1,10 +1,11 @@
+ /* Public domain. */
+ 
+ #include <unistd.h>
++#include <grp.h>
+ 
+ int main()
+ {
+-  short x[4];
++  gid_t x[4];
+ 
+   x[0] = x[1] = 0;
+   if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1);
+--- a/pathexec_run.c
++++ b/pathexec_run.c
+@@ -1,5 +1,6 @@
+ /* Public domain. */
+ 
++#include <unistd.h>
+ #include "error.h"
+ #include "stralloc.h"
+ #include "str.h"
+--- a/prot.c
++++ b/prot.c
+@@ -1,12 +1,15 @@
+ /* Public domain. */
+ 
++#include <unistd.h>
++#include <grp.h>
++
+ #include "hasshsgr.h"
+ #include "prot.h"
+ 
+ int prot_gid(int gid)
+ {
+ #ifdef HASSHORTSETGROUPS
+-  short x[2];
++  gid_t x[2];
+   x[0] = gid; x[1] = 73; /* catch errors */
+   if (setgroups(1,x) == -1) return -1;
+ #else
+--- a/seek_set.c
++++ b/seek_set.c
+@@ -1,5 +1,6 @@
+ /* Public domain. */
+ 
++#include <unistd.h>
+ #include <sys/types.h>
+ #include "seek.h"
+ 
diff --git a/app-admin/socklog/metadata.xml b/app-admin/socklog/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/app-admin/socklog/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/socklog/socklog-2.1.0.ebuild b/app-admin/socklog/socklog-2.1.0.ebuild
new file mode 100644
index 000000000000..1cfad2788449
--- /dev/null
+++ b/app-admin/socklog/socklog-2.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="small secure replacement for syslogd with automatic log rotation"
+HOMEPAGE="http://smarden.org/socklog/"
+SRC_URI="http://smarden.org/socklog/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static"
+
+RDEPEND=">=sys-process/runit-1.4.0"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.1.0-headers.patch )
+
+S=${WORKDIR}/admin/${P}/src
+
+src_prepare() {
+	default
+	use static && append-ldflags -static
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
+}
+
+src_install() {
+	dobin tryto uncat socklog-check
+	dosbin socklog socklog-conf
+
+	cd .. || die
+	dodoc package/CHANGES
+	dohtml doc/*.html
+	doman man/*
+}
diff --git a/app-admin/sshguard-2.1.0-r1 b/app-admin/sshguard-2.1.0-r1
deleted file mode 100644
index 371964d26f8a..000000000000
--- a/app-admin/sshguard-2.1.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-devel/flex
-DESCRIPTION=protects hosts from brute force attacks against ssh
-EAPI=6
-HOMEPAGE=http://sshguard.sourceforge.net/
-KEYWORDS=amd64 ~arm x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=virtual/logger
-SLOT=0
-SRC_URI=mirror://sourceforge/sshguard/sshguard-2.1.0.tar.gz
-_md5_=95e72b6fc199494d817fc99950a12db3
diff --git a/app-admin/sshguard-2.1.0-r2 b/app-admin/sshguard-2.1.0-r2
deleted file mode 100644
index df76631f8306..000000000000
--- a/app-admin/sshguard-2.1.0-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-devel/flex
-DESCRIPTION=protects hosts from brute force attacks against ssh
-EAPI=6
-HOMEPAGE=http://sshguard.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=virtual/logger
-SLOT=0
-SRC_URI=mirror://sourceforge/sshguard/sshguard-2.1.0.tar.gz
-_md5_=dc8be30afdd8aa02246262ab73e04260
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
new file mode 100644
index 000000000000..29ba7064a5ba
--- /dev/null
+++ b/app-admin/sshguard/Manifest
@@ -0,0 +1,8 @@
+AUX sshguard-2.1.0-conf.patch 408 BLAKE2B bec9debaa542d7d2d7f21d5308cda162a75a639a85d712a1adfe253fed735a1b85d83b0b0297db96fada22e61e332f5847b2815280f8ddda105cbe6d9194bf6c SHA512 5edfbf3a6955d86233de10665bea527a2e8ebaaeb505d16073c861fa2883b32d0c655f5d4c99145af63df95612129dcd25ffae3710c8615709768bdcff9ef5bc
+AUX sshguard.confd 634 BLAKE2B f083e6d4f7df6cefae89ef382a82cd7c5863c6a2ded34aee61ab028f8320c35552b80d5d8222ed35adb13a70cf6096eb5d88749f5b5ff72ca483f27fd1c0de56 SHA512 72b2a9c995bcb604516525f8190eaf35fa57e18274f83a8d00fd5b223b598c0c4ffd8b7ce89b1139c89380e5a7181c8024a6041375c445edb29c8f8b49abee50
+AUX sshguard.initd 572 BLAKE2B d92f03b4da940a47ae27281c1075914e7e4157d459096a19615a05815f3507a11a41ec5290830f299e96fee8c7203831f6e91b11faa6a6f07eaec68f98e9bf0f SHA512 0a38cdc6121c6f981bccfd75648843f16b724d412648773f1838e8c67a6c7231df756da8ac1c3651a18b5a271337c07ab97a3314d3a81904bf3c2c68dd00f9f7
+AUX sshguard.initd-r1 400 BLAKE2B 4d97e26fdacc5477936c899b69a8ac5d6507b8336228f425823bfaab1119d5862654babdce2e33ab530d41943f4e62f983e0d48ff38d319a85382e3c680e5e22 SHA512 1d73ee8e244f8318a4488aa9cf404d619da893828201215de741cea20cbb99dbce44caaefae6ab407146ca05d1ced61a03228fe60b9fa0beb152bcd8098ea86b
+DIST sshguard-2.1.0.tar.gz 1117466 BLAKE2B 1a105f346aa9b774fb0314161d779eadaab299d3b74181a449ab86534e11375e4c017c142bc621733593369bcebada9511dd40c64cb4a49cd124eb7537ae0717 SHA512 0a75e9d1a8c9c010c767a49e96e88db4a92aae8d428deebcff1ce8befa36b77cb1937f2fcb2a4e2a3e86d47896a8405265eb30ee7a603fc18a3ee117d646b119
+EBUILD sshguard-2.1.0-r1.ebuild 763 BLAKE2B 2af47f5332bb6ab2cc39e8da7b4b61d91f663f93958c56474d4f813d0e32a9e6ff895bd15b3f740153b0643d2bbde8f2d1588d2636cdf89daff5826d63d395ba SHA512 281964bf882b40da1d5de715d93c12df1910c550304871c4ba5cf7570ac86821547299fd831025290182f8207027de8c053aa814a615b25656b982027fa457bd
+EBUILD sshguard-2.1.0-r2.ebuild 768 BLAKE2B 2ca5bfe103a6aee4cd013540cc9292eb3e9631f6863ac83a26496d5de083605e8515c5797173fedaf3590702e379584aa84031f960a70daaadb35ee019be5134 SHA512 a6324574621132921a9f9c7c9cfe3abc503e3b0d508ff6ef7bf9ad82db3476c169d7e88aa68e3d4c6dd268b51f38f06a1210e7489f5cbeb270345057efc34582
+MISC metadata.xml 348 BLAKE2B 9dd6c721b71bc5c73a367a9a7e4ef55ee0f0805c917968e66788716241db4c4aa4479ceffdb881d26c7da8b53fd2a5db921c7ef4138e9ff5401e621124d0bc19 SHA512 b93ba2b6eb5371962e1565ef4a333b50ba0dc44ae4365486fd55b04bdac546c8ff68fedebbb7a01d3cb4810f48148bfb870bef952b631fca931cf149ea8429ec
diff --git a/app-admin/sshguard/files/sshguard-2.1.0-conf.patch b/app-admin/sshguard/files/sshguard-2.1.0-conf.patch
new file mode 100644
index 000000000000..8874cc48904d
--- /dev/null
+++ b/app-admin/sshguard/files/sshguard-2.1.0-conf.patch
@@ -0,0 +1,11 @@
+--- a/examples/sshguard.conf.sample
++++ b/examples/sshguard.conf.sample
+@@ -6,7 +6,7 @@
+ 
+ #### REQUIRED CONFIGURATION ####
+ # Full path to backend executable (required, no default)
+-#BACKEND="/usr/local/libexec/sshg-fw-iptables"
++#BACKEND="/usr/libexec/sshg-fw-iptables"
+ 
+ # Space-separated list of log files to monitor. (optional, no default)
+ #FILES="/var/log/auth.log /var/log/authlog /var/log/maillog"
diff --git a/app-admin/sshguard/files/sshguard.confd b/app-admin/sshguard/files/sshguard.confd
new file mode 100644
index 000000000000..326f8918aaa4
--- /dev/null
+++ b/app-admin/sshguard/files/sshguard.confd
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/sshguard
+#   See sshguard(8) for details.
+
+# Initial (empty) options.
+SSHGUARD_OPTS=""
+
+# Files to monitor
+#   -l <source>
+SSHGUARD_OPTS="${SSHGUARD_OPTS} -l /var/log/auth.log"
+
+# White listing
+#   -w <addr/host/block/file>
+#SSHGUARD_OPTS="${SSHGUARD_OPTS} -w 192.168.0.0/24"
+
+# Define how long in milliseconds start-stop-daemon waits to check that
+# sshguard is still running before calling success or failure.
+# Values lower than the default of 999 are probably not useful.
+SSHGUARD_WAIT="999"
diff --git a/app-admin/sshguard/files/sshguard.initd b/app-admin/sshguard/files/sshguard.initd
new file mode 100644
index 000000000000..f1360ce8610b
--- /dev/null
+++ b/app-admin/sshguard/files/sshguard.initd
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	after iptables
+	use logger
+}
+
+SSHGUARD_PIDFILE=${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid}
+
+start() {
+	ebegin "Starting sshguard"
+	[ -z "${SSHGUARD_WAIT}" ] && SSHGUARD_WAIT=999
+	start-stop-daemon --start --wait ${SSHGUARD_WAIT} --background --quiet --exec \
+		/usr/sbin/sshguard -- -i ${SSHGUARD_PIDFILE} ${SSHGUARD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping sshguard"
+	start-stop-daemon --stop -p ${SSHGUARD_PIDFILE}
+	eend $?
+}
diff --git a/app-admin/sshguard/files/sshguard.initd-r1 b/app-admin/sshguard/files/sshguard.initd-r1
new file mode 100644
index 000000000000..e7b5ca7428b3
--- /dev/null
+++ b/app-admin/sshguard/files/sshguard.initd-r1
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/sshguard"
+pidfile="${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid}"
+command_args="-i \"${pidfile}\" ${SSHGUARD_OPTS}"
+command_background=1
+start_stop_daemon_args="--wait ${SSHGUARD_WAIT:-999} --interpreted --quiet"
+
+depend() {
+	after iptables
+	use logger
+}
diff --git a/app-admin/sshguard/metadata.xml b/app-admin/sshguard/metadata.xml
new file mode 100644
index 000000000000..0daba0da53ea
--- /dev/null
+++ b/app-admin/sshguard/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<upstream>
+<remote-id type="sourceforge">sshguard</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-admin/sshguard/sshguard-2.1.0-r1.ebuild b/app-admin/sshguard/sshguard-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..5fc804a5f545
--- /dev/null
+++ b/app-admin/sshguard/sshguard-2.1.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="protects hosts from brute force attacks against ssh"
+HOMEPAGE="http://sshguard.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86 ~x86-fbsd"
+
+DEPEND="
+	sys-devel/flex
+"
+RDEPEND="
+	virtual/logger
+"
+DOCS=(
+	CHANGELOG.rst
+	CONTRIBUTING.rst
+	README.rst
+	examples/net.sshguard.plist
+	examples/sshguard.service
+	examples/whitelistfile.example
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-conf.patch
+)
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	insinto /etc
+	newins examples/sshguard.conf.sample sshguard.conf
+}
diff --git a/app-admin/sshguard/sshguard-2.1.0-r2.ebuild b/app-admin/sshguard/sshguard-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..7faed8b68c9c
--- /dev/null
+++ b/app-admin/sshguard/sshguard-2.1.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="protects hosts from brute force attacks against ssh"
+HOMEPAGE="http://sshguard.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
+
+DEPEND="
+	sys-devel/flex
+"
+RDEPEND="
+	virtual/logger
+"
+DOCS=(
+	CHANGELOG.rst
+	CONTRIBUTING.rst
+	README.rst
+	examples/net.sshguard.plist
+	examples/sshguard.service
+	examples/whitelistfile.example
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-conf.patch
+)
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	insinto /etc
+	newins examples/sshguard.conf.sample sshguard.conf
+}
diff --git a/app-admin/stow-2.2.2-r1 b/app-admin/stow-2.2.2-r1
deleted file mode 100644
index 40df289a4814..000000000000
--- a/app-admin/stow-2.2.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-lang/perl test? ( dev-perl/IO-stringy virtual/perl-Test-Harness dev-perl/Test-Output )
-DESCRIPTION=GNU Stow is a symlink farm manager
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/stow/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://gnu/stow/stow-2.2.2.tar.gz
-_eclasses_=perl-functions	01e8c68d5a528bbcda4d3c60205983df
-_md5_=2f5f8e9b73ffaf1f90dbe8e9450f9005
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
new file mode 100644
index 000000000000..08590cff417f
--- /dev/null
+++ b/app-admin/stow/Manifest
@@ -0,0 +1,3 @@
+DIST stow-2.2.2.tar.gz 579324 BLAKE2B fc4ab7f386e8245b361cee5fc0decd91caec543ec6178c82720866c33a974ba9d68e999a68c3b7357d873ab1b58bb8b022bf02dad029972f42c317ffc288bd04 SHA512 8a3e5da6b5cb4c1ee1b512bae5a9859f83659d5de05f7a9af1dd09df2a32f6b8c6d43b79736db91232c43621d542041d4ef92eb088925796adad0676f200a9b5
+EBUILD stow-2.2.2-r1.ebuild 621 BLAKE2B 5cd0b3810fd8d2bde5dc13cf5e80639d463bd17a51ed8750d11aaeb75a4ed4983938d3e4faffea30adf08da2432ebf2417fa6b6df071f9a09d290877fedba27c SHA512 0ad9daf266d7a2163a778569d74e45c1cdc506c455ae7ba783ce07b5f4f32f9fb99979a188b770566c8d2e72a10bd256d5900333b8d3bbc7566a05cb828c82f1
+MISC metadata.xml 469 BLAKE2B c09f5d5ad52c89661d6c2b43f1762584cf3282ec9812233df01900ea4b738faf2c66b4405f0d5b01f33016b7c98714cb14fb503f84ed2332596d65ad676217f1 SHA512 d2dedba051ac4de16316392a51e87ea36f435c7f568523ddbd06aa620f4d350edafc6bc996954d9982dd1496951c22731fc5cb5df2725414986281709dafb126
diff --git a/app-admin/stow/metadata.xml b/app-admin/stow/metadata.xml
new file mode 100644
index 000000000000..04f725369a73
--- /dev/null
+++ b/app-admin/stow/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ewfalor@gmail.com</email>
+		<name>Erik Falor</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/stow/stow-2.2.2-r1.ebuild b/app-admin/stow/stow-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..553379c37f3d
--- /dev/null
+++ b/app-admin/stow/stow-2.2.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit perl-functions
+
+DESCRIPTION="GNU Stow is a symlink farm manager"
+HOMEPAGE="https://www.gnu.org/software/stow/"
+SRC_URI="mirror://gnu/stow/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+
+DEPEND="dev-lang/perl
+	test? (
+		dev-perl/IO-stringy
+		virtual/perl-Test-Harness
+		dev-perl/Test-Output
+	)"
+RDEPEND="dev-lang/perl:="
+
+src_configure() {
+	perl_set_version
+	econf "--with-pmdir=${VENDOR_LIB}"
+}
diff --git a/app-admin/su-exec-0.2 b/app-admin/su-exec-0.2
deleted file mode 100644
index fead0b644e09..000000000000
--- a/app-admin/su-exec-0.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Switch user and group id and exec
-EAPI=6
-HOMEPAGE=https://github.com/ncopa/su-exec
-IUSE=static
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/ncopa/su-exec/archive/v0.2.tar.gz -> su-exec-0.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=54b27b7199778b6d21ed0d4a35ecdedc
diff --git a/app-admin/su-exec/Manifest b/app-admin/su-exec/Manifest
new file mode 100644
index 000000000000..7e5ba2aa118b
--- /dev/null
+++ b/app-admin/su-exec/Manifest
@@ -0,0 +1,3 @@
+DIST su-exec-0.2.tar.gz 2426 BLAKE2B 79eda06463a238371e35dcc7acf2df9e8a7696a531a5dc9d0e9650219a5c72d71cf0e368f2178f83e949cf0f05fbc01e7023085fa2cffebcd8b78e82ab9756e2 SHA512 68155a06c716b362aee1214f22cd325b3e934c05b653d3b084a720458fb04207c0681d218b72adfd5ae8fab0262f7ab90e49eb2e218d1b0d7d7af7911715d4e1
+EBUILD su-exec-0.2.ebuild 595 BLAKE2B 44e9e1e201b74506b2d1bdd0d25f8e957ba5b7dd4db859de6708bd33d2c122d046a51122f7096936621c7e60dd0e5d44e565295cba4de4b055b3d2e7f8244f9d SHA512 2a008451f0277ac2bf5e97cca68078e4f333f0b488ca8750b22e75dc6424d45ce34c214e5b6513835b8faba6c40caab1506ec8e208ea231f2144ea2fb0d6a4cf
+MISC metadata.xml 323 BLAKE2B 56dfb262d3d2714721cbd8436aaaa6628ca11013bc801a7d9a18fa5a87d4e20e41d98584f344a98b8f697ad6427f6641bba7090b562594b08995e8b31d4d2292 SHA512 3eadc250f3acadea3d3b3f29ef78380ed153b12b34b5e752dd088470949dec3590889b8daa6db37472ed043a10f14f5bf2e8c280fae7efd3ee398fa5d88b0caf
diff --git a/app-admin/su-exec/metadata.xml b/app-admin/su-exec/metadata.xml
new file mode 100644
index 000000000000..662615bdd73c
--- /dev/null
+++ b/app-admin/su-exec/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ncopa/su-exec</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/su-exec/su-exec-0.2.ebuild b/app-admin/su-exec/su-exec-0.2.ebuild
new file mode 100644
index 000000000000..f51e2f258af4
--- /dev/null
+++ b/app-admin/su-exec/su-exec-0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Switch user and group id and exec"
+HOMEPAGE="https://github.com/ncopa/su-exec"
+SRC_URI="https://github.com/ncopa/su-exec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static"
+
+src_prepare() {
+	default
+	sed -i -e "s/-Werror//" Makefile || die
+}
+
+src_compile() {
+	CC=$(tc-getCC) emake $(usex static "${PN}-static" "")
+}
+
+src_install() {
+	newbin ${PN}$(usex static "-static" "") ${PN}
+	dodoc README.md
+}
diff --git a/app-admin/sud-1.3-r1 b/app-admin/sud-1.3-r1
deleted file mode 100644
index dc2205ea5ef4..000000000000
--- a/app-admin/sud-1.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A daemon to execute processes with special privileges in a nosuid environment
-EAPI=6
-HOMEPAGE=http://s0ftpj.org/projects/sud/index.htm
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://s0ftpj.org/projects/sud/sud-1.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f7e590e14c8a958294bb1074bc1157e7
diff --git a/app-admin/sud/Manifest b/app-admin/sud/Manifest
new file mode 100644
index 000000000000..da3615d7568d
--- /dev/null
+++ b/app-admin/sud/Manifest
@@ -0,0 +1,5 @@
+AUX sud-1.3-fix-build-system.patch 649 BLAKE2B 00563b734e50ef85636603e09b32f9db3ad0d072aac61291ae0a0447cbdf2aa04dd40ac0d37e0d03147dac242bf4251eb4c1cbb9b3897008b9fb3e6e06622374 SHA512 9c8151b09d9a1cb06a523c9ddc34ddf18adcc1a45c89805f9c8865a69890810403e7e6b5d9fe6d034f3f68700d88044ce318dd1345ec5843540a404dc54d4e34
+AUX sud.rc6 387 BLAKE2B a1eef9ef30a73c15ea8daf2f2a266cacbcf38dfc2fda1e481b9693c24c5fe5ba726a9154b8dc4a072aa008d5d96ec820f8b1dff375b16ef28f5b5230961fbac1 SHA512 07feba04e36df02e5cab6260f5943d4a72c3549a604d9db33a2f4734b39a60a3514899c0831bf1fe5ce073889989d42f0ae64d1f7bb0735fca7fd2584887364b
+DIST sud-1.3.tar.gz 117542 BLAKE2B e9d28c119e25d3cf0434d10c04d34fbdd0a52fbea84ee09b2dc835ec9eabf30fc91895fd691febbf57590b790febe04b1b45d354f7e2fcab513608de85419746 SHA512 54b58b54e665133dcc40f00708a929bc038df1e2ce18514d830e3f3f823110bd27a209771fc378c2bcd372692e168f55150f12893e2fbd433b51e2173dbd410e
+EBUILD sud-1.3-r1.ebuild 697 BLAKE2B 8f4b85dfc0efbbbe4e63627f22e6e98eb11aeda2a95f8a486cfd7fdb1bc614a3b15a9c6e6fde6a0012606252a4a1a8f3bd26b8fb0176a438eb421ee60134bb15 SHA512 0eaa293326637f1456527a97d68118471bc897643ad6766c19f4c7828b31c23648dffc73827e429555c06727c58d5330d04cd36ad48b0d34d3568060ec5ce87a
+MISC metadata.xml 719 BLAKE2B 5e27e4bdaf382f590f9f5eab598c94e62ac353e0694e3e7094f37637dfc3201e8f23a52d2c2d7f9bfffb574b59838bdb41ebc746a389ebb8a6e89ac0fec2ee9d SHA512 94b453b02af38033f480fa0cd38b6614f4f972a1f2f826e56eda1668db212a31bd6643146f40ba220f77e748c6ba29935527b0a363fcc3cb87e617cfc2ee5938
diff --git a/app-admin/sud/files/sud-1.3-fix-build-system.patch b/app-admin/sud/files/sud-1.3-fix-build-system.patch
new file mode 100644
index 000000000000..5937d3f0a8e6
--- /dev/null
+++ b/app-admin/sud/files/sud-1.3-fix-build-system.patch
@@ -0,0 +1,30 @@
+--- a/login/Makefile.am
++++ b/login/Makefile.am
+@@ -2,5 +2,5 @@
+ ilogin_SOURCES = login.c
+ ilogin_CFLAGS = -Wall
+ 
+-install-data-hook:
+-	chmod 500 $(sbindir)/ilogin
++install-exec-hook:
++	chmod 500 $(DESTDIR)$(sbindir)/ilogin
+--- a/su/Makefile.am
++++ b/su/Makefile.am
+@@ -4,5 +4,5 @@
+ 
+ INCLUDES = -I../sud
+ 
+-install-data-hook:
+-	chmod 555 $(bindir)/suz
++install-exec-hook:
++	chmod 555 $(DESTDIR)$(bindir)/suz
+--- a/sud/Makefile.am
++++ b/sud/Makefile.am
+@@ -7,5 +7,5 @@
+ #INCLUDES = -I..
+ CLEANFILES = conf_lexer.c conf_parser.h conf_parser.c
+ 
+-install-data-hook:
+-	chmod 500 $(sbindir)/sud
++install-exec-hook:
++	chmod 500 $(DESTDIR)$(sbindir)/sud
diff --git a/app-admin/sud/files/sud.rc6 b/app-admin/sud/files/sud.rc6
new file mode 100644
index 000000000000..068acf776173
--- /dev/null
+++ b/app-admin/sud/files/sud.rc6
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting sud"
+	start-stop-daemon --start --quiet --pidfile /var/run/sud.pid \
+		--exec /usr/sbin/sud
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping sud"
+	start-stop-daemon --stop --quiet --pidfile /var/run/sud.pid
+	eend $?
+}
diff --git a/app-admin/sud/metadata.xml b/app-admin/sud/metadata.xml
new file mode 100644
index 000000000000..39516e080887
--- /dev/null
+++ b/app-admin/sud/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>lu_zero@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+  <email>base-system@gentoo.org</email>
+  <name>Gentoo Base System</name>
+</maintainer>
+<longdescription>
+sud (superuser daemon) permits a user to switch to root privileges and to use a suid program in a nosuid environment. It is based on a client/server model and on the ability to pass file descriptors between processes. sud permits you to choose your authentication method, and your effective credentials will be checked by using a Unix domain socket.
+</longdescription>
+</pkgmetadata>
diff --git a/app-admin/sud/sud-1.3-r1.ebuild b/app-admin/sud/sud-1.3-r1.ebuild
new file mode 100644
index 000000000000..7c72435d9c4d
--- /dev/null
+++ b/app-admin/sud/sud-1.3-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A daemon to execute processes with special privileges in a nosuid environment"
+HOMEPAGE="http://s0ftpj.org/projects/sud/index.htm"
+SRC_URI="http://s0ftpj.org/projects/sud/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-build-system.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -D_GNU_SOURCE
+	default
+}
+
+src_install() {
+	default
+
+	doman ilogin.1 sud.1 suz.1
+	insinto /etc
+	doins miscs/sud.conf*
+	newinitd "${FILESDIR}"/sud.rc6 sud
+}
diff --git a/app-admin/sudo-1.8.22-r2 b/app-admin/sudo-1.8.22-r2
deleted file mode 100644
index a08596f1d8e3..000000000000
--- a/app-admin/sudo-1.8.22-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib sys-devel/bison >=app-portage/elt-patches-20170422
-DESCRIPTION=Allows users or groups to run commands as other users
-EAPI=6
-HOMEPAGE=https://www.sudo.ws/
-IUSE=gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
-LICENSE=ISC BSD
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
-REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
-SLOT=0
-SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.8.22.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.22.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=63697c31e3c98574d4e4bcb5af00cda0
diff --git a/app-admin/sudo-1.8.23 b/app-admin/sudo-1.8.23
deleted file mode 100644
index fa5fd7eb0d12..000000000000
--- a/app-admin/sudo-1.8.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib sys-devel/bison >=app-portage/elt-patches-20170422
-DESCRIPTION=Allows users or groups to run commands as other users
-EAPI=6
-HOMEPAGE=https://www.sudo.ws/
-IUSE=gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
-LICENSE=ISC BSD
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
-REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
-SLOT=0
-SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.8.23.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.23.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=248ee4cbf018958e8bdece0461a39c07
diff --git a/app-admin/sudo-1.8.23-r1 b/app-admin/sudo-1.8.23-r1
deleted file mode 100644
index e80767ca0c8e..000000000000
--- a/app-admin/sudo-1.8.23-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib sys-devel/bison >=app-portage/elt-patches-20170422
-DESCRIPTION=Allows users or groups to run commands as other users
-EAPI=6
-HOMEPAGE=https://www.sudo.ws/
-IUSE=gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
-LICENSE=ISC BSD
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
-REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
-SLOT=0
-SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.8.23.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.23.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6e89eaa76815f3cd963efa270768e8fc
diff --git a/app-admin/sudo-1.8.24_beta1 b/app-admin/sudo-1.8.24_beta1
deleted file mode 100644
index 041386af9008..000000000000
--- a/app-admin/sudo-1.8.24_beta1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib sys-devel/bison >=app-portage/elt-patches-20170422
-DESCRIPTION=Allows users or groups to run commands as other users
-EAPI=6
-HOMEPAGE=https://www.sudo.ws/
-IUSE=gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey
-LICENSE=ISC BSD
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
-REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
-SLOT=0
-SRC_URI=https://www.sudo.ws/sudo/dist/beta/sudo-1.8.24b1.tar.gz ftp://ftp.sudo.ws/pub/sudo/beta/sudo-1.8.24b1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6e89eaa76815f3cd963efa270768e8fc
diff --git a/app-admin/sudo-9999 b/app-admin/sudo-9999
deleted file mode 100644
index 264afa2a5273..000000000000
--- a/app-admin/sudo-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=sys-libs/zlib ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) sys-devel/bison >=app-portage/elt-patches-20170422 dev-vcs/mercurial
-DESCRIPTION=Allows users or groups to run commands as other users
-EAPI=6
-HOMEPAGE=https://www.sudo.ws/
-IUSE=gcrypt ldap nls openssl offensive pam sasl selinux +sendmail skey
-LICENSE=ISC BSD
-RDEPEND=sys-libs/zlib ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta )
-REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=11107976e2ad9a2c8a066c16bae18c13
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
new file mode 100644
index 000000000000..ea25e0ab8216
--- /dev/null
+++ b/app-admin/sudo/Manifest
@@ -0,0 +1,9 @@
+DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d96597f983d8af01434d224dd698f9257b0965a0e480e8d19eb38eef0c8216942ca5217c3fe7516cdf397f7b7 SHA512 5ce10a9302d25bb726e347499d26a0b3697446cfcdf0fd9094ee35198db7b023d5250a53fdcb4184d1a09f5fd2a78fc645bc8e80f265666b05a91f62f49b0695
+DIST sudo-1.8.23.tar.gz 3150674 BLAKE2B 11b1c7bfa372005cda8baf651c4662f6fd15e94ca77f7705b23ca6573424796d5c1f8e47e2874c4b54017141d01a632885ac60c92346d932537048373cad0ede SHA512 a9d61850a4857bfd075547a13efb13b054e4736e3ebe3c8a98a90a090b1d9b9688354ec9725fc99d1d256999b6f9c6ae6215ce9770fcdebd7f24731107b48342
+DIST sudo-1.8.24b1.tar.gz 3167476 BLAKE2B 23fa302773733ac84f36af006076a367c8201ed238f43007b9fff504ead6b8845614c0180aa1cfd33b7fb7082437b9701ff6e4da8df44e97f34a0084a0920feb SHA512 92746df75b32031ef890c48fe0383001640c8470bae841f2277f42008eda4e86b0ed0494ceb0a9e1ac7a7510375c9a7c7d23ec3e84a42e94d457f6771170357c
+EBUILD sudo-1.8.22-r2.ebuild 5990 BLAKE2B 3e9d5827271f71362f4e3a9664e6f22437764a49fd2c20c79d2e8c211058627bf288b885b65a8a3ca4768460074871d0269c13cddd186605f063bbffa7d39f50 SHA512 a165bdbca3ce48e969bfa9fc2d8d1768343fd3570735ab874237c0a0378fd0b3ec64820586d9040fe4ad19ae91ddad0a62e04626e3c4b38c336a44bce47b7690
+EBUILD sudo-1.8.23-r1.ebuild 6154 BLAKE2B ca5c41cb76ca84b961cd1397bcf7914285347a32cc3a0bfe8385b0441e61e1995dc10c80b237cd55690f3f4e030f0c9ce0697b35bd79a37dc040a0de8f7e51d1 SHA512 08c9ca2d25a364a24325af96536996ce297c099e3632a4316467ec8abe5c27578e376607eee94a57c7a4c4ca444db4ca33879af9b745472ffb8766c48aeafa4e
+EBUILD sudo-1.8.23.ebuild 5962 BLAKE2B e65fc8e35531d64bd7ad8bc3954018164359513b54b2868f2215006a4dcc907d1355fec8c1b3327fae57f2642e72e99ed11709281a88579d68c53629bcf5841f SHA512 a83a23a13b892f661bfd467078e2b390d455d2e3228d60e1045a58091724c6939daa063549a66b669b8240d90cf69bb28812d5b9db91ffd34acf17bb005afa4c
+EBUILD sudo-1.8.24_beta1.ebuild 6154 BLAKE2B ca5c41cb76ca84b961cd1397bcf7914285347a32cc3a0bfe8385b0441e61e1995dc10c80b237cd55690f3f4e030f0c9ce0697b35bd79a37dc040a0de8f7e51d1 SHA512 08c9ca2d25a364a24325af96536996ce297c099e3632a4316467ec8abe5c27578e376607eee94a57c7a4c4ca444db4ca33879af9b745472ffb8766c48aeafa4e
+EBUILD sudo-9999.ebuild 6295 BLAKE2B e89dc623a7ada1424bedc74284b9acfa1f377ff4265a88dce4025c82f4cfe8b46a95b2c8c6d81e35b24f3b5f9386debfd1a1999a43c61a569bce7f30055f3138 SHA512 42fdb1275318ed17354ecf4765c5ce1cc4dbcdd2149f007bb48cccb01306f1b779f10ad62be60b4bd680b045d3e59bebe8f4a9cacdc99614f8f60be7a232b7b3
+MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml
new file mode 100644
index 000000000000..fd239654c5e5
--- /dev/null
+++ b/app-admin/sudo/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<longdescription lang="en">
+		Sudo (superuser do) allows a system administrator to give certain
+		users (or groups of users) the ability to run some (or all)
+		commands as root or another user while logging the commands and
+		arguments.
+	</longdescription>
+	<use>
+		<flag name="gcrypt">Use SHA2 from <pkg>dev-libs/libgcrypt</pkg> instead of sudo's internal SHA2</flag>
+		<flag name="offensive">Let sudo print insults when the user types the wrong password</flag>
+		<flag name="openssl">Use SHA2 from <pkg>dev-libs/openssl</pkg> instead of sudo's internal SHA2</flag>
+		<flag name="sendmail">Allow sudo to send emails with sendmail</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:todd_miller:sudo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/sudo/sudo-1.8.22-r2.ebuild b/app-admin/sudo/sudo-1.8.22-r2.ebuild
new file mode 100644
index 000000000000..5c8f882a27c0
--- /dev/null
+++ b/app-admin/sudo/sudo-1.8.22-r2.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pam multilib libtool
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+	*_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+	ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+fi
+IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
+
+CDEPEND="
+	gcrypt? ( dev-libs/libgcrypt:= )
+	openssl? ( dev-libs/openssl:0= )
+	pam? ( virtual/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	sys-libs/zlib
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sudo )
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	sendmail? ( virtual/mta )
+"
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	pam? ( !skey )
+	skey? ( !pam )
+	?? ( gcrypt openssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+set_rootpath() {
+	# FIXME: secure_path is a compile time setting. using ROOTPATH
+	# is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path ..."
+
+	# first extract the default ROOTPATH from build env
+	ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+	if [[ -z ${ROOTPATH} ]] ; then
+		ewarn "	Failed to find ROOTPATH, please report this"
+	fi
+
+	# then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:$thisp
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		ROOTPATH=${newpath#:}
+	}
+	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
+
+	# finally, strip gcc paths #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${ROOTPATH} ; do
+			for e ; do [[ $thisp == $e ]] && continue 2 ; done
+			newpath+=:$thisp
+		done
+		ROOTPATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+	einfo "... done"
+}
+
+src_configure() {
+	local ROOTPATH
+	set_rootpath
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	myeconfargs=(
+		--enable-zlib=system
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/var/run/sudo
+		--with-secure-path="${ROOTPATH}"
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable openssl)
+		$(use_enable sasl)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with ldap)
+		$(use_with pam)
+		$(use_with skey)
+		$(use_with selinux)
+		$(use_with sendmail)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP
+		dosbin plugins/sudoers/sudoers2ldif
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins doc/schema.OpenLDAP sudo.schema
+	fi
+
+	pamd_mimic system-auth sudo auth account session
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	fperms 0711 /var/db/sudo #652958
+
+	# Don't install into /var/run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED}"/var/run
+}
+
+pkg_postinst() {
+	#652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
diff --git a/app-admin/sudo/sudo-1.8.23-r1.ebuild b/app-admin/sudo/sudo-1.8.23-r1.ebuild
new file mode 100644
index 000000000000..8e7d28d69bd5
--- /dev/null
+++ b/app-admin/sudo/sudo-1.8.23-r1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pam multilib libtool
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+	*_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+	ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+fi
+IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
+
+CDEPEND="
+	gcrypt? ( dev-libs/libgcrypt:= )
+	openssl? ( dev-libs/openssl:0= )
+	pam? ( virtual/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	sys-libs/zlib
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sudo )
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	sendmail? ( virtual/mta )
+"
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	pam? ( !skey )
+	skey? ( !pam )
+	?? ( gcrypt openssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+set_secure_path() {
+	# FIXME: secure_path is a compile time setting. using PATH or
+	# ROOTPATH is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path ..."
+
+	# first extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
+		echo "${ROOTPATH}")
+		case "${SECURE_PATH}" in
+			*/usr/sbin*) ;;
+			*) SECURE_PATH=$(unset PATH;
+				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+				;;
+		esac
+	if [[ -z ${SECURE_PATH} ]] ; then
+		ewarn "	Failed to detect SECURE_PATH, please report this"
+	fi
+
+	# then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:$thisp
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+	# finally, strip gcc paths #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${SECURE_PATH} ; do
+			for e ; do [[ $thisp == $e ]] && continue 2 ; done
+			newpath+=:$thisp
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+	einfo "... done"
+}
+
+src_configure() {
+	local SECURE_PATH
+	set_secure_path
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	myeconfargs=(
+		--enable-zlib=system
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/var/run/sudo
+		--with-secure-path="${SECURE_PATH}"
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable openssl)
+		$(use_enable sasl)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with ldap)
+		$(use_with pam)
+		$(use_with skey)
+		$(use_with selinux)
+		$(use_with sendmail)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins doc/schema.OpenLDAP sudo.schema
+	fi
+
+	pamd_mimic system-auth sudo auth account session
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	fperms 0711 /var/db/sudo #652958
+
+	# Don't install into /var/run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED}"/var/run
+}
+
+pkg_postinst() {
+	#652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
diff --git a/app-admin/sudo/sudo-1.8.23.ebuild b/app-admin/sudo/sudo-1.8.23.ebuild
new file mode 100644
index 000000000000..b67fefb0afb3
--- /dev/null
+++ b/app-admin/sudo/sudo-1.8.23.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pam multilib libtool
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+	*_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+	ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+fi
+IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
+
+CDEPEND="
+	gcrypt? ( dev-libs/libgcrypt:= )
+	openssl? ( dev-libs/openssl:0= )
+	pam? ( virtual/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	sys-libs/zlib
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sudo )
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	sendmail? ( virtual/mta )
+"
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	pam? ( !skey )
+	skey? ( !pam )
+	?? ( gcrypt openssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+set_rootpath() {
+	# FIXME: secure_path is a compile time setting. using ROOTPATH
+	# is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path ..."
+
+	# first extract the default ROOTPATH from build env
+	ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+	if [[ -z ${ROOTPATH} ]] ; then
+		ewarn "	Failed to find ROOTPATH, please report this"
+	fi
+
+	# then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:$thisp
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		ROOTPATH=${newpath#:}
+	}
+	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
+
+	# finally, strip gcc paths #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${ROOTPATH} ; do
+			for e ; do [[ $thisp == $e ]] && continue 2 ; done
+			newpath+=:$thisp
+		done
+		ROOTPATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+	einfo "... done"
+}
+
+src_configure() {
+	local ROOTPATH
+	set_rootpath
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	myeconfargs=(
+		--enable-zlib=system
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/var/run/sudo
+		--with-secure-path="${ROOTPATH}"
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable openssl)
+		$(use_enable sasl)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with ldap)
+		$(use_with pam)
+		$(use_with skey)
+		$(use_with selinux)
+		$(use_with sendmail)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins doc/schema.OpenLDAP sudo.schema
+	fi
+
+	pamd_mimic system-auth sudo auth account session
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	fperms 0711 /var/db/sudo #652958
+
+	# Don't install into /var/run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED}"/var/run
+}
+
+pkg_postinst() {
+	#652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
diff --git a/app-admin/sudo/sudo-1.8.24_beta1.ebuild b/app-admin/sudo/sudo-1.8.24_beta1.ebuild
new file mode 100644
index 000000000000..8e7d28d69bd5
--- /dev/null
+++ b/app-admin/sudo/sudo-1.8.24_beta1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pam multilib libtool
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+	*_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+	ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+fi
+IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
+
+CDEPEND="
+	gcrypt? ( dev-libs/libgcrypt:= )
+	openssl? ( dev-libs/openssl:0= )
+	pam? ( virtual/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	sys-libs/zlib
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sudo )
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	sendmail? ( virtual/mta )
+"
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	pam? ( !skey )
+	skey? ( !pam )
+	?? ( gcrypt openssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+set_secure_path() {
+	# FIXME: secure_path is a compile time setting. using PATH or
+	# ROOTPATH is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path ..."
+
+	# first extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
+		echo "${ROOTPATH}")
+		case "${SECURE_PATH}" in
+			*/usr/sbin*) ;;
+			*) SECURE_PATH=$(unset PATH;
+				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+				;;
+		esac
+	if [[ -z ${SECURE_PATH} ]] ; then
+		ewarn "	Failed to detect SECURE_PATH, please report this"
+	fi
+
+	# then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:$thisp
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+	# finally, strip gcc paths #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${SECURE_PATH} ; do
+			for e ; do [[ $thisp == $e ]] && continue 2 ; done
+			newpath+=:$thisp
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+	einfo "... done"
+}
+
+src_configure() {
+	local SECURE_PATH
+	set_secure_path
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	myeconfargs=(
+		--enable-zlib=system
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/var/run/sudo
+		--with-secure-path="${SECURE_PATH}"
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable openssl)
+		$(use_enable sasl)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with ldap)
+		$(use_with pam)
+		$(use_with skey)
+		$(use_with selinux)
+		$(use_with sendmail)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins doc/schema.OpenLDAP sudo.schema
+	fi
+
+	pamd_mimic system-auth sudo auth account session
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	fperms 0711 /var/db/sudo #652958
+
+	# Don't install into /var/run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED}"/var/run
+}
+
+pkg_postinst() {
+	#652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
new file mode 100644
index 000000000000..bfac67e52acd
--- /dev/null
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pam multilib libtool
+if [[ ${PV} == "9999" ]] ; then
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+	inherit mercurial
+fi
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+	*_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+if [[ ${PV} != "9999" ]] ; then
+	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+	fi
+fi
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap nls openssl offensive pam sasl selinux +sendmail skey"
+
+CDEPEND="
+	sys-libs/zlib
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	gcrypt? ( dev-libs/libgcrypt:= )
+	openssl? ( dev-libs/openssl:0= )
+	pam? ( virtual/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+"
+RDEPEND="
+	${CDEPEND}
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	selinux? ( sec-policy/selinux-sudo )
+	sendmail? ( virtual/mta )
+"
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	pam? ( !skey )
+	skey? ( !pam )
+	?? ( gcrypt openssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+set_secure_path() {
+	# FIXME: secure_path is a compile time setting. using PATH or
+	# ROOTPATH is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path ..."
+
+	# first extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
+		echo "${ROOTPATH}")
+		case "${SECURE_PATH}" in
+			*/usr/sbin*) ;;
+			*) SECURE_PATH=$(unset PATH;
+				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+				;;
+		esac
+	if [[ -z ${SECURE_PATH} ]] ; then
+		ewarn "	Failed to detect SECURE_PATH, please report this"
+	fi
+
+	# then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:$thisp
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+	# finally, strip gcc paths #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${SECURE_PATH} ; do
+			for e ; do [[ $thisp == $e ]] && continue 2 ; done
+			newpath+=:$thisp
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+	einfo "... done"
+}
+
+src_configure() {
+	local SECURE_PATH
+	set_secure_path
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	myeconfargs=(
+		--enable-zlib=system
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/var/run/sudo
+		--with-secure-path="${SECURE_PATH}"
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable openssl)
+		$(use_enable sasl)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with ldap)
+		$(use_with pam)
+		$(use_with skey)
+		$(use_with selinux)
+		$(use_with sendmail)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins doc/schema.OpenLDAP sudo.schema
+	fi
+
+	pamd_mimic system-auth sudo auth account session
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	fperms 0711 /var/db/sudo #652958
+
+	# Don't install into /var/run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED}"/var/run
+}
+
+pkg_postinst() {
+	#652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
diff --git a/app-admin/superadduser-1.0.9 b/app-admin/superadduser-1.0.9
deleted file mode 100644
index 6320c97ec29f..000000000000
--- a/app-admin/superadduser-1.0.9
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Interactive adduser script from Slackware
-EAPI=6
-HOMEPAGE=http://www.interlude.org.uk/unix/slackware/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=BSD
-RDEPEND=sys-apps/shadow
-SLOT=0
-_md5_=6e821bfc06b39f86bc32fd25c285e9a5
diff --git a/app-admin/superadduser/Manifest b/app-admin/superadduser/Manifest
new file mode 100644
index 000000000000..c6110b535035
--- /dev/null
+++ b/app-admin/superadduser/Manifest
@@ -0,0 +1,4 @@
+AUX 1.0.9/superadduser 13973 BLAKE2B 4458ad50a2699293ef2e5ff9cc63051d91d0892f39437f97dd6d7dd12c35e06ef2e2d327814c391790b471d596c64b4060def0abd5d05def2457fd21e736fa2a SHA512 3eac518597abf1ce6b5562137003c875df41f30df3394a2afdb3458833736c73ad47e94edcda06f71c207c203a43449b8f740e3345f853976e550657b372bdba
+AUX superadduser.8 517 BLAKE2B 25817073bfd4effb62fb18a8a7721cffe9dd376d88734a3dea337ba9c6cfc3ad4663c56e44bf44ce70ddf23113d3691e6ffdaf6bd5a6eb67add357fc47d46d06 SHA512 f07bc575a8ee89b2fcc27714eac4ad5c7129dedc2fa927d5490735109594f81dbe0fd7057f5c1317f3aa1905a1ac5a51e589d5eb9484b528b0174380e6c3297f
+EBUILD superadduser-1.0.9.ebuild 489 BLAKE2B 4bc24eb06cc39fe01ba410fb2f451fc46ca2fb1019761580741c71481a5992fba1960f2d6589447c3f29781e7c1c9d657cdc23fcc2325ae6c85fece8b842780c SHA512 04ba7cd16d4554611d333c25aa34d23cc11d37e8cd9e32656908d58d330be6b3effcc454f78e0d0542994704a7e6edacde0f503343ce45d5c3217a764128ace6
+MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-admin/superadduser/files/1.0.9/superadduser b/app-admin/superadduser/files/1.0.9/superadduser
new file mode 100644
index 000000000000..dd5e3158ddad
--- /dev/null
+++ b/app-admin/superadduser/files/1.0.9/superadduser
@@ -0,0 +1,407 @@
+#!/bin/bash
+#
+# Copyright 1995  Hrvoje Dogan, Croatia.
+# Copyright 2002, 2003, 2004  Stuart Winter, West Midlands, England, UK.
+# Copyright 2004  Slackware Linux, Inc., Concord, CA, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#
+##########################################################################
+# Program: /usr/sbin/adduser
+# Purpose: Interactive front end to /usr/sbin/useradd for Slackware Linux
+# Author : Stuart Winter <stuart@polplex.co.uk>
+#          Based on the original Slackware adduser by Hrvoje Dogan
+#          with modifications by Patrick Volkerding
+# Version: 1.09
+##########################################################################
+# Usage..: adduser [<new_user_name>]
+##########################################################################
+# History #
+###########
+# v1.09 - 07/06/04 
+#       * Added standard Slackware script licence to the head of this file.
+# v1.08 - 25/04/04
+#       * Disallow user names that begin with a numeric because useradd 
+#         (from shadow v4.03) does not allow them. <sw>
+# v1.07 - 07/03/03
+#       * When supplying a null string for the uid (meaning 'Choose next available'), 
+#         if there were file names in the range 'a-z' in the pwd then the 
+#         egrep command considered these files rather than the null string. 
+#         The egrep expression is now in quotes.  
+#         Reported & fixed by Vadim O. Ustiansky <sw>
+# v1.06 - 31/03/03
+#       * Ask to chown user.group the home directory if it already exists.
+#         This helps reduce later confusion when adding users whose home dir
+#         already exists (mounted partition for example) and is owned
+#         by a user other than the user to which the directory is being
+#         assigned as home.  Default is not to chown.
+#         Brought to my attention by mRgOBLIN. <sw>
+# v1.05 - 04/01/03
+#       * Advise & prevent users from creating logins with '.' characters
+#         in the user name. <sw>
+#       * Made pending account creation info look neater <sw>
+# v1.04 - 09/06/02
+#       * Catered for shadow-4.0.3's 'useradd' binary that no longer
+#         will let you create a user that has any uppercase chars in it
+#         This was reported on the userlocal.org forums
+#         by 'xcp' - thanks. <sw,pjv>
+# v1.03 - 20/05/02
+#       * Support 'broken' (null lines in) /etc/passwd and 
+#         /etc/group files <sw>       
+#       * For recycling UIDs (default still 'off'), we now look in 
+#         /etc/login.defs for the UID_MIN value and use it
+#         If not found then default to 1000 <sw>
+# v1.02 - 10/04/02
+#       * Fix user-specified UID bug. <pjv>
+# v1.01 - 23/03/02
+#       * Match Slackware indenting style, simplify. <pjv>
+# v1.00 - 22/03/02
+#       * Created
+#######################################################################
+
+# Path to files
+pfile=/etc/passwd
+gfile=/etc/group
+sfile=/etc/shells
+
+# Paths to binaries
+useradd=/usr/sbin/useradd
+chfn=/usr/bin/chfn
+passwd=/usr/bin/passwd
+chmod=/bin/chmod
+
+# Defaults
+defhome=/home
+defshell=/bin/bash
+defchmod=711 # home dir permissions - may be preferable to use 701, however.
+defgroup=users
+
+# Determine what the minimum UID is (for UID recycling)
+# (we ignore it if it's not at the beginning of the line (i.e. commented out with #))
+export recycleUIDMIN="$(grep ^UID_MIN /etc/login.defs | awk '{print $2}' 2>/dev/null)"
+# If we couldn't find it, set it to the default of 1000
+if [[ -z "$recycleUIDMIN" ]]; then
+   export recycleUIDMIN=1000  # this is the default from Slackware's /etc/login.defs
+fi
+
+
+# This setting enables the 'recycling' of older unused UIDs.
+# When you userdel a user, it removes it from passwd and shadow but it will
+# never get used again unless you specify it expliticly -- useradd (appears to) just
+# look at the last line in passwd and increment the uid.  I like the idea of 
+# recycling uids but you may have very good reasons not to (old forgotten
+# confidential files still on the system could then be owned by this new user).
+# We'll set this to no because this is what the original adduser shell script
+# did and it's what users expect.
+recycleuids=no
+
+# Function to read keyboard input.
+# bash1 is broken (even ash will take read -ep!), so we work around
+# it (even though bash1 is no longer supported on Slackware).
+function get_input() { 
+  local output
+  if [[ "`echo $BASH_VERSION | cut -b1`" = "1" ]]; then
+    echo -n "${1} " >&2 # fudge for use with bash v1
+    read output
+  else # this should work with any other /bin/sh
+    read -ep "${1} " output
+  fi
+  echo $output
+}
+
+# Function to display the account info
+function display () {
+  local goose
+  goose="$(echo $2 | cut -d ' ' -f 2-)"  # lop off the prefixed argument useradd needs
+  echo -n "$1 "
+  # If it's null then display the 'other' information
+  if [ -z "$goose" -a ! -z "$3" ]; then 
+    echo "$3" 
+  else 
+    echo "$goose" 
+  fi
+}
+
+# Function to check whether groups exist in the /etc/group file
+function check_group () {
+  local got_error group
+  if [[ ! -z "$@" ]]; then  
+  for group in $@ ; do
+    local uid_not_named="" uid_not_num=""
+    grep -v "$^" $gfile | awk -F: '{print $1}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_named=yes  
+    grep -v "$^" $gfile | awk -F: '{print $3}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_num=yes
+    if [ ! -z "$uid_not_named" -a ! -z "$uid_not_num" ]; then
+      echo "- Group '$group' does not exist"
+      got_error=yes
+    fi
+  done
+  fi
+  # Return exit code of 1 if at least one of the groups didn't exist
+  if [[ ! -z "$got_error" ]]; then
+    return 1
+  fi
+}   
+
+#: Read the login name for the new user :#
+#
+# Remember that most Mail Transfer Agents are case independant, so having
+# 'uSer' and 'user' may cause confusion/things to break.  Because of this,
+# useradd from shadow-4.0.3 no longer accepts usernames containing uppercase,
+# and we must reject them, too.
+
+# Set the login variable to the command line param
+echo
+LOGIN="$1"
+needinput=yes
+while [[ ! -z $needinput ]]; do
+  if [[ -z "$LOGIN" ]]; then
+    while [[ -z "$LOGIN" ]]; do LOGIN="$(get_input "Login name for new user []:")" ; done
+  fi
+  grep "^${LOGIN}:" $pfile >/dev/null 2>&1  # ensure it's not already used
+  if [[ $? -eq 0 ]]; then
+    echo "- User '$LOGIN' already exists; please choose another"
+    unset LOGIN
+  elif [[ ! -z "$( echo $LOGIN | grep "^[0-9]" )" ]]; then
+    echo "- User names cannot begin with a number; please choose another"
+    unset LOGIN
+  elif [[ ! "$LOGIN" = "`echo $LOGIN | tr A-Z a-z`" ]]; then # useradd does not allow uppercase
+    echo "- User '$LOGIN' contains illegal characters (uppercase); please choose another"
+    unset LOGIN
+  elif [[ ! -z "$( echo $LOGIN | grep '\.' )" ]]; then
+    echo "- User '$LOGIN' contains illegal characters (period/dot); please choose another"
+    unset LOGIN
+  else
+    unset needinput
+  fi
+done
+
+# Display the user name passed from the shell if it hasn't changed
+if [[ "$1" = "$LOGIN" ]]; then
+  echo "Login name for new user: $LOGIN"
+fi
+
+#: Get the UID for the user & ensure it's not already in use :#
+#
+# Whilst we _can_ allow users with identical UIDs, it's not a 'good thing' because
+# when you change password for the uid, it finds the first match in /etc/passwd 
+# which isn't necessarily the correct user
+#
+echo
+needinput=yes
+while [[ ! -z "$needinput" ]]; do
+  _UID="$(get_input "User ID ('UID') [ defaults to next available ]:")"
+  grep -v "^$" $pfile | awk -F: '{print $3}' | grep "^${_UID}$" >/dev/null 2>&1
+  if [[ $? -eq 0 ]]; then
+    echo "- That UID is already in use; please choose another"
+  elif [ ! -z "$(echo $_UID | egrep '[A-Za-z]')" ]; then
+    echo "- UIDs are numerics only"         
+  else
+    unset needinput
+  fi
+done
+# If we were given a UID, then syntax up the variable to pass to useradd
+if [[ ! -z "$_UID" ]]; then 
+  U_ID="-u ${_UID}"
+else
+  # Will we be recycling UIDs?
+  if [[ "$recycleuids" = "yes" ]]; then
+    U_ID="-u $(awk -F: '{uid[$3]=1} END { for (i=ENVIRON["recycleUIDMIN"];i in uid;i++);print i}' $pfile)"
+  fi   
+fi
+
+#: Get the initial group for the user & ensure it exists :#
+#
+# We check /etc/group for both the text version and the group ID number 
+echo
+needinput=yes
+while [[ ! -z "$needinput" ]]; do
+  GID="$(get_input "Initial group [ ${defgroup} ]:")"
+  check_group "$GID"
+  if [[ $? -gt 0 ]]; then
+    echo "- Please choose another"
+  else
+    unset needinput 
+  fi
+done
+# Syntax the variable ready for useradd
+if [[ -z "$GID" ]]; then
+  GID="-g ${defgroup}"
+else
+  GID="-g ${GID}"
+fi
+
+#: Get additional groups for the user :#
+#
+echo
+needinput=yes
+while [[ ! -z "$needinput" ]]; do
+  AGID="$(get_input "Additional groups (comma separated) []:")"
+  AGID="$(echo "$AGID" | tr -d ' ' | tr , ' ')" # fix up for parsing 
+  if [[ ! -z "$AGID" ]]; then
+    check_group "$AGID"  # check all groups at once (treated as N # of params)
+    if [[ $? -gt 0 ]]; then
+      echo "- Please re-enter the group(s)"
+    else
+      unset needinput # we found all groups specified
+      AGID="-G $(echo "$AGID" | tr ' ' ,)"
+    fi
+  else
+    unset needinput   # we don't *have* to have additional groups
+  fi
+done
+
+#: Get the new user's home dir :#
+#       
+echo
+needinput=yes
+while [[ ! -z "$needinput" ]]; do
+  HME="$(get_input "Home directory [ ${defhome}/${LOGIN} ]")"
+  if [[ -z "$HME" ]]; then
+    HME="${defhome}/${LOGIN}"
+  fi 
+  # Warn the user if the home dir already exists
+  if [[ -d "$HME" ]]; then
+    echo "- Warning: '$HME' already exists !"
+    getyn="$(get_input "  Do you wish to change the home directory path ? (Y/n) ")"
+    if [[ "$(echo $getyn | grep -i "n")" ]]; then
+      unset needinput
+      # You're most likely going to only do this if you have the dir *mounted* for this user's $HOME
+      getyn="$(get_input "  Do you want to chown $LOGIN.$( echo $GID | awk '{print $2}') $HME ? (y/N) ")"
+      if [[ "$(echo $getyn | grep -i "y")" ]]; then
+         CHOWNHOMEDIR=$HME # set this to the home directory
+      fi
+    fi
+  else
+    unset needinput
+  fi
+done           
+HME="-d ${HME}"
+
+#: Get the new user's shell :#
+echo
+needinput=yes
+while [[ ! -z "$needinput" ]]; do
+  unset got_error
+  SHL="$(get_input "Shell [ ${defshell} ]")"
+  if [[ -z "$SHL" ]]; then
+    SHL="${defshell}"
+  fi 
+  # Warn the user if the shell doesn't exist in /etc/shells or as a file
+  if [[ -z "$(grep "^${SHL}$" $sfile)" ]]; then
+    echo "- Warning: ${SHL} is not in ${sfile} (potential problem using FTP)"
+    got_error=yes
+  fi
+  if [[ ! -f "$SHL" ]]; then
+    echo "- Warning: ${SHL} does not exist as a file"
+    got_error=yes
+  fi
+  if [[ ! -z "$got_error" ]]; then
+    getyn="$(get_input "  Do you wish to change the shell ? (Y/n) ")"
+    if [[ "$(echo $getyn | grep -i "n")" ]]; then
+      unset needinput
+    fi
+  else
+    unset needinput
+  fi
+done           
+SHL="-s ${SHL}"
+
+#: Get the expiry date :#
+echo
+needinput=yes
+while [[ ! -z "$needinput" ]]; do
+  EXP="$(get_input "Expiry date (YYYY-MM-DD) []:")"
+  if [[ ! -z "$EXP" ]]; then
+    # Check to see whether the expiry date is in the valid format
+    if [ -z "$(echo "$EXP" | grep "^[[:digit:]]\{4\}[-]\?[[:digit:]]\{2\}[-]\?[[:digit:]]\{2\}$")" ]; then
+      echo "- That is not a valid expiration date"
+    else
+      unset needinput 
+      EXP="-e ${EXP}" 
+    fi
+  else
+    unset needinput
+  fi
+done
+
+# Display the info about the new impending account
+echo
+echo "New account will be created as follows:"
+echo
+echo "---------------------------------------"
+display "Login name.......: " "$LOGIN"
+display "UID..............: " "$_UID" "[ Next available ]"
+display "Initial group....: " "$GID"
+display "Additional groups: " "$AGID" "[ None ]"
+display "Home directory...: " "$HME"
+display "Shell............: " "$SHL"
+display "Expiry date......: " "$EXP" "[ Never ]"
+echo
+
+echo "This is it... if you want to bail out, hit Control-C.  Otherwise, press"
+echo "ENTER to go ahead and make the account."
+read junk
+
+echo
+echo "Creating new account..."
+echo
+echo
+
+# Add the account to the system
+CMD="$useradd "$HME" -m "$EXP" "$U_ID" "$GID" "$AGID" "$SHL" "$LOGIN""
+$CMD
+
+if [[ $? -gt 0 ]]; then
+  echo "- Error running useradd command -- account not created!"
+  echo "(cmd: $CMD)"
+  exit 1
+fi
+
+# chown the home dir ?  We can only do this once the useradd has
+# completed otherwise the user name doesn't exist.
+if [[ ! -z "${CHOWNHOMEDIR}" ]]; then
+  chown "$LOGIN"."$( echo $GID | awk '{print $2}')" "${CHOWNHOMEDIR}"
+fi
+
+# Set the finger information
+$chfn "$LOGIN"
+if [[ $? -gt 0 ]]; then
+  echo "- Warning: an error occurred while setting finger information"
+fi
+
+# Set a password
+$passwd "$LOGIN"
+if [[ $? -gt 0 ]]; then
+  echo "* WARNING: An error occured while setting the password for"
+  echo "           this account.  Please manually investigate this *"
+  exit 1
+fi
+
+# If it was created (it should have been!), set the permissions for that user's dir 
+HME="$(echo "$HME" | awk '{print $2}')"  # We have to remove the -g prefix
+if [[ -d "$HME" ]]; then
+  $chmod $defchmod "$HME"
+fi
+
+echo
+echo
+echo "Account setup complete."
+exit 0
+
diff --git a/app-admin/superadduser/files/superadduser.8 b/app-admin/superadduser/files/superadduser.8
new file mode 100644
index 000000000000..efefadcd14d6
--- /dev/null
+++ b/app-admin/superadduser/files/superadduser.8
@@ -0,0 +1,20 @@
+.TH superadduser "8" "April 2002" "superadduser 1.0" 
+.SH NAME
+superadduser \- manual page for the superadduser program, an interactive 
+version of adduser.
+.SH SYNOPSIS
+.B superadduser
+.SH DESCRIPTION
+Superadduser interactively asks the user to fill in the necessary parameters to
+the 
+.I shadow
+package's useradd program.
+.PP
+.SH AUTHOR
+Man page by Karl Trygve Kalleberg <karltk@gentoo.org>
+.br
+Script by Stuart Winter <stuart@polplex.co.uk>
+.SH "SEE ALSO"
+useradd(8) 
+.TP
+The \fI/usr/sbin/superadduser\fR script. 
diff --git a/app-admin/superadduser/metadata.xml b/app-admin/superadduser/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/app-admin/superadduser/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/superadduser/superadduser-1.0.9.ebuild b/app-admin/superadduser/superadduser-1.0.9.ebuild
new file mode 100644
index 000000000000..ec577756b792
--- /dev/null
+++ b/app-admin/superadduser/superadduser-1.0.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Interactive adduser script from Slackware"
+HOMEPAGE="http://www.interlude.org.uk/unix/slackware/"
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+RDEPEND="sys-apps/shadow"
+
+S=${WORKDIR}
+
+src_install() {
+	dosbin "${FILESDIR}"/${PV}/superadduser
+	doman "${FILESDIR}"/superadduser.8
+}
diff --git a/app-admin/supernova-2.2.0 b/app-admin/supernova-2.2.0
deleted file mode 100644
index ca9c6dc0617b..000000000000
--- a/app-admin/supernova-2.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( >=dev-python/mkdocs-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=novaclient wrapper for multiple nova environments
-EAPI=5
-HOMEPAGE=https://github.com/rackerhacker/supernova
-IUSE=doc examples test python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/click[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keyring-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-novaclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rackspace-novaclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/s/supernova/supernova-2.2.0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=33c596e0007960eb274f14156296256b
diff --git a/app-admin/supernova/Manifest b/app-admin/supernova/Manifest
new file mode 100644
index 000000000000..9bebbb0df614
--- /dev/null
+++ b/app-admin/supernova/Manifest
@@ -0,0 +1,3 @@
+DIST supernova-2.2.0.tar.gz 24068 BLAKE2B 129c077baf9b415851f3c17eb5a9870ff2d8109a54c424d9039204620b6dd68d8f17183b5c52d863882bd2586ed03b7d1c397f70f337bfba9e9c8255b6feb578 SHA512 436ec13dfaf5ff7cadacc1dedc3545a579784cfce3b0c7925cc0d877ba76a4c865ad3687ae8ae22fdb11d880282dd555f9a9d709c005ad024299a34607fd8063
+EBUILD supernova-2.2.0.ebuild 1246 BLAKE2B 0b6da2ad5949e34a4671c2d31249005f37502b9ea8fc6fd03324064b4005b397ef1a8c8b94957d6874e79406c932c813bd16c98046b36da2774a7a29a11d73d9 SHA512 a0a7cf3bc5f829c04d4f06762a87239bf153e2f76d395f8b353cd30f661b8070208c8e5213d53d69af3da8fb7709a8abfa3bd2ba428625244c500b9b4892240d
+MISC metadata.xml 513 BLAKE2B 902b49ed2456d8b8742d17a03370e66a3299b540cf5d6c84b39333d3de8fd849fbae680378b79397bb00faeed0e1e54c9fc160fd710f11888ca442f0dff6a074 SHA512 8253bfed9a47098f43a96906fbd72144005ca7bae46aa3f4e2f3bdc00b95a7dfc5d8b7106a1127cb3a6b3d3ab34748f6560bb38917047074674ed4955f389834
diff --git a/app-admin/supernova/metadata.xml b/app-admin/supernova/metadata.xml
new file mode 100644
index 000000000000..a227b41365cc
--- /dev/null
+++ b/app-admin/supernova/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rackerhacker/supernova</remote-id>
+    <remote-id type="pypi">supernova</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/supernova/supernova-2.2.0.ebuild b/app-admin/supernova/supernova-2.2.0.ebuild
new file mode 100644
index 000000000000..148043720999
--- /dev/null
+++ b/app-admin/supernova/supernova-2.2.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="novaclient wrapper for multiple nova environments"
+HOMEPAGE="https://github.com/rackerhacker/supernova"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	${CDEPEND}
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/keyring-0.9.2[${PYTHON_USEDEP}]
+	dev-python/python-novaclient[${PYTHON_USEDEP}]
+	dev-python/rackspace-novaclient[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	if use doc; then
+		mkdocs build || die "docs failed to build"
+	fi
+}
+
+python_test() {
+	py.test || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( site/. )
+	use examples && local EXAMPLES=( example_configs/. )
+
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/${PN}-completion.bash ${PN}
+}
diff --git a/app-admin/supervisor-3.1.4 b/app-admin/supervisor-3.1.4
deleted file mode 100644
index caf87ca9e8f3..000000000000
--- a/app-admin/supervisor-3.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/meld3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A system for controlling process state under UNIX
-EAPI=5
-HOMEPAGE=http://supervisord.org/ https://pypi.org/project/supervisor/
-IUSE=doc test python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=repoze ZPL BSD HPND GPL-2
-RDEPEND=dev-python/meld3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/s/supervisor/supervisor-3.1.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5eea46651bf2bb0755e94b1ffa74456c
diff --git a/app-admin/supervisor-3.3.3 b/app-admin/supervisor-3.3.3
deleted file mode 100644
index 940b1045716f..000000000000
--- a/app-admin/supervisor-3.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/meld3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A system for controlling process state under UNIX
-EAPI=6
-HOMEPAGE=http://supervisord.org/ https://pypi.org/project/supervisor/
-IUSE=doc test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=repoze ZPL BSD HPND GPL-2
-RDEPEND=dev-python/meld3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/s/supervisor/supervisor-3.3.3.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2ac4945cac374960fb4bdafabad8a40a
diff --git a/app-admin/supervisor-3.3.4 b/app-admin/supervisor-3.3.4
deleted file mode 100644
index c5918877eb56..000000000000
--- a/app-admin/supervisor-3.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/meld3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig
-DESCRIPTION=A system for controlling process state under UNIX
-EAPI=6
-HOMEPAGE=http://supervisord.org/ https://pypi.org/project/supervisor/
-IUSE=doc test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=repoze ZPL BSD HPND GPL-2
-RDEPEND=dev-python/meld3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/s/supervisor/supervisor-3.3.4.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f44653197cc52ed3a2bd1bb1e027268f
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
new file mode 100644
index 000000000000..e0c6fb3619ae
--- /dev/null
+++ b/app-admin/supervisor/Manifest
@@ -0,0 +1,14 @@
+AUX conf.d 85 BLAKE2B 09d98219fcb93738cfb22e25b914011235684b0e5f1154512a14ca7c2c70ffd515d800be9b7820be75e574b0d9d4c5ad7ec95bff981595650fb5414062de4756 SHA512 73a831b1d5b30686fa8120cbb3317ca2291da72f8217e1402791eee1dee7d232b26b9146e8eee5ce75c69a4c1c7993bb29eeb5de758cf731f1c093ecb340fcc2
+AUX conf.d-r1 182 BLAKE2B eae951b6dc0252ee7b13988d65addb667d24dc452a2c50644a7857362a2ba42c85c2fc9d35cb44dc6d8f3d4f2fdcd75e4621f7b58d42e887e7175d15f7c5828f SHA512 30334b022c6473cb5594be8a241571d080b60b1c4fee5d2fe2d04533b75543ebe2e43a5be1e282a1960eb6edc106585edbcdf43c18ba6e476b8374876cfec2cb
+AUX init.d 630 BLAKE2B 541cb9bb68547f093a68586504129823c7c1b519960f50284f45c395bc6bd964c1caa37daecfb58f8f8aeffea598eefecf517c71e929771a0b58f9a38e7f9493 SHA512 95f7320dc8c4de958f9b61c0d39f9fe27ee8916a23dfc2ea9af0ad46b76302e93232dc4c418739769a5c34b204e8c6cd3bad8a4dd85fc2fd854e62e99b571fc2
+AUX init.d-r1 452 BLAKE2B 5d1b15d6d4a39ebb586ffdccd138bd1f2f3681798c3ff3e1465654967a87e96a922cfc6b1aca193173ce6f06714b4f4f8216c81acf02dc77cb65476101a216c9 SHA512 8490213db35c47d31ae901401673ad7ffb6a15e32abc54ac8d3ac50fe59261a0767dbd706015edfef4dfd83c9ecd2c7c9201c9cb4a04d0b2f5634280c5883959
+AUX init.d-r2 553 BLAKE2B 270ff81ca5bac99f22b49bf47ec64d73b4328804ea264e99301de3d563d2479a3640a0f5e35b2553d679e97a85480d273db170b741638b0a90929fccb490deb2 SHA512 d8d7d6165445fb4bef75454dd2b03c866fb4942c19d6ae4a8b36a900bdd9ee3a55cade02304d49d6e0095df885a1a4fa52694012a7d85d67cc1b181aaf69d8cc
+AUX supervisord.conf 2525 BLAKE2B d36d6ef6b952a99ccfd61976c21eb54922555db4802288d9364f02331da5e693bce3862869248f7c0b81285576ca633e679a26acf75f03b2e620e16eea963909 SHA512 1ce55ef1f9a4cd7592645007af5e0f18147e8dca1c324ac2e48bf58aa2191ec657cfa68d7e6bdc9ba8e0747b32f4e6a44009e8c55a7bd77b265ac8593f51eeb7
+AUX supervisord.service 404 BLAKE2B 87c99a2b388befb04f1d8e3442a5c0b6d802837047c45da2bb7017631bf4af4b858bc4d7964f1d64937e331728884bc21e62e9d01b11cca46aaea389372c6bad SHA512 0fe777d1f0bf70dc9b49132102ac90083261321850f80e9e323459c894c55f722ab8470eba3ba7bb35a9d69ad411a3247546066d6cba5801c9b289350ea4bed5
+DIST supervisor-3.1.4.tar.gz 392321 BLAKE2B 316789fae200f02242a90d3a22a3c6486576f74dbab81b95efc72768a89c54999a370625f9589afe1edff08351840fbe27a7ef8674e6f1e3bbdd4237f3227df6 SHA512 7182db4169d37aa8f7a2a4e1d57ce40f6dea21759ed73fb49286dd5ffb2bdede0fccdc71344e93c8f8c067a2cbc4e3cb0a9a50b22bacdb1b8bc1378581ed5f07
+DIST supervisor-3.3.3.tar.gz 418354 BLAKE2B 50ce29cdad6c4d8c1a041de74d970ef57031c8b3b77180f8b837e402773ac912d384397e650b94eaeaf1db2d9a6bbb21f19247454262e96ea0f1b733226701a2 SHA512 8285445da8a0ed790fbdf75d988304ab8fcefd9c36975ae6526ec58f511c73cd8707f22b7cff40c3aed5e63f3665d096ed4b5dbc2cc456fe0c5b4547149dbb4a
+DIST supervisor-3.3.4.tar.gz 419794 BLAKE2B b916c22f3ec1cc180d495f08dac1a66cfd5a93c060906c015a85b2bf64733b4ed298b67050db1332639902a1c6601118a5c05e01c54ed4fc32910d1c24431131 SHA512 fab141b52a548a3efd26f175798b1b8fbb46ce465aa48c3281cb80584b829ecef90ae1355e4106632d13c84363ae03f081d69fb4148303ff387ab7d4e778d21a
+EBUILD supervisor-3.1.4.ebuild 1190 BLAKE2B 914c69c7e7d8146273fa3b2dc9445a5fee5f7d52692884a208d1b4cd3b3ac11d902823ebf1f33e2d82aaa0bdf316de85b12d04917cd115d800516733b20fc445 SHA512 be9e9ece37f97cc515679f06ca358e3af4b06039ee9009be02e28c6acecbd157fde107622201e6cea2a5c00221a6ffb078a98611662ab002edc08e3ade26c983
+EBUILD supervisor-3.3.3.ebuild 1075 BLAKE2B 53cf037167e7706893bf8dc22eab6f32d70573576745b71da1913958d169ddb936f4ef46abf0095c327c9174254124414d200449792e6aa208881d9d16ee8960 SHA512 920938eebe8368c84a564cb556c137caddd0342f2eb2c293e7a1d64e8283add801530c605d61391b11af9ada569a7a5a55170285837fee70d1497487e09b41f4
+EBUILD supervisor-3.3.4.ebuild 1962 BLAKE2B b9d1166a42facd65d57fe1eb72e261d394d51de3a1df394a877197165357959282f4094ea21255729f15d8438aeca4123e126e76ca0aa3bd75c0ab7e1068165f SHA512 1a808d9979563f2ea818ab577c43a7ed39489cc33403d6ad2650299b78224269c03245e7ebf05d9b0cd54b32efa56edc39a4af017b2798a4cae362abb796023f
+MISC metadata.xml 623 BLAKE2B dc7acae3a83fce87bdaf98f65ba4ac2434e0344faeb8ad302dcba5be3a59f2b6ffa9d85338ad432100d5e1017e40bbeb606724a214097e14bcc7082eb331986a SHA512 f05e62f68c51fe2bab054d03b3a902682eaaa133de08ac558a92736868dcc8049d1f27828e3ecae8f5f64b038bb8a322e58c90401e6fe01d215941e1507076e8
diff --git a/app-admin/supervisor/files/conf.d b/app-admin/supervisor/files/conf.d
new file mode 100644
index 000000000000..922f4ce4132f
--- /dev/null
+++ b/app-admin/supervisor/files/conf.d
@@ -0,0 +1,4 @@
+# /etc/conf.d/supervisord
+
+# Options to pass to the supervisord process
+SUPD_OPTS=""
diff --git a/app-admin/supervisor/files/conf.d-r1 b/app-admin/supervisor/files/conf.d-r1
new file mode 100644
index 000000000000..7a80c826ef51
--- /dev/null
+++ b/app-admin/supervisor/files/conf.d-r1
@@ -0,0 +1,7 @@
+# /etc/conf.d/supervisord
+
+# Configuration file (default: /etc/supervisord.conf)
+#SUPD_CONFIG_FILE="/etc/supervisord.conf"
+
+# Options to pass to the supervisord process
+SUPD_OPTS=""
diff --git a/app-admin/supervisor/files/init.d b/app-admin/supervisor/files/init.d
new file mode 100644
index 000000000000..bf8d00c9517d
--- /dev/null
+++ b/app-admin/supervisor/files/init.d
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+checkconfig() {
+	if [ ! -f /etc/supervisord.conf ] ; then
+		eerror "Please create /etc/supervisord.conf:"
+		eerror "echo_supervisord_conf >> /etc/supervisord.conf"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	ebegin "Starting supervisord"
+	start-stop-daemon --start \
+		--exec /usr/bin/supervisord -b --pidfile /var/run/supervisord.pid \
+		-- -n ${SUPD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping supervisord"
+	start-stop-daemon --stop --pidfile /var/run/supervisord.pid
+	eend $?
+}
diff --git a/app-admin/supervisor/files/init.d-r1 b/app-admin/supervisor/files/init.d-r1
new file mode 100644
index 000000000000..f22f49d54947
--- /dev/null
+++ b/app-admin/supervisor/files/init.d-r1
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="client/server system that allows its users to monitor and control a number of processes on UNIX-like operating systems"
+
+command="/usr/bin/supervisord"
+pidfile="/var/run/supervisord.pid"
+command_args="--nodaemon --pidfile ${pidfile} ${SUPD_OPTS}"
+command_background="yes"
+
+required_files="/etc/supervisord.conf"
diff --git a/app-admin/supervisor/files/init.d-r2 b/app-admin/supervisor/files/init.d-r2
new file mode 100644
index 000000000000..c5723b36f013
--- /dev/null
+++ b/app-admin/supervisor/files/init.d-r2
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="client/server system that allows its users to monitor and control a number of processes on UNIX-like operating systems"
+
+SUPD_CONFIG_FILE="${SUPD_CONFIG_FILE:-/etc/supervisord.conf}"
+
+command="/usr/bin/supervisord"
+pidfile="/run/supervisord.pid"
+command_args="--nodaemon --pidfile ${pidfile} --configuration \
+  \"${SUPD_CONFIG_FILE}\" ${SUPD_OPTS}"
+command_background="yes"
+
+required_files="${SUPD_CONFIG_FILE}"
diff --git a/app-admin/supervisor/files/supervisord.conf b/app-admin/supervisor/files/supervisord.conf
new file mode 100644
index 000000000000..91d6be018123
--- /dev/null
+++ b/app-admin/supervisor/files/supervisord.conf
@@ -0,0 +1,69 @@
+; Supervisor configuration file based on supervisor/skel/sample.conf
+; vim: set ft=dosini:
+
+; The below section contains configuration parameters for an HTTP server
+; that listens on a UNIX domain socket. If the configuration file has no
+; [unix_http_server] section, a UNIX domain socket HTTP server will not
+; be started.
+[unix_http_server]
+; the path to the socket file (with which supervisorctl can communicate)
+file=/run/supervisord.sock
+; socket file mode (default 0700)
+chmod=0770
+; socket file uid:gid owner
+chown=root:supervisor
+; default is no username (open server)
+;username=user
+; default is no password (open server)
+;password=123
+
+; The below section contains global settings
+; related to the supervisord process.
+[supervisord]
+; main log file; default $CWD/supervisord.log
+logfile=/var/log/supervisor/supervisord.log
+; 'AUTO' child log dir, default $TEMP
+childlogdir=/var/log/supervisor
+; max main logfile bytes before rotation; default 50MB
+logfile_maxbytes=50MB
+; number of main logfile backups; 0 means none, default 10
+logfile_backups=10
+; log level; default info; others: debug, warn, trace
+loglevel=info
+; minimum available startup file descriptors; default 1024
+minfds=1024
+; minimum available process descriptors; default 200
+minprocs=200
+; default is current user, must be explicitely set if running as root
+user=root
+; process file creation umask; default 022
+;umask=022
+; supervisord identifier, default is 'supervisor'
+;identifier=supervisor
+; default is not to cd during start
+;directory=/tmp
+; don't clean up tempfiles at start; default false
+;nocleanup=true
+; key value pairs to add to environment
+;environment=KEY="value"
+; strip ANSI escape codes in logs; default false
+;strip_ansi=false
+
+; The below section must remain in the config file for RPC
+; (supervisorctl/web interface) to work, additional interfaces may be
+; added by defining them in separate rpcinterface: sections
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+; The below section contains settings for
+; the supervisorctl interactive shell program.
+[supervisorctl]
+serverurl=unix:///run/supervisord.sock ; use a unix:// URL for a unix socket
+
+; The below section can just contain the "files" setting. This
+; setting can list multiple files (separated by whitespace or
+; newlines). It can also contain wildcards. The filenames are
+; interpreted as relative to this file. Included files *cannot*
+; include files themselves.
+[include]
+files = /etc/supervisord.d/*.conf
diff --git a/app-admin/supervisor/files/supervisord.service b/app-admin/supervisor/files/supervisord.service
new file mode 100644
index 000000000000..4ccd1ca5fcc0
--- /dev/null
+++ b/app-admin/supervisor/files/supervisord.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Supervisor process control system for UNIX
+Documentation=http://supervisord.org
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/supervisord -n -c /etc/supervisord.conf
+ExecStop=/usr/bin/supervisorctl $OPTIONS shutdown
+ExecReload=/usr/bin/supervisorctl -c /etc/supervisord.conf $OPTIONS reload
+KillMode=process
+Restart=on-failure
+RestartSec=50s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/supervisor/metadata.xml b/app-admin/supervisor/metadata.xml
new file mode 100644
index 000000000000..e24194729211
--- /dev/null
+++ b/app-admin/supervisor/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sbraz@gentoo.org</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">supervisor</remote-id>
+		<remote-id type="github">Supervisor/supervisor</remote-id>
+		<bugs-to>https://github.com/Supervisor/supervisor/issues</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+		Supervisor is a client/server system that allows its users to control a number of processes on UNIX-like operating systems.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/supervisor/supervisor-3.1.4.ebuild b/app-admin/supervisor/supervisor-3.1.4.ebuild
new file mode 100644
index 000000000000..f7356ad7d5c8
--- /dev/null
+++ b/app-admin/supervisor/supervisor-3.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )	# py2 only
+# xml.etree.ElementTree module required.
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="A system for controlling process state under UNIX"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="repoze ZPL BSD HPND GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+# ALL versions of meld3 match to >=meld3-0.6.5
+RDEPEND="dev-python/meld3[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+python_compile_all() {
+	# Somehow the test phase is called and run on invoking a doc build; harmless
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	newinitd "${FILESDIR}/init.d-r1" supervisord
+	newconfd "${FILESDIR}/conf.d" supervisord
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-admin/supervisor/supervisor-3.3.3.ebuild b/app-admin/supervisor/supervisor-3.3.3.ebuild
new file mode 100644
index 000000000000..7dba0e2b7cd7
--- /dev/null
+++ b/app-admin/supervisor/supervisor-3.3.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )	# py2 only
+# xml.etree.ElementTree module required.
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="A system for controlling process state under UNIX"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="repoze ZPL BSD HPND GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/meld3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	newinitd "${FILESDIR}/init.d-r1" supervisord
+	newconfd "${FILESDIR}/conf.d" supervisord
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-admin/supervisor/supervisor-3.3.4.ebuild b/app-admin/supervisor/supervisor-3.3.4.ebuild
new file mode 100644
index 000000000000..1b78252cdb4d
--- /dev/null
+++ b/app-admin/supervisor/supervisor-3.3.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )	# py2 only
+# xml.etree.ElementTree module required.
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1 systemd user
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="A system for controlling process state under UNIX"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="repoze ZPL BSD HPND GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/meld3[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+python_prepare_all() {
+	# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
+	sed -i '/namespace_packages=/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/.build/html/. )
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newinitd "${FILESDIR}/init.d-r2" supervisord
+	newconfd "${FILESDIR}/conf.d-r1" supervisord
+	dodoc supervisor/skel/sample.conf
+	keepdir /etc/supervisord.d
+	insinto /etc
+	doins "${FILESDIR}/supervisord.conf"
+	keepdir /var/log/supervisor
+	systemd_dounit "${FILESDIR}/supervisord.service"
+}
+
+pkg_preinst() {
+	enewgroup supervisor
+	fowners :supervisor /var/log/supervisor
+	fperms 750 /var/log/supervisor
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "You may install your configuration files in ${EROOT%/}/etc/supervisord.d"
+		elog "For config examples, see ${EROOT%/}/usr/share/doc/${PF}/sample.conf.bz2"
+		elog ""
+		elog "By default, only members of the supervisor group can run supervisorctl."
+	fi
+}
diff --git a/app-admin/swatchdog-3.2.4-r1 b/app-admin/swatchdog-3.2.4-r1
deleted file mode 100644
index 8dd2d8f44b91..000000000000
--- a/app-admin/swatchdog-3.2.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Simple log watcher
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/swatch/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Date-Manip dev-perl/Date-Calc dev-perl/File-Tail dev-perl/TimeDate >=virtual/perl-Time-HiRes-1.12 !app-admin/swatch dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://sourceforge/swatch/swatchdog-3.2.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	4b65c2afee485a204b0b22518141ae47	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5342b82b6fd108fc352d4bff44b2b3a4
diff --git a/app-admin/swatchdog/Manifest b/app-admin/swatchdog/Manifest
new file mode 100644
index 000000000000..caf960cc6d90
--- /dev/null
+++ b/app-admin/swatchdog/Manifest
@@ -0,0 +1,6 @@
+AUX swatchdog-confd 678 BLAKE2B 4ad9fb2627f69f2edf5d4ac48653fa89e9bcb1e2e00c003185f73c3674d9836fce11f4ebc2e82c6587ef7d68289cd2e9a1ba2e0634d8672d0c54778507055e78 SHA512 ca294509dd2d2f6622ec16760e32c44972c9ac99761bb743607dd5f7dab44a10f17183e736589111c3124e68f783f9ef9c0c28c5acbf1e39f3fae7cb9c4db238
+AUX swatchdog-init 1502 BLAKE2B 547590375d8f35b9a96cc149eaf6a66a6b705577a5ed7ced91d21ea7e457deb5ffa13fa3c87487f6d573a5368c8cabd58da372bd6c95737abab73d45dbc94e92 SHA512 30d5451cd871c15d2e50a3d5f32f4ea986971e2aa9a0b06ce5e383643aacd72a29c1574ec03bc3c0c994ebb13287f5870e8987971bcb73821f3ee744c7c574a3
+AUX swatchdogrc 299 BLAKE2B 05a0b3c13e6e184d7da0d302f62a0a6c3bcf25a90a30a3c207bcb19d6aa07f7068db7a56ffc5518625d0e40cd2b269e5c2fca7e2a5808cb81ba564087e0ad469 SHA512 64dfe179ccab5674742b8198f15b5439c324c7e9648fa0064a36010f7160303abd09c5af4efdb422628827ff8f327a8db312c4fdfbf02aab29c772d82f1d5b44
+DIST swatchdog-3.2.4.tar.gz 30122 BLAKE2B 103491a231306cedad030fca8cc309ce89e8cbc8a3fcee63cd482efb733b91db8b29193bb1e9b9c5213261b150e3dc6be2b506dee83b2297d5af2f1451f596c8 SHA512 4e0a4e3feed00df0f0d04f94cc090e53e71fa9b20d46236ec41d63b98b5733d80a5941b491cffcbb0b655a9c7d2b5c9423ca7ae043346dbe1b05ee6ab24b9489
+EBUILD swatchdog-3.2.4-r1.ebuild 767 BLAKE2B 5763f3766e8840120532c40db221a371fbea422cb41c400f492b85f0d83ba569d53ce299c08096e2cad312e71716285c46ed125410f800466feac588cfd395f6 SHA512 6002de4c68848260f282666cf0cf51f9f97acc7466bd71301b80a3d1392ffb2f6c1e94a41bd6c0db3f98f05eb35bd152fc3fe691b09846b41308ed32b0f3e8f8
+MISC metadata.xml 1137 BLAKE2B 83db6178d7c8813c8ab5b3f97aee38492de3d1fa31e9778d108a311923014d4e1a30a9a19b6628d9540a47eb0ea5f77cb2d751490c44f990efc09a6d958ffe43 SHA512 3a4efd76ee1a609c59a84ec43482982c27d9cf0ba4e4f42cb162c8dc39acbe89ffb146735d04aa111c404e546311df40cd9da782d76c766ac37e14aedb5f4884
diff --git a/app-admin/swatchdog/files/swatchdog-confd b/app-admin/swatchdog/files/swatchdog-confd
new file mode 100644
index 000000000000..13f8a0aed79e
--- /dev/null
+++ b/app-admin/swatchdog/files/swatchdog-confd
@@ -0,0 +1,25 @@
+# /etc/conf.d/swatchdog: config file for /etc/init.d/swatchdog
+
+# Path to the swatchdog program.
+#SWATCHDOG_BINARY="/usr/bin/swatchdog"
+
+# Swatchrc to read patterns and actions from.
+#SWATCHDOGRC="/etc/swatchdogrc"
+
+# File to monitor
+#SWATCHDOG_TAILFILE="/var/log/syslog"
+
+# Arguments to tail program
+#SWATCHDOG_TAILARGS=""
+
+# Swatch log file
+#SWATCHDOG_LOGFILE="/var/log/swatchdog.log"
+
+# Swatch error file
+#SWATCHDOG_ERRFILE="/var/log/swatchdog-err.log"
+
+# Where to output the generated script to. Should not be writable by others.
+#SWATCHDOG_SCRIPT="/run/swatchdog/swatchdog_script.pl"
+
+# Whether to parse the complete file once at startup. Defaults to "NO".
+PARSE_FULL="NO"
diff --git a/app-admin/swatchdog/files/swatchdog-init b/app-admin/swatchdog/files/swatchdog-init
new file mode 100644
index 000000000000..d623070073f7
--- /dev/null
+++ b/app-admin/swatchdog/files/swatchdog-init
@@ -0,0 +1,53 @@
+#!/sbin/openrc-run
+# This script is based on the one created by Phil (bug #255329).
+
+depend() {
+	need logger
+}
+
+SWATCHDOG_BINARY=${SWATCHDOG_BINARY:-/usr/bin/swatchdog}
+SWATCHDOGRC=${SWATCHDOGRC:-/etc/swatchdogrc}
+SWATCHDOG_TAILFILE=${SWATCHDOG_TAILFILE:-/var/log/syslog}
+SWATCHDOG_LOGFILE=${SWATCHDOG_LOGFILE:-/var/log/swatchdog.log}
+SWATCHDOG_ERRFILE=${SWATCHDOG_ERRFILE:-/var/log/swatchdog-err.log}
+SWATCHDOG_SCRIPT=${SWATCHDOG_SCRIPT:-/run/swatchdog/swatchdog_script.pl}
+
+gen_script() {
+	local tailargs=""
+	if [ "${SWATCHDOG_TAILARGS}" ]; then
+		tailargs="--tail-args=\"${SWATCHDOG_TAILARGS}\""
+	fi
+	ebegin "Generating swatchdog script from config"
+	${SWATCHDOG_BINARY} --dump-script="${SWATCHDOG_SCRIPT}" \
+		--use-cpan-file-tail ${tailargs} \
+		--config-file "${SWATCHDOGRC}" $1 "${SWATCHDOG_TAILFILE}"
+	eend $?
+}
+
+parse_full() {
+	gen_script --examine
+	ebegin "Parsing complete file once"
+	/usr/bin/perl ${SWATCHDOG_SCRIPT} 1>/dev/null
+	eend $?
+}
+
+start() {
+	checkpath -d -q -m 0750 -o root:root /run/swatchdog
+	if [ "${PARSE_FULL}" = "YES" ]; then
+		parse_full
+	fi
+	gen_script --tail-file
+	ebegin "Starting swatchdog"
+	start-stop-daemon --start --quiet --background \
+		--make-pidfile --pidfile /run/swatchdog/swatchdog.pid \
+		--stdout ${SWATCHDOG_LOGFILE} --stderr ${SWATCHDOG_ERRFILE} \
+		--exec /usr/bin/perl -- ${SWATCHDOG_SCRIPT}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping swatchdog"
+	start-stop-daemon --stop --exec /usr/bin/perl \
+		--pidfile /run/swatchdog/swatchdog.pid --quiet
+	eend $?
+}
diff --git a/app-admin/swatchdog/files/swatchdogrc b/app-admin/swatchdog/files/swatchdogrc
new file mode 100644
index 000000000000..5132f855852b
--- /dev/null
+++ b/app-admin/swatchdog/files/swatchdogrc
@@ -0,0 +1,10 @@
+#
+# A sample configuration file for swatchdog.
+#
+# See "man swatchdog" for details.
+
+# Mails root when invalid remote login attempted.
+watchfor /(.*) (.*) (.*) (.*) (.*):( [iI]nvalid [uU]ser )(.*)( from )(.*)$/
+	threshold track_by=$9,type=limit,count=3,seconds=30
+	mail root,subject="Invalid user"
+
diff --git a/app-admin/swatchdog/metadata.xml b/app-admin/swatchdog/metadata.xml
new file mode 100644
index 000000000000..e0a3fdd952e8
--- /dev/null
+++ b/app-admin/swatchdog/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nimiux@gentoo.org</email>
+		<name>Chema Alonso</name>
+	</maintainer>
+	<longdescription lang="en">
+		swatchdog.pl started out as swatch, the "simple watchdog"
+		for activity monitoring log files produced by UNIX's syslog
+		facility. It has since been evolving into a utility that can
+		monitor just about any type of log. The name has been changed
+		to satisfy a request made by the old Swiss watch company.
+	</longdescription>
+	<longdescription lang="es">
+		swatchdog.pl comenzó como swatch, el "simple perro guardián"
+		para monitorizar la actividad en los ficheros de registro
+		producidos por la característica syslog de los sistemas UNIX.
+		Desde entonces ha evolucionado hacia una utilidad que puede
+		monitorizar cualquier tipo de registro. Se ha cambiado el
+		nombre del proyecto para satisfacer una petición realizada
+		por la empresa de relojes suiza.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">swatch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild b/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
new file mode 100644
index 000000000000..c572801b8f3a
--- /dev/null
+++ b/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
+inherit perl-app
+
+DESCRIPTION="Simple log watcher"
+HOMEPAGE="https://sourceforge.net/projects/swatch/"
+SRC_URI="mirror://sourceforge/swatch/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="dev-perl/Date-Manip
+		dev-perl/Date-Calc
+		dev-perl/File-Tail
+		dev-perl/TimeDate
+		>=virtual/perl-Time-HiRes-1.12
+		!app-admin/swatch"
+
+src_install() {
+	emake install
+	newinitd "${FILESDIR}/${PN}-init" "${PN}"
+	newconfd "${FILESDIR}/${PN}-confd" "${PN}"
+	insinto /etc
+	doins "${FILESDIR}/${PN}rc"
+
+	# Clean up perl localpod and packlist (bug #620886)
+	perl_delete_localpod
+	perl_fix_packlist
+}
diff --git a/app-admin/sxid-4.2-r2 b/app-admin/sxid-4.2-r2
deleted file mode 100644
index 501a0ea6bc65..000000000000
--- a/app-admin/sxid-4.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=suid, sgid file and directory checking
-EAPI=6
-HOMEPAGE=http://freshmeat.net/projects/sxid
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=virtual/mailx
-SLOT=0
-SRC_URI=http://linukz.org/download/sxid-4.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=01469b2a2aa8581e3bdaba389802d88f
diff --git a/app-admin/sxid/Manifest b/app-admin/sxid/Manifest
new file mode 100644
index 000000000000..948d69f8362a
--- /dev/null
+++ b/app-admin/sxid/Manifest
@@ -0,0 +1,3 @@
+DIST sxid-4.2.tar.gz 41827 BLAKE2B c436ffd1b05306508c0ab0e4236cb3968d4456ae0686357a3a2c2a587fdbdaf8e760d5ff8198188c23854b080a91a35fc27a9717ab28f6907deb887a7b455cea SHA512 ed2832a0ffa89a41eba39e116122878b830c46ee7bfb906652606cff61fe16bc28ab6e6b4a802cc2436d9b3a7bdd734a827f007e6f1ce14ca84a9015d3a37a69
+EBUILD sxid-4.2-r2.ebuild 742 BLAKE2B c7614bb1724fca040f2977c4e6df40e15c97f48319128859081d1529bf1fcb70434feaf24b7a20396bd8937476fdb3ff2ee2e82863c818ca7fea54af397133bb SHA512 eef8fc9083ccee3ddf0264510a50803a36a66d50c0ba482ffe2e69407756963cf01314be2e32a432297cbefb22be4a4e4261fce2edb88e269320924dbdd4138e
+MISC metadata.xml 239 BLAKE2B 2c20ec7073e95bd9e1cc847b1e1fa0e79e8f22177834ae4ec3c9f4f6599ef0b626fe6eb76aa8684fe5e6493278a508f3c48552d8184a1da955078848df42a1c6 SHA512 78b96763365234c0639c1b756aad62686435ddb7c52aaa88b2afe19c978eb7cf1e0f5d16ea1f7f394d77491fa6b0d978e42d208f4fa1255d1e265432c4642323
diff --git a/app-admin/sxid/metadata.xml b/app-admin/sxid/metadata.xml
new file mode 100644
index 000000000000..28ab88d96ca0
--- /dev/null
+++ b/app-admin/sxid/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="freshmeat">sxid</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/sxid/sxid-4.2-r2.ebuild b/app-admin/sxid/sxid-4.2-r2.ebuild
new file mode 100644
index 000000000000..5351273bef83
--- /dev/null
+++ b/app-admin/sxid/sxid-4.2-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="suid, sgid file and directory checking"
+HOMEPAGE="http://freshmeat.net/projects/sxid"
+SRC_URI="http://linukz.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="virtual/mailx"
+
+DOCS=( docs/sxid.{conf,cron}.example )
+
+src_prepare() {
+	default
+	# this is an admin application and really requires root to run correctly
+	# we need to move the binary to the sbin directory
+	sed -i s/bindir/sbindir/g source/Makefile.in || die
+	eautoreconf
+}
+
+pkg_postinst() {
+	elog
+	elog "You will need to configure sxid.conf for your system using the manpage and example"
+	elog
+}
diff --git a/app-admin/sysklogd-1.5.1-r1 b/app-admin/sysklogd-1.5.1-r1
deleted file mode 100644
index aa01324bfdec..000000000000
--- a/app-admin/sysklogd-1.5.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Standard log daemons
-EAPI=5
-HOMEPAGE=http://www.infodrom.org/projects/sysklogd/
-IUSE=logrotate
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-lang/perl sys-apps/debianutils
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.1.tar.gz mirror://debian/pool/main/s/sysklogd/sysklogd_1.5-6.diff.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=25723fb68feec118c55212f16a77c29b
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
new file mode 100644
index 000000000000..b135cec01488
--- /dev/null
+++ b/app-admin/sysklogd/Manifest
@@ -0,0 +1,14 @@
+AUX sysklogd-1.4.2-caen-owl-klogd-drop-root.diff 4315 BLAKE2B 41b42e8f07abc905be77600e161065b063630e7e7ae92932b4d6165cab83f23e87fb521f7c0b36ce9ee42d99c5914a47605df277c9fce666dcb48ee93a3b918e SHA512 1a5cf4a5dec3ecaa8258110820b64d6a8e1e768e841a3f0ade8d7827b91e73c2d8a49a9d8b74566373133627af88dd46d14e83ae1940a0b2e6cd6fe8710a7e7a
+AUX sysklogd-1.4.2-caen-owl-syslogd-bind.diff 3242 BLAKE2B 93a53fc525bab3ebac577e02d381bc69beab1cf69136aedaf06e6c8e4b6fbe78cb68f705d42d9dde2f315c93cf12594bd8d2c80d0f6773d604c465b5b99bed56 SHA512 995c240fc54681445f68f7681173e1e1860aaab309edc8ac3531881c63c8889f009a7fd622d37145e80fe187410b80c28554140d6a6660134ca87a1c8d13570d
+AUX sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff 3245 BLAKE2B 9c0459edcdfd6c453aa6b379e698c4343d9110c329d01fb5481beb9533dc0a33aa812a2fe6a039c3ffe8b2458aaa1ce581195c2702a0b4e23c7a196a2d97e840 SHA512 87865e069f9c78990660cf29a37ba1ded7cc078ea8f05af63fc6068c470d1881181387477dccb830d96af05f352959181619380d61afccf3a11d213372e68852
+AUX sysklogd-1.5-build.patch 626 BLAKE2B 03fe37ad2095f88cfa5cf3b79ece26acf4d70f9a0817482e5a509044baca0a8e2f8a122bb90f0a8ffedc42342183d26071347354cd4946398b011124d9c2ff15 SHA512 aa8ce937733bb24f6b4bc4a47e40df99697c554276a29a21201b76354b902875bbeb7387520f3b7f8e05a76b16d3c4431bf775c85480fd9e31b78d499b5605fa
+AUX sysklogd-1.5-debian-cron.patch 913 BLAKE2B 20c0fc489b5ed90576f02f400817537ba6a59dd3521de2bacbc97964748792069bbeb1a656e4384ce8edfca320c9f212f4f04f2c4c49374f9cd5b0b59bb30c2f SHA512 5af0a61e5fb8dd78c30fa42d747b4de3a4f68b80b86a2f53447d2277c98d72972c242ffe5649c30a9f08f30e27974fd3bfe4a5537fa1c7b8658312b0550b28e0
+AUX sysklogd-1.5-glibc-2.24.patch 279 BLAKE2B 635ad71844161a13f5c95e670db49c486a856556f10ccd04ea7f4b9cb1252aa9788a2f4e17864d4e0155fd3ca148862a48ce0c4808e389d37f146087088e60be SHA512 35d92a0f1665d38201bdb2f4d4c0e5f17a6086f7a38e489ac4820cdff166419992253fa6c73e321c73e209e4b41a6e2363e19060ef48f18fef8c5ea65ac2664e
+AUX sysklogd-1.5-syslog-func-collision.patch 2273 BLAKE2B 7aa2ccaf4bb1663c7c71f0d9f67c17f39b6c61b4706352bf779eb9a790e2fed8753afeaa4c2234739513500383593ee2f59a87485378fb554589e0e9a77f61ad SHA512 1fc3e215a45d95dd11ca2d1713f9a3f416e82b9d60127da62d904071f02ec1e934aa099a20d09a7c1eea37f9d93dbaa0e0ce8118af9b58b92d781cc26659e5fc
+AUX sysklogd.confd 113 BLAKE2B 392d4c0ac09d5dd85d01e4d57cb541271e3c09ce90671d6bfcbecfde64184c94603929bee0fe3ae2d65af2b6283919b8a6517c1e551f870d4c0e25bf1ffad051 SHA512 4553d85e93fb07e7d4a6ed0b47a3ea2044a5605adaac05223724c32a60bb8ae96d99ca95965c3931640beef234e976c1141b83f603aa8c6e8aca1dec20ca807c
+AUX sysklogd.logrotate 402 BLAKE2B 2aba98bcef0516602268132507248ea44097541ac5659427f24a286661c500e6ff92b387f184bba84d0f10669ff9c917d7c8ee613c7fdb3a472434485b5f8c78 SHA512 655b25bc92c6d73807b11b0d64f97d619c067efb9fc16ee9c2aba5ba349b13991a22c83e7adaafb95e17578b17992992cab16d18b7bdb2be7d4fc876df5824f7
+AUX sysklogd.rc7 1447 BLAKE2B 352be79eca7a99213557f29110a53eca85dfbc11e134eac48801b5d61ebca9e77beadbee10c7f86267fe3509e17352468f9f777d25a875d583292a409d5db071 SHA512 f3c8f00fbf65833735d57927fe25c6299103bbc0b8fa548103b4f2f06f0dc2aa2276f12326ff7477f4ba491a96ccd30fe01cc53e841b0ccee83c4dacabb5a94e
+DIST sysklogd-1.5.1.tar.gz 90011 BLAKE2B c40bd8d5769f7d3d4141d602c74ac41e05a140743d18c4923d9368da7ba193ccb89a6837173994f0b7a9c290cc23f64513040434d7ab8df81b5d09b73b0263ad SHA512 a72196a1a172d25be1c4791ef6256fe71fa2ba8c1383d230e646e93f8a65c3a57c535189726325da4c792fdb2e9cb119bba43c878816a8e78e78189fd32b12b7
+DIST sysklogd_1.5-6.diff.gz 25677 BLAKE2B 3cb1f596490998b6002d4656a2321a500ce9941a37737c0b9d4702bbb87d7bc9ba21b68e06d175e3c1714a701adc6b3312e18a556ebc9ef395d8968762830cb5 SHA512 816961a835a43057569f62fd20d9f7b5e0bfcfcb173b68947457708504db3ce47e635956c8a9564f9bd577d8f3c49dfc725d321dfd3370b2de918363c30f838e
+EBUILD sysklogd-1.5.1-r1.ebuild 1703 BLAKE2B 1b5f75d79a86e05f3b7f71523f794a1bcf4cce6b0242dd8564204edcb886c1c9e7a450f25e00e3899f159643dc9d65da38d8c40fbe25becda0522359485b4347 SHA512 f7355db8d66f1b73b09381aa43f9d7112646229bf2a68facc9cf2a5fdf290f95adbc7bd48203473f7d2a21ba608c23aba267d0a5875c5f6b464bff5d1b2752de
+MISC metadata.xml 378 BLAKE2B b2ff06a70503694dcc5349aebb2d043cb74c10463e137c7bdd9ee6b5c1241e67fab49c201d08858b200a3007bea36e1d0ae1460e569b0b9e6f8281cf39c58c48 SHA512 9d7311cf197ebeec7e989d97d08a35360242ee0aa467e38e1715c6a425e1e279ddd75da8e2856c1238f357741d67bd67d07841425d7dcc3f8f964def8f02d15c
diff --git a/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff b/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
new file mode 100644
index 000000000000..40b8817d4e28
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
@@ -0,0 +1,162 @@
+http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff?rev=1.2;content-type=text%2Fplain
+diff -upk.orig sysklogd-1.4.2.orig/klogd.8 sysklogd-1.4.2/klogd.8
+--- sysklogd-1.4.2.orig/klogd.8	2005-03-11 16:12:09 +0000
++++ sysklogd-1.4.2/klogd.8	2005-08-18 14:37:47 +0000
+@@ -18,6 +19,12 @@ klogd \- Kernel Log Daemon
+ .RB [ " \-f "
+ .I fname
+ ]
++.RB [ " \-u "
++.I username
++]
++.RB [ " \-j "
++.I chroot_dir
++]
+ .RB [ " \-iI " ]
+ .RB [ " \-n " ]
+ .RB [ " \-o " ]
+@@ -53,6 +60,20 @@ stderr.
+ .BI "\-f " file
+ Log messages to the specified filename rather than to the syslog facility.
+ .TP
++.BI "\-u " username
++Tells klogd to become the specified user and drop root privileges before
++starting logging.
++.TP
++.BI "\-j " chroot_dir
++Tells klogd to
++.BR chroot (2)
++into this directory after initializing.
++This option is only valid if the \-u option is also used to run klogd
++without root privileges.
++Note that the use of this option will prevent \-i and \-I from working
++unless you set up the chroot directory in such a way that klogd can still
++read the kernel module symbols.
++.TP
+ .BI "\-i \-I"
+ Signal the currently executing klogd daemon.  Both of these switches control
+ the loading/reloading of symbol information.  The \-i switch signals the
+diff -upk.orig sysklogd-1.4.2.orig/klogd.c sysklogd-1.4.2/klogd.c
+--- sysklogd-1.4.2.orig/klogd.c	2005-08-18 12:29:52 +0000
++++ sysklogd-1.4.2/klogd.c	2005-08-18 14:37:47 +0000
+@@ -261,6 +261,8 @@
+ #include <stdarg.h>
+ #include <paths.h>
+ #include <stdlib.h>
++#include <pwd.h>
++#include <grp.h>
+ #include "klogd.h"
+ #include "ksyms.h"
+ #ifndef TESTING
+@@ -315,6 +317,9 @@ static enum LOGSRC {none, proc, kernel} 
+ int debugging = 0;
+ int symbols_twice = 0;
+ 
++char *server_user = NULL;
++char *chroot_dir = NULL;
++int log_flags = 0;
+ 
+ /* Function prototypes. */
+ extern int ksyslog(int type, char *buf, int len);
+@@ -535,8 +540,9 @@ static enum LOGSRC GetKernelLogSrc(void)
+ 	 * First do a stat to determine whether or not the proc based
+ 	 * file system is available to get kernel messages from.
+ 	 */
+-	if ( use_syscall ||
+-	    ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT)) )
++	if (!server_user &&
++	    (use_syscall ||
++	    ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT))))
+ 	{
+ 	  	/* Initialize kernel logging. */
+ 	  	ksyslog(1, NULL, 0);
+@@ -983,6 +989,27 @@ static void LogProcLine(void)
+ }
+ 
+ 
++static int drop_root(void)
++{
++	struct passwd *pw;
++
++	if (!(pw = getpwnam(server_user))) return -1;
++
++	if (!pw->pw_uid) return -1;
++
++	if (chroot_dir) {
++		if (chdir(chroot_dir)) return -1;
++		if (chroot(".")) return -1;
++	}
++
++	if (setgroups(0, NULL)) return -1;
++	if (setgid(pw->pw_gid)) return -1;
++	if (setuid(pw->pw_uid)) return -1;
++
++	return 0;
++}
++
++
+ int main(argc, argv)
+ 
+ 	int argc;
+@@ -1000,7 +1027,7 @@ int main(argc, argv)
+ 	chdir ("/");
+ #endif
+ 	/* Parse the command-line. */
+-	while ((ch = getopt(argc, argv, "c:df:iIk:nopsvx2")) != EOF)
++	while ((ch = getopt(argc, argv, "c:df:u:j:iIk:nopsvx2")) != EOF)
+ 		switch((char)ch)
+ 		{
+ 		    case '2':		/* Print lines with symbols twice. */
+@@ -1022,6 +1049,10 @@ int main(argc, argv)
+ 		    case 'I':
+ 			SignalDaemon(SIGUSR2);
+ 			return(0);
++		    case 'j':		/* chroot 'j'ail */
++			chroot_dir = optarg;
++			log_flags |= LOG_NDELAY;
++			break;
+ 		    case 'k':		/* Kernel symbol file. */
+ 			symfile = optarg;
+ 			break;
+@@ -1037,6 +1068,9 @@ int main(argc, argv)
+ 		    case 's':		/* Use syscall interface. */
+ 			use_syscall = 1;
+ 			break;
++		    case 'u':		/* Run as this user */
++			server_user = optarg;
++			break;
+ 		    case 'v':
+ 			printf("klogd %s.%s\n", VERSION, PATCHLEVEL);
+ 			exit (1);
+@@ -1045,6 +1079,10 @@ int main(argc, argv)
+ 			break;
+ 		}
+ 
++	if (chroot_dir && !server_user) {
++		fputs("'-j' is only valid with '-u'\n", stderr);
++		exit(1);
++	}
+ 
+ 	/* Set console logging level. */
+ 	if ( log_level != (char *) 0 )
+@@ -1158,7 +1196,7 @@ int main(argc, argv)
+ 		}
+ 	}
+ 	else
+-		openlog("kernel", 0, LOG_KERN);
++		openlog("kernel", log_flags, LOG_KERN);
+ 
+ 
+ 	/* Handle one-shot logging. */
+@@ -1191,6 +1229,11 @@ int main(argc, argv)
+ 		}
+ 	}
+ 
++	if (server_user && drop_root()) {
++		syslog(LOG_ALERT, "klogd: failed to drop root");
++		Terminate();
++	}
++
+         /* The main loop. */
+ 	while (1)
+ 	{
diff --git a/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-bind.diff b/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-bind.diff
new file mode 100644
index 000000000000..ad311a512c0f
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-bind.diff
@@ -0,0 +1,103 @@
+http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff?rev=1.1;content-type=text%2Fplain
+diff -upk.orig sysklogd-1.4.2.orig/sysklogd.8 sysklogd-1.4.2/sysklogd.8
+--- sysklogd-1.4.2.orig/sysklogd.8	2004-07-09 17:33:32 +0000
++++ sysklogd-1.4.2/sysklogd.8	2005-08-18 14:40:25 +0000
+@@ -15,6 +15,9 @@ sysklogd \- Linux system logging utiliti
+ .I config file
+ ]
+ .RB [ " \-h " ] 
++.RB [ " \-i "
++.I IP address
++]
+ .RB [ " \-l "
+ .I hostlist
+ ]
+@@ -104,6 +107,13 @@ Specifying this switch on the command li
+ This can cause syslog loops that fill up hard disks quite fast and
+ thus needs to be used with caution.
+ .TP
++.BI "\-i " "IP address"
++If
++.B syslogd
++is configured to accept log input from a UDP port, specify an IP address
++to bind to, rather than the default of INADDR_ANY.  The address must be in
++dotted quad notation, DNS host names are not allowed.
++.TP
+ .BI "\-l " "hostlist"
+ Specify a hostname that should be logged only with its simple hostname
+ and not the fqdn.  Multiple hosts may be specified using the colon
+diff -upk.orig sysklogd-1.4.2.orig/syslogd.c sysklogd-1.4.2/syslogd.c
+--- sysklogd-1.4.2.orig/syslogd.c	2005-08-18 14:33:22 +0000
++++ sysklogd-1.4.2/syslogd.c	2005-08-18 14:40:25 +0000
+@@ -774,6 +774,8 @@ char	**LocalHosts = NULL;	/* these hosts
+ int	NoHops = 1;		/* Can we bounce syslog messages through an
+ 				   intermediate host. */
+ 
++char	*bind_addr = NULL;	/* bind UDP port to this interface only */
++
+ extern	int errno;
+ 
+ /* Function prototypes. */
+@@ -878,7 +880,7 @@ int main(argc, argv)
+ 		funix[i]  = -1;
+ 	}
+ 
+-	while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:v")) != EOF)
++	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
+ 		switch((char)ch) {
+ 		case 'a':
+ 			if (nfunix < MAXFUNIX)
+@@ -895,9 +897,17 @@ int main(argc, argv)
+ 		case 'h':
+ 			NoHops = 0;
+ 			break;
++		case 'i':
++			if (bind_addr) {
++				fprintf(stderr, "Only one -i argument allowed, "
++					"the first one is taken.\n");
++				break;
++			}
++			bind_addr = optarg;
++			break;
+ 		case 'l':
+ 			if (LocalHosts) {
+-				fprintf (stderr, "Only one -l argument allowed," \
++				fprintf(stderr, "Only one -l argument allowed, "
+ 					"the first one is taken.\n");
+ 				break;
+ 			}
+@@ -1244,7 +1254,7 @@ int main(argc, argv)
+ int usage()
+ {
+ 	fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
+-		" [-s domainlist] [-f conffile]\n");
++		" [-s domainlist] [-f conffile] [-i IP address]\n");
+ 	exit(1);
+ }
+ 
+@@ -1286,15 +1296,22 @@ static int create_inet_socket()
+ 	int fd, on = 1;
+ 	struct sockaddr_in sin;
+ 
++	memset(&sin, 0, sizeof(sin));
++	sin.sin_family = AF_INET;
++	sin.sin_port = LogPort;
++	if (bind_addr) {
++		if (!inet_aton(bind_addr, &sin.sin_addr)) {
++			logerror("syslog: not a valid IP address to bind to.");
++			return -1;
++		}
++	}
++
+ 	fd = socket(AF_INET, SOCK_DGRAM, 0);
+ 	if (fd < 0) {
+ 		logerror("syslog: Unknown protocol, suspending inet service.");
+ 		return fd;
+ 	}
+ 
+-	memset(&sin, 0, sizeof(sin));
+-	sin.sin_family = AF_INET;
+-	sin.sin_port = LogPort;
+ 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, \
+ 		       (char *) &on, sizeof(on)) < 0 ) {
+ 		logerror("setsockopt(REUSEADDR), suspending inet");
diff --git a/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff b/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
new file mode 100644
index 000000000000..8c3f571f3ca2
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
@@ -0,0 +1,118 @@
+http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff?rev=1.1;content-type=text%2Fplain
+diff -upk.orig sysklogd-1.4.2.orig/sysklogd.8 sysklogd-1.4.2/sysklogd.8
+--- sysklogd-1.4.2.orig/sysklogd.8	2005-08-18 14:40:25 +0000
++++ sysklogd-1.4.2/sysklogd.8	2005-08-18 14:41:26 +0000
+@@ -32,6 +32,9 @@ sysklogd \- Linux system logging utiliti
+ .RB [ " \-s "
+ .I domainlist
+ ]
++.RB [ " \-u"
++.IB username
++]
+ .RB [ " \-v " ]
+ .LP
+ .SH DESCRIPTION
+@@ -161,6 +164,19 @@ is specified and the host logging resolv
+ no domain would be cut, you will have to specify two domains like:
+ .BR "\-s north.de:infodrom.north.de" .
+ .TP
++.BI "\-u " "username"
++This causes the
++.B syslogd
++daemon to become the named user before starting up logging.
++
++Note that when this option is in use,
++.B syslogd
++will open all log files as root when the daemon is first started;
++however, after a
++.B SIGHUP
++the files will be reopened as the non-privileged user.  You should
++take this into account when deciding the ownership of the log files.
++.TP
+ .B "\-v"
+ Print version and exit.
+ .LP
+diff -upk.orig sysklogd-1.4.2.orig/syslogd.c sysklogd-1.4.2/syslogd.c
+--- sysklogd-1.4.2.orig/syslogd.c	2005-08-18 14:40:25 +0000
++++ sysklogd-1.4.2/syslogd.c	2005-08-18 14:41:26 +0000
+@@ -524,6 +524,10 @@ static char sccsid[] = "@(#)syslogd.c	5.
+ #include <arpa/nameser.h>
+ #include <arpa/inet.h>
+ #include <resolv.h>
++
++#include <pwd.h>
++#include <grp.h>
++
+ #ifndef TESTING
+ #include "pidfile.h"
+ #endif
+@@ -775,6 +779,7 @@ int	NoHops = 1;		/* Can we bounce syslog
+ 				   intermediate host. */
+ 
+ char	*bind_addr = NULL;	/* bind UDP port to this interface only */
++char	*server_user = NULL;	/* user name to run server as */
+ 
+ extern	int errno;
+ 
+@@ -827,6 +832,21 @@ static int set_nonblock_flag(int desc)
+ 	return fcntl(desc, F_SETFL, flags | O_NONBLOCK);
+ }
+ 
++static int drop_root(void)
++{
++	struct passwd *pw;
++
++	if (!(pw = getpwnam(server_user))) return -1;
++
++	if (!pw->pw_uid) return -1;
++
++	if (initgroups(server_user, pw->pw_gid)) return -1;
++	if (setgid(pw->pw_gid)) return -1;
++	if (setuid(pw->pw_uid)) return -1;
++
++	return 0;
++}
++
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
+@@ -880,7 +900,7 @@ int main(argc, argv)
+ 		funix[i]  = -1;
+ 	}
+ 
+-	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
++	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:u:v")) != EOF)
+ 		switch((char)ch) {
+ 		case 'a':
+ 			if (nfunix < MAXFUNIX)
+@@ -933,6 +953,9 @@ int main(argc, argv)
+ 			}
+ 			StripDomains = crunch_list(optarg);
+ 			break;
++		case 'u':
++			server_user = optarg;
++			break;
+ 		case 'v':
+ 			printf("syslogd %s.%s\n", VERSION, PATCHLEVEL);
+ 			exit (0);
+@@ -1100,6 +1123,11 @@ int main(argc, argv)
+ 		kill (ppid, SIGTERM);
+ #endif
+ 
++	if (server_user && drop_root()) {
++		dprintf("syslogd: failed to drop root\n");
++		exit(1);
++	}
++
+ 	/* Main loop begins here. */
+ 	for (;;) {
+ 		int nfds;
+@@ -1254,7 +1282,7 @@ int main(argc, argv)
+ int usage()
+ {
+ 	fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
+-		" [-s domainlist] [-f conffile] [-i IP address]\n");
++		" [-s domainlist] [-f conffile] [-i IP address] [-u username]\n");
+ 	exit(1);
+ }
+ 
diff --git a/app-admin/sysklogd/files/sysklogd-1.5-build.patch b/app-admin/sysklogd/files/sysklogd-1.5-build.patch
new file mode 100644
index 000000000000..12f4822cd265
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-1.5-build.patch
@@ -0,0 +1,20 @@
+respect env CC/CFLAGS/CPPFLAGS/LDFLAGS
+
+--- Makefile
++++ Makefile
+@@ -17,14 +17,12 @@
+ #   along with this program; if not, write to the Free Software
+ #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+-CC= gcc
+ #SKFLAGS= -g -DSYSV -Wall
+ #LDFLAGS= -g
+-SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
++SKFLAGS= $(CFLAGS) $(CPPFLAGS) -DSYSV -Wall -fno-strength-reduce
+ # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+ # $(shell getconf LFS_SKFLAGS)
+-LDFLAGS= -s
+ 
+ # Look where your install program is.
+ INSTALL = /usr/bin/install
diff --git a/app-admin/sysklogd/files/sysklogd-1.5-debian-cron.patch b/app-admin/sysklogd/files/sysklogd-1.5-debian-cron.patch
new file mode 100644
index 000000000000..7f6c2a79b0b2
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-1.5-debian-cron.patch
@@ -0,0 +1,38 @@
+--- debian/cron.daily
++++ debian/cron.daily
+@@ -20,10 +20,6 @@
+ #		Written by Martin Schulze <joey@debian.org>.
+ #		$Id: cron.daily,v 1.14 2007-05-28 16:33:34 joey Exp $
+ 
+-test -x /usr/sbin/syslogd-listfiles || exit 0
+-test -x /sbin/syslogd || exit 0
+-test -f /usr/share/sysklogd/dummy || exit 0
+-
+ set -e
+ 
+ cd /var/log
+@@ -41,4 +37,4 @@
+ 
+ # Restart syslogd
+ #
+-/etc/init.d/sysklogd reload-or-restart > /dev/null
++/etc/init.d/sysklogd --quiet reload
+--- debian/cron.weekly
++++ debian/cron.weekly
+@@ -19,10 +19,6 @@
+ #		Written by Ian A. Murdock <imurdock@debian.org>.
+ #		$Id: cron.weekly,v 1.11 2007-05-28 16:33:34 joey Exp $
+ 
+-test -x /usr/sbin/syslogd-listfiles || exit 0
+-test -x /sbin/syslogd || exit 0
+-test -f /usr/share/sysklogd/dummy || exit 0
+-
+ set -e
+ 
+ cd /var/log
+@@ -40,4 +36,4 @@
+ 
+ # Restart syslogd
+ #
+-/etc/init.d/sysklogd reload-or-restart > /dev/null
++/etc/init.d/sysklogd --quiet reload
diff --git a/app-admin/sysklogd/files/sysklogd-1.5-glibc-2.24.patch b/app-admin/sysklogd/files/sysklogd-1.5-glibc-2.24.patch
new file mode 100644
index 000000000000..fcddb7574590
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-1.5-glibc-2.24.patch
@@ -0,0 +1,11 @@
+--- sysklogd-1.5.1/syslogd.c
++++ sysklogd-1.5.1/syslogd.c
+@@ -2094,7 +2094,7 @@
+ 	(void) signal(SIGCHLD, reapchild);	/* reset signal handler -ASP */
+ 	wait ((int *)0);
+ #else
+-	union wait status;
++	int status;
+ 
+ 	while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0)
+ 		;
diff --git a/app-admin/sysklogd/files/sysklogd-1.5-syslog-func-collision.patch b/app-admin/sysklogd/files/sysklogd-1.5-syslog-func-collision.patch
new file mode 100644
index 000000000000..76912a265565
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-1.5-syslog-func-collision.patch
@@ -0,0 +1,103 @@
+http://bugs.gentoo.org/342601
+
+rename local "syslog" and "vsyslog" functions to avoid conflicts with glibc's
+
+patch by Dmitriy Matrosov
+
+--- sysklogd-1.5/klogd.c
++++ sysklogd-1.5/klogd.c
+@@ -258,7 +262,6 @@
+ #if !defined(__GLIBC__)
+ #include <linux/time.h>
+ #endif /* __GLIBC__ */
+-#include <stdarg.h>
+ #include <paths.h>
+ #include <stdlib.h>
+ #include <pwd.h>
+@@ -637,7 +640,7 @@
+ 			}
+ 			argl += 3;
+ 		}
+-		syslog(priority, fmt, argl);
++		syslog_own(priority, fmt, argl);
+ 		va_end(ap);
+ #ifdef TESTING
+ 		putchar('\n');
+@@ -646,7 +649,7 @@
+ 	}
+ 
+ 	va_start(ap, fmt);
+-	vsyslog(priority, fmt, ap);
++	vsyslog_own(priority, fmt, ap);
+ 	va_end(ap);
+ #ifdef TESTING
+ 	printf ("\n");
+@@ -1205,7 +1208,7 @@
+ 	}
+ 
+ 	if (server_user && drop_root()) {
+-		syslog(LOG_ALERT, "klogd: failed to drop root");
++		syslog_own(LOG_ALERT, "klogd: failed to drop root");
+ 		Terminate();
+ 	}
+ 
+--- sysklogd-1.5/klogd.h
++++ sysklogd-1.5/klogd.h
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <syslog.h>
+ #include <string.h>
++#include <stdarg.h>
+ 
+ 
+ /* Function prototypes. */
+@@ -38,3 +43,5 @@
+ extern char * ExpandKadds(char *, char *);
+ extern void SetParanoiaLevel(int);
+ extern void Syslog(int priority, char *fmt, ...);
++extern void syslog_own(int, const char *, ...);
++extern void vsyslog_own(int, const char *, va_list);
+--- sysklogd-1.5/ksym_mod.c
++++ sysklogd-1.5/ksym_mod.c
+@@ -95,7 +98,6 @@
+ #if !defined(__GLIBC__)
+ #include <linux/time.h>
+ #endif /* __GLIBC__ */
+-#include <stdarg.h>
+ #include <paths.h>
+ #include <linux/version.h>
+ 
+--- sysklogd-1.5/syslog.c
++++ sysklogd-1.5/syslog.c
+@@ -75,6 +79,10 @@
+ 
+ #define	_PATH_LOGNAME	"/dev/log"
+ 
++
++void syslog_own(int, const char *, ...);
++void vsyslog_own(int, const char *, va_list);
++
+ static int	LogFile = -1;		/* fd for log */
+ static int	connected;		/* have done connect */
+ static int	LogStat = 0;		/* status bits, set by openlog() */
+@@ -82,17 +90,17 @@
+ static int	LogFacility = LOG_USER;	/* default facility code */
+ 
+ void
+-syslog(int pri, const char *fmt, ...)
++syslog_own(int pri, const char *fmt, ...)
+ {
+ 	va_list ap;
+ 
+ 	va_start(ap, fmt);
+-	vsyslog(pri, fmt, ap);
++	vsyslog_own(pri, fmt, ap);
+ 	va_end(ap);
+ }
+ 
+ void
+-vsyslog(pri, fmt, ap)
++vsyslog_own(pri, fmt, ap)
+ 	int pri;
+ 	const char *fmt;
+ 	va_list ap;
diff --git a/app-admin/sysklogd/files/sysklogd.confd b/app-admin/sysklogd/files/sysklogd.confd
new file mode 100644
index 000000000000..c9735739117d
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd.confd
@@ -0,0 +1,6 @@
+# Config file for /etc/init.d/sysklogd
+
+SYSLOGD="-m 0"
+# send warnings and above to the console
+KLOGD="-c 3 -2"
+
diff --git a/app-admin/sysklogd/files/sysklogd.logrotate b/app-admin/sysklogd/files/sysklogd.logrotate
new file mode 100644
index 000000000000..8148a2ab2948
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd.logrotate
@@ -0,0 +1,8 @@
+/var/log/auth.log /var/log/daemon.log /var/log/debug /var/log/kern.log /var/log/lpr.log /var/log/mail.err /var/log/mail.info /var/log/mail.log /var/log/mail.warn /var/log/messages /var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice /var/log/syslog /var/log/user.log {
+  create 640 root root
+  sharedscripts
+  missingok
+  postrotate
+    /etc/init.d/sysklogd -q reload
+  endscript
+}
diff --git a/app-admin/sysklogd/files/sysklogd.rc7 b/app-admin/sysklogd/files/sysklogd.rc7
new file mode 100644
index 000000000000..787fe3d752d7
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd.rc7
@@ -0,0 +1,74 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_started_commands="reload"
+
+depend() {
+	need clock hostname
+	provide logger
+}
+
+start_daemon() {
+	local retval=0
+	local daemon="$1"
+	local options="$2"
+
+	[ -z "${daemon}" ] && return 1
+
+	ebegin "sysklogd -> start: ${daemon}"
+	start-stop-daemon --start --exec /usr/sbin/"${daemon}" \
+		--pidfile /var/run/"${daemon}".pid -- ${options}
+	retval=$?
+	eend ${retval} "Failed to start ${daemon}"
+
+	return ${retval}
+}
+
+stop_daemon() {
+	local retval=0
+	local daemon="$1"
+
+	[ -z "${daemon}" ] && return 1
+	
+	ebegin "sysklogd -> stop: ${daemon}"
+	# syslogd can be stubborn some times (--retry 15)...
+	start-stop-daemon --stop --retry 15 --quiet --pidfile /var/run/"${daemon}".pid
+	retval=$?
+	eend ${retval} "Failed to stop ${daemon}"
+
+	return ${retval}
+}
+
+start() {
+	start_daemon "syslogd" "${SYSLOGD}" || return 1
+
+	# klogd do not always start proper if started too early
+	sleep 1
+
+	if ! start_daemon "klogd" "${KLOGD}" ; then
+		stop_daemon "syslogd"
+		return 1
+	fi
+
+	return 0
+}
+
+stop() {
+	stop_daemon "klogd" || return 1
+	stop_daemon "syslogd" || return 1 
+	return 0
+}
+
+reload() {
+	local ret=0
+
+	ebegin "Reloading configuration"
+
+	start-stop-daemon --signal HUP --pidfile /var/run/syslogd.pid
+	ret=$((${ret} + $?))
+	start-stop-daemon --signal USR1 --pidfile /var/run/klogd.pid
+	ret=$((${ret} + $?))
+
+	eend ${ret}
+}
diff --git a/app-admin/sysklogd/metadata.xml b/app-admin/sysklogd/metadata.xml
new file mode 100644
index 000000000000..094ccd37b3fd
--- /dev/null
+++ b/app-admin/sysklogd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="logrotate">use app-admin/logrotate for rotating logs rather than custom cron scripts</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..ea099c26f115
--- /dev/null
+++ b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DEB_PV="1.5-6"
+DESCRIPTION="Standard log daemons"
+HOMEPAGE="http://www.infodrom.org/projects/sysklogd/"
+SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz
+	mirror://debian/pool/main/s/sysklogd/${PN}_${DEB_PV}.diff.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="logrotate"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	sys-apps/debianutils"
+
+DOCS=( ANNOUNCE CHANGES NEWS README.1st README.linux )
+
+PATCHES=(
+	"${WORKDIR}"/${PN}_${DEB_PV}.diff
+
+	"${FILESDIR}"/${PN}-1.5-debian-cron.patch
+	"${FILESDIR}"/${PN}-1.5-build.patch
+
+	# CAEN/OWL security patches
+	"${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-bind.diff
+	"${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-drop-root.diff
+	"${FILESDIR}"/${PN}-1.4.2-caen-owl-klogd-drop-root.diff
+
+	"${FILESDIR}"/${PN}-1.5-syslog-func-collision.patch #342601
+	"${FILESDIR}"/${PN}-1.5-glibc-2.24.patch #604232
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+}
+
+src_configure() {
+	append-lfs-flags
+	tc-export CC
+}
+
+src_install() {
+	dosbin syslogd klogd debian/syslog-facility debian/syslogd-listfiles
+	doman *.[1-9] debian/syslogd-listfiles.8
+	insinto /etc
+	doins debian/syslog.conf
+	if use logrotate ; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
+	else
+		exeinto /etc/cron.daily
+		newexe debian/cron.daily syslog
+		exeinto /etc/cron.weekly
+		newexe debian/cron.weekly syslog
+	fi
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/sysklogd.rc7 sysklogd
+	newconfd "${FILESDIR}"/sysklogd.confd sysklogd
+}
diff --git a/app-admin/syslog-ng-3.13.2 b/app-admin/syslog-ng-3.13.2
deleted file mode 100644
index 28e14214591c..000000000000
--- a/app-admin/syslog-ng-3.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2 sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=syslog replacement with advanced filtering features
-EAPI=6
-HOMEPAGE=http://www.balabit.com/network-security/syslog-ng
-IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7
-KEYWORDS=amd64 arm64 hppa ia64 sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2
-REQUIRED_USE=python? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.13.2/syslog-ng-3.13.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=27e36a126a0c0c96ce54216c03041103
diff --git a/app-admin/syslog-ng-3.14.1 b/app-admin/syslog-ng-3.14.1
deleted file mode 100644
index c8cb878a4daf..000000000000
--- a/app-admin/syslog-ng-3.14.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2 sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=syslog replacement with advanced filtering features
-EAPI=6
-HOMEPAGE=https://syslog-ng.com/open-source-log-management
-IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.14.1/syslog-ng-3.14.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=dfdd019de167e97eb2bad4cf9a39cee1
diff --git a/app-admin/syslog-ng-3.15.1 b/app-admin/syslog-ng-3.15.1
deleted file mode 100644
index b87b51543327..000000000000
--- a/app-admin/syslog-ng-3.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:= ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=syslog replacement with advanced filtering features
-EAPI=6
-HOMEPAGE=https://syslog-ng.com/open-source-log-management
-IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:= ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.15.1/syslog-ng-3.15.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=64939ad0db6ecba3baf560aabb807d46
diff --git a/app-admin/syslog-ng-3.16.1 b/app-admin/syslog-ng-3.16.1
deleted file mode 100644
index 76dce6fc9823..000000000000
--- a/app-admin/syslog-ng-3.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.3 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:= ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=syslog replacement with advanced filtering features
-EAPI=6
-HOMEPAGE=https://syslog-ng.com/open-source-log-management
-IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.3 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:= ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.16.1/syslog-ng-3.16.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=15b30cefbc341736c54d95f5d6c3a07c
diff --git a/app-admin/syslog-ng-3.7.3 b/app-admin/syslog-ng-3.7.3
deleted file mode 100644
index 96bcc6f3b925..000000000000
--- a/app-admin/syslog-ng-3.7.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.8.3 ) geoip? ( >=dev-libs/geoip-1.5.0 ) json? ( >=dev-libs/json-c-0.9:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) redis? ( dev-libs/hiredis ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/eventlog-0.2.12 >=dev-libs/glib-2.10.1:2 virtual/pkgconfig sys-devel/flex >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=syslog replacement with advanced filtering features
-EAPI=5
-HOMEPAGE=http://www.balabit.com/network-security/syslog-ng
-IUSE=amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.8.3 ) geoip? ( >=dev-libs/geoip-1.5.0 ) json? ( >=dev-libs/json-c-0.9:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) redis? ( dev-libs/hiredis ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/eventlog-0.2.12 >=dev-libs/glib-2.10.1:2
-REQUIRED_USE=python? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.7.3/syslog-ng-3.7.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d64ce0e41b5d4e2b177d421d41fef5ee
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
new file mode 100644
index 000000000000..59671bc89742
--- /dev/null
+++ b/app-admin/syslog-ng/Manifest
@@ -0,0 +1,39 @@
+AUX 3.13/syslog-ng.conf.gentoo 1184 BLAKE2B 1a4b78d913c24f085efdbe36893f22e71295af5fcf6f085462ab6baf265aa9e26d796a1fd41d8bef6dd20b119a0920c1d07cf19e8d70640f88d70e333875d1fe SHA512 1dc14fc8ff4f16dac750436e4472e0f69e81f287981b31aa3864a8267beea19fd040b14b955c5011992c70092213a08b2a8350bac792c4d5c256f753b318ed6a
+AUX 3.13/syslog-ng.conf.gentoo.fbsd 577 BLAKE2B b8aa747638899024ea8b04fdf3cc623ee77ac2522eb68e6763943808735ab6ef85c29db9f076cc2c3768d377a43530ccd634a50a51a6face8d1b93239aee6839 SHA512 3a0cc8685be4af41690bbd4aaec87b0d44ed8dd3b1dec0bac32818288c4adac1f4673dd73ffdc4164feb4afe8b98728c66a51a323bf302958e422595130a5ee2
+AUX 3.13/syslog-ng.conf.gentoo.hardened 4498 BLAKE2B 42626430ef11c3db6b56bfa07f6514551191e6c0e6086eab7c7ffad61d48c4f7931c97ec53af7e26b7187481f3ff572e67e442478995e39e80ab2fcc912251cc SHA512 0501c56996b619c92ae7ea7d7bc2b3110ed099f7efe4708faafd4dab06092d2cec3c015dcc9a4db6b7c7cc94bea278146b840bdb151278eab9a68bf186703bf9
+AUX 3.13/syslog-ng.confd 1492 BLAKE2B 8df9e16ec0fd8de141d1624f7451fefe19c49b2ba91ebdd63b6cce730ab2997715d7d352629f8bc6f7c700fce7fa04f291d3507dc421e1382a104dc264395e83 SHA512 8a346864dd88ac393f7080c4a073b20f21dfd547c2517abdd963beb50b9ac49565487a9508b042eb5d00055b2a5bef8db245cfa94c36ba1a60922caaae8bc4e0
+AUX 3.13/syslog-ng.rc 1799 BLAKE2B cf9ee36cdf27600f5caa75453b746ced42cda3e3dc8909925b11604967216061f8b3103b6b9f1af499a8c1d986cd9fb82d616138577773ce35c353bea055c6ac SHA512 2a0996057d4dcd730c89af87845749d9ec28c04f99d4f72be809f0f70a213a89a190c86a717169927f292049b326136fd76c6e02413963f7cd554d8acb74d555
+AUX 3.14/syslog-ng.conf.gentoo 1184 BLAKE2B ad9a75f4b25518d44f8dc0fa48af5bd0df9d27742af3bc3a30ad9e11dd1f201fafe15436a84d4b608052b79cff87a21d27ab4b5556ff2a9fe08f93c415c0ed8b SHA512 8b12f9a13090613460f5985d25d9ec5628c768bb8ccbfd326de56ca8b3d6c36295fc4bdd9f290b4e3fe3407ce5270e18b6b301224f074a679d91838282bfd306
+AUX 3.14/syslog-ng.conf.gentoo.fbsd 577 BLAKE2B bf18a1b56899483c83d80a4e36e99a594977d3af7905ed025d532a028ee0737f0d24c8076139f42a8e3c70c2f10d1a679f070fed59d088769ed54c72e3b8cda2 SHA512 d60f491b80b8b388392776abf327dcea6f4e1f0822e8361d1ee5949a7d5bcdc52130cc941d3933724b3f2425a105122eee6b7df0fc67bde0ca9bbbed5d58ad24
+AUX 3.14/syslog-ng.conf.gentoo.hardened 4498 BLAKE2B 568cf2b335d52865910d3324579635e1630a927ac12dfc4243c57f0f33fe7ffe63598843462810d71cf043f4d4672b4a4e45fae7ad5fc5f61096b52bbd64f5fb SHA512 539bc6480b85a0ae789bc0063d1af6225aa3fc61bca2d57190ee8676ad21aefdc88a9c3f66287575547a84099f4b989cfcf297e1317d2ed34de8b25363377081
+AUX 3.14/syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530903659828565018dff71d62e56bfba28afa6c5e9fcb55aee2a41bcfff53c9ad006ee319124adbd66a SHA512 c945d27560afa310ac7f15e0cde3a564d5296892c747827d68df1b49c728998b056b596f93ac2564a5cb349f88db6585de58ec64cdaa13b92f20f5aac213ef44
+AUX 3.14/syslog-ng.rc 1892 BLAKE2B 6596679ca09eb9c74c4971d99cebb400f7de483adc23f723ed2e0c1541c4badd89a2ba2dba8845cb6457e64bd44e53024034b7c59e7c438018e240daa73333b6 SHA512 b350fbb9a6cf5fd44aeb2e778968b7d4a51b5447057721f36cf528c57753d83ee9b889ca1f1d54a3a25f3c5cff5dedd9dcac2d4591ad6e77246eb420f523f36e
+AUX 3.7/syslog-ng.conf.gentoo 1203 BLAKE2B 786a4315e11d2feb839aaad7af5fd3544c3c3319857009b716e732a34618a026f25e8f44b2f8c4ebb2fd74cd78eb676bb65c6573f3bb8f357cde71f728ef56a5 SHA512 44de47c9ba8927ab69cbd9479bc18f87a311fb7a7273912b236650385bbaddec28d3a706d822e53a4264fc8fd9895887243fb070252024b732bdb41a840d44be
+AUX 3.7/syslog-ng.conf.gentoo.fbsd 593 BLAKE2B 2b161a0aed035fdeba7dffdadcce28f29d2bd4077e391b8af98c031fa92366cf454349463f4ba457e08cf44f9b78a25b525bda9c55405102b079a89223a328d0 SHA512 947be1b330a98490da99d9e64d76732fe8eb54beb266ae1a546df7319cea998a89963ddf086e993025efbba1a8aefc2ecc4ff5bd440a50e565cfddbe35536d90
+AUX 3.7/syslog-ng.conf.gentoo.hardened 4520 BLAKE2B 968f77526cb027259acf507177f02b8d735a48aff78f809eb14e50795c26fee62b1e15602ed3ee16317ecb15f14d33135fa0dc54bea2ead002f96618991f87ec SHA512 2a0d31178e83ea9685ac1b5988652ef077b71d368d75eda46ebf0e1ef3dbb79e8c911bc6498d6a934912250ead902cfa4bb8ceff1f14a08e06f6152824e36128
+AUX 3.7/syslog-ng.confd 1492 BLAKE2B 8df9e16ec0fd8de141d1624f7451fefe19c49b2ba91ebdd63b6cce730ab2997715d7d352629f8bc6f7c700fce7fa04f291d3507dc421e1382a104dc264395e83 SHA512 8a346864dd88ac393f7080c4a073b20f21dfd547c2517abdd963beb50b9ac49565487a9508b042eb5d00055b2a5bef8db245cfa94c36ba1a60922caaae8bc4e0
+AUX 3.7/syslog-ng.rc6 1919 BLAKE2B 5769cd9f4464dbdde9a8af7b700292f59772132b3f32cf542b4cb4f596541c7f244c906d236650f09921c131e84722813578493b36e8d8281df401a1d127d3c9 SHA512 2681f6b1c4acd9fbb9e29b4b732c09b8384ffdb501aed15bbaac97409cc79269f2e5068dac5746bfcc52751c5943279c3cce5d3f869b4c6ec2cc5f23d2ad3b04
+AUX README.hardened 358 BLAKE2B a816cf461b4c3553e979c309ced21537841e24ad805b67f43d5bf06fb77b86959a75c7680df87e7ded7fd72073ad469a06bdec1e739784c82776d04a91bd3add SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e
+AUX patches/syslog-ng-3.12.1-json-c-0.13+.patch 862 BLAKE2B aeab5c994f0c9e5c3909300f5f8b56ed22194746f95b6cc2f6e600dbe04c9f4016b3f1d085c222f0d7d6922765f71c56d1bd3ac1757b1ca07d11c9d15a6fc1b4 SHA512 ded991eeee706e4d51f48e803db75d39e907f83aaf9cb9994eef146ba8d7cc784e5d3890eb18acdb4ff2702dcf8291686c6975ba3b0c4f0d3817a301ae81a641
+AUX patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch 929 BLAKE2B d3d0b94c30364e9663b2c7d672f24c03643a0fe0e5954df3a4b90f7108321858e529b22fc596ea85caf34ff5fd78b01cd6e4f2233fe282816e844b6194040948 SHA512 744c4b16df09ae14a09211d7e7a19e02723be2464a81d16586273e88973e7dbe0e2803326b7171a043889f127a8bb976fc0266d826e5632bd498f736e4d5acca
+AUX patches/syslog-ng-3.14.1-fix-tls-client.patch 6248 BLAKE2B 8671b724886a62bbd9e61987a6e7e95ed5773278b6fd8cb1c2ba3285ba4c6589190484386da9d8865326f3588937b825a738462e7a935363d103942982c68dd4 SHA512 1999cc1107d8b22a58f5919a8bc0f8930d0c60170bb9f23a20e25f49f84f8d10ceecd6903de9cd7cc738dbc8cdec690880be400f5dafc3b06ae88681d4848694
+AUX syslog-ng.conf.gentoo.fbsd.in 591 BLAKE2B 47cdf8975a0cb083d6f6633e812fcb872155cb126bceac2d17be3b9f4cf0ff692e32905ddbcc72d80168bda1fc9b3c3691cc416d7570cdf675b3b35d3824e98c SHA512 8e4cddbcf08b91f3ffef69c0766ee59191ecff33d9e6ad4810f7f383a83f0fed7e2975b82868b80ee4aafae2cc95ee3e4ee9b212ac701dc5b6f0dcecdd7ad088
+AUX syslog-ng.conf.gentoo.hardened.in 4512 BLAKE2B ed6b3fdfc8cdc68899bb9b89998c01190d0d0839726df0953e8a92e21d6311ecd1c53fa5854ce7dc542fe3660dce2879f2a93a22ac8b6114a1a9f1a6616b1be6 SHA512 3fd24e1483552c3c5c142dc87cacf3efc7a6286d71bd7d894b8587e15e7993cb88a9a08c0b67ecaa7f015fcbf96f9022946c5770ff2b653728e0f213dd08e284
+AUX syslog-ng.conf.gentoo.in 1198 BLAKE2B a95b1fb9f46655502a41b0381c7388c9b54cfe9b8c3fd68dc68bd473175688e8ae72145a0ef718ef65220ecced7ecab00b39755cf41d4e21a6d375059cf6f309 SHA512 2830d1c5071a50c4aea6288b35c2880988111f29a11a641ee89f001a4ca4319943f87fdb1fd7079988888efa55401e2ed62f7a507c452de137f2e97a445d60e1
+AUX syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530903659828565018dff71d62e56bfba28afa6c5e9fcb55aee2a41bcfff53c9ad006ee319124adbd66a SHA512 c945d27560afa310ac7f15e0cde3a564d5296892c747827d68df1b49c728998b056b596f93ac2564a5cb349f88db6585de58ec64cdaa13b92f20f5aac213ef44
+AUX syslog-ng.logrotate 231 BLAKE2B ede8c2e3bd6fa67b2740bca74fa45e799a88dcb9aac456df4fbad5db919f0ac8671b7e073efa1d7fdf1f2c119521d6fe8d5e6d4209b0fb09062e8499bd3377be SHA512 f8dfdbc4ea59c4cbb500b9ac0d4f8c7e33d0510049c7945ee1ae50039dc011b1ca2835c18ee145bf3d9ca306aca0d0de879735c3298b8a0f944db6ba4747ab1b
+AUX syslog-ng.logrotate.hardened 1614 BLAKE2B c9845bb43bd09a210f06912131dd2ba88164f0dc58f9d81455c13bba0ee923d1b9a6025f6b8e5fd066254bf6d0c81588b8d515aa055da157c29aaa0aa63fd700 SHA512 141b0ce95ca8ea6a9faf1f94ae1feffceffae19dbd4337c55d7dd4e554d41b7b8846680fab77f361ff4bf6093e3fe239fd3cec32dbb56ddc7b5e0f40bc054760
+AUX syslog-ng.logrotate.hardened.in 1518 BLAKE2B c13fd2707266edef0e74476aaf8446c8f77d2ffa8508cd7b8c32d13a22ff63bc883ac7a79f21287681b906430ecb05bae7665c064adbe161e4e1647e3ace9c29 SHA512 43ab59f037d6955844ba9a12675b745351fd3144dc1db8b81fe1c6ef48798452ac9a6d94caa68978dae396eceaa1a6d476fc99221989cb40265d6bb9dbbbf620
+AUX syslog-ng.logrotate.in 219 BLAKE2B acfde709749d11790b451e3f9a0d9bc33f129e86e3f68bdd36cf2d2c9c5561c5308805aea36378e8d79995e1bf173e4471845805681be2c409b52479333c35d8 SHA512 7a838006ce61c9702d6ea77672affa8cb1dc2ec2c6a1a268a4ae4f5a59dcac1ccfe835d25144ef8376a60a11227fa64e38dc16f8d0eaff182f14a6644a3a5ceb
+AUX syslog-ng.rc 1894 BLAKE2B 589c512657b46c19a3c407249382bfac951725aa2a389390f8ee911ceca363768618fd5cb6010f9294c6b977ce40e08ad0f4c085b293e6eac7bc094e95befda5 SHA512 4af1a8352c11280e17206ec60f12d85a882d11adcc60c88c86fbf45b786e71a1a3004b657a69c5f17692679a161d79e02197dc03a41f1e79b080a9a419f5b2cc
+DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
+DIST syslog-ng-3.14.1.tar.gz 9039910 BLAKE2B 688eb52557c41a2556835978809b74ef4cc6b78e54580c4f349a8b9ebc07a6cf5ab99d8cda2a0212cb0186fe9e0a276d46ab9846c5ed1c391d734596ccc2d0a9 SHA512 86e5b59f76de3f585781accc9e426b2f74a73a560a6b49364e3f2b71b6fdd382b8473b468ac396e09c1dd0e00aa525a25874af67ce6c81978df2995c9b920aa7
+DIST syslog-ng-3.15.1.tar.gz 9147238 BLAKE2B 86c51a51569efed2c2127a6102a10224a0599d40af0d34f28b5b52e314687851753f979a8d9edabdba02d347407b1b2856bce11991eeda53cbe10ad135934534 SHA512 79b4f2eff92bcbfe8a875bc72eb98bb43d86ef3c63deaf4acefcdad4f3a98df9de4e7935fc2ebbe017fd5eb22aa0743f1ff428d0ccf3790a1767f4e25c6a7b13
+DIST syslog-ng-3.16.1.tar.gz 8899693 BLAKE2B 850d83ff6f7e2db4aaf0737cc97403084bfa97855df28ccc8134c7d744cc0539e5d9efcd72f7eaa5407504897bc274419963843afa4c81964732dc5d6f0337cd SHA512 6b47e570ac19154f6158d8de0898c0a49e87d4ed51cae67224501e9460063efc53c4b2ad518d7def811d320f88cbefbf5d645de31f300498921652d7be305999
+DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
+EBUILD syslog-ng-3.13.2.ebuild 4695 BLAKE2B d026ac7e37138dd621abcd9138f63e3ea70a950af5dcfb8e2321def753c6d26f84c07c74341f919e79aded8803694d9b4a18bdf3acfe0e1ee473777201221df9 SHA512 61e87012b39fbccd4c08c19b6f4e5d92694831c6b8f8b795b180098ca02c2878461574d0f26be9b200a06f20995bd472908b8ac174fd455823ec0d2ccc724bb7
+EBUILD syslog-ng-3.14.1.ebuild 4800 BLAKE2B 827277cd46a8484ab39656177f1bdbe4ee1e4e8715257289aa4642835f6bf5030c006b4147d9faf07888526e5dfc724967dd95efbb102867e2c2d5d3db03029c SHA512 5e36a93088045183cb8c2dc55809cef3412c1872f3eea356dd96569553d12d3fc3df624870d9b5a66558087781efd0769a880c35253485fdf6697e2371092563
+EBUILD syslog-ng-3.15.1.ebuild 4767 BLAKE2B c15f68a8d083a878ce7b12cb53a4d6515c0ba90b313a465a5e01b32d730a17070a57dc9a8b93a29ef02119b5a25090e013f89c378daa89c1d22330971442eb4f SHA512 18f5ee084f6494103b3046cd1aabfdd9f0039933d689acc154ef032e551798fa2c8abb1cbb91663a4bf9627687930e2cb3ada9d0db0b60ce49048699a69f5e47
+EBUILD syslog-ng-3.16.1.ebuild 4850 BLAKE2B aab49b02f504139fbc8c09a310dc3e32d0f11adfa3784643af55c898f959dcfcf6c81d4b4eeabe8fbb4674c20463d8f854e227fc35276907eb16c2bfa95b0cda SHA512 f6c7a21e0bb4c5a8bce3a0c9b8c00a4af55dc66cfd3ad9bfafd6e7a753eb0d963229d7837253422d58ac99e05c799ead6fa14bc7a13087da75d8510e2e0bc8ba
+EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
+MISC metadata.xml 1080 BLAKE2B 913203dd1c18414dfb03794e9053151638c56bbb306b9da3c731c64e392a126a30adc38f8516b99c3c5cec024675e9779a10bdd5178f8e87f8bee2ad0b08044b SHA512 4d776d710534634a84d1415f93e3412a580319bf2580451fb27581ca498d2ca81747d3247aaaadde10319b82cefd36e9d29899778ce918838a583aec17130f00
diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo
new file mode 100644
index 000000000000..ee8c76a7f535
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo
@@ -0,0 +1,36 @@
+@version: 3.13
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200);
+	# The default action of syslog-ng is to log a MARK line
+	# to the file every 20 minutes.  That's seems high for most
+	# people so turn it down to once an hour.  Set it to zero
+	# if you don't want the functionality at all.
+	mark_freq(3600);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.fbsd
new file mode 100644
index 000000000000..e9122a89061a
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.fbsd
@@ -0,0 +1,24 @@
+@version: 3.13
+#
+# Syslog-ng default configuration file for Gentoo FreeBSD
+#
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.hardened
new file mode 100644
index 000000000000..db6e7f0a1ce1
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.hardened
@@ -0,0 +1,115 @@
+@version: 3.13
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+#
+# Syslog-ng configuration file, compatible with default hardened installations.
+#
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+	stats_freq(43200);
+};
+
+source src {
+    system();
+    internal();
+};
+
+source kernsrc {
+    file("/proc/kmsg");
+};
+
+#source net { udp(); };
+#log { source(net); destination(net_logs); };
+#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
+
+destination authlog { file("/var/log/auth.log"); };
+destination _syslog { file("/var/log/syslog"); };
+destination cron { file("/var/log/cron.log"); };
+destination daemon { file("/var/log/daemon.log"); };
+destination kern { file("/var/log/kern.log"); };
+destination lpr { file("/var/log/lpr.log"); };
+destination user { file("/var/log/user.log"); };
+destination uucp { file("/var/log/uucp.log"); };
+#destination ppp { file("/var/log/ppp.log"); };
+destination mail { file("/var/log/mail.log"); };
+
+destination avc { file("/var/log/avc.log"); };
+destination audit { file("/var/log/audit.log"); };
+destination pax { file("/var/log/pax.log"); };
+destination grsec { file("/var/log/grsec.log"); };
+
+destination mailinfo { file("/var/log/mail.info"); };
+destination mailwarn { file("/var/log/mail.warn"); };
+destination mailerr { file("/var/log/mail.err"); };
+
+destination newscrit { file("/var/log/news/news.crit"); };
+destination newserr { file("/var/log/news/news.err"); };
+destination newsnotice { file("/var/log/news/news.notice"); };
+
+destination debug { file("/var/log/debug"); };
+destination messages { file("/var/log/messages"); };
+destination console { usertty("root"); };
+destination console_all { file("/dev/tty12"); };
+#destination loghost { udp("loghost" port(999)); };
+
+destination xconsole { pipe("/dev/xconsole"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { not facility(authpriv, mail); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kern { facility(kern); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_user { facility(user); };
+filter f_uucp { facility(uucp); };
+#filter f_ppp { facility(ppp); };
+filter f_news { facility(news); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn)
+	and not facility(auth, authpriv, mail, news); };
+filter f_emergency { level(emerg); };
+
+filter f_info { level(info); };
+
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_crit { level(crit); };
+filter f_err { level(err); };
+
+filter f_avc { message(".*avc: .*"); };
+filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
+filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
+filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
+
+log { source(src); filter(f_authpriv); destination(authlog); };
+log { source(src); filter(f_syslog); destination(_syslog); };
+log { source(src); filter(f_cron); destination(cron); };
+log { source(src); filter(f_daemon); destination(daemon); };
+log { source(kernsrc); filter(f_kern); destination(kern); destination(console_all); };
+log { source(src); filter(f_lpr); destination(lpr); };
+log { source(src); filter(f_mail); destination(mail); };
+log { source(src); filter(f_user); destination(user); };
+log { source(src); filter(f_uucp); destination(uucp); };
+log { source(kernsrc); filter(f_pax); destination(pax); };
+log { source(kernsrc); filter(f_grsec); destination(grsec); };
+log { source(kernsrc); filter(f_audit); destination(audit); };
+log { source(kernsrc); filter(f_avc); destination(avc); };
+log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
+log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
+log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
+log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
+log { source(src); filter(f_news); filter(f_err); destination(newserr); };
+log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
+log { source(src); filter(f_debug); destination(debug); };
+log { source(src); filter(f_messages); destination(messages); };
+log { source(src); filter(f_emergency); destination(console); };
+#log { source(src); filter(f_ppp); destination(ppp); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.confd b/app-admin/syslog-ng/files/3.13/syslog-ng.confd
new file mode 100644
index 000000000000..42fa26ab4cf4
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.13/syslog-ng.confd
@@ -0,0 +1,42 @@
+# Config file for /etc/init.d/syslog-ng
+
+# If you are not using network logging, this entire section should be
+# commented out. Otherwise, choose one of the settings below based on
+# how you are configuring your network.
+#
+# If you are using the net.* scripts to configure your network, you should
+# set rc_need to match the interface through which your logging server
+# can be reached.
+#rc_need="net.eth0"
+#
+# If you are using an interface manager like wicd, dhcpcd in standalone
+# mode, networkmanager, etc to control your interfaces, set rc_need to
+# the name of that service.
+# rc_need="dhcpcd"
+#rc_need="networkmanager"
+#
+# If you are using newnet and configuring your interface statically with
+# the network script, you should use this setting.
+#rc_need="network"
+#
+# You can use this setting, but I do not recommend relying on it.
+#rc_need="net"
+#
+# You may also want to uncomment the following if you are using network
+# logging.
+#rc_use="stunnel"
+
+# For very customized setups these variables can be adjusted as needed
+# but for most situations they should remain commented:
+# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
+# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
+# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
+# SYSLOG_NG_PIDFILE_DIR=/run
+# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
+# SYSLOG_NG_GROUP=root
+# SYSLOG_NG_USER=root
+
+# Put any additional options for syslog-ng here.
+# See syslog-ng(8) for more information.
+
+SYSLOG_NG_OPTS=""
diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.rc b/app-admin/syslog-ng/files/3.13/syslog-ng.rc
new file mode 100644
index 000000000000..4a6f6451b7da
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.13/syslog-ng.rc
@@ -0,0 +1,58 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${SYSLOG_NG_CONFIGFILE:=/etc/syslog-ng/${RC_SVCNAME}.conf}
+: ${SYSLOG_NG_STATEFILE_DIR:=/var/lib/syslog-ng}
+: ${SYSLOG_NG_STATEFILE:=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
+: ${SYSLOG_NG_PIDFILE_DIR:=/run}
+: ${SYSLOG_NG_PIDFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
+
+: ${SYSLOG_NG_GROUP:=root}
+: ${SYSLOG_NG_USER:=root}
+
+command="/usr/sbin/syslog-ng"
+command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
+extra_commands="checkconfig"
+extra_started_commands="reload"
+pidfile="${SYSLOG_NG_PIDFILE}"
+start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
+description="Syslog-ng is a syslog replacement with advanced filtering features."
+description_checkconfig="Check the configuration file that will be used by \"start\""
+description_reload="Reload the configuration without exiting"
+required_files="${SYSLOG_NG_CONFIGFILE}"
+required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
+
+depend() {
+	use clock
+	need hostname localmount
+	after bootmisc
+	provide logger
+}
+
+checkconfig() {
+	ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
+	syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
+	eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
+}
+
+start_pre() {
+	checkconfig || return 1
+	checkpath \
+		-d \
+		--mode 0700 \
+		--owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
+		"${SYSLOG_NG_STATEFILE_DIR}"
+}
+
+stop_pre() {
+	[ "$RC_CMD" = "restart" ] && sleep 1
+	return 0
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading configuration and re-opening log files"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo
new file mode 100644
index 000000000000..7833f3aac376
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo
@@ -0,0 +1,36 @@
+@version: 3.14
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200);
+	# The default action of syslog-ng is to log a MARK line
+	# to the file every 20 minutes.  That's seems high for most
+	# people so turn it down to once an hour.  Set it to zero
+	# if you don't want the functionality at all.
+	mark_freq(3600);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.fbsd
new file mode 100644
index 000000000000..bb21cdf0f04d
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.fbsd
@@ -0,0 +1,24 @@
+@version: 3.14
+#
+# Syslog-ng default configuration file for Gentoo FreeBSD
+#
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.hardened
new file mode 100644
index 000000000000..51b41e8ea48b
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.hardened
@@ -0,0 +1,115 @@
+@version: 3.14
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+#
+# Syslog-ng configuration file, compatible with default hardened installations.
+#
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+	stats_freq(43200);
+};
+
+source src {
+    system();
+    internal();
+};
+
+source kernsrc {
+    file("/proc/kmsg");
+};
+
+#source net { udp(); };
+#log { source(net); destination(net_logs); };
+#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
+
+destination authlog { file("/var/log/auth.log"); };
+destination _syslog { file("/var/log/syslog"); };
+destination cron { file("/var/log/cron.log"); };
+destination daemon { file("/var/log/daemon.log"); };
+destination kern { file("/var/log/kern.log"); };
+destination lpr { file("/var/log/lpr.log"); };
+destination user { file("/var/log/user.log"); };
+destination uucp { file("/var/log/uucp.log"); };
+#destination ppp { file("/var/log/ppp.log"); };
+destination mail { file("/var/log/mail.log"); };
+
+destination avc { file("/var/log/avc.log"); };
+destination audit { file("/var/log/audit.log"); };
+destination pax { file("/var/log/pax.log"); };
+destination grsec { file("/var/log/grsec.log"); };
+
+destination mailinfo { file("/var/log/mail.info"); };
+destination mailwarn { file("/var/log/mail.warn"); };
+destination mailerr { file("/var/log/mail.err"); };
+
+destination newscrit { file("/var/log/news/news.crit"); };
+destination newserr { file("/var/log/news/news.err"); };
+destination newsnotice { file("/var/log/news/news.notice"); };
+
+destination debug { file("/var/log/debug"); };
+destination messages { file("/var/log/messages"); };
+destination console { usertty("root"); };
+destination console_all { file("/dev/tty12"); };
+#destination loghost { udp("loghost" port(999)); };
+
+destination xconsole { pipe("/dev/xconsole"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { not facility(authpriv, mail); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kern { facility(kern); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_user { facility(user); };
+filter f_uucp { facility(uucp); };
+#filter f_ppp { facility(ppp); };
+filter f_news { facility(news); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn)
+	and not facility(auth, authpriv, mail, news); };
+filter f_emergency { level(emerg); };
+
+filter f_info { level(info); };
+
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_crit { level(crit); };
+filter f_err { level(err); };
+
+filter f_avc { message(".*avc: .*"); };
+filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
+filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
+filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
+
+log { source(src); filter(f_authpriv); destination(authlog); };
+log { source(src); filter(f_syslog); destination(_syslog); };
+log { source(src); filter(f_cron); destination(cron); };
+log { source(src); filter(f_daemon); destination(daemon); };
+log { source(kernsrc); filter(f_kern); destination(kern); destination(console_all); };
+log { source(src); filter(f_lpr); destination(lpr); };
+log { source(src); filter(f_mail); destination(mail); };
+log { source(src); filter(f_user); destination(user); };
+log { source(src); filter(f_uucp); destination(uucp); };
+log { source(kernsrc); filter(f_pax); destination(pax); };
+log { source(kernsrc); filter(f_grsec); destination(grsec); };
+log { source(kernsrc); filter(f_audit); destination(audit); };
+log { source(kernsrc); filter(f_avc); destination(avc); };
+log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
+log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
+log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
+log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
+log { source(src); filter(f_news); filter(f_err); destination(newserr); };
+log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
+log { source(src); filter(f_debug); destination(debug); };
+log { source(src); filter(f_messages); destination(messages); };
+log { source(src); filter(f_emergency); destination(console); };
+#log { source(src); filter(f_ppp); destination(ppp); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.14/syslog-ng.confd b/app-admin/syslog-ng/files/3.14/syslog-ng.confd
new file mode 100644
index 000000000000..9ddeda7e0987
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.14/syslog-ng.confd
@@ -0,0 +1,43 @@
+# Config file for /etc/init.d/syslog-ng
+
+# If you are not using network logging, this entire section should be
+# commented out. Otherwise, choose one of the settings below based on
+# how you are configuring your network.
+#
+# If you are using the net.* scripts to configure your network, you should
+# set rc_need to match the interface through which your logging server
+# can be reached.
+#rc_need="net.eth0"
+#
+# If you are using an interface manager like wicd, dhcpcd in standalone
+# mode, networkmanager, etc to control your interfaces, set rc_need to
+# the name of that service.
+# rc_need="dhcpcd"
+#rc_need="networkmanager"
+#
+# If you are using newnet and configuring your interface statically with
+# the network script, you should use this setting.
+#rc_need="network"
+#
+# You can use this setting, but I do not recommend relying on it.
+#rc_need="net"
+#
+# You may also want to uncomment the following if you are using network
+# logging.
+#rc_use="stunnel"
+
+# For very customized setups these variables can be adjusted as needed
+# but for most situations they should remain commented:
+# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
+# SYSLOG_NG_CONTROLFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.ctl
+# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
+# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
+# SYSLOG_NG_PIDFILE_DIR=/run
+# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
+# SYSLOG_NG_GROUP=root
+# SYSLOG_NG_USER=root
+
+# Put any additional options for syslog-ng here.
+# See syslog-ng(8) for more information.
+
+SYSLOG_NG_OPTS=""
diff --git a/app-admin/syslog-ng/files/3.14/syslog-ng.rc b/app-admin/syslog-ng/files/3.14/syslog-ng.rc
new file mode 100644
index 000000000000..fddf34c4ecda
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.14/syslog-ng.rc
@@ -0,0 +1,59 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${SYSLOG_NG_CONFIGFILE:=/etc/syslog-ng/${RC_SVCNAME}.conf}
+: ${SYSLOG_NG_STATEFILE_DIR:=/var/lib/${RC_SVCNAME}}
+: ${SYSLOG_NG_STATEFILE:=${SYSLOG_NG_STATEFILE_DIR}/${RC_SVCNAME}.persist}
+: ${SYSLOG_NG_PIDFILE_DIR:=/run}
+: ${SYSLOG_NG_PIDFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
+: ${SYSLOG_NG_CONTROLFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.ctl}
+
+: ${SYSLOG_NG_GROUP:=root}
+: ${SYSLOG_NG_USER:=root}
+
+command="/usr/sbin/syslog-ng"
+command_args="--cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --control \"${SYSLOG_NG_CONTROLFILE}\" --persist-file \"${SYSLOG_NG_STATEFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
+command_user="${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}"
+extra_commands="checkconfig"
+extra_started_commands="reload"
+pidfile="${SYSLOG_NG_PIDFILE}"
+description="Syslog-ng is a syslog replacement with advanced filtering features."
+description_checkconfig="Check the configuration file that will be used by \"start\""
+description_reload="Reload the configuration without exiting"
+required_files="${SYSLOG_NG_CONFIGFILE}"
+required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
+
+depend() {
+	use clock
+	need hostname localmount
+	after bootmisc
+	provide logger
+}
+
+checkconfig() {
+	ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
+	syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
+	eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
+}
+
+start_pre() {
+	checkconfig || return 1
+	checkpath \
+		-d \
+		--mode 0700 \
+		--owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
+		"${SYSLOG_NG_STATEFILE_DIR}"
+}
+
+stop_pre() {
+	[ "$RC_CMD" = "restart" ] && sleep 1
+	return 0
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading configuration and re-opening log files"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo
new file mode 100644
index 000000000000..131dea1f71ad
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo
@@ -0,0 +1,36 @@
+@version: 3.7
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+options { 
+	threaded(yes);
+	chain_hostnames(no); 
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200); 
+	# The default action of syslog-ng is to log a MARK line
+	# to the file every 20 minutes.  That's seems high for most
+	# people so turn it down to once an hour.  Set it to zero
+	# if you don't want the functionality at all.
+	mark_freq(3600); 
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd
new file mode 100644
index 000000000000..eb2e3d986e6d
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd
@@ -0,0 +1,24 @@
+@version: 3.7
+#
+# Syslog-ng default configuration file for Gentoo FreeBSD
+#
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200); 
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.hardened
new file mode 100644
index 000000000000..b7443f0bd66a
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.hardened
@@ -0,0 +1,114 @@
+@version: 3.7
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+#
+# Syslog-ng configuration file, compatible with default hardened installations.
+#
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+	stats_freq(43200);
+};
+
+source src {
+    unix-dgram("/dev/log");
+    internal();
+};
+source kernsrc {
+    file("/proc/kmsg");
+};
+
+#source net { udp(); };
+#log { source(net); destination(net_logs); };
+#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
+
+destination authlog { file("/var/log/auth.log"); };
+destination _syslog { file("/var/log/syslog"); };
+destination cron { file("/var/log/cron.log"); };
+destination daemon { file("/var/log/daemon.log"); };
+destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
+destination lpr { file("/var/log/lpr.log"); };
+destination user { file("/var/log/user.log"); };
+destination uucp { file("/var/log/uucp.log"); };
+#destination ppp { file("/var/log/ppp.log"); };
+destination mail { file("/var/log/mail.log"); };
+
+destination avc { file("/var/log/avc.log"); };
+destination audit { file("/var/log/audit.log"); };
+destination pax { file("/var/log/pax.log"); };
+destination grsec { file("/var/log/grsec.log"); };
+
+destination mailinfo { file("/var/log/mail.info"); };
+destination mailwarn { file("/var/log/mail.warn"); };
+destination mailerr { file("/var/log/mail.err"); };
+
+destination newscrit { file("/var/log/news/news.crit"); };
+destination newserr { file("/var/log/news/news.err"); };
+destination newsnotice { file("/var/log/news/news.notice"); };
+
+destination debug { file("/var/log/debug"); };
+destination messages { file("/var/log/messages"); };
+destination console { usertty("root"); };
+destination console_all { file("/dev/tty12"); };
+#destination loghost { udp("loghost" port(999)); };
+
+destination xconsole { pipe("/dev/xconsole"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { not facility(authpriv, mail); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kern { facility(kern); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_user { facility(user); };
+filter f_uucp { facility(uucp); };
+#filter f_ppp { facility(ppp); };
+filter f_news { facility(news); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn)
+	and not facility(auth, authpriv, mail, news); };
+filter f_emergency { level(emerg); };
+
+filter f_info { level(info); };
+
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_crit { level(crit); };
+filter f_err { level(err); };
+
+filter f_avc { message(".*avc: .*"); };
+filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
+filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
+filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
+
+log { source(src); filter(f_authpriv); destination(authlog); };
+log { source(src); filter(f_syslog); destination(_syslog); };
+log { source(src); filter(f_cron); destination(cron); };
+log { source(src); filter(f_daemon); destination(daemon); };
+log { source(kernsrc); filter(f_kern); destination(kern); };
+log { source(src); filter(f_lpr); destination(lpr); };
+log { source(src); filter(f_mail); destination(mail); };
+log { source(src); filter(f_user); destination(user); };
+log { source(src); filter(f_uucp); destination(uucp); };
+log { source(kernsrc); filter(f_pax); destination(pax); };
+log { source(kernsrc); filter(f_grsec); destination(grsec); };
+log { source(kernsrc); filter(f_audit); destination(audit); };
+log { source(kernsrc); filter(f_avc); destination(avc); };
+log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
+log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
+log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
+log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
+log { source(src); filter(f_news); filter(f_err); destination(newserr); };
+log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
+log { source(src); filter(f_debug); destination(debug); };
+log { source(src); filter(f_messages); destination(messages); };
+log { source(src); filter(f_emergency); destination(console); };
+#log { source(src); filter(f_ppp); destination(ppp); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.confd b/app-admin/syslog-ng/files/3.7/syslog-ng.confd
new file mode 100644
index 000000000000..42fa26ab4cf4
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.confd
@@ -0,0 +1,42 @@
+# Config file for /etc/init.d/syslog-ng
+
+# If you are not using network logging, this entire section should be
+# commented out. Otherwise, choose one of the settings below based on
+# how you are configuring your network.
+#
+# If you are using the net.* scripts to configure your network, you should
+# set rc_need to match the interface through which your logging server
+# can be reached.
+#rc_need="net.eth0"
+#
+# If you are using an interface manager like wicd, dhcpcd in standalone
+# mode, networkmanager, etc to control your interfaces, set rc_need to
+# the name of that service.
+# rc_need="dhcpcd"
+#rc_need="networkmanager"
+#
+# If you are using newnet and configuring your interface statically with
+# the network script, you should use this setting.
+#rc_need="network"
+#
+# You can use this setting, but I do not recommend relying on it.
+#rc_need="net"
+#
+# You may also want to uncomment the following if you are using network
+# logging.
+#rc_use="stunnel"
+
+# For very customized setups these variables can be adjusted as needed
+# but for most situations they should remain commented:
+# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
+# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
+# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
+# SYSLOG_NG_PIDFILE_DIR=/run
+# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
+# SYSLOG_NG_GROUP=root
+# SYSLOG_NG_USER=root
+
+# Put any additional options for syslog-ng here.
+# See syslog-ng(8) for more information.
+
+SYSLOG_NG_OPTS=""
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.rc6 b/app-admin/syslog-ng/files/3.7/syslog-ng.rc6
new file mode 100644
index 000000000000..a27ae55dcbdf
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.rc6
@@ -0,0 +1,58 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
+SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
+SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
+SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run}
+SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
+
+SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
+SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
+
+command="/usr/sbin/syslog-ng"
+command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
+extra_commands="checkconfig"
+extra_started_commands="reload"
+pidfile="${SYSLOG_NG_PIDFILE}"
+start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
+description="Syslog-ng is a syslog replacement with advanced filtering features."
+description_checkconfig="Check the configuration file that will be used by \"start\""
+description_reload="Reload the configuration without exiting"
+required_files="${SYSLOG_NG_CONFIGFILE}"
+required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
+
+depend() {
+	use clock
+	need hostname localmount
+	after bootmisc
+	provide logger
+}
+
+checkconfig() {
+	ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
+	syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
+	eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
+}
+
+start_pre() {
+	checkconfig || return 1
+	checkpath \
+		-d \
+		--mode 0700 \
+		--owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
+		"${SYSLOG_NG_STATEFILE_DIR}"
+}
+
+stop_pre() {
+	[ "$RC_CMD" = restart ] && sleep 1
+	return 0
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading configuration and re-opening log files"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/app-admin/syslog-ng/files/README.hardened b/app-admin/syslog-ng/files/README.hardened
new file mode 100644
index 000000000000..dcb0fc3f3ae2
--- /dev/null
+++ b/app-admin/syslog-ng/files/README.hardened
@@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+If you intend to use syslog-ng together with the systemd journal,
+please be sure to configure it to listen accordingly, e.g. replace
+
+    unix-dgram("/dev/log");
+
+with
+
+    unix-dgram("/run/systemd/journal/syslog");
+
+in /etc/syslog-ng/syslog-ng.conf
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch b/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch
new file mode 100644
index 000000000000..3703bec22ba1
--- /dev/null
+++ b/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch
@@ -0,0 +1,33 @@
+From 1b824dd6389e209eab752d5a698c6093f311e3e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
+Date: Mon, 11 Dec 2017 15:46:06 +0100
+Subject: [PATCH] modules/json: Adaptions for json-c v0.13
+
+---
+ modules/json/json-parser.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/modules/json/json-parser.c b/modules/json/json-parser.c
+index 0368ed8f7..356df48b9 100644
+--- a/modules/json/json-parser.c
++++ b/modules/json/json-parser.c
+@@ -20,6 +20,8 @@
+  * COPYING for details.
+  */
+ 
++#define JSON_C_VER_013 (13 << 8)
++
+ #include "json-parser.h"
+ #include "dot-notation.h"
+ #include "scratch-buffers.h"
+@@ -28,7 +30,10 @@
+ #include <ctype.h>
+ 
+ #include <json.h>
++
++#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
+ #include <json_object_private.h>
++#endif
+ 
+ typedef struct _JSONParser
+ {
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch b/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch
new file mode 100644
index 000000000000..4339612f58c8
--- /dev/null
+++ b/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch
@@ -0,0 +1,23 @@
+From 41dd64e7b11d527f8f3cc6ae13067d0225191538 Mon Sep 17 00:00:00 2001
+From: kokan <peter.kokai@balabit.com>
+Date: Sat, 31 Mar 2018 15:36:08 +0200
+Subject: [PATCH] libsyslog-ng: missing dependency libsecret-storage
+
+Signed-off-by: kokan <peter.kokai@balabit.com>
+---
+ lib/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index af2f44ece2..4a0b11c92f 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -47,7 +47,7 @@ lib_libsyslog_ng_la_LDFLAGS		= -no-undefined -release ${LSNG_RELEASE} \
+ 
+ lib_test_subdirs			= lib_filter lib_logproto lib_parser lib_rewrite lib_template lib_stats lib_control
+ 
+-lib_libsyslog_ng_la_DEPENDENCIES	= lib/eventlog/src/libevtlog.la
++lib_libsyslog_ng_la_DEPENDENCIES       = lib/eventlog/src/libevtlog.la lib/secret-storage/libsecret-storage.la
+ 
+ if IVYKIS_INTERNAL
+ lib_libsyslog_ng_la_DEPENDENCIES	+= lib/ivykis/src/libivykis.la
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch b/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch
new file mode 100644
index 000000000000..b4046bdbadb1
--- /dev/null
+++ b/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch
@@ -0,0 +1,173 @@
+From a4f7b9dc75c2b678466cc104d8ca111bd90fba11 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady@balabit.com>
+Date: Wed, 7 Mar 2018 18:35:09 +0100
+Subject: [PATCH 1/3] tls: fix tls_context_load_key_and_cert()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+key_file and cert_file are optional (the client cert is not mandatory).
+
+Signed-off-by: László Várady <laszlo.varady@balabit.com>
+---
+ lib/tlscontext.c                         | 9 +++++++++
+ modules/afsocket/transport-mapper-inet.c | 6 +++---
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/lib/tlscontext.c b/lib/tlscontext.c
+index 510ac2738d..b202c397f3 100644
+--- a/lib/tlscontext.c
++++ b/lib/tlscontext.c
+@@ -599,9 +599,18 @@ _are_key_and_cert_files_accessible(TLSContext *self)
+          file_exists(self->cert_file);
+ }
+ 
++static gboolean
++_client_key_and_cert_files_are_not_specified(TLSContext *self)
++{
++  return self->mode == TM_CLIENT && (!self->key_file && !self->cert_file);
++}
++
+ static TLSContextLoadResult
+ tls_context_load_key_and_cert(TLSContext *self)
+ {
++  if (_client_key_and_cert_files_are_not_specified(self))
++    return TLS_CONTEXT_OK;
++
+   if (!_are_key_and_cert_files_accessible(self))
+     return TLS_CONTEXT_FILE_ACCES_ERROR;
+   if (!SSL_CTX_use_PrivateKey_file(self->ssl_ctx, self->key_file, SSL_FILETYPE_PEM))
+diff --git a/modules/afsocket/transport-mapper-inet.c b/modules/afsocket/transport-mapper-inet.c
+index 80c0d21801..1afb34b33f 100644
+--- a/modules/afsocket/transport-mapper-inet.c
++++ b/modules/afsocket/transport-mapper-inet.c
+@@ -176,17 +176,17 @@ transport_mapper_inet_async_init(TransportMapper *s, TransportMapperAsyncInitCB
+ 
+   TLSContextSetupResult tls_ctx_setup_res = tls_context_setup_context(self->tls_context);
+ 
++  const gchar *key = tls_context_get_key_file(self->tls_context);
++
+   if (tls_ctx_setup_res == TLS_CONTEXT_SETUP_OK)
+     {
+-      const gchar *key = tls_context_get_key_file(self->tls_context);
+-      if (secret_storage_contains_key(key))
++      if (key && secret_storage_contains_key(key))
+         secret_storage_update_status(key, SECRET_STORAGE_SUCCESS);
+       return func(func_args);
+     }
+ 
+   if (tls_ctx_setup_res == TLS_CONTEXT_SETUP_BAD_PASSWORD)
+     {
+-      const gchar *key = tls_context_get_key_file(self->tls_context);
+       msg_error("Error setting up TLS context",
+                 evt_tag_str("keyfile", key));
+       call_finalize_init_args *args = g_new0(call_finalize_init_args, 1);
+
+From 9e3eae23330442c9e58ae5ccc732457f2d0e694e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady@balabit.com>
+Date: Wed, 7 Mar 2018 19:39:24 +0100
+Subject: [PATCH 2/3] tlscontext: fix error logging of cert_file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+file_exists() has a side effect: it logs when the file can't be opened.
+
+Since the && operator is evaluated lazily, the error messages of cert_file
+were not displayed when the first invocation of file_exists failed
+(on key_file).
+
+Signed-off-by: László Várady <laszlo.varady@balabit.com>
+---
+ lib/tlscontext.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/lib/tlscontext.c b/lib/tlscontext.c
+index b202c397f3..5a503387c4 100644
+--- a/lib/tlscontext.c
++++ b/lib/tlscontext.c
+@@ -595,8 +595,10 @@ tls_context_load_pkcs12(TLSContext *self)
+ static gboolean
+ _are_key_and_cert_files_accessible(TLSContext *self)
+ {
+-  return file_exists(self->key_file) &&
+-         file_exists(self->cert_file);
++  gboolean key_file_exists = file_exists(self->key_file);
++  gboolean cert_file_exists = file_exists(self->cert_file);
++
++  return key_file_exists && cert_file_exists;
+ }
+ 
+ static gboolean
+
+From 3eef78b6ac8016d3eb33b36bd98419d5b086767f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady@balabit.com>
+Date: Wed, 7 Mar 2018 19:43:41 +0100
+Subject: [PATCH 3/3] tlscontext: rename file_exists() to is_file_accessible()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: László Várady <laszlo.varady@balabit.com>
+---
+ lib/tlscontext.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/lib/tlscontext.c b/lib/tlscontext.c
+index 5a503387c4..73015d2462 100644
+--- a/lib/tlscontext.c
++++ b/lib/tlscontext.c
+@@ -322,7 +322,7 @@ tls_session_free(TLSSession *self)
+ }
+ 
+ static gboolean
+-file_exists(const gchar *fname)
++_is_file_accessible(const gchar *fname)
+ {
+   if (!fname)
+     return FALSE;
+@@ -444,7 +444,7 @@ _is_dh_valid(DH *dh)
+ static DH *
+ _load_dh_from_file(const gchar *dhparam_file)
+ {
+-  if (!file_exists(dhparam_file))
++  if (!_is_file_accessible(dhparam_file))
+     return NULL;
+ 
+   BIO *bio = BIO_new_file(dhparam_file, "r");
+@@ -528,7 +528,7 @@ tls_context_setup_dh(TLSContext *self)
+ static PKCS12 *
+ _load_pkcs12_file(const gchar *pkcs12_file)
+ {
+-  if (!file_exists(pkcs12_file))
++  if (!_is_file_accessible(pkcs12_file))
+     return NULL;
+ 
+   FILE *p12_file = fopen(pkcs12_file, "rb");
+@@ -595,10 +595,10 @@ tls_context_load_pkcs12(TLSContext *self)
+ static gboolean
+ _are_key_and_cert_files_accessible(TLSContext *self)
+ {
+-  gboolean key_file_exists = file_exists(self->key_file);
+-  gboolean cert_file_exists = file_exists(self->cert_file);
++  gboolean key_file_accessible = _is_file_accessible(self->key_file);
++  gboolean cert_file_accessible = _is_file_accessible(self->cert_file);
+ 
+-  return key_file_exists && cert_file_exists;
++  return key_file_accessible && cert_file_accessible;
+ }
+ 
+ static gboolean
+@@ -650,10 +650,10 @@ tls_context_setup_context(TLSContext *self)
+         goto error;
+     }
+ 
+-  if (file_exists(self->ca_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->ca_dir))
++  if (_is_file_accessible(self->ca_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->ca_dir))
+     goto error;
+ 
+-  if (file_exists(self->crl_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->crl_dir))
++  if (_is_file_accessible(self->crl_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->crl_dir))
+     goto error;
+ 
+   if (self->crl_dir)
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.in b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.in
new file mode 100644
index 000000000000..d9df76c7fbc2
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.in
@@ -0,0 +1,24 @@
+@version: @SYSLOGNG_VERSION@
+#
+# Syslog-ng default configuration file for Gentoo FreeBSD
+#
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.in b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.in
new file mode 100644
index 000000000000..845267390992
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.in
@@ -0,0 +1,115 @@
+@version: @SYSLOGNG_VERSION@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+#
+# Syslog-ng configuration file, compatible with default hardened installations.
+#
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+	stats_freq(43200);
+};
+
+source src {
+    system();
+    internal();
+};
+
+source kernsrc {
+    file("/proc/kmsg");
+};
+
+#source net { udp(); };
+#log { source(net); destination(net_logs); };
+#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
+
+destination authlog { file("/var/log/auth.log"); };
+destination _syslog { file("/var/log/syslog"); };
+destination cron { file("/var/log/cron.log"); };
+destination daemon { file("/var/log/daemon.log"); };
+destination kern { file("/var/log/kern.log"); };
+destination lpr { file("/var/log/lpr.log"); };
+destination user { file("/var/log/user.log"); };
+destination uucp { file("/var/log/uucp.log"); };
+#destination ppp { file("/var/log/ppp.log"); };
+destination mail { file("/var/log/mail.log"); };
+
+destination avc { file("/var/log/avc.log"); };
+destination audit { file("/var/log/audit.log"); };
+destination pax { file("/var/log/pax.log"); };
+destination grsec { file("/var/log/grsec.log"); };
+
+destination mailinfo { file("/var/log/mail.info"); };
+destination mailwarn { file("/var/log/mail.warn"); };
+destination mailerr { file("/var/log/mail.err"); };
+
+destination newscrit { file("/var/log/news/news.crit"); };
+destination newserr { file("/var/log/news/news.err"); };
+destination newsnotice { file("/var/log/news/news.notice"); };
+
+destination debug { file("/var/log/debug"); };
+destination messages { file("/var/log/messages"); };
+destination console { usertty("root"); };
+destination console_all { file("/dev/tty12"); };
+#destination loghost { udp("loghost" port(999)); };
+
+destination xconsole { pipe("/dev/xconsole"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { not facility(authpriv, mail); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kern { facility(kern); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_user { facility(user); };
+filter f_uucp { facility(uucp); };
+#filter f_ppp { facility(ppp); };
+filter f_news { facility(news); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn)
+	and not facility(auth, authpriv, mail, news); };
+filter f_emergency { level(emerg); };
+
+filter f_info { level(info); };
+
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_crit { level(crit); };
+filter f_err { level(err); };
+
+filter f_avc { message(".*avc: .*"); };
+filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
+filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
+filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
+
+log { source(src); filter(f_authpriv); destination(authlog); };
+log { source(src); filter(f_syslog); destination(_syslog); };
+log { source(src); filter(f_cron); destination(cron); };
+log { source(src); filter(f_daemon); destination(daemon); };
+log { source(kernsrc); filter(f_kern); destination(kern); destination(console_all); };
+log { source(src); filter(f_lpr); destination(lpr); };
+log { source(src); filter(f_mail); destination(mail); };
+log { source(src); filter(f_user); destination(user); };
+log { source(src); filter(f_uucp); destination(uucp); };
+log { source(kernsrc); filter(f_pax); destination(pax); };
+log { source(kernsrc); filter(f_grsec); destination(grsec); };
+log { source(kernsrc); filter(f_audit); destination(audit); };
+log { source(kernsrc); filter(f_avc); destination(avc); };
+log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
+log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
+log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
+log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
+log { source(src); filter(f_news); filter(f_err); destination(newserr); };
+log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
+log { source(src); filter(f_debug); destination(debug); };
+log { source(src); filter(f_messages); destination(messages); };
+log { source(src); filter(f_emergency); destination(console); };
+#log { source(src); filter(f_ppp); destination(ppp); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.in b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.in
new file mode 100644
index 000000000000..d889102f955f
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.in
@@ -0,0 +1,36 @@
+@version: @SYSLOGNG_VERSION@
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200);
+	# The default action of syslog-ng is to log a MARK line
+	# to the file every 20 minutes.  That's seems high for most
+	# people so turn it down to once an hour.  Set it to zero
+	# if you don't want the functionality at all.
+	mark_freq(3600);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.confd b/app-admin/syslog-ng/files/syslog-ng.confd
new file mode 100644
index 000000000000..9ddeda7e0987
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.confd
@@ -0,0 +1,43 @@
+# Config file for /etc/init.d/syslog-ng
+
+# If you are not using network logging, this entire section should be
+# commented out. Otherwise, choose one of the settings below based on
+# how you are configuring your network.
+#
+# If you are using the net.* scripts to configure your network, you should
+# set rc_need to match the interface through which your logging server
+# can be reached.
+#rc_need="net.eth0"
+#
+# If you are using an interface manager like wicd, dhcpcd in standalone
+# mode, networkmanager, etc to control your interfaces, set rc_need to
+# the name of that service.
+# rc_need="dhcpcd"
+#rc_need="networkmanager"
+#
+# If you are using newnet and configuring your interface statically with
+# the network script, you should use this setting.
+#rc_need="network"
+#
+# You can use this setting, but I do not recommend relying on it.
+#rc_need="net"
+#
+# You may also want to uncomment the following if you are using network
+# logging.
+#rc_use="stunnel"
+
+# For very customized setups these variables can be adjusted as needed
+# but for most situations they should remain commented:
+# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
+# SYSLOG_NG_CONTROLFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.ctl
+# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
+# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
+# SYSLOG_NG_PIDFILE_DIR=/run
+# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
+# SYSLOG_NG_GROUP=root
+# SYSLOG_NG_USER=root
+
+# Put any additional options for syslog-ng here.
+# See syslog-ng(8) for more information.
+
+SYSLOG_NG_OPTS=""
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate b/app-admin/syslog-ng/files/syslog-ng.logrotate
new file mode 100644
index 000000000000..ba4730e084f4
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate
@@ -0,0 +1,12 @@
+#
+# Syslog-ng logrotate snippet for Gentoo Linux
+# contributed by Michael Sterrett
+#
+
+/var/log/messages {
+    missingok
+    sharedscripts
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened
new file mode 100644
index 000000000000..678814a623fb
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened
@@ -0,0 +1,75 @@
+#
+# Syslog-ng logrotate snippet for Hardened Gentoo Linux
+# contributed by Maciej Grela
+#
+# Updated bug #284669
+
+# Generic
+/var/log/debug /var/log/syslog /var/log/kern.log {
+    sharedscripts
+    missingok
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
+
+# System services
+/var/log/cron.log /var/log/daemon.log /var/log/lpr.log /var/log/uucp.log {
+    sharedscripts
+    missingok
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
+
+# User log
+/var/log/user.log {
+    sharedscripts
+    missingok
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
+
+# News system
+/var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice {
+    sharedscripts
+    missingok
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
+
+# Mail system
+/var/log/mail.log /var/log/mail.info /var/log/mail.err /var/log/mail.warn {
+    sharedscripts
+    missingok
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
+
+# Hardened logs
+/var/log/avc.log /var/log/audit.log /var/log/pax.log /var/log/grsec.log {
+    sharedscripts
+    missingok
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
+
+# Authentication
+/var/log/auth.log {
+    sharedscripts
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
+
+# the rest
+/var/log/messages {
+    sharedscripts
+    postrotate
+        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+    endscript
+}
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
new file mode 100644
index 000000000000..21ec5eba69c3
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
@@ -0,0 +1,75 @@
+#
+# Syslog-ng logrotate snippet for Hardened Gentoo Linux
+# contributed by Maciej Grela
+#
+# Updated bug #284669
+
+# Generic
+/var/log/debug /var/log/syslog /var/log/kern.log {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# System services
+/var/log/cron.log /var/log/daemon.log /var/log/lpr.log /var/log/uucp.log {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# User log
+/var/log/user.log {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# News system
+/var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# Mail system
+/var/log/mail.log /var/log/mail.info /var/log/mail.err /var/log/mail.warn {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# Hardened logs
+/var/log/avc.log /var/log/audit.log /var/log/pax.log /var/log/grsec.log {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# Authentication
+/var/log/auth.log {
+    sharedscripts
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# the rest
+/var/log/messages {
+    sharedscripts
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.in b/app-admin/syslog-ng/files/syslog-ng.logrotate.in
new file mode 100644
index 000000000000..2e368bd1099a
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.in
@@ -0,0 +1,12 @@
+#
+# Syslog-ng logrotate snippet for Gentoo Linux
+# contributed by Michael Sterrett
+#
+
+/var/log/messages {
+    missingok
+    sharedscripts
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
diff --git a/app-admin/syslog-ng/files/syslog-ng.rc b/app-admin/syslog-ng/files/syslog-ng.rc
new file mode 100644
index 000000000000..c13e4b1d46f9
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.rc
@@ -0,0 +1,59 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${SYSLOG_NG_CONFIGFILE:=/etc/syslog-ng/${RC_SVCNAME}.conf}
+: ${SYSLOG_NG_STATEFILE_DIR:=/var/lib/${RC_SVCNAME}}
+: ${SYSLOG_NG_STATEFILE:=${SYSLOG_NG_STATEFILE_DIR}/${RC_SVCNAME}.persist}
+: ${SYSLOG_NG_PIDFILE_DIR:=/run}
+: ${SYSLOG_NG_PIDFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
+: ${SYSLOG_NG_CONTROLFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.ctl}
+
+: ${SYSLOG_NG_GROUP:=root}
+: ${SYSLOG_NG_USER:=root}
+
+command="/usr/sbin/syslog-ng"
+command_args="--cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --control \"${SYSLOG_NG_CONTROLFILE}\" --persist-file \"${SYSLOG_NG_STATEFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
+command_user="${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}"
+extra_commands="checkconfig"
+extra_started_commands="reload"
+pidfile="${SYSLOG_NG_PIDFILE}"
+description="Syslog-ng is a syslog replacement with advanced filtering features."
+description_checkconfig="Check the configuration file that will be used by \"start\""
+description_reload="Reload the configuration without exiting"
+required_files="${SYSLOG_NG_CONFIGFILE}"
+required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
+
+depend() {
+	use clock
+	need hostname localmount
+	after bootmisc
+	provide logger
+}
+
+checkconfig() {
+	ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
+	syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
+	eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
+}
+
+start_pre() {
+	checkconfig || return 1
+	checkpath \
+		-d \
+		--mode 0700 \
+		--owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
+		"${SYSLOG_NG_STATEFILE_DIR}"
+}
+
+stop_pre() {
+	[ "${RC_CMD}" = "restart" ] && sleep 1
+	return 0
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading configuration and re-opening log files"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
new file mode 100644
index 000000000000..42f30628ff47
--- /dev/null
+++ b/app-admin/syslog-ng/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hydrapolic@gmail.com</email>
+		<name>Tomáš Mózes</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="amqp">Enable support for AMQP destinations</flag>
+		<flag name="http">Enable support for HTTP destinations</flag>
+		<flag name="json">Enable support for JSON template formatting via <pkg>dev-libs/json-c</pkg></flag>
+		<flag name="mongodb">Enable support for mongodb destinations</flag>
+		<flag name="pacct">Enable support for reading Process Accounting files (EXPERIMENTAL, Linux only)</flag>
+		<flag name="redis">Enable support for Redis destinations</flag>
+		<flag name="smtp">Enable support for SMTP destinations</flag>
+		<flag name="spoof-source">Enable support for spoofed source addresses</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">balabit/syslog-ng</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
new file mode 100644
index 000000000000..b8f22a45ef86
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1 eutils multilib systemd versionator
+
+MY_PV=${PV/_/}
+MY_PV_MM=$(get_version_component_range 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="amd64 arm64 hppa ia64 sparc x86"
+IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+RDEPEND="
+	amqp? ( >=net-libs/rabbitmq-c-0.8.0 )
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.9.0 )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	http? ( net-misc/curl )
+	json? ( >=dev-libs/json-c-0.9:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( >=dev-libs/hiredis-0.11.0 )
+	smtp? ( net-libs/libesmtp )
+	spoof-source? ( net-libs/libnet:1.1 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	>=dev-libs/ivykis-0.36.1
+	>=dev-libs/libpcre-6.1
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	!dev-libs/eventlog
+	>=dev-libs/glib-2.10.1:2"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/patches/${PN}-3.12.1-json-c-0.13+.patch
+)
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local f
+
+	use python && python_fix_shebang .
+
+	# remove bundled libs
+	rm -r lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
+
+	# drop scl modules requiring json
+	if use !json; then
+		sed -i -r '/cim|ewmm|graylog2/d' scl/Makefile.am || die
+	fi
+
+	# use gentoo default path
+	if use systemd; then
+		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+			-i contrib/systemd/syslog-ng@default || die
+	fi
+
+	for f in "${FILESDIR}"/*logrotate*.in ; do
+		local bn=$(basename "${f}")
+
+		sed \
+			-e "$(usex systemd \
+				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng@default/' \
+				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \
+			"${f}" > "${T}/${bn/.in/}" || die
+	done
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		--disable-java \
+		--disable-java-modules \
+		--disable-riemann \
+		--enable-manpages \
+		--localstatedir=/var/lib/syslog-ng \
+		--sysconfdir=/etc/syslog-ng \
+		--with-embedded-crypto \
+		--with-ivykis=system \
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
+		--with-pidfile-dir=/var/run \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$(use_enable amqp) \
+		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) \
+		$(use_enable caps linux-caps) \
+		$(use_enable dbi sql) \
+		$(use_enable geoip) \
+		$(use_enable http) \
+		$(use_enable ipv6) \
+		$(use_enable json) \
+		$(use_enable mongodb) \
+		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") \
+		$(use_enable pacct) \
+		$(use_enable python) \
+		$(use_enable redis) \
+		$(use_enable smtp) \
+		$(use_enable spoof-source) \
+		$(use_enable systemd) \
+		$(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
+		contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
+		"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
+
+	# Install default configuration
+	insinto /etc/default
+	doins contrib/systemd/syslog-ng@default
+
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${T}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc" syslog-ng
+	newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	prune_libtool_files --modules
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		echo
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+		echo
+	fi
+
+	if use systemd; then
+		echo
+		ewarn "The service file for systemd has changed to support multiple instances."
+		ewarn "To start the default instance issue:"
+		ewarn "# systemctl start syslog-ng@default"
+		echo
+	fi
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
new file mode 100644
index 000000000000..c700adcaabde
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit autotools python-single-r1 eutils multilib systemd versionator
+
+MY_PV=${PV/_/}
+MY_PV_MM=$(get_version_component_range 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+RDEPEND="
+	amqp? ( >=net-libs/rabbitmq-c-0.8.0 )
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.9.0 )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	http? ( net-misc/curl )
+	json? ( >=dev-libs/json-c-0.9:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( >=dev-libs/hiredis-0.11.0 )
+	smtp? ( net-libs/libesmtp )
+	spoof-source? ( net-libs/libnet:1.1 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	>=dev-libs/ivykis-0.36.1
+	>=dev-libs/libpcre-6.1
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	!dev-libs/eventlog
+	>=dev-libs/glib-2.10.1:2"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/patches/${PN}-3.14.1-fix-tls-client.patch"
+	"${FILESDIR}/patches/${PN}-3.14.1-fix-automake-1.16-build.patch"
+)
+
+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
+	contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened"
+	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local f
+
+	use python && python_fix_shebang .
+
+	# remove bundled libs
+	rm -r lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
+
+	# drop scl modules requiring json
+	if use !json; then
+		sed -i -r '/cim|ewmm|graylog2/d' scl/Makefile.am || die
+	fi
+
+	# use gentoo default path
+	if use systemd; then
+		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+			-i contrib/systemd/syslog-ng@default || die
+	fi
+
+	for f in "${FILESDIR}"/*logrotate*.in ; do
+		local bn=$(basename "${f}")
+
+		sed \
+			-e "$(usex systemd \
+				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng@default/' \
+				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \
+			"${f}" > "${T}/${bn/.in/}" || die
+	done
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		--disable-java \
+		--disable-java-modules \
+		--disable-riemann \
+		--enable-manpages \
+		--localstatedir=/var/lib/syslog-ng \
+		--sysconfdir=/etc/syslog-ng \
+		--with-embedded-crypto \
+		--with-ivykis=system \
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
+		--with-pidfile-dir=/var/run \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$(use_enable amqp) \
+		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) \
+		$(use_enable caps linux-caps) \
+		$(use_enable dbi sql) \
+		$(use_enable geoip) \
+		$(use_enable http) \
+		$(use_enable ipv6) \
+		$(use_enable json) \
+		$(use_enable mongodb) \
+		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") \
+		$(use_enable pacct) \
+		$(use_enable python) \
+		$(use_enable redis) \
+		$(use_enable smtp) \
+		$(use_enable spoof-source) \
+		$(use_enable systemd) \
+		$(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+	default
+
+	# Install default configuration
+	insinto /etc/default
+	doins contrib/systemd/syslog-ng@default
+
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${T}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc" syslog-ng
+	newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	prune_libtool_files --modules
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		echo
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+		echo
+	fi
+
+	if use systemd; then
+		echo
+		ewarn "The service file for systemd has changed to support multiple instances."
+		ewarn "To start the default instance issue:"
+		ewarn "# systemctl start syslog-ng@default"
+		echo
+	fi
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.15.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.15.1.ebuild
new file mode 100644
index 000000000000..6a1c1b82936f
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.15.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit autotools eapi7-ver python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# unit tests require https://github.com/Snaipe/Criterion with additional deps
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.10.1:2
+	>=dev-libs/ivykis-0.36.1
+	>=dev-libs/libpcre-6.1:=
+	!dev-libs/eventlog
+	amqp? ( >=net-libs/rabbitmq-c-0.8.0:= )
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.9.0 )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	http? ( net-misc/curl )
+	json? ( >=dev-libs/json-c-0.9:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	smtp? ( net-libs/libesmtp )
+	spoof-source? ( net-libs/libnet:1.1= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
+	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
+	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local f
+
+	use python && python_fix_shebang .
+
+	# remove bundled libs
+	rm -r lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
+
+	# drop scl modules requiring json
+	if use !json; then
+		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic/d' scl/Makefile.am || die
+	fi
+
+	# use gentoo default path
+	if use systemd; then
+		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+			-i contrib/systemd/syslog-ng@default || die
+	fi
+
+	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
+		sed \
+			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
+				"/etc/init.d/syslog-ng reload")#g" \
+			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	for f in syslog-ng.conf.gentoo.fbsd.in \
+			syslog-ng.conf.gentoo.hardened.in \
+			syslog-ng.conf.gentoo.in; do
+		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-docs
+		--disable-java
+		--disable-java-modules
+		--disable-riemann
+		--enable-manpages
+		--localstatedir=/var/lib/syslog-ng
+		--sysconfdir=/etc/syslog-ng
+		--with-embedded-crypto
+		--with-ivykis=system
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng
+		--with-pidfile-dir=/var/run
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable amqp)
+		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
+		$(use_enable caps linux-caps)
+		$(use_enable dbi sql)
+		$(use_enable geoip)
+		$(use_enable http)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_enable mongodb)
+		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
+		$(use_enable pacct)
+		$(use_enable python)
+		$(use_enable redis)
+		$(use_enable smtp)
+		$(use_enable spoof-source)
+		$(use_enable systemd)
+		$(use_enable tcpd tcp-wrapper)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Install default configuration
+	insinto /etc/default
+	doins contrib/systemd/syslog-ng@default
+
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${T}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${T}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
+	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	find "${D}" -name '*.la' -delete || die
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+	fi
+
+	if use systemd; then
+		ewarn "The service file for systemd has changed to support multiple instances."
+		ewarn "To start the default instance issue:"
+		ewarn "# systemctl start syslog-ng@default"
+	fi
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.16.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.16.1.ebuild
new file mode 100644
index 000000000000..27ecc33b1e1a
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.16.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit autotools eapi7-ver python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# unit tests require https://github.com/Snaipe/Criterion with additional deps
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.10.1:2
+	>=dev-libs/ivykis-0.42.3
+	>=dev-libs/libpcre-6.1:=
+	!dev-libs/eventlog
+	amqp? ( >=net-libs/rabbitmq-c-0.8.0:= )
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.9.0 )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	http? ( net-misc/curl )
+	json? ( >=dev-libs/json-c-0.9:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	smtp? ( net-libs/libesmtp )
+	spoof-source? ( net-libs/libnet:1.1= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
+	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
+	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local f
+
+	use python && python_fix_shebang .
+
+	# remove bundled libs
+	rm -r lib/ivykis modules/afmongodb/mongo-c-driver || die
+
+	# drop scl modules requiring json
+	if use !json; then
+		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic/d' scl/Makefile.am || die
+	fi
+
+	# drop scl modules requiring http
+	if use !http; then
+		sed -i -r '/telegram/d' scl/Makefile.am || die
+	fi
+
+	# use gentoo default path
+	if use systemd; then
+		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+			-i contrib/systemd/syslog-ng@default || die
+	fi
+
+	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
+		sed \
+			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
+				"/etc/init.d/syslog-ng reload")#g" \
+			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	for f in syslog-ng.conf.gentoo.fbsd.in \
+			syslog-ng.conf.gentoo.hardened.in \
+			syslog-ng.conf.gentoo.in; do
+		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-docs
+		--disable-java
+		--disable-java-modules
+		--disable-riemann
+		--enable-manpages
+		--localstatedir=/var/lib/syslog-ng
+		--sysconfdir=/etc/syslog-ng
+		--with-embedded-crypto
+		--with-ivykis=system
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng
+		--with-pidfile-dir=/var/run
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable amqp)
+		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
+		$(use_enable caps linux-caps)
+		$(use_enable dbi sql)
+		$(use_enable geoip)
+		$(use_enable http)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_enable mongodb)
+		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
+		$(use_enable pacct)
+		$(use_enable python)
+		$(use_enable redis)
+		$(use_enable smtp)
+		$(use_enable spoof-source)
+		$(use_enable systemd)
+		$(use_enable tcpd tcp-wrapper)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Install default configuration
+	insinto /etc/default
+	doins contrib/systemd/syslog-ng@default
+
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${T}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${T}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
+	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	find "${D}" -name '*.la' -delete || die
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+	fi
+
+	if use systemd; then
+		ewarn "The service file for systemd has changed to support multiple instances."
+		ewarn "To start the default instance issue:"
+		ewarn "# systemctl start syslog-ng@default"
+	fi
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild b/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild
new file mode 100644
index 000000000000..45a21915a87a
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit autotools python-single-r1 eutils multilib systemd versionator
+
+MY_PV=${PV/_/}
+MY_PV_MM=$(get_version_component_range 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+RDEPEND="
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	json? ( >=dev-libs/json-c-0.9:= )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis )
+	smtp? ( net-libs/libesmtp )
+	spoof-source? ( net-libs/libnet:1.1 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	dev-libs/libpcre
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/eventlog-0.2.12
+	>=dev-libs/glib-2.10.1:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local f
+
+	use python && python_fix_shebang .
+
+	if use !json ; then
+		sed -i -e '1 s/cim //' scl/Makefile.am || die
+		eautoreconf
+	fi
+
+	for f in "${FILESDIR}"/*logrotate*.in ; do
+		local bn=$(basename "${f}")
+
+		sed \
+			-e "$(usex systemd \
+				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
+				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \
+			"${f}" > "${T}/${bn/.in/}" || die
+	done
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		--disable-java \
+		--disable-docs \
+		--enable-manpages \
+		--with-embedded-crypto \
+		--with-ivykis=internal \
+		--with-libmongo-client=internal \
+		--sysconfdir=/etc/syslog-ng \
+		--localstatedir=/var/lib/syslog-ng \
+		--with-pidfile-dir=/var/run \
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
+		$(systemd_with_unitdir) \
+		$(use_enable systemd) \
+		$(use_enable caps linux-caps) \
+		$(use_enable geoip) \
+		$(use_enable ipv6) \
+		$(use_enable json) \
+		$(use_enable mongodb) \
+		$(use_enable pacct) \
+		$(use_enable python) \
+		$(use_enable redis) \
+		$(use_enable smtp) \
+		$(use_enable amqp) \
+		$(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
+		$(use_enable spoof-source) \
+		$(use_enable dbi sql) \
+		$(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+	# -j1 for bug #484470
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
+		contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
+		"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
+
+	# Install default configuration
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${T}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc6" syslog-ng
+	newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	prune_libtool_files --modules
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	elog "For detailed documentation please see the upstream website:"
+	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.7-guides/en/syslog-ng-ose-v3.7-guide-admin/html/index.html"
+
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		echo
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+		echo
+	fi
+}
diff --git a/app-admin/syslog-summary-1.14-r1 b/app-admin/syslog-summary-1.14-r1
deleted file mode 100644
index 1260b9dbfac1..000000000000
--- a/app-admin/syslog-summary-1.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=Summarizes the contents of a syslog log file
-EAPI=5
-HOMEPAGE=https://github.com/dpaleino/syslog-summary
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~sparc x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://github/dpaleino/syslog-summary/syslog-summary-1.14.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d5ad1e507842f221b800b2d46e4bf9e9
diff --git a/app-admin/syslog-summary/Manifest b/app-admin/syslog-summary/Manifest
new file mode 100644
index 000000000000..4379182f8605
--- /dev/null
+++ b/app-admin/syslog-summary/Manifest
@@ -0,0 +1,3 @@
+DIST syslog-summary-1.14.tar.gz 7278 BLAKE2B 609e506c099b734be87ba6d6e21f70283d4654ab5c6d3794da71099f3e590d178348c13ab271ddb84682220091adfd702c107bf2dee792419de3ce14d2a9c9db SHA512 db1f0660ad435eea26fc3ec4cd475f5f1b98bb629495707741077e52aef88fe8bff4a318bb5b0821e57ccfa0646454c6825a5a4fc1fb4b73ea67cbd4defef277
+EBUILD syslog-summary-1.14-r1.ebuild 753 BLAKE2B f53172e88a9c133bdbb4130fd2a9a45c563723ad7b2d2679745d60abf2b3d3febd03d68b7f11d2104b50bccb1538c67b178138738e404ab6449d224e136e0011 SHA512 d3a1d4bd6634b7a37b029b5231c924ab603f8512c55309a686851aa9d71f8f8e93315a72fb2566d35d22712aa6afea71849f6e940b8ec7ba9d7d6f020d96c83c
+MISC metadata.xml 260 BLAKE2B 05122248962f66c9b196f089fa2f4de513350f4151907e5703b7be273c5f6d0907265eb957a6762ef8048d5ae6d9628daa0143afbd8b31c6d9407932cb356113 SHA512 165a24f5387267c854334cc1de61522c00da716191e985aa2d7df5f85f042c85c2a5037fe8fdec791232e43bf3644294e6fef8150fd7449334488c4d54c60f7a
diff --git a/app-admin/syslog-summary/metadata.xml b/app-admin/syslog-summary/metadata.xml
new file mode 100644
index 000000000000..262bb459b8c4
--- /dev/null
+++ b/app-admin/syslog-summary/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="github">dpaleino/syslog-summary</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
new file mode 100644
index 000000000000..f23f58c39b83
--- /dev/null
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
+
+DESCRIPTION="Summarizes the contents of a syslog log file"
+HOMEPAGE="https://github.com/dpaleino/syslog-summary"
+SRC_URI="mirror://github/dpaleino/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+src_prepare() {
+	python_fix_shebang -f syslog-summary
+
+	# Sadly, the makefile is useless for us.
+	rm Makefile || die
+}
+
+src_install() {
+	dobin syslog-summary
+	dodoc AUTHORS ChangeLog NEWS README
+	doman syslog-summary.1
+
+	insinto /etc/syslog-summary
+	doins ignore.rules
+}
diff --git a/app-admin/syslogread-0.92-r1 b/app-admin/syslogread-0.92-r1
deleted file mode 100644
index d886cdf6f353..000000000000
--- a/app-admin/syslogread-0.92-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=>=dev-libs/bglibs-1.106
-DESCRIPTION=Syslog message handling tools
-EAPI=5
-HOMEPAGE=http://untroubled.org/syslogread/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/daemontools
-SLOT=0
-SRC_URI=http://untroubled.org/syslogread/archive/syslogread-0.92.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c67227be8dff694eadb0d454f4485c8
diff --git a/app-admin/syslogread/Manifest b/app-admin/syslogread/Manifest
new file mode 100644
index 000000000000..492633d2b246
--- /dev/null
+++ b/app-admin/syslogread/Manifest
@@ -0,0 +1,7 @@
+AUX 0.92/klogd.run 84 BLAKE2B 55ab3af85c0d2c4d2a64a13a06121dda81aa1d8e46b9dcbe35e0cca7547e083c9e01932ca46744f18e756ce9112855605586822cef1f27a1ea6de021f758fd37 SHA512 6451fc04a4005e5bf0e8c7852da8fa46c6e87ae32cff18554996acdb06a9d4c1323f54439de6c7c9274fbd09aed38c9c3af982700aa3ca1f122434ba9b75fc6e
+AUX 0.92/syslogread-log.run 129 BLAKE2B f19209cf028c423169843fe9c522b26778a87a9d23bf48763b206f2cf9f19de16cfab78390f24aabb043a66d5878eda305ef300ef78179035c3cafcd29cd9b99 SHA512 3ef1cd5a49a8a360c1417ff646ecb1c42ec15a2ebe1fdf83e949e7fb7a80265c3e76229316a1f98107b9739a4edf5ea62c446aa4af3cb254ea2c180c36ed0aab
+AUX 0.92/syslogread.run 56 BLAKE2B 80da0e8fee9548fb94adfbc11d273b6ab14b27797921e37e08b08196c3ec06145cf4ffdc3784b48296bf712e264823d3ef6b9bd5f9fcc0ce33ba33c36aee4ae6 SHA512 f1ba637765145a51279c29e1c9c345a5426e606c7f483129d6675b1998c8a578c591f16aaf9887907ecf3053c75ada1190c52ab09a49e938f566068c191096ac
+AUX syslogread-0.92-fix-parallel-build.patch 516 BLAKE2B 14371b7491b60133fff8544916529eb7c797ecb31d5dcf41d238d5cb802a1af77e2bba20780d39d29ff423304878353abb14ff0ffe523385cd0f2a316788e271 SHA512 da661b502f21c82284acbc057e53531dd5ae596c8a7fcc85e6f112687ddc7756bb4c908c7d5f30e935023576fccbb625c5d5cebcbc17c09164cf34353d501635
+DIST syslogread-0.92.tar.gz 21807 BLAKE2B 02ca376af331f7ea8ba75c00b1a805aa3ab2405d1a19492cfd210bba15b7f6fac695c84d37eb4685306567a19e1d5c6f111ad57a650b0f32f9576e652425ece8 SHA512 8e00d169955e2c659233df1746f0e50f33f50cf9eb7d4b6d2926eadd6e6a7183b7beec485b7422befc399cc48da83462a709304715083d2c5ec8359b6f3728c0
+EBUILD syslogread-0.92-r1.ebuild 2174 BLAKE2B fb9801241bdb0822c1f7078e1052cd8cee150a4ac4a94dc2714ac43d4f9eaba75349f5ad88d4777b56ea43e7740ba1c559878ed44c57e1aa7e419f91f289983a SHA512 5e9ffff6904fe1b2a67081256e1c483db3b65355acc4c9e76d8cd578ea29384ec858ac314f740c5db20e1fd17afc7949af82d3b1aecaf44c36c3119594ffeb51
+MISC metadata.xml 320 BLAKE2B 48648831757dd6f6654988baab3bf2ed4b1e2f007099db5626f52a73b0dcf9346762bd6cc2df7e5050354805124bd36cee46ad9dde8351c6085d848542222954 SHA512 ed2785769c5264f45b4712ec699ce6b01ae6dafc0ebd3de566b0c7d1189fca026f249e8e9f60b24dc69ca24cc8c86f45dca94161c80fdca8242494132305b408
diff --git a/app-admin/syslogread/files/0.92/klogd.run b/app-admin/syslogread/files/0.92/klogd.run
new file mode 100644
index 000000000000..b6d0fb27795e
--- /dev/null
+++ b/app-admin/syslogread/files/0.92/klogd.run
@@ -0,0 +1,4 @@
+#!/bin/sh 
+exec 2>&1
+exec < /proc/kmsg 
+exec /usr/bin/multilog t n64 /var/log/klogd
diff --git a/app-admin/syslogread/files/0.92/syslogread-log.run b/app-admin/syslogread/files/0.92/syslogread-log.run
new file mode 100644
index 000000000000..f53cd0199571
--- /dev/null
+++ b/app-admin/syslogread/files/0.92/syslogread-log.run
@@ -0,0 +1,3 @@
+#!/bin/sh
+#exec setuidgid syslog syslogxlate '*.*' | multilog t /var/log/syslog
+exec setuidgid syslog multilog t /var/log/syslog
diff --git a/app-admin/syslogread/files/0.92/syslogread.run b/app-admin/syslogread/files/0.92/syslogread.run
new file mode 100644
index 000000000000..fdcb018c3066
--- /dev/null
+++ b/app-admin/syslogread/files/0.92/syslogread.run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec envuidgid syslog sysloglread -U /dev/log
diff --git a/app-admin/syslogread/files/syslogread-0.92-fix-parallel-build.patch b/app-admin/syslogread/files/syslogread-0.92-fix-parallel-build.patch
new file mode 100644
index 000000000000..98e810fc70a9
--- /dev/null
+++ b/app-admin/syslogread/files/syslogread-0.92-fix-parallel-build.patch
@@ -0,0 +1,19 @@
+--- Makefile.orig	2010-01-14 13:47:59.000000000 +0100
++++ Makefile	2010-01-14 13:49:00.000000000 +0100
+@@ -45,14 +45,14 @@
+ 	./load insthier -lbg-installer
+ 	mv insthier installer
+ 
+-instcheck: load insthier.o
++instcheck: load insthier.o installer instshow
+ 	./load insthier -lbg-instcheck
+ 	mv insthier instcheck
+ 
+ insthier.o: compile insthier.c conf_bin.c conf_man.c
+ 	./compile insthier.c
+ 
+-instshow: load insthier.o
++instshow: load insthier.o installer
+ 	./load insthier -lbg-instshow
+ 	mv insthier instshow
+ 
diff --git a/app-admin/syslogread/metadata.xml b/app-admin/syslogread/metadata.xml
new file mode 100644
index 000000000000..2fbe00ebaa8e
--- /dev/null
+++ b/app-admin/syslogread/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+	This package is a set of tools that are useful in receiving, analyzing,
+	or producing syslog messages.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/syslogread/syslogread-0.92-r1.ebuild b/app-admin/syslogread/syslogread-0.92-r1.ebuild
new file mode 100644
index 000000000000..f92cca746857
--- /dev/null
+++ b/app-admin/syslogread/syslogread-0.92-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs multilib user
+
+DESCRIPTION="Syslog message handling tools"
+HOMEPAGE="http://untroubled.org/syslogread/"
+SRC_URI="http://untroubled.org/syslogread/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/bglibs-1.106"
+RDEPEND="virtual/daemontools"
+
+pkg_setup() {
+	enewgroup syslog
+	enewuser syslog -1 -1 /nonexistent syslog
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/syslogread-0.92-fix-parallel-build.patch
+}
+
+src_configure() {
+	echo "/usr/include/bglibs/" > conf-bgincs
+	echo "/usr/$(get_libdir)/bglibs/" > conf-bglibs
+	echo "${D}/usr/bin" > conf-bin
+	echo "${D}/usr/share/man" > conf-man
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man
+	./installer || die
+
+	dodoc ANNOUNCEMENT ChangeLog README
+
+	insinto /var/lib/supervise/klogd
+	newins "${FILESDIR}/${PV}/klogd.run" klogd.run
+
+	insinto /var/lib/supervise/syslogd
+	newins "${FILESDIR}/${PV}/syslogread.run" syslogread.run
+
+	insinto /var/lib/supervise/syslogd/log
+	newins "${FILESDIR}/${PV}/syslogread-log.run" syslogread-log.run
+
+	# See ChangeLog for why these are commented out:
+
+	#newinitd "${FILESDIR}/${PV}/syslogread.init" syslogread
+
+	#keepdir /var/log/klogd
+	#keepdir /var/log/syslog
+
+	#fowners syslog:syslog /var/log/syslog
+	#fperms o-rwx /var/log/syslog
+}
+
+pkg_postinst() {
+	echo
+	elog "Run "
+	elog "emerge --config =${PF}"
+	elog "to create or update your run files (backups are created) in"
+	elog "    /var/lib/supervise/klogd (kernel logger)"
+	elog "    /var/lib/supervise/syslog (system logger)"
+	echo
+}
+
+pkg_config() {
+	cd "${ROOT}"var/lib/supervise/klogd
+	[ -e run ] && cp run klogd.run.`date +%Y%m%d%H%M%S`
+	cp klogd.run run
+	chmod u+x run
+
+	cd "${ROOT}"var/lib/supervise/syslogd
+	[ -e run ] && cp run syslogread.run.`date +%Y%m%d%H%M%S`
+	cp syslogread.run run
+	chmod u+x run
+
+	cd "${ROOT}"var/lib/supervise/syslogd/log
+	[ -e run ] && cp run syslogread-log.run.`date +%Y%m%d%H%M%S`
+	cp syslogread-log.run run
+	chmod u+x run
+}
diff --git a/app-admin/sysrqd-14 b/app-admin/sysrqd-14
deleted file mode 100644
index 458f8dfda26e..000000000000
--- a/app-admin/sysrqd-14
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DESCRIPTION=daemon providing access to the kernel sysrq functions via network
-EAPI=6
-HOMEPAGE=http://julien.danjou.info/projects/sysrqd
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~wschlich/src/app-admin/sysrqd/sysrqd-14.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=37e9622c45a179dacc839c1e6922a345
diff --git a/app-admin/sysrqd/Manifest b/app-admin/sysrqd/Manifest
new file mode 100644
index 000000000000..690a0c0970e8
--- /dev/null
+++ b/app-admin/sysrqd/Manifest
@@ -0,0 +1,6 @@
+AUX sysrqd-14-fix-build-system.patch 615 BLAKE2B 25de1ca0a421ab37737613533fb68819a6f611271b44c7381963476e01ab62a204bf61a1bf5a61100d1199601d7db8f7010cdd1207eeb50dff9768f34b7028fe SHA512 2ecb26c68a4a7382af1c09d81b71544e9621c0425fcd7577be1e4b929b808989d223d128affb0107724423624f3bf550327c92cb9c56676d45f49707ee7d1321
+AUX sysrqd-config.patch 421 BLAKE2B 9cc04c7c31c39f1015b95aaf5c695a2221b65d2c471506b9f3e836fec43585e7e21d7fa7a01c4cdd7815f9c1ebb10800ca1cfccabd397223eb6b3f700f8cd54d SHA512 5dd351220cbb10a09d6c6f0bae07a37fc678988467a8a1cff2075217a82eb4bbfc6f2155b47b71159e3442f8d25bbff539a3e2a61f91829d6dae7820e647fca8
+AUX sysrqd.init 700 BLAKE2B 2570aeb1b01d098bd8330a9e78c85708013d3ee09318f84a1e5f088ffc2a32077cf6e18bc3413106724d7fe024bea9720f6f20c5a28a5fb5a775a219ed7c95e4 SHA512 9845a09cfa20ee9cd09e61e142cf53aaf482909ce3ec1401743864823a7bd45ced812fb235eef2adb914c3c624e227fa5936b73e1b83d8a3888fb25498980918
+DIST sysrqd-14.tar.gz 4759 BLAKE2B 3ef8b2f5092a899753da487d0a82a71d2d93d0c6a70689b5923fa900f2766de15fa2e416cb667d800dac19499218a0246941b8c52bfe4421af774ccecc62222e SHA512 efad48be3974923ec14d0958e788115c9273bc29b4f03853e6e087f6af872299ea57d42f885be19ff4eeaffa577ecf1c53ea2adb2f84e1487bb2511597b89cb2
+EBUILD sysrqd-14.ebuild 1395 BLAKE2B 4368fe901f94f14e010dfa5e8f4648f13dd93727a521e9db49398cc2704482a1d62e633a8acf5a4633b1903224d5c99357a08cfe25118aea695fc9297d06c1ab SHA512 11080e964bfa37504a653432ea99910ac469c969859f5301ee86b7f80db4a5bd147af3da5b8cf6119473959de2110195978d9d00c3589f8f61d12f4845cc32ae
+MISC metadata.xml 414 BLAKE2B eb2c97371677b4c978e210a3069e30cd453ebaf2249d01e80e52c116bb9dd4243f692cb4e4f384412191e691a67054a390f35143fb8fc403b595f11c3e09dd68 SHA512 e0c64a75f859353dd258c074a2353882ddba2955144297672ada48f29ebd742d4acd7193816aae859f7f7df1d4b23e9bd1176856aa801ee7a0035f8ce2224859
diff --git a/app-admin/sysrqd/files/sysrqd-14-fix-build-system.patch b/app-admin/sysrqd/files/sysrqd-14-fix-build-system.patch
new file mode 100644
index 000000000000..2668c3c0c491
--- /dev/null
+++ b/app-admin/sysrqd/files/sysrqd-14-fix-build-system.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -5,15 +5,15 @@
+         -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wsign-compare \
+         -Wunused -Winit-self -Wpointer-arith -Wredundant-decls \
+         -Wmissing-prototypes -Wmissing-format-attribute -Wmissing-noreturn \
+-        -std=gnu99 -pipe -DSYSRQD_VERSION="\"$(VERSION)\"" -O3
++        -std=gnu99
++CPPFLAGS += -DSYSRQD_VERSION="\"$(VERSION)\""
+ 
+ SBINDIR=$(DESTDIR)/usr/sbin
+ #MANDIR=$(DESTDIR)/usr/share/man/man1
+ INSTALL = install
+ #MAN=sysrqd.1
+ 
+-$(BIN): $(O)
+-	$(CC) $(LDFLAGS) -o $(BIN) $(O)
++all: $(BIN)
+ 
+ install: $(BIN)
+ 	$(INSTALL) -d -m 755 $(SBINDIR)
diff --git a/app-admin/sysrqd/files/sysrqd-config.patch b/app-admin/sysrqd/files/sysrqd-config.patch
new file mode 100644
index 000000000000..56c6afb60804
--- /dev/null
+++ b/app-admin/sysrqd/files/sysrqd-config.patch
@@ -0,0 +1,13 @@
+--- a/sysrqd.c
++++ b/sysrqd.c
+@@ -40,8 +40,8 @@
+ #define BIND_MAX_LEN 16
+ #define PROMPT "sysrq> "
+ #define SYSRQ_TRIGGER_PATH "/proc/sysrq-trigger"
+-#define AUTH_FILE "/etc/sysrqd.secret"
+-#define BINDIP_FILE "/etc/sysrqd.bind"
++#define AUTH_FILE "/etc/sysrqd/sysrqd.secret"
++#define BINDIP_FILE "/etc/sysrqd/sysrqd.bind"
+ #define PID_FILE "/var/run/sysrqd.pid"
+ #define SYSRQD_PRIO -19
+ #define SYSRQD_LISTEN_PORT 4094
diff --git a/app-admin/sysrqd/files/sysrqd.init b/app-admin/sysrqd/files/sysrqd.init
new file mode 100644
index 000000000000..f88fc8ce43ef
--- /dev/null
+++ b/app-admin/sysrqd/files/sysrqd.init
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	sysrqd_secret=/etc/sysrqd/sysrqd.secret
+	sysrqd_pidfile=/var/run/sysrqd.pid
+	if [ ! -e ${sysrqd_secret} ]; then
+		eerror "You need a '${sysrqd_secret}' containing a secret/password!"
+		eerror "Refusing to start."
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --pidfile ${sysrqd_pidfile} --quiet --exec /usr/sbin/sysrqd
+	eend $?
+}
+
+stop() {
+	checkconfig || return 1
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --pidfile ${sysrqd_pidfile}
+	eend $?
+}
diff --git a/app-admin/sysrqd/metadata.xml b/app-admin/sysrqd/metadata.xml
new file mode 100644
index 000000000000..ff003efefc85
--- /dev/null
+++ b/app-admin/sysrqd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+		sysrqd is a small daemon intended to manage Linux Sysrq over network.
+		Its philosophy is to be very responsive under heavy load and try to
+		be somehow reliable. Authentication is made by clear password.
+	</longdescription>
+</pkgmetadata>
+
diff --git a/app-admin/sysrqd/sysrqd-14.ebuild b/app-admin/sysrqd/sysrqd-14.ebuild
new file mode 100644
index 000000000000..249bbce77e12
--- /dev/null
+++ b/app-admin/sysrqd/sysrqd-14.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="daemon providing access to the kernel sysrq functions via network"
+HOMEPAGE="http://julien.danjou.info/projects/sysrqd"
+#SRC_URI="http://julien.danjou.info/${PN}/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-config.patch
+	"${FILESDIR}"/${PN}-14-fix-build-system.patch
+)
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dosbin sysrqd
+	newinitd "${FILESDIR}/sysrqd.init" sysrqd
+
+	local bindip='127.0.0.1' secret
+	declare -i secret
+	let secret=${RANDOM}*${RANDOM}*${RANDOM}*${RANDOM}
+	echo ${bindip} > sysrqd.bind || die
+	echo ${secret} > sysrqd.secret || die
+
+	diropts -m 0700 -o root -g root
+	dodir /etc/sysrqd
+	insinto /etc/sysrqd
+	insopts -m 0600 -o root -g root
+	doins sysrqd.bind
+	doins sysrqd.secret
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog
+	elog "Be sure to change the initial secret in /etc/sysrqd/sysrqd.secret !"
+	elog "As a security precaution, sysrqd is configured to only listen on"
+	elog "127.0.0.1 by default. Change the content of /etc/sysrqd/sysrqd.bind"
+	elog "to an IPv4 address you want it to listen on or remove the file"
+	elog "to make it listen on any IP address (0.0.0.0)."
+	elog
+}
diff --git a/app-admin/sysstat-11.4.0 b/app-admin/sysstat-11.4.0
deleted file mode 100644
index 013c24235a02..000000000000
--- a/app-admin/sysstat-11.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=isag? ( dev-lang/tk:0 dev-vcs/rcs sci-visualization/gnuplot ) nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=System performance tools for Linux
-EAPI=5
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug isag nls lm_sensors selinux static
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=GPL-2
-RDEPEND=isag? ( dev-lang/tk:0 dev-vcs/rcs sci-visualization/gnuplot ) nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.4.0.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=840921a8b748a34d480647c192e9269b
diff --git a/app-admin/sysstat-11.6.3 b/app-admin/sysstat-11.6.3
deleted file mode 100644
index 9703c5dfccea..000000000000
--- a/app-admin/sysstat-11.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=System performance tools for Linux
-EAPI=6
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.6.3.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=933ab29b17cc1914e51b80aa503da485
diff --git a/app-admin/sysstat-11.6.4 b/app-admin/sysstat-11.6.4
deleted file mode 100644
index ee975774440f..000000000000
--- a/app-admin/sysstat-11.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=System performance tools for Linux
-EAPI=6
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.6.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=933ab29b17cc1914e51b80aa503da485
diff --git a/app-admin/sysstat-11.7.3 b/app-admin/sysstat-11.7.3
deleted file mode 100644
index 4a8fec8f1911..000000000000
--- a/app-admin/sysstat-11.7.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=System performance tools for Linux
-EAPI=6
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.7.3.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ca29918b76d1748279cf3fefcaeb5a68
diff --git a/app-admin/sysstat-11.7.4 b/app-admin/sysstat-11.7.4
deleted file mode 100644
index 14007704a984..000000000000
--- a/app-admin/sysstat-11.7.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=System performance tools for Linux
-EAPI=6
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.7.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ca29918b76d1748279cf3fefcaeb5a68
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
new file mode 100644
index 000000000000..44535c0a3bbc
--- /dev/null
+++ b/app-admin/sysstat/Manifest
@@ -0,0 +1,15 @@
+AUX sysstat-10.0.4-flags.patch 887 BLAKE2B 289e53b21e8f3cd2b1a46219ec7fe7ba82b6fb660580481faa7a3142e8a664d16e4fe9213a5fe396d72bcd6a003ea9b7d06a3f5e4557ae05d3a225427f273b6c SHA512 7daf43a8b09af67781ae33cbaaf7d6da9bb1f6f750428a08c3ddde8ecb94e0de27d5746a332086eb5191cccd8e6dbc37c263ab3046294b4b3df1a2666c1ab6ee
+AUX sysstat-11.0.4-cron.patch 1609 BLAKE2B b190f9b6e47da5240ced4fed912bdcdb130d88cf326e0e8109dc5996c22c812c64f2dfaaa6b0456b368d2b59aa30271b4de402bd83c2754c0224b4fd6598c604 SHA512 531340bb0770c07743caa6c760584c0f4cda5a5db7dd46bd2eee8ae1cccabecffee084571fb68a3510735b04430f2bb454068d9983da2856a0459ccb258eb89d
+AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f49718cc0fb3c70bc681e8cdda29394ea5a75d871c76f658305b26d44d1034d09079f3b6306a4dd466cd0775b5514b2 SHA512 80dd658b06f2e1072a3a58bbe84770170f1cb6c3e2ae0d660713a007b0e9e59c45b710cc1484c94ec466759455ae18a7fbae237b6674ee9ddb43a7a4502cb0d5
+AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
+DIST sysstat-11.4.0.tar.xz 343968 BLAKE2B e34da8cf0216f66fad3ade0ed40e8ec3b7641f7568ebcce5bc3122f888c90885ece346bf7f4f8e71e92435257ee5c6c0e5a89913c0e22a0ad28fa1018a73ea71 SHA512 4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604
+DIST sysstat-11.6.3.tar.xz 527828 BLAKE2B 4221252589652d949541d8ec8d7057abe90cafaae7b2222538d4fcb95aaa45f3da542539eb0742a910456c8ee134203207fc5e9485b0948a6c581f33eb949c2c SHA512 37a770b4ff26abdb94c8d97fa49b094702e9f5fb12549fd012b9767c7f42ede50ce209085c7ad3b7cd2e208ba1e5bfe9425893f7bb0bbc517aed688300bf9712
+DIST sysstat-11.6.4.tar.xz 528028 BLAKE2B 931a172ce399133a0827f7dc7090719e778e7c89a1383adf93a99c386cd11343de26649355dd3a382deceeffe6c2f1890d3424aae6ae441aaa4a47f046b520f7 SHA512 36affc6749d0eef5760e542dde060c257eea323196f9b83b52cc931825dfa796b48cad37060b9ca20d58fb3909c07b8bd67bc8d09c9c6285c08c4e2e9ca1d308
+DIST sysstat-11.7.3.tar.xz 543556 BLAKE2B f6042021a7c5047727ddbcd38cf6e9f88ca44adaf9f8a9e56cf84c9d9b4d61bef7e07ef910c54fdcc0342c8f9b28e9b114778f57f3ed70d8b950263086426387 SHA512 c752ebba4d25a30147e68d0cb44d93020bb9b44823812c99550f6b34b42fc6f015c28ef0e6609a1e33ae6e4de566ae2d0e8a4711e412a4298baf5721dd15d27f
+DIST sysstat-11.7.4.tar.xz 545176 BLAKE2B 08dec13040fe1df87902dfc67bda0ae7281768a4f426906b94d925f302892857091f279d976020924de665a41c4d73f3b64b48394436639804aab0b28bffce94 SHA512 4dcb05799e82410f2a13b44c2de1f6c7d31f20410e8a9528ac365a059591c04f918ad51c42b73fd06489bbed48a181b290897a91e9837b685cfc51c006aa8a05
+EBUILD sysstat-11.4.0.ebuild 1945 BLAKE2B 60e245699e621770f3f8aac3d622063b8e6bdad5135e3408dce587eae8d3b32c6884dc4db78a397b2a7ca0b58a7277fb652b21fad8a6e3c0e008f70eea0c8503 SHA512 25438d8e95dac4789c18215f83c09868ef7bb9886d5abe76f70b5461b65cfa42648c7593d861c0d075f1ec7bde52503d3235f3aea716e9fc9a39dfc5762e269c
+EBUILD sysstat-11.6.3.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
+EBUILD sysstat-11.6.4.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
+EBUILD sysstat-11.7.3.ebuild 1787 BLAKE2B d9235c61d19c41e58a65b61bd3188f085a3e08810cfbf2291067bca879f6465b27a115ed534d3d77c6bbf1e8d03286193a1f77a03e3065f62782e649ab49095a SHA512 2dc9618776ca53b7587094a337530e42e687fe83da4967bb8ed45e5a5da5e8ac6fb5980b4e2769d88e192b102e9f2a20a1fac25caf9dbafe2c71ecd716c14866
+EBUILD sysstat-11.7.4.ebuild 1787 BLAKE2B d9235c61d19c41e58a65b61bd3188f085a3e08810cfbf2291067bca879f6465b27a115ed534d3d77c6bbf1e8d03286193a1f77a03e3065f62782e649ab49095a SHA512 2dc9618776ca53b7587094a337530e42e687fe83da4967bb8ed45e5a5da5e8ac6fb5980b4e2769d88e192b102e9f2a20a1fac25caf9dbafe2c71ecd716c14866
+MISC metadata.xml 336 BLAKE2B ba4225003301f291de8d348fcec269a2f7dc8f729a93e3c974a3eb9712f7fe08f59d799e4bf2e936a1224bfa5fa59d4b4b333aeacde9864313c20e1d3a7f4580 SHA512 63adb90aca54ec347aac7feaad3b2ee3c707fc536c0de0e0ee045d4fe2c08e231bdbd4473b9722a747ef1263cb98a067a43cbbbae28aabad71458c16df946bc6
diff --git a/app-admin/sysstat/files/sysstat-10.0.4-flags.patch b/app-admin/sysstat/files/sysstat-10.0.4-flags.patch
new file mode 100644
index 000000000000..402e7d604b1a
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-10.0.4-flags.patch
@@ -0,0 +1,31 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -69,9 +69,8 @@
+ SYSCONFIG_DIR = @SYSCONFIG_DIR@
+ 
+ # Compiler flags
+-CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2
++CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes 
+ DFLAGS = @DFLAGS@
+-LFLAGS = @STRIP@
+ DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\"
+ DFLAGS += $(DFSENSORS)
+ 
+@@ -154,7 +153,7 @@
+ 	$(CC) -o $@ -c $(CFLAGS) $(DFLAGS) $<
+ 
+ % : %.o
+-	$(CC) -o $@ $(CFLAGS) $^ $(LFLAGS)
++	$(CC) -o $@ $(CFLAGS) $(LFLAGS) $^ $(LIBS)
+ 
+ all: sadc sar sadf iostat mpstat pidstat nfsiostat cifsiostat locales
+ 
+@@ -196,7 +195,7 @@
+ 
+ sadc.o: sadc.c sa.h version.h common.h ioconf.h sysconfig.h rd_stats.h rd_sensors.h
+ 
+-sadc: LFLAGS += $(LFSENSORS)
++sadc: LIBS = $(LFSENSORS)
+ sadc: sadc.o act_sadc.o sa_wrap.o sa_common.o librdstats.a librdsensors.a libsyscom.a
+ 
+ sar.o: sar.c sa.h version.h common.h ioconf.h pr_stats.h sysconfig.h
diff --git a/app-admin/sysstat/files/sysstat-11.0.4-cron.patch b/app-admin/sysstat/files/sysstat-11.0.4-cron.patch
new file mode 100644
index 000000000000..9d047ac6e9fe
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-11.0.4-cron.patch
@@ -0,0 +1,38 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -368,25 +368,19 @@
+ 	$(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR)
+ ifdef SYSTEMD_UNIT_DIR
+ 	mkdir -p $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+-else
+-	if [ -d /etc/cron.d ]; then \
+-		mkdir -p $(DESTDIR)/etc/cron.d; \
+-	elif [ -d /etc/cron.hourly -a -d /etc/cron.daily ]; then \
+-		mkdir -p $(DESTDIR)/etc/cron.hourly $(DESTDIR)/etc/cron.daily; \
+-	fi
+-	if [ -d $(INIT_DIR) ]; then \
+-		mkdir -p $(DESTDIR)$(INIT_DIR); \
+-	elif [ -d $(RC_DIR) ]; then \
++endif
++ifeq ($(INSTALL_CRON),y)
++	mkdir -p $(DESTDIR)/etc/cron.d; \
++	mkdir -p $(DESTDIR)$(INIT_DIR); \
++	if [ -d $(RC_DIR) ]; then \
+ 		mkdir -p $(DESTDIR)$(RC_DIR); \
+ 	fi
+ endif
+-	if [ -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" ]; then \
+-		if [ -d $(DESTDIR)/etc/cron.d ]; then \
+-			$(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
+-		elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \
+-			$(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \
+-			$(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \
+-		fi \
++	if [ -d $(DESTDIR)/etc/cron.d ]; then \
++		$(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
++	elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \
++		$(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \
++		$(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \
+ 	fi
+ ifeq ($(COPY_ONLY),n)
+ 	if [ \( -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" \) -a ! -d $(DESTDIR)/etc/cron.d ]; then \
diff --git a/app-admin/sysstat/files/sysstat-11.7.3-flags.patch b/app-admin/sysstat/files/sysstat-11.7.3-flags.patch
new file mode 100644
index 000000000000..9438a0fd8f74
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-11.7.3-flags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -71,7 +71,7 @@
+ # Compiler flags
+ CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2
+ DFLAGS = @DFLAGS@
+-LFLAGS = @STRIP@
++LFLAGS = $(LDFLAGS)
+ DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\"
+ DFLAGS += $(DFSENSORS)
+ 
diff --git a/app-admin/sysstat/files/sysstat.init.d b/app-admin/sysstat/files/sysstat.init.d
new file mode 100644
index 000000000000..4222de28174b
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat.init.d
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+    use hostname
+}
+
+start() {
+    ebegin "Writing a dummy startup record using sadc (see sadc(8))..."
+    /usr/lib/sa/sa1 --boot
+    eend $?
+}
+
+stop() {
+    ebegin "Cannot stop writing a dummy startup record (see sadc(8))..."
+    eend $?
+}
diff --git a/app-admin/sysstat/metadata.xml b/app-admin/sysstat/metadata.xml
new file mode 100644
index 000000000000..b62be5070572
--- /dev/null
+++ b/app-admin/sysstat/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>jer@gentoo.org</email>
+	<name>Jeroen Roovers</name>
+</maintainer>
+<use>
+	<flag name="isag">Install isag, the Interactive System Activity Graph tool</flag>
+</use>
+</pkgmetadata>
diff --git a/app-admin/sysstat/sysstat-11.4.0.ebuild b/app-admin/sysstat/sysstat-11.4.0.ebuild
new file mode 100644
index 000000000000..34da2f0d0764
--- /dev/null
+++ b/app-admin/sysstat/sysstat-11.4.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="debug isag nls lm_sensors selinux static"
+
+CDEPEND="
+	isag? (
+		dev-lang/tk:0
+		dev-vcs/rcs
+		sci-visualization/gnuplot
+	)
+	nls? ( virtual/libintl )
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+	epatch \
+		"${FILESDIR}"/${PN}-10.0.4-flags.patch \
+		"${FILESDIR}"/${PN}-11.0.4-cron.patch
+}
+
+src_configure() {
+	tc-export AR
+	use static && append-ldflags -static
+
+	sa_lib_dir=/usr/$(get_libdir)/sa \
+		conf_dir=/etc \
+		rcdir=${SYSSTAT_FAKE_RC_DIR} \
+		econf \
+			$(use_enable debug debuginfo) \
+			$(use_enable isag install-isag) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls) \
+			--enable-copy-only \
+			--enable-documentation \
+			--enable-install-cron \
+			--with-systemdsystemunitdir=$(systemd_get_unitdir)
+}
+
+src_compile() {
+	emake LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	emake \
+		CHOWN=true \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		MANGRPARG='' \
+		install
+
+	dodoc contrib/sargraph/sargraph
+
+	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/sysstat/sysstat-11.6.3.ebuild b/app-admin/sysstat/sysstat-11.6.3.ebuild
new file mode 100644
index 000000000000..b9b3e8d42883
--- /dev/null
+++ b/app-admin/sysstat/sysstat-11.6.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+	nls? ( virtual/libintl )
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.0.4-flags.patch
+	"${FILESDIR}"/${PN}-11.0.4-cron.patch
+)
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	tc-export AR
+	use static && append-ldflags -static
+
+	sa_lib_dir=/usr/$(get_libdir)/sa \
+		conf_dir=/etc \
+		rcdir=${SYSSTAT_FAKE_RC_DIR} \
+		econf \
+			$(use_enable debug debuginfo) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls) \
+			--enable-copy-only \
+			--enable-documentation \
+			--enable-install-cron \
+			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_compile() {
+	emake LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	emake \
+		CHOWN=true \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		MANGRPARG='' \
+		install
+
+	dodoc -r contrib/
+
+	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/sysstat/sysstat-11.6.4.ebuild b/app-admin/sysstat/sysstat-11.6.4.ebuild
new file mode 100644
index 000000000000..b9b3e8d42883
--- /dev/null
+++ b/app-admin/sysstat/sysstat-11.6.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+	nls? ( virtual/libintl )
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.0.4-flags.patch
+	"${FILESDIR}"/${PN}-11.0.4-cron.patch
+)
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	tc-export AR
+	use static && append-ldflags -static
+
+	sa_lib_dir=/usr/$(get_libdir)/sa \
+		conf_dir=/etc \
+		rcdir=${SYSSTAT_FAKE_RC_DIR} \
+		econf \
+			$(use_enable debug debuginfo) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls) \
+			--enable-copy-only \
+			--enable-documentation \
+			--enable-install-cron \
+			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_compile() {
+	emake LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	emake \
+		CHOWN=true \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		MANGRPARG='' \
+		install
+
+	dodoc -r contrib/
+
+	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/sysstat/sysstat-11.7.3.ebuild b/app-admin/sysstat/sysstat-11.7.3.ebuild
new file mode 100644
index 000000000000..0a51edcf4022
--- /dev/null
+++ b/app-admin/sysstat/sysstat-11.7.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+	nls? ( virtual/libintl )
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.4-cron.patch
+	"${FILESDIR}"/${PN}-11.7.3-flags.patch
+)
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	tc-export AR
+	use static && append-ldflags -static
+
+	sa_lib_dir=/usr/$(get_libdir)/sa \
+		conf_dir=/etc \
+		rcdir=${SYSSTAT_FAKE_RC_DIR} \
+		econf \
+			$(use_enable debug debuginfo) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls) \
+			--enable-copy-only \
+			--enable-documentation \
+			--enable-install-cron \
+			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	emake \
+		CHOWN=true \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		MANGRPARG='' \
+		install
+
+	dodoc -r contrib/
+
+	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/sysstat/sysstat-11.7.4.ebuild b/app-admin/sysstat/sysstat-11.7.4.ebuild
new file mode 100644
index 000000000000..0a51edcf4022
--- /dev/null
+++ b/app-admin/sysstat/sysstat-11.7.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+	nls? ( virtual/libintl )
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.4-cron.patch
+	"${FILESDIR}"/${PN}-11.7.3-flags.patch
+)
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	tc-export AR
+	use static && append-ldflags -static
+
+	sa_lib_dir=/usr/$(get_libdir)/sa \
+		conf_dir=/etc \
+		rcdir=${SYSSTAT_FAKE_RC_DIR} \
+		econf \
+			$(use_enable debug debuginfo) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls) \
+			--enable-copy-only \
+			--enable-documentation \
+			--enable-install-cron \
+			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	emake \
+		CHOWN=true \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		MANGRPARG='' \
+		install
+
+	dodoc -r contrib/
+
+	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/system-config-printer-1.4.8 b/app-admin/system-config-printer-1.4.8
deleted file mode 100644
index fb0688b924f1..000000000000
--- a/app-admin/system-config-printer-1.4.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/glib-2:2 dev-libs/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycups-1.9.60[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] gnome-keyring? ( gnome-base/libgnome-keyring[introspection] ) policykit? ( >=sys-auth/polkit-0.104-r1 ) !app-admin/system-config-printer-common !app-admin/system-config-printer-gnome app-text/docbook-xml-dtd:4.1.2 >=app-text/xmlto-0.0.22 dev-util/desktop-file-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( dev-python/epydoc[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=GNOME frontend for a Red Hat's printer administration tool
-EAPI=5
-HOMEPAGE=http://cyberelk.net/tim/software/system-config-printer/
-IUSE=doc gnome-keyring policykit python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sh ~sparc x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/glib-2:2 dev-libs/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycups-1.9.60[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] gnome-keyring? ( gnome-base/libgnome-keyring[introspection] ) policykit? ( >=sys-auth/polkit-0.104-r1 ) !app-admin/system-config-printer-common !app-admin/system-config-printer-gnome
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=http://cyberelk.net/tim/data/system-config-printer/1.4/system-config-printer-1.4.8.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f00f888fbb4caa72544d322f63aa9a9
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
new file mode 100644
index 000000000000..f6e7e3c5830a
--- /dev/null
+++ b/app-admin/system-config-printer/Manifest
@@ -0,0 +1,3 @@
+DIST system-config-printer-1.4.8.tar.xz 904068 BLAKE2B dfadfd7f2ef8c37a588d2a4755c977a07c16d3779cf30652ca1056986d5de073fa334a912e4a8e865e88b323888f88b83c5ef8b086e4afafd7bf284c1b597f3d SHA512 9f832f11e0e6bca32a29201b9f78d7a3ea35a46f7484548e5e71e6939fd51065e07325e12bdb1bc577ee606299cfef54759def6564923904a79f27b654ec5304
+EBUILD system-config-printer-1.4.8.ebuild 2305 BLAKE2B 594c35c24a8d0ed8c79ed6af9d73069022d3af1d8dd321898dd8b3a1773c38673e2ab26d4b4da065a03e5e54ae738f1d67bc9032a3933dbefc8c4889cae6ce23 SHA512 0e1d651a46c0cfec924aec183fdfbfe175e668d3e0c566838c72527d90a28ab194a92952cda5c9a46999b03487b7441cab4709521f2a5e1757b112d5ab09878f
+MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/metadata.xml b/app-admin/system-config-printer/metadata.xml
new file mode 100644
index 000000000000..ef7c43f6f08a
--- /dev/null
+++ b/app-admin/system-config-printer/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>reavertm@gentoo.org</email>
+	<name>Maciej Mrozowski</name>
+</maintainer>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer type="project">
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild b/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild
new file mode 100644
index 000000000000..4dc7fcecc7ff
--- /dev/null
+++ b/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-single-r1 systemd versionator
+
+MY_V="$(get_version_component_range 1-2)"
+
+DESCRIPTION="GNOME frontend for a Red Hat's printer administration tool"
+HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
+SRC_URI="http://cyberelk.net/tim/data/system-config-printer/${MY_V}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sh ~sparc x86"
+SLOT="0"
+
+IUSE="doc gnome-keyring policykit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# Additional unhandled dependencies
+# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
+# python samba client: smbc
+# selinux: needed for troubleshooting
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2:2
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/pycups-1.9.60[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	net-print/cups[dbus]
+	virtual/libusb:1
+	>=virtual/udev-172
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango[introspection]
+	gnome-keyring? ( gnome-base/libgnome-keyring[introspection] )
+	policykit? ( >=sys-auth/polkit-0.104-r1 )
+	!app-admin/system-config-printer-common
+	!app-admin/system-config-printer-gnome
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/xmlto-0.0.22
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )
+"
+
+# Bug 471472
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myconf
+
+	# Disable installation of translations when LINGUAS not chosen
+	if [[ -z "${LINGUAS}" ]]; then
+		myconf="${myconf} --disable-nls"
+	else
+		myconf="${myconf} --enable-nls"
+	fi
+
+	gnome2_src_configure \
+		--with-desktop-vendor=Gentoo \
+		--with-udev-rules \
+		$(systemd_with_unitdir) \
+		${myconf}
+}
+
+src_compile() {
+	gnome2_src_compile
+	use doc && emake html
+}
+
+src_install() {
+	gnome2_src_install
+	use doc && dohtml -r html/
+	python_fix_shebang "${ED}"
+}
diff --git a/app-admin/system-tools-backends-2.10.2 b/app-admin/system-tools-backends-2.10.2
deleted file mode 100644
index d7dedf5bb8d4..000000000000
--- a/app-admin/system-tools-backends-2.10.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=!<app-admin/gnome-system-tools-1.1.91 >=sys-apps/dbus-1.1.2 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.15.2:2 >=dev-perl/Net-DBus-0.33.4 dev-lang/perl >=sys-auth/polkit-0.94 userland_GNU? ( virtual/shadow ) virtual/pkgconfig >=dev-util/intltool-0.40 >=app-portage/elt-patches-20170422 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Tools aimed to make easy the administration of UNIX systems
-EAPI=5
-HOMEPAGE=https://projects.gnome.org/gst/
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=!<app-admin/gnome-system-tools-1.1.91 >=sys-apps/dbus-1.1.2 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.15.2:2 >=dev-perl/Net-DBus-0.33.4 dev-lang/perl >=sys-auth/polkit-0.94 userland_GNU? ( virtual/shadow )
-SLOT=0
-SRC_URI=mirror://gnome/sources/system-tools-backends/2.10/system-tools-backends-2.10.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=20afbfd8e5fb43d8cf35c9e97f1dce1f
diff --git a/app-admin/system-tools-backends/Manifest b/app-admin/system-tools-backends/Manifest
new file mode 100644
index 000000000000..d233c00c460e
--- /dev/null
+++ b/app-admin/system-tools-backends/Manifest
@@ -0,0 +1,5 @@
+AUX system-tools-backends-2.8.2-cve-2008-4311.patch 1984 BLAKE2B fdceba11d1f10d200709a7b0a391da459d7d59c69900243cacaeb9f372eb74033d2d7e3be32ba10fbccdf15c8acc04b7a2e2cb524f5c540c06113140a33a6171 SHA512 ec8d2f526ad16f286aeef6d521ae3f2909676b846ad2a715d23c5a30b02f0608e42d550691e0e07493d70d1141093dc59c36a55afa82032c6d28e128ab1fd49b
+AUX system-tools-backends-2.8.2-default-permissions.patch 945 BLAKE2B a825942ddf3bb8cf00d9c355f7864fc2aa48c0e2a89cc7098914204a4724e581623cfc798b9e39eb543ec5245b3ef4973798c1a8b3b46233975bd040bdc10102 SHA512 0225f2825928c123cde5781d8d34c64e71ac6c4349e7440bc4e37cbbaaa99b55ca86f14459477a0a4ab3bd60625f95427d3779bd167d10f721a2b2c4ca9a20ae
+DIST system-tools-backends-2.10.2.tar.bz2 448939 BLAKE2B 2a9a957b1f5438dd40997eaa2efba634fc21a9b7c3d26c3a48ac714e62d80b0a782582325ef92a3309024f278d73ac93c7611e51eca62a210ab44436e6bf9129 SHA512 9ee3e0643122740493265e532350fed9056334de0ea3d6656daa1d42b97f76f0f85024ac87e732fe5122a1e31ad009a1d2f119720081673a06696b81452fb990
+EBUILD system-tools-backends-2.10.2.ebuild 1460 BLAKE2B c1818feca58411f992b93022bc924a87b1a037b817e7643717dfc5ce113c837eccd3fcc910b3919f5f5e6f281bbbe7bce5a8b466e0ea20540ace9ecb068e5257 SHA512 487b2d0918986e8b35a6af7065d27fbed62b9a0e05fb72e82c96124cb169f6d07fe162fb2374ec781e2fe3d2bf21cd5c98ad6f88491a292bf4e4f66df4e4e115
+MISC metadata.xml 505 BLAKE2B d649c3edba16b67de8e85125083cf3588e4635640533457bbd3d3e64485947e5e568627df60a27f8bc6154c7d50de53bd285abda4744028b3a181816a965ea55 SHA512 e3d52afec42d48a68f30802c50b3e7cb033100acd041706b1bbba6b6168c7dc1b2720a20a346a974acd2b82c530e41868d3bc49f89c1a469ba38e372e459e397
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-cve-2008-4311.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-cve-2008-4311.patch
new file mode 100644
index 000000000000..47f93da74f16
--- /dev/null
+++ b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-cve-2008-4311.patch
@@ -0,0 +1,47 @@
+From 544d679c2796602ff277e78e238abd56d30ad633 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 14 Dec 2009 20:37:58 +0100
+Subject: [PATCH 3/4] Gentoo: fix CVE-2008-4311
+
+commit fd648907e46017d46c367f59c62d0b0395830903
+Author: Simon McVittie <http://smcv.pseudorandom.co.uk/>
+Date:   2009-01-04 19:35:51 +0000
+
+    Allow root to send messages to all the system tools backends, so
+    they work even when CVE-2008-4311 has been fixed.
+
+    Also disallow normal user access by destination, not by
+    interface (fd.o #18961).
+---
+ org.freedesktop.SystemToolsBackends.conf |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/org.freedesktop.SystemToolsBackends.conf b/org.freedesktop.SystemToolsBackends.conf
+index 58972ee..537ef73 100644
+--- a/org.freedesktop.SystemToolsBackends.conf
++++ b/org.freedesktop.SystemToolsBackends.conf
+@@ -22,8 +22,10 @@
+     <allow send_interface="org.freedesktop.SystemToolsBackends.Platform" send_member="getPlatform"/>
+     -->
+ 
+-    <!-- Only allow talking to the dispatcher -->
+-    <allow send_destination="org.freedesktop.SystemToolsBackends"/>
++    <!-- configuration modules can't be accessed directly... -->
++    <deny send_destination="org.freedesktop.SystemToolsBackends"/>
++    <deny send_destination="org.freedesktop.SystemToolsBackends.Platform"/>
++    <deny send_destination="org.freedesktop.SystemToolsBackends"/>
+   </policy>
+ 
+   <policy user="0">
+@@ -45,8 +47,6 @@
+ 
+     <!-- be able to speak to configuration modules,
+          so any message to them has to go through the dispatcher -->
+-    <allow send_interface="org.freedesktop.SystemToolsBackends"/>
+-    <allow send_interface="org.freedesktop.SystemToolsBackends.Platform"/>
+     <allow send_destination="org.freedesktop.SystemToolsBackends"/>
+     <allow send_destination="org.freedesktop.SystemToolsBackends.Platform"/>
+     <allow send_destination="org.freedesktop.SystemToolsBackends.GroupsConfig"/>
+-- 
+1.6.5.4
+
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-default-permissions.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-default-permissions.patch
new file mode 100644
index 000000000000..bc58ba4fb1f9
--- /dev/null
+++ b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-default-permissions.patch
@@ -0,0 +1,25 @@
+From ea88120dac8ba2c2dabf4c393c283f69b3d33b5a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 14 Dec 2009 20:37:15 +0100
+Subject: [PATCH 2/4] Gentoo: restrict access to stb to users in stb-admin group
+
+---
+ org.freedesktop.SystemToolsBackends.conf |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/org.freedesktop.SystemToolsBackends.conf b/org.freedesktop.SystemToolsBackends.conf
+index d031525..58972ee 100644
+--- a/org.freedesktop.SystemToolsBackends.conf
++++ b/org.freedesktop.SystemToolsBackends.conf
+@@ -60,4 +60,8 @@
+     <allow send_destination="org.freedesktop.SystemToolsBackends.UserConfig"/>
+     <allow send_destination="org.freedesktop.SystemToolsBackends.UsersConfig"/>
+   </policy>
++  <policy group="stb-admin">
++    <!-- be able to speak to the dispatcher -->
++    <allow send_destination="org.freedesktop.SystemToolsBackends"/>
++  </policy>
+ </busconfig>
+-- 
+1.6.5.4
+
diff --git a/app-admin/system-tools-backends/metadata.xml b/app-admin/system-tools-backends/metadata.xml
new file mode 100644
index 000000000000..a8fccb3731a6
--- /dev/null
+++ b/app-admin/system-tools-backends/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>lxqt@gentoo.org</email>
+	<name>LXQt</name>
+</maintainer>
+<longdescription lang="en">
+The System Tools Backends are a set of cross-platform modules for Linux,
+FreeBSD, Solaris and other Unix systems. The backends provide an common DBus
+interface to all distros for modifying or reading the system configuration.
+</longdescription>
+</pkgmetadata>
diff --git a/app-admin/system-tools-backends/system-tools-backends-2.10.2.ebuild b/app-admin/system-tools-backends/system-tools-backends-2.10.2.ebuild
new file mode 100644
index 000000000000..436bb9c06c14
--- /dev/null
+++ b/app-admin/system-tools-backends/system-tools-backends-2.10.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils gnome2 readme.gentoo user
+
+DESCRIPTION="Tools aimed to make easy the administration of UNIX systems"
+HOMEPAGE="https://projects.gnome.org/gst/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="
+	!<app-admin/gnome-system-tools-1.1.91
+	>=sys-apps/dbus-1.1.2
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.15.2:2
+	>=dev-perl/Net-DBus-0.33.4
+	dev-lang/perl
+	>=sys-auth/polkit-0.94
+	userland_GNU? ( virtual/shadow )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You need to add yourself to the group stb-admin and
+add system-tools-backends to the default runlevel.
+You can do this as root like so:
+# rc-update add system-tools-backends default
+"
+
+pkg_setup() {
+	enewgroup stb-admin
+}
+
+src_prepare() {
+	# Change default permission, only people in stb-admin is allowed
+	# to speak to the dispatcher.
+	epatch "${FILESDIR}/${PN}-2.8.2-default-permissions.patch"
+
+	# Apply fix from ubuntu for CVE 2008 4311
+	epatch "${FILESDIR}/${PN}-2.8.2-cve-2008-4311.patch"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure --localstatedir=/var
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-admin/systemdgenie-0.99.0 b/app-admin/systemdgenie-0.99.0
deleted file mode 100644
index 63dcb4249d69..000000000000
--- a/app-admin/systemdgenie-0.99.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-apps/systemd sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=systemd managment utility
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/systemdgenie.git
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-apps/systemd >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/unstable/systemdgenie/systemdgenie-0.99.0.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=97be443413edb83c2e757af010023e96
diff --git a/app-admin/systemdgenie/Manifest b/app-admin/systemdgenie/Manifest
new file mode 100644
index 000000000000..a52812fa1661
--- /dev/null
+++ b/app-admin/systemdgenie/Manifest
@@ -0,0 +1,3 @@
+DIST systemdgenie-0.99.0.tar.xz 29104 BLAKE2B f2da14ae035fa04bd775dedb8bdd7fe41612c019a47fe02e1994a7304677970193ba54aacbb7d0fd8e31832eb01ae1f12b8dc7a869b0c6529dcd18b1fece2b52 SHA512 9600ffa05737bbf8d7deaece3fc78392dbb4228aa2f001ca3e34fb6390c1a9104884f61eec90ae204550a8cee0281b92f34f64652f9881967430fb695f6bb3f4
+EBUILD systemdgenie-0.99.0.ebuild 730 BLAKE2B 5206ebebb22844b31945f72972b441d0f8c7ce9066c8c00eac544683dc0d8c83f984d48c58d45e298af2d7e5ae4524641874ad66f92cf3865c043e71c380a3d7 SHA512 3b92b9c57e85c4aa6fc121c1a31d49ca68ea7650e581d43af67a416c5a06c6410df4b4a23f711651e04c6fef5a055ef0a930d4c530aab7c3edd4d853e4acc6d4
+MISC metadata.xml 686 BLAKE2B 30d737327ef735c3b38e8c5940372dd1004d15206aeda7a1c18b7088fb0b0d31bf4c740ec2cbf9747f10d86c2c594af695a3f5e6e1a9b4aee2c42af198682358 SHA512 cf49cfa73a7798aa4a5c568df4afc5fdf3d66c43b9df5569ae38f4d590aefe6161e78e8314be92dbd4366d1413258a6a55c24e9783f1df870ad27a2f2c87cb9d
diff --git a/app-admin/systemdgenie/metadata.xml b/app-admin/systemdgenie/metadata.xml
new file mode 100644
index 000000000000..11abdb5d1f9d
--- /dev/null
+++ b/app-admin/systemdgenie/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		systemd management utility based on KDE technologies. Tt provides a graphical frontend for the systemd daemon, which allows for viewing and controlling systemd units, logind sessions as well as easy modification of configuration and unit files.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>rthomsen6@gmail.com</email>
+			<name>Ragnar Thomsen</name>
+		</maintainer>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild b/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild
new file mode 100644
index 000000000000..3d6e2edbee3d
--- /dev/null
+++ b/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="systemd managment utility"
+HOMEPAGE="https://cgit.kde.org/systemdgenie.git"
+LICENSE="GPL-2+"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	sys-apps/systemd
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
diff --git a/app-admin/systemrescuecd-x86-4.4.1 b/app-admin/systemrescuecd-x86-4.4.1
deleted file mode 100644
index 01cbaa6e8d23..000000000000
--- a/app-admin/systemrescuecd-x86-4.4.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.4.1
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.4.1/systemrescuecd-x86-4.4.1.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.5.0 b/app-admin/systemrescuecd-x86-4.5.0
deleted file mode 100644
index 379b64ad5649..000000000000
--- a/app-admin/systemrescuecd-x86-4.5.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.5.0
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.5.0/systemrescuecd-x86-4.5.0.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.5.1 b/app-admin/systemrescuecd-x86-4.5.1
deleted file mode 100644
index aa449dc48915..000000000000
--- a/app-admin/systemrescuecd-x86-4.5.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.5.1
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.5.1/systemrescuecd-x86-4.5.1.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.5.2 b/app-admin/systemrescuecd-x86-4.5.2
deleted file mode 100644
index f8fd3009362f..000000000000
--- a/app-admin/systemrescuecd-x86-4.5.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.5.2
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.5.2/systemrescuecd-x86-4.5.2.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.5.3 b/app-admin/systemrescuecd-x86-4.5.3
deleted file mode 100644
index 8a2d49e7be11..000000000000
--- a/app-admin/systemrescuecd-x86-4.5.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.5.3
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.5.3/systemrescuecd-x86-4.5.3.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.5.4 b/app-admin/systemrescuecd-x86-4.5.4
deleted file mode 100644
index 2150f6ed970c..000000000000
--- a/app-admin/systemrescuecd-x86-4.5.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.5.4
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.5.4/systemrescuecd-x86-4.5.4.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.6.0 b/app-admin/systemrescuecd-x86-4.6.0
deleted file mode 100644
index 2f4ac6d37eb4..000000000000
--- a/app-admin/systemrescuecd-x86-4.6.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.6.0
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.6.0/systemrescuecd-x86-4.6.0.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.6.1 b/app-admin/systemrescuecd-x86-4.6.1
deleted file mode 100644
index a3b48cc6c19b..000000000000
--- a/app-admin/systemrescuecd-x86-4.6.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.6.1
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.6.1/systemrescuecd-x86-4.6.1.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.7.0 b/app-admin/systemrescuecd-x86-4.7.0
deleted file mode 100644
index 199c3790bd7e..000000000000
--- a/app-admin/systemrescuecd-x86-4.7.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.7.0
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.7.0/systemrescuecd-x86-4.7.0.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.7.1 b/app-admin/systemrescuecd-x86-4.7.1
deleted file mode 100644
index 8acb3ac3f40d..000000000000
--- a/app-admin/systemrescuecd-x86-4.7.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.7.1
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.7.1/systemrescuecd-x86-4.7.1.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.7.2 b/app-admin/systemrescuecd-x86-4.7.2
deleted file mode 100644
index aaee32c47a8d..000000000000
--- a/app-admin/systemrescuecd-x86-4.7.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.7.2
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.7.2/systemrescuecd-x86-4.7.2.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.7.3 b/app-admin/systemrescuecd-x86-4.7.3
deleted file mode 100644
index fa190419cac4..000000000000
--- a/app-admin/systemrescuecd-x86-4.7.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.7.3
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.7.3/systemrescuecd-x86-4.7.3.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.8.0 b/app-admin/systemrescuecd-x86-4.8.0
deleted file mode 100644
index 7bea62f36902..000000000000
--- a/app-admin/systemrescuecd-x86-4.8.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.8.0
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.8.0/systemrescuecd-x86-4.8.0.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.8.1 b/app-admin/systemrescuecd-x86-4.8.1
deleted file mode 100644
index 99f20e755d0b..000000000000
--- a/app-admin/systemrescuecd-x86-4.8.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.8.1
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.8.1/systemrescuecd-x86-4.8.1.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.8.2 b/app-admin/systemrescuecd-x86-4.8.2
deleted file mode 100644
index 5b0e28b73a98..000000000000
--- a/app-admin/systemrescuecd-x86-4.8.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.8.2
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.8.2/systemrescuecd-x86-4.8.2.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.8.3 b/app-admin/systemrescuecd-x86-4.8.3
deleted file mode 100644
index f51356facf3b..000000000000
--- a/app-admin/systemrescuecd-x86-4.8.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.8.3
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.8.3/systemrescuecd-x86-4.8.3.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.9.0 b/app-admin/systemrescuecd-x86-4.9.0
deleted file mode 100644
index d1e20d663aea..000000000000
--- a/app-admin/systemrescuecd-x86-4.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.9.0
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.9.0/systemrescuecd-x86-4.9.0.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.9.1 b/app-admin/systemrescuecd-x86-4.9.1
deleted file mode 100644
index c3bdef82051c..000000000000
--- a/app-admin/systemrescuecd-x86-4.9.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.9.1
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.9.1/systemrescuecd-x86-4.9.1.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.9.2 b/app-admin/systemrescuecd-x86-4.9.2
deleted file mode 100644
index 1da657bef2cb..000000000000
--- a/app-admin/systemrescuecd-x86-4.9.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=5
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.9.2
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.9.2/systemrescuecd-x86-4.9.2.iso
-_md5_=48043707a09553ce12d9d03054aa7cb0
diff --git a/app-admin/systemrescuecd-x86-4.9.3 b/app-admin/systemrescuecd-x86-4.9.3
deleted file mode 100644
index 42d9481d09be..000000000000
--- a/app-admin/systemrescuecd-x86-4.9.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=6
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.9.3
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.9.3/systemrescuecd-x86-4.9.3.iso
-_md5_=b305776d6608a44e2b3131a6ee7d6b33
diff --git a/app-admin/systemrescuecd-x86-4.9.4 b/app-admin/systemrescuecd-x86-4.9.4
deleted file mode 100644
index b3747eda75f8..000000000000
--- a/app-admin/systemrescuecd-x86-4.9.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=6
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.9.4
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.9.4/systemrescuecd-x86-4.9.4.iso
-_md5_=b305776d6608a44e2b3131a6ee7d6b33
diff --git a/app-admin/systemrescuecd-x86-4.9.5 b/app-admin/systemrescuecd-x86-4.9.5
deleted file mode 100644
index 351bab51226a..000000000000
--- a/app-admin/systemrescuecd-x86-4.9.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=6
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.9.5
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.9.5/systemrescuecd-x86-4.9.5.iso
-_md5_=b305776d6608a44e2b3131a6ee7d6b33
diff --git a/app-admin/systemrescuecd-x86-4.9.6 b/app-admin/systemrescuecd-x86-4.9.6
deleted file mode 100644
index 9b87b845069b..000000000000
--- a/app-admin/systemrescuecd-x86-4.9.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=6
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=4.9.6
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/4.9.6/systemrescuecd-x86-4.9.6.iso
-_md5_=b305776d6608a44e2b3131a6ee7d6b33
diff --git a/app-admin/systemrescuecd-x86-5.0.0 b/app-admin/systemrescuecd-x86-5.0.0
deleted file mode 100644
index 8eddb1ca8c13..000000000000
--- a/app-admin/systemrescuecd-x86-5.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=6
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=5.0.0
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/5.0.0/systemrescuecd-x86-5.0.0.iso
-_md5_=b305776d6608a44e2b3131a6ee7d6b33
diff --git a/app-admin/systemrescuecd-x86-5.0.1 b/app-admin/systemrescuecd-x86-5.0.1
deleted file mode 100644
index 97f6b7af2d66..000000000000
--- a/app-admin/systemrescuecd-x86-5.0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=6
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=5.0.1
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/5.0.1/systemrescuecd-x86-5.0.1.iso
-_md5_=b305776d6608a44e2b3131a6ee7d6b33
diff --git a/app-admin/systemrescuecd-x86-5.0.2 b/app-admin/systemrescuecd-x86-5.0.2
deleted file mode 100644
index 2767ff86a5ea..000000000000
--- a/app-admin/systemrescuecd-x86-5.0.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=6
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=5.0.2
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/5.0.2/systemrescuecd-x86-5.0.2.iso
-_md5_=b305776d6608a44e2b3131a6ee7d6b33
diff --git a/app-admin/systemrescuecd-x86-5.0.3 b/app-admin/systemrescuecd-x86-5.0.3
deleted file mode 100644
index 79b6842bab83..000000000000
--- a/app-admin/systemrescuecd-x86-5.0.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=6
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=5.0.3
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/5.0.3/systemrescuecd-x86-5.0.3.iso
-_md5_=b305776d6608a44e2b3131a6ee7d6b33
diff --git a/app-admin/systemrescuecd-x86-5.0.4 b/app-admin/systemrescuecd-x86-5.0.4
deleted file mode 100644
index ab96ae12c602..000000000000
--- a/app-admin/systemrescuecd-x86-5.0.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=6
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=5.0.4
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/5.0.4/systemrescuecd-x86-5.0.4.iso
-_md5_=b305776d6608a44e2b3131a6ee7d6b33
diff --git a/app-admin/systemrescuecd-x86-5.1.0 b/app-admin/systemrescuecd-x86-5.1.0
deleted file mode 100644
index 85552b43d60b..000000000000
--- a/app-admin/systemrescuecd-x86-5.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=6
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=5.1.0
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/5.1.0/systemrescuecd-x86-5.1.0.iso
-_md5_=b305776d6608a44e2b3131a6ee7d6b33
diff --git a/app-admin/systemrescuecd-x86-5.1.1 b/app-admin/systemrescuecd-x86-5.1.1
deleted file mode 100644
index c7d6c515907d..000000000000
--- a/app-admin/systemrescuecd-x86-5.1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=6
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=5.1.1
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/5.1.1/systemrescuecd-x86-5.1.1.iso
-_md5_=b305776d6608a44e2b3131a6ee7d6b33
diff --git a/app-admin/systemrescuecd-x86-5.1.2 b/app-admin/systemrescuecd-x86-5.1.2
deleted file mode 100644
index 8c936e84e3bb..000000000000
--- a/app-admin/systemrescuecd-x86-5.1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=6
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=5.1.2
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/5.1.2/systemrescuecd-x86-5.1.2.iso
-_md5_=7160db51d58d288e65e81b9aa292e3df
diff --git a/app-admin/systemrescuecd-x86-5.2.0 b/app-admin/systemrescuecd-x86-5.2.0
deleted file mode 100644
index 55ab8838217a..000000000000
--- a/app-admin/systemrescuecd-x86-5.2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=6
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=5.2.0
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/5.2.0/systemrescuecd-x86-5.2.0.iso
-_md5_=b1199bbecf4da8961eb1e01c5c78ddda
diff --git a/app-admin/systemrescuecd-x86-5.2.1 b/app-admin/systemrescuecd-x86-5.2.1
deleted file mode 100644
index ce4dc630708b..000000000000
--- a/app-admin/systemrescuecd-x86-5.2.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=6
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=5.2.1
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/5.2.1/systemrescuecd-x86-5.2.1.iso
-_md5_=7160db51d58d288e65e81b9aa292e3df
diff --git a/app-admin/systemrescuecd-x86-5.2.2 b/app-admin/systemrescuecd-x86-5.2.2
deleted file mode 100644
index 9270287e2baf..000000000000
--- a/app-admin/systemrescuecd-x86-5.2.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=isohybrid? ( >=sys-boot/syslinux-4 )
-DESCRIPTION=The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant
-EAPI=6
-HOMEPAGE=http://www.sysresccd.org/
-IUSE=+isohybrid
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=5.2.2
-SRC_URI=mirror://sourceforge/systemrescuecd/sysresccd-x86/5.2.2/systemrescuecd-x86-5.2.2.iso
-_md5_=7160db51d58d288e65e81b9aa292e3df
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
new file mode 100644
index 000000000000..735560a9baa3
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -0,0 +1,69 @@
+DIST systemrescuecd-x86-4.4.1.iso 413272064 BLAKE2B fcac7e428df5a416b406ade8fbec980f2e6fe2b1d3458dd7597949713d8932c23eee85da77e87e129341827f0ac7078b4b8ee43e00b13c86ae52b775d7dbd43b SHA512 5c5045df219181064201dda195961096da9722d3d5758dcb111c2c74ed083b3464f314340c01a5a27a920c33bd5bc95efee2efa1edc2405a0d11d9bc67e4b2a5
+DIST systemrescuecd-x86-4.5.0.iso 439603200 BLAKE2B f435184bd68cd1a5450ebdf87d51c75f950aaaba6e56a96ec802d521b1d4dc53c7b53193682b412e6343c2ce564921a86118b1eb7f1366c5177a7c07f9a2a6fe SHA512 e821876cb6f58d5eaeba35c91c60503e81c04c50b3c496e4144c8dc459c6e78aece9b7e7a3ca35ce427e0965c197758b2267909bcdf95f6a19221898fdbc91b2
+DIST systemrescuecd-x86-4.5.1.iso 443541504 BLAKE2B 9426e392baf0fb2ffb1318b8783541bcf665b7b2ddaadaf52d6a302b89de07fce26148affcc0bf64c7d69ad67a1ad8961a10472c8b9d00412013d9dd1b106c0d SHA512 561fa30404a7a41a1fcb0cc24c1a5eea407de1c2d2f1bd5273e2acd471986ab8587df9f9b3ff364617f81a351cdedd12c6859b53b1f7e430867c654fd136a524
+DIST systemrescuecd-x86-4.5.2.iso 456060928 BLAKE2B 1ea3a9a65a0e2681bfeba2e660d333f96f8535e1048a2b6ac66a2eeb543c2e6a47b3d9293cc58943e61c0f2c5b2585987c6b9bc2188f156dfca653a30fe6df1c SHA512 b27223b08032f0132f81204a244638262cf70348a1a299e5bf63971db556d604e52d8c3408e3943c305eac887c2e38ed6d2b1488633595c9f8c1cc087162f911
+DIST systemrescuecd-x86-4.5.3.iso 458467328 BLAKE2B 787a1195ed2403553d860f2a8e97c86e551b481a0bd65777a587ebb3a4837267875822a98e2bab32b823dbe3ba2a8268c7733d9ce8133f926cb3c0b222998a8d SHA512 14774e9a882d5a505532ab8bee85e81867f5d30674df471eb76cae84678eae00fa3992c894b6c90b85c7eaa20bdc04ffe910a7a432092faf3329c08bf54eff49
+DIST systemrescuecd-x86-4.5.4.iso 459102208 BLAKE2B c27bb5035a71aba423026f2f4dc0b7e6c8c3c3b66525823de537e1f2e6f62cdf923c6a6ddca517404746b0cb0d55f145186913c8966b36dae330783db825011c SHA512 c32904413516af917de3d58b8eaf3b5701b9c49b1249daf1f8eca060497d5278fedbb0c0d86907bf94ddeab716dc8bf014e0baed0aee66141e8967207805d446
+DIST systemrescuecd-x86-4.6.0.iso 467294208 BLAKE2B c6e0f582aca37617058efa30433360ba6c7dc53c2f7d64d433456188245a878118a560f02b9090fe3d387c0df49fbebec7f187d6e97a1b4af9750ba45e64435d SHA512 f90d46adb8ab19b19eae589744808bcbd50aa0b0eac22eca92a09e8407c77e7a2bf573c2c72b37f497a9d287c90b20164b213bf007b538063f758b12b1da11eb
+DIST systemrescuecd-x86-4.6.1.iso 470530048 BLAKE2B 71a0d19d0db74c26e8a6023d135d401547013a028ce74a5540292a7c1d84d58bb4d60762e846f3c160f0fcdc64fca3a9a3ddcaa490da6ddbb48ffbe07aa0b465 SHA512 3ae7c4f3f2196190c8bac44da35878450ef5455240e10f5bf2063a28f0f1c59d35458c7db42a3324e8b963a9e8b250a1b54ffa85e5cb6cf27c9e94ae1fb593d3
+DIST systemrescuecd-x86-4.7.0.iso 479350784 BLAKE2B ebf81de607133ba94ad3c8555ec40c0619d102f44b7a327db5457d89fb049b10d9a802d7394e02c8fe94fc7e25fccecd6d0cf3faa7206cd9355e75ad27909d5a SHA512 c0246dd558186d3436666ef6509eacb2abed82a3205e47eb00b0fa0e98cafbfd6dd8880e83bb7e98b2b019b6f1a0797abcb26c5101eed265a83c37139085dc1d
+DIST systemrescuecd-x86-4.7.1.iso 481220608 BLAKE2B bb5ac00936a3a33b711223ba7a1c7ea494a5c7b74c5e5692d1fa2b5fd11b7862221ea5a38d062362dd2e35d3df0422dcd2c60c95458e80bcfd47a89b3d41485e SHA512 13114a4e4616dfb8f118c07724fcca1fe9dd739a7c2dd8f5553f48dbaa744fe6d211cf6f341159b4ffda090f0101bd96f72d3e11c7c8c77a33a888d3c2859a6c
+DIST systemrescuecd-x86-4.7.2.iso 482217984 BLAKE2B 3e776a7bc2184e30cc1e91cf1147db683bb228512e5f30a6ab287db9fbc6583ce18803f7a18b38dc02679f0858b0f7540e571fa5a7e60a08a75cfca1e4ef3c03 SHA512 2340facff40d8f7eaebf75bba771333d21e8951384c34b04dcc5734de3c18e0c8e50e5cc35b93ab91df48f2ba9dc51ebe97a820fdb322d9f169df7067d6a92d6
+DIST systemrescuecd-x86-4.7.3.iso 482799616 BLAKE2B fbcbc66ddce672971ea89370ce681adf3622c7e7706c18eb779443bdf0156a7c083d68213da8233b6c7f9035734f903fe1ba165b128aa1fae38fe30b27cc893e SHA512 42331496283b981661861e49448b17b0a4fd202f38024990a5aaf2572f300016e67f86ec3ec82adb4dc337a5275da858bf80fbb6a49886682298ffcea6c0d1f0
+DIST systemrescuecd-x86-4.8.0.iso 488042496 BLAKE2B c3535ddd71029591841a844a6c79dfe08c3a6fa7f24df7fb99ed77e2988d54cf6c1c7ea0607a77b30532642940dbd34030a604bcbc26eff3d2a0b29fa6b0e79a SHA512 bfd3142149a9155e35d1add271265ae54074bfe2a8f658ca366dfdecfa893b683adb6206f11738d972df98cf7026c893d17ecebf8635c3cd5cd38cfd4c0b2e0e
+DIST systemrescuecd-x86-4.8.1.iso 483315712 BLAKE2B e83dc2eac645e0b2fe317c29af6269f3d58a20ffbee83d19d493770f15de98d65fa66bd5e1cefb0a7c4e7fc08c155900428ef4417a2b0264d9ed7a5f625efa75 SHA512 0424fab36e2caf7e3e9dd7c334d57b7eb9a090e3d79c52ea8e003e05931558b48be5375ac49eaaa78141d179d7153c91c386a42d7ead8d56ef3113363b8ff692
+DIST systemrescuecd-x86-4.8.2.iso 497338368 BLAKE2B 6e26aaeb1e67d5462db3aa70101134a14ed1038c2cae305283653fa07664d8f7c48dbb57a1593d404556ac9ed569b4c7148de5c41e9b6b80fd11536843ad83b4 SHA512 6467e383382edcd4a92aae60404b0f1451f6941c147dd911296f911a001d0002546d1fe4d4f49dc1eafc688aa53eaa07948b6f7f388fc87830ec1c58093b1135
+DIST systemrescuecd-x86-4.8.3.iso 498751488 BLAKE2B e5cf10b946844e7109ec79a35f0d27cb58ee3e73c12041fc2125b5d5af5e160f0a43f25fc686dbf6ae46c7ccbf082531e0dc80af1762883cb710a55813169040 SHA512 6111ad0b238ece75bef707f40668f6e7d039eeee4e89acf6e975e07ce6084f7d00da3c24e3271d3d75a504849e1799d1155691a0d6f5f1dd82966a41b7f5ec04
+DIST systemrescuecd-x86-4.9.0.iso 504498176 BLAKE2B f788e615472fb94112bf85b3aa3424b999adfd1927dcc287f9ce5144f3f62463241c366e21acd76e87a4fc9d1db50849f54c2b33d19d0b265f81840525aae633 SHA512 04c89f0140245992aac2659b2b0114ae2961bd382ca302a70fe8dc2348286099601011b16c339cb95ca13345aaed94749272a61f86223dec30cb31328565665b
+DIST systemrescuecd-x86-4.9.1.iso 513009664 BLAKE2B 51b98de778e39ec9e6f878d3c6bd88efd9bb0f62c9c09f738a9e5afd359376149050e866e897505b5de50198c6d509c2612eba663f4d982c5fc04ef7a2f01c79 SHA512 ac4c2bc65611a575c2f4d12012e9bcaf8bd94283aa8d8c0ad571352b8f33161dded68de091839c9d8a4d5101a2413864838596eed1aedcf20d9441dd59f96dfa
+DIST systemrescuecd-x86-4.9.2.iso 512159744 BLAKE2B 0b31a1215626a6049c10c42a36eb470b9d941b70c05b6dccef6299073d454e215ef5e4b35079885e95ce0d9d27c05797648433c6a96bd7b981c70a1b7bc7558f SHA512 2d99c0e432ecf5b5635d597d6899518c6ee03bb79911d992d22bda993d38376028407c98ba15f9510c8723c5fba6bf8f0958574542c6035e7cce4c5096ad0a18
+DIST systemrescuecd-x86-4.9.3.iso 515739648 BLAKE2B 7c095dde897ab59e9a6473eff7f49f2c257cf8cd2429c8438fc22f21eecc6b97fad041f107bbe427dc67127ed85053605d3e7c1eb09714606a3b40af6b20ed1e SHA512 d60b3ba1548c98faba24e2c56ffe70be2e271b0946d2dde46cf766e6f206881f1e0450998af05c439f37edbcac67f0649830914c4354c2212518f63faa140254
+DIST systemrescuecd-x86-4.9.4.iso 516374528 BLAKE2B ad80cda36537c4cb4eb6db2a6a064f77f7c4342effd2bd6692a17d40cc9e67b5fcddb6b8787d18f6f540427b82e4979d3a46df8cf111ac65a385315e055006f6 SHA512 7bfe963e7ec04f18efbeac5d40a016b56ae7bc8fe8913d8cfd0ea9fbe0f3833d2b86d1a00f30f6587b91338416884af6a65249121609ce2f58a6efa50486e139
+DIST systemrescuecd-x86-4.9.5.iso 520032256 BLAKE2B 19c14273c51b7f95d9ecac74ffb43ead7c2b8f704b6b8badf2e32a59f3d4ef5779e625a7410e8e1d62d16c3ece2b9f849c657220463d0bacd4e0292618bb64e2 SHA512 6f9a3497c809c8cf1dcec114221d5d992fa2735b3fa1cc992e46a8e9c793ef7019c37c4a61f8abddafbac0cf7ce03c6fc9a3a2a750d7a82e69db3bdc6791e7fc
+DIST systemrescuecd-x86-4.9.6.iso 566126592 BLAKE2B 8ce2464c63cba82706d8cca6f5248691d01cf198ac83b0b1e228ef9093f1f6e03d2eb9d1a224d3b88b7d8e72bab07394629ba6b92a424842cc85d3753081260f SHA512 89f6fdc89f91e515d2d84543998ce2c4629c88d290d4aa16f9ad42e194ad7720ec02155a30e19a4744e5d68db0bb476fc86cafe64ec9eb62ff809c32504841b5
+DIST systemrescuecd-x86-5.0.0.iso 484790272 BLAKE2B e26c145ca2c00d606eab9497efee48f1c45d7aa04c91c6524ba61c7e5abc32af975164c599bfd213b758aed7afe5ce9f650788ed5552a89cccd2aa6107aeb698 SHA512 67e442f229c55d16a13a46619134afee14fd7cf71e9d5e3d6f54a7b2ce3646e9ff89a17605c05f7a255b251c3bc56004aa9a59bd06f3ed69f7f4b9057ea6ea6c
+DIST systemrescuecd-x86-5.0.1.iso 485711872 BLAKE2B 010d2bd0161cafd0907d46cffd5f79011d4677e2ed7810a9dc14c121b8dd281d465c9c9d061a28d3d8708f1e258b6ddcbdcaf4aa9f9f37f7fca5923413167b26 SHA512 b18663574e54f1b6b5a147aa947d8faa4ad7eff7d756e8c3cee5397fdf3ac97c1c907f65a61403b2f0a7583fb9ad0fb74c920a8040365f6caad649371deeb1c4
+DIST systemrescuecd-x86-5.0.2.iso 495773696 BLAKE2B 7ca6bfafd38a585c0e520c50fd4adb6ae2dd1dcc49ec932ad119e8679bceeb1c819a3bba57d6a7142db5b15159b0baa3855643f272d0e3336f06bda1757a5a75 SHA512 eaf5c080fbf810c0f966335c1f2f797f8e756c03a6246c8f2e2dd13637a66a160fd0d966095849d16b94664bf973bb9064e1f9f91785f0fd51372820c90b905f
+DIST systemrescuecd-x86-5.0.3.iso 501446656 BLAKE2B 5ef49720c97ea5afb31dc6f30f57985570dcf56dd5d390dfe5d13f24a3503d37a311a720a1859525f0fde13d17e00b2439a0db4934187c1ce1bc35ba7d689c7b SHA512 a6748224f3f8cac5f9751648278bbc06acfc123c64b7c0a3b6e47f00b0a3c255082e9ffc43fd0fd3df26322cf154797ea6a02c6b37087ae832219ec4f3bec673
+DIST systemrescuecd-x86-5.0.4.iso 501141504 BLAKE2B 01acafdb8e7ac8343f0e30ed7be73e6e7ef92ed1d1edc2153e0c192717d25d7b85a163a5444222aee1af57971a871843ef1cec2d264f5a2ca7df32ed2aaff7b6 SHA512 26b624c75f75e181051b164b0a1f24b612d9ac11c2ed8df3e40fd13e48bfa58022be814e4ac608f3fde892eaa99954f10c0e1fb1ef4831a501dc4e1c0c87b764
+DIST systemrescuecd-x86-5.1.0.iso 505047040 BLAKE2B 3653bdd2733cfe214275ab8d3a95a1cab142f72a12da7fa7f76af8faa1801a1ab4da74493efeb2e1b759e871b1ddf8a847825a4f37ae6c3b009fd90e4dcfdd4b SHA512 15d019bbb91019f1b6d1847fc786e6c02f3f768826241e0823842bca9745ff1fa48fe7d32828f899b90845b2f4ce948a1f98e093edf8ca4c0c39cc0da72b4aa8
+DIST systemrescuecd-x86-5.1.1.iso 517359616 BLAKE2B f139a521076f0345a65bddfd999f7dd4479a9fd26e3621f2c419804228922af53f2e6d99a97919db0041e4199a95ea745d674a7b0a61f86dc5d9e10ff562d314 SHA512 a4063305da50ea8b73fb7157f46bf386b80d3ef777adabdcdd944814c801d078fe63778f166b80788b0851549b35bf6ada5940ca5a40a6c1a3e0f4c66efbea91
+DIST systemrescuecd-x86-5.1.2.iso 523479040 BLAKE2B abf6f1e3e05e382b48dcfd4ecde9f70896462418cf36057e3a42dc2366e0b56133deeb6f00363d15d94238c22fb8ac5c88b57ca6c213c9dcc299fa04def5e2cd SHA512 516e60632459dd5408f83035aa265ed4169b13f978a23960a85837c9c8b5bbab70776e22a6e6727184bd9df81cbbeff4a5819d5927ff0ff3a79036bc4c54cfdc
+DIST systemrescuecd-x86-5.2.0.iso 569669632 BLAKE2B fe31a68df650b46bd875b91c643c8f1daaa60042ea6c59ac452bb99a2792dcdcee62f1b60c329a70c95689af22c1a0fc52a966631af347258d665f55d2f6d8c0 SHA512 42da80a419aa27bea891339dc163a62bff8ba34d74c202a7fd0317592e8870a71ddc7fa9e9ded5e9d2f75dc36ec8417673074ffde60ea472815405456e34876c
+DIST systemrescuecd-x86-5.2.1.iso 570523648 BLAKE2B 9bb6b2ff7b9930f658baddbf60ef89e86171febcfb48eb0a6ce1bfea8fd3348773a9da948370f9f310dd0e992c40aa64a4ef1442f5cd7f408f847d147074cf1f SHA512 6820f079c9e97ac0d383ed9096a120e7e31771e1d41465f4cf7f5db36a7cb83ccfaae5c5e561181c3b3cb169d4cc4a9a6904a707ecde06a6de4f2456d2a658e4
+DIST systemrescuecd-x86-5.2.2.iso 572006400 BLAKE2B 2cc95acc529ae8e0525664ffbdfefaf6e4513e8135fa6af120121b0b7930b0203bd17d5d70ccafacfe0064bb8615f45aa22b6e6e3fcee8a005a0315fd9b5cf62 SHA512 7dd1ccd63775e35f6589808416468c4a9314f4a7a5d0cb1f2bc34ffb9eef3a450b0da244dfc9e325d828c39404c0cdcce27cc990eade33762c17a1e32f8db9b5
+EBUILD systemrescuecd-x86-4.4.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.5.0.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.5.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.5.2.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.5.3.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.5.4.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.6.0.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.6.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.7.0.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.7.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.7.2.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.7.3.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.8.0.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.8.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.8.2.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.8.3.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.9.0.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.9.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.9.2.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
+EBUILD systemrescuecd-x86-4.9.3.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
+EBUILD systemrescuecd-x86-4.9.4.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
+EBUILD systemrescuecd-x86-4.9.5.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
+EBUILD systemrescuecd-x86-4.9.6.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
+EBUILD systemrescuecd-x86-5.0.0.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
+EBUILD systemrescuecd-x86-5.0.1.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
+EBUILD systemrescuecd-x86-5.0.2.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
+EBUILD systemrescuecd-x86-5.0.3.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
+EBUILD systemrescuecd-x86-5.0.4.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
+EBUILD systemrescuecd-x86-5.1.0.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
+EBUILD systemrescuecd-x86-5.1.1.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
+EBUILD systemrescuecd-x86-5.1.2.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
+EBUILD systemrescuecd-x86-5.2.0.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf450b27713e03a0005926aff8995d098bf49ce487c4f090b5032b5e2bf25fe03174199e7af1ad4608de955e8aadc464b86ed4 SHA512 087629ec3bee8ab3326df039262db4a07ebf9bbb98ebc9cfa00056f4fdc08f069c49a8cfecc5b2e6bb0c355037b1d34a754294339a8df9a3f0db9619117761f6
+EBUILD systemrescuecd-x86-5.2.1.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
+EBUILD systemrescuecd-x86-5.2.2.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
+MISC metadata.xml 610 BLAKE2B 400c26cbce80747fe88b60d34ea0f018b7119ad6ef333e8de931424aaa929db90ba0836a4520fbe62baa0c7aa9992745c4c082e495f318066acf5285e56dcd10 SHA512 5092c69f83df351b3697ab0c83e165eba5c7ceffd197707047bdd4d2e809ff7267e436e91e3035223beb088c48835ae28fd4032a8122687af116fa1405b30b15
diff --git a/app-admin/systemrescuecd-x86/metadata.xml b/app-admin/systemrescuecd-x86/metadata.xml
new file mode 100644
index 000000000000..823bc77a91fb
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <use>
+    <flag name="isohybrid">
+      Pass downloaded images through isohybrid in order to make it
+      possible to copy them directly to USB media and boot (requires
+      <pkg>sys-boot/syslinux</pkg> at build time).
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">systemrescuecd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.0.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.1.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.3.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.0.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.2.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.3.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.0.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.1.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.2.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.3.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.4.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.4.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.5.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.5.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.6.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.6.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.0.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.1.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.2.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.3.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.4.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.4.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.0.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.1.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.2.ebuild
new file mode 100644
index 000000000000..1ceb856d826f
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="amd64 x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.0.ebuild
new file mode 100644
index 000000000000..7bfc35a7dd27
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.1.ebuild
new file mode 100644
index 000000000000..1ceb856d826f
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="amd64 x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild
new file mode 100644
index 000000000000..1ceb856d826f
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="amd64 x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/tenshi-0.17 b/app-admin/tenshi-0.17
deleted file mode 100644
index 49cc66ff06ac..000000000000
--- a/app-admin/tenshi-0.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DESCRIPTION=Log parsing and notification program
-EAPI=6
-HOMEPAGE=http://dev.inversepath.com/trac/tenshi
-KEYWORDS=amd64 ppc x86
-LICENSE=ISC
-RDEPEND=dev-lang/perl dev-perl/IO-BufferedSelect sys-apps/coreutils
-SLOT=0
-SRC_URI=https://github.com/inversepath/tenshi/archive/0.17.tar.gz -> tenshi-0.17.tar.gz
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=2e2a92dcc0c60e44083b981b3f038a79
diff --git a/app-admin/tenshi/Manifest b/app-admin/tenshi/Manifest
new file mode 100644
index 000000000000..34e0194e9d12
--- /dev/null
+++ b/app-admin/tenshi/Manifest
@@ -0,0 +1,3 @@
+DIST tenshi-0.17.tar.gz 24597 BLAKE2B 846128e65b1a2d2a3bc5edecc9356069f44d9c13757771ec7fc5c31063d8aeb9403d447dbb088d2aa7d05d3b086ac6c569cd24a05c336225540b3baa10e79bb7 SHA512 2ca93ceaab0843c321fa69d8ba1c7b31eaf809cac4348c98327ddd9ab72df4d5ff00d6b4edeb19a9f02e154161988e0c2284248fd0e84d2b42dd82fdbaac1a78
+EBUILD tenshi-0.17.ebuild 1199 BLAKE2B e7e0499c5659c35fbd2b8662bd543350e06fbf98c4ddbfa6681fe3926949a9ccf4e2a4376ec5390704c95afc95f452481f431516d21ce060cb3d8c59bd7de136 SHA512 c8ebcb56ef759ad01bfe4f9be27b5cdff560e1184b93eac61b6e35f6dbad26dfc942923969a30d00e5b44022955b5eaa74d93aa0ce47b2465d7dbe5b5af972f7
+MISC metadata.xml 464 BLAKE2B 7a6641b592d206396a955c7aef2ce071335c3b937700f8fc5d9aacb1be093b84570afa4702ecb9d9eaec328d2aebf37f260b176d6b8e75921cdf52eff5980dd9 SHA512 db98f1636bb66ec2f345b93d9c52894032f408ae893135bb776394a5e7a1173629f58d8fce1d3b6a77962517067ca5e3859ecf4efb56bdfb950d2450d100c954
diff --git a/app-admin/tenshi/metadata.xml b/app-admin/tenshi/metadata.xml
new file mode 100644
index 000000000000..1cd4d2b19887
--- /dev/null
+++ b/app-admin/tenshi/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>bldewolf@cpp.edu</email>
+  <name>Brian De Wolf</name>
+</maintainer>
+<maintainer type="person">
+  <email>atj@pulsewidth.org.uk</email>
+  <name>Adam James</name>
+</maintainer>
+<maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/tenshi/tenshi-0.17.ebuild b/app-admin/tenshi/tenshi-0.17.ebuild
new file mode 100644
index 000000000000..aa5c431f8c84
--- /dev/null
+++ b/app-admin/tenshi/tenshi-0.17.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user
+
+DESCRIPTION="Log parsing and notification program"
+HOMEPAGE="http://dev.inversepath.com/trac/tenshi"
+SRC_URI="https://github.com/inversepath/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	dev-perl/IO-BufferedSelect
+	sys-apps/coreutils"
+
+pkg_setup() {
+	enewgroup tenshi
+	enewuser tenshi -1 -1 /var/lib/tenshi tenshi
+}
+
+src_prepare() {
+	default
+	# Fix for bug #241254
+	sed -i 's:^docdir =.*:docdir = /usr/share/doc/${PF}:' \
+		Makefile || die "docdir substitution failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doman tenshi.8
+	newinitd tenshi.openrc-init tenshi
+
+	# We don't need to install LICENSE files.
+	rm "${D}/usr/share/doc/${PF}/LICENSE" || die 'failed to remove LICENSE'
+}
+
+pkg_postinst() {
+	ewarn "The sample config installed to ${ROOT}etc/tenshi/tenshi.conf"
+	ewarn "monitors /var/log/messages which, by default, can not be read"
+	ewarn "by the tenshi user.  Make sure that the tenshi user has read"
+	ewarn "permission on all the files that you want tenshi to monitor."
+}
diff --git a/app-admin/testdisk-7.1_pre20180322-r1 b/app-admin/testdisk-7.1_pre20180322-r1
deleted file mode 100644
index f6dc35ea6cc7..000000000000
--- a/app-admin/testdisk-7.1_pre20180322-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=static? ( sys-apps/util-linux[static-libs] sys-fs/e2fsprogs[static-libs] sys-libs/ncurses:0[static-libs] jpeg? ( virtual/jpeg:0[static-libs] ) ntfs? ( sys-fs/ntfs3g:=[static-libs] ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) zlib? ( sys-libs/zlib[static-libs] ) !arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) ) ) !static? ( sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses:0= jpeg? ( virtual/jpeg:0 ) ntfs? ( sys-fs/ntfs3g ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) zlib? ( sys-libs/zlib ) !arm? ( ewf? ( app-forensics/libewf:= ) ) ) qt5? ( dev-qt/linguist-tools:5 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=Checks and undeletes partitions + PhotoRec, signature based recovery tool
-EAPI=6
-HOMEPAGE=https://www.cgsecurity.org/wiki/TestDisk
-IUSE=ewf jpeg ntfs qt5 reiserfs static zlib
-KEYWORDS=amd64 ~arm ~hppa ~ppc x86
-LICENSE=GPL-2
-RDEPEND=!static? ( static? ( sys-apps/util-linux[static-libs] sys-fs/e2fsprogs[static-libs] sys-libs/ncurses:0[static-libs] jpeg? ( virtual/jpeg:0[static-libs] ) ntfs? ( sys-fs/ntfs3g:=[static-libs] ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) zlib? ( sys-libs/zlib[static-libs] ) !arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) ) ) !static? ( sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses:0= jpeg? ( virtual/jpeg:0 ) ntfs? ( sys-fs/ntfs3g ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) zlib? ( sys-libs/zlib ) !arm? ( ewf? ( app-forensics/libewf:= ) ) ) )
-REQUIRED_USE=static? ( !qt5 )
-SLOT=0
-SRC_URI=https://git.cgsecurity.org/cgit/testdisk/snapshot/testdisk-9eb2aa12ce051d8d3d31e6b440389d5abf5efaf1.tar.gz -> testdisk-7.1_pre20180322.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=60d770199b6df820733610deb596e074
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
new file mode 100644
index 000000000000..a5d1fa33294e
--- /dev/null
+++ b/app-admin/testdisk/Manifest
@@ -0,0 +1,3 @@
+DIST testdisk-7.1_pre20180322.tar.gz 632598 BLAKE2B 741610622c9afa2c41d14e8eb391cbe629a5f7ac102cf4cbf446b0c0d7330cb8482a17c1ce8470aa9d1b0578aac254cf17aa061e21dd831a803152514fab5422 SHA512 fbe699ccfbe31be636d71eda5d1fccb8efb16788bf664e048ee16344c3d3689961aaa7ef4c9123690db695bb7ae3439440bd775ab8b8455500232b2fc6048ebc
+EBUILD testdisk-7.1_pre20180322-r1.ebuild 2512 BLAKE2B cb68ae32f495fb7ff57c9dbbd3cb63d9c826cfb34e58cd053c32d6797b3632227ad71caf62ea7899bb292c48849a0f6ac5da339cea1242b488ab8485226ac790 SHA512 bf6ccce7c91035b45dda4dcc5f651d783600de40a4df78e8ee39f0f0543e8049ec90ec875dd4ced6cb760faa1f8a9eb80da5b23b352f01d208d49c686f3fcd79
+MISC metadata.xml 447 BLAKE2B da97d4af9961ab42d914dd33abbf433e5974ed49efb2ac2c4ff6cfdd50735bddc48b9b9e15d86a3701d740c73ef9df31439599fdd1cb6a37a306ddcf1cdafc73 SHA512 f6e65d544043790ff6b654dce7e4995214fde5f5c5f35926e396721cc223c97f06a918d7d345e9f4f51c82437af41887a0cb442eb0c7172f839df3249eb58095
diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
new file mode 100644
index 000000000000..0421c7e47677
--- /dev/null
+++ b/app-admin/testdisk/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<use>
+		<flag name="ntfs">Include the ability to read NTFS filesystems</flag>
+		<flag name="reiserfs">Include reiserfs reading ability</flag>
+		<flag name="ewf">Include ewf library</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild
new file mode 100644
index 000000000000..b7dc995f76b3
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=9eb2aa12ce051d8d3d31e6b440389d5abf5efaf1
+inherit autotools flag-o-matic gnome2-utils
+
+DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
+HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
+SRC_URI="https://git.cgsecurity.org/cgit/${PN}/snapshot/${PN}-${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
+
+REQUIRED_USE="static? ( !qt5 )"
+
+# WARNING: reiserfs support does NOT work with reiserfsprogs
+# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+COMMON_DEPEND="
+	static? (
+		sys-apps/util-linux[static-libs]
+		sys-fs/e2fsprogs[static-libs]
+		sys-libs/ncurses:0[static-libs]
+		jpeg? ( virtual/jpeg:0[static-libs] )
+		ntfs? ( sys-fs/ntfs3g:=[static-libs] )
+		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
+		zlib? ( sys-libs/zlib[static-libs] )
+		!arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) )
+	)
+	!static? (
+		sys-apps/util-linux
+		sys-fs/e2fsprogs
+		sys-libs/ncurses:0=
+		jpeg? ( virtual/jpeg:0 )
+		ntfs? ( sys-fs/ntfs3g )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+		)
+		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+		zlib? ( sys-libs/zlib )
+		!arm? ( ewf? ( app-forensics/libewf:= ) )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="!static? ( ${COMMON_DEPEND} )"
+
+DOCS=( )
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-sudo
+		--without-ntfs
+		$(use_with ewf)
+		$(use_with jpeg)
+		$(use_with ntfs ntfs3g)
+		$(use_enable qt5 qt)
+		$(use_with reiserfs)
+		$(use_with zlib)
+	)
+
+	# this static method is the same used by upstream for their 'static' make
+	# target, but better, as it doesn't break.
+	use static && append-ldflags -static
+
+	econf "${myeconfargs[@]}"
+
+	# perform safety checks for NTFS, REISERFS and JPEG
+	if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
+		die "Failed to find either NTFS or NTFS-3G library."
+	fi
+	if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
+		die "Failed to find reiserfs library."
+	fi
+	if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
+		die "Failed to find jpeg library."
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-admin/tmpreaper-1.6.13-r1 b/app-admin/tmpreaper-1.6.13-r1
deleted file mode 100644
index 1a7d2c8fe9a7..000000000000
--- a/app-admin/tmpreaper-1.6.13-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=sys-fs/e2fsprogs
-DESCRIPTION=A utility for removing files based on when they were last accessed
-EAPI=6
-HOMEPAGE=http://packages.debian.org/sid/tmpreaper
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/t/tmpreaper/tmpreaper_1.6.13+nmu1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=615d6a06d445ad50dfdd8edb13151949
diff --git a/app-admin/tmpreaper/Manifest b/app-admin/tmpreaper/Manifest
new file mode 100644
index 000000000000..0ae900f62c83
--- /dev/null
+++ b/app-admin/tmpreaper/Manifest
@@ -0,0 +1,5 @@
+AUX tmpreaper-1.6.13-fix-protect.patch 1204 BLAKE2B 8c1b66d939ac8e997272265744873a22a5e5306d8fbec6e56ace78cf4162387c2cb2c2d7372ec62f0e7c99fa954d7e321482d0dbaa75ba6e3ff48a8785277e3c SHA512 7b7f386d8f685e6b38ff3a96030e69a5134016e0a0b30b6841ddc4ae02ae3f90c47388426be98ec35a920e40360aa0cd8662e29d03a765c6ae0209f9907c53c0
+AUX tmpreaper-1.6.13-gentoo.patch 1766 BLAKE2B a619096b159686dbcdaacdbd3bf979f74664f8abb2c58957dec7fcb17bee7c1b5b790f4e7283af9f82fb1f7eac2a76f73c5ec26804c6bd799643d553fb56be17 SHA512 0086ac04a352bd35ce9e95576816fc324011bfff78cfa089828bf3befb8b183ae2213be9759422ce1f9ddd1cb26dcdf292b429ffe2d0873a1f6f6577e34c5fc9
+DIST tmpreaper_1.6.13+nmu1.tar.gz 141080 BLAKE2B ad2895e0444e3c1a1ceabf71c34b560a817e7cc274482bde63a07499fac799ef127f5b64c953d43cd11a279819972b63b7e21a683f6250a77eeadc299a491a78 SHA512 c868d421a7757a47b81c8932743981ded2b415c83377f8781fdfd4dfda48c701991da17fa262dfa0680b2a315d6b46ee4c9035ba4c06f5a0c1bc32efa717f19f
+EBUILD tmpreaper-1.6.13-r1.ebuild 1115 BLAKE2B 819bfc595646ab0cbd96d40c47b4d5358cbe903d41883e10de9180bc63e7b8e7d682155a46b70788d59b79686b57c0721ecff00930fa71c53f3af828f66ce526 SHA512 0e6e094cdfbb941d08cdaa4f7302eb6dc61ac4c20d9dd0948e9f8c38ba4d0fda1b5d8b283c2736ed75cf170fa37ff8dfa6de2ef35ca120c6d2246e86ce56fe9a
+MISC metadata.xml 1159 BLAKE2B b0c934dea54b86c8eec6b21e212906473d59eca307c4130da36de3f0582a1e070fc4b3b242b92529981e33057e2d49606c48a5ca3a0c6f791bba39b78589a7dd SHA512 128a7b822d4a88be9bf4cf9b5a371ac8fc41e6922dc374d4859d046efe98fae0031783b43ccbe153239688a138506983e56694d16298c3ab04f2451692725ae1
diff --git a/app-admin/tmpreaper/files/tmpreaper-1.6.13-fix-protect.patch b/app-admin/tmpreaper/files/tmpreaper-1.6.13-fix-protect.patch
new file mode 100644
index 000000000000..9c07a4471e18
--- /dev/null
+++ b/app-admin/tmpreaper/files/tmpreaper-1.6.13-fix-protect.patch
@@ -0,0 +1,46 @@
+--- tmpreaper-1.6.13+nmu1/tmpreaper.c.orig	2006-12-05 10:55:58.000000000 -0800
++++ tmpreaper-1.6.13+nmu1/tmpreaper.c	2006-12-05 10:56:46.000000000 -0800
+@@ -467,6 +467,21 @@
+ 		    continue;
+ 		}
+ 
++		if (FLAGS_PROTECT_P (flags)) {
++		    skip = i = 0;
++		    do {
++			if (sb.st_ino == protect_table[i].inode) {
++			    message (LOG_VERBOSE,
++				     "Entry matching `--protect' pattern skipped. `%s'\n",
++				     protect_table[i].name);
++			    skip = 1;
++			    break;
++			}
++		    } while (protect_table[i++].name);
++		    if (skip)
++			continue;
++		}
++
+ 		if (S_ISDIR (sb.st_mode)) {
+                     char *dst;
+ 
+@@ -489,21 +504,6 @@
+ 			     (u_int) getpid(), ent->d_name);
+ 		}
+ 
+-		if (FLAGS_PROTECT_P (flags)) {
+-		    skip = i = 0;
+-		    do {
+-			if (sb.st_ino == protect_table[i].inode) {
+-			    message (LOG_VERBOSE,
+-				     "Entry matching `--protect' pattern skipped. `%s'\n",
+-				     protect_table[i].name);
+-			    skip = 1;
+-			    break;
+-			}
+-		    } while (protect_table[i++].name);
+-		    if (skip)
+-			continue;
+-		}
+-
+ 		/* Decide whether to remove the file or not */
+ 		/* check for mtime on directory instead of atime if requested */
+ 		if ( FLAGS_MTIME_P(flags) ||
diff --git a/app-admin/tmpreaper/files/tmpreaper-1.6.13-gentoo.patch b/app-admin/tmpreaper/files/tmpreaper-1.6.13-gentoo.patch
new file mode 100644
index 000000000000..afd5f60f3a1c
--- /dev/null
+++ b/app-admin/tmpreaper/files/tmpreaper-1.6.13-gentoo.patch
@@ -0,0 +1,47 @@
+diff -ur tmpreaper-1.6.13+nmu1.orig//debian/cron.daily tmpreaper-1.6.13+nmu1/debian/cron.daily
+--- tmpreaper-1.6.13+nmu1.orig//debian/cron.daily	2008-05-19 10:10:16.000000000 -0700
++++ tmpreaper-1.6.13+nmu1/debian/cron.daily	2010-10-10 19:44:14.563252064 -0700
+@@ -32,28 +32,7 @@
+ 
+ # Set config defaults
+ SHOWWARNING=''
+-
+-# get the TMPREAPER_TIME value from /etc/default/rcS
+-
+-if grep '^TMPTIME=' /etc/default/rcS >/dev/null 2>&1; then
+-    eval $(grep '^TMPTIME=' /etc/default/rcS)
+-    if [ -n "$TMPTIME" ]; then
+-        # Don't clean files if TMPTIME is negative or 'infinite'
+-        # to mimic the way /lib/init/bootclean.sh works.
+-        case "$TMPTIME" in
+-          -*|infinite|infinity)
+-                # don't use this as default
+-                ;;
+-           *)
+-                if [ "$TMPTIME" -gt 0 ]; then
+-                    TMPREAPER_TIME=${TMPTIME}d
+-                else
+-                    TMPREAPER_TIME=7d
+-                fi
+-                ;;
+-        esac
+-    fi
+-fi
++TMPREAPER_TIME=''
+ 
+ # ! Important !  The "set -f" below prevents the shell from expanding
+ #                file paths, which is vital for the configuration below to work.
+diff -ur tmpreaper-1.6.13+nmu1.orig//debian/tmpreaper.conf tmpreaper-1.6.13+nmu1/debian/tmpreaper.conf
+--- tmpreaper-1.6.13+nmu1.orig//debian/tmpreaper.conf	2006-12-08 04:24:03.000000000 -0800
++++ tmpreaper-1.6.13+nmu1/debian/tmpreaper.conf	2010-10-10 19:45:53.251119766 -0700
+@@ -40,9 +40,7 @@
+ # TMPREAPER_ADDITIONALOPTIONS
+ #       extra options that are passed to tmpreaper, e.g. --all
+ 
+-# uncomment and change the next line to overrule the /etc/default/rcS value
+-# TMPREAPER_TIME=7d
+-
++TMPREAPER_TIME=7d
+ TMPREAPER_PROTECT_EXTRA=''
+ TMPREAPER_DIRS='/tmp/.'
+ TMPREAPER_DELAY='256'
diff --git a/app-admin/tmpreaper/metadata.xml b/app-admin/tmpreaper/metadata.xml
new file mode 100644
index 000000000000..6f3fd9e0f558
--- /dev/null
+++ b/app-admin/tmpreaper/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<longdescription lang="en">
+		tmpreaper is a program that can be used to clean out temporary-file
+		directories. It recursively searches the directory, refusing to chdir()
+		across symlinks, and removes files that haven't been accessed in a
+		user-specified amount of time. You can specify a set of files to protect
+		from deletion with a shell pattern. It will not remove files owned by the
+		process EUID that have the `w' bit clear, unless you ask it to, much like
+		`rm -f'. `tmpreaper' will not remove symlinks, sockets, fifos, or special
+		files unless given a command line option enabling it to.
+
+		WARNING: Please do not run `tmpreaper' on `/'. There are no protections
+		against this written into the program, as that would prevent it from
+		functioning the way you'd expect it to in a `chroot(8)' environment.
+
+		The daily tmpreaper run can be configured through /etc/tmpreaper.conf .
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild
new file mode 100644
index 000000000000..d13fc5593381
--- /dev/null
+++ b/app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+MY_P="${PN}_${PV}+nmu1"
+DESCRIPTION="A utility for removing files based on when they were last accessed"
+HOMEPAGE="http://packages.debian.org/sid/tmpreaper"
+SRC_URI="mirror://debian/pool/main/t/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND="sys-fs/e2fsprogs"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-protect.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /etc
+	doins debian/tmpreaper.conf
+
+	exeinto /etc/cron.daily
+	newexe debian/cron.daily tmpreaper
+	doman debian/tmpreaper.conf.5
+	dodoc README ChangeLog debian/README*
+}
+
+pkg_postinst() {
+	elog "This package installs a cron script under /etc/cron.daily"
+	elog "You can configure it using /etc/tmpreaper.conf"
+	elog "Consult tmpreaper.conf man page for more information"
+	elog "Read /usr/share/doc/${P}/README.security and"
+	elog "remove SHOWWARNING from /etc/tmpreaper.conf afterwards"
+}
diff --git a/app-admin/tmpwatch-2.11-r2 b/app-admin/tmpwatch-2.11-r2
deleted file mode 100644
index 6c65a4086d3a..000000000000
--- a/app-admin/tmpwatch-2.11-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Files which haven't been accessed are removed from specified directories
-EAPI=6
-HOMEPAGE=https://pagure.io/tmpwatch
-IUSE=selinux
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-tmpreaper )
-SLOT=0
-SRC_URI=https://releases.pagure.org/tmpwatch/tmpwatch-2.11.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec3ed27af4731724e63b412f5aa22ba4
diff --git a/app-admin/tmpwatch/Manifest b/app-admin/tmpwatch/Manifest
new file mode 100644
index 000000000000..497f646f974c
--- /dev/null
+++ b/app-admin/tmpwatch/Manifest
@@ -0,0 +1,5 @@
+AUX tmpwatch-2.11-boottime.patch 1034 BLAKE2B 37d257d39c8b7734e08f2498d07ac1d30e029a22c6ba70f2127f5a6a2d443555794022590e31445479ff145b9440695682aeb5be0102929ee9630c8a6527ce44 SHA512 6ad3cfe0dcd1a14d071ac64ca09279aae853c3b5a47604d99c2ff24319145d5c599ed6e780ac7eb9a2e2d185495e9d7e2133c905490b647f6b639a4bcd0def92
+AUX tmpwatch.cron 1533 BLAKE2B fd6e4ed53bb72e881a0dc92301ec04cf376dba40c2294973daaf8a353972664fb56da6e0f17b3ac161e189f9b7e5b9e883a7d2b5f64e4f909206432fb1163a90 SHA512 9c96eaccc70d6eadac1233b6cd6772c61dbe8fed348fbe45d729bba8d8434f32bb4ba800cf92f151d7576763f7fde7c5c25b55293ecdac5f5254ce387da8b016
+DIST tmpwatch-2.11.tar.bz2 145609 BLAKE2B ee66c77138e6f35030de817528ece1b3fa19622804e179fbc5c70c27281a52b8e8f7c7f631c9de73eb05085363852e91ee5a619de7db9a597a9f88afd95e164b SHA512 9242c5e1812c2ffc756cfc4cdc3023d0c0515e7c180e58ca3a838aa075d09fe4dc08dbc9afbc87ce3382e8aa8cb80a70e406deeab4ce10b39b6845d667989d97
+EBUILD tmpwatch-2.11-r2.ebuild 704 BLAKE2B 51e32787779599dd5a1a5bd9074e8c2eade4dea631cb9ff18137dc2ff1b19802e366b79ea55c37c4e196f9e9bc6c51f166f3681ca289f81c0adda53ac0e1de7e SHA512 297c4f41388e35eae3c1f0a4b13354bdb638b7df16d70e676be67faaead0a76ab71cd90c312cb97eed39bc18be1b06e674856e0afd832084a8cb0677a68b021b
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch b/app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch
new file mode 100644
index 000000000000..b622c8d70e70
--- /dev/null
+++ b/app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch
@@ -0,0 +1,30 @@
+Make boot time detection failures non-fatal.  Taken from PLD Linux
+
+Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=468444
+PLD bug: https://bugs.launchpad.net/pld-linux/+bug/1034364
+Patch: https://github.com/pld-linux/tmpwatch/blob/master/tmpwatch-boottime.patch
+
+--- tmpwatch-2.11/tmpwatch.c~
++++ tmpwatch-2.11/tmpwatch.c
+@@ -666,9 +666,11 @@
+ 	time_t boot_time;
+ 
+ 	if (clock_gettime(CLOCK_REALTIME, &real_clock) != 0
+-	    || clock_gettime(CLOCK_BOOTTIME, &boot_clock) != 0)
+-	    message(LOG_FATAL, "Error determining boot time: %s\n",
++	    || clock_gettime(CLOCK_BOOTTIME, &boot_clock) != 0) {
++	    message(LOG_DEBUG, "Error determining boot time: %s\n",
+ 		    strerror(errno));
++	    socket_kill_time = 0; /* Never remove sockets */
++	} else {
+ 	boot_time = real_clock.tv_sec - boot_clock.tv_sec;
+ 	if (real_clock.tv_nsec < boot_clock.tv_nsec)
+ 	    boot_time--;
+@@ -677,6 +679,7 @@
+ 	boot_time -= 2;
+ 
+ 	socket_kill_time = boot_time - grace_seconds;
++	}
+ #else
+ 	socket_kill_time = 0; /* Never remove sockets */
+ #endif
diff --git a/app-admin/tmpwatch/files/tmpwatch.cron b/app-admin/tmpwatch/files/tmpwatch.cron
new file mode 100644
index 000000000000..806b1453e552
--- /dev/null
+++ b/app-admin/tmpwatch/files/tmpwatch.cron
@@ -0,0 +1,47 @@
+#!/bin/sh
+# vim: ft=sh
+
+# This cron script contains several (commented out) examples.  You may use
+# them as is, by uncommenting them, or modify them to suit your needs.  Read
+# tmpwatch(8) for more information on tmpwatch parameters.
+
+### Variables ###
+
+TMPWATCH="/usr/sbin/tmpwatch"
+#PORTAGE_TMPDIR="$(portageq envvar PORTAGE_TMPDIR)/portage"
+#PORTAGE_LOGDIR="$(portageq envvar PORT_LOGDIR)"
+#DISTDIR="$(portageq distdir)"
+
+### EXAMPLES ###
+
+# NOTE: if you have noatime in /etc/fstab for any partitions you plan on
+# running tmpwatch on, you should obviously change any of the examples that
+# use atime (-u|--atime).  Those that don't specify anything, default to 
+# atime.
+
+# NOTE2: the time value is in HOURS!
+
+# Delete everything in /tmp that haven't been accessed in a week (>=168 hrs).
+#
+# if [[ -d /tmp ]]; then
+#   ${TMPWATCH} --atime 168 /tmp
+# fi
+
+# Delete everything in PORTAGE_TMPDIR that hasn't been modified in 2 weeks.
+#
+# if [[ -d ${PORTAGE_TMPDIR:-/var/tmp/portage} && -z $(/usr/bin/pgrep emerge) ]]; then
+#   ${TMPWATCH} --mtime --all 336 ${PORTAGE_TMPDIR:-/var/tmp/portage}
+# fi
+
+# Delete everything in DISTDIR that hasn't been accessed in 6 months (going
+# by 30 day months)
+#
+# if [[ -d ${DISTDIR:-/usr/portage/distfiles} ]]; then
+#   ${TMPWATCH} --atime --fuser 4320 ${DISTDIR:-/usr/portage/distfiles}
+# fi
+
+# Delete everything in PORTAGE_LOGDIR that hasn't been accessed in 4 weeks
+#
+# if [[ -d ${PORTAGE_LOGDIR:-/var/log/portage} ]]; then
+#   ${TMPWATCH} --atime 772 ${PORTAGE_LOGDIR:-/var/log/portage}
+# fi
diff --git a/app-admin/tmpwatch/metadata.xml b/app-admin/tmpwatch/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/tmpwatch/metadata.xml
@@ -0,0 +1,5 @@
+<?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/tmpwatch/tmpwatch-2.11-r2.ebuild b/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
new file mode 100644
index 000000000000..d95863cf391c
--- /dev/null
+++ b/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Files which haven't been accessed are removed from specified directories"
+HOMEPAGE="https://pagure.io/tmpwatch"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-tmpreaper )"
+DEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-boottime.patch"
+)
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	dosbin tmpwatch
+	doman tmpwatch.8
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}/${PN}.cron" "${PN}"
+}
diff --git a/app-admin/tripwire-2.4.3.7 b/app-admin/tripwire-2.4.3.7
deleted file mode 100644
index 7542832cd8ca..000000000000
--- a/app-admin/tripwire-2.4.3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-devel/automake sys-devel/autoconf ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Open Source File Integrity Checker and IDS
-EAPI=6
-HOMEPAGE=http://www.tripwire.org/
-IUSE=libressl selinux ssl static +tools
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=GPL-2
-PDEPEND=tools? ( app-admin/mktwpol )
-RDEPEND=virtual/cron virtual/mta selinux? ( sec-policy/selinux-tripwire ) ssl? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=https://github.com/Tripwire/tripwire-open-source/archive/2.4.3.7.tar.gz -> tripwire-2.4.3.7.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c25639d00a91afe7e648d9199aadc76d
diff --git a/app-admin/tripwire/Manifest b/app-admin/tripwire/Manifest
new file mode 100644
index 000000000000..6f8826913fb4
--- /dev/null
+++ b/app-admin/tripwire/Manifest
@@ -0,0 +1,6 @@
+AUX tripwire 466 BLAKE2B 1fca6945b6b8ce959b7c617eef9454690662676020ce7451396f8cd365d093fa687896c3f22ac2e3df3d370cb42aa55967198de573172b79d023711b59951404 SHA512 1df37364a84ab26ca0a3f2637e9f4938333c394979c2ccadb69401b7e6a93d03911ce737b25bb6e76c1963e4b7eaffd35b3551aa141b51bc9b3a8a00d9c828cf
+AUX tripwire.txt 11492 BLAKE2B f157c47e1461095a51e9868127d25df6769c3ea6441fe34925c29ef3e93541e66516ba59b1c04120979a4edc1f31bf166ac72998f2adba571d64ffa7c7008fd3 SHA512 ec53b2f71fb33f227628e1160a72fecf4a1aca7ee58b750945e7c0d0ce756a37666a02fe9e8ec235055fe6d28e1d20e77a449ae229f5d5d2349eaffe07827d47
+AUX twcfg.txt 604 BLAKE2B 78c0e1457e5ea37031c8f9cf5a340ee600775973ea2475daadb07f3cb59f117667506438628ced1b4b1fa738855748df7d4b2e6695d65de9ed832f335943797a SHA512 c8a568638d5a18bb9508ee6f70aea815b8bfdb9efbf7823cdad59890a617bbe941454f6f4622e38e4ac4622e1d611c9fc085d73aec5a23b5c13ae7f1d783b388
+DIST tripwire-2.4.3.7.tar.gz 1002257 BLAKE2B fb0c847087e8b27d2a111b4a4122b3c4d5b187efe6f80995c6d06c7592a22fec2c537bbebba9c21a7761a8047535de4a96a6b94246da586faad4e9fc92137196 SHA512 541138f4a4c3a4227f31de6607503d305f0d893bdd5d24928d619d3a25bb8fe7061a45c041992ace957b976b834b5f4212b5c727eee1cbc76ddb2e2c52aeafbd
+EBUILD tripwire-2.4.3.7.ebuild 2411 BLAKE2B 9646cb96ee17a4e2a31d7c4ac065a72b363aa89c809a41ac94bc2d414b4679053378c6697a758e515691eaebb094ee2bdc65c38240f0a18c903f3c4e061e3b0d SHA512 09e8911547b7a629e5bc546005b9a17aae84057d93dd956a6fe687819f1fe5e09720d48caa72844a8736e2cfa23bb6b4387a19e31e1b8e587e6da792836a5838
+MISC metadata.xml 1616 BLAKE2B bd19945c4dfb57c6e1102e5d2460f5784fbc4eb54c53a04052a08f45c4131edf8117e834d1b964a350512618e875aab3323f986ea71a893fee19ec08b54a0da2 SHA512 ae04a581b34beb18adb7aea67d9ec17dc5cd897d3e974515c5c59e2e5e8391f86238bcaa59967aa7413c99ce56ae670a7badf8008ed8b6926f7f0a4eab0b83a2
diff --git a/app-admin/tripwire/files/tripwire b/app-admin/tripwire/files/tripwire
new file mode 100644
index 000000000000..8f0f23f3e2d5
--- /dev/null
+++ b/app-admin/tripwire/files/tripwire
@@ -0,0 +1,10 @@
+#!/bin/sh
+HOST_NAME=`uname -n`
+if [ ! -e /var/lib/tripwire/${HOST_NAME}.twd ] ; then
+	echo "****    Error: Tripwire database for ${HOST_NAME} not found.  ****"
+	echo "**** Check tripwire.txt file for instructions or install      ****"
+	echo "**** app-admin/mktwpol package (if you used the \"tools\"  ****"
+	echo "**** USE flag, this has been done for you already.            ****"
+else
+        test -f /etc/tripwire/tw.cfg &&  /usr/sbin/tripwire --check --quiet
+fi
diff --git a/app-admin/tripwire/files/tripwire.txt b/app-admin/tripwire/files/tripwire.txt
new file mode 100644
index 000000000000..4f47f8bd8196
--- /dev/null
+++ b/app-admin/tripwire/files/tripwire.txt
@@ -0,0 +1,272 @@
+tripwire.txt					v. 11 Sept 2013
+
+Introduction to Tripwire, with Gentoo-specific installation information
+
+Tripwire software can monitor the integrity of critical system files and
+directories by identifying specified changes made to selected system
+files and directories. Configure Tripwire software to monitor your
+system in the way that is best for you.
+
+Tripwire software works by comparing files and directories against a
+defined baseline, stored in a tripwire-created database. Tripwire
+generates the baseline by taking a "snapshot" of specified files and
+directories. Tripwire software then compares the current system against
+the baseline and reports modifications, additions, or deletions. Use
+Tripwire software for system security, intrusion detection, damage
+assessment, and recovery forensics.
+
+
+To set-up Tripwire Configuration
+
+The Tripwire tarball installs the basic program files needed to run the
+software.  However, this installation does not prepare the configuration
+files that Tripwire needs to perform correctly. After you install the
+tripwire executable files and example configuration, you must:
+
+1. Review and perhaps edit the plain-text tripwire configuration file
+   (/etc/tripwire/twcfg.txt) with a text editor, if desired.
+
+2. Either run a configuration script (twsetup.sh from Gentoo's mktwpol
+   package, or tripwire-setup-keyfiles from Red Hat, or deprecated
+   twinstall.sh, also from Red Hat), or run the program `twadmin` with
+   the correct command line switches to make key files and encrypt/sign
+   the tripwire configuration file.
+
+   Make site key file
+   ------------------
+   `twadmin --generate-keys -S /etc/tripwire/site.key`
+
+   Make local key file
+   -------------------
+   `twadmin --generate-keys -L /etc/tripwire/$HOSTNAME-local.key`
+
+   Make mandatory signed tripwire configuration file (tw.cfg)
+   ----------------------------------------------------------
+   `twadmin --create-cfgfile -S /etc/tripwire/site.key /etc/tripwire/twcfg.txt`
+
+Note: Once encrypted/signed, the configuration file, tw.cfg, must not be
+renamed or moved.  The plain-text tripwire configuration file (twcfg.txt)
+should be deleted.  It can be recreated with `twadmin --print-cfgfile`
+
+3. Make a plain-text policy file.  The use of the name twpol.txt is
+   common, but the name of this file is not defined or used by Tripwire,
+   other than preparation of the encrypted/signed policy file.
+
+   To make the plain-text policy file, either run a policy file generator
+   (for example, mktwpol.sh from Gentoo's mktwpol package), or edit the
+   plain-text policy file (twpol-GENERIC.txt, or twpol.txt, or similar)
+   with a text editor.  The plain-text policy file should not refer to
+   any non-existent file or directory.
+
+   If you edit twpol-GENERIC.txt to act as your plain-text policy file,
+   provide your system's HOSTNAME at line 61.  If you don't provide
+   the correct HOSTNAME, a tripwire inspection of the target computer's
+   filesystem will fail to check the tripwire database file for changes.
+
+	TWDB=/var/lib/tripwire/YOUR_HOSTNAME.twd;
+
+4. Convert the plain-text policy file into the encrypted/signed form
+   that tripwire will refer to as it examines the files on the target
+   computer's filesystem.  The default filename for the encrypted/signed
+   policy file is defined in the tripwire configuration file (tw.cfg)
+   and is usually tw.pol.  The encryption/signing of plain-text twpol.txt
+   is done with yet another `twadmin` command line.
+
+   Make mandatory encrypted/signed system inspection policy file
+   --------------------------------------------------------------
+   `twadmin -m P -c /etc/tripwire/tw.cfg /etc/tripwire/twpol.txt`
+
+Note: If you modify the plain-text policy file after running the
+configuration script, you must re-sign the plain-text policy file before
+initializing the database file.  Tripwire baseline database creation and
+inspections refer to the encrypted/signed policy file, not to the
+plain-text policy file.
+
+Note: The plain-text tripwire policy file (twpol.txt) should be deleted.
+It can be recreated with `twadmin --print-polfile`
+
+5. Initialize the Tripwire database file.
+
+   Record current file attributes in the tripwire database
+   -------------------------------------------------------
+   `tripwire --init -c /etc/tripwire/tw.cfg`
+
+Note: Tripwire might issue some "Warning: File system error" errors,
+and appear to hang.  But as long as it follows with "### Continuing...",
+it is still working.
+
+6. Run the first integrity check.
+
+   `tripwire --check -c /etc/tripwire/tw.cfg`
+
+Note: The use of "-c /etc/tripwire/tw.cfg" is not required if Tripwire
+uses the default tripwire configuration directory and file names.  If
+you defer to tripwire default filenames, then updating a text policy
+file into a tripwire database, and running an integrity check, can be
+done with these commands:
+
+   `twadmin --create-polfile /etc/tripwire/twpol.txt`
+   `tripwire --init`
+   `tripwire --check`
+
+Modifying the Policy File
+
+How Tripwire software checks your system is specified in the Tripwire
+plain-text policy file (twpol.txt).  A default policy file is included in
+the Tripwire software installation.  This policy file should be tailored
+to fit your particular system.  Tailoring the policy file is necessary
+to take advantage of Tripwire software's ability to monitor changes on
+your system.
+
+The plain-text policy file is usually located at /etc/tripwire/twpol.txt.
+An example policy file (located at /etc/tripwire/twpol-GENERIC.txt, or
+at /usr/share/doc/tripwire-VER#-REL#/policyguide.txt) is included to
+help you learn the policy language.  Read the sample policy files and
+the comments in the sample policy file to learn the policy language.
+
+After you modify the plain-text policy file, don't forget!
+
+ encrypt/sign using `twadmin --create-polfile /etc/tripwire/twpol.txt`
+
+
+Selecting Passphrases
+
+Tripwire files are encrypted/signed using site or local keys. These keys
+are protected by passphrases. When selecting passphrases, the following
+recommendations apply:
+
+Use at least eight alphanumeric and symbolic characters for each
+passphrase. The maximum length of a passphrase is 1023 characters.
+Quotes should not be used as passphrase characters.
+
+Assign a unique passphrase for the site key. The site key passphrase
+protects the site key, which is used to sign Tripwire software
+configuration and policy files. Assign a unique passphrase for the local
+key. The local key signs the Tripwire baseline database file. The local
+key may sign the Tripwire report files also.
+
+Store the passphrases in a secure location. There is no way to remove
+encryption from a signed file if you forget your passphrase and lost the
+key files.  If you forget the passphrases, the files are unusable. In
+that case you must create new key files and the baseline database.
+
+
+Initializing the Database
+
+In Database Initialization mode, Tripwire software builds a database of
+filesystem objects based on the rules in the policy file. This database
+serves as the baseline for integrity checks. The syntax for Database
+Initialization mode is:
+
+  `tripwire --init -c /etc/tripwire/tw.cfg`
+
+
+Running an Integrity Check
+
+The Integrity Check mode compares the current file system objects with
+their properties recorded in the Tripwire database. Violations are
+printed to stdout. The report file is saved and can later be accessed by
+twprint. An email option enables you to send email. The syntax for
+Integrity Check mode is:
+
+  `tripwire --check -c /etc/tripwire/tw.cfg`
+
+
+Printing Reports - twprint Print Report Mode
+
+The twprint --print-report mode prints the contents of a Tripwire
+report. If you do not specify a report with the --twrfile or -r
+command-line argument, the default report file specified by the
+configuration file REPORTFILE variable is used.
+
+Example: On a machine named LIGHTHOUSE, the command could be:
+
+  `twprint -m r --twrfile LIGHTHOUSE-19990622-021212.twr`
+
+
+Updating the Database after an Integrity Check
+
+Database Update mode enables you to update the Tripwire database after
+an integrity check if you determine that the violations discovered are
+valid. This update process saves time by enabling you to update the
+database without having to re-initialize it. It also enables selective
+updating, which cannot be done through re-initialization. The syntax for
+Database Update mode is:
+
+  `tripwire --update`
+
+
+Updating the Policy File
+
+Change the way that Tripwire software scans the system by changing the
+rules in the policy file.  You can then update the database without a
+complete re-initialization. This saves a significant amount of time and
+preserves security by keeping the policy file synchronized with the
+database it uses.  The syntax for Policy Update mode is:
+
+  `tripwire  --update-policy`
+
+
+Testing email functions
+
+Test mode tests the software's email notification system, using the
+settings currently specified in the configuration file. The syntax for
+Email Test Reporting mode is:
+
+  `tripwire  --test`
+
+
+Tripwire Components
+
+The policy file begins as a text file containing comments, rules,
+directives, and variables. These dictate the way Tripwire software
+checks your system. Each rule in the policy file specifies a system
+object to be monitored. Rules also describe which changes to the object
+to report, and which to ignore.
+
+System objects are the files and directories you wish to monitor. Each
+object is identified by an object name. A property refers to a single
+characteristic of an object that Tripwire software can monitor.
+Directives control conditional processing of sets of rules in a policy
+file. During installation, the text policy file is encrypted/signed and
+renamed, and becomes the active policy file.
+
+The database file is an important component of Tripwire software. When
+first installed, Tripwire software uses the policy file rules to create
+the database file. The database file is a baseline "snapshot" of the
+system in a known secure state. Tripwire software compares this baseline
+against the current system to determine what changes have occurred. This
+is an integrity check.
+
+When you perform an integrity check, Tripwire software produces report
+files. Report files summarize any changes that violated the policy file
+rules during the integrity check. You can view the report file in a
+variety of formats, at varying levels of detail.
+
+The Tripwire configuration file stores system-specific information, such
+as the location of Tripwire data files. Tripwire software generates some
+of the configuration file information during installation. The system
+administrator can change parameters in the configuration file at any
+time. The configuration file variables POLFILE, DBFILE, REPORTFILE,
+SITEKEYFILE, and LOCALKEYFILE specify where the policy file, database
+file, report files, and site and local key files reside. These variables
+must be defined or the configuration file is invalid. If any of these
+variables are undefined, an error occurs on execution of Tripwire
+software and the program exits.
+
+
+Tripwire Help
+
+All Tripwire commands support the help arguments.
+
+Example: To get help with Create Configuration File mode, type:
+
+  `twadmin --help --create-cfgfile`
+
+  -?			Display usage and version information
+  --help		Display all command modes
+  --help all		Display help for all command modes
+  --help [mode]		Display help for current command mode
+  --version		Display version information
+
+We recommend you read the Tripwire Release Notes and README file.
diff --git a/app-admin/tripwire/files/twcfg.txt b/app-admin/tripwire/files/twcfg.txt
new file mode 100644
index 000000000000..9cf39bcc01e4
--- /dev/null
+++ b/app-admin/tripwire/files/twcfg.txt
@@ -0,0 +1,15 @@
+ROOT                   =/usr/sbin
+POLFILE                =/etc/tripwire/tw.pol
+DBFILE                 =/var/lib/tripwire/$(HOSTNAME).twd
+REPORTFILE             =/var/lib/tripwire/report/$(HOSTNAME)-$(DATE).twr
+SITEKEYFILE            =/etc/tripwire/site.key
+LOCALKEYFILE           =/etc/tripwire/$(HOSTNAME)-local.key
+EDITOR                 =/bin/nano
+LATEPROMPTING          =false
+LOOSEDIRECTORYCHECKING =false
+MAILNOVIOLATIONS       =true
+EMAILREPORTLEVEL       =3
+REPORTLEVEL            =3
+MAILMETHOD             =SENDMAIL
+SYSLOGREPORTING        =false
+MAILPROGRAM            =/usr/lib/sendmail -oi -t
diff --git a/app-admin/tripwire/metadata.xml b/app-admin/tripwire/metadata.xml
new file mode 100644
index 000000000000..9cf612218444
--- /dev/null
+++ b/app-admin/tripwire/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nimiux@gentoo.org</email>
+		<name>Chema Alonso</name>
+	</maintainer>
+	<longdescription lang="en">
+		Tripwire is a tool that aids system administrators and users in
+		monitoring a designated set of files for any changes. Used with system
+		files on a regular (e.g., daily) basis, Tripwire can notify system
+		administrators of corrupted or tampered files, so damage control
+		measures can be taken in a timely manner.
+	</longdescription>
+	<longdescription lang="es">
+		Tripwire es una herramienta que ayuda a los administradores y
+		usuarios en la monitorización de los cambios en un conjunto de
+		ficheros. Se utiliza particularmente en los ficheros de sistema
+		de un modo regular (por ejemplo diariamente). Tripwire puede
+		notificar a los administradores de sistema sobre ficheros que
+		se han corrompido o han sido modificados maliciosamente, por lo
+		que se pueden adoptar medidas de control de forma periódica.
+	</longdescription>
+	<use>
+		<flag name="tools">Installs app-admin/mktwpol, providing scripts
+		for the installation/setup of tripwire, including generating the
+		tripwire policy file and maintenance of the tripwire database</flag>
+		<flag name="ssl">Adds support for Secure Socket Layer connections</flag>
+		<flag name="static">Builds the package statically</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">tripwire</remote-id>
+		<remote-id type="github">Tripwire/tripwire-open-source</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/tripwire/tripwire-2.4.3.7.ebuild b/app-admin/tripwire/tripwire-2.4.3.7.ebuild
new file mode 100644
index 000000000000..4339d2ac489c
--- /dev/null
+++ b/app-admin/tripwire/tripwire-2.4.3.7.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Open Source File Integrity Checker and IDS"
+HOMEPAGE="http://www.tripwire.org/"
+SRC_URI="https://github.com/Tripwire/tripwire-open-source/archive/${PV}.tar.gz -> ${PF}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE="libressl selinux ssl static +tools"
+
+DEPEND="sys-devel/automake
+	sys-devel/autoconf
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+RDEPEND="virtual/cron
+	virtual/mta
+	selinux? ( sec-policy/selinux-tripwire )
+	ssl? ( dev-libs/openssl )"
+PDEPEND="tools? ( app-admin/mktwpol )"
+
+S="${WORKDIR}/tripwire-open-source-${PV}"
+
+src_prepare() {
+	eautoreconf
+	eapply_user
+}
+
+src_configure() {
+	# tripwire can be sensitive to compiler optimisation.
+	# see #32613, #45823, and others.
+	# 	-taviso@gentoo.org
+	strip-flags
+	append-cppflags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
+	econf $(use_enable ssl openssl) $(use_enable static)
+}
+
+src_install() {
+	dosbin "${S}"/bin/{siggen,tripwire,twadmin,twprint}
+	doman "${S}"/man/man{4/*.4,5/*.5,8/*.8}
+	dodir /etc/tripwire /var/lib/tripwire{,/report}
+	keepdir /var/lib/tripwire{,/report}
+
+	exeinto /etc/cron.daily
+	doexe "${FILESDIR}"/tripwire
+
+	dodoc ChangeLog policy/policyguide.txt TRADEMARK \
+		"${FILESDIR}"/tripwire.txt
+
+	insinto /etc/tripwire
+	doins "${FILESDIR}"/twcfg.txt policy/twpol-GENERIC.txt
+
+	fperms 750 /etc/cron.daily/tripwire
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Tripwire needs to be configured before its first run. You can"
+		elog "do this by manually editing the twpol-GENERIC.txt file shipped with"
+		elog "the package to suit your needs. A quickstart guide is provided"
+		elog "in tripwire.txt file to help you with this."
+		elog "To configure tripwire automatically, you can use the twsetup.sh"
+		elog "script provided by the app-admin/mktwpol package. This package is"
+		elog "installed for you by the \"tools\" USE flag (which is enabled by"
+		elog "default."
+else
+		elog "Maintenance of tripwire policy files as packages are added"
+		elog "and deleted from your system can be automated by the mktwpol.sh"
+		elog "script provided by the app-admin/mktwpol package. This package"
+		elog "is installed for you if you append \"tools\" to your USE flags"
+	fi
+}
diff --git a/app-admin/ulogd-2.0.5_p20161017 b/app-admin/ulogd-2.0.5_p20161017
deleted file mode 100644
index a0f70c0b3c80..000000000000
--- a/app-admin/ulogd-2.0.5_p20161017
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) nfacct? ( >=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) doc? ( app-text/linuxdoc-tools app-text/texlive-core dev-texlive/texlive-fontsrecommended virtual/latex-base ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=A userspace logging daemon for netfilter/iptables related logging
-EAPI=6
-HOMEPAGE=https://netfilter.org/projects/ulogd/index.html
-IUSE=dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite ulog kernel_linux
-KEYWORDS=amd64 ~ia64 ppc x86
-LICENSE=GPL-2
-RDEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) nfacct? ( >=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
-SLOT=0
-SRC_URI=http://git.netfilter.org/ulogd2/snapshot/62064f6a9e054739ecbdda010dbe9c3fd69bbaa2.tar.gz -> ulogd-2.0.5_p20161017.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=ab73e3bd3639815c5cfd6a4afa186814
diff --git a/app-admin/ulogd-2.0.7 b/app-admin/ulogd-2.0.7
deleted file mode 100644
index e0c72b9d3fad..000000000000
--- a/app-admin/ulogd-2.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) nfacct? ( >=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) doc? ( app-text/linuxdoc-tools app-text/texlive-core dev-texlive/texlive-fontsrecommended virtual/latex-base ) virtual/pkgconfig
-DESCRIPTION=A userspace logging daemon for netfilter/iptables related logging
-EAPI=6
-HOMEPAGE=https://netfilter.org/projects/ulogd/index.html
-IUSE=dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog kernel_linux
-KEYWORDS=amd64 ~ia64 ppc x86
-LICENSE=GPL-2
-RDEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) nfacct? ( >=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) selinux? ( sec-policy/selinux-ulogd )
-SLOT=0
-SRC_URI=https://www.netfilter.org/projects/ulogd/files/ulogd-2.0.7.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=458ae896005eef4e2c25572f72833af1
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
new file mode 100644
index 000000000000..2f3d1a40f856
--- /dev/null
+++ b/app-admin/ulogd/Manifest
@@ -0,0 +1,8 @@
+AUX ulogd.init 949 BLAKE2B bebbf58aab0957017980d46762743f366d9f2daeca35bbed53c1ae7ab2645a6de84eddf25e82a48c4185a6a9a991b4e3562e7d06579ba8a9b2fb36a9f5b0b7de SHA512 87331bc32592fc9153274a8716a5206392af99087f89d8ba51539c477805a1932706ad2fbb8f71947ef3534a368cb2559fd2f54ae0038ab49eccda85763e7a99
+AUX ulogd.logrotate 193 BLAKE2B 65e6d518260ad322539f05ea5a3177092db8cfa67bd8cd035cd714f8c3e6f90860ce47e27dccdf66feed68258f9bbbe2ef16fa103000f0166927a8cf9fc6969c SHA512 be62a8c63d567d90ab07d9a9e86fb85d868683c385de598b81fa369fd13581a144a0be1aedd2b899d653d94475679eee1fd4939ae72a35777d75208584b2f17a
+AUX ulogd.service 390 BLAKE2B e1395888ffe09cafd98a4384ab7b06e18c0e1b92fa80fb07a05415a3927bcd68a5d3d900ada141c684359bd37910801d40e069cba8cefc8a7c323584b9d8b993 SHA512 73923e6a851bf4f34f532c8b3fa17eb227f2fb2b4c485b89a488789f2d4af3605bd09538095a6acbee6d74300e98755bb03bacabe450104319938cfff62e4c89
+DIST ulogd-2.0.5_p20161017.tar.gz 137936 BLAKE2B 4cd252820920b0f872ddf97894c5917ed03fcab78b7fc215fa0ad00fbce2d2bd8cadc80120d452868e5292c97e595ea0ea861d685919fd18a8f040b683f2fe5d SHA512 b9a3f5323766856fc20d58a6c55f9bc955f50e9d7052df0828ca08bf9d573326e69920f6c90c9d3e877c4dc1a29a5a994cde070bd0834fbf4dee8eebbb251e98
+DIST ulogd-2.0.7.tar.bz2 394573 BLAKE2B bec028a3b35038a8cc0f3f8b81b3e19addb66fce09e4ea0f3b2cd29b20cdb28025a576badd0765d9bb15f9d097799b6f55ff45058f8a838daa836c3fe878eef0 SHA512 1ad12bcf91bebe8bf8580de38693318cdabd17146f1f65acf714334885cf13adf5f783abdf2dd67474ef12f82d2cfb84dd4859439bc7af10a0df58e4c7e48b09
+EBUILD ulogd-2.0.5_p20161017.ebuild 3283 BLAKE2B cca75edb07b6a0ed2189e49a7adfe01f3b484c08475bd2dab869b2f103e4b22888245b9a2d5f141a1fd67913e57bdfcbc48d6e6f4f8afe58c01c3ecc318b6036 SHA512 2a053311bf836f933fdb3ffa23f354bda4eaac186a36fbe50ccd4aeed719d8c172ab67f969339b0ef29a4698b0bd7b2fac9804eaa75d4b2c84b7808a096f9791
+EBUILD ulogd-2.0.7.ebuild 3186 BLAKE2B a70b5de31f86a873bfbd6163b8a9bdcec777bfcf5d12b86cf2d39b623147da2b1a4063518384f17e41697942040015eb1a5ab628a0f4a2b5454e9399d4add0ad SHA512 af9184754de193294703db3f5cd91b698df3c21547dc0e63bd8eb4990bed9642f4a06744a2dbcf19302cad40fdb8286faa22ef8cf2f0159d063e99b98a434164
+MISC metadata.xml 1106 BLAKE2B b3573379c3ff51e2547356bca45add6e891b5ab04784c8c926c52633551209c91ccf51103c289d4e45e16e7fb1f9775055131c400fdfa3627c158282ba0991ef SHA512 d97a125e3fcc6ed123c2da7520bd9f2fa615394d583ac5d984225286676ad3b01d0b5ccf01567d68cacffed6e12e5182bdbd618355e8bec2a05ade66369f9f1d
diff --git a/app-admin/ulogd/files/ulogd.init b/app-admin/ulogd/files/ulogd.init
new file mode 100644
index 000000000000..84020224afc0
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd.init
@@ -0,0 +1,41 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload reopen"
+
+: ${ULOGD_BINARY:=/usr/sbin/ulogd}
+: ${ULOGD_PIDFILE:=/run/${SVCNAME}.pid}
+: ${ULOGD_WAIT:=200}
+: ${ULOGD_OPTS:=--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}}
+
+depend() {
+	before iptables ip6tables ebtables nftables firewall
+	after mysql postgresql
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start \
+		--exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} --wait ${ULOGD_WAIT} \
+		-- ${ULOGD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile ${ULOGD_PIDFILE}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME} configuration"
+	start-stop-daemon --signal USR1 --pidfile ${ULOGD_PIDFILE}
+	eend $?
+}
+
+reopen() {
+	ebegin "Reopening ${SVCNAME} logfiles"
+	start-stop-daemon --signal HUP --pidfile ${ULOGD_PIDFILE}
+	eend $?
+}
diff --git a/app-admin/ulogd/files/ulogd.logrotate b/app-admin/ulogd/files/ulogd.logrotate
new file mode 100644
index 000000000000..777e40097a5e
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd.logrotate
@@ -0,0 +1,9 @@
+/var/log/ulogd/*.log {
+    sharedscripts
+    missingok
+    notifempty
+    create 0640 ulogd
+    postrotate
+        [ -f /run/ulogd.pid ] && /bin/kill -HUP $(cat /run/ulogd.pid)
+    endscript
+}
diff --git a/app-admin/ulogd/files/ulogd.service b/app-admin/ulogd/files/ulogd.service
new file mode 100644
index 000000000000..e6c88fb810c3
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=A userspace logging daemon for netfilter/iptables related logging
+Before=iptables.service ip6tables.service ebtables.service nftables.service
+After=mysql.service postgresql.service
+
+[Service]
+Type=forking
+PIDFile=/run/ulogd.pid
+ExecStart=/usr/sbin/ulogd --daemon --uid ulogd --pidfile /run/ulogd.pid
+ExecReload=/bin/kill -USR1 $MAINPID
+
+[Install]
+WantedBy=network.target
diff --git a/app-admin/ulogd/metadata.xml b/app-admin/ulogd/metadata.xml
new file mode 100644
index 000000000000..20ac91005d26
--- /dev/null
+++ b/app-admin/ulogd/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="json">Build JSON output plugin to save packets in JSON file format</flag>
+		<flag name="pcap">Build PCAP output plugin to save packets in libpcap file format</flag>
+		<flag name="nfacct">Build NFACCT input plugin to support traffic accounting via nfnetlink_acct</flag>
+		<flag name="nfct">Build NFCT input plugin to support stateful flow-based logging via nfnetlink_conntrack</flag>
+		<flag name="nflog">Build NFLOG input plugin to support stateless packet-based logging via nfnetlink_log</flag>
+		<flag name="ulog">Build ULOG input plugin to support deprecated packet-based logging via ULOG target</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugzilla.netfilter.org/enter_bug.cgi?product=ulogd</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/ulogd/ulogd-2.0.5_p20161017.ebuild b/app-admin/ulogd/ulogd-2.0.5_p20161017.ebuild
new file mode 100644
index 000000000000..192a002f058a
--- /dev/null
+++ b/app-admin/ulogd/ulogd-2.0.5_p20161017.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT_ID="62064f6a9e054739ecbdda010dbe9c3fd69bbaa2"
+
+inherit autotools eutils flag-o-matic linux-info readme.gentoo-r1 systemd user vcs-snapshot
+
+DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
+HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
+SRC_URI="http://git.netfilter.org/${PN}2/snapshot/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc x86"
+IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite ulog"
+
+RDEPEND="
+	|| ( net-firewall/iptables net-firewall/nftables )
+	>=net-libs/libnfnetlink-1.0.1
+	dbi? ( dev-db/libdbi )
+	json? ( dev-libs/jansson )
+	nfacct? (
+		>=net-libs/libmnl-1.0.3
+		>=net-libs/libnetfilter_acct-1.0.1
+	)
+	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
+	nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
+	mysql? ( virtual/mysql )
+	pcap? ( net-libs/libpcap )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/linuxdoc-tools
+		app-text/texlive-core
+		dev-texlive/texlive-fontsrecommended
+		virtual/latex-base
+	)
+"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+You must have at least one logging stack enabled to make ulogd work.
+Please edit the example configuration located at '${EPREFIX}/etc/ulogd.conf'.
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 14; then
+		die "${PN} requires a kernel >= 2.6.14."
+	fi
+
+	if use nfacct && kernel_is lt 3 3 0; then
+		ewarn "NFACCT input plugin requires a kernel >= 3.3."
+	fi
+
+	if use ulog && kernel_is ge 3 17 0; then
+		ewarn "ULOG target has been removed in the 3.17 kernel release."
+		ewarn "Consider enabling NFACCT, NFCT, or NFLOG support instead."
+	fi
+
+	enewgroup ulogd
+	enewuser ulogd -1 -1 /var/log/ulogd ulogd
+}
+
+src_prepare() {
+	default_src_prepare
+
+	# Change default settings to:
+	# - keep log files in /var/log/ulogd instead of /var/log;
+	# - create sockets in /run instead of /tmp.
+	sed -i \
+		-e "s|var/log|var/log/${PN}|g" \
+		-e 's|tmp|run|g' \
+		ulogd.conf.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-lfs-flags
+	local myeconfargs=(
+		$(use_with dbi)
+		$(use_with json jansson)
+		$(use_enable nfacct)
+		$(use_enable nfct)
+		$(use_enable nflog)
+		$(use_with mysql)
+		$(use_with pcap)
+		$(use_with postgres pgsql)
+		$(use_with sqlite)
+		$(use_enable ulog)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default_src_compile
+
+	if use doc; then
+		# Prevent access violations from bitmap font files generation.
+		export VARTEXFONTS="${T}/fonts"
+		emake -C doc
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/${PN}.html )
+
+	default_src_install
+	prune_libtool_files --modules
+	readme.gentoo_create_doc
+
+	doman ${PN}.8
+
+	use doc && dodoc doc/${PN}.{dvi,ps,txt}
+	use mysql && dodoc doc/mysql-*.sql
+	use postgres && dodoc doc/pgsql-*.sql
+	use sqlite && dodoc doc/sqlite3.table
+
+	insinto /etc
+	doins ${PN}.conf
+	fowners root:ulogd /etc/${PN}.conf
+	fperms 640 /etc/${PN}.conf
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	diropts -o ulogd -g ulogd
+	keepdir /var/log/ulogd
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-admin/ulogd/ulogd-2.0.7.ebuild b/app-admin/ulogd/ulogd-2.0.7.ebuild
new file mode 100644
index 000000000000..a95d6739b241
--- /dev/null
+++ b/app-admin/ulogd/ulogd-2.0.7.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic linux-info ltprune readme.gentoo-r1 systemd user
+
+DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
+HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
+SRC_URI="https://www.netfilter.org/projects/ulogd/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc x86"
+IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog"
+
+COMMON_DEPEND="
+	|| ( net-firewall/iptables net-firewall/nftables )
+	>=net-libs/libnfnetlink-1.0.1
+	dbi? ( dev-db/libdbi )
+	json? ( dev-libs/jansson )
+	nfacct? (
+		>=net-libs/libmnl-1.0.3
+		>=net-libs/libnetfilter_acct-1.0.1
+	)
+	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
+	nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
+	mysql? ( virtual/mysql )
+	pcap? ( net-libs/libpcap )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		app-text/linuxdoc-tools
+		app-text/texlive-core
+		dev-texlive/texlive-fontsrecommended
+		virtual/latex-base
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-ulogd )
+"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+You must have at least one logging stack enabled to make ulogd work.
+Please edit the example configuration located at '${EPREFIX}/etc/ulogd.conf'.
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if use nfacct && kernel_is lt 3 3 0; then
+		ewarn "NFACCT input plugin requires a kernel >= 3.3."
+	fi
+
+	if use ulog && kernel_is ge 3 17 0; then
+		ewarn "ULOG target has been removed in the 3.17 kernel release."
+		ewarn "Consider enabling NFACCT, NFCT, or NFLOG support instead."
+	fi
+
+	enewgroup ulogd
+	enewuser ulogd -1 -1 /var/log/ulogd ulogd
+}
+
+src_prepare() {
+	default_src_prepare
+
+	# Change default settings to:
+	# - keep log files in /var/log/ulogd instead of /var/log;
+	# - create sockets in /run instead of /tmp.
+	sed -i \
+		-e "s|var/log|var/log/${PN}|g" \
+		-e 's|tmp|run|g' \
+		ulogd.conf.in || die
+}
+
+src_configure() {
+	append-lfs-flags
+	local myeconfargs=(
+		$(use_with dbi)
+		$(use_with json jansson)
+		$(use_enable nfacct)
+		$(use_enable nfct)
+		$(use_enable nflog)
+		$(use_with mysql)
+		$(use_with pcap)
+		$(use_with postgres pgsql)
+		$(use_with sqlite)
+		$(use_enable ulog)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default_src_compile
+
+	if use doc; then
+		# Prevent access violations from bitmap font files generation.
+		export VARTEXFONTS="${T}/fonts"
+		emake -C doc
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/${PN}.html )
+
+	default_src_install
+	prune_libtool_files --modules
+	readme.gentoo_create_doc
+
+	doman ${PN}.8
+
+	use doc && dodoc doc/${PN}.{dvi,ps,txt}
+	use mysql && dodoc doc/mysql-*.sql
+	use postgres && dodoc doc/pgsql-*.sql
+	use sqlite && dodoc doc/sqlite3.table
+
+	insinto /etc
+	doins ${PN}.conf
+	fowners root:ulogd /etc/${PN}.conf
+	fperms 640 /etc/${PN}.conf
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	diropts -o ulogd -g ulogd
+	keepdir /var/log/ulogd
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-admin/usbview-2.0 b/app-admin/usbview-2.0
deleted file mode 100644
index d30e66f06308..000000000000
--- a/app-admin/usbview-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 virtual/pkgconfig
-DESCRIPTION=Display the topology of devices on the USB bus
-EAPI=5
-HOMEPAGE=http://www.kroah.com/linux-usb/
-IUSE=kernel_linux
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
-SLOT=0
-SRC_URI=http://www.kroah.com/linux-usb/usbview-2.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eb946e79a420adb747b2726cee752fd6
diff --git a/app-admin/usbview/Manifest b/app-admin/usbview/Manifest
new file mode 100644
index 000000000000..628522e24e2e
--- /dev/null
+++ b/app-admin/usbview/Manifest
@@ -0,0 +1,3 @@
+DIST usbview-2.0.tar.gz 366337 BLAKE2B d3ce8f3b97ebb650f7cc8b47d7a4c4b985022811f55b43b41a65aaa120450aa187ce2dfc2671315575dfcbd108b68ca50420145a6c59ab85f7c4fcfc53a233f9 SHA512 87b3d0b0c734c94e5527f19575c0460f5c0b894dac29936a759d573058c9c007ad59c9be32a5c6d485cba258193efe4ca15bdd6f3ca31df321ed230778b5404f
+EBUILD usbview-2.0.ebuild 687 BLAKE2B f9c2b2dd996981f14c96f1209093d5d92a1b1d3e1d5f558ba851bb661577b156af808356489fa70817cc69ffc7213a742d8443b179b1f2500f8f23f8e37c9316 SHA512 dcbfe53a7099bda627bb260a893ef388a6da2cb1cfa859856d7db9bbeff27a5b7d348e7950d0c1e88805254f5f22105cc60f481e9d2e9d707cd65824249f405d
+MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/app-admin/usbview/metadata.xml b/app-admin/usbview/metadata.xml
new file mode 100644
index 000000000000..2ba8e9e851e4
--- /dev/null
+++ b/app-admin/usbview/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/usbview/usbview-2.0.ebuild b/app-admin/usbview/usbview-2.0.ebuild
new file mode 100644
index 000000000000..a57e2594af0c
--- /dev/null
+++ b/app-admin/usbview/usbview-2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils linux-info
+
+DESCRIPTION="Display the topology of devices on the USB bus"
+HOMEPAGE="http://www.kroah.com/linux-usb/"
+SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+pkg_setup() {
+	CONFIG_CHECK="~DEBUG_FS"
+	linux-info_pkg_setup
+}
+
+src_install() {
+	default
+	doicon usb_icon.xpm
+	make_desktop_entry ${PN} 'USB Viewer' usb_icon
+}
diff --git a/app-admin/vault-0.10.1 b/app-admin/vault-0.10.1
deleted file mode 100644
index 4eca81b5b062..000000000000
--- a/app-admin/vault-0.10.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=>=dev-lang/go-1.10:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=A tool for managing secrets
-EAPI=6
-HOMEPAGE=https://vaultproject.io/
-IUSE=+filecaps
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/vault/archive/v0.10.1.tar.gz -> vault-0.10.1.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9b28c4fec804b611bac337447aa2bfaf
diff --git a/app-admin/vault-0.10.2 b/app-admin/vault-0.10.2
deleted file mode 100644
index c98efd3119c8..000000000000
--- a/app-admin/vault-0.10.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=>=dev-lang/go-1.10:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=A tool for managing secrets
-EAPI=6
-HOMEPAGE=https://vaultproject.io/
-IUSE=+filecaps
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/vault/archive/v0.10.2.tar.gz -> vault-0.10.2.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9b28c4fec804b611bac337447aa2bfaf
diff --git a/app-admin/vault-0.10.3 b/app-admin/vault-0.10.3
deleted file mode 100644
index 3e22ba4268e5..000000000000
--- a/app-admin/vault-0.10.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=>=dev-lang/go-1.10:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=A tool for managing secrets
-EAPI=6
-HOMEPAGE=https://vaultproject.io/
-IUSE=+filecaps
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/vault/archive/v0.10.3.tar.gz -> vault-0.10.3.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9b28c4fec804b611bac337447aa2bfaf
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
new file mode 100644
index 000000000000..d24a2b955e44
--- /dev/null
+++ b/app-admin/vault/Manifest
@@ -0,0 +1,12 @@
+AUX localhost.json.example 130 BLAKE2B c2af154a798286daae8a1804c698a8a8437bb4fbf2c9e928bd8ebd2cc846a7887058695f3715a4e3b9c82232529fe053b40d52fd98fd6b6c4018fbb2009a7da0 SHA512 9f9bc222f3716942b7423fa2ab14afd1d516bf3f3170b7418a75b970a33341426e13f89cf331a5e25bd3159dcbb435e20e75a0c9109e767e67bf777a7dbcd182
+AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f29ac183bd1473de37107b2e141b74933c1b14502cdaaaebe493ee71ad6c9141a889c6e73b977 SHA512 395d823dee49fed30d99fea1fcd1b0c1c3ae2bfd806fa0c169aa14d83a594d224f8966870799a3740a7e52f039616efe78834e0522e7a2802c7df4c56b3bbdd2
+AUX vault.initd 542 BLAKE2B 5e28a00356c010d34458c6f64d2bdb0736673ae552bec809cc5e23a1613e44cd847b4df99bee652a99cb6fb84443d5f9c5c1fba1c165d946f1c93cd8ca31ffa3 SHA512 ac13c688e006799b607c44e94fbdf922befc62131014b714a93ca4bb0205f5f012bb3e4814eeeb47b31034f5c35b187fc8ebaeca02bd02430c5842bc9821f29a
+AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
+AUX vault.service 409 BLAKE2B 1e34e7bb4e5d52949b1b0afbe495aea00202ee599db1b1737bd81c5252a6d57efd2a5c98e4dfaa4d632bb664a467414e644ec751921ced20f5e4c40b27222eb6 SHA512 2c4c7c395ebcd06e70de57d93384442ea88346cc2815b509966bd9f12579758e5f43d9a2ca1158e3b25198ad0c82ed9cf5d453f3cd7b5873011b3b13ec60196c
+DIST vault-0.10.1.tar.gz 13001413 BLAKE2B d4dd663062062c55d110b165c1369a8a6f44c91002d564680ed008fcea2ce1e26ac24773deb951a46a7d9bcce2234e3b1dc250a957605f3ec82c781ac2e46b4a SHA512 dfa2d81e0e51cf41694ad40ad9bcc6847a9261ee06b2787d59915b941a63bfe58e649271e1ff5a963b892af5c13043057f29a1a8412efe51b3cf54157c54a060
+DIST vault-0.10.2.tar.gz 15861571 BLAKE2B c1129c6f87fcd00aaf8fecaf472e33c6872663cbac1e778e3d1af9ca7978501fe9ca400cc6d79224f9f0df5912909218dfc2ff1547144b3a94fa9f10aed89534 SHA512 ce24d0c3c126bd8f265542c97dea4f0a1c56c5003e74b0aeb16aa462c326aa360f169e0bd08a4187480dbfcf1a052249f4dcf5a5bf356c4c901676d1b55c67b0
+DIST vault-0.10.3.tar.gz 15902247 BLAKE2B f69ddbe1309800cfae756f8ca1dd0da3e92ce49a1ec70539dc30785344afb7fe39472dcb2fb5ee4f410c7b52b13b00996b08d89624ef8523adcf4f809601ad5c SHA512 baacf549f9b73d306154dad6cd6efb3fb0eca3280c885cd772dada524cd436c1d5f1f705118274aa7cea6002cd8e0b86f1dfb02c4f5787d08dc535112cb62096
+EBUILD vault-0.10.1.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
+EBUILD vault-0.10.2.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
+EBUILD vault-0.10.3.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
+MISC metadata.xml 306 BLAKE2B 882a83701d71a45cdc6fc00ba3da98ff7d7439c9f81ef0aa1655c49bd5e79b3e625858d33f4ac6d5157df6ef74c5dd00a2b8efb1fd5ee45f9a0ed785c90d8ebc SHA512 d1fc4040379fb33c7f193f37a1c044000408e47c9df8b17771ed7cb5194f9d8b8c062b8a6804e72fb5a666683a8d5b49ec5a6328394870d9bdc1b7f3e0e4e787
diff --git a/app-admin/vault/files/localhost.json.example b/app-admin/vault/files/localhost.json.example
new file mode 100644
index 000000000000..02c377e424a9
--- /dev/null
+++ b/app-admin/vault/files/localhost.json.example
@@ -0,0 +1,9 @@
+backend "consul" {
+	address = "127.0.0.1:8500"
+	path = "vault"
+}
+
+listener "tcp" {
+	address = "127.0.0.1:8200"
+	tls_disable = 1
+}
diff --git a/app-admin/vault/files/vault.confd b/app-admin/vault/files/vault.confd
new file mode 100644
index 000000000000..6263ff00f911
--- /dev/null
+++ b/app-admin/vault/files/vault.confd
@@ -0,0 +1,7 @@
+# you can change the init script behavior by setting those parameters
+# - group (default: vault)
+# - pidfile (default: /run/vault/vault.pid)
+# - user (default: vault)
+
+# extra arguments for the consul agent
+command_args="-config=/etc/vault.d"
diff --git a/app-admin/vault/files/vault.initd b/app-admin/vault/files/vault.initd
new file mode 100644
index 000000000000..d430bb8d39a9
--- /dev/null
+++ b/app-admin/vault/files/vault.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2015-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="vault server"
+group=${group:-${RC_SVCNAME}}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+
+command="/usr/bin/${RC_SVCNAME}"
+command_args="server ${command_args}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+depend() {
+	need net
+}
diff --git a/app-admin/vault/files/vault.logrotated b/app-admin/vault/files/vault.logrotated
new file mode 100644
index 000000000000..66b827b9e693
--- /dev/null
+++ b/app-admin/vault/files/vault.logrotated
@@ -0,0 +1,7 @@
+/var/log/vault/vault.log {
+	missingok
+	size 5M
+	rotate 3
+	compress
+	copytruncate
+}
diff --git a/app-admin/vault/files/vault.service b/app-admin/vault/files/vault.service
new file mode 100644
index 000000000000..3071d0346277
--- /dev/null
+++ b/app-admin/vault/files/vault.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=vault server
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=vault
+Environment=VAULT_SERVER_OPTS="-config=/etc/vault.d"
+ExecStart=/usr/bin/vault server $VAULT_SERVER_OPTS
+CapabilityBoundingSet=CAP_IPC_LOCK
+AmbientCapabilities=CAP_IPC_LOCK
+Capabilities=CAP_IPC_LOCK=ep
+SecureBits=keep-caps
+Restart=on-failure
+SuccessExitStatus=2
+
+[Install]
+WantedBy=default.target
diff --git a/app-admin/vault/metadata.xml b/app-admin/vault/metadata.xml
new file mode 100644
index 000000000000..9f451f6533d7
--- /dev/null
+++ b/app-admin/vault/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">hashicorp/vault</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/vault/vault-0.10.1.ebuild b/app-admin/vault/vault-0.10.1.ebuild
new file mode 100644
index 000000000000..2e6d92497501
--- /dev/null
+++ b/app-admin/vault/vault-0.10.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fcaps golang-base golang-vcs-snapshot systemd user
+
+EGO_PN="github.com/hashicorp/${PN}"
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.10:=
+	dev-go/gox"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i src/${EGO_PN}/scripts/build.sh || die
+	sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	mkdir bin || die
+	export GOPATH=${S}
+	cd src/${EGO_PN} || die
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	dobin bin/${PN}
+}
diff --git a/app-admin/vault/vault-0.10.2.ebuild b/app-admin/vault/vault-0.10.2.ebuild
new file mode 100644
index 000000000000..2e6d92497501
--- /dev/null
+++ b/app-admin/vault/vault-0.10.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fcaps golang-base golang-vcs-snapshot systemd user
+
+EGO_PN="github.com/hashicorp/${PN}"
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.10:=
+	dev-go/gox"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i src/${EGO_PN}/scripts/build.sh || die
+	sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	mkdir bin || die
+	export GOPATH=${S}
+	cd src/${EGO_PN} || die
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	dobin bin/${PN}
+}
diff --git a/app-admin/vault/vault-0.10.3.ebuild b/app-admin/vault/vault-0.10.3.ebuild
new file mode 100644
index 000000000000..2e6d92497501
--- /dev/null
+++ b/app-admin/vault/vault-0.10.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fcaps golang-base golang-vcs-snapshot systemd user
+
+EGO_PN="github.com/hashicorp/${PN}"
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.10:=
+	dev-go/gox"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i src/${EGO_PN}/scripts/build.sh || die
+	sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	mkdir bin || die
+	export GOPATH=${S}
+	cd src/${EGO_PN} || die
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	dobin bin/${PN}
+}
diff --git a/app-admin/verynice-1.1-r2 b/app-admin/verynice-1.1-r2
deleted file mode 100644
index 7c746e672eba..000000000000
--- a/app-admin/verynice-1.1-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A tool for dynamically adjusting the nice-level of processes
-EAPI=5
-HOMEPAGE=https://web.archive.org/web/2010033109/http://thermal.cnde.iastate.edu/~sdh4/verynice/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://thermal.cnde.iastate.edu/~sdh4/verynice/down/verynice-1.1.tar.gz
-_eclasses_=epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d67a2d5fed92e6cb66ecc9adbec8ea52
diff --git a/app-admin/verynice-1.1-r3 b/app-admin/verynice-1.1-r3
deleted file mode 100644
index 1ccd4830ed8e..000000000000
--- a/app-admin/verynice-1.1-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A tool for dynamically adjusting the nice-level of processes
-EAPI=6
-HOMEPAGE=https://web.archive.org/web/20130621090315/http://thermal.cnde.iastate.edu/~sdh4/verynice/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://gentoo/verynice-1.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=64c565a69a4f966e16d52f9a35dc5c33
diff --git a/app-admin/verynice/Manifest b/app-admin/verynice/Manifest
new file mode 100644
index 000000000000..2a24b408e73a
--- /dev/null
+++ b/app-admin/verynice/Manifest
@@ -0,0 +1,7 @@
+AUX verynice 372 BLAKE2B 995a40cf67092736685e16b9a5429467972db32debebd64915e233e4be57862496b96c8a70bb57786e3770af3552f747359c534e4bfd62c91271a1ee974946b1 SHA512 b65b2f826b29ce19a237eace78518d0b31af0138caae0342c5354341dccd93cb13ffbf8d82acd1a52d0d710e62ae9d4a18a84e479c01c8931f78051daeab7e02
+AUX verynice-1.1-build.patch 2529 BLAKE2B 5ec0b3c4b4c1a91d3f7076068bfd3a39128d896682a8b356100240f7daf1b885d2606ec8c2dc1afdd29add09649f8642158f6dad373aeb7ba349e46997aa1a0a SHA512 d532a4a80b8d0719c07a5171403b90eba6562b6645703e4b7c79368cc71eca546cd0033796def0d3016c6ab2a62db85e266ef67ffdff5a6268f403213bf2ab70
+AUX verynice.service 158 BLAKE2B b71905d327904eb6a524e5d6b2dbc1606ffd0b5bbfad659c9d336ea41edbe8e6510966886cf814888bf8ec55cdd033299b1c91b7e7e3c3f455fa0f8a6ab8ddd3 SHA512 03a88cc405c8d6fa18f1e523e6987b1455011cf17ff38f1e937d523b33d88cae839f256811b487ec3141d8b396a15b8af778998d53bf55dd69f6a6a6dbc6a148
+DIST verynice-1.1.tar.gz 37576 BLAKE2B ac499b298858ada109f298bb2d37dc5fc7ecd17386994749a5a8a3612038eaa98d1f122ed990d9c8bd9e17a428b0a3b4c0c7f0df4a9f1c0441e3fe22fbeb1d07 SHA512 731fa22162bb4f48b943839ccf8ccdc769587e323da11e4a77ad14539a724ffbb89e5f4122e1ab36df3306c507afc958d1125160d34d9cbf55df4dc69e4a0139
+EBUILD verynice-1.1-r2.ebuild 780 BLAKE2B ead43a3cb913646f7269b253f0f5c37951411aec437408c446d47018966d8f313fb5402244a174ef4ffce2819350d4b9fe1c55bacebed6cc828b3937399c9db7 SHA512 72074cefa72a8f125a9669ad35a7b1c240ed8dd4e05110c957a4b7733cc521897714a7d0035639664eb63af52f9ffc96df0160498f75133a5e9e88ab650c7aac
+EBUILD verynice-1.1-r3.ebuild 729 BLAKE2B 0b519f289c07ccda9c48765b88bf37bc184355ece6698a859dfd8e2fd9e2ab643dcbc9d6e255b9a7cb830fd1f19de080aa82d913e21d2c9f08999bab53f0549f SHA512 98a2149b7d39117b58f0fe6fee1b11808666390234b0f3e02b5944be1eb785991cc874b960861e168b92f3cb75ecc4d7687d43905bd170d5e9be20475546568f
+MISC metadata.xml 318 BLAKE2B 1786ed2568f2f60dcaa875da07b616c2c77a1d4fe0151463db5542db66caef11931259da6bca4b437e125849caa3a3505ee607eca6c57b35ecfa75f45c82f370 SHA512 04cee3becd3a20c8f455969ea4c38d7a0843283bafded1af5310fe090159ad2ae0c804fc4893fa88138ad98aa3feda6991624c8a4942b245b64db5eebb3dcf46
diff --git a/app-admin/verynice/files/verynice b/app-admin/verynice/files/verynice
new file mode 100644
index 000000000000..4aa89cf73b2a
--- /dev/null
+++ b/app-admin/verynice/files/verynice
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	after checkroot root
+}
+
+start() {
+	ebegin "Starting verynice"
+	/usr/sbin/verynice -d /var/run/verynice.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping verynice"
+	start-stop-daemon --stop --quiet --pidfile=/var/run/verynice.pid
+	eend $?
+}
diff --git a/app-admin/verynice/files/verynice-1.1-build.patch b/app-admin/verynice/files/verynice-1.1-build.patch
new file mode 100644
index 000000000000..3782c74a5c05
--- /dev/null
+++ b/app-admin/verynice/files/verynice-1.1-build.patch
@@ -0,0 +1,73 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Dec 26 19:46:44 UTC 2012
+Subject: build system
+
+respect flags, add LDFLAGS to linker line
+fix install rules
+
+--- a/Makefile
++++ b/Makefile
+@@ -15,13 +15,15 @@
+ #    along with this program; if not, write to the Free Software
+ #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+-CC = gcc
++CC ?= gcc
+ 
+ 
+ RPM_BUILD_ROOT=
+ 
+ # PREFIX is usually either /usr or /usr/local
+ PREFIX=/usr/local
++BINDIR=$(PREFIX)/sbin
++ETCDIR=/etc
+ TARGET=linux
+ 
+ 
+@@ -32,8 +34,8 @@
+ VERSION=1.1
+ 
+ #CFLAGS= -I../include/ -O3 -Wimplicit
+-CFLAGS= -I../include/ -g -Wimplicit -DPREFIX=\"$(PREFIX)\" -DTARGET_$(TARGET) -DVERSION=\"$(VERSION)\"
+-LINK = gcc 
++CFLAGS += -Wimplicit
++CPPFLAGS = -I../include/ -DPREFIX=\"$(PREFIX)\" -DTARGET_$(TARGET) -DVERSION=\"$(VERSION)\"
+ AG = /home3/sdh4/anagram/ag_unix_dev/ag
+ 
+ 
+@@ -55,20 +57,15 @@
+ 	(cd .. ; tar cvzf verynice-$(VERSION).tar.gz verynice/ )
+ 
+ install: 
+-	$(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/sbin
+-	$(INSTALL) verynice $(RPM_BUILD_ROOT)$(PREFIX)/sbin	
+-	if [ $(PREFIX) = "/usr" ]; then \
+-	  mv -f $(RPM_BUILD_ROOT)/etc/verynice.conf $(RPM_BUILD_ROOT)/etc/verynice.conf~ ; \
+-	  $(INSTALL) verynice.conf $(RPM_BUILD_ROOT)/etc ; \
+-	else \
+-	  $(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/etc ; \
+-	  mv -f $(RPM_BUILD_ROOT)$(PREFIX)/etc/verynice.conf $(RPM_BUILD_ROOT)$(PREFIX)/etc/verynice.conf~ ; \
+-	  $(INSTALL) -m 644 verynice.conf $(RPM_BUILD_ROOT)$(PREFIX)/etc ; \
+-	fi
++	$(INSTALL) -d $(RPM_BUILD_ROOT)$(BINDIR)
++	$(INSTALL) verynice $(RPM_BUILD_ROOT)$(BINDIR)
++	$(INSTALL) -d $(RPM_BUILD_ROOT)$(ETCDIR)
++	$(INSTALL) -m 644 verynice.conf $(RPM_BUILD_ROOT)$(ETCDIR)
+ 	$(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/share 
+ 	$(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/share/doc 
+ 	$(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION)
+-	$(INSTALL) -m 644 verynice.html $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION)
++	$(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION)/html
++	$(INSTALL) -m 644 verynice.html $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION)/html
+ 	$(INSTALL) -m 644 README $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION)
+ 	$(INSTALL) -m 644 README.SYN $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION)
+ 	$(INSTALL) -m 644 COPYING $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION)
+@@ -95,7 +92,7 @@
+ 	$(AG) $*
+ 
+ verynice: verynice.o config.o linklist.o stringstack.o 
+-	$(LINK) -g -o $@ $^ -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm
+ 
+ 
+ 
diff --git a/app-admin/verynice/files/verynice.service b/app-admin/verynice/files/verynice.service
new file mode 100644
index 000000000000..e85ef4c895b2
--- /dev/null
+++ b/app-admin/verynice/files/verynice.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=A tool for dynamically adjusting the nice-level of processes
+
+[Service]
+ExecStart=/usr/sbin/verynice
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/verynice/metadata.xml b/app-admin/verynice/metadata.xml
new file mode 100644
index 000000000000..a1dec792eedb
--- /dev/null
+++ b/app-admin/verynice/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		A tool that can dynamically adjust the nice-level of processes under
+		Unix-like operating systems.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/verynice/verynice-1.1-r2.ebuild b/app-admin/verynice/verynice-1.1-r2.ebuild
new file mode 100644
index 000000000000..e9dc02e399c0
--- /dev/null
+++ b/app-admin/verynice/verynice-1.1-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit epatch systemd toolchain-funcs
+
+DESCRIPTION="A tool for dynamically adjusting the nice-level of processes"
+HOMEPAGE="https://web.archive.org/web/2010033109/http://thermal.cnde.iastate.edu/~sdh4/verynice/"
+SRC_URI="http://thermal.cnde.iastate.edu/~sdh4/verynice/down/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1-build.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake RPM_BUILD_ROOT="${D}" PREFIX=/usr
+}
+
+src_install(){
+	emake RPM_BUILD_ROOT="${D}" PREFIX=/usr VERSION=${PVR} install
+	doinitd "${FILESDIR}"/verynice
+	systemd_dounit "${FILESDIR}"/verynice.service
+}
diff --git a/app-admin/verynice/verynice-1.1-r3.ebuild b/app-admin/verynice/verynice-1.1-r3.ebuild
new file mode 100644
index 000000000000..7aba33fc8dc2
--- /dev/null
+++ b/app-admin/verynice/verynice-1.1-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="A tool for dynamically adjusting the nice-level of processes"
+HOMEPAGE="https://web.archive.org/web/20130621090315/http://thermal.cnde.iastate.edu/~sdh4/verynice/"
+SRC_URI="http://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-build.patch
+)
+
+src_compile() {
+	tc-export CC
+	emake RPM_BUILD_ROOT="${D}" PREFIX=/usr
+}
+
+src_install(){
+	emake RPM_BUILD_ROOT="${D}" PREFIX=/usr VERSION=${PVR} install
+	doinitd "${FILESDIR}"/verynice
+	systemd_dounit "${FILESDIR}"/verynice.service
+}
diff --git a/app-admin/watchfolder-0.3.3-r1 b/app-admin/watchfolder-0.3.3-r1
deleted file mode 100644
index 46475de099a3..000000000000
--- a/app-admin/watchfolder-0.3.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=watches directories and processes files
-EAPI=6
-HOMEPAGE=http://freshmeat.net/projects/watchd/
-KEYWORDS=~alpha amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://dstunrea.sdf-eu.org/files/watchfolder-0.3.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=052afb0d019400e74512353798e1c3af
diff --git a/app-admin/watchfolder/Manifest b/app-admin/watchfolder/Manifest
new file mode 100644
index 000000000000..3d12d6a494ea
--- /dev/null
+++ b/app-admin/watchfolder/Manifest
@@ -0,0 +1,5 @@
+AUX 0.3.3-64bit.patch 450 BLAKE2B 8d88a4677bf59cdd95a6dc539364ef8aab46ab40e59107ba88198113bc79d1b61cdbe88e52a8c9cd805e4133dee2bde9bf068ce8a2822bb5a7201c118ef29a7a SHA512 86d6e072904fed5a168398fd80f648b30a9346745dac7b6ee460122e205f8f627aa4bfff78b007726af95b711c4bb91ca8282ca1a000e6954bf6d33e399f18c0
+AUX 0.3.3-fortify-sources.patch 410 BLAKE2B d44f872bd89cb0c3cccaf5b70e6293937340562ee71ff73185ff466b6dbac1e3b4854afa6eecec6558e36a070a9ed4a1efa275dde5d91ff0f1084509bcd60054 SHA512 0e3b372b9eaf1f4874ecbf7135ed67e1dcf62366516215a5d5fc5a1288893385b24f1d34855fc134eaad0dc29562ec4de0c90365ce87b7071234fcb1750e4676
+DIST watchfolder-0.3.3.tar.gz 86741 BLAKE2B d834f8aade7e648e27f95ca896355ec07afb24bac0f0116280f374e763c6fca8e7e7ffca7850d54b11fdf1c1ccfe8d28bd52a527eeb7110d4783a55de28828fb SHA512 162a3535748d280d06db8b05ddc4c87b578ff4be08aeb7a08858c28fd4612f46c4b8ed866513283edcd6ad24207c94a02e562200ae102d1897b4b28be6717dc6
+EBUILD watchfolder-0.3.3-r1.ebuild 877 BLAKE2B 6ae578f60dd9cfbd43367aa8f3fa77cd669a77c7bc92c30fc02181fab6ef3db89b9bab49c751a768f442486fe70314521f3ccf32ca2fc4c6eaa7a84ec3ce6465 SHA512 d84172d22d08f541039e3b74816d2745ac0dd8484bd912c3e81ef20d42aed241aa3bf310c14903e6619765010bb167d343f8c8c3abec7e9949bfafd3e68a60f2
+MISC metadata.xml 241 BLAKE2B f902bc0becbcf0a1830c4b9dca2ae4acd8ae91741ff1b6bf7cc68a08be61a26293b94c7690a06446e84f38d46dfe4c22c52a9e736b426c535b82acccb644b13c SHA512 9e7d032c1d5e4be915c726c4a312eb2bdad6eb036827f2aceecf5f370bbc255e72ee420816646fe639a607dee0f5d112d843e897183f8c587ec866fe8248b452
diff --git a/app-admin/watchfolder/files/0.3.3-64bit.patch b/app-admin/watchfolder/files/0.3.3-64bit.patch
new file mode 100644
index 000000000000..070e9c019d26
--- /dev/null
+++ b/app-admin/watchfolder/files/0.3.3-64bit.patch
@@ -0,0 +1,11 @@
+--- a/watchd.c	2006-02-23 12:33:32.000000000 -0500
++++ b/watchd.c	2006-02-23 12:45:30.000000000 -0500
+@@ -176,7 +176,7 @@
+ // free(p2tmp);
+ 
+  p2tmp=strchr(p2,0xa);		// Not very nice,
+- p2[(int)p2tmp-(int)p2]=0x00;	// but in fact: It works ;)
++ *(p2+(p2tmp-p2))=0x00;		// but in fact: It works ;)
+ 
+  while (p2[0]==' ') {p2++;}       		     // Again, quick and dirty..
+  while (p1[strlen(p1)-1]==' ') {p1[strlen(p1)-1]=0;} // Need to say anything?;)
diff --git a/app-admin/watchfolder/files/0.3.3-fortify-sources.patch b/app-admin/watchfolder/files/0.3.3-fortify-sources.patch
new file mode 100644
index 000000000000..175e8ed29ec3
--- /dev/null
+++ b/app-admin/watchfolder/files/0.3.3-fortify-sources.patch
@@ -0,0 +1,11 @@
+--- a/watchd.c	2009-02-27 23:46:42.000000000 +0000
++++ b/watchd.c	2009-02-27 23:50:22.000000000 +0000
+@@ -671,7 +671,7 @@
+    {
+     if (folder->flags&FL_LOG_FILE)
+     {
+-     log=open(curfolder->logfile, O_CREAT | O_WRONLY | O_APPEND );
++     log=open(curfolder->logfile, O_CREAT | O_WRONLY | O_APPEND, S_IRUSR | S_IWUSR );
+      if (log>0)
+       {
+        lseek(fd, SEEK_SET, 0); // Rewind temp log file..
diff --git a/app-admin/watchfolder/metadata.xml b/app-admin/watchfolder/metadata.xml
new file mode 100644
index 000000000000..b837dfa17fef
--- /dev/null
+++ b/app-admin/watchfolder/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="freshmeat">watchd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild b/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..ff216bde996b
--- /dev/null
+++ b/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="watches directories and processes files"
+HOMEPAGE="http://freshmeat.net/projects/watchd/"
+SRC_URI="http://dstunrea.sdf-eu.org/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${P/folder/d}"
+
+PATCHES=(
+	# patch to remove warnings on 64 bit systems
+	"${FILESDIR}"/${PV}-64bit.patch
+	# and a gcc 4.3.3 / fortify_sources fix
+	"${FILESDIR}"/${PV}-fortify-sources.patch
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/-c -o/s:OPT:CFLAGS:' \
+		-e 's:(\(LD\)\?OPT):(LDFLAGS) $(CFLAGS):' \
+		-e 's:gcc:$(CC):' \
+		Makefile || die "sed Makefile failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin watchd
+	insinto /etc
+	doins watchd.conf
+	dodoc README doc/*
+}
diff --git a/app-admin/webalizer-2.23.08 b/app-admin/webalizer-2.23.08
deleted file mode 100644
index 09d052210e44..000000000000
--- a/app-admin/webalizer-2.23.08
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare prerm setup
-DEPEND=>=sys-libs/db-4.2:* >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2:0= >=media-libs/gd-1.8.3[png] dev-libs/geoip bzip2? ( app-arch/bzip2 ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Webserver log file analyzer
-EAPI=5
-HOMEPAGE=http://www.webalizer.org/
-IUSE=bzip2 xtended geoip nls vhosts
-KEYWORDS=alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/db-4.2:* >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2:0= >=media-libs/gd-1.8.3[png] dev-libs/geoip bzip2? ( app-arch/bzip2 ) >=app-admin/webapp-config-1.50.15
-SLOT=0
-SRC_URI=ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-08-src.tar.bz2 xtended? ( http://patrickfrei.ch/webalizer/rb30/webalizer-2.23-08-RB30-patch.tar.gz ) https://dev.gentoo.org/~blueness/webalizer/webalizer.conf.gz ftp://ftp.mrunix.net/pub/webalizer/geodb//webalizer-geodb-20140201.tgz
-_eclasses_=db-use	582140d1a711279e50ce284fc7b609f5	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=6b483a71ed26e54f178ce8e206386025
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
new file mode 100644
index 000000000000..18c5742e9050
--- /dev/null
+++ b/app-admin/webalizer/Manifest
@@ -0,0 +1,8 @@
+AUX apache.webalizer 203 BLAKE2B fd92b85d0cd5a3bb0118ca3e47f616aa4f68cf3b954d1a8ad21ccc3cd229cc66e12e7f461497eb740c9a5ad5b34f8cf4c81d7e86e9725d6789568d15de10265c SHA512 19145c1d74322f2f6724bde7c5ef0c0111489566ba3ba8dcdeba38681332250e77e26652ccc2b6ff1a41f7dc7795c34a4c5e189cf92b24fe0ad544c4afac40b0
+AUX webalizer-language-list.txt 1520 BLAKE2B 303cffa208d2375c37b3f105a67d22cde6612219ddba20e816fb64ec4eee98b6dcbec0e534402587a108c805b0de3b67ad99d46103dae46f507b319f11ba117f SHA512 52abca2565a8d06d8bf538b8c168b32dbb065e655a4c849d6ff1e1299c4e84d6f9717b7e74ef730a9c68cd63f2d03232ae5c9d1ba391f68e3f1314444e41c29a
+DIST webalizer-2.23-08-RB30-patch.tar.gz 45723 BLAKE2B 510e984121cc5109e442184010edb0e2fbb7bb9738297c0689acd32e55a1720bdf7bcea3a21cc73aa8ecd0b9d0a8b1a7b336227003dee5abfff9d5288a5250d7 SHA512 142674cb7de6e1833ed9bf7587d5d3b1fce64eb95b7448392d0e8ec6e89dcd69cdb6900b75db9c283b19e5423392f76565b5ad279748da656ed2061fb180c949
+DIST webalizer-2.23-08-src.tar.bz2 308090 BLAKE2B 84f56b8b6a7e2b382040649ca8c6b6b7b57de92a09922253473f6cf920a4dd10a2c268b926c0cdd4fcf029dbbe39d629eecbd74cc42f62c018a00c3cc86c4f7d SHA512 23fe6e3ef1c85aa527ffafef16c31c13ad8e1f9feb774557c07a5c8fd6c67986b98180ef16d6cebe62d59c5f7ca214b8292e94ce8f195fa0541de9c5438fb9bd
+DIST webalizer-geodb-20140201.tgz 733070 BLAKE2B fd97dfd14e2fcbc6c97d6cb423c922d6bf7504f156fb61fb11319094a4d2e25fd8fa2623f419b57d06ef0762a507799cfd750a5e3a86a143aa1afcc790942cae SHA512 c31bbf39ab2a27712f83e7c1cf4297bc26850ed72e68bb4b47233b062055cf26931e859cdbc70dfa7737e17a3c05d4858b4e9c9c3a0492b0b285f92c0f992223
+DIST webalizer.conf.gz 8986 BLAKE2B 6cee5f96c31a189bf7ce75ec845081d9a2f0e547362d415c84f78f1ddaa8e3ffd327517968037ac1606a485d9cba740054bb9851065d0ea03739b5558c7ef6f9 SHA512 ec7f815e0215116d72e6d93b471a4b86a1c152a8ebae7c374144cabeeb06750d3a39fde65faf069e9aeb133f27b0b4cdee16bed5442e7fbd4eb4f45a4f3cd84b
+EBUILD webalizer-2.23.08.ebuild 4222 BLAKE2B abf62b488d87de185333e3900fe995400416acca263ede382d5da791304d154d95d0651a4531d453fbcf9d674f5733585044ba428bf80705bc13c1573310067d SHA512 8267cb7a29cb7cb006a631b6e04cb01c701f14c602ede2a0ab0dd40da6d15edc70adf118a2fcc4561cc8db975c71642f9fb97e99dfaa44ee5957d8eade13f862
+MISC metadata.xml 434 BLAKE2B 72cde450aa4735601e14978c5bfc3be91f257907988e6017dc27f7aca8dad9b8586dc78943d69a10344d25d2435fb8394b5fe1239a0ea7ff2ae3ae2b26ba0eec SHA512 9d006c56a0019b4ea29e8f9f845ca9006ecdccf64b9e50c343420af4b3852b5c08f09a23d792c3d1454454f8a0696a0dbc4b36b4da2c6f0d4967f533ad3a3149
diff --git a/app-admin/webalizer/files/apache.webalizer b/app-admin/webalizer/files/apache.webalizer
new file mode 100644
index 000000000000..0dbab4111a92
--- /dev/null
+++ b/app-admin/webalizer/files/apache.webalizer
@@ -0,0 +1,9 @@
+# This is the config snippet for Webalizer
+<Directory "/var/www/localhost/htdocs/webalizer">
+	Options None
+	AllowOverride None
+	Order allow,deny
+	Allow from all
+</Directory>
+
+# vim: ts=4 filetype=apache
diff --git a/app-admin/webalizer/files/webalizer-language-list.txt b/app-admin/webalizer/files/webalizer-language-list.txt
new file mode 100644
index 000000000000..ed9e3232417b
--- /dev/null
+++ b/app-admin/webalizer/files/webalizer-language-list.txt
@@ -0,0 +1,136 @@
+aa afar
+ab abkhazian
+af afrikaans
+am amharic
+ar arabic
+as assamese
+ay aymara
+az azerbaijani
+ba bashkir
+be byelorussian
+bg bulgarian
+bh bihari
+bi bislama
+bn bengali
+bo tibetan
+br breton
+ca catalan
+co corsican
+cs czech
+cy welsh
+da danish
+de german
+dz bhutani
+el greek
+en english
+eo esperanto
+es spanish
+et estonian
+eu basque
+fa persian
+fi finnish
+fj fiji
+fo faeroese
+fr french
+fy frisian
+ga irish
+gd gaelic
+gl galician
+gn guarani
+gu gujarati
+ha hausa
+hi hindi
+hr croatian
+hu hungarian
+hy armenian
+ia interlingua
+ie interlingue
+ik inupiak
+in indonesian
+is icelandic
+it italian
+iw hebrew
+ja japanese
+ji yiddish
+jw javanese
+ka georgian
+kk kazakh
+kl greenlandic
+km cambodian
+kn kannada
+ko korean
+ks kashmiri
+ku kurdish
+ky kirghiz
+la latin
+ln lingala
+lo laothian
+lt lithuanian
+lv latvian
+mg malagasy
+mi maori
+mk macedonian
+ml malayalam
+mn mongolian
+mo moldavian
+mr marathi
+ms malay
+mt maltese
+my burmese
+na nauru
+ne nepali
+nl dutch
+no norwegian
+oc occitan
+om oromo afan
+or oriya
+pa punjabi
+pl polish
+ps pashto
+pt portuguese
+qu quechua
+rm rhaeto-romance
+rn kirundi
+ro romanian
+ru russian
+rw kinyarwanda
+sa sanskrit
+sd sindhi
+sg sangro
+sh serbo-croatian
+si singhalese
+sk slovak
+sl slovenian
+sm samoan
+sn shona
+so somali
+sq albanian
+sr serbian
+ss siswati
+st sesotho
+su sudanese
+sv swedish
+sw swahili
+ta tamil
+te tegulu
+tg tajik
+th thai
+ti tigrinya
+tk turkmen
+tl tagalog
+tn setswana
+to tonga
+tr turkish
+ts tsonga
+tt tatar
+tw twi
+uk ukrainian
+ur urdu
+uz uzbek
+vi vietnamese
+vo volapuk
+wo wolof
+xh xhosa
+yo yoruba
+zh chinese
+zu zulu
diff --git a/app-admin/webalizer/metadata.xml b/app-admin/webalizer/metadata.xml
new file mode 100644
index 000000000000..dc3cf7c59bb9
--- /dev/null
+++ b/app-admin/webalizer/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<use>
+		<flag name="xtended">Include the 404 extension</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-admin/webalizer/webalizer-2.23.08.ebuild b/app-admin/webalizer/webalizer-2.23.08.ebuild
new file mode 100644
index 000000000000..605bbadefb1f
--- /dev/null
+++ b/app-admin/webalizer/webalizer-2.23.08.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# uses webapp.eclass to create directories with right permissions
+# probably slight overkill but works well
+
+EAPI="5"
+
+inherit versionator eutils webapp db-use
+
+WEBAPP_MANUAL_SLOT="yes"
+XTENDED_VER="RB30"
+XTENDED_URL="rb30"
+
+MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
+MY_P="${PN}-${MY_PV}"
+
+GEODB_DATE="20140201"
+GEODB_URL="ftp://ftp.mrunix.net/pub/webalizer/geodb/"
+GEODB_DIR="/usr/share/webalizer/geodb"
+
+DESCRIPTION="Webserver log file analyzer"
+HOMEPAGE="http://www.webalizer.org/"
+SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
+	xtended? ( http://patrickfrei.ch/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz )
+	https://dev.gentoo.org/~blueness/webalizer/webalizer.conf.gz
+	${GEODB_URL}/webalizer-geodb-${GEODB_DATE}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
+IUSE="bzip2 xtended geoip nls"
+SLOT="0"
+
+DEPEND=">=sys-libs/db-4.2:*
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/libpng-1.2:0=
+	>=media-libs/gd-1.8.3[png]
+	dev-libs/geoip
+	bzip2? ( app-arch/bzip2 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	# USE=nls has no real meaning if LINGUAS isn't set
+	if use nls && [[ -z "${LINGUAS}" ]]; then
+		ewarn "you must set LINGUAS in /etc/portage/make.conf"
+		ewarn "if you want to USE=nls"
+		die "please either set LINGUAS or do not use nls"
+	fi
+}
+
+src_prepare() {
+	if use xtended; then
+		epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch
+	fi
+}
+
+src_configure() {
+	# really dirty hack; necessary due to a really gross ./configure
+	# basically, it just sets the natural language the program uses
+	# unfortunatly, this program only allows for one lang, so only the first
+	# entry in LINGUAS is used
+	if use nls; then
+		local longlang="$(grep ^${LINGUAS:0:2} "${FILESDIR}"/webalizer-language-list.txt)"
+		local myconf="${myconf} --with-language=${longlang:3}"
+	else
+		local myconf="${myconf} --with-language=english"
+	fi
+
+	econf --enable-dns \
+		--with-db=$(db_includedir) \
+		--with-dblib=$(db_libname) \
+		${myconf} \
+		$(use_enable geoip) \
+		$(use_enable bzip2 bz2) \
+		--with-geodb=${GEODB_DIR} \
+		|| die "econf failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dobin webalizer
+	dosym webalizer /usr/bin/webazolver
+	doman webalizer.1
+
+	insinto /etc
+	doins "${WORKDIR}"/${PN}.conf
+
+	insinto ${GEODB_DIR}
+	doins "${WORKDIR}"/GeoDB.dat
+
+	dodoc CHANGES *README* INSTALL sample.conf "${FILESDIR}"/apache.webalizer
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog
+	elog "It is suggested that you restart apache before using webalizer"
+	elog "You may want to review /etc/webalizer.conf and ensure that"
+	elog "OutputDir is set correctly"
+	elog
+	elog "Then just type webalizer to generate your stats."
+	elog "You can also use cron to generate them e.g. every day."
+	elog "They can be accessed via http://localhost/webalizer"
+	elog
+	elog "A sample Apache config file has been installed into"
+	elog "/usr/share/doc/${PF}/apache.webalizer"
+	elog "Please edit and install it as necessary"
+	elog
+
+	if [[ ${#LINGUAS} -gt 2 ]] && use nls; then
+		ewarn
+		ewarn "You have more than one language in LINGUAS"
+		ewarn "Due to the limitations of this package, it was built"
+		ewarn "only with ${LINGUAS:0:2} support. If this is not what"
+		ewarn "you intended, please place the language you desire"
+		ewarn "_first_ in the list of LINGUAS in /etc/portage/make.conf"
+		ewarn
+	fi
+
+	if use xtended; then
+		ewarn
+		ewarn "If you are upgrading webalizer from USE=-xtended to USE=xtended"
+		ewarn "you will need to delete webalizer.current and process all previous"
+		ewarn "days in the same month using 'webalizer /path/to/access_log.1'."
+		ewarn "For more information about using XTENDED webalizer, see:"
+		ewarn
+		ewarn "    http://www.patrickfrei.ch/webalizer/rb30/INSTALL"
+		ewarn
+	fi
+
+	if use geoip; then
+		elog
+		elog "Note: we have installed the GeoDB.dat dated ${GEODB_DATE}."
+		elog "But you may want to upate to the latest version which is"
+		elog "available at ${GEODB_URL}.  Replace the GeoDB.dat file in"
+		elog "${GEODB_DIR} with the newer version."
+		elog
+	fi
+
+	webapp_pkg_postinst
+}
diff --git a/app-admin/webapp-config-1.52-r1 b/app-admin/webapp-config-1.52-r1
deleted file mode 100644
index f2f9c44144da..000000000000
--- a/app-admin/webapp-config-1.52-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=app-text/xmlto !dev-python/configparser python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Gentoo's installer for web-based applications
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/webapp-config/
-IUSE=+portage python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.52.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=295c52270b7243f744cff4d784bd6844
diff --git a/app-admin/webapp-config-1.53-r2 b/app-admin/webapp-config-1.53-r2
deleted file mode 100644
index c82e5c785884..000000000000
--- a/app-admin/webapp-config-1.53-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=app-text/xmlto !dev-python/configparser sys-apps/gentoo-functions python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Gentoo's installer for web-based applications
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/webapp-config/
-IUSE=+portage python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=portage? ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.53.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7c1a7926bac7da516af1fdf804a75d34
diff --git a/app-admin/webapp-config-1.54-r2 b/app-admin/webapp-config-1.54-r2
deleted file mode 100644
index e43d53e27463..000000000000
--- a/app-admin/webapp-config-1.54-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=app-text/xmlto sys-apps/gentoo-functions python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Gentoo's installer for web-based applications
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/webapp-config/
-IUSE=+portage python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=portage? ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.54.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=52e30a22178bc39d71aea5f543d4cd72
diff --git a/app-admin/webapp-config-1.55-r1 b/app-admin/webapp-config-1.55-r1
deleted file mode 100644
index d3ef53c3bfc0..000000000000
--- a/app-admin/webapp-config-1.55-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=app-text/xmlto sys-apps/gentoo-functions python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Gentoo's installer for web-based applications
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/webapp-config/
-IUSE=+portage python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=portage? ( || ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.55.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db9c0912f612126b098eebdb7c980ed6
diff --git a/app-admin/webapp-config-9999 b/app-admin/webapp-config-9999
deleted file mode 100644
index c97c07ceb327..000000000000
--- a/app-admin/webapp-config-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=app-text/xmlto sys-apps/gentoo-functions python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Gentoo's installer for web-based applications
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/webapp-config/
-IUSE=+portage python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=GPL-2
-RDEPEND=portage? ( || ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f0e175276615f82c87284000d05f152
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
new file mode 100644
index 000000000000..4d78a97fcc43
--- /dev/null
+++ b/app-admin/webapp-config/Manifest
@@ -0,0 +1,14 @@
+AUX webapp-config-1.52-nulls-doctest.patch 9054 BLAKE2B 722e41d0585580a7137aeeca48d93e9574cb69246ae45128735197f19df21c360cb945fc72053860a5bc9f35573488554ed0b2fe9cb5c1ae9bb27e9568496f4e SHA512 3e1fa14a1db1a3c6fe505d846e40c47b91d75ffea52daf4f34e9da0713b954b47264d0b4f068e9736bc3d100ee981b461888b9ee8cde9103dcd86eb1b5f5a47f
+AUX webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch 756 BLAKE2B 4f15574025b919b29574ca55d06507e1d727934ced133482b8f75044d6e247ce3c95903cb1da8e928d95fcee9217cdf653cf8793ef78fb9f9fd73b2b533aa7ba SHA512 e67f8e055bd0af7b97eade6dfce40fac411374dc264952ef1f17ffb5a161eed015bbbee512e83e1b533cef352c7dc863a96fa2345ecedaaa72352ddb622b820d
+AUX webapp-config-1.54-fix-bashism.patch 400 BLAKE2B def7896c26a6b8c948b63717058aa6a6eb67ccba45db9a9f2c3018891dad111f73aded150e8663b23e49ad9f7202ecf7c70b17b8dab23b27e424f746fcd42f09 SHA512 2e5080199ded653e07cf0188ca16ad0a505e7dc8230176c2452a4b2934017d7a8696a5d4b2bfcbc92159b36602a391d9c270acf0b7178f10249f5141fa8e22af
+AUX webapp-config-1.54-pvr-check.patch 2095 BLAKE2B ffc28f16af8d69e5c60fc7cfd85ed20ea2d3f1d43400c60e41984d78e33505038ca0928392667763882a3c555117febefd7eea8d0a43b17118d949bb65446e03 SHA512 ee1c38e467ae4670b84d7b8d1cd8d99544898f8816dcc1cce37afb7ae3b8ecdce49f1d61f7f2e2609ec1166c5dffaa639e0705c017f18d0c3b50e72baf99aa96
+DIST webapp-config-1.52.tar.bz2 62951 BLAKE2B 8abc9f5503c9204fdb2d860f819e06a9f75f285bc0190bf1c479caea08754da92a351a12abe026d8600a51d8e33d57d827b027e8a0f9da5a8af1f09daa0de1e5 SHA512 ec616067588e6ab306af067e70bab9d17961aa675f387ee67a2291235ce81638b49a784d9a6c31891b7c78a712f276c3e62c6681a5e496a52c7e6fe7753922ea
+DIST webapp-config-1.53.tar.bz2 63429 BLAKE2B bb13d52a4c19859ff4730df2f7db75452effa23d1864d97aada38137f00ada8eec530f728f1c3ae06ecbed713a2d489b7225db3fc02aeabbf6241d0956761609 SHA512 7d2fc7197d537f2264c26b68b61e69273d2fcd3eec93657db54ba685c8383e7b8245cf05ed2ddd8b72453bf3fbf8f4bc4867e53d608331799df2e6162be14820
+DIST webapp-config-1.54.tar.bz2 58954 BLAKE2B 42a4305c51ccb8bb9db455c6ae2663b5d17c9d477eee3e504569c802e5f0d10183f3e6cd1e747462dcc0559d6ed7ba53a8b5607ed422f34813a33e0e8148bb90 SHA512 fa61e88696eaed130575e5ae9a17ec827aa14aece359e5ba43fa723ad00083def22e44fb02d99fc5ba6000a5949c5ce7aecea9307d2bfae333e202ef111dcd31
+DIST webapp-config-1.55.tar.bz2 72583 BLAKE2B be958dc991f0e1f6835d9c29350b7d97e3f23d52971f6013165ce59a8f4b32ac6262c9719956d1bcdbe60797f07d77910b44a749ae545c4dc15f765525144709 SHA512 44294b276fd036908438cd984ebf70433639caa18d8330bab348433b4f39ea2c42c57fa8de4f0a6198f7875429a3ef9ebe61321c288d910f9be8b3414865f438
+EBUILD webapp-config-1.52-r1.ebuild 1606 BLAKE2B 9f9f8643009e63730bc35ef404784d4883dfc396cf901d1cd13099c49bd8ccd5fea30603d2f8a2951dabcc5f4c9755a1cebde4457e4a26aed54bcce26530d4d8 SHA512 bff85d0cd35afc3fc99525ea34db8a6a49c0aa56b91ba4e8a6ad5dab9f5a34880b7f193166c0cdc40d37e51741306e091a080dfb363cc5d5401a315fce0d4d79
+EBUILD webapp-config-1.53-r2.ebuild 1690 BLAKE2B 07202fd26910ab49aeaeb12ccbacde118d19bbb99e748fa454add902b38fcbfe7b4444c668ffe3c0c7727f2915fb7fd687893d67c178d3f988d89f8deafee7b4 SHA512 3d4ba6d9bfae336fab02b3fcd5b5d11b7c28dbdaf2d32594e98ad79c321914af33cc9c761d7fb7b6b4f734e35f8d47734712d2866ca7981e4c4b296135638b46
+EBUILD webapp-config-1.54-r2.ebuild 1743 BLAKE2B 4fd352e2f29ba7289935662e424a9cbdc1e484b2021f027cb60c102aa790621535a8861e0a0f9dae07556ee303d1ffc109735c7e0db1beb2c7f0d0434ec04a55 SHA512 be5330d0ecd6d05d8a5a539baaffd1919079bbbf22eb508789ef306a0e9cdc513268a3ca19fde73ebc7182adff30b34813fe47d1226b8d66758fd6f2da8525d3
+EBUILD webapp-config-1.55-r1.ebuild 1749 BLAKE2B 858936e485482eae2d04f3baecc698aa4af9fa22027109e2cd930e16c0adea7621db2b0df21709b920b10a2207f53e8ff82276c05463bf65bc6075f1871f01ca SHA512 4bb2d185ac159bf870d32333d06cf31d5958c5692a983ae23b6fa6fcad2d358bf30ba4268942a9c5e04a9308b7ecb26b97df1d514a5fd6b10c229f8d4ac2aefb
+EBUILD webapp-config-9999.ebuild 1875 BLAKE2B 34626a203c536160711fdc2a90129c33d1223f1275dd5ab21564454c0ac50addb18a6688677936539f357a0fd56f1ec1f454090b43975c3d6b521d308e29bd31 SHA512 badc7e1f37c48da80e1550a8486fc537a644d06fdbaa5f598c2389c29383f096b109b7274827e1b99d23a4a0490761cbcea24e1d7fe2e170273676dc9cfa5b49
+MISC metadata.xml 661 BLAKE2B f82847c0e1fb4f92339258755eb15899b5f4ce6e0acbc8bfcc1dc428e9c76f335b40f8b878de5de009bf09dd7e4e7f119104b4fdac78179b8e2a5abe5d2f87f4 SHA512 bd5161502c6e93cef50b1206247f26920d011d87ca9b9d83217f30a2c29e67728262804d42b13eeb956b69432adbf27d9f42ca75b48a92b6335c9eac25a9976c
diff --git a/app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch b/app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch
new file mode 100644
index 000000000000..97c64a90df25
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch
@@ -0,0 +1,185 @@
+From 5f61d249507c3502c3c76faf3926522e6e63370d Mon Sep 17 00:00:00 2001
+From: Devan Franchini <twitch153@gentoo.org>
+Date: Fri, 3 Jan 2014 21:03:00 -0500
+Subject: [PATCH] WebappConfig/{ebuild,content}.py: Nulls doctest code.
+
+Due to the variable nature of the returning values of the two functions
+run_vars() and add(), it is unrealistic to depend on doctest to not
+fail. It has been decided that disabling these two doctest codes would
+be the best decision to prevent failures that are not detrimental.
+
+X-Gentoo-Bug: 430010
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/430010
+---
+ WebappConfig/content.py | 36 ++++++++++++++++++------------------
+ WebappConfig/ebuild.py  | 46 +++++++++++++++++++++++-----------------------
+ 2 files changed, 41 insertions(+), 41 deletions(-)
+
+diff --git a/WebappConfig/content.py b/WebappConfig/content.py
+index 8fe5be9..c635f5a 100644
+--- a/WebappConfig/content.py
++++ b/WebappConfig/content.py
+@@ -379,71 +379,71 @@ class Contents:
+                         (and this is important for md5)
+           relative    - 1 for storing a relative filename, 0 otherwise
+ 
+-        >>> OUT.color_off()
+-        >>> import os.path
+-        >>> here = os.path.dirname(os.path.realpath(__file__))
++        OUT.color_off()
++        import os.path
++        here = os.path.dirname(os.path.realpath(__file__))
+ 
+         One for pretending:
+ 
+-        >>> a = Contents(here + '/tests/testfiles/contents/app/',
++        a = Contents(here + '/tests/testfiles/contents/app/',
+         ...              package = 'test', version = '1.0',
+         ...              pretend = True)
+ 
+         And this one is for real:
+ 
+-        >>> b = Contents(here + '/tests/testfiles/contents/app/',
++        b = Contents(here + '/tests/testfiles/contents/app/',
+         ...              package = 'test', version = '1.0')
+ 
+         Pretend to add a file:
+ 
+-        >>> a.add('file', 'config-owned',
++        a.add('file', 'config-owned',
+         ...       destination = here + '/tests/testfiles/contents/app/',
+         ...       path = '/test1', relative = True)
+         *     pretending to add: file 1 config-owned "test1"
+ 
+         Lets not pretend this time:
+ 
+-        >>> b.add('file', 'config-owned',
++        b.add('file', 'config-owned',
+         ...       destination = here + '/tests/testfiles/contents/app/',
+         ...       path = '/test1', relative = True)
+-        >>> b.entry(here + '/tests/testfiles/contents/app/test1') #doctest: +ELLIPSIS
++        b.entry(here + '/tests/testfiles/contents/app/test1') #doctest: +ELLIPSIS
+         'file 1 config-owned "test1" ... d8e8fca2dc0f896fd7cb4cb0031ba249 '
+ 
+         Lets produce an error with a file that does not exist:
+ 
+-        >>> b.add('file', 'config-owned',
++        b.add('file', 'config-owned',
+         ...       destination = here + '/tests/testfiles/contents/app/',
+         ...       path = '/nothere', relative = True) #doctest: +ELLIPSIS
+         * Cannot access file .../tests/testfiles/contents/app/nothere to add it as installation content. This should not happen!
+ 
+         Other file types:
+ 
+-        >>> b.add('hardlink', 'config-owned',
++        b.add('hardlink', 'config-owned',
+         ...       destination = here + '/tests/testfiles/contents/app/',
+         ...       path = '/test2', relative = True)
+-        >>> b.entry(here + '/tests/testfiles/contents/app/test2') #doctest: +ELLIPSIS
++        b.entry(here + '/tests/testfiles/contents/app/test2') #doctest: +ELLIPSIS
+         'file 1 config-owned "test2" ... d8e8fca2dc0f896fd7cb4cb0031ba249 '
+-        >>> b.add('dir', 'default-owned',
++        b.add('dir', 'default-owned',
+         ...       destination = here + '/tests/testfiles/contents/app/',
+         ...       path = '/dir1', relative = True)
+-        >>> b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS
++        b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS
+         'dir 1 default-owned "dir1" ... 0 '
+-        >>> b.add('dir', 'default-owned', destination = here + '/tests/testfiles/contents/app',
++        b.add('dir', 'default-owned', destination = here + '/tests/testfiles/contents/app',
+         ...       path = '/dir1',
+         ...       relative = False)
+-        >>> b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS
++        b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS
+         'dir 0 default-owned ".../tests/testfiles/contents/app/dir1" ... 0 '
+ 
+         Q: Is the full link to the target what we want?
+         A: Yes, since the link will still be ok even if we move the directory.
+ 
+-        >>> b.add('sym', 'virtual',
++        b.add('sym', 'virtual',
+         ...       destination = here + '/tests/testfiles/contents/app/',
+         ...       path = '/test3', relative = True)
+-        >>> b.entry(here + '/tests/testfiles/contents/app/test3') #doctest: +ELLIPSIS
++        b.entry(here + '/tests/testfiles/contents/app/test3') #doctest: +ELLIPSIS
+         'sym 1 virtual "test3" ... 0 .../tests/testfiles/contents/app/test1'
+ 
+-        >>> b.db_print() #doctest: +ELLIPSIS
++        b.db_print() #doctest: +ELLIPSIS
+         file 1 config-owned "test1" ... d8e8fca2dc0f896fd7cb4cb0031ba249 
+         file 1 config-owned "test2" ... d8e8fca2dc0f896fd7cb4cb0031ba249 
+         sym 1 virtual "test3" ... 0 .../tests/testfiles/contents/app/test1
+diff --git a/WebappConfig/ebuild.py b/WebappConfig/ebuild.py
+index 03c0c57..cc23bec 100644
+--- a/WebappConfig/ebuild.py
++++ b/WebappConfig/ebuild.py
+@@ -201,35 +201,35 @@ class Ebuild:
+         The procedure from above is repeated to set up the default
+         environment:
+ 
+-        >>> import WebappConfig.config
+-        >>> config = WebappConfig.config.Config()
+-        >>> config.config.set('USER', 'my_htdocsbase',  'htdocs')
+-        >>> config.config.set('USER', 'pn',   'horde')
+-        >>> config.config.set('USER', 'pvr',  '3.0.5')
+-        >>> import os.path
+-        >>> here = os.path.dirname(os.path.realpath(__file__))
+-        >>> config.config.set('USER', 'my_approot', here +
+-        ...                   '/tests/testfiles/share-webapps')
+-        >>> my_approot = config.config.get('USER', 'my_approot')
+-        >>> my_appdir = my_approot + "/horde/3.0.5"
+-        >>> config.config.set('USER', 'my_appdir', my_appdir)
+-        >>> config.config.set('USER', 'my_hookscriptsdir', my_appdir + '/hooks')
+-        >>> config.config.set('USER', 'my_cgibinbase', 'cgi-bin')
+-        >>> config.config.set('USER', 'my_errorsbase', 'error')
+-        >>> config.config.set('USER', 'my_iconsbase', 'icons')
+-        >>> config.config.set('USER', 'my_serverconfigdir', '/'.join([my_appdir,'conf']))
+-        >>> config.config.set('USER', 'my_hostrootdir', '/'.join([my_appdir,'hostroot']))
+-        >>> config.config.set('USER', 'my_htdocsdir', '/'.join([my_appdir,'htdocs']))
+-        >>> config.config.set('USER', 'my_sqlscriptsdir', '/'.join([my_appdir,'sqlscripts']))
++        "">>> import WebappConfig.config"
++        ">>> config = WebappConfig.config.Config()"
++        ">>> config.config.set('USER', 'my_htdocsbase',  'htdocs')"
++        ">>> config.config.set('USER', 'pn',   'horde')"
++        ">>> config.config.set('USER', 'pvr',  '3.0.5')"
++        ">>> import os.path"
++        ">>> here = os.path.dirname(os.path.realpath(__file__))"
++        ">>> config.config.set('USER', 'my_approot', here +"
++        "...                   '/tests/testfiles/share-webapps')"
++        ">>> my_approot = config.config.get('USER', 'my_approot')"
++        ">>> my_appdir = my_approot + "/horde/3.0.5""
++        ">>> config.config.set('USER', 'my_appdir', my_appdir)"
++        ">>> config.config.set('USER', 'my_hookscriptsdir', my_appdir + '/hooks')"
++        ">>> config.config.set('USER', 'my_cgibinbase', 'cgi-bin')"
++        ">>> config.config.set('USER', 'my_errorsbase', 'error')"
++        ">>> config.config.set('USER', 'my_iconsbase', 'icons')"
++        ">>> config.config.set('USER', 'my_serverconfigdir', '/'.join([my_appdir,'conf']))"
++        ">>> config.config.set('USER', 'my_hostrootdir', '/'.join([my_appdir,'hostroot']))"
++        ">>> config.config.set('USER', 'my_htdocsdir', '/'.join([my_appdir,'htdocs']))"
++        ">>> config.config.set('USER', 'my_sqlscriptsdir', '/'.join([my_appdir,'sqlscripts']))"
+ 
+         Time to create the ebuild handler:
+ 
+-        >>> a = Ebuild(config)
++        ">>> a = Ebuild(config)"
+ 
+         The dummy post-install file should display all the variables
+         that are exported here:
+ 
+-        >>> a.show_postinst() #doctest: +ELLIPSIS
++        ">>> a.show_postinst() #doctest: +ELLIPSIS
+         <BLANKLINE>
+         =================================================================
+         POST-INSTALL INSTRUCTIONS
+@@ -270,7 +270,7 @@ class Ebuild:
+         PVR: 3.0.5
+         <BLANKLINE>
+         =================================================================
+-        <BLANKLINE>        
++        <BLANKLINE>"
+         '''
+ 
+         v_root = self.get_config('vhost_root')
+-- 
+1.8.3.2
+
diff --git a/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch b/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch
new file mode 100644
index 000000000000..06a924a426be
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch
@@ -0,0 +1,25 @@
+From ff7ba0d89c79584f14a8137d886a656a9af6de5c Mon Sep 17 00:00:00 2001
+From: Devan Franchini <twitch153@gentoo.org>
+Date: Sat, 27 Dec 2014 20:43:08 -0500
+Subject: [PATCH] webapp-cleaner: sources function.sh from /lib/gentoo
+
+---
+ sbin/webapp-cleaner | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sbin/webapp-cleaner b/sbin/webapp-cleaner
+index bfec623..52e44ac 100755
+--- a/sbin/webapp-cleaner
++++ b/sbin/webapp-cleaner
+@@ -13,7 +13,7 @@ CMD="emerge -Cav"
+ WEBAPP_DIR="/usr/share/webapps"
+ WEBAPP_CONFIG=
+ 
+-[[ -z ${RC_GOT_FUNCTIONS} ]] && source /etc/init.d/functions.sh
++[[ -z ${RC_GOT_FUNCTIONS} ]] && source /lib/gentoo/functions.sh
+ 
+ function help() {
+ 	echo "Remove obsolete and unused versions of web applications"
+-- 
+2.0.5
+
diff --git a/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch b/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch
new file mode 100644
index 000000000000..9958c142d4a7
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch
@@ -0,0 +1,12 @@
+diff -Naur WebappConfig.old/ebuild.py WebappConfig/ebuild.py
+--- WebappConfig/ebuild.py
++++ WebappConfig/ebuild.py
+@@ -101,7 +101,7 @@
+ 
+         for i in post_instructions:
+             i = i.replace('"', '\\"')
+-            post.append(os.popen('echo -n "' + i + '"\n').read()[:-1])
++            post.append(os.popen('printf "' + i + '"\n').read()[:-1])
+ 
+         post = post + [
+             '',
diff --git a/app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch b/app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch
new file mode 100644
index 000000000000..9a35ad70cafb
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch
@@ -0,0 +1,49 @@
+commit 9e251c7574d074e424ea19024f743c754f321979
+Author: Devan Franchini <twitch153@gentoo.org>
+Date:   Fri Jul 10 21:25:17 2015 -0400
+
+    config.py: Fixes package version checking regression
+    
+    Previously webapp-config would not do any sanity checks when
+    setting the package version. After adding a sanity check in 1.54
+    I made the mistake of not being flexible enough and this caused
+    a regression that prevented web apps with versions such as
+    "20140929d"[1] to be installed. This commit fixes that while still
+    allowing for some sanity checking.
+    
+    [1]: https://github.com/gentoo/webapp-config/issues/2
+
+diff --git a/WebappConfig/config.py b/WebappConfig/config.py
+index 6c915c3..3a176a0 100644
+--- a/WebappConfig/config.py
++++ b/WebappConfig/config.py
+@@ -996,17 +996,20 @@ class Config:
+                     OUT.die('Invalid package name')
+ 
+                 if len(args) > 1:
+-                    argsvr = args[1].split('.')
+-                    if len(argsvr) == 1:
+-                        OUT.die('Invalid package version: %(pvr)s'
++                    pvr = args[1]
++                    has_int = False # A package version should have at least one
++                                    # numerical value, but we want to allow for
++                                    # the flexibility of having any alphanumeric
++                                    # value while checking to make sure it's sane.
++
++                    for char in pvr:
++                        if char.isdigit():
++                            has_int = True
++
++                    if not has_int:
++                        OUT.die('Invalid package version: "%(pvr)s"'
+                                 % {'pvr': args[1]})
+ 
+-                    pvr = ''
+-                    for i in range(0, len(argsvr)):
+-                        if not i == len(argsvr) - 1:
+-                            pvr += argsvr[i] + '.'
+-                        else:
+-                            pvr += argsvr[i]
+                     self.config.set('USER', 'pvr', pvr)
+ 
+                 if (not options['dir'] and
diff --git a/app-admin/webapp-config/metadata.xml b/app-admin/webapp-config/metadata.xml
new file mode 100644
index 000000000000..bf2371089c83
--- /dev/null
+++ b/app-admin/webapp-config/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>twitch153@gentoo.org</email>
+		<name>Devan Franchini</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<use>
+		<flag name="portage">Propagete python_targets dependencies to sys-apps/portage</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">webapp-config</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
new file mode 100644
index 000000000000..e8c416dd5e3a
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+portage"
+
+DEPEND="app-text/xmlto
+	!dev-python/configparser"
+RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+	epatch "${FILESDIR}/${P}-nulls-doctest.patch"
+}
+
+python_compile_all() {
+	emake -C doc/
+}
+
+python_install() {
+	# According to this discussion:
+	# http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
+	# distutils does not provide for specifying two different script install
+	# locations. Since we only install one script here the following should
+	# be ok
+	distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/vhosts
+	doins config/webapp-config
+
+	keepdir /usr/share/webapps
+	keepdir /var/db/webapps
+
+	dodoc AUTHORS
+	doman doc/*.[58]
+	dohtml doc/*.[58].html
+}
+
+python_test() {
+	PYTHONPATH="." "${PYTHON}" WebappConfig/tests/dtest.py \
+		|| die "Testing failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	elog "Now that you have upgraded webapp-config, you **must** update your"
+	elog "config files in /etc/vhosts/webapp-config before you emerge any"
+	elog "packages that use webapp-config."
+}
diff --git a/app-admin/webapp-config/webapp-config-1.53-r2.ebuild b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
new file mode 100644
index 000000000000..e7084845cb46
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+RESTRICT="test"
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+portage"
+
+DEPEND="app-text/xmlto
+	!dev-python/configparser
+	sys-apps/gentoo-functions"
+RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+	epatch "${FILESDIR}/${P}-sources-function.sh-from-lib-gentoo.patch"
+}
+
+python_compile_all() {
+	emake -C doc/
+}
+
+python_install() {
+	# According to this discussion:
+	# http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
+	# distutils does not provide for specifying two different script install
+	# locations. Since we only install one script here the following should
+	# be ok
+	distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/vhosts
+	doins config/webapp-config
+
+	keepdir /usr/share/webapps
+	keepdir /var/db/webapps
+
+	dodoc AUTHORS
+	doman doc/*.[58]
+	dohtml doc/*.[58].html
+}
+
+python_test() {
+	PYTHONPATH="." "${PYTHON}" WebappConfig/tests/dtest.py \
+		|| die "Testing failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	elog "Now that you have upgraded webapp-config, you **must** update your"
+	elog "config files in /etc/vhosts/webapp-config before you emerge any"
+	elog "packages that use webapp-config."
+}
diff --git a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
new file mode 100644
index 000000000000..d364cbb45113
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+portage"
+
+DEPEND="app-text/xmlto
+	sys-apps/gentoo-functions"
+RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+	epatch "${FILESDIR}/${P}-pvr-check.patch"\
+		"${FILESDIR}/${P}-fix-bashism.patch"
+}
+python_compile_all() {
+	emake -C doc/
+}
+
+python_install() {
+	# According to this discussion:
+	# http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
+	# distutils does not provide for specifying two different script install
+	# locations. Since we only install one script here the following should
+	# be ok
+	distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/vhosts
+	doins config/webapp-config
+
+	keepdir /usr/share/webapps
+	keepdir /var/db/webapps
+
+	dodoc AUTHORS
+	doman doc/*.[58]
+	dohtml doc/*.[58].html
+}
+
+python_test() {
+	PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \
+		|| die "Testing failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	elog "webapp-config now requires that all -I/-U/-C commands be followed"
+	elog "by the package name and package version of the webapp"
+	elog "eg.) 'webapp-config -d drupal -I drupal 8.0.0_beta10'"
+	elog "See 'man 8 webapp-config' for more information"
+}
diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
new file mode 100644
index 000000000000..be1d9c659f8b
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1 prefix
+
+SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+portage"
+
+DEPEND="app-text/xmlto
+	sys-apps/gentoo-functions"
+RDEPEND="
+	portage? (
+		|| (
+			sys-apps/portage[${PYTHON_USEDEP}]
+			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+		)
+	)"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	eprefixify WebappConfig/eprefix.py config/webapp-config
+}
+
+python_compile_all() {
+	emake -C doc/
+}
+
+python_install() {
+	# According to this discussion:
+	# http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
+	# distutils does not provide for specifying two different script install
+	# locations. Since we only install one script here the following should
+	# be ok
+	distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/vhosts
+	doins config/webapp-config
+
+	keepdir /usr/share/webapps
+	keepdir /var/db/webapps
+
+	dodoc AUTHORS
+	doman doc/*.[58]
+	dohtml doc/*.[58].html
+}
+
+python_test() {
+	PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \
+		|| die "Testing failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	elog "Now that you have upgraded webapp-config, you **must** update your"
+	elog "config files in /etc/vhosts/webapp-config before you emerge any"
+	elog "packages that use webapp-config."
+}
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
new file mode 100644
index 000000000000..08cda6204783
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1 prefix
+
+if [[ ${PV} = 9999* ]]
+then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+portage"
+
+DEPEND="app-text/xmlto
+	sys-apps/gentoo-functions"
+RDEPEND="
+	portage? (
+		|| (
+			sys-apps/portage[${PYTHON_USEDEP}]
+			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+		)
+	)"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	eprefixify WebappConfig/eprefix.py config/webapp-config
+}
+
+python_compile_all() {
+	emake -C doc/
+}
+
+python_install() {
+	# According to this discussion:
+	# http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
+	# distutils does not provide for specifying two different script install
+	# locations. Since we only install one script here the following should
+	# be ok
+	distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/vhosts
+	doins config/webapp-config
+
+	keepdir /usr/share/webapps
+	keepdir /var/db/webapps
+
+	dodoc AUTHORS
+	doman doc/*.[58]
+	dohtml doc/*.[58].html
+}
+
+python_test() {
+	PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \
+		|| die "Testing failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	elog "Now that you have upgraded webapp-config, you **must** update your"
+	elog "config files in /etc/vhosts/webapp-config before you emerge any"
+	elog "packages that use webapp-config."
+}
diff --git a/app-admin/webmin-1.791 b/app-admin/webmin-1.791
deleted file mode 100644
index 7ff46fa9cea5..000000000000
--- a/app-admin/webmin-1.791
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config install postinst postrm preinst prepare prerm
-DEPEND=virtual/perl-MIME-Base64 virtual/perl-Socket virtual/perl-Sys-Syslog virtual/perl-Time-HiRes virtual/perl-Time-Local dev-perl/Authen-Libwrap dev-perl/IO-Tty dev-perl/MD5 dev-perl/Net-SSLeay dev-perl/Authen-PAM dev-perl/Sys-Hostname-Long >=net-dns/dnssec-tools-1.13 !minimal? ( mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ldap? ( dev-perl/perl-ldap ) dev-perl/XML-Generator dev-perl/XML-Parser ) ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
-DESCRIPTION=A web-based Unix systems administration interface
-EAPI=5
-HOMEPAGE=http://www.webmin.com/
-IUSE=minimal +ssl mysql postgres ldap ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-2
-RDEPEND=virtual/perl-MIME-Base64 virtual/perl-Socket virtual/perl-Sys-Syslog virtual/perl-Time-HiRes virtual/perl-Time-Local dev-perl/Authen-Libwrap dev-perl/IO-Tty dev-perl/MD5 dev-perl/Net-SSLeay dev-perl/Authen-PAM dev-perl/Sys-Hostname-Long >=net-dns/dnssec-tools-1.13 !minimal? ( mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ldap? ( dev-perl/perl-ldap ) dev-perl/XML-Generator dev-perl/XML-Parser )
-REQUIRED_USE=minimal? ( !mysql !postgres !ldap )
-SLOT=0
-SRC_URI=minimal? ( mirror://sourceforge/webadmin/webmin-1.791-minimal.tar.gz ) !minimal? ( mirror://sourceforge/webadmin/webmin-1.791.tar.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=68ad03a4c8d08f463cdfc3d6e2b30d98
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
new file mode 100644
index 000000000000..71318c47e10b
--- /dev/null
+++ b/app-admin/webmin/Manifest
@@ -0,0 +1,7 @@
+AUX gentoo-setup-1.791 13727 BLAKE2B dca9dadd5775006f5bfbeee870723db8806a2236c984e2b4cec70031101f97fc5d4e1e1fd9219f27cdaa31ee860d247f71a01180b392154c16ca6554b1f73483 SHA512 fa6fde84eb9a16fea5d019fd920aed2a2f5dd51e5f32fa407fd1c424a0627eaafab7cd3b572a57e4f97e06ce5b6b5a7373ac377776a474a8512e077130eadc6e
+AUX init.d.webmin 2160 BLAKE2B b26d1e22ceb655d62e467a30501ddacf29c825c84ed926805f39861982ff829d119da03f45ec60fd3c35c17b12a06ca051e15fbd3e54e53cde5d84681d15f839 SHA512 9a8b11f1375be7ced1a402b97bb16b627c3459871722d52b2c471f36f103bcfe51a1598014905ac22072aff38e4baf25f53ad08b99dc3d367ce9851c489c1681
+AUX webmin.service 416 BLAKE2B aef00b0f948286c54736613e37f114e6ffd90453cc6eadc3afffe7fa114df4e6a8b91e4f02da6fdfaa3eb2f57254e5e6785b201d0461f28839742cc13d883816 SHA512 7cf86342db3d34cbe39b62fa768660ba7dd160d9c0d113ef6a3a176187fa0c72531bed38e3203cf627ab05c1ac4d9a8b9e829d1baa9739d63dfa74f09c445f1e
+DIST webmin-1.791-minimal.tar.gz 2635024 BLAKE2B a817063c722586c99f19156733c2efbc87515498ae0238ba393c1f0a7e59726d1a6b4f797469128a75b8ab3b92d8a3fcfc2117a281a42e2a993c44d8ca0b8514 SHA512 e8e7b43865399e918ef017d4d710b21cc7ce2f6566056faa82d756be29f038e07a20055978531f8785639c78339970fbfeabd4a4aa1fa4b331f3a344a78954d2
+DIST webmin-1.791.tar.gz 28800013 BLAKE2B 90bcb65131b559f5a0e45aea6cc2735269ddbc49e91604cc37cac0951423ef57c4e1e8496aff1105925f67bce1d2ea10392fa73ca3ed4d714d12f14c76da1e27 SHA512 4ba19f057ee70bc0a283753a6c190bbae15f0e2af1650ef1656c7b94e07a6750203ef3b7190f7abd544b25988446df6b174bf06191426893bd4224e54451e771
+EBUILD webmin-1.791.ebuild 10395 BLAKE2B 1ba7729a111fe38ba7b7b774c563c7967794b27902b54398e9a3e5113fecca454baf9ebb4f0387c04682055f468d0beebce1647319a668253989db4291324463 SHA512 dc54fd107cefd1a4b08353135d72466b31b51114e2de85c82755452bdd6f50dc89796ceee273be730e65a7a3bb4fc9fc22c6e696c89fd7b893c546664007b09f
+MISC metadata.xml 245 BLAKE2B fb529d74f567dd37b9744ec3bfe3de132890694f483fcec456927b8edbdb0a7257fb39685079fe93cf8e8c52377bf87750dea764c98092dc8d6868b19d5dc7d9 SHA512 eb79433135fa9654e593b79830b2a34d158af83164c3f77c2b46950924ade8d03687ff26bb856e49c1e02bb33753c9771380480768ded4983d330f3e25f7c28a
diff --git a/app-admin/webmin/files/gentoo-setup-1.791 b/app-admin/webmin/files/gentoo-setup-1.791
new file mode 100644
index 000000000000..680dfbb5303b
--- /dev/null
+++ b/app-admin/webmin/files/gentoo-setup-1.791
@@ -0,0 +1,438 @@
+#!/bin/sh
+# gentoo-setup.sh
+#
+# Version 1.2
+#
+# A modified original Webmin setup.sh script to comply with Gentoo specifics
+#
+# Modification done by: PhobosK <phobosk@kbfx.net>
+#
+# This script runs after the webmin archive is installed, and in the pkg_config() phase.
+# It does setup the various config files of Webmin depending on if it is
+# a new install, an upgrade or a reset.
+
+LANG=
+export LANG
+
+if [ -z ${wadir} ]; then
+	echo "You can't run this script outside of the 'emerge --config app-admin/webmin' command."
+	exit 1
+fi
+
+# All things we do is from the Webmin install dir - $wadir
+cd $wadir
+
+
+# Are we hard resetting everything?
+# If yes, we do:
+# 1. Run the specific Webmin $wadir/run-uninstalls.pl
+#	 It runs all uninstall.pl files in every module's folder.
+#	 They delete all the set specific Webmin cron jobs.
+#	 If bumping you should go through these files using the command:
+#	 find . -name uninstall.pl -exec cat {} \; -print
+# 2. Delete the whole /etc/webmin content, keeping only the gentoo .keep_* files
+if [ "$reset" = "hard" ]; then
+	echo "Running Webmin's specific uninstall procedures.. (Please ignore any possible errors)"
+	(WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir LANG= "$wadir/run-uninstalls.pl")
+	echo "..done"
+	echo ""
+
+	echo "Deleting the content of user's config folder: $config_dir .."
+	find $config_dir ! -name '.keep_*' -delete 2>/dev/null
+	echo "..done"
+	echo ""
+fi
+
+
+# Are we soft resetting?
+# If yes we do:
+# - Delete the $config_dir/config file so we get new config values
+if [ "$reset" = "soft" ]; then
+	echo "Deleting the user's $config_dir/config file.."
+	if [ -f "$config_dir/config" ]; then
+		rm -f "$config_dir/config"
+	fi
+	echo "..done"
+	echo ""
+fi
+
+
+# Get all available modules of this version
+allmods=`echo */module.info | sed -e 's/\/module.info//g'`
+
+# Get current Webmin version
+ver=`cat "$wadir/version"`
+
+if [ -r "$config_dir/config" ]; then
+	upgrading=1
+fi
+
+
+# Check if upgrading from an old version
+if [ "$upgrading" = 1 ]; then
+	echo "Updating existant Webmin's config files.."
+
+	# Get current var path
+	if [ -r "$config_dir/var-path" ]; then
+		_var_dir=`cat $config_dir/var-path`
+		if [ -n ${_var_dir} ]; then
+			var_dir=${_var_dir}
+		fi
+	fi
+
+	# Get current perl path
+	if [ -r "$config_dir/perl-path" ]; then
+		_perl=`cat $config_dir/perl-path`
+		if [ -n ${_perl} ]; then
+			perl=${_perl}
+		fi
+	fi
+
+	# Get old os name and version
+	os_type=`grep "^os_type=" $config_dir/config | sed -e 's/os_type=//g'`
+	os_version=`grep "^os_version=" $config_dir/config | sed -e 's/os_version=//g'`
+	real_os_type=`grep "^real_os_type=" $config_dir/config | sed -e 's/real_os_type=//g'`
+	real_os_version=`grep "^real_os_version=" $config_dir/config | sed -e 's/real_os_version=//g'`
+
+	# Get port, ssl, no_ssl2, no_ssl3, ssl_redirect, no_sslcompression, ssl_honorcipherorder, no_tls1, no_tls1_1 and keyfile
+	port=`grep "^port=" $config_dir/miniserv.conf | sed -e 's/port=//g'`
+	ssl=`grep "^ssl=" $config_dir/miniserv.conf | sed -e 's/ssl=//g'`
+	no_ssl2=`grep "^no_ssl2=" $config_dir/miniserv.conf | sed -e 's/no_ssl2=//g'`
+	no_ssl3=`grep "^no_ssl3=" $config_dir/miniserv.conf | sed -e 's/no_ssl3=//g'`
+	ssl_redirect=`grep "^ssl_redirect=" $config_dir/miniserv.conf | sed -e 's/ssl_redirect=//g'`
+	ssl_honorcipherorder=`grep "^ssl_honorcipherorder=" $config_dir/miniserv.conf | sed -e 's/ssl_honorcipherorder=//g'`
+	no_sslcompression=`grep "^no_sslcompression=" $config_dir/miniserv.conf | sed -e 's/no_sslcompression=//g'`
+	no_tls1=`grep "^no_tls1=" $config_dir/miniserv.conf | sed -e 's/no_tls1=//g'`
+	no_tls1_1=`grep "^no_tls1_1=" $config_dir/miniserv.conf | sed -e 's/no_tls1_1=//g'`
+	keyfile=`grep "^keyfile=" $config_dir/miniserv.conf | sed -e 's/keyfile=//g'`
+
+	# Update ACLs
+	$perl "$wadir/newmods.pl" $config_dir $allmods
+
+	# Update miniserv.conf with new root directory, mime types file and server info
+	grep -v "^root=" $config_dir/miniserv.conf | grep -v "^mimetypes=" | grep -v "^server=" >$tempdir/$$.miniserv.conf
+	mv $tempdir/$$.miniserv.conf $config_dir/miniserv.conf
+	echo "root=$wadir" >> $config_dir/miniserv.conf
+	echo "mimetypes=$wadir/mime.types" >> $config_dir/miniserv.conf
+	echo "server=MiniServ/$ver" >> $config_dir/miniserv.conf
+	grep logout= $config_dir/miniserv.conf >/dev/null
+	if [ $? != "0" ]; then
+		echo "logout=$config_dir/logout-flag" >> $config_dir/miniserv.conf
+	fi
+
+	# Remove old cache of module infos
+	rm -f $config_dir/module.infos.cache
+	echo "..done"
+	echo ""
+else
+	# Create webserver's new config files
+	echo "Creating Webmin's new config files.."
+
+	echo $perl > $config_dir/perl-path
+	echo $var_dir > $config_dir/var-path
+
+	# Create a totally new conf file
+	cfile=$config_dir/miniserv.conf
+	echo "port=$port" > $cfile
+	echo "root=$wadir" >> $cfile
+	echo "mimetypes=$wadir/mime.types" >> $cfile
+	echo "addtype_cgi=internal/cgi" >> $cfile
+	echo "realm=Webmin Server" >> $cfile
+	echo "logfile=$var_dir/miniserv.log" >> $cfile
+	echo "errorlog=$var_dir/miniserv.error" >> $cfile
+	echo "pidfile=$pidfile" >> $cfile
+	echo "logtime=168" >> $cfile
+	echo "ppath=$ppath" >> $cfile
+	echo "ssl=$ssl" >> $cfile
+	echo "no_ssl2=$no_ssl2" >> $cfile
+	echo "no_ssl3=$no_ssl3" >> $cfile
+	echo "ssl_redirect=$ssl_redirect" >> $cfile
+	echo "ssl_honorcipherorder=$ssl_honorcipherorder" >> $cfile
+	echo "no_sslcompression=$no_sslcompression" >> $cfile
+	echo "no_tls1=$no_tls1" >> $cfile
+	echo "no_tls1_1=$no_tls1_1" >> $cfile
+	echo "keyfile=$keyfile" >> $cfile
+	echo "env_WEBMIN_CONFIG=$config_dir" >> $cfile
+	echo "env_WEBMIN_VAR=$var_dir" >> $cfile
+	echo "atboot=$atboot" >> $cfile
+	echo "logout=$config_dir/logout-flag" >> $cfile
+	echo "listen=10000" >> $cfile
+	echo "denyfile=\\.pl\$" >> $cfile
+	echo "log=1" >> $cfile
+	echo "blockhost_failures=5" >> $cfile
+	echo "blockhost_time=60" >> $cfile
+	echo "syslog=1" >> $cfile
+	echo "session=1" >> $cfile
+	echo "premodules=WebminCore" >> $cfile
+	echo "server=MiniServ/$ver" >> $cfile
+
+	# Append package-specific info to config file.
+	# miniserv-conf can be created by upstream or by us in src_install phase (see there).
+	if [ -f "$wadir/miniserv-conf" ]; then
+		cat "$wadir/miniserv-conf" >>$cfile
+	fi
+
+	# Create the default user allowed to login - root only
+	login="root"
+
+	if [ -r /etc/shadow ]; then
+		#crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :`
+		crypt=x
+	else
+		crypt=`grep "^root:" /etc/passwd | cut -f 2 -d :`
+	fi
+
+	ufile=$config_dir/miniserv.users
+	echo "$login:$crypt:0" > $ufile
+	chmod 600 $ufile
+
+
+	echo "userfile=$ufile" >> $cfile
+	chmod 600 $cfile
+	echo "..done"
+	echo ""
+
+	echo "Creating access control file.."
+	afile=$config_dir/webmin.acl
+	echo "$login: $allmods" > $afile
+	chmod 600 $afile
+	echo "..done"
+	echo ""
+fi
+
+
+# Create start, stop, restart and reload Gentoo compliant Webmin scripts
+# We use sys-apps/openrc functions which is already pulled by sys-apps/baselayout
+# or systemctl if we run under systemd
+echo "Creating start and stop scripts.."
+rm -f $config_dir/{start,stop,restart,reload}
+
+# The start script in /etc/webmin (Gentoo compliant)
+cat <<END >>"$config_dir/start"
+#!/bin/sh
+
+if [ ! -f "${pidfile}" ]; then
+	if [[ -d /run/systemd/system ]] ; then
+		systemctl start webmin.service
+	else
+		rc-service --ifexists -- webmin start
+	fi
+fi
+END
+
+# The stop script in /etc/webmin (Gentoo compliant)
+cat <<END >>"$config_dir/stop"
+#!/bin/sh
+
+if [[ -d /run/systemd/system ]] ; then
+	systemctl stop webmin.service
+else
+	rc-service --ifexists -- webmin --ifstarted stop
+fi
+END
+
+# The restart script in /etc/webmin (Gentoo compliant)
+cat <<END >>"$config_dir/restart"
+#!/bin/sh
+
+if [[ -d /run/systemd/system ]] ; then
+	systemctl try-restart webmin.service
+else
+	rc-service --ifexists -- webmin --ifstarted restart
+fi
+END
+
+# The reload script in /etc/webmin (Gentoo compliant)
+cat <<END >>"$config_dir/reload"
+#!/bin/sh
+
+if [[ -d /run/systemd/system ]] ; then
+	systemctl reload-or-try-restart webmin.service
+else
+	rc-service --ifexists -- webmin --ifstarted reload
+fi
+END
+
+chmod 755 $config_dir/{start,stop,restart,reload}
+echo "..done"
+echo ""
+
+
+if [ "$upgrading" = 1 ]; then
+	echo "Updating other config files.."
+else
+	echo "Copying other config files.."
+fi
+
+# This just copies and merges the Webmin's release config files, with user's in the /etc/webmin folder
+newmods=`$perl "$wadir/copyconfig.pl" "$os_type/$real_os_type" "$os_version/$real_os_version" "$wadir" $config_dir "" $allmods`
+if [ "$upgrading" != 1 ]; then
+	# Store the OS and version
+	echo "os_type=$os_type" >> $config_dir/config
+	echo "os_version=$os_version" >> $config_dir/config
+	echo "real_os_type=$real_os_type" >> $config_dir/config
+	echo "real_os_version=$real_os_version" >> $config_dir/config
+
+	# Turn on logging by default
+	echo "log=1" >> $config_dir/config
+
+	# Disallow unknown referers by default
+	echo "referers_none=1" >>$config_dir/config
+else
+	# one-off hack to set log variable in config from miniserv.conf
+	grep log= $config_dir/config >/dev/null
+	if [ "$?" = "1" ]; then
+		grep log= $config_dir/miniserv.conf >> $config_dir/config
+		grep logtime= $config_dir/miniserv.conf >> $config_dir/config
+		grep logclear= $config_dir/miniserv.conf >> $config_dir/config
+	fi
+
+	# Disallow unknown referers if not set
+	grep referers_none= $config_dir/config >/dev/null
+	if [ "$?" != "0" ]; then
+		echo "referers_none=1" >>$config_dir/config
+	fi
+fi
+echo $ver > $config_dir/version
+echo "..done"
+echo ""
+
+# Set passwd_ fields in miniserv.conf from global config
+for field in passwd_file passwd_uindex passwd_pindex passwd_cindex passwd_mindex; do
+	grep $field= $config_dir/miniserv.conf >/dev/null
+	if [ "$?" != "0" ]; then
+		grep $field= $config_dir/config >> $config_dir/miniserv.conf
+	fi
+done
+grep passwd_mode= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+	echo passwd_mode=0 >> $config_dir/miniserv.conf
+fi
+
+grep ssl_honorcipherorder= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+	echo ssl_honorcipherorder=1 >> $config_dir/miniserv.conf
+fi
+
+# Disable SSL compression to defeat BEAST attack
+grep no_sslcompression= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+	echo no_sslcompression=1 >> $config_dir/miniserv.conf
+fi
+
+# Tighten SSL security
+grep no_ssl2= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+	echo no_ssl2=1 >> $config_dir/miniserv.conf
+fi
+
+grep no_ssl3= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+	echo no_ssl3=1 >> $config_dir/miniserv.conf
+fi
+
+grep no_tls1= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+    echo no_tls1=1 >> $config_dir/miniserv.conf
+fi
+
+grep no_tls1_1= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+    echo no_tls1_1=1 >> $config_dir/miniserv.conf
+fi
+
+# Make Perl crypt MD5 the default
+grep md5pass= $config_dir/config >/dev/null
+if [ "$?" != "0" ]; then
+	echo md5pass=1 >> $config_dir/config
+fi
+
+# Set a special theme if none was set before
+if [ "$theme" = "" ]; then
+	theme=`cat "$wadir/defaulttheme" 2>/dev/null`
+fi
+oldthemeline=`grep "^theme=" $config_dir/config`
+oldtheme=`echo $oldthemeline | sed -e 's/theme=//g'`
+if [ "$theme" != "" ] && [ "$oldthemeline" = "" ] && [ -d "$wadir/$theme" ]; then
+	themelist=$theme
+fi
+
+# Set a special overlay if none was set before
+if [ "$overlay" = "" ]; then
+	overlay=`cat "$wadir/defaultoverlay" 2>/dev/null`
+fi
+if [ "$overlay" != "" ] && [ "$theme" != "" ] && [ -d "$wadir/$overlay" ]; then
+	themelist="$themelist $overlay"
+fi
+
+# Apply the theme and maybe overlay
+if [ "$themelist" != "" ]; then
+	echo "theme=$themelist" >> $config_dir/config
+	echo "preroot=$themelist" >> $config_dir/miniserv.conf
+fi
+
+# If the old blue-theme is still in use, change it (new in 1.730)
+oldtheme=`grep "^theme=" $config_dir/config | sed -e 's/theme=//g'`
+if [ "$oldtheme" = "blue-theme" ]; then
+   sed -i -e 's/theme=blue-theme/theme=gray-theme/g' $config_dir/config
+   sed -i -e 's/preroot=blue-theme/preroot=gray-theme/g' $config_dir/miniserv.conf
+fi
+
+# Set the product field in the global config
+grep product= $config_dir/config >/dev/null
+if [ "$?" != "0" ]; then
+	echo product=webmin >> $config_dir/config
+fi
+
+# If password delays are not specifically disabled, enable them
+grep passdelay= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+	echo passdelay=1 >> $config_dir/miniserv.conf
+fi
+
+
+echo "Changing ownership and permissions.."
+# Make all config dirs non-world-readable
+for m in $newmods; do
+	chown -R root:root $config_dir/$m
+	chmod -R og-rw $config_dir/$m
+done
+
+# Make miniserv config files non-world-readable
+for f in miniserv.conf miniserv.users; do
+	chown -R root:root $config_dir/$f
+	chmod -R og-rw $config_dir/$f
+done
+chmod +r $config_dir/version
+
+# Fix up bad permissions from some older installs
+for m in ldap-client ldap-server ldap-useradmin mailboxes mysql postgresql servers virtual-server; do
+	if [ -d "$config_dir/$m" ]; then
+		chown root:root $config_dir/$m
+		chmod og-rw $config_dir/$m
+		chmod og-rw $config_dir/$m/config 2>/dev/null
+	fi
+done
+echo "..done"
+echo ""
+
+
+# This executes all postinstall.pl for every module
+# If you do bump, you should look at the specific changes they do with this command in root folder:
+# find . -name postinstall.pl -exec cat {} \; -print
+# Generally they are safe to run 'cause they change only user's config in /etc/webmin
+# or setup some cron jobs
+if [ "$nopostinstall" = "" ]; then
+	echo "Running postinstall scripts.. (Please ignore any possible errors)"
+	(cd "$wadir" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir "$wadir/run-postinstalls.pl")
+	echo "..done"
+	echo ""
+fi
+
+# Enable background collection
+if [ "$upgrading" != 1 -a -r $config_dir/system-status/enable-collection.pl ]; then
+	echo "Enabling background status collection.. (Please ignore any possible errors)"
+	$config_dir/system-status/enable-collection.pl 5
+	echo "..done"
+	echo ""
+fi
diff --git a/app-admin/webmin/files/init.d.webmin b/app-admin/webmin/files/init.d.webmin
new file mode 100644
index 000000000000..0c9dcc08831a
--- /dev/null
+++ b/app-admin/webmin/files/init.d.webmin
@@ -0,0 +1,85 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+
+# We do not give a choice to user for configuring these 'cause it will mess up
+# Webmin's configuration
+WEBMIN_EXE="%exe%"
+WEBMIN_PID="%pid%"
+WEBMIN_CONF="%conf%"
+WEBMIN_CONFIG="%config%"
+
+extra_started_commands="reload"
+
+depend() {
+	use net logger
+}
+
+checkconfig() {
+	# Check if Webmin setup has been done
+	if [ ! -f ${WEBMIN_CONFIG} ]; then
+		eerror "Error in Webmin's configuration. The ${WEBMIN_CONFIG} is not present."
+		eerror "Please run 'emerge --config app-admin/webmin' to fix this."
+		return 1
+	fi
+
+	# Check if ssl cert is present
+	local key ssl
+	key=`grep "^keyfile=" ${WEBMIN_CONF} | sed -e 's/keyfile=//g'`
+	ssl=`grep "^ssl=" ${WEBMIN_CONF} | sed -e 's/ssl=//g'`
+
+	if [ ! -f "${key}" ] ; then
+		if [ "${ssl}" = "0" ]; then
+			ewarn "Your SSL certificate is not present."
+			ewarn "Please either fix the path in the 'keyfile=' option of your ${WEBMIN_CONF}"
+			ewarn "OR run 'emerge --config app-admin/webmin'"
+		else
+			eerror "Error in Webmin's configuration. No SSL certificate is present."
+			eerror "Please either fix the path in the 'keyfile=' option of your ${WEBMIN_CONF}"
+			eerror "OR change the 'ssl=' option of your ${WEBMIN_CONF} to 'ssl=0'"
+			eerror "OR run 'emerge --config app-admin/webmin'"
+			return 1
+		fi
+	fi
+
+	return 0
+}
+
+reload() {
+	if [ ! -f "${WEBMIN_PID}" ]; then
+		eerror "Webmin is not running"
+		return 1
+	fi
+
+	checkconfig || return 1
+
+	ebegin "Reloading Webmin's configuration files"
+	start-stop-daemon --signal USR1 --pidfile "$WEBMIN_PID"
+	eend $?
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting Webmin"
+
+	start-stop-daemon --start --background --interpreted \
+		--env LANG= \
+		--env PERLLIB="%perllib%" \
+		--exec "$WEBMIN_EXE" \
+		--pidfile "$WEBMIN_PID" \
+		-- "$WEBMIN_CONF"
+	eend $?
+	# Leave time to spawn, so no stop is received while spawning
+	sleep 3
+}
+
+stop() {
+	ebegin "Stopping Webmin"
+	start-stop-daemon --stop  --interpreted --quiet \
+		--exec "$WEBMIN_EXE" \
+		--pidfile "$WEBMIN_PID"
+	eend $?
+	# Leave time to stop because of the scripts that use this
+	sleep 3
+}
diff --git a/app-admin/webmin/files/webmin.service b/app-admin/webmin/files/webmin.service
new file mode 100644
index 000000000000..5bec85b97c8c
--- /dev/null
+++ b/app-admin/webmin/files/webmin.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Webmin Administration Tool
+After=network.target remote-fs.target nss-lookup.target
+ConditionFileNotEmpty=%config%
+ConditionFileNotEmpty=%conf%
+
+[Service]
+RemainAfterExit=yes
+KillMode=mixed
+# Webmin is exiting with 1 on SIGTERM
+SuccessExitStatus=1
+ExecStart=%exe% %conf%
+PIDFile=%pid%
+Environment="PERLLIB=%perllib%" LANG= 
+ExecReload=/bin/kill -USR1 $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/webmin/metadata.xml b/app-admin/webmin/metadata.xml
new file mode 100644
index 000000000000..e12b2ca96ebf
--- /dev/null
+++ b/app-admin/webmin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">webadmin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/webmin/webmin-1.791.ebuild b/app-admin/webmin/webmin-1.791.ebuild
new file mode 100644
index 000000000000..c69abb400e6a
--- /dev/null
+++ b/app-admin/webmin/webmin-1.791.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils pam ssl-cert systemd
+
+DESCRIPTION="A web-based Unix systems administration interface"
+HOMEPAGE="http://www.webmin.com/"
+SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
+	!minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
+# because openssl is forced by dev-perl/Net-SSLeay
+IUSE="minimal +ssl mysql postgres ldap"
+REQUIRED_USE="minimal? ( !mysql !postgres !ldap )"
+
+# All the required perl modules can be found easily using (in Webmin's root src dir):
+# find . -name cpan_modules.pl -exec grep "::" {} \;
+# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
+# to install them using the in-built cpan module, and this will mess up perl on the system
+# That's why some modules are forced without a use flag
+# NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons
+DEPEND="virtual/perl-MIME-Base64
+	virtual/perl-Socket
+	virtual/perl-Sys-Syslog
+	virtual/perl-Time-HiRes
+	virtual/perl-Time-Local
+	dev-perl/Authen-Libwrap
+	dev-perl/IO-Tty
+	dev-perl/MD5
+	dev-perl/Net-SSLeay
+	dev-perl/Authen-PAM
+	dev-perl/Sys-Hostname-Long
+	>=net-dns/dnssec-tools-1.13
+	!minimal? (
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+		ldap? ( dev-perl/perl-ldap )
+		dev-perl/XML-Generator
+		dev-perl/XML-Parser
+	)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	local perl="$( which perl )"
+
+	# Remove the unnecessary and incompatible files
+	rm -rf acl/Authen-SolarisRBAC-0.1*
+	if ! use minimal ; then
+		rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
+		rm -f mount/{free,net,open}bsd-mounts*
+		rm -f mount/macos-mounts*
+	fi
+
+	# For security reasons remove the SSL certificate that comes with Webmin
+	# We will create our own later
+	rm -f miniserv.pem
+
+	# Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
+	# We will use our own later
+	rm -f setup.{sh,pl}
+
+	# Set the installation type/mode to Gentoo
+	echo "gentoo" > install-type
+
+	# Fix the permissions of the install files
+	chmod -R og-w "${S}"
+
+	# Since we should not modify any files after install
+	# we set the perl path in all cgi and pl files here using Webmin's routines
+	# The pl file is Prefix safe and works only on provided input, no other filesystem files
+	ebegin "Fixing perl path in source files"
+	(find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
+	eend $?
+}
+
+src_install() {
+	# Create config dir and keep
+	diropts -m0755
+	dodir /etc/webmin
+	keepdir /etc/webmin
+
+	# Create install dir
+	# Third party modules installed through Webmin go here too, so keep
+	dodir /usr/libexec/webmin
+	keepdir /usr/libexec/webmin
+
+	# Copy our own setup script to installation folder
+	insinto /usr/libexec/webmin
+	newins "${FILESDIR}"/gentoo-setup-${PV} gentoo-setup.sh
+	fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
+
+	# This is here if we ever want in future ebuilds to add some specific
+	# config values in the /etc/webmin/miniserv.conf
+	# The format of this file should be the same as the one of miniserv.conf:
+	# var=value
+	#
+	# Uncomment it if you use such file. Before that check if upstream
+	# has this file in root dir too.
+	#newins "${FILESDIR}/miniserv-conf" miniserv-conf
+
+	# Create the log dir and keep
+	diropts -m0700
+	dodir /var/log/webmin
+	keepdir /var/log/webmin
+
+	# Create the init.d file and put the neccessary variables there
+	newinitd "${FILESDIR}"/init.d.webmin webmin
+	sed -i \
+		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
+		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
+		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
+		-e "s:%config%:${EROOT}etc/webmin/config:" \
+		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
+		"${ED}etc/init.d/webmin" \
+		|| die "Failed to patch the webmin init file"
+
+	# Create the systemd service file and put the neccessary variables there
+	systemd_newunit "${FILESDIR}"/webmin.service webmin.service
+	sed -i \
+		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
+		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
+		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
+		-e "s:%config%:${EROOT}etc/webmin/config:" \
+		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
+		"${ED}$(_systemd_get_systemunitdir)/webmin.service" \
+		|| die "Failed to patch the webmin systemd service file"
+
+	# Setup pam
+	pamd_mimic system-auth webmin auth account session
+
+	# Copy files to installation folder
+	ebegin "Copying install files to destination"
+	cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
+	eend $?
+}
+
+pkg_preinst() {
+	# First stop service if running so Webmin to not messup our config
+	ebegin "Stopping any running Webmin instance prior merging"
+	if systemd_is_booted ; then
+		systemctl stop webmin.service 2>/dev/null
+	else
+		rc-service --ifexists -- webmin --ifstarted stop
+	fi
+	eend $?
+}
+
+pkg_postinst() {
+	# Run pkg_config phase first - non interactively
+	export INTERACTIVE="no"
+	pkg_config
+	# Every next time pkg_config should be interactive
+	INTERACTIVE="yes"
+
+	ewarn
+	ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
+	ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
+	ewarn "To avoid problems, please before using any module, look at its configuration options first."
+	ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
+	ewarn
+	if systemd_is_booted ; then
+		elog "- To make Webmin start at boot time, run: 'systemctl enable webmin.service'"
+	else
+		elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
+	fi
+	elog "- The default URL to connect to Webmin is: https://localhost:10000"
+	elog "- The default user that can login is: root"
+	elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
+}
+
+pkg_prerm() {
+	# First stop service if running - we do not want Webmin to mess up config
+	ebegin "Stopping any running Webmin instance prior unmerging"
+	if systemd_is_booted ; then
+		systemctl stop webmin.service 2>/dev/null
+	else
+		rc-service --ifexists -- webmin --ifstarted stop
+	fi
+	eend $?
+}
+
+pkg_postrm() {
+	# If removing webmin completely, remind the user for the Webmin's own cron jobs.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		ewarn
+		ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
+		ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
+		ewarn "To fix this just disable them if you intend to use Webmin again,"
+		ewarn "OR delete them if not."
+		ewarn
+	fi
+}
+
+pkg_config(){
+	# First stop service if running
+	ebegin "Stopping any running Webmin instance"
+	if systemd_is_booted ; then
+		systemctl stop webmin.service 2>/dev/null
+	else
+		rc-service --ifexists -- webmin --ifstarted stop
+	fi
+	eend $?
+
+	# Next set the default reset variable to 'none'
+	# reset/_reset can be:
+	# 'none' - does not reset anything, just upgrades if a conf is present
+	#		   OR installs new conf if a conf is missing
+	# 'soft' - deletes only $config_dir/config file and thus resetting most
+	#		  conf values to their defaults. Keeps the specific Webmin cron jobs
+	# 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
+	#		  and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
+	local _reset="none"
+
+	# If in interactive mode ask user what should we do
+	if [[ "${INTERACTIVE}" = "yes" ]]; then
+		einfo
+		einfo "Please enter the number of the action you would like to perform?"
+		einfo
+		einfo "1. Update configuration"
+		einfo "   (keeps old config options and adds the new ones)"
+		einfo "2. Soft reset configuration"
+		einfo "   (keeps some old config options, the other options are set to default)"
+		ewarn "   All Webmin users will be reset"
+		einfo "3. Hard reset configuration"
+		einfo "   (all options including module options are set to default)"
+		ewarn "   You will lose all Webmin configuration options you have done till now"
+		einfo "4. Exit this configuration utility (default)"
+		while [ "$correct" != "true" ] ; do
+			read answer
+			if [[ "$answer" = "1" ]] ; then
+				_reset="none"
+				correct="true"
+			elif [[ "$answer" = "2" ]] ; then
+				_reset="soft"
+				correct="true"
+			elif  [[ "$answer" = "3" ]] ; then
+				_reset="hard"
+				correct="true"
+			elif  [ "$answer" = "4" -o "$answer" = "" ] ; then
+				die "User aborted configuration."
+			else
+				echo "Answer not recognized. Enter a number from 1 to 4"
+			fi
+		done
+
+		if [[ "$_reset" = "hard" ]]; then
+			while [ "$sure" != "true" ] ; do
+				ewarn "You will lose all Webmin configuration options you have done till now."
+				ewarn "Are you sure you want to do this? (y/n)"
+				read answer
+				if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+					sure="true"
+				elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+					die "User aborted configuration."
+				else
+					echo "Answer not recognized. Enter 'y' or 'n'"
+				fi
+			done
+		fi
+	fi
+
+	export reset=$_reset
+
+	# Create ssl certificate for Webmin if there is not one in the proper place
+	if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
+		SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
+		install_cert "${EROOT}/etc/ssl/webmin/server"
+	fi
+
+	# Ensure all paths passed to the setup script use EROOT
+	export wadir="${EROOT}usr/libexec/webmin"
+	export config_dir="${EROOT}etc/webmin"
+	export var_dir="${EROOT}var/log/webmin"
+	export tempdir="${T}"
+	export pidfile="${EROOT}var/run/webmin.pid"
+	export perl="$( which perl )"
+	export os_type='gentoo-linux'
+	export os_version='*'
+	export real_os_type='Gentoo Linux'
+	export real_os_version='Any version'
+	# Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect', 'no_sslcompression',
+	# 'ssl_honorcipherorder', 'no_tls1' and 'no_tls1_1' for tightening security
+	export ssl=1
+	export no_ssl2=1
+	export no_ssl3=1
+	export ssl_redirect=1
+	export ssl_honorcipherorder=1
+	export no_sslcompression=1
+	export no_tls1=1
+	export no_tls1_1=1
+	export keyfile="${EROOT}etc/ssl/webmin/server.pem"
+	export port=10000
+
+	export atboot=0
+
+	einfo "Executing Webmin's configure script"
+	$wadir/gentoo-setup.sh
+
+	einfo "Configuration of Webmin done"
+}
diff --git a/app-admin/whowatch-1.8.5 b/app-admin/whowatch-1.8.5
deleted file mode 100644
index edd1ce68a674..000000000000
--- a/app-admin/whowatch-1.8.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Displays information about users currently logged on in real time
-EAPI=5
-HOMEPAGE=http://wizard.ae.krakow.pl/~mike/
-KEYWORDS=amd64 ~arm hppa ~mips ppc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=http://wizard.ae.krakow.pl/~mike/download/whowatch-1.8.5.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=17a5667a7ca5b5e9124ae8352d01fb96
diff --git a/app-admin/whowatch-1.8.6 b/app-admin/whowatch-1.8.6
deleted file mode 100644
index e97fa8e80757..000000000000
--- a/app-admin/whowatch-1.8.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Displays information about users currently logged on in real time
-EAPI=6
-HOMEPAGE=http://wizard.ae.krakow.pl/~mike/ https://github.com/mtsuszycki/whowatch/
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=https://github.com/mtsuszycki/whowatch/releases/download/whowatch-1.8.6/whowatch-1.8.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f71bd51ef85c82442267bc92ca63aa11
diff --git a/app-admin/whowatch/Manifest b/app-admin/whowatch/Manifest
new file mode 100644
index 000000000000..d76d302454d0
--- /dev/null
+++ b/app-admin/whowatch/Manifest
@@ -0,0 +1,7 @@
+AUX whowatch-1.8.4-select.patch 348 BLAKE2B 7e7b0624e2607e62ef9d00555943e701300fbfbb632e3c800590c97565c3716b705643c49ef261e627570108c4bd1fa8e945826689ab6ff029ccbc4a9c48f88c SHA512 ab2b9aef685c68b913b14d083e95f2b105b8d36e50a40da98f4d35ab173df21a931571d6052b8bb177678561f528175c4a6970c30f8f7aa9a29da2b528cd1e9f
+AUX whowatch-1.8.4-tinfo.patch 627 BLAKE2B 2b7a5623188bda62a038a07ad6796e66821f8e34d53d82605f0ea462171a2145578dc97fa2b374933fac0d710f68c69f90efab52a341510b0e461b67e53e21aa SHA512 7d256fc59184839a1ce6168689763c0b2a1e32c841438979c00ab8c2c2fc0e87e5e8f6002e1433326b94ebf9b917348b2f19b126562e01ab387bfbed79184c7a
+DIST whowatch-1.8.5.tar.gz 133845 BLAKE2B f0f5b80d7adc488030877936ab8d12687f8b5617e445efa604971ae6e0b2de403b6f77a119f9ab1311811900003af85235ad546c425296facece165034b82cad SHA512 9a534dcc859101e3f6636fcfc191be3c0a66b843225dbace0d851f8cca7bbf1374929f604414556c651167c24a223525304fe2963a92b97ba97a8f57179ec738
+DIST whowatch-1.8.6.tar.gz 141801 BLAKE2B d52ae8304d25c570873c65cc3b91d8fe227bf71f1802cc8055332f4614b9ca9f6c17dea10b07bbd20f834623f9e10456b19c6393996f6c66819e7e921ffb6240 SHA512 49aa45b0a88a41c98fb7b548f0f098004c8bcca9ec078e977fcec8bc109c9beab25989003bfff4b3dc38a9d62d69378f64441753a1cca62729d2013d2ed73cb0
+EBUILD whowatch-1.8.5.ebuild 694 BLAKE2B 493fb8d1b96c927eca5059ca1bafa7073f85ec8a5e334dc4341cbdf35cda3e5572128dd03adc2442c08843902f55d75f6e5d985e3fdacf7b0ce8261cb94833ca SHA512 2c3ceebdbbec7055dd7bcea688a3cea207b4545672f05eb8a2996a181b96dd87cdbb6f53cb3b479f1e9a15954bfd2b5d580926ed3bc3b95072d1cb9ec5185a83
+EBUILD whowatch-1.8.6.ebuild 707 BLAKE2B 668d7a1f8c8aa70f3b450732c0d3213089d2edd006e054a2fca89a9cd2d8e652a1f5951351f3ff4b5a33ff7debc3c4d5102f30766d47d72ba375aa0fa3e796eb SHA512 b50c34ee41b33ce227cbb77869c7a8d39da6c8bfeef94746ddfd16247ccf451740cb2131e9ff066894ddd24c0952c7d636285c6c8baa537643643d2048173543
+MISC metadata.xml 388 BLAKE2B d26eb0308267a387313561d328a2663f0345fce18d558e42b3e1b787bdef2e09a352558285621882b1def719b358b98d3314c6f8371049faf152dd565653df6b SHA512 6f9e4b4105915444690434f721d6fcfdc78fff506927a854c13a67d06d81293361f44f19c55fb78e32daa9b70a07410f844924f94a251cbd0aa71adefd9de5f3
diff --git a/app-admin/whowatch/files/whowatch-1.8.4-select.patch b/app-admin/whowatch/files/whowatch-1.8.4-select.patch
new file mode 100644
index 000000000000..0907c70e6750
--- /dev/null
+++ b/app-admin/whowatch/files/whowatch-1.8.4-select.patch
@@ -0,0 +1,17 @@
+--- a/src/whowatch.c
++++ b/src/whowatch.c
+@@ -436,12 +436,12 @@
+ 		gettimeofday(&after, 0);
+ 		tv.tv_sec -= (after.tv_sec - before.tv_sec);
+ 		if(retval > 0) {
+-			int key = read_key();
++			int key = getkey();
+ 			key_action(key);
+ 		}
+ 		if(tv.tv_sec <= 0) {
+ 			ticks++;
+-			periodic();
++			main_periodic();
+ 			tv.tv_sec = TIMEOUT;
+ 		}
+ #endif
diff --git a/app-admin/whowatch/files/whowatch-1.8.4-tinfo.patch b/app-admin/whowatch/files/whowatch-1.8.4-tinfo.patch
new file mode 100644
index 000000000000..6ad7849ac037
--- /dev/null
+++ b/app-admin/whowatch/files/whowatch-1.8.4-tinfo.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,14 +16,8 @@
+ dnl Replace `main' with a function in -lkvm:
+ AC_CHECK_LIB(kvm, kvm_openfiles)
+ dnl Replace `main' with a function in -lncurses:
+-CURS=0
+-AC_CHECK_LIB(ncurses, scrollok, [CURS=1 ; LIBS="$LIBS -lncurses"])
+-if test "$CURS" !=  "1"; then
+-	AC_CHECK_LIB(curses, scrollok, [CURS=1 ; LIBS="$LIBS -lcurses"])
+-fi
+-if test "$CURS" != "1"; then
+-	AC_MSG_ERROR([Could not find proper curses library])
+-fi
++PKG_CHECK_MODULES(NCURSES, ncurses, [LIBS="$LIBS $NCURSES_LIBS"],
++	AC_MSG_ERROR([Could not find proper curses library]))
+ 
+ dnl Checks for header files.
+ AC_HEADER_DIRENT
diff --git a/app-admin/whowatch/metadata.xml b/app-admin/whowatch/metadata.xml
new file mode 100644
index 000000000000..740b2bc5107f
--- /dev/null
+++ b/app-admin/whowatch/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<longdescription>
+		A interactive who program that displays information about the users currently logged into the machine.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/whowatch/whowatch-1.8.5.ebuild b/app-admin/whowatch/whowatch-1.8.5.ebuild
new file mode 100644
index 000000000000..e63c78391d8a
--- /dev/null
+++ b/app-admin/whowatch/whowatch-1.8.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Displays information about users currently logged on in real time"
+HOMEPAGE="http://wizard.ae.krakow.pl/~mike/"
+SRC_URI="http://wizard.ae.krakow.pl/~mike/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ~mips ppc x86"
+IUSE=""
+
+RDEPEND="
+	sys-libs/ncurses:0=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.4-tinfo.patch
+	epatch "${FILESDIR}"/${PN}-1.8.4-select.patch
+	eautoreconf
+}
+
+src_install() {
+	dobin src/${PN}
+	doman ${PN}.1
+	dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/app-admin/whowatch/whowatch-1.8.6.ebuild b/app-admin/whowatch/whowatch-1.8.6.ebuild
new file mode 100644
index 000000000000..b29bc3afdbcd
--- /dev/null
+++ b/app-admin/whowatch/whowatch-1.8.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Displays information about users currently logged on in real time"
+HOMEPAGE="http://wizard.ae.krakow.pl/~mike/ https://github.com/mtsuszycki/whowatch/"
+SRC_URI="https://github.com/mtsuszycki/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.4-tinfo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	dobin src/${PN}
+	doman ${PN}.1
+	dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/app-admin/xstow-1.0.1 b/app-admin/xstow-1.0.1
deleted file mode 100644
index 6c1f90a2ef8f..000000000000
--- a/app-admin/xstow-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=ncurses? ( sys-libs/ncurses:0= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=replacement for GNU stow with extensions
-EAPI=5
-HOMEPAGE=http://xstow.sourceforge.net/
-IUSE=ncurses
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=ncurses? ( sys-libs/ncurses:0= )
-SLOT=0
-SRC_URI=mirror://sourceforge/xstow/xstow-1.0.1.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=178ef6c8ea8d788aad6de2ae15a3067a
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
new file mode 100644
index 000000000000..54dce9a69741
--- /dev/null
+++ b/app-admin/xstow/Manifest
@@ -0,0 +1,5 @@
+AUX 99xstow 65 BLAKE2B c3d3dae69e0ed5251a996ddfb164795718974e1c2464176e680373fab25ceeb8a22392ac8de0dd489462e28bc48512c151f3f438ddc7f9bd093d5c63b46ba29b SHA512 0ade954fc07ba98be74d79e8ce842fc4e3e12f83d59f76eb78810251cc9e1612d963401be99f38002d94a2a32c9c2a32429f73d7ee69e97c12f6a05db14a3476
+AUX xstow-1.0.1-ncurses.patch 1070 BLAKE2B 58782b144bf997d88e1480f7743afb8d6dc2e814a4a412bb0d0ebf8cc83ae0d1aab5605228e7a6228e0aec6b8fca83104249e80e7f2406aafe2f9ab8408cf6eb SHA512 63fce626ad5b376a5aa2d335fdd4d73ce3a1b7fccc5a6ff5ab92182d6f3ca40417926b9d35f3447ed73f386d3022d6dc81ec39a2f790fea46b681d344fdad389
+DIST xstow-1.0.1.tar.bz2 153530 BLAKE2B ad5d2677725f2254bb87a4cf8f73e8158868a206f41e9a2ee7bb2547ae6e8634ab65f58655a04051425e5818071253672ccf96b8ddccd01026e992d085e0c1c5 SHA512 bb4bb0e9d8fbfe3933c2137cd2258e3246ebfba549aec669a7f324e82af0eea4ab7ca38e68d7102c1417c1566029318749139fa91efd7a904b8f742d426a3d4b
+EBUILD xstow-1.0.1.ebuild 1233 BLAKE2B 4e9f6f5dc62d3865a724f13038865faa05567d0677fecae352d001427b8e67ddcf2aa52e7090d46ef7c1c406373240cc9df1c55872d3199f467fbbe1db336c3d SHA512 8fcfc7e9bf0d041bc868a949f96483188dbe0a9070028466d948e6432f249764571c564789ee0476d9e4eb0882efaffcda1753a313ce9c7659d37c3f2d7811f1
+MISC metadata.xml 643 BLAKE2B e6df59691a659e8790b1deadc96f89e8d6e913f76d44ad3c2613060706264cc8733db8f7dde018da313d177ce997eb3c5bcb7ce9afdf2bc40022300e1371be19 SHA512 4c060ddc762544f9f635d8cd4543694ff685caa0994995d0551d2b6f9d0c2f52566007d8bd3ca5ed6e7f8d83528c2983eccd2e5923591c010e00ddeab6909840
diff --git a/app-admin/xstow/files/99xstow b/app-admin/xstow/files/99xstow
new file mode 100644
index 000000000000..07625f392537
--- /dev/null
+++ b/app-admin/xstow/files/99xstow
@@ -0,0 +1,3 @@
+LDPATH=/var/lib/lib
+PATH=/var/lib/bin
+MANPATH=/var/lib/share/man
diff --git a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch
new file mode 100644
index 000000000000..b7d29f287e7f
--- /dev/null
+++ b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch
@@ -0,0 +1,56 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -91,11 +91,12 @@
+ 			AC_MSG_RESULT(disabled)
+ 			support_curses=0
+ 		else
++			AC_MSG_RESULT(enabled)
+ 			support_curses=1
+ 		fi
+ 	],
+-	[
+-		AC_MSG_RESULT(enabled)
++	[])
++if test $support_curses -eq 1; then
+ 		AC_CHECK_HEADER([curses.h],
+ 				[
+ 				  # test which libraray to use
+@@ -146,7 +147,7 @@
+ 				  fi
+ 
+ 				  if test $support_curses -eq 1; then
+-				  	AC_SUBST(LDFLAGS_DYNAMIC, "$LDFLAGS -l$curseslib $tinfolib")
++				  	AC_SUBST(LDFLAGS_DYNAMIC, "-l$curseslib $tinfolib")
+ 				        AC_DEFINE(HAVE_CURSES_H, 1, [curses library can be used])
+ 				  fi
+ 
+@@ -154,8 +155,7 @@
+ 				[
+ 				  support_curses=0
+ 				])
+-	])
+-
++fi
+ 
+ NO_STL_SSTREAM=0
+ NO_STL_STRSTREAM=0
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -46,7 +46,7 @@
+ 	backtrace.h \
+ 	backtrace.cpp
+ 
+-xstow_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC)
++xstow_LDADD= $(LDFLAGS_DYNAMIC)
+ 
+ if ENABLE_MERGE
+ 
+@@ -63,7 +63,7 @@
+ 			backtrace.h \
+ 			backtrace.cpp
+ 
+-merge_info_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC)
++merge_info_LDADD= $(LDFLAGS_DYNAMIC)
+ 
+ endif
+ 
diff --git a/app-admin/xstow/metadata.xml b/app-admin/xstow/metadata.xml
new file mode 100644
index 000000000000..b3d90cf176bd
--- /dev/null
+++ b/app-admin/xstow/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ewfalor@gmail.com</email>
+		<name>Erik Falor</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>A program that manages the installation of software packages.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xstow</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/xstow/xstow-1.0.1.ebuild b/app-admin/xstow/xstow-1.0.1.ebuild
new file mode 100644
index 000000000000..de7357598a6c
--- /dev/null
+++ b/app-admin/xstow/xstow-1.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="replacement for GNU stow with extensions"
+HOMEPAGE="http://xstow.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="ncurses"
+
+DEPEND="ncurses? ( sys-libs/ncurses:0= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ncurses.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with ncurses curses)
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" install
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	# create new STOWDIR
+	dodir /var/lib/xstow
+
+	# install env.d file to add STOWDIR to PATH and LDPATH
+	doenvd "${FILESDIR}/99xstow" || die "doenvd failed"
+}
+
+pkg_postinst() {
+	elog "We now recommend that you use /var/lib/xstow as your STOWDIR"
+	elog "instead of /usr/local in order to avoid conflicts with the"
+	elog "symlink from /usr/lib64 -> /usr/lib.  See Bug 246264"
+	elog "(regarding app-admin/stow, equally applicable to XStow) for"
+	elog "more details on this change."
+	elog "For your convenience, PATH has been updated to include"
+	elog "/var/lib/bin."
+}
diff --git a/app-admin/xtail-2.1-r1 b/app-admin/xtail-2.1-r1
deleted file mode 100644
index 6215e38c8a4c..000000000000
--- a/app-admin/xtail-2.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-arch/unzip
-DESCRIPTION=Tail multiple logfiles at once, even if rotated
-EAPI=6
-HOMEPAGE=http://www.unicom.com/sw/xtail/
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.unicom.com/sw/xtail/xtail-2.1.tar.gz http://www.unicom.com/files/20120219-patch-aalto.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=33a6a021442776d9deb17d86fd529faf
diff --git a/app-admin/xtail/Manifest b/app-admin/xtail/Manifest
new file mode 100644
index 000000000000..179aaf7455e1
--- /dev/null
+++ b/app-admin/xtail/Manifest
@@ -0,0 +1,4 @@
+DIST 20120219-patch-aalto.zip 4991 BLAKE2B 6b3e228508bb12c1e18f3d2982c1bf23c996e1be231b4b08b640a310f9c5e9642b9f6ea25d45c717902cdf1024509fca6d804f8e64d3bb764eac8bc3e9bd0846 SHA512 ae20448944e25aa04879bdab8d61bd910b1aa6f85c3d8287e712c6d37b1154af480edc6569467e31b3b404d7f90f771ec3e4c20c58132d9125303b40a6f102f2
+DIST xtail-2.1.tar.gz 26769 BLAKE2B 9a5c47810b2a8cd7aa4d8cc543ec9edce7a24ee446627f658063547276a43dfb72503f10c4d2d6a35f25415a32a2aa177dc5fde79e8ed834cf8ade5aaf9fb447 SHA512 a8519969ef960af97c4dcb75c679daa5687f553c909817ede1134dfa5d70ed71c5264f0e61c8c579cc253ccb7739a68c5213811169489a98e676ef8941d9446f
+EBUILD xtail-2.1-r1.ebuild 755 BLAKE2B 31ca3dd7ee5ebeb9fbcb28be16bf5d127b4ebe813b6988a1a0c4b5e752cadd2a3f8710640db0627d7d5cc33c82ace85191b1de32d8865fef0c737a92fe020e19 SHA512 190a8e7362c30ba5d1d53048859c64194db7e40d8a4fc1bab9e061ba8747524d9b1e9f0b07b80a63d0f6b0504e8666c89a28b53c07be884a0c67f76d88722c10
+MISC metadata.xml 360 BLAKE2B 66088dbb2e54eefb45d81e9995e925b65e606285f4d7e03ddd3a7db550a57de31b2d07b93b048b79be840c80d920c7ca0a9ff44a5a1d554d45d55118a5838c95 SHA512 669688029486d152f48a596dfa985eab29c4652479e9ccbfc2cbe32c81e1d4c34395aadd483ad3af397e5f67e74f3219f946cd283c6133df134a42eb41c4427a
diff --git a/app-admin/xtail/metadata.xml b/app-admin/xtail/metadata.xml
new file mode 100644
index 000000000000..517fc676864e
--- /dev/null
+++ b/app-admin/xtail/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo.power@gmail.com</email>
+		<name>Iván</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/xtail/xtail-2.1-r1.ebuild b/app-admin/xtail/xtail-2.1-r1.ebuild
new file mode 100644
index 000000000000..9f010062d31f
--- /dev/null
+++ b/app-admin/xtail/xtail-2.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tail multiple logfiles at once, even if rotated"
+HOMEPAGE="http://www.unicom.com/sw/xtail/"
+SRC_URI="
+	http://www.unicom.com/sw/xtail/${P}.tar.gz
+	http://www.unicom.com/files/20120219-patch-aalto.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${WORKDIR}"/0001-Use-ISO8601-Fix-Gcc-header-Use-C-c.patch
+	"${WORKDIR}"/0001-xtail.1-remove-SIGQUIT.patch
+	"${WORKDIR}"/xtail_2.1-5-debian-local-changes.patch
+)
+
+src_configure() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	dobin xtail
+	doman xtail.1
+	dodoc README
+	newdoc ../README README.patches
+}
diff --git a/app-admin/yaala-0.7.3-r1 b/app-admin/yaala-0.7.3-r1
deleted file mode 100644
index 812daf268a97..000000000000
--- a/app-admin/yaala-0.7.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=Yet Another Log Analyzer
-EAPI=5
-HOMEPAGE=http://www.yaala.org/
-IUSE=gd storable
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl gd? ( dev-perl/GDGraph ) storable? ( virtual/perl-Storable )
-SLOT=0
-SRC_URI=http://www.yaala.org/files/yaala-0.7.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=90fafa387b2b6e9f6b8f9b068bc5e514
diff --git a/app-admin/yaala-0.7.3-r2 b/app-admin/yaala-0.7.3-r2
deleted file mode 100644
index 7a4b9048cf7c..000000000000
--- a/app-admin/yaala-0.7.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Yet Another Log Analyzer
-EAPI=5
-HOMEPAGE=http://www.yaala.org/
-IUSE=gd
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-Storable gd? ( dev-perl/GDGraph ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://www.yaala.org/files/yaala-0.7.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bc46663f33f8b349e07ffcd4ace23002
diff --git a/app-admin/yaala/Manifest b/app-admin/yaala/Manifest
new file mode 100644
index 000000000000..cbd8ef690629
--- /dev/null
+++ b/app-admin/yaala/Manifest
@@ -0,0 +1,5 @@
+AUX yaala-0.7.3-r1-correct-paths.patch 1095 BLAKE2B 5c7a232836bd19ffa678db3c2d522f9d831535e3dc086e014fc45fe233ae9e20aa1a69359ccc2e913b1b2cd66ba29e053957ed32aabdb38948a57e55b485796e SHA512 c44bad33bf23ed089a4ddc2497cc5507c3c1927053c09ed64e39dad95400b0f0d1170da499c504240919262391f6424c5a830298e7c5a49542dd3424fabed8a7
+DIST yaala-0.7.3.tar.bz2 41528 BLAKE2B 527f691730cd50f60137bce014958423bea4bf007891ac0a6fa0888099da7678661612369d29b41683de81a25bc92163f0d9f413e5a11e9f86c273e0e866ca8e SHA512 30ad37c2c612f47472a840ea40aa924ffa59828455e7268dc29eb3d0276aab835b54396a29eabce88ef0e357523086b182ca1ec366b50851ecb8d2530f4eac01
+EBUILD yaala-0.7.3-r1.ebuild 1681 BLAKE2B 50fa29f2619f3b16d47d162ad2cd4ff89d035af12f5a58fe326855cff408ff4d2ac79dc1d400ef3dfccffe80ef71c588181655debc9f45cc49c87a13d290475c SHA512 babadaca079b88ab4a0f8c97b7dbacd36f716c3978fb81fdd8da3f0c441ed5bd05e03602d71f9dc4da2e4b7a4bdc2a3d397acd089d869627a9e6f44138841118
+EBUILD yaala-0.7.3-r2.ebuild 1629 BLAKE2B 2037c5addce578ebdbfb7cd1a2c74a1a01d751f0f6c2004a0bdffb9ccc28b901515e2feaf9caf91aa98fcdacd7cbe30883e8cb6ad256fb0bb95fa518b16d55b6 SHA512 776f8319d1ff37d5f64a9b64e8a181716260c8cd8cc69391eac41ac676c59b2e53da093de45d5fcb9f0af2693565c3905d7aefbf687df81497894a7242ec300a
+MISC metadata.xml 337 BLAKE2B b1435fe71f760cc4fd4b6bceee0d4675b7f7e7b89986544003cfb7bbf59851b02025a8b0839d446efbde8c8240bcbba782d8f88c9e0db59b227de91dc885043a SHA512 a24db5faa68733175428ecdfc9c333e5209cfdbaee9e40a23af29d188068d5400d14d60c7239d890d7e66f640c4a2023cabf9b6d131d2abe58f0e90b221119c6
diff --git a/app-admin/yaala/files/yaala-0.7.3-r1-correct-paths.patch b/app-admin/yaala/files/yaala-0.7.3-r1-correct-paths.patch
new file mode 100644
index 000000000000..e938abf4b802
--- /dev/null
+++ b/app-admin/yaala/files/yaala-0.7.3-r1-correct-paths.patch
@@ -0,0 +1,31 @@
+--- a/yaala	2013-04-03 15:50:03.909024254 +0200
++++ b/yaala	2013-04-03 15:49:46.545691028 +0200
+@@ -58,6 +58,6 @@
+ 
+ parse_argv (@ARGV);
+-read_config (get_config ('config') ? get_config ('config') : 'config');
++read_config (get_config ('config') ? get_config ('config') : '/etc/yaala/config');
+ 
+ unless (get_config ('input'))
+ {
+--- a/lib/Yaala/Parser/WebserverTools.pm	2013-04-03 16:04:02.665685730 +0200
++++ b/lib/Yaala/Parser/WebserverTools.pm	2013-04-03 16:04:36.729018853 +0200
+@@ -11,7 +11,7 @@
+ 	detect_browser detect_os extract_data);
+ @Yaala::Parser::WebserverTools::ISA = ('Exporter');
+ 
+-read_config ('webserver.config');
++read_config ('/etc/yaala/webserver.config');
+ 
+ our $referer_format = get_config ('referer_format');
+ our $localhost_name = '';
+--- a/lib/Yaala/Data/Persistent.pm	2013-04-03 16:08:06.935684219 +0200
++++ b/lib/Yaala/Data/Persistent.pm	2013-04-03 16:07:54.229017631 +0200
+@@ -18,5 +18,5 @@
+ our $HAVE_STORABLE = 0;
+ our $WANT_PERSISTENCY = 1;
+ our $DATA_STRUCTURE = {};
+-our $FILENAME = 'persistency.data';
++our $FILENAME = '/var/lib/yaala/persistency.data';
+ 
+
diff --git a/app-admin/yaala/metadata.xml b/app-admin/yaala/metadata.xml
new file mode 100644
index 000000000000..893290974a28
--- /dev/null
+++ b/app-admin/yaala/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription>
+    Yet Another Log Analyzer
+  </longdescription>
+  <use>
+    <flag name="storable">Support for persistence of Perl data structures.</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-admin/yaala/yaala-0.7.3-r1.ebuild b/app-admin/yaala/yaala-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..e974cd81bf30
--- /dev/null
+++ b/app-admin/yaala/yaala-0.7.3-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Yet Another Log Analyzer"
+HOMEPAGE="http://www.yaala.org/"
+SRC_URI="http://www.${PN}.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="gd storable"
+
+RDEPEND="dev-lang/perl
+	gd? ( dev-perl/GDGraph )
+	storable? ( virtual/perl-Storable )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PF}-correct-paths.patch
+
+	sed -i "s:/var/lib/${PN}:/usr/bin:g" packaging/${PN}.cron || die 'Failed to correct path in cron file.'
+}
+
+src_install() {
+	dobin ${PN}
+
+	# Switch to ^y when we switch to EAPI=6.
+	local mod="Y${PN:1}"
+
+	exeinto /usr/lib64/perl5/vendor_perl/${mod}/
+	doexe lib/${mod}/*.pm
+
+	exeinto /usr/lib64/perl5/vendor_perl/${mod}/Data/
+	doexe lib/${mod}/Data/*.pm
+
+	exeinto /usr/lib64/perl5/vendor_perl/${mod}/Parser/
+	doexe lib/${mod}/Parser/*.pm
+
+	exeinto /usr/lib64/perl5/vendor_perl/${mod}/Report/
+	doexe lib/${mod}/Report/*.pm
+
+	dodoc AUTHORS CHANGELOG README{,.persistency,.selections}
+
+	insinto /usr/share/${PN}
+	doins -r reports
+	doins -r sample_configs
+
+	insinto /etc/${PN}
+	doins {,webserver.}config
+
+	insinto /etc/logrotate.d
+	doins packaging/${PN}.cron
+
+	if use storable ; then
+		dodir /var/lib/${PN}
+		keepdir /var/lib/${PN}
+		chmod 777 /var/lib/${PN}
+	fi
+}
+
+pkg_postinst() {
+	ewarn "It is required that you change the configuration files in /etc/${PN}"
+	ewarn "before you run \`yaala ...\`, otherwise it will refuse to execute because"
+	ewarn "Setup.pm checks whether the variable 'select' has been unquoted and set."
+	echo ""
+	elog "Example configuration files can be found in /usr/share/${PN}."
+}
diff --git a/app-admin/yaala/yaala-0.7.3-r2.ebuild b/app-admin/yaala/yaala-0.7.3-r2.ebuild
new file mode 100644
index 000000000000..9265cdda0f52
--- /dev/null
+++ b/app-admin/yaala/yaala-0.7.3-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+inherit eutils perl-module
+
+DESCRIPTION="Yet Another Log Analyzer"
+HOMEPAGE="http://www.yaala.org/"
+SRC_URI="http://www.${PN}.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gd"
+
+RDEPEND="
+	dev-lang/perl
+	virtual/perl-Storable
+	gd? ( dev-perl/GDGraph )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.7.3-r1-correct-paths.patch
+
+	sed -i "s:/var/lib/${PN}:/usr/bin:g" packaging/${PN}.cron || die 'Failed to correct path in cron file.'
+}
+
+src_install() {
+	dobin ${PN}
+
+	# Switch to ^y when we switch to EAPI=6.
+	local mod="Y${PN:1}"
+
+	perl_set_version
+
+	insinto "${VENDOR_LIB}/${mod}/"
+	doins lib/${mod}/*.pm
+
+	insinto "${VENDOR_LIB}/${mod}/Data/"
+	doins lib/${mod}/Data/*.pm
+
+	insinto "${VENDOR_LIB}/${mod}/Parser/"
+	doins lib/${mod}/Parser/*.pm
+
+	insinto "${VENDOR_LIB}/${mod}/Report/"
+	doins lib/${mod}/Report/*.pm
+
+	dodoc AUTHORS CHANGELOG README{,.persistency,.selections}
+
+	insinto /usr/share/${PN}
+	doins -r reports
+	doins -r sample_configs
+
+	insinto /etc/${PN}
+	doins {,webserver.}config
+
+	insinto /etc/logrotate.d
+	doins packaging/${PN}.cron
+
+	keepdir /var/lib/${PN}
+	fperms 777 /var/lib/${PN}
+}
+
+pkg_postinst() {
+	ewarn "It is required that you change the configuration files in /etc/${PN}"
+	ewarn "before you run \`yaala ...\`, otherwise it will refuse to execute because"
+	ewarn "Setup.pm checks whether the variable 'select' has been unquoted and set."
+	echo ""
+	elog "Example configuration files can be found in /usr/share/${PN}."
+}
diff --git a/app-admin/yadm-1.07 b/app-admin/yadm-1.07
deleted file mode 100644
index 727c6d064ee4..000000000000
--- a/app-admin/yadm-1.07
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=test? ( dev-tcltk/expect dev-util/bats dev-vcs/git )
-DESCRIPTION=A dotfile manager for the config files in your home folder
-EAPI=6
-HOMEPAGE=https://github.com/TheLocehiliosan/yadm/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/TheLocehiliosan/yadm/archive/1.07.tar.gz -> yadm-1.07.tar.gz
-_md5_=0b228bd25726e3f821800fd450a0f20e
diff --git a/app-admin/yadm-1.12.0 b/app-admin/yadm-1.12.0
deleted file mode 100644
index 78ca8965d988..000000000000
--- a/app-admin/yadm-1.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=test? ( dev-tcltk/expect dev-util/bats dev-vcs/git )
-DESCRIPTION=A dotfile manager for the config files in your home folder
-EAPI=6
-HOMEPAGE=https://github.com/TheLocehiliosan/yadm/
-IUSE=zsh-completion test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-vcs/git app-crypt/gnupg zsh-completion? ( app-shells/gentoo-zsh-completions )
-SLOT=0
-SRC_URI=https://github.com/TheLocehiliosan/yadm/archive/1.12.0.tar.gz -> yadm-1.12.0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=67499028640edf8ef15212e3a79f58a0
diff --git a/app-admin/yadm/Manifest b/app-admin/yadm/Manifest
new file mode 100644
index 000000000000..13d27bfcde22
--- /dev/null
+++ b/app-admin/yadm/Manifest
@@ -0,0 +1,5 @@
+DIST yadm-1.07.tar.gz 34240 BLAKE2B 11952a693c38aac2f2e7fa3efd469dc640941ef9c75a8a1e70974b4eea37c506df7480b2fce84ca8482c932295923ece4ff52cfc13bf9b52030dab0500f07c86 SHA512 9bbe33c82a137375cb27916ae5b5a06f06c25a75ae05688be473103c29154309d3472accc0aa0670a80a4714bc6523ab85c41fd6aa8d1909586437c5778b9144
+DIST yadm-1.12.0.tar.gz 47340 BLAKE2B ef710f56c96244c082bfcc887cae4aee00aaaadec5e7466500dde263c5e4f43df046e11742fd275e989bd9704b39a123f17248cd70d64f6ca552b28db6c44814 SHA512 402a67770154ce3ae7ab947ff4d4e26ca5040d343110fb749195ca5c3f4ee435aba1d8cdf02d4ecf4a81d3f331c1b891bed4fb3fcfcc893867e0fce45b9c8cd8
+EBUILD yadm-1.07.ebuild 895 BLAKE2B 30f232a9b56113aeb38d9b500fc4964e21d705095a3e74214159854a4b2613635a29cbc0ffed322a627805de7b6d25b41b4749e4a5fb38a652a919b9410a5b56 SHA512 7313f9adeb78b32db14351ddead4d8c13cc81c49ec3cc7ea9d78ed4318bee9704d99890a9fc403679069e830583acbe8e37d32bcf91cf4fc25839f9715a239fa
+EBUILD yadm-1.12.0.ebuild 1234 BLAKE2B 73b60da066947ed5ff45950e5809695be1b234e01005103eee4076efcab65fc3acb193716590974caca0a5c209dc13fff77ef85f778c5aa2f8c65d1c67e9ffbe SHA512 9321ffa59728389909b187a1da4cf230467ab180f9ecc24e3137dfc1909329ab68e40066c622ad1c411ff5ed3dfdce9c6b2c1f69ec77f248d7e2361e38f99218
+MISC metadata.xml 825 BLAKE2B 6fbf4554179cf6141396b8e21be3dada54c0eec7c5c5bd1e18860b73f1d170044006b92010f7dd5d3c2238f8545024ee43dc2c86305e8bc91871acdd497c8749 SHA512 0c8facf902245118eab0d6c4b48eb5a2fb63aa6cb7fe4581cc0353bd164912b7620eb2f42984b45410065d3a6e1af1cffa5028f5c26a4ecd38a9983da6b34feb
diff --git a/app-admin/yadm/metadata.xml b/app-admin/yadm/metadata.xml
new file mode 100644
index 000000000000..1151270bb4ea
--- /dev/null
+++ b/app-admin/yadm/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">TheLocehiliosan/yadm</remote-id>
+	</upstream>
+	<longdescription lang="en">
+	yadm is a dotfile manager that handles the hassle of synchronizing the
+	dotfiles in your home folder across different workstations. It has a
+	philosophy using git and getting out of git's way to ensure it does what it
+	does best. What sets it apart is that it supports encryption, which enables
+	you to add files like mutt configuration with passwords and host it
+	publicly. It also enables you to add suffixes to your files like
+	##Linux.hostname, and yadm will automatically symlink the file if you are
+	on that hostname.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/yadm/yadm-1.07.ebuild b/app-admin/yadm/yadm-1.07.ebuild
new file mode 100644
index 000000000000..7c5907088202
--- /dev/null
+++ b/app-admin/yadm/yadm-1.07.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A dotfile manager for the config files in your home folder"
+HOMEPAGE="https://github.com/TheLocehiliosan/yadm/"
+SRC_URI="https://github.com/TheLocehiliosan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DOCS=( CHANGES CONTRIBUTORS README.md )
+
+DEPEND="
+	test? (
+		dev-tcltk/expect
+		dev-util/bats
+		dev-vcs/git
+	)"
+RDEPEND="
+	app-crypt/gnupg
+	dev-vcs/git"
+
+src_compile() {
+	emake yadm.md
+}
+
+src_test() {
+	# 109_accept_encryption tests are interactive, thus fail. Skip them
+	while IFS="" read -d $'\0' -r f ; do
+		bats "${f}" || die "Test ${f} failed"
+	done < <(find test -name '*.bats' -and -not -name '109_accept_encryption.bats' -print0)
+}
+
+src_install() {
+	einstalldocs
+
+	dobin "${PN}"
+	doman "${PN}.1"
+}
diff --git a/app-admin/yadm/yadm-1.12.0.ebuild b/app-admin/yadm/yadm-1.12.0.ebuild
new file mode 100644
index 000000000000..e6b2381a71ff
--- /dev/null
+++ b/app-admin/yadm/yadm-1.12.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="A dotfile manager for the config files in your home folder"
+HOMEPAGE="https://github.com/TheLocehiliosan/yadm/"
+SRC_URI="https://github.com/TheLocehiliosan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="zsh-completion test"
+
+DEPEND="
+	test? (
+		dev-tcltk/expect
+		dev-util/bats
+		dev-vcs/git
+	)"
+
+RDEPEND="
+	dev-vcs/git
+	app-crypt/gnupg
+	zsh-completion? ( app-shells/gentoo-zsh-completions )"
+
+src_compile() {
+	emake "${PN}.md"
+}
+
+src_test() {
+	# 109_accept_encryption tests are interactive, thus fail. Skip them
+	# 113_accept_jinja_alt.bats are depepending on the optional envtpl
+	while IFS="" read -d $'\0' -r f ; do
+		bats "${f}" || die "test ${f} failed"
+	done < <(find test -name '*.bats' -and -not -name '109_accept_encryption.bats' -and -not -name '113_accept_jinja_alt.bats' -print0)
+}
+
+src_install() {
+	einstalldocs
+
+	dobin "${PN}"
+	doman "${PN}.1"
+
+	dobashcomp completion/yadm.bash_completion
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		newins completion/yadm.zsh_completion _${PN}
+	fi
+}