8 files changed, 9 insertions, 59 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 3875928465ac..17f56eaded7a 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index 0038230f2693..a42807994bec 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,6 +1,6 @@
 DIST tatt-0.4.tar.gz 23397 BLAKE2B dc6efaf866b059567d11c2a91929b025e74f73ae5ad81a98a632c3b2393025e2e35320ed223ae84b28a8770c713536afe73289d66f7c1396118a975867a56161 SHA512 57df8cdda9b6711da36e3635182fcfb64a376d7c3a76a29ea0252fc17597defe921d90bf9989f4fc199ab9848fae6fc4f53623140825f79368e90723a5562dd6
 DIST tatt-0.5.tar.gz 23249 BLAKE2B d98456bab4ec4d820bddc2ec614e02582f5b0385d806c876a5155cb09bd1468908ded3f5c879fc38f2cb4211f8415dddd640dd20b6b123c926b02387d49dced1 SHA512 0e2fa0dc12339be2ee2408a9dfa06201857bd2ef570b1c5ab46f0c4f0dc07492fc16d74c8f05cdef9232361b77843703d5f7e6752bff17a1ca2c3aa3cb1c1f29
-EBUILD tatt-0.4.ebuild 838 BLAKE2B 4a015f059bea94e7e4a62388288b9fab827b50476888f87ce931a7bd18581a6627bcaf6c9e3f3a52ce613c239f74a84965865c88b3b0a5eb1854989ca845651c SHA512 d553d3eff5a18b7426e0553c97e994c24ee48780fae06a869ffaac61eb2ea09dcbcafe3830185925a859b5967ab5d5743528dab157961a89aca66c734e530ea7
+EBUILD tatt-0.4.ebuild 837 BLAKE2B ed3e6b5953fe0f5276336d2ce7d1e809220b56bd1a5bd9005041145879702b96c7540114790962e7d3bc5361a919ef2da5d6990ad0808cbcc0b63e8d11f5e1b8 SHA512 61bb3f55c1c2dc18ac9549decd4257d14a2d7c500868843974c3fe6e5f05fce4550f4e2b364efb355f31f78c53b3fad830051c444b179ac3fb9c79cfdfe2a7d3
 EBUILD tatt-0.5.ebuild 831 BLAKE2B 026f19dca17e10a4a201ae427130af71654c788532a31acdf8fc0ad9e443711e07dcbbfccc11a4e81d058dfc3ec260529bd7e95be77a737f041a3bc0ccf557d5 SHA512 549a0b0bc40da3ea5336551b45a40353d5f722de9adaf09b849670980cac6f7b01e889178f622d1a23fde37651e0b5d9308696a51d8cffffdc51a81d23ee1726
 EBUILD tatt-9999.ebuild 750 BLAKE2B b7f6bfb81ebd1aa9fcf824b772f9e7a8dbbe540b4c2d838f4a24d4633502d18009ff3eb7f0141004e3908334df91fbd63b4e333a8a31910408597e0fe198360d SHA512 f2ba4af09dc1f83010883ac4d58790b38ad48fda09ee8b58b16b2eef8b428e5308ecf6c317c15b0a8934bd2deff3fe9834133d78932aa6ade4dd64deb13fd746
 MISC metadata.xml 640 BLAKE2B ced0c34c83e7caaa4158afcb814c0dd58fdde9f1bf1db6c1a041ae080b6c188e5d92546ccc6229099560787292a252a16d4d636a35b969a3964fca5aaa151815 SHA512 1320dd15e0191463c28417c1fdc9084362356c89a0ed34c4002f6f0a2266596645e8170b781f39cbb60d40da58953f28893b4e9a6804f077393ca739f6bc15a2
