reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /app-portage
326 files changed, 11471 insertions, 0 deletions
diff --git a/app-portage/cfg-update/Manifest b/app-portage/cfg-update/Manifest
new file mode 100644
index 000000000000..947257e349e8
--- /dev/null
+++ b/app-portage/cfg-update/Manifest
@@ -0,0 +1,5 @@
+DIST cfg-update-1.8.9.tgz 162356 SHA256 82d14b3cd7b1c144d7d77836919689471cd31c69cefba9b8714580e6cf1e495e SHA512 2c2d4d5cddaf1c5c8233bfde29b488d682e723da3e267756e203b4ea3c97f2f88615530002975ff07fb466eebed603e4ce227591a1b1e09ef3aca8c2eb17fcb9 WHIRLPOOL d17b179bc4589cc650178e981c0d5a6e336023f3128a9b76c1a4a19e0fe347982ff75d2337ed972e040fec1b93097b4336818b748f2af20eccb2e82f332417af
+EBUILD cfg-update-1.8.9.ebuild 2975 SHA256 dc1071e12b479f82b666466f9197a5425632b00d9cb2bb4a31eb84c93dd1a6cf SHA512 163b354dcdc84e8747a1b93b44adb650ae183cbe19a160972e3ce45069d3757c0b3c0699a9f344fecaedf65c76d05fbb6e5f041dc679f8f8f9b018829f43fbd0 WHIRLPOOL 4aa0d3c57d2f2e5d081436038addafa5552c9840f3481572b1730ecbe2c35e33143801288c1b16d0800a6f1612ad21eec86a8e6590222b75532afb4abc9ad040
+MISC ChangeLog 2558 SHA256 3458130d6df999a11519df02596e738cd986ac707c8e2a76d8fea8a4dc497e1d SHA512 969a676661d5747ed8593ccb9ac43dfd7a8b746cc39f1c3be743acd58f7fdbff08ff627c4d45d0d7eca762da96347b6c174fa706b12fbd4a042f75f1bc78f10f WHIRLPOOL e0a932649db9456c670d0411905b85598d861b37c66f7969ab6becad2d49796a0d425ad958ddfe9e955d3d3aeb9d09ab636f9139bd65e731c3c1ba4f7b1500d4
+MISC ChangeLog-2015 6406 SHA256 d4568900cd9c096c6b9463c0e5206c461d9c2c204d49e0d025cf1e0309d3d86c SHA512 cebb82206c159d33eb7c1a1061337d5921c01dce61996ecb3f01dc2390b4c53f6b8203055c9770f501978a8091817b8a0b5d160b11c9c3c4314077c8bbeef38c WHIRLPOOL 82c24398587288bdcbed2871a3b684798686864a512c716cf995861e22195afeb20aba79c43ff8873ffb2df80d9750c8237a4d6e941b5e063cd2417efc44b039
+MISC metadata.xml 305 SHA256 74328f3fc93cfd1234e8bd0baf5ea2047073a5d1a8880385fe2be626cdefa740 SHA512 e0e51a2923f24cb77e5a9dddcdb89b2c4301d3c1b34f6a71be1611890e91ecf8e890852307964594c3c09486aee1e6758ad6d59e902842dd9cb63c6168b6d515 WHIRLPOOL 15ebfcf86b60350ee1e17598875c3eee33fdacffd3e7cac290a06fe7f7d003248bc20539b815b14b7d7ae046ca7ac2e35d9135696e21750c97e8f9fcdaf63349
diff --git a/app-portage/cfg-update/cfg-update-1.8.9.ebuild b/app-portage/cfg-update/cfg-update-1.8.9.ebuild
new file mode 100644
index 000000000000..66b2498efec6
--- /dev/null
+++ b/app-portage/cfg-update/cfg-update-1.8.9.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Easy to use GUI & CLI alternative for etc-update"
+HOMEPAGE="https://github.com/rich0/cfg-update"
+SRC_URI="https://github.com/rich0/cfg-update/tarball/${PV} -> ${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86"
+IUSE="X"
+
+RDEPEND="
+	dev-perl/TermReadKey
+	X? (
+		>=x11-misc/sux-1.0
+		x11-apps/xhost
+		)"
+
+S="${WORKDIR}/rich0-cfg-update-2f10786"
+
+pkg_prerm() {
+	if [[ ${ROOT} == / ]]
+	then
+		ebegin "Disabling portage hook"
+		cfg-update --ebuild --disable-portage-hook
+		eend $?
+		ebegin "Disabling paludis hook"
+		cfg-update --ebuild --disable-paludis-hook
+		eend $?
+	fi
+}
+
+pkg_postrm() {
+	echo
+	ewarn "If you want to permanently remove cfg-update from your system"
+	ewarn "you should remove the index file /var/lib/cfg-update/checksum.index"
+	echo
+}
+
+src_install() {
+	dobin \
+		cfg-update emerge_with_indexing_for_cfg-update \
+		emerge_with_indexing_for_cfg-update_phphelper \
+		cfg-update_phphelper emerge_with_indexing_for_cfg-update_bashhelper
+	insinto /usr/lib/cfg-update
+	doins cfg-update cfg-update_indexing test.tgz
+	dodoc ChangeLog
+	doman *.8
+	insinto /etc
+	doins cfg-update.conf cfg-update.hosts
+	keepdir /var/lib/cfg-update
+}
+
+pkg_postinst() {
+	if [[ ! -e "${ROOT}"/var/lib/cfg-update/checksum.index \
+		&& -e "${ROOT}"/var/lib/cfg-update/checksum.index ]]
+	then
+		ebegin "Moving checksum.index from /usr/lib/cfg-update to /var/lib/cfg-update"
+		mv "${ROOT}"/usr/lib/cfg-update/checksum.index \
+			"${ROOT}"/var/lib/cfg-update/checksum.index
+		eend $?
+	fi
+
+	if [[ -e "${ROOT}"/usr/bin/paludis ]]
+	then
+		echo
+		ewarn "If you have used Paludis version <0.20.0 on your system, chances are"
+		ewarn "that you have some corrupted CONTENTS files on your system..."
+		echo
+		ewarn "Please run: cfg-update --check-packages"
+		echo
+		ewarn "The above command will check all packages installed with Paludis and"
+		ewarn "will output a list of packages that need to be re-installed with"
+		ewarn "Paludis 0.20.0 or higher. If you do not re-install these packages"
+		ewarn "you risk losing your custom settings when updating configuration"
+		ewarn "files, that belong to these packages, with cfg-update!"
+		echo
+	fi
+
+	if [[ ${ROOT} == / ]]
+	then
+		ebegin "Moving backups to /var/lib/cfg-update/backups"
+		/usr/bin/cfg-update --ebuild --move-backups
+		eend $?
+	fi
+
+	echo
+	einfo "If this is a first time install, please check the configuration"
+	einfo "in /etc/cfg-update.conf before using cfg-update:"
+	echo
+	einfo "If your system does not have an X-server installed you need to"
+	einfo "change the MERGE_TOOL to sdiff, imediff2 or vimdiff."
+	einfo "If you have X installed, set MERGE_TOOL to your favorite GUI tool:"
+	einfo "xxdiff, beediff, kdiff3, meld (default), gtkdiff, gvimdiff, tkdiff"
+	echo
+	einfo "TIP: to maximize the chances of future automatic updates, run:"
+	einfo "cfg-update --optimize-backups"
+	echo
+}
diff --git a/app-portage/cfg-update/metadata.xml b/app-portage/cfg-update/metadata.xml
new file mode 100644
index 000000000000..1864b4eb4ebf
--- /dev/null
+++ b/app-portage/cfg-update/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>rich0@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rich0/cfg-update</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/conf-update/Manifest b/app-portage/conf-update/Manifest
new file mode 100644
index 000000000000..bfb7c035d8c5
--- /dev/null
+++ b/app-portage/conf-update/Manifest
@@ -0,0 +1,5 @@
+DIST conf-update-1.0.3.tar.bz2 18296 SHA256 5b8479447904e809338375c7d586803a3e8f8d6150cfc33da2c83763119a9a54 SHA512 7f20a4974f804d73729105d9abc0f3205a7574c6e2c6dbf020404f3161500b5ecc60d141e0833e9ae0f43a814591a74cd885a5033f50864bbcfb36ba452175b7 WHIRLPOOL e078895290de9cc116847a48c6fd6d190bc9a3700001de6d31a5728a7eefd2bc41bb34b67a3922ef10730f4668415a0b519861152ba4e54fe0150ec01232d578
+EBUILD conf-update-1.0.3-r1.ebuild 885 SHA256 5d165f2771471032535866e3e510eff360758fc8e7b7a09b26ee3ea2a6256cad SHA512 9f1983417e066bd533ccceb808c42b08e3e89a5995aae0f41f066f51eb1b1621b41e771c28429bcc8a5e15853d8d06d54f7c145fbffe74f47ac432639117f667 WHIRLPOOL c9d3fa944449aa1940fca12d07e69859c51e5bf3884168d37cd780e59fd1dc509722747fab62761ee7d277a1720aa79f809a3999961da2cfe84e307f7ef8ef21
+MISC ChangeLog 4722 SHA256 20fb85ace046cb904b8a2e528f0edb2fae9c2a7461c029c359f25e1b6e2b219b SHA512 e79b11c2e932ca6225f1eb5303338d94464903a0448b1665b49bba2880f4f6adf7de5139573f463f86ebb3bacb005863a43339d87c5ef902c75f4a26d77b97db WHIRLPOOL 552e655741231345764e98484710387d74fed5d3949d4291265a07b4ff3fa873e8779e2ad46768d5eda8eb15930651b452dfb9f29f2154f7ce670783b6da035b
+MISC ChangeLog-2015 5364 SHA256 dec9e79d578a9bda3b5dc99738b64eb59afa8d55cd27e131c1cd14d5123871e2 SHA512 fa58e771bae988cd91afedc083d4bdc3424649cc8b0750ab48a7f26111aa3427533980a11f3a4f1307b5252bd376794054e59496a639aa1140bebc3064599b6a WHIRLPOOL d0d1a520192851d6ed9304798860af425925a719079b348230465ce9618252ad27e470980b713a369514e7fb64baf88751e546ee22a77d2fa0dd7350d35ea3e5
+MISC metadata.xml 719 SHA256 6f46bd9e78ba0b25fd4e20f27fafcb5ec17c8289334746e5da52739aa8778f2b SHA512 8ec8e0a07735d9ec4f7ebb99bb6e645bf01dbe2ae9c899939198983961fcbd77aa3ce41d987a23fc2ded878e19ee2ee4636e5165bdc7667b45722eeb1096b647 WHIRLPOOL 92a087d2e5663086e25e7c158580bb8231060aad07014d0fe0ec3106d7ae9a37149753509121b5337c09e0f985e949f3e2e9a7929587665f55755fb80c56b7cf
diff --git a/app-portage/conf-update/conf-update-1.0.3-r1.ebuild b/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..b599d25db4be
--- /dev/null
+++ b/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="${PN} is a ncurses-based config management utility"
+HOMEPAGE="https://gitweb.gentoo.org/proj/conf-update.git/"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="colordiff libressl"
+
+RDEPEND=">=dev-libs/glib-2.6
+		sys-libs/ncurses:0
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+		colordiff? ( app-misc/colordiff )"
+DEPEND="virtual/pkgconfig
+		${RDEPEND}"
+
+src_prepare() {
+	sed -i -e "s/\$Rev:.*\\$/${PVR}/" "${S}"/"${PN}".h || die
+	if use colordiff ; then
+		sed -i -e "s/diff_tool=diff/diff_tool=colordiff/" ${PN}.conf  \ die 'colordiff-sed failed'
+	fi
+	tc-export PKG_CONFIG
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/app-portage/conf-update/metadata.xml b/app-portage/conf-update/metadata.xml
new file mode 100644
index 000000000000..cae82b362a61
--- /dev/null
+++ b/app-portage/conf-update/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>nimiux@gentoo.org</email>
+  <name>Chema Alonso</name>
+</maintainer>
+<longdescription lang="en">
+conf-update is a curses based tool for the Gentoo Linux portage
+system
+</longdescription>
+<longdescription lang="es">
+conf-update es una herramienta basada en curses para el sistema
+portage de Gentoo Linux
+</longdescription>
+<use>
+  <flag name="colordiff">Use colors when displaying diffs
+    (<pkg>app-misc/colordiff</pkg>)</flag>
+<flag name="libressl">Enable SSL connections and crypto functions
+	using <pkg>dev-libs/libressl</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
new file mode 100644
index 000000000000..abe5a52e0b79
--- /dev/null
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -0,0 +1,11 @@
+DIST cpuid2cpuflags-3.tar.bz2 70130 SHA256 779314786ceb347e69f150becd54b97b9f18a1d7e06ca88b7b112a44e00d116c SHA512 65fb0a845a480977a64566d5e3a3700af60f96252eef6d26273afc43484a2289cdb311fcfc1cee60e684be15e167c796e901b68a2a981f6b9c02c8055daddc71 WHIRLPOOL 9036563c9ce80896640f4fee6a35dfbc936521abbe2b9d79b951af5e9218f161d35b9ab3dc68e1f685f8d000c13c0c649c66c84c132d65c88127e701db084910
+DIST cpuid2cpuflags-4.tar.bz2 71216 SHA256 e8d911d06852ffa860ad175235f78aa8beb009ecb26d1809cd6c3fd253dbba4a SHA512 0f8a078a605687af9be0152d530dabfa7636827005747a5cce399103eec34f96216b4417e06472821aceecdca737a6ee106b63f056f221d6f2a3050bc3a03f6b WHIRLPOOL e887c998d0b5b4ffa9956c76f3853d4d695acc6eafaa4e94484ce3c895399a78e98eb91fb918a7df5e2cc07c6e28ea100725bf0b28af23cd082f6e719a62b74b
+DIST cpuinfo2cpuflags-1.tar.gz 1429 SHA256 aaa4b80568936acc4b2798f62254a5170328c862cadc70b22cd10e4e6716bbcc SHA512 68a21cfdb0fc8c6eb5aad5c6702d50dd56c927b2010efea1651dbc6a9657654b770bc5a4055fb11e790066c2c63c9ea29c3e03d91057abe187e7029e6797aede WHIRLPOOL 57c66d7eddbf6245735f037980a3d7a685dbccc11bba7e7dd0e1290a77960f17cdb81f161c012abc0eec213b951709df8d7677f0034d5b083bc6f45be1386ad8
+DIST cpuinfo2cpuflags-2.tar.bz2 68939 SHA256 a8779df6fbd5f7d3b92580b0b73242a209bedd4e8204ea04d1d811e1ca6d5cba SHA512 672042112e6430edb0dbfd82d3de2088324544e7bcd81b1c3376d5a85b5f7da91b0e1c92d00d575adb861091b33de599a05edc9a75d0ef76a253ca077276127c WHIRLPOOL f64c040a4a6b8c193447d6c01aa2ba18af5c1232c6a7b0f9f794f5792c39d7c4288c190d135f2c80475dbf5fc3f187496edab4861209209311cdcd0e4218c7d8
+EBUILD cpuid2cpuflags-1.ebuild 1058 SHA256 42c7960468c51de9d6183f2f385fe7c14cbf4930dbe9bc6a5c3b07a28eac5121 SHA512 ca30faabee1bd898fc80f7207fe71d205d6ee6a09e1697f242bfafaca1071fb343ab58623d713b15202096f6e3e240dd83600ce0b695be546721037c77e9c850 WHIRLPOOL a117982d38c56beb59794f27f92031a7cf67b08bc6b5af8cd50110e69f7525fe1bc703dbbfb0e76cb567cfeb687aeec13cc87fc81b91c99198d95df4a952198d
+EBUILD cpuid2cpuflags-2.ebuild 498 SHA256 da912563810224ba2f2500de454824591bc2b026b62cc07188fbb46ff038f221 SHA512 d981b9632d2b881eb50c2cb74c40c1a732bf1dc20ff93cde278d0e4d51eba88440b8eb7289e53644c35b00376a2e52bec79c8e1c720bd5c7168259a4c8f41267 WHIRLPOOL 0b5cf1799948ee307264242bfefe29073561e8c98a07042fb67b3fa61c49be23980b85f3bb49c35c6fd9ad8e4291b2d0669d3a7f276d5d123c2d3890bc48233b
+EBUILD cpuid2cpuflags-3.ebuild 925 SHA256 8c614b3e083c50fb046918541cbf79305e9ba90e10909a86d90872f6589072c3 SHA512 11d0906da57f15999ce0fe85dfb5def644f08fb6c97c5a310ef537e2cfcd9901d279a82cb58aee7f8f8fbe140117d6ba70205af4dc47e44af840cfece8455653 WHIRLPOOL 8a19ba7056064c0f91f95438e8b9650c70fb01ec971cd77bfe2fbcee64df1c47e828c5a885220960ab51e30334809e70665acf73425f8a237ce871a8c6a49a04
+EBUILD cpuid2cpuflags-4.ebuild 930 SHA256 4420d7973d98d56c37aa0f50742ba22a44f5a41d3bba4b7af3ec61ff18efc2c5 SHA512 428b39f888875375ecb735e2d75e562e4df447133e9eece95156e0eafcd6672baa09d2ffad96769f171027cd4207d1fc02d4e24f9cf900dcce0425183db3adc0 WHIRLPOOL 5585c1f5b05c4c23595fc7feee6fae4f76d0aad6858c62e6853c4311df3ce7d00608addf407a33dd99584340f3da935d37a675180056ce8fedcf86ab65c16455
+EBUILD cpuid2cpuflags-9999.ebuild 410 SHA256 ac1dd7d6ecc6e5895ce71e3893b01e3459d59cf24c199438c3ed64cba7f72451 SHA512 02a38010f453641b73461f5afb980b7e1cb1817f3a688064d699827d698f94a3f27a65f7c0dddb7be287694cfe426bbfdd5ec03714d3b777a4975a38e5561b69 WHIRLPOOL dd26466eb72fb8436975eef376dd22c980c66d6568adde3325ebf38375430a5637101cc552390ec66f0b0f68cad82833f23e9f173f3754450b0001cd4a1e407b
+MISC ChangeLog 519 SHA256 eb586fd27ed5d9f80b5beb2da6dea349145220387c098c190b595220899594ba SHA512 74fa4f575a81dcd9fdef180a98f480343e66a7dcf7a572e96fc3fca294b138d65394867fe06730be06c2a714a58b0946769b3b85e54fc7d8449d18927cda56dc WHIRLPOOL 5b2caa3643a1f547adf7cc77273ce1e5e5187668e7e4a9446c6bb57a80fb2d524a6f45334ede229464d1a812393d0b044e692efb02ea3ffff72ac3235e3cb7eb
+MISC metadata.xml 343 SHA256 2f05a8b4933234f1d0b03925c4ba3e6e459ce92520358aec6d189a0f04bcb4d9 SHA512 8ae8b8d61adaf555d1f59e50655e9e12f342e194ab8363f03a34390eed1455144acee39553b93306d9775b8c9fb119de52b8bb4d9284c71ddc39c3d3414a31dc WHIRLPOOL 59c00649e6f47c5505dcfd0a3357ebb1be852c421ca9596d0bf1b3b50d9ac08198163a689f3212f032141a04f627ec7423a7807504415c881968d9a8f621d0f5
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild
new file mode 100644
index 000000000000..cc95afbc6f2f
--- /dev/null
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit python-r1
+
+MY_PN=cpuinfo2cpuflags
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Script to guess CPU_FLAGS_X86 flags from /proc/cpuinfo"
+HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
+SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=${PYTHON_DEPS}
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	python_foreach_impl python_newscript "${MY_PN}-x86"{.py,}
+}
+
+pkg_postinst() {
+	if has_version 'sys-apps/portage' \
+		&& ! has_version "sys-apps/portage[${PYTHON_USEDEP}]"
+	then
+		ewarn "Support for matching Python implementations should be enabled"
+		ewarn "on sys-apps/portage as well. Otherwise, cpuinfo2cpuflags won't"
+		ewarn "be able to figure out the correct repository location and will"
+		ewarn "require you to specify it explicitly."
+	fi
+}
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-2.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-2.ebuild
new file mode 100644
index 000000000000..e2535eee58b5
--- /dev/null
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P=cpuinfo2cpuflags-${PV}
+DESCRIPTION="Tool to guess CPU_FLAGS_X86 flags for the host"
+HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
+SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${MY_P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-3.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-3.ebuild
new file mode 100644
index 000000000000..7aec3c15788b
--- /dev/null
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tool to guess CPU_FLAGS_X86 flags for the host"
+HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
+SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v%-r*} -lt 2 ]]; then
+			elog 'Please note that the output has changed in v2. The new format is suitable'
+			elog 'both for Portage and Paludis. To use it, e.g.:'
+			elog
+			elog '  $ echo "*/* $(cpuid2cpuflags)" > /etc/portage/package.use/00cpuflags'
+			elog
+			elog '(you may need to convert package.use into a directory if you want to use'
+			elog ' separate file as presented here)'
+		fi
+	done
+}
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-4.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-4.ebuild
new file mode 100644
index 000000000000..318806faa56c
--- /dev/null
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tool to guess CPU_FLAGS_X86 flags for the host"
+HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
+SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v%-r*} -lt 2 ]]; then
+			elog 'Please note that the output has changed in v2. The new format is suitable'
+			elog 'both for Portage and Paludis. To use it, e.g.:'
+			elog
+			elog '  $ echo "*/* $(cpuid2cpuflags)" > /etc/portage/package.use/00cpuflags'
+			elog
+			elog '(you may need to convert package.use into a directory if you want to use'
+			elog ' separate file as presented here)'
+		fi
+	done
+}
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild
new file mode 100644
index 000000000000..8e891b478ae5
--- /dev/null
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/mgorny/cpuid2cpuflags"
+inherit autotools git-r3
+
+DESCRIPTION="Tool to guess CPU_FLAGS_X86 flags for the host"
+HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
+SRC_URI=""
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-portage/cpuid2cpuflags/metadata.xml b/app-portage/cpuid2cpuflags/metadata.xml
new file mode 100644
index 000000000000..422aab7218c1
--- /dev/null
+++ b/app-portage/cpuid2cpuflags/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>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">mgorny/cpuid2cpuflags</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/deltup/Manifest b/app-portage/deltup/Manifest
new file mode 100644
index 000000000000..738cd5b11429
--- /dev/null
+++ b/app-portage/deltup/Manifest
@@ -0,0 +1,7 @@
+AUX deltup-0.4.6-cxx.patch 659 SHA256 24e07a6ddaf76154f0f3c263c35ab48b6a14b88f2581c3e0b7d4d03148e6474e SHA512 fae1d6c90a7458b0c4a7795a16ac794a506e2bd002be0be9e0772ef7a9f5174aeef35422d6ee1cca69e4dccc49b36dc732a3408d92d0c960e229935318d0033c WHIRLPOOL 293092d89cb716dd63434cf9450c330b85bbf50c913d8c3e28c6b059f64cc4211cd82ecaa7f12c31da103b201f0c53e91e79968c57e8c9c410f2c110d2666aa4
+AUX deltup-0.4.6-ldflags.patch 241 SHA256 76bab3bc4d914d38023c5345567f45c47f43fc6afed35f512c9a48dfebcce2ef SHA512 e8b705bd581928b15523e6692648fb89f2bb0c15c565a7dee4d45292fae8aad88e9c6e83b29672825943c2bc15d8b151e57f603dd1c6577a62203249f1e96316 WHIRLPOOL 736111dc3bcf8f3d3ce684a7e1d598d36bd19d64781b9d25809a3eb5b4278985c5b5b09e2edf6ee9ef6a0a3690bce26cc59f82f9b5eece75a72c9a8422091a61
+DIST deltup-0.4.6.tar.gz 14869 SHA256 f86b304dcdadc864cd347d382dc2c9c249e399f22408d6d7d68490374386c365 SHA512 196be319f31860d89654c23241edde503d4194064617970d87cb0d0a66544959bc666dd34a3bf1a42e69ddb5927420728a1e208b7bb848e935e99f3a090ffa7a WHIRLPOOL 4186c446ea3bcbd28577119e56ca2fe5ce8b479f80ebc48ca34727481385d0e854714a6aad34a466b933279e3f3709cc1b78607cc216c81acee800e480e37b26
+EBUILD deltup-0.4.6-r1.ebuild 915 SHA256 acfb098c6ce235bc3e49ac00c68cdbed9c5f19ac5a041d76086f86304dfd1484 SHA512 e41bb9abe643fb6961f6b99081b318208430b6f03ada7e196bad9dd388ed7ea4a1a31b94fd12bcda1dae212c125a40c075efb8a0208a69667833e82ef032a46f WHIRLPOOL 15fadd48d17d3f50801028b1ac4b79efbcf64097444975c86c29c1316c68e9eca23c9b5bd20cab196b17d7f1771c887d67d47271924eddc7526960d1855ba366
+MISC ChangeLog 3143 SHA256 9380a8ba9e3dd0a8b957bbe02b9b4e94e75c7753590b760db32ae176c23ab58b SHA512 b24d31ad0b6c7f5aa4adcbcad541f0feeaa73081b785121e6b4c3952997198369a9afa1c393f89ff8131521762b4a5f4d764b3f1d321e66e70fc1688c9ee083c WHIRLPOOL 2a6b3c904f11b4e921d5eeedc2a9bbbc712d3b4891eacdde8bc08335669b1123c943c4a825eb4be35ee080df76186c1afb7f32ebc79aa9bee0b7aaf4f3f6fdfc
+MISC ChangeLog-2015 5126 SHA256 46a518c4087f4736286fce87b37fc7f3ad342210f00f47ea9288d82942bc2aaf SHA512 00846c0dfb01a9af958d88ed0234abd880c01f9ccc965be7e68303971a1f87c1926ca54e8b29f69306fafb741e51703e7945802998fa80af4dd9fa1cebbe350f WHIRLPOOL e86119c5d155f0abecc9fa7095301d3931e82b2ecac66a305db1f6a031ab90068d16234ec30afd2315793c98a0ef2d672421c6a3312954e0c2e397e7b76014cf
+MISC metadata.xml 592 SHA256 cc55e65a755f22efa1d55c47ee4c581c280eb6e1023ccb0e926081c62dcdb5a8 SHA512 59b391026a872df130fce1cd78e7dff67fdcfe1cdd18b820fb87039a520035d3a4808ca3f7466066c08908861d61d4158c2a579ab51128f4f1d21c777b02db40 WHIRLPOOL f9e42ef2595e7fdbc53e1b3a1fed5798a8f88c58e576c9ea0c045cc16a20ed26330943701214a584c7093a39effaa31abeae8aac2c965cad1297e3f081430d7b
diff --git a/app-portage/deltup/deltup-0.4.6-r1.ebuild b/app-portage/deltup/deltup-0.4.6-r1.ebuild
new file mode 100644
index 000000000000..9c4ebf21a658
--- /dev/null
+++ b/app-portage/deltup/deltup-0.4.6-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Delta-Update - patch system for updating source-archives."
+HOMEPAGE="http://deltup.sourceforge.net"
+SRC_URI="https://github.com/jjwhitney/Deltup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+MY_PN="Deltup"
+S="${WORKDIR}/${MY_PN}-${PV}/src"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND="
+	sys-libs/zlib
+	app-arch/bzip2
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+"
+RDEPEND="${DEPEND}
+	|| ( dev-util/bdelta =dev-util/xdelta-1* )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.6-ldflags.patch
+	"${FILESDIR}"/${PN}-0.4.6-cxx.patch
+)
+
+src_compile () {
+	emake CXX=$(tc-getCXX)
+}
+
+src_install () {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc "${S}"/../{README,ChangeLog}
+	doman "${S}"/../deltup.1
+}
diff --git a/app-portage/deltup/files/deltup-0.4.6-cxx.patch b/app-portage/deltup/files/deltup-0.4.6-cxx.patch
new file mode 100644
index 000000000000..6a07dc1ee0a1
--- /dev/null
+++ b/app-portage/deltup/files/deltup-0.4.6-cxx.patch
@@ -0,0 +1,23 @@
+diff --git a/Makefile b/Makefile
+index 6a3aa95..a591a6f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,3 +7,3 @@ CC = g++
+ objfiles=bpatch.o archfunc.o file.o system.o tmpstore.o deltup.o 
+-libs=-lstdc++ -lz -lbz2 -lcrypto #-lssl
++libs=-lz -lbz2 -lcrypto #-lssl
+ 
+@@ -12,3 +12,3 @@ libs=-lstdc++ -lz -lbz2 -lcrypto #-lssl
+ %.o : %.cpp
+-	${CC} -c $< -o $@ ${CXXFLAGS} #-g #-Wall -pedantic
++	${CXX} -c $< -o $@ ${CXXFLAGS} #-g #-Wall -pedantic
+ 
+@@ -17,6 +17,6 @@ all: deltup
+ depend:
+-	gcc -MM *.cpp > .depend
++	${CXX} -MM *.cpp > .depend
+ 	
+ deltup: $(objfiles)
+-	${CC} $(objfiles) ${LDFLAGS} -o deltup $(libs)
++	${CXX} $(objfiles) ${LDFLAGS} -o deltup $(libs)
+ 
diff --git a/app-portage/deltup/files/deltup-0.4.6-ldflags.patch b/app-portage/deltup/files/deltup-0.4.6-ldflags.patch
new file mode 100644
index 000000000000..0d06255abcd2
--- /dev/null
+++ b/app-portage/deltup/files/deltup-0.4.6-ldflags.patch
@@ -0,0 +1,9 @@
+diff --git a/Makefile b/Makefile
+index 6a3aa95..6e7c5cf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,3 +20,3 @@ depend:
+ deltup: $(objfiles)
+-	${CC} $(objfiles) ${CXXFLAGS} -o deltup $(libs)
++	${CC} $(objfiles) ${LDFLAGS} -o deltup $(libs)
+ 
diff --git a/app-portage/deltup/metadata.xml b/app-portage/deltup/metadata.xml
new file mode 100644
index 000000000000..99396d6343f5
--- /dev/null
+++ b/app-portage/deltup/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>Ameretat.Reith@gmail.com</email>
+    <name>Ameretat 'reith' Reith</name>
+    <description>Primary Maintainer, Assign bugs</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jjwhitney/Deltup</remote-id>
+    <remote-id type="sourceforge">deltup</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/demerge/Manifest b/app-portage/demerge/Manifest
new file mode 100644
index 000000000000..613a42b11497
--- /dev/null
+++ b/app-portage/demerge/Manifest
@@ -0,0 +1,5 @@
+DIST demerge-0.047.tar.gz 11142 SHA256 b582ca4b422b08745ef0c500d382ffc60b4c2dba5cbcfa8a453c3124f49ea7d2 SHA512 6c2d172694516c030c358c9668ff4a1fe54d910583de6829bec0de6e67d428b1853b23f6ccd18fc9286932cb9a2bc5a37bab4b5ce43ddf2dd031c64c2ee6b1ce WHIRLPOOL 2ce52af1c3561050bed7638aaddf1fb38e2c6d44711b15f55a191ebfff57773f9ed798e584c6b2ff2505f6cc996a0d28cb1deccd47fb1b6fb32bb97c3e7da576
+EBUILD demerge-0.047-r2.ebuild 1325 SHA256 00da1ea3a7eaecd1d4bc2a65d370ee41eb5f1e8f4e81fe2c17bcb0b5d04504be SHA512 6c02224548af746e9ac1a406267b6dd7f25d147d3443f85e035a20b5ab4ed75b289bb22d1112207b0e09f39a28d3b63df834e779eba70141739ed608d7d9f7ad WHIRLPOOL 78113be47426883b1c81a9771bc02029394d5c55337fcc7efb0ab20865640b9322efac25f6522a860ec7ec8b589bbd61423ef3b8ae6560476b4b374b17642115
+MISC ChangeLog 3693 SHA256 d38315a0d84af1aa05152390e58f24b4dd3f99a5e1b666740749c1483b391210 SHA512 84dae11e6c4e6ef80aa325cdad7314f972d61d01ed51e6c1c63cf642d8bba4c1f8eb940fcea0f9cfe33b789c3217c1c3e6807a8f9dfe3a51b500636300e52b41 WHIRLPOOL ae2bcc93b28aadbe193d582b94ce914f820d4cb5694ebc556c8194867ed24f64bf293f2705dc496eb5a5124296f3c791260ef66cfc3b186e23d97b914dc39141
+MISC ChangeLog-2015 7488 SHA256 2422865fcb66c793d0a950c095f3277d8510744f745af9480daa5f9636c474a4 SHA512 7d640e1f6553dce6c79ba8fc03304cf17325d0ff6c55c46bcd3335864c419724ceaaf3bbf28f65b4eb709f5cc92ae01dca6e420dea33867336c5d69d684adbd4 WHIRLPOOL fbfcd5d1eb25a04758d4dfbdef2110b0d31fceee31c2268950ae75d54261f49f8c88064105c6a3ba0094c40e8f9e4053e5ee2328970744f83b67ee475590bbf6
+MISC metadata.xml 473 SHA256 851aac6e8cb28bf0c574ba8928bfe6bdb94c15852d46e578a121d9781c8f3258 SHA512 084e5b4c139be745f253a91466ad38846d047bca3e5c742a46c8795a47c32d027daf727d7bda4b26cb5fada3b1d77fb820ab52d1c250d67cfcd6591c50c4a97d WHIRLPOOL 034414966bfc352fff31a6ad10f71bb9c28edb7fb591a4051967135ccfd30b1d585575324875dfbc25a983beae5345d90f1bc54cc8f16b57513e528b03c223b7
diff --git a/app-portage/demerge/demerge-0.047-r2.ebuild b/app-portage/demerge/demerge-0.047-r2.ebuild
new file mode 100644
index 000000000000..acbdfaaa5e9d
--- /dev/null
+++ b/app-portage/demerge/demerge-0.047-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DESCRIPTION="demerge - revert to previous installation states"
+HOMEPAGE="http://download.mpsna.de/opensource/demerge/"
+SRC_URI="http://download.mpsna.de/opensource/demerge/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 ~sh sparc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+		>=dev-perl/PortageXS-0.02.10-r3
+		virtual/perl-Term-ANSIColor
+		dev-perl/TermReadKey
+		dev-perl/Shell-EnvImporter"
+RDEPEND="${DEPEND}
+		sys-apps/portage"
+
+src_prepare() {
+	# Fix path for new make.conf location
+	sed -i -e 's:/etc/make.conf:/etc/portage/make.conf:g' demerge
+	default
+}
+
+src_install() {
+	dobin demerge || die
+	dodoc Changelog
+	doman demerge.3
+}
+
+pkg_postinst() {
+	if [ ! -e /etc/portage/postsync.d/demerge-record ]; then
+		mkdir -p /etc/portage/postsync.d/
+		echo '[ -x /usr/bin/demerge ] && /usr/bin/demerge --postsync' > /etc/portage/postsync.d/demerge-record
+		elog "/etc/portage/postsync.d/demerge-record has been installed for convenience"
+		elog "If you wish for it to be automatically run at the end of every --sync simply chmod +x /etc/portage/postsync.d/demerge-record"
+		elog "If ever you find this to be an inconvenience simply chmod -x /etc/portage/postsync.d/demerge-record"
+	fi
+
+}
diff --git a/app-portage/demerge/metadata.xml b/app-portage/demerge/metadata.xml
new file mode 100644
index 000000000000..93ad16625584
--- /dev/null
+++ b/app-portage/demerge/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>
+	<longdescription lang="en">
+		demerge makes it easy to revert to previous installation states.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-portage/diffmask/Manifest b/app-portage/diffmask/Manifest
new file mode 100644
index 000000000000..5edded8d124f
--- /dev/null
+++ b/app-portage/diffmask/Manifest
@@ -0,0 +1,6 @@
+DIST diffmask-0.3.3.tar.bz2 8605 SHA256 303bccbdd6f538fee4cf20e1aa8c8c165c1843333331e46016318f198ae9cb24 SHA512 5f28f68dc1adba2fb7b0db5e2a329e46017298de9c44765d521a0f338223eef2a77573636987e942595db9b89b72db93b68cf5b805091b0ebb1e91a18bfcd48b WHIRLPOOL ac3bbf5591b993972b8ef2929a048d0b13324b19074d3107d8e8ebd35e9c54670fdd6fadf83a23f26b3a93443ca40c686567e991580701892fff0283dbe630c3
+EBUILD diffmask-0.3.3-r2.ebuild 529 SHA256 df3968d61d2cfd14145e69faaf38f03c31efa6b2ddb151cfbaa8cdc03994ba23 SHA512 9182358e989ccbdaa955fa2ae676ae4237c51e38f3b4b796f2300136dc6bc0f1c37557d35730d1885ccf1aee865ab76f65a56bd35a5ea43808dcae387be9c9d9 WHIRLPOOL c01299bcfc98943d7f7e93d7dc2ebce51c54c2f99dcbade2f8b1580e27b5f739ef3b85045c927f770148bf64002f42084bdcd75e1a0b66e8d678e501ba1dcf3c
+EBUILD diffmask-9999.ebuild 628 SHA256 804f684cf41ef1d2b41334979195f853acb910705d7a632885286c47dc902596 SHA512 76c25cd8062533cced22c9a95e2cbc8100c3c2f3324ce1eb349906b5bb32d9dadc2b1f3853cb2382f25932844d7ec9bb176edf0c52a80e310edef6fbb0c4e948 WHIRLPOOL 3b667b5bc53c5c85cd3a27987cefe41b941657a01a6b6567d8a31a3fb5775ef2136cc2ea9421f414521992c0364f731eff185eb0a355733f177100215654dfd7
+MISC ChangeLog 2539 SHA256 5091f4e76dca597084d8da3be73f5bc53ce8ce7e25fb4957d1f31c932d6e503d SHA512 453053448ec2457b28c6c68a4c55166c23f0d8785664e4faa3d7b21fa0e4262bb5cda60073c2c1f48ccae58717f61b30cb1433c56a2c958c27a645d6a48d5003 WHIRLPOOL 8573bc90952f584615fd27e113f167056d81fa1c72282112973a15a1c3a8d4fdcd50c15186f04929a45a85c7f16508f58e283a809002e26afb688a4a70389e13
+MISC ChangeLog-2015 4177 SHA256 2501302f6a36a48aa1deaba47af55f8391f762348493922891479f56c1fea029 SHA512 f6815aedf5c0135cb34c4a7faf948490448fe48fd1a39a7e8e39e1bf49690fe1fd25397c7bbc031b53b3c731951476f614c747d85fb9c6fa38cf8f39465c5a09 WHIRLPOOL c10e9293498475c08adabd86691d45aaa6e0039aaabee50f2ea6d93a844879f92f64f31012b1a5e3f3c890c845deab41d88064f58c10a5fb1d06407464ff83b0
+MISC metadata.xml 871 SHA256 5f3d0f35ef8d9bec0dfbb67e19c5e46849c58ca727bec96ee3fcd22ed0064392 SHA512 98374fb6cc37dac755916a9ea83fc642707c54338a7b4abf151475916be379859f76987d575eb4e4d6d455e7a7081316d8442396d59e5591edef44eca89f72d0 WHIRLPOOL 3cf7d22861e0965764e416c0190383cc3629ecc1fbae727e69110524bdfc14e023fa84f8de23db64455500c2917df6938716f7583b2f12af753f8bea75f15932
diff --git a/app-portage/diffmask/diffmask-0.3.3-r2.ebuild b/app-portage/diffmask/diffmask-0.3.3-r2.ebuild
new file mode 100644
index 000000000000..14598106ea42
--- /dev/null
+++ b/app-portage/diffmask/diffmask-0.3.3-r2.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,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
+HOMEPAGE="https://bitbucket.org/mgorny/diffmask/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/diffmask/diffmask-9999.ebuild b/app-portage/diffmask/diffmask-9999.ebuild
new file mode 100644
index 000000000000..91a23879b64f
--- /dev/null
+++ b/app-portage/diffmask/diffmask-9999.ebuild
@@ -0,0 +1,28 @@
+# 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
+
+#if LIVE
+EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
+inherit git-r3
+#endif
+
+DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
+HOMEPAGE="https://bitbucket.org/mgorny/diffmask/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+#if LIVE
+
+KEYWORDS=
+SRC_URI=
+#endif
diff --git a/app-portage/diffmask/metadata.xml b/app-portage/diffmask/metadata.xml
new file mode 100644
index 000000000000..787683efe046
--- /dev/null
+++ b/app-portage/diffmask/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>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<longdescription>
+		A utility to maintain a package.unmask file consisting of entries
+		copied from package.mask files. It can (try to) automatically find
+		entries unmasking specific packages, update existing package.unmask
+		entries (e.g. unmasking additional packages as they are appended to
+		the mask entries) and remove old unmasks.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>mgorny@gentoo.org</email>
+			<name>Michał Górny</name>
+		</maintainer>
+		<bugs-to>https://bitbucket.org/mgorny/diffmask/issues/</bugs-to>
+		<remote-id type="bitbucket">mgorny/diffmask</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-portage/distpatch/Manifest b/app-portage/distpatch/Manifest
new file mode 100644
index 000000000000..0276f65f4f15
--- /dev/null
+++ b/app-portage/distpatch/Manifest
@@ -0,0 +1,5 @@
+DIST distpatch-0.1.2.tar.gz 19998 SHA256 97452cf226d390c0d4634d4b985040228cc7e22551322ea949ef6c72eb6771a2 SHA512 f4dd08fd69a5b2030e0b912c1153994bcc03f40af65fff185231a220c110d0e7b5a4acf402d116e9dbfef86b13d17036ca563d0fefd89bc62809e1ecc9acf1ed WHIRLPOOL 4577cc6361212b52c4ff7a25a4d50b4b8bccbccb0d2081a61a3dbcfcb7bf0d4b09d8bfddcbc1c8607e30a4dca7d74336386a01d483697acbd7268bd7e454225d
+EBUILD distpatch-0.1.2.ebuild 579 SHA256 c1a1d489c19a81d0d432fca3e3152c6697a4a9fbb9f0ac8e179597cd75730403 SHA512 e8ac6b1a92f5a4eaf4d6aa3fa39b5a143be30df91652d0d9796284bdf5ebc29ff552a2a2cce60ea18e51a1c8b1bec443de33be72c912d07428e0afd21b6addf4 WHIRLPOOL 0c36a71d78ebdaf019403ecb8a5bcb6eb1a3154eff9717b59bf53578329ba3065f42dfb4030e781ba868fd13345fb41541bac1f6e0cb0a5948cb701ba9b5f28a
+MISC ChangeLog 2538 SHA256 72ba10c1f2d30c2fc280745f820d63b4a13ffcee6eb9fc144dff40660c79fc8d SHA512 d3feddf53df5acd932d59e4e640e8bd03b5314a007770427c3663f0e963347f6219f99d81ec33cb113c0d1d3017a3c158f1bb4242e52e6c624d71c1dd02ffcbb WHIRLPOOL 3d769ef9a8ed9f99e2f9c1ceeb0664b380f2e8d6bd557cd31ddc17c0691c09fcae2d907a8ac991e50348f6b4b643eff7be8f0c487313775f39b54d6cb19492c6
+MISC ChangeLog-2015 626 SHA256 8a69d4c662fde1eb1deaa23567781de13cbbc201c686d42216c1852f6be706e3 SHA512 6f018be83376db9a8e0b23c76a16eed6e60f1453a2e8fdd360c0bf2768f65416c27a5fe1239c751a97bd7e17e4550fd72ae99ea7716fe829d5c67ea8a950dbc0 WHIRLPOOL a500eab8599a3cb33ca7ac3a8d01d62cc40c63524ac324c57b7ae677776500fda74a357e17b09a7049184ec8c30c76525cca921db1836ebd55c578c36b586016
+MISC metadata.xml 489 SHA256 8cef573e4d4eddaa8b2abb2e334fba88a025801f257903c0127270ca92b15a20 SHA512 bf9e190068b60e9bcf3a857a38a155c7189d0ea00a098e2df94b152218157c03f936ab15e00038edc09aa9583cba1711a57e1a9ef17edb794fef59372b35f08a WHIRLPOOL 20bef915720842c2494af4dcb84449efbad4952862b226e1d99f33e2c4113e07be918667211e0211157db54b432e9dc735ed757a2a64da9d400cb55e7bdb259a
diff --git a/app-portage/distpatch/distpatch-0.1.2.ebuild b/app-portage/distpatch/distpatch-0.1.2.ebuild
new file mode 100644
index 000000000000..f4b74b77721b
--- /dev/null
+++ b/app-portage/distpatch/distpatch-0.1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distfile Patching Support for Gentoo Linux (tools)"
+HOMEPAGE="https://github.com/rafaelmartins/distpatch"
+SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=sys-apps/portage-2.1.8.3
+	dev-python/snakeoil"
+DEPEND="${CDEPEND}
+	dev-python/setuptools"
+RDEPEND="${CDEPEND}
+	>=dev-util/diffball-1.0.1"
diff --git a/app-portage/distpatch/metadata.xml b/app-portage/distpatch/metadata.xml
new file mode 100644
index 000000000000..523e39992295
--- /dev/null
+++ b/app-portage/distpatch/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>rafaelmartins@gentoo.org</email>
+    <name>Rafael G. Martins</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>rafaelmartins@gentoo.org</email>
+      <name>Rafael G. Martins</name>
+    </maintainer>
+    <remote-id type="github">rafaelmartins/distpatch</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/eclass-manpages/Manifest b/app-portage/eclass-manpages/Manifest
new file mode 100644
index 000000000000..7eb7772c3531
--- /dev/null
+++ b/app-portage/eclass-manpages/Manifest
@@ -0,0 +1,16 @@
+AUX eclass-to-manpage.awk 9812 SHA256 750d616d4cb53a28da2b125dcdaf6f664bed04f93557061dba314319c04e54c3 SHA512 af8901b21350c820ae206b5652394c4c859326791bc00af9a0baa3b9b7c72cd3068f20cff292f0707aec6aa9715477ca840df047c1bc033f48800e110d8bb51c WHIRLPOOL f088bd24d90f44cfec4530f7c59062373f05868c65da9b40051684c5eb6df817ee1269218dca0704a77f07a33fc37ba620cc64bcf0514d78d4b045b6c9fdeb72
+AUX eclass-to-manpage.sh 780 SHA256 27c19b79671cea217bd7d84e7f385a7d3cdf78411b6ce2f07303965d201c841b SHA512 266f15ac5d2efc42ce792d9e0c1d91e99502a5cd93ee1b915fe952cdd894bc4e773014c3f6731d2a11a2d82466676035cff21a1d88070fe85f1dca915dca203c WHIRLPOOL a9bafe48b6ba3fce7787cd6029adee73b1a08b06ebd114dfdfa9a1270a40e1190ff91fb21ccb6b9a3ef6063c3e9880445ba6daa8085551eb134b4658ec9fbf68
+DIST eclass-manpages-20170321.tar.xz 459596 SHA256 47aaef9603822bf0a5e7f738b4f354c83bdcbb61b1639f66de02db24de2b4bc6 SHA512 7ff2a48659382ae84944e4f4cf4bb8a73d51355d8bcd63f16fa155e3da3010430babe6f7d977327e5c7f14f0b5e6a23ee5659665e35b020bcd7772008ce3b3b0 WHIRLPOOL 656cb2a0867b6f10a2bba59dd26ffc19c75d8e753d150d4fec90ffe7d586192e98fd44af5aafeb2fee1e0209a10c916ad0dc677a71a14ba4796dd1795d6acb17
+DIST eclass-manpages-20170428.tar.xz 457936 SHA256 f1138d403ede694409c5cd584d1b7c1cd596e8714f092a84312cf19837240af6 SHA512 15f21b13aa66eb7fa9a02bcd4e33ec5f9eba9a82412184ba821ccfdccaa1e34d8161464ae9db939bc3e7df661eda45755efa4a465883c4577b406ca712aa2e01 WHIRLPOOL 10f688309fc299189b315b25a7f528b38b5bb5d8f35785d4d3dd0af46d2f7fcf7dd14bad693a57a9c0262c95412a5edf44d7ad1ca729df71cc7a12b005edf643
+DIST eclass-manpages-20170521.tar.xz 455584 SHA256 34063a43d913b5311596bf601c02f2cd0fd98d75dd6584fa95289bd7f8a2cbe6 SHA512 0f91eaf3066a8208fd02c256927ea5e8b2d488642f37573bedf8284afef49d7c4951144687fda29146cf27af05cc29efbea0a41462e0d59fc94cae3e9e70870e WHIRLPOOL 52846eb282307a56b662166dd4c26db4b09089fb4f8d8654aeccb4a94579b1495b7b196efee3bb4496b4895ca113f2e87d79aaab698c8c9977bf496172e3c156
+DIST eclass-manpages-20170712.tar.xz 456832 SHA256 aac17f7efec309db108c34fb511dcb0ebdee0d5dbcf94fa36ca3317afe5669bd SHA512 a64c97683fa796d6122b722dfe065447ebd106c2974a7f3c4ea67743429efa43082979febdfd5a3676635b745cec02420771d1b2ce401c7100867aef9bd9de0b WHIRLPOOL 212bdc3b6bb29b17765e557e4540ed8fed678a42d8a4678661ee13f59b0a7282be2439a4078ff1b0af8db8cba33dfb0446adac6b632bba5f8e2d50cc8c10e9ac
+DIST eclass-manpages-20170905.tar.xz 453248 SHA256 bcf4204dcb8c6c3f29d81d4be94638781d7712b32246bece036fa0445db295b0 SHA512 a6e8732f7a06e3a7bfd009a25d91f7f3c6721283c0265361029ee25cdaa20198a7b273e5825d7ac3f66c7ccfa7eea20c2c3ff23dc08bab22a32c2325a413e6b5 WHIRLPOOL c3b7d5b80539c8ac0393d33ba9d96ce12d7894981669b8e67e55a3c8985af5474d0fea53dfb3620cc6788dd43e9c88095758f51cdc5e84fa67c9e84a4c43afc7
+EBUILD eclass-manpages-20170321.ebuild 1051 SHA256 8bbb1e862485a703824456769d04c2a71ca178276d772d3ecd9d345e4367e193 SHA512 26fd28474f65d196a20b1a64e7e9e5c04890bcc1a28b23a878220bb993f90ea226b1ddefb00af469998394510973f02fb8cde38eb713f4e7329940b95f30ed16 WHIRLPOOL 7871337c2502536913ff2ef331f564fb75172e218416c1dd77c63a83fc010b65c432eb20927060be9b8656a719d548db52a88deaa1c2f0c5ee68206655aa1acc
+EBUILD eclass-manpages-20170428.ebuild 1051 SHA256 8bbb1e862485a703824456769d04c2a71ca178276d772d3ecd9d345e4367e193 SHA512 26fd28474f65d196a20b1a64e7e9e5c04890bcc1a28b23a878220bb993f90ea226b1ddefb00af469998394510973f02fb8cde38eb713f4e7329940b95f30ed16 WHIRLPOOL 7871337c2502536913ff2ef331f564fb75172e218416c1dd77c63a83fc010b65c432eb20927060be9b8656a719d548db52a88deaa1c2f0c5ee68206655aa1acc
+EBUILD eclass-manpages-20170521.ebuild 1051 SHA256 8bbb1e862485a703824456769d04c2a71ca178276d772d3ecd9d345e4367e193 SHA512 26fd28474f65d196a20b1a64e7e9e5c04890bcc1a28b23a878220bb993f90ea226b1ddefb00af469998394510973f02fb8cde38eb713f4e7329940b95f30ed16 WHIRLPOOL 7871337c2502536913ff2ef331f564fb75172e218416c1dd77c63a83fc010b65c432eb20927060be9b8656a719d548db52a88deaa1c2f0c5ee68206655aa1acc
+EBUILD eclass-manpages-20170712.ebuild 1051 SHA256 8bbb1e862485a703824456769d04c2a71ca178276d772d3ecd9d345e4367e193 SHA512 26fd28474f65d196a20b1a64e7e9e5c04890bcc1a28b23a878220bb993f90ea226b1ddefb00af469998394510973f02fb8cde38eb713f4e7329940b95f30ed16 WHIRLPOOL 7871337c2502536913ff2ef331f564fb75172e218416c1dd77c63a83fc010b65c432eb20927060be9b8656a719d548db52a88deaa1c2f0c5ee68206655aa1acc
+EBUILD eclass-manpages-20170905.ebuild 1112 SHA256 1e6f9431c81ea2c9ff70ec9c11358778b3f6543010c7c7ea63984b33e2f1a275 SHA512 c91678e3f434802810c0611aeb5186218ddef027c7f0896cb27429b697005f5c1dd724e4b3946dc030c8cf8cc0e28f8a1e5e2f09db06aba0e13950ca64cb9231 WHIRLPOOL 96d21ec9c9c016c8aee25d922f70caac96328f06935c1d30b47327debc843a54524101492f2e20bb31a061c372e8ebfc1dd897e5fe818d9173b164b963b2cec4
+EBUILD eclass-manpages-99999999.ebuild 916 SHA256 1c2fe5c8b864ee252887846233d792133463140e16e52c3e15598947a31cadaf SHA512 ac863b1ab0c85239d7c31350be6cdeaef0856e771881f0296aa5321012618fa20a74dae3c20b11925eab18f6c787ebe050d9fb41abc8d2281d3e5713146e27b9 WHIRLPOOL 06f9a8b408c564ade369be28394e27d0987dcd3147a76b200e6564a6cfc64a4602d3e24d6401e8a8d35f45eaf744cf187c9fa92f3786f9184e72a0d90c74f452
+MISC ChangeLog 4364 SHA256 0fafda4a482913b6fe5e90ca8d934545b4b2f0e306a994391ab39a5b6a66afd8 SHA512 3ca98f6747566320c56963a46650d89302b25b47d7ac28142ac5b47f16f0e67689461757af71657e73e0c8d54386eec3be223e7c2570f3186c59a6c76ccb9b2c WHIRLPOOL e8292d83fb3f598c13a48eb5e0de68dd4f7ff406076658fbe72e93b6fc37110aa8330f5ea18c281f2331cedd8fafbf1a1e24ddab45ecdce093164a186ac79e52
+MISC ChangeLog-2015 5984 SHA256 4f408b5874baafcd2f70805c7830f6c64df24a202028f9f5649beb4680e29adf SHA512 72c9e444e6f5ebf46591c00d737517fb1b206aed566c4f284348a525cfc903fba2ad56609beb8cd50c8a09f2c348a9198b847cfe648cca8399c6201f92993e04 WHIRLPOOL 819507eb368e14c0ad275bccfbecd41acaabb6782709eb60ae5c6837132bab666a50189b8b3b619b4baf8dcb8edeb618a9ae08fed1abdd5ad3f31c2b30ecb62f
+MISC metadata.xml 452 SHA256 8760946a9fffdb7fee0c3d55a8558b7f153ccd56c8c8001bd1038782cfac95a9 SHA512 a2296b428c42027039a65ee16f1dea3383d7a5ac08a89c5125551c3e089a0a7b01448ca397fc0c83e587522ddb1c15f1d9160ea1b0fa9fab857bcf5d7b3708f4 WHIRLPOOL 050e4768465ab47aa8ed1e20c090e95c34b730fcd2623111f67cb806f171e8c5bfb82cea5afa80681feecaa70c5c06085fa420be91f994048c1c7961e1465732
diff --git a/app-portage/eclass-manpages/eclass-manpages-20170321.ebuild b/app-portage/eclass-manpages/eclass-manpages-20170321.ebuild
new file mode 100644
index 000000000000..a9f100ab082e
--- /dev/null
+++ b/app-portage/eclass-manpages/eclass-manpages-20170321.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="collection of Gentoo eclass manpages"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+
+# How to create a snapshot and upload it to your dev-space:
+#
+# mkdir eclass-manpages-$(date +%Y%m%d)
+# cp "$(portageq get_repo_path / gentoo)"/eclass/*.eclass eclass-manpages-$(date +%Y%m%d)/
+# tar -cf eclass-manpages-$(date +%Y%m%d).tar eclass-manpages-$(date +%Y%m%d)
+# xz -9e eclass-manpages-$(date +%Y%m%d).tar
+# scp eclass-manpages-$(date +%Y%m%d).tar.xz dev.gentoo.org:public_html/dist/
+#
+# Then copy the ebuild and update your name in SRC_URI ;-).
+
+src_compile() {
+	env ECLASSDIR="${S}" bash "${FILESDIR}"/eclass-to-manpage.sh || die
+}
+
+src_install() {
+	doman *.5
+}
diff --git a/app-portage/eclass-manpages/eclass-manpages-20170428.ebuild b/app-portage/eclass-manpages/eclass-manpages-20170428.ebuild
new file mode 100644
index 000000000000..a9f100ab082e
--- /dev/null
+++ b/app-portage/eclass-manpages/eclass-manpages-20170428.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="collection of Gentoo eclass manpages"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+
+# How to create a snapshot and upload it to your dev-space:
+#
+# mkdir eclass-manpages-$(date +%Y%m%d)
+# cp "$(portageq get_repo_path / gentoo)"/eclass/*.eclass eclass-manpages-$(date +%Y%m%d)/
+# tar -cf eclass-manpages-$(date +%Y%m%d).tar eclass-manpages-$(date +%Y%m%d)
+# xz -9e eclass-manpages-$(date +%Y%m%d).tar
+# scp eclass-manpages-$(date +%Y%m%d).tar.xz dev.gentoo.org:public_html/dist/
+#
+# Then copy the ebuild and update your name in SRC_URI ;-).
+
+src_compile() {
+	env ECLASSDIR="${S}" bash "${FILESDIR}"/eclass-to-manpage.sh || die
+}
+
+src_install() {
+	doman *.5
+}
diff --git a/app-portage/eclass-manpages/eclass-manpages-20170521.ebuild b/app-portage/eclass-manpages/eclass-manpages-20170521.ebuild
new file mode 100644
index 000000000000..a9f100ab082e
--- /dev/null
+++ b/app-portage/eclass-manpages/eclass-manpages-20170521.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="collection of Gentoo eclass manpages"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+
+# How to create a snapshot and upload it to your dev-space:
+#
+# mkdir eclass-manpages-$(date +%Y%m%d)
+# cp "$(portageq get_repo_path / gentoo)"/eclass/*.eclass eclass-manpages-$(date +%Y%m%d)/
+# tar -cf eclass-manpages-$(date +%Y%m%d).tar eclass-manpages-$(date +%Y%m%d)
+# xz -9e eclass-manpages-$(date +%Y%m%d).tar
+# scp eclass-manpages-$(date +%Y%m%d).tar.xz dev.gentoo.org:public_html/dist/
+#
+# Then copy the ebuild and update your name in SRC_URI ;-).
+
+src_compile() {
+	env ECLASSDIR="${S}" bash "${FILESDIR}"/eclass-to-manpage.sh || die
+}
+
+src_install() {
+	doman *.5
+}
diff --git a/app-portage/eclass-manpages/eclass-manpages-20170712.ebuild b/app-portage/eclass-manpages/eclass-manpages-20170712.ebuild
new file mode 100644
index 000000000000..a9f100ab082e
--- /dev/null
+++ b/app-portage/eclass-manpages/eclass-manpages-20170712.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="collection of Gentoo eclass manpages"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+
+# How to create a snapshot and upload it to your dev-space:
+#
+# mkdir eclass-manpages-$(date +%Y%m%d)
+# cp "$(portageq get_repo_path / gentoo)"/eclass/*.eclass eclass-manpages-$(date +%Y%m%d)/
+# tar -cf eclass-manpages-$(date +%Y%m%d).tar eclass-manpages-$(date +%Y%m%d)
+# xz -9e eclass-manpages-$(date +%Y%m%d).tar
+# scp eclass-manpages-$(date +%Y%m%d).tar.xz dev.gentoo.org:public_html/dist/
+#
+# Then copy the ebuild and update your name in SRC_URI ;-).
+
+src_compile() {
+	env ECLASSDIR="${S}" bash "${FILESDIR}"/eclass-to-manpage.sh || die
+}
+
+src_install() {
+	doman *.5
+}
diff --git a/app-portage/eclass-manpages/eclass-manpages-20170905.ebuild b/app-portage/eclass-manpages/eclass-manpages-20170905.ebuild
new file mode 100644
index 000000000000..4326190bb528
--- /dev/null
+++ b/app-portage/eclass-manpages/eclass-manpages-20170905.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="collection of Gentoo eclass manpages"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~titanofold/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Keep the keywords stabled. No need to change to ~arch.
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+
+# How to create a snapshot and upload it to your dev-space:
+#
+# mkdir eclass-manpages-$(date +%Y%m%d)
+# cp "$(portageq get_repo_path / gentoo)"/eclass/*.eclass eclass-manpages-$(date +%Y%m%d)/
+# tar -cf eclass-manpages-$(date +%Y%m%d).tar eclass-manpages-$(date +%Y%m%d)
+# xz -9e eclass-manpages-$(date +%Y%m%d).tar
+# scp eclass-manpages-$(date +%Y%m%d).tar.xz dev.gentoo.org:public_html/dist/
+#
+# Then copy the ebuild and update your name in SRC_URI ;-).
+
+src_compile() {
+	env ECLASSDIR="${S}" bash "${FILESDIR}"/eclass-to-manpage.sh || die
+}
+
+src_install() {
+	doman *.5
+}
diff --git a/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild b/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild
new file mode 100644
index 000000000000..e37f9d2ce39a
--- /dev/null
+++ b/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="collection of Gentoo eclass manpages"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="sys-apps/portage"
+
+S=${WORKDIR}
+
+genit() {
+	local e=${1:-${ECLASSDIR}}
+	einfo "Generating man pages from: ${e}"
+	# Need `bash` because the .sh isn't +x on the servers #451352
+	env ECLASSDIR=${e} bash "${FILESDIR}"/eclass-to-manpage.sh || die
+}
+
+src_compile() {
+	# First process any eclasses found in overlays.  Then process
+	# the main eclassdir last so that its output will clobber anything
+	# that might have come from overlays.  Main tree wins!
+	local o e
+	for o in $(portageq get_repos /) ; do
+		e="$(portageq get_repo_path / ${o})/eclass"
+		[[ -d ${e} ]] || continue
+		genit "${e}" || die
+	done
+	genit || die
+}
+
+src_install() {
+	doman *.5
+}
diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.awk b/app-portage/eclass-manpages/files/eclass-to-manpage.awk
new file mode 100644
index 000000000000..0b65162c04ec
--- /dev/null
+++ b/app-portage/eclass-manpages/files/eclass-to-manpage.awk
@@ -0,0 +1,427 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# This awk converts the comment documentation found in eclasses
+# into man pages for easier/nicer reading.
+#
+# If you wish to have multiple paragraphs in a description, then
+# create empty comment lines.  Paragraph parsing ends when the comment
+# block does.
+
+# The format of the eclass description:
+# @ECLASS: foo.eclass
+# @MAINTAINER:
+# <required; list of contacts, one per line>
+# @AUTHOR:
+# <optional; list of authors, one per line>
+# @BUGREPORTS:
+# <optional; description of how to report bugs;
+#  default: tell people to use bugs.gentoo.org>
+# @VCSURL: <optional; url to vcs for this eclass; default: https://gitweb.gentoo.org/repo/gentoo.git/log/eclass/@ECLASS@>
+# @BLURB: <required; short description>
+# @DESCRIPTION:
+# <optional; long description>
+# @EXAMPLE:
+# <optional; example usage>
+
+# The format of functions:
+# @FUNCTION: foo
+# @USAGE: <required arguments to foo> [optional arguments to foo]
+# @RETURN: <whatever foo returns>
+# @MAINTAINER:
+# <optional; list of contacts, one per line>
+# [@INTERNAL]
+# @DESCRIPTION:
+# <required if no @RETURN; blurb about this function>
+
+# The format of function-specific variables:
+# @VARIABLE: foo
+# [@DEFAULT_UNSET]
+# [@INTERNAL]
+# [@REQUIRED]
+# @DESCRIPTION:
+# <required; blurb about this variable>
+# foo="<default value>"
+
+# The format of eclass variables:
+# @ECLASS-VARIABLE: foo
+# [@DEFAULT_UNSET]
+# [@INTERNAL]
+# [@REQUIRED]
+# @DESCRIPTION:
+# <required; blurb about this variable>
+# foo="<default value>"
+
+# Disable manpage generation:
+# @DEAD
+
+# Common features:
+# @CODE
+# In multiline paragraphs, you can create chunks of unformatted
+# code by using this marker at the start and end.
+# @CODE
+#
+# @ROFF <some roff macros>
+# If you want a little more manual control over the formatting, you can
+# insert roff macros directly into the output by using the @ROFF escape.
+
+function _stderr_msg(text, type,   file, cnt) {
+	if (_stderr_header_done != 1) {
+		cnt = split(FILENAME, file, /\//)
+		print "\n" file[cnt] ":" > "/dev/stderr"
+		_stderr_header_done = 1
+	}
+
+	print "   " type ":" NR ": " text > "/dev/stderr"
+}
+function warn(text) {
+	_stderr_msg(text, "warning")
+}
+function fail(text) {
+	_stderr_msg(text, "error")
+	exit(1)
+}
+function xfail(text) {
+	_stderr_msg(text, "error (ignoring)")
+	exit(77)
+}
+
+function eat_line() {
+	ret = $0
+	sub(/^# @[A-Z]*:[[:space:]]*/,"",ret)
+	getline
+	return ret
+}
+function eat_paragraph() {
+	code = 0
+	ret = ""
+	getline
+	while ($0 ~ /^#/) {
+		# Only allow certain tokens in the middle of paragraphs
+		if ($2 ~ /^@/ && $2 !~ /^@(CODE|ROFF)$/)
+			break
+
+		sub(/^#[[:space:]]?/, "", $0)
+
+		# Escape . at start of line #420153
+		if ($0 ~ /^[.]/)
+			$0 = "\\&" $0
+
+		# Translate @CODE into @ROFF
+		if ($1 == "@CODE" && NF == 1) {
+			if (code)
+				$0 = "@ROFF .fi"
+			else
+				$0 = "@ROFF .nf"
+			code = !code
+		}
+
+		# Allow people to specify *roff commands directly
+		if ($1 == "@ROFF")
+			sub(/^@ROFF[[:space:]]*/, "", $0)
+
+		ret = ret "\n" $0
+
+		# Handle the common case of trailing backslashes in
+		# code blocks to cross multiple lines #335702
+		if (code && $NF == "\\")
+			ret = ret "\\"
+		getline
+	}
+	sub(/^\n/,"",ret)
+	return ret
+}
+
+function pre_text(p) {
+	return ".nf\n" p "\n.fi"
+}
+
+function man_text(p) {
+	return gensub(/-/, "\\-", "g", p)
+}
+
+#
+# Handle an @ECLASS block
+#
+function handle_eclass() {
+	eclass = $3
+	eclass_maintainer = ""
+	eclass_author = ""
+	blurb = ""
+	desc = ""
+	example = ""
+
+	# Sanity check the eclass name. #537392
+	if (eclass !~ /[.]eclass$/)
+		fail(eclass ": @ECLASS name is missing a '.eclass' suffix")
+
+	# first the man page header
+	print ".\\\" -*- coding: utf-8 -*-"
+	print ".\\\" ### DO NOT EDIT THIS FILE"
+	print ".\\\" ### This man page is autogenerated by eclass-to-manpage.awk"
+	print ".\\\" ### based on comments found in " eclass
+	print ".\\\""
+	print ".\\\" See eclass-to-manpage.awk for documentation on how to get"
+	print ".\\\" your eclass nicely documented as well."
+	print ".\\\""
+	print ".TH \"" toupper(eclass) "\" 5 \"" strftime("%b %Y") "\" \"Portage\" \"portage\""
+
+	# now eat the global data
+	getline
+	if ($2 == "@MAINTAINER:")
+		eclass_maintainer = eat_paragraph()
+	if ($2 == "@AUTHOR:")
+		eclass_author = eat_paragraph()
+	if ($2 == "@BUGREPORTS:")
+		reporting_bugs = eat_paragraph()
+	if ($2 == "@VCSURL:")
+		vcs_url = eat_line()
+	if ($2 == "@BLURB:")
+		blurb = eat_line()
+	if ($2 == "@DESCRIPTION:")
+		desc = eat_paragraph()
+	if ($2 == "@EXAMPLE:")
+		example = eat_paragraph()
+	# in case they typo-ed the keyword, bail now
+	if ($2 ~ /^@/)
+		fail(eclass ": unknown keyword " $2)
+
+	# finally display it
+	print ".SH \"NAME\""
+	print eclass " \\- " man_text(blurb)
+	if (desc != "") {
+		print ".SH \"DESCRIPTION\""
+		print man_text(desc)
+	}
+	if (example != "") {
+		print ".SH \"EXAMPLE\""
+		print man_text(example)
+	}
+
+	# sanity checks
+	if (blurb == "")
+		fail(eclass ": no @BLURB found")
+	if (eclass_maintainer == "")
+		warn(eclass ": no @MAINTAINER found")
+}
+
+#
+# Handle a @FUNCTION block
+#
+function show_function_header() {
+	if (_function_header_done != 1) {
+		print ".SH \"FUNCTIONS\""
+		_function_header_done = 1
+	}
+}
+function handle_function() {
+	func_name = $3
+	usage = ""
+	funcret = ""
+	maintainer = ""
+	internal = 0
+	desc = ""
+
+	# make sure people haven't specified this before (copy & paste error)
+	if (all_funcs[func_name])
+		fail(eclass ": duplicate definition found for function: " func_name)
+	all_funcs[func_name] = func_name
+
+	# grab the docs
+	getline
+	if ($2 == "@USAGE:")
+		usage = eat_line()
+	if ($2 == "@RETURN:")
+		funcret = eat_line()
+	if ($2 == "@MAINTAINER:")
+		maintainer = eat_paragraph()
+	if ($2 == "@INTERNAL") {
+		internal = 1
+		getline
+	}
+	if ($2 == "@DESCRIPTION:")
+		desc = eat_paragraph()
+
+	if (internal == 1)
+		return
+
+	show_function_header()
+
+	# now print out the stuff
+	print ".TP"
+	print "\\fB" func_name "\\fR " man_text(usage)
+	if (desc != "")
+		print man_text(desc)
+	if (funcret != "") {
+		if (desc != "")
+			print ""
+		print "Return value: " funcret
+	}
+
+	if (blurb == "")
+		fail(func_name ": no @BLURB found")
+	if (desc == "" && funcret == "")
+		fail(func_name ": no @DESCRIPTION found")
+}
+
+#
+# Handle @VARIABLE and @ECLASS-VARIABLE blocks
+#
+function _handle_variable() {
+	var_name = $3
+	desc = ""
+	val = ""
+	default_unset = 0
+	internal = 0
+	required = 0
+
+	# make sure people haven't specified this before (copy & paste error)
+	if (all_vars[var_name])
+		fail(eclass ": duplicate definition found for variable: " var_name)
+	all_vars[var_name] = var_name
+
+	# grab the optional attributes
+	opts = 1
+	while (opts) {
+		getline
+		if ($2 == "@DEFAULT_UNSET")
+			default_unset = 1
+		else if ($2 == "@INTERNAL")
+			internal = 1
+		else if ($2 == "@REQUIRED")
+			required = 1
+		else
+			opts = 0
+	}
+	if ($2 == "@DESCRIPTION:")
+		desc = eat_paragraph()
+
+	# extract the default variable value
+	# first try var="val"
+	op = "="
+	regex = "^.*" var_name "=(.*)$"
+	val = gensub(regex, "\\1", 1, $0)
+	if (val == $0) {
+		# next try : ${var:=val}
+		op = "?="
+		regex = "^[[:space:]]*:[[:space:]]*[$]{" var_name ":?=(.*)}"
+		val = gensub(regex, "\\1", 1, $0)
+		if (val == $0) {
+			if (default_unset + required + internal == 0)
+				warn(var_name ": unable to extract default variable content: " $0)
+			val = ""
+		} else if (val !~ /^["']/ && val ~ / /) {
+			if (default_unset == 1)
+				warn(var_name ": marked as unset, but has value: " val)
+			val = "\"" val "\""
+		}
+	}
+	if (length(val))
+		val = " " op " \\fI" val "\\fR"
+	if (required == 1)
+		val = val " (REQUIRED)"
+
+	if (internal == 1)
+		return ""
+
+	# now accumulate the stuff
+	ret = \
+		".TP" "\n" \
+		"\\fB" var_name "\\fR" val "\n" \
+		man_text(desc)
+
+	if (desc == "")
+		fail(var_name ": no @DESCRIPTION found")
+
+	return ret
+}
+function handle_variable() {
+	show_function_header()
+	ret = _handle_variable()
+	if (ret == "")
+		return
+	print ret
+}
+function handle_eclass_variable() {
+	ret = _handle_variable()
+	if (ret == "")
+		return
+	if (eclass_variables != "")
+		eclass_variables = eclass_variables "\n"
+	eclass_variables = eclass_variables ret
+}
+
+#
+# Spit out the common footer of manpage
+#
+function handle_footer() {
+	if (eclass_variables != "") {
+		print ".SH \"ECLASS VARIABLES\""
+		print man_text(eclass_variables)
+	}
+	if (eclass_author != "") {
+		print ".SH \"AUTHORS\""
+		print pre_text(man_text(eclass_author))
+	}
+	if (eclass_maintainer != "") {
+		print ".SH \"MAINTAINERS\""
+		print pre_text(man_text(eclass_maintainer))
+	}
+	print ".SH \"REPORTING BUGS\""
+	print reporting_bugs
+	print ".SH \"FILES\""
+	print ".BR " eclass
+	print ".SH \"SEE ALSO\""
+	print ".BR ebuild (5)"
+	print pre_text(gensub("@ECLASS@", eclass, 1, vcs_url))
+}
+
+#
+# Init parser
+#
+BEGIN {
+	state = "header"
+	reporting_bugs = "Please report bugs via http://bugs.gentoo.org/"
+	vcs_url = "https://gitweb.gentoo.org/repo/gentoo.git/log/eclass/@ECLASS@"
+}
+
+#
+# Main parsing routine
+#
+{
+	if (state == "header") {
+		if ($0 ~ /^# @ECLASS:/) {
+			handle_eclass()
+			state = "funcvar"
+		} else if ($0 == "# @DEAD") {
+			eclass = "dead"
+			exit(77)
+		} else if ($0 == "# @eclass-begin") {
+			# White list old eclasses that haven't been updated so we can block
+			# new ones from being added to the tree.
+			if (eclass == "")
+				xfail("java documentation not supported")
+			fail("java documentation not supported")
+		} else if ($0 ~ /^# @/)
+			warn("Unexpected tag in \"" state "\" state: " $0)
+	} else if (state == "funcvar") {
+		if ($0 ~ /^# @FUNCTION:/)
+			handle_function()
+		else if ($0 ~ /^# @VARIABLE:/)
+			handle_variable()
+		else if ($0 ~ /^# @ECLASS-VARIABLE:/)
+			handle_eclass_variable()
+		else if ($0 ~ /^# @/)
+			warn("Unexpected tag in \"" state "\" state: " $0)
+	}
+}
+
+#
+# Tail end
+#
+END {
+	if (eclass == "")
+		xfail("eclass not documented yet (no @ECLASS found)")
+	else if (eclass != "dead")
+		handle_footer()
+}
diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.sh b/app-portage/eclass-manpages/files/eclass-to-manpage.sh
new file mode 100755
index 000000000000..5f389390d60e
--- /dev/null
+++ b/app-portage/eclass-manpages/files/eclass-to-manpage.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+: ${ECLASSDIR:=${0%/*}/../../../eclass}
+: ${FILESDIR:=${ECLASSDIR}/../app-portage/eclass-manpages/files}
+
+AWK="gawk"
+while [[ $# -gt 0 ]] ; do
+	case $1 in
+	-e) ECLASSDIR=$2; shift;;
+	-f) FILESDIR=$2; shift;;
+	-d) AWK="dgawk";;
+	*) break;;
+	esac
+	shift
+done
+
+if [[ ! -d ${ECLASSDIR} ]] ; then
+	echo "Usage: ${0##*/} [-e eclassdir] [-f eclass-to-manpage.awk FILESDIR] [eclasses]" 1>&2
+	exit 1
+fi
+
+[[ $# -eq 0 ]] && set -- "${ECLASSDIR}"/*.eclass
+
+ret=0
+for e in "$@" ; do
+	set -- \
+	${AWK} \
+		-f "${FILESDIR}"/eclass-to-manpage.awk \
+		${e}
+	if [[ ${AWK} == "gawk" ]] ; then
+		"$@" > ${e##*/}.5
+		tret=$?
+		if [[ ${tret} -ne 0 ]] ; then
+			rm -f ${e##*/}.5
+			if [[ ${tret} -ne 77 ]] ; then
+				echo "FAIL: ${e}"
+				ret=1
+			fi
+		fi
+	else
+		"$@"
+	fi
+done
+exit ${ret}
diff --git a/app-portage/eclass-manpages/metadata.xml b/app-portage/eclass-manpages/metadata.xml
new file mode 100644
index 000000000000..430fce10a0a1
--- /dev/null
+++ b/app-portage/eclass-manpages/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>vapier@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
new file mode 100644
index 000000000000..cfb73a67f2d4
--- /dev/null
+++ b/app-portage/eix/Manifest
@@ -0,0 +1,14 @@
+DIST eix-0.32.10.tar.xz 600120 SHA256 4ecd6ed7e5bb8859c5e5548265e622bffd19800c889d49e75c0bad556830c5da SHA512 cf67889cb54c9b1453b626339038f8bc87ad9de1d3637caa56aa0de0580904cd0061c4d70c2a004e75fdc35e204e640917288a619653edb17ce7c495d20e4c4b WHIRLPOOL 96781b9324be20d081f43acca31ee1dd299ff1feed680346508fee0fba3b735f5b9f1c4b5c309875ffddfc75a7215dbf4f700117fa2afa27da66231635cf1766
+DIST eix-0.32.4.tar.xz 592284 SHA256 8132be9c496b5b19699c50d9aacd49560ca1f0466e3de4f47b896337f3527fc6 SHA512 382181d082648e9b236c3bf54fdf5d75a8575a7994e6a1d3380e80bcc36ff5779c660c5b5fc5f233cef79e48099fc53bb1c8b87e2ca919dcdb43d5fde276f553 WHIRLPOOL 0c8258d36a30a76fec2e7315e07776c277b2f098f6c0fb0a9a182f28827a659c334b190e10c52ea7ec8facd7a6e1f6124b3ffefd3ed2aade6da747e815276737
+DIST eix-0.32.5.tar.xz 595124 SHA256 1ebe07f46800f3f254d1385cd88eba328da9f07cc17731ad1b231a8b13450f6e SHA512 355c0daf81c349ceaa53a7253816a072578923f2044e53c9a8e98ceb9726b238f86f8b1d8ad96bb62851f887e50c1e5e443115dc12fcae7c8bca851caf9b9650 WHIRLPOOL 3b707ebeadc1653917269c81a594469ff2c603e5ad3772d1b19efb9fbd81dcf76b527c9d03975748e9cf0e1f011d1704ecd39f108ea166d78c9bb3be7370ada7
+DIST eix-0.32.9.tar.xz 599072 SHA256 0929581db3282a81a82ab9e17e6522a6517609de96f3a22ab7c081d0c3288edd SHA512 1a7c3d5f371150f5990fe1f1c4cadb0e3ee0a5810011702904aabd58ca250c10f820d6c64e7182096e0b7e2aa001cf573c5f2e83499ceb350cc59b599ec2ca5b WHIRLPOOL d22f2c536baeb2d2204800b6d8600d27c6933b1f89f1b09954fbc2945939d9981d26d8f20f05b066e2edae75dba6db5b41e37273d19d36481946e106699bc95f
+DIST eix-0.33.0.tar.xz 610600 SHA256 18e4f195d465a0fbecaf44c49d5ea6e63e14bdafe8aa7d32682f9f369ee648c2 SHA512 6fd4ca253ee908eb192ee35c4228bea0fa8a04030070b35489bddc639053c2e3f6a2faf32f539ffd2c7d9da0c664ff5f29ac0d732d9a47b6c9976a65dd402de2 WHIRLPOOL eb2517a7fde169d2e1359bca0bcea0bd273459af3ec83aff4f34aa7ee5624046ef1e5e91bec63a8ba69ec301d3eb50fabb9a7676501b65dd1137a8f837014c13
+EBUILD eix-0.32.10.ebuild 2941 SHA256 431fa60b9dcfae7d9a372730fa00e2cea9cb79790cd458d217d06a3705516bdf SHA512 ce4660b31445a0bb1b4ff1a4624e0f8db7f6a6ced85a8e3b7109e2bd6dc8244511fa95e4b79d130823917ff810529f9e611e92c5a13dba0c0941e089fa6eb254 WHIRLPOOL a36c91cb65c98fcede5563e3e76a87d827c0a941e850e63034fb0af48848c7e6e6f43df83beac3dfb03d35e2c1dc0cdb72bd7f3f0cd4769c9851e1fb10ea2786
+EBUILD eix-0.32.4.ebuild 2360 SHA256 26b9b757c3e31bd1d7b543e885112645d592e6a823e281fb9f8a9b96aeef7a99 SHA512 1b34e69dcab7ca2851ebb26ede4c73acc3221ce03370935674ac6f399f9005bcb6bed6f40c783d578891ab0ef0056182a94ef1e9bd64743f20e887a31249dc06 WHIRLPOOL 512bda5d7170c6e916815468cdef499a31f10fe6a24ab4674e7c451a3f11396c2d5ed1b3ad6d313f1433e068c57a9ff916bbe76fa94f867ec24c88cc3e73ee78
+EBUILD eix-0.32.5-r1.ebuild 2941 SHA256 431fa60b9dcfae7d9a372730fa00e2cea9cb79790cd458d217d06a3705516bdf SHA512 ce4660b31445a0bb1b4ff1a4624e0f8db7f6a6ced85a8e3b7109e2bd6dc8244511fa95e4b79d130823917ff810529f9e611e92c5a13dba0c0941e089fa6eb254 WHIRLPOOL a36c91cb65c98fcede5563e3e76a87d827c0a941e850e63034fb0af48848c7e6e6f43df83beac3dfb03d35e2c1dc0cdb72bd7f3f0cd4769c9851e1fb10ea2786
+EBUILD eix-0.32.5.ebuild 2454 SHA256 affb1e42e44c972dd070af11bbf9a68394e6c8fe8f3d5869b764978d3e00a6e5 SHA512 248caf260d7f06375eca2a60debc9427326623496a90c321a5f33b141b247c2d660345dfd3aa60473003e02d9e86ba78f14c91c19576f742d700aa7f7dd207c0 WHIRLPOOL 33c8f33093b4c6268f50e044e5ac987cad5b2654a6f2b65edbdb1c13f9b1ab0d384565491bc28a5a59b611b686257789810896818f57d743954f70f73552ced9
+EBUILD eix-0.32.9.ebuild 2937 SHA256 0adbf6b21cc3217c2cf567e9d06ab4a6cd0217fce09ca37ffceaa7ae9f5e64c3 SHA512 6851d0e1708beffaec5e0685d885a0d3d46e93b9bee25a291fb26b6c6837a8003e34c41904218f3af44e50f0fe37c99de4802c0a7909b615264aa3e079cbf1ff WHIRLPOOL e0e7c24899162488df59f74179eb142012968dbca54e7864ff803f3a3b66cb47d6a69c13bf77b029d476f528666e59cc55eaabfbf5c48700dc61003129fed449
+EBUILD eix-0.33.0.ebuild 2949 SHA256 008c1e3ecce8d8034f2b25ad24e3498c166c365c777eeb2de20fad6ebf0080ac SHA512 fdd98d866bafe7c64feecfd4dae28eac41bf4038e2e4db7bfd2b7bb5de2ec33a822df14f73e1bbbc84ba3e0d0a22e8592a2fa607f552d36c9267caeb227e2da8 WHIRLPOOL 0936e2a483dd6bf05097a5124826580af4684c5dcd300fd10b19656ad406fd24c07ace2b2da776076ca8c488f465f74a895386ec2f4c8a4bfec5759013b9ff76
+MISC ChangeLog 9770 SHA256 4b50e3176529311b7210564458969cfe7e9bcccbb476d012507a1b01dcce5d6c SHA512 fb26b4781f4a4af63619763afd097566190545b48a81e737e58ea7aab41f12b4bf8e9e713f4302bea29f3779626cf172f5f3713546a51c39ae14f52faef84da5 WHIRLPOOL c3b7f92c57f9b21cf095f867406895c29de2e5f3ab72a4afeb53994d2a75e3c72ab27239b45fa4fc91373f9bdd5e1c8968ec53fa9f1870932992a75bd51424e6
+MISC ChangeLog-2015 62879 SHA256 dd3e3360c5a6ff69ddc4ebd0263adcbde4b4c72d130ba57b2ae304af40f62c09 SHA512 d6f1888e8cc75bccd6609c062689c64d978458b4bd9056a9297016d1419752f65cc19f7c175d0d0ffe4d7ddfbd3bb22b668717f073525a18cd6c136f9e000f46 WHIRLPOOL 4bb43b05071475173f9bc3afa4d7bfef3ad434c0a8ae9de21d8e9aa78272730c83dc21789aecaf886491aa1c5dbcd93b4a5213b6c83b7124b823225bd4b17c10
+MISC metadata.xml 933 SHA256 f46c9806d9a2a4dffe59f1340a0253a56118c509c5338a6d2c2c4bebf51b1db0 SHA512 e5272580ca0631bcb1150f8a879150e8ae9c90948b3c90ef8ee42631e7345b99c2a6db64ce199a02e86f83ede5f8b41134d50136746d836fe68ae97429a6b550 WHIRLPOOL e5b8206377b7f671b9e65f47e67d91774d667cb93e42336f5fe6cfa5e1f302a5ba7537e96bb40b96a6926bfeec2f075e1b42f53d7d6e938f5702ddb627e3ea57
diff --git a/app-portage/eix/eix-0.32.10.ebuild b/app-portage/eix/eix-0.32.10.ebuild
new file mode 100644
index 000000000000..2026b44a4b15
--- /dev/null
+++ b/app-portage/eix/eix-0.32.10.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="de ru"
+inherit autotools bash-completion-r1 l10n systemd flag-o-matic
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+BOTHDEPEND="nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${BOTHDEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT%/}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions.sh\\\\\":" \
+		-i src/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoicasserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	# https://github.com/vaeth/eix/issues/35
+	append-cxxflags -std=c++11
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	systemd_dotmpfilesd tmpfiles.d/eix.conf
+
+	insinto /usr/share/${PN}
+	doins "${ED}"/usr/bin/eix-functions.sh
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+
+	keepdir /var/cache/eix
+}
+
+pkg_postinst() {
+	if ! use prefix; then
+		# note: if this is done in src_install(), portage:portage
+		# ownership may be reset to root
+		chown portage:portage "${EROOT%/}"/var/cache/eix || die
+	fi
+
+	local obs=${EROOT%/}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT%/}/var/cache/${PN}" || die
+	fi
+}
diff --git a/app-portage/eix/eix-0.32.4.ebuild b/app-portage/eix/eix-0.32.4.ebuild
new file mode 100644
index 000000000000..9f51156cf926
--- /dev/null
+++ b/app-portage/eix/eix-0.32.4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="de ru"
+inherit bash-completion-r1 l10n systemd
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+BOTHDEPEND="nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${BOTHDEPEND}
+	=app-shells/push-2.0
+	=app-shells/quoter-3.0_p2"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT%/}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoicasserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	systemd_dotmpfilesd tmpfiles.d/eix.conf
+
+	keepdir /var/cache/eix
+}
+
+pkg_postinst() {
+	if ! use prefix; then
+		# note: if this is done in src_install(), portage:portage
+		# ownership may be reset to root
+		chown portage:portage "${EROOT%/}"/var/cache/eix || die
+	fi
+
+	local obs=${EROOT%/}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT%/}/var/cache/${PN}" || die
+	fi
+}
diff --git a/app-portage/eix/eix-0.32.5-r1.ebuild b/app-portage/eix/eix-0.32.5-r1.ebuild
new file mode 100644
index 000000000000..2026b44a4b15
--- /dev/null
+++ b/app-portage/eix/eix-0.32.5-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="de ru"
+inherit autotools bash-completion-r1 l10n systemd flag-o-matic
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+BOTHDEPEND="nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${BOTHDEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT%/}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions.sh\\\\\":" \
+		-i src/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoicasserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	# https://github.com/vaeth/eix/issues/35
+	append-cxxflags -std=c++11
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	systemd_dotmpfilesd tmpfiles.d/eix.conf
+
+	insinto /usr/share/${PN}
+	doins "${ED}"/usr/bin/eix-functions.sh
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+
+	keepdir /var/cache/eix
+}
+
+pkg_postinst() {
+	if ! use prefix; then
+		# note: if this is done in src_install(), portage:portage
+		# ownership may be reset to root
+		chown portage:portage "${EROOT%/}"/var/cache/eix || die
+	fi
+
+	local obs=${EROOT%/}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT%/}/var/cache/${PN}" || die
+	fi
+}
diff --git a/app-portage/eix/eix-0.32.5.ebuild b/app-portage/eix/eix-0.32.5.ebuild
new file mode 100644
index 000000000000..2f449772fab8
--- /dev/null
+++ b/app-portage/eix/eix-0.32.5.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="de ru"
+inherit bash-completion-r1 l10n systemd flag-o-matic
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+BOTHDEPEND="nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${BOTHDEPEND}
+	=app-shells/push-2.0
+	=app-shells/quoter-3.0_p2"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT%/}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoicasserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	# https://github.com/vaeth/eix/issues/35
+	append-cxxflags -std=c++11
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	systemd_dotmpfilesd tmpfiles.d/eix.conf
+
+	keepdir /var/cache/eix
+}
+
+pkg_postinst() {
+	if ! use prefix; then
+		# note: if this is done in src_install(), portage:portage
+		# ownership may be reset to root
+		chown portage:portage "${EROOT%/}"/var/cache/eix || die
+	fi
+
+	local obs=${EROOT%/}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT%/}/var/cache/${PN}" || die
+	fi
+}
diff --git a/app-portage/eix/eix-0.32.9.ebuild b/app-portage/eix/eix-0.32.9.ebuild
new file mode 100644
index 000000000000..5d9d774ac772
--- /dev/null
+++ b/app-portage/eix/eix-0.32.9.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="de ru"
+inherit autotools bash-completion-r1 l10n systemd flag-o-matic
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+BOTHDEPEND="nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${BOTHDEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT%/}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions.sh\\\\\":" \
+		-i src/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoicasserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	# https://github.com/vaeth/eix/issues/35
+	append-cxxflags -std=c++11
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	systemd_dotmpfilesd tmpfiles.d/eix.conf
+
+	insinto /usr/share/${PN}
+	doins "${ED}"/usr/bin/eix-functions.sh
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+
+	keepdir /var/cache/eix
+}
+
+pkg_postinst() {
+	if ! use prefix; then
+		# note: if this is done in src_install(), portage:portage
+		# ownership may be reset to root
+		chown portage:portage "${EROOT%/}"/var/cache/eix || die
+	fi
+
+	local obs=${EROOT%/}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT%/}/var/cache/${PN}" || die
+	fi
+}
diff --git a/app-portage/eix/eix-0.33.0.ebuild b/app-portage/eix/eix-0.33.0.ebuild
new file mode 100644
index 000000000000..ecc62a0a6c0d
--- /dev/null
+++ b/app-portage/eix/eix-0.33.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="de ru"
+inherit autotools bash-completion-r1 l10n systemd flag-o-matic
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+BOTHDEPEND="nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${BOTHDEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT%/}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions.sh\\\\\":" \
+		-i src/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-assertsasserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	# https://github.com/vaeth/eix/issues/35
+	append-cxxflags -std=c++11
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	systemd_dotmpfilesd tmpfiles.d/eix.conf
+
+	insinto /usr/share/${PN}
+	doins "${ED}"/usr/bin/eix-functions.sh
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+
+	keepdir /var/cache/eix
+}
+
+pkg_postinst() {
+	if ! use prefix; then
+		# note: if this is done in src_install(), portage:portage
+		# ownership may be reset to root
+		chown portage:portage "${EROOT%/}"/var/cache/eix || die
+	fi
+
+	local obs=${EROOT%/}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT%/}/var/cache/${PN}" || die
+	fi
+}
diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml
new file mode 100644
index 000000000000..f07795f51987
--- /dev/null
+++ b/app-portage/eix/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>xmw@gentoo.org</email>
+    <name>Michael Weber</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>martin@mvath.de</email>
+    <name>Martin Väth</name>
+    <description>Upstream developer, CC on bugs, do not copy ebuilds
+      from his overlay</description>
+  </maintainer>
+  <use>
+    <flag name="debug">Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use.</flag>
+    <flag name="doc">Create description of the eix cache file additionally in html format</flag>
+    <flag name="sqlite">Compile in support for portage's sqlite backend; to actually use it you need additional configuration of portage and eix</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">vaeth/eix</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/elogv/Manifest b/app-portage/elogv/Manifest
new file mode 100644
index 000000000000..43e4b1d895f1
--- /dev/null
+++ b/app-portage/elogv/Manifest
@@ -0,0 +1,15 @@
+DIST elogv-0.7.6.1.tar.gz 17968 SHA256 93630986043e4599d801b187a37272331ac6763f8ddb0ad66343bb037160fc56 SHA512 c2ddea6189165262fae6968d9bb3b8e76f316d9696f07369552ae00eb48a49323232ea7d3609310cd0e440bd912e474dd396a71922dbf5c9f1ee587899ef859e WHIRLPOOL 2c9f2aa779320d8311818e3d9a8ac03c56b1369ae7dd8ab9dea69b87a0146048ec89f570640c552e6faecdde2f40f38aaef0c6332a33e3f7461bad3c39bc9a01
+DIST elogv-0.7.6.2.tar.gz 18206 SHA256 bf33a2444054e9ddd8164ea45144aa346a1e4da518034f33ee605af75f9ff7a0 SHA512 5628a409346d6375f10a77a08eaef6a160abff385701232c78f5d02a9493f84c451a53f301940a96e177eb295198d05e9c3e2525ab89ad6565f0eca2f2b0102e WHIRLPOOL ed83c38f174eea228bbbddf4edb17ec1ee571a6d0693954af012223bc84bf38351b16304747c8b3dfe3baab67634bf5530783f4845e9a9beeed52cbc43f45bd5
+DIST elogv-0.7.6.3.tar.gz 18424 SHA256 916c557ecb21e7fa2f2fbe2963804e95aefdaf983e99db565fee6f79baf1f94f SHA512 c9127a4770721bd66cd75cf197af9262f7764f8227c36a7229d597fcd9e8db52aeffb42bdcc7b0c0ff20bdcfc9d18b9a568b0456b71ec764a937b148f9893677 WHIRLPOOL 67f2e62978a335c1ccfb8e91aa4ed8fa4c20dca6fda190f6ae5f61dde89f310ea0aa1b543c9b71b504c60a9d39b46d16086f13c0c87d6ead417e2b1c8c86feba
+DIST elogv-0.7.6.4.tar.gz 18481 SHA256 9279a1fc1ec981142bf44694e1d714859b92a33ea1a2f8c33814f0d2f045b72c SHA512 e9331438552a63c26afc3f16ed4877298bb976a242639c0aae506507570b68cc677bc6e491f0b293a1986579c9edbab769b8d63924f9b0a18ad1e5a222f4d388 WHIRLPOOL d86f0e284200eb76f9fce82f0d2eccd8fe74e5c548d640e159e89db9a8685c3b44dc0350d4b6a6b2004cad07ca4568e11e0a594cf6ef2a298c413d632843397d
+DIST elogv-0.7.6.5.tar.gz 19021 SHA256 e3d6d29eefae2e1672b96f40837859ff12e2ebb6c37b0a244e0b35c14a0ea5cd SHA512 4a596653ca1c1dc3c315cdf111ddf12d7af5514582da50bf659c48d063fd971c2466d1bd0e4fa1e92e71afaa9715024269cf7ed3a5969ce986742a2c5f648c4a WHIRLPOOL e698e828a076f8d8477fa1a99d2a69e81a256771f5c00f24dd14cbc76fc4f99141dfa518a4a223f928f4503a679351fdb0cc0e84e9d03938208ddd496b3b74b4
+DIST elogv-0.7.6.6.tar.gz 19362 SHA256 224fbf37acb725e6e6942d4685d75e5281218eb2eabf16fc090da9ffa39f513c SHA512 d044feecbbef17d676551e545dcc4e6e27779668371d40d891d53bb7187474f665a422a732a0e95246fbd9d689ddeca509a74b6ce677f3a50871878e12895cba WHIRLPOOL dc86b3cb1bfbb29fba5f65de2189fd238c0afec739c05155c68f144bbe3517d15291ebc5624c987c79fb3f5d1f33b2016803b6bf90f20855608fe31503316197
+EBUILD elogv-0.7.6.1-r1.ebuild 1651 SHA256 5a21df63d1d34b52bad6efe80f6582a01ea3fbee9cb6beaa6af206ea08ff50c1 SHA512 16c45d42c0b06feed893cdbae62210e79e4228f2b5a6e2d3dd225efc8c03f27b3984dff6e8a06975f4b2e7580e732b214c1cd62c9add079dd3675d6ea199c0c2 WHIRLPOOL 0ad8b27d34c328bb50f9bb8662113aeb98546f322413a29f64f60bdbdb18bb7a41722d5206f0beb2f2eb2486584a1a08395390affb2823199bf979f28e0024ca
+EBUILD elogv-0.7.6.2.ebuild 1655 SHA256 a89fe28193eb472291fb966ee1812699fde52d4fe15e65276834752e4a741a08 SHA512 c208d2ea697f359b29f469c9a6e541cc5302e9f333a0339cce0dc659cb2679142a3fa95cdd78752caa9e6c046f61803a0a27d1ba30700c8f260bc84493b2559e WHIRLPOOL bd2b5be61ec4a3848bd0e3db66e81302156dac0ec2a98b81bf67bc3b537b531dfa65156787ceb4f77198491c32585fd2e1835607c53e2f0fb49628b8bb652ecd
+EBUILD elogv-0.7.6.3.ebuild 1655 SHA256 a89fe28193eb472291fb966ee1812699fde52d4fe15e65276834752e4a741a08 SHA512 c208d2ea697f359b29f469c9a6e541cc5302e9f333a0339cce0dc659cb2679142a3fa95cdd78752caa9e6c046f61803a0a27d1ba30700c8f260bc84493b2559e WHIRLPOOL bd2b5be61ec4a3848bd0e3db66e81302156dac0ec2a98b81bf67bc3b537b531dfa65156787ceb4f77198491c32585fd2e1835607c53e2f0fb49628b8bb652ecd
+EBUILD elogv-0.7.6.4.ebuild 1655 SHA256 a89fe28193eb472291fb966ee1812699fde52d4fe15e65276834752e4a741a08 SHA512 c208d2ea697f359b29f469c9a6e541cc5302e9f333a0339cce0dc659cb2679142a3fa95cdd78752caa9e6c046f61803a0a27d1ba30700c8f260bc84493b2559e WHIRLPOOL bd2b5be61ec4a3848bd0e3db66e81302156dac0ec2a98b81bf67bc3b537b531dfa65156787ceb4f77198491c32585fd2e1835607c53e2f0fb49628b8bb652ecd
+EBUILD elogv-0.7.6.5.ebuild 1655 SHA256 a89fe28193eb472291fb966ee1812699fde52d4fe15e65276834752e4a741a08 SHA512 c208d2ea697f359b29f469c9a6e541cc5302e9f333a0339cce0dc659cb2679142a3fa95cdd78752caa9e6c046f61803a0a27d1ba30700c8f260bc84493b2559e WHIRLPOOL bd2b5be61ec4a3848bd0e3db66e81302156dac0ec2a98b81bf67bc3b537b531dfa65156787ceb4f77198491c32585fd2e1835607c53e2f0fb49628b8bb652ecd
+EBUILD elogv-0.7.6.6.ebuild 1655 SHA256 a89fe28193eb472291fb966ee1812699fde52d4fe15e65276834752e4a741a08 SHA512 c208d2ea697f359b29f469c9a6e541cc5302e9f333a0339cce0dc659cb2679142a3fa95cdd78752caa9e6c046f61803a0a27d1ba30700c8f260bc84493b2559e WHIRLPOOL bd2b5be61ec4a3848bd0e3db66e81302156dac0ec2a98b81bf67bc3b537b531dfa65156787ceb4f77198491c32585fd2e1835607c53e2f0fb49628b8bb652ecd
+MISC ChangeLog 3008 SHA256 90a63dc88a36eee766f7e94ac209de32e8fdaeb1da707ccdb3303d9452d414aa SHA512 280b3eac14c8e7ed08a57fb438306b73b2b142a5789639568243543cc16019f8aa587e3788a9989b9aee59a3f6b5f4700facfb1a20342c04cf3dcbfb5221b33c WHIRLPOOL 1a4984d270b21cf4e9ca03be33e4642dfe97f0d18a27bff92ad4fdca613360d3df51ee9286536d6d88419c1b7bfc397b596c048da18cb3472862464e64b71e45
+MISC ChangeLog-2015 13040 SHA256 976ae252005fb8b77e8aad2cce6c86b91761d37bb13fa50bb9d5f4a3a1f4412c SHA512 425079af3e9b780bed71ecb0354b2971b4ea72e1c6d61afbb061208ec9a19b80778e32df960c70d82df6605f09a0f24a468e13c23b9182144612f3b7baad0942 WHIRLPOOL b08ea8253f1a6913dc7aa9fda84afdaef011096d015e467ebbe2bf70fa77cf2913d4294309dcdeb5400f2d9b378464ce6e5eb132821b9c381014ae46aba297bb
+MISC metadata.xml 582 SHA256 9d929e6276204049cc2b069430938e44e98bf911d618252953e91d022dc761b0 SHA512 88148334ec51fcaf83c44026110439fc03a5b5ecfdd3e44e202a76a51614433109e5b21a115619b9177a004716551cf714d60bb7ce2f32c411cf1a7a4b2d7e4f WHIRLPOOL 7b931f061e10a8e333b1780650f8012adaef3229657c9837e29881ebe42e4ee10c44522d9e12a8784211cdc82588a6479608e8cbb083522d7cb3e4f222023478
diff --git a/app-portage/elogv/elogv-0.7.6.1-r1.ebuild b/app-portage/elogv/elogv-0.7.6.1-r1.ebuild
new file mode 100644
index 000000000000..a4bbdde6db36
--- /dev/null
+++ b/app-portage/elogv/elogv-0.7.6.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
+HOMEPAGE="https://github.com/gentoo/elogv"
+SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="linguas_de linguas_es linguas_it linguas_pl"
+
+DOCS=( README )
+
+src_install() {
+	distutils-r1_src_install
+
+	# unset LINGUAS => install all languages
+	# empty LINGUAS => install none
+	local i
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(ls "${ED}"/usr/share/locale/) ; do
+			if ! has ${i} ${LINGUAS} ; then
+				rm -rf "${ED}"/usr/share/{locale,man}/${i}
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	elog "  dev-python/pyliblzma (for xz compressed elog files)"
+	elog
+	elog "In order to use this software, you need to activate"
+	elog "Portage's elog features.  Required is"
+	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
+	elog "and at least one out of "
+	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
+	elog "More information on the elog system can be found"
+	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
+	elog
+	elog "To operate properly this software needs the directory"
+	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
+	elog "To start the software as a user, add yourself to the portage"
+	elog "group."
+	elog
+}
diff --git a/app-portage/elogv/elogv-0.7.6.2.ebuild b/app-portage/elogv/elogv-0.7.6.2.ebuild
new file mode 100644
index 000000000000..70a51bcf1487
--- /dev/null
+++ b/app-portage/elogv/elogv-0.7.6.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
+HOMEPAGE="https://github.com/gentoo/elogv"
+SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="linguas_de linguas_es linguas_it linguas_pl"
+
+DOCS=( README )
+
+src_install() {
+	distutils-r1_src_install
+
+	# unset LINGUAS => install all languages
+	# empty LINGUAS => install none
+	local i
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(ls "${ED}"/usr/share/locale/) ; do
+			if ! has ${i} ${LINGUAS} ; then
+				rm -rf "${ED}"/usr/share/{locale,man}/${i}
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	elog "  dev-python/pyliblzma (for xz compressed elog files)"
+	elog
+	elog "In order to use this software, you need to activate"
+	elog "Portage's elog features.  Required is"
+	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
+	elog "and at least one out of "
+	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
+	elog "More information on the elog system can be found"
+	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
+	elog
+	elog "To operate properly this software needs the directory"
+	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
+	elog "To start the software as a user, add yourself to the portage"
+	elog "group."
+	elog
+}
diff --git a/app-portage/elogv/elogv-0.7.6.3.ebuild b/app-portage/elogv/elogv-0.7.6.3.ebuild
new file mode 100644
index 000000000000..70a51bcf1487
--- /dev/null
+++ b/app-portage/elogv/elogv-0.7.6.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
+HOMEPAGE="https://github.com/gentoo/elogv"
+SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="linguas_de linguas_es linguas_it linguas_pl"
+
+DOCS=( README )
+
+src_install() {
+	distutils-r1_src_install
+
+	# unset LINGUAS => install all languages
+	# empty LINGUAS => install none
+	local i
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(ls "${ED}"/usr/share/locale/) ; do
+			if ! has ${i} ${LINGUAS} ; then
+				rm -rf "${ED}"/usr/share/{locale,man}/${i}
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	elog "  dev-python/pyliblzma (for xz compressed elog files)"
+	elog
+	elog "In order to use this software, you need to activate"
+	elog "Portage's elog features.  Required is"
+	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
+	elog "and at least one out of "
+	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
+	elog "More information on the elog system can be found"
+	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
+	elog
+	elog "To operate properly this software needs the directory"
+	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
+	elog "To start the software as a user, add yourself to the portage"
+	elog "group."
+	elog
+}
diff --git a/app-portage/elogv/elogv-0.7.6.4.ebuild b/app-portage/elogv/elogv-0.7.6.4.ebuild
new file mode 100644
index 000000000000..70a51bcf1487
--- /dev/null
+++ b/app-portage/elogv/elogv-0.7.6.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
+HOMEPAGE="https://github.com/gentoo/elogv"
+SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="linguas_de linguas_es linguas_it linguas_pl"
+
+DOCS=( README )
+
+src_install() {
+	distutils-r1_src_install
+
+	# unset LINGUAS => install all languages
+	# empty LINGUAS => install none
+	local i
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(ls "${ED}"/usr/share/locale/) ; do
+			if ! has ${i} ${LINGUAS} ; then
+				rm -rf "${ED}"/usr/share/{locale,man}/${i}
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	elog "  dev-python/pyliblzma (for xz compressed elog files)"
+	elog
+	elog "In order to use this software, you need to activate"
+	elog "Portage's elog features.  Required is"
+	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
+	elog "and at least one out of "
+	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
+	elog "More information on the elog system can be found"
+	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
+	elog
+	elog "To operate properly this software needs the directory"
+	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
+	elog "To start the software as a user, add yourself to the portage"
+	elog "group."
+	elog
+}
diff --git a/app-portage/elogv/elogv-0.7.6.5.ebuild b/app-portage/elogv/elogv-0.7.6.5.ebuild
new file mode 100644
index 000000000000..70a51bcf1487
--- /dev/null
+++ b/app-portage/elogv/elogv-0.7.6.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
+HOMEPAGE="https://github.com/gentoo/elogv"
+SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="linguas_de linguas_es linguas_it linguas_pl"
+
+DOCS=( README )
+
+src_install() {
+	distutils-r1_src_install
+
+	# unset LINGUAS => install all languages
+	# empty LINGUAS => install none
+	local i
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(ls "${ED}"/usr/share/locale/) ; do
+			if ! has ${i} ${LINGUAS} ; then
+				rm -rf "${ED}"/usr/share/{locale,man}/${i}
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	elog "  dev-python/pyliblzma (for xz compressed elog files)"
+	elog
+	elog "In order to use this software, you need to activate"
+	elog "Portage's elog features.  Required is"
+	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
+	elog "and at least one out of "
+	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
+	elog "More information on the elog system can be found"
+	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
+	elog
+	elog "To operate properly this software needs the directory"
+	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
+	elog "To start the software as a user, add yourself to the portage"
+	elog "group."
+	elog
+}
diff --git a/app-portage/elogv/elogv-0.7.6.6.ebuild b/app-portage/elogv/elogv-0.7.6.6.ebuild
new file mode 100644
index 000000000000..70a51bcf1487
--- /dev/null
+++ b/app-portage/elogv/elogv-0.7.6.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
+HOMEPAGE="https://github.com/gentoo/elogv"
+SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="linguas_de linguas_es linguas_it linguas_pl"
+
+DOCS=( README )
+
+src_install() {
+	distutils-r1_src_install
+
+	# unset LINGUAS => install all languages
+	# empty LINGUAS => install none
+	local i
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(ls "${ED}"/usr/share/locale/) ; do
+			if ! has ${i} ${LINGUAS} ; then
+				rm -rf "${ED}"/usr/share/{locale,man}/${i}
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	elog "  dev-python/pyliblzma (for xz compressed elog files)"
+	elog
+	elog "In order to use this software, you need to activate"
+	elog "Portage's elog features.  Required is"
+	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
+	elog "and at least one out of "
+	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
+	elog "More information on the elog system can be found"
+	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
+	elog
+	elog "To operate properly this software needs the directory"
+	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
+	elog "To start the software as a user, add yourself to the portage"
+	elog "group."
+	elog
+}
diff --git a/app-portage/elogv/metadata.xml b/app-portage/elogv/metadata.xml
new file mode 100644
index 000000000000..b1e51624af0f
--- /dev/null
+++ b/app-portage/elogv/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>fuzzyray@gentoo.org</email>
+    <name>Paul Varner</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>sping@gentoo.org</email>
+    <name>Sebastian Pipping</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>tools-portage@gentoo.org</email>
+    <name>Gentoo Portage tools team</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">gentoo/elogv</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
new file mode 100644
index 000000000000..bd93ba665a52
--- /dev/null
+++ b/app-portage/elogviewer/Manifest
@@ -0,0 +1,15 @@
+AUX elogviewer-0.6.2-missing_newline.patch 806 SHA256 a3c38393f11a280f0a80a7640f7b4995b8be942fc0e302ff6a39c26553190705 SHA512 e2e335f679cfd8850c9797f1233464b44abc9939f48ab218aae94e072c597a10a1814411f7453d01ef39c79382d5904c48efa12b9eecb6282d3cb9fde3a54968 WHIRLPOOL 87f9365d13ab656929985f003e039f6644a7e182335e429b4f5a6a6d7bef43ccd77fc93f51d82be7371373ea35fffb1417af33f8d5c9db1bdab6f6381705401a
+DIST elogviewer-0.6.2.tar.gz 13904 SHA256 27c879a64824dbee50b6f8ddd387047d4bfe80f101fadf24571ba1b12b135dbf SHA512 dccf4dffb87fefb7d9e0609b3312d63b73c1b9c5933819c38b775b049e222687e9da06e63fe8194560f4bb631fa586b4746af9e0a7575eefa782b57d9c1c6e04 WHIRLPOOL 46d04c684b741d337a7c713b3bb375dc78afc99b573a8f229f9970609c6628a5dd6d30e4112c33c19ef7cc24502a5019079a8d70b47a81f199440643926ef80a
+DIST elogviewer-2.1.tar.gz 14968 SHA256 12e13c1fec1651e57cf39f66231a2cf27af5110c1b4944ac84f76de7f9cc7fe7 SHA512 27a34ce67e16a51055246b7169c11c248310b2a1d987018938094301b2602839e48909e3224f7d791343bb691de8e2f0ca7b00bd1477e2b3b43d61a24b4e688f WHIRLPOOL c4ab91936d147121d3ab34d04d5c74587d5c4f61f56e2e1c35e0ceed5d92537d29642599b8c5215c2405c892b00f244a30c980da9270b3afab61cd083227e85e
+DIST elogviewer-2.6.tar.gz 16093 SHA256 299c58bdf0394a485cda7688e0e668fc028f83730841322a8e41a49902aba558 SHA512 1ca43c0ddc7dcab6a9e753644866b0a8ec8ddb5a56d2b8a25ab06f9ee1fc759910ef7af6257c3c98b886700121f078409931aada67b2aad03a43f440a0b8f233 WHIRLPOOL 77e85cb24a6a43d8068eb1aadbdba61c4addcd686398005181735ae552edbab6e62d4eefad6722dc744b166736c164f66e29e2b4db92014cef622592e0d09f77
+DIST elogviewer-2.7.tar.gz 19936 SHA256 7d4f8326d52f56c5fa50fa423d23ad77e1863c9b01c66e16bd587c7aa31470c4 SHA512 81cf20e8e5509d83634d601f0920bd369e1974c843b600b54faa433dc9927a0df6c9820d2b1f35b241bcd86ea891945f16ec2b0d1b65d08c085a3b245c8b038d WHIRLPOOL 323cfe91af23a3fb95b5305bdba04e28c8ce85aaa479ed264686fea41861de2ca8a3f5a80342d7ea14499e55b0eca7de65039b05156e7f51cd118ab1d842c4c4
+EBUILD elogviewer-0.6.2-r3.ebuild 1627 SHA256 55a0204b6d90dda2229499f48341fbfb6c0f1e5563ccda624bc4454c2a301314 SHA512 37f1e3c1251bbb2b7dd8e192bf8d64316836f88c77e1f890b42116bca24ea98d0a4f9768e345958a08f0f4e3742c716e6998cc71e261c4888974e1f07cae8e3d WHIRLPOOL 212e0963f4ea0c5f43561241d28fb018208c4d357b75ba5e6fcee10078559f19ac8cf6a27c7103df172ae320590e7c8c9831e9299746649f1781be10e0daf109
+EBUILD elogviewer-2.1-r1.ebuild 1343 SHA256 48568e4ec9fb3e2619f238f35d0e0935100907de50353f39e19b53d3dd133270 SHA512 2db28fda43a17633e0bccc7a73c8e52d4083c7cbf6999308373d2495f67b3686ac14b5b1972c41764e503223891a26ad801dd0f212fc1cc4662f067445d0250e WHIRLPOOL e74d9fa1b07e4d12100ae30f2379632a508cdd3982ecaa9cf318a2abfe3a82c86c0e5072ecee3e4f5730039dcb682fbc9b2c1610a28b5d9d79bfd5d1738b6668
+EBUILD elogviewer-2.1-r2.ebuild 1349 SHA256 48cbeff316340162b8672f8a2d02cd1040b185107c772ba6e1995c0de184fba5 SHA512 bf1fbfd6b012dd6c0e1f9ea31b6356098219cfd15373bf4b4471b785fc67f40c13850cd1735119898b5ea60e23dee0f7e8f8db3ff3f93138012dfcd9bbb50583 WHIRLPOOL 3a584993738ceafe8563ca73f54d9d3b6af0e877c7af668f76941db631fadbc52e44827f5f33fb4d41e4ebe955208d1d32245e75d76d1e086fbb9e48af99727b
+EBUILD elogviewer-2.6-r1.ebuild 1511 SHA256 a5a74fac591bc5b666642b8c64de820a58b23c0067e4e3ee260386bfd4502a62 SHA512 5996ca563a74e8ec679c0e4ea87821d4b0bbbabeba6c32a51a8bc5b2c360e53dcbd419b2422a8852b628b8f720f9083476c2e8d4e4a2c34ddb060095630a96bf WHIRLPOOL c8ea1857c03d0681d30ac4ca454f6d67c11fb345f26baa7c808d0bffafa181a728e25e52ac1a98ce98f568a167683d66ef2692b7e4ce7c74fed595ab9a93a841
+EBUILD elogviewer-2.6-r2.ebuild 1569 SHA256 5a40a3df74705ca16192d9509f7cd00d3a55149f1901edc6fb42f1db8972e823 SHA512 9a05aad3e028ed993283c0bb9dbef9b517f0f7b58d4c85b955404b75253677b916d91b8a28a3c8b566f153c680d0f72ccb72daa101fe9c29681a6d5b7adbad5a WHIRLPOOL c092a3d83a53062cbed4b3a7ee49e0478591ff937ebe787cffac2eb03b39002bf5f0ff80d208276a7b4f887040e264a094805197fbe58aaa8f88de17aa2df9e2
+EBUILD elogviewer-2.6.ebuild 1457 SHA256 26ea347d9d70b31b4bfe64a3f7c97bfe1745d6ba1e346fb8d5c4ff77ae5f3328 SHA512 1914a17e6a2dbb062b3b15c051e32be7d4c03d46243d359d192af79f0496354ef0ade2af62ac4dba01624f0f379fcb7c0c03d9f7af83669b029f81e79ba600e9 WHIRLPOOL c61af34714d8e0bf5c70c7970510138dea882bd7dd46dd94acb7207895ffea960c54258e6c16b99e8b5ca6b3846391f838e2d0fb30a994ed1ae7c2230023cc60
+EBUILD elogviewer-2.7.ebuild 1831 SHA256 bf662f9c22c515e502e9743dfe7454f07a7432f1ae083a946ff3eb344272891d SHA512 e860952f7ea59fba7fa31c81ca4a9568c96164430d70a897c998f4b4c0c5ab505233a9648c9004215c6db3055fb4d4c656c718cc35b540f5b350411bb773e1dd WHIRLPOOL 060597e6a935d22c9424650384b1017251a8a87fdf9e18e007b5916e79917fd5856dd577226ffe5e4cf4f7c93f20ac00e4bdb2cae02fd3cd1b1ef4bfd1e80731
+MISC ChangeLog 6014 SHA256 0948ad48075a4d364146a8d535856dc291873f7fa6774a20cab8bdcec58688e8 SHA512 a59bc2f35010c4bb7d8a11da97c3bdd61d8943440d1e41535907c2c7916cb9f78398a2db5b3d6ac84cdf345f4e8628ea3aa5fb9f2fc414d5e8917f342e1dea09 WHIRLPOOL f556caaf20df4200604e5d712940060c05d9458802e17f7d5d5cd3de450664409f166bb7091cf500158b7f3e734da491e4ea44e34cff7562ff870402aa2e9611
+MISC ChangeLog-2015 9729 SHA256 5be12d42304859b608d8a7eecd494984ed01c08684c33e67f096f402bdac2e24 SHA512 d5d514a4d1f6c69abe1333f0cc70cc25529325b072613e9eaff79dcb85cce9af8a95a2b94f569fd278a400e0da6bb129b1a901f8c33106bcba62dac5d73f61b4 WHIRLPOOL 42c98ba36e935989cf065503c9fae076b8fadb5c629ef2a9dd1ecc937542e4e37bbe8b3006bba72a5fd1fc82040d90f23fd765578d171466995693cac69e5cd5
+MISC metadata.xml 509 SHA256 10070c725fe3c5eda3ad39c19b30cbd10e521dd8a337c2dfbc45391bc47ab9aa SHA512 2fc82898f7f2968181f8ea2cbcb3ad34327f4849e6060ab818c4d4d9bf58a8515027e74dc6034dd1016e12c0df7fb84d0c234235880ee547a5ae3fac9a09e1b3 WHIRLPOOL 2452655d6e208c51263b55e3868380576d5d79f3b773eb50e48368a05668d0a9dab2c69d06ac53ea661ef18cac10b4282888dd235d54c135f4634f911de348ad
diff --git a/app-portage/elogviewer/elogviewer-0.6.2-r3.ebuild b/app-portage/elogviewer/elogviewer-0.6.2-r3.ebuild
new file mode 100644
index 000000000000..de0a0d95ee43
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-0.6.2-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-r1
+
+DESCRIPTION="GTK+ based utility to parse the contents of elogs created by Portage"
+HOMEPAGE="https://sourceforge.net/projects/elogviewer/"
+
+SRC_URI="mirror://sourceforge/elogviewer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}
+	>=sys-apps/portage-2.1
+	>=dev-python/pygtk-2.0"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	# Apply patch from Bug 349071 to restore missing newline
+	epatch "${FILESDIR}/${P}-missing_newline.patch"
+	# Fix bug #453016
+	sed -e 's|is not ""|!= ""|' -i elogviewer || die
+}
+
+src_install() {
+	python_foreach_impl python_doscript  "${WORKDIR}"/elogviewer
+	dodoc "${WORKDIR}"/CHANGELOG
+	doman "${WORKDIR}"/elogviewer.1
+	make_desktop_entry elogviewer Elogviewer "" "System" ||
+		die "Couldn't make desktop entry"
+}
+
+pkg_postinst() {
+	elog
+	elog "In order to use this software, you need to activate"
+	elog "Portage's elog features.  Required is"
+	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
+	elog "and at least one out of "
+	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
+	elog "More information on the elog system can be found"
+	elog "in /usr/share/portage/config/make.conf.example"
+	elog
+	elog "To operate properly this software needs the directory"
+	elog "${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage."
+	elog "To start the software as a user, add yourself to the portage"
+	elog "group."
+	elog
+}
diff --git a/app-portage/elogviewer/elogviewer-2.1-r1.ebuild b/app-portage/elogviewer/elogviewer-2.1-r1.ebuild
new file mode 100644
index 000000000000..3d151f53b65d
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-2.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=(python2_7)
+
+inherit distutils-r1
+
+DESCRIPTION="Elog viewer for Gentoo"
+HOMEPAGE="https://sourceforge.net/projects/elogviewer"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+		|| ( dev-python/PyQt4[${PYTHON_USEDEP},X]
+			dev-python/pyside[${PYTHON_USEDEP},X] )
+		>=sys-apps/portage-2.1
+		"
+DEPEND="${RDEPEND}
+		dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+	mv elogviewer.py elogviewer
+	dobin elogviewer
+	doman elogviewer.1
+	dodoc LICENSE.TXT
+}
+
+pkg_postinst() {
+	elog
+	elog "In order to use this software, you need to activate"
+	elog "Portage's elog features.  Required is"
+	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
+	elog "and at least one of "
+	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
+	elog "More information on the elog system can be found"
+	elog "in /usr/share/portage/config/make.conf.example"
+	elog
+	elog "To operate properly this software needs the directory"
+	elog "${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage."
+	elog "To start the software as a user, add yourself to the portage"
+	elog "group."
+	elog
+}
diff --git a/app-portage/elogviewer/elogviewer-2.1-r2.ebuild b/app-portage/elogviewer/elogviewer-2.1-r2.ebuild
new file mode 100644
index 000000000000..53a2e8edd64d
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-2.1-r2.ebuild
@@ -0,0 +1,49 @@
+# 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})
+
+inherit distutils-r1
+
+DESCRIPTION="Elog viewer for Gentoo"
+HOMEPAGE="https://sourceforge.net/projects/elogviewer"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+		|| ( dev-python/PyQt4[${PYTHON_USEDEP},X]
+			dev-python/pyside[${PYTHON_USEDEP},X] )
+		>=sys-apps/portage-2.1
+		"
+DEPEND="${RDEPEND}
+		dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+	mv elogviewer.py elogviewer
+	dobin elogviewer
+	doman elogviewer.1
+	dodoc LICENSE.TXT
+}
+
+pkg_postinst() {
+	elog
+	elog "In order to use this software, you need to activate"
+	elog "Portage's elog features.  Required is"
+	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
+	elog "and at least one of "
+	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
+	elog "More information on the elog system can be found"
+	elog "in /usr/share/portage/config/make.conf.example"
+	elog
+	elog "To operate properly this software needs the directory"
+	elog "${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage."
+	elog "To start the software as a user, add yourself to the portage"
+	elog "group."
+	elog
+}
diff --git a/app-portage/elogviewer/elogviewer-2.6-r1.ebuild b/app-portage/elogviewer/elogviewer-2.6-r1.ebuild
new file mode 100644
index 000000000000..e7579cce328c
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-2.6-r1.ebuild
@@ -0,0 +1,50 @@
+# 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})
+DISABLE_AUTOFORMATTING=true
+inherit distutils-r1 eutils readme.gentoo
+
+DESCRIPTION="Elog viewer for Gentoo"
+HOMEPAGE="https://sourceforge.net/projects/elogviewer"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	|| (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		dev-python/PyQt4[${PYTHON_USEDEP},X]
+		dev-python/pyside[${PYTHON_USEDEP},X] )
+	>=sys-apps/portage-2.1
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
+	!dev-python/PyQt5[-gui]
+	!dev-python/PyQt5[-widgets]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOC_CONTENTS="In order to use this software, you need to activate
+Portage's elog features.  Required is
+	PORTAGE_ELOG_SYSTEM=\"save\"
+and at least one of
+	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
+More information on the elog system can be found in
+/usr/share/portage/config/make.conf.example
+
+To operate properly this software needs the directory
+${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
+To start the software as a user, add yourself to the portage group."
+
+src_install() {
+	mv elogviewer.py elogviewer
+	dobin elogviewer
+	doman elogviewer.1
+	make_desktop_entry ${PN} ${PN} ${PN} System
+	readme.gentoo_src_install
+}
diff --git a/app-portage/elogviewer/elogviewer-2.6-r2.ebuild b/app-portage/elogviewer/elogviewer-2.6-r2.ebuild
new file mode 100644
index 000000000000..94b30a95ff5d
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-2.6-r2.ebuild
@@ -0,0 +1,59 @@
+# 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} )
+
+DISABLE_AUTOFORMATTING=true
+
+inherit python-single-r1 eutils readme.gentoo-r1
+
+DESCRIPTION="Elog viewer for Gentoo"
+HOMEPAGE="https://sourceforge.net/projects/elogviewer"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	|| (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		dev-python/PyQt4[${PYTHON_USEDEP},X]
+		dev-python/pyside[${PYTHON_USEDEP},X]
+	)
+	>=sys-apps/portage-2.1
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
+	!dev-python/PyQt5[-gui]
+	!dev-python/PyQt5[-widgets]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOC_CONTENTS="In order to use this software, you need to activate
+Portage's elog features.  Required is
+	PORTAGE_ELOG_SYSTEM=\"save\"
+and at least one of
+	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
+More information on the elog system can be found in
+/usr/share/portage/config/make.conf.example
+
+To operate properly this software needs the directory
+${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
+To start the software as a user, add yourself to the portage group."
+
+src_install() {
+	python_newscript elogviewer.py elogviewer
+
+	make_desktop_entry ${PN} ${PN} ${PN} System
+
+	doman elogviewer.1
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-portage/elogviewer/elogviewer-2.6.ebuild b/app-portage/elogviewer/elogviewer-2.6.ebuild
new file mode 100644
index 000000000000..c1e8197e554c
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-2.6.ebuild
@@ -0,0 +1,48 @@
+# 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})
+DISABLE_AUTOFORMATTING=true
+inherit distutils-r1 eutils readme.gentoo
+
+DESCRIPTION="Elog viewer for Gentoo"
+HOMEPAGE="https://sourceforge.net/projects/elogviewer"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	|| (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		dev-python/PyQt4[${PYTHON_USEDEP},X]
+		dev-python/pyside[${PYTHON_USEDEP},X] )
+	>=sys-apps/portage-2.1
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOC_CONTENTS="In order to use this software, you need to activate
+Portage's elog features.  Required is
+	PORTAGE_ELOG_SYSTEM=\"save\"
+and at least one of
+	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
+More information on the elog system can be found in
+/usr/share/portage/config/make.conf.example
+
+To operate properly this software needs the directory
+${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
+To start the software as a user, add yourself to the portage group."
+
+src_install() {
+	mv elogviewer.py elogviewer
+	dobin elogviewer
+	doman elogviewer.1
+	make_desktop_entry ${PN} ${PN} ${PN} System
+	readme.gentoo_src_install
+}
diff --git a/app-portage/elogviewer/elogviewer-2.7.ebuild b/app-portage/elogviewer/elogviewer-2.7.ebuild
new file mode 100644
index 000000000000..6d26ee4235d0
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-2.7.ebuild
@@ -0,0 +1,67 @@
+# 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} )
+
+DISABLE_AUTOFORMATTING=true
+
+inherit python-single-r1 eutils readme.gentoo-r1
+
+DESCRIPTION="Elog viewer for Gentoo"
+HOMEPAGE="https://sourceforge.net/projects/elogviewer"
+SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	|| (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		dev-python/PyQt4[${PYTHON_USEDEP},X]
+		dev-python/pyside[${PYTHON_USEDEP},X]
+	)
+	>=sys-apps/portage-2.1
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	!dev-python/PyQt5[-gui]
+	!dev-python/PyQt5[-widgets]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOC_CONTENTS="In order to use this software, you need to activate
+Portage's elog features.  Required is
+	PORTAGE_ELOG_SYSTEM=\"save\"
+and at least one of
+	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
+More information on the elog system can be found in
+/usr/share/portage/config/make.conf.example
+
+To operate properly this software needs the directory
+${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
+To start the software as a user, add yourself to the portage group."
+
+src_compile() {
+	rm -f Makefile
+}
+
+src_install() {
+	python_newscript elogviewer.py elogviewer
+
+	make_desktop_entry ${PN} ${PN} ${PN} System
+
+	doman elogviewer.1
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	ewarn "The elogviewer's configuration file is now saved in:"
+	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
+	ewarn "Please migrate any user specific settings to the new config file."
+}
diff --git a/app-portage/elogviewer/files/elogviewer-0.6.2-missing_newline.patch b/app-portage/elogviewer/files/elogviewer-0.6.2-missing_newline.patch
new file mode 100644
index 000000000000..e7f3e79a6a93
--- /dev/null
+++ b/app-portage/elogviewer/files/elogviewer-0.6.2-missing_newline.patch
@@ -0,0 +1,23 @@
+Add missing newline and remove debug print statement
+
+https://bugs.gentoo.org/349071
+
+--- elogviewer
++++ elogviewer
+@@ -154,7 +154,7 @@
+                     and self.filters[section] == True:
+                     self.insert_with_tags(
+                         self.get_end_iter(),
+-                        line,
++                        line + '\n',
+                         self.get_tag_table().lookup(header))
+         finally:
+             file_obj.close()
+@@ -385,7 +385,6 @@
+         if len(split_filename) is 3:
+             (self._category, self._package, t) = split_filename
+         elif len(split_filename) is 2:
+-            print split_filename
+             (self._category, self._package) = split_filename[0].split('/')
+             t = split_filename[1]
+         t = time.strptime(t, itime)
diff --git a/app-portage/elogviewer/metadata.xml b/app-portage/elogviewer/metadata.xml
new file mode 100644
index 000000000000..2ac6f8372519
--- /dev/null
+++ b/app-portage/elogviewer/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>fuzzyray@gentoo.org</email>
+		<name>Paul Varner</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">elogviewer</remote-id>
+		<remote-id type="github">Synss/elogviewer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
new file mode 100644
index 000000000000..6d86e645a0fd
--- /dev/null
+++ b/app-portage/elt-patches/Manifest
@@ -0,0 +1,9 @@
+DIST elt-patches-20170317.tar.xz 23356 SHA256 24d2665ba560d01160b955ecf46a17433ee879960e3d914698be170b6698dad4 SHA512 28da9a214cd2bccebad45f464a414fedf80fc6b497d1f6b8f30a0a67570a614065ef67ce43316872d94a144de1a154ecd164a47009ebcd7d39128ccc2dd39618 WHIRLPOOL 944e2a1a92485a93b1b236047d8c6394c76b8b68242f8bf3f683511c0357ee351a2823e77707e2737ea247873fd88287120c3fc3af4ed28488bfafb13a0b163b
+DIST elt-patches-20170422.tar.xz 27864 SHA256 56c5391b8c6958bca081d1eead516917ac6571da283862b2468fe0e2eb33682c SHA512 90867925f797ec815cfd8f45655cbc0bdc5f46e1a84792988ca76aaed97489907a926acf8f50c0499c56f6e70ea7081732f71c74a8d49bf24a6d265a0a4202dc WHIRLPOOL 11e2aa4f74e8648730e7d541d6061ec72f4f2ef40c205a863a381f972931e9441cc2110c7e8d3f71899ffc08d9857a5afa01438d2d2080cc9f2d394cf84c00f5
+DIST elt-patches-20170815.tar.xz 27864 SHA256 caf05e2b3bdf1dfc4188a27c703dc68d66d51ea4274edc6a6ebf9918cf1b2340 SHA512 deba10767b6a8cb5e8139e6f47a30e6f8a4a9312adb1d3e0199df24321d89601915fc91003da2d14fda679e7cbd30a4d4cf39d94ba57bce06432eefc168650dd WHIRLPOOL dcf892154407238cbe7874a1d2b976b8bf8260ab47a18cd8d6e543d98fa47442d83cfefca9431a2e4eebae5156f5e31e4d976831558faff8a79da251d45686f2
+DIST elt-patches-20170826.1.tar.xz 27912 SHA256 56812ae2699cc8881ae5b6d9c1137b7c21fb8116e5994d83e736dedd16049dd1 SHA512 30a1e8b77d2963b7c56eef3a7a0a576ea6d30f1133c7bf6ad3b5b57cbe3e2de5e8cfbc50a929fea589b42ca02802a7ed16ccf7adb868290a2cc3add5b4fc77d3 WHIRLPOOL 4e15ce002e3f9efb2c335f523e57b70f929e036902b2a6f7f2db042bbf43b1b75309ec25e46dbe4dacbb51ba47a83a7062252e53ecc2814bd352620a288cd1db
+EBUILD elt-patches-20170317.ebuild 702 SHA256 22f2525bf7bba04d13d82efa6ff60964e36b46a12cdfd840da93a312001f4d5a SHA512 71ff8eb6a19d1e8e785b753587e426e64baf56ca215e2011b66fe8455fc40e6f6c8df1e3d0b037da1552ca94724fb2f29b14ea674a4e6c9d647ea3b8f16bc9eb WHIRLPOOL e9641cf914bca339d8a8c387152782a9277ed544db0597cf654777a875e74664c1d26e17b50b0dcfc31f9ae37b7a1350ca16d927947e12d38044eedd30580709
+EBUILD elt-patches-20170422.ebuild 825 SHA256 a84ff5c46525cacf86daf7386a02066594f0c04b417b02986e907bc65c927967 SHA512 8c1f168c3fc9088d6d3e24be3584c44068562d59ac7e9240ba0dcabc616355efcaa22bde1bc5ba689a12ef22b669731a78236c02b4bb4adc660d31979ba6e06d WHIRLPOOL 7b57277860196ebc21fca014cc5d8bb9a3bf2e21f65560a194b9ee4b603f8963dcc01ded056597e78845ee3ed35138fb170bd487c42544541d597f972224510d
+EBUILD elt-patches-20170815.ebuild 837 SHA256 7f1a3945190e7f38c438a37ef971c76246a49bc427844391b3c841d3d08558ce SHA512 50df780533458d2b75395ae96c6fbff12b596c259b0e9db16aa5d7adbfa47367746ab8ee4081d91698fa61e5e88880d1801d982f08b597a5e738442d49b8eb4f WHIRLPOOL a3831f8824ce1762df51563a9b076371f2911f819a9e30991b2d8dadae308c03f6f0bb203b8bfcdb7f10369c791b00eca0da58b7989b42433c2b4cff5d920982
+EBUILD elt-patches-20170826.1.ebuild 876 SHA256 bfd34ec72119339cd457a19585af2defe9be4da86682e716dda70b0ee6877515 SHA512 ac77f0ef49d51df10d1d4afd3942c6a455a3a3a44a2e78eacde674b2e5337c152fc95fe800b56ff095a9fddd8f5aff7e394ee28189aa70ab461c0c9c49a74d35 WHIRLPOOL 4d31dedeec68c824395de10cd341c714a9957962836ac6c18a34104bac43167df4a09d902480fe1e72ad18f817070ea001750c1f6890a5cb7234439687c6a3d2
+MISC metadata.xml 223 SHA256 0834d0e288620f593dd7fdfcd741f70a9148531d7259c483f062e9aac0d690d9 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb WHIRLPOOL a86eedb2ffe72a1deeed960f811fd16ff3bd26f22d9cde76d93280cee537d614b5a9ec3cd310df89de6704b8eacd37c2feec3b67e42eec46d13b108049b45484
diff --git a/app-portage/elt-patches/elt-patches-20170317.ebuild b/app-portage/elt-patches/elt-patches-20170317.ebuild
new file mode 100644
index 000000000000..fbb181673f1a
--- /dev/null
+++ b/app-portage/elt-patches/elt-patches-20170317.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Collection of patches for libtool.eclass"
+HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt ~x64-cygwin ~x86-cygwin"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+
+src_install() {
+	insinto /usr/share/elt-patches
+	doins -r .
+}
diff --git a/app-portage/elt-patches/elt-patches-20170422.ebuild b/app-portage/elt-patches/elt-patches-20170422.ebuild
new file mode 100644
index 000000000000..ea7235f801ef
--- /dev/null
+++ b/app-portage/elt-patches/elt-patches-20170422.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Collection of patches for libtool.eclass"
+HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt ~x64-cygwin ~x86-cygwin"
+IUSE=""
+
+RDEPEND="sys-apps/gentoo-functions"
+DEPEND="app-arch/xz-utils"
+
+src_compile() {
+	emake prefix="${EPREFIX}/usr" libdirname="$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+}
diff --git a/app-portage/elt-patches/elt-patches-20170815.ebuild b/app-portage/elt-patches/elt-patches-20170815.ebuild
new file mode 100644
index 000000000000..76878a10174f
--- /dev/null
+++ b/app-portage/elt-patches/elt-patches-20170815.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Collection of patches for libtool.eclass"
+HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="sys-apps/gentoo-functions"
+DEPEND="app-arch/xz-utils"
+
+src_compile() {
+	emake rootprefix="${EPREFIX%/}" libdirname="$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" rootprefix="${EPREFIX%/}" install
+}
diff --git a/app-portage/elt-patches/elt-patches-20170826.1.ebuild b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
new file mode 100644
index 000000000000..84ee7fc57803
--- /dev/null
+++ b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Collection of patches for libtool.eclass"
+HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="sys-apps/gentoo-functions"
+DEPEND="app-arch/xz-utils"
+
+src_compile() {
+	emake rootprefix="${EPREFIX%/}" libdirname="$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" rootprefix="${EPREFIX%/}" install
+}
diff --git a/app-portage/elt-patches/metadata.xml b/app-portage/elt-patches/metadata.xml
new file mode 100644
index 000000000000..f540000d5aab
--- /dev/null
+++ b/app-portage/elt-patches/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>base-system@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-portage/emerge-delta-webrsync/Manifest b/app-portage/emerge-delta-webrsync/Manifest
new file mode 100644
index 000000000000..7b271839ae99
--- /dev/null
+++ b/app-portage/emerge-delta-webrsync/Manifest
@@ -0,0 +1,11 @@
+DIST emerge-delta-webrsync-3.6.2 16837 SHA256 962f41b3e0ec64fce0e23e2365e8e2d18c5fdb762542cf5d1d2a23e072a19c30 SHA512 734598326dbdd588f5b62e2117ca377ad443161feca73a50dfe5740c20afb59ee9e8cd056bcaa0555f7276172db19d572a9a32023c5a311a6aa309d11f3dde86 WHIRLPOOL 1822a0e028e3c4f9e053b951e8e8c98268baf38f1da488e43a41f54089440f7ec8d1427c17e297e72bd5f1628611f3a46811231470fbe16997d97a18909593fb
+DIST emerge-delta-webrsync-3.7.1 22122 SHA256 72005e813037d7aa0280885c915c0da6da8768122574ae5d0e83e981ad6821fc SHA512 57fafb5ee4c083b60fc52f030928a9e6d1d3306f5ac53c88d7277a0421ffb3b64b1934db4367878077b05692b0340113c958116aa503d0e7a1ec3bcd383470a4 WHIRLPOOL 45ac04bf19643e7e34f0175922a413b96fcce9d181f9dd971072ef3e53ef47d8b98069f4223906050a5391af6b3d0a59f449141a869090e3d2c013eb941ff335
+DIST emerge-delta-webrsync-3.7.2 22344 SHA256 6fd9e7cfeff9d8755435f7c448b015a6d3764b4cc684a7531e07ce48a9507115 SHA512 36b65e0f550b5b0a3a5cf271126bf0d44bd182c06148d72c5ed9e105394a38be5dd0845e2d674df246b4436a10f15033bdc857526f664656f1cdb79dd8b7a18c WHIRLPOOL 6e308d4dc7ccb288f47ff79197e25298171b07d965548f5fee61145518be3900f0e6909bc44d27ec28e3bcfc41f94a285bdc9aa39730455f3a64b32addf44d2c
+DIST emerge-delta-webrsync-3.7.3 22348 SHA256 745e240c36fec2c269491a44e46fe090fd125ba5079ab600e4862002431c7c39 SHA512 987dabb5013233a164651564cfbf27ea7bea9057c810c3497b830a3fd58b89317791f1fb6d12f5e3e4aee58954a8aa6abe22eb8a5384b398239d4b28b665b2dd WHIRLPOOL 0618e71095171346b581a06111bf549a5d14f41922c615d1e378d2e0cf1f534c5ca53847dd16296469785b4a7b79e7f714e9bf097715bd6195e7215852bb5c76
+EBUILD emerge-delta-webrsync-3.6.2.ebuild 1113 SHA256 253907c54704ca7b2a1451f1d4fbd69352f32f2a09fc657e3445a06f293e5239 SHA512 18f23ead9aba98412070f5d7a7c06fdf53cf38d0c92a8103a903e8b434d7f977731abd6406e9ea4e1c81aaa3d47803186c360a12743a37635da4b24ff1b254ca WHIRLPOOL 731d0e5c9ec758adc4a2db2868de32dcf8691b4686e1baf8b61d4438cef011cfaeae0d8346839e843669c7b9997d59a6b92cd2110e2d0089c7c1388282fed78d
+EBUILD emerge-delta-webrsync-3.7.1.ebuild 1117 SHA256 fa76e9fc059a1fda00e1b81f0cbb8b125812900e05767efb99c196e5e593d725 SHA512 25e2fcf9089a3a6354503ee783269a85adb08cc934f67c3b34c8901f3b3c807c5200f06320ebfbfe34a49ab8d7ad88ee1cbfb6e2e254d0d9edd185b651a5f43f WHIRLPOOL a3c2db57487090760bb4db37b2d4b8773b4ede4108ff7acbb7027c4f33e372aaa0bfd8c29c8ad89fc46bea3ca5a300b19d67490a4c47c5d6cf16267b9f454fb0
+EBUILD emerge-delta-webrsync-3.7.2-r1.ebuild 1223 SHA256 0cea9f0810a7bc03ef9d26a4b8f865b43d58f5d876e789432bd684b5e4e32cc1 SHA512 84208b781a603717b8f22f1a111949279aeb44b693fedb7d0e823f9dbd6c8a21037f353f8ea12c2d7694cb484f20af448688a2f75976288ac73afd9213a3c728 WHIRLPOOL c1d38921b9a1b347cc8983f88b61805683ccfa49c8f55d95a9179d64a1b2ab0c39610a5c7015be81adc586892bfccddbc4ea7fe22ee4c67ba936739ee54cc00d
+EBUILD emerge-delta-webrsync-3.7.3.ebuild 1116 SHA256 7689b357d20e6f699db07e52f88f3d27f69913bf9ddf2ca16edd4b4817d40e92 SHA512 d1c3444f4b3ea4825efb4fd4e18d98f138f5f8f7d187b63dd8f6f35e23192db0c3d793e559f0af44ef4df3d102f5e267e165c6d89e8a0854f17ecc3d8fba29bb WHIRLPOOL 940f5f61a9b1fc64b57f50c60668a9c745b146c2be147cfbb6425e93efe7817e53270c30d32472c4baa8c0c66851765e3888c644a96d6a1a53752c7f2f5909e9
+MISC ChangeLog 3062 SHA256 669e8d50d8d7e2abdc8a36e72c6c32af4087a3eb9a69786db365e4fc1f7a1ed7 SHA512 78c61cf2af527ed619e80410ebed1ae6f529e2cecbdf6a1976489853f05077c85443bf62711dc4c0d92161e4161319a2fce87c461e7cb27ae2a3fbad9f247a44 WHIRLPOOL 6b1b2e80fe20e9119d84bd07a6ef3a4fb9e3e117976817ce4ba729a1dd75e4151ddcddabdac9ce086bda3820743b1e70bfae215e8c10e168c3ed9f9184ede009
+MISC ChangeLog-2015 9687 SHA256 76739fd981256f1325145f870f9ebbc214a7d9a9a3d0f79a610695cf035c7b7f SHA512 02ef7dc1696a69535d1f6ad99606855381ee547e7ddf40c9c38c9a854870953dea3fad75a123408dc25817d49b07f16d64196fd1d94e43d5599b7a4073c68744 WHIRLPOOL 2a8cbc3cb7a08b104a67b8fdfc1d9157082d881ac142b1d0ae7fe62d7a6e75600ff58a7842d04ebd7f02202bb5bec673da6d3a3efefe5785a9b30203636c9d43
+MISC metadata.xml 294 SHA256 13f636755b30bb33051f1fa0341f4264cdc2fa9d6ddd4bafce4ed206376e4365 SHA512 c4cdfd8350418cd0c231874c709d1fdf2c8132309dcd621682ebb77abd77ed57ce0d484a387b75f4762e58193150ca744e51b560d9b5a8cf631b4faef1465555 WHIRLPOOL 20faebf3e10d9ddc51d516fcbbf1ba23543f5effd09d3e45d5a5aa4692758de068bbae86198e8359d32db6d8343f7616fd1dd4bb203eecabc623a4128a7e0593
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.2.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.2.ebuild
new file mode 100644
index 000000000000..1819bd0a5b5e
--- /dev/null
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
+HOMEPAGE="https://www.gentoo.org/proj/en/portage/index.xml"
+SRC_URI="https://raw.githubusercontent.com/gentoo/portage/228a860476d7543608b469c569ec1d4e70aa7f59/misc/emerge-delta-webrsync -> ${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-shells/bash
+	>=sys-apps/portage-2.1.10
+	>=dev-util/diffball-0.6.5"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die
+}
+
+src_install() {
+	newbin ${P} ${PN}
+	keepdir /var/delta-webrsync
+	fperms 0770 /var/delta-webrsync
+}
+
+pkg_preinst() {
+	# Failure here is non-fatal, since the "portage" group
+	# doesn't necessarily exist on prefix systems.
+	chgrp portage "${ED}"/var/delta-webrsync 2>/dev/null
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && \
+		! has_version app-arch/tarsync ; then
+		elog "For maximum emerge-delta-webrsync" \
+			"performance, install app-arch/tarsync."
+	fi
+}
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.1.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.1.ebuild
new file mode 100644
index 000000000000..52849edb7524
--- /dev/null
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
+HOMEPAGE="https://www.gentoo.org/proj/en/portage/index.xml"
+SRC_URI="https://raw.githubusercontent.com/gentoo/portage/4ab31da4f09c7d0cb323b16b5b4b607d652ffc48/misc/emerge-delta-webrsync -> ${P}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-shells/bash
+	>=sys-apps/portage-2.1.10
+	>=dev-util/diffball-0.6.5"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die
+}
+
+src_install() {
+	newbin ${P} ${PN}
+	keepdir /var/delta-webrsync
+	fperms 0770 /var/delta-webrsync
+}
+
+pkg_preinst() {
+	# Failure here is non-fatal, since the "portage" group
+	# doesn't necessarily exist on prefix systems.
+	chgrp portage "${ED}"/var/delta-webrsync 2>/dev/null
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && \
+		! has_version app-arch/tarsync ; then
+		elog "For maximum emerge-delta-webrsync" \
+			"performance, install app-arch/tarsync."
+	fi
+}
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild
new file mode 100644
index 000000000000..4f574f0ad868
--- /dev/null
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
+HOMEPAGE="https://www.gentoo.org/proj/en/portage/index.xml"
+SRC_URI="https://raw.githubusercontent.com/gentoo/portage/779a9e686d89e31af43e33b1163b01aeff65d7ea/misc/emerge-delta-webrsync -> ${P}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-shells/bash
+	>=sys-apps/portage-2.1.10
+	>=dev-util/diffball-0.6.5"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die
+}
+
+src_prepare() {
+	# Remove premature `rm -fr "${TMPDIR}"` for bug #506192.
+	sed -e '334,336d' -i ${P} || die
+}
+
+src_install() {
+	newbin ${P} ${PN}
+	keepdir /var/delta-webrsync
+	fperms 0770 /var/delta-webrsync
+}
+
+pkg_preinst() {
+	# Failure here is non-fatal, since the "portage" group
+	# doesn't necessarily exist on prefix systems.
+	chgrp portage "${ED}"/var/delta-webrsync 2>/dev/null
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && \
+		! has_version app-arch/tarsync ; then
+		elog "For maximum emerge-delta-webrsync" \
+			"performance, install app-arch/tarsync."
+	fi
+}
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.3.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.3.ebuild
new file mode 100644
index 000000000000..e9bca915fffa
--- /dev/null
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=d2ae2f85a34e27a6b458cb51cac008686911e8ce -> ${P}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-shells/bash
+	>=sys-apps/portage-2.1.10
+	>=dev-util/diffball-0.6.5"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die
+}
+
+src_install() {
+	newbin ${P} ${PN}
+	keepdir /var/delta-webrsync
+	fperms 0770 /var/delta-webrsync
+}
+
+pkg_preinst() {
+	# Failure here is non-fatal, since the "portage" group
+	# doesn't necessarily exist on prefix systems.
+	chgrp portage "${ED}"/var/delta-webrsync 2>/dev/null
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && \
+		! has_version app-arch/tarsync ; then
+		elog "For maximum emerge-delta-webrsync" \
+			"performance, install app-arch/tarsync."
+	fi
+}
diff --git a/app-portage/emerge-delta-webrsync/metadata.xml b/app-portage/emerge-delta-webrsync/metadata.xml
new file mode 100644
index 000000000000..15533694141b
--- /dev/null
+++ b/app-portage/emerge-delta-webrsync/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<bugs-to>mailto:dev-portage@gentoo.org</bugs-to>
+	</upstream>
+	<maintainer type="project"><email>dev-portage@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/app-portage/epkg/Manifest b/app-portage/epkg/Manifest
new file mode 100644
index 000000000000..b6b3c404319f
--- /dev/null
+++ b/app-portage/epkg/Manifest
@@ -0,0 +1,9 @@
+DIST epkg-0.2.tar.gz 702 SHA256 93e7171a31800e1e8c69f14fb43d1738e7fda595b4eab9a045374e28708af8f4 SHA512 bbb3579be7138dcaee177b31deea406c3775e9f9ca01b79704a0b13279a5ebc1eaa1f9bbf47067370332c58102acdbc0fab718923c34e4cfcb062ffff773b165 WHIRLPOOL 2bfd1982fb2422f410f5c2a202a144735baad8b0adbefb9d1b4830c775b0d842f27b970d213ad31ceec1041842e1499bf6230de048734cebd28ea7f1c7dc587e
+DIST epkg-0.3.tar.gz 2926 SHA256 f996ab4aaa64c42d1e4635da46e65d57445d2f6c9a059e0b471dd140d5798b5e SHA512 2b815305c00b50a7a7e433345dd722591a1106edbf9b79715e70296489f4203fc1585a9abff826413d89ce8dde2680a78c375659fd1767e8c13e6fe1b48d4c40 WHIRLPOOL 5caba1df0fc8c1e7a79fa2cbb44e6245b32f0bfda2f5f27feec9e7e779bf047947e0adf9d10045f05cfaaa5b665be25595bce901b23bc7024df76ff496dfeaad
+DIST epkg-0.4.tar.gz 3696 SHA256 7b3f51ed9fbbc931d2378525595379559e6d893d0c71b41a4529ea6f91b853a7 SHA512 2b9ef0e2d0ec123a1e333403371d0d4d750bc5247a05771dc2f694d225ea5db2702dbc9a126cec1d0ddca38dffa837dd66acaa046ac94d00a28890f3e3cd7879 WHIRLPOOL 63bf5fc3ce3017ad708cb9e42585e934369fb9249d9910f49bce52a6c71edf2729df8d065b80dc4dc4555433538b0f457531566603492412d1512bb227d4104c
+EBUILD epkg-0.2.ebuild 502 SHA256 dea9f5fcd4e60520937e9d07fe1046989cb1b332b18a70973198f6f3b813eccb SHA512 f96f319506ffcf75a5b6b6030dc0481b81849f9e39c8b8cd874c4a0c0a86949c0702228e79fe301bff6d24c7c668552b817f6d6556bc097bd2b76142051c3152 WHIRLPOOL 3be30bf872d88f83ab0fa1e9985c20368c1d63b55aec08c7eaac38ca95025215a311eaf1dd90e2e8e8bf81227945d875c319918c74f53894cf88a2bb24d3e6a4
+EBUILD epkg-0.3.ebuild 518 SHA256 c8c8c462db81de73e172f4e408c162be879e5245cb8059c5b99ff491f7088538 SHA512 20d2c8b87b3ddf47049c265a49f4f7447d60d3fe158991865f3504834c23da9fa10596dace07a71b64710850dd472fd64ab89ca4acdad8268c66202edab2ca41 WHIRLPOOL 7e4a1fbf7666c9982da1ca16499b99659c95fafcef23103218b203177c7b84a20eb57f301622ade0b787778e3c8d146253b23b9aa4a3475b5075b31e88ccab81
+EBUILD epkg-0.4.ebuild 512 SHA256 7e4462ce374724a06d90da014fcff3211963ecdde72a953bc6a170400cf33f1d SHA512 958392c809f278684f980b59abfbd581d901202bc2b1cfd228d4adecd8039806752ac15461e83a31a248e6a3ce4a6059cbd2bbb395bea695b699ba5f466d097c WHIRLPOOL 693a3521d5be537bb5602443dfb4deb758e8a015fb2b064d26553df0b8fe437cafe88a02bb0ba9f398e33f235619fc371cb3339f51d2dff3bc687927f16d0882
+MISC ChangeLog 2545 SHA256 ae2a70848a03c8adb040733c1ff2206bb43069db535279bfb45095be5c3b951c SHA512 d93720720d546c92d80cf332196a114d3241d491e4eecd2f4cacfbfe21002973953e8a5078113c77ab8071366dfc6cea08ae2b6f8b195e6b4c2dc38f3f938cf0 WHIRLPOOL 308f409dd67965dc688307987af90185910426cf1ed16bcf646c5b7338ead00ed2e7b9d843253bde141e5ef261130ae8fa2dc97540fe64ceeaf72b03a6c43c28
+MISC ChangeLog-2015 892 SHA256 84b3528b03825cceb8f3850f065918c7e97217e53bf43aadf49a79ed482ace93 SHA512 9d79a5e589090c1d65d8ad11b9fb16efa1df995d469b157c5ab79c9f2cc5a1baa40856f619bdabfe0fec01e9acdb368f82054fb8022481b9ffedea9089eb980d WHIRLPOOL a22277cd2394317bceeebfdcce9670f62c949d3bb66d185780f4a0551bb68afb7ed9985c48c645633a3324aaf35b3e9a6fb05401db56d208dd1ad6665e0d2f2f
+MISC metadata.xml 219 SHA256 4becff0c717736bef29dc4717745285b1f8cf3f66edb66ee587ad2d613982cbb SHA512 b0549e6cb87ae03afde418a4bc199edd3cc4d0d0d545a2a96713fd8f66adcad0750f52a426856a9572455de41253b63f7559a80c3f3a60fee92cae6c4a63b82f WHIRLPOOL 5e89e75d5728a66f9a180e7b8b801c1ea4cfe93e629e9b2a807cf8440628fd298ceb62349ab67aacf5ca7665ba2e5e0a2166a6eb391ff4e29e0f1ff4544663be
diff --git a/app-portage/epkg/epkg-0.2.ebuild b/app-portage/epkg/epkg-0.2.ebuild
new file mode 100644
index 000000000000..025e37e2f0f3
--- /dev/null
+++ b/app-portage/epkg/epkg-0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="A simple portage wrapper which works like other package managers"
+HOMEPAGE="https://github.com/jdhore/epkg"
+SRC_URI="https://github.com/jdhore/${PN}/archive/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}-${P}"
+DEPEND=""
+RDEPEND="app-portage/eix
+		app-portage/gentoolkit
+		sys-apps/portage"
+
+src_install() {
+	dobin epkg
+}
diff --git a/app-portage/epkg/epkg-0.3.ebuild b/app-portage/epkg/epkg-0.3.ebuild
new file mode 100644
index 000000000000..a0cc0d820e4c
--- /dev/null
+++ b/app-portage/epkg/epkg-0.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="A simple portage wrapper which works like other package managers"
+HOMEPAGE="https://github.com/jdhore/epkg"
+SRC_URI="https://github.com/jdhore/${PN}/archive/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}-${P}"
+DEPEND=""
+RDEPEND="app-portage/eix
+		app-portage/gentoolkit
+		sys-apps/portage"
+
+src_install() {
+	dobin epkg
+	doman doc/epkg.1
+}
diff --git a/app-portage/epkg/epkg-0.4.ebuild b/app-portage/epkg/epkg-0.4.ebuild
new file mode 100644
index 000000000000..484c567dcc1e
--- /dev/null
+++ b/app-portage/epkg/epkg-0.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A simple portage wrapper which works like other package managers"
+HOMEPAGE="https://github.com/jdhore/epkg"
+SRC_URI="https://github.com/jdhore/${PN}/archive/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}-${P}"
+DEPEND=""
+RDEPEND="app-portage/eix
+		app-portage/gentoolkit
+		sys-apps/portage"
+
+src_install() {
+	dobin epkg
+	doman doc/epkg.1
+}
diff --git a/app-portage/epkg/metadata.xml b/app-portage/epkg/metadata.xml
new file mode 100644
index 000000000000..b291a268b032
--- /dev/null
+++ b/app-portage/epkg/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="github">jdhore/epkg</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
new file mode 100644
index 000000000000..82cfdb119216
--- /dev/null
+++ b/app-portage/esearch/Manifest
@@ -0,0 +1,9 @@
+AUX 1.3-Fix-python-3-compatability.patch 1177 SHA256 d4521db43d14d320d04ed5b6d6b51a53924337520ebc2a72c4b998964f4e3043 SHA512 b136b610a87e61e2ca01956fc2ba444b25e26333ed973c0c779279203ddb1ab100ec7ca35c50f4aeaa950829438c7e7729aa95fa43efbd0b5eb3b6f31fce529a WHIRLPOOL 63a4b7cbc4765598535b683788ccbc07e51d0eb7c648341d72a23a23242ab3babcf546c2afe4a4593b5b050db0b314a621747ac85e235e6bbb9bf25c0ea0be23
+AUX 1.3-Fix-setup.py.patch 792 SHA256 6b0ec7506981f126bdabb9fe87f89db0737775e5b1d78f659c8860b51e6972d4 SHA512 db741e6effca01b8e71810bd455d227c93df2ca86f5b77c69ba227cb1426dfeca548854b626d4d626e311faa6b8bb137c9f22b21322b6fa9f5ac2dec4786a5d2 WHIRLPOOL 94bec35478d51fcaf9cf08bdc793a64113cfd9f10dcca38e8372d99c2a30822e193518dd4ae6d758c1d9ff517535f1747806d523511c733bbd155de98e286f6d
+AUX eupdatedb.cron 659 SHA256 f0092005752c82d62c1c5b8b3883329610be7a568569d5a375bfc780f3b3b3e0 SHA512 4ebaa0f8f73215aa497dc0adb922eae1ca42047b7069d2d0dd279edca8c4d9e782ccbfbc421ccd4cdbbffcc5cd8cffcf0c56ab66747043c5743c217c1e33df92 WHIRLPOOL fedf72e6823004613046865ae4d78bee4ff3a00c0f60253599bbdccc43989d6168ccdf26d6c85b914549c05a81ce071791b9046a0727ed0c6a6d174613ae20eb
+DIST esearch-1.3.tar.gz 19383 SHA256 3274c2da21d86287fa27fd562aa63ce82dd813e4d1ebb9c44bd2b82c9ed323f7 SHA512 7fbc1c362a320a76a40c45ddf83a29223eaafd3cfed1d8a9410a380e2025fb515eea26e38ebf0f304d14230c6c5cfc83ef2116b774b1d50ee4f7f4bb0ac046c4 WHIRLPOOL e1caa3f0b09925841899422d98b6222ccde68993d2e24b24034d3bac63e75cc07445513d418fbde99f23ed9d72203bbfe8cbc0861028648ace0c53ec683e6ad3
+EBUILD esearch-1.3-r1.ebuild 1554 SHA256 3ca61f080448512c44fbdbf5ef7a4b51799e440aa9e0052228ec8e1818f7ac57 SHA512 6e156896e3b0f83f8312e26ee8a23191ef576de5e892038e25d3399d15d6f0be59e1c242d394a547635b1a7a84770037ecd0ce18d18338b6997a907a57c3740d WHIRLPOOL 0dede47b01bb48a062acdf18370762df632db4b20d53f3aeb9e6e924ccf1cf6e82a3fc381d9654be0e93c5d224a2e0766c76faf5135d2bc907cb93776a3718c1
+EBUILD esearch-9999.ebuild 1134 SHA256 79eeb80372e8013e1411cb21862f7ba9a85f054307bb8529cd6f1fc164848c73 SHA512 52e1430d598fabc4305f4449e43e1b6fb2fb2a23e23ae874e0e6fb6c865ba7a5ae68c69f1d9bc850340d85d3db1462c656498b7c42b444399a7f8754fc892025 WHIRLPOOL 441c3576a6e7ba9e01bf5b471e2e6c66554487233366ca2a393da1abbf9c6296d77b4adab92dd9a486d5e6b9eabc2729a6726a25f5c7350d067560cb03cda21f
+MISC ChangeLog 2844 SHA256 37edc683159e417f0ac38f750cf5df571b3f61f6792a2fdb0b56770be80a832e SHA512 303fb5b60e83ca77a4ca63c66f6eb534f5613bad0926dbbe0ffea9aac03ebd0063a7a42ef74414c7e0486339a6416dc57b67fcb3240d399a210bb406d4b74829 WHIRLPOOL c18f580cb7458b862ecbe5b29dd70309d8a4cbec85bc8e27b53e5ade27c3b7a5afc405693bcab67322e50a103d4f5fb398a6f0293b39c76edb0e243585b23966
+MISC ChangeLog-2015 19096 SHA256 833fbf9b64644f295bd5f064dcbe2caa47bdb7369f84faa54cc61e1d7e426989 SHA512 6127524f5b5b903bfb2348a3cb4eb3422432ddeb0f790bfe50527d8eaaeae2826304d0357f8a12f28da938088aff717db12e479fc3328c2b14d2239ad7e3e1b4 WHIRLPOOL a280315bde8d38cd560453de412f6c8c10b035755e4f41768bc8005e7e61a6063375883d0be26fe0acdd88003de501f89d82c47b8c091189bdca66e05eb2a00e
+MISC metadata.xml 357 SHA256 dd697466fad5149291be4ff35c30194571635a0b1afa709cf813438a55f7d9f6 SHA512 a84ae0adf855d68fc14b01d1583b0c264a27852df31397af387ee7d8948f413cd98d2fad937899a91387f23d70738a540522b393e2fdab21dc0f55014cf6557f WHIRLPOOL 6a7b1f6416f6de520ca4223447a4ccaf1c587890e8c100aad9729a8c44fd5ee40f5afa349189efeba0d3a3ed0da7010f4829862b03e57285b77a939cdf322e1b
diff --git a/app-portage/esearch/esearch-1.3-r1.ebuild b/app-portage/esearch/esearch-1.3-r1.ebuild
new file mode 100644
index 000000000000..d8d6dfbd071c
--- /dev/null
+++ b/app-portage/esearch/esearch-1.3-r1.ebuild
@@ -0,0 +1,53 @@
+# 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})
+PYTHON_REQ_USE="readline(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Replacement for 'emerge --search' with search-index"
+HOMEPAGE="https://github.com/fuzzyray/esearch"
+SRC_URI="mirror://github/fuzzyray/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="linguas_fr linguas_it"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+
+DEPEND="sys-apps/portage"
+RDEPEND="${DEPEND}"
+
+# Populate the patches array for any patches for -rX releases
+# It is an array of patch file names of the form:
+# "${FILESDIR}"/${PV}-fix-EPREFIX-capability.patch
+PATCHES=(
+	"${FILESDIR}"/${PV}-Fix-setup.py.patch
+	"${FILESDIR}"/${PV}-Fix-python-3-compatability.patch
+)
+
+python_prepare_all() {
+	python_export_best
+	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version \
+		|| die "setup.py set_version failed"
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc eupdatedb.cron || die "dodoc failed"
+
+	# Remove unused man pages according to the linguas flags
+	if ! use linguas_fr ; then
+		rm -rf "${ED}"/usr/share/man/fr \
+			|| die "rm failed to remove ${ED}/usr/share/man/fr"
+	fi
+
+	if ! use linguas_it ; then
+		rm -rf "${ED}"/usr/share/man/it \
+			|| die "rm failed to remove ${ED}/usr/share/man/it"
+	fi
+}
diff --git a/app-portage/esearch/esearch-9999.ebuild b/app-portage/esearch/esearch-9999.ebuild
new file mode 100644
index 000000000000..114acaf455e1
--- /dev/null
+++ b/app-portage/esearch/esearch-9999.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=(python{2_7,3_4,3_5,3_6})
+PYTHON_REQ_USE="readline(+)"
+
+inherit distutils-r1 git-2
+
+EGIT_REPO_URI="https://github.com/fuzzyray/esearch.git"
+
+DESCRIPTION="Replacement for 'emerge --search' with search-index"
+HOMEPAGE="https://github.com/fuzzyray/esearch"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="linguas_fr linguas_it"
+
+KEYWORDS=""
+
+DEPEND="sys-apps/portage"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	python_export_best
+	echo VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
+	VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc eupdatedb.cron || die "dodoc failed"
+
+	# Remove unused man pages according to the linguas flags
+	if ! use linguas_fr ; then
+		rm -rf "${ED}"/usr/share/man/fr \
+			|| die "rm failed to remove ${ED}/usr/share/man/fr"
+	fi
+
+	if ! use linguas_it ; then
+		rm -rf "${ED}"/usr/share/man/it \
+			|| die "rm failed to remove ${ED}/usr/share/man/it"
+	fi
+}
diff --git a/app-portage/esearch/files/1.3-Fix-python-3-compatability.patch b/app-portage/esearch/files/1.3-Fix-python-3-compatability.patch
new file mode 100644
index 000000000000..36c9d2255b8c
--- /dev/null
+++ b/app-portage/esearch/files/1.3-Fix-python-3-compatability.patch
@@ -0,0 +1,34 @@
+From 3978f923ac814aef014cf412b63d11fd94f60692 Mon Sep 17 00:00:00 2001
+From: Paul Varner <fuzzyray@gentoo.org>
+Date: Wed, 8 May 2013 14:26:48 -0500
+Subject: [PATCH 1/2] Fix python 3 compatability with 'esearch -e' (Bug 469076)
+
+Thanks to zmedico for the patch.
+---
+ esearch/search.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/esearch/search.py b/esearch/search.py
+index f91f5b1..696a0f0 100755
+--- a/esearch/search.py
++++ b/esearch/search.py
+@@ -22,6 +22,7 @@ import re
+ try:
+     from portage.output import bold, red, green, darkgreen, turquoise, blue, nocolor
+     from portage import settings, pkgcmp, pkgsplit, portdb, best
++    from portage.util import cmp_sort_key
+ except ImportError:
+     print("Critical: portage imports failed!")
+     sys.exit(1)
+@@ -107,7 +108,7 @@ def searchEbuilds(path, portdir=True, searchdef="", repo_num="",
+                     data['defebuild'] = (searchdef, pkgs[-1][3])
+         if not portdir:
+             config['found_in_overlay'] = True
+-        pkgs.sort(mypkgcmp)
++        pkgs.sort(key=cmp_sort_key(mypkgcmp))
+         for pkg in pkgs:
+             rev = ""
+             if pkg[2] != "r0":
+-- 
+1.8.5.4
+
diff --git a/app-portage/esearch/files/1.3-Fix-setup.py.patch b/app-portage/esearch/files/1.3-Fix-setup.py.patch
new file mode 100644
index 000000000000..aad5d49f2f56
--- /dev/null
+++ b/app-portage/esearch/files/1.3-Fix-setup.py.patch
@@ -0,0 +1,28 @@
+From 94e77b115f5b14b7dfea50e4a7b77047e4b47263 Mon Sep 17 00:00:00 2001
+From: Paul Varner <fuzzyray@gentoo.org>
+Date: Tue, 18 Dec 2012 04:33:27 -0600
+Subject: [PATCH 1/3] Fix setup.py so that either VERSION or PVR will set the
+ version.
+
+This fixes the issue with egg-info always having a version number of
+9999.  Fix is from Brian Dolbec courtesy of mirrorselect.
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 9d2addd..45a4c06 100755
+--- a/setup.py
++++ b/setup.py
+@@ -14,7 +14,7 @@ import io
+ 
+ sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'pym'))
+ 
+-__version__ = os.getenv('VERSION', default='9999')
++__version__ = os.getenv('VERSION', default=os.getenv('PVR', default='9999'))
+ 
+ cwd = os.getcwd()
+ 
+-- 
+1.8.5.4
+
diff --git a/app-portage/esearch/files/eupdatedb.cron b/app-portage/esearch/files/eupdatedb.cron
new file mode 100644
index 000000000000..1cf802f7b05f
--- /dev/null
+++ b/app-portage/esearch/files/eupdatedb.cron
@@ -0,0 +1,32 @@
+#! /bin/bash
+
+# The eupdatedb script _needs_ to be installed with the filename 'eupdatedb'
+# because it does things based on basename $0.
+
+# Run some script
+
+SCRIPT="/usr/sbin/eupdatedb"
+SCRIPTPREOPTS="nice -n 19"
+SCRIPTOPTS="--quiet"
+PRECOMMAND=""
+POSTCOMMAND=""
+DATE="`date +%Y%m%d`"
+LOG="/var/log/`basename ${SCRIPT}`"
+
+${PRECOMMAND}
+
+# Start logging
+echo "--- Starting ${SCRIPT} for ${DATE} ---" >> ${LOG}
+
+if [ "`${SCRIPTPREOPTS} ${SCRIPT} ${SCRIPTOPTS}`" ]
+then
+	 echo "${SCRIPT}: success." >> ${LOG}
+else
+	echo "ERROR: ${SCRIPT} failed." >> ${LOG}
+fi
+
+# Cleanup tasks
+${POSTCOMMAND}
+
+# End logging
+echo "--- Ending ${SCRIPT} for ${DATE} ---" >> ${LOG}
diff --git a/app-portage/esearch/metadata.xml b/app-portage/esearch/metadata.xml
new file mode 100644
index 000000000000..540aa0188fe8
--- /dev/null
+++ b/app-portage/esearch/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>tools-portage@gentoo.org</email>
+    <name>Gentoo Portage tools team</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">fuzzyray/esearch</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/etc-proposals/Manifest b/app-portage/etc-proposals/Manifest
new file mode 100644
index 000000000000..7ff41968571a
--- /dev/null
+++ b/app-portage/etc-proposals/Manifest
@@ -0,0 +1,5 @@
+DIST etc-proposals-1.4.3.tar.gz 53696 SHA256 42c2b117e141d0e69a8717e98e9ddc9dffd2ed27533c6296e87e810c631e71c7 SHA512 9de117b96908bbde87e8ee9c326525961547ba779ae571071c57571d039f3e01f9d0ec6be5eefc1ea40abdfe73631b4c750964dc94dbb6348119b83afbc556a1 WHIRLPOOL 6fb095554bc8a98cf51d1426252ed3afe620c1cb9308e66315d1456f6a99d1e75fbd4513ce947cd5ab4aa1cc1d9dd680f29fb7fada06ef93dc28fbb5800fe539
+EBUILD etc-proposals-1.4.3-r3.ebuild 1422 SHA256 cd25cda32f4873d10d5b38645a74fbd4f09d6ceb135daf1aa6e0fc5f62a43803 SHA512 8e85c645dfec3349f14dedabdac4b3b7c26a6c5a84261ea3a05c144bf575f0ff197e72cc430e4fd0b9b118bb719bcfc0026855ccf44e4b4dea5c53b9c063f6db WHIRLPOOL 6660a466aa133743adb25682298a9b179e0160c313410791ff33b583a663fb3030fe22a96dd7289da87fc1b1ef4e2182a537bd58dce3b8fb9744c5692c20f777
+MISC ChangeLog 2577 SHA256 c07eace8ec84efddf0a0523e80992267fbbaa88bf1ae7993e79309133696b42c SHA512 da8ba937f06400be2364478e5fa8f443e27ad92b22964d92c3d0d26a93e6a0d3a6db1103ed62d075e7b7e82939c845b3eded7d0a1fe82593bb7efe473bf1975c WHIRLPOOL b590dc5b5e490b34fb3f278f2314c78326e819f930491d6b0ea183784a45f12777e9a63b584b9a88690c4dbabb36d9a887cee23f9aeaa20cc580936201b9f535
+MISC ChangeLog-2015 3679 SHA256 ee14869d0546ac9ad214a1c54c4ba0938a1c2083ec6fbfe34dec698b8ff23845 SHA512 3e10cd40a4c7da719980e8f3c24376ea6470c1f96b0993dc97ea64b68d47cf445fc9504fa8446c663a375456e369489118950045784098b71b46be2479da97ec WHIRLPOOL 86e658c58c9e8c151b5236d115736dfffdd63e90c30a0a78bfdbfdb3f981884d0c50767760947ec8fff2d768a089bfb0c9c20f85f09c6aa3346b5752cf1e1ca2
+MISC metadata.xml 463 SHA256 ef6f4a4a764b66df2ac141b04aae7487d694fbc4afdb195716e71e87b83e989f SHA512 8e858c382a8880509a3f8964a2d94e64899a842d7c0368069eb8f58c041863a3a6d6a3d586cfd12d411de21bd990b685ebfa3d2d97ac460c0eb2a6dbf6aa91d1 WHIRLPOOL ae37ca0dfd65b9583ce5292c05c109f385f006eb4f03ac4d89ccc8dc7f696e10e6fe24060b771d768c0e52688b2122ebbfcc8b00a3aa4585620cc205fc6473c9
diff --git a/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild b/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
new file mode 100644
index 000000000000..798238739380
--- /dev/null
+++ b/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
@@ -0,0 +1,42 @@
+# 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
+
+DESCRIPTION="a set of tools for updating gentoo config files"
+HOMEPAGE="https://sourceforge.net/projects/etc-proposals.berlios/"
+SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
+
+IUSE="gtk qt4"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+
+DEPEND="gtk? ( >=dev-python/pygtk-2.10 )
+		qt4? ( >=dev-python/PyQt4-4.1.1[X] )"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodir /usr/sbin
+	einfo "Moving /usr/bin/etc-proposals to /usr/sbin/etc-proposals"
+	mv "${ED%/}/usr/bin/etc-proposals" "${ED%/}/usr/sbin/etc-proposals" || die
+	rmdir "${ED%/}/usr/bin" || die
+
+	# Bug 308725: Filter out the "PreferedFrontends" based on USE Flags:
+	use qt4 || sed -i -e '/^PreferedFrontends=/ s/qt4,//' "${D}"/etc/etc-proposals.conf
+	use gtk || sed -i -e '/^PreferedFrontends=/ s/gtk2,//' "${D}"/etc/etc-proposals.conf
+}
+
+pkg_postinst() {
+	elog "The configuration file has been installed to /etc/etc-proposals.conf"
+	elog "If you are installing etc-proposals for the first time or updating"
+	elog "from a version < 1.3 you should run the following command once:"
+	elog "etc-proposals --init-db"
+	ewarn "A full backup of /etc and other files managed by CONFIG_PROTECT"
+	ewarn "is highly advised before testing this tool!"
+}
diff --git a/app-portage/etc-proposals/metadata.xml b/app-portage/etc-proposals/metadata.xml
new file mode 100644
index 000000000000..8f4a4e4862f1
--- /dev/null
+++ b/app-portage/etc-proposals/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>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">etc-proposals.berlios</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-portage/euscan/Manifest b/app-portage/euscan/Manifest
new file mode 100644
index 000000000000..638aec482034
--- /dev/null
+++ b/app-portage/euscan/Manifest
@@ -0,0 +1,6 @@
+DIST euscan-0.1.1.tar.gz 441780 SHA256 cbf89803c0c8d6025239f0abd1ac17179c8ff81b1b059be7fc9415a8cfe6dd7e SHA512 2f55f8f4b0fd46b13c981ba94be29a62f16fe2890ce03f99ac14b1488c2ebb59abdaee12f671d679b934b4fd875ee27e751d2c305420f7cfb08e69ec899a75ab WHIRLPOOL 602bc0e3ee60ee6acc6c39bd477957a544fecfd81b38bbd06e46adab246f16889700b38bf6dde306b9978357e521ebf4d185364fd37f765696cde53836a8e127
+EBUILD euscan-0.1.1-r1.ebuild 807 SHA256 fc76040e2a3ac3743cc3b232e97ef774e525f30eae64fcccce92082ac40c8e4b SHA512 7c6800d0e92415790e0dd61814ac14e40278dbed98727ba122bb90f46a053ec1e4c6884395e635f167ca927a5338f42b5be50f2c7f78d58421ba7568b4cc2218 WHIRLPOOL 0639197bf96ce55829aa6b8b353c79163cb4d231bb258211cb14c0ee2b96d8e6443113f51ba66439cfd9ce62ed11e1ec0f307582d175b886e2b412b0fc33e6fc
+EBUILD euscan-9999.ebuild 770 SHA256 b2dae39af001147defae61336bc6dafc94ef1c059db8fe5790ff4c9a266642b6 SHA512 836aa85797ce81df8c38bd42096900cc0406b3b85aef2b125c50e10d920bdc57ca6e98e51d18514006753e71c5c7674951a46cf202c29f3a192944c4b7d46926 WHIRLPOOL e73b2acdb2f690205e59b2e9f0a908c498932dc56e24ef554e493bec42da1c2140880e565e64155d7950d59baa479bf420fe03f48302ce29e90db698679a4073
+MISC ChangeLog 3103 SHA256 2960dbb1f001de217e147a1a21c27fb5b2559185deff15d9c6fd62dabe34fb43 SHA512 a402aa97b3ae81078f1ce3bac0e3e3a2662828f7f42218c1b8a5487c12328c1d76917eac4236acf0803f915cc9ab20d18fad6146a8624e599eaa17636724d993 WHIRLPOOL 22923771d25b23f81e6480c9cf7843f871820d19c49eb3878e7ce4cf18fa9279e0cfc50e47efec16e196394b1e642b147e7eda61a88de9d15c64e5c7759772fc
+MISC ChangeLog-2015 2321 SHA256 f0abfc40e11007abba0c2108a35cb6e1fdfca516960aa42cc230684cf026f960 SHA512 073ba7e4af1c089289e77c704431550a89a2eff312640e0533e55275936345e4d46f065065656345a472de8451ff8966bf4ae8143da4a9c38151e466a6c6e85a WHIRLPOOL 64cb242409b8fbe00f252238d09cb43ecc97252ffade6b5d7be77707e3017453016f35d1d302f74907a3c83a6fb89e8ce77eea1a778895150118b727e7f47deb
+MISC metadata.xml 340 SHA256 46663e868baa69c44ad2584d0551db271f913196e7fb4da8848883d3928914c1 SHA512 de74198fe372171f19b6486164e81b3f256ae6a04451ce5c3c789909a0a3bff6ec15a42a3cf3387f227cef33f8dbb32eb9872af95d6f962f61ecd2fa64ad0b5d WHIRLPOOL e56f2f3c5e6fcf295ed5540608d7e5dcfb283c653ba1c4e8dc5cc0a5225fd66fa72f7fc7223530603b7042652148bb31864a7ac0faf16173156976d001ad1d87
diff --git a/app-portage/euscan/euscan-0.1.1-r1.ebuild b/app-portage/euscan/euscan-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..19345bf907e9
--- /dev/null
+++ b/app-portage/euscan/euscan-0.1.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+DESCRIPTION="Ebuild upstream scan utility"
+HOMEPAGE="https://github.com/iksaif/euscan"
+SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	>=app-portage/gentoolkit-0.2.8[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+}
diff --git a/app-portage/euscan/euscan-9999.ebuild b/app-portage/euscan/euscan-9999.ebuild
new file mode 100644
index 000000000000..f502a249b5fe
--- /dev/null
+++ b/app-portage/euscan/euscan-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1 git-2
+
+DESCRIPTION="Ebuild upstream scan utility"
+HOMEPAGE="https://github.com/iksaif/euscan"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/iksaif/euscan.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS=""
+
+DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	>=app-portage/gentoolkit-0.2.8[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+}
diff --git a/app-portage/euscan/metadata.xml b/app-portage/euscan/metadata.xml
new file mode 100644
index 000000000000..2c94ca18e808
--- /dev/null
+++ b/app-portage/euscan/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>patrick@gentoo.org</email>
+</maintainer>
+<maintainer type="person">
+        <email>alicef@gentoo.org</email>
+        <name>Alice Ferrazzi</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-portage/euses/Manifest b/app-portage/euses/Manifest
new file mode 100644
index 000000000000..523a0c7083a8
--- /dev/null
+++ b/app-portage/euses/Manifest
@@ -0,0 +1,5 @@
+DIST euses-2.5.9.tar.bz2 44281 SHA256 440406e79642dfa8faf477a666425e1b4915991c988fbca4c86c228441645508 SHA512 afbacdcb73bc10548b32050bc38f71e9ac8613277d2cd961f2f96e32e7fa1827c5a208e68a6994efdcaa9e4a64a581138daadab2296a5e60c5e29677dbbd9ef8 WHIRLPOOL c2ac9f6dc63f9013186e86c8c8933b37ee4295d8ff52f30592ab15e9d3c7b3ca634a3dcce08c049f4bf5663dfe12eeadbd3fbdace54a5590eefef4974e902726
+EBUILD euses-2.5.9.ebuild 449 SHA256 fe821473dbd91df379ee9ee83f78c5982c5f48c0eebc4e61375f8854cfaf1e56 SHA512 99954debb0f506b717ce7b8a57ba04e8170bbbe9c372785957def0e912ae920fdaefbbd95aee8e6c2ba7d12a99fbc281c90d7f17cbb77f9e9266cc9914a27d09 WHIRLPOOL c8772b0f4e94202ca47edf19a461d5dad3f59c99f46dc071f8606da8bc831de53bca75a20baa8043f105cd8aa8c1fb1963f5bc55dad1b9250eb1f689fe747ce4
+MISC ChangeLog 2424 SHA256 55ec7fd523139f568695f3b85214de76042ec2a19ae8011e8425970538b07efe SHA512 1971f3268dda78e26f9117d7c35b421c9d96a08781f23016602505fc29e4bad61daa2b771e8078425f83dfbbfe770513649698bcfd69edf5894ca4abaf4b0b60 WHIRLPOOL 6c3767e06e5dd15f9979c90e97269ed64f7b04b950a36dee4a97667c83fafd4026715dce2e72b69845699e7e1c95f3d4d065663e69bdaab27442208b2beabd7d
+MISC ChangeLog-2015 8883 SHA256 2a9f92f3681357bc6ae3eedd4738cc357aedcf841e7d8c58135c51aa59fb88c6 SHA512 9ac38cdc199ad46ea095dafab8c39a04b3335ccd3676055611542a0d32849607ddf4e8654638a32423dd5ffa1cc726cebb84ceae2c424da700b08d086a209e3f WHIRLPOOL bffea50fd90ccf69726a3043cc12741704fed0525becbead175e7cdaf546566a4053409e44c55ab86105d5f4c39e9827289b99a4ec46df103326533644176f4c
+MISC metadata.xml 363 SHA256 b4966cc2e00ea88ac278b43b073325de2ccf9c126b4c0c3943b740f7871c510c SHA512 568c3af8e7aa91c9732a29b74b31b89869ae031fcdf94d9c13c64f740bf1c86ee45a257cf10a298090239c7a92119e0010fc9316962a625a6494ff3174e80e5f WHIRLPOOL 6f351cb046f840c2257b061b1bf6111bb4f9232b4a962cc9fd99ccb011cdc73aed55a6a6ab055426e5259d41bfe11c216591072c260d0640d5f866cd7d4edf0d
diff --git a/app-portage/euses/euses-2.5.9.ebuild b/app-portage/euses/euses-2.5.9.ebuild
new file mode 100644
index 000000000000..d56aa793a6bb
--- /dev/null
+++ b/app-portage/euses/euses-2.5.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="look up USE flag descriptions fast"
+HOMEPAGE="http://www.xs4all.nl/~rooversj/gentoo"
+SRC_URI="http://www.xs4all.nl/~rooversj/gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc ChangeLog
+}
diff --git a/app-portage/euses/metadata.xml b/app-portage/euses/metadata.xml
new file mode 100644
index 000000000000..f62a0f06e2e9
--- /dev/null
+++ b/app-portage/euses/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>jer@gentoo.org</email>
+	<name>Jeroen Roovers</name>
+</maintainer>
+<maintainer type="project">
+	<email>tools-portage@gentoo.org</email>
+	<name>Gentoo Portage tools team</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-portage/fetchcommandwrapper/Manifest b/app-portage/fetchcommandwrapper/Manifest
new file mode 100644
index 000000000000..25f33babcc58
--- /dev/null
+++ b/app-portage/fetchcommandwrapper/Manifest
@@ -0,0 +1,11 @@
+DIST fetchcommandwrapper-0.7.1.tar.gz 3187 SHA256 083eab79afadeadc00e9ad1dce77a54511df1a1e7b48c61c886012b565eba066 SHA512 be1e382180606d527f85c2f45888373286687c2b521c66cb11ed90f05e107bb54cbfe83b0509bf52e31108db3a52b9089259c83e63cae3a1d25dbca583faaf74 WHIRLPOOL dd9bda47ba066fc5ccab658b8914627ab14e0914ccc00541486910e7e2acc974016dacd7e40f86d6782adce45e9948cece74d09611ca965cceb110a491fc650e
+DIST fetchcommandwrapper-0.7.2.tar.gz 3134 SHA256 0ccab9876c6d2ed15c972aa5287069e2f2c503b9b36f6246b15be12eb7ec05b8 SHA512 f268cbef691320106b3f929b0ab3b63085ffdd3e1988fbada2d37c6abcdf7e417758055fff503bb70490840dfde7704e87bb7434faa1d1115cc42729ad10de61 WHIRLPOOL 1c9f2a5681a49a62e06003811a7903d58c816f34a38acf2c424238af58f32e48b0181d034c6ed2b44dcf3e4438ba1a45feb82315e263f5638a5c9fffe2f4b6a3
+DIST fetchcommandwrapper-0.7.3.tar.gz 3431 SHA256 c10659ff6e4c95102683be4848bdca44746ea9f500a081b01f9a1dd28d3a3faf SHA512 df314331b66b89842285a175be686fe800de4a93ad382b72659429a62de02c4fc708d8964f766c7203c3c2aa838a684e808442d410d37ab9f8b9af8328442a51 WHIRLPOOL d041ed86901ea03bbe7d3ef34837ed040088ec168671c82431d376cd3d82143ba54f4b71b73c79c33b55998542c229ae9544faaa027e3e6e79378c7127acc809
+DIST fetchcommandwrapper-0.8.tar.gz 3558 SHA256 b8a85e84a68ec96c7c425814326c048d58c7536631733fc7fc6d667507a41bda SHA512 b064515d3f4b85f849de53934a45e7a64c9af8bfcfb83ee70d09aad9712623cff2c43a28c93ccd00b74f99679856225201e7c8f33b9b0338121ac1072335e5ba WHIRLPOOL 1055b19fda503662604e6c72c7a224e6136066063285503084f056cb3b74bde0ce4a92150e8cecea36651c0f4fba80205d937ce546790691076696459373ec80
+EBUILD fetchcommandwrapper-0.7.1.ebuild 634 SHA256 dccca495776d7806f2f8c827994d92ba89d51e08deb63c758ecb22b9d2d39124 SHA512 8b281114c4c0218fa5005c14937a8032b3b46fe1f9100f63ed3a91636ed6c6483a5993b7cb9741838b49c0951470dcfe248c8f75d0dea873716ffb4882377809 WHIRLPOOL da970bc0c811b5aaf0475ad60450934e68fe8a7c2ea047dc3f06f1a7a1c8022a1379548d092f531ab62d4051a4b3babda82adab3a42ae7fca60a6349b8ad1d6e
+EBUILD fetchcommandwrapper-0.7.2.ebuild 634 SHA256 dccca495776d7806f2f8c827994d92ba89d51e08deb63c758ecb22b9d2d39124 SHA512 8b281114c4c0218fa5005c14937a8032b3b46fe1f9100f63ed3a91636ed6c6483a5993b7cb9741838b49c0951470dcfe248c8f75d0dea873716ffb4882377809 WHIRLPOOL da970bc0c811b5aaf0475ad60450934e68fe8a7c2ea047dc3f06f1a7a1c8022a1379548d092f531ab62d4051a4b3babda82adab3a42ae7fca60a6349b8ad1d6e
+EBUILD fetchcommandwrapper-0.7.3.ebuild 685 SHA256 f7153cd2f8bca3d5324b02496824aadc847959764c8d9a7c31fe306069cce56d SHA512 4fc5bba0a8524e937cfb8ace71173b10f614a1fbdc90290f1e751035c74674b7e68455ca24d73205754bcedc653a7157d4ce64bf7a7f580f88a58f5c814b857a WHIRLPOOL b969b5ba0a792769b01152aa7ae90dcc539697312aef72fd2bca6f8a367847b1efb7919ebf878d3d387ba1747bc9e4b08fcae30abd8e256013e4b42663676f6e
+EBUILD fetchcommandwrapper-0.8.ebuild 685 SHA256 f7153cd2f8bca3d5324b02496824aadc847959764c8d9a7c31fe306069cce56d SHA512 4fc5bba0a8524e937cfb8ace71173b10f614a1fbdc90290f1e751035c74674b7e68455ca24d73205754bcedc653a7157d4ce64bf7a7f580f88a58f5c814b857a WHIRLPOOL b969b5ba0a792769b01152aa7ae90dcc539697312aef72fd2bca6f8a367847b1efb7919ebf878d3d387ba1747bc9e4b08fcae30abd8e256013e4b42663676f6e
+MISC ChangeLog 2293 SHA256 12659fbdba14baad00a0140e280322ab45e175dd20a69ebfda493b7d315db5e3 SHA512 9bdb67b10a440f745de573884a8d377ef7cbd185d04bab004995dab4be6cd71462ccffc99c250fdfd635ced76d5965dde1e7ac1921dc6ebb2da612273fda707a WHIRLPOOL fe086a189c86894dcd1f8e878baddef33dcc22c5de7bdee9d8839a270121082f6723db865baadc94acdb3848d3d8a383511b7195a8fa36425c83cca95327b79f
+MISC ChangeLog-2015 876 SHA256 7afe8230393339a79321f160effdd90a7e922d312e5d942f5caea342ebb36ce4 SHA512 8c483eb5695ec6b255a2a553d968efb2e12c1cda39f40599b172c25c692c219842f6b991e5b16ea8816fa2915b0c12a44b31ad367f7849c7527c58a26fdccdbd WHIRLPOOL 6824fde90f61fe1bee2894ad5bacf3dbe18c715a9d3e385dcb9193a1234b228abefe8048d2c6a62e69ac3dbaabcc5bfcf09acc4c85cb5f3618e55082441bb2b6
+MISC metadata.xml 350 SHA256 2a4cbcc115e86ae83d626dde76dafb583c404b32ee158784b20f459ddaecf8fe SHA512 700ba67b643b208acca8a25e93ec723a25d23d0b14f52866e20935fc58487401a2b0d2f90df6804f5c660427a849a3d32e520725aff2e47319d8e4ff184fc1b8 WHIRLPOOL 2138779018fc80ec4426c0d47531226d332269b49b5f768b554487537a641fa3d9f07d943bf680ecee0b21ced38c7ac7447d7ed5b01aeb98a66b5a2171a8a5a3
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.1.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.1.ebuild
new file mode 100644
index 000000000000..d4abf02b7dd7
--- /dev/null
+++ b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND"
+HOMEPAGE="https://github.com/gentoo/fetchcommandwrapper"
+SRC_URI="http://www.hartwork.org/public/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=net-misc/aria2-1.10.2"
+
+pkg_postinst() {
+	ewarn 'You need to append'
+	ewarn '   source /usr/share/fetchcommandwrapper/make.conf'
+	ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.'
+}
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.2.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.2.ebuild
new file mode 100644
index 000000000000..d4abf02b7dd7
--- /dev/null
+++ b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND"
+HOMEPAGE="https://github.com/gentoo/fetchcommandwrapper"
+SRC_URI="http://www.hartwork.org/public/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=net-misc/aria2-1.10.2"
+
+pkg_postinst() {
+	ewarn 'You need to append'
+	ewarn '   source /usr/share/fetchcommandwrapper/make.conf'
+	ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.'
+}
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.3.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.3.ebuild
new file mode 100644
index 000000000000..bf638f923ccf
--- /dev/null
+++ b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.3.ebuild
@@ -0,0 +1,25 @@
+# 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,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND"
+HOMEPAGE="https://github.com/gentoo/fetchcommandwrapper"
+SRC_URI="https://github.com/gentoo/fetchcommandwrapper/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=net-misc/aria2-1.10.2"
+
+pkg_postinst() {
+	ewarn 'You need to append'
+	ewarn '   source /usr/share/fetchcommandwrapper/make.conf'
+	ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.'
+}
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.ebuild
new file mode 100644
index 000000000000..bf638f923ccf
--- /dev/null
+++ b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.ebuild
@@ -0,0 +1,25 @@
+# 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,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND"
+HOMEPAGE="https://github.com/gentoo/fetchcommandwrapper"
+SRC_URI="https://github.com/gentoo/fetchcommandwrapper/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=net-misc/aria2-1.10.2"
+
+pkg_postinst() {
+	ewarn 'You need to append'
+	ewarn '   source /usr/share/fetchcommandwrapper/make.conf'
+	ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.'
+}
diff --git a/app-portage/fetchcommandwrapper/metadata.xml b/app-portage/fetchcommandwrapper/metadata.xml
new file mode 100644
index 000000000000..b37944b1a238
--- /dev/null
+++ b/app-portage/fetchcommandwrapper/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">gentoo/fetchcommandwrapper</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/flaggie/Manifest b/app-portage/flaggie/Manifest
new file mode 100644
index 000000000000..8631d87b25d8
--- /dev/null
+++ b/app-portage/flaggie/Manifest
@@ -0,0 +1,6 @@
+DIST flaggie-0.2.1.tar.bz2 16767 SHA256 00a657a6c518bfabbc38770f61600d315a5441e821a8006406346e9a44f025d1 SHA512 3f273ebeceaaedce7a3807126fb3f450e420338a883440066d06a4d6a95b63bd538bb5da882fea23e0d390b28a83f50375dbda2624f656327775b2b700f2b2e4 WHIRLPOOL 9df433aa157dabda6089c9a2cf954085b96b13aaeeff1311be4547132d9b50109aed1f6e0b9f968b498d022721217072dda932137dad5ffc2b99ed23cce018be
+EBUILD flaggie-0.2.1.ebuild 1127 SHA256 7480dbe9012853dd989e4c872de76e19c8801117a181787abfd00c9c43238b2e SHA512 443394e552ab925cdc4d4b3208d70c521db8ab4b08f61bf2b97bb2058ac1cf82c12038cb34ebda11d18f2c93efc679b82aaa667fbedcc17d53f41d46b4dba737 WHIRLPOOL e1ab915fb3d140e89e0c798c49e228ea964d7da5469e856748f60bc7546c82bfeb9e2b14352eee032742e9c06998efbce4a3e63f30dc4d33c0eb2fd3a5df88d6
+EBUILD flaggie-9999.ebuild 1040 SHA256 94031a63b03f86255fa5a25064edcb10b6b2f7918e7badc2eddfb45451c2c701 SHA512 57259958f20a745a0dd0573577fe52aa14c1067cee633bcecbff429ef69bf1dd927e65b3bbc4bd96ed4dae29bcccdecce2f8bc2f3149bf43770b1cc4e7ae62eb WHIRLPOOL 6d9e4b4d628eaba3b3b5c0e8f55d9cd92e5c5fcb6ad3737abba17784dd2b6043b6a4c39026f2a6f3f708f0c9719ef69301fd94b0ac828c4633ad32c36d3faa0f
+MISC ChangeLog 3199 SHA256 602f6120a1b352eb3cdeface551547e01b6f704db5c1510bd70891ebdbde9130 SHA512 032728c9e2fa14055546224f813e40274e044e7b038a0c62671e0bccdca656410438e11a172dd9e967057308e2b5f825b06137f69e9cb6f711cafecc91dbfb46 WHIRLPOOL 24ce044d719951492837949b470b493b86da823f5fea6b3ce0d5c17055ded37c3bbf572d4da8e5b1b55c7dbf5cfc321dadaea189391184feb26382f073d8bbc0
+MISC ChangeLog-2015 9389 SHA256 6685271483706bbfcab624bcba731539405fbe4541482a7c6e8ebfa67fa3764b SHA512 9a6e49d73387b0fc414169dc55ef6688af8779ce59f7dd421cb19e06972c744facf4e228ee8710ef9b733b2c354062eb5d4ce9a0a6c0bd6f2048087604aedaed WHIRLPOOL 32f193cd9142229016a32da89a72864f0144389ff32b2f84924165560f30088ad4825536cadce3689bf1421780fdc667833322af10d2a9f47fd8e0a2b6ca546a
+MISC metadata.xml 522 SHA256 1e6487b3f69a9fad6d93006c52e2f676f999f997de67be969f3d0ed21b240f25 SHA512 bc30ee4bb1c6d72bdaf385fd7554819a1d82ea4fac31fa291a33fc5a3de1ee9931d76b8767b53c18683e885d62f8d72589f0609c462f472d4455570fc9e7da13 WHIRLPOOL c0751cafb1a547b7d9f6fb9976bccc181ca5926b2c5e89cdc35416661a26cd6964ac8285806449026b8dfa5cd02b489c587d85676b6e5c8e8e7a1a1111dcf8d8
diff --git a/app-portage/flaggie/flaggie-0.2.1.ebuild b/app-portage/flaggie/flaggie-0.2.1.ebuild
new file mode 100644
index 000000000000..db5dbabc1d17
--- /dev/null
+++ b/app-portage/flaggie/flaggie-0.2.1.ebuild
@@ -0,0 +1,36 @@
+# 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 bash-completion-r1 distutils-r1
+
+DESCRIPTION="A smart CLI mangler for package.* files"
+HOMEPAGE="https://github.com/mgorny/flaggie/"
+SRC_URI="https://github.com/mgorny/flaggie/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ~mips ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	newbashcomp contrib/bash-completion/${PN}.bash-completion ${PN}
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	ewarn "Please denote that flaggie creates backups of your package.* files"
+	ewarn "before performing each change through appending a single '~'."
+	ewarn "If you'd like to keep your own backup of them, please use another"
+	ewarn "naming scheme (or even better some VCS)."
+	elog
+	elog "bash-completion support requires:"
+	elog "	app-shells/gentoo-bashcomp"
+	has_version app-shells/gentoo-bashcomp && \
+		elog "(installed already)"
+}
diff --git a/app-portage/flaggie/flaggie-9999.ebuild b/app-portage/flaggie/flaggie-9999.ebuild
new file mode 100644
index 000000000000..60d5f61f5398
--- /dev/null
+++ b/app-portage/flaggie/flaggie-9999.ebuild
@@ -0,0 +1,36 @@
+# 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} )
+
+EGIT_REPO_URI="https://github.com/mgorny/flaggie.git"
+inherit bash-completion-r1 distutils-r1 git-r3
+
+DESCRIPTION="A smart CLI mangler for package.* files"
+HOMEPAGE="https://github.com/mgorny/flaggie/"
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	newbashcomp contrib/bash-completion/${PN}.bash-completion ${PN}
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	ewarn "Please note that flaggie creates backups of your package.* files"
+	ewarn "before performing each change through appending a single '~'."
+	ewarn "If you'd like to keep your own backup of them, please use another"
+	ewarn "naming scheme (or even better some VCS)."
+	if ! has_version app-shells/gentoo-bashcomp; then
+		elog
+		elog "If you want to use bash-completion, you need to install:"
+		elog "	app-shells/gentoo-bashcomp"
+	fi
+}
diff --git a/app-portage/flaggie/metadata.xml b/app-portage/flaggie/metadata.xml
new file mode 100644
index 000000000000..5ecf8886a38f
--- /dev/null
+++ b/app-portage/flaggie/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/flaggie/issues/</bugs-to>
+    <remote-id type="github">mgorny/flaggie</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/fquery/Manifest b/app-portage/fquery/Manifest
new file mode 100644
index 000000000000..19f0ec5ad3cd
--- /dev/null
+++ b/app-portage/fquery/Manifest
@@ -0,0 +1,7 @@
+DIST fquery-0.2.2.tar.gz 14489 SHA256 5641c8748ff11e5ba37175eac76ee4b14739a3d4d4711ea5ce023bc8d8559cbe SHA512 d8560a043a3e9d489232427c5911b650cca932cda1c2185c881834c8fd54d316bc650bf4d187da53cd9785adf17381e1cb7cddaf21e73d89f7854cbb33738587 WHIRLPOOL 5d7390e941ab1ecdfb06a68a5f7e483b20d52044fce358f296ec5652ffa98c96db13292da7baebce47bee4d142f91be8e2916dce2dda6c6cebad0ab8091fd19b
+DIST fquery-0.2.3.tar.gz 14511 SHA256 8bbbedcec2bd3f98ea91a187b3970de55a5e2c60ec96fe44b7609a9d122f039e SHA512 0dc345b189bd18f5f1084ab2aea07390b547b6c663d03fa9cec968e5cef598fe58b6a294845ca12b020c78ff2a01ce7e5da0bb06a513c53b8b5aa357b071fb88 WHIRLPOOL 735f56af88e5498a06ac92714b70f1ae843448ffe4836c56b365fdc42cd1a34409fd8ce536afb843355aa9659e78e0fd3949c2546ee4eb31091e8e17e6fb68ca
+EBUILD fquery-0.2.2.ebuild 597 SHA256 f60eae77391a3cf92e71ae324117f5b8d83cde76c92f58d44593e0161a51f3c1 SHA512 0812ebe50ec4d31eb2920155b588a95793cc2958c009b82b83c559ec0ce169ccc5d917f3937bdce0d51af2158058882e82fa5b8cd69b85bcb2b66a91f21dca52 WHIRLPOOL b1bbe5bcb0fa3e36248294d69569fb5e7f93f5095c4cfd8251928f058b1053edd14a51ef243f9e1eeb84d3d37229eb541df6ec6e2c0e405a37d2c5858dc2a0c9
+EBUILD fquery-0.2.3.ebuild 597 SHA256 f60eae77391a3cf92e71ae324117f5b8d83cde76c92f58d44593e0161a51f3c1 SHA512 0812ebe50ec4d31eb2920155b588a95793cc2958c009b82b83c559ec0ce169ccc5d917f3937bdce0d51af2158058882e82fa5b8cd69b85bcb2b66a91f21dca52 WHIRLPOOL b1bbe5bcb0fa3e36248294d69569fb5e7f93f5095c4cfd8251928f058b1053edd14a51ef243f9e1eeb84d3d37229eb541df6ec6e2c0e405a37d2c5858dc2a0c9
+MISC ChangeLog 2956 SHA256 e8abf4af5dc9dace56bb549f7cfc21ca8519d69fdaad6b81d9ec392e7ad9cbec SHA512 ab435635043b0f165196acace6a0acee79be21616876012328058f773c5bda0750cb636ea88c8d3b5dc84a9e26d75755c71c41f155607fadac0e7a1fa7841b83 WHIRLPOOL 184446c7c60e3e1064930dba9a13258821088255f0a521699689da2c4b61cee2e893106d56e00df77cfe86a8befb1b046e8a952a23ea7eec2033e07ba1b26e04
+MISC ChangeLog-2015 507 SHA256 8e72e8fd244250b19e393ab38fdd91513ef0d7a14e21ae1ae1cd62945f4f9b02 SHA512 e8955a34dd00d28494ce6f3dbc453450e05f8b864da4db4c0cd030f25d2043dddf73d4041d08144f40266809551955ea4fab3f06daa5122ee884c8431e06b7a2 WHIRLPOOL 63fafe91c6a966d20a8517c85e9e519b5b8b641f35fd778d5b1f7754eea45cfa3dc9b32e4bdf08055b7499a8cdf58429aaa57e014e59b7ee51c74adf64404534
+MISC metadata.xml 290 SHA256 b7f6704af11012fc149de6df946de7be6afc8ab8caf333e713823cdcdc89a6d3 SHA512 89b8856e1eb7618964811ce381d36e758b17b7d3c9d364a1d715d31b4873599304c6f1883abf1f401841c760f7f7d6fa117bb1e0111702998ac79b6f08744874 WHIRLPOOL cdc6b72d8d1284c461ed854b9cc1a6a07700093ca439c4ba8e5f0e78a1cb96605d1f5482beb9204737b637a6d246c2c3ab67de71a21d0f6c57d8cdedea1d05f2
diff --git a/app-portage/fquery/fquery-0.2.2.ebuild b/app-portage/fquery/fquery-0.2.2.ebuild
new file mode 100644
index 000000000000..c0d1703447b9
--- /dev/null
+++ b/app-portage/fquery/fquery-0.2.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="Installed package query tool for Gentoo Linux"
+HOMEPAGE="http://hackage.haskell.org/package/fquery"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/hashtables:=
+	dev-haskell/parsec:=
+	dev-haskell/regex-compat:=
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/app-portage/fquery/fquery-0.2.3.ebuild b/app-portage/fquery/fquery-0.2.3.ebuild
new file mode 100644
index 000000000000..c0d1703447b9
--- /dev/null
+++ b/app-portage/fquery/fquery-0.2.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="Installed package query tool for Gentoo Linux"
+HOMEPAGE="http://hackage.haskell.org/package/fquery"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/hashtables:=
+	dev-haskell/parsec:=
+	dev-haskell/regex-compat:=
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/app-portage/fquery/metadata.xml b/app-portage/fquery/metadata.xml
new file mode 100644
index 000000000000..30d7a9f1b7d4
--- /dev/null
+++ b/app-portage/fquery/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="project">
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		A fast replacement for equery
+	</longdescription>
+</pkgmetadata>
diff --git a/app-portage/g-cpan/Manifest b/app-portage/g-cpan/Manifest
new file mode 100644
index 000000000000..8496af7c4f1f
--- /dev/null
+++ b/app-portage/g-cpan/Manifest
@@ -0,0 +1,12 @@
+DIST g-cpan-0.16.5.tar.gz 33894 SHA256 929c06ee2cdd3361121b6f359ea7fc9201bc42caff96ef1df45b4cb93ccfd988 SHA512 f2eab23281abe567ee2df42895e3f0783228c6ab5e3a8230089e900fd2700367d736299da20fb228f2d4542491a24da05fd035a81aff7d79ce5132e35c48ad0b WHIRLPOOL 01e0b9fc59264455d57fc64c432e683ae941c74d6efa6e2b3430dea6caac019cfad3e893a4b39de4386a3dadadecf95d828a9fbaa8e8b1260303081e2cc6ce65
+DIST g-cpan-0.16.6.tar.gz 33844 SHA256 efd0a99483d8ce4a6c828f145592846e6076887b33f95431d7b8256c6973906d SHA512 f8e9e211ffc09ca42d1444a42ad2b8111beb8988e4a01387cf8788f7e4a52e6133168820c2800ac82429fa022e2ff473a774c48ac140b5cde184b3d77cd6e1b1 WHIRLPOOL 95d7db1905df41f320b8876a02f53e3238d55ab1be30e4b086ed362797819629997edd06e167c21325cc8d13540247a842cedcfcf1a236737fec91835b952252
+DIST g-cpan-0.16.7.tar.gz 33621 SHA256 35ead4120bee1b4158413eb1f5933baf1ce75500495d590163fbfef95c9c171f SHA512 2412b30fa4c3432882db0f31da6ace841e353a363e15a3b536ea1febcf601a7f9c4e14968e3abcf848e3557098088012472179688caf36cd97ae9b528a3db7fb WHIRLPOOL 646f76745023ae815ebecf57856b50dcd568657df68aee89099dd64904a4d43e9cef82f4f16518bd0b8db50e3ddd57aa200bf8fcffbd6539305f59be798bece1
+DIST g-cpan-0.16.9.tar.gz 34463 SHA256 2d85b37905af8d2878b949438d61d80d530184605260a3b49901b113ef8b7b42 SHA512 f26d81974fedb024808fe3671ae297fd36abc37a5b04783f36f6c9e8c6000a411c675e999e91da48801a7c84fde15a59587df02fa9d7b3833ccc0916993b1783 WHIRLPOOL a7f11aa4588fc5fe31ba9570b059b7f90a370f477e04ea62cd823c438f3ab27687417014fa62381b744f461825be4d3c9aff6d37f6880abf60a8f4cef41edf62
+EBUILD g-cpan-0.16.5.ebuild 1060 SHA256 327e5a2a6129570da2179bfa026fa7dcb0361e7697e9687ecde25d69d7de3518 SHA512 a2524f42f7df44c7eb2eceabb9fef72173b4d2f9981eba77d77c6728c549bc31e55eff27621ce736c46610d037dd33807d8fafe10efd2315abc6ca2f0295eb5c WHIRLPOOL f047ed54a05642a4cbaa3223d4dd1ac2094e8453438d98c3122495370086fc1be04000ed1a6adef4f74d7eb447ee40cec9b3718d0d8ba680c25f74a776eb97e3
+EBUILD g-cpan-0.16.6.ebuild 1152 SHA256 21fd096e1d2a6d6911d92883ab7d83df45aaa85e17deb97907549fc2cae50148 SHA512 0def8a8ea3c3644fc55dc1a99110213814063e881bf4c5ae49c8bd69fd460c9236b6d95d7a0ffa76bcd42d1175f451eeea4998832f09f780b96d07daedf0650f WHIRLPOOL 7de13e928b34abc64c3cf2f1f6ee92ed6e4cbb83f7e72f523b7ed07dfa3cb3f9322caa63d802421b0b021695fa81bf1a700d961542160548d3d6ce5ba315a418
+EBUILD g-cpan-0.16.7.ebuild 1444 SHA256 f647e43957ce4592699c93963f8046350df839e1bc3cb1483503ea7fcc7e772d SHA512 2a89a12a6d0d096a6bbc5ff30655250f63e7c5cf9cbc271e59691972552450eca0945072cb3d485883c4eb203d4ae9ed9c1095dd752d8c197c5826a612eebca3 WHIRLPOOL 92791d1685bd87018c696e5c1799f49dbfe96d2f762d490363539b8e5bb32c34b4fea7eb06d8d33b1520f0bbef2a1d2d6438902fdc21cf9463daf0606f37823a
+EBUILD g-cpan-0.16.9.ebuild 1429 SHA256 eabaa0faea91a39c57749768d9fa3185201ee62c412e86f93b434388d61128ed SHA512 dd77001bc6b259c6282f7fcf271cf468a16e119cb757fbd54217e8e1ee2be07ff0089f1c5740a71e79f15fb4f8f0bcd4a8bbb532a87de856f4ceecb9598df363 WHIRLPOOL 0d7923504f6c48deca2bcb22f07537c859233637d58cd1996a64692059e1fa9d887f4859c1d54b2076bde2baf3fbb129a048bffbfa686c216ac16a6b7532515f
+EBUILD g-cpan-9999.ebuild 1480 SHA256 13eea11589ce84f085c64201ba35f5b9d2b394e48c2311a40a43f41a8d978eb6 SHA512 7086e51ac1cfa3ab8f7a1e596c60470ae8fd7e3530fdced8c6dffd8d4094dcf9a2e987786231c1fd2f9a4dc9eeae563743b7f0e44b35952ebbfb46813756653e WHIRLPOOL 168c9cd7a77379e4b2f0bc93a6ae3701e13a5dd38cc2cda8cec2641f818a057cac9a490b552d31b2da7b328e3c6d8e4f9f8a0048288d367d0d31cea2bb681178
+MISC ChangeLog 4705 SHA256 9538b433bcc182cea5d9dadbc6612e03158ae11a6711d358254c2234c13b73bd SHA512 93ca19119348945b2a1da5618c4ab97a70686b513587141ffc4d45f09483e62114a7950cbb2ee949a2593dd3d0368e44aa5c62a12cf6c48fd4b7ab2ee00e1150 WHIRLPOOL 48f93b4bb4335c74712434ddd0ef30a80419524f8d02572942df866b7a5f48feaa154b5b179e39e870482f9280b2bc674f798aa78c5dab0591c671e18eab3f8e
+MISC ChangeLog-2015 14282 SHA256 7185407707847f495c548009d8f2fc11d2bb8bf4ca8f9b00dc91824bd1dfe9ac SHA512 17233489fbb5556b3bdfd34f18c31dc17a3d5af64c39204a01990fd0bbdfe2722ecd531c3aef809192a77ae49b79d08bfa28d846c5ce01c318fc65c65c73c587 WHIRLPOOL 80bd643b9783a5701011969e8fb96c45d81443f5a89cd3900a19492bf15034a488ec1e036238ca28be4638f94bdeec6c8f56ad5addb0d10d07f1a910cf8b9811
+MISC metadata.xml 565 SHA256 7a63196796ca91cf5b659381d00a6e17761033a7bf402cf02f2cfc9b8e639c1b SHA512 057c2d4a401423d789283661cef0a4c42955d10cbf9671f671de279975fde004d0836e5fec8bd1d34c5f0f1f0bf21d6ebded0bb716d7445001c975a22ff2d0c9 WHIRLPOOL 6b33115e3fa8d7afad4583b34e741bd7df3b081be84857906d8cd63271ac563b3eecefae3ebfb93edecfcf4025ad3a3098d774487e59ca0b0e5eb9fb38600fc9
diff --git a/app-portage/g-cpan/g-cpan-0.16.5.ebuild b/app-portage/g-cpan/g-cpan-0.16.5.ebuild
new file mode 100644
index 000000000000..a6a38e8e0d2b
--- /dev/null
+++ b/app-portage/g-cpan/g-cpan-0.16.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+		 https://dev.gentoo.org/~chainsaw/distfiles/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+		>=dev-perl/YAML-0.60
+		dev-perl/Shell-EnvImporter
+		dev-perl/Log-Agent"
+RDEPEND="${DEPEND}"
+
+src_install() {
+		perl-module_src_install
+		diropts "-m0755"
+		dodir "/var/tmp/g-cpan"
+		keepdir "/var/tmp/g-cpan"
+		dodir "/var/log/g-cpan"
+		keepdir "/var/log/g-cpan"
+}
+
+pkg_postinst() {
+	elog "You may wish to adjust the permissions on /var/tmp/g-cpan"
+	elog "if you have users besides root expecting to use g-cpan."
+	elog "Please note that some CPAN packages need additional manual"
+	elog "parameters or tweaking, due to bugs in their build systems."
+}
diff --git a/app-portage/g-cpan/g-cpan-0.16.6.ebuild b/app-portage/g-cpan/g-cpan-0.16.6.ebuild
new file mode 100644
index 000000000000..876c6180f0f3
--- /dev/null
+++ b/app-portage/g-cpan/g-cpan-0.16.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-lang/perl
+		>=dev-perl/YAML-0.60
+		>=dev-perl/Shell-EnvImporter-1.70.0-r2
+		dev-perl/Log-Agent"
+RDEPEND="${DEPEND}"
+
+src_install() {
+		perl-module_src_install
+		diropts "-m0755"
+		dodir "/var/tmp/g-cpan"
+		dodir "/var/log/g-cpan"
+		keepdir "/var/log/g-cpan"
+}
+
+pkg_postinst() {
+	elog "You may wish to adjust the permissions on /var/tmp/g-cpan"
+	elog "if you have users besides root expecting to use g-cpan."
+	elog "Please note that some CPAN packages need additional manual"
+	elog "parameters or tweaking, due to bugs in their build systems."
+}
diff --git a/app-portage/g-cpan/g-cpan-0.16.7.ebuild b/app-portage/g-cpan/g-cpan-0.16.7.ebuild
new file mode 100644
index 000000000000..b56c85f37fb1
--- /dev/null
+++ b/app-portage/g-cpan/g-cpan-0.16.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit perl-module
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/gentoo-perl/g-cpan/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+IUSE="test"
+
+COMMONDEPEND="
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	dev-perl/Log-Agent
+	virtual/perl-Memoize
+	virtual/perl-IO
+	dev-perl/Shell-EnvImporter
+	virtual/perl-Term-ANSIColor
+	>=dev-perl/YAML-0.60
+"
+RDEPEND="${COMMONDEPEND}
+	>=sys-apps/portage-2.0.0
+"
+DEPEND="${COMMONDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.940.0 )
+"
+
+src_install() {
+		perl-module_src_install
+		diropts -m0775 -o portage -g portage
+		dodir "/var/tmp/g-cpan"
+		dodir "/var/log/g-cpan"
+		keepdir "/var/log/g-cpan"
+}
+
+pkg_postinst() {
+	elog "If you want to use g-cpan as non root user you may wish to adjust"
+	elog "the permissions on /var/tmp/g-cpan or add users to the portage group."
+	elog "Please note that some CPAN packages need additional manual"
+	elog "parameters or tweaking, due to bugs in their build systems."
+}
diff --git a/app-portage/g-cpan/g-cpan-0.16.9.ebuild b/app-portage/g-cpan/g-cpan-0.16.9.ebuild
new file mode 100644
index 000000000000..a385366a29ce
--- /dev/null
+++ b/app-portage/g-cpan/g-cpan-0.16.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit perl-module
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+fi
+
+DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+IUSE="test"
+
+COMMONDEPEND="
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	dev-perl/Log-Agent
+	virtual/perl-Memoize
+	virtual/perl-IO
+	dev-perl/Shell-EnvImporter
+	virtual/perl-Term-ANSIColor
+	>=dev-perl/YAML-0.60
+"
+RDEPEND="${COMMONDEPEND}
+	>=sys-apps/portage-2.0.0
+"
+DEPEND="${COMMONDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.940.0 )
+"
+
+src_install() {
+	perl-module_src_install
+	diropts -m0775 -o portage -g portage
+	dodir "/var/tmp/g-cpan"
+	dodir "/var/log/g-cpan"
+	keepdir "/var/log/g-cpan"
+}
+
+pkg_postinst() {
+	elog "If you want to use g-cpan as non root user you may wish to adjust"
+	elog "the permissions on /var/tmp/g-cpan or add users to the portage group."
+	elog "Please note that some CPAN packages need additional manual"
+	elog "parameters or tweaking, due to bugs in their build systems."
+}
diff --git a/app-portage/g-cpan/g-cpan-9999.ebuild b/app-portage/g-cpan/g-cpan-9999.ebuild
new file mode 100644
index 000000000000..669c09926378
--- /dev/null
+++ b/app-portage/g-cpan/g-cpan-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit perl-module
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+IUSE="test"
+
+COMMONDEPEND="
+	dev-perl/Config-Tiny
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	dev-perl/Log-Agent
+	virtual/perl-Memoize
+	virtual/perl-IO
+	dev-perl/Path-Tiny
+	dev-perl/Shell-EnvImporter
+	virtual/perl-Term-ANSIColor
+	>=dev-perl/YAML-0.60
+"
+RDEPEND="${COMMONDEPEND}
+	>=sys-apps/portage-2.0.0
+"
+DEPEND="${COMMONDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.940.0 )
+"
+
+src_install() {
+	perl-module_src_install
+	diropts -m0775 -o portage -g portage
+	dodir "/var/tmp/g-cpan"
+	dodir "/var/log/g-cpan"
+	keepdir "/var/log/g-cpan"
+}
+
+pkg_postinst() {
+	elog "If you want to use g-cpan as non root user you may wish to adjust"
+	elog "the permissions on /var/tmp/g-cpan or add users to the portage group."
+	elog "Please note that some CPAN packages need additional manual"
+	elog "parameters or tweaking, due to bugs in their build systems."
+}
diff --git a/app-portage/g-cpan/metadata.xml b/app-portage/g-cpan/metadata.xml
new file mode 100644
index 000000000000..67070ea1bee7
--- /dev/null
+++ b/app-portage/g-cpan/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>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>Sergiy.Borodych@gmail.com</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gentoo-perl/g-cpan</remote-id>
+		<bugs-to>https://github.com/gentoo-perl/g-cpan/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-portage/g-octave/Manifest b/app-portage/g-octave/Manifest
new file mode 100644
index 000000000000..ec820a6eb7ce
--- /dev/null
+++ b/app-portage/g-octave/Manifest
@@ -0,0 +1,9 @@
+AUX g-octave-0.4.1-add_cave_support.patch 3289 SHA256 a9ec0ebba905879d6d31e06da6cca91aad075f70936ee3f8d15fc2afa1ef30b9 SHA512 2903550b2f61940d3a141ed59af5ae19a2d03dcaffb3b143c66247be8e8e5262b29f2693b884c8a2b7cf6c9e1885a5e6564286dfdee77d3a34ed3a2e86ab97db WHIRLPOOL ec1d605b96c802622ed39cbdee02c206553a9a45e7e38a766fcb5324b3a19005712a7dc4b48cb14c0eed4b56fb44879de623cede93daea3c9c71d73616970657
+AUX g-octave-0.4.1-fix-Makefile.patch 491 SHA256 9d3ff0a346affbb38785cbe166cb3916f27be5975a06602a00c484ba0b5145e4 SHA512 d11269f703fa887ca6a5c42773f8891c28036d0890818a233504e4827c3221e2b69ea80ce02023c3bfe279a17318ba4084b137d2f92f281abacf5aa218492ce4 WHIRLPOOL f842345e923131cdaf5f453e5432a6a06181054a1549182f45026d062b43f84fca99d0e635c3378a968c01416b628926c65b5162adb5d4a7152bb1b0eefe9b4e
+AUX g-octave-0.4.1-fix-sourceforge-svn-root.patch 1441 SHA256 6ef1396c625384b99afdd47783e7043c135465b0f1fd0659eb5f7109be1a9d58 SHA512 637a3f0a7be6cacde645768bc2f576ceccb163fa00dae60520ff0de876f8414b75568e33a04bbc225520ef05258e4339930f748577620cb9588cfcbf961fce1b WHIRLPOOL 2d4a0d7c11fb0406d64b21a26f575a1bd047b230f7a7373da1456efec2d13f47584e651e6ba7a92a7166de646b0308693b1ab1785ce27f25eccddae40c357917
+DIST g-octave-0.4.1.tar.gz 52285 SHA256 14992469fbf82385fc3a2c541289d236030bd3bd7ebf0b654a8ff1d1d20c3437 SHA512 424b95e626981aa5685795ffb3df1a1d608e5293adba074cc67f7dcf08d4a0c94a0174005f97a8da1ba1ae4233299e6a530af96ba3b9fd0d8b224915e947efb3 WHIRLPOOL 82698ceccb4786bebf6127c05ad87759556456a3aca0615f5a7a99260d30170246f3b323f7485ab79f3e5c3f57eb356c3d6cda3dfdad3c7657e04a2eac026b2e
+DIST g-octave-db-bdf02cb.tar.gz 39836 SHA256 e0f0797e44b4d0fe6b0952a66631cd3ed14594881334c35d734f1eb6a46daf88 SHA512 5eae00e18b6d4633ed0feda3a2eea6b36da049c133bcd49e54481443ff435bfcab0f303ab9f0e8c3f48fad707625ee13b4564c510d89fa196e737c7599ea5fa6 WHIRLPOOL 0c8618e9e36c854364cd390eda4d4e1f08c76211088cfe45d6b6d0220bf7afe82137b18417cfbf0f4524561edb6daa9340b7f16fecb4380a4ed90bdb84857c13
+EBUILD g-octave-0.4.1-r5.ebuild 2362 SHA256 77c99335ad03278058277e8ca0478cff2c8f50cd7cbcdc0836d8e41ea6ced346 SHA512 951ac52387f25f968249e7925c2abec03e231a9ffe082512c0ac13f2f8f8e5f7489536f412b8a9bc141e421b1bd7522d01323c78cae0a3e512af9309f0175360 WHIRLPOOL 12198f1ab5211f85aea96ede3efc99848428b7699cb6e8cce9d1a49622e9939fb6f0b5765e9bf26c7690dce161342eeb43d225f13708d02dcfd16c67c7e681a1
+MISC ChangeLog 3190 SHA256 a8de2bc129729177f9a111a425e6a726ceee2ea67fac9848ff2fe582d54641c9 SHA512 a694902746a7fa807d54d621f858b1d7180604dc015d247734375c095fe3921d6734f74e5463c2dd09a15326659aceb22eff4ba5da77131816ebfdc39ef42049 WHIRLPOOL 8662fac90a8ffee74bac98cdc04b447cb8d0631a9f34e59fae0e1259ec2361ddef7106ca2b6bfb4573a4ebecdee9da6f0a637eb5b44cd8cae8d02c3ab95f55f7
+MISC ChangeLog-2015 2018 SHA256 236f84b46d1c26fa99f9bba1e1dd265019d62a727866ff680e940ae6eeef7c59 SHA512 6a29863fddfdafe1d9483aee2c66024eb843682b349919876a86d79e6442eeb72866d1a012d76f57d5b1cfb5bd0e2289fd5c67a322a55fc74777c3be8b5bf8c2 WHIRLPOOL b21592615b1dc005f950d37c674a97b78dad28aa69ea29d5678322a25a1c4ef9cc553afd70adf57368af061c6eacda23a5f00c0986be92dfc3e9ae47b7364fc0
+MISC metadata.xml 1006 SHA256 a68b52dcb575f7ad63a71f53ed5c4e4390297211dc369b291715d7803c7d0df9 SHA512 84b7e69f1edaae0863d30e66af5b8d5ae0f01bc0ea4c12bdd2a3b706c768e2fa4281da693bd355662ceee12b6c64f30c43188ec94fbb9b0a8e60405bb763cbf5 WHIRLPOOL 53e544b7cdebdadf6c4b3bcef557557787f61b7da4a746a90b2db9ffb3d713a465b84eccd90ed05dca0e478c5dccb71ced940bf0d5bd828f04131aa3ece97cc5
diff --git a/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch b/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch
new file mode 100644
index 000000000000..27468c1bba5a
--- /dev/null
+++ b/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch
@@ -0,0 +1,88 @@
+--- g-octave-0.4.1/g_octave/package_manager.py	2010-10-23 23:37:26.000000000 +0200
++++ g-octave-0.4.1/g_octave/package_manager.py	2011-05-25 12:52:10.510019006 +0200
+@@ -15,6 +15,7 @@
+     'Portage',
+     'Pkgcore',
+     'Paludis',
++    'Cave',
+ ]
+ 
+ import grp
+@@ -243,3 +244,56 @@
+                 packages.append(line.strip())
+         return packages
+ 
++class Cave(Base):
++    
++    _client = '/usr/bin/cave'
++    _group = 'paludisbuild'
++    
++    post_uninstall = [
++        'You may want to remove the dependencies too, using:',
++        '# cave purge',
++    ]
++    
++    def __init__(self, ask=False, verbose=False, pretend=False, oneshot=False, nocolor=False):
++        self._fullcommand = [self._client]
++        self._cmd = ['-z']
++        oneshot and self._cmd.append('-1')
++        not pretend and self._cmd.append('-x')
++        #if verbose:
++        #    self._fullcommand += [
++        #        '--show-descriptions', 'all',
++        #        '--show-option-descriptions', 'all',
++        #    ]
++        #cave doesn't support '--ask'
++        #cave doesn't support '--no-color'
++    
++    def run_command(self, command):
++        return subprocess.call(self._fullcommand + command + self._cmd)
++    
++    def install_package(self, pkgatom, catpkg):
++        return self.run_command(['resolve'] + [pkgatom])
++
++    def uninstall_package(self, pkgatom, catpkg):
++        return self.run_command(['uninstall'] + [pkgatom])
++    
++    def update_package(self, pkgatom=None, catpkg=None):
++        cmd = ['-1','-K','s','-k','s']
++        if pkgatom is None:
++            pkgatom = self.installed_packages()
++        else:
++            pkgatom = [pkgatom]
++        self.do_ebuilds(pkgatom)
++        return self.run_command(['resolve'] + cmd + pkgatom)
++    
++    def installed_packages(self):
++        packages = []
++        p = subprocess.Popen([
++            'cave',
++            'print-ids',
++            '--matching', 'g-octave/*::installed',
++            '--format', '%c/%p\n',
++        ], stdout=subprocess.PIPE)
++        if p.wait() == os.EX_OK:
++            for line in p.stdout:
++                packages.append(line.strip())
++        return packages
+--- g-octave-0.4.1/scripts/g-octave	2011-05-25 12:00:25.740019020 +0200
++++ g-octave-0.4.1/scripts/g-octave	2011-05-25 12:00:39.434019008 +0200
+@@ -217,7 +217,7 @@
+             return os.EX_DATAERR
+         return os.EX_OK
+ 
+-    from g_octave.package_manager import Portage, Pkgcore, Paludis
++    from g_octave.package_manager import Portage, Pkgcore, Paludis, Cave
+ 
+     if conf_prefetch.package_manager == 'portage':
+         log.info('Your package manager is: Portage')
+@@ -228,6 +228,9 @@
+     elif conf_prefetch.package_manager == 'paludis':
+         log.info('Your package manager is: Paludis')
+         pkg_manager = Paludis(options.ask, options.verbose, options.pretend, options.oneshot, not options.colors)
++    elif conf_prefetch.package_manager == 'cave':
++        log.info('Your package manager is: Paludis (Cave)')
++        pkg_manager = Cave(options.ask, options.verbose, options.pretend, options.oneshot, not options.colors)
+     else:
+         log.error('Invalid package manager: %s' % conf_prefetch.package_manager)
+         out.eerror('Invalid package manager: %s' % conf_prefetch.package_manager)
diff --git a/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch b/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch
new file mode 100644
index 000000000000..af56b4f75d96
--- /dev/null
+++ b/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch
@@ -0,0 +1,12 @@
+--- g-octave-0.4.1/share/g-octave.eclass	2013-05-30 19:01:07.980521612 +0200
++++ g-octave-0.4.1/share/g-octave.eclass.new	2013-05-30 19:03:38.933514388 +0200
+@@ -48,6 +48,9 @@
+ 	for filename in Makefile configure; do
+ 		cp "${DISTDIR}/g-octave_${filename}" "${S}/${filename}"
+ 	done
++
++	sed -i -e 's@libexec@lib@g' "${S}/Makefile" || die 'sed failed.'
++
+ 	chmod 0755 "${S}/configure"
+ 	if [ -e "${S}"/src/autogen.sh ]; then
+ 		cd "${S}"/src && ./autogen.sh || die 'failed to run autogen.sh'
diff --git a/app-portage/g-octave/files/g-octave-0.4.1-fix-sourceforge-svn-root.patch b/app-portage/g-octave/files/g-octave-0.4.1-fix-sourceforge-svn-root.patch
new file mode 100644
index 000000000000..2700f3b100dc
--- /dev/null
+++ b/app-portage/g-octave/files/g-octave-0.4.1-fix-sourceforge-svn-root.patch
@@ -0,0 +1,36 @@
+--- a/contrib/manage_pkgdb.py
++++ b/contrib/manage_pkgdb.py
+@@ -50,7 +50,7 @@ class SfUpdates:
+     # feed url from 'http://sourceforge.net/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/'
+     feed_url = u'http://sourceforge.net/api/file/index/project-id/2888/mtime/desc/rss?path=%2FOctave%20Forge%20Packages%2FIndividual%20Package%20Releases'
+ 
+-    svnroot_url = u'https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/'
++    svnroot_url = u'http://svn.code.sf.net/p/octave/code/trunk/octave-forge'
+     categories = [u'main', u'extra', u'language', u'nonfree']
+ 
+     _timestamp = None
+--- a/g_octave/description.py
++++ b/g_octave/description.py
+@@ -269,7 +269,7 @@ def __getattr__(self, name):
+ 
+ class SvnDescription(Description):
+     
+-    _url = 'https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge'
++    _url = 'http://svn.code.sf.net/p/octave/code/trunk/octave-forge'
+     
+     def __init__(self, category, package):
+         temp_desc = config_file = tempfile.mkstemp()[1]
+--- a/share/g-octave.eclass
++++ b/share/g-octave.eclass
+@@ -13,7 +13,7 @@
+ G_OCTAVE_CAT="${G_OCTAVE_CAT:-main}"
+ 
+ 
+-REPO_URI="https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge"
++REPO_URI="http://svn.code.sf.net/p/octave/code/trunk/octave-forge"
+ if [[ ${PV} = 9999* ]]; then
+ 	inherit subversion autotools
+ 	ESVN_REPO_URI="${REPO_URI}/${G_OCTAVE_CAT}/${PN}"
+-- 
+1.7.10
+
diff --git a/app-portage/g-octave/g-octave-0.4.1-r5.ebuild b/app-portage/g-octave/g-octave-0.4.1-r5.ebuild
new file mode 100644
index 000000000000..539e75f517a4
--- /dev/null
+++ b/app-portage/g-octave/g-octave-0.4.1-r5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+DB_COMMIT="bdf02cbf0a8d017c6c1bddeffd6f03d5d90695ed"
+DB_DIR="rafaelmartins-${PN}-db-${DB_COMMIT:0:7}"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A tool that generates and installs ebuilds for Octave-Forge"
+HOMEPAGE="https://github.com/rafaelmartins/g-octave"
+
+SRC_URI="mirror://github/rafaelmartins/${PN}/${P}.tar.gz
+	https://github.com/rafaelmartins/${PN}-db/tarball/${DB_COMMIT} ->
+		${PN}-db-${DB_COMMIT:0:7}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="doc? ( >=dev-python/sphinx-1.0 )"
+RDEPEND="sys-apps/portage"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${P}-add_cave_support.patch"
+		"${FILESDIR}/${P}-fix-sourceforge-svn-root.patch"
+		"${FILESDIR}/${P}-fix-Makefile.patch"
+	)
+	sed -i -e 's/^has_fetch.*$/has_fetch = False/' scripts/g-octave \
+		|| die 'failed to patch the g-octave main script'
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html || die 'failed to compile the documentation.'
+	fi
+}
+
+python_install_all() {
+	local HTML_DOCS=( ${PN}.html )
+	doman ${PN}.1 || die 'doman failed.'
+	if use doc; then
+		mv docs/_build/{html,sphinx} || die 'mv failed.'
+		HTML_DOCS+=( docs/_build/sphinx )
+	fi
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	"${EPYTHON}" scripts/run_tests.py || die 'test failed.'
+}
+
+pkg_postinst() {
+	elog
+	elog 'To be able to use g-octave with the shipped package database, please'
+	elog 'edit your configuration file, clean your db directory and run:'
+	elog "    emerge --config =${PF}"
+	elog
+	elog "If you are upgrading from =${PN}-0.3, please read this:"
+	elog "http://g-octave.readthedocs.org/en/latest/upgrading/#from-0-3-to-0-4"
+	elog
+	elog 'Please install the package manager that you want to use before run g-octave'
+	elog
+}
+
+pkg_config() {
+	local db="$(g-octave --config db)"
+	mkdir -p "${db}" || die 'mkdir failed.'
+	einfo "Extracting g-octave database files to: ${db}"
+	tar -xzf "${DISTDIR}/${PN}-db-${DB_COMMIT:0:7}.tar.gz" -C "${db}" || die 'tar failed.'
+	rm -rf "${db}"/{patches,octave-forge,info.json,manifest.json,timestamp} || die 'rm db files failed.'
+	mv -f "${db}/${DB_DIR}"/* "${db}" || die 'mv failed.'
+	rm -rf "${db}/${DB_DIR}" || die 'rm db dir failed.'
+}
diff --git a/app-portage/g-octave/metadata.xml b/app-portage/g-octave/metadata.xml
new file mode 100644
index 000000000000..a767dd6b01bd
--- /dev/null
+++ b/app-portage/g-octave/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>rafaelmartins@gentoo.org</email>
+    <name>Rafael G. Martins</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <longdescription lang="en">
+        g-octave is a tool that generates and installs ebuilds for Octave-Forge
+        packages "on-the-fly" to Gentoo Linux, using Portage. It's capable to
+        generate ebuilds and Manifest files for the packages, and to install
+        them using an autogenerated overlay (named g-octave). g-octave can also
+        handle patches to the packages automatically. The command line interface
+        tries to be very similar to the interface of the emerge tool.
+	</longdescription>
+  <upstream>
+    <remote-id type="github">rafaelmartins/g-octave</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/g-sorcery/Manifest b/app-portage/g-sorcery/Manifest
new file mode 100644
index 000000000000..98b9b77e1a49
--- /dev/null
+++ b/app-portage/g-sorcery/Manifest
@@ -0,0 +1,11 @@
+DIST g-sorcery-0.1.tar.gz 45796 SHA256 47fbc40864849cb4b9dfe15d79a38310705fc4dd2a7d5c2ef99688f5b31edec6 SHA512 207776ed65c79365dd65a21b14f3ba38589a2b5f47c3c6ac38691ba7949b9a836f6a8543e443119d6f2381a5f34ee854ecbc7d2f88527301c7cb1e10478406a5 WHIRLPOOL 4af6a5267d2c3dc5b9c4932b39dc474419f95c0c279d3211847abd8aa25cb148413815099a8c1866156d2437c673850445fbedd04e00076072c9ed91fc150897
+DIST g-sorcery-0.2.1.tar.gz 55546 SHA256 369c006bc17b1871fec1e7bb86b672866aaa4a57b59da459a5ee90ac09ef0bfb SHA512 42c34ed8addaf721583029d5056751810b0a77546f798081c7c605223342fa2a99bd2e30f20f004a8606ccf847108f0e2ef2c479f3cbb55f2fe6648d4ffc075e WHIRLPOOL 5af665c872904e8d01651a103c70949b350f4565f2f798be9d606ece7057326a02bdcf9f7c5c3d2abd582be627924f99919dd28132a3c2450bed23f0d619b0f7
+DIST g-sorcery-0.2.tar.gz 54173 SHA256 0d37d5f7ad41771fadefef4caa7d75470c334f277d50107b727f8cd4688b5189 SHA512 9715d468c3eb34eac2bda81b7442d86fc8af984c2115c93682ae6c63d59a9ed3d7d0234df845659ccd991eb304d732ae33e31c217a7916b8dd08e2617984cb32 WHIRLPOOL 8e9439c11132f25ef8f21421ff89043773de15211934dbb45e0b409d058f41b347f536f0b88d0f1a7f8632918b08988edeb76897a2b9d087e1f83da55e35fcac
+EBUILD g-sorcery-0.1-r1.ebuild 666 SHA256 30cc4b588f94cecc36e1ee0a40822dc33d1dc2d6187005a7728c74717a036fae SHA512 0b86108e43627da22083a965455f8a2a109d207281eeff32d40cae1c4e8b360037e05f46731ec65aa8291ad8d8260288207ab189fd1ed06a934b2694d8fa2a12 WHIRLPOOL 265bca8f58ebf9c44f1e19eec4d413b894266a6463510c1999bc4b7e177d14e301a48d2844b988fed8beceb14bb6f97b092810da52c36c258362e6114ecb29c4
+EBUILD g-sorcery-0.2.1-r1.ebuild 933 SHA256 f518b426dc1ad68f76a19af000d4b139402ba61246263bd4e56b5b5bd175716e SHA512 5282726934e607f1206f45701d54e87ef266f0b78f20dcacaa24ac85678287d5431668def3d6700f26049d89723319afd17a5b2c554ac60b9dccd0824b904029 WHIRLPOOL 2cd9a53099ac5df9daa5756610eee6794ffd34f149a0f9f545cfe14f071fa83b40112731a5b9e86d4127b36a1751db8b71f7d31408a484217a9951b08140e0b9
+EBUILD g-sorcery-0.2.1.ebuild 866 SHA256 7a7635d0e949e035e35bd6f44ae32920c74cabd34d7c4a7db128b26b8059afd3 SHA512 f290aaab0f812cf104d6dc4fc0db9d4e7fd383f1743a3bba12600faa3fa03931f274760cf4ec046d27edd7daceb8ad989edef0c1b8558f0bd7bc89ad91360364 WHIRLPOOL 3cad68fdbd86dc5680dc3b39b425b4fca5c017c63ef6cc2a6e368b37ea09d410658aebe19b55fa3bb8fe62fc0e085617a4c6322656921cdb89e66e3a6666595a
+EBUILD g-sorcery-0.2.ebuild 840 SHA256 54201694600967d435291a38c109782d530220c34bc26fd5c989306310af9117 SHA512 708c0c4bdee4a452e76432cb659b4406e2d74fb5afa30f3f3439fdc213eb95e828d25c8e02edd4487bb23e97c13a02f9a4b5257c240a25fc286e4239058de1d6 WHIRLPOOL 70e27af1484319795def1cbb13c3dd4d2a06c726100f44494235718393b70cd79209258e10da415be8b2e116309f98652fc2119120560abd6e42e242525bd5d0
+EBUILD g-sorcery-9999.ebuild 836 SHA256 0d0268b09ac560fc68686d1b46880798f130575a0a31346dd31553def1cd630d SHA512 54832b1386e1863ca783affa01ed2947d60eec4170cdeedacfc5b9d6c819c883ffd3689888b06633caccdbd0f264577c69f1978374d70f89e1b478e275b15c80 WHIRLPOOL 731c9c87ddc556a86840d09cf5dc7a156820e8a514c8c491724304a2c1f2c332ec1375341b530df5c79a189631219afd4ebf8dd4f1fad82b3f45b430e151f917
+MISC ChangeLog 3745 SHA256 5998afc03a61e088e8cd75088ab9495864ef37abd05037e0bd3f8b9c877dd37d SHA512 dc9d649d57b8809d7e5036c8f592b5691f1da75b732d6c4a69c22d711f5a0daf5b98fcb5050eaf8560460641d5299907517f000ec609dd89690cb2de0c593894 WHIRLPOOL 0146a08fe6c79002e06bd2117a3d9830f8a61ee385f0433795f18853f228ae27f729b76326d268c00c27aaff9aa61590abcfb9654c69e26c5de65b11049e1510
+MISC ChangeLog-2015 2188 SHA256 6db9359bcda307dc21fd9061eed135c6ce18f7321b6d56332daa1200d714ddc4 SHA512 abca48ca86349e7fafa9f581aec2e2174a1c37f96176f37df781dc1586b93e05cfefc71de02438bffff9b0321086bb2ffbb7b4602a915d7241da2f3cc738ad79 WHIRLPOOL c705df562ffe90e5462ca044c90c16991d668e3f03e36b53bc7527b0fff7d2dbc65f33029ad9b52a63add25b020d16159f3c8598240417176bda465f15526ce8
+MISC metadata.xml 542 SHA256 362917d75cc8d1db31b38e1858d4a3198aa1af408f57e8ca58986469f9356509 SHA512 16f1c1200af5effda505a70cf3246c50143f3f4b4a05c07a0dc40350f7630e73506494c05781d8063a03bcf0b0fca9f34839256021cd197fccdd8fe67c1a9b42 WHIRLPOOL 1b2a40431c5834111c266467c037db02012d0fb1632f6b29697aec3944459d3f4babda6513532670a3fd605b2d69fdb22001f891eaf70f130ef7487b37256750
diff --git a/app-portage/g-sorcery/g-sorcery-0.1-r1.ebuild b/app-portage/g-sorcery/g-sorcery-0.1-r1.ebuild
new file mode 100644
index 000000000000..08cac22a5e43
--- /dev/null
+++ b/app-portage/g-sorcery/g-sorcery-0.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_7,3_4})
+
+inherit distutils-r1
+
+DESCRIPTION="framework for ebuild generators"
+HOMEPAGE="https://github.com/jauhien/g-sorcery"
+SRC_URI="https://github.com/jauhien/g-sorcery/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+PDEPEND=">=app-portage/layman-2.2.0[g-sorcery,${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/*.8
+	dohtml docs/developer_instructions.html
+	diropts -m0777
+	dodir /var/lib/g-sorcery
+}
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..cb461e5aba4d
--- /dev/null
+++ b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
@@ -0,0 +1,41 @@
+# 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})
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="framework for ebuild generators"
+HOMEPAGE="https://github.com/jauhien/g-sorcery"
+SRC_URI="https://github.com/jauhien/g-sorcery/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="bson git"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	git? ( dev-vcs/git )
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
+
+src_prepare() {
+	hprefixify setup.py
+	default
+}
+
+python_test() {
+	PYTHONPATH="." "${PYTHON}" scripts/run_tests.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/*.8
+	dohtml docs/developer_instructions.html
+	diropts -m0777
+	dodir /var/lib/g-sorcery
+}
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild
new file mode 100644
index 000000000000..3c6dc9125f1c
--- /dev/null
+++ b/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild
@@ -0,0 +1,36 @@
+# 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})
+
+inherit distutils-r1
+
+DESCRIPTION="framework for ebuild generators"
+HOMEPAGE="https://github.com/jauhien/g-sorcery"
+SRC_URI="https://github.com/jauhien/g-sorcery/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="bson git"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+
+DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	git? ( dev-vcs/git )
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
+
+python_test() {
+	PYTHONPATH="." "${PYTHON}" scripts/run_tests.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/*.8
+	dohtml docs/developer_instructions.html
+	diropts -m0777
+	dodir /var/lib/g-sorcery
+}
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.ebuild
new file mode 100644
index 000000000000..a86a63afcbe4
--- /dev/null
+++ b/app-portage/g-sorcery/g-sorcery-0.2.ebuild
@@ -0,0 +1,35 @@
+# 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})
+
+inherit distutils-r1
+
+DESCRIPTION="framework for ebuild generators"
+HOMEPAGE="https://github.com/jauhien/g-sorcery"
+SRC_URI="https://github.com/jauhien/g-sorcery/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="bson"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+
+DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
+
+python_test() {
+	PYTHONPATH="." "${PYTHON}" scripts/run_tests.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/*.8
+	dohtml docs/developer_instructions.html
+	diropts -m0777
+	dodir /var/lib/g-sorcery
+}
diff --git a/app-portage/g-sorcery/g-sorcery-9999.ebuild b/app-portage/g-sorcery/g-sorcery-9999.ebuild
new file mode 100644
index 000000000000..8e6f16207b89
--- /dev/null
+++ b/app-portage/g-sorcery/g-sorcery-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=(python{2_7,3_4,3_5})
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="framework for ebuild generators"
+HOMEPAGE="https://github.com/jauhien/g-sorcery"
+SRC_URI=""
+EGIT_BRANCH="master"
+EGIT_REPO_URI="git://git.gentoo.org/proj/g-sorcery.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="bson git"
+
+DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	git? ( dev-vcs/git )
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
+
+python_test() {
+	PYTHONPATH="." "${PYTHON}" scripts/run_tests.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/*.8
+	dohtml docs/developer_instructions.html
+	diropts -m0777
+	dodir /var/lib/g-sorcery
+}
diff --git a/app-portage/g-sorcery/metadata.xml b/app-portage/g-sorcery/metadata.xml
new file mode 100644
index 000000000000..069307842914
--- /dev/null
+++ b/app-portage/g-sorcery/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<use>
+		<flag name="bson">Support BSON file format for package DB</flag>
+	</use>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>layman@gentoo.org</email>
+		<name>Gentoo Layman team</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jauhien/g-sorcery</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-portage/genlop/Manifest b/app-portage/genlop/Manifest
new file mode 100644
index 000000000000..fd38268e1679
--- /dev/null
+++ b/app-portage/genlop/Manifest
@@ -0,0 +1,11 @@
+AUX genlop-0.30.10-sync.patch 671 SHA256 fd3f14abe8fa06a138c66d1bd7f0196a93f24781dd62d6fbee2ed6a10b39a97b SHA512 dfb9edf5eefac114e868590df49b36e1f799ce4849448ca081d12c70019d40dee3dd7056665281728891ad8b7cada9213f17f0260347aa867b20009c0f87781d WHIRLPOOL 866a072510d8474354a3038f076a81345f590b6a9d25cee02af29fba8d12bf6898f6e912adf28c5beaab5a4d32138034cff1d879f342c3187effcfad94865f50
+AUX genlop-0.30.9-display.patch 676 SHA256 eb129aacec990af46ae762289bf739b82c2d84c5f3456d5dbef9758a6af00003 SHA512 76b5663dd1c2fb5700e8519b303db82ee37e6567fa847251304eec10e04bbb0c83a13d09b47f3cc725f9196d3ad34147ae9781c1284d33820f859703399c2f93 WHIRLPOOL b8c867d8b7bbe02da3a249c8801be1bdeeff74044b6be633e80d6caa41a3a2b2ced7138096019d1811a3f948ae7179adf0003afc0287a8b33156deb3b8a0ccff
+DIST genlop-0.30.10.tar.gz 20872 SHA256 690ef95d2ce715f2a1a3a2d380d74958cfdd3a28033625aec6e8d694f91dc4de SHA512 eab59d7dc012fbbdbe7de509deba66e6c7d0c5a37064e79c25a37c64becc259ee5206194615b60b3363022fa59e458356547edca307ceb4e19eeeaf4b146c593 WHIRLPOOL 378e2837929ae21417d3be0b840fb9635248b94cdefef9459455ce80236117c79a9a5f406d707d400e7887f38dbcd5004edd24caac6ebb207ab2f693d4f74bfa
+DIST genlop-0.30.9.tar.gz 21160 SHA256 76aae7055c68bd1bd9f0e17d9e984c32b7e94d4824c9e433f45e3457916f1193 SHA512 659c85bb1d75a90e37449a194fca2c610b2684dab3eb722d566aa929626d958aa1584d12a623f31518d982543be9392786291886ea66a5511e61de1beb3a6936 WHIRLPOOL fab528d251c57541c0cb5e5072d863abf6e776282a64ee3ecfcb88113bac3f1f0256825c0a19fdabbb8f671bc442703a12b28a9d1a4ab7b44c388367ea43dd2c
+EBUILD genlop-0.30.10-r1.ebuild 768 SHA256 03e2b8680748a018ab201096f81ab542dd6ac465aeb64c7ef5d4a277746e4867 SHA512 ea1e977c546be4a1ae9af37dd8e70ca07c4a35e6e1eab5d9b07f57174b75a4d31595597935390449610d9f158491fea5c9b852165635f418f417f6f76f85633b WHIRLPOOL 4faaea58a4474a7205483bd880d839abf4693a49ca0478812ee76a0c93f439f6aa297e06ab6ea82d17cda4061bd38c45e8cdadec57a54884c7aa3156846baa95
+EBUILD genlop-0.30.10.ebuild 651 SHA256 056dcb5c3236b88cc8c70b9cac69cb6fbddf2d1732dde40b0d94f79a6e0dda47 SHA512 d0bf745a31bf0151622e0e919e40a48fda8edf39998e396a37f6d259bdc6db361bd0a42f0c20e1c602e48ec28e0d4ad6a7fdb83a56a1b9341e638c05ee17692a WHIRLPOOL 711c7a8fded87d1bc980546e1fe46495929a3b80342e8a108e56c9e1ece2ce1bdc262ee1bd5c7dff566203d2c312adfc718aeb15840852a5f2fc83f961dc70a6
+EBUILD genlop-0.30.9-r1.ebuild 773 SHA256 b667bc5eb5fbd8ad41fba7ad944329f4daff15a8fb8a04fddb0a284a96b74324 SHA512 c53494d4d127c4b54d6c8a8897b1ff76d3bb0f6f2ee686042ad18422570802b2ca0d8a9f4e22fd1076342f48409182a9d72f196a3f652757c312f3c9e42d84fb WHIRLPOOL 5346ac4621dcbe6c2e1900d5c14ef779589528c010dab10a9503d3313e806e5dd1205146c8d0e249300f6aff7a1ff51ad10fd2456e3ec7fc8ad975eb626cf744
+EBUILD genlop-9999.ebuild 562 SHA256 e91e1a28f09bd29824f9b820f25b69745c9829c1c6e61931450b3e2ebc0286d8 SHA512 0a4f6c106834bb4eae2bd9231f1ebf3981a68d75d942a47989a218a95d828fe382d590066b804fbce48da169648d70f8dab47f388c7da4d6f6ea74218d5f5625 WHIRLPOOL 488c31fee19e1ba28f9c1e54405d35237b9ca2df1eeb80a3471716e2df86f11f918e0c7c25064eb1733885ea265cebe17518bffe0b1176214d0d8d850de213b8
+MISC ChangeLog 3000 SHA256 6e9d77d6af8f07441aee7e3d6612bf210c47496085a8ec1f3080dbebc3656ee7 SHA512 662ceb50ae17e09e501d0f6a783efff854445007c568f3d33839b9f428c58676bbb71c5ddf476b5f5f9ea73799d05d04f811795d2a3719baac50ebe8c04c67b7 WHIRLPOOL 65cf0a0d48469122d1b10774bc42309a0e81e2a3f75e527827c8d1a3724494331f5dee1abb1a68b6e535fa8f75e0e09fe60a4f0addabf4179a2265799380b2ea
+MISC ChangeLog-2015 12181 SHA256 43194a98bb862996e07e0d69e5d0c1f09de0ddbf9ca63a902eb69a3fa7f56e4a SHA512 b6fa2e4f8e8fd625ab2efede4f1dc58d58c5c2a57b773f13a21a1677b133fa0b21098a098e69d0c4ba5e52afe4472f29ac611ae23a27b7cf89ad12e41d2a997d WHIRLPOOL c477b5090090ee52feab2dd623635fc8d83716f9979a374f857564f88942486c0875ca5928321da1f0b1a06a2af8f2756fe667e91da0ef6a0e0695f165b764c8
+MISC metadata.xml 377 SHA256 796ee4a603fc28ba190e8133dbca66e58f173a5dbd8290a871f9e50be5b41c31 SHA512 3bc89900e1d25dc84831f78427b06089a1f0a16710d2adf31871af825041522b2446eb2a8156c4506d7e19cb6c73fa055f318b9dc48c9bd15d92511493098f1c WHIRLPOOL 63e2a133a3cb9a460d9aeb787bf967926a2f2ca4d6788c99b64dc9b66fbcfbbfc04b4568a551c4e394a754cdc11d5a800f5aaabfd5a25da1d6e7a12f5019c44f
diff --git a/app-portage/genlop/files/genlop-0.30.10-sync.patch b/app-portage/genlop/files/genlop-0.30.10-sync.patch
new file mode 100644
index 000000000000..8c798dddd18a
--- /dev/null
+++ b/app-portage/genlop/files/genlop-0.30.10-sync.patch
@@ -0,0 +1,26 @@
+From 46eb6a5a9a90049920ea84018b69b643c2809bfa Mon Sep 17 00:00:00 2001
+From: Paul Varner <fuzzyray@gentoo.org>
+Date: Thu, 19 Feb 2015 09:46:47 -0600
+Subject: [PATCH] Fix genlop -r to work with new Portage sync code. (Bug
+ 540050)
+
+---
+ genlop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/genlop b/genlop
+index e36c678..4e0faf0 100755
+--- a/genlop
++++ b/genlop
+@@ -968,7 +968,7 @@ sub rsync() {
+ 		my $handle;
+ 		open_file($_, \$handle);
+ 		while(<$handle>) {
+-			if ($_ =~ m/^(.*?)\: \=\=\= Sync completed with/) {
++			if ($_ =~ m/^(.*?)\: \=\=\= Sync completed/) {
+ 				if ($date_found) {
+ 					if (datecompare($1) <= 0) {
+ 						next;
+-- 
+2.3.0
+
diff --git a/app-portage/genlop/files/genlop-0.30.9-display.patch b/app-portage/genlop/files/genlop-0.30.9-display.patch
new file mode 100644
index 000000000000..cd9919ee3a27
--- /dev/null
+++ b/app-portage/genlop/files/genlop-0.30.9-display.patch
@@ -0,0 +1,26 @@
+From 76cb98e439c65b5ec8d32d809100a67c653e5635 Mon Sep 17 00:00:00 2001
+From: Paul Varner <fuzzyray@gentoo.org>
+Date: Mon, 21 Jan 2013 15:37:19 -0600
+Subject: [PATCH] Fix issue where genlop <pkg name> no longer displays merge
+ information (Bug 453382).
+
+---
+ genlop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/genlop b/genlop
+index 52af5ed..d5020eb 100755
+--- a/genlop
++++ b/genlop
+@@ -1127,7 +1127,7 @@ foreach my $ebuild_arg (@targets)
+ 						}
+ 					}
+ 				}
+-				if ($list_found or $ebuild_found or $time_found)
++				if ($list_found or $ebuild_found or $time_found or !$info_found)
+ 				{
+ 					my $eb = $2;
+ 					my $extra = $3 || "";
+-- 
+1.8.1.1
+
diff --git a/app-portage/genlop/genlop-0.30.10-r1.ebuild b/app-portage/genlop/genlop-0.30.10-r1.ebuild
new file mode 100644
index 000000000000..6b2d28df5e7f
--- /dev/null
+++ b/app-portage/genlop/genlop-0.30.10-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base bash-completion-r1
+
+DESCRIPTION="A nice emerge.log parser"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl"
+SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${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=""
+
+DEPEND="dev-lang/perl
+	 dev-perl/Date-Manip
+	 dev-perl/libwww-perl"
+RDEPEND="${DEPEND}"
+
+# Populate the patches array for any patches for -rX releases
+PATCHES=( "${FILESDIR}"/${P}-sync.patch )
+
+src_install() {
+	dobin genlop
+	dodoc README Changelog
+	doman genlop.1
+	newbashcomp genlop.bash-completion genlop
+}
diff --git a/app-portage/genlop/genlop-0.30.10.ebuild b/app-portage/genlop/genlop-0.30.10.ebuild
new file mode 100644
index 000000000000..79e11b3c92f2
--- /dev/null
+++ b/app-portage/genlop/genlop-0.30.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1
+
+DESCRIPTION="A nice emerge.log parser"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl"
+SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	 dev-perl/Date-Manip
+	 dev-perl/libwww-perl"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin genlop
+	dodoc README Changelog
+	doman genlop.1
+	newbashcomp genlop.bash-completion genlop
+}
diff --git a/app-portage/genlop/genlop-0.30.9-r1.ebuild b/app-portage/genlop/genlop-0.30.9-r1.ebuild
new file mode 100644
index 000000000000..96167c0796c9
--- /dev/null
+++ b/app-portage/genlop/genlop-0.30.9-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit base bash-completion-r1
+
+DESCRIPTION="A nice emerge.log parser"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl"
+SRC_URI="mirror://gentoo//${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	 dev-perl/Date-Manip
+	 dev-perl/libwww-perl"
+RDEPEND="${DEPEND}"
+
+# Populate the patches array for any patches for -rX releases
+PATCHES=( "${FILESDIR}"/${P}-display.patch )
+
+src_install() {
+	dobin genlop || die "failed to install genlop (via dobin)"
+	dodoc README Changelog
+	doman genlop.1
+	newbashcomp genlop.bash-completion genlop
+}
diff --git a/app-portage/genlop/genlop-9999.ebuild b/app-portage/genlop/genlop-9999.ebuild
new file mode 100644
index 000000000000..f4cc3925ba6b
--- /dev/null
+++ b/app-portage/genlop/genlop-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit git-2 bash-completion-r1
+
+EGIT_REPO_URI="https://github.com/gentoo-perl/genlop.git"
+DESCRIPTION="A nice emerge.log parser"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="dev-lang/perl
+	 dev-perl/Date-Manip
+	 dev-perl/libwww-perl"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin genlop
+	dodoc README Changelog
+	doman genlop.1
+	newbashcomp genlop.bash-completion genlop
+}
diff --git a/app-portage/genlop/metadata.xml b/app-portage/genlop/metadata.xml
new file mode 100644
index 000000000000..310c8d376ea6
--- /dev/null
+++ b/app-portage/genlop/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>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
+<maintainer type="project">
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-portage/gentoolkit-dev/Manifest b/app-portage/gentoolkit-dev/Manifest
new file mode 100644
index 000000000000..5d69eff91dca
--- /dev/null
+++ b/app-portage/gentoolkit-dev/Manifest
@@ -0,0 +1,10 @@
+AUX gentoolkit-dev-0.2.8.3-tests.patch 897 SHA256 993cf921d0e03806199fee9734a656559a6d7bf20b4427a2ef11f578cff3dc65 SHA512 0b5f3555a8374c1765770c27a950a26a3e7f7f222a5cf1cb1a5ed326d1d7757fd40639eaf58c54daffc668929bd25e76fffb108c75f20e5f0a2937f74a03e8cb WHIRLPOOL 7247d88f8ec56be1312f6978dc157721cd62336bc639cb29f54a729a336253485655fc6aa8be1b44373fb0be4dcc56b72a7f2e2185a09f84bd9f3c44a14bfff1
+DIST gentoolkit-dev-0.2.8.3.tar.gz 53322 SHA256 b9f96deb53adacf7885c937e1c92688a40839a3992da551616f8745835ec59fb SHA512 f55362e46928633598cb07640505202521e3f4bdaade1faecb4ac14ba1bee0489207cb7ab03531e06d7922446a57083365f51c63ceb8cf1e0badba9ac503c16e WHIRLPOOL 9bb50b92c52c62a74249885ff7d82d6ba2426de6b7052b2e65673a85c6dfe76c201d899e71b8d327a3fed550a1cf1a75616cda369d7f5f37bc93912a8d7845e5
+DIST gentoolkit-dev-0.3.0.tar.gz 58655 SHA256 c42d525560f5c85f48e9b2aeb02a5f3ee04e80e52c90e5d1a00eed1ebe9df671 SHA512 d15f6546cf88af0832c14eb003c72b5906bb9b9f078c903e1e444b12c2e432fd1a2fa077eda5496e222cb50cfd5a705e86044b9a1c0164ac6b4b38268461ced5 WHIRLPOOL b3db58c6941ad5ae04fc581de8785d9e0fe6c3b49bdabf401732e881b2e2a1489eb86c3fd650cafe6b56bf26c74ad25dffe8dfb7fdc8b374b3bb0427dd34c2e4
+DIST gentoolkit-dev-0.3.1.tar.gz 58472 SHA256 f68e8647b799c6872598a5adfe6a028af6b8521ae5cd5a6615b796c906e5304c SHA512 e47fa698710132914c2de6d25f7450b90383b9d6283e927221bec30be3a56de93c09e81c35e025dee2f01bd5c2f10cf231fc392c415849029529712cd81aea19 WHIRLPOOL a3fc98b9bf7e4086245795abbd1d71fe1da394aba90f0cc3ae3258f6b7be79363c171dab45d40b9bf37f008f8b0da4bf674f52b8d11c48d1cf06237c8746acca
+EBUILD gentoolkit-dev-0.2.8.3-r1.ebuild 1554 SHA256 07a761509777be5bc6fc1e9afc3f0cb57ed77fd7062aa8eaaf7c92898b2c2555 SHA512 7d86c2ec99dcf6b1b263f4f2b4c72900e68c6ba8d3babfd910d748ef91100c55c94facd712361eb50030aedf78759ddca8f73b13518b6a1c519189ab4ae7f93f WHIRLPOOL 8e14ad4398dc61b8e01446a7f30ffbf6b99a776346e21fad777349df3283b698d6b01c90c16f84955a6db7299d1225bbdf9d40236c9f876e240e4a7f8474ca70
+EBUILD gentoolkit-dev-0.3.0.ebuild 2339 SHA256 7a6b7ca7819d2edc9edf604e56ef4ce8c62a95053d4f1d98bc345c9e74947830 SHA512 70d80ebb6ea489e2530ebdbda66e6696dcbfc28e7e4083de72249cbdee0992b511857b621b625fb7729b21a43b472871f51180f12c3ec8a93371b829c33538e8 WHIRLPOOL 208a89e8575a62ed8070134de2bbd66a2dc009f22b559b2669a30d2d7fcc32e88177d9ec392dac2cd6f67f83bffd2b4b0ef890e5440aae744b939e0acf35fda1
+EBUILD gentoolkit-dev-0.3.1.ebuild 2414 SHA256 5646cadc106bcdb094e568a977b19671c69ac260c2055e1432260cc5959d595c SHA512 9e4d4dceb99fba907f610238669e4cfbea036bb2045cf1d4a3460773d21d1b1f0a260c56fd409f5eaaa4a9a9abb80aad0e911e428a4a4ac317680d8b2b8a9ece WHIRLPOOL 549930b9aea6e8f05c0aa33ba1c8a5477c7934b44a53fe077e7771699e8362443b62493907bf702667f5094614b73e97ea4079aee76e34110636732d96b66b33
+MISC ChangeLog 3740 SHA256 7745095b7cf69d14b8ba980fa6b24d7fff84c4929a538f57af354918026ccd2c SHA512 287434da7a7f4e1544dded855e2efada0b3c1c2377fab8f4c465e70a79c9fd12bab757a45fbe69f1d96544bf6e5f01be8ea0b1df076f228ced0d135e12b70571 WHIRLPOOL ad2a920cef455f2f125d48286e7376256e32199495c3cbc7589dbe141d8971b60fcaefef73c6cbac9879b6f367cf169ed0a532f993d2c1395c393e0bae2b98f3
+MISC ChangeLog-2015 22290 SHA256 c95fbb79c90dcc75eba939ed9b4c3d4777d91f563fd92832e205fe61103301dd SHA512 8aa69bbfcaed83bb7fdcd0d38a9ea29a01908497dc46017248aca621cc7bbc9a2f5045b1358e6b463a3da0097b5e355e35b552594e97db936ed97c79e239fe5f WHIRLPOOL 69980e330f2b1a78443c255de9a0ef82153eb24698bab04fc4c8a9206f1dab15c86b59044dc203d9278e78708fae28ac1f14f04b57040b8cb724857460882c08
+MISC metadata.xml 533 SHA256 85feb3811c713836f7de405b6123264a8e3ff0b6500efd0a61191e635e150c5a SHA512 cbecb84390c3cd16a766fa162aaae12b456e656b1d6f17ca8279a79016ad9107541ba52c350cd2603487b608c4bc852919aa3b2e765e6031e320c359f89224a4 WHIRLPOOL 436edd53752fefc42c1de0def7c71662446961fb0d1b938aefd33cdbfe11c3b35acc8c98553421aa4bb23d9b7d8dff2b7028249c318b2588baaa2bde99420839
diff --git a/app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.8.3-tests.patch b/app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.8.3-tests.patch
new file mode 100644
index 000000000000..533491d76897
--- /dev/null
+++ b/app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.8.3-tests.patch
@@ -0,0 +1,25 @@
+From 2da4232cfd9597b829dda4bcfbf3aab25f243950 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Sat, 11 May 2013 23:56:25 +0200
+Subject: [PATCH] Fix echangelog test
+
+---
+ src/echangelog/test/test.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/echangelog/test/test.sh b/src/echangelog/test/test.sh
+index 0559113..53bb0b5 100755
+--- a/src/echangelog/test/test.sh
++++ b/src/echangelog/test/test.sh
+@@ -160,7 +160,7 @@ ebegin "Preparing echangelog"
+ 
+ if [ -e "../echangelog" ]; then
+ 	cp ../echangelog "${_ROOT}/tmp" || set $?
+-	sed -i -e 's:use POSIX qw.*:use POSIX qw(setlocale getcwd);\nuse TEST qw(strftime);:' "${_ROOT}/tmp/echangelog" || set $?
++	sed -i -e 's:use POSIX qw.*:use POSIX qw(locale_h setlocale getcwd);\nuse TEST qw(strftime);:' "${_ROOT}/tmp/echangelog" || set $?
+ 	eend ${1:-0} || exit ${1}
+ else
+ 	eerror "error"
+-- 
+1.8.1.5
+
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
new file mode 100644
index 000000000000..b113ef5deeb4
--- /dev/null
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
@@ -0,0 +1,57 @@
+# 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} )
+
+PYTHON_REQ_USE="xml"
+
+inherit python-r1 eutils
+
+DESCRIPTION="Collection of developer scripts for Gentoo"
+HOMEPAGE="https://www.gentoo.org/proj/en/portage/tools/index.xml"
+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 ~ppc-aix ~amd64-fbsd ~sparc-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="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]
+	dev-lang/perl
+	sys-apps/diffutils"
+DEPEND="${PYTHON_DEPS}
+	!>=app-portage/gentoolkit-0.4.0
+	test? ( ${CDEPEND} )"
+RDEPEND="${PYTHON_DEPS}
+	${CDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-tests.patch"
+}
+
+src_test() {
+	# echangelog test is not able to run as root
+	# the EUID check may not work for everybody
+	if [[ ${EUID} -ne 0 ]];
+	then
+		python_foreach_impl emake test
+	else
+		ewarn "test skipped, please re-run as non-root if you wish to test ${PN}"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	python_replicate_script "${ED}"/usr/bin/imlate
+}
+
+pkg_postinst() {
+	ewarn "This package is deprecated.  ebump, ekeyword and imlate have "
+	ewarn "been moved to >=app-portage/gentoolkit-0.4.0"
+	ewarn "The remaining gentoolkit-dev commands are considered deprecated"
+}
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild
new file mode 100644
index 000000000000..dd303b08c326
--- /dev/null
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild
@@ -0,0 +1,86 @@
+# 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} )
+PYTHON_REQ_USE="xml"
+
+inherit python-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoolkit.git
+		https://anongit.gentoo.org/git/proj/gentoolkit.git"
+	EGIT_BRANCH="gentoolkit-dev"
+else
+	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-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"
+fi
+
+DESCRIPTION="Collection of developer scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]
+	dev-lang/perl
+	sys-apps/diffutils"
+DEPEND="${PYTHON_DEPS}
+	!>=app-portage/gentoolkit-0.4.0
+	test? ( ${CDEPEND} )"
+RDEPEND="${PYTHON_DEPS}
+	${CDEPEND}"
+
+src_prepare() {
+	if [[ -n ${EPREFIX} ]] ; then
+		# fix shebangs of scripts
+		local d p
+		ebegin "Fixing shebangs"
+		for d in src/* ; do
+			p=${d#*/}
+			sed -i \
+				-e "1s:\(\(/usr\)\?/bin/\):${EPREFIX}\1:" \
+				${d}/${p}* \
+				|| die "failed to fix ${d}/${p}"
+		done
+		eend $?
+
+		# fix repo location
+		sed -i \
+			-e "s:portage\.db\['/'\]:portage.db['${EPREFIX}/']:g" \
+			src/ekeyword/ekeyword.py \
+			|| die "failed to set EPREFIX in ekeyword"
+		# fix repo name
+		sed -i \
+			-e "s:repo='gentoo':repo='gentoo_prefix':g" \
+			src/ekeyword/ekeyword.py \
+			|| die "failed to set correct reponame in ekeyword"
+	fi
+}
+
+src_test() {
+	# echangelog test is not able to run as root
+	# the EUID check may not work for everybody
+	if [[ ${EUID} -ne 0 ]]; then
+		python_foreach_impl emake test
+	else
+		ewarn "test skipped, please re-run as non-root if you wish to test ${PN}"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	python_replicate_script "${ED}"/usr/bin/{ekeyword,imlate}
+}
+
+pkg_postinst() {
+	ewarn "This package is deprecated.  ebump, ekeyword and imlate have "
+	ewarn "been moved to >=app-portage/gentoolkit-0.4.0"
+	ewarn "The remaining gentoolkit-dev commands are considered deprecated"
+}
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild
new file mode 100644
index 000000000000..3ddd92e2178b
--- /dev/null
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild
@@ -0,0 +1,87 @@
+# 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} )
+PYTHON_REQ_USE="xml"
+
+inherit python-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoolkit.git
+		https://anongit.gentoo.org/git/proj/gentoolkit.git"
+	EGIT_BRANCH="gentoolkit-dev"
+else
+	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz
+		https://dev.gentoo.org/~vapier/dist/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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"
+fi
+
+DESCRIPTION="Collection of developer scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]
+	dev-lang/perl
+	sys-apps/diffutils"
+DEPEND="${PYTHON_DEPS}
+	!>=app-portage/gentoolkit-0.4.0
+	test? ( ${CDEPEND} )"
+RDEPEND="${PYTHON_DEPS}
+	${CDEPEND}"
+
+src_prepare() {
+	if [[ -n ${EPREFIX} ]] ; then
+		# fix shebangs of scripts
+		local d p
+		ebegin "Fixing shebangs"
+		for d in src/* ; do
+			p=${d#*/}
+			sed -i \
+				-e "1s:\(\(/usr\)\?/bin/\):${EPREFIX}\1:" \
+				${d}/${p}* \
+				|| die "failed to fix ${d}/${p}"
+		done
+		eend $?
+
+		# fix repo location
+		sed -i \
+			-e "s:portage\.db\['/'\]:portage.db['${EPREFIX}/']:g" \
+			src/ekeyword/ekeyword.py \
+			|| die "failed to set EPREFIX in ekeyword"
+		# fix repo name
+		sed -i \
+			-e "s:repo='gentoo':repo='gentoo_prefix':g" \
+			src/ekeyword/ekeyword.py \
+			|| die "failed to set correct reponame in ekeyword"
+	fi
+}
+
+src_test() {
+	# echangelog test is not able to run as root
+	# the EUID check may not work for everybody
+	if [[ ${EUID} -ne 0 ]]; then
+		python_foreach_impl emake test
+	else
+		ewarn "test skipped, please re-run as non-root if you wish to test ${PN}"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	python_replicate_script "${ED}"/usr/bin/{ekeyword,imlate}
+}
+
+pkg_postinst() {
+	ewarn "This package is deprecated.  ebump, ekeyword and imlate have "
+	ewarn "been moved to >=app-portage/gentoolkit-0.4.0"
+	ewarn "The remaining gentoolkit-dev commands are considered deprecated"
+}
diff --git a/app-portage/gentoolkit-dev/metadata.xml b/app-portage/gentoolkit-dev/metadata.xml
new file mode 100644
index 000000000000..c0f5291db220
--- /dev/null
+++ b/app-portage/gentoolkit-dev/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="project">
+    <email>tools-portage@gentoo.org</email>
+    <name>Gentoo Portage tools team</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>vapier@gentoo.org</email>
+    <description>Only ekeyword related bugs</description>
+  </maintainer>
+  <longdescription>
+		Gentoolkit-dev is a collection of developer tools for the Gentoo distribution.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
new file mode 100644
index 000000000000..29e77202f2c1
--- /dev/null
+++ b/app-portage/gentoolkit/Manifest
@@ -0,0 +1,15 @@
+AUX 0.3.0.8-revdep-rebuild-476740.patch 990 SHA256 0e41b1ca96b59112af756e6b199349b1165d9ee23d81d0c17a862d52ba30f426 SHA512 9aaff1a7c277a1aefa57213ada599b520f5cea0f76f9d08b94c29324e380223c1e682804ae8e7d683077c436ec007cf2df31ff8285f38d349f5f6478e8df733f WHIRLPOOL 65db69af095d40799e11525439068f68de0eced22b5b7391b3a9e10bbb1f23fef244f7e10395cdaa9e1d0ce2e3bd8f6314e7bab25bfae201ec54f7ff87fb6151
+AUX 0.3.0.8-revdep-rebuild-484340.patch 1696 SHA256 b82e965072f10d11af4ae89c1633b773c1ffce0454862b26eaa6f153cdfd07fc SHA512 330caf60a34508847323e4f129d8195286b2093c3d2bb023a1a4e7dbee09d8d18f657bd584af8977a4ba46df8d5043fc72fd4fd54caa1076cae544ded15afc3c WHIRLPOOL f8198bcca4fb7764220cad90f8edb9efa32a57cd6c189f5e9733a36dca2ad0490a5e772aa12b4bf23418c43c470ba2b8b1b3ed99f397d3bac71f3d290acbe7d3
+AUX 0.3.2-helpers.py-589686.patch 821 SHA256 a7b5a2e1c0c3e32375e8f83560f2f6b673adff3fef8cd3e592ee96c963416772 SHA512 6b164bd281de47b99bb888386c1de181d78149cac89f7e9fa452827e2a1b2bd7f2d238e4fba672ff603294858ac90f59d589c9793b0810f896e7379a6f8aba79 WHIRLPOOL 53f49efc15d5c20aba32df2ad4907b1ba76433ed83566b90b3709c177dbee4e00350f23949c3eb617b5360d8c544077add38efdcdccc64ea7829b4d41c0f96fd
+DIST gentoolkit-0.3.0.8.tar.gz 3192497 SHA256 0338dee7c295c32b60a84e529b764d2bc61536fa3aca021cd5a75c6e534864a6 SHA512 50efd701d0d056740bcf7c7cdce652ae7c9e2786f799f5d30946e752b8aa735489d3e0dc5c7664a5810a0f22cec05b9bc7ccc10292b07ac4dd0777658651f72d WHIRLPOOL 5a2455e50d4e0f4df8abab5b81deb6bb00e078dfed1687ae046ce97a0427eafea2d3de9b83ac6de8155d207653d001c6684ac92226fa2320515c6e14c8fea6e0
+DIST gentoolkit-0.3.2.tar.gz 3198294 SHA256 f3bb38d663c1b153447556b5265df5a11b6ed78411e761335b692111c823d9dd SHA512 e174ac7f12d45703515876ea558a661e1d0c5d4cc71d2d64ee793786e2a2d3d2b309500b6e1891774e3415de74922efc77553c0103d695f5dda91def9a6ac637 WHIRLPOOL 67192702f72f437cc31aeeef8bf005c83a4a9322e9fa0de3c1e0d229bfb95d7363f14a8902da5ffbf49dee45cd587286899ea1ead017cd7d18d0f852cc7fd9fb
+DIST gentoolkit-0.3.3.tar.gz 3197037 SHA256 bb1fd78a6063efffd4e8402cd799f2c22ed2bbf440c26390aab68bfb6f4ee982 SHA512 ad142c2c66e7f7a2e4184c8f95e394ee783cd57808e6254e9f5df0f3f60ad842042f773716ca0fd6d7545bb8a2d11c1c167a4ec471eb3238c8ee3a519f70a691 WHIRLPOOL 81c2aa8cb36d9c6abef99729b07c9cc5402d66ccfd8523a4cee57ed99d2b4c2ab0db6c77dccdc90597bd11d60e11823130dd1136eeaba9b2a18383da3e9c5f25
+DIST gentoolkit-0.4.0.tar.gz 3215377 SHA256 3696b45b304b4b789f21d897e09311cf08474dcd9247dd3143bce95ffba5a220 SHA512 6cf693c588d4a2f5bd06fff4e78ef98007e613348048ec993c5430e168baef6c1da01e1843903f3e87ca8e47dd1ffb207acccbc5c0e881fa3093a7880fec9a56 WHIRLPOOL 0114e0e2274b198aca5bbadce6baf5b6595be92e48d322c759826d1143d7d82ea2deb91ba2f8133e5b554567b7ce62081b5e7df24fa3b029bb50041ce99509db
+EBUILD gentoolkit-0.3.0.8-r2.ebuild 2569 SHA256 e20a5852712f094eecda0895280fd72836a18e9237f160e6c4f961a6f4985d5e SHA512 0796f45a84f363d3c868445d4e34e6e87d65c00d3cc01c398e44071d33040fb1d65aa2132386374e4e16c8c654f03f34fd3f2a18f28ff5810f48db995fdda3f9 WHIRLPOOL fee5219af98ab4c9b3484b88ae577851ad769e3c94d1cace0f5abc74232bb2b1487ed09d3e423007c0a45b3ecff1df1976e821c47d22cec825d76a83313fe34a
+EBUILD gentoolkit-0.3.2-r1.ebuild 2244 SHA256 0e7b5fc22d0415f1493f931e4ee7b5fd16e1873b96f93a022efeca009f4e778a SHA512 0f7841b73128a56f85889480d7358d7472b5e40ec5eb1f53c7191bf2ef37e73b6744d340acc0f94fcdffb211f568ee0d87e73f03fcfb47dfb2b214eda50090d7 WHIRLPOOL 5ee1e6733481143b95aba28bd655205b9fb69d53aeca5efb3dcb622d77215d4d77400a2a9cff5d977963088606a0eb041e106b74b6dfe4e6c1b0312394f58b73
+EBUILD gentoolkit-0.3.3.ebuild 2190 SHA256 96abe4ba43ac0dcd731c08fb7609f60d6477060c350fb9270455245ea6ddd889 SHA512 6f95f1af8e2ae139ef6058b3798f75e331890bc05efb8abb4cc3c0e4014176424a424e9663f748f3cbae510186d8a7dce1b9d11e0813aa5e65ac9e4ee6d3aaa8 WHIRLPOOL 0476bfb125e2fb141398ed5a9a483de7fe5ba34c35be9591b43e2c92ace976b4bcc1c137ca4220bb3c63a72973930579a8d50c9b188dd4eab92ae70c90fbef18
+EBUILD gentoolkit-0.4.0.ebuild 2172 SHA256 5ce7288d045c189da6f3364875603923fd75b046b386766a0acc4406311cd600 SHA512 f782b097d20fb1803a25786368b2ea98173d0e8b4781ece7290f70310c0bcd0ac611c4c280e44aa2a76bf3739273d6eae2c4abb6054fe50069731f5eff798a92 WHIRLPOOL 9c7af0b2348e66264a026bf839b380342921b57773b19a11c91c8dfa3985b8f0b83b9778401b77fcd113629a8dfadcf1634967f98278c9339e065d5fc30d1d70
+EBUILD gentoolkit-9999.ebuild 1972 SHA256 d581494f29bafdb6b585d48dd54b5fc494a1d6e765ca1b03c8a8102dc46c276b SHA512 3c4443aa492625e7636854c651a1c70fb7059dd22e0168765bf27fb89dcb473f9c18dbc479a278067eda756021bca20e482e941a2b4ffcdd48f987cd800ba2c2 WHIRLPOOL 914f86d7971d167ae2c06241946397974d03724445e20af5ec4f1a47f1a9a1331098eac7ac2bca07e8045adcc457777b5d771b29f2993ec2fb5efa45e65a1aa1
+MISC ChangeLog 7216 SHA256 ecd70d2fd05932d6ba807c47f2f141c856d6fdbc60e7541c7a3f446916ba15ea SHA512 a9ab9e5e6eba30938c756ecf6a6af5671dab5a567384f6d7d124724d7e8eb5daba3975c31a736a1e31077456736a6b311188b1c3569ce8e1066cf2a9acdbbba1 WHIRLPOOL 44d726f589915c8b348775ff61f6fcad879b9853aabd7316f8a8483bd94f6fb68334feee9d1cdf17212f34d2c3b1931524e8fe65ccbe13aca062e41296e162b4
+MISC ChangeLog-2015 81145 SHA256 2be0115c31ea5a66f6ec2cab2d1280dd85d47c7fcb68dbd2ab81ae732b2adbf1 SHA512 a4a8f6cc06b49b8be331a0eeefa5bfa9c18ae4599025c0e6846497af0ba39cf627f4520082d50b818eb21716b65005bb155de466bf25a61f9c3f739119327b28 WHIRLPOOL ce50e41dbd48411c01c2390ab9c5eec9953c4a3c4128a4f104aca579c59b73d37910621d959049a8dac16c1e2cf2c39833f02666c683fcb50ca5ac7d7e396cfc
+MISC metadata.xml 558 SHA256 c900e08a1c08dc178959f027ac0818ea138ae31768161b31b2382eba443c2235 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704 WHIRLPOOL b4866a09bcdcdf95579f6bfcb16d1b3ec7bfcf3b827cbce435a55cd815e7a5839942fb9854ebe84f0e174f99eabb20c82f11d9510b2dd8141b2ceebeccf1230e
diff --git a/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-476740.patch b/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-476740.patch
new file mode 100644
index 000000000000..8832838bd33f
--- /dev/null
+++ b/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-476740.patch
@@ -0,0 +1,33 @@
+From 87a01450ab33220f6f0821d4f4209004cdc3aa8b Mon Sep 17 00:00:00 2001
+From: Paul Varner <fuzzyray@gentoo.org>
+Date: Tue, 10 Sep 2013 13:52:28 -0500
+Subject: [PATCH] Fix Ctrl-C handling when running emerge (Bug 476740).
+
+---
+ bin/revdep-rebuild.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/bin/revdep-rebuild.sh b/bin/revdep-rebuild.sh
+index 6cb5608..09f5135 100755
+--- a/bin/revdep-rebuild.sh
++++ b/bin/revdep-rebuild.sh
+@@ -1052,6 +1052,7 @@ portage_settings() {
+ 	if [[ -n ${REVDEP_REBUILD_DEFAULT_OPTS} ]]; then
+ 		EMERGE_DEFAULT_OPTS=("${REVDEP_REBUILD_DEFAULT_OPTS[@]}")
+ 	fi
++
+ }
+ 
+ ##
+@@ -1138,7 +1139,7 @@ rebuild() {
+ 		REBUILD_LIST=$(sort -u "$EBUILDS_FILE")
+ 	fi
+ 
+-	trap - SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM
++	trap "kill 0" SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM
+ 
+ 	[[ $QUIET -ne 1 ]] && einfo 'All prepared. Starting rebuild'
+ 	echo "emerge --complete-graph=y --oneshot ${EMERGE_DEFAULT_OPTS[@]} ${EMERGE_OPTIONS[@]} $REBUILD_LIST"
+-- 
+1.8.3.2
+
diff --git a/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-484340.patch b/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-484340.patch
new file mode 100644
index 000000000000..1a0393dac48d
--- /dev/null
+++ b/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-484340.patch
@@ -0,0 +1,46 @@
+From db997501ec8e0ef0c5e4426649c17d2498b40e06 Mon Sep 17 00:00:00 2001
+From: Paul Varner <fuzzyray@gentoo.org>
+Date: Tue, 10 Sep 2013 10:59:31 -0500
+Subject: [PATCH] Fix use of REVDEP_REBUILD_DEFAULT_OPTS (Bug 484340).
+
+---
+ bin/revdep-rebuild.sh | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/bin/revdep-rebuild.sh b/bin/revdep-rebuild.sh
+index 7f848bc..6cb5608 100755
+--- a/bin/revdep-rebuild.sh
++++ b/bin/revdep-rebuild.sh
+@@ -1034,27 +1034,24 @@ portage_settings() {
+ 	local ORIG_SEARCH_DIRS="$SEARCH_DIRS"
+ 	local ORIG_SEARCH_DIRS_MASK="$SEARCH_DIRS_MASK"
+ 	local ORIG_LD_LIBRARY_MASK="$LD_LIBRARY_MASK"
+-	local ORIG_REVDEP_REBUILD_DEFAULT_OPTS="$REVDEP_REBUILD_DEFAULT_OPTS"
+ 	unset SEARCH_DIRS
+ 	unset SEARCH_DIRS_MASK
+ 	unset LD_LIBRARY_MASK
+-	unset REVDEP_REBUILD_DEFAULT_OPTS
+ 
+ 	eval $(portageq envvar -v PORTAGE_ROOT PORTAGE_NICENESS EMERGE_DEFAULT_OPTS NOCOLOR SEARCH_DIRS SEARCH_DIRS_MASK LD_LIBRARY_MASK REVDEP_REBUILD_DEFAULT_OPTS)
+ 	export NOCOLOR
+ 
+ 	# Convert quoted paths to array.
+ 	eval "EMERGE_DEFAULT_OPTS=(${EMERGE_DEFAULT_OPTS})"
++	eval "REVDEP_REBUILD_DEFAULT_OPTS=(${REVDEP_REBUILD_DEFAULT_OPTS})"
+ 	SEARCH_DIRS="$ORIG_SEARCH_DIRS $SEARCH_DIRS"
+ 	SEARCH_DIRS_MASK="$ORIG_SEARCH_DIRS_MASK $SEARCH_DIRS_MASK"
+ 	LD_LIBRARY_MASK="$ORIG_LD_LIBRARY_MASK $LD_LIBRARY_MASK"
+-	REVDEP_REBUILD_DEFAULT_OPTS="$ORIG_REVDEP_REBUILD_DEFAULT_OPTS $REVDEP_REBUILD_DEFAULT_OPTS"
+ 
+ 	# Replace EMERGE_DEFAULT_OPTS with REVDEP_REBUILD_DEFAULT_OPTS (if it exists)
+ 	if [[ -n ${REVDEP_REBUILD_DEFAULT_OPTS} ]]; then
+-		EMERGE_DEFAULT_OPTS=("$REVDEP_REBUILD_DEFAULT_OPTS")
++		EMERGE_DEFAULT_OPTS=("${REVDEP_REBUILD_DEFAULT_OPTS[@]}")
+ 	fi
+-
+ }
+ 
+ ##
+-- 
+1.8.3.2
+
diff --git a/app-portage/gentoolkit/files/0.3.2-helpers.py-589686.patch b/app-portage/gentoolkit/files/0.3.2-helpers.py-589686.patch
new file mode 100644
index 000000000000..282846c47246
--- /dev/null
+++ b/app-portage/gentoolkit/files/0.3.2-helpers.py-589686.patch
@@ -0,0 +1,30 @@
+From bc92540f8ce498e8305103619c7085b670ba19b1 Mon Sep 17 00:00:00 2001
+From: Paul Varner <fuzzyray@gentoo.org>
+Date: Mon, 25 Jul 2016 13:01:06 -0500
+Subject: Add missing import of io.open when using python2.7
+
+This fixes the traceback when running equery changes with Python 2.7
+
+X-Gentoo-bug: 589686
+X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=589686
+---
+ pym/gentoolkit/helpers.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/pym/gentoolkit/helpers.py b/pym/gentoolkit/helpers.py
+index 0d985b6..8d25393 100644
+--- a/pym/gentoolkit/helpers.py
++++ b/pym/gentoolkit/helpers.py
+@@ -26,6 +26,9 @@ __docformat__ = 'epytext'
+ # =======
+ 
+ import os
++import sys
++if sys.hexversion < 0x3000000:
++	from io import open
+ import re
+ from functools import partial
+ from itertools import chain
+-- 
+cgit v0.12
+
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.8-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.8-r2.ebuild
new file mode 100644
index 000000000000..040f9c34ec97
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.8-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~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"
+
+DEPEND="sys-apps/portage"
+RDEPEND="${DEPEND}
+	!<=app-portage/gentoolkit-dev-0.2.7
+	sys-apps/gawk"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-revdep-rebuild-484340.patch
+	"${FILESDIR}"/${PV}-revdep-rebuild-476740.patch
+)
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	mv ./bin/revdep-rebuild{,.py} || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# Rename the python versions of revdep-rebuild, since we are not ready
+	# to switch to the python version yet. Link /usr/bin/revdep-rebuild to
+	# revdep-rebuild.sh. Leaving the python version available for potential
+	# testing by a wider audience.
+	dosym revdep-rebuild.sh /usr/bin/revdep-rebuild
+
+	# Create cache directory for revdep-rebuild
+	keepdir /var/cache/revdep-rebuild
+	use prefix || fowners root:0 /var/cache/revdep-rebuild
+	fperms 0700 /var/cache/revdep-rebuild
+
+	# remove on Gentoo Prefix platforms where it's broken anyway
+	if use prefix; then
+		elog "The revdep-rebuild command is removed, the preserve-libs"
+		elog "feature of portage will handle issues."
+		rm "${ED}"/usr/bin/revdep-rebuild*
+		rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
+		rm -rf "${ED}"/etc/revdep-rebuild
+		rm -rf "${ED}"/var
+	fi
+}
+
+pkg_postinst() {
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		elog "    app-admin/eclean-kernel"
+		elog "    app-portage/diffmask"
+		elog "    app-portage/flaggie"
+		elog "    app-portage/install-mask"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..eeca23d3292b
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild
@@ -0,0 +1,74 @@
+# 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} pypy)
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/gentoolkit/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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"
+
+DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!<=app-portage/gentoolkit-dev-0.2.7
+	sys-apps/gawk
+	sys-apps/gentoo-functions"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-helpers.py-589686.patch
+)
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove on Gentoo Prefix platforms where it's broken anyway
+	if use prefix; then
+		elog "The revdep-rebuild command is removed, the preserve-libs"
+		elog "feature of portage will handle issues."
+		rm "${ED}"/usr/bin/revdep-rebuild*
+		rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
+		rm -rf "${ED}"/etc/revdep-rebuild
+		rm -rf "${ED}"/var
+	fi
+}
+
+pkg_postinst() {
+	# Create cache directory for revdep-rebuild
+	mkdir -p -m 0755 "${EROOT%/}"/var/cache
+	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
+
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		elog "    app-admin/eclean-kernel"
+		elog "    app-portage/diffmask"
+		elog "    app-portage/flaggie"
+		elog "    app-portage/install-mask"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
new file mode 100644
index 000000000000..c57b96514b09
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
@@ -0,0 +1,70 @@
+# 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} pypy)
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+SRC_URI="https://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+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"
+
+DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!<=app-portage/gentoolkit-dev-0.2.7
+	sys-apps/gawk
+	sys-apps/gentoo-functions"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove on Gentoo Prefix platforms where it's broken anyway
+	if use prefix; then
+		elog "The revdep-rebuild command is removed, the preserve-libs"
+		elog "feature of portage will handle issues."
+		rm "${ED}"/usr/bin/revdep-rebuild*
+		rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
+		rm -rf "${ED}"/etc/revdep-rebuild
+		rm -rf "${ED}"/var
+	fi
+}
+
+pkg_postinst() {
+	# Create cache directory for revdep-rebuild
+	mkdir -p -m 0755 "${EROOT%/}"/var/cache
+	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
+
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		elog "    app-admin/eclean-kernel"
+		elog "    app-portage/diffmask"
+		elog "    app-portage/flaggie"
+		elog "    app-portage/install-mask"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
new file mode 100644
index 000000000000..83450c7fa03e
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.4.0.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=(python{2_7,3_4,3_5,3_6} pypy)
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/gentoolkit/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+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"
+
+DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!app-portage/gentoolkit-dev
+	sys-apps/gawk
+	sys-apps/gentoo-functions"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	# Create cache directory for revdep-rebuild
+	mkdir -p -m 0755 "${EROOT%/}"/var/cache
+	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
+
+	einfo "Starting with this version, ebump, ekeyword and imlate are now"
+	einfo "part of the gentoolkit package."
+	einfo "The gentoolkit-dev package is now deprecated in favor of a single"
+	einfo "gentoolkit package.   The remaining tools from gentoolkit-dev"
+	einfo "are now obsolete/unused with the git based tree."
+
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		elog "    app-admin/eclean-kernel"
+		elog "    app-portage/diffmask"
+		elog "    app-portage/flaggie"
+		elog "    app-portage/install-mask"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
new file mode 100644
index 000000000000..db87f0f2dcb0
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -0,0 +1,72 @@
+# 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} pypy)
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit distutils-r1 git-r3
+
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoolkit.git"
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS=""
+
+DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!app-portage/gentoolkit-dev
+	sys-apps/gawk
+	sys-apps/gentoo-functions"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
+	VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove on Gentoo Prefix platforms where it's broken anyway
+	if use prefix; then
+		elog "The revdep-rebuild command is removed, the preserve-libs"
+		elog "feature of portage will handle issues."
+		rm "${ED}"/usr/bin/revdep-rebuild*
+		rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
+		rm -rf "${ED}"/etc/revdep-rebuild
+		rm -rf "${ED}"/var
+	fi
+}
+
+pkg_postinst() {
+	# Create cache directory for revdep-rebuild
+	mkdir -p -m 0755 "${EROOT%/}"/var/cache
+	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
+
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		elog "    app-admin/eclean-kernel"
+		elog "    app-portage/diffmask"
+		elog "    app-portage/flaggie"
+		elog "    app-portage/install-mask"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}
diff --git a/app-portage/gentoolkit/metadata.xml b/app-portage/gentoolkit/metadata.xml
new file mode 100644
index 000000000000..011e78ec7428
--- /dev/null
+++ b/app-portage/gentoolkit/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="project">
+    <email>tools-portage@gentoo.org</email>
+    <name>Gentoo Portage tools team</name>
+  </maintainer>
+  <longdescription>
+Gentoolkit is a collection of useful adminstration scripts particular to
+the Gentoo Linux distribution. It contains rough drafts and
+implementations of features that may in time make it into Portage, or
+into full-fledged tools in their own right.
+</longdescription>
+</pkgmetadata>
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
new file mode 100644
index 000000000000..88824554650f
--- /dev/null
+++ b/app-portage/gentoopm/Manifest
@@ -0,0 +1,6 @@
+DIST gentoopm-0.2.9.tar.bz2 24652 SHA256 49d757e521a9a254645ca1f765e9ea86c082f68263c697dec84acd2d80d48368 SHA512 e7d1daa811eb6c0877c2bec98b72bce61380802fe704f271a4df6383506d62ba661eb83ac9afd432627e2f10bf38840796768a565b80b6489563cfc54ed81ae7 WHIRLPOOL 2bc4fcace43b306c6677a37bd675042214bef36a7f4977be944d76fcbba735b54490c8d60add7e15fa30ab0213a8fab14c488a55f6da67b0e1cac10eb30e4a20
+EBUILD gentoopm-0.2.9.ebuild 905 SHA256 2c620d7ab69eb00b3e817fbdd784f366e6d528108af4305b9c70b13d71e54935 SHA512 7a0f8d7429949ede7d17fc1a70b1a77c7c08feb812f9e495b0fa393471b6c43e1faf166f26cccc1a3641f377c1ed53e03f19c336d7641c059bc497e7af57ee9b WHIRLPOOL 0c5adfe8974d2db7de4e97bbf2f91e2f6d0d08c229f64bed8735ff9305581d8edb1224fba621a799fefb037439f2fc36680e0856bcb863ab58ca29ef88f1f8c6
+EBUILD gentoopm-9999.ebuild 1052 SHA256 b10c4f385bb974c61516830dd2bd8240e4cddbdb79a377909998ca917c9295af SHA512 446019bf972e550acca235b0735adb312b037e3d818a85a6e00acd80c35ad6afc279f00ff433237e6a1d02b5c85c6e8f4aca378723d613658529fdd2fd704ec7 WHIRLPOOL 1bb5115c1c6f0156efd387f0413fd6fcb712a30ec566a80ea0a6d1f8b924cdb169608eae37e83865a79c61eebccf03944e4fc6fe18e500ebd8afc8d4f50bc3da
+MISC ChangeLog 3653 SHA256 b2926877abc4ca955c3deab36f6c013762ee64c80bbd90beee688b9cacc8237e SHA512 d2ce6c1dec7a4a7f3d4c3a990b4d5fde245a62c765b97596ff3d0b9a03816f726170ce61072ee73fa99dbbcfe8e5c4f88777b4202277919465d5e0b2ebe376f2 WHIRLPOOL e133cc282cb72fd50e86e3d7eebf783911a67719e8ecf9825781fabbddb3934ad2a4283b8e08e7f7c4d106a39595f783b71db91b3f5942725797a8ee2cb9114e
+MISC ChangeLog-2015 9550 SHA256 acb14eb487ae16dfab21b278a891c3ebec1c781cd7154baf5aab028f294a3451 SHA512 73e7a3a7863d93fc10b116ba43a974d28ba040042f89ea440b2de2d33dbf09084c263fa6207f57ae4fa6691d68a759d35390913caf83551c5607480ecfaefa5f WHIRLPOOL 08bc7d65c5bf1142a7097fa4b627eb8ffb87d6c677c6a601dd22fb7cf23f0acdbd418911ea9bf6b4adea10957a16c50f26a2f1080835dcab554a577613b4fb90
+MISC metadata.xml 527 SHA256 4ce95cdf83d7dc68c4b06314933d03a8c20a9fbeb6ddfcde3eef36bcce02ad13 SHA512 422137d02e652646b6e1cc176d4b5209dd7831dcd63eb1c47ce58105aee6648817cd79b67c8dcc1002cb97c53112b0ec75957821af0935275ee5125013c7ff2e WHIRLPOOL 9bf6c83816ed036411d4f02975114f294891e87e52ed085a3429df485a2f8f0f2f43cb33f99d5a47cf7dc6f6885752c748857cf19c3ee526557570306cd62082
diff --git a/app-portage/gentoopm/gentoopm-0.2.9.ebuild b/app-portage/gentoopm/gentoopm-0.2.9.ebuild
new file mode 100644
index 000000000000..60dc5d73ba47
--- /dev/null
+++ b/app-portage/gentoopm/gentoopm-0.2.9.ebuild
@@ -0,0 +1,39 @@
+# 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
+
+DESCRIPTION="A common interface to Gentoo package managers"
+HOMEPAGE="https://github.com/mgorny/gentoopm/"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="|| (
+		sys-apps/pkgcore
+		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}]
+		>=sys-apps/paludis-0.64.2[python-bindings] )"
+DEPEND="doc? ( dev-python/epydoc )"
+PDEPEND="app-eselect/eselect-package-manager"
+
+python_compile_all() {
+	if use doc; then
+		"${PYTHON}" setup.py doc || die
+	fi
+}
+
+python_test() {
+	"${PYTHON}" setup.py test || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/* )
+
+	distutils-r1_python_install_all
+}
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
new file mode 100644
index 000000000000..a4529c98bc9b
--- /dev/null
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -0,0 +1,46 @@
+# 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} pypy )
+
+EGIT_REPO_URI="https://github.com/mgorny/gentoopm.git"
+inherit distutils-r1 git-r3
+
+DESCRIPTION="A common interface to Gentoo package managers"
+HOMEPAGE="https://github.com/mgorny/gentoopm/"
+SRC_URI=""
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+RDEPEND="
+	|| (
+		>=sys-apps/pkgcore-0.9.4[${PYTHON_USEDEP}]
+		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}]
+		>=sys-apps/paludis-3.0.0_pre20170219[python,${PYTHON_USEDEP}] )"
+DEPEND="doc? ( dev-python/epydoc[$(python_gen_usedep python2_7)] )"
+PDEPEND="app-eselect/eselect-package-manager"
+
+REQUIRED_USE="doc? ( $(python_gen_useflags python2_7) )"
+
+src_configure() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+	distutils-r1_src_configure
+}
+
+python_compile_all() {
+	use doc && esetup.py doc
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/app-portage/gentoopm/metadata.xml b/app-portage/gentoopm/metadata.xml
new file mode 100644
index 000000000000..1ddb67ad7e6c
--- /dev/null
+++ b/app-portage/gentoopm/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/gentoopm/issues/</bugs-to>
+    <remote-id type="github">mgorny/gentoopm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/getdelta/Manifest b/app-portage/getdelta/Manifest
new file mode 100644
index 000000000000..40fe84c47930
--- /dev/null
+++ b/app-portage/getdelta/Manifest
@@ -0,0 +1,6 @@
+AUX getdelta-0.7.9.patch 9393 SHA256 7f6b977e707f338510c4852d6812b1a4803c996cea98192c542bb36de9b4d87b SHA512 c9c363c8e36245a8cd409d3a43c0d9110c409311f6972893d993f16f2911496c33c50c98e8dd9138b52bb7d7dc5ffb56b0611c28e9682ea5ac189cb27c5755dc WHIRLPOOL e4d2ccc8e1a50ca1174183394f3464e82d95dd7be3c5a3dad8d7fe596196ad28a2daf09603ed4ff3b5eafce67f7bcd4d3d996bd672805ed11bf1d5d5433b8e0b
+DIST getdelta-0.7.8.tar.bz2 10335 SHA256 72bd5dac59e86a5c78217a15e3198df513152dc784a8685b1a8c2c5efdb34217 SHA512 66374ce1a0ec5492d11478ddcaeb67b497a44357605f3cd1b9176796ca9f69d8c6865f9db188a6d7722c4ab372a5a317dfa6fafe97d9f08f76f332469f1ee2b2 WHIRLPOOL 88e6f1df59e4897c3c667634b8d08c0a225daad56f627793074947b8f2bd3840b9108e50e0506fe49ca2ab43179d43c902f3da49a994b1886b855bb3cc65f395
+EBUILD getdelta-0.7.9-r2.ebuild 1391 SHA256 2b116f25a5ac6a047ab0a06469efc6aeb0901151e4a65b03e8bb7d1eec20881a SHA512 5d50594b215d4901b7378d627d78c51162bc39ec75901ecb00722658704948bc4e8dffc4eba4467fb2c32bf0dc389c7b1d0f7930c3cfb318f16bfb1da81deb1a WHIRLPOOL 8821a3e0877532f7a4fcdba98ca84e06867ee205b4a2f4cccaa000f3c7424a19796f535127bbc0191ee123dc9a1b567b998861683a48f0b2fc04a1993255371e
+MISC ChangeLog 2468 SHA256 09f1dc1393ee22015f37a79bebd5ce01986fad9f31b3bab6737bce52c44896fd SHA512 9c3041c8b79bcc73a71884bbaae8043b04cb43f04ddb0531f225a7666cf4bdc9ed16c8a0d0bce5e24ff5e7df1545716f7f65523761518244360d3b4b025ac6b7 WHIRLPOOL 33a343db93464fd623afd69b583cf3b7ddacceb0063a08c6f2555c01e2d19b855e16b4d355c3d33d533587974f3342ebcc706f37422a2c9a5d28860e61695643
+MISC ChangeLog-2015 4496 SHA256 8b83addcef5950dd0e2a4781146dbd67afeb3bdd8798affc1dba66302abd1f66 SHA512 2328b4b3e0ba54fd05677d76183813da2a103fb1a4493c510d2b954dd80f360cc1d9d9ae4e5618777eee0685a3c5299d0727428bbfecf0180cb0ce5d82437eaf WHIRLPOOL b8e3f4015a63e1c68fe0bffadb7cd7f44de8c1056284e7070de663ffa9cfd890d710150f1716358d6a32069413e863f274ac74def2050852ad06f74ec243f880
+MISC metadata.xml 495 SHA256 470b264a335319f6017d0a732f2928060c37263df90e12a03dab96754fec3840 SHA512 1e2fbc185f118b58adafb9ccc5c03d56d3802aa719601ba2bda7cdc2fae31a4f558261087d1da74e33786539f7b827a24acc9ad85a0ae4dadd26be31417efd92 WHIRLPOOL dd4a3bd3db297bd2bc61b1ea613de0b297768661b1f5a12153ba0e0d9a59627b93a36927a9ed06421df7f745df28a643691516a1f1c7b81bc7be8c2be9970886
diff --git a/app-portage/getdelta/files/getdelta-0.7.9.patch b/app-portage/getdelta/files/getdelta-0.7.9.patch
new file mode 100644
index 000000000000..9ab117e59c95
--- /dev/null
+++ b/app-portage/getdelta/files/getdelta-0.7.9.patch
@@ -0,0 +1,252 @@
+--- getdelta.sh	2007-07-13 16:30:26.000000000 +0000
++++ getdelta.sh	2010-08-27 17:23:31.692000002 +0000
+@@ -25,6 +25,9 @@
+ VERSION="0.7"
+ 
+ # Changelog
++# version 0.7.9   2008/10/08
++#		- add second parameter for destination name (EAPI=2)
++#		- quote more carefully
+ # version 0.7.8   2007/07/13
+ #		- added option -O to call of emerge when finding mirrors
+ #		- replaced some calls of coreutils with bash-internals
+@@ -326,13 +329,13 @@
+ 
+ remove() {
+ 	output "${GREEN}You have chosen to remove ${CYAN}$1\n"
+-	pushd ${DISTDIR} >/dev/null 2>&1
++	pushd -- "${DISTDIR}" >/dev/null 2>&1
+ 	removeme=true
+ 	for n in $(grep -v "^#" ${DO_NOT_REMOVE})
+ 	do
+        		grep -q $n <<< "$1"  && removeme=false && output "${CYAN}${1}${RED} is not deleted, since it matches ${n} in ${DO_NOT_REMOVE}"
+ 	done
+-	$removeme && rm -f $1
++	$removeme && rm -f -- "$1"
+ 	popd >/dev/null 2>&1
+ }
+ 
+@@ -349,7 +352,7 @@
+ 			-e "s/src4/srcDDD/g" \
+ 			-e "s/src5/srcEEE/g" \
+ 			-e "s/src6/srcFFF/g" \
+-			-e "s/src7/srcGGG/g" <<< $MASK_FILENAME)
++			-e "s/src7/srcGGG/g" <<< "$MASK_FILENAME")
+ 	fi
+ 	
+ 	# ignore PR for src-files of firefox
+@@ -375,7 +378,7 @@
+ 		   -e "s/rc//g" \
+ 		   -e "s/[\._-]//g" \
+ 		   -e "s/\+//g" \
+-		   -e "s/ //g" <<< $MASK_FILENAME)
++		   -e "s/ //g" <<< "$MASK_FILENAME")
+ }
+ 
+ # create or update a config-file
+@@ -384,6 +387,7 @@
+ add_to_configfile LOCAL_MIRROR "" "set this to one or more (space separated) URI ending with '/' if you want to check one or more local mirror(s) first\n# most people just leave it empty."
+ add_to_configfile DELTUP_SERVER "http://linux01.gwdg.de/~nlissne/deltup.php" "deltup-server to use"
+ add_to_configfile FETCH "/usr/bin/wget -t 1 --passive-ftp" "command to use for downloading"
++add_to_configfile FETCHNAME "\$FETCH -O" "command to use for downloading; first parameter is the filename, second the url"
+ add_to_configfile QUEUERETRY 15 "number of seconds to wait before a queued request is retried"
+ add_to_configfile MAXIMUM_ACCEPTABLE_QUEUEPOS "15" "the maximum queuepos you would accept (if higher download full archive instead)"
+ add_to_configfile QUEUETIMEOUT 900 "when a dtu-request is queued - how long should we wait max. before downloading the original archive instead (in seconds)"
+@@ -424,14 +428,14 @@
+ add_to_donotremove "^rp-pppoe"
+ 
+ 
+-if [ -z $1 ]
++if [ -z "$1" ]
+ then
+ 	COLOR=true
+ 	echo -e "${YELLOW}getdelta.sh version ${VERSION}"
+ 	echo "This script has to be called like this:"
+ 	echo -e "${CYAN}$0 <URI>"
+ 	echo -e "\n${YELLOW}To use it, you should just put the following line into your /etc/make.conf"
+-	echo -e "${GREEN}FETCHCOMMAND=\"$0 \\\${URI}\""
++	echo -e "${GREEN}FETCHCOMMAND=\"$0 \\\"\\\${URI}\\\" \\\"\\\${FILE}\\\"\""
+ 	echo -e "\n${YELLOW}There is a config-file ${CYAN}${GETDELTA_CONFIGFILE}${YELLOW} with some variables to control the behaviour of this script."
+ 	echo -e "Edit it to your needs.${NORMAL}"
+ 	exit 1
+@@ -464,10 +468,12 @@
+ 	output "use getdelta.sh for your FETCHCOMMAND, only." &&
+ 	sleep 5 && exit 1
+ 
+-pushd $DISTDIR >/dev/null 2>/dev/null
++pushd -- "$DISTDIR" >/dev/null 2>/dev/null
+ ORIG_URI=$1
+ NEW_FILE=$(basename $ORIG_URI)
+ 
++[ -z "${NEW_FILE}" ] && NEW_FILE=${ORIG_URI##*/}
++
+ # repoman downloads metadata.dtd with FETCHCOMMAND
+ # this should not be done with getdelta - so just fetch the file and exit
+ 
+@@ -475,7 +481,7 @@
+ # dtu files.
+ if [ "${NEW_FILE}" = "metadata.dtd" ] || [ "$GETDELTA" = "0" ]
+ then
+-	$FETCH $@
++	$FETCHNAME "$NEW_FILE" "$ORIG_URI"
+ 	exit $?
+ fi
+ 
+@@ -516,7 +522,7 @@
+ #
+ output "${GREEN}Searching for a previously downloaded file in ${YELLOW}${DISTDIR}\n"
+ 
+-first_chars=$(sed 's/[[:digit:]][[:print:]]*$//' <<< $NEW_FILE)
++first_chars=$(sed 's/[[:digit:]][[:print:]]*$//' <<< "$NEW_FILE")
+ length_first_chars=${#first_chars}
+ [ $length_first_chars -lt 3 ] && first_chars="${NEW_FILE:0:2}"
+ 
+@@ -527,7 +533,7 @@
+ let len1=${#mask}
+ filelist=""
+ 
+-for name in $( ls ${first_chars}* 2>/dev/null )
++for name in $( ls -- "${first_chars}"* 2>/dev/null )
+ do
+ 	mask2=$(mask_name "${name}")
+ 	# add any file, that results in the same mask or differ not more than two letters
+@@ -582,7 +588,7 @@
+ 
+ 	# find matching part of filename - first: frontmatch
+ 	x=0;
+-	a=($NEW_FILE $filelist)
++	a=("$NEW_FILE" $filelist)
+ 	match=""
+ 	while [ -z "$match" ]
+ 	do
+@@ -657,7 +663,7 @@
+ 	FILE_IS_CORRUPT=false
+ 	if $CHECK_OLD_FILE 
+ 	then
+-		file_digest=$(grep -h ${best_candidate} ${FILESDIR}/digest-* | sed -n 1p)
++		file_digest=$(grep -h ${best_candidate} "${FILESDIR}"/digest-* | sed -n 1p)
+ 		if [ "$file_digest" ]
+ 		then
+ 			file_md5=$(cut -d ' ' -f2 <<< "$file_digest") 
+@@ -669,7 +675,7 @@
+ 				FILE_IS_CORRUPT=true
+ 			fi
+ 		else
+-			if [ $(rev <<< ${best_candidate} | cut -d. -f2 | rev) = "tar" ]
++			if [ $(rev <<< "${best_candidate}" | cut -d. -f2 | rev) = "tar" ]
+ 			then
+ 				output "${YELLOW}Could not find a digest-file for ${CYAN}${best_candidate}${YELLOW}. Testing file integrity with tar.\n"
+ 				if ! tar -tf ${best_candidate} >/dev/null
+@@ -698,17 +704,16 @@
+ 
+ 		# Remember where we are, and go to a new dir there we can work
+ 		tmp_dwn_dest="${DISTDIR}/.getdelta-`date +%N`-tmp"
+-		mkdir ${tmp_dwn_dest}
++		mkdir -- "${tmp_dwn_dest}"
+ 		# If user abort Ctrl+C (signal 2), remove tmp-dir; enabable trap again and send it again to stop wget
+-		trap "rm -r ${tmp_dwn_dest}; trap 2; kill -2 $$" 2
+-		pushd ${tmp_dwn_dest} >/dev/null 2>&1
++		trap 'rm -r -- "${tmp_dwn_dest}"; trap 2; kill -2 '$$ 2
++		pushd -- "${tmp_dwn_dest}" >/dev/null 2>&1
+ 
+ 		# thanks to MATSUI Fe2+ Tetsushi for idea and patch
+ 		FILESIZE=$(stat -c %s "${DISTDIR}/${best_candidate}")
+ 		let TIMELIMIT=${FILESIZE}/${BANDWIDTH}
+ 		[[ $TIMELIMIT -lt $QUEUETIMEOUT ]] && QUEUETIMEOUT=$TIMELIMIT
+-			
+-		if $FETCH "${DELTUP_SERVER}${query}"
++		if $FETCH "${DELTUP_SERVER}${query}" -O ${best_candidate}-${NEW_FILE}.dtu
+ 		then
+ 			# thanks to deelkar for this much more elegant solution to the "broken pipe" problem with "head -n1"
+ 			GOTFILE=$(ls -c | sed -n 1p) 
+@@ -718,15 +723,15 @@
+ 			# may have sento to us.
+ 			
+ 			# first: the request have been queued
+-			if [ "${GOTFILE}" = "deltup-queued" ]
++#			if [ "${GOTFILE}" = "deltup-queued" ]
++			if [[ "$(file -bi ${GOTFILE}|cut -d ";" -f1)" != "application/x-bzip2" && "$(cat ${GOTFILE}|cut -d "," -f1)" != "sorry" ]]
+ 			then 
+ 				let QTMOUT=$(date +%s)+QUEUETIMEOUT
+-				while [ -f deltup-queued ]
++				while [[ "$(file -bi ${GOTFILE}|cut -d ";" -f1)" != "application/x-bzip2" && "$(cat ${GOTFILE}|cut -d "," -f1)" != "sorry" ]]
+ 				do
+ 					output "${GREEN}destination file: ${CYAN}${NEW_FILE}\n"
+-					output "${YELLOW}$(cat deltup-queued)"
+-					QUEUEPOS=$(grep "has been queued" deltup-queued | cut -d. -f2 | cut -d")" -f1)
+-					rm -f deltup-queued
++					output "${YELLOW}$(cat ${GOTFILE})"
++					QUEUEPOS=$(grep "has been queued" ${GOTFILE} | cut -d. -f2 | cut -d")" -f1)
+ 					TSTAMP=$(date +%s)
+ 					if ((TSTAMP<QTMOUT)) && ((QUEUEPOS<=MAXIMUM_ACCEPTABLE_QUEUEPOS))
+ 					then
+@@ -741,7 +746,7 @@
+ 							sleep 1
+ 						done
+ 						echo -n -e "${NORMAL}"
+-						$FETCH "${DELTUP_SERVER}${query}"
++						$FETCH "${DELTUP_SERVER}${query}" -O ${best_candidate}-${NEW_FILE}.dtu
+ 						GOTFILE=$(ls -c | sed -n 1p)
+ 					else
+ 						if ((TSTAMP>=QTMOUT))
+@@ -761,20 +766,20 @@
+ 				done
+ 			fi
+ 			
+-			if [ -f ${best_candidate}-${NEW_FILE}.failed ]
++			if [ "$(cat ${GOTFILE}|cut -d "," -f1)" = "sorry" ]
+ 			then
+ 				output "\n${RED}The server could not build the dtu-file for ${NEW_FILE}\n" 
+-				output "${YELLOW}reason:\n${RED}$(cat ${best_candidate}-${NEW_FILE}.failed)\n" 
+-				rm -rf ${best_candidate}-${NEW_FILE}.failed
++				output "${YELLOW}reason:\n${RED}$(cat ${GOTFILE})\n" 
++				rm -rf -- "${GOTFILE}"
+ 			fi
+ 
+-			if [ -f ${best_candidate}-${NEW_FILE}.dtu ]
++			if [ -f "${best_candidate}-${NEW_FILE}.dtu" ]
+ 			then
+ 				output "${GREEN}Successfully fetched the dtu-file - let's build ${NEW_FILE}...\n" 
+-				downloadsize=$(stat -c %s  ${best_candidate}-${NEW_FILE}.dtu)
+-				if deltup -p -v -D ${DISTDIR} ${best_candidate}-${NEW_FILE}.dtu 
++				downloadsize=$(stat -c %s "${best_candidate}-${NEW_FILE}.dtu")
++				if deltup -p -v -D "${DISTDIR}" "${best_candidate}-${NEW_FILE}.dtu"
+ 				then 
+-					newsize=$(stat -c %s ${NEW_FILE})
++					newsize=$(stat -c %s "${NEW_FILE}")
+ 					let savedsize=${newsize}-${downloadsize}
+ 					let percent=${savedsize}*100/${newsize}
+ 					unit="bytes"
+@@ -791,8 +796,8 @@
+ 					esac
+ 					output "${YELLOW}This dtu-file saved ${UCOLOR}${savedsize} ${unit} (${percent}%)${YELLOW} download size.\n"
+ 				fi
+-				mv -f ${NEW_FILE} ${DISTDIR} &&
+-				${REMOVE_OLD}  && remove "${best_candidate}"
++				mv -f -- "${NEW_FILE}" "${DISTDIR}" &&
++				${REMOVE_OLD}  && remove ${best_candidate}
+ 			fi
+ 
+ 		fi # if $FETCH "${DELTUP_SERVER}${query}"
+@@ -812,7 +817,7 @@
+ 			read
+ 		fi
+ 		popd >/dev/null 2>&1
+-		rm -rf ${tmp_dwn_dest}
++		rm -rf -- "${tmp_dwn_dest}"
+ 		#stop respond to trap2
+ 		trap 2
+ 	fi # if ! FILE_IS_CORRUPT
+@@ -824,10 +829,10 @@
+ 	
+ # Ok, once we are here, we should have got the delta (and used it)
+ # or we still have to download the full file
+-if ! [ -f ${DISTDIR}/${NEW_FILE} ] 
++if ! [ -f "${DISTDIR}/${NEW_FILE}" ] 
+ then
+ 	output "${RED}The dtu could not be fetched,${YELLOW} downloading full file from original URL\n"
+-	$FETCH $ORIG_URI
++	$FETCHNAME "$NEW_FILE" "$ORIG_URI"
+ # remember we had a fallback to use correct exitcode for portage
+ 	FALLBACK=$?
+ fi
diff --git a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
new file mode 100644
index 000000000000..df2523078442
--- /dev/null
+++ b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="dynamic deltup client"
+HOMEPAGE="http://linux01.gwdg.de/~nlissne/"
+SRC_URI="http://linux01.gwdg.de/~nlissne/${PN}-0.7.8.tar.bz2"
+SLOT="0"
+IUSE=""
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~sparc ~x86"
+
+RDEPEND="app-portage/deltup
+	dev-util/bdelta"
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}.patch
+}
+
+src_install () {
+	# portage has moved make.globals, so we just hotfix it
+	sed -i -e "s:/etc/make.globals:/usr/share/portage/config/make.globals:g" "${WORKDIR}"/getdelta.sh || die "Couldn't fix make.globals path"
+
+	# make.conf has now two locations. This should fix it ( #461726 )
+	sed -i -e "s:source /etc/make.conf:source /etc/make.conf || source /etc/portage/make.conf:" "${WORKDIR}"/getdelta.sh || die "Couldn't fix make.conf path"
+
+	sed -i -e "s:/bin/sh:/bin/bash:" "${WORKDIR}"/getdelta.sh || die
+	dobin "${WORKDIR}"/getdelta.sh || die
+}
+
+pkg_postinst() {
+	elog "You need to put"
+	elog "FETCHCOMMAND=\"/usr/bin/getdelta.sh \\\${URI}\""
+	elog "into your /etc/make.conf to make use of getdelta"
+
+	# make sure permissions are ok
+	touch "${ROOT}"/var/log/getdelta.log
+	mkdir -p "${ROOT}"/etc/deltup
+	chown -R portage:portage "${ROOT}"/{var/log/getdelta.log,etc/deltup}
+	chmod -R ug+rwX "${ROOT}"/{var/log/getdelta.log,etc/deltup}
+}
diff --git a/app-portage/getdelta/metadata.xml b/app-portage/getdelta/metadata.xml
new file mode 100644
index 000000000000..9b449d0de5af
--- /dev/null
+++ b/app-portage/getdelta/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>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>nlissne@linux01.gwdg.de</email>
+    <name>Nicolai Lissner</name>
+  </maintainer>
+<maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-portage/gpytage/Manifest b/app-portage/gpytage/Manifest
new file mode 100644
index 000000000000..7dc198365739
--- /dev/null
+++ b/app-portage/gpytage/Manifest
@@ -0,0 +1,5 @@
+DIST gpytage-0.3.0_rc1.tar.gz 45470 SHA256 2d083999ad266eac5bce2c5cea9a00977d08d5bfae452903749609b824714930 SHA512 82f6ecdf5a5710c5f11a22401f46dbb50410f78101086f4ae727b09e6a022065c83b1ceccc3cf6771b5b09c37fabedd9ba58a01121c941c55d0fe9185ae9d0b7 WHIRLPOOL eb72604a269f015370e583e448b8f24b72909e0748c7eb74171580fcbe725864187c679f2c9ca00b1ac5f8b1eb39f07851cf03018f27c1f0fb88b89488e502a2
+EBUILD gpytage-0.3.0_rc1-r1.ebuild 430 SHA256 8154ec36252dc83044711f41b3e6cc25296788b7f7ce505e3151e1a08cd5bd36 SHA512 15613ea9f3abdf7b9928845312e2f6bd0f3ffab857c9818a4016c3d5d08bfb20ba9c5a279f8cd52e30bebcf77138d213d5b32e8654bec8155c7476efca6b4000 WHIRLPOOL 70373b4528f69fdd4c940af5aad48408db0ac802b2c20b4f0e81e248d7640913f9cc8652b755d6a33ab7215b80a5622c37f41202317b194e967db665b88d270f
+MISC ChangeLog 3039 SHA256 202357cb57e480698808e4a2d83dc4a4851b59fe903e169bb9a0efcfaa8ad926 SHA512 5e79fcea00f1d846323461d07a00ad81cb083ef9a997318d2e7122a2642063fa287fd0ec34370599fcfa3eb4e5207a91e8ab8ca1c660acb9042c248fd0d40d86 WHIRLPOOL 6049e28d8f301c2c35257f1466fc834073fb62ffbd66e9ecc99c84056964ce3fddd7aaa08e1f653ec635cdc94b2ad8122983a1f08dd4bdadc0d3e7a7c6eecaa5
+MISC ChangeLog-2015 1714 SHA256 5bfc65c5d27d807fea8e892321a056ce3d9e84e3366ea39d1a6ca0dbb7603edd SHA512 17668ed9da4a63292a066c237fa180a214e5b1fd454e83de543ea56c12b7ea7eda1ad6515b95edd48847aae168e3667320efa5ac210ee49fef799ea6acfde7b0 WHIRLPOOL e2c8cb3bccc7e410b7eabe5fb60a17df705038b602aef15cf506f0bce654e7be98188025033963fac2c9ae692b1c625628181479843f15d91a3286cab42da22d
+MISC metadata.xml 371 SHA256 35c5738fc5adc318cd826f3fb9a1c44d4fdebdf56c5e19e77266bfac2764adca SHA512 56a42cde34ea7c1d416374cc8f1bf10f65257f25affe9289f92c6fdfdbc59eb32d71c8c45618b410b5ef768318d9038da1de6787b6477449d01624f2f67e24ca WHIRLPOOL 5d063350d17f1ab4edf86596020e5139aa2fa3a3fda376c23437546baa327691afca3be833adf926b966d71cfbb53f66804ba277f2ba9aa78153dcd3fc1f2c0d
diff --git a/app-portage/gpytage/gpytage-0.3.0_rc1-r1.ebuild b/app-portage/gpytage/gpytage-0.3.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..4f2a875c2724
--- /dev/null
+++ b/app-portage/gpytage/gpytage-0.3.0_rc1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="GTK Utility to help manage Portage's user config files"
+HOMEPAGE="https://gna.org/projects/gpytage"
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pygtk-2.14"
diff --git a/app-portage/gpytage/metadata.xml b/app-portage/gpytage/metadata.xml
new file mode 100644
index 000000000000..55c598a89486
--- /dev/null
+++ b/app-portage/gpytage/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>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
+<maintainer type="project">
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
new file mode 100644
index 000000000000..2cc7b09ba92e
--- /dev/null
+++ b/app-portage/gpyutils/Manifest
@@ -0,0 +1,9 @@
+AUX implementations.txt 781 SHA256 9bf1a7cad311a488dd3631221284e6e8068b7c1e41630cffa2c8bfeeb100b201 SHA512 f442fbc1a4da5e3ecdb51b3b3a72f5f4f2f8b3777fc514c923d8ad885a89dd725486eae803fe481a7f8d5a32691ba2fba974f887548094599a27cb3b39a0ab89 WHIRLPOOL f09beb2a449c4112f2eaa762e2281da971c76ab3c8bffb0ac9554eac9bd5ff72c3cda6d7a05aacba050e866fd3a2c3286a537150c15fdafc50957d67f8131360
+DIST gpyutils-0.1.4.tar.bz2 13458 SHA256 bdffc77f526708e2c7d46aa35d75003b2489c2ed09a1d1f49f4574ec48a173e4 SHA512 fce002bd77868106990ceda1f7ef5e734ec279b85352d9481c0044624e0c837c558654f1d59617301dc7d8125fe7fb2b9778547f1dad19448c0aae165018babc WHIRLPOOL eddc8c4394bff7d37e4c02004d82972b7bc8d3c17970e384b9123e85a9c310c5d6ecb8f7b062396ac53a3bde175beeb7095d7b9ea3d4bb72336552b40f084766
+DIST gpyutils-0.2.1.tar.bz2 15044 SHA256 9820ff7456f7be4dade93f923f5410f2bb7e2395c239a288a163b130e1b977be SHA512 58b796647bf614e4ad492fe97539bd11f0d5beeecb7fd903a81917bfaac54ced4fb14813f499010093884891eda9c43226bcf2cae7744e7290bf9b16928b6172 WHIRLPOOL 3ae97e07f020a0e57ff1cdad86cb0b1c8b2a036ea572ba45c231bee8ab1b885074a29a92e9fe5d247ab2d977c4528e0b6147bd70756e765a9da2a4d12d3ed723
+EBUILD gpyutils-0.1.4.ebuild 513 SHA256 11a7fdb4d15f07772c877a1051d288b6caa69d1040a13f5416cd1eeffadb2a40 SHA512 971fd49a6b1e67e0693128e30b9265b2d1f56fb4970f5d1f9a555a092620fd272d7de19999bd4c1c2d398f4a09ac96c758292edb37808e45cb30acade59c7e65 WHIRLPOOL 7f0e95c8304206778f673cb1ffa8945d7ab2040b76f05f4d4a0bbba00968ea640f00d47287173a934d469d363fded5bfb7dc3eeb954a84100aff9dff373a5428
+EBUILD gpyutils-0.2.1.ebuild 519 SHA256 002c8293bda4749dcc2ef44ad28fc8ea88796e8f5449c7d2668d6cde5ac40c12 SHA512 e19aa3fad32d70354d00b28ef019243cfaeb64cddb6ce7ede3397588b870b9f16bfe5901514a0df3982432432b254a94c5901e79bb73402ebed7bb3d05ffd42e WHIRLPOOL de1e879a83a900d05f41aaad42741a2028e94ef7348b9ad3266b31ad97f81ae899f0f244a4409fef97b606177c0df27ef8d26386bc93115ee962d42c27e447a0
+EBUILD gpyutils-9999.ebuild 498 SHA256 3f5e8f5728163f1bd2c9714ece2864f9c0208c977359d6ca4986cb9135d74fdb SHA512 d7a4e377084238a4eae3698258c33156348986a12f10cdf9a528c4d9697a30502cf628c640326f514ec034806eafb8f18cfd071f12b16ec1c449dc70a9fc6c71 WHIRLPOOL 70a3821c3f5b4f2aaa195f7d6f597e61f42c2a4ae445b6f112f57afeef15fe0b16b52010976567dfcbea21412eeae73bae3298b81d8d9d1ca5ed9c3a2c743c6e
+MISC ChangeLog 3306 SHA256 059451ca21377bc6de679424d8695aed41957ed8a4d23fa36d96f6bc0dabbaf0 SHA512 acbfe0b4456475225158e334f8ff525ce0cc907a82c3017c5e2e8c071689b9d0408209e1403d87f9c96e779d1192a143294596a9d7218009503c90325aa2758b WHIRLPOOL 641c8abe59d11ed1a8560290a2b770a9f4d3531b26127157de95772836807fc1b71ade382f0dadc0fe53056071322783f07529476dd6c876a834c8fdadbf6a63
+MISC ChangeLog-2015 3161 SHA256 40d0b7f0cbce88d3a12c6c88469aa33a13a5fa69598b2727c78aa3d5e192b31f SHA512 3030eef251e1356fb081e0d39adb119c71ee88a46c2275bae065433a1985917f5a357d314a2d25990a4b1147fdbe868b729fd5cb459eb0b8747fd7aac28d4130 WHIRLPOOL e7983f35408329988dd1872b384a3d5bc89b9db94ee868bb68fdbe601afb7e4fa2ca2ed2f7e4b891e136241826d68c34c9e41bdb1c3c1e4b4942251466b9d004
+MISC metadata.xml 527 SHA256 d2c634da933619262766d8670ffa1eab7a3612009135f3d8c734beb41776775a SHA512 52f6670e1fd8b5b58a566226a20ea405aad364eb085a7f2d62485086e5d9ce2ceebfe9ab3c6321892fa775187cecfe8148cc25ed5256ebbe1ac3fba8d7d39ddc WHIRLPOOL f2a1d7846cefa77f2cd80b51d43ad16b3dfdbe0da0110c81871ccfb4757607d683afc5a084618d9a64ab86d64344adbb67b66eb5ff68f23bd2c4ea5ca6c4d174
diff --git a/app-portage/gpyutils/files/implementations.txt b/app-portage/gpyutils/files/implementations.txt
new file mode 100644
index 000000000000..ead622173966
--- /dev/null
+++ b/app-portage/gpyutils/files/implementations.txt
@@ -0,0 +1,30 @@
+# python-r1	old-eclass	status	short-code
+#
+# python-r1: python-r1 eclass implementation name
+# old-eclass: python.eclass implementation name (null if not supported)
+# status: dead, old, supported, current, experimental, future
+# short-code: short string used in tabular output
+
+python2_4	2.4	dead	2.4
+python2_5	2.5	dead	2.5
+python2_6	2.6	dead	2.6
+python2_7	2.7	current	2.7
+python3_0	3.0	dead	3.0
+python3_1	3.1	dead	3.1
+python3_2	3.2	dead	3.2
+python3_3	3.3	dead	3.3
+python3_4		current	3.4
+python3_5		supported	3.5
+python3_6		supported	3.6
+
+pypy1_8	2.7-pypy-1.8	dead	p1.8
+pypy1_9	2.7-pypy-1.9	dead	p1.9
+pypy2_0	2.7-pypy-2.0	dead	p2.0
+
+pypy		supported	pypy
+pypy3		supported	pypy3
+
+jython2_5	2.5-jython	dead	j2.5
+jython2_7	2.7-jython	experimental	j2.7
+
+# vim:ts=16:sts=16:noet:ft=conf
diff --git a/app-portage/gpyutils/gpyutils-0.1.4.ebuild b/app-portage/gpyutils/gpyutils-0.1.4.ebuild
new file mode 100644
index 000000000000..cd588c59526b
--- /dev/null
+++ b/app-portage/gpyutils/gpyutils-0.1.4.ebuild
@@ -0,0 +1,22 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Utitilies for maintaining Python packages"
+HOMEPAGE="https://github.com/mgorny/gpyutils/"
+SRC_URI="https://github.com/mgorny/gpyutils/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-portage/gentoopm-0.2.9[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-portage/gpyutils/gpyutils-0.2.1.ebuild b/app-portage/gpyutils/gpyutils-0.2.1.ebuild
new file mode 100644
index 000000000000..45dfe8370db8
--- /dev/null
+++ b/app-portage/gpyutils/gpyutils-0.2.1.ebuild
@@ -0,0 +1,22 @@
+# 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
+
+DESCRIPTION="Utitilies for maintaining Python packages"
+HOMEPAGE="https://github.com/mgorny/gpyutils/"
+SRC_URI="https://github.com/mgorny/gpyutils/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-portage/gentoopm-0.2.9[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-portage/gpyutils/gpyutils-9999.ebuild b/app-portage/gpyutils/gpyutils-9999.ebuild
new file mode 100644
index 000000000000..06e17abf9f00
--- /dev/null
+++ b/app-portage/gpyutils/gpyutils-9999.ebuild
@@ -0,0 +1,23 @@
+# 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} pypy )
+
+EGIT_REPO_URI="https://github.com/mgorny/gpyutils.git"
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Utitilies for maintaining Python packages"
+HOMEPAGE="https://github.com/mgorny/gpyutils/"
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-portage/gentoopm-0.2.9[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-portage/gpyutils/metadata.xml b/app-portage/gpyutils/metadata.xml
new file mode 100644
index 000000000000..1d172ebd5f18
--- /dev/null
+++ b/app-portage/gpyutils/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/gpyutils/issues/</bugs-to>
+    <remote-id type="github">mgorny/gpyutils</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
new file mode 100644
index 000000000000..464bffeb507d
--- /dev/null
+++ b/app-portage/grs/Manifest
@@ -0,0 +1,8 @@
+DIST grs-0.4.tar.gz 34212 SHA256 a069b51258fa9dbe8158ebe7339967c588360037a405bb9600ca69f3f18bb0d2 SHA512 e24879aabf7d9d029f584693dcb5e6578d5e14ab9e2588143883b7a27174184a2e2c30d08bf140a1bb45b7ab80c10e73f5ccf96de0bea8185d326ce0ce83fa11 WHIRLPOOL 4a6389efeec00a71f457a5d1087758ebd590aa4546a1c36e37de33a0aae34c7e42cd591795ad3b4a232c5e85511f4d42173fdcb6dbbc7fbb55a89490632e0f30
+DIST grs-0.5.tar.gz 34213 SHA256 8442d68d680665fcf3700add714503929d04cd435ebd487529a2555518bc8825 SHA512 85cb78d898c266fe4f1a5298d3add20fb127d43469cd00d32400bebf0c7350c07b581f9e8714a32db62c57f5a92fca0cbe66f0e2812dab86f57d9e8c66aaab7f WHIRLPOOL e99c2278a71f8285028699c7e961f27f94bf52189a2de3ea38d07514101fdc45be4b6261c5ea35429afd5acf9e06c4bd7a910df72c82b877e7d324cdb27c7d47
+EBUILD grs-0.4.ebuild 859 SHA256 b8e967103d4a2a1ea9384828f0564b7722ffb32330cf73dfce2967010ee8d8e9 SHA512 a4121e207a4f94b9f4356cfc4ccddc3612471ee2a892d2edd3c3aa9daaeb61809230c428977866cc6332f3943a24536036d38bd196622bf7dddccc746ee449b1 WHIRLPOOL d6889b4a09e2858324a28b525441ef5bf6ab27c5f6f6bc41f65c18388e1d687a1936f37e1b1226bb51cc536954b3e3ddc8c17bc41c057f0795c0c6a85e89e7ab
+EBUILD grs-0.5.ebuild 1031 SHA256 d0d594369268689bb15d613f917e0a0f4b9dadf56bc8a59c31ff2bd9d433ccdd SHA512 c526b0394b0058a515dcddfa4ae88bfbae9eaa399d556b29a765cad51a7f7013b0c732ee2a2624fbdf2e344cbf32a4ac7214853a42763fbc1f5a54cb0bb263d3 WHIRLPOOL c5bb43dfa82a574e1f7c33e61b74944b50585be1f062ff4ae4680607f5d37917e035ab616cec324769ccbbc75684f8e591079d7491b87430549b8a76c61dc26e
+EBUILD grs-9999.ebuild 1032 SHA256 619a7a6dda4c248217f1792d3b8e03f39bb79adfa8c23c11e4ffbeb626d2596c SHA512 aff08181f410d55d2b2e0cc767b7183b56f72c779bf129a3e15549cfb3077e31706637c2614c242e340f81c02b28a058de112197d69957b85130a915e0c4347a WHIRLPOOL 1d657f88308dfeb1fe8fb4970289a9fcfc1b34706170c1d53229cdf2bc1c94158a7097385e412a3a6637146da9ca5cb0b023d7e1547a4ad35aa5483587600807
+MISC ChangeLog 4444 SHA256 bcdcdf2f8ca03e6b485f745a69fffc282339caf2d0bdf802018decc7ed3614fd SHA512 c88e9d804368d7ab7ec6114647050363de1878c90cf0f6f1f9514b2747187c099f5ec1963a5cb78cf119e203b61a6bf5d33bbd6f9fd60307f79c0f7a6c268c28 WHIRLPOOL 78c4cc719265f2d2c14ec97b4cdd3822108df2bde6a0b24cd16114ea959ab1939029a9c70d881fff6c7d84e1ac7b7f7f08947051f1ce536884d1d9b3bd3d6927
+MISC ChangeLog-2015 491 SHA256 0c5744f808431ad564f0e1abc743e3d89aed698b87c4479d2ffced3805df7999 SHA512 43d5be9c6be9ae5ed4097d8af8419e6f6256233a120bcb7d495b8a70811fc95ef9be3847c6b8657f6e36c2f26c86bd41021dfe670abfd1df5b04daf8812c87f0 WHIRLPOOL c89718a7ffed7a8c9660779b402ff6170f8be014e62e95f05a8b819e3592b22d8f13069d308f75b2069a720226b23697a0a9caa9faa53c7982965d9e9da2483f
+MISC metadata.xml 252 SHA256 a590e5133cd97a615db4f977b0e28e5c60c56cac76eb3d339109cdf379003b60 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65 WHIRLPOOL b209a730a169969b9e3c4d4612368bc5b30bfa5fae275d98d83ba96fd0ad01d308a8fed4f7d67a7c9fa417c624dfeb23ce89ab58923a8a0b5b1bd68ee73f288c
diff --git a/app-portage/grs/grs-0.4.ebuild b/app-portage/grs/grs-0.4.ebuild
new file mode 100644
index 000000000000..c80a026859f5
--- /dev/null
+++ b/app-portage/grs/grs-0.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/grss.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64"
+fi
+
+DESCRIPTION="Suite to build Gentoo Reference Systems"
+HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-arch/tar[xattr]
+	app-crypt/md5deep
+	dev-libs/libcgroup
+	dev-vcs/git
+	net-misc/rsync
+	sys-apps/portage
+	sys-fs/squashfs-tools
+	virtual/cdrtools
+	|| (
+		sys-kernel/genkernel
+		sys-kernel/genkernel-next
+	)"
+
+src_install() {
+	distutils-r1_src_install
+	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
+	doenvd "${T}"/20grs
+}
diff --git a/app-portage/grs/grs-0.5.ebuild b/app-portage/grs/grs-0.5.ebuild
new file mode 100644
index 000000000000..0ec4143b9139
--- /dev/null
+++ b/app-portage/grs/grs-0.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 linux-info
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/grss.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64"
+fi
+
+DESCRIPTION="Suite to build Gentoo Reference Systems"
+HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-arch/tar[xattr]
+	app-crypt/md5deep
+	dev-libs/libcgroup
+	dev-vcs/git
+	net-misc/rsync
+	sys-apps/portage
+	sys-fs/squashfs-tools
+	virtual/cdrtools
+	|| (
+		sys-kernel/genkernel
+		sys-kernel/genkernel-next
+	)"
+
+pkg_setup() {
+	local CONFIG_CHECK="~CGROUPS"
+	local ERROR_CGROUPS="WARNING: grsrun requires CONFIG_CGROUPS enabled in the kernel."
+	linux-info_pkg_setup
+}
+
+src_install() {
+	distutils-r1_src_install
+	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
+	doenvd "${T}"/20grs
+}
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
new file mode 100644
index 000000000000..864f7da9b717
--- /dev/null
+++ b/app-portage/grs/grs-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 linux-info
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/grss.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Suite to build Gentoo Reference Systems"
+HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-arch/tar[xattr]
+	app-crypt/md5deep
+	dev-libs/libcgroup
+	dev-vcs/git
+	net-misc/rsync
+	sys-apps/portage
+	sys-fs/squashfs-tools
+	virtual/cdrtools
+	|| (
+		sys-kernel/genkernel
+		sys-kernel/genkernel-next
+	)"
+
+pkg_setup() {
+	local CONFIG_CHECK="~CGROUPS"
+	local ERROR_CGROUPS="WARNING: grsrun requires CONFIG_CGROUPS enabled in the kernel."
+	linux-info_pkg_setup
+}
+
+src_install() {
+	distutils-r1_src_install
+	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
+	doenvd "${T}"/20grs
+}
diff --git a/app-portage/grs/metadata.xml b/app-portage/grs/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/app-portage/grs/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>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-portage/gs-elpa/Manifest b/app-portage/gs-elpa/Manifest
new file mode 100644
index 000000000000..89acd7f67f16
--- /dev/null
+++ b/app-portage/gs-elpa/Manifest
@@ -0,0 +1,7 @@
+DIST gs-elpa-0.1.3.tar.gz 15486 SHA256 2cc71f64bd2109711ea9f4baeff4413dcd39d4d0318f115ce056572efcce8e71 SHA512 616c6cc33e89094e727c9ebe577d211cf9200a95b7ad6fd4b350b16d6982e3d509278b63a145880cdbc8f83481ba409b650e43260d463bf90a22e2a705997020 WHIRLPOOL 3d8562485b70a1d64a8a53bb5fb492ebdc84fafd3c1e880fb55172f69342d76966e425a85082370d15e71f938935e05496487cd7a3dde016868cc32a97c660a6
+EBUILD gs-elpa-0.1.3-r1.ebuild 614 SHA256 fda48f0a8fa220cdf20bf28a869d05c189b4124114833bf506eb5fb15fe2d38b SHA512 662fd5e8ddf29867a68b3fc7ab91216f938f6fd45b8436d52498e3c3db7a546d44bfdaf5dda44f5250335042fac039835c054bfd46f1dfa9d7c784a0db92d710 WHIRLPOOL d3fa317e4c2f85e406ec156291d97d18d380ee666be8564648ddcf19ffff2c51023055c4622e7e790dee3aa01bf8d841f17c964414d0c44822093c3eae175f29
+EBUILD gs-elpa-0.1.3.ebuild 610 SHA256 a3515cd5c8de8e36cfae0426e9a4886c6e0c98b42db19928129791101fd8b705 SHA512 d38f0e4130f0fd0237db8a24773724e1f5926ee0e46b97195cf01bea25ea744677db6b75a7075cac7cf46b8fdcc9e2065ebf7f0844c65124ebaaa28f708153df WHIRLPOOL f72e49ca9bf944e42941fb0c150d9a0a3f55bfcb9f1588b6522484b9637af01e6b72c8edfb6fb2685172a96e9b51297d50b78c3b53784f497e6013af930ab06b
+EBUILD gs-elpa-9999.ebuild 606 SHA256 6a31617fb1eb0328ed26491384c51f46b1c8d379e49327f2d476d4298a88b2bc SHA512 f3d9d1cfd7ae2de05d1e9d6068a3704e906362ebab180ad4d4d145748383a43da860eadb31dd6da45ff82518cd3797cc1d7f82b28d0fe15ed92686ba4b2f7915 WHIRLPOOL a9e3230c35c4d21492c825c97a786803a0ad284090cd81383f0365ca531b5e04d3cfabc2a9ea4b6d488209ae13798638cd02fcd0dc767de021e3b6269bc11e9b
+MISC ChangeLog 2863 SHA256 ec9caa29b4b95e9041dbb3b8bf78bb003b713519453816faaa8a288c388d33e4 SHA512 e8065eb8ca52f4c5ce28f1e8c041daabdd0108ecdc92fdcfaa6f5b6feb5e01d015bee5711fb93adec7fa4bc1c9c8b231c082f851c9d37da6c385271f5500cb83 WHIRLPOOL 66ea5300124b3b37cc42b2d902ce7155abc1ce4d22f9b66c7e8ce153ed39b7d66c589f5600664fcaa6d5cd810e8b93694135f284d9fb78f88f34ca29edd1b517
+MISC ChangeLog-2015 1176 SHA256 7492692bba1d7663405c045a8c2bebe9a1b800bb41229b160a8146baadb82b1e SHA512 3be561caa564fb16d2038c13c243d952fa8272b42673d5b13e414f7a844bef7649ea058daf85aee9c55ea88d09df79320128af15b28c4eacfaa1c64b0225532b WHIRLPOOL 72445ebf04b35eaaa1e0bc0f6d22e21fd5bf967e5254d4e1ab82e8bc8281eda6eb6d48a4e0dfeb15a006567397cd22ffcad60f8cc66aa8089750a60700634052
+MISC metadata.xml 458 SHA256 4bf5792813f2c6d447bda2f3c79e73462f4a179ff056558bd9bc3fcafc2cc961 SHA512 a10179d347d6605ef42687b02ea306a52e50f8693bf4c3d30ff1abb49490add6e5e77c6e9b7cdad18161d1bf91b5a8337306eea033ed66ff1b0e7b2da974d3e7 WHIRLPOOL 20e117caa7dbc10703c6a68392189aaf5a833d751beacd357e4e9bf2c31b842026ba4c9313fc1bc5edc58e14287d42560d7d3b269279aa58b0128a8aed260305
diff --git a/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild b/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..8a01663378e7
--- /dev/null
+++ b/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=(python{2_7,3_4,3_5})
+
+inherit distutils-r1
+
+DESCRIPTION="g-sorcery backend for elisp packages"
+HOMEPAGE="https://github.com/jauhien/gs-elpa"
+SRC_URI="https://github.com/jauhien/gs-elpa/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-portage/g-sorcery[$(python_gen_usedep 'python*')]
+	dev-python/sexpdata[$(python_gen_usedep 'python*')]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/*.8
+}
diff --git a/app-portage/gs-elpa/gs-elpa-0.1.3.ebuild b/app-portage/gs-elpa/gs-elpa-0.1.3.ebuild
new file mode 100644
index 000000000000..137fcd14cc02
--- /dev/null
+++ b/app-portage/gs-elpa/gs-elpa-0.1.3.ebuild
@@ -0,0 +1,25 @@
+# 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})
+
+inherit distutils-r1
+
+DESCRIPTION="g-sorcery backend for elisp packages"
+HOMEPAGE="https://github.com/jauhien/gs-elpa"
+SRC_URI="https://github.com/jauhien/gs-elpa/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-portage/g-sorcery[$(python_gen_usedep 'python*')]
+	dev-python/sexpdata[$(python_gen_usedep 'python*')]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/*.8
+}
diff --git a/app-portage/gs-elpa/gs-elpa-9999.ebuild b/app-portage/gs-elpa/gs-elpa-9999.ebuild
new file mode 100644
index 000000000000..9762b32af61c
--- /dev/null
+++ b/app-portage/gs-elpa/gs-elpa-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=(python{2_7,3_4,3_5})
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="g-sorcery backend for elisp packages"
+HOMEPAGE="https://github.com/jauhien/gs-elpa"
+SRC_URI=""
+EGIT_BRANCH="master"
+EGIT_REPO_URI="https://github.com/jauhien/gs-elpa"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=app-portage/g-sorcery-0.2[$(python_gen_usedep 'python*')]
+	dev-python/sexpdata[$(python_gen_usedep 'python*')]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/*.8
+}
diff --git a/app-portage/gs-elpa/metadata.xml b/app-portage/gs-elpa/metadata.xml
new file mode 100644
index 000000000000..ab100ed48313
--- /dev/null
+++ b/app-portage/gs-elpa/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>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>layman@gentoo.org</email>
+		<name>Gentoo Layman team</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jauhien/gs-elpa</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-portage/gs-pypi/Manifest b/app-portage/gs-pypi/Manifest
new file mode 100644
index 000000000000..88dcc7bdde5b
--- /dev/null
+++ b/app-portage/gs-pypi/Manifest
@@ -0,0 +1,11 @@
+DIST gs-pypi-0.1.tar.gz 15351 SHA256 98a684cad3bb64af397dac5373b57a4bb23a6784dec6f3d049423808d068c1d8 SHA512 e7d8dabed21de28f327da3163e95ea16dfb63c27d502233c0f6eae7bf3146866498c492795eff5c7126bf56bf6dd1613457290ffab83962741d49bd9254f059f WHIRLPOOL e7ce64d24302e4daa5ea2fdb96d1f43ccf9c5af1bd28a4de12dce05f73772de495e8c3f459088bac305caab02cae6f97018081d800eb1fadcc2e1ae133302c26
+DIST gs-pypi-0.2.1.tar.gz 16608 SHA256 34c8e9596373b1348863fdc025edcc7d4cc8bee7a17cc4ce5e0749e56020977c SHA512 72c04ab621690b0e1e8aee489cef09ed3f04a84b4d1f5e0888913429f24c37e79e320d41c585d7e5a087b8f9e6859f6702c42d81c1086bb51ce77c9949af6ac0 WHIRLPOOL 4cd010ae9d7a22b08d15bc54d5f1734d2de970fd2efa6facbdfca870b9ebc384e9a07f46008f12f67b7c38eacb5edec41a41885876a963963277823060b2ee94
+DIST gs-pypi-0.2.tar.gz 16582 SHA256 17c72368d10d740f31cd84e237a350b10ec1ac0606432fc226a167d0433061ac SHA512 b28143f6eb85151cee27c24f11fd8e2adae7115120cc38eeaaa9a59af49af9cee8423725db0babc0dec7ef357ed2485f8a360f69db9fb246f1097fc0f3c227b0 WHIRLPOOL dbeae06ece88f1842c8be9b517a386534da433f599bbf6001b5b50fc22cfe0977569651c3b9d41a725a3dacb436991e8679ba403e8cc12528c9674ff1dcf78d6
+EBUILD gs-pypi-0.1.ebuild 618 SHA256 258c52a11732c2ffbf770aee4fd996a4c89841cdd76cdc431745d2c6df28810f SHA512 50d55c21c3bb025c3d8e958ef54ec19be9cd0c710f867ac4658eabd059e6cb4a6b61fbd894dd2e7c3c025d50fde04bcbf178f29b48736d663598169150b82d2c WHIRLPOOL da88d69ecea8fdb6b48fbb31251ddf668cb7414e996fe596292d86fa6ce7809229299002f3ead1f1a9cc5305dcfd76ff6d55f688581c1e2e0c5fd913ec591045
+EBUILD gs-pypi-0.2.1-r1.ebuild 643 SHA256 d3ddb4745105fa0d1b04b27e86c1771f0c11ed8ea42b14520357686389864022 SHA512 66fb85e81ee57e6b7c84d1fd81fdb7f68521816eb9d0a19d39a80d8467cca0949e8cd9bfa9bde81700e6f2576c823e75b4dfc72e2f85d6d436934267ca894f2f WHIRLPOOL e63797bc6a7e5451a9c031d54c8bba5f6b4bb6dd6924f41ad2101ddb1fa3de396e7e2bb8a86e17d4dfc22bd8da211bed53509f6fe89e041d9fdfd41a4e674de9
+EBUILD gs-pypi-0.2.1.ebuild 639 SHA256 b272e01b0ad31f4c542a3c718e44456894ce136f178fedfef95d11d6b5d608c0 SHA512 bf2a0488128f89f21a3d7c26c11b3d76e707bc5b40725a3a7b4306468529b3df3dfcf9be509f474062c2a1b95531b97405ff978d6dfda7bcb77ad2ff6460218b WHIRLPOOL f195edd7af1948c200c155841cf8e353f4980b573d4863ca27f57287263f8928c04120b78de11626e6c789db08e30bbc0c85987f2e3338db6d8ac62fc23a2bcc
+EBUILD gs-pypi-0.2.ebuild 630 SHA256 70c33c9396bfa9684b164ca6bd9a2c697cf86f795ead4f743bb13d733d4ec4e5 SHA512 27424c83d2221634968425a533e1fb8582453ff40444cca141674c57a1c15085476bb1255643c17b5a5fd44b9dfdd0fbc8713e659d66f5d85042a00c534dae58 WHIRLPOOL 3777621270e6e4307c6c4568d01cc0f38f276a8835d1d5acdafa36db06caf143ecc70ce8c2411a54d04f4030d9e3c6d88112b8020ae350a1b4878e06235155fb
+EBUILD gs-pypi-9999.ebuild 628 SHA256 7c375c7a4c8d4faba6dd8d2aa2f23b52090582522468050b8098d2a9889cca50 SHA512 9dd5b854d7fd55cd79c5120245a80f690d1fbfad70405fa39134506a452817cac9055d7ed6a3d99f47e462d2c6a2cfda6d49cd96c80320eaa31f9f4f5ed1fed9 WHIRLPOOL d9b3bf41f9f6e464a061fb8abcbd9288a55e10428e472f64f9c0edb33dfcbaccb98d1c77ff3785fdc2dfca5fdc60738c7664e330c4a6f64185a28903566bd745
+MISC ChangeLog 3266 SHA256 4266d53c7d2fac6728871d3f4c8ed7aa9c52d1d6375f3a920c6123c0c52accbd SHA512 f41c8fe353dd510f9c8d181fb261b311709a4f6fbbaea5eafb950f2b7892d3f62ee7b731fe68ffc416f898c0436b2c7a45aff76153797be72400c050f8065667 WHIRLPOOL e5bfddc04bc546a5f8c8e495249be20ef6452ba586d3ef5e9880f074a88cf1c876b5d2cb5b99db8ef14806c3043b4bda6e2fc9e3d44521c07e6cf0031a51296b
+MISC ChangeLog-2015 988 SHA256 dbc669dbb078ce088b7764006723e36f3b8ee7cdf1f649533cc82c5853e00a65 SHA512 899f653f029830b30b9a24f04d1cd5590ca418a5595a514e44fcae9e2b8ab5ad66ee475971b3f9e3f1e256d81d13a41954a4d8c1f14671bea69667fd75e3f67d WHIRLPOOL cddd94c54cc8dc99bbf72135f2933d190e01585b10d93b79dc46bf5bd74bad98f91d385e0b45b21c1ff677291dd810fed992227792af569f275c17f853dfcc32
+MISC metadata.xml 458 SHA256 cdd6c259e4e09963da4d444a49e1a247757e803370acef410d4945e221276e4e SHA512 aba194b461f34bf1d7ea50f0d3ac9ca6c3f6b7fa665f307c0977bb95ce650fb81877865baa7ebbf98256297169292c239afc9c2a6e48572df98f2501e1cb0eb5 WHIRLPOOL c09cbac5d579d6ab3e09be58d6e5e872e607c0f97e69d204d5c9fcb8796b63b70b30c019db64629b743c84c7952014289e47f32dcd73023265d9f63b2fce7014
diff --git a/app-portage/gs-pypi/gs-pypi-0.1.ebuild b/app-portage/gs-pypi/gs-pypi-0.1.ebuild
new file mode 100644
index 000000000000..dae5eca3555d
--- /dev/null
+++ b/app-portage/gs-pypi/gs-pypi-0.1.ebuild
@@ -0,0 +1,25 @@
+# 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})
+
+inherit distutils-r1
+
+DESCRIPTION="g-sorcery backend for pypi packages"
+HOMEPAGE="https://github.com/jauhien/gs-pypi"
+SRC_URI="https://github.com/jauhien/gs-pypi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-portage/g-sorcery[$(python_gen_usedep 'python*')]
+		dev-python/beautifulsoup:4[$(python_gen_usedep 'python*')]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/*.8
+}
diff --git a/app-portage/gs-pypi/gs-pypi-0.2.1-r1.ebuild b/app-portage/gs-pypi/gs-pypi-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..80da171c493e
--- /dev/null
+++ b/app-portage/gs-pypi/gs-pypi-0.2.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=(python{2_7,3_4,3_5})
+
+inherit distutils-r1
+
+DESCRIPTION="g-sorcery backend for pypi packages"
+HOMEPAGE="https://github.com/jauhien/gs-pypi"
+SRC_URI="https://github.com/jauhien/gs-pypi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=app-portage/g-sorcery-0.2.1[bson(-),git(-),$(python_gen_usedep 'python*')]
+	dev-python/beautifulsoup:4[$(python_gen_usedep 'python*')]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/*.8
+}
diff --git a/app-portage/gs-pypi/gs-pypi-0.2.1.ebuild b/app-portage/gs-pypi/gs-pypi-0.2.1.ebuild
new file mode 100644
index 000000000000..a118272f159b
--- /dev/null
+++ b/app-portage/gs-pypi/gs-pypi-0.2.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_7,3_4})
+
+inherit distutils-r1
+
+DESCRIPTION="g-sorcery backend for pypi packages"
+HOMEPAGE="https://github.com/jauhien/gs-pypi"
+SRC_URI="https://github.com/jauhien/gs-pypi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=app-portage/g-sorcery-0.2.1[bson(-),git(-),$(python_gen_usedep 'python*')]
+	dev-python/beautifulsoup:4[$(python_gen_usedep 'python*')]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/*.8
+}
diff --git a/app-portage/gs-pypi/gs-pypi-0.2.ebuild b/app-portage/gs-pypi/gs-pypi-0.2.ebuild
new file mode 100644
index 000000000000..eed9d40201b1
--- /dev/null
+++ b/app-portage/gs-pypi/gs-pypi-0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_7,3_4})
+
+inherit distutils-r1
+
+DESCRIPTION="g-sorcery backend for pypi packages"
+HOMEPAGE="https://github.com/jauhien/gs-pypi"
+SRC_URI="https://github.com/jauhien/gs-pypi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=app-portage/g-sorcery-0.2[bson(-),$(python_gen_usedep 'python*')]
+	dev-python/beautifulsoup:4[$(python_gen_usedep 'python*')]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/*.8
+}
diff --git a/app-portage/gs-pypi/gs-pypi-9999.ebuild b/app-portage/gs-pypi/gs-pypi-9999.ebuild
new file mode 100644
index 000000000000..4233e2078a9e
--- /dev/null
+++ b/app-portage/gs-pypi/gs-pypi-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=(python{2_7,3_4,3_5})
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="g-sorcery backend for pypi packages"
+HOMEPAGE="https://github.com/jauhien/gs-pypi"
+SRC_URI=""
+EGIT_BRANCH="master"
+EGIT_REPO_URI="https://github.com/jauhien/gs-pypi"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=app-portage/g-sorcery-9999[bson(-),git(-),$(python_gen_usedep 'python*')]
+	dev-python/beautifulsoup:4[$(python_gen_usedep 'python*')]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/*.8
+}
diff --git a/app-portage/gs-pypi/metadata.xml b/app-portage/gs-pypi/metadata.xml
new file mode 100644
index 000000000000..d359987b1792
--- /dev/null
+++ b/app-portage/gs-pypi/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>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>layman@gentoo.org</email>
+		<name>Gentoo Layman team</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jauhien/gs-pypi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-portage/hackport/Manifest b/app-portage/hackport/Manifest
new file mode 100644
index 000000000000..f67f4ef8a983
--- /dev/null
+++ b/app-portage/hackport/Manifest
@@ -0,0 +1,8 @@
+DIST hackport-0.5.1.tar.gz 1390428 SHA256 667af1dc76c2833dd1fec935c5e61cc331be3c7b20c77ff68206177f70eccdad SHA512 006e4457a9ebba9acff35787a73a321b903db2f6ff54423cd66e91a93390183d0ca2690e2d0c8b5c1256116c9f81cabeac45c6dcb21e537849afbb1109bd80af WHIRLPOOL afd0156c687193f658ff82a08e4b1f1dfc719f91ddac16541bde8b916e669d74475552d3552ad338c5a3f7272c8492d8bd7f1ef69abc65652372ea26c0834ae3
+DIST hackport-0.5.2.tar.gz 1390418 SHA256 fa38878313ab5075d86438d3853760b48c5a943a822a91f6a4057424abed7c63 SHA512 c191421608667cde034eb8b4e3c1ae95a8ae41cc35df8f3cfad640870f871dd78711173666bee671af4efc762c069e7f20cd3693d96f64f60848d83ce185575c WHIRLPOOL 36c748500ece1c3dde7631e04488bc278fabde31a4420c4bdd587f8bf9918eb31bf09c8476d8bed7e6ce4167c0f3a29f3e11024e8736bd6cb16514be7c1d7a15
+DIST hackport-0.5.3.tar.gz 1390724 SHA256 0e4e75886d116099bdbe727ad5165f707a8e77ba7a37c3c8bfe3eeec44ce95fb SHA512 785a1fb9762bdd10e86f47255d687a905eb122eb46e9470b7ea562cbe98d1be882b28923d5852f41ba2481c27321de9b2322fc83b5fa77037ba9251ea5f08dcc WHIRLPOOL 23af3477d8becff3a8f96f3f0291f3178083714b7a16383a61be39bf042dff9596f4421672ce2790329e388da7a6055738a98c4224df2ba681a0b00b8a4eed8d
+EBUILD hackport-0.5.1.ebuild 1251 SHA256 f7d71d3191622dc8d53dac0c76b9256e6b3c75d06372835b731e2f8fef1cad0c SHA512 2833246aaf85bc2aa5cfd00125515b2cf4e11d564ba477b97e9b0f0c494871b8cb865d9ebacac6377fae4dabf7ba274b7c8f9e18a0c59e4f44aab8d2eb76e8ae WHIRLPOOL 91b68fc4bd708c5ce345f04bca4be7c8d579d5880a66a2f8cbdf59e56629b53a34f162b350d692e7475cb0eada6d062c468cd25022fa74b62ebf50aa90a8ccae
+EBUILD hackport-0.5.2.ebuild 1251 SHA256 f7d71d3191622dc8d53dac0c76b9256e6b3c75d06372835b731e2f8fef1cad0c SHA512 2833246aaf85bc2aa5cfd00125515b2cf4e11d564ba477b97e9b0f0c494871b8cb865d9ebacac6377fae4dabf7ba274b7c8f9e18a0c59e4f44aab8d2eb76e8ae WHIRLPOOL 91b68fc4bd708c5ce345f04bca4be7c8d579d5880a66a2f8cbdf59e56629b53a34f162b350d692e7475cb0eada6d062c468cd25022fa74b62ebf50aa90a8ccae
+EBUILD hackport-0.5.3.ebuild 1251 SHA256 d21f37b7a274e55524f239f517392b7c0a7c394b0fbdcf1cc31f2227cc85df14 SHA512 27170b43c9cf49d89ba294bed4bdb973f4a52261d79160e8795708bc406debab65b6d1911ab8bea4d8a0dd61d7343b7a71452103c8843b3973780465895d610c WHIRLPOOL b4c5f010b85a8aaa25fdab05bc777ea5b87afb908327f987d97346f356301f089823097aa7028b43379e7db364ede68e2eedfa086407361abd64a3f19494b81f
+EBUILD hackport-9999.ebuild 1364 SHA256 0512435a1b0b32f6a16a8d9fb8cbf28e9741b9de2430156d4904a9b194a99af2 SHA512 e94224507ca7bbc52d2d3fbea71a760f799651c5da9d7b964427a96b6e7d911fc33d7ea6c2aee0da6b7eab177e6aeaced60cd377f8d39c1fed9fd2bde173f20e WHIRLPOOL 9083354a971ed7b65956aa0715259dbbd72a064484a105df9e3ba186b145d239a472eee746f4daf56cdbf00ab8de911a3de4cc307b717ae59a9deae11a2ca805
+MISC metadata.xml 497 SHA256 2a97c388ecf515a7852db4bfe6961d8bb722dd4d439253c148f17b965c0f3fe9 SHA512 8f4884fa20eb6a46b2007e99a6787f51a7d8f6a8cbb18b1c7f12541914f6d6959274ace8f9576529e5ab6a372d3904f54d11470e9f5d81f6ee066628e1fc2de3 WHIRLPOOL cf15e2c7f99d89bbcfb3d86e1d9edeac016d1a491cc55f99084daa9a8dff6f90671499df8c8d536f0bebf9c3ed1cb04bb4ff8c80e73039a494b7b67392cb4593
diff --git a/app-portage/hackport/hackport-0.5.1.ebuild b/app-portage/hackport/hackport-0.5.1.ebuild
new file mode 100644
index 000000000000..c2ee1f280100
--- /dev/null
+++ b/app-portage/hackport/hackport-0.5.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hackage and Portage integration tool"
+HOMEPAGE="http://hackage.haskell.org/package/hackport"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # tests are broken: need path to ebuild tree
+
+RDEPEND="dev-haskell/async:=
+	dev-haskell/base16-bytestring:=
+	dev-haskell/base64-bytestring:=
+	dev-haskell/cryptohash:=
+	dev-haskell/ed25519:=
+	dev-haskell/extensible-exceptions:=
+	dev-haskell/hashable:=
+	>=dev-haskell/http-4000.0.3:=
+	dev-haskell/missingh:=
+	dev-haskell/mtl:=
+	>=dev-haskell/network-2.6:=
+	>=dev-haskell/network-uri-2.6:=
+	dev-haskell/old-locale:=
+	dev-haskell/old-time:=
+	dev-haskell/parsec:=
+	dev-haskell/random:=
+	dev-haskell/regex-compat:=
+	dev-haskell/split:=
+	dev-haskell/stm:=
+	>=dev-haskell/tar-0.5:=
+	>=dev-haskell/xml-1.3.7:=
+	dev-haskell/zlib:=
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hunit )
+"
+
+src_install() {
+	haskell-cabal_src_install
+	doman man/hackport.1
+}
diff --git a/app-portage/hackport/hackport-0.5.2.ebuild b/app-portage/hackport/hackport-0.5.2.ebuild
new file mode 100644
index 000000000000..c2ee1f280100
--- /dev/null
+++ b/app-portage/hackport/hackport-0.5.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hackage and Portage integration tool"
+HOMEPAGE="http://hackage.haskell.org/package/hackport"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # tests are broken: need path to ebuild tree
+
+RDEPEND="dev-haskell/async:=
+	dev-haskell/base16-bytestring:=
+	dev-haskell/base64-bytestring:=
+	dev-haskell/cryptohash:=
+	dev-haskell/ed25519:=
+	dev-haskell/extensible-exceptions:=
+	dev-haskell/hashable:=
+	>=dev-haskell/http-4000.0.3:=
+	dev-haskell/missingh:=
+	dev-haskell/mtl:=
+	>=dev-haskell/network-2.6:=
+	>=dev-haskell/network-uri-2.6:=
+	dev-haskell/old-locale:=
+	dev-haskell/old-time:=
+	dev-haskell/parsec:=
+	dev-haskell/random:=
+	dev-haskell/regex-compat:=
+	dev-haskell/split:=
+	dev-haskell/stm:=
+	>=dev-haskell/tar-0.5:=
+	>=dev-haskell/xml-1.3.7:=
+	dev-haskell/zlib:=
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hunit )
+"
+
+src_install() {
+	haskell-cabal_src_install
+	doman man/hackport.1
+}
diff --git a/app-portage/hackport/hackport-0.5.3.ebuild b/app-portage/hackport/hackport-0.5.3.ebuild
new file mode 100644
index 000000000000..4c05769273e9
--- /dev/null
+++ b/app-portage/hackport/hackport-0.5.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.2.9999
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hackage and Portage integration tool"
+HOMEPAGE="http://hackage.haskell.org/package/hackport"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # tests are broken: need path to ebuild tree
+
+RDEPEND="dev-haskell/async:=
+	dev-haskell/base16-bytestring:=
+	dev-haskell/base64-bytestring:=
+	dev-haskell/cryptohash:=
+	dev-haskell/ed25519:=
+	dev-haskell/extensible-exceptions:=
+	dev-haskell/hashable:=
+	>=dev-haskell/http-4000.0.3:=
+	dev-haskell/missingh:=
+	dev-haskell/mtl:=
+	>=dev-haskell/network-2.6:=
+	>=dev-haskell/network-uri-2.6:=
+	dev-haskell/old-locale:=
+	dev-haskell/old-time:=
+	dev-haskell/parsec:=
+	dev-haskell/random:=
+	dev-haskell/regex-compat:=
+	dev-haskell/split:=
+	dev-haskell/stm:=
+	>=dev-haskell/tar-0.5:=
+	>=dev-haskell/xml-1.3.7:=
+	dev-haskell/zlib:=
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hunit )
+"
+
+src_install() {
+	haskell-cabal_src_install
+	doman man/hackport.1
+}
diff --git a/app-portage/hackport/hackport-9999.ebuild b/app-portage/hackport/hackport-9999.ebuild
new file mode 100644
index 000000000000..c5936c97a158
--- /dev/null
+++ b/app-portage/hackport/hackport-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="test-suite"
+EGIT_REPO_URI="https://github.com/gentoo-haskell/hackport.git"
+
+inherit git-r3 haskell-cabal
+
+DESCRIPTION="Hackage and Portage integration tool"
+HOMEPAGE="https://github.com/gentoo-haskell/hackport"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RESTRICT=test # tests are broken: need path to ebuild tree
+
+RDEPEND="dev-haskell/async:=
+	dev-haskell/base16-bytestring:=
+	dev-haskell/base64-bytestring:=
+	dev-haskell/cryptohash:=
+	dev-haskell/ed25519:=
+	dev-haskell/extensible-exceptions:=
+	dev-haskell/hashable:=
+	>=dev-haskell/http-4000.0.3:=
+	dev-haskell/missingh:=
+	dev-haskell/mtl:=
+	>=dev-haskell/network-2.6:=
+	>=dev-haskell/network-uri-2.6:=
+	dev-haskell/old-locale:=
+	dev-haskell/old-time:=
+	dev-haskell/parsec:=
+	dev-haskell/random:=
+	dev-haskell/regex-compat:=
+	dev-haskell/split:=
+	dev-haskell/stm:=
+	>=dev-haskell/tar-0.5:=
+	>=dev-haskell/xml-1.3.7:=
+	dev-haskell/zlib:=
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hunit )
+"
+
+src_prepare() {
+	default
+	sed -e 's/^Version:.*/&.9999/' -i ${PN}.cabal || die # just to distinct from release install
+}
+
+src_install() {
+	haskell-cabal_src_install
+	doman man/hackport.1
+}
diff --git a/app-portage/hackport/metadata.xml b/app-portage/hackport/metadata.xml
new file mode 100644
index 000000000000..91fe17ae253f
--- /dev/null
+++ b/app-portage/hackport/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="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		A command line tool to manage an overlay of Gentoo ebuilds
+		that are generated from a hackage repo of Cabal packages.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">gentoo-haskell/hackport</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-portage/install-mask/Manifest b/app-portage/install-mask/Manifest
new file mode 100644
index 000000000000..f90ca58c7f9e
--- /dev/null
+++ b/app-portage/install-mask/Manifest
@@ -0,0 +1,9 @@
+AUX install-mask.conf 173 SHA256 f41c2e5c074fad1fac1dff35ebd1e3fbaf51bb82bbb019f57e9b7f9f344fa7f5 SHA512 3a917bf001e417667e0a44be8536b5fda9d64a91df02a95823fce6dfc54c037055393fb1015169f078ad90d9c042984fd604886261480fcb097b3bb0a9b23110 WHIRLPOOL 9a3dbddfd112ee73ec46f14372d9d46ee7ec0b594411216501827d750b0c82fef18853400c420e7c2569397ee48911347c514174c5b97111c992ed1149574d43
+AUX location-db.conf 282 SHA256 56badd0be09e93de992665639f16d20506c25b97996334f7f2c0db9651e5077f SHA512 5a20a014a2a58245bcf25cd061f87ad1d34a48d9d2e3e7287ba0544b603e917fe91c2d4b166ca028e44d87898a1633dfe1fe7ef3a35d5cb787c9a53a34239b5b WHIRLPOOL e790079fefaf48154a622e4ed15a364ff26e773ef9fd1fe2d0af3b768ae7ccefdb7bc87fa7612183db77e77887c1050447a8a3a695cb3020c6f72c8468844bd3
+AUX location-db.xml 505 SHA256 7182c207017bd6da77a1a7b042fbe5c41f4d5f6bae70a664ad1fb53f2ed85c2e SHA512 8dd05ed3206dc4b99fc0fd895d7547ee03f0b46f0cfde2009f1c104525c6e7a7d46bcd30ed42c83974082846ece34659180eb51de9ea0d2910e920ecffd42513 WHIRLPOOL 49626ca7c052a9dd4c4747cc103f01acd5522c445e34dec816c60127199597dc3042bf0d2d7ede3fd5664e38fd845e79e242f10bf249a726b46eae9194909346
+DIST install-mask-0.1.1.tar.bz2 4241 SHA256 e81cfccc1b382816911598fb432a85ac9242fd2bc50203b12dcbcae3ee956203 SHA512 461f58b4e6fc41bfbe60d713a6d02eec8fe0a4e9ed8a19f8e155174b27f8e3d93c739e2ccce8ab34488ba31649ee585d7b23033dc94f19aa2e3b2033f21f5e79 WHIRLPOOL 4d229ae5c2d01a78daf002565a2699213e98eeed1e0e22d3240b4bc4fcacf147e9ab0a63d3b6e191e474c2869c112a8ad2bf7e4945263cdf43f44b4a568cd3e8
+EBUILD install-mask-0.1.1.ebuild 622 SHA256 f42e5320beda47d7252eb923d8370d5b3908927e3c06770b9f940b6c85b011f8 SHA512 65ea5ffae5a2c1ea8a96852674543f5113d43b83bb5ed61167bd7fce574b20c0f3b52f37fa8f785e890c3594d6fa7ec59fd9840efed7e1e7df30485b1ca9f3a5 WHIRLPOOL 8a1f63da98ced169f93ff569c2f04cae172c4f18ff9d74eaf4733aff8cb25005481883e0bd1cd9178cadc5e439d420107758472fe42e583ab9ae1ba6b9a3157a
+EBUILD install-mask-9999.ebuild 745 SHA256 9ef53c7e4a314212d18f774f44ddc4685c27e3296036ef5a593c2b286596fd9b SHA512 0a9b47aeef41c8927a7fb1b3d6ae6907a15ef7c517c4113bfedcf051c0daf37b3e87478a0bffed856f1e2f9d8f3d7dfdc73c61a77101e4b38c799813da800a0d WHIRLPOOL 3371b70f21d406ab0029a543cfbd8b4ec46cee86deb3a13bf02d0f6da1883d08da065f3ee6d4a64d4732c4a05bc5c3361b99f619cf7f597584f00399c19b6207
+MISC ChangeLog 3268 SHA256 4ec28b152f19d6ff75d6311f9a597ec56332457c4694851701d93cc7672d4672 SHA512 bb633635624c2b60f6c3c6000658407c6f7ebcdbf55ff0f510e519307c7bc3f9395530cf566891643057d13f0de2fe1144f13988cf8d44898e2ee3ca65de5bbd WHIRLPOOL 76d532710c9e106a7957112a615d3a7d06921fa951e859c63779ecdb073dc7d266b4b48b6f90e191aaa85d7bb896826599c1138a0b479ef9f73a9c6c7e1c6027
+MISC ChangeLog-2015 4043 SHA256 687fae9c8f78990befcb17952ef82b3b5d7086bff9b55834c34c48a65b4c002c SHA512 938f6120b90e4edeca0898304a966c0a176cfca7d815c3440ac1dccd4cddeb4bb7521c775f9544463b09d17e819e814030285206a5a1d71538465baca8dbfdc8 WHIRLPOOL f221711c52aec7a2a37d7720a07136896e94caf0861ef24ec28b1e98273e5e7a6f46d0b6ef68762e7ce5e4f64e3b1c2888de4c5b252f502f8ebd202f6f7dce57
+MISC metadata.xml 541 SHA256 df32b0c1fa52d84d633112af509a8f1efa3cf2b136534fa9567f0575bb875105 SHA512 637298068bdb858d10e754d6911e150ae8d0e38ebde86cb7d57d41654d53c58128e942b3cbb6675c398b9a108a67616d966bbffd6975ea54506163cf1ba49696 WHIRLPOOL ddb8134837a351b2347c2cef8898d7b5d5d7759a5f0891184f7089c01ff8106fec3cc5b3dd9ffd27c398d9e96b8d64e89668767b09bbbceed2f0856116a9282c
diff --git a/app-portage/install-mask/files/install-mask.conf b/app-portage/install-mask/files/install-mask.conf
new file mode 100644
index 000000000000..78b49a473427
--- /dev/null
+++ b/app-portage/install-mask/files/install-mask.conf
@@ -0,0 +1,6 @@
+# Example /etc/portage/sets.conf adding the @install-mask set.
+
+[install-mask]
+class = portage.sets.shell.CommandOutputSet
+command = install-mask -r
+world-candidate = False
diff --git a/app-portage/install-mask/files/location-db.conf b/app-portage/install-mask/files/location-db.conf
new file mode 100644
index 000000000000..cb050cab37c4
--- /dev/null
+++ b/app-portage/install-mask/files/location-db.conf
@@ -0,0 +1,18 @@
+[__install-mask__]
+version=1
+
+[systemd]
+path=/usr/lib/systemd/system
+description=systemd unit and auxiliary files.
+
+[bash-completion]
+path=/usr/share/bash-completion
+
+[locale]
+path=/usr/share/locale
+description=All localizations.
+
+[logrotate]
+path=/etc/logrotate.d
+
+# vim:ft=dosini
diff --git a/app-portage/install-mask/files/location-db.xml b/app-portage/install-mask/files/location-db.xml
new file mode 100644
index 000000000000..eea4842e235c
--- /dev/null
+++ b/app-portage/install-mask/files/location-db.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<install-mask>
+	<location id="systemd">
+		<path>/usr/lib/systemd/system</path>
+		<description>
+			systemd unit and auxiliary files.
+		</description>
+	</location>
+
+	<location id="bash-completion">
+		<path>/usr/share/bash-completion</path>
+	</location>
+
+	<location id="locale">
+		<path>/usr/share/locale</path>
+		<description>
+			All localizations.
+		</description>
+	</location>
+
+	<location id="logrotate">
+		<path>/etc/logrotate.d</path>
+	</location>
+</install-mask>
diff --git a/app-portage/install-mask/install-mask-0.1.1.ebuild b/app-portage/install-mask/install-mask-0.1.1.ebuild
new file mode 100644
index 000000000000..82f83703be43
--- /dev/null
+++ b/app-portage/install-mask/install-mask-0.1.1.ebuild
@@ -0,0 +1,25 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Handle INSTALL_MASK setting in make.conf"
+HOMEPAGE="https://bitbucket.org/mgorny/install-mask/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="app-portage/flaggie[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/portage/config/sets
+	newins sets.conf ${PN}.conf
+}
diff --git a/app-portage/install-mask/install-mask-9999.ebuild b/app-portage/install-mask/install-mask-9999.ebuild
new file mode 100644
index 000000000000..b551ebb532b2
--- /dev/null
+++ b/app-portage/install-mask/install-mask-9999.ebuild
@@ -0,0 +1,35 @@
+# 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} )
+
+inherit distutils-r1
+
+#if LIVE
+EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
+inherit git-r3
+#endif
+
+DESCRIPTION="Handle INSTALL_MASK setting in make.conf"
+HOMEPAGE="https://bitbucket.org/mgorny/install-mask/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="app-portage/flaggie[${PYTHON_USEDEP}]"
+#if LIVE
+
+KEYWORDS=
+SRC_URI=
+#endif
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/portage/config/sets
+	newins sets.conf ${PN}.conf
+}
diff --git a/app-portage/install-mask/metadata.xml b/app-portage/install-mask/metadata.xml
new file mode 100644
index 000000000000..34455911e2de
--- /dev/null
+++ b/app-portage/install-mask/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://bitbucket.org/mgorny/install-mask/issues/</bugs-to>
+    <remote-id type="bitbucket">mgorny/install-mask</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/java-ebuilder/Manifest b/app-portage/java-ebuilder/Manifest
new file mode 100644
index 000000000000..e5363ddc576b
--- /dev/null
+++ b/app-portage/java-ebuilder/Manifest
@@ -0,0 +1,7 @@
+DIST java-ebuilder-0.1.tar.gz 22291 SHA256 0c4dd0f76c0b36c7d736ed2f02ed06244ef7645be45bf7ca83ed27aaafe8787e SHA512 bc058b03da53bab03d7a48b2971f34da812bfd03aff7cc64ee4a3209245f4855bf8095d12c5c506f49b896db69fba09f06814f4c35e13a25c4e8f381d6416637 WHIRLPOOL 9ccacb782eedd8e56a5508f1379098579cd12bd86dac727df4577e218c295fa908cbcab49772934508e3f302607d5f075373948bfec93d214ad08b001b600b4f
+DIST java-ebuilder-0.2.tar.gz 22998 SHA256 849e09768daf9bad42373e743fd851e0302caa90dbda8166e2c67f618433128b SHA512 c76b15d4a81413e05359202c7b73b84baa3b277faddb7aa5f904290e5e47ed2bc6d80638c7b5417acc4224d067e4f48f1687972b7e36c363da8e9a89ea7f2766 WHIRLPOOL 85a41a31f2567c488f05930616082bfe75c0975cef3c5ba476eb8152dacd8e437b5bf8cf330ed66bb3332408bb0f0ec37ab53550b3f07a05be6d66210f031643
+EBUILD java-ebuilder-0.1.ebuild 1397 SHA256 2abb5b6ce68539f714cc6eaa532440babe78b7f241460448f734431df14cb6bc SHA512 0001504bf184ed2ea32b1aca77be9f2ba8584a756757169033e3c7026a0322cec24558e503c70a6444ea4996b5b0705adc61fe539e36310782b8c9e44918aae2 WHIRLPOOL dfdd01c2b10ac6d4f567b02aefe67cbc7d1437e396004a274ca294e93f86c2bd089d2bf227f0e4535f6ac908c2e0f2fad551285eccf628e444ac0cdaefb71d44
+EBUILD java-ebuilder-0.2.ebuild 1402 SHA256 4e1c712c732d766f6f22772f7ea9dbd28c458e39f39a0ffafba07e4c67a89d1d SHA512 cc8503ead6ca6e77c60909f304fe0b263e248ec470a06fd2d4192b9c5dc62d1941722d9803b4d6e1f34b8fca773481ea0df252882857d9e85455779994ff0172 WHIRLPOOL cb2f5a5d0a3cb502df37f6ab7d47fafc05a26356703ccdb7f98f35a6ea1b01507d5a67bb3b7775113d431b3f872772411679109a72e0121e6629c36793506e4b
+EBUILD java-ebuilder-9999.ebuild 1401 SHA256 37a022d50cce12303c944f1489f38c50cafc6798b8585a6aeb9573ff32e9b1c5 SHA512 b143151a16b6e1b9316f616a0fbc6edd20d0a12f4c07344e182cbf706323207466e607c91e3641aa461ff594daf0aff8674ae099f46569ecf5a2b8ff40a03773 WHIRLPOOL 0fc0e6707cc1d13a1d1b7e39890ed7cc4a2fbbd2405972546564c448fca3db712a4bb18f55e00abc4fe18a9795c0625ae0a373f1f24f399f9cfe0a467990a7be
+MISC ChangeLog 612 SHA256 7957978d87734e104e2437b35280f4158f3dd04178524a6e2783464b2b25cea4 SHA512 b90ae754c26a9bcb779c379eb9782d97eddbfd3bbed10f017cb9c291853aa616d29a5bb378710e60cdd650c8c6480eb11a7b8ff87c18dfe698865c3ef7389a58 WHIRLPOOL a055226568a870bebb9294de21a99a0ce063f9223dc3923941e4de27cfe54169d12edbcb496561ed06995cc97430911649641a8f67e122964cee717110d51322
+MISC metadata.xml 339 SHA256 5c5cfcd8906f0f9f240656875538f5b9b65c0f3eeae3970fe4c1f35c8d3f28e2 SHA512 b200cb9a9934082d9460c2dcaded12756bbafde1c0df15638979a31974736233f02fe15bffd5698532ebfffdad7f9b3b6df9129c2e7f1383314cf1ac5898595b WHIRLPOOL 066327c1bbd80071381d0873008718c8ef2312dae687c395d20fa06a89d91c2906e4d7eed37fcaa8d5c49e42c068ebe7936c7268c5ab8840523751e1615eba29
diff --git a/app-portage/java-ebuilder/java-ebuilder-0.1.ebuild b/app-portage/java-ebuilder/java-ebuilder-0.1.ebuild
new file mode 100644
index 000000000000..1c42c4d5eeee
--- /dev/null
+++ b/app-portage/java-ebuilder/java-ebuilder-0.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+if [[ ${PV} == 9999 ]]; then
+	ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/heroxbd/${PN}.git"
+else
+	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+inherit java-pkg-2 java-pkg-simple prefix ${ECLASS}
+
+DESCRIPTION="Java team tool for semi-automatic creation of ebuilds from pom.xml"
+HOMEPAGE="https://github.com/gentoo/java-ebuilder"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8
+	sys-process/parallel
+	>=dev-java/maven-bin-3"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_ADDRES_DIRS="src/main/resources"
+
+MAIN_CLASS="org.gentoo.java.ebuilder.Main"
+
+java_prepare() {
+	eapply_user
+	local base_dir="target/classes/"
+	[[ ! -d "${base_dir}" ]] &&mkdir -p "${base_dir}META-INF"
+	echo "Manifest-Version: 1.0
+Main-Class: ${MAIN_CLASS}" \
+		>> "${base_dir}META-INF/MANIFEST.MF"
+}
+
+src_prepare() {
+	hprefixify scripts/{{tree,meta}.sh,movl} java-ebuilder.conf
+	eapply_user
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main ${MAIN_CLASS}
+
+	insinto /var/lib/${PN}
+	doins -r maven
+	dodir /var/lib/${PN}/{poms,cache}
+
+	dodoc README maven.conf
+
+	exeinto /usr/lib/${PN}
+	doexe scripts/{tree,meta}.sh
+
+	dobin scripts/movl
+
+	insinto /etc
+	doins java-ebuilder.conf
+}
diff --git a/app-portage/java-ebuilder/java-ebuilder-0.2.ebuild b/app-portage/java-ebuilder/java-ebuilder-0.2.ebuild
new file mode 100644
index 000000000000..f294a30ebbc8
--- /dev/null
+++ b/app-portage/java-ebuilder/java-ebuilder-0.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+if [[ ${PV} == 9999 ]]; then
+	ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/heroxbd/${PN}.git"
+else
+	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+inherit java-pkg-2 java-pkg-simple prefix ${ECLASS}
+
+DESCRIPTION="Java team tool for semi-automatic creation of ebuilds from pom.xml"
+HOMEPAGE="https://github.com/gentoo/java-ebuilder"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8
+	sys-process/parallel
+	>=dev-java/maven-bin-3"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_ADDRES_DIRS="src/main/resources"
+
+MAIN_CLASS="org.gentoo.java.ebuilder.Main"
+
+java_prepare() {
+	eapply_user
+	local base_dir="target/classes/"
+	[[ ! -d "${base_dir}" ]] &&mkdir -p "${base_dir}META-INF"
+	echo "Manifest-Version: 1.0
+Main-Class: ${MAIN_CLASS}" \
+		>> "${base_dir}META-INF/MANIFEST.MF"
+}
+
+src_prepare() {
+	eapply_user
+	hprefixify scripts/{{tree,meta}.sh,movl} java-ebuilder.conf
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main ${MAIN_CLASS}
+
+	insinto /var/lib/${PN}
+	doins -r maven
+	dodir /var/lib/${PN}/{poms,cache}
+
+	dodoc README maven.conf
+
+	exeinto /usr/lib/${PN}
+	doexe scripts/{tree,meta}.sh
+
+	dobin scripts/movl
+
+	insinto /etc
+	doins java-ebuilder.conf
+}
diff --git a/app-portage/java-ebuilder/java-ebuilder-9999.ebuild b/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
new file mode 100644
index 000000000000..367d6061c927
--- /dev/null
+++ b/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+if [[ ${PV} == 9999 ]]; then
+	ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
+else
+	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+inherit java-pkg-2 java-pkg-simple prefix ${ECLASS}
+
+DESCRIPTION="Java team tool for semi-automatic creation of ebuilds from pom.xml"
+HOMEPAGE="https://github.com/gentoo/java-ebuilder"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8
+	sys-process/parallel
+	>=dev-java/maven-bin-3"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_ADDRES_DIRS="src/main/resources"
+
+MAIN_CLASS="org.gentoo.java.ebuilder.Main"
+
+java_prepare() {
+	eapply_user
+	local base_dir="target/classes/"
+	[[ ! -d "${base_dir}" ]] &&mkdir -p "${base_dir}META-INF"
+	echo "Manifest-Version: 1.0
+Main-Class: ${MAIN_CLASS}" \
+		>> "${base_dir}META-INF/MANIFEST.MF"
+}
+
+src_prepare() {
+	eapply_user
+	hprefixify scripts/{{tree,meta}.sh,movl} java-ebuilder.conf
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main ${MAIN_CLASS}
+
+	insinto /var/lib/${PN}
+	doins -r maven
+	dodir /var/lib/${PN}/{poms,cache}
+
+	dodoc README maven.conf
+
+	exeinto /usr/lib/${PN}
+	doexe scripts/{tree,meta}.sh
+
+	dobin scripts/movl
+
+	insinto /etc
+	doins java-ebuilder.conf
+}
diff --git a/app-portage/java-ebuilder/metadata.xml b/app-portage/java-ebuilder/metadata.xml
new file mode 100644
index 000000000000..860761f67af5
--- /dev/null
+++ b/app-portage/java-ebuilder/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="github">gentoo/java-ebuilder</remote-id>
+  </upstream>
+  <maintainer type="person">
+     <email>heroxbd@gentoo.org</email>
+     <name>Benda Xu</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-portage/kuroo4/Manifest b/app-portage/kuroo4/Manifest
new file mode 100644
index 000000000000..8ff7472cb64b
--- /dev/null
+++ b/app-portage/kuroo4/Manifest
@@ -0,0 +1,5 @@
+DIST kuroo4-0.90.5.tar.gz 342698 SHA256 698b4fa177b52bc84787e925304f5287eaa4dc4c77e10339232d2703ba3fc536 SHA512 aed2ec984b77768f5325b41b01ea1c63e214e45699f9c29e1bf11cf7d6ff6ecc6660c2cc07948d0fc66f0469154fa00e1df9e78d330ad426db86a70db85f400f WHIRLPOOL 5a2ff9a14aa345117da539ff390357561332b40b2dba7709421b056d83363acc2bf7cd0232f945b942b8e894bf23816208304db6a5ef05a4049ca45f3c039035
+EBUILD kuroo4-0.90.5.ebuild 512 SHA256 076cb935a2bbec0ff696ffa456dddcff1787c1075f571b591757745a27968144 SHA512 3a38125337f4a33541674b51e92a170c141e087ddcfade2bdbd375f00f01e9832ca253c80024fe959ac9d1020fc59f2fc797ecfede616cfebde3eb45b3eb8454 WHIRLPOOL debb76391d2f383ddda6372a9ab284cd46ef644ac3c4f386ae4141a28ad2b4d8b51e36bb4308220dac7b1ed96745b431f87bbf4368c7cfb5468df9cdeb721f54
+MISC ChangeLog 3294 SHA256 038369fd269b9decfb9387afbf807f24b89e7c166f0e725aba89af4af3c8c725 SHA512 2c0cc4a34dea877beed1a198005e90fe236af3669d0279aeb155ce83ea050ce55afbe55bea47792e6e148124aa87461e1875f588499a3f2c4963158bdf1a3555 WHIRLPOOL c21f3221d89308173e5d5beffaea0a11a136e7cf4b5fc2396fcc184da9b609f2ea3ceb315afb658e5ffabebf77e6f2d73172ef2edc0ecc4ab7c012ed65df56c2
+MISC ChangeLog-2015 2097 SHA256 94fbe78a5d7bfb01482e6452fb610b74725ae86aba6bd506e595b2da1e2168bc SHA512 c413cbe3f56336fd84813caef2f86344155523c5a7a669749ce5040faf65232d175d42fd993cd5ab701fb8dd75fb13c1f0a5a6e3c9fdf3fa29a152f4cd890a81 WHIRLPOOL 8a9250b132dd6da1cc6b9a30bb80130072def4a42791573e8efbb3be01750694406772ad7945a2bda28af25c97f55f9247fb5dac467959f8fef96b4d268e7de7
+MISC metadata.xml 848 SHA256 d4bd24ef0cf59e9f3c5445a80ca1030f321d6b27072b324a2b2a4c9ff167d264 SHA512 b474295993a6b05a885bc9873f18f3c880b953417471059d06cd3a367b0b8d482809091126caf5443f5f761776eb96f128138352dbeaa86219ba4554c924f3db WHIRLPOOL 4e433c59214f27edc5a8e1466fe2cde1e9d339f883b7dfa14f39c22c4c03a76acd64e5aa500c70e8ca87624e61c030fb2f9e1fe555e23cdd0c0fdb57dc5251fe
diff --git a/app-portage/kuroo4/kuroo4-0.90.5.ebuild b/app-portage/kuroo4/kuroo4-0.90.5.ebuild
new file mode 100644
index 000000000000..e54ca5334b90
--- /dev/null
+++ b/app-portage/kuroo4/kuroo4-0.90.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+QT3SUPPORT_REQUIRED="true"
+inherit kde4-base
+
+DESCRIPTION="Graphical Portage frontend based on KDELibs4/Qt4"
+HOMEPAGE="https://sourceforge.net/projects/kuroo/"
+SRC_URI="mirror://sourceforge/kuroo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="dev-db/sqlite:3"
+
+RDEPEND="${DEPEND}
+	app-portage/gentoolkit
+	kde-apps/kompare:*
+	kde-plasma/kde-cli-tools[kdesu]
+"
diff --git a/app-portage/kuroo4/metadata.xml b/app-portage/kuroo4/metadata.xml
new file mode 100644
index 000000000000..22f510c8b7d6
--- /dev/null
+++ b/app-portage/kuroo4/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">Graphical Portage frontend based on KDE4/Qt4</longdescription>
+	<maintainer type="project">
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>galiven@users.sourceforge.net</email>
+		<name>Andrew Schenck</name>
+		<description>Upstream Maintainer (please CC on bugs)</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">kuroo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
new file mode 100644
index 000000000000..d5c22768f644
--- /dev/null
+++ b/app-portage/layman/Manifest
@@ -0,0 +1,19 @@
+AUX layman-2.0.0.doctest.patch 933 SHA256 929fe74035671d2b95c61464f3d83c9c16069293f5fc24a93f3a88083649ef4f SHA512 37a3bf04ba5185bf7f885321a4a925e24218d6e283b4c9d85e4935e0fb3dacf4fa543fa79e146c44bcbf833e7348dc49270cd0baa562a5e2539fc792b91abaf8 WHIRLPOOL 593deab62ed74124b386d6167283ddb08ba2c004c32288501697d09bf0e611067ed2b49bf52596543c036ac5a434efea63dd30f715815bddea97d3c05198bc84
+AUX layman-2.0.0.svn_upgrade.patch 2447 SHA256 a0c1bf027cb63b9000b58d67a419198c7311514d31a78862db9203a0e4808362 SHA512 a3b9d0a0049aef011ddaadc627c38c9730e547aa4941fc1081ea7727f228e72080314a1cc376fa96ba23efe365529795a1b501c90b76561f6c4bff9aba72eb1f WHIRLPOOL 921529390429f8c4cd008769438ba005e01104a45bb0a966827a9dcf19089f0e16cc3ccf434fe6eb1c6947db0f4f7c7c5f9ab65bfba9f7a42bb17f343e8e9865
+AUX layman-2.2.0-adds-kwargs-debug.patch 1015 SHA256 3b59728735854916e67b86a9b266e99592b54c0111dba145200a464fbfa11173 SHA512 cedf55524b2d11ae41a05192e8ba31fce677fb528560b168e4441bf2274c864c23a0d6463e79ea34c29e61ff1d4f514efba32bcee914fe6b915b6f039f8e106e WHIRLPOOL b5f9c1ece37ccd2d2fed00e431581da73dba5578e7948c9ac569c32f679c054493657f86fadba9c2333cc24de41b4cdd6c85a4a24f222a621e9d23e3775acbc0
+AUX layman-2.2.0-change-for-upstream-ssl-fetch.patch 1234 SHA256 f7a9c91f64a6fa028aab8834ccb6fc914170f51584dfe311e04686a6ee6ddf16 SHA512 bd58b813e3b364f4116537c1a66b0109a6a08fb5a30a53a691c697739197d84fed4449bbd3b751396e81d4adbb0f72101bd04e949068534bb77ced929c5c4191 WHIRLPOOL 2574c29065b467424e09095123beb904482b041cbbdc9c55b224f4c0e55ee7fa90010f00f9eaf1eddfc535b3970d43e6fb39a8814976e429fdeba7854c1a18e0
+AUX layman-2.2.0-removes-doctest-remnants.patch 6172 SHA256 88c9e11cd7d86472eadccdeb137495d0cd135d0c57e9732946ef1da1bfe4227a SHA512 9c8f81269d7219a6a1d0ca6365be3e49c6c407810670a5acf71edf8d47255772e67631a018b1f1a1a4bc0f1981663882d30c2480af1e90fef09030bf2e12935e WHIRLPOOL 013713afe2c76ce71be09f0e89ea0961a43b861edb7493eb488d9233055b8f79e4e4839778c68d98ffa4d55a99599f47d3ada6dd3c12aa5801e26edc7a634e2d
+AUX layman-2.4.1-sourcefileattributechanges.patch 1889 SHA256 af62af970bec3f90595dd08cd1ac81711aa8455954f7bac9a9735a47437bdb2a SHA512 ffb5015069c1b1725514d18abff9a7c152825335f05a7edf160d0e90a3d7cd9d0a6338fb24ed8a6ebcc24c2f23beefc4bc35d3d12fe887d86a3251bdb03fc4f2 WHIRLPOOL 167273bc26b22a8bcd52223df0b2a3c47963379b69b96dd6d98b2e04bfe870d74a3ca554604ef5d7f7b2b6ac2021f1e4e9f877e0488befa22c86cd60b32ec154
+DIST layman-2.0.0.tar.gz 81184 SHA256 5843035ae4cc069693c05cf9821dae3d89d3ea7e2115b8137ea5a4a6c2807f33 SHA512 30756464d71ab1e047036550b6500d7e57999d808ebe3efba1d1ae6c037f8ca777ba704a4981d75a90285133635027a7bc13f1890f34823de33ae991ed99e2da WHIRLPOOL ec362189c4757ee032dc93e079ea0f5b291d5652231a84f1175fb308ca5622882d5008f23fd6a3d5143ff0dc98c91632d19c2e6604dcaa9b6a550bc902d79c1a
+DIST layman-2.2.0.tar.gz 116210 SHA256 4a10cfd3eb354e993886369995ae9b1243418e0370c6aabd4d0ef6c5b387b7a2 SHA512 34cac041d7b64274debdbc42cab079fd3bb3aee511ea9e80db726df0f828207d79a5262788483ced5cbf49924e3aa4f19fe21439c98dceea973d8f83473c2e41 WHIRLPOOL 8c5d3cbbfef35c6294dfac899cb42f49e0761745573721e38b7d6c9ac48031f95bbb961c9d8dd9d309e4672cc1e5b050107ba025a9f28127e5d7d6d9a73a6e9a
+DIST layman-2.4.1.tar.gz 130388 SHA256 545792a15a0a2514c79f1b3090aceef15e413c656f294b6ff84f8a36da7aa2da SHA512 bdb713d4c7d3773129b45a385068278958040759bb564e48cfda4dda9da5224ccaa7833fce3d06151ed1fecddbb6f1a059db6e71534d0e887dff12640af6c806 WHIRLPOOL b6ef18f8f3633e9bb2a08df620306441f8352174dc66f2bbb68613cff0796e0914f7008de4f185167815ba3267c3b63a4fe22d2bcd794f70cd78bc20e706d7d8
+DIST layman-2.4.2.tar.gz 137893 SHA256 e84f8b745dd160bacf7b08dfd95b5c6d117dc8721edca370600f29ef0676ff92 SHA512 9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf WHIRLPOOL eba1844f2279071947601a8baa9424db24e5bd1ba2d9ac14f90e4ae2c3e0b566dabf10378cf6286225d85d11940add45239df8cb5b150eea227b47223ce65485
+EBUILD layman-2.0.0-r1.ebuild 1629 SHA256 ed09dc8304b011c9ee1334a9dd3d149b2b1bb5eede27607a32b5e1f7f146df7b SHA512 bce1210abde1e4626bdcce87a771f7bec2e95de631df615b89508d61b1ad33571dd3379912c8915408b4689d106914451abc0ab2ee9168219ad1ccee2282e056 WHIRLPOOL 7135dafe44aa329df0615713bee3061467e55db926fa7b2e61fcd4e7ff7dc2277942fc06ef0ee3396d5a591b146feebb9829ddddc4042ce0b477cae69a76ce46
+EBUILD layman-2.0.0-r3.ebuild 1668 SHA256 fc44cf3123452786da6f0591003a977ba93feed1c6b0f37e4248f47baa25c94c SHA512 215e1136fbba7153772417deee4456b4174d0b551194f4ebeb3f29583315a74fcb4791b631c1049fb993218b2b8d6e30910366eaf935e4d0b010725488d7213f WHIRLPOOL bbd4ccc79694192ebcd953a24dd6073e9405376a81db7f980e95dd88e18c4127f91f665527497e761847c0d4e36817045e602f8a10969db20f83d84171465977
+EBUILD layman-2.2.0-r7.ebuild 2178 SHA256 94a58ffcb1c7d4be309abdd9e7bc999857699b25b130d588d38539f42f16accc SHA512 04c77e388d73a53034fce76018c09d79ff67e1ece9719afb381bb79a4566b45873ba3acab4040f64b4012e0a442f72d9bb534f1cfe19840a461e5b607678b255 WHIRLPOOL bf4a93f1b24cbbe0da05db8f5fbd6093f434d5ab0425298e892a5b8468a652c1a2ac0618f13d3451a1600c8380411684948204393bc7f1a0906903dbe15b5021
+EBUILD layman-2.4.1-r1.ebuild 2116 SHA256 76e5d81a19ccc0765302018b09f5654a86788e91962577df5bf8559a7fe0be17 SHA512 5ecb7a7786ca0354090a20f4fc63def960d27a2a47b77d2d69742f905109a06f693154694967229ab3dcfbb52ec4ddfbfcee7260c426afe2253011f329035b60 WHIRLPOOL 1a0869fc052271a34dc001ae13f868a2a6a8e4ce30aefcb7bbb1804f1b217b1c07e0500797286291a685835828c4f4b3a8fed2c94678655b717728d6bb6feab8
+EBUILD layman-2.4.2.ebuild 2169 SHA256 e94d4af104b1d611803ef03626e9e19935529eb219192992b8e465bcea20890d SHA512 4019a22b5535b9539d206a3c586581b29e068f8dc06c474d4278a2d91997b348f454177027ce2d63a05ab8aa0caf0f482e1bdc164f43b7f13607a67462521d4d WHIRLPOOL 6b064c5872f9fac2cdcbd1583b51ed9b564859584cbb069712b882c599b835a278cf5f2e5cfe61c985c759a5b74fe075602e70f7d5689d4acf97cdcadb94e6d9
+EBUILD layman-9999.ebuild 2114 SHA256 386041655189c1bd6eea8e14bdc33410ee82476f8987d8f670b07ad45d6f989a SHA512 0baec4eef589dcfd53cd7549f383159f543a08986ee955ef3e668cbf1fccc8a9438e09173957aea7664a9ef9d55d6bbcb26d2ba56706502e9fa5cec4c5c3c758 WHIRLPOOL ef76c9ce0e47d98c6313d463d8ee81bfb88cdf9d734ea8e321f1f251b0202b54dc8d224f4d0a7801e10597afcf732b7eeefe6a3442a25fa705afe9e7ece59657
+MISC ChangeLog 5988 SHA256 78a0d55b2608dc55c4edd97d6251ca66bccf4ee0fb60f3beb328d4d6952ad831 SHA512 f3c777e451d15c2eae9abd3938e4bec75f5dfcf527f32378fb5f92c9851fa64c72132734eafa00655a4a2ccc5d4319ed47e4010fe444a43d0e0c04e8513ae28a WHIRLPOOL ba8ceae01498d831dec00df43f3326ce690fe97ff21dcc2a6abd31521e8f6485870f4bc60ecf5c5ed9fe0f6ed98d0462f58269d1ba4e38534f78bb71b0d41233
+MISC ChangeLog-2015 35186 SHA256 079e1fcc43d5f3f6a09604b5c9765741e3d01229604c80b3c7fa5bcac7457805 SHA512 9457e8e4579010d3ee0d74dc2469ae592da3d34475e4b7e1c1166ac2e3f72e52cfa8dbcd96a9770423fd457e23705fdb125c17255b82831c7806222b0a416c36 WHIRLPOOL d3baceba7a1fa0d4d23a89acf211991d94e43b0e0ec1941210f289db5057c1d54be2b52bfe3a195eb79eae693fcace81567a6b39f2fdfdab65d9d0a0c83a7500
+MISC metadata.xml 1177 SHA256 4324ee736d870fd107e590f7c34ecc830deaa988a2e39a3334e3f5b844d8dcdb SHA512 d41244afefdb11e5f68be2200a759e4209b2b59f5b9de083e79a522d5a10f12359f9fd6f30fd24f73d4e9b190a2f974f8e519cd22614dd2b023594952dba957e WHIRLPOOL b3b5eb1bdfe75ad59a86bf0a9b39445b42968daafd8e3891db3ff5d81f1d19c2b3bba0b3a9a5ec6cd8a2b2934c6792d3c711a90d5439496b59e931bec787f730
diff --git a/app-portage/layman/files/layman-2.0.0.doctest.patch b/app-portage/layman/files/layman-2.0.0.doctest.patch
new file mode 100644
index 000000000000..6d3305ca3ef7
--- /dev/null
+++ b/app-portage/layman/files/layman-2.0.0.doctest.patch
@@ -0,0 +1,20 @@
+diff --git a/layman/db.py b/layman/db.py
+index e2d740c..55a846a 100644
+--- a/layman/db.py
++++ b/layman/db.py
+@@ -93,6 +93,7 @@ class DB(DbBase):
+         >>> from layman.config import OptionConfig
+         >>> myoptions = {'installed' :
+         ...           here + '/tests/testfiles/global-overlays.xml',
++        ...           'local_list':  here + '/tests/testfiles/overlays.xml',
+         ...           'make_conf' : write2,
+         ...           'nocheck'    : 'yes',
+         ...           'storage'   : tmpdir}
+@@ -173,6 +174,7 @@ class DB(DbBase):
+         >>> from layman.config import OptionConfig
+         >>> myoptions = {'installed' :
+         ...           here + '/tests/testfiles/global-overlays.xml',
++        ...           'local_list':  here + '/tests/testfiles/overlays.xml',
+         ...           'make_conf' : write2,
+         ...           'nocheck'    : 'yes',
+         ...           'storage'   : tmpdir}
diff --git a/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch b/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch
new file mode 100644
index 000000000000..431b9370593a
--- /dev/null
+++ b/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch
@@ -0,0 +1,58 @@
+From 580097d4bc0cd3f07b4ce1b8da33e63f03ef0305 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Mon, 6 Jan 2014 22:01:12 -0800
+Subject: [PATCH] Update svn's check_upgrade() for newer svn versions.
+
+Thanks you, Arfrever, for your assistance.
+---
+ layman/overlays/svn.py | 32 ++++++++++++--------------------
+ 1 file changed, 12 insertions(+), 20 deletions(-)
+
+diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py
+index 4804925..374a516 100644
+--- a/layman/overlays/svn.py
++++ b/layman/overlays/svn.py
+@@ -131,27 +131,19 @@ class SvnOverlay(OverlaySource):
+         return
+ 
+     def check_upgrade(self, target):
+-        '''Code to check the installed svn version and
+-        run "svn upgrade" if needed.'''
++        '''Code to run "svn upgrade" it only takes longer
++        than checking if it does need an upgrade if it is
++        actually needed.
++        '''
+         file_to_run = _resolve_command(self.command(), self.output.error)[1]
+-        args = file_to_run + ' -q --version'
++        args = " ".join([file_to_run, " upgrade", target])
+-        pipe = Popen(args, shell=True, stdout=PIPE)
++        pipe = Popen(args, shell=True, stdout=PIPE, stderr=PIPE)
+         if pipe:
+-            self.output.debug("SVN: check_upgrade()... have a valid pipe", 4)
+-            version = pipe.stdout.readline().strip('\n')
+-            self.output.debug("SVN: check_upgrade()... svn version found: %s"
+-                % version, 4)
++            self.output.debug("SVN: check_upgrade()... have a valid pipe, "
++                "running upgrade", 4)
++            upgrade_output = pipe.stdout.readline().strip('\n')
++            if upgrade_output:
++                self.output.debug("  output: %s" % upgrade_output, 4)
++            self.output.debug("SVN: check_upgrade()... svn upgrade done", 4)
+             pipe.terminate()
+-            if version >= '1.7.0':
+-                self.output.debug("SVN: check_upgrade()... svn upgrade maybe",
+-                    4)
+-                _path = path([target,'.svn/wc.db'])
+-                if not os.path.exists(_path):
+-                    self.output.info("An svn upgrade needs to be run...",
+-                        2)
+-                    args = ["upgrade"]
+-                    return self.run_command(self.command(), args,
+-                        cwd=target, cmd="svn upgrade")
+-                return
+-        else:
+-            return
++        return
+-- 
+1.8.3.2
+
diff --git a/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch b/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch
new file mode 100644
index 000000000000..2020cb716449
--- /dev/null
+++ b/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch
@@ -0,0 +1,28 @@
+From: Devan Franchini <twitch153@gentoo.org>
+Date: Sun, 7 Dec 2014 23:12:36 -0500
+Subject: [PATCH] Adds kwargs-debug and modifies kwargs-info level to 5
+
+--- a/layman/overlays/archive.py
++++ b/layman/overlays/archive.py
+@@ -50,7 +50,8 @@ class ArchiveOverlay(OverlaySource):
+             connector_output = {
+                 'info': self.output.debug,
+                 'error': self.output.error,
+-                'kwargs-info': {'level': 2},
++                'kwargs-info': {'level': 5},
++                'kwargs-debug': {'level': 2},
+                 'kwargs-error': {'level': None},
+             }
+            
+--- a/layman/remotedb.py
++++ b/layman/remotedb.py
+@@ -120,6 +120,6 @@ class RemoteDB(DbBase):
+             'info':  self.output.info,
+             'debug': self.output.debug,
+             'error': self.output.error,
+-            'kwargs-info': {'level': 2},
++            'kwargs-info': {'level': 5},
+             'kwargs-debug': {'level': 2},
+             'kwargs-error':{'level': None},
+         }
+
diff --git a/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch b/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch
new file mode 100644
index 000000000000..d738b26f12c0
--- /dev/null
+++ b/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch
@@ -0,0 +1,38 @@
+From 81f1545f1371931d560492e8b323096d4befc775 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Fri, 17 Oct 2014 19:40:38 -0700
+Subject: [PATCH] remotedb.py: Change for upstream ssl-fetch change
+
+---
+ layman/remotedb.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/layman/remotedb.py b/layman/remotedb.py
+index f0f7ea9..b866bd7 100644
+--- a/layman/remotedb.py
++++ b/layman/remotedb.py
+@@ -57,7 +57,7 @@ class RemoteDB(DbBase):
+         self.detached_urls = []
+         self.signed_urls = []
+         self.proxies = config.proxies
+-        
++
+         self.urls  = [i.strip()
+             for i in config['overlays'].split('\n') if len(i)]
+ 
+@@ -116,9 +116,11 @@ class RemoteDB(DbBase):
+         need_gpg = [False, True, True]
+         # setup the ssl-fetch output map
+         connector_output = {
+-            'info':  self.output.debug,
++            'info':  self.output.info,
++            'debug': self.output.debug,
+             'error': self.output.error,
+             'kwargs-info': {'level': 2},
++            'kwargs-debug': {'level': 2},
+             'kwargs-error':{'level': None},
+         }
+         fetcher = Connector(connector_output, self.proxies, USERAGENT)
+-- 
+2.0.5
+
diff --git a/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch b/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch
new file mode 100644
index 000000000000..4b077140019b
--- /dev/null
+++ b/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch
@@ -0,0 +1,208 @@
+From: Devan Franchini <twitch153@gentoo.org>
+Date: Fri, 18 Oct 2014 15:21:24 -0400
+Subject: [PATCH] Removes doctest remnants
+
+--- a/layman/api.py	2014-10-18 14:27:13.233842116 -0400
++++ b/layman/api.py	2014-10-18 14:29:51.184849673 -0400
+@@ -714,15 +714,3 @@
+     write = os.fdopen(fd_w, 'w')
+     read = os.fdopen(fd_r, 'r')
+     return (read, write, fd_r, fd_w)
+-
+-
+-if __name__ == '__main__':
+-    import doctest, sys
+-
+-    # Ignore warnings here. We are just testing
+-    from warnings     import filterwarnings, resetwarnings
+-    filterwarnings('ignore')
+-
+-    doctest.testmod(sys.modules[__name__])
+-
+-    resetwarnings()
+--- a/layman/argsparser.py	2014-10-18 14:27:13.233842116 -0400
++++ b/layman/argsparser.py	2014-10-18 14:30:35.256851781 -0400
+@@ -404,14 +404,3 @@
+         self.output.debug('ARGSPARSER: Returning keys', 9)
+ 
+         return keys
+-
+-
+-#===============================================================================
+-#
+-# Testing
+-#
+-#-------------------------------------------------------------------------------
+-
+-if __name__ == '__main__':
+-    import doctest
+-    doctest.testmod(sys.modules[__name__])
+--- a/layman/cli.py	2014-10-18 14:27:13.233842116 -0400
++++ b/layman/cli.py	2014-10-18 14:32:11.456856384 -0400
+@@ -397,15 +397,3 @@
+         # blank newline  -- no " *"
+         self.output.notice('')
+         return info != {}
+-
+-
+-if __name__ == '__main__':
+-    import doctest
+-
+-    # Ignore warnings here. We are just testing
+-    from warnings     import filterwarnings, resetwarnings
+-    filterwarnings('ignore')
+-
+-    doctest.testmod(sys.modules[__name__])
+-
+-    resetwarnings()
+--- a/layman/config.py	2014-10-18 14:27:13.233842116 -0400
++++ b/layman/config.py	2014-10-18 14:31:02.528853086 -0400
+@@ -348,13 +348,3 @@
+         if new_defaults is not None:
+             self._defaults.update(new_defaults)
+         return
+-
+-#===============================================================================
+-#
+-# Testing
+-#
+-#-------------------------------------------------------------------------------
+-
+-if __name__ == '__main__':
+-    import doctest
+-    doctest.testmod(sys.modules[__name__])
+--- a/layman/db.py	2014-10-18 14:27:13.234842116 -0400
++++ b/layman/db.py	2014-10-18 14:32:32.160857374 -0400
+@@ -315,21 +315,3 @@
+             raise Exception('Syncing overlay "' + overlay_name +
+                             '" returned status ' + str(result) + '!' +
+                             '\ndb.sync()')
+-
+-
+-#===============================================================================
+-#
+-# Testing
+-#
+-#-------------------------------------------------------------------------------
+-
+-if __name__ == '__main__':
+-    import doctest, sys
+-
+-    # Ignore warnings here. We are just testing
+-    from warnings     import filterwarnings, resetwarnings
+-    filterwarnings('ignore')
+-
+-    doctest.testmod(sys.modules[__name__])
+-
+-    resetwarnings()
+--- a/layman/dbbase.py	2014-10-18 14:27:13.234842116 -0400
++++ b/layman/dbbase.py	2014-10-18 14:31:14.648853666 -0400
+@@ -252,21 +252,3 @@
+         """returns a list of the overlay names
+         """
+         return sorted(self.overlays)
+-
+-
+-#===============================================================================
+-#
+-# Testing
+-#
+-#-------------------------------------------------------------------------------
+-
+-if __name__ == '__main__':
+-    import doctest
+-
+-    # Ignore warnings here. We are just testing
+-    from warnings     import filterwarnings, resetwarnings
+-    filterwarnings('ignore')
+-
+-    doctest.testmod(sys.modules[__name__])
+-
+-    resetwarnings()
+--- a/layman/overlays/archive.py	2014-10-18 14:27:13.253842116 -0400
++++ b/layman/overlays/archive.py	2014-10-18 14:31:54.640855579 -0400
+@@ -188,15 +188,3 @@
+         '''
+ 
+         return self.is_supported()
+-
+-
+-if __name__ == '__main__':
+-    import doctest
+-
+-    # Ignore warnings here. We are just testing.
+-    from warnings    import filterwarnings, resetwarnings
+-    filterwarnings('ignore')
+-
+-    doctest.testmod(sys.modules[__name__])
+-
+-    resetwarnings()
+--- a/layman/overlays/modules/tar/tar.py	2014-10-18 14:27:13.245842116 -0400
++++ b/layman/overlays/modules/tar/tar.py	2014-10-18 15:10:13.303965557 -0400
+@@ -94,14 +94,3 @@
+         return require_supported(
+             [(self.command(),  'tar', 'app-arch/tar'), ],
+             self.output.warn)
+-
+-if __name__ == '__main__':
+-    import doctest
+-
+-    # Ignore warnings here. We are just testing
+-    from warnings     import filterwarnings, resetwarnings
+-    filterwarnings('ignore')
+-
+-    doctest.testmod(sys.modules[__name__])
+-
+-    resetwarnings()
+--- a/layman/overlays/overlay.py	2014-10-18 14:27:13.253842116 -0400
++++ b/layman/overlays/overlay.py	2014-10-18 14:31:38.624854813 -0400
+@@ -546,14 +546,3 @@
+     def source_types(self):
+         for i in self.sources:
+             yield i.type
+-
+-
+-#==============================================================================
+-#
+-# Testing
+-#
+-#------------------------------------------------------------------------------
+-
+-if __name__ == '__main__':
+-    import doctest
+-    doctest.testmod(sys.modules[__name__])
+--- a/layman/remotedb.py	2014-10-18 14:27:13.253842116 -0400
++++ b/layman/remotedb.py	2014-10-18 14:29:31.064848710 -0400
+@@ -384,14 +384,3 @@
+         self.signed_urls = [i.strip()
+             for i in self.config['gpg_signed_lists'].split('\n') if len(i)]
+     '''
+-
+-if __name__ == '__main__':
+-    import doctest
+-
+-    # Ignore warnings here. We are just testing
+-    from warnings     import filterwarnings, resetwarnings
+-    filterwarnings('ignore')
+-
+-    doctest.testmod(sys.modules[__name__])
+-
+-    resetwarnings()
+--- a/layman/utils.py	2014-10-18 14:27:13.254842117 -0400
++++ b/layman/utils.py	2014-10-18 14:30:24.088851247 -0400
+@@ -347,14 +347,3 @@
+     for key in kwargs:
+         result[key] = kwargs[key]
+     return result
+-
+-
+-#===============================================================================
+-#
+-# Testing
+-#
+-#-------------------------------------------------------------------------------
+-
+-if __name__ == '__main__':
+-    import doctest
+-    doctest.testmod(sys.modules[__name__])
+
diff --git a/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch b/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch
new file mode 100644
index 000000000000..207f474304c7
--- /dev/null
+++ b/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch
@@ -0,0 +1,42 @@
+From 90fe6724d0a8d1ebfe6443dee118432e20432b8b Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Tue, 10 May 2016 15:12:02 -0700
+Subject: [PATCH] layman/module.py: Fix commit 63808ef00f94 mis-applied
+ 'sourcefile' attribute changes
+
+It was not looking for the 'sourcefile' attribute first, then falling back to the kidname for
+backward compatibility.
+It was incorrectly looking for an ImportError, instead of a 'sourcefile' KeyError.
+The filepath of the affected file for the error message had an extra leading '_'.
+Add the module name to the warning message.
+---
+ layman/module.py | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/layman/module.py b/layman/module.py
+index 08bcbc2..092418f 100644
+--- a/layman/module.py
++++ b/layman/module.py
+@@ -49,13 +49,14 @@ class Module(object):
+             kid = self.module_spec['provides'][submodule]
+             kidname = kid['name']
+             try:
++                kid['module_name'] = '.'.join([mod_name, kid['sourcefile']])
++            except KeyError:
+                 kid['module_name'] = '.'.join([mod_name, kidname])
+-            except ImportError:
+-                kid['module_name'] = '.'.join([mod_name, self.name])
+-                f = self.__module.__file__
+-                msg = 'Module.__initialize(); module spec is old, missing '\
++                f = self._module.__file__
++                msg = 'Module.__initialize(); %(module)s module spec is old, missing '\
+                       'attribute: \'sourcefile\'.\nBackward compatibility '\
+-                      'may be removed in the future.\nFile: %(f)s' % {'f': f}
++                      'may be removed in the future.\nFile: %(f)s' % {
++                      'module': self.name, 'f': f}
+                 self.output.warn(msg)
+             kid['is_imported'] = False
+             self.kids[kidname] = kid
+-- 
+2.8.3
+
diff --git a/app-portage/layman/layman-2.0.0-r1.ebuild b/app-portage/layman/layman-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..b0c313242eb5
--- /dev/null
+++ b/app-portage/layman/layman-2.0.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit eutils distutils-r1 prefix
+
+DESCRIPTION="Tool to manage Gentoo overlays"
+HOMEPAGE="http://layman.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bazaar cvs darcs +git mercurial subversion test"
+
+DEPEND="test? ( dev-vcs/subversion )"
+
+RDEPEND="
+	bazaar? ( dev-vcs/bzr )
+	cvs? ( dev-vcs/cvs )
+	darcs? ( dev-vcs/darcs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? (
+		|| (
+			>=dev-vcs/subversion-1.5.4[http]
+			>=dev-vcs/subversion-1.5.4[webdav-neon]
+			>=dev-vcs/subversion-1.5.4[webdav-serf]
+		)
+	)
+	"
+
+python_prepare_all()  {
+	local PATCHES=( "${FILESDIR}"/layman-2.0.0.doctest.patch )
+	distutils-r1_python_prepare_all
+	eprefixify etc/layman.cfg layman/config.py
+}
+
+python_test() {
+	for suite in layman/tests/{dtest,external}.py ; do
+		PYTHONPATH="." "${PYTHON}" ${suite} \
+				|| die "test suite '${suite}' failed"
+	done
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/layman
+	doins etc/layman.cfg
+
+	doman doc/layman.8
+	dohtml doc/layman.8.html
+
+	keepdir /var/lib/layman
+	keepdir /etc/layman/overlays
+}
+
+pkg_postinst() {
+	# now run layman's update utility
+	einfo "Running layman-updater..."
+	"${EROOT}"/usr/bin/layman-updater
+	einfo
+}
diff --git a/app-portage/layman/layman-2.0.0-r3.ebuild b/app-portage/layman/layman-2.0.0-r3.ebuild
new file mode 100644
index 000000000000..dfe874aaa77b
--- /dev/null
+++ b/app-portage/layman/layman-2.0.0-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_REQ_USE="xml(+)"
+
+inherit eutils distutils-r1 prefix
+
+DESCRIPTION="Tool to manage Gentoo overlays"
+HOMEPAGE="http://layman.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bazaar cvs darcs +git mercurial subversion test"
+
+DEPEND="test? ( dev-vcs/subversion )"
+
+RDEPEND="
+	bazaar? ( dev-vcs/bzr )
+	cvs? ( dev-vcs/cvs )
+	darcs? ( dev-vcs/darcs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? (
+		|| (
+			>=dev-vcs/subversion-1.5.4[http]
+			>=dev-vcs/subversion-1.5.4[webdav-neon]
+			>=dev-vcs/subversion-1.5.4[webdav-serf]
+		)
+	)
+	sys-apps/portage[${PYTHON_USEDEP}]
+	"
+
+python_prepare_all()  {
+	local PATCHES=( "${FILESDIR}"/layman-2.0.0.*.patch )
+	distutils-r1_python_prepare_all
+	eprefixify etc/layman.cfg layman/config.py
+}
+
+python_test() {
+	for suite in layman/tests/{dtest,external}.py ; do
+		PYTHONPATH="." "${PYTHON}" ${suite} \
+				|| die "test suite '${suite}' failed"
+	done
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/layman
+	doins etc/layman.cfg
+
+	doman doc/layman.8
+	dohtml doc/layman.8.html
+
+	keepdir /var/lib/layman
+	keepdir /etc/layman/overlays
+}
+
+pkg_postinst() {
+	# now run layman's update utility
+	einfo "Running layman-updater..."
+	"${EROOT}"/usr/bin/layman-updater
+	einfo
+}
diff --git a/app-portage/layman/layman-2.2.0-r7.ebuild b/app-portage/layman/layman-2.2.0-r7.ebuild
new file mode 100644
index 000000000000..c8f4f72e8786
--- /dev/null
+++ b/app-portage/layman/layman-2.2.0-r7.ebuild
@@ -0,0 +1,88 @@
+# 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 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit eutils distutils-r1 linux-info prefix
+
+DESCRIPTION="Tool to manage Gentoo overlays"
+HOMEPAGE="http://layman.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bazaar cvs darcs +git g-sorcery mercurial squashfs subversion test"
+
+DEPEND="test? ( dev-vcs/subversion )"
+
+RDEPEND="
+	bazaar? ( dev-vcs/bzr )
+	cvs? ( dev-vcs/cvs )
+	darcs? ( dev-vcs/darcs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	g-sorcery? ( app-portage/g-sorcery )
+	subversion? (
+		|| (
+			>=dev-vcs/subversion-1.5.4[http]
+			>=dev-vcs/subversion-1.5.4[webdav-neon]
+			>=dev-vcs/subversion-1.5.4[webdav-serf]
+		)
+	)
+	sys-apps/portage[${PYTHON_USEDEP}]
+	>=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}]
+	"
+
+layman_check_kernel_config() {
+	local CONFIG_CHECK
+	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
+	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
+}
+
+pkg_pretend() {
+	layman_check_kernel_config
+}
+
+pkg_setup() {
+	layman_check_kernel_config
+}
+
+python_prepare_all()  {
+	distutils-r1_python_prepare_all
+	epatch "${FILESDIR}"/${P}-removes-doctest-remnants.patch
+	epatch "${FILESDIR}"/${P}-change-for-upstream-ssl-fetch.patch
+	epatch "${FILESDIR}"/${P}-adds-kwargs-debug.patch
+	rm "${S}"/"${PN}"/tests/dtest.py
+	eprefixify etc/layman.cfg layman/config.py
+}
+
+python_test() {
+	for suite in layman/tests/external.py ; do
+		PYTHONPATH="." "${PYTHON}" ${suite} \
+		|| die "test suite '${suite}' failed"
+	done
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/layman
+	doins etc/layman.cfg
+
+	doman doc/layman.8
+	dohtml doc/layman.8.html
+
+	keepdir /var/lib/layman
+	keepdir /etc/layman/overlays
+}
+
+pkg_postinst() {
+	# now run layman's update utility
+	einfo "Running layman-updater..."
+	"${EROOT}"/usr/bin/layman-updater
+	einfo
+}
diff --git a/app-portage/layman/layman-2.4.1-r1.ebuild b/app-portage/layman/layman-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..78e7343bf953
--- /dev/null
+++ b/app-portage/layman/layman-2.4.1-r1.ebuild
@@ -0,0 +1,92 @@
+# 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} pypy )
+PYTHON_REQ_USE="xml(+),sqlite?"
+
+inherit eutils distutils-r1 linux-info prefix
+
+DESCRIPTION="Tool to manage Gentoo overlays"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Layman"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
+IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
+
+DEPEND="test? ( dev-vcs/subversion )
+	"
+
+RDEPEND="
+	bazaar? ( dev-vcs/bzr )
+	cvs? ( dev-vcs/cvs )
+	darcs? ( dev-vcs/darcs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	g-sorcery? ( app-portage/g-sorcery )
+	subversion? (
+		|| (
+			>=dev-vcs/subversion-1.5.4[http]
+			>=dev-vcs/subversion-1.5.4[webdav-neon]
+			>=dev-vcs/subversion-1.5.4[webdav-serf]
+		)
+	)
+	gpg? ( >=dev-python/pyGPG-0.2 )
+	sync-plugin-portage?  ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
+	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
+	"
+
+PATCHES=(
+	"${FILESDIR}/layman-2.4.1-sourcefileattributechanges.patch"
+)
+
+layman_check_kernel_config() {
+	local CONFIG_CHECK
+	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
+	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
+}
+
+pkg_pretend() {
+	layman_check_kernel_config
+}
+
+pkg_setup() {
+	layman_check_kernel_config
+}
+
+python_prepare_all()  {
+	python_setup
+	esetup.py setup_plugins
+	distutils-r1_python_prepare_all
+	eprefixify etc/layman.cfg layman/config.py
+}
+
+python_test() {
+	suite=layman/tests/external.py
+	PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed"
+	unset suite
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/layman
+	doins etc/layman.cfg
+
+	doman doc/layman.8
+	dohtml doc/layman.8.html
+
+	keepdir /var/lib/layman
+	keepdir /etc/layman/overlays
+}
+
+pkg_postinst() {
+	# now run layman's update utility
+	einfo "Running layman-updater..."
+	"${EROOT}"/usr/bin/layman-updater
+	einfo
+}
diff --git a/app-portage/layman/layman-2.4.2.ebuild b/app-portage/layman/layman-2.4.2.ebuild
new file mode 100644
index 000000000000..8e8ec17a7a6d
--- /dev/null
+++ b/app-portage/layman/layman-2.4.2.ebuild
@@ -0,0 +1,88 @@
+# 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 )
+PYTHON_REQ_USE="xml(+),sqlite?"
+
+inherit eutils distutils-r1 linux-info prefix
+
+DESCRIPTION="Tool to manage Gentoo overlays"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Layman"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
+
+DEPEND="test? ( dev-vcs/subversion )
+	"
+
+RDEPEND="
+	bazaar? ( dev-vcs/bzr )
+	cvs? ( dev-vcs/cvs )
+	darcs? ( dev-vcs/darcs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	g-sorcery? ( app-portage/g-sorcery )
+	subversion? (
+		|| (
+			>=dev-vcs/subversion-1.5.4[http]
+			>=dev-vcs/subversion-1.5.4[webdav-neon]
+			>=dev-vcs/subversion-1.5.4[webdav-serf]
+		)
+	)
+	gpg? ( >=dev-python/pyGPG-0.2 )
+	sync-plugin-portage?  ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
+	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
+	"
+
+layman_check_kernel_config() {
+	local CONFIG_CHECK
+	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
+	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
+}
+
+pkg_pretend() {
+	layman_check_kernel_config
+}
+
+pkg_setup() {
+	layman_check_kernel_config
+}
+
+python_prepare_all()  {
+	python_setup
+	esetup.py setup_plugins
+	distutils-r1_python_prepare_all
+	eprefixify etc/layman.cfg layman/config.py
+}
+
+python_test() {
+	suite=layman/tests/external.py
+	PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed"
+	unset suite
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/layman
+	doins etc/layman.cfg
+
+	doman doc/layman.8
+	dohtml doc/layman.8.html
+
+	keepdir /var/lib/layman
+	keepdir /etc/layman/overlays
+}
+
+pkg_postinst() {
+	# now run layman's update utility
+	einfo "Running layman-updater..."
+	"${EROOT}"/usr/bin/layman-updater
+	einfo
+}
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
new file mode 100644
index 000000000000..c5419f1102ff
--- /dev/null
+++ b/app-portage/layman/layman-9999.ebuild
@@ -0,0 +1,95 @@
+# 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 )
+PYTHON_REQ_USE="xml(+),sqlite?"
+
+inherit eutils distutils-r1 git-2 linux-info prefix
+
+DESCRIPTION="Tool to manage Gentoo overlays"
+HOMEPAGE="http://layman.sourceforge.net"
+SRC_URI=""
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
+
+DEPEND="test? ( dev-vcs/subversion )
+	app-text/asciidoc
+	"
+
+RDEPEND="
+	bazaar? ( dev-vcs/bzr )
+	cvs? ( dev-vcs/cvs )
+	darcs? ( dev-vcs/darcs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	g-sorcery? ( app-portage/g-sorcery )
+	subversion? (
+		|| (
+			>=dev-vcs/subversion-1.5.4[http]
+			>=dev-vcs/subversion-1.5.4[webdav-neon]
+			>=dev-vcs/subversion-1.5.4[webdav-serf]
+		)
+	)
+	gpg? ( >=dev-python/pyGPG-0.2 )
+	sync-plugin-portage?  ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
+	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
+	"
+
+layman_check_kernel_config() {
+	local CONFIG_CHECK
+	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
+	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
+}
+
+pkg_pretend() {
+	layman_check_kernel_config
+}
+
+pkg_setup() {
+	layman_check_kernel_config
+}
+
+python_prepare_all()  {
+	python_setup
+	esetup.py setup_plugins
+	distutils-r1_python_prepare_all
+	eprefixify etc/layman.cfg layman/config.py
+}
+
+python_test() {
+	suite=layman/tests/external.py
+	PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed"
+	unset suite
+}
+
+python_compile_all() {
+	# override MAKEOPTS to prevent build failure
+	emake -j1 -C doc
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/layman
+	doins etc/layman.cfg
+
+	doman doc/layman.8
+	dohtml doc/layman.8.html
+
+	keepdir /var/lib/layman
+	keepdir /etc/layman/overlays
+}
+
+pkg_postinst() {
+	# now run layman's update utility
+	einfo "Running layman-updater..."
+	"${EROOT}"/usr/bin/layman-updater
+	einfo
+}
diff --git a/app-portage/layman/metadata.xml b/app-portage/layman/metadata.xml
new file mode 100644
index 000000000000..095d087db42d
--- /dev/null
+++ b/app-portage/layman/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>layman@gentoo.org</email>
+		<name>Gentoo Layman team</name>
+	</maintainer>
+	<use>
+		<flag name="bazaar">Support <pkg>dev-vcs/bzr</pkg> based overlays</flag>
+		<flag name="cvs">Support <pkg>dev-vcs/cvs</pkg> based overlays</flag>
+		<flag name="darcs">Support <pkg>dev-vcs/darcs</pkg> based overlays</flag>
+		<flag name="g-sorcery">Support <pkg>app-portage/g-sorcery</pkg> based overlays</flag>
+		<flag name="git">Support <pkg>dev-vcs/git</pkg> based overlays</flag>
+		<flag name="gpg">Support <pkg>app-crypt/gnupg</pkg> signed overlays lists and manifests</flag>
+		<flag name="mercurial">Support <pkg>dev-vcs/mercurial</pkg> based overlays</flag>
+		<flag name="squashfs">Support mounting squashfs image overlays locally read-only</flag>
+		<flag name="subversion">Support <pkg>dev-vcs/subversion</pkg> based overlays</flag>
+		<flag name="sync-plugin-portage">Install the <pkg>sys-apps/portage</pkg> sync module</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">layman</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-portage/metadata.xml b/app-portage/metadata.xml
new file mode 100644
index 000000000000..3872164d80bc
--- /dev/null
+++ b/app-portage/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-portage category contains software which works with portage or
+		ebuilds.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-portage enthält Programme für das Arbeiten mit Portage
+		oder Ebuilds.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-portage contiene programas para trabajar con portage
+		o con ebuilds.
+	</longdescription>
+	<longdescription lang="ja">
+		app-portageカテゴリにはportageかebuildと使うソフトウェアが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De app-portage categorie bevat applicaties die samenwerken met portage of
+		direct met ebuilds te maken hebben.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-portage chứa các ứng dụng liên quan đến
+		portage.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-portage contiene programmi per portage o per le ebuilds.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria app-portage contém programas que funcionam com o portage
+		ou ebuilds.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-portage zawiera dodatkowe programy do pracy z systemem
+		Portage oraz ebuildami.
+	</longdescription>
+</catmetadata>
+
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
new file mode 100644
index 000000000000..5ad2c144b3b4
--- /dev/null
+++ b/app-portage/metagen/Manifest
@@ -0,0 +1,15 @@
+DIST metagen-0.6.2.tar.gz 6100 SHA256 d1f6c7a24fa9f7f119c9309ed2ec217bc0fd3da48568417a46220a40e2c74201 SHA512 0ab8d7755259b870c995c471f366a976f4acc336dda4c2fa1c4e5b78b5aa701fb75d4dd88ac0ee069a231550b07b89b4a8f724c94ec791efe6c4c64b97ac19ff WHIRLPOOL fa6b85934e58cc5b73237fb619d64bd87df148b8f70fa5df2bbf94ef986f1ea3e693b7e3eb25b56cbe26fe35fff5102ba5787a22ec94800d3d328ccc9606473c
+DIST metagen-0.6.3.tar.bz2 6118 SHA256 655253786c3dafe2426a61d8585acfbbd4a560e0a2609331e230c72699b10494 SHA512 1a25e1ebd35ae97e0823aee2f929c09b9041c78496c2425cf5c0bf3d9f1747313dcf30b7e0a5d4e861cbd0caaf48b506f85eb5f25ab0b9e75a62514b0bb64ecd WHIRLPOOL 5e0c594ad728b6646a324d7c8115ad19f15304baad1922fb45e96a771355092e43ba3ae98f0f44e87f2c8e9d74af5ee75c09e86472329e1497dd81959467f927
+DIST metagen-0.6.4.2.tar.bz2 6837 SHA256 b048deace35579b7cc2d7c6eb39aa869369e932220c2a3d3d01ca378b4baa18c SHA512 cec88403ee06449f30524e0fe485b2e76f4f3bdc23feee0eb60503ab6e9c351bab3f55cdf3847ccec14a8f1e1b9ebe820a5f76feb095b13be11fe5fcf258ed2c WHIRLPOOL 6d5d99a75300858f8ddf947c698109f98355a34db805395bad4211212ef11ce40455ab45174d3adc8faafe18374ac71fe6ff8c43f6db94c75c0ec353df6e44ac
+DIST metagen-0.6.5.tar.bz2 6973 SHA256 da376be075c68d07f42f94e7017090f469c04280f6450cb4ed6bc4bab577e0ab SHA512 6a95ce78c7b8ead89a28ea927d9e36cf806a1d363cc703c86c553a74499304081ac360d3fba390d5cc54de08572e8305ab1896d73eceff35166de32760162fe0 WHIRLPOOL b12d8a1dbf7b142de3b9bfb3363565fec70450b28d05c55cca95ecc91ca8a9d02ad5905a660428fd6064ac2589028f081ba5a5ab7d440d8f5ac672bf864c01e1
+DIST metagen-0.6.6.tar.bz2 6341 SHA256 27af723e8fe0f20dea4250a0ebf30088fb80c387ec1cbc6dd512e260bd8192ce SHA512 0accac41957a555a35261c72053fb93ade62eb449d9ee4a2b1683afddb853d7bfb6394dc06c90643044cba1b573932663f1c7b559bf400ec15fce0c3f8c231ca WHIRLPOOL 7832d7cb88512578d060a499152b373091a6d4d7fca76f0bc59dcb30ca1a8734a94e0a0f58fb354e03d74f747dfe8709e8d6b4e059d471f871dade2291c6e8ad
+EBUILD metagen-0.6.2-r1.ebuild 827 SHA256 4c1e994bf106d662f47e20f4140bb143dcc879591994f6311bbc4907b88af9ce SHA512 e856e57d1cec091360241cc19e6273396af76ef10e84cf0691af6daec509546a79864a1850fd8fc37ec1e3acc6e6ae4552dfe02bc3846aa8dc6c5c7b87740c17 WHIRLPOOL 255c85e2a26b0535a13990bed4ee980cf6e6dfda2dac578d108965558966ce84651233e9a39bfd482726dd4ec082c3416902499db32ffaccc48de3bf2e8c94f1
+EBUILD metagen-0.6.3.ebuild 825 SHA256 7b83e435eba80c19563b763bbbd171a654a92a5d9c4dd36ded5077953994a45a SHA512 9b2089d4723b1542f8cb1cb44f39eb56e46bec7fff835e47c90fc5f8dae1d4bd66af142f9d5714da6887a757e3c2156e7a96ee12c87ec09bb1ee800d8e44504c WHIRLPOOL 92ec09346e6bc0cff579bc280a13c8e3305d2cbb29ef15bf13c9aab6c459c263236364b803135028321d4359693bc52cd55aab8d7b2bd370e746a6b04436da23
+EBUILD metagen-0.6.4.2.ebuild 829 SHA256 544f9954f28ddaff8c02027c3e749644525f11dab5e93db2bb0b1ce5beed97ad SHA512 542fd0585a00e849a8692540992b6de31becfc3ecaa35f37873cfd4b2878568328ae3c61f004ba2d05637e856c179fa17d05eee7688bf02600abb96373f77760 WHIRLPOOL c0785f2d0db822df9a3f5684905ad3653db187c8a9ab614ffadebd84b4444ddd3348f747fb3cba0a188277170e699303b54049207f6d40ada518841fbac67020
+EBUILD metagen-0.6.5-r1.ebuild 930 SHA256 b78de1f289afdbfb448c9ebf3eb624d3e7713ac574c3554e7d224dcb55e130d4 SHA512 a6e76c8f6f6b95bc89ea766e6ab5f3fe4af7728d6a3df90687f62fae934f4d3d6cd39007f37eec7bf295bdd63f9075f4a33507caa96fcc91a3802aa86a5fc3ae WHIRLPOOL 6d90eee93f921ea5bd461ce8fee0471b42f86d687e7a64b7a298e47cc0759c3a58ec0f7413673233dac999499e9e0b3e59ca3a2aef887e8caef74dfd046e13ef
+EBUILD metagen-0.6.5.ebuild 825 SHA256 b15baf9cc0cce9281ea66ca5c0745dc6d90fd1247b943c861c7f6a55a8726ecf SHA512 8892e342ee8b999c42e7f90dfcdf50f568fa886cf313c9c869387a21be4c3eeb298ba069e8d6b23eb2305cb3d5dcbfb638692ee8c3f69bf0dfb7ce4fa5453402 WHIRLPOOL be64bcc31d54288dac3b8120b21ba380c8f86d0059b8af139e332b97a92babc394f7ed3ec681ac83dce243b549356e5c986f081ea0d55f16ffd561a59c9df19b
+EBUILD metagen-0.6.6.ebuild 818 SHA256 06bf697cd06f21e61fdafbb8ff25293fd19e078fe21a45144f2dd8bf451920de SHA512 d0a98e890b7a3ff7e07149b1430a869288b56c0e32cbe6b39ea9bd3fd621bc5019015ce884137fa57f3d6c67710125aa0929f72655c98b8d9b76cfea571e22f2 WHIRLPOOL e7a9a41da2823c1c15b5a7fdc7a3f97b71ce7440b775538486fdbaf0007cd1dead874d77194019c1044af5cba823bbf4c26a61f2d1e917c89101dd311014bf00
+EBUILD metagen-9999.ebuild 889 SHA256 6c0654e002399176172a1b3cdecefd21c24eabfc22380f13185204dae4005b98 SHA512 9fde9c59acf15aa2d6cc2ecc0a8925800b66375d0dda8276333ee579f457d404c1d779b59ac03e9f036ee8b996ea7aa0cf6c2a0732a624b0ac1e862b713b91df WHIRLPOOL fe54435540d6d04e982a6e0ce2a72751d558c0e7916679f337f1b5ba71b5b04a10b94dd7b0803013c78918276afaff78c2cc6c97d6f9a839714089ac2855b7ea
+MISC ChangeLog 4552 SHA256 5f0548e578df104bedb75f9c44ec60fd7b0d3a176d80b776dee028a14ebfce5b SHA512 d88e8b11ec589975d60963756ab2a4ac7ce33230b6b896fa570ab4b53174875c5696d27af35e08dee2bc84404cdbf6c2355b761fc463f554de28ad2a4be36929 WHIRLPOOL 965623041f5c3eb3a9dcd0dccbda5fa3756cc9a5771f274a730a46bcfd327c37b1920fd0e72b3e26e0ea8a7ab2853853d6dff02d2cad33bbfc1e346ecffcad9e
+MISC ChangeLog-2015 5810 SHA256 f939b9d66bb8134d798b9b5437a44dedd5fc0457c3a7f2116b29bf1ee054683d SHA512 c1c60e8b7e099bae4ed5f936b1e4354a73ec74e932c934995d84f2e15edeb253a39af0cea884ab7c67212e62e06ba0a9d04f1fb1553c7a1bb6dc4be7f74c847e WHIRLPOOL d63c880b78f2e67e4dbc049b5d0078347853c1d1da0ce103fd5802c70c5d184a782395cb261dcaaa489fe694c05d9a2c216ca46edf8a16d435ac5880c6e73828
+MISC metadata.xml 295 SHA256 b7abfe8ee8e2a0a63e3518a7726112f49c07ac6eab096dd3168e205cd62f1d0d SHA512 68ea6ebd27bc287655010afbfa6ea291c8bb7de14cef145c91b3179c4d28e865701ef8dfe914457ea933785045731277d3b245877d935d1163915a76db9511b8 WHIRLPOOL b794fc9ab00f39da69b8b97f1d058c913439047534ff41d48792deee3574c6581861b6668da70430f0586001f1eace4cfdc8bb2550a9d63f9be19b0a0c17b375
diff --git a/app-portage/metagen/metadata.xml b/app-portage/metagen/metadata.xml
new file mode 100644
index 000000000000..eb3702fd181f
--- /dev/null
+++ b/app-portage/metagen/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>sping@gentoo.org</email>
+</maintainer>
+<longdescription>metagen creates metadata.xml files for ebuilds</longdescription>
+</pkgmetadata>
diff --git a/app-portage/metagen/metagen-0.6.2-r1.ebuild b/app-portage/metagen/metagen-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..e8a7369e1a69
--- /dev/null
+++ b/app-portage/metagen/metagen-0.6.2-r1.ebuild
@@ -0,0 +1,34 @@
+# 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
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="https://dev.gentoo.org/~neurogeek/metagen_releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript metagen/main.py metagen
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/metagen/metagen-0.6.3.ebuild b/app-portage/metagen/metagen-0.6.3.ebuild
new file mode 100644
index 000000000000..46e06ca46727
--- /dev/null
+++ b/app-portage/metagen/metagen-0.6.3.ebuild
@@ -0,0 +1,34 @@
+# 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
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript metagen/main.py metagen
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/metagen/metagen-0.6.4.2.ebuild b/app-portage/metagen/metagen-0.6.4.2.ebuild
new file mode 100644
index 000000000000..6ae80946042b
--- /dev/null
+++ b/app-portage/metagen/metagen-0.6.4.2.ebuild
@@ -0,0 +1,34 @@
+# 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
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript metagen/main.py metagen
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/metagen/metagen-0.6.5-r1.ebuild b/app-portage/metagen/metagen-0.6.5-r1.ebuild
new file mode 100644
index 000000000000..a6e19aaf00e2
--- /dev/null
+++ b/app-portage/metagen/metagen-0.6.5-r1.ebuild
@@ -0,0 +1,37 @@
+# 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
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
+	|| (
+		( >=sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}] app-portage/repoman[${PYTHON_USEDEP}] )
+		<sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript metagen/main.py metagen
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/metagen/metagen-0.6.5.ebuild b/app-portage/metagen/metagen-0.6.5.ebuild
new file mode 100644
index 000000000000..3eb87efbb6ec
--- /dev/null
+++ b/app-portage/metagen/metagen-0.6.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript metagen/main.py metagen
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/metagen/metagen-0.6.6.ebuild b/app-portage/metagen/metagen-0.6.6.ebuild
new file mode 100644
index 000000000000..124483989462
--- /dev/null
+++ b/app-portage/metagen/metagen-0.6.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript metagen/main.py metagen
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild
new file mode 100644
index 000000000000..6f413d6b1c1d
--- /dev/null
+++ b/app-portage/metagen/metagen-9999.ebuild
@@ -0,0 +1,38 @@
+# 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 git-r3
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI=""
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/metagen.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+IUSE=""
+DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
+	|| (
+		( >=sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}] app-portage/repoman[${PYTHON_USEDEP}] )
+		<sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript metagen/main.py metagen
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
new file mode 100644
index 000000000000..83125dcdd07d
--- /dev/null
+++ b/app-portage/mirrorselect/Manifest
@@ -0,0 +1,14 @@
+AUX mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch 721 SHA256 80ad76963b67839e130e22699a147f8a3df42cd4c5b38ebe14d0e25463e29950 SHA512 032544106b1e6dad76f46131f94913b1875d9605808dbe5145ca0fd80916c158551745a850a25cf4252f9f860e8608ed76e31ca878110db66e05003e86d55127 WHIRLPOOL 0781642f2f3be5f749e092ea4c75608c30ac2de3410eb179c8afadf52ede8b13f69882062667af7391e0126543ef55d4752bb6a855e6ab2be3e15e2a356de6e7
+AUX mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch 658 SHA256 24de16f4891094758733aa06cc4729ee1832bc93c0fdf43220e4377925d97b38 SHA512 4f2ce8c8136a380cfcd0f44489fcd51be1a8c66353dba59ff8872ca6f72901c0f19f231f8c44fe396bb5735e6e8e16b389e22bcada1f9a0a793dec20baefe604 WHIRLPOOL 17310e74f5d9f95b9eddd9fb422ba7335487f58500492fe41555ede739bccd2c4ae5195be40849d885a00e8ee993ea7ad8087ad6d82a90fcc9e2dd2ba498aa6f
+DIST mirrorselect-2.2.0.1.tar.gz 13138 SHA256 029a09073d6a4363f060912d257f8f118bb3a061c05db532bde1c05816affab1 SHA512 08216c381b70856dd56e903a208bc0ed202826b89136dd0b1cf69bd7cf2afa2df608ac2a0aed5161a56f51cf4bcb51f3826ad55b3a26e671ba2c68490c9cffad WHIRLPOOL 6925c4dc514fdd5f7c50427627b1ef6babba99c4e98d00d7144489ba16c3740ba967461847d99cd080805e6aebd44ca51ca85bd117ffdb52ba3cdf511fac0c69
+DIST mirrorselect-2.2.2.tar.gz 15964 SHA256 343089675448e8928ccc74f0eed285f3034a9252de4d1b8980cacf3047cca20f SHA512 91ce16d236418ba186c447c6497684c4138afd4279a0ba95ee0f069309e8ce086a5a4ce4715ef21275362b7c3772924d422d7711d188d40c1e0b90f773765cf9 WHIRLPOOL 0625ac6f01ebdbf6e78a1c1f42a960afb8b2911297b07ca735dcf51615697a3a3926f3dc62925501b8fce6170d94785f6df57147280011b3643746200fb6001d
+DIST mirrorselect-2.2.3.tar.gz 15230 SHA256 8fafdccac2c97c8c515ee8cea241d8356229de7d38b1d7d5cacd9c310c53dda6 SHA512 af1d3657b9ff5a6184ebfd89579a1bdbf11f7389ca12d4cd7a41cd136a553732cbbfb7675e25f7d79756b0b9e74b496d28ee5fdc8872173825262fae0052e8e2 WHIRLPOOL 1b05f9213a5ae1d508ce3ecf8a39b488f099f4bcf9215f12b40beca6354528c8e6cc2c006dbcfac0dd2bce1e3adfcedb18d2d92cd68e3b2b3111f8b3d86ce682
+DIST mirrorselect-test 102403 SHA256 add93012c44824626a7e05eed2186dcfb60e0b696d4ad7910fdb9eb31c93d3b5 SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27 WHIRLPOOL ca9be67338986403d87db7de04d3d1b3ecd483f2a104668a7c23e8e2ef1141a31394d12d3cd4121ec25436c967aac960f3652c20f20d2c89fdde6dd547cd9f8a
+EBUILD mirrorselect-2.2.0.1.ebuild 867 SHA256 524d3c915ee61f7412e8e50417acc8a762a620c9c6cd2ee7993c3ffa9da1a726 SHA512 ddc4aa350d3f829b898537f50522f37dd5207b5032e9a18696c71ba472d6822a5c33ce63bee185c1201fc47d62fe2a150fcb5ea7137615ccd23b61ab5b9c853b WHIRLPOOL 3e4c13ad15f6d71c9d87379c0ad70e16104b3e2ba0433dcf03765f8b0bc6a7f5801f60b9472b8a0e5203870be46ec0c09ed70614cd85cacca98f5c8918b0d4f0
+EBUILD mirrorselect-2.2.2-r2.ebuild 1132 SHA256 51c42c18e87c40736a4511f1820ce29cff897c2f9e9b89ba4b1818cad840a2fb SHA512 42ad846a47675f9fcf9290b09941ef161ee5b827e42025e81937a502ecb39e8d6e597c206f9b55b28f12fce2554a1af14890cc43ae85f373e5ccb1171f8aea8a WHIRLPOOL 2681fbd5ad9a1b32c681ac7676ba696f3ee74973e4a84b95c5aa58929b7ab13fff7995137a60ddd0e0b7fa53e72816577ff69071f1258ffeb7556a70de96fea5
+EBUILD mirrorselect-2.2.2.ebuild 1018 SHA256 fc222c999b977535990cd4b98d05f1b6dc581278aa93bd10454b7034ed682893 SHA512 95b12638b7e49a49597abedffb6e09c412237714ee649a10360c595a38935512644988b226afde7526749568938a1453aaff03c28d7ce77c623414476f94597e WHIRLPOOL ae5fe5c551a9a989e8e56a2c3407572099c71638156a91790ba360cab71b1af50aeb4e83f5f9c1ab253c03f55abc05cf939c182ae2cc6283e42027dc6ccc6ab1
+EBUILD mirrorselect-2.2.3.ebuild 982 SHA256 f52a7c60c52b8ae3a3aa81e75b683ffe502dc9103053332c547e84b589af326e SHA512 59cd003de18fce4bbacf0a5ce7d5da7cceb423a2790de29ddffdc72386f9f4daf602730e4f4b583b0f1ea8a96f82a4a9543dcd1feae9559a52eb466117337e29 WHIRLPOOL 4b640a59a5595687c281869ddd3a505990af55a8cbc6209ad91181e97aa12ad59fcc1202479fda3d654a866befa7601594f20d8822d8dd2e68e98b85d8a959e4
+EBUILD mirrorselect-9999.ebuild 1045 SHA256 f42f54122b83d979b529f2506cd7103036d310bd726e29c70434b96793737dd9 SHA512 8775aeacb9942cfa6761f25391843449310a9b540845b01090a7cca57b6d1b804e733e8429fe2b16139af346960884070e895284335683fdf69665cda60f04cc WHIRLPOOL 2f1705adc553e1becd1d4a1927ffc2b20b0b0de3543b0ff4d9db57285c8e9445a09b6d87425be81282d9063fc89a38c0999bed86fe4c4644b2527ff80a13ade5
+MISC ChangeLog 3234 SHA256 a470d0747ffc95fe85798b97765e57e0dc8d5cc01b9777ae4463ddb0777daa4f SHA512 9ad777fef588761c2dfc199d8e66f7a7694db354d854863721c9031974f4707cc5e76f0f0b5d88d279db820681d1a4cf93e7fc0e255e32b3ffe2f48463a0debc WHIRLPOOL e7f2c1bb7cc30476b714856543493cba9f171478b8352a1567c0ce82e4843086bc5d32d74c4a795dc7ae20d74d3bb3a9e8622e22fa2ca8c7bb19e5c03136cf81
+MISC ChangeLog-2015 26452 SHA256 aea6097654520a07a39f6d6f3ca0423244b4bbb64714ae013017b636547617d8 SHA512 2eadbd2b3bbfb96540f3ba9914590f18b69d10f9d68be4cd46b0f139f058ee0994607e35640c1bac3fc44863de2473a4f985c61f75c4c347980f0cb01180047c WHIRLPOOL 6964bb40d7435f8fa27e89cd2f9b3df1ec2821d1dee1a48a2c0bd3b4cb0d28b083923555d8277acd3793c4b03c255a648ccb3f36d92b8c6bd50d8ec8e60408eb
+MISC metadata.xml 470 SHA256 be91a5dc173ee9e08b578140db70f8e8b5875d38834c5ca041cfbb0cde01e0d1 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc WHIRLPOOL 72fca0179318df04428d67d8e36233f14f7ec58473d9211241bcd6870ca0a4ac92e6a63e18e5917bfaeb861ebf312d151869d5d33daccdfc1856ee77f23fad14
diff --git a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch
new file mode 100644
index 000000000000..d170103a4657
--- /dev/null
+++ b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch
@@ -0,0 +1,24 @@
+From e9dea3a98aa5031fecf1c7115de77e948e8d07ca Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Tue, 27 Jan 2015 10:19:05 -0800
+Subject: [PATCH] Add missed output mode function assignment.
+
+---
+ mirrorselect/extractor.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
+index 59efad1..06dce6c 100644
+--- a/mirrorselect/extractor.py
++++ b/mirrorselect/extractor.py
+@@ -107,6 +107,7 @@ class Extractor(object):
+ 		# setup the ssl-fetch ouptut map
+ 		connector_output = {
+ 			'info':self.output.write,
++			'debug': self.output.write,
+ 			'error': self.output.print_err,
+ 			'kwargs-info': {'level': 2},
+ 			'kwargs-debug': {'level':2},
+-- 
+2.2.2
+
diff --git a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch
new file mode 100644
index 000000000000..2e5fd93c09cb
--- /dev/null
+++ b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch
@@ -0,0 +1,24 @@
+From 9ec1e9649c980d32d23aab40eff3cac5e8f6f555 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Mon, 26 Jan 2015 18:23:05 -0800
+Subject: [PATCH] Update for ssl-fetch api change
+
+---
+ mirrorselect/extractor.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
+index ec5f299..59efad1 100644
+--- a/mirrorselect/extractor.py
++++ b/mirrorselect/extractor.py
+@@ -109,6 +109,7 @@ class Extractor(object):
+ 			'info':self.output.write,
+ 			'error': self.output.print_err,
+ 			'kwargs-info': {'level': 2},
++			'kwargs-debug': {'level':2},
+ 			'kwargs-error': {'level':0},
+ 			}
+ 
+-- 
+2.2.2
+
diff --git a/app-portage/mirrorselect/metadata.xml b/app-portage/mirrorselect/metadata.xml
new file mode 100644
index 000000000000..ca6a7a138342
--- /dev/null
+++ b/app-portage/mirrorselect/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>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
+	<longdescription lang="en">
+		This utility is used to select the fastest mirror (distfiles) and
+		provide a nicer front-end for mirror selection
+		(both rsync + distfiles) to a user.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
new file mode 100644
index 000000000000..b45d2f38ba34
--- /dev/null
+++ b/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 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="xml"
+
+inherit eutils distutils-r1 prefix
+
+DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
+SRC_URI="https://dev.gentoo.org/~dolsen/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux"
+
+RDEPEND="
+	dev-util/dialog
+	net-analyzer/netselect
+	"
+
+python_prepare_all()  {
+	python_export_best
+	eprefixify setup.py mirrorselect/main.py
+	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
+	distutils-r1_python_prepare_all
+}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild
new file mode 100644
index 000000000000..725b4bf5dcce
--- /dev/null
+++ b/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild
@@ -0,0 +1,40 @@
+# 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} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils distutils-r1 prefix
+
+DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
+	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+	"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+
+RDEPEND="
+	dev-util/dialog
+	net-analyzer/netselect
+	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
+	"
+
+PATCHES=(
+	"${FILESDIR}/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch"
+	"${FILESDIR}/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch"
+)
+
+python_prepare_all()  {
+	python_setup
+	eprefixify setup.py mirrorselect/main.py
+	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
+	distutils-r1_python_prepare_all
+}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild
new file mode 100644
index 000000000000..88aaa45414ac
--- /dev/null
+++ b/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 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="xml"
+
+inherit eutils distutils-r1 prefix
+
+DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
+	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+	"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+
+RDEPEND="
+	dev-util/dialog
+	net-analyzer/netselect
+	>=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}]
+	<dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
+	"
+
+python_prepare_all()  {
+	python_export_best
+	eprefixify setup.py mirrorselect/main.py
+	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
+	distutils-r1_python_prepare_all
+}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
new file mode 100644
index 000000000000..1b812d4b497c
--- /dev/null
+++ b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
@@ -0,0 +1,35 @@
+# 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} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils distutils-r1 prefix
+
+DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
+	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+	"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+
+RDEPEND="
+	dev-util/dialog
+	net-analyzer/netselect
+	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
+	"
+
+python_prepare_all()  {
+	python_setup
+	eprefixify setup.py mirrorselect/main.py
+	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
+	distutils-r1_python_prepare_all
+}
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
new file mode 100644
index 000000000000..efbbddff3d18
--- /dev/null
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -0,0 +1,43 @@
+# 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} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils distutils-r1 git-r3 prefix
+
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/mirrorselect.git"
+
+DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS=""
+
+RDEPEND="
+	dev-util/dialog
+	net-analyzer/netselect
+	=dev-python/ssl-fetch-9999[${PYTHON_USEDEP}]
+	"
+
+python_prepare_all()  {
+	python_export_best
+	eprefixify setup.py mirrorselect/main.py
+	echo Now setting version... VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
+	VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	distutils-r1_pkg_postinst
+
+	einfo "This is a development version."
+	einfo "Please report any bugs you encounter to:"
+	einfo "https://bugs.gentoo.org/"
+}
diff --git a/app-portage/overlint/Manifest b/app-portage/overlint/Manifest
new file mode 100644
index 000000000000..18fe69fe2012
--- /dev/null
+++ b/app-portage/overlint/Manifest
@@ -0,0 +1,7 @@
+DIST overlint-0.5.2.tar.gz 2701 SHA256 3d6db0fcd73bbc4a3f31755f61751cc15a2c4fa3334ef5dc1bffa7d574a61ced SHA512 aae78ed2d3f02e83ced3dbe8ace468adb204b80e040b979a97d92af0c91e79019f2ed14e6e3655ffa8137c55c8fd1f054c27229819ae7908632586acb284f3ea WHIRLPOOL fbe3c646d9b36bf2e5cf53583ade3f64c768508b2ca11aa66032d0f15e828c1297f271db3f845523c88204b5005ca4d335080e81862bc8d1c140395431a937d2
+DIST overlint-0.5.3.tar.gz 2706 SHA256 c770527fb5a04caccaea1a9d787b7d8d3415c1401374800af065075c8eb38d5f SHA512 348b59e5f013b1c4060312208fdc7fddad3252d6f386513d743b7685d8aafbf76ac626fb9000c2d47c362b85d223dea5f59b4cfec55dbf24a52185c5b943a149 WHIRLPOOL b8fab05a8b35d245f373ad89723c37d6043576bba7975631c856694fe40a9ef35310a70373f88013836056fe801712ccd8dd6eaa9bea954e18056c5fda3c8b29
+EBUILD overlint-0.5.2.ebuild 466 SHA256 33faaf8b95c5fa7f9191e6ee71a4dd5d3b3db166c954dfb60c5f6aad2c79ced2 SHA512 14bb74721903f33da9fbe1c44892b631553e14d36f8ecf05de11ee331006b6523d5d24305943904bfde815a6396d7b3f1cd6482de16eb0d2a9ea438199cc3742 WHIRLPOOL fda29a87a7e0c4c69f2619691c39d2c426f1e9f719339edc92a822fd2130bd21d68015027a3e9dd98d0dced41b5e6a5adcb30cebc892b738092861b8e29b525e
+EBUILD overlint-0.5.3.ebuild 487 SHA256 678d7f6b9532feb9b94dc777fa453f8646fb5a6142e7524f3af4d109c2961572 SHA512 3848cb95b5d2420ded863bf12825e4421211f111bda1e9cec7ec512b70e2857839e76cea3dfec0d9b2e9010cec03998820e78b4dc84bedc15fa72103cdda7617 WHIRLPOOL 35d5bff3c2009e7bd9ba33cff6581d0362e20992434745355c5b0d0f5ded54d2223ff8a1b886e5a2ee54c9c601ae98eaf29841202ee4538488e2dd8589dc00f9
+MISC ChangeLog 2773 SHA256 4730fbedbef12bd65dc72a954fb67b058509a25968a9d3eeb93c0c35537b1f88 SHA512 f34e9a8575585ef750967a89931764c414aebc34337c445bdab0454b112f7a7e7410ec043817c254a7bc9c2119427bc4d285e6a4f23b1bef0d769d107883582f WHIRLPOOL f9e523cd4208159ac939aefb0a9baef510448d2eee0ad93267aacd4690105ccee895c4146de498848ed973254b60b9fc9b0ed51e1c25c2bfccd482beb6282b1c
+MISC ChangeLog-2015 3058 SHA256 9ad52f2a79c88f98536033ca4a6f1489f7bc14e31fae0e69193668be033ec60a SHA512 7d38d9fabd6105823ee4f14fe02ac567ef9e515e3d91ba346adbf9a06e2c362eb29a91b27a0260e817d89898016f168e6e1240bad6942406f6ee28beae3b292a WHIRLPOOL 93a05d36f544576463f0dac9013a5b8c4735cd5427503c23368423121ffeb18b2be785ffe8a33517d476aa8749470414ff46d1431510ef9a294991905caebbc5
+MISC metadata.xml 249 SHA256 abaf8c3d7632caaacd242fc7f4d5b1377778c50c7bfa5c356b35773f377d4f69 SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273 WHIRLPOOL cb6e12eeeb412f25a85ebc6322f4b22a14c7c23fc7d49a46e8168cdbf425e121a276fc4e915c4626ed9b64d7f7aef50ee11c428ed149126999d277adbea1f57f
diff --git a/app-portage/overlint/metadata.xml b/app-portage/overlint/metadata.xml
new file mode 100644
index 000000000000..6d2298876faa
--- /dev/null
+++ b/app-portage/overlint/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>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-portage/overlint/overlint-0.5.2.ebuild b/app-portage/overlint/overlint-0.5.2.ebuild
new file mode 100644
index 000000000000..bad334ae475d
--- /dev/null
+++ b/app-portage/overlint/overlint-0.5.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple tool for static analysis of overlays"
+HOMEPAGE="https://cgit.gentoo.org/proj/overlint.git"
+SRC_URI="http://www.hartwork.org/public/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sys-apps/portage"
diff --git a/app-portage/overlint/overlint-0.5.3.ebuild b/app-portage/overlint/overlint-0.5.3.ebuild
new file mode 100644
index 000000000000..7e57262b3a36
--- /dev/null
+++ b/app-portage/overlint/overlint-0.5.3.ebuild
@@ -0,0 +1,19 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple tool for static analysis of overlays"
+HOMEPAGE="https://cgit.gentoo.org/proj/overlint.git"
+SRC_URI="http://www.hartwork.org/public/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/perl-info/Manifest b/app-portage/perl-info/Manifest
new file mode 100644
index 000000000000..eef46c37ec71
--- /dev/null
+++ b/app-portage/perl-info/Manifest
@@ -0,0 +1,5 @@
+DIST perl-info-0.16.tar.gz 2058 SHA256 1b562f4f192bf7761f394a3ec52cfe183e04d338382db7d09e27eb7990c59fca SHA512 4e37b2496d8a9490de9d105fcaf74ed24d7d2809a4aea4709d0f15811736a8101edf9a4274c82448c24be37692455350e490d29560e616d688da1e6d72d38483 WHIRLPOOL cb32c7b126421483bd601e81345e6d12c46165748b77500556ebc5bc47d472e61796f3bcad20e253a50951281567a207425d47d1ae4c2aa69093a10a7f4d2053
+EBUILD perl-info-0.16.ebuild 561 SHA256 f37199d8be4c45799795fa54e5f6dcc14252147350db01a0e9b149c02f9076b8 SHA512 c83738ff843034236ec43dac51de30619d66e80b4fd5cfaa086658714af2e027b3999cad6e28215616523d9d75f41cd4a4a061eb27279fc8bd72241dae858908 WHIRLPOOL 89143486016a4c19725e87086ef0afeaf63fcf9861fec3b0d79e455e54753b6cb8c8cdbf7be4475cad88d72e43b6020f97478d208115d20cb688bc1af937e012
+MISC ChangeLog 2459 SHA256 176549c8a61aaa47f4c3c4fb65065f4c6d9ea9bb691220d9918b4df7ec488621 SHA512 15804af8e0af12fde6ca1aec6671c6b0fd7e889b0e375c76eea0f83ec27be470594045fa63a75f37fa58a5645b38e93374ed273879d711ec208c7f764497dc97 WHIRLPOOL 21f44089c4e6b4867b2bf0f15691a12687ccb241a50095ec03cddf65a65be6c64262038d94feb8cf1086650dde8365f3eb7e2ab0952c8a7e672207ef3e0758f6
+MISC ChangeLog-2015 3663 SHA256 c3c4cccd9acb46e14b1b73a7e1595d7c590eef2cb634dbf941f69521b437968c SHA512 a877c14c1314370ba7a6acfcbe918a4339250981a100bfa79e38b103e92dadf0dbf731176f794ebe8487f4363674d31fa18e9d0492fe41544f768e5e302ad384 WHIRLPOOL ff1bf8e6642724ba65201212c2db492a0536f0916ab41ce2ad100c0862f4d248e003fd42ac90e235a1bb6db5e7204b08d64237d3a554bef9ac780aaff0148dc6
+MISC metadata.xml 251 SHA256 38969a343659e88a894d06828458ee55b28e9acd7aca5a59ed98621146aab844 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695 WHIRLPOOL f05271953c2c5c80651322f48dbe5824812a413518fbf78b44ecf77c3e57d53507b42cb3d0b0a9c0ba77c31cb6278bd3af3bae204f86dc428ef1125fc155b30c
diff --git a/app-portage/perl-info/metadata.xml b/app-portage/perl-info/metadata.xml
new file mode 100644
index 000000000000..51930499ab60
--- /dev/null
+++ b/app-portage/perl-info/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>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-portage/perl-info/perl-info-0.16.ebuild b/app-portage/perl-info/perl-info-0.16.ebuild
new file mode 100644
index 000000000000..a3f95161e3ee
--- /dev/null
+++ b/app-portage/perl-info/perl-info-0.16.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Tool to gather relevant perl data useful for bugreport; 'emerge --info' for perl"
+HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	https://dev.gentoo.org/~tove/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc sparc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	virtual/perl-Term-ANSIColor
+	>=dev-perl/PortageXS-0.02.04"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin ${PN} || die
+}
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
new file mode 100644
index 000000000000..06aecf2e5fe0
--- /dev/null
+++ b/app-portage/pfl/Manifest
@@ -0,0 +1,8 @@
+AUX e-file-20110906-http-response.patch 356 SHA256 472ec1ed6bd3497467fd0f94add7f7dcba4cc259edd120e0ae1a55c614a5b06a SHA512 92d469ebff864e47a196db012d4b04422700b76bddbdcd03c8c2dce26015f2e354b41d4cea0e458383ca72f356843d137f3de64b78f0ddf416fb31d846dbcbab WHIRLPOOL 55fbaf1816091d3e4a4f0b534f5bf0f9e8873f3f394f57044c7991e0821280afa72ed5b5d80018d39bb1ece8665493d88f50f63dc9142dff9a4a1ebb771e4895
+AUX e-file-20110906-portageq.patch 1256 SHA256 a52b0ed637b5a3839a2310121480cf227c85dbf3d48910e6143a8524c770cbba SHA512 370f74f68888860e8b8d82ea55288c67df45e946e3fc1ff6e4a0c24a4036a045a942347c7eaee02574f7c3d66a6c5c5b3a2208a2c7457f4e7d1fed65e95466aa WHIRLPOOL 00dd91b89d4326fc7497ac0ef396afdc932c16be999050b4ddae300cfdf5afd959cff3f6c63fd0f8471dfdedb5b0521fd84b43973e4c8000c42e12de145681c0
+AUX pfl-2.4-reponame.patch 336 SHA256 04d5dfbfffa599fa85ce062654c4267c8186b6443ace02b2f544da113f0f3002 SHA512 bb1d4af5b29f070ef75cebd0374fd50556bbc38c8b7b15256c1156dae9887b6e794a0bcc35a199e4e232cae20251a7b74da614779ed589ae9f0420829a5a4659 WHIRLPOOL 8b64335b45cbabbb81d6e0102712cfd8f280f4bb49b3a76c709871983514dbdd43533b5b9308f777f30b2bd359629c8e7c8adca689591caf7d680929afa2a882
+DIST pfl-2.4.tar.bz2 6274 SHA256 7e09db7fe79a2c0cdd8faf39ff05069f5c03b5f994168ecb0395c628b8d5f297 SHA512 a33712bc38d6e02474856dc3a9eac0d39be032a9554f2510815602e94648cd6bf499111a3354568788ddcc0a653a2ac54fac56b0af03fb1cf822ec44ffcb1d72 WHIRLPOOL 3091e30199313c27b88f35563825c2add7bcee972337ef8936636342442b663d12d5ad3c178342812906476071d7224ff134eacdabbf9f7478d7823d793b128f
+EBUILD pfl-2.4-r4.ebuild 1133 SHA256 1e5be517667c5c99fdb6998eb83569ca3bce588007840ed52f35e9f70f102fd7 SHA512 5af730fc92de9ac3975ee483c8cfb0555bb08db5df66f6e2c097f855c8d7bb0512a2ca790d08b5aaf9d8d95731002458d4933fcd5031f118c32318213e56c851 WHIRLPOOL a1b1e5bc4aa0e1e0357761d8303262cede0ad28804a7aa43debb64ea9b225c083e86034fc6bbdab8f6df4aed27b185bbbfeb7e78812d713bbc91137c15befa86
+MISC ChangeLog 2960 SHA256 4c3bb76764b346d02f29df97685dd1d96debd361393fce162a47f5bcf44f7ed9 SHA512 33894b9d0cbb3a802ba0a36aad3f5482faa04965ffcc276b2d5859da90ef36e4c28362a0366c11b7b8992e22fe3961655a8414e365a1d58f56980ce1c53b8807 WHIRLPOOL 1a711a68940e9741196c2e6b162d14b0d87db0b0a79bb383beb4ccc0b94eff611a05c8f8639fc9ede48b3e34bbf5d9b1e3ed4f7674b3db3fd1b79b73ad7877d0
+MISC ChangeLog-2015 10167 SHA256 12f1cd1664e0ce0475ab52dcd1b7ab17e2f85b97fd5300cd208c0cac60b9daf2 SHA512 145c998c21e856bc6b7db9b00551599a03b4ad3b3cafdf3834a0c56f90559f8cbbc99d95da5ce43680103b080806b40403e0fac7ef216639569c20154e5bd6c0 WHIRLPOOL 41cde280c45411ec630603109c37dc204e18151bb5f9afcbba88d22071b8f6087793393c0fb00ffe661ad0e856127f25d58de8590f55683d60c8cd989465ed53
+MISC metadata.xml 495 SHA256 5a64abb9fd0ab4245e2eeae52c57f72f318f1de415b4d7fed195869f5f584c0a SHA512 b556cae880b209d43627f462f429c4aa71f023e96f6bef4eb2fbed854d28e94be98a3f07e65b980dbc22e6ad9b7da6fc284402329119a47538a2eb1158ce942b WHIRLPOOL cbdd3aa1f51296d606e162e0070458452313febba533acde3ae5ef7ebfced15ff019c6ca8f270f1b490c10b6d87a9258cc2f717048263f8d8d7f92eb67fb5ecf
diff --git a/app-portage/pfl/files/e-file-20110906-http-response.patch b/app-portage/pfl/files/e-file-20110906-http-response.patch
new file mode 100644
index 000000000000..672cde5f5375
--- /dev/null
+++ b/app-portage/pfl/files/e-file-20110906-http-response.patch
@@ -0,0 +1,11 @@
+--- bin/e-file	2013-10-14 21:33:54.421701259 +0200
++++ bin/e-file	2013-10-14 21:34:10.004702370 +0200
+@@ -25,7 +25,7 @@
+ 
+ URL="http://www.portagefilelist.de/index.php/Special:PFLQuery2?file=$1&searchfile=lookup&lookup=file&txt"
+ 
+-curl -s $URL | awk -v isgentoo=$isgentoo '
++curl -s -f $URL | awk -v isgentoo=$isgentoo '
+ BEGIN{
+ 	FOUND=0
+ 	if(isgentoo){
diff --git a/app-portage/pfl/files/e-file-20110906-portageq.patch b/app-portage/pfl/files/e-file-20110906-portageq.patch
new file mode 100644
index 000000000000..2a65519f459b
--- /dev/null
+++ b/app-portage/pfl/files/e-file-20110906-portageq.patch
@@ -0,0 +1,44 @@
+--- bin/e-file
++++ bin/e-file
+@@ -16,11 +16,11 @@
+ 	exit 1
+ fi
+ 
+-if type emerge >/dev/null 2>&1; then
++if type portageq >/dev/null 2>&1; then
+ 	isgentoo=1
+ else
+ 	isgentoo=0
+-	echo 'WARNING: "emerge" no found. If your system is not gentoo, a part of function will not available!' >&2
++	echo 'WARNING: "portageq" no found. If your system is not gentoo, a part of function will not available!' >&2
+ fi
+ 
+ URL="http://www.portagefilelist.de/index.php/Special:PFLQuery2?file=$1&searchfile=lookup&lookup=file&txt"
+@@ -29,8 +29,7 @@
+ BEGIN{
+ 	FOUND=0
+ 	if(isgentoo){
+-		"emerge --info | grep PORTDIR" | getline
+-		split($0,PORTDIR,/\"/)
++		"portageq get_repo_path $(portageq envvar EROOT) gentoo" | getline PORTDIR
+ 	}
+ }
+ {
+@@ -75,7 +74,7 @@
+ 				}
+ 			
+ 				NF=0
+-				cmd="(grep -h HOMEPAGE\\= " PORTDIR[2] "/" pkg "/*.ebuild | tail -n 1)2>/dev/null"
++				cmd="(grep -h HOMEPAGE\\= " PORTDIR "/" pkg "/*.ebuild | tail -n 1)2>/dev/null"
+ 				cmd | getline
+ 				if(NF==0){
+ 					HOMEPAGE=""
+@@ -85,7 +84,7 @@
+ 				}
+ 				
+ 				NF=0
+-				cmd="(grep -h DESCRIPTION " PORTDIR[2] "/" pkg "/*.ebuild | tail -n 1)2>/dev/null"
++				cmd="(grep -h DESCRIPTION " PORTDIR "/" pkg "/*.ebuild | tail -n 1)2>/dev/null"
+ 				cmd | getline
+ 				if(NF==0){
+ 					DESCRIPTION=""
diff --git a/app-portage/pfl/files/pfl-2.4-reponame.patch b/app-portage/pfl/files/pfl-2.4-reponame.patch
new file mode 100644
index 000000000000..a9041d46b329
--- /dev/null
+++ b/app-portage/pfl/files/pfl-2.4-reponame.patch
@@ -0,0 +1,11 @@
+--- pfl/pfl.py	(Revision 68)
++++ pfl/pfl.py	(Arbeitskopie)
+@@ -226,6 +226,8 @@
+ 				v = '%s-%s' % (v, r)
+ 				
+ 			repo, = self._vardbapi.aux_get(cpv, ['repository'])
++			if len(repo) == 0:
++				repo, = self._vardbapi.aux_get(cpv, ['REPOSITORY'])
+ 
+ 			# timestamp of merge
+ 			mergedstamp = self._vardbapi.aux_get(cpv, ['_mtime_'])[0]
diff --git a/app-portage/pfl/metadata.xml b/app-portage/pfl/metadata.xml
new file mode 100644
index 000000000000..534265d6749f
--- /dev/null
+++ b/app-portage/pfl/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>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>bugs@portagefilelist.de</email>
+			<name>Daniel Buschke</name>
+		</maintainer>
+	</upstream>
+	<use>
+		<flag name="network-cron">Adds a cron job which does a weekly submit of the package database</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-portage/pfl/pfl-2.4-r4.ebuild b/app-portage/pfl/pfl-2.4-r4.ebuild
new file mode 100644
index 000000000000..2a623a82db6e
--- /dev/null
+++ b/app-portage/pfl/pfl-2.4-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Searchable online file/package database for Gentoo"
+HOMEPAGE="http://www.portagefilelist.de"
+SRC_URI="http://files.portagefilelist.de/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="+network-cron"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	net-misc/curl
+	sys-apps/portage[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	epatch "${FILESDIR}"/e-file-20110906-http-response.patch \
+		"${FILESDIR}"/e-file-20110906-portageq.patch \
+		"${FILESDIR}"/pfl-2.4-reponame.patch
+}
+
+python_install_all() {
+	if use network-cron ; then
+		exeinto /etc/cron.weekly
+		doexe cron/pfl
+	fi
+
+	keepdir /var/lib/${PN}
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT%/}/var/lib/${PN}/pfl.info" ]]; then
+		touch "${EROOT%/}/var/lib/${PN}/pfl.info" || die
+		chown -R 0:portage "${EROOT%/}/var/lib/${PN}" || die
+		chmod 775 "${EROOT%/}/var/lib/${PN}" || die
+	fi
+}
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
new file mode 100644
index 000000000000..11202928726b
--- /dev/null
+++ b/app-portage/portage-utils/Manifest
@@ -0,0 +1,12 @@
+AUX portage-utils-0.61-solaris.patch 599 SHA256 7a5fbdd3f3ed89e7c2fa92c9acc61bd855aac81427326cfe47d09c8508686fb6 SHA512 e8da9c632f1637cd36c0302b065b03c89be412170354038a8b180d977d03db8a54188f1f920f4a2044696d9f5f008a26465e81210e7e7cdce73ea4c9fe048fbd WHIRLPOOL 07725da5a91e8bc8f62ccca59865263e6a86ebc5fbc564a8ac176185c07dfda3fa543a002d08b82f40891949ee5e8af5f1c249a9869e9f9a2c2cd465a0674431
+AUX post_sync 190 SHA256 73560378a5ef2bc39ced8f954f3d371f89d04fa45301f6e6471262caff03d5bf SHA512 0153d2931c2d2a0f03e74f75dadc14d115c0d0e50cbc43e17c1b05a6a406b4bf47435bd32d1b2f559ce6a576e24a30dcf47e8ea6d346371553560ceb055b4429 WHIRLPOOL 747a31cb3d31c242f4272940cdba19c62b0b4a60e93f5c8fa558325c8733c74cf1494d53e6b8b931a60d3529bb75fb043f210d98238f37b0f19857a612927b78
+AUX q-reinitialize 68 SHA256 e7aa83822c78d89d128d10e61ff30f529ea5af3c3b9b4395db6c213675b11e3b SHA512 d322fc0e3fd82583e9cfc6ffa95636134e4491e63fc1a1f34dcda58a1749c3ebcda97caee47bea4f44fb056c35c97e30819dd22e5c2ed8c936e0863466ebf6ae WHIRLPOOL 95f691370916fb749c67dffc176a0a1fef75f4eb5c21e0ff0d06e825ebe204cd7cf3412e26d4f4a204b166a882819379442203235a0cc0110a21d11311a0afd3
+DIST portage-utils-0.62.tar.xz 527216 SHA256 f6ce1938e41ec2073be12568470a7aae51489579add0709c08af5d9be1c0c563 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1 WHIRLPOOL 105d60d3f778a79972e39d2d8e78aa8b971f085721362e4d594d86006752d97b25d41a1e5a9006f603cda0088da89abb179d8bc129815c1363f30dfb6ff59891
+DIST portage-utils-0.63.tar.xz 529012 SHA256 7a754cccad2d4c3331d348ba9df51bb3b9565866674303152b55248b05130a02 SHA512 2b0bceee63b894e7f517f3c938a1873aa90c41b668abbf6a39125a1bb9ce1059731e34216cc357787b5cbf83a0cf0748530147262673ea0bc26404d6274714eb WHIRLPOOL fdaec19af639c744394063dd57f7e64fb02ff10c4ee5b1ef2f49928df6d47fb5bf732e547264390787e20ca6e3251be3935e9f348f2510aa0fc6779778ca44ba
+DIST portage-utils-0.64.tar.xz 533124 SHA256 a53505758d04b2115f636afc9f0c15176a591f3cdb58f684cfd148b29c4783f0 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7 WHIRLPOOL 19e34782c2f1ed637db73865acc6c07c4162ace55c0b24287bf92c66a9ebea4ca0ab230bb94478aa71bee72280231f75dd5de4eb8fc10248b52ee77cc977392e
+EBUILD portage-utils-0.62.ebuild 2255 SHA256 521aa5d3d09a887c1971d6f2003840feba084f26ab58806bfbda8113c57759ba SHA512 7623733d270ec35228f8ae3383ec123a4593e764aad2c960ab37ad3e08e616cc60e690dc59494dfcf4a06162ff822377bda580a0393beda20ea026bf557cf22e WHIRLPOOL 74b65fa301f624495c83fbfeb47e1f1d1e34efb2531778ab2ca2df9dd42c97db5b668c6e11464071b88183637c4b38824fc669363607eaf05cfb1c1fc23a975e
+EBUILD portage-utils-0.63.ebuild 1202 SHA256 3b1d9e46fc06983f68e1596f696e5577a1ac915e2f8dc30810b87be66c34224e SHA512 59a8f22bff1da852dbc0b4cf6d37b98c8a7dbf4c1fe5abed40f771479471a08de418a4e898d90b6e52fd13a1bf92e6a3f74a88792bf52b54de27d9ae41cec3ad WHIRLPOOL 5b99ad53bdc322a9d4216c018b98d430a3f3003e8b0884be7b2613f3ca89a38c4040377f3b69502542db819b5ed96c75ad48362c5b357578680a4ab1e4a68962
+EBUILD portage-utils-0.64.ebuild 1098 SHA256 23f610445cdfd8eb57a5b34d9628c3d9e5d3e0ebb8fb836d43e4f8ba344948d0 SHA512 3623da7562f2c7e8ccfb2c9ba8229346615a730dd8dbd23bfffc6379cd3b182ca789aa5fb4b875d68070b78e931cc72971028094a366d757c23b02c5352994dd WHIRLPOOL 0eb66ff10058d12957d372262e3ef3e213d6bc5c751bcfc0d838c2a5de16446696a541d8a2886b455e7895956f4d0486b2010efec7b2e3b4198ada0b6850ef42
+MISC ChangeLog 5551 SHA256 ff22e38cd7884953731308cce4eec5c58ab6fc20346fe1f63b67b8218f5a3045 SHA512 b60867699b62397ad1eeaa58a1f7a39ab7582b73df14901a3d7fc12c7c073a31090e051b8e5de4dca5ab5998765b20a015783569b2678efdd19b6d868a9b4ad0 WHIRLPOOL 69858193d50d6c894f176dffa6ea92cd759a1ed0eecb3403d3c695211260f9301e3dac724f0ab9571f74afc2d28b3e4512f18a5eb7b865eb97c36ec47bc31385
+MISC ChangeLog-2015 29800 SHA256 fb987414375c6e0cf3014c646223045e16cb82678578617025df2a8b51c05312 SHA512 3905ac03de51f61ceaeb5873c57702459af1dc6158594015752e2b72a636006664ee1a6da783f531a27988352d73c9dd8a68aa1775d44fd9649565ca380a2134 WHIRLPOOL ee3a960bc7e66f1f5501b2ad24aedacc7fada42337a3f3a7a6478098e48177f8c334749b13272fb27ba4ddefa37dcc3d85826decabe7363230bcb80973cae427
+MISC metadata.xml 214 SHA256 67bae2549564e628c2309c047a10077b3864da7f3903a79a64597be1197ca4d4 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd WHIRLPOOL be2c2d84627f9fd53ea5a6b1d1e7bb570423c19588c69157546fa3f6d615be5f98caf2227a0d218ff4ca5df3433baefef6f6d2d7b1ecdec773f8ba8689477758
diff --git a/app-portage/portage-utils/files/portage-utils-0.61-solaris.patch b/app-portage/portage-utils/files/portage-utils-0.61-solaris.patch
new file mode 100644
index 000000000000..8bcc9c1b0bad
--- /dev/null
+++ b/app-portage/portage-utils/files/portage-utils-0.61-solaris.patch
@@ -0,0 +1,27 @@
+qcache: work around missing d_type/DT_DIR
+
+--- qcache.c
++++ qcache.c
+@@ -750,13 +750,21 @@
+ 
+ 		xasprintf(&catpath, "%s/dep/%s", portedb, data->overlay);
+ 		dir = opendir(catpath);
+-		while ((de = readdir(dir)))
++		while ((de = readdir(dir))) {
++#ifndef DT_DIR
++			struct stat s;
++			if (stat(de->d_name, &s))
++				continue;
++			if (S_ISDIR(s.st_mode) && de->d_name[0] != '.') {
++#else
+ 			if (de->d_type == DT_DIR && de->d_name[0] != '.') {
++#endif
+ 				bool ok;
+ 				allcats = add_set_unique(de->d_name, allcats, &ok);
+ 				if (ok)
+ 					++numcat;
+ 			}
++		}
+ 		closedir(dir);
+ 		free(catpath);
+ 
diff --git a/app-portage/portage-utils/files/post_sync b/app-portage/portage-utils/files/post_sync
new file mode 100644
index 000000000000..e94ea5d0257a
--- /dev/null
+++ b/app-portage/portage-utils/files/post_sync
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Copyright 2006-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+for f in /etc/portage/postsync.d/* ; do
+	[ -x "${f}" ] && "${f}"
+done
+:
diff --git a/app-portage/portage-utils/files/q-reinitialize b/app-portage/portage-utils/files/q-reinitialize
new file mode 100644
index 000000000000..7bca1a86b3ae
--- /dev/null
+++ b/app-portage/portage-utils/files/q-reinitialize
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -x /usr/bin/q ] && /usr/bin/q -r ${PORTAGE_QUIET:+-q}
+:
diff --git a/app-portage/portage-utils/metadata.xml b/app-portage/portage-utils/metadata.xml
new file mode 100644
index 000000000000..496b9d3fd3e6
--- /dev/null
+++ b/app-portage/portage-utils/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>vapier@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-portage/portage-utils/portage-utils-0.62.ebuild b/app-portage/portage-utils/portage-utils-0.62.ebuild
new file mode 100644
index 000000000000..ede0015835af
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.62.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit flag-o-matic toolchain-funcs eutils
+
+DESCRIPTION="small and fast portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-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="nls static"
+
+RDEPEND="dev-libs/iniparser:0"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	static? ( dev-libs/iniparser:0[static-libs] )"
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
+	if use prefix || ! use kernel_linux || \
+	   has_version '<sys-libs/glibc-2.10'
+	then
+		econf --with-eprefix="${EPREFIX}"
+	else
+		tc-export CC
+	fi
+}
+
+src_compile() {
+	emake NLS=$(usex nls)
+}
+
+src_install() {
+	default
+
+	exeinto /etc/portage/bin
+	doexe "${FILESDIR}"/post_sync
+	insinto /etc/portage/postsync.d
+	doins "${FILESDIR}"/q-reinitialize
+
+	# Portage fixes shebangs, we just need to fix the paths in the files
+	sed -i \
+		-e "s:\(/etc/portage/postsync.d\|/usr/bin/q\):${EPREFIX}&:g" \
+		"${ED}"/etc/portage/bin/post_sync \
+		"${ED}"/etc/portage/postsync.d/q-reinitialize || die
+}
+
+pkg_preinst() {
+	# preserve +x bit on postsync files #301721
+	local x
+	pushd "${ED}" >/dev/null
+	for x in etc/portage/postsync.d/* ; do
+		[[ -x ${EROOT}/${x} ]] && chmod +x "${x}"
+	done
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "${EPREFIX}/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
+		elog "If you wish for it to be automatically run at the end of every --sync:"
+		elog "   # chmod +x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
+		elog "Normally this should only take a few seconds to run but file systems"
+		elog "such as ext3 can take a lot longer.  To disable, simply do:"
+		elog "   # chmod -x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
+	fi
+}
diff --git a/app-portage/portage-utils/portage-utils-0.63.ebuild b/app-portage/portage-utils/portage-utils-0.63.ebuild
new file mode 100644
index 000000000000..7cb197753ca9
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.63.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit flag-o-matic toolchain-funcs eutils
+
+DESCRIPTION="small and fast portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-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="nls static"
+
+RDEPEND="dev-libs/iniparser:0"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	static? ( dev-libs/iniparser:0[static-libs] )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.61-solaris.patch
+	epatch_user
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
+	if use prefix || ! use kernel_linux || \
+	   has_version '<sys-libs/glibc-2.10'
+	then
+		econf --with-eprefix="${EPREFIX}"
+	else
+		tc-export CC
+	fi
+}
+
+src_compile() {
+	emake NLS=$(usex nls)
+}
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
new file mode 100644
index 000000000000..5eb5c140742d
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.64.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit toolchain-funcs
+
+DESCRIPTION="small and fast portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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="nls static"
+
+RDEPEND="dev-libs/iniparser:0"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	static? ( dev-libs/iniparser:0[static-libs] )"
+
+src_configure() {
+	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
+	if use prefix || ! use kernel_linux || \
+	   has_version '<sys-libs/glibc-2.10'
+	then
+		econf --with-eprefix="${EPREFIX}"
+	else
+		tc-export CC
+	fi
+}
+
+src_compile() {
+	emake NLS=$(usex nls) STATIC=$(usex static)
+}
diff --git a/app-portage/porthole/Manifest b/app-portage/porthole/Manifest
new file mode 100644
index 000000000000..9ff8a68e0fff
--- /dev/null
+++ b/app-portage/porthole/Manifest
@@ -0,0 +1,8 @@
+AUX porthole-0.6.1-masking_status.patch 485 SHA256 1ba67b57505994566942f03722b6edccd817550a2fac984fbbcb25bf6c98b254 SHA512 5df59b9ceb47c8e6c5a3ca3c4777efcfdc7ee52e43f0a2121299ac777e2ecbbe707cb330a13355d35862dc5de7fa193fee846063e4825c4537d6c0b6d790bbbe WHIRLPOOL 37d167869602031a66fdc82861d7e50fd94873a98fc288def15386b70240c408c54ad91b825b1f5bf16c5574c6cf3479fbebe6d1e6921974f3f098e0f70b0a09
+AUX porthole-0.6.1-missing-attribute.patch 665 SHA256 4d70d5d85fbc7de42bbef3f4bbe23d0feafd46252d0d38ae76aee9760df437ff SHA512 e450d7d188b7762cebdfd33e6bc586c38e63fec80fe51fd500559587a85e6f5632ad3279d8e8a4bc37781e77f3f6f3df9af8b013f1725dbb47877642177d27d2 WHIRLPOOL 7b16c44840dd93b728e401606ba902b8b8f3b6fe0826592d7ce7e6b0e9eae48b7be3a3942d9c57a2e3a908a71f13c0b1908e26219b890dec5f5866045fff240b
+AUX porthole-0.6.1-missing_import.patch 858 SHA256 d79428460882d99d4dc0fa5130a1adcb7523488347309a95fd37b7312b0dd8a1 SHA512 aa61359f9b0d53ffeb3a68bdcacf0010de2a789ea70b1bc0a1035d649ff3986e7fb44292fced65f5652475956d7a10d15907a4e6fa139854f7cdb4a7db1eaebd WHIRLPOOL 7a7c6b4a0a140133eda665163e309c2a42d77c2a3e092584a834c834dfca18de51a425d6b2bc54d8bf93a5de3e8c7ea12ece3f586fa04f558a8133e66ec6122e
+DIST porthole-0.6.1.tar.bz2 958696 SHA256 eb9991cb078f51f5b4c9900995ffc3f7f5e3891e62b10cd1c5384efece010d62 SHA512 9bc1d79c587ad8228b9bb4eee6cb32559a5d7b6a9f4f6ece752fce9030f71fdbfd6158d7a2a055641b63df1f0a1c31995747e15b618de79cd8a7a56e4d8f634c WHIRLPOOL 8f9cf3b2d7b4ec44b0425115b19c9c00b4fe816d035d512b305a5e3d02f7e92f2b0d12057b141f123ff2d8c747e23e8075bb1afefe5bb02d9a02884f08eb1ba7
+EBUILD porthole-0.6.1-r4.ebuild 2058 SHA256 2bce7c3456df5094ed1307678ae2dbc67a74d754e46c8f47b91945529cb6c13c SHA512 f789e86f3bb4665ca54a66e8227ad052f8b61939debdf3766c824124824c65375249f1bd45ec6133125e55bf76eb1576bf56d289103df2888fd4765798371417 WHIRLPOOL 55c6cd53ff02209b405f1bed61b73d573836fb393a2422af2c577982d760ddcbcf3957533bff4ab3437439af568fd72461b91ef1eaa7183f246b9ed9ab85e5db
+MISC ChangeLog 4483 SHA256 46fcaf95a9a08347ad67c123fb4333b6156822a736199d9bacf3e263e4ad6292 SHA512 58c7f534cf66636b0edad3052745089ac5e768cfc24451502e628b35766f813582e687a900ed999f26394d79f550f768a01aef7662e2ab6a6f0f75e5b5db4d41 WHIRLPOOL 549b33867c6b640b36172c385b227221cbef37a4f820d95beb07d22e288a5308f3325cb48da53c37853b9cdc76b92d3c86707554ac07c76d72163631d6c4ab81
+MISC ChangeLog-2015 8339 SHA256 df5c0159e8ade95fa3cbe5a4439a312acab491ef610138a488e817700951a426 SHA512 9cfa1959db0c7245e4aa7ee9a19092f2df8ce4720766c508e43378ba6292bd6a1f165d527798a6fc9e80746f551c7621abc08e179b6013cc94401fa40f30bb6e WHIRLPOOL c888c6904682354af48d82da6591bc2e6bc651eeb76ed44809ca7f8ff6948d6e77ff110f1b8380e2cc673c589bfc65a5dc9c6ced579b45e077f8a92f86c257ac
+MISC metadata.xml 519 SHA256 1ff4cba79b5d41c816d399d6c4c34f496b8629ec29b021fb5f4841deba021a41 SHA512 d149c76b00d1a0c2b3593f90b45b944de122498606d86cb90f992beb2a727bb3b32f610e823c0d0ad0377538616447698acc110c6f152860844a53610d531220 WHIRLPOOL de36e63d874fe0a125c58ebd982d2eec526cb61e899ff05e555856f32deb6d4c90a999cbddec1ed8ff16325d8278ad14aedf2cbc3205d2717c07c99eacbdefba
diff --git a/app-portage/porthole/files/porthole-0.6.1-masking_status.patch b/app-portage/porthole/files/porthole-0.6.1-masking_status.patch
new file mode 100644
index 000000000000..e626fbb3c58f
--- /dev/null
+++ b/app-portage/porthole/files/porthole-0.6.1-masking_status.patch
@@ -0,0 +1,17 @@
+Index: porthole/backends/portagelib.py
+===================================================================
+--- porthole/backends/portagelib.py	(revision 1209)
++++ porthole/backends/portagelib.py	(working copy)
+@@ -452,7 +452,11 @@
+ 
+ 
+ def get_masking_status(ebuild):
+-    return portage.getmaskingstatus(ebuild)
++    try:
++        status = portage.getmaskingstatus(ebuild)
++    except KeyError:
++        status = ['deprecated']
++    return status
+ 
+ 
+ def get_masking_reason(ebuild):
diff --git a/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch b/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch
new file mode 100644
index 000000000000..aa011a174b17
--- /dev/null
+++ b/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch
@@ -0,0 +1,14 @@
+diff -uNr porthole/db/user_configs.py.old porthole/db/user_configs.py
+
+--- porthole/db/user_configs.py.old	2010-11-27 13:34:35.000000000 +0600
++++ porthole/db/user_configs.py	2010-11-27 13:31:24.000000000 +0600
+@@ -364,7 +364,7 @@
+             debug.dprint("USER_CONFIGS: set_user_config(): add: " +
+                 "%s,\n remove: %s " %(str(add),str(remove)))
+             set_config.set_user_config(filename=file, name=name, ebuild=ebuild,
+-                comment=comment, username=privileges.USER, 
++                comment=comment, username=privileges.user, 
+                 add=add, remove=remove)
+             self.set_config_callback()
+         else:
+			 
+\ No newline at end of file
diff --git a/app-portage/porthole/files/porthole-0.6.1-missing_import.patch b/app-portage/porthole/files/porthole-0.6.1-missing_import.patch
new file mode 100644
index 000000000000..33c9e4ee3353
--- /dev/null
+++ b/app-portage/porthole/files/porthole-0.6.1-missing_import.patch
@@ -0,0 +1,19 @@
+--- porthole/db/user_configs.py	2010/03/20 12:32:29	1217
++++ porthole/db/user_configs.py	2010/03/20 14:10:46	1218
+@@ -36,6 +36,7 @@
+ from porthole import backends
+ portage_lib = backends.portage_lib
+ from porthole.utils import debug
++from porthole.privilege import controller as privileges
+ 
+ ## set up this module to act as a user configs data server,
+ ## watch the user configs for changes and auto update
+@@ -363,7 +364,7 @@
+             debug.dprint("USER_CONFIGS: set_user_config(): add: " +
+                 "%s,\n remove: %s " %(str(add),str(remove)))
+             set_config.set_user_config(filename=file, name=name, ebuild=ebuild,
+-                comment=comment, username=priviliges.USER, 
++                comment=comment, username=privileges.USER, 
+                 add=add, remove=remove)
+             self.set_config_callback()
+         else:
diff --git a/app-portage/porthole/metadata.xml b/app-portage/porthole/metadata.xml
new file mode 100644
index 000000000000..860c6eb9ffd5
--- /dev/null
+++ b/app-portage/porthole/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="project">
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+		<description>Upstream Maintainer (please CC on bugs)</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">porthole</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-portage/porthole/porthole-0.6.1-r4.ebuild b/app-portage/porthole/porthole-0.6.1-r4.ebuild
new file mode 100644
index 000000000000..033b4f609fee
--- /dev/null
+++ b/app-portage/porthole/porthole-0.6.1-r4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A GTK+-based frontend to Portage"
+HOMEPAGE="http://porthole.sourceforge.net"
+SRC_URI="mirror://sourceforge/porthole/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ~ppc64 sparc x86 ~x86-fbsd"
+IUSE="nls"
+LANGS="de pl ru vi it fr tr"
+for X in $LANGS; do IUSE="${IUSE} linguas_${X}"; done
+
+RDEPEND=">=sys-apps/portage-2.1[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	gnome-base/libglade:2.0
+	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.14 )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-masking_status.patch" # bug 307037
+	"${FILESDIR}/${P}-missing_import.patch" # bug 323179
+	"${FILESDIR}/${P}-missing-attribute.patch" #bug 323179
+)
+
+src_compile(){
+	# Compile localizations if necessary
+	if use nls ; then
+		cd scripts
+		./pocompile.sh -emerge ${LINGUAS} || die "pocompile failed"
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc TODO README NEWS AUTHORS
+
+	keepdir /var/log/porthole
+	fperms g+w /var/log/porthole
+	keepdir /var/db/porthole
+	fperms g+w /var/db/porthole
+
+	# nls
+	if use nls; then
+		# mo directory doesn't exists with nls enabled and unsupported LINGUAS
+		[[ -d porthole/i18n/mo ]] && domo porthole/i18n/mo/*
+	fi
+}
+
+pkg_preinst() {
+	chgrp portage "${D}"/var/log/porthole
+	chgrp portage "${D}"/var/db/porthole
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Porthole has updated the way that the upgrades are sent to emerge."
+	einfo "In this new way the user needs to set any 'Settings' menu emerge options"
+	einfo "Porthole automatically adds '--oneshot' for all upgrades selections"
+	einfo "Other options recommended are '--noreplace'  along with '--update'"
+	einfo "They allow for portage to skip any packages that might have already"
+	einfo "been upgraded as a dependency of another previously upgraded package"
+	einfo
+}
diff --git a/app-portage/porticron/Manifest b/app-portage/porticron/Manifest
new file mode 100644
index 000000000000..952683d9c4ac
--- /dev/null
+++ b/app-portage/porticron/Manifest
@@ -0,0 +1,8 @@
+AUX porticron-0.7_p20140126-portage-2.2.8.patch 760 SHA256 3d1c38df727ecf5d85e8ede02e07e22f53fe77d58350eb7a7d1e8e825a266eb6 SHA512 4822999104a803f1d053ecde0b3332f13c81e1cb83c57fc142cac65895d3ffffa1c40e6c3ee35e791da4b650bf1e526de0e296944e854f5f8d477cefc6ae74a9 WHIRLPOOL ed1dec7f763a97dcd8fd074c70be8942a4bf52bb891bf2bcd696fb9b632e1272947604819b52b05cd9d9cb650b54ccaf8d89638e8c380cd9b68a322a075061f7
+DIST porticron-0.7.1.tar.gz 6530 SHA256 1ca246a905e7cd5b11c5d7145359e19b9f31efff79cda26d881a30c9adf804c7 SHA512 ba2f365011e1ad2f7cb67d655839fa425791ab95309753719b4a4206db735f141d473d24bbb68da25a88db54919d033f53efaf497c26de71f3edb4a39dcc957c WHIRLPOOL 092460831ad8151873b81e3a702603e031d3800878775ed428e8b060b9bd0f901f84501eb4a076d1e24e3600cfdcf0bd98602b43ea2ba94c0ac4ca538421caa2
+DIST porticron-0.7_p20140126.tar.gz 4453 SHA256 46b61958a182d9cdd73dbea76a017855eebc4780dc75692503c0d1e7ff0ea482 SHA512 c14c5ff18eff74d7c225883dc0e1cea16666f0dcab07f9b249aed0db2874179eacc824c0f35dc2cfd97dc0c2db5f2bf6d13c3e76a2cd1b87de46fb073622f3d5 WHIRLPOOL f932a2319be582b564412badb456daf0fd86e3991ffc63fa25718337669b860097ac6d446a220f4e56e3a97cb8660a9f2bd25eeb1c54a2921fb0c7d6991bad5b
+EBUILD porticron-0.7.1.ebuild 575 SHA256 05eeb8a44a908c18d08a639e711765c7d51224dcd5a6a4556adf09a52762b4a8 SHA512 041b14559b7df56ff482d979ec71cbd7ebd0ae18d8ed8c1413e939f66f8c7eb502d6b8ced13affdd898940c3c000e70ba17b86f3b8bc1ef312a139c57fc714fb WHIRLPOOL 91ccf62817452c88dd0b4f1954132f3932edb2f8b2e6fca2ef414c5807153222b0732a53da15c64d78a147cbd13edab3d55a5e937f8a5a4c656483abb52dbf58
+EBUILD porticron-0.7_p20140126.ebuild 627 SHA256 87663b268ff95241568a38a6add5997615e8bed2ea371be8c00134f37ae0d0ca SHA512 50fe9bbbab60dbbe8201228e4b60a997f0efe47e59b7e64e4a21cf82e5ecc5c58f56c4684280a3a339c3e0c7e2a168be92409de0ab1eaf125968a7abd17691fa WHIRLPOOL f561340400b48ca5187fe04909122a40bc8658159f71da0d1dbcea503c3ab530f194906d807b8f275f0ae4b595498e1229250928c9e88de23bf7e6882481da12
+MISC ChangeLog 2255 SHA256 49fb3c9ad46f55a6c714a1df70e1355974eb247044ff32a9ba5684d69aeb9911 SHA512 2000448406cba9d387e87d606f679d3e099f0b6ffba0ac94cb6ee635cd31d9bfd9f4fd9bb480b6aa0cb5be5839900d9f228600741293131d2888e1e335c217db WHIRLPOOL f0983912cc3f3a66a6a155d031f60dde6fb4beca49c57f7201b2d80bd57c54e2225275b44a9550a3801084f1b54fc5c8b8c521d2d99838821ad6586a418a498f
+MISC ChangeLog-2015 5612 SHA256 fe9da197183b9bb8df851f24bcadd2ec22a586d86977ab4f3e33d989f3522d74 SHA512 d66acfc2b2acb0c1bfc3851ff49b7e952614b76a4d859a4b86758227247b8e46ad2447a3376709bb9c2d4a0ff0c5223c7b1b92a262f40453f3c150f14397bd32 WHIRLPOOL 58d36a80ea414cd0d43e43ce92bc0ed491369a7e813dea9e431cadde2f7f8db98769b6d066a367c3b9d1b9bc49b288d6f2ace39f702fe512d85896d8d4979f6f
+MISC metadata.xml 334 SHA256 f6eea71b2fbd43c88a164106d4b47352c9bc921399cb918a88e097be0f520141 SHA512 76cdaa159c6d7b418e8f4cbab36fdcd1ec7361f176222e305622b57084514719c94c3b97377cbbe847a3c5e5b34e0118983d07983db9af107b41cf1b3ed49136 WHIRLPOOL ef78405ba444270422277cca367bbfa46bcb56d7e391e7bd4cd72c116f442c9491c3a64fb816cbaba6c4d00859738b14be9dff2f3241a13f488bf40ddf97ea62
diff --git a/app-portage/porticron/files/porticron-0.7_p20140126-portage-2.2.8.patch b/app-portage/porticron/files/porticron-0.7_p20140126-portage-2.2.8.patch
new file mode 100644
index 000000000000..4531ab638fd8
--- /dev/null
+++ b/app-portage/porticron/files/porticron-0.7_p20140126-portage-2.2.8.patch
@@ -0,0 +1,26 @@
+From 7a7002d5af62d0a4791a386cdc3560330f27f1c0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rainer=20M=C3=BCller?= <raimue@codingfarm.de>
+Date: Sun, 26 Jan 2014 23:23:03 +0100
+Subject: [PATCH] Avoid the deprecated `portageq portdir'
+
+This implements the fix proposed in hollow/porticron#6.
+---
+ bin/porticron | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/porticron b/bin/porticron
+index d168b27..86a1f70 100755
+--- a/bin/porticron
++++ b/bin/porticron
+@@ -117,7 +117,7 @@ FQDN=$(hostname --fqdn)
+ HOST=$(hostname -s)
+ IP=$(dig +short ${FQDN} | tr '\n' ' ')
+ DATE=$(date -R)
+-PORTDIR=$(portageq portdir)
++PORTDIR=$(portageq get_repo_path $(portageq envvar EROOT) gentoo)
+ 
+ # replace variables
+ for var in FQDN HOST IP DATE; do
+-- 
+1.8.5.1
+
diff --git a/app-portage/porticron/metadata.xml b/app-portage/porticron/metadata.xml
new file mode 100644
index 000000000000..ffc8ad5b4f61
--- /dev/null
+++ b/app-portage/porticron/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="github">gentoo/porticron</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/porticron/porticron-0.7.1.ebuild b/app-portage/porticron/porticron-0.7.1.ebuild
new file mode 100644
index 000000000000..1c9da925a281
--- /dev/null
+++ b/app-portage/porticron/porticron-0.7.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils vcs-snapshot
+
+DESCRIPTION="cron script to sync portage and send update mails to root"
+HOMEPAGE="https://github.com/gentoo/porticron"
+SRC_URI="https://github.com/gentoo/porticron/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-portage/gentoolkit
+	net-dns/bind-tools
+"
+DEPEND=""
+
+src_install() {
+	dosbin bin/porticron
+	insinto /etc
+	doins etc/porticron.conf
+}
diff --git a/app-portage/porticron/porticron-0.7_p20140126.ebuild b/app-portage/porticron/porticron-0.7_p20140126.ebuild
new file mode 100644
index 000000000000..26330c1b01f8
--- /dev/null
+++ b/app-portage/porticron/porticron-0.7_p20140126.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils vcs-snapshot
+
+DESCRIPTION="cron script to sync portage and send update mails to root"
+HOMEPAGE="https://github.com/gentoo/porticron"
+SRC_URI="https://github.com/hollow/${PN}/tarball/df727fe -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86"
+IUSE=""
+
+RDEPEND="
+	app-portage/gentoolkit
+	net-dns/bind-tools
+"
+DEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-portage-2.2.8.patch
+}
+
+src_install() {
+	dosbin bin/porticron
+	insinto /etc
+	doins etc/porticron.conf
+}
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
new file mode 100644
index 000000000000..1761a1e39cfd
--- /dev/null
+++ b/app-portage/portpeek/Manifest
@@ -0,0 +1,11 @@
+DIST portpeek-2.1.18.tar.gz 12233 SHA256 9cda20138b3e75f6f38c3cb117b23e9c01f2b8b0418379bfd68a30b09da835c5 SHA512 f3f7e728c3255f39394393344af469f719f5d0d83e45ddc75b81d53a2c80fe0ac18a606f5c8159917f784eb10a0b0bede44f7d764e11986d492ac61da48f4ade WHIRLPOOL cb97f3cdf95e5c31ba6530757bcd5aed71aa5e0dbb5d683db9a7d5a2e5f4fb9137463167802fe131b4bc6d2d8df2bf662bba9d1282f5df4148444c52ff59fc57
+DIST portpeek-2.1.21.tar.gz 12624 SHA256 cb36444a476158636d96d7b3ec0fc9c123ad2ec908338307763daa65b78e1d0e SHA512 7b430c85dcba4ac0d29e6fd680eaed2b59a60b5d21f0b93e90ff2e3ca7018f141e858accf10a035b75463c067444ef1be718be198bb6cc237827c9b7e67df76e WHIRLPOOL d1ae1ecb9e797cf809cca24f923fe879842605d1a4be1d43187bbfa2f03d15d18c2b667e86fa580a4ecea801b7db9208c374ba2aea70de086bb9115b0127027e
+DIST portpeek-2.1.24.tar.gz 12736 SHA256 3bc943e53033d389bae4b2bb2a8c54e8dc38aba4a922520c3c70c9cafdc5ba37 SHA512 fa702483c6182685242a26401ba1b058f276ff6fd18839fd7f566d48cb62c2cb78029789089267cbacc1b435f1aa815c0df51ace06afa71f242298511fa79d7a WHIRLPOOL 7ecede0af297b5601dde4fc166e53e2814aee6999f9f59c62a53c2edd209ea2ebe95d41cd3a671eb12cf1cf43e10e46d4143529cbf9b48609ce0df5eac2ca5a5
+DIST portpeek-2.1.25.tar.gz 12864 SHA256 2f5338a13dd9f02caaab14812e448463ed7d93ef268a846e78be3f7669af0144 SHA512 9d40ad387d252bb42a66e27de00c63f2f4725a794da7bb35fc5519ab5342e309c823090005336b22add81e4e043b0fa4f97ecdb86bb20bf595fd4188bda437f9 WHIRLPOOL 979a79ce6d16406d54b2f4c21dcca7249e395938588be903857a9ae5bc9336d0c5f036dbf747d256331fe4b5a222f2c03914859ec4df414a75a5dc9db3ac1125
+EBUILD portpeek-2.1.18.ebuild 693 SHA256 19006348d767436d5305e3575f37a67e834e5763c714fa1bffd5591e9350bf85 SHA512 9939d7c34a7cbad1b29c16c291b24a19101f0de387fc043ed18006aa95c12d440dce872da8552a3e8450a24e2be30b87b3d27027559602a40afa2d4b93724226 WHIRLPOOL a49cf2441658c30efa9118eaca77af1ebcd4447612e1b146a2c9640a641e44367131ac5bc4cdc0a630741b75d110cf90a1e2e76fc3d9f38456627e79afa4f561
+EBUILD portpeek-2.1.21.ebuild 692 SHA256 3e5eb1246f012ff90a05806861b34e4f48505cf2120c66b2116cc407bdaeaf06 SHA512 02c5df14a945e8703ae9f99ee7d61083dd6b125ff5bc7d12c9f09cb0c8006335696de9113a8d490ce6460bd59d5b91f71af50119efb943e62b5d6ad196149045 WHIRLPOOL 552121580937a68504e7b2b38bc73c860af1bf119b83a74d0a7453bbb0a70876d9c2ffa8df6354235a24ebb56fdd4e1178c0824a915591e992cf81e427dac3bf
+EBUILD portpeek-2.1.24.ebuild 694 SHA256 93135a7248f58eea01f412aa83644663eca977b0306fed96fe38f8b779983779 SHA512 2de0c56eade803cfde62c396d3347a4a3242ad36c10d5dcd4895d3c7fe2b20c62fb9c8272e6558c6b7a64b25301575a9416a5e1dc788002825f3f9a8c3c5ce6b WHIRLPOOL fb122ecdecd8c97d48a9f28a3ffc0a20d6dcad2cc38a70c2eacd87cbd02cc9bb95bfe084411bf1940a534183713b242f82fb6d76ab410563ba5e6709c22ef75a
+EBUILD portpeek-2.1.25.ebuild 698 SHA256 2cd9bc011a2cb5750298714483c0c3c4241a17f2e4fafe82209886b3c4eb7ce3 SHA512 6b7f0c41f96f5b5c6dd540cc894541eb30168b28a0481df2f6d03e5be2214ac5ef75eedafc28356c8fedccf742be667e24c072f750aa4428b1c3bc55f710b27b WHIRLPOOL 687b1ed97d4b500c977685d2a530e0b7befacc3213775b6620f7364240530ad45c684ccee4cbd9ec7c2d0e5752b3289077cea190d57eff0b47cd214e07f7a6b0
+MISC ChangeLog 3419 SHA256 93a95a493d6e4df8fa3ca029bed1d49794867d7b0c6c75d578693d6866fd50cf SHA512 65afdce362d8acb088463848f2a763941bcda512d2dc22e00f9019358d9a1581f7236221a1e5f246c98fa9d6e80971d7198142a9d970c0a04b5cfa79431e54e1 WHIRLPOOL 7c60a68ddedc232cd2ea8cf5fc871ceded00695b826dcff5249126ef84d6ad330072bdea207c04663c0da142aa641b87f70df0d037fb0fccf27f5744c472c9e2
+MISC ChangeLog-2015 31060 SHA256 0fc958653e62fce77a58c5dae71e4cdd43d38f95ae35623a34a7e863888a16e1 SHA512 7abca4fa041737a134f635e7552e813c216a0aec2139deca491de7e975f127f2a9150a25d7c000f36c5835140aec59e691c40ec787da48af25227d4ff3519b3b WHIRLPOOL 4deecd94c0f61e07acdcbfb40e82e4a2393b99f7f714a44b3677f0d490558ccc7c56a5df56be1ad80c1755d7434e670b5ff4a2f88d3d1b31fd307f4dc16122a0
+MISC metadata.xml 222 SHA256 efc75c99c2e9a0faf92d38715e27f5f41737e41d09151cdfc6c2705acf9e0181 SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9 WHIRLPOOL bfbd07ff189028e3d1f64d5a77675072490de02c469f821434f53dac8538c45a1e446401cacde68bc626febe7bcafd3b6a526f569873fa49c7f018cdca9f6963
diff --git a/app-portage/portpeek/metadata.xml b/app-portage/portpeek/metadata.xml
new file mode 100644
index 000000000000..542792de7f1b
--- /dev/null
+++ b/app-portage/portpeek/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>mpagano@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-portage/portpeek/portpeek-2.1.18.ebuild b/app-portage/portpeek/portpeek-2.1.18.ebuild
new file mode 100644
index 000000000000..a0de25ebb266
--- /dev/null
+++ b/app-portage/portpeek/portpeek-2.1.18.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit python-r1
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
+SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc sparc x86 ~x86-fbsd"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=app-portage/gentoolkit-0.3.0.9-r2
+	>=sys-apps/portage-2.2.8-r1[${PYTHON_USEDEP}]"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	doman *.[0-9]
+}
diff --git a/app-portage/portpeek/portpeek-2.1.21.ebuild b/app-portage/portpeek/portpeek-2.1.21.ebuild
new file mode 100644
index 000000000000..a737d6375ca0
--- /dev/null
+++ b/app-portage/portpeek/portpeek-2.1.21.ebuild
@@ -0,0 +1,29 @@
+# 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} )
+
+inherit python-r1
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
+SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc sparc x86 ~x86-fbsd"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=app-portage/gentoolkit-0.3.2-r1
+	>=sys-apps/portage-2.3.0[${PYTHON_USEDEP}]"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	doman *.[0-9]
+}
diff --git a/app-portage/portpeek/portpeek-2.1.24.ebuild b/app-portage/portpeek/portpeek-2.1.24.ebuild
new file mode 100644
index 000000000000..f10e14f839ac
--- /dev/null
+++ b/app-portage/portpeek/portpeek-2.1.24.ebuild
@@ -0,0 +1,29 @@
+# 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} )
+
+inherit python-r1
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
+SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=app-portage/gentoolkit-0.3.3
+	>=sys-apps/portage-2.3.5[${PYTHON_USEDEP}]"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	doman *.[0-9]
+}
diff --git a/app-portage/portpeek/portpeek-2.1.25.ebuild b/app-portage/portpeek/portpeek-2.1.25.ebuild
new file mode 100644
index 000000000000..6863af18ad73
--- /dev/null
+++ b/app-portage/portpeek/portpeek-2.1.25.ebuild
@@ -0,0 +1,29 @@
+# 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="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
+SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=app-portage/gentoolkit-0.4.0
+	>=sys-apps/portage-2.3.8[${PYTHON_USEDEP}]"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	doman *.[0-9]
+}
diff --git a/app-portage/pqlop/Manifest b/app-portage/pqlop/Manifest
new file mode 100644
index 000000000000..2d21c83259eb
--- /dev/null
+++ b/app-portage/pqlop/Manifest
@@ -0,0 +1,5 @@
+DIST pqlop-0.02.py 14920 SHA256 aeeeeab1e5d38a694c80401472506e95a10f4ffada70765b9737d6f8f0f6c543 SHA512 6c2cca73b5280ac8563573a81baff56cf43420c18688fae497ff014ec5668806d589473a2cb8093fdc07675761e8c4124f18eb568a74e1816f573541459d633f WHIRLPOOL fedf6a863b02a74017eb40a3175a377f8e4b96c2e7f1c09e516769cf6c30dff60ca96d586d27ac17442e9194a401f9a4a7011af7b5aef939bee38e6837829dc6
+EBUILD pqlop-0.02-r1.ebuild 669 SHA256 39589b15e31b4e767bddad3c80f4ddc60f499a4c4dd29417886046a5862b7966 SHA512 d466476b0e24a31eacbd5d4ed5919e0b9fc35a31756cbe39b71336be771f3dcefb5e51ea4a5a0e7cb43e70bc65222389177e95e4d621e402c647c2b623e82a13 WHIRLPOOL c790a9d97fd7953c4ab03ce5104001422e3bc1c604ab62fafd5c61ff4c6bba66ee63b1f5b2d89bb6baec0176721e0d7b9edf7c4f51d19f21c23fe1e14767a928
+MISC ChangeLog 2556 SHA256 bc08f3cf53093860e1f7c48b22c613d5c42e713809430ca839f69ce4bfeb5a12 SHA512 a12a43e154e32f9db3cc1b7618188295b0ebd07abef2de658104d56d5ead5836574307f774933f41917c80227786fca56a3436bf40eb1847059c5cea657d274e WHIRLPOOL c398c06037465005402066a9f0469d1b382e261ca532798e95f7a58977baa4d7a1530e7b72ebe3bb5bf0c23c8b451ed919d1f27b43a5800e3f94639532023654
+MISC ChangeLog-2015 1468 SHA256 91ee10df315f3ad57f227cee800d24cf0545b0d5018bce348fadf55bbe5cf26a SHA512 e7b4a9f10c7ab36a47edb99c55faf81c0144f33d4ad214429bf370ab8b4185907e82e46ff8482b19c0544afbb81dfacc313c2d113c4bb0bf0113faa493f6480c WHIRLPOOL 10fd28144b175787ce01bf23ec103885d47bc3a09cbd6314f098b8078b3c7869b0c78401855ad35c5be087b4298802d72a75f00c7d0cf009464a4db4c4e7806f
+MISC metadata.xml 643 SHA256 2268473544d103b4041b96925676ccd44c06b3f6688c93a055ddf1f60c7c6838 SHA512 29086f30b727cf54cdaa4e027d005934a1a24f46b6637cb9c3b0e9cdde1977714ba66aab3a07c2c400af47d955907a98ed74409fe761abe206845734b3588194 WHIRLPOOL cbea868d30400f6220f79d08e86efb7ade747d5e261ac5a85003db534bd1d9489258e722aea8c7abf19963cc5cac8c4d322673c240deb096517e1c740ce369dc
diff --git a/app-portage/pqlop/metadata.xml b/app-portage/pqlop/metadata.xml
new file mode 100644
index 000000000000..db9e20be8780
--- /dev/null
+++ b/app-portage/pqlop/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>lk4d4math@gmail.com</email>
+    <name>Alexandr Morozov</name>
+    <description>Author and maintainer of package</description>
+  </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>
+  <upstream>
+    <remote-id type="bitbucket">LK4D4/pqlop</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/pqlop/pqlop-0.02-r1.ebuild b/app-portage/pqlop/pqlop-0.02-r1.ebuild
new file mode 100644
index 000000000000..9ec8cda42764
--- /dev/null
+++ b/app-portage/pqlop/pqlop-0.02-r1.ebuild
@@ -0,0 +1,34 @@
+# 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} )
+
+inherit python-r1
+
+DESCRIPTION="emerge.log parser written in python"
+HOMEPAGE="https://bitbucket.org/LK4D4/pqlop"
+SRC_URI="https://bitbucket.org/LK4D4/pqlop/raw/${PV}/pqlop.py -> ${P}.py"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	${PYTHON_DEPS}
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	newbin "${DISTDIR}"/${P}.py ${PN} || die "newbin failed"
+	python_replicate_script "${ED}"/usr/bin/${PN} || die "python_replicate_script failed"
+}
diff --git a/app-portage/prefix-chain-setup/Manifest b/app-portage/prefix-chain-setup/Manifest
new file mode 100644
index 000000000000..9c9c1c95df9d
--- /dev/null
+++ b/app-portage/prefix-chain-setup/Manifest
@@ -0,0 +1,6 @@
+EBUILD prefix-chain-setup-0.5.ebuild 6092 SHA256 40e3567bfa308232625ae87a1284fc6b3ec70a009ae5b65a5b9b5b2380e6936e SHA512 0615e9e39ce76aedd0c682ba098770c1a209ac92d849bbb702fc76091c3999dfc88aa1e8fab9cbe029f1a30f0eb1dcd7601add4b8f8de318bf76e3193010a36c WHIRLPOOL f8f7d345b3b1fd65e6dac678f787f7fe6f76304aede9cef9919e935c933477f3c4fdeee6013b957b427e0b3b7a48c6725bbd6d0fd19cd972dd4a32a93efd5e44
+EBUILD prefix-chain-setup-0.6.ebuild 6123 SHA256 298b8cb6b57c95eb69f3188e724a55b91e2bf1faa37bedcde306d3412fd8e8e2 SHA512 300c8ad213b746d5c62d07bbb918c6a3370184221d57b5dd3b19ea475c00aa22a7e0acf75cf40b8eab04e71e1fb58562c073964e7c77b747860c947cba15d602 WHIRLPOOL 8d615edd03c30ff3dd32d64c08aeb54a44ae4f3190c7edac5d1459824dc65db8e8a8c71c49f05ff95cd0253790f25ad154af179e360d5efdcfced4d5f8da7ead
+EBUILD prefix-chain-setup-0.7.ebuild 6610 SHA256 96af82ed07dc16e79b79c2b75db79cef2800e62ab897411e8fbed1bb4e2fdf63 SHA512 ee6013082cf657586aeac0261f7cab46bfff1b66190f70cc0b3cc842d7803ae246d25b41c18a0f94954c48d8da6ba51bf04174418b81ad43567c4f9ee1e200ba WHIRLPOOL bdd9f3f9ae74826b75b796dece4286c9da8efefb65c9f175ba3354c5782292f1e89f1a4976fd8c6dddb4506089a99e532ab4d81bfc5494bb441b2f9eace8e830
+MISC ChangeLog 2663 SHA256 f890acb2155ae94ba9cbf54ad58453ffdd1f70f1217735826302676f12759fc4 SHA512 4c0d894163a995d953fdb349eee7a4ed4f78c0e432affe0f5276da8cb87efafff64e46424f30b802a306a70a272e0cf909074975184cdf26881376312ae95432 WHIRLPOOL 599e93c6065f2851d5b216d8e831540e9e7742d04373c8877bc373f2af8df4ad64fd3db7b2b08af3e10ecedb08ebb2e7c16cb774e1aca5cd4052f414bdb0b70a
+MISC ChangeLog-2015 1566 SHA256 d16bc55408e0c2d99fc83fe70c374312f6b8f05abf19a948f51ff74af2f21bbc SHA512 eddb0024e9d9d6720a63cc3552290b1d6254dc66be3e7f50aa30b5980c3f9625a6dc71b4afde440e5beafdad954064e41fc9ec0846aee2cbfbe83e9fd659d629 WHIRLPOOL 08ddd55cfd3c2a7db491c349e0178cdcd95b7b79f30a50990d805cbb272e79ccdd46cb92551470a07b59075eb0a197ca19fbde5308d46853c5ffeff281bf2c0f
+MISC metadata.xml 243 SHA256 acb891975882d2b75bb5a1a76063f1d61ad1d96c799548e7f141e1623a0cc57e SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9 WHIRLPOOL e06d2acbfdb38aa17edb0da41bcafece9c9a5d0542c9192ee3b74ae0b6250d24fb096e3a153f6a215a29d3dd7c5794f2c67f0917db3aa3f1cc65e86ea27e228f
diff --git a/app-portage/prefix-chain-setup/metadata.xml b/app-portage/prefix-chain-setup/metadata.xml
new file mode 100644
index 000000000000..d33cce94b0d4
--- /dev/null
+++ b/app-portage/prefix-chain-setup/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>prefix@gentoo.org</email>
+	<name>Gentoo Prefix</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-portage/prefix-chain-setup/prefix-chain-setup-0.5.ebuild b/app-portage/prefix-chain-setup/prefix-chain-setup-0.5.ebuild
new file mode 100644
index 000000000000..6ec586c0c17c
--- /dev/null
+++ b/app-portage/prefix-chain-setup/prefix-chain-setup-0.5.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit prefix
+
+DESCRIPTION="Chained EPREFIX bootstrapping utility"
+HOMEPAGE="https://dev.gentoo.org/~mduft"
+SRC_URI=""
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~ppc-aix ~x64-cygwin ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_install() {
+	eprefixify ${PN}
+	sed -e "s,@GENTOO_PORTAGE_CHOST@,${CHOST}," -i ${PN}
+	dobin ${PN}
+}
+
+src_unpack() {
+	{ cat > "${PN}" || die; } <<'EOF'
+#!/usr/bin/env bash
+
+PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
+PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
+CHILD_EPREFIX=
+CHILD_PROFILE=
+DO_MINIMAL=no
+DO_SOURCES=no
+PORT_TMPDIR=
+
+#
+# get ourselfs the functions.sh script for ebegin/eend/etc.
+#
+for f in \
+	/lib/gentoo/functions.sh \
+	/etc/init.d/functions.sh \
+	/sbin/functions.sh \
+; do
+	if [[ -r ${PARENT_EPREFIX}${f} ]]; then
+		. "${PARENT_EPREFIX}${f}"
+		f=found
+		break
+	fi
+done
+
+if [[ ${f} != found ]]; then
+	echo "Cannot find Gentoo functions, aborting." >&2
+	exit 1
+fi
+
+for arg in "$@"; do
+	case "${arg}" in
+	--eprefix=*)	CHILD_EPREFIX="${arg#--eprefix=}"	;;
+	--profile=*)	CHILD_PROFILE="${arg#--profile=}"	;;
+	--sources)		DO_SOURCES=yes						;;
+	--portage-tmpdir=*)	PORT_TMPDIR="${arg#--portage-tmpdir=}" ;;
+
+	--help)
+		einfo "$0 usage:"
+		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create chained to the prefix"
+		einfo "                         where this script is installed (${PARENT_EPREFIX})"
+		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
+		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
+		einfo "  --sources              inherit 'source' statements from the parent make.conf"
+		einfo "  --portage-tmpdir=DIR   use DIR as portage temporary directory."
+		exit 0
+		;;
+	esac
+done
+
+#
+# sanity check of given values
+#
+
+test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
+test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
+test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
+test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
+if test -n "${PORT_TMPDIR}"; then
+	if ! test -d "${PORT_TMPDIR}"; then
+		einfo "creating temporary directory ${PORT_TMPDIR}"
+		mkdir -p "${PORT_TMPDIR}"
+	fi
+fi
+
+einfo "creating chained prefix ${CHILD_EPREFIX}"
+
+#
+# functions needed below.
+#
+eend_exit() {
+	eend $1
+	[[ $1 != 0 ]] && exit 1
+}
+
+#
+# create the directories required to bootstrap the least.
+#
+ebegin "creating directory structure"
+(
+	set -e
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage
+	mkdir -p "${CHILD_EPREFIX}"/var/log
+)
+eend_exit $?
+
+#
+# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
+#
+ebegin "creating make.conf"
+(
+	set -e
+	echo "#"
+	echo "# The following values where taken from the parent prefix's"
+	echo "# environment. Feel free to adopt them as you like."
+	echo "#"
+	echo "CFLAGS=\"$(portageq envvar CFLAGS)\""
+	echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\""
+	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
+	niceness=$(portageq envvar PORTAGE_NICENESS || true)
+	[[ -n ${niceness} ]] &&
+		echo "PORTAGE_NICENESS=\"${niceness}\""
+	echo "USE=\"prefix-chaining\""
+	echo
+	echo "# Mirrors from parent prefix."
+	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
+	echo
+	echo "#"
+	echo "# Below comes the chained-prefix setup. Only change things"
+	echo "# if you know exactly what you are doing!"
+	echo "# by default, only DEPEND is inherited from the parent in"
+	echo "# the chain. if you want more, make it a comma seperated"
+	echo "# list - like this: DEPEND,RDEPEND,PDEPEN - which would the"
+	echo "# all that is possible"
+	echo "#"
+	echo "PORTDIR=\"$(portageq envvar PORTDIR)\""
+	echo "SYNC=\"$(portageq envvar SYNC || true)\""
+	if test -z "${PORT_TMPDIR}"; then
+		case "${CHILD_PROFILE}" in
+		*winnt*)	echo "PORTAGE_TMPDIR=/var/tmp" ;;
+		*)			echo "PORTAGE_TMPDIR=\"${CHILD_EPREFIX}/var/tmp\"" ;;
+		esac
+	else
+		echo "PORTAGE_TMPDIR=\"${PORT_TMPDIR}\""
+	fi
+	echo "READONLY_EPREFIX=\"${PARENT_EPREFIX}:DEPEND\""
+
+	if test "${DO_SOURCES}" == "yes"; then
+		# don't fail if nothing found
+		for f in /etc/portage/make.conf /etc/make.conf; do
+			if [[ -r ${PARENT_EPREFIX}${f} ]]; then
+				egrep "^source .*" "${PARENT_EPREFIX}${f}" 2>/dev/null || true
+				break;
+			fi
+		done
+	fi
+) > "${CHILD_EPREFIX}"/etc/portage/make.conf
+eend_exit $?
+
+#
+# create the make.profile symlinks.
+#
+ebegin "creating make.profile"
+(
+	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
+)
+eend_exit $?
+
+#
+# adjust permissions of generated files.
+#
+ebegin "adjusting permissions"
+(
+	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
+)
+eend_exit $?
+
+#
+# now merge some basics.
+#
+ebegin "installing required basic packages"
+(
+	# this -pv is there to avoid the global update output, which is
+	# there on the first emerge run. (thus, just cosmetics).
+	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -p1qO baselayout-prefix > /dev/null 2>&1
+
+	set -e
+	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -1qO gentoo-functions baselayout-prefix prefix-chain-utils
+
+	# merge with the parent's chost. this forces the use of the parent
+	# compiler, which generally would be illegal - this is an exception.
+	# This is required for example on winnt, because the wrapper has to
+	# be able to use/resolve symlinks, etc. native winnt binaries miss that
+	# ability, but interix binaries don't.
+	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" CHOST="${PARENT_CHOST}" emerge -1qO gcc-config
+
+	# select the chain wrapper profile from gcc-config
+	env -i "$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
+
+	# do this _AFTER_ selecting the correct compiler!
+	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -1qO libtool
+)
+eend_exit $?
+
+#
+# wow, all ok :)
+#
+ewarn
+ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
+ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
+ewarn
+EOF
+}
diff --git a/app-portage/prefix-chain-setup/prefix-chain-setup-0.6.ebuild b/app-portage/prefix-chain-setup/prefix-chain-setup-0.6.ebuild
new file mode 100644
index 000000000000..da26e810781f
--- /dev/null
+++ b/app-portage/prefix-chain-setup/prefix-chain-setup-0.6.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="Chained EPREFIX bootstrapping utility"
+HOMEPAGE="https://prefix.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~ppc-aix ~x64-cygwin ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_install() {
+	eprefixify ${PN}
+	sed -e "s,@GENTOO_PORTAGE_CHOST@,${CHOST}," -i ${PN}
+	dobin ${PN}
+}
+
+src_unpack() {
+	{ cat > "${PN}" || die; } <<'EOF'
+#!/usr/bin/env bash
+
+PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
+PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
+CHILD_EPREFIX=
+CHILD_PROFILE=
+DO_MINIMAL=no
+DO_SOURCES=no
+PORT_TMPDIR=
+
+#
+# get ourselfs the functions.sh script for ebegin/eend/etc.
+#
+for f in \
+	/lib/gentoo/functions.sh \
+	/etc/init.d/functions.sh \
+	/sbin/functions.sh \
+; do
+	if [[ -r ${PARENT_EPREFIX}${f} ]]; then
+		. "${PARENT_EPREFIX}${f}"
+		f=found
+		break
+	fi
+done
+
+if [[ ${f} != found ]]; then
+	echo "Cannot find Gentoo functions, aborting." >&2
+	exit 1
+fi
+
+for arg in "$@"; do
+	case "${arg}" in
+	--eprefix=*)	CHILD_EPREFIX="${arg#--eprefix=}"	;;
+	--profile=*)	CHILD_PROFILE="${arg#--profile=}"	;;
+	--sources)		DO_SOURCES=yes						;;
+	--portage-tmpdir=*)	PORT_TMPDIR="${arg#--portage-tmpdir=}" ;;
+
+	--help)
+		einfo "$0 usage:"
+		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create chained to the prefix"
+		einfo "                         where this script is installed (${PARENT_EPREFIX})"
+		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
+		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
+		einfo "  --sources              inherit 'source' statements from the parent make.conf"
+		einfo "  --portage-tmpdir=DIR   use DIR as portage temporary directory."
+		exit 0
+		;;
+	esac
+done
+
+#
+# sanity check of given values
+#
+
+test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
+test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
+test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
+test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
+if test -n "${PORT_TMPDIR}"; then
+	if ! test -d "${PORT_TMPDIR}"; then
+		einfo "creating temporary directory ${PORT_TMPDIR}"
+		mkdir -p "${PORT_TMPDIR}"
+	fi
+fi
+
+einfo "creating chained prefix ${CHILD_EPREFIX}"
+
+#
+# functions needed below.
+#
+eend_exit() {
+	eend $1
+	[[ $1 != 0 ]] && exit 1
+}
+
+#
+# create the directories required to bootstrap the least.
+#
+ebegin "creating directory structure"
+(
+	set -e
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage
+	mkdir -p "${CHILD_EPREFIX}"/var/log
+)
+eend_exit $?
+
+#
+# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
+#
+ebegin "creating make.conf"
+(
+	set -e
+	echo "#"
+	echo "# The following values where taken from the parent prefix's"
+	echo "# environment. Feel free to adopt them as you like."
+	echo "#"
+	echo "CFLAGS=\"$(portageq envvar CFLAGS)\""
+	echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\""
+	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
+	niceness=$(portageq envvar PORTAGE_NICENESS || true)
+	[[ -n ${niceness} ]] &&
+		echo "PORTAGE_NICENESS=\"${niceness}\""
+	echo "USE=\"prefix-chaining\""
+	echo
+	echo "# Mirrors from parent prefix."
+	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
+	echo
+	echo "#"
+	echo "# Below comes the chained-prefix setup. Only change things"
+	echo "# if you know exactly what you are doing!"
+	echo "# by default, only DEPEND is inherited from the parent in"
+	echo "# the chain. if you want more, make it a comma seperated"
+	echo "# list - like this: DEPEND,RDEPEND,PDEPEN - which would the"
+	echo "# all that is possible"
+	echo "#"
+	echo "PORTDIR=\"$(portageq envvar PORTDIR)\""
+	echo "SYNC=\"$(portageq envvar SYNC || true)\""
+	if test -z "${PORT_TMPDIR}"; then
+		case "${CHILD_PROFILE}" in
+		*winnt*)	echo "PORTAGE_TMPDIR=/var/tmp" ;;
+		*)			echo "PORTAGE_TMPDIR=\"${CHILD_EPREFIX}/var/tmp\"" ;;
+		esac
+	else
+		echo "PORTAGE_TMPDIR=\"${PORT_TMPDIR}\""
+	fi
+	echo "READONLY_EPREFIX=\"${PARENT_EPREFIX}:DEPEND\""
+
+	if test "${DO_SOURCES}" == "yes"; then
+		# don't fail if nothing found
+		for f in /etc/portage/make.conf /etc/make.conf; do
+			if [[ -r ${PARENT_EPREFIX}${f} ]]; then
+				egrep "^source .*" "${PARENT_EPREFIX}${f}" 2>/dev/null || true
+				break;
+			fi
+		done
+	fi
+) > "${CHILD_EPREFIX}"/etc/portage/make.conf
+eend_exit $?
+
+#
+# create the make.profile symlinks.
+#
+ebegin "creating make.profile"
+(
+	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
+)
+eend_exit $?
+
+#
+# adjust permissions of generated files.
+#
+ebegin "adjusting permissions"
+(
+	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
+)
+eend_exit $?
+
+#
+# now merge some basics.
+#
+ebegin "installing required basic packages"
+(
+	# this -pv is there to avoid the global update output, which is
+	# there on the first emerge run. (thus, just cosmetics).
+	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -p1qO baselayout-prefix > /dev/null 2>&1
+
+	set -e
+	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -1qO \
+		gentoo-functions baselayout-prefix elt-patches gnuconfig prefix-chain-utils
+
+	# merge with the parent's chost. this forces the use of the parent
+	# compiler, which generally would be illegal - this is an exception.
+	# This is required for example on winnt, because the wrapper has to
+	# be able to use/resolve symlinks, etc. native winnt binaries miss that
+	# ability, but interix binaries don't.
+	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" CHOST="${PARENT_CHOST}" emerge -1qO gcc-config
+
+	# select the chain wrapper profile from gcc-config
+	env -i "$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
+
+	# do this _AFTER_ selecting the correct compiler!
+	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -1qO libtool
+)
+eend_exit $?
+
+#
+# wow, all ok :)
+#
+ewarn
+ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
+ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
+ewarn
+EOF
+}
diff --git a/app-portage/prefix-chain-setup/prefix-chain-setup-0.7.ebuild b/app-portage/prefix-chain-setup/prefix-chain-setup-0.7.ebuild
new file mode 100644
index 000000000000..9261c360d302
--- /dev/null
+++ b/app-portage/prefix-chain-setup/prefix-chain-setup-0.7.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="Chained EPREFIX bootstrapping utility"
+HOMEPAGE="https://prefix.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-apps/portage[prefix-chaining]"
+
+S="${WORKDIR}"
+
+src_install() {
+	eprefixify ${PN}
+	sed -e "s,@GENTOO_PORTAGE_CHOST@,${CHOST}," -i ${PN}
+	dobin ${PN}
+}
+
+src_unpack() {
+	{ cat > "${PN}" || die; } <<'EOF'
+#!/usr/bin/env bash
+
+PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
+PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
+CHILD_EPREFIX=
+CHILD_PROFILE=
+DO_MINIMAL=no
+DO_SOURCES=no
+PORT_TMPDIR=
+
+#
+# get ourselfs the functions.sh script for ebegin/eend/etc.
+#
+for f in \
+	/lib/gentoo/functions.sh \
+	/etc/init.d/functions.sh \
+	/sbin/functions.sh \
+; do
+	if [[ -r ${PARENT_EPREFIX}${f} ]]; then
+		. "${PARENT_EPREFIX}${f}"
+		f=found
+		break
+	fi
+done
+
+if [[ ${f} != found ]]; then
+	echo "Cannot find Gentoo functions, aborting." >&2
+	exit 1
+fi
+
+for arg in "$@"; do
+	case "${arg}" in
+	--eprefix=*)	CHILD_EPREFIX="${arg#--eprefix=}"	;;
+	--profile=*)	CHILD_PROFILE="${arg#--profile=}"	;;
+	--sources)		DO_SOURCES=yes						;;
+	--portage-tmpdir=*)	PORT_TMPDIR="${arg#--portage-tmpdir=}" ;;
+
+	--help)
+		einfo "$0 usage:"
+		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create chained to the prefix"
+		einfo "                         where this script is installed (${PARENT_EPREFIX})"
+		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
+		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
+		einfo "  --sources              inherit 'source' statements from the parent make.conf"
+		einfo "  --portage-tmpdir=DIR   use DIR as portage temporary directory."
+		exit 0
+		;;
+	esac
+done
+
+#
+# sanity check of given values
+#
+
+test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
+test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
+test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
+test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
+if test -n "${PORT_TMPDIR}"; then
+	if ! test -d "${PORT_TMPDIR}"; then
+		einfo "creating temporary directory ${PORT_TMPDIR}"
+		mkdir -p "${PORT_TMPDIR}"
+	fi
+fi
+
+einfo "creating chained prefix ${CHILD_EPREFIX}"
+
+#
+# functions needed below.
+#
+eend_exit() {
+	eend $1
+	[[ $1 != 0 ]] && exit 1
+}
+
+#
+# create the directories required to bootstrap the least.
+#
+ebegin "creating directory structure"
+(
+	set -e
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.mask
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.force
+	mkdir -p "${CHILD_EPREFIX}"/var/log
+)
+eend_exit $?
+
+#
+# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
+#
+ebegin "creating make.conf"
+(
+	set -e
+	echo "#"
+	echo "# The following values where taken from the parent prefix's"
+	echo "# environment. Feel free to adopt them as you like."
+	echo "#"
+	echo "CFLAGS=\"$(portageq envvar CFLAGS)\""
+	echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\""
+	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
+	niceness=$(portageq envvar PORTAGE_NICENESS || true)
+	[[ -n ${niceness} ]] &&
+		echo "PORTAGE_NICENESS=\"${niceness}\""
+	echo "USE=\"prefix-chain\""
+	echo
+	echo "# Mirrors from parent prefix."
+	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
+	echo
+	echo "#"
+	echo "# Below comes the chained-prefix setup. Only change things"
+	echo "# if you know exactly what you are doing!"
+	echo "# by default, only DEPEND is inherited from the parent in"
+	echo "# the chain. if you want more, make it a comma seperated"
+	echo "# list - like this: DEPEND,RDEPEND,PDEPEN - which would the"
+	echo "# all that is possible"
+	echo "#"
+	echo "PORTDIR=\"$(portageq envvar PORTDIR)\""
+	echo "SYNC=\"$(portageq envvar SYNC || true)\""
+	if test -z "${PORT_TMPDIR}"; then
+		case "${CHILD_PROFILE}" in
+		*winnt*)	echo "PORTAGE_TMPDIR=/var/tmp" ;;
+		*)			echo "PORTAGE_TMPDIR=\"${CHILD_EPREFIX}/var/tmp\"" ;;
+		esac
+	else
+		echo "PORTAGE_TMPDIR=\"${PORT_TMPDIR}\""
+	fi
+	echo "READONLY_EPREFIX=\"${PARENT_EPREFIX}:DEPEND\""
+
+	if test "${DO_SOURCES}" == "yes"; then
+		# don't fail if nothing found
+		for f in /etc/portage/make.conf /etc/make.conf; do
+			if [[ -r ${PARENT_EPREFIX}${f} ]]; then
+				egrep "^source .*" "${PARENT_EPREFIX}${f}" 2>/dev/null || true
+				break;
+			fi
+		done
+	fi
+) > "${CHILD_EPREFIX}"/etc/portage/make.conf
+eend_exit $?
+
+ebegin "creating profile/use.mask"
+cat > "${CHILD_EPREFIX}"/etc/portage/profile/use.mask/prefix-chain-setup <<-'EOM'
+	# masked in base profile, unmask here
+	-prefix-chain
+	EOM
+eend_exit $?
+
+ebegin "creating profile/use.force"
+cat > "${CHILD_EPREFIX}"/etc/portage/profile/use.force/prefix-chain-setup <<-'EOM'
+	# masked in base profile, force here
+	prefix-chain
+	EOM
+eend_exit $?
+
+#
+# create the make.profile symlinks.
+#
+ebegin "creating make.profile"
+(
+	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
+)
+eend_exit $?
+
+#
+# adjust permissions of generated files.
+#
+ebegin "adjusting permissions"
+(
+	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
+)
+eend_exit $?
+
+#
+# now merge some basics.
+#
+ebegin "installing required basic packages"
+(
+	# this -pv is there to avoid the global update output, which is
+	# there on the first emerge run. (thus, just cosmetics).
+	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -p1qO baselayout-prefix > /dev/null 2>&1
+
+	set -e
+	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -1qO \
+		gentoo-functions baselayout-prefix gnuconfig prefix-chain-utils
+
+	# merge with the parent's chost. this forces the use of the parent
+	# compiler, which generally would be illegal - this is an exception.
+	# This is required for example on winnt, because the wrapper has to
+	# be able to use/resolve symlinks, etc. native winnt binaries miss that
+	# ability, but interix binaries don't.
+	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" CHOST="${PARENT_CHOST}" emerge -1qO gcc-config
+
+	# select the chain wrapper profile from gcc-config
+	env -i "$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
+
+	# do this _AFTER_ selecting the correct compiler!
+	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -1qO libtool
+)
+eend_exit $?
+
+#
+# wow, all ok :)
+#
+ewarn
+ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
+ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
+ewarn
+EOF
+}
diff --git a/app-portage/repo-commit/Manifest b/app-portage/repo-commit/Manifest
new file mode 100644
index 000000000000..819fa8a1e41d
--- /dev/null
+++ b/app-portage/repo-commit/Manifest
@@ -0,0 +1,6 @@
+DIST repo-commit-0.4.1.tar.bz2 54416 SHA256 2012984b21af51cb65dfbba7ab67c5df886ff0555143be85763259acb06df1d9 SHA512 25d4ec02605454e49dafb59a753abbe6b28b2e07225d5479bfa0e0d493d3dd6bd2302dd4efaa2d6a6af5f8c7e41a5029ac8edb9d7b1dd8ec9349a057d1d61622 WHIRLPOOL a8f0c46cf950a74b6fdf6d5c0a35bed3fac4a86da16f8c36df2a9da01bc0bbb678044e8640d19b1fb8d5535e34eed65a987e1f4f40c251c2d165b2c4f186dc5f
+EBUILD repo-commit-0.4.1.ebuild 533 SHA256 c360496fe17bf00fbdd9af96c515d252d3938208062086177131044990be8d60 SHA512 2f4882d0b988b1a0f35501f016e6baa35b551e23f94e90b96f557bac294e937f7be85afd25927d686c8da20920976390a6810856006d2ccc9af9c3d937c73ab6 WHIRLPOOL 84168f308a75ba8b602d6626f55a21185553dd0290741b4b697ee467e1f460f76375c56441abd9949c8c644f9340c245976889372cb009e7a882549b3e0df90a
+EBUILD repo-commit-9999.ebuild 682 SHA256 216e3b8e4dec65ec81488148252d825fdeb03789fb4ae311ea24c3c28af90888 SHA512 97f73e3db00fa6d70448f5c9d30db34075c0a7c0db19e06df3b69159c21b02a875a94f9f08826041ecf24f9f83ceaa3c3f63da4e4ab476b822d05892116b138a WHIRLPOOL 711ea0590fcb9fbacec58bf78b9a5af473806961afe2dc6dcbaa995343b5469f4561ed07b63693b1ce848ce62272daecfc6ed0d8ee83bd8188959502849b61c9
+MISC ChangeLog 2917 SHA256 c307e91923f0311537ce2d9d50b43220db9b59ba74aa6b8b302a00fc77c66986 SHA512 fddeb16d7813d813cfb8300211d90dfcad4f04fc2ef7a00dcb5552f9be283c50a526061a9cce4193ea1d9a819a1484dfd3f2da476f127ec94b8d5dfc38e9abd8 WHIRLPOOL 6ec6532fc4df3c308023e3d6df046e1c2dcd4ca159b3cde02d7668c3ab1a757f8c92551abb4a046d04a123a3175e9d3d1f4661f90149937596ac59da84307630
+MISC ChangeLog-2015 1821 SHA256 f1d2e2fd8a8ecad11da71349a81ab5b187e09da1eb911f0e91ce4c1e244b7dc2 SHA512 9ae8b34c597b7fb39e6c07182ce1289f5b3cca196ec99768cc9bc5f6089a276ee70ab0c513cbc58257372632807d64c2c529dcf467b4071f5ef9e8e294e69e64 WHIRLPOOL 7e37b391ecd6936192fd03ed0199cdab1f95ff994983b103832c58f7e4758ff0401f0d8835e181c6c35319eaa7f985362f661748b22141d6ea4808cc06134d7b
+MISC metadata.xml 549 SHA256 c5566a7ef55c6fea787e01abb33aea1d4094279440943a441384bf245a70c261 SHA512 110e2eb5294f6ad2e4d293d582fef925ffea615ec54b5d3b3aaeef66cc36f51da18aa255873da7db072f11a5f9101b7ea4a7443a20254f2ca823dccaaddd4a99 WHIRLPOOL 4f22e5e9d08a4357206e8631eacf7e544f1a8aed17e6ae7d906d7748a9e0e7b20fdc2300e91176cdf8defc46fbef3cec666c4d2c1108a5b731b17a22a023377f
diff --git a/app-portage/repo-commit/metadata.xml b/app-portage/repo-commit/metadata.xml
new file mode 100644
index 000000000000..40c4a119f168
--- /dev/null
+++ b/app-portage/repo-commit/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>binki@gentoo.org</email>
+    <name>Nathan Phillip Brink</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>binki@gentoo.org</email>
+      <name>Nathan Phillip Brink</name>
+    </maintainer>
+    <bugs-to>https://bitbucket.org/gentoo/repo-commit/issues/</bugs-to>
+    <remote-id type="bitbucket">gentoo/repo-commit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/repo-commit/repo-commit-0.4.1.ebuild b/app-portage/repo-commit/repo-commit-0.4.1.ebuild
new file mode 100644
index 000000000000..d9e1004d6089
--- /dev/null
+++ b/app-portage/repo-commit/repo-commit-0.4.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="A repository commit helper"
+HOMEPAGE="https://bitbucket.org/gentoo/repo-commit/"
+SRC_URI="https://www.bitbucket.org/gentoo/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	|| (
+		>=sys-apps/portage-2.2.0_alpha86
+		( >=sys-apps/portage-2.1.10.30
+			<sys-apps/portage-2.2.0_alpha )
+		app-portage/gentoolkit-dev
+	)
+	sys-apps/portage"
diff --git a/app-portage/repo-commit/repo-commit-9999.ebuild b/app-portage/repo-commit/repo-commit-9999.ebuild
new file mode 100644
index 000000000000..e8559e807850
--- /dev/null
+++ b/app-portage/repo-commit/repo-commit-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#if LIVE
+AUTOTOOLS_AUTORECONF=yes
+EGIT_REPO_URI="https://bitbucket.org/gentoo/${PN}.git"
+
+inherit git-r3
+#endif
+
+inherit autotools-utils
+
+DESCRIPTION="A repository commit helper"
+HOMEPAGE="https://bitbucket.org/gentoo/repo-commit/"
+SRC_URI="https://www.bitbucket.org/gentoo/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	|| (
+		>=sys-apps/portage-2.2.0_alpha86
+		( >=sys-apps/portage-2.1.10.30
+			<sys-apps/portage-2.2.0_alpha )
+		app-portage/gentoolkit-dev
+	)
+	sys-apps/portage"
+#if LIVE
+
+KEYWORDS=
+SRC_URI=
+#endif
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
new file mode 100644
index 000000000000..1dbefac415c6
--- /dev/null
+++ b/app-portage/repoman/Manifest
@@ -0,0 +1,16 @@
+AUX repoman-2.3.0-bug-586864.patch 1034 SHA256 178a501c97e39666d49e656ce649c909433848a0ccaa45326fcf238e33ff9299 SHA512 463bd5f0255165faf0c60faa327c29d9eb1a6f9ccdf41369879485f234e1bf9d2713332c115b36088ac9227a56ca154786b3955b2d6e8ffdf7bdc3f10a5a762e WHIRLPOOL 82594eda5b608e4c5651ec769f76eb5842256160430319348f0a3dcc8934278e6ea03d39639e759d9880dd525febc59925e53ee53811fea8071fb000202a361f
+DIST repoman-2.3.0-bug-586864.patch 1074 SHA256 4ad35afd9237be63c1c2c21348501499c252c4bf828a04f08ca0a129e091001d SHA512 b48112a623a4844e5783f229ee0208f729b99ab46128d19735a76633efee17deb81342b5dc8fa67f4f4f5a851509c04c8d2f2ba2cbd992a9d26e61da4ed5f7e8 WHIRLPOOL f1cb4d9a11d8958fae726642bd0d12a0bb8d6564077c09b961fa2f0448c0503132683b4199e37f7cbd5bfd01adb1eede50496ed9b2ad32572284eacd3b2cd2dc
+DIST repoman-2.3.0.tar.bz2 75285 SHA256 e67d1a2dbb89f44e64a49259e64affcf138ade8ad0f397b93c9cbdecd517b726 SHA512 960c63caed12f7c89d374ecceb39677b62d588bf75cc8da1857641c60310061188f4c2fd7177c93a4e8f20cf00a423426f2a70666320f263158531a618a7ff9c WHIRLPOOL bff6d55a4abc5032cd3d04d8e56ec3bb7902c6877836ca4b129f5a57480c01eb6a6225b75fd0cc0b6a2a2991728896ddef3b7ee2a225a901c0523d88d99cecf6
+DIST repoman-2.3.0_rc1.tar.bz2 74621 SHA256 e1de34b710cd43787a91ab49e0b0a6ca32d942ee130ec74523b00f3c5f4ccefa SHA512 7594053472512ab66a269acd1e5f3a9191a519df061ed65b612af0ee30f830ff71ab6b602416aa968476fec1f534ecf313317a28df6120b74c7379197b769983 WHIRLPOOL 9e00736856879f222eaa2f8330109e92b8c7d262ed5a1ef0cf0c3c36f84dfdedfea2de202043aba7585f42353e1ebaf04b16329c812d7e71f957cf697899abd0
+DIST repoman-2.3.1.tar.bz2 76678 SHA256 93a39ff20eac6166ec29497ae2476cc168ea35d8822aaed33a3010fe9c2abf91 SHA512 6655027acaa6b98b7fdf927b6744e87b6ea09fe6d61653874aeb5603943aa9fc68df9435335dfc8f51d25949354660eaccdd1c8b659dbc87aea7a2f8bf3dfd16 WHIRLPOOL 29ddd58a8585a3926853beb66afe5d1a41a16667c9155b7dbc08a63ec02ea8873b304ac7267e3525341cd49c15dcc0dc01e0d0802c61a438fb75b113b7aafd66
+DIST repoman-2.3.2.tar.bz2 77218 SHA256 69b6ed4fae2475f4b4faa4117498caa943ec8e9e360cd5551e819abc7315d19c SHA512 262dfa8d018b318df695003ec1f370d0d2065f50594cfc2c2ef26989409f61d43e6c0e42d279ed1e316e2a9027ca3fd6e46a06b95d80700d57e0bc3e3713cb6c WHIRLPOOL b571a759717af651737047d13dd35f122d982a73091f2c4509ff4e45301badf947ecd10668f10ef5cb865eb0b0e49133ceb4561d9872bde9bc4de7cbbd524360
+DIST repoman-2.3.3.tar.bz2 78045 SHA256 8e8fdb81e3c1f0a7a1d49b161083fa39d47883b3b2bb6ff9456d23f41a75b807 SHA512 17212c19b14817a8a004619dd56ad557457d45919da45edfb27538304e68187fe1104f0b6ccc2b29fa1709645a7a82c75676b118b20d79dc790b0eb2ebf5a2ce WHIRLPOOL b4533763b06ef3e1e2e885bcc5340e05a4d8ab32d47856cbe48920066dcbdb4ce3fd867bef17eecd0caeb91e5481fefdab020e6046518145331727c9496a7a15
+EBUILD repoman-2.3.0-r1.ebuild 2524 SHA256 ced87e9d318754b7a622020f0af5a853a7466f0556fb2ff31a00d197c2ba470d SHA512 4fd4259a8160ea50677dbf7dd790fcd158dd48986e5ba60e6fd45db17d69e70f0a296e5b04f7a4199f1641364a558395723686763787117a0460c4837b89c0d7 WHIRLPOOL 03c0b1f6a9aa5fb54e7f0bab25e7de458ddffe5d213df09eddc07fea95bddbd940aad7f6f4234d7a6fc3f046216541c1286f55a414f4682080dd47ace4b2c1bd
+EBUILD repoman-2.3.0-r2.ebuild 2070 SHA256 b515ace3569a701282ffc57b0e88de2c02648fbb7c71f666adaaa1846a81d9ef SHA512 88c1b2d5bdb4d2673a01bfc818ff86a6d97ada48384fe3f1817fc65c420682e55a8b354ed6cfde341e8d36c443958d65b5753271ce5e0d32cb8888e226eea6eb WHIRLPOOL 99940667dcbe426e757372d0e7862f98f9a4b341c9ae4d6b3507954c024b534442c60650614dad65e8f78596c14817e8d57e6868627a991c0ee7eb08d7dd9e28
+EBUILD repoman-2.3.0_rc1-r1.ebuild 2339 SHA256 4c6c38efdfcde04082c1abccf2a00645acfff98dd7ef89e8691ff5cdc81277f3 SHA512 ea588da9b8b92cbd796093a3300d052d8083f77fd1f59ff62abf670a037e5e81cded59aa9bb8119f5c6fd387e57ccbb86dad6ce3c89dc0ade4bb22622223da5c WHIRLPOOL 93954d495fdec814267153ed0f8e7d27342406a9317c63b05202c7c8f57c16d2205430f1408ec838b93e24e8f871b0676af958c7cabcbd64e6b10ed15386f78a
+EBUILD repoman-2.3.1.ebuild 2308 SHA256 ae768d03e3e3169aaa1f2d71787e6b357fde3149c850ec296dcfc5eb832cd1ac SHA512 3dbdd9a4e2e3a7d7dcff47bd8961556499f9ff4dc16fac691fdd42f0e80c48d3da6bdd51b045f42696b5aed0aed6936d0d3d1b967bb9cec7c5b347e87ff7f84e WHIRLPOOL ed7304e9a4d7e2ba05d1f1958688262e7dab45d55a177ffb73c9c642e1dfc5df89b4b0e0a8d71232c4c62349dab3415cd3aa466959fb2548c870cf6d6987433a
+EBUILD repoman-2.3.2.ebuild 2329 SHA256 3d8f24a69c42d287cfff8426a9ccb4d422cdf46c1aba5e5ef98df35b2b122c8a SHA512 98e29099a07f6e64448c9845f229bc5bb8d6d85e957d84e920f1d6a7c08166c5812e01e8748bc77c9f75694dc1a6f421b7508fc005e24f7782d5cdbf21bc7e31 WHIRLPOOL 3bb64068eed7311ecbf46f8f555f0c4dd7727ecb04ac7f004a3f0a220bc8f724c65613335a705efe66afce0bab3f2cc6efb6ec5d44372f6ecdf11323edfb44e3
+EBUILD repoman-2.3.3.ebuild 2324 SHA256 92f80521ab5cd4260e927492a07452e19fa32a8bbb15adad1cd03ab0649284e1 SHA512 1265b43c98e7b56260133eee8ec958c2232d5f2503ec931cf9e546083b52fd9601cea1c8590e9a3a1ad55c5c56b01efb21697e0ee13447e1809444a323a66a8b WHIRLPOOL 754576724a656034a215431e3fa52b5f9a37fe25e0d31d73b65af2ac1628f4ae15101b658161adc6cefadbb1f278d56a09ceaddda5d17aaadebfe7c354b3b477
+EBUILD repoman-9999.ebuild 1911 SHA256 114c92105f529c817319119d3c8014f37f3fe1b4a5a2596267454b16a98ff428 SHA512 13466195689cc62920b4d1e74a8e0420cf41dd394785d59ed5f9f6f6b2010251fa29223c721d8d0e1e94c613b01c8f467257899327987bd9f18c3830f0826cf5 WHIRLPOOL 85d64a9e32c6294e59a10936d4ee98be8c6c3c8279613f5b782e1b7288e8534c53d0beb147d796102b612d9cdf37c5a9e2a0f662b4b73c0f6224b1b34145d379
+MISC ChangeLog 3297 SHA256 e5006daf1eb546a30991fab2d1cac52df6c32b5527671aaefcc6d1df5013f280 SHA512 46e97258481fd9d9da54ffcd58af12af33fbd640e63658d0169e5118bd8af19e717008e049909754ff1af5645d0233c6ec0c5fed5f7e279e5bb2a13b2a88c500 WHIRLPOOL 7b8729002820e4a461853023ab65acb37edd535712da93f607ac330822c84d3c1159c2198cffb7e90b257e03915925debdcc83a1674bb089f97c7bc03775d466
+MISC metadata.xml 472 SHA256 86bc3425785a5e30c01ee34eec4888dc145ffb17a005a91ceed62141923092ef SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0 WHIRLPOOL dcbe2acccbeb3454b0ec333a99d35332c57801fa52e74efd2a14d4d605e64d26ecb93e41db8ccb40fa2efebe3715a83f7163c19d1e0a1d013c425a0f38ad6e6c
diff --git a/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch b/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch
new file mode 100644
index 000000000000..adba72fdcc57
--- /dev/null
+++ b/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch
@@ -0,0 +1,32 @@
+From ef33db45a0c1d462411d4ced1857a322c0ab28f6 Mon Sep 17 00:00:00 2001
+From: Zac Medico <zmedico@gentoo.org>
+Date: Thu, 23 Jun 2016 23:22:41 -0700
+Subject: repoman: skip QA checks in manifest mode (bug 586864)
+
+The relevent Scanner loop control logic broke in commit 4062c69dc27a
+because it was relying on the return value from the Manifest module's
+"check" method.
+
+Fixes: 4062c69dc27a ("repoman: Move manifest generation to modules/commit/manifest.py")
+X-Gentoo-Bug: 586864
+X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=586864
+---
+ pym/repoman/scanner.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
+index d7cd81f..8999751 100644
+--- a/pym/repoman/scanner.py
++++ b/pym/repoman/scanner.py
+@@ -294,6 +294,8 @@ class Scanner(object):
+ 
+ 			if self.generate_manifest:
+ 				manifest.Manifest(**self.kwargs).update_manifest(checkdir)
++				if self.options.mode == 'manifest':
++					continue
+ 			checkdirlist = os.listdir(checkdir)
+ 
+ 			dynamic_data = {
+-- 
+cgit v0.12
+
diff --git a/app-portage/repoman/metadata.xml b/app-portage/repoman/metadata.xml
new file mode 100644
index 000000000000..c15cfac45369
--- /dev/null
+++ b/app-portage/repoman/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <bugs-to>mailto:dev-portage@gentoo.org</bugs-to>
+    <changelog>https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES</changelog>
+    <doc>https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage</doc>
+  </upstream>
+  <maintainer type="project">
+    <email>dev-portage@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-portage/repoman/repoman-2.3.0-r1.ebuild b/app-portage/repoman/repoman-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..754b1c0e3461
--- /dev/null
+++ b/app-portage/repoman/repoman-2.3.0-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_3 python3_4 python3_5 python3_6
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1 eutils multilib
+
+DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-lang/python-exec:2"
+
+RDEPEND="
+	dev-lang/python-exec:2
+	!<sys-apps/portage-2.3.0_rc
+	>=dev-python/lxml-3.6.0
+	"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/repoman"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	https://gitweb.gentoo.org/proj/portage.git/patch/?id=ef33db45a0c1d462411d4ced1857a322c0ab28f6 -> repoman-2.3.0-bug-586864.patch"
+
+python_prepare_all() {
+	epatch "${DISTDIR}/repoman-2.3.0-bug-586864.patch"
+	distutils-r1_python_prepare_all
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "This release of repoman is from the new portage/repoman split"
+	einfo "release code base."
+	einfo "This new repoman code base is still being developed.  So its API's"
+	einfo "are not to be considered stable and are subject to change."
+	einfo "The code released has been tested and considered ready for use."
+	einfo "This however does not guarantee it to be completely bug free."
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/app-portage/repoman/repoman-2.3.0-r2.ebuild b/app-portage/repoman/repoman-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..ed54ebf5fd53
--- /dev/null
+++ b/app-portage/repoman/repoman-2.3.0-r2.ebuild
@@ -0,0 +1,73 @@
+# 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} )
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	!<sys-apps/portage-2.3.0_rc
+	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.3.0-bug-586864.patch )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if [[ -n "${EPREFIX}" ]] ; then
+		einfo "Prefixing shebangs ..."
+
+		local file
+		while read -r -d $'\0' file; do
+			local shebang=$(head -n1 "${file}")
+
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "This release of repoman is from the new portage/repoman split"
+	einfo "release code base."
+	einfo "This new repoman code base is still being developed.  So its API's"
+	einfo "are not to be considered stable and are subject to change."
+	einfo "The code released has been tested and considered ready for use."
+	einfo "This however does not guarantee it to be completely bug free."
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild b/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..fba438681a65
--- /dev/null
+++ b/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_3 python3_4 python3_5
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-lang/python-exec:2"
+
+RDEPEND="
+	dev-lang/python-exec:2
+	!<sys-apps/portage-2.3.0_rc
+	>=dev-python/lxml-3.6.0
+	"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/repoman"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "This release of repoman is from the new portage/repoman split"
+	einfo "release code base."
+	einfo "This new repoman code base is still being developed.  So its API's"
+	einfo "are not to be considered stable and are subject to change."
+	einfo "The code released has been tested and considered ready for use."
+	einfo "This however does not guarantee it to be completely bug free."
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/app-portage/repoman/repoman-2.3.1.ebuild b/app-portage/repoman/repoman-2.3.1.ebuild
new file mode 100644
index 000000000000..6a2af5d05d95
--- /dev/null
+++ b/app-portage/repoman/repoman-2.3.1.ebuild
@@ -0,0 +1,78 @@
+# 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} )
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+	S="${WORKDIR}/${P}/repoman"
+else
+	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=sys-apps/portage-2.3.0_rc[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if [[ -n "${EPREFIX}" ]] ; then
+		einfo "Prefixing shebangs ..."
+
+		local file
+		while read -r -d $'\0' file; do
+			local shebang=$(head -n1 "${file}")
+
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "This release of repoman is from the new portage/repoman split"
+	einfo "release code base."
+	einfo "This new repoman code base is still being developed.  So its API's"
+	einfo "are not to be considered stable and are subject to change."
+	einfo "The code released has been tested and considered ready for use."
+	einfo "This however does not guarantee it to be completely bug free."
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/app-portage/repoman/repoman-2.3.2.ebuild b/app-portage/repoman/repoman-2.3.2.ebuild
new file mode 100644
index 000000000000..93c73208b024
--- /dev/null
+++ b/app-portage/repoman/repoman-2.3.2.ebuild
@@ -0,0 +1,78 @@
+# 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} )
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+	S="${WORKDIR}/${P}/repoman"
+else
+	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=sys-apps/portage-2.3.0_rc[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if [[ -n "${EPREFIX}" ]] ; then
+		einfo "Prefixing shebangs ..."
+
+		local file
+		while read -r -d $'\0' file; do
+			local shebang=$(head -n1 "${file}")
+
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "This release of repoman is from the new portage/repoman split"
+	einfo "release code base."
+	einfo "This new repoman code base is still being developed.  So its API's"
+	einfo "are not to be considered stable and are subject to change."
+	einfo "The code released has been tested and considered ready for use."
+	einfo "This however does not guarantee it to be completely bug free."
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/app-portage/repoman/repoman-2.3.3.ebuild b/app-portage/repoman/repoman-2.3.3.ebuild
new file mode 100644
index 000000000000..fec5b7d6832c
--- /dev/null
+++ b/app-portage/repoman/repoman-2.3.3.ebuild
@@ -0,0 +1,78 @@
+# 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} )
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+	S="${WORKDIR}/${P}/repoman"
+else
+	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=sys-apps/portage-2.3.0_rc[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if [[ -n "${EPREFIX}" ]] ; then
+		einfo "Prefixing shebangs ..."
+
+		local file
+		while read -r -d $'\0' file; do
+			local shebang=$(head -n1 "${file}")
+
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "This release of repoman is from the new portage/repoman split"
+	einfo "release code base."
+	einfo "This new repoman code base is still being developed.  So its API's"
+	einfo "are not to be considered stable and are subject to change."
+	einfo "The code released has been tested and considered ready for use."
+	einfo "This however does not guarantee it to be completely bug free."
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
new file mode 100644
index 000000000000..a5a60b0ee04b
--- /dev/null
+++ b/app-portage/repoman/repoman-9999.ebuild
@@ -0,0 +1,60 @@
+# 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} )
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+	S="${WORKDIR}/${P}/repoman"
+else
+	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=sys-apps/portage-2.3.0_rc[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "This release of repoman is from the new portage/repoman split"
+	einfo "release code base."
+	einfo "This new repoman code base is still being developed.  So its API's"
+	einfo "are not to be considered stable and are subject to change."
+	einfo "The code released has been tested and considered ready for use."
+	einfo "This however does not guarantee it to be completely bug free."
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
new file mode 100644
index 000000000000..d9d4eb71c686
--- /dev/null
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -0,0 +1,8 @@
+DIST smart-live-rebuild-1.3.4.1.tar.bz2 15980 SHA256 dd1e780937322a4cdee5a8f9af48d24283bda203e40167d02c7bb18924a4335f SHA512 65b864532e662d0fa032962673c2c2d6c1e21c557c82e295591086aea22de90ca9fed0e90bb0da0f6926ab19176a04ab41ee80c88dd8c5c05c3751c30ca39a92 WHIRLPOOL 329ea91bba103c6b2728905dac33532030d2c0ae802deb19056b1719bec6d85bd9b9a039cad4b3add92620c003cc573c797080cb2e02f09e670a0475439904be
+DIST smart-live-rebuild-1.3.5.tar.bz2 16004 SHA256 f7d304bb00ec32ab48bb3062a89896dbd0df344e010e91ea40417d162f5ad881 SHA512 46933334c8c46a056c837e60a5d8aed30a35b1ddd20d7c0f03e813f6cac11cc2dc9469674b1e9c23d94c9ebc474e5eacc7aa0e8f82492554a7f49b438ed740d2 WHIRLPOOL d9a5ab93057cc3070f46fec49eee0c71237481a8e3dc84a9de40df5eb78d2fe3617b5fd1f82c04b24e9bfaef81de0883d0c8696c00ff8e7a685f175e30783370
+EBUILD smart-live-rebuild-1.3.4.1.ebuild 775 SHA256 f845d07b18aa2959e02263fc4484c36754d88b09f3c8948f112cd3af824cffc1 SHA512 3abd2a0cdb07a410c45cabe4dbc17f910b056c2b4b0fa3d74c9a7efee8de6c13bd4cf3d0df20a786719fa43d40cd609baaa801c13debbd3c76f2ceba3d81a6ce WHIRLPOOL a440095178e2acb885dae472cd0ef5deb43a56512cbbd11e3eb17d2f3608cf09e7142384d54164b9fc0cdefab92926db5ecaa512a6354d97d3bf396a4a3d3b69
+EBUILD smart-live-rebuild-1.3.5.ebuild 831 SHA256 e3d2e0dbdf1be737ec995fc7c5185ad4d8993332bbff7d86979dc993018ed6b1 SHA512 6d4fde8146c1dbd7201e85862babcbf0b0481139db77429042568802450690c78b9cf79a33032b8a8f030a581351bfc179fdd96397b48ba5e359495ef50b16ee WHIRLPOOL e14270e19f8949369346bfc187636feac0c90e63b03cc8e840183d7854bd4291a20351ac46ad582dc0c1a7df6d62a9c0cb098724887c3242b606d853b5344612
+EBUILD smart-live-rebuild-9999.ebuild 736 SHA256 364f204009d73b7835d1d6958166470edd8ac47be70f837d97af566916e795ca SHA512 84782417c0aa0fa96fd1638b6d25cb2bb22fa0b9ae82de28395cec71c58c818251d3310603e48c97cefce86d3822b48329a45d8cdb21c5bcc2137fe96ad40abf WHIRLPOOL 6dd47864bdc2839f856417eb81e157cf84a65b3f574d293e566a87bd77d50665fc5498595c06a853f9bc3ec06e639cc046b11e1260488a95de89f54e9108b423
+MISC ChangeLog 3015 SHA256 104f743b90adee46f9921ee807ddbd03cc682fefd394cc4d50358d700516dc10 SHA512 756fb76e409effc35710c7f40836563ec6fd507b66990de68f286f360b3bc21e476f3b82e85a26c11b3f6dd3e79fa07ccda615a139379dd8e1c72977616d4add WHIRLPOOL 30004a7bf6b689ae4f8159e11f125503ca8bbb58f6c4372c88e99faf5dd1ec07401d3f16494d664e1b2b858e42196f1eaa4971b8291f5c70aff69d40f9526e82
+MISC ChangeLog-2015 13274 SHA256 ac42520eed351805ef505d83cf44859fb4ef600265cd00c2b057d76e14d23988 SHA512 5274b02208538d5672b3d1e20ad729be93bef292c8db4dece36b252f4452a2e86ca042c0d708c2663b45c0701e353d1ccab514704acc4f303d1227ad0e441e4b WHIRLPOOL 341fe39c7c673c44d61a0eedeb0dda2b04e15d3a1f05cba073bb5b21c21ee49b7a5ea2c30ce7caeed6c0bc687152b8457b45c3cfee26a213d44159938a734c74
+MISC metadata.xml 769 SHA256 f3032bdcf9eae80b9213e8bab9759cd499202e65f5b92f6b2318eb4b0513096c SHA512 d11c942868f0166c646922088dfecf3047f8ca017b85965382bec8fc794e11d6ffdea27a9156a41faec10a79a13836b13d8b9213a44e57672e1355fbd6bfd0da WHIRLPOOL 70ee65c769ca4c1078494d2f0704a2afee16ffa6139c308f7ca94d8b710ff3064dc14fea6cbf91692ec9b63b8b1160ba44d8a7e92ee3aee9d770801e01d46f42
diff --git a/app-portage/smart-live-rebuild/metadata.xml b/app-portage/smart-live-rebuild/metadata.xml
new file mode 100644
index 000000000000..fd31fc1dbcf4
--- /dev/null
+++ b/app-portage/smart-live-rebuild/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>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<longdescription>
+		A smart replacement for various live package rebuilding
+		solutions. smart-live-rebuild tries to update the source
+		checkouts of live packages and calls emerge to rebuild those
+		which are out-of-date.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>mgorny@gentoo.org</email>
+			<name>Michał Górny</name>
+		</maintainer>
+		<bugs-to>https://github.com/mgorny/smart-live-rebuild/issues/</bugs-to>
+		<remote-id type="github">mgorny/smart-live-rebuild</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild
new file mode 100644
index 000000000000..d6076ad37afd
--- /dev/null
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild
@@ -0,0 +1,31 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Check live packages for updates and emerge them as necessary"
+HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
+SRC_URI="https://github.com/mgorny/smart-live-rebuild/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/portage
+	newins smart-live-rebuild.conf{.example,}
+	insinto /usr/share/portage/config/sets
+	newins sets.conf.example ${PN}.conf
+}
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.5.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.5.ebuild
new file mode 100644
index 000000000000..19a3369a8d7a
--- /dev/null
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.5.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 distutils-r1
+
+DESCRIPTION="Check live packages for updates and emerge them as necessary"
+HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
+SRC_URI="https://github.com/mgorny/smart-live-rebuild/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
+
+# Tests need to be fixed
+RESTRICT=test
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/portage
+	newins smart-live-rebuild.conf{.example,}
+	insinto /usr/share/portage/config/sets
+	newins sets.conf.example smart-live-rebuild.conf
+}
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
new file mode 100644
index 000000000000..c8a7533d0933
--- /dev/null
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -0,0 +1,32 @@
+# 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} )
+
+EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Check live packages for updates and emerge them as necessary"
+HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
+SRC_URI=""
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/portage
+	newins smart-live-rebuild.conf{.example,}
+	insinto /usr/share/portage/config/sets
+	newins sets.conf.example smart-live-rebuild.conf
+}
diff --git a/app-portage/splat/Manifest b/app-portage/splat/Manifest
new file mode 100644
index 000000000000..882d8ae2d1fc
--- /dev/null
+++ b/app-portage/splat/Manifest
@@ -0,0 +1,6 @@
+AUX splat-0.08-prefix.patch 853 SHA256 6d2f4defc1ae000da7e85c7cd086958391d198355331af0640dc50da4381cbda SHA512 946764f7eb2eea8155806b842f6d5fd979bdf7e2a955c62d10cee0e652df51f70c0a0e7d9d4069cae3824c87bf6756edb0f0ca94e120a0d43bb6787705d62cf2 WHIRLPOOL 1464ef510433210900394d39561b3ef35a8c74a9a803d755581d87303c0905cae5ef71de9ceb1478c70efed924f068e485d6630b26a351d402f43513ac10284b
+DIST splat-0.08.tar.bz2 12180 SHA256 cdadf79909308d830d68e9b2583f91f081291ee9db2dbadd05c291b6566241e3 SHA512 18be949f601cd7ba61babc667a26df9bc5ba7ece33c9b680be7c3541418ea65f3ecf1ae402a70fa3499b79ca2b000c36a58e202d06456cbb7745bec749b1374f WHIRLPOOL a80900d2d831ad9a9a9db65ac644269de60a3f3ca7ad614ff64d0a416c2ce39638520fca7abb58721ea05c58bded3e0d3a8779f92bd6875f956718dcc580862b
+EBUILD splat-0.08-r1.ebuild 592 SHA256 c7bb738c46f9eb9e228242bfa776912f1855d58d25887e7654c9be1886ea0bd6 SHA512 b4fbea2df6442a020a60dcdeac89cfb6715099d5af958a51b9c66f2fd5c9c0ffa6955d788abfd68584d2eaccbd48eae5380442d809554750465cf8a7ded06e13 WHIRLPOOL c79f3b429a42d90fad20f5e34d03accb5819b4efefaeb32ed0a7545b2e54d034976e18770bdc02eff8e95746384d6be87cc3e15ef4a2b130545e0766f033441e
+MISC ChangeLog 2555 SHA256 897607c767b66ff295043fe56b6e394bb1be2ad4910a6f614da4cefcbcc66346 SHA512 a533bcb5a918c015cb24a89544785398c8a455cc136cf21db107a30aa87fc3afd1b0de4f085176a29a6795cfe2132b0f1fbd08a9cdb53d32d74f5cb81d8cdf01 WHIRLPOOL d6764df06160816d96807721e8bbaaf1460d74aed021f4631164c943e8b6fe25fe92785e8d980fc93d7bad4f2703bab174f6dc2a2282e5779dbf7f3f13f478fd
+MISC ChangeLog-2015 4012 SHA256 293bcb2bf0d2864cc838490a799da82f150f3398bcc3f09649472cb51eab2089 SHA512 2bc70acaa672315ad08840554b00615ca9662aaa6ed4cd8a102ea3cc8b28dfcf2ca82cda67640ac36fec6716f2a46ba9a4a6115df8301cc4b78417a6b57d314a WHIRLPOOL 01baae05a62963b839050fd6fcee376bcb40f498591b80079d3427574f38081e3dd33ab8bf0ccf42ab62abeba8deb8d03ad10f8a7981671d84c0fc2133a1a6d7
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-portage/splat/files/splat-0.08-prefix.patch b/app-portage/splat/files/splat-0.08-prefix.patch
new file mode 100644
index 000000000000..e2599deb8bf5
--- /dev/null
+++ b/app-portage/splat/files/splat-0.08-prefix.patch
@@ -0,0 +1,33 @@
+--- splat.pl
++++ splat.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w
+ 
+ # Copyright 2003; Shaun Guth <l8nite@l8nite.net>
+ #
+@@ -65,13 +65,13 @@
+ 			return unless /\.ebuild$/;
+ 
+ 			my $basedir = dirname($File::Find::name);
+-			   $basedir =~ s/^\/var\/db\/pkg//;
++			   $basedir =~ s|^@GENTOO_PORTAGE_EPREFIX@/var/db/pkg||;
+ 			my $package = join('/',(splitdir($basedir))[1,2]);
+ 
+ 			$INSTALLED{$package} = 1;
+ 
+ 		}, 'no_chdir' => 1, },
+-		'/var/db/pkg',
++		'@GENTOO_PORTAGE_EPREFIX@/var/db/pkg',
+ 	);
+ 
+ 	&parse_command_line();
+@@ -320,7 +320,7 @@
+ 	# no logfile defined? Let's check make.conf
+ 	if( !defined($logfile) || $logfile eq "" )
+ 	{
+-		$logfile = '/var/log/emerge.log';
++		$logfile = '@GENTOO_PORTAGE_EPREFIX@/var/log/emerge.log';
+ 
+ 		if( $OPT->{'verbose'} ) {
+ 			warn "*** No log file specified.\n";
diff --git a/app-portage/splat/metadata.xml b/app-portage/splat/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-portage/splat/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-portage/splat/splat-0.08-r1.ebuild b/app-portage/splat/splat-0.08-r1.ebuild
new file mode 100644
index 000000000000..dee572b6fb0b
--- /dev/null
+++ b/app-portage/splat/splat-0.08-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils prefix
+
+DESCRIPTION="Simple Portage Log Analyzer Tool"
+HOMEPAGE="http://www.l8nite.net/projects/splat/"
+SRC_URI="http://www.l8nite.net/projects/splat/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-prefix.patch
+	eprefixify splat.pl
+}
+
+src_install() {
+	newbin splat.pl splat
+	dodoc ChangeLog
+}
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
new file mode 100644
index 000000000000..398d0c5218dd
--- /dev/null
+++ b/app-portage/tatt/Manifest
@@ -0,0 +1,6 @@
+DIST tatt-0.4.tar.gz 23397 SHA256 53ed63685187acc55241698dac26a7cadbdf846dfc72709a9d67db65572dc2ef SHA512 57df8cdda9b6711da36e3635182fcfb64a376d7c3a76a29ea0252fc17597defe921d90bf9989f4fc199ab9848fae6fc4f53623140825f79368e90723a5562dd6 WHIRLPOOL a152e6cdee833d892eb0ff1b6c24d107b99ac4b7c92510d230fdbb6e1375825c1294a7008e1e09c496115f6116f3de48a4500dcc3a257998c8ee5bb0a29c08b0
+EBUILD tatt-0.4.ebuild 825 SHA256 796513431adaebebff4add7f614b89c926958367aab3d950ca077b9bf7bc3bc0 SHA512 cb49c7a1c27e9fc59173fd9e8a3e3fb7b6cce618c19fc6d7dfc6e1c26d68e87fb5e2e425085b5b9527faafd97958d7ba18e6847a9a35f59cee5b10b3484095fb WHIRLPOOL 65408e5680eca8ccf75b7bed75e7ac61f7a2105c6bdd956556daa47e208674d843960adbb9691c84b1aa5263bfc1188461379d0770708d70df92b13c8af96558
+EBUILD tatt-9999.ebuild 758 SHA256 5bd7ff506af112927f9c12ca5af44c480837654a0209d40f098c74a51d25bf1a SHA512 6c3401692d716a83ae3a7ad757669d5ecb34cd8a93c550cf5ff318696cc026f7f862ecec7d9570339fe5e7be95a0a1dfc6d3c0aa479047b1887bdfa1b649142b WHIRLPOOL 40c4a2583c80ea330c5ae670b20da77c3225390d2f665b7194672478bca257846ec285120d35a49a6ec139ae7daade1eda8dcdcb929237c6ec80259bc331af4c
+MISC ChangeLog 2846 SHA256 03a0d6fec5483eccaa76c8f11a29475ee1b5bd22494e11ae5d6955667a7df851 SHA512 3bfe13295e8633fc4011547b72ebe287a688598fbbf996466b5e0003fa0ebd09f7066480d6ca27b459d837a6afffbb5734f994d8bf55f8b308075e6e9736e809 WHIRLPOOL 25eed97da6353453a46bda6568b72bdd83591beec833ccc811b578200c6837d97cc0048f2e4074d818702dd64649f6dee063c7ae88cf14c41df25722802ec72e
+MISC ChangeLog-2015 1950 SHA256 ee2e86185e0355d76855b8bce9b9ac056c406b5fa022aa9c22abe943550d844e SHA512 9b1a69536452ab41164bfe18074c4ee3ca7c3b531f8c36a215fb3791efb84c524ad7ce98db835adc015aa96d8067cc601a0f4a3cb59fdac9faa63cdf6812b868 WHIRLPOOL 7285ff7d72f39d72e6d932281b07f2ea79b0515e2976d631eda6baf1b0110ce220d19e8e5db13afa361e0580b2c15e8d3b30231a22fde926a084c55a03da8fb7
+MISC metadata.xml 640 SHA256 e42f0af2b7e7cf83ef058fd50eb6afb7fb089c73a5882fbf9181f89cc4f2304b SHA512 1320dd15e0191463c28417c1fdc9084362356c89a0ed34c4002f6f0a2266596645e8170b781f39cbb60d40da58953f28893b4e9a6804f077393ca739f6bc15a2 WHIRLPOOL 8b68f05ffac044eb90caa076c59832addfb47eeec79f1f08e719cfa784c31727bb38d0217206c5f1500fa35695f32a102d8b31067372e06dd60f07141f07a7ae
diff --git a/app-portage/tatt/metadata.xml b/app-portage/tatt/metadata.xml
new file mode 100644
index 000000000000..5029e3c544e6
--- /dev/null
+++ b/app-portage/tatt/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>kensington@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="templates">Install template scripts to be used with tatt</flag>
+  </use>
+  <longdescription lang="en">
+Tatt arch testing tool can be use to automatically generate scripts for various boring tasks during arch work.  
+It aims at developers. If you are a normal user you will not need tatt.
+</longdescription>
+  <upstream>
+    <remote-id type="github">kensington/tatt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-portage/tatt/tatt-0.4.ebuild b/app-portage/tatt/tatt-0.4.ebuild
new file mode 100644
index 000000000000..4ee05f275167
--- /dev/null
+++ b/app-portage/tatt/tatt-0.4.ebuild
@@ -0,0 +1,38 @@
+# 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
+
+DESCRIPTION="arch testing tool"
+HOMEPAGE="https://github.com/kensington/tatt"
+SRC_URI="https://github.com/kensington/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+templates"
+
+RDEPEND="
+	app-portage/eix
+	app-portage/gentoolkit
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	www-client/pybugz
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use templates; then
+		insinto "/usr/share/${PN}"
+		doins -r templates
+	fi
+	doman tatt.1
+	doman tatt.5
+}
diff --git a/app-portage/tatt/tatt-9999.ebuild b/app-portage/tatt/tatt-9999.ebuild
new file mode 100644
index 000000000000..67cd52838afb
--- /dev/null
+++ b/app-portage/tatt/tatt-9999.ebuild
@@ -0,0 +1,38 @@
+# 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 git-r3
+
+DESCRIPTION="arch testing tool"
+HOMEPAGE="https://github.com/kensington/tatt"
+EGIT_REPO_URI="https://github.com/kensington/tatt.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="+templates"
+
+RDEPEND="
+	app-portage/eix
+	app-portage/gentoolkit
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	www-client/pybugz
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use templates; then
+		insinto "/usr/share/${PN}"
+		doins -r templates
+	fi
+	doman tatt.1
+	doman tatt.5
+}
diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
new file mode 100644
index 000000000000..0a044ab20ecb
--- /dev/null
+++ b/app-portage/ufed/Manifest
@@ -0,0 +1,8 @@
+DIST ufed-0.91.tar.bz2 61466 SHA256 1f53be6c2a3dacf3e88f43245fd9775c793236044c85441a6f80bed7ff2f11fd SHA512 34fc57b4d3fd1e8c4226401aec409ce4303294ec9044673ec62053b8dc6ade9d54419a5d208ba6767b75507bc9f8983a401dc258b0bae5b733e7a0c791554c35 WHIRLPOOL 9ee78247430ac3ece6f7e52cadc2305ef409f02c556576a8dea47ba25082b81fc917350854d479363a77558b8b0a312a58d76b233b29510b69e75983bf7515b6
+DIST ufed-0.92.tar.bz2 61606 SHA256 0816d2ba522e1e61ab585c13bb67c33ca037ab3021f958a9e66803d678692405 SHA512 b1a608d026945144653f43ad322e54f0f1192d39fea3da2a4919e07de65445c75aa5e2d1e8cf9b24849c45f891a0de5952c92b3227f6c1200965f3c280611408 WHIRLPOOL 388ed787bf5743fa8d431b3cdbb97fb01106057b74b0dd6bac97fd89b213b400ecd2626f690ae06e7d77edf1cdc72b6a4dfaf07db6eef59a02be0b3e84a4487d
+EBUILD ufed-0.91.ebuild 1010 SHA256 d339aa8dbc944eeb6809b5ddabb5a6b06838f9f818fb66e1be405b34de0b54b7 SHA512 58d77734677556264fb712254ff9b481100e6e387dbee79bc0da012a0e00e491a11083814ee6312547a125d5ca7b18d12e523668533a1391ac389a80c16d820c WHIRLPOOL 4cdb8980fc84b8df5ede839af79abfd934fdee1b57c7bff1e3363caa074465efa22147da19c2f5a77f0379bbcc3376664669928381f88fdc6f402c741c794a03
+EBUILD ufed-0.92.ebuild 1013 SHA256 a7547001f9becfe292234c110886e3d35bcbf3c48814b3ceddb70d5e463cd84d SHA512 4a2b6ef3a0c912401058e3a063726b661a27c28cc5e4b908be49f21d66b984748c1f303ba5007950fa4e37d09b4b4cdca066952283d066939d63d552fbf00b34 WHIRLPOOL 619f41dc603c1bd751352c0641130658b73aaf3f0c9731791d5890c88afd4d98499b6019eef3b9dee9c642a7aace296ce288d6fe5301e2473a75ff4ac0e5d702
+EBUILD ufed-9999.ebuild 704 SHA256 209b0dc887dc6d9ed43718a646042369f6d59c6d600f68b96633e78bed00dcb7 SHA512 5734703cd8c31e58caf7a6a8cbe2b7f294e3fcfa6d9409bf3b2d68f5e2256af471f4c6548693b6637537124a9817e62fd868c010ea8219a6f693376de5b80773 WHIRLPOOL a6c11d7e246540693260377b25ba105fe0152a1456ba4cee6624eb6a98885514c40f46fb76ecb515c36608b7117355d958a2270017e4cf09ad3b995cfc836daa
+MISC ChangeLog 5601 SHA256 c9facd044d8ceb8ccb5da3915d0c6a35d8e23238c966b93f8917e5aba0c725ed SHA512 3e49c36f8e5ae9a14fc089d1528297344f2680eecf0cd9267fa6f4ffd66c37e9e33edf1744cf8c7ec28c8d873ae985441a508b360b150e068818c7ceaf6d0163 WHIRLPOOL 8900fb7ad041b9074fadae8b4f74ea154b8263e30f92ffd99ac9cb6d93c928b24458ff2896eeb9b956d07738e6afb3bc2b486069378f299afdcea26cab82ef69
+MISC ChangeLog-2015 16149 SHA256 e6e2e08e8f675803c6a4975e38290f1f078f57f5dda1e21ca5c3b6ca762e70bb SHA512 9803ae0557426bb213245bdd2cb0e11354b1ddc1b1968a87887dc8f08559a52d8da8826d209ac211917fe16aa3a61143c4fee7760aca9db8feb87827f90137c9 WHIRLPOOL b7767bdf0ed54e98cb3e6c2adf159960b585c0ae75b5e1b82b63d7655202245758c5ae40e88998e135397460875d9d54bd5738c4abbeeb919e12fb0f0ab88ed2
+MISC metadata.xml 554 SHA256 8cfa2923767c5ee89ccfa33ee5eba90323c1084e9d228b44e0b70ca757ca5486 SHA512 11e52225e9e30a00bd9c2ed14b5fa28cec85d20fea90384822ba46794b831e1b189f867546f19a5ca4c6a1a2ca8b1d73e20b4b2a3878b455c6511332323b689d WHIRLPOOL 3ef0405bf10a6b71ce985d810a049eb2017d4533b01037fb558ed94279957dca4767e9b56ed48d0b53339ac7f55612754c11619a436308d06be4291a66d6dc5f
diff --git a/app-portage/ufed/metadata.xml b/app-portage/ufed/metadata.xml
new file mode 100644
index 000000000000..8b98e6ddb1c4
--- /dev/null
+++ b/app-portage/ufed/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>yamakuzure@gmx.net</email>
+		<name>Sven Eden</name>
+		<description>Current maintainer, assign bugs</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>fuzzyray@gentoo.org</email>
+		<description>Proxy committer, CC bugs</description>
+	</maintainer>
+<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-portage/ufed/ufed-0.91.ebuild b/app-portage/ufed/ufed-0.91.ebuild
new file mode 100644
index 000000000000..7cf7b8704dbf
--- /dev/null
+++ b/app-portage/ufed/ufed-0.91.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base eutils multilib autotools
+
+DESCRIPTION="Gentoo Linux USE flags editor"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+COMMON_DEPEND="sys-libs/ncurses:0="
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+# Populate the patches array for patches applied for -rX releases
+# It is an array of patch file names of the form:
+# "${FILESDIR}"/${P}-make.globals-path.patch
+PATCHES=()
+
+src_prepare() {
+	base_src_prepare
+	# Change the version number to reflect the ebuild version
+	sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
+}
diff --git a/app-portage/ufed/ufed-0.92.ebuild b/app-portage/ufed/ufed-0.92.ebuild
new file mode 100644
index 000000000000..5d0997e86d74
--- /dev/null
+++ b/app-portage/ufed/ufed-0.92.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib autotools
+
+DESCRIPTION="Gentoo Linux USE flags editor"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+COMMON_DEPEND="sys-libs/ncurses:0="
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+# Populate the patches array for patches applied for -rX releases
+# It is an array of patch file names of the form:
+# "${FILESDIR}"/${P}-make.globals-path.patch
+PATCHES=()
+
+src_prepare() {
+	# epatch "${PATCHES[@]}"
+	# Change the version number to reflect the ebuild version
+	sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
+}
diff --git a/app-portage/ufed/ufed-9999.ebuild b/app-portage/ufed/ufed-9999.ebuild
new file mode 100644
index 000000000000..5946596356fe
--- /dev/null
+++ b/app-portage/ufed/ufed-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib git-r3 autotools
+
+DESCRIPTION="Gentoo Linux USE flags editor"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/ufed.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+COMMON_DEPEND="sys-libs/ncurses:0="
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Change the version number to reflect the ebuild version
+	sed -i "s:,\[git\],:,\[9999-${EGIT_VERSION}\],:" configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
+}
diff --git a/app-portage/unsandbox/Manifest b/app-portage/unsandbox/Manifest
new file mode 100644
index 000000000000..699fcbe7502e
--- /dev/null
+++ b/app-portage/unsandbox/Manifest
@@ -0,0 +1,6 @@
+DIST unsandbox-2.tar.gz 891 SHA256 88f1ced6f197ba65f10266de879ab88ab05e3e874c4b29ba82a1db684518df84 SHA512 d669a7119e397434219c7a86a5d10caeb0099fed841a3264ba09ed45c206621baf3f98104d3b6ff8239a79306177d6ebe0305ab67ab472e739f722e1823ab2c6 WHIRLPOOL e309a78c37f4f8f038a9499f1a3e7310e33c306d6624e60c993326015b328218b1fd51ab70db4d15ee6ba6d2c3efb0d9b1a59ee77231d9a7442db3774d5a35c4
+DIST unsandbox.c 678 SHA256 806422d7cc96de98a6283ed11efcfe37d6597236d861313849fbd7a6e24e7cfa SHA512 380bb1c59442c1637de0b95450a58be7249b7943e061b3ec18464f5fa04629e27453aaefa85d48f84c4f3a0affaa9302a81d36b33a860d027280e4e9a396fd04 WHIRLPOOL b7dfe56418ec6970cf053454aebd70cf0fcc9bb7eb1f8f0583d1c6b01d6c500327407b4f9e8db118d0552546f4ea0c60ce38f8bd27bdfaeabd8804f958c59262
+EBUILD unsandbox-1.ebuild 535 SHA256 b10cf947c644866ed8fa45dc36675ead027199143bb10649254e405fa1179b87 SHA512 aba1fea454faab73c88af47ceea41e736f0810f27f21ca0f886963ee864c8185ae112d1c8fb2fef28a5332070b7202f6fc96614bc0a88dc825fc4650a1a441ed WHIRLPOOL ab0f71343628c1b970a9c716a8058cddd9815f5e70f0ed3843850810fc7663b388c5f92f29699654364a38da2dbc9eeb80f823b55e8c6141721ffd363104a0ff
+EBUILD unsandbox-2.ebuild 371 SHA256 df9f6c395e8c064f849a0593c3522db1bfef2b53022efac4b25ad831a7590c42 SHA512 7673a06b849cc36e9cdb1d9c79824131b5c71d3b99f10b3760488f7da45a033c4f1efe885f1576560700cc95d1bf31c3ab005209d2a4f3fd6a733533e356ba8f WHIRLPOOL 796d62cc7e90f66f1652d4c9b41a65fcc1c85ee10b5106da1ebccabfc69dc89f5e6bcf78969172539673a7d384e8b9031d20a4407c5c06ab78c07c20e6562f80
+MISC ChangeLog 379 SHA256 101fb05d1a1d521b9e2efae0de16e769a976f526b38687fe01e89691ed576c0d SHA512 6255c9ec8e2eb319256f8a0ac8d5817026b1e9a5f15f31c006cabb2419531c4f4f52d878968106637f63ef20a4cbd3f6ca38e5f3965df943058ce8df046cfb01 WHIRLPOOL 6590ddf166893a8c2dde6139bb79fe4fa3d42ff465ef37c588ec1c7931884cc00d91155ce5352153d5da604fc35862548b86af742c3a2570016fb02a3c4d3eda
+MISC metadata.xml 328 SHA256 143a3ae9f0baf2c0e5ab036e8b0abbdd48b7cc2875002949f0d14b838fb2046c SHA512 800ada1895db6c4dd907d24e7400046c8c5d9b919310b3bd7f394ba368b1261fafd1140d175e20830e406282c4088c3304f70a506461fc1ea0c86a8a3e783961 WHIRLPOOL b3394480ce62344ca90c7ce90b1f4433875cbcfffa455ad0e6c0507edda2198246708f27810476911cbdc42ead5e330e63f0981129528a41b5721cc0e6a51347
diff --git a/app-portage/unsandbox/metadata.xml b/app-portage/unsandbox/metadata.xml
new file mode 100644
index 000000000000..6a495dd36abf
--- /dev/null
+++ b/app-portage/unsandbox/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>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mgorny/unsandbox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-portage/unsandbox/unsandbox-1.ebuild b/app-portage/unsandbox/unsandbox-1.ebuild
new file mode 100644
index 000000000000..34a3551ad98a
--- /dev/null
+++ b/app-portage/unsandbox/unsandbox-1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="The Sandbox escapist tool"
+HOMEPAGE="https://dev.gentoo.org/~mgorny/dist/unsandbox.c"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/unsandbox.c"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}"/unsandbox.c "${WORKDIR}"/ || die
+}
+
+src_compile() {
+	tc-export CC
+	emake LDLIBS=-ldl unsandbox
+}
+
+src_install() {
+	dobin unsandbox
+}
diff --git a/app-portage/unsandbox/unsandbox-2.ebuild b/app-portage/unsandbox/unsandbox-2.ebuild
new file mode 100644
index 000000000000..74169617d3fd
--- /dev/null
+++ b/app-portage/unsandbox/unsandbox-2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="The Sandbox escapist tool"
+HOMEPAGE="https://github.com/mgorny/unsandbox"
+SRC_URI="https://github.com/mgorny/unsandbox/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /app-portage