9 files changed, 60 insertions, 8 deletions
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 3ac642e12b76..a08ff01d3094 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-awk/Manifest b/app-eselect/eselect-awk/Manifest
index 2c0343b6e165..65829bcf8d7f 100644
--- a/app-eselect/eselect-awk/Manifest
+++ b/app-eselect/eselect-awk/Manifest
@@ -1,3 +1,5 @@
 DIST eselect-awk-0.2.tar.gz 1541 BLAKE2B 4ad07b02869672bef3c905a7417706344ccc11a9a46fcfe85cefa95881a4e727c11481bcefe17f96a77f1adc64d5ad3b1f2dfcc259bfcb8365d03ad68d88d365 SHA512 ef00ac8e8b962c17dc8094d64e5cbf44654a747cc648a5cf38346c3a90e0d685726693094ac265398b40d9d325600073ea2c4905b813f1e40fbfc7627930a5de
+DIST eselect-awk-0.3.tar.gz 1543 BLAKE2B 9ff340002d76a3bc3569501d7b92a8d216eac65e9c009be2a7b43802512050fdae962b53e66bbd0e5df6d295968aa4e3d56c8442adce5eac5d7c8b1f30b1e924 SHA512 d90ed1c8edddd996e2b62b4a927d2c5ead5790aff275e3a79f4a1361358c4debef0c50ec2c8d6da5a210755a5d51cad4b2c5d6ee90553227f0f24b251b52e383
 EBUILD eselect-awk-0.2.ebuild 496 BLAKE2B dabe1c0990015d8ec9d4d1b90e9f5734e63b415c51657db846231d1c3a7337c7fa7438e420e32634a824482146f93b264181713fc2842b2c6e0cf64ecfec7d06 SHA512 4bb01e01ddf6806b0dd2d1bdadde1544edf6d44c683c8aba40a6ca2987477a797fe54b9c7d8fa9388421901bf09bb0c8da242a0fd5b911abfe60754cb9066a61
-MISC metadata.xml 372 BLAKE2B 7d8462555c43bd348728c94113ea20312aca3d126874bfa2d2e8ffcff87df07ba9de74cc9d3c1f2d51b3779ed742a3c05d80549735406ef6f499e4343c468dd2 SHA512 dcd1c89d7c9e64f49ea4531c40482c7911e6b7f2873691d0dbb395ea179bf1a1be3bd4da9633e802e164ac837b5f3212844094c2a4773af7ab415e9005241b1e
+EBUILD eselect-awk-0.3.ebuild 505 BLAKE2B 9dbe4ffdcc4125e8fee3941657ca4bd990c7e0ac2b1aa71627f4417936f052796518c216003b468d6b44355da6524b3dbdae62df6bea1f6b8435c347a4211fdc SHA512 3dfb86763dd44d1410b6418513b64ed8a482a592f71175e77ea9ff03f7e30310864aa3243714fcf55918e3763804ec81ce67843b85b0c3d5c3da8f900f2dc408
+MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/app-eselect/eselect-awk/eselect-awk-0.3.ebuild b/app-eselect/eselect-awk/eselect-awk-0.3.ebuild
new file mode 100644
index 000000000000..8289afe8cc93
--- /dev/null
+++ b/app-eselect/eselect-awk/eselect-awk-0.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Manages the {,/usr}/bin/awk symlink"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://dev.gentoo.org/~junghans/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-macos"
+IUSE=""
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	doins awk.eselect
+}
diff --git a/app-eselect/eselect-awk/metadata.xml b/app-eselect/eselect-awk/metadata.xml
index 9218df9e2c8f..4eb20a048df2 100644
--- a/app-eselect/eselect-awk/metadata.xml
+++ b/app-eselect/eselect-awk/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
-	</pkgmetadata>
+</pkgmetadata>
diff --git a/app-eselect/eselect-blas/Manifest b/app-eselect/eselect-blas/Manifest
index da41c99a02e9..fd97d3d1b123 100644
--- a/app-eselect/eselect-blas/Manifest
+++ b/app-eselect/eselect-blas/Manifest
@@ -2,5 +2,5 @@ AUX blas.eselect-0.1 350 BLAKE2B a21d38edf3188c2f26d384010d070048c0df19dcf87338e
 AUX blas.eselect-0.2 4948 BLAKE2B 1d96b09958669a85b6276ebe29f146cd592c141b11454c0c981c24e6a93f17779399300bfe540aa89c11f2399ef6a716728e3e2297e0cab8a1652b96a0c5ca94 SHA512 f312bb665fd70ec479fcd1e2fe11b50ccf8b6e80b8513e41a648328f521e7fc0639e83bc615afa177f780d3ec3d37ebee0c4755d2d03a3a604d71562791b4b11
 AUX blas.eselect.5 2368 BLAKE2B 8545c10ff73bafc4b9abdaab6410e0cba4d543ebcb7615f96357c72b63253c48158b08f85693005e8793982e86fa1e47c518d90a9302eb15cab6da84e584bf87 SHA512 46a423dc25d6f44769f92babcd8c98a8fa6f19bd64717fc894b9be1984e5f7ea4e00a458d9dd25724fd40377fa633b7f9c513878000a653b386f6be75532f531
 EBUILD eselect-blas-0.1.ebuild 699 BLAKE2B 5c6b8c0a6bc222efc70382c458b082d9d5360bea2d8b6ec22d448a6ffbbf71d34ea0bde803d12b8d204a66ef7d928bc89262c2a57a3709c031b35390da705845 SHA512 d3caee097a979becdb4b5ab672819839b2b94f87840ef0a81e9d788b1c281a0dfbd13c977d527c3ee9dd9dc640c48fd61989325f8e88af4ae5f213e238afc339
