6 files changed, 2 insertions, 62 deletions
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 61f6b2f48e71..5ae69d92c3b3 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-lib-bin-symlink/Manifest b/app-eselect/eselect-lib-bin-symlink/Manifest
index 5197ef23cf83..6662df4f27f2 100644
--- a/app-eselect/eselect-lib-bin-symlink/Manifest
+++ b/app-eselect/eselect-lib-bin-symlink/Manifest
@@ -1,6 +1,4 @@
 DIST eselect-lib-bin-symlink-0.1.1.tar.bz2 45376 BLAKE2B 59ffe0897a57115debf185344eb7fef5177394337c02dde6f67e79114e53f411edd5e5854c86beb4884eca6a51282a0dc09ee94e82cb0d0d0fd7e54a99e660ed SHA512 16b56153aa61534997f42641656c3feaf27243fece8cdd42e93ed0be5dabedafc316af8111cd7ff0e321666de8deb1a35e86032cd9590060f677ac7e68fd48bd
-DIST eselect-lib-bin-symlink-0.1.tar.bz2 45331 BLAKE2B ffc21e3496d8affb0ac45c2781e26355192f84f44bf252042ae8dcea60b1e3d2ff4bfb3a6f53b0d67a13617dd5e3b076aa864fd803219d9dc64fe47c7f5229f4 SHA512 c4e31c81ee778a18335e3a5f45eba28688ca6af8b7f5069897a19f1d51e0a83fc35b80149c29643c01ff959aedd05b80a020bd0fbdb9fc7ecf207405f8c77ed6
 EBUILD eselect-lib-bin-symlink-0.1.1.ebuild 656 BLAKE2B 224c90c5714a5aca835065726779806e7873e4029aa33134ea2e4b0e65dc370daa35dd590d190295691c435c81e69579a3563d10e99cee3b6d7ad76ded7d4aa1 SHA512 721c447737d131b1b09223362c43481798d8fd3ba8fb7b47d8da1b032db205b4bf42c1651cbb55a886fbac4de247176cf58d1226b85fcce5bb0702da3712fa02
-EBUILD eselect-lib-bin-symlink-0.1.ebuild 636 BLAKE2B 26d367a5562c743670835145a83781dcba1109349c77f6f2302b4645cd8dbdf730d617a20c35d14f95c1893eb4da1e52ccc9f4b36a2a13407ccf43e7016a30c2 SHA512 7dcdbdb17eb197dfcac899dcc09e1b667184313de4f7336b9c4c0d26e3ec823e74b1dd2e086af2c01231ac29365985e115fdf01d52da5d34903727ed15b1c3b1
 EBUILD eselect-lib-bin-symlink-9999.ebuild 793 BLAKE2B cfe551ad8b6a12317abca16a4728c40812dd751712358911a16c387f7788eee1e8b8e08de6b3046cc1ef929e2dc08167a10557d698752047bdb9d68f1bf031d9 SHA512 e77554398060f689c0b427070a4b2b475674c16dc443bcfa1e13c11be8b54d050b8aa4e50a73d8fe8d7baa3ac5f811fa03ec5afa511d65d2f9457d5fc685a68c
 MISC metadata.xml 563 BLAKE2B c794d406f73c06b4c05fa441274f145600677f1b82256cc1621540510f6246934ee00f90e40ce170aded4e97ac2b77c5982ab4d1df1e0d27873bd4498212124f SHA512 35b31f23ebe0f3d08726edc4a876162907a8031d9907d67d775534b4d7719330701a94859a5dd79457cfc50ee9be3cc9a7829c7a0dcfd751dba2e68d2f75b6cb
diff --git a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.ebuild b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.ebuild
deleted file mode 100644
index d94346e6c9b6..000000000000
--- a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="An eselect library to manage executable symlinks"
-HOMEPAGE="https://bitbucket.org/mgorny/eselect-lib-bin-symlink/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index 3b9c2b32dcbd..586a6d2108de 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,6 +1,4 @@
-DIST eselect-repository-1.tar.gz 5378 BLAKE2B c60ff31d570a63b7b2863ae45d467f2d1302a35263f192ff96fea2cb3f448e5042ef8b6903e9a4e9db76f203e0609600ea3b4a7cbca957aa34bdafe40bc25da6 SHA512 7f985c3abe3fa02dfe44aade71583e7280c4757470fe8bf43de8fcc2403e8b924d9b0af104e926a2b3cd79a92b440570347db511767c908dda087ccc9f3aba6e
 DIST eselect-repository-2.tar.gz 5441 BLAKE2B 28608b7e5d06747afea4ef28b0f45ac97dcea0310201d857f1248e7fc586a331fce01c9017df83c332cbfb55b51b52a45361e06db8a7d4b788a70f63eb4c83d8 SHA512 7667053b7d06117f49366d7bb6ad39b1b0715c778e49e18649ce38b364e58c0c31f4fa077a459374c52d3bb7f550002a4368cbb7fc14fd9961815bb1355c1f61
