gentoo resync : 29.03.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-03-29 16:53:27 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-03-29 16:53:27 +0100
commit: 1173ad5704ce725916e0c332416aff326d850d06 (patch)
tree: d48d60977ce19864893dfb2222bf2982ffb4262a /sys-apps
parent: 8c364c784966be1700ea39ae45028f3e9be9cae0 (diff)
55 files changed, 521 insertions, 1629 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 75d97542fb71..ea6500ab3d90 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/apply-default-acl/Manifest b/sys-apps/apply-default-acl/Manifest
index 78dab60eb259..0126f04dcbfb 100644
--- a/sys-apps/apply-default-acl/Manifest
+++ b/sys-apps/apply-default-acl/Manifest
@@ -1,5 +1,5 @@
 DIST apply-default-acl-0.0.6.tar.gz 112220 BLAKE2B b0cc21ba3cb9c8112e9b8b02a9cb2eaad81e7ebee2bd0505e1925ce73d97f328b4ce0519d5f8c44b841407f73af1ce32d5ca8a629d244acde969a3ed10c8e75e SHA512 6034de13db1867372b8529e29e8b1a3d002619d4522a5eab346a7940946a1c74adc3eec952bc72bf62c736ae89d5631748153a87feb45353af27ec46c71176f3
-DIST apply-default-acl-0.3.1.tar.xz 244668 BLAKE2B efeaa5171f95e943bfc4157ed005cc188b16570149d9d373b22d525a7361a90449f53a5f6df1a44dfaa01f594b133fd0a8108ef48cbdad66ed2fb55fa3a199cf SHA512 78546d20994f24fed54fec9a558d5a1eaf45ace59d14f7641ef72fb14bc19b5679c0886b3732c998ebd1d8d20a555bccd1407e48de986c555a0d9d5510445932
+DIST apply-default-acl-0.4.0.tar.xz 245540 BLAKE2B 5f3cfbde56fff48714c4d66a40286137255e02923b1928e13b849c5b3cca50c90491cfa42d0c62b7c019deec2673a7ff84cfffb59ac84ca3ff901b6ab4a6c816 SHA512 6c2c62586ef2999450d14825eee3ef12d8e20b8c2984074a9d8a4aa199d0d385acf0c25c303e643f2323ce5b65bfc220757ce76f278ad16200137b2e45e5eda1
 EBUILD apply-default-acl-0.0.6.ebuild 523 BLAKE2B 8ff9d888cd4934d731874a6fedf8881e74dfb5a2e3d3462fc3050a0acd7011cd5a771a3fbf525ab041d2642a5d938bc34474855d4b4d50a681c2bea0251f4a12 SHA512 be23e98716900ddbc133417b4e033d9963b1410a4b9206a0df963fc623ee1c452adb0621b851521755aa167e2846454195eaf7fad39c56fca43828f26ddaf80a
-EBUILD apply-default-acl-0.3.1.ebuild 525 BLAKE2B ae50dc57320ddfbf68b507abb6be75a899a24ff6f34fe0f4f2247a4f37e33c77738e7a0d9473d203715e268f8e80effa78002b7d1515b9017d3e7bb6f2f491a8 SHA512 bb5eebe5d361de4de5e12118163dca38e256990e50b27fde43287efddf221d463369caa47d24516b5c66967cfd66b61d380a9b5e53ab51bd63b2148e66c56519
+EBUILD apply-default-acl-0.4.0.ebuild 525 BLAKE2B ae50dc57320ddfbf68b507abb6be75a899a24ff6f34fe0f4f2247a4f37e33c77738e7a0d9473d203715e268f8e80effa78002b7d1515b9017d3e7bb6f2f491a8 SHA512 bb5eebe5d361de4de5e12118163dca38e256990e50b27fde43287efddf221d463369caa47d24516b5c66967cfd66b61d380a9b5e53ab51bd63b2148e66c56519
 MISC metadata.xml 409 BLAKE2B d120f8236355cd9c5534402178c29eb8879f341053686f3d44c7c08f44d8e15abe905e8567b9154f6abb324aa1dbe5a3095e4a8d5377ea14c4906e932d5ee6b1 SHA512 ccf6bafbdfc01736cd151ee30fe4d2e7124ee633463052aa41e0a8ef687793d358825b53b01d21aa9cc9a64633ec37b2bd2b7a27aac20a6d56b12f79eff56b18
diff --git a/sys-apps/apply-default-acl/apply-default-acl-0.3.1.ebuild b/sys-apps/apply-default-acl/apply-default-acl-0.4.0.ebuild
index dac225d9c5f4..dac225d9c5f4 100644
--- a/sys-apps/apply-default-acl/apply-default-acl-0.3.1.ebuild
+++ b/sys-apps/apply-default-acl/apply-default-acl-0.4.0.ebuild
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 71a0b435f2b8..20cb807d6562 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -2,9 +2,11 @@ DIST flashrom-0.9.6.1.tar.bz2 368133 BLAKE2B 17ebea9814ad0513df7e8f80d7f9e2115d8
 DIST flashrom-0.9.7.tar.bz2 408883 BLAKE2B cf4168d6e9bbc2de32714963c6a6730412041df36d5d4bac5e7021821dd18ecb13d94673c7aeecb24870e30c1e3ffd840f47bcb664b169107af5a7ac7b5e9f89 SHA512 a226c1ac3f9c7822b74ca14b7f9b53013110b2cdb66b1f936593c693ee54f19d643cc3a97a9635c05f2c959aca817668006f609ddb503a84d0bf5d510065674e
 DIST flashrom-0.9.8.tar.bz2 473902 BLAKE2B c127a41c2857ae2e1564777b49b1eff17e2e931c8a2417e738e8188871a6ce4e0fe6a0380c2139aaa906f299ca833563df895aa5fd1af333b24bf7467de0dc8f SHA512 1a1c4513bac7cdf91326ab68b822034101e688bfab0dc0b5698f664fc766027229128c55eed94f302cac05d949647cdec6a103a423c3861b047cf0ff7cc0b509
 DIST flashrom-0.9.9.tar.bz2 495199 BLAKE2B 0bfb6fe1ea3dfbc21192da574473190b6674a4cdada5b2ad5200174a2c7249aae196eadc9fc48208174caf2f8b19588a73f717cf17781b0fd1fa5791cde7fc08 SHA512 155445ce7acab97f91596aad704aa2211da1c3f71fb463fc65c621dfea41e44b5de7db801c5b5cfc37450e8a8cfed5b202553715d999710422c830a0c38ae153
+DIST flashrom-1.0.tar.bz2 321693 BLAKE2B 7e3e021cdf639083717ca30d5268ac9e02eb8b68e54bbcd5caf9de4352f332ba0ab23cf22253f0627fa9c9a0472404fff44cda17e8c306fe4f93b2b1f0563718 SHA512 355ac1322421b2fd699deb0ceff8555c9e89062e639de674c62f1fdacad9ed9351fe89e4c14e22f07a6d4e2e2f070fd4d2ed1cd347a20069f2505966b5c29e0e
 EBUILD flashrom-0.9.6.1.ebuild 2702 BLAKE2B e09bdc5eefbb5ede081353387f4f28d5de54a1298e867053774a883fdbd5a4cdd3df7dcc461a1806911c0ff74f84ee086130d0c1c9e250e01ff39c725635f62e SHA512 5488a0f73d3545182fd1e240add89304044aa511db26cb1799a4f99112c55902a70a1fdf79f12d1bb5713b18d5f1a4bdf1136b5c18d381cffe7430cf5dc80020
-EBUILD flashrom-0.9.7.ebuild 3400 BLAKE2B 11c2fb2eda0d52ef3fae367d3cec29e62956242b2ba160d78a8eb34e06f13f8143fe1777906d1b16bbb14d40d376017c0aeb06bfed8e1b79d7eee0f63f7d60eb SHA512 822b0ed4c599fc237c78913aa59eedf48852c9ea6fbe87de6783594d2af2a168bed9ccb67b3fbdb81ceb1822ff37fce567504d945552c58ecf34603f1812c35e
-EBUILD flashrom-0.9.8.ebuild 4135 BLAKE2B 7800d2f231479c083af14f1e4ab625cb8b7be3371b2db4ade1099d9742a1e77fc2f22408e3b6babfc14c0c64f1d7a7d3ed1347a765fd132a9bc22b3e2f0c91b0 SHA512 a4b53721ac9c1568482120bd3702a998a6ecb9d38c352a7878903b8fc4622cf23b5e625bf4a2565b9aa4958a93d807f6920836d3c8e6741558521b0dc0976ba1
-EBUILD flashrom-0.9.9.ebuild 4253 BLAKE2B e88703f23f93dd2f5c5b6ab30b47624f49aa334bae3837cac80e63bb66be6538323879a1fd50164343cdda5c8dde3c5c95342a184a29e02ac7dcd14f28bd48a5 SHA512 a01fe51282a284faea2e8213866df650148d7abfb399c113ecf5a2b9a98d41795b72218a52a0db61197225033e2fabaf56254bc02e1af1a606957cd2d0b89bc3
-EBUILD flashrom-9999.ebuild 4253 BLAKE2B e88703f23f93dd2f5c5b6ab30b47624f49aa334bae3837cac80e63bb66be6538323879a1fd50164343cdda5c8dde3c5c95342a184a29e02ac7dcd14f28bd48a5 SHA512 a01fe51282a284faea2e8213866df650148d7abfb399c113ecf5a2b9a98d41795b72218a52a0db61197225033e2fabaf56254bc02e1af1a606957cd2d0b89bc3
+EBUILD flashrom-0.9.7.ebuild 3394 BLAKE2B f95bbed798bb7a86c962c32cf2b09b47474415fb141d72c13d6045b955153d8a50e0f29834f641bc674f7349796167d0a9be9fae7dad2c9758ec79df14f8f816 SHA512 6435c267b8664b7cdfe9a8fedea13ff4e5756e107ed40643b16c404f6c46bff4c6f679cc02154d29157ff45c2fa3930d9fe742c258bf29de502ed8c090f92ea9
+EBUILD flashrom-0.9.8.ebuild 4129 BLAKE2B 40113bd2aae43ad066b0e3f3da25e2164bb94250047d8cc360402af983f6dd4ad8de5a0c285fccce776c301fd659e5e3dd49d36fa9f550726ea631f7ea7c71a5 SHA512 2fa5038683700dbe446a386f93c37afcb6f089396b4f6e17526de58ca840cb3c908808335988a6d84ebe44868d92d47dfba6bcc7b62a0cfc1ba8568f4258770f
+EBUILD flashrom-0.9.9.ebuild 4247 BLAKE2B 14c4b35866d6f45924b20f625152bad859c853ae651d0704e1ec267f420ca6a29013fc67b6b8cfe6ae42cd86d23d68420e914f4a77c383724055470b387507db SHA512 4a8591b141a7c3964e814e4b47f0cc3f1f4810ef0526b640846668f3a54a7b69354f4ac02e937842042e3e6cefa112e711d6ad22d2742b1711125c451c6968b1
+EBUILD flashrom-1.0.ebuild 4146 BLAKE2B ceeaea4b99c4151866294c5ed4bf25203bc9cd394d79e60f553e02ef76e73863d3196691d47bb0f46fef3c55370358c91d9373751e5bec261f38093721ccc374 SHA512 0dfee6352b5bdf9f349ba257fedc73d5e3ba5071951eb5ff5be73b4e7be9aa4df338c296125dc52e5602dffce49c094f11d4c1a04f7abaee0846ee52e7032c5b
+EBUILD flashrom-9999.ebuild 4146 BLAKE2B ceeaea4b99c4151866294c5ed4bf25203bc9cd394d79e60f553e02ef76e73863d3196691d47bb0f46fef3c55370358c91d9373751e5bec261f38093721ccc374 SHA512 0dfee6352b5bdf9f349ba257fedc73d5e3ba5071951eb5ff5be73b4e7be9aa4df338c296125dc52e5602dffce49c094f11d4c1a04f7abaee0846ee52e7032c5b
 MISC metadata.xml 4482 BLAKE2B 69683fa8e9f2193f52a7b548cf6c811f2d01e18acdcc57edbc12fdfca8cf4110a65c3c204ee1d323d3e1529ec169381c92c923dc0d6a637ab745d0c49cc80942 SHA512 f9161a35b798faccd83029720b0780e4edae9c2127d5226f7e8933a55dcba3a38e9f7e215555325a9178f931478ea43d93353c40bafcfdaa813666cfb7589ba8
diff --git a/sys-apps/flashrom/flashrom-0.9.7.ebuild b/sys-apps/flashrom/flashrom-0.9.7.ebuild
index 380c620e355d..1ddd4a0e7b4a 100644
--- a/sys-apps/flashrom/flashrom-0.9.7.ebuild
+++ b/sys-apps/flashrom/flashrom-0.9.7.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="https://download.flashrom.org/releases/${P}.tar.bz2"
-	KEYWORDS="amd64 arm ~mips x86"
+	KEYWORDS="amd64 arm x86"
 fi
 
 DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