-EBUILD eselect-blas-0.2.ebuild 673 BLAKE2B 81fdfb1ce14e0447de85faa926c8e80104ecc5f11b51404c3938e65af60f822fa9acb4816f29f7090a3b8b5ae2cd5e9729fb6f3b168b82bd3c3cde297d08c048 SHA512 b9121419b32132f1d78a87264fc48a6fdafda2f89a24b9e9ad8cde14375d86cd6b100fb86b74024372b47b1a84a819e273b168f9a5ee9f842a40dc855e777a59
+EBUILD eselect-blas-0.2.ebuild 672 BLAKE2B 7c556a753c3f9449bafb767d2bb08e08b3769e08de584b34db9cd5e69d5977b0a632615004581cd01cb028d31960c44245c0d27517e700022c97435765d3a514 SHA512 54da8f789f3acff87552038dd2e489ea82b6c24fdd2e624844926e77d66434dcd1bccf3a9e8e9707d8848d2076163d9eaf191968d12d9891184e6a4614af7e49
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-eselect/eselect-blas/eselect-blas-0.2.ebuild b/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
index 23b589fc28c8..930087457bb5 100644
--- a/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
+++ b/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 # Need skel.bash lib
diff --git a/app-eselect/eselect-sh/Manifest b/app-eselect/eselect-sh/Manifest
index effdebb56388..43790201f7e1 100644
--- a/app-eselect/eselect-sh/Manifest
+++ b/app-eselect/eselect-sh/Manifest
@@ -1,3 +1,5 @@
 AUX sh.eselect-0.4-r2 347 BLAKE2B a67b9287c40f2f5d96e3a849f889e092a3861423db7bbe5653fddfd5583a7475edee2eb071792b92980269ce19cae24ca774404e95c51a42b6b67f960d9a38ad SHA512 ab8ff220613e1de75e6ffc4bd0b021e55f80658d0071af9fc1036d28f81cdea35e209869803c33e89ea90fb3c980f511b91bf4e64d56f530e92af5fccff522be
+AUX sh.eselect-0.4.1 341 BLAKE2B 9f1723010505a9a364c83799af6ae4a354bf40e31c911a47cbd93b79362bfa255c8cd7eb1e1a50c3e10dbd02cbb22b53c8727571f63a362fa55c4c76afc2029c SHA512 610078d4c889708ba00a3c6cc6185b6d395b64c680e2da0dfd72a4e9debdbb3b001a089d8bddf0e7d8bb92175a80be823867331661e9b7b3e66a0bf754c4cf8c
 EBUILD eselect-sh-0.4-r2.ebuild 596 BLAKE2B 8addb4b4a9d997d4a3e46241ffc9ed75ba00a8d175ec196606557f29c46a709850777f4c791a5b32275bc7fe1ea9b086877aa8354f108191f4c968de4189cdc6 SHA512 29cd9cc68ace0b699dc360ed3b4a5df2ef0a8f376be0c91008b6d05bab97c26d56d68599b8d209df861d68084648d09b632fc8e9a414f6a5eace9f61e5e122f8
+EBUILD eselect-sh-0.4.1.ebuild 615 BLAKE2B fc3894eff5e5cc2347a8292ce515aa72a973148727f61b64f1eaff35c9953ec7e5cc6dfea4598609534c61d7a8e5202c5f805c760ce8f5897e9ca346cb122c5e SHA512 640bf88060aa3bd585b56d98b926b84807139dac5e74c9667f4469b7d761ada6d57bf86aebb850177a47fab3229bf3b5fa174d9aac501fa6b314a132d0f4c2bf
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild b/app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild
new file mode 100644
index 000000000000..2d22ada5e0b1
--- /dev/null
+++ b/app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Manages the /bin/sh (POSIX shell) symlink"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI=""
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="app-eselect/eselect-lib-bin-symlink"
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	newins "${FILESDIR}"/sh.eselect-${PV} sh.eselect
+}
diff --git a/app-eselect/eselect-sh/files/sh.eselect-0.4.1 b/app-eselect/eselect-sh/files/sh.eselect-0.4.1
new file mode 100644
index 000000000000..286c321816d9
--- /dev/null
+++ b/app-eselect/eselect-sh/files/sh.eselect-0.4.1
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage /bin/sh (POSIX shell) implementations"
+MAINTAINER="mgorny@gentoo.org"
+VERSION="0.4.1"
+
+SYMLINK_PATH=/bin/sh
+SYMLINK_TARGETS=( bash dash mksh )
+SYMLINK_DESCRIPTION='POSIX shell'
+SYMLINK_CRUCIAL=1
+
+inherit bin-symlink