diff --git a/app-portage/tatt/tatt-0.4.ebuild b/app-portage/tatt/tatt-0.4.ebuild
index 3a1eebd40877..78be3080366b 100644
--- a/app-portage/tatt/tatt-0.4.ebuild
+++ b/app-portage/tatt/tatt-0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kensington/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+templates"
 
 RDEPEND="
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index 960f99898b83..1b18aaf467b4 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,8 +1,4 @@
-DIST unsymlink-lib-1.tar.gz 6000 BLAKE2B d9263d973ab70ffb77aa8c90f0b4562a8214ae4c9d111cf7a19172b2e62427cbce4a5ffa0a3c020b4a599274d664eaf60967922315f414eed3f9321f3863a736 SHA512 f27640cbcc67ef1ff5a24c8e8d17955eb0cc745465b3ee831d9a06da37c058279311f230846cc350160cfcce1b80e74defedad8ebd59abd2a6d2a59af9c39500
-DIST unsymlink-lib-2.tar.gz 6145 BLAKE2B 52036321e28ee98b8d58d009031091e720c791859bdd43f4c4a5468ad3133a99fe89eeab3dfd23d9e97e928787cde430e45af7fad142cc3383ab896b3397ad56 SHA512 01dc59afd32c503d115ccf86a723bdf000a78d2d5b7b8dc9e5f89c4e0cbea4d7167186206a6e06dc52803e418370e8f7de5e783eae3790704254ab95c3adeb1f
-DIST unsymlink-lib-3.tar.gz 6183 BLAKE2B 7b519869a74239eaffd22fb6a157ac56dd1740e0faee8d9190d65d8a18384e1668139067caaa28282c750fec3a97d3ec0bc25f9f29fc227d9b5850c9ed2b3473 SHA512 6c0f55b5ffacf17c8539330eb690d5d1496629534abb4ea636f39c83e3fe65653434f6179669400b9849ad03ecd762f723fc8a7d18eea19fc8658a1309e7c110
-EBUILD unsymlink-lib-1.ebuild 552 BLAKE2B 320731b1763bb4f192b4f8bc27c5defd7bb850834f99e641abb3980470b5d2d20dda041b33c0482c04c791f4346ad1daa223066aaf34304efd8684edc65ebb84 SHA512 5d24ca910a5474c9fc901008fa5432d768d4580b01ae1849166d8cbbb1cd19c1a42c2c407325b6bae6b5d551baf511c03c4febdbb5bbf20c5dcb4200ec40c524
-EBUILD unsymlink-lib-2.ebuild 552 BLAKE2B 320731b1763bb4f192b4f8bc27c5defd7bb850834f99e641abb3980470b5d2d20dda041b33c0482c04c791f4346ad1daa223066aaf34304efd8684edc65ebb84 SHA512 5d24ca910a5474c9fc901008fa5432d768d4580b01ae1849166d8cbbb1cd19c1a42c2c407325b6bae6b5d551baf511c03c4febdbb5bbf20c5dcb4200ec40c524
-EBUILD unsymlink-lib-3.ebuild 552 BLAKE2B 320731b1763bb4f192b4f8bc27c5defd7bb850834f99e641abb3980470b5d2d20dda041b33c0482c04c791f4346ad1daa223066aaf34304efd8684edc65ebb84 SHA512 5d24ca910a5474c9fc901008fa5432d768d4580b01ae1849166d8cbbb1cd19c1a42c2c407325b6bae6b5d551baf511c03c4febdbb5bbf20c5dcb4200ec40c524
-EBUILD unsymlink-lib-9999.ebuild 537 BLAKE2B 9d759237ad8326c1651705cb1ff604dc1fe91958ad655c83ddac0046e9760bbb42669f549da600ff5f47c579fcfe1ba3f3e419b5d3aa5638a094f7e01de06927 SHA512 e0f88165520b8886801a7180cc5a2c71c368810017e274ed588b4836df0643a1caea286ffdfe60de977b7ea8ead8ed7588563ef13ed7a9492812b583a7213dcc
+DIST unsymlink-lib-5.tar.gz 6561 BLAKE2B 657fb97ef1c8696e430ee726bea16292271bbb1f8d1bef3288f0df3a8220bf77c182d6666a8c7a6ef4081ef6289e77c7191f46c458c654b634ba650fe4677898 SHA512 fa90a6851c068010167bc6769b91cbbf80235a4afeafa970bb11f4e0de555e76d8828a0d7872535db5506af28e4511ab61a21766ec0e1c6802ed858cfc3b6010
+EBUILD unsymlink-lib-5.ebuild 588 BLAKE2B 01d2dc4ec3f2afd53108fdadbf1a2f14df83fb13b647624da4b18e7a8648290cfb42523aa77d2b6ea6a95e4a1b30ee1e891cf2d03129bb32dd171142511ad092 SHA512 ba3c0aec93c4dc1c291c69a814e14be5b1b91292e1dd60a6dc034f97ec3fedaef345657b79bd894578ec6b168e532be48e99816d0f10645dbf1cd7db51d14e94
+EBUILD unsymlink-lib-9999.ebuild 573 BLAKE2B 8708c8cf4a0fb2249a4440d38983595c7101e1f07ac2522460d2738f80abfb7b640fe5a4cbdeacfe0148dbc01f75389015f9e11e7dc6f7b8e13c8fa4ada458f6 SHA512 dcc7c50d19385bd074da4f77444d910258fcd3acf83e7a7a983aea2848403c29ec655ff0346fbeebe21522ae2cc9965177c82c66afb3aeb2bbb7764488fb180d
 MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-2.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-2.ebuild
deleted file mode 100644
index c5194b936c20..000000000000
--- a/app-portage/unsymlink-lib/unsymlink-lib-2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-inherit python-single-r1
-
-DESCRIPTION="Convert your system to SYMLINK_LIB=no"
-HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
-SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-
-src_install() {
-	python_doscript unsymlink-lib
-	dodoc README
-}
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-3.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-3.ebuild
deleted file mode 100644
index c5194b936c20..000000000000
--- a/app-portage/unsymlink-lib/unsymlink-lib-3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-inherit python-single-r1
-
-DESCRIPTION="Convert your system to SYMLINK_LIB=no"
-HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
-SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-
-src_install() {
-	python_doscript unsymlink-lib
-	dodoc README
-}
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-1.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-5.ebuild
index c5194b936c20..6ca4f9fdb17b 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-1.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-5.ebuild
@@ -16,7 +16,8 @@ KEYWORDS="~amd64"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}
+	sys-apps/portage[${PYTHON_USEDEP}]"
 
 src_install() {
 	python_doscript unsymlink-lib
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
index 8f99997dcec6..8a11a8833e6b 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
@@ -17,7 +17,8 @@ KEYWORDS=""
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}
+	sys-apps/portage[${PYTHON_USEDEP}]"
 
 src_install() {
 	python_doscript unsymlink-lib