diff --git a/sys-apps/flashrom/flashrom-0.9.8.ebuild b/sys-apps/flashrom/flashrom-0.9.8.ebuild
index 5c1ffdbebc23..82ae6d8592c2 100644
--- a/sys-apps/flashrom/flashrom-0.9.8.ebuild
+++ b/sys-apps/flashrom/flashrom-0.9.8.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="https://download.flashrom.org/releases/${P}.tar.bz2"
-	KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
diff --git a/sys-apps/flashrom/flashrom-0.9.9.ebuild b/sys-apps/flashrom/flashrom-0.9.9.ebuild
index 5e764d19fc7d..b6fe28e75232 100644
--- a/sys-apps/flashrom/flashrom-0.9.9.ebuild
+++ b/sys-apps/flashrom/flashrom-0.9.9.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="https://download.flashrom.org/releases/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
diff --git a/sys-apps/flashrom/flashrom-1.0.ebuild b/sys-apps/flashrom/flashrom-1.0.ebuild
new file mode 100644
index 000000000000..45893e146faf
--- /dev/null
+++ b/sys-apps/flashrom/flashrom-1.0.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://review.coreboot.org/flashrom.git"
+	inherit git-r3
+else
+	SRC_URI="https://download.flashrom.org/releases/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
+HOMEPAGE="https://flashrom.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# The defaults match the upstream Makefile.
+# Note: Do not list bitbang_spi as it is not a programmer; it's a backend used
+# by some other spi programmers.
+IUSE_PROGRAMMERS="
+atahpt +atapromise +atavia +buspirate_spi ch341a_spi dediprog +drkaiser +dummy
++ft2232_spi +gfxnvidia +internal +it8212 +linux_spi mstarddc_spi +nic3com
++nicintel +nicintel_eeprom +nicintel_spi nicnatsemi +nicrealtek +ogp_spi
++pickit2_spi +pony_spi +rayer_spi +satamv +satasii +serprog +usbblaster_spi"
+IUSE="${IUSE_PROGRAMMERS} +internal_dmi static tools +wiki"
+
+LIB_DEPEND="atahpt? ( sys-apps/pciutils[static-libs(+)] )
+	atapromise? ( sys-apps/pciutils[static-libs(+)] )
+	atavia? ( sys-apps/pciutils[static-libs(+)] )
+	ch341a_spi? ( virtual/libusb:0[static-libs(+)] )
+	dediprog? ( virtual/libusb:0[static-libs(+)] )
+	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
+	ft2232_spi? ( dev-embedded/libftdi:=[static-libs(+)] )
+	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
+	it8212? ( sys-apps/pciutils[static-libs(+)] )
+	internal? ( sys-apps/pciutils[static-libs(+)] )
+	nic3com? ( sys-apps/pciutils[static-libs(+)] )
+	nicintel? ( sys-apps/pciutils[static-libs(+)] )
+	nicintel_eeprom? ( sys-apps/pciutils[static-libs(+)] )
+	nicintel_spi? ( sys-apps/pciutils[static-libs(+)] )
+	nicnatsemi? ( sys-apps/pciutils[static-libs(+)] )
+	nicrealtek? ( sys-apps/pciutils[static-libs(+)] )
+	ogp_spi? ( sys-apps/pciutils[static-libs(+)] )
+	pickit2_spi? ( virtual/libusb:0[static-libs(+)] )
+	rayer_spi? ( sys-apps/pciutils[static-libs(+)] )
+	satamv? ( sys-apps/pciutils[static-libs(+)] )
+	satasii? ( sys-apps/pciutils[static-libs(+)] )
+	usbblaster_spi? ( dev-embedded/libftdi:=[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	sys-apps/diffutils"
+RDEPEND+=" !internal_dmi? ( sys-apps/dmidecode )"
+
+_flashrom_enable() {
+	local c="CONFIG_${2:-$(echo "$1" | tr [:lower:] [:upper:])}"
+	args+=( "${c}=$(usex $1 yes no)" )
+}
+flashrom_enable() {
+	local u
+	for u ; do _flashrom_enable "${u}" ; done
+}
+
+src_compile() {
+	# Help keep things in sync.
+	local sprogs=$(echo $(
+		grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \
+			sort -u | \
+			sed 's:^CONFIG_::' | \
+			tr '[:upper:]' '[:lower:]'))
+	local eprogs=$(echo ${IUSE_PROGRAMMERS//[+-]})
+	if [[ ${sprogs} != "${eprogs}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "IUSE set to: ${eprogs}"
+		eerror "flashrom.c : ${sprogs}"
+		die "sync IUSE to the list of source programmers"
+	fi
+
+	# Turn USE flags into CONFIG_xxx settings.
+	local args=()
+	flashrom_enable ${eprogs}
+	_flashrom_enable wiki PRINT_WIKI
+	_flashrom_enable static STATIC
+
+	# You have to specify at least one programmer, and if you specify more than
+	# one programmer you have to include either dummy or internal in the list.
+	# We pick dummy as the default because internal requires libpci.
+	if ! use internal && ! use dummy ; then
+		if [[ ${#args[@]} -ne 1 ]] ; then
+			ewarn "You have to specify at least one programmer, and if you specify"
+			ewarn "more than one programmer, you have to enable either dummy or"
+			ewarn "internal as well.  'dummy' will be the default now."
+			args+=( CONFIG_DUMMY=yes )
+		fi
+	fi
+
+	tc-export AR CC PKG_CONFIG RANLIB
+	emake WARNERROR=no "${args[@]}"
+}
+
+src_test() {
+	if [[ -d tests ]] ; then
+		pushd tests >/dev/null
+		./tests.py || die
+		popd >/dev/null
+	fi
+}
+
+src_install() {
+	dosbin flashrom
+	doman flashrom.8
+	dodoc README Documentation/*.txt
+
+	if use tools ; then
+		if use amd64 ; then
+			dosbin util/ich_descriptors_tool/ich_descriptors_tool
+		elif use x86 ; then
+			dosbin util/ich_descriptors_tool/ich_descriptors_tool
+		fi
+	fi
+}
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index 5e764d19fc7d..45893e146faf 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://code.coreboot.org/svn/flashrom/trunk"
-	inherit subversion
+	EGIT_REPO_URI="https://review.coreboot.org/flashrom.git"
+	inherit git-r3
 else
 	SRC_URI="https://download.flashrom.org/releases/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
@@ -64,12 +64,6 @@ flashrom_enable() {
 	for u ; do _flashrom_enable "${u}" ; done
 }
 
-src_prepare() {
-	sed -i \
-		-e 's:pkg-config:$(PKG_CONFIG):' \
-		Makefile || die
-}
-
 src_compile() {
 	# Help keep things in sync.
 	local sprogs=$(echo $(
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index b6acd13869a8..d3b97d8fab6b 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -2,7 +2,7 @@ AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6
 DIST hwloc-1.11.10.tar.bz2 4102431 BLAKE2B 4caec6f1c1a5f0b571854127cc6fd808e778b3b2bcf7ded7edfe99100ac4ccc05c893f3df0a56119234510aa5256e5da84cfa15dddb7d15e49eca2936baa7f41 SHA512 9e2cf5cc43f8c21cfd0bf09a58fda09ba832908eca5a211d164eb106f090609b6351bc934e572200530284fbfc5c460db29a49ec7974dbd298d757ed8aaf32b3
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967 SHA512 aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
 DIST hwloc-1.11.7.tar.bz2 4187754 BLAKE2B 9d55c35ee328eddbdb9364f4330d157eeefb53fd01b3d0cba23423515302ab0f43aac6c6aaec3a96277411883e3806888aa1c55d2312e102d00302305279f044 SHA512 f3afd123f917d07fe987b8a16dba9f1aa9a9112fc4bdc806417c942b5fbd3b7f31067550048258814b4ba08d4ac7bd45c1fd477457d817bf9453735e0b82f04e
-EBUILD hwloc-1.11.10.ebuild 2234 BLAKE2B db00c1f5d061643e62d2f80eb6f7436d03a7e390015a272fa06ae5dc12512ec304d4fa5b1da7b2b386fdd9733fd09b8798a6938d9abd83055ba72642a1c41dd2 SHA512 cd0c1d0190fec2baced33fad211267a50863e0ded4a1437332899c75f0cf0e98adfb8678c35e7d434a4eb3d1ac3cfb46df26548ad5be5c2a6189e4d768670fbc
+EBUILD hwloc-1.11.10.ebuild 2240 BLAKE2B c935e5c7f67b37f0075cc402ac838d098e81e37172c463d04b843051f1581e3d53ba896f9c4d09bf33bc99f7aa004b60e993a18216b8c07ed65e87b4a46f1ede SHA512 96c45d99501f348b99867edb06cb55e397c0b00a6dd7dd0b542d140655088fd35aaa7c9135b5e506d95614f30453b5aa16cc5e0bd5fb6c0baa19660eab9aeb4e
 EBUILD hwloc-1.11.2-r1.ebuild 2207 BLAKE2B 56a2d0b7383b173cc389a22b3a3ee68a867db2339bad083720bb6c1a8f5e8879e414a87039164b019140f959d742519d5d5cc9126a8712e4ddb9af2dffedd964 SHA512 ec68dd2534e19ef77a0bd4fd87b357d8dc05bddc6a361ee320fe7b9145ed0a6988d219ec8c56c6ea66036db61e1cbd2ade9f34e4470b997684f95309287fce6d
 EBUILD hwloc-1.11.7.ebuild 2218 BLAKE2B e085ef7ca3e0d275b5e59b4e14206450bc4c820addef6931547247037862072d988e70f37f900a9a6bf66d478c48b97500ae1d5cbba1b405e5321e7841c217ab SHA512 984bb91ccc20ee9afeee0cc474141a7c967deb8e4cc02235a095161721e16aeec43901fb9fcd1eff0b3dd05e5f3a46691711a64a838d90423ecded36e900baf5
 MISC metadata.xml 1263 BLAKE2B 31a2da3a73430d956f12a029941ee5439ab374be53be55a505f9de83735eab843cd60ca48230bdefa0e8dd3f53b8276dccb62df847364bb79e737f8770fa2553 SHA512 9c21fd25ba0f5046ab051e58884c67d3627040bf66b58d114fa504e411aefe3411c591e356a419e955269e74cafba06ac9fe335b1bb9c43253c029accef1d166
diff --git a/sys-apps/hwloc/hwloc-1.11.10.ebuild b/sys-apps/hwloc/hwloc-1.11.10.ebuild
index a0470dfc5145..ac35fa5698e0 100644
--- a/sys-apps/hwloc/hwloc-1.11.10.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
diff --git a/sys-apps/portage-mgorny/Manifest b/sys-apps/portage-mgorny/Manifest
index 39dd8671ca05..88a81290e3a3 100644
--- a/sys-apps/portage-mgorny/Manifest
+++ b/sys-apps/portage-mgorny/Manifest
@@ -1,4 +1,4 @@
-DIST portage-mgorny-2.3.24.4.tar.gz 1235738 BLAKE2B 4365b4c2ac754b6a09a19598d7e4bddc16575b17dcd3e6dabcbb58ddd905a548da5d7c5a660e8bb8e638e39bf8803869144f08f6ece34775e79dd70f4be6d933 SHA512 ed5f14a457d00951f4af6b76db501f33523b6a19f2983d1b7acaa62f7eee90b8facf834f88d4de2dea26f12b7f373c64771c9f797af6c82578fb45b8db8ef678
-EBUILD portage-mgorny-2.3.24.4.ebuild 7161 BLAKE2B a28242e6998063885289bd70325fe5fa294eef5211ed210bd494f661477a075c99732b637a785b1d9eaa053e8870b575313ace8a360c746099bcae66b1eedc44 SHA512 01ccd7ae1f1b28993fe7fe12e8660460c886b3cdcfc06c9af8842a863b60b65063b65fe5681379dcbdf9fb4b7579d4dbb02458275c45df81f323183fcb08cbe1
-EBUILD portage-mgorny-9999.ebuild 7046 BLAKE2B 9bc4ab0e238e9cc3d25552764e135039a8e3ac8a423b5288f1d801e569497aebf1c22e35249deec5291bb731e00c1dd378895c6e13a38e30bc22b2eb8f89c2cd SHA512 02d4a0e299ea2bdc958a1b46b2e81d6ad5848caa03456a2b6d5a6b3b55eeb28c9cde264e232e0815e40a9bb8f8273fa2102eb5d9d92edc4c3b9585c59ed38f87
+DIST portage-mgorny-2.3.26.1.tar.gz 1237698 BLAKE2B 73dcce2f57930bd074f6de5103a31ba3730537196438302ea7b25b21ee32d6ab8b3292b42825eac2e912639be1dd0a1b15c049c5cb22f54525c476b96f4817f4 SHA512 38c5ca6a1fee7125942fca10921f3c2ae201c6c06b4f69ee7b0b90b44486aca7b8e4f5817efad99c1ef5ad3f558cd9da144d2c3c26242a1a05bca9e17921b173
+EBUILD portage-mgorny-2.3.26.1.ebuild 7148 BLAKE2B 6560b50e0e55106e2415c3ebe7ace10d0b62ab4f8183d90566bf172b9d819ec2e816e6bfc241e7208bd4a24444a6e8b337f9b7a328ec6d05a246e6168af2f789 SHA512 9745458840e04187caa20076f939d83a325e0bdbb58e36eda4572b1ec1d989fa343389a8dda730f90c12ca3e308a0a5bacb1d3d5d443625293abe48eaea5cb8b
+EBUILD portage-mgorny-9999.ebuild 7060 BLAKE2B 283fe989708567de926d6a7d227193a6f8761caec6a485cd80d95c60f2efb018b9b6df48362cdfebeefbaaedddcd9df9066bc3a42d4c913a4b2f5c4f505b9382 SHA512 a2a77e0a75ea9169e28f7c886a41b11368196e6f27980c33406804b40deea275ce58d1564de4c6dcd3c5e44caabd640d3c576fb415ac12bcc2fb34ec2f934e76
 MISC metadata.xml 817 BLAKE2B 8792bea6f73e3d72c747a11a0946c119abd9a24e3a1f40c457563536a9a1ce304c8c2ff0682fad3f94913d171806a262cf73de7437b5f250215810d8ffb32447 SHA512 e3498363b89e349d37b13dd40c7b3225f8c445b1ea2db9f70f2a1d718b7576103296d52581aa5ae0edc4ddd3fa8123161425c2732753f88e997b1cca818572b2
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.24.4.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.26.1.ebuild
index 39117506dcf5..d6c166badf4d 100644
--- a/sys-apps/portage-mgorny/portage-mgorny-2.3.24.4.ebuild
+++ b/sys-apps/portage-mgorny/portage-mgorny-2.3.26.1.ebuild
@@ -9,9 +9,8 @@ PYTHON_REQ_USE='bzip2(+),threads(+)'
 inherit distutils-r1
 
 DESCRIPTION="Fork of Portage focused on cleaning up and useful features"
-HOMEPAGE="https://github.com/mgorny/portage"
-SRC_URI="https://github.com/mgorny/portage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/portage-${PV}
+HOMEPAGE="https://github.com/mgorny/portage-mgorny"
+SRC_URI="https://github.com/mgorny/portage-mgorny/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
diff --git a/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild b/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
index 492a6ca37c29..d3195fa60f36 100644
--- a/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
+++ b/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
@@ -9,9 +9,9 @@ PYTHON_REQ_USE='bzip2(+),threads(+)'
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Fork of Portage focused on cleaning up and useful features"
-HOMEPAGE="https://github.com/mgorny/portage"
+HOMEPAGE="https://github.com/mgorny/portage-mgorny"
 SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/portage.git"
+EGIT_REPO_URI="https://github.com/mgorny/portage-mgorny.git"
 
 LICENSE="GPL-2"
 KEYWORDS=""
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 51f2ac8258e6..e13b1dbe20ac 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,12 +4,14 @@ DIST portage-2.3.13.tar.bz2 945477 BLAKE2B 0ad44859f04db529713cc80a51e6dadc767ed
 DIST portage-2.3.16.tar.bz2 949134 BLAKE2B f8e7b6f13dfbf9aecdec444705042c6584c324522c0d131bf3c10f8fbfd5f6eeb97134afa42ed23da37f36ad4e2a0fc27129aebeb100aed2e3fd650c360ed060 SHA512 5847904b3262adcef04c7d6781cf2d03130480a49c5343a3a2d5cc36ddc7245ac30b1ba152329f96e2e4ca8d62ef387554cb228798db60f6f8141830d147dfaf
 DIST portage-2.3.19.tar.bz2 954921 BLAKE2B e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240 SHA512 94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d
 DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9c5211e9cafd4f1a35de1d77e655d99df0ceb352fd431a8cefd40c733064422d8f41099edf7263aa36ef8cfd2ba8 SHA512 fca250d4afc1819a27b67daff770132ed4e88fb067038992a6b3f8aac63604536366ea628dd30c24f93db19ae55e88da372598ccc489bcf445038dfe860ce0ec
+DIST portage-2.3.26.tar.bz2 970245 BLAKE2B b854bef894327b9e4beabca55d70368d326548d96efdc5b63e47f77971da195d041c8e8412bbb308ef6922be02964727c99f9dcc92a2a4b0a7372e0a1c774ffe SHA512 5acb8a00fdbc72a8c3e79f8b1c2ba17c9b469205edf1e56592db9ccfeb54b4dc83a98548ff0e01c408456a1c962262377967f6d70510c8d1b0e7ab15eab51079
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db
 EBUILD portage-2.3.13.ebuild 8197 BLAKE2B 0d4dc660b6169ea2c69c35ff9d44ce8ae3d25d18f15f529bca80140e20fae2905598cc2668c5b9fdc9bac042144bdbf7c8ccffb0e2680cff28ceef13123ac228 SHA512 1dea3d8545bdb72b4b0acbaf7377404be97630335ec1d22430e2a872c550a45abde63b03cc2105cac70627e0c5b5481448bcedfa0b7702e11ed79f29c2f4b3a2
 EBUILD portage-2.3.16.ebuild 8360 BLAKE2B e86eb44b2dd331f52d308a63d3db0f94dd2873ba1fba84d9f3a2d0420a18ee656765238c4da0025ebc329a1b42025ab2f665b9374f757e3b7a40b67af2391564 SHA512 993dca2cc7a1b1d102507f11945922cc403771055dc273c10e92b62c55b9f47e9b32136a8d958f66de32476b2c60ce4d211e69cbb1fa7de7003ca0c658944025
 EBUILD portage-2.3.19-r1.ebuild 8415 BLAKE2B 2f317c8d4c636a870ed27cbb4dbdc3a0cba6decbef29944f5eec3d8091e6b4fd098033da44bffe55a312c23de2e9dbd16b73a9d69ba2d3c2d2ce05ba0d6cf033 SHA512 b4d363547eab3e074da48d9050b1dd091372114ded9ff146df3f0168264f7cc7781d4b5968df42f3a5dea8fcdfa1c483a5e3ecdefc59222503f7daf441c9da20
 EBUILD portage-2.3.24-r1.ebuild 9270 BLAKE2B 56129755048817a6651fae7f243cbc89a17959c59371fb337542840ec3ca4543c1e5ad35143b0564f01ecc818b7a63748749426be91c002c8406d9f2eb78cc36 SHA512 efab90e8139a141d6d5466a2d9d67181d7dfe923bc0be3bc735b3107369b8a20485ad0ed3faef1c4ff105e5dadd0dd55533bcc251cf833222102fc46ed74b1d6
+EBUILD portage-2.3.26.ebuild 9279 BLAKE2B 3d8fd9527d24aed70be755af64e7b782eafda0172bf7e12a31be3660d435d687d0e834077a76128350a8275679d7084ca4e18c9c1593d2f8da53274ceb6b4b28 SHA512 0a9b7d938952ce2f3c8856310d211f7eb6e0bfc996b11a26954c1efa9604409a627d8aa83cc4800480a77685c004af2c1d0c49113c0b6bedc1bad9c46be093ea
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
 EBUILD portage-9999.ebuild 8795 BLAKE2B 82b5c300a67ef35dc2e57e2680efec39cfe4247e5ae8b6e469bfb022275076056b0ec05f280d4925a4537588d94b471397d8a065c2a80e6e64b5e9c51cff2ec7 SHA512 fadc6f2da2fc363438aee4a04b0c36bad372d724c14591fba943b6f9f7602d820300192dd1ca9d78f32bf2279a27aca0c74364a2563a58a135f684adfbaf1910
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.26.ebuild b/sys-apps/portage/portage-2.3.26.ebuild
new file mode 100644
index 000000000000..c2e3ea64cbb6
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.26.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_4 python3_5 python3_6
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-10
+			app-crypt/gentoo-keys
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+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)"
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i pym/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		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)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	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" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use epydoc && targets+=(
+		install_epydoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
+		has_version "<${CATEGORY}/${PN}-2.3.3"; then
+		SYNC_DEPTH_UPGRADE=true
+	else
+		SYNC_DEPTH_UPGRADE=false
+	fi
+}
+
+pkg_postinst() {
+	if ${SYNC_DEPTH_UPGRADE}; then
+		ewarn "Please note that this release no longer respects sync-depth for"
+		ewarn "git repositories.  There have been too many problems and"
+		ewarn "performance issues.  See bugs 552814, 559008"
+	fi
+	einfo ""
+	einfo "This release of portage NO LONGER contains the repoman code base."
+	einfo "Repoman has its own ebuild and release package."
+	einfo "For repoman functionality please emerge app-portage/repoman"
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 7428f691f5c1..bbdf08b294cf 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,13 +1,3 @@
-DIST s6-linux-init-0.0.1.4.tar.gz 21493 BLAKE2B 3dbb9aa93b46f69581be0a32f4d2832536cced31f8fb2dd4aad8ddd22303efc9ef0d1ea44a4e0ba912185a16bfd77397834acb9c6d908971b15b6ac946d3badb SHA512 84fabc9720f2aa2c68723c7b34023a8971f9e55c367b69c200c9c99d2c04bd23b598563facaca4deb4a11f732be3016361e38a40258a7d0ce68cb0f3c10a0235
-DIST s6-linux-init-0.1.0.0.tar.gz 22242 BLAKE2B 59e3226dde94f772c2946a07867d1ef96ca0b1f5bcf14d7d7f210eb54f970182865f979f15e7e28662ef7cca05bfa2d25e8dece9581378cc05d8ff7975f11f4c SHA512 8898ac09212d33d4160d0a1ccad4f6f24ed8010a16815daec4a68827f7af1948568807ae2063bb1f0fe901b87f605eb3cd199d0a3e9a217255b77ed4fc9eef08
-DIST s6-linux-init-0.2.0.0.tar.gz 24482 BLAKE2B 00c1e7396f7f6fc7ce1e4aa957330740bcf85c9ba53e4c998b793f373d679a34c060f73515729165537b8e1a4e5113903f84f9229a07033a81562fc179ffb74f SHA512 16c8c97b65ad533b70ed9dd189827778797dc8d0a70af0880655b5f89a1524cd9d3675cb681b99f4704d43c810a4211c9926bfeb743247d7c29559ec2f77606e
-DIST s6-linux-init-0.3.0.0.tar.gz 24692 BLAKE2B f7074e6f8591fc4339327e428c526b79d847b1358e4e75b691cdde591c91c47f25c09ffbb4215fed1da3425c42bc79916cb83ff45ec5c298f5d55050af21e4a8 SHA512 9aa775fb2bb86680ba438a4a03b543fda696434eaf7ddea5009ec3adaebb899a2ed039a4727eb7d5427088ed3ff08a9eeaa853769f089789a7327a538f798c67
-DIST s6-linux-init-0.3.1.0.tar.gz 25920 BLAKE2B 56aa4b4fba0150ba55b097c753fb204812cb0b7abea136702b26e1c1363f8a0450428009c0fd7dfcdd42fd63dae139ce154dfc196cf6024c1fbd0a486243354d SHA512 f9c9b35daf8c7322c2146fb14f4df61131fafb6144a71666cfb77f5684e0669abee9689b238d1d1adfea04795a8cd1e88e61920b6c42432cb8a53c0861b776d8
 DIST s6-linux-init-0.3.1.1.tar.gz 25955 BLAKE2B 46e8e88c9c48fd00819cd0f437eea7ca6a5c08751aa3196dda24a8d3a22fdb14270ae99c74134ab0e123dde65bf3cc86c7916a157e447a72428db9b3870ffe3f SHA512 b8a44e09fc6770e91f1ffeed3267bf5fb83cf857653727d52773674db5942fbbc010355bdf24e456d2b2df5a1ac72888b78b2ec502c0d42770af58aaaec00648
-EBUILD s6-linux-init-0.0.1.4.ebuild 1240 BLAKE2B d9fe1919c6db03231b0a8e0bc3557162d8602daadbf37366bee826a46f54f31faa4b19100a0ca5c9147bb409fd0e285d78c175e7f4bd7ae01b839e8f218b1475 SHA512 1fc85d43eb2767601b08957e0ea03ee7aa0393eddce7772997ace94ee78a3b1bc2518df338b0275b00f661081cfff8f0a75d83516df13de07bf77a0dbfb07b05
-EBUILD s6-linux-init-0.1.0.0.ebuild 1243 BLAKE2B e2257294d65c85bdb5c3eea4e239f80d4a85266ae22a60a9782c6968a0d8d9a7c9fdeb1fc66f1a6b3f7ab9fafceb8ed4aa361c60572c6e0d6c917a0c65c310b8 SHA512 a41ca8126bbdd6b374315039fe58c25efea30f304873b3fc916d11ca9e06848ae011fc3e07333339f068517362c96b94548927eb9052edaa7693f4e9253750be
-EBUILD s6-linux-init-0.2.0.0.ebuild 1241 BLAKE2B effd129723bae3110fccb3fc9bbb5bfc34713230c670c235c8a8f7be6c9b33d3e6b5355e239f299ca413419e4d123c816103e8c6dc8fdeba412f565986cff08c SHA512 642f101392debe4604565c5ff35ba6bea7b403a28351b5f1ad157e7189feef6710886f81e4d349b84379b3888c3c0318e801f5339e86e7e0c81782200c44c215
-EBUILD s6-linux-init-0.3.0.0.ebuild 1333 BLAKE2B 628e9a3703ee1fcec3187491cc4aa9a0cc1b1267e037fb085211750d81ec7a92c7cf182d4769cd24b28e67589069aac4e711b11a9f1bd58297a8359d4750a429 SHA512 c2d814c76f6edc99ae64c37743018179529b41ba41c4d87adec1e3f6d0f4570f78ad350d7983d2a7238628847f4901c2fa6b74ec939523dd76302878dac1ac88
-EBUILD s6-linux-init-0.3.1.0.ebuild 1472 BLAKE2B b2d10b719f4668df01bbf241390d6203cf489786e0129e4076336a5a5ef6e44de370749313e06e008984ea78b0f07014d68288fb33912902bee21f2bfb59c887 SHA512 57607c57abc5adb22a22c1aa3d24545d591d83c9a7bfb87931a394229fd4ace887b5a5e859983c5b30fb6d08d151bc76f6cc88b69d31154d218b258221aebb89
 EBUILD s6-linux-init-0.3.1.1.ebuild 1472 BLAKE2B b2d10b719f4668df01bbf241390d6203cf489786e0129e4076336a5a5ef6e44de370749313e06e008984ea78b0f07014d68288fb33912902bee21f2bfb59c887 SHA512 57607c57abc5adb22a22c1aa3d24545d591d83c9a7bfb87931a394229fd4ace887b5a5e859983c5b30fb6d08d151bc76f6cc88b69d31154d218b258221aebb89
 MISC metadata.xml 461 BLAKE2B a9b075ac9aacaa5fba1cc8d768dd188eea6fc1b44d36dc785698db2c8658db6af198a7c534621e41c85a3fac8d4a8bb724470afe90335e2d1afff2ca5d03a454 SHA512 6d7640d82400f43a58eaf536a0275dbffd45dc33fdde49e1d41da959ba0fb0ea68ad9fee8b7e2991d0d4a78b69a224880ed91e4a922f067bf6e1a741748bb4b9
diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.0.1.4.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.0.1.4.ebuild
deleted file mode 100644
index 6aa42b653bdd..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-0.0.1.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="http://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND="
-	static? ( >=dev-libs/skalibs-2.3.8.0[static-libs] )
-	!static? ( >=dev-libs/skalibs-2.3.8.0 )
-	"
-RDEPEND="
-	!static? ( >=dev-libs/skalibs-2.3.8.0 )
-	"
-
-DOCS=(INSTALL examples/)
-HTML_DOCS=(doc/.)
-
-src_prepare()
-{
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
-
-	eapply_user
-}
-
-src_configure()
-{
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable static allstatic) \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--datadir=/etc \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-}
-
-pkg_postinst()
-{
-	einfo "The generated init script requires additional packages."
-	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
-}
diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.1.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.1.0.0.ebuild
deleted file mode 100644
index 4dbdf86c2a5a..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-0.1.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="http://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND="
-	static? ( >=dev-libs/skalibs-2.3.10.0[static-libs] )
-	!static? ( >=dev-libs/skalibs-2.3.10.0 )
-	"
-RDEPEND="
-	!static? ( >=dev-libs/skalibs-2.3.10.0 )
-	"
-
-DOCS=(INSTALL examples/)
-HTML_DOCS=(doc/.)
-
-src_prepare()
-{
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
-
-	eapply_user
-}
-
-src_configure()
-{
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static) \
-		$(use_enable static allstatic) \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--datadir=/etc \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-}
-
-pkg_postinst()
-{
-	einfo "The generated init script requires additional packages."
-	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
-}
diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.2.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.2.0.0.ebuild
deleted file mode 100644
index 823817826d98..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-0.2.0.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="http://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.4.0.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.4.0.0
-	)
-"
-RDEPEND="
-	!<sys-apps/s6-linux-utils-2.2.0.0
-	!static? (
-		>=dev-libs/skalibs-2.4.0.0:=
-	)
-"
-
-DOCS="INSTALL examples"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
-
-pkg_postinst()
-{
-	einfo "The generated init script requires additional packages."
-	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
-}
diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.3.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.3.0.0.ebuild
deleted file mode 100644
index 791ce6855b68..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-0.3.0.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.5.0.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.5.0.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.0
-	>=sys-apps/s6-2.5.0.0
-	>=sys-apps/s6-linux-utils-2.3.0.0
-	>=sys-apps/s6-portable-utils-2.2.0.0
-	!static? (
-		>=dev-libs/skalibs-2.5.0.0:=
-	)
-"
-
-DOCS="INSTALL examples"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
-
-pkg_postinst()
-{
-	einfo "The generated init script requires additional packages."
-	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
-}
diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.3.1.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.3.1.0.ebuild
deleted file mode 100644
index d94588ab510a..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-0.3.1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.6.0.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.6.0.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.2
-	>=sys-apps/s6-2.6.1.0
-	>=sys-apps/s6-linux-utils-2.4.0.0
-	>=sys-apps/s6-portable-utils-2.2.1.1
-	!static? (
-		>=dev-libs/skalibs-2.6.0.0:=
-	)
-"
-
-DOCS="INSTALL examples"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
-
-pkg_postinst()
-{
-	einfo "The generated init script requires additional packages."
-	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
-}
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 8379a744a726..0bc212e46790 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,15 +1,3 @@
-DIST s6-linux-utils-2.0.2.3.tar.gz 40050 BLAKE2B 208fb99ec9d079d7a69a8eb80a86bfc8ad48d43b879f4d1bca22b2ced6c3d033289d660ff40a39efb7effb01c052fa7917f969f7969b5657df05eb489ba69b9c SHA512 10d919c67036dbd57ed8d0e2ba46e1957c621414cae2326c2c696a27b46496d928aa768465236585ed8be279a2866cc9a519f9feb51b9757f999e9b8b80faf2d
-DIST s6-linux-utils-2.1.0.0.tar.gz 40996 BLAKE2B b7dcff330b7e8568cfcdeb1b250bdca4c145e9897660a21720f5b35bb7f81c897c90caf00201fe05854a6933d8e8b5cff152c3fd8fa1b577c2c595b0f3278f3d SHA512 a2bd997334b69c7d864ea14dd27af7b62c8a7b6ccf8f9431ed87f46590546e540a06577f04d2cf3e52299cd9819a31e926326862d751b8528bc98ec2f4e93913
-DIST s6-linux-utils-2.2.0.0.tar.gz 40863 BLAKE2B 4989e0c37f946b380eb4db0600bf06e4b2c28f255669e7ff3e1045bf322b3eb01bf59c26f5ef8cebbe3d0db28a83164487fafd40a63453e1e5020ac7de182424 SHA512 5d0fcd29f7a03146b5296d7164326f76af95a8632df4204021d9ae30b1f03590e7f25d410f07639cf741a455f9624f9410b2e7836ae6838916da50be1527ae7f
-DIST s6-linux-utils-2.3.0.0.tar.gz 40377 BLAKE2B 25f8c1ebf59bb3d68ca160351b6eca8ae54e5833178b03e2be5f4c37019362285f939852f5c95c69fc2f8843ff54dbba83dbcc2e2a0a219cdd1ed4fdb2327a05 SHA512 09e5744f6ac35d33c9c61ffc0ae6c8697e5d1816e5bd83e2dd4385d54a8f6da9c43fe2b1cb1cacba6f30a53cd7d9487a12b44028b20b110c74d6c3016d0511a1
-DIST s6-linux-utils-2.4.0.0.tar.gz 44050 BLAKE2B 59264ade0c0be6893fe7e9c9eb623e6151cc81380590857e754d4812447ea2042284bcc708e723cdf504d7803d17721b500529b2eedaba7694f835332b298fdc SHA512 68f3dbd230d99afeeb47310ec544b7d9fa4658b580567f81100f988fd90d4db239938eae9b999d7be9ee384d9ac51ac61ff5d2d620a1b9711ff5663ff2aa6021
-DIST s6-linux-utils-2.4.0.1.tar.gz 44248 BLAKE2B 8c224ff2df293d96fdbad16805f8055a0cd53db6f9bb63f15d65a85b78fb0b15022f5bbf5a97806eb2a37061a36412539c0ca6e63049a7985b1f609dc0a871cb SHA512 91c1ed1ea329394158e859e8fd5741a2589ba8d0f8c2d0a0d14b989bd99dce3666d3de78f6be676b672824d21f0e40bf03ede198ec59e391791c092a65f835d5
 DIST s6-linux-utils-2.4.0.2.tar.gz 40832 BLAKE2B 24ce6d51aacfcaeeb8531931a0deac4e2430f627907157022ed6378e7058afcc946f1c620bb3758e43a1911db517dd46e65a43f338c446e61711b000d6751523 SHA512 4b0c8f1b65b8eb47f3aa7aa365d20dcd46fc144e166f78825ee53aeb789e009b2716a826efa1e92e86e8fe86421efc6ae07970ce421c6913f0b1db679eb6117e
-EBUILD s6-linux-utils-2.0.2.3.ebuild 1064 BLAKE2B b94d73bb973f1210e0c0f7db096a393e1822ca41869cdc60ac4597a6cc29e8424ac4c64d66fd2507184aa8ed0bc69232408bbab08e461afe79dc3d3032fe7fd6 SHA512 635bfc068b86ed52094aac3a64b8437d1f44b6239bca890f89be06c21b2d682fdc8fc027487855cd522b46f2c511ed9e067ef92cfb4b7ad38ff4f6a04b40721c
-EBUILD s6-linux-utils-2.1.0.0.ebuild 1049 BLAKE2B 13d190e2ba46b661460ad5622c5eb1caddcd1f9f442e190e1a1b100ddc7e11f95851e6704ea9b46853ae53bed5ab8cb7a5b9fb5493dfeb6a7ff2d4ae1e9cab19 SHA512 a08169031add46d92eef870cd4b374605471db8b603a5ff914b57aa1ec6396d590c2f7b0560bbe2f882c93737801aafda36e3a60233d0029d17c17096be479bd
-EBUILD s6-linux-utils-2.2.0.0.ebuild 1013 BLAKE2B a4ba5f8d7eba4526a4f888cb69dde359f3246e3bb1b5f4d1bbcea732dbdb99bf6f0e3532b3e6782cf0a018bc31ed44e39c791de1445b74b9ef8e656d36e6ed63 SHA512 d9b18ff313baf6514f917a86554ea280a53ee4cb2350da90724047712118bb0aa7ef346c2a5b3938ddd7cff218e344129593046e74c88760fc7629b6d7f5fdb1
-EBUILD s6-linux-utils-2.3.0.0.ebuild 1015 BLAKE2B c008a50d226dd0edc702dba0690fc8505a9eb8c9797667c3a7ec16acb87e61d49c332840347c1e4837499d25784b79e47ceb1a966d0e13e3f2d9b376383a2394 SHA512 7f75497a328c2947d24320ddbbeb267f4bed39eec996d6eb9259cc7d9965982a4cd5db26e96a56b65290fc486697ff45ef14f0ff3990e7feabcef13abdde06d9
-EBUILD s6-linux-utils-2.4.0.0.ebuild 1154 BLAKE2B cd880b93e2de8afabd2507d51ded9b4ce622dccb5049ec33c17c8e35952d7da67b14bc401d41ff6b4e8cbbdf3a1d9572d5c08dba64139c62380ee52b562d9e3e SHA512 5580711a1f971441d5a8f926fb049223a3d7817eaf366af0c6d6bede1119770f19b8eb72561ef0696983324a4ab3f406e2aa5585b623a3dd10c47eae982f3fca
-EBUILD s6-linux-utils-2.4.0.1.ebuild 1154 BLAKE2B ffa1b35de29ac866905693b12381aeef66c85f2f69cb46aff0e39683ed06077e01acaec1b1a1fbc43dfc9e2d78e6634485a0e32d5d08ab96aa0e69b2e804fcb9 SHA512 553c03ebb0b7d403cb47000f81943993e8005cba717b2c4c27cd7415817f226e5e26a4f750cc55ed35fafaaf03f6b09623595f68942741231a42d62084125983
 EBUILD s6-linux-utils-2.4.0.2.ebuild 1149 BLAKE2B 9bde0a49a4d14c1be0642e590f568a0ab15c7a29f51480779f96ff25799494f73e268d6ca9e8ccbd82c3259b6df1dba770d29f94459b9c4d2fe97b1eba27eab1 SHA512 bfd9bba07e7071baa00df31f5980952f6312b370d4f9762650afb1dfce909f8d6d50029bd7d7d78f2cafafc8ac7e3162bdc31c68b13d610394730be35ebc429a
 MISC metadata.xml 461 BLAKE2B a9b075ac9aacaa5fba1cc8d768dd188eea6fc1b44d36dc785698db2c8658db6af198a7c534621e41c85a3fac8d4a8bb724470afe90335e2d1afff2ca5d03a454 SHA512 6d7640d82400f43a58eaf536a0275dbffd45dc33fdde49e1d41da959ba0fb0ea68ad9fee8b7e2991d0d4a78b69a224880ed91e4a922f067bf6e1a741748bb4b9
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.0.2.3.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.0.2.3.ebuild
deleted file mode 100644
index 11727787a717..000000000000
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.0.2.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib
-
-DESCRIPTION="Set of tiny linux utilities"
-HOMEPAGE="http://www.skarnet.org/software/s6-linux-utils/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND="
-	static? ( >=dev-libs/skalibs-2.3.8.0[static-libs] )
-	!static? ( >=dev-libs/skalibs-2.3.8.0 )
-	"
-RDEPEND="
-	!static? ( >=dev-libs/skalibs-2.3.8.0 )
-	"
-
-HTML_DOCS="doc/."
-
-src_prepare()
-{
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
-
-	eapply_user
-}
-
-src_configure()
-{
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static) \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--datadir=/etc \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-}
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.1.0.0.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.1.0.0.ebuild
deleted file mode 100644
index 9aa08ac895f6..000000000000
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.1.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Set of tiny linux utilities"
-HOMEPAGE="http://www.skarnet.org/software/s6-linux-utils/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND="
-	static? ( >=dev-libs/skalibs-2.3.10.0[static-libs] )
-	!static? ( >=dev-libs/skalibs-2.3.10.0 )
-	"
-RDEPEND="
-	!static? ( >=dev-libs/skalibs-2.3.10.0 )
-	"
-
-HTML_DOCS="doc/."
-
-src_prepare()
-{
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
-
-	eapply_user
-}
-
-src_configure()
-{
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static) \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--datadir=/etc \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-}
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.2.0.0.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.2.0.0.ebuild
deleted file mode 100644
index acadc49031dd..000000000000
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.2.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="set of tiny linux utilities"
-HOMEPAGE="http://www.skarnet.org/software/s6-linux-utils/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.4.0.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.4.0.0
-	)
-"
-RDEPEND="
-	!static? (
-		>=dev-libs/skalibs-2.4.0.0:=
-	)
-"
-
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.3.0.0.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.3.0.0.ebuild
deleted file mode 100644
index c8808a355bd4..000000000000
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.3.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="set of tiny linux utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.5.0.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.5.0.0
-	)
-"
-RDEPEND="
-	!static? (
-		>=dev-libs/skalibs-2.5.0.0:=
-	)
-"
-
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.4.0.0.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.4.0.0.ebuild
deleted file mode 100644
index 3465861c965c..000000000000
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.4.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="set of tiny linux utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.5.1.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.5.1.0
-	)
-"
-RDEPEND="
-	!static? (
-		>=dev-libs/skalibs-2.5.1.0:=
-	)
-"
-
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.4.0.1.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.4.0.1.ebuild
deleted file mode 100644
index 148e80db555f..000000000000
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.4.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="set of tiny linux utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.6.0.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.6.0.0
-	)
-"
-RDEPEND="
-	!static? (
-		>=dev-libs/skalibs-2.6.0.0:=
-	)
-"
-
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index 5bc97c626f08..550cd77895a5 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,13 +1,3 @@
-DIST s6-portable-utils-2.0.5.3.tar.gz 46300 BLAKE2B fb1b0713cd8b5172c18f0e6eb679f79784fdc3e08b85e471916ba048758a1c9f701abcd309304442f4a5309992dcd091ce722823803b9b9a70d7a7ab86a9c551 SHA512 19e71457dc0ca8c1d161da36fb32902f2b8c60759745651806c9eebd19f3ec4d3d87d2d45fb226711eb16f6ae407671c363fc2a7df7d5746ecf3a4197012a122
-DIST s6-portable-utils-2.0.6.0.tar.gz 46972 BLAKE2B bfb204c40eb152c41e6a84a8ec6b6942a05bd5ee62726d11a1bc86f462b729e4be31d8d376bcca72d6d5f55856a6c51ebdc25a3dff8a157416fa4a01e7485737 SHA512 822c723f112550550591afb83908bf4d62f40e88fd46eacc6d56feb4c952bcfc4bad91c988f7379323cf7997c4fb823bb837e0c433ca6947762a63a1b8681557
-DIST s6-portable-utils-2.1.0.0.tar.gz 47170 BLAKE2B aba943205803710d2b306c824937c5e87d35a4b9dd00ffa9e12dc46659be114ba1c7edcd5ec5a2c347d14209d63166b81bd64fdad4c047d3dc5c2b2516eda15a SHA512 0b18304c63180c3233a5f29e1fc24b20c9c99c8949b042244d4a5b69cf2f15049ccbeddb2c3ffc5e88ee636bcfe836568670cc1626d5517381771ee3baff10c5
-DIST s6-portable-utils-2.2.0.0.tar.gz 47142 BLAKE2B f9b7aff5ffd6c1a6d4afc9072cf035487075ffea799df340394bb747b7a103cc92fdd63560af03e6300c718eb1783ddf2f587d9ad7b8a290f69039f8dad9c5a6 SHA512 199f492dd5493ebd284a8cec278816c8d2586ce47d7be082e71926df32fcbcb2feeceb041ab75d20dd40c152cef7151748a75c8122312dc0d7681c8c9cf199ec
-DIST s6-portable-utils-2.2.1.0.tar.gz 47651 BLAKE2B 62925b82158f0226779c45e6f835f5da8f480cc180886b58f4845e7b2e8198b482e001dc036e2435a6c9a3d102c1ceb09d36ca9d7dd19423d64b7c1b0e4dcd9e SHA512 258419ab42683b4876337be467eb111699d5308c450cf281575a8b1b656fa853d2d46a34ae15b6b8d9fdc785703e5c6ed1b6286d1de000167e9db142f08e3193
 DIST s6-portable-utils-2.2.1.1.tar.gz 47138 BLAKE2B f5519fbedc2599c0b9366bbff38a9438cb4cdf3b770dfec6e519f8857bd77a3bea172284318df224104fe7003af4a68cadc8089d77c98ba4da85eb59d59819f4 SHA512 fba7a4d1f5e0c969dc254775f28c02f1b8673ead28022962175bd605125dc56012cfdeb177037c322780be93a5191a5292a47cb26cf5d466bb5eb081fa5a9657
-EBUILD s6-portable-utils-2.0.5.3.ebuild 1075 BLAKE2B 9e5ae009c5329bdafd4d12f0393391548f7f15a97fb6acbd232726ec10bc0284bcd1f1b78991baabf5288dff250622c0aec0f3016b5c417db84b7eace1f86038 SHA512 1b8fdf40510ca2a6289599b1808f2d6b66e89f3b5269975dbf69e69b7d5698f06972dc19f1c8962c91749561d1f01305c9d0077d527cb1860a08c17cd6d65294
-EBUILD s6-portable-utils-2.0.6.0.ebuild 1060 BLAKE2B aee34e932a06081b416b03b39c432423128b84d5784650127be3577f2afc6ee0d73e71e79c3784487015ca667d9b9824242752e4df5425679fa0a3da0dac2b0f SHA512 f1062451890dd7e44bb032ce1b9cfc6413c83cd9e06bdd672317e4fc414160521038cc09ca87f6ca39f8ce7142858d8ec625c9ed9961ec3c773697130d5b510f
-EBUILD s6-portable-utils-2.1.0.0.ebuild 1024 BLAKE2B bdfd021576050fbb5803ff93f05f19dfea8f6764de47d19bad62efd4832c234d9855c895958e9d4a2b8d0759d973107e956c67b9347ddc6e6f3435f35cd8cf7b SHA512 3e675676026bcc8224f7a21afaa24a8629628f236b99ab3832f365a5a9b7614006811cd1ccc0b4e570376d451436fa75f4121b01076ac5a2e1256e6bbb441e1e
-EBUILD s6-portable-utils-2.2.0.0.ebuild 1026 BLAKE2B f6d63a77268df903de7a4afde4503dbe1871e6d578e0fdce1b401840117804a740b2e7ae7c6658514497b8a854a8aa5632e513b5e67b682729c97372b2162689 SHA512 1f576fec45d2d5c6d21abf0894aca73092a724e06c79d7bf6323e4f6026381c471efc63bcb0630aeee83936ae1e237e39da973d914c0cb17d7dd91b18a84ad15
-EBUILD s6-portable-utils-2.2.1.0.ebuild 1165 BLAKE2B 9cd3eaa72f731c13125da02ca6e672159ef46502b487af319d6e64b004267aec75fed742b5b0e6c510d99d8fc61aaf5b26ab6a28fea6494ddc7cd5ebd3304a27 SHA512 7080df68f673a2f8cbd9e7ce1dda3b6506a50ad54ef8d8a908cf15c57402703d1811b29bbf4d5479dc557e3192199ebe260acec53d4bc6242ca17a35f8ca6993
 EBUILD s6-portable-utils-2.2.1.1.ebuild 1165 BLAKE2B 2606b82a595387a09d74f1295ca6bf89428f339f55827290cdbaa185adb62982247fc61346adc75025c0d0312d0292c7364105cc787b550e52bac09dc4e9db1d SHA512 e29fc657d3088c4d160a0526ed09d6377d777ee3b9c4c5ff23db7eeb174e0ed52f14f08d7a02e3a72249391d0c91f038e1d348763071ed100a200b4611ccc5f3
 MISC metadata.xml 461 BLAKE2B a9b075ac9aacaa5fba1cc8d768dd188eea6fc1b44d36dc785698db2c8658db6af198a7c534621e41c85a3fac8d4a8bb724470afe90335e2d1afff2ca5d03a454 SHA512 6d7640d82400f43a58eaf536a0275dbffd45dc33fdde49e1d41da959ba0fb0ea68ad9fee8b7e2991d0d4a78b69a224880ed91e4a922f067bf6e1a741748bb4b9
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.0.5.3.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.0.5.3.ebuild
deleted file mode 100644
index 3de06fd3619e..000000000000
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.0.5.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib
-
-DESCRIPTION="Set of tiny portable unix utilities"
-HOMEPAGE="http://www.skarnet.org/software/s6-portable-utils/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND="
-	static? ( >=dev-libs/skalibs-2.3.8.0[static-libs] )
-	!static? ( >=dev-libs/skalibs-2.3.8.0 )
-	"
-RDEPEND="
-	!static? ( >=dev-libs/skalibs-2.3.8.0 )
-	"
-
-HTML_DOCS="doc/."
-
-src_prepare()
-{
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
-
-	eapply_user
-}
-
-src_configure()
-{
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static) \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--datadir=/etc \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-}
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.0.6.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.0.6.0.ebuild
deleted file mode 100644
index c4e21382c452..000000000000
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.0.6.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Set of tiny portable unix utilities"
-HOMEPAGE="http://www.skarnet.org/software/s6-portable-utils/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND="
-	static? ( >=dev-libs/skalibs-2.3.10.0[static-libs] )
-	!static? ( >=dev-libs/skalibs-2.3.10.0 )
-	"
-RDEPEND="
-	!static? ( >=dev-libs/skalibs-2.3.10.0 )
-	"
-
-HTML_DOCS="doc/."
-
-src_prepare()
-{
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
-
-	eapply_user
-}
-
-src_configure()
-{
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static) \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--datadir=/etc \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-}
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.1.0.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.1.0.0.ebuild
deleted file mode 100644
index 96485ef8ba1d..000000000000
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.1.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="set of tiny portable unix utilities"
-HOMEPAGE="http://www.skarnet.org/software/s6-portable-utils/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.4.0.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.4.0.0
-	)
-"
-RDEPEND="
-	!static? (
-		>=dev-libs/skalibs-2.4.0.0:=
-	)
-"
-
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.0.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.0.0.ebuild
deleted file mode 100644
index 19b915f7e615..000000000000
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="set of tiny portable unix utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.5.0.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.5.0.0
-	)
-"
-RDEPEND="
-	!static? (
-		>=dev-libs/skalibs-2.5.0.0:=
-	)
-"
-
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.0.ebuild
deleted file mode 100644
index a78156832d38..000000000000
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="set of tiny portable unix utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.5.1.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.5.1.0
-	)
-"
-RDEPEND="
-	!static? (
-		>=dev-libs/skalibs-2.5.1.0:=
-	)
-"
-
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 1dd7d51cbe90..19939f0c7e6d 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,17 +1,5 @@
-DIST s6-rc-0.0.2.1.tar.gz 85549 BLAKE2B 6418b2357d721ea950d935d5b10c19b2a0fd975207283a99e8b49cd6deba0c209af8895c093821ffb76be30de3e73ae686d34f7b95641ceaa2f2b9a8d04e3351 SHA512 9a83e272ba521e5ede17ded6b6143797d70205c6631fd08bdb9cbefc66e8ab6011de68e94876ec3c7af439ffbff21778207507db74f0ae91117e88fe36a7f65c
-DIST s6-rc-0.0.3.0.tar.gz 86992 BLAKE2B b37239f9de164257813c33556c07d387c580107e0f8309b3d24d1d49580e19b3398c5ffb05fcbaeee21453e3ac967004812947437cd7a7acf1b74af0401129d1 SHA512 66fe8cf1937671d3b6c06e7aca40e5b94502ca12a659b50e8120a178295084272091a378e8bbf9f69c560fbc69ca10ffdf08763cbd714ed2411d0d558437e325
-DIST s6-rc-0.1.0.0.tar.gz 88520 BLAKE2B c0c117b96085316d7a3df6690788ea3f29ccdc1dc2b46c19b08735f0662dfc635d5ff823d0d27bb9efdbae806d7e6958140f45edf136bb7c2b9c368404634f21 SHA512 d58f52e4bc132eab6fddd1be3b406d0314cc4fdd61e476310a16348c117b032dafd3ef8701219dd7476247d5b9a6685621e94212705aa88934cb1eaee7b1e6fe
-DIST s6-rc-0.2.0.0.tar.gz 90133 BLAKE2B 2168ecdc28c38673bdf71e73391f6253332da6eb7abbdaac728579eabfa47adb6ba3a978228cef44f63d14e3c224a3d2988f35f1f43805925a461d32198d93b7 SHA512 981d504382c9801ef53fb2a4a4f7410cf6165f1f49670cb5d42545c3e1bef6c0a50e6176b149fd61ec45ebe701411d12b5e7012cfb897d3472e52a1b8f76f636
-DIST s6-rc-0.2.0.1.tar.gz 90345 BLAKE2B df5516e49ca3852a8046190d335dba74e20c5d106aca03d81010e41b3a8b56893d1f3339d9188211c009d1e77461fa1d6bce91cd8f1070e93209da59ac898f27 SHA512 d067f1b409146923531f5191e8c9d17c8e846cf4815fac11f08089fe983a55a1d11bba942a036d2d8f48d26390e1350f273bcd8705abcfbff33b9da2984cb8ef
-DIST s6-rc-0.2.1.2.tar.gz 90978 BLAKE2B f237704f2ce8ac00ba4b46bbc0bbfe2066592604abadf6c9a518ee9da5dae056b0467c3ddb215c40a647b726beaf5e7da3cb282c45ac66bab7fc4a09558c9fed SHA512 33951996cf1fc1e497c26a90254a916e992c69128134cbc64ed41c76e74c04e55c91036e2c7e836f3eda650fbcd670c52722b5b2d12ec4a3887101eb20c3347f
 DIST s6-rc-0.3.0.0.tar.gz 93183 BLAKE2B 0096fe268393192867b1e2d45f9a46c0a76184783e16dbf066891a84a3f6177aec40a4cc78c276126c4588d7d57e4c5a2fa609b1b0276a12a595b99bc7440497 SHA512 d29755f84975b6b2811f55a88cd2b9f1f8383c80ec8aa19e778f74eedf0ae6cb17e55ad96c46bfea7dc3c586a6f10c783db80e8742d2a2e36d3d0062c0f10c06
 DIST s6-rc-0.4.0.0.tar.gz 96417 BLAKE2B fea4cfbadd82e8e775e4ba2cc1168fc3932f2f23335efa73f254fb17176954cf4d0c10e16bcecf4d62e9ebe05cb213e370042f86e40cb5a4a5583768fe313a83 SHA512 81ed2b09ab980e9d531e6b919f25fe9819f6144e7e639d488362fd872aead73244a03d83da9abd4cb64c10226c5e6fd163c517dcd59566b32a26841b4814ac21
-EBUILD s6-rc-0.0.2.1.ebuild 1296 BLAKE2B a3dee28d40f2e7d41c63089426294a8d216d54ad0370df4810bb6eef0f2cfde1af5a6fbbd1fa55ac869309243332248c84e990937284a73eebe59425a51a15c0 SHA512 3f5c56e6c861a36ae0afead1b982b3596adb7929e8a26e66df33087ca89cf2950b8667303e640f164fc38298de6afc3e6f3d754d683209be618c93032c36d0f0
-EBUILD s6-rc-0.0.3.0.ebuild 1299 BLAKE2B 84aaf4f43a130c71238d93c26f0f6e04689e5ed8c9224af5dbe23e3de66ec24630378c90a7821a0348d1de72b9b05a4b71bf42775f69d1e65d7c0ba9723616d6 SHA512 1332f82db79db0a80d8e07904fa34c6465fabad96837efdd44ec81e5f4f63d2b8fc97fe3d58066be589ce760f780026211e7040f970cbe8a06a96c71c6bc0960
-EBUILD s6-rc-0.1.0.0.ebuild 1483 BLAKE2B 09ebfd219ea30ba46929eb380694fbb3ec22203c49a2a81d0144d66f6fcab242d94b4e85f320a144a204dfc760b03f1d614be0aa83a9705c8317009eada7527e SHA512 e4e60d92632789123df84e325888dddf9d13297c90ae55ce9f8f9ec7425320d0ad3c0e0c24b816ea472c87d71908de091e72946b7b8722cc6551dd243eb4820c
-EBUILD s6-rc-0.2.0.0.ebuild 1485 BLAKE2B 17c220018b28d78d7dce98a6ce07a2103f7d7fa7a3b47d49df35f04062cdd0544859c000f23dc97967eff94bd347efbbd56ef6cadedf267ca1d5e71ef61deacb SHA512 6e2518ccb38a40d4520a464f7f124fdf03be30d9445cb6661a603c770a2db472cd9cd9b2e676b9deb278ba559aed6f12505205dbf3707af68cdb79aedf686ece
-EBUILD s6-rc-0.2.0.1.ebuild 1624 BLAKE2B 673f6fce3032b0d6f19d95f1438cae4b07ba25765306246e69341dfd407c4cc742ec142eaaa2fe25444bd0e673ed3002a19d371b589007c11505fe77921b4358 SHA512 0737f02730bd5af03134199843fe2c0103c6ecd76342b8e0aada063777260158542ac25ff081eff10c4db0cfeed958f3e2b0a9ecada65da98877f8b985bd30a7
-EBUILD s6-rc-0.2.1.2.ebuild 1624 BLAKE2B bb4dd3e3fca5846758f1e93caced185001ada0983c76d0e4531bca5f04edaaf8c0e5f445896f007dcb73d4794a1e7993b87568102a88eab1af9dede98adcf2d0 SHA512 1461f37172187ecf8457db8ccd1f34e8197c554aca47d88b2f867ba7e5509f84984373da8cad06380d3ee1ccfb3b07ea0efa03ad2ad61bd5d5b7d3607c56068f
 EBUILD s6-rc-0.3.0.0.ebuild 1619 BLAKE2B 3746812cc4b8c852ae97dad2b9e28e7b84713f98a08df1fd11660507f4810357d8cd1e4798ea246440206fbf4ad1ac452f773f0ac1442e27a4897b4d084d4db3 SHA512 30767d3accaed63968c91dba9d4d4eef80eef838cb2505a84cbc75ce8e966a0f5fa60a24942921a3bdec524f49e22148fd012c1212f206010dd8ef7061956f3c
 EBUILD s6-rc-0.4.0.0.ebuild 1866 BLAKE2B bdb83058265bfbeca41faf995b796c042f7b4f2f27816cfe6b6039e88ecc6b1f81db18337925673cd82106ce950c4d2ca533614009fb4e18d35072a562764bc0 SHA512 c0c00a6a58ea33ba062a41e26911875c944d77ff20875f8569542d17fa0e075fbe05e0018f92eab6671cd20d2ecfdcb9de0a64f1fe27f785b97ff8b0c75f6027
 MISC metadata.xml 461 BLAKE2B a9b075ac9aacaa5fba1cc8d768dd188eea6fc1b44d36dc785698db2c8658db6af198a7c534621e41c85a3fac8d4a8bb724470afe90335e2d1afff2ca5d03a454 SHA512 6d7640d82400f43a58eaf536a0275dbffd45dc33fdde49e1d41da959ba0fb0ea68ad9fee8b7e2991d0d4a78b69a224880ed91e4a922f067bf6e1a741748bb4b9
diff --git a/sys-apps/s6-rc/s6-rc-0.0.2.1.ebuild b/sys-apps/s6-rc/s6-rc-0.0.2.1.ebuild
deleted file mode 100644
index dd910dc1ab2d..000000000000
--- a/sys-apps/s6-rc/s6-rc-0.0.2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Service manager for the s6 supervision suite"
-HOMEPAGE="http://www.skarnet.org/software/s6-rc/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-DEPEND="
-	static? (
-		>=dev-lang/execline-2.1.4.5[static-libs]
-		>=dev-libs/skalibs-2.3.8.3[static-libs]
-		>=sys-apps/s6-2.2.4.2[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.1.4.5
-		>=dev-libs/skalibs-2.3.8.3
-		>=sys-apps/s6-2.2.4.2
-	)
-	"
-RDEPEND="
-	!static? (
-		>=dev-lang/execline-2.1.4.5
-		>=dev-libs/skalibs-2.3.8.3
-		>=sys-apps/s6-2.2.4.2
-	)
-	"
-
-DOCS=("examples/")
-HTML_DOCS=("doc/.")
-
-src_prepare()
-{
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
-
-	eapply_user
-}
-
-src_configure()
-{
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static-libs static) \
-		$(use_enable static allstatic) \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--datadir=/etc \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-}
diff --git a/sys-apps/s6-rc/s6-rc-0.0.3.0.ebuild b/sys-apps/s6-rc/s6-rc-0.0.3.0.ebuild
deleted file mode 100644
index c2cd0af9fe9c..000000000000
--- a/sys-apps/s6-rc/s6-rc-0.0.3.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Service manager for the s6 supervision suite"
-HOMEPAGE="http://www.skarnet.org/software/s6-rc/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-DEPEND="
-	static? (
-		>=dev-lang/execline-2.1.5.0[static-libs]
-		>=dev-libs/skalibs-2.3.10.0[static-libs]
-		>=sys-apps/s6-2.3.0.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.1.5.0
-		>=dev-libs/skalibs-2.3.10.0
-		>=sys-apps/s6-2.3.0.0
-	)
-	"
-RDEPEND="
-	!static? (
-		>=dev-lang/execline-2.1.5.0
-		>=dev-libs/skalibs-2.3.10.0
-		>=sys-apps/s6-2.3.0.0
-	)
-	"
-
-DOCS=("examples/")
-HTML_DOCS=("doc/.")
-
-src_prepare()
-{
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
-
-	eapply_user
-}
-
-src_configure()
-{
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static-libs static) \
-		$(use_enable static allstatic) \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--datadir=/etc \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-}
diff --git a/sys-apps/s6-rc/s6-rc-0.1.0.0.ebuild b/sys-apps/s6-rc/s6-rc-0.1.0.0.ebuild
deleted file mode 100644
index 2233ae60574b..000000000000
--- a/sys-apps/s6-rc/s6-rc-0.1.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="service manager for the s6 supervision suite"
-HOMEPAGE="http://www.skarnet.org/software/s6-rc/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.2.0.0[static-libs]
-		>=dev-libs/skalibs-2.4.0.0[static-libs]
-		>=sys-apps/s6-2.4.0.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.2.0.0[static=]
-		>=dev-libs/skalibs-2.4.0.0
-		>=sys-apps/s6-2.4.0.0[static=]
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.2.0.0:=[!static?]
-	>=sys-apps/s6-2.4.0.0:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.4.0.0:=
-	)
-"
-
-DOCS="examples"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/s6 \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
diff --git a/sys-apps/s6-rc/s6-rc-0.2.0.0.ebuild b/sys-apps/s6-rc/s6-rc-0.2.0.0.ebuild
deleted file mode 100644
index 0e7c6f01fd35..000000000000
--- a/sys-apps/s6-rc/s6-rc-0.2.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="service manager for the s6 supervision suite"
-HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.3.0.0[static-libs]
-		>=dev-libs/skalibs-2.5.0.0[static-libs]
-		>=sys-apps/s6-2.5.0.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.3.0.0[static=]
-		>=dev-libs/skalibs-2.5.0.0
-		>=sys-apps/s6-2.5.0.0[static=]
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.0:=[!static?]
-	>=sys-apps/s6-2.5.0.0:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.5.0.0:=
-	)
-"
-
-DOCS="examples"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/s6 \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
diff --git a/sys-apps/s6-rc/s6-rc-0.2.0.1.ebuild b/sys-apps/s6-rc/s6-rc-0.2.0.1.ebuild
deleted file mode 100644
index 4c43b7e5cd11..000000000000
--- a/sys-apps/s6-rc/s6-rc-0.2.0.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="service manager for the s6 supervision suite"
-HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.3.0.1[static-libs]
-		>=dev-libs/skalibs-2.5.1.0[static-libs]
-		>=sys-apps/s6-2.5.1.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.3.0.1[static=]
-		>=dev-libs/skalibs-2.5.1.0
-		>=sys-apps/s6-2.5.1.0[static=]
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.1:=[!static?]
-	>=sys-apps/s6-2.5.1.0:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.5.1.0:=
-	)
-"
-
-DOCS="examples"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/s6 \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
diff --git a/sys-apps/s6-rc/s6-rc-0.2.1.2.ebuild b/sys-apps/s6-rc/s6-rc-0.2.1.2.ebuild
deleted file mode 100644
index e3e6bf37f0ad..000000000000
--- a/sys-apps/s6-rc/s6-rc-0.2.1.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="service manager for the s6 supervision suite"
-HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.3.0.2[static-libs]
-		>=dev-libs/skalibs-2.6.0.0[static-libs]
-		>=sys-apps/s6-2.6.1.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.3.0.2[static=]
-		>=dev-libs/skalibs-2.6.0.0
-		>=sys-apps/s6-2.6.1.0[static=]
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.2:=[!static?]
-	>=sys-apps/s6-2.6.1.0:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.6.0.0:=
-	)
-"
-
-DOCS="examples"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/s6 \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 40577dc7e120..516701269591 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,19 +1,7 @@
 DIST s6-2.1.3.0.tar.gz 181237 BLAKE2B 8cf3b4d4da81aacc17fb663a0648bae1a17085c796014d9c49b4c8c5915cdb9694f067fc1f23afc0738377535d4db493f3b1d187c62ebb48c531e975e398db6f SHA512 f5b962fb9f36a910fd8b56b1158cc28d1dab808f22f6beb309b8c23dab1863409aaecd2e3806b51ec34aef1c70f117d3b8af4c7167e0e854f6925fe278cdcaca
-DIST s6-2.2.4.3.tar.gz 192153 BLAKE2B 385a99c24679f8b096a71cc63b2d2274ab48437cd0135e7ad72b374115ccf71c30376a3ec2e6074dd0f511625861415d23db87ad12f27e7aeccec554d7daa4ef SHA512 af2f06d31eeba3efeaa93e1df6afc50051eb4b13b034d24750314e0d7e9277953595cd04134eecbe239c0ea633e2242712d193a23389a3c1206a81bf7438b5bb
-DIST s6-2.3.0.0.tar.gz 192887 BLAKE2B 88783014bd1187b56afc28b0b7e46fbe5879bae0eb4a20d4ccf16b12303a4d8f41cf96be74b49722484688b2c10212eb364f577837aaaa4a6b72965d07024358 SHA512 40b9ae41b29a32a47a88211a3eb2a0771b5108fc57a2a7a0524e5c6b99bf31c465e99bd910b11c7de784f22b712c79bb32306e963bf8b1aa5270e5463577758c
-DIST s6-2.4.0.0.tar.gz 193534 BLAKE2B 022d75ef30a48c6d87858f39d40ba7ae9678d35908fe1bfa8f0c08b66a9669be7fee8babc8eaff05203e9096f0825f4a3749b8ed093fa9492adf14c8ca3976a8 SHA512 bd294fd6ec6bd5b696c52f8ef43de278a82d2b5ec4bcea3f32ab45f15b22b33633210f38709c1e736bab8ac4c560af6a307b2617709adfc8d5f9c0bce329dff2
-DIST s6-2.5.0.0.tar.gz 190980 BLAKE2B b4568dd3b12ece596aee01bfd4617dbb994afa364f5b17e5ab7c55dadd58fcd49b02e62ae869bd20af082a0b23cf10fc56062ec13c274f7f8ab071c77445bedb SHA512 ffda119167fa334e2d87de1a453ddefafa541be0a71ced95f7eb2001dcc76a01db4a8bda04746c49d2cd26495453f0b39d3dbf57e2a76435c8537218b745da94
-DIST s6-2.5.1.0.tar.gz 191814 BLAKE2B af98e095512bd6ec2d991d576c14c7cf310b20c1c66265b0c40699d297ec96198817dc5d03b082cc51822562056b61a53af36a39680429db62491c49583d7c72 SHA512 b8d40b541d6c9b4b78f2aea229eea3188f867dda4ed15626e590b549c0e6bd5114d015ad749faa520e69385272c0960cf6d635a4e51d4e14821e61cab7469fd0
-DIST s6-2.6.1.0.tar.gz 195903 BLAKE2B c963793f1fc903d6de4959b762b3882a8789c98a2516d424486c79f5b1b2b3fa6d0d65b67d1bcbeb5e521b600fc0e832d65f5069a50c940c29e0aa08b8ffbdde SHA512 e29855cd3c0037d83270318569d2a79a8f616c681cb9c218cfc8c207d9c267cedbb6adc4a6379dbdd29323aef5549810363af08a9fdcc9308d8f6924c12399e6
 DIST s6-2.6.1.1.tar.gz 196083 BLAKE2B a05083adcba33770ccbc5621c0fc6d7f6c5be22f700bb6a5642fd37bab1ed78b18c16bf5713ade1c2ae456fb653b38aeb793e671138b1038f988ed78c6fad748 SHA512 08f1af0f2e66b3f60f4a6b1489ae91fc59dd5aec97789cc655ae2ba7841327293e3a3027155d02502b34bcdad40778dfaeb441f100e8598aecf081d9d739c99d
 DIST s6-2.7.0.0.tar.gz 198303 BLAKE2B e835fd25c75a25d3f39ed59098911e65441e3fcbb4f53c48b3c13de63600975839be4fafb9a620d9ec6168a27a2f0bf86efe08797803230e8e12cab1fb0bcd3a SHA512 495d73b8e5c34ad7295dcf94d34b6998341db063594b31be6b15bead5e47644cc3c7e893974bed4ed1feff7a8a3ad2430658c26eab361e8c90893f877476cc53
 EBUILD s6-2.1.3.0.ebuild 1284 BLAKE2B 805f6f16a33b6a150ef75c2c3775c715598694b13d68dfb930a438df946ed1d0ea3c668024ed963997f2667883765dbe0814ade890b80c8c2ccd35ac2bb5e7c4 SHA512 f5f2e6a032852380cd2991cd09c09f4c55d498c42b33af819893f3f81335db221827e5400633d99f18502d0fb9e8965728d7ce32129f1736aee049c498bcf193
-EBUILD s6-2.2.4.3.ebuild 1252 BLAKE2B 7b8e670cd1340c12440eb3fe8e0bb1632dc8b729f46e209db8834004bb30f6b7d65370663e261a14e99159e6bea9186fccc80e0a649dec0e32d9d1ee80ceded9 SHA512 c7a6e48be8d4a208a0d1221bd86fb1da12ce3c9aecfc6f67f690084f4eef2f1afd7c785d8562c97190c27d394d36b6b2156c69c876647cff1509bb9b1e15674c
-EBUILD s6-2.3.0.0.ebuild 1255 BLAKE2B 81bcee6e5dc1de2220c8d4d7c48bd00b27cc73334751a3e9be05af2dfcfbcf7fdc5793fc126104da1f8831dbc993d89ede8dc14eff680d1eb0f9f2b5fa0748fc SHA512 a18aa2c7103cd31793fd93cca6e0a6d96ee73351f9242c7818a67411bd4c2ea417c966c624c17c160315e9c222ab407d40a7bfb2bbfc61f88e470055efa4e57f
-EBUILD s6-2.4.0.0.ebuild 1367 BLAKE2B 97a6277165f5815ed82466330f0b16bcafeaa02ab8d5b2ce388172a2d0cd36ece9ae9687ba1b9700f3309ef64e1fd5f4c387fce8cbcf920362d7ea19e2e06b5a SHA512 9b964b772d17c62a995c94d0f92358e9480bba71700fdc354b41e7f3da1a21d8ba7dc31c5c4cac7c94ef185907bcd2b744820d223ed6b2b1680c6abf0c08ae6d
-EBUILD s6-2.5.0.0.ebuild 1374 BLAKE2B 3d1f214e3c5bbb333285b7e6bf36e38b1a41fb0a40fc11affa50ca945600c52b2a9e79bfe9c4ded13e392f07a4586d8883da8494cf39c5a2c670616fa8ca3bb9 SHA512 ef0e67375e3257ffe9cbd40aac8156d78ac5867e944e51ad8785634ba85162100dcad96382407edb41d075a1c39b5ea0d64f7429e3a4560c10271fefc5256af6
-EBUILD s6-2.5.1.0.ebuild 1513 BLAKE2B c1dba3f0a4889150d008817ef56e7866daf0be462a0449bef6b932efb00035826fdc9831f2d388fdbafa419a4a175b4fe8306f37d714fbebf766188e407a2268 SHA512 4b63aa06da36d262803900b63fa5e4e5f392b4921e8dac29fe412ccf1f89f13a83e50f8647a98d2925d816f0168b93d80322739c3be4cc691408d7a6973c3bec
-EBUILD s6-2.6.1.0.ebuild 1513 BLAKE2B d6307c6b861f39ccf89279e1262fa60ce2e50b80f490a7ff79f66c1f19a0e1440ea6d306ed2b78340ebe38a098028740b36cc8f83f180e5000f2b8065a7b1371 SHA512 7eac0267f0b72fea14074951d324e8c538a553fadcb14cb41b1d88fdaa79da74bc8ed57975123d06b131d08d21cb16520d85264fb3dfcab36aecff51a9051bc7
 EBUILD s6-2.6.1.1.ebuild 1508 BLAKE2B fbfa323712511650c38cfce93faf3c4408791ca887ba7a77e4c9b4022b36cd42ee719b8691bfe8976db608ff4a7822753fabd78d51f107b77ee84d117fc55d10 SHA512 194af6e8227a1f63e5285af765dcb43ae3c06e07daa33c83718e73077d3a3848e1edddef3acd49e48618e2ac10c240bb60313338248a1fc6395b326064cf6a6b
 EBUILD s6-2.7.0.0.ebuild 1508 BLAKE2B e04f58311a19ea1ed6088b46f7919296a234efd09d07bd77207f1d9432183c57081072974b4c720a40f57af0dfb8ebbd447f47ca862c89e8f612b825a43bfe25 SHA512 ad05a4ed4e5c0f98c52cf9a3b37c33de5025cfa04b3d240f7a8487b86637f4317ae6cd10d835f18734326bd3e47d1777d91c860dc2020f16e5d9f888172323b3
 MISC metadata.xml 413 BLAKE2B ad4e5f70c72eb8fcbc679c329e16d9eadcec41aeb07b391098676a9c52739b4e3a27fe86e742d1322a50261e62060f7a93eafd6534ccc7514f2402295e2b01b5 SHA512 000e085535127bf6a340451b6cbd51549dd2f1f9cba1bcf76dde590f628f780fc756f344844982f1d3a6ef69299b6db4fb71ddd92f72650e38f7a24aa541257c
diff --git a/sys-apps/s6/s6-2.2.4.3.ebuild b/sys-apps/s6/s6-2.2.4.3.ebuild
deleted file mode 100644
index b2a3a2ca2298..000000000000
--- a/sys-apps/s6/s6-2.2.4.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="http://www.skarnet.org/software/s6/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-4.0
-	static? (
-		>=dev-lang/execline-2.1.4.5[static-libs]
-		>=dev-libs/skalibs-2.3.9.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.1.4.5
-		>=dev-libs/skalibs-2.3.9.0
-	)
-	"
-RDEPEND="
-	!static? (
-		>=dev-lang/execline-2.1.4.5
-		>=dev-libs/skalibs-2.3.9.0
-	)
-	"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare()
-{
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
-
-	eapply_user
-}
-
-src_configure()
-{
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static-libs static) \
-		$(use_enable static allstatic) \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--datadir=/etc \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-}
diff --git a/sys-apps/s6/s6-2.3.0.0.ebuild b/sys-apps/s6/s6-2.3.0.0.ebuild
deleted file mode 100644
index 36eee93e2aeb..000000000000
--- a/sys-apps/s6/s6-2.3.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="http://www.skarnet.org/software/s6/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-4.0
-	static? (
-		>=dev-lang/execline-2.1.5.0[static-libs]
-		>=dev-libs/skalibs-2.3.10.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.1.5.0
-		>=dev-libs/skalibs-2.3.10.0
-	)
-	"
-RDEPEND="
-	!static? (
-		>=dev-lang/execline-2.1.5.0
-		>=dev-libs/skalibs-2.3.10.0
-	)
-	"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare()
-{
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
-
-	eapply_user
-}
-
-src_configure()
-{
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static-libs static) \
-		$(use_enable static allstatic) \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--datadir=/etc \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-}
diff --git a/sys-apps/s6/s6-2.4.0.0.ebuild b/sys-apps/s6/s6-2.4.0.0.ebuild
deleted file mode 100644
index ab8f1fe5a452..000000000000
--- a/sys-apps/s6/s6-2.4.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="http://www.skarnet.org/software/s6/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.2.0.0[static-libs]
-		>=dev-libs/skalibs-2.4.0.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.2.0.0[static=]
-		>=dev-libs/skalibs-2.4.0.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.2.0.0:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.4.0.0:=
-	)
-"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
diff --git a/sys-apps/s6/s6-2.5.0.0.ebuild b/sys-apps/s6/s6-2.5.0.0.ebuild
deleted file mode 100644
index 5eddf9e93b07..000000000000
--- a/sys-apps/s6/s6-2.5.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.3.0.0[static-libs]
-		>=dev-libs/skalibs-2.5.0.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.3.0.0[static=]
-		>=dev-libs/skalibs-2.5.0.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.0:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.5.0.0:=
-	)
-"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
diff --git a/sys-apps/s6/s6-2.5.1.0.ebuild b/sys-apps/s6/s6-2.5.1.0.ebuild
deleted file mode 100644
index 622bd4a43122..000000000000
--- a/sys-apps/s6/s6-2.5.1.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.3.0.1[static-libs]
-		>=dev-libs/skalibs-2.5.1.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.3.0.1[static=]
-		>=dev-libs/skalibs-2.5.1.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.1:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.5.1.0:=
-	)
-"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
diff --git a/sys-apps/s6/s6-2.6.1.0.ebuild b/sys-apps/s6/s6-2.6.1.0.ebuild
deleted file mode 100644
index 44dec59c63f3..000000000000
--- a/sys-apps/s6/s6-2.6.1.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.3.0.2[static-libs]
-		>=dev-libs/skalibs-2.6.0.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.3.0.2[static=]
-		>=dev-libs/skalibs-2.6.0.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.2:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.6.0.0:=
-	)
-"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 72f927e7933d..66def60a8181 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -19,7 +19,7 @@ DIST systemd-237-patches-0.tar.gz 74617 BLAKE2B 52750bb08731e9e694a00fedc1e42beb
 DIST systemd-237.tar.gz 6871350 BLAKE2B 4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91 SHA512 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b
 DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
 EBUILD systemd-233-r6.ebuild 13593 BLAKE2B 82e15d7171054d46049bc9a50a8482bc1ebbe7bb53af2ad1b6ee594582f30cb561c6d2e18226f4401c605cf9bcd53290128c7be441cfa6cd60470e313144009d SHA512 53b2e092bc48bc8d2899d9869e77049e9ce0cc6178ac63bb830544ec0a69a3ba5ba29a82a5ba76ab19dd4ce8997b9ae5ffeb3698780fe086ed5a632ff386c1d3
-EBUILD systemd-236-r5.ebuild 13050 BLAKE2B cf66e71c9b2061c77b83dd4c26d34d04c85f24a0b644a889bbf43913b2718b08a0a3f608eb658544b07214de45481f162ecf181fd07941c4263ebb2a8e7dfae6 SHA512 4dca6663e0ed3da44a075bc83997c6c3f9ff2a75cb226eacc20501d95a6a5f11cda3ca6ccd88331b2976d33d83eccd580faf5ebc281c328ac9883dcfdb24ab4d
+EBUILD systemd-236-r5.ebuild 13049 BLAKE2B e06a3d3d52778f00c7ad935ea674e76c19185adff4fcabfb08ad4ab77866256358d17a0c359d8d69d083f5c0a0adfb457d9abcd52bef71c9019c5cd005f51edc SHA512 d17627d55e3006fbcd2c6c91a51482c599788a3d96ba10bd5d4fc369fbb6ab7dbb2daf0f432402f422df21fb8bb1fa9416366853dde90710c51f23505be732c6
 EBUILD systemd-237-r2.ebuild 13075 BLAKE2B ff45dd6aa7ff3c27ad18495eb44a8ff04c67d8dddc80546fafa52e3845f1f3ded10f47f9b4e6c46b46786651d3c387f0e86e87ebf09f52045d62054fd9c5f403 SHA512 8bd6fb56e66284ef26f5ad525a38ce67e74d2b48d57dd15a1c67dfd60805da57745b837342d45c96406bef4c7a26aabf0de0db6f60fafb026268a6a154f457b1
 EBUILD systemd-237-r3.ebuild 13179 BLAKE2B 75470d89f815d0f4b7b17687e418d26c739160cfdc6a106fbc9f4a18c721894c37f5bcb68b1e2c2153e48cef02d88d6268f70d37326f047b4577ea61cbd6781d SHA512 f61e8b07ee2908d470503ffb561bcf2be47a24d98823feca7a9e37655a3d048fe18e761e0e8d949498efc25b47601ffaf6b72b83e62b7e5365b98e759d320b9f
 EBUILD systemd-238-r1.ebuild 13177 BLAKE2B b5cc7874441577984d7c2421050263863cbe20d42bc83d16e5fb60f09cb93acec8026f8bf3da5066e9cb5bfdd1efd47226c2fd47513a2d57e2ea68f9926dc05e SHA512 d48031e4d7a2f4a3602db2c4698ac21075d2fa0bf51a1c20b58c13abd3ac2d092674c6763e59981b095ca861f8adccec84171b8d095832214f94fc688c1d65de
diff --git a/sys-apps/systemd/systemd-236-r5.ebuild b/sys-apps/systemd/systemd-236-r5.ebuild
index aed2113e91aa..1661ac965008 100644
--- a/sys-apps/systemd/systemd-236-r5.ebuild
+++ b/sys-apps/systemd/systemd-236-r5.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~floppym/dist/${P}-patches-2.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 x86"
+	KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 x86"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index d24cbfbc2b05..272a12048f2d 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -6,7 +6,9 @@ AUX xinetd-2.3.15-creds.patch 367 BLAKE2B d2ffeb2d83b1c604556e240177417d79e2d4ce
 AUX xinetd.confd 90 BLAKE2B 4fd6cce15cffc6de5b59e83646cafbf52f61b203292ac4ecbbaed904d8387a4ac686f730e2f0ddf5ee90575bd0a7d73588a23b25ec4a6e9c73d48714f5770f5d SHA512 03bf05e544c0e52bc2bdeadf494dabd49ace985687b656baae869be99ef65a5f7129492c37e062bf6f196f70561d6239f2d3c4e8171fddc04729d3e266bfe2b2
 AUX xinetd.rc6 721 BLAKE2B d273c33bdd9df218f8dfdc765c0e3a788baaee0fbb3fd20e63be0f1d4b587b19550107c1818015077ce9fa194fca7180748b39089c51101f10ceeb6066a323af SHA512 bfe591f83a03e26ccbe06c489fa8c2e7af0f05203e0239b7cbde521dbe22700ba63d4bc50465e01a3fc101a7c7cfa40d0a6a02e881e950143bef7ac4046a6604
 AUX xinetd.service 192 BLAKE2B e13bdc35380da5805e9fbec1a1d05f7290bc154b1adea73b23468f909eea22c411be11cf3e2c68757e8120db73ccc8ca624c808c6563859a29c095b94c10bbf9 SHA512 c2b324c1116485996c414543f67c5dae89de3f82ac85634009da4dc04ea720a860626f6bb0ece0bb734616c6e4394e31ca00a71f697dc93e38b05fbad06dedc0
+DIST xinetd-2.3.15.3.tar.xz 383204 BLAKE2B dada7e1efb8c70d9b47efbb33de54e643e195fc043a2fe8b1b61a1d9e597a5a10feda8d6692e665af1f1690870e619098a9a2367df3a73f7821a91777532f1fa SHA512 3a744d5ce66da46743eec28d5b95a44709b1828187078984e59d7220ac325abce1198927e9156f343a4e16a9dc63e8846f1dcb0facbf05ea44c73aecbe7e504f
 DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa
 EBUILD xinetd-2.3.15-r2.ebuild 1489 BLAKE2B 0e692389c82eaa474c6068ef4b2f3d96713dc3c9c5174c2265632f3904d6021ba966c23d0a7f7eaa7ce50ae026bf954407764351c62298556311f705949cbbf9 SHA512 552f0cda59c778ba6a576df1cba0befa55ff909e1f9fdec092dc7ea666be8371e956f2d34fdc1364c997db9eed36dd9c38ebcc10db0d5dfe8fbd576ed8ea0d8d
 EBUILD xinetd-2.3.15-r3.ebuild 1584 BLAKE2B b50232148f4aa38bd767715958ee7da6b0a4a8b35f17138f9422ad98546edb301aa87e1182b6feef7fb491fbd84c5072ec5ca4df213065f78b098820d47d921b SHA512 2ed014285abf51f3c745f94c0dda14233f0ca7e971c94fa4bcffc8ecf83265f9bc48388639e7caaebc2b24bbb07b87e4e672c30ea3bea209ef38258718a11c85
+EBUILD xinetd-2.3.15.3.ebuild 1096 BLAKE2B 928797856851a3ecb1875828e1e38567daedeba49b70acdb523c720025c37bc41b168b137c63ef3bde91b3e77425bb739107d65d30973912f2f3ea16973d576d SHA512 cb63acc52c40dbc447de0c10638ede9abf8e152b8d0a83679fc8bb6e892198d73e0ee2485d6f428eb9cde89e808e204010172696adf51820b74894f94b016e84
 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
new file mode 100644
index 000000000000..b418883270af
--- /dev/null
+++ b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="powerful replacement for inetd"
+HOMEPAGE="https://github.com/openSUSE/xinetd"
+SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="perl selinux tcpd"
+
+DEPEND="
+	selinux? ( sys-libs/libselinux )
+	kernel_linux? ( net-libs/libtirpc:= )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
+"
+RDEPEND="
+	${DEPEND}
+	perl? ( dev-lang/perl )
+"
+DEPEND="
+	${DEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		$(use_with tcpd libwrap) \
+		$(use_with selinux labeled-networking) \
+		--with-loadavg
+}
+
+src_install() {
+	default
+
+	use perl || rm -f "${ED}"/usr/sbin/xconv.pl
+
+	newinitd "${FILESDIR}"/xinetd.rc6 xinetd
+	newconfd "${FILESDIR}"/xinetd.confd xinetd
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	newdoc contrib/xinetd.conf xinetd.conf.dist.sample
+	dodoc README.md CHANGELOG
+}
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index 339a5f791d96..46a41f3703b8 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -1,7 +1,9 @@
 DIST yarn-v1.1.0.tar.gz 874168 BLAKE2B 2c2e00237e4c1264ba3167f5fbeb40ef64d9ca42b05bd4e005673437c9c2ef084e93db00811840aa6cac6fbdec912cff654b09a81bbd6ccfb954d1e14128cd79 SHA512 7ce740ac47d8ba42c47d0262979fcd1d22daede2a298e1743341c52584bee7d4beca8758c118deccaefd9cb0bc2780a37e110ae3633af56ac6916ae0389eadf6
 DIST yarn-v1.2.1.tar.gz 885691 BLAKE2B ba7a291e4b071cd285e890fbd8af2a1adf78bc7a65ddaf7adcebee2b8bc15d4b98293eeae79be5ad664daa6a56d553ade1fd5e50aaafc7ed2f980ebfe4feac58 SHA512 cb61788e16cd3537073b3a8711ce6a29f7e14380cea20ca16144e97ed05ec62c685b805a18af9e70d16f7aedb4c460cad97027e37fb43596f97570386d596477
 DIST yarn-v1.3.2.tar.gz 886500 BLAKE2B 224503241b646bd6befe6571022e1081c4e9cce2371ce0c111704a6f0ceb7c4b4f0267c9c37d05feec60311cc7804706fb47d130ca64e6182590e88d8476b386 SHA512 d488ae56b60884bb42e5e2ac8a0359c6947e234ed8b5bba12a93f24abb4419b4a6fef708c35df8caa9e68edca3fe570d1dcda9295d29438e45a32ef5d029aedf
+DIST yarn-v1.5.1.tar.gz 936225 BLAKE2B b35631ba0fef692797c83431fb673c0286dbd29a5a3e5819111bcc189a136d7059afd7e1901a249204e1a14ff4c7a7321207d7fe1c057d4e585184424f9c26dc SHA512 b58b712ee395d4cfec5271e02e8cf77489438815aeebea1c6844866eb6161be9ae078f62f726e44eeb704d0195b94339d1e89991ce56de8690d613d4bab5f548
 EBUILD yarn-1.1.0.ebuild 841 BLAKE2B 0affb4007c2324aede03eae842a00443f056d323fe2b4ea8ef65139ddbe8a43bc192a27364f081346f64fd01bdadb70e4f7eccd3e7b9350122496fef6bec8dc5 SHA512 89b39480a4b8a24f7a1fe3a6231b25d9b5d70b21c2e8d3d4aab95581b9906b6e6be1aac50b4cf3914995f5e2c27482f40c56eade9cbb3efc59b24a5e899c86f5
 EBUILD yarn-1.2.1.ebuild 841 BLAKE2B 0affb4007c2324aede03eae842a00443f056d323fe2b4ea8ef65139ddbe8a43bc192a27364f081346f64fd01bdadb70e4f7eccd3e7b9350122496fef6bec8dc5 SHA512 89b39480a4b8a24f7a1fe3a6231b25d9b5d70b21c2e8d3d4aab95581b9906b6e6be1aac50b4cf3914995f5e2c27482f40c56eade9cbb3efc59b24a5e899c86f5
 EBUILD yarn-1.3.2.ebuild 841 BLAKE2B 08bf76001e5e2aa1e7cb0efa3d022bd562b79a058c83363d7a27abeca51aef0141a199676d2a561d58cc01035c51822a55913538d0c44d24f81d3c6312d85ed8 SHA512 4e53d8287c9c49563c2d36e7fc5dd0657c2926f32bc7aa1b8caba62e8278fe0ed029e59afb3147d554344b7997ffc79e3f230ae3adaa419cad265595f3250062
+EBUILD yarn-1.5.1.ebuild 841 BLAKE2B 08bf76001e5e2aa1e7cb0efa3d022bd562b79a058c83363d7a27abeca51aef0141a199676d2a561d58cc01035c51822a55913538d0c44d24f81d3c6312d85ed8 SHA512 4e53d8287c9c49563c2d36e7fc5dd0657c2926f32bc7aa1b8caba62e8278fe0ed029e59afb3147d554344b7997ffc79e3f230ae3adaa419cad265595f3250062
 MISC metadata.xml 249 BLAKE2B 40574a5c45dfb1d3be956c6034adc79f009243f2fd43280002f05cc451d8f7f5b8916c815660693a8ca3cfadd9dc5a5fc52b52211f9e256dfbbac2b26c5bb2c7 SHA512 d406f99c7fb4c5839522e07fbee81cf55330fc0c4ba6fff5281179f2ea7c21048e7cbd5563665b9a458f8b5a9724dd1fb9ac8641e2bb192f1514358902560f73
diff --git a/sys-apps/yarn/yarn-1.5.1.ebuild b/sys-apps/yarn/yarn-1.5.1.ebuild
new file mode 100644
index 000000000000..bb76e804940f
--- /dev/null
+++ b/sys-apps/yarn/yarn-1.5.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, reliable, and secure node dependency management"
+HOMEPAGE="https://yarnpkg.com"
+SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/yarn-v${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!dev-util/cmdtest
+	net-libs/nodejs"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}-v${PV}
+
+src_install() {
+	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path
+	insinto "${install_dir}"
+	doins -r .
+	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
+	fperms a+x "${install_dir}/bin/yarn.js"
+	while read -r -d '' path; do
+		[[ $(head -n1 "${path}") == \#\!* ]] || continue
+		chmod +x "${path}" || die #614094
+	done < <(find "${ED}" -type f -print0)
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-03-29 16:53:27 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-03-29 16:53:27 +0100
commit	1173ad5704ce725916e0c332416aff326d850d06 (patch)
tree	d48d60977ce19864893dfb2222bf2982ffb4262a /sys-apps
parent	8c364c784966be1700ea39ae45028f3e9be9cae0 (diff)