Merge branch 'edge' into next

11 files changed, 11 insertions, 75 deletions

diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index aa416ec54db0..3ac642e12b76 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-electron/Manifest b/app-eselect/eselect-electron/Manifest
deleted file mode 100644
index 53502dd31545..000000000000
--- a/app-eselect/eselect-electron/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST eselect-electron-2.1.tar.gz 9658 BLAKE2B c5bcd58f5b82c3c9f4cb1e6cfb26665b7524b0d973a717437a18f5ee66fa5fe30bdd4e82673efc8199dc4a637a0b93ba537a62fc060d68b3bde7370138f815ce SHA512 6ba30b1e4d55e01cd9df3ab30038a45dba80c6191e676169e28b3f9881b4154db5edfe8569cafe77022b467e9383a291b1e6c49e296a8ed90582b2c6d1489c47
-EBUILD eselect-electron-2.1.ebuild 655 BLAKE2B 4cd072d3856299dfc86e776fcc764dad9e7c05cc03ea03bfa8f5c62b8f79bbf97f861b473f60e1b4659b48122b44f771ecdaae0be0dcdeb6fa34584938f72ed6 SHA512 350af545abbd6b740426369a295f630d2b52044bb50de4c531aa1777d4a213251706830a34b46a277af8e2de4d09fe5a2448ec9420c11752e8da1de8917cbaed
-MISC metadata.xml 254 BLAKE2B 628a9ae5d877a1cfc867e2a95d461fac653b17cf76bb83b22852821c68acc8ab8a0798019cc1508a0c314c746d3aca72ab0e565be5daa5f829fa0efa5e5d5116 SHA512 2b50869af59565463b4f65eefa16489d6073fcb19825004229cc9eadca26d7827644a23f2f031a34d68f18eaca988ea081f426ac3b70879f57878ddc87a8ffdd
diff --git a/app-eselect/eselect-electron/eselect-electron-2.1.ebuild b/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
deleted file mode 100644
index a860e35738ec..000000000000
--- a/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Utility to select the default Electron slot"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://github.com/elprans/${PN}/archive/v${PV}.tar.gz -> eselect-electron-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-admin/eselect"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins electron.eselect
-	dosym eselect /usr/bin/electron-config
-}
-
-pkg_postinst() {
-	electron-config update
-}
diff --git a/app-eselect/eselect-electron/metadata.xml b/app-eselect/eselect-electron/metadata.xml
deleted file mode 100644
index d1ae01fef6da..000000000000
--- a/app-eselect/eselect-electron/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="github">elprans/eselect-electron</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-eselect/eselect-iptables/Manifest b/app-eselect/eselect-iptables/Manifest
index b74cb504327c..712d722d2a30 100644
--- a/app-eselect/eselect-iptables/Manifest
+++ b/app-eselect/eselect-iptables/Manifest
@@ -1,3 +1,3 @@
-DIST eselect-iptables-20200319.tar.xz 1584 BLAKE2B be7cad34ef41a6b3c1b25470f2cef7bc2de33d83b5b0846a52695c0d09d9770368abd8d59a00a4edbc0ecbc91b83648de2e6686c7ee8a46036369558f5ed1e16 SHA512 828d8b0b1f41af2ad807c33f4e529411dc5feb21b37c76e8f19f0b7bf3d90ccb61db6b2e0b2ef353acfa4ea95b4a375da4fe769132b1fc6a7879acef6e10db9a
-EBUILD eselect-iptables-20200319.ebuild 522 BLAKE2B f73a944f56cc2a83512e79b66446fbf2fd10b1f80c96e453a7cfe1fb0588f961be63c240705bbb2194a99e0c5dd90428b01db973ba88710bb57ce4324dd2dcf1 SHA512 55f377955febb244ce53460e855c8a1d36bd69e2e72b6d8340265285773dafe96249947c919944f3b0161898eba26ae57cfcffcd827157aeb76a4a4343d90eb1
+DIST eselect-iptables-20200508.tar.xz 2152 BLAKE2B e28e566d15116134308ae122443dddb8e66bcbdbbe6f6448bab0b7061710cb3b5610a9f058f43c41c3b130150c5046a6b00b0697d28fea6f2c9049485486c3c4 SHA512 b76734a53a8d1a14e662758516e0bd6d5eefbf8bca5718dae67c912365e21aecc800d63ab9dee626807db8e065469d4019f9b5369937a5b123e25f91faa43d2e
+EBUILD eselect-iptables-20200508.ebuild 650 BLAKE2B a76c4780d29d3d01b4d4e579efbf4898d15cb9d5975bc3d8459c9a4de2043a71d959728862b5a83be6a5af4676c056e77c299d89809b2bf4406878d62e284961 SHA512 b483e75486908db19c0efdc353dc3cba01b46545391fbb10f28ef8bfd2a8d0d39895e52b50948865ed2f491f5613c84055ccee94a8ff4475069717af3688c853
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/app-eselect/eselect-iptables/eselect-iptables-20200319.ebuild b/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild
index 89c49dbd9740..f033207e9698 100644
--- a/app-eselect/eselect-iptables/eselect-iptables-20200319.ebuild
+++ b/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild
@@ -16,4 +16,9 @@ RDEPEND="app-admin/eselect"
 src_install() {
 	insinto /usr/share/eselect/modules
 	doins iptables.eselect
+
+	local symlink
+	for symlink in {eb,arp}tables; do
+		dosym iptables.eselect /usr/share/eselect/modules/${symlink}.eselect
+	done
 }