-EBUILD eselect-repository-1-r1.ebuild 873 BLAKE2B f6fb58f5a89342c1a1d615b5cdb269785e1a82b392f4cec5611ffdbc6fb3d84d8877f58418c0c597e29036a47a3da3135b3246cafe113ee4798ea012c6c591e3 SHA512 f854db694f468bd3730025b97c8d34e5bf6f692d9a92fa7585276bbbb2490164e784497795d3597f9bf5e48565aeb48c6465633bcdea37f06dfd7d93ff1a356e
-EBUILD eselect-repository-2.ebuild 868 BLAKE2B f22906813061515d7cddac0e85474aa58d4491fdeffc3d63f5c3c7c588603cce2a0ff1c0f9122db10f0ec31bf9225d741e5618c1baa904b3e8fe2a5d338cee4b SHA512 cc5ede5a2d32f110ca1a41c6b78a8ced608659430fcca7cf015c10fa5f363dd0acce42e08cbc62082d2728d2b23ca671f451a3d6054c005bcf21e7308fb022a4
+EBUILD eselect-repository-2.ebuild 873 BLAKE2B f6fb58f5a89342c1a1d615b5cdb269785e1a82b392f4cec5611ffdbc6fb3d84d8877f58418c0c597e29036a47a3da3135b3246cafe113ee4798ea012c6c591e3 SHA512 f854db694f468bd3730025b97c8d34e5bf6f692d9a92fa7585276bbbb2490164e784497795d3597f9bf5e48565aeb48c6465633bcdea37f06dfd7d93ff1a356e
 EBUILD eselect-repository-9999.ebuild 848 BLAKE2B a0487c133cc3096374e30c2e2d024f346e4f1f3e8573ef29cc416a8ba9066a61fa6ea0fb2d7acfb6bb3ede0eb31fac7fa71f81ecc04f73b7dcf47d800ea6015c SHA512 0c3cc2c3e2e894d2fdb1ddd4123b76283c56120da2332f5b364b9e4941b39c11cc28c200162f9f2c994deab34f5b97580116431652058a971282171923daa261
 MISC metadata.xml 337 BLAKE2B f1e5fed0f35fa48ba72720ef703cbd6cba18d0e8a15097b49544d86caef6752fa672f1904f511f1c54f3a7eb0cf195b95bb1bdee20f0317431c077839269ca77 SHA512 e3da0532b27d28ee74ddb0b4c2bd7fb4f2e128b86de2001583b03312692a8c8b0ae943e3e3ebabc6f109dd816d783543cbd5f91fb92a5f6055d07a0c0f11f4af
diff --git a/app-eselect/eselect-repository/eselect-repository-1-r1.ebuild b/app-eselect/eselect-repository/eselect-repository-1-r1.ebuild
deleted file mode 100644
index 54b33e1a1bd0..000000000000
--- a/app-eselect/eselect-repository/eselect-repository-1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-inherit python-single-r1
-
-DESCRIPTION="Manage repos.conf via eselect"
-HOMEPAGE="https://github.com/mgorny/eselect-repository"
-SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	app-admin/eselect
-	dev-python/lxml[${PYTHON_USEDEP}]
-	net-misc/wget"
-
-src_compile() {
-	MAKEARGS=(
-		PREFIX="${EPREFIX}/usr"
-		SYSCONFDIR="${EPREFIX}/etc"
-		SHAREDSTATEDIR="${EPREFIX}/var"
-		ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
-	)
-
-	emake "${MAKEARGS[@]}"
-	python_fix_shebang eselect-repo-helper
-}
-
-src_install() {
-	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
-	keepdir /var/db/repos
-	einstalldocs
-}
diff --git a/app-eselect/eselect-repository/eselect-repository-2.ebuild b/app-eselect/eselect-repository/eselect-repository-2.ebuild
index fef00322510b..54b33e1a1bd0 100644
--- a/app-eselect/eselect-repository/eselect-repository-2.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}