diff --git a/app-eselect/eselect-rails/Manifest b/app-eselect/eselect-rails/Manifest
index 0b88742b7dec..341db0ef9f9d 100644
--- a/app-eselect/eselect-rails/Manifest
+++ b/app-eselect/eselect-rails/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-rails-0.24.tar.xz 1600 BLAKE2B 84ef0f6d9ba78b652567cb36a6835ef0a793122864b46afe9643a73d98300466a6c81845bd36ff834967ba7ad0ae99fc3b4a6327298f28f29ebfc273b40155aa SHA512 df36b71865e41d61a9e5e497402cc819b5c7266a5df3fa6b960ae7a4d2fe4ddaa686d6971968b41e8a0c65bcb229a4d3a953d30c9f8a54b271478730e88a8dd3
-EBUILD eselect-rails-0.24.ebuild 729 BLAKE2B 4b205a1fb2e0ab754e0cf4950b87450b6b9f5a3f5e8774fe9df1ab0ee34c80f82a0455b7d3a3535216674ba4696ae0981d97b8e0c3b1078fc3509b822e051f3a SHA512 6ef8c747548afc9729073ea89cf0bbd61065e3a2bf1559d03edd23962bedb3125150cff6a4a4ab98f1560e225a32860fce62c327ae70bead93f64bc20ad1b086
+EBUILD eselect-rails-0.24.ebuild 736 BLAKE2B 3eb9175d30142e1ad4169ee94c2d4aa045f48daf6370317b9e96309a6927b182dfe9fd3473608a47f2b29739e6d41dd0d51356c7473f7950c080b84c429dbc4a SHA512 117027b54c3464bec7e6505f7cbeb86ba281dfe9fc987cd7c651a2ed956773a4098325f5a89150414bf37c88e654b8ad216e85f55738a11d5543cf69220dc86a
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/app-eselect/eselect-rails/eselect-rails-0.24.ebuild b/app-eselect/eselect-rails/eselect-rails-0.24.ebuild
index 4187aa506d04..3f2e19ca964f 100644
--- a/app-eselect/eselect-rails/eselect-rails-0.24.ebuild
+++ b/app-eselect/eselect-rails/eselect-rails-0.24.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.0"
diff --git a/app-eselect/eselect-rust/Manifest b/app-eselect/eselect-rust/Manifest
index 8c155fc8fdf7..da88f11e83c1 100644
--- a/app-eselect/eselect-rust/Manifest
+++ b/app-eselect/eselect-rust/Manifest
@@ -1,5 +1,3 @@
-DIST eselect-rust-20200101.tar.bz2 49740 BLAKE2B 4c1e767517e9f20002fac049a2ee23e47c52ccae9981316f7b7163f36a76e44dd516e7364100d1c4f5deb42dc5ddda94588639da06a71740d987bd163bc25e56 SHA512 836363e1c87b7f8e4e9c33b2cf6b8ba6846256630925676addec3d673a6e99965db19c42533de8aaf63d04713c3978f8ace73e5642071d80cd0e25a10b8cecb1
 DIST eselect-rust-20200419.tar.bz2 50278 BLAKE2B 5d5e773a0e0481403e1645cb5fdf642e1ce5d1819e9699a79fcaf822ff3e6f258b2d1958548e00df200d9aaf061be1d3b1773e6b0e92b498fe75316ac13ff235 SHA512 68db32df19864a8365e272946161966b9cb513d7403dd1df7a4c7d87fba3b8bfcad59b407dca7dd6c8e0756f2e5cbde367ade69629eaa78d019d2b524051f741
-EBUILD eselect-rust-20200101.ebuild 748 BLAKE2B 1654719606a9bf15c2a6bf31c5e42b8a7f1869f5fad8e52bef4a83fe7bd239ee69ceb1d171e876a2518d95a5cbcfe17f31e2d2cfefb29af552f757f91aa6c3fb SHA512 8f34597fcba494bdf10720a0f5d599d0ab9fa4dcc361025138c87b462233942b1c16c49563c9f0e074f264f23e173c6cff45bbc41041f65db8bd6cc246b00abb
-EBUILD eselect-rust-20200419.ebuild 752 BLAKE2B 63b486e9f11d2b8c71b3cbaa51881b6fcb20e79d8442cda9593bf08f0048f4b125cbc6f6f4108e2bbece86b182432bc0c30b2f9fcdcb5c7cc56944be4167a809 SHA512 fc95a785122e81c703ea7dc4ca1061b9210a1bfc6b8d0b1cc8b9082b58adca621afd254188d196e4920660265f15fcb1769e3a1d98404a23fe829103b63a846d
+EBUILD eselect-rust-20200419.ebuild 748 BLAKE2B 1654719606a9bf15c2a6bf31c5e42b8a7f1869f5fad8e52bef4a83fe7bd239ee69ceb1d171e876a2518d95a5cbcfe17f31e2d2cfefb29af552f757f91aa6c3fb SHA512 8f34597fcba494bdf10720a0f5d599d0ab9fa4dcc361025138c87b462233942b1c16c49563c9f0e074f264f23e173c6cff45bbc41041f65db8bd6cc246b00abb
 MISC metadata.xml 301 BLAKE2B b569454ab084e600cd974251af1ec665c54a5f37b03d6fdfd43384a36d0c738482ca4605031a8e6a000de46c7d1f756338417b313dd0212e2b0671dc7839a94d SHA512 63b1c2f65bc5f26653ee98ca2722f5da05f1a8b3d430b5921b685c7506c3d685c36d0bc2c2eb293529ffda32d50e1a59783c24d2399c1f647b1bdedb68d48616
diff --git a/app-eselect/eselect-rust/eselect-rust-20200101.ebuild b/app-eselect/eselect-rust/eselect-rust-20200101.ebuild
deleted file mode 100644
index 505dc6789336..000000000000
--- a/app-eselect/eselect-rust/eselect-rust-20200101.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-else
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-fi
-
-DESCRIPTION="Eselect module for management of multiple Rust versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Rust"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.2.3"
-
-src_prepare() {
-	default
-	[[ ${PV} == "99999999" ]] && eautoreconf
-}
-
-pkg_postinst() {
-	if has_version 'dev-lang/rust' || has_version 'dev-lang/rust-bin'; then
-		eselect rust update --if-unset
-	fi
-}
diff --git a/app-eselect/eselect-rust/eselect-rust-20200419.ebuild b/app-eselect/eselect-rust/eselect-rust-20200419.ebuild
index 353065b6e4ff..505dc6789336 100644
--- a/app-eselect/eselect-rust/eselect-rust-20200419.ebuild
+++ b/app-eselect/eselect-rust/eselect-rust-20200419.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 else
 	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Rust versions"