gentoo resync : 20.03.2022

3 files changed, 4 insertions, 39 deletions

diff --git a/app-misc/empty/Manifest b/app-misc/empty/Manifest
index 4ea9ac429b2e..562977b0d253 100644
--- a/app-misc/empty/Manifest
+++ b/app-misc/empty/Manifest
@@ -1,6 +1,4 @@
 AUX empty-respect-LDFLAGS.patch 234 BLAKE2B a344d06f25ec7bd82d5633a9d716eb7235af51d532e9010685fbbea4b51c8deedbd99119403b0d592dc810bd52a70af96d55e3b4e40bbeeb1b7e4100a138c361 SHA512 a3d15d1ca8eb4c422080c24121cd1164ab534a374911fe8500980a3ea92e6bb90d6f8eeb6e1e0d86e49d901f344f2c79c386e8904f3d5f8b2b23c7e8c74463de
-DIST empty-0.6.20b.tgz 16269 BLAKE2B 15a50b2484278cb03b7d91cd5b6a14b9898a3ead3bf2017cc86d9dc8e3a3ec5650b20f57fec6ccdccf780c008841d41205098ea423731c593c1744ca55e5a934 SHA512 bdeda29ecde0bc7ee0432656f0497154e04dbad26aba62a0fe76ded394ddeefe2bfd921594a2dae44459b62ab4767d3b12a7a86216dfda56b6d77035a8b05c3d
 DIST empty-0.6.21b.tgz 26793 BLAKE2B d7266c03ef1580bf9871c294e54e292ba264ef6b72c4be1db8e408696bc8327891cb7827de68e429b0496165bc7e105c697c76f29267b3f10030bc6b183a4910 SHA512 4aef74a61161e8d6b6b5159adfa5b7f2779798fddfdbc070b15ca3f747081eb2f7984b58b0a0cef4452892712d274580cf33c64ffddaee3f70ac9bacfc2f7e09
-EBUILD empty-0.6.20b.ebuild 564 BLAKE2B defcdf39ddee62cca9361e89f0a1106f8494c3f5428343061ac1e755b9449c3a54f446df9e7eea7ca3e92bcd89d3ad9f8cac5069ed5d492ffa72718bdf407475 SHA512 238614e3b44540dcfcdb545f9ce99346e8224497d21024a56bb138fad1cf2b6f9acb858b518b857c5f3309346e6cc6e32d268801a98a91e40b4de3709d7655dc
-EBUILD empty-0.6.21b.ebuild 557 BLAKE2B bc166212adf8eb1d0e6f0de39e9858d5745daced57f4eb09bd3aca1f456aaba401fbb211b659eff3c8e8ea52dbeafdceeab95a4d13b1171b65a6b5a205c2237c SHA512 e97fbf9c0f4762058696036b8216e989dec442e4b33b3f914fa9e0ddb556b38669ada581ec7e643c78e7cea31b8e246b2b7a64be4a4bc9fb65c78f01c9f93d4f
+EBUILD empty-0.6.21b.ebuild 564 BLAKE2B bb3bb2a8620694ccc14b4b5f562f55c9c28f94a4539bae42a3361c6d883579fd4974a0c214d9813c6d38bae1d9241abb7877054f98e85ded6e5f18476a44386d SHA512 03de0da61c25abc5fe2df54230938771e44a302c0aab17c39638bb75ed4fffb684dc88ea9f9156b610ba2a0a7cc1db8370f3c1b4bec5f8867ae03141d3cad45d
 MISC metadata.xml 323 BLAKE2B 336922bc9057e6eb09cabc9bdaf48230cdf1597f81c203cbcb33a34fa9a37b68f882e4ea4b6f5e8753daf1c4df579d4293c5bebe55bb54f7e8d07a742436d7e8 SHA512 4ae6c406ddf3d9de0beb4d365cdbdc570cb8c216118afa07edc434ddc17b1e380d07272d9c991d8c13b77bce6306afc80c19df1b0fd42d32758eed957f931106
diff --git a/app-misc/empty/empty-0.6.20b.ebuild b/app-misc/empty/empty-0.6.20b.ebuild
deleted file mode 100644
index 0660d112cd97..000000000000
--- a/app-misc/empty/empty-0.6.20b.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Small shell utility, similar to expect(1)"
-HOMEPAGE="http://empty.sourceforge.net"
-SRC_URI="mirror://sourceforge/empty/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND="virtual/logger"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-respect-LDFLAGS.patch"
-	eapply_user
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	dobin empty
-	doman empty.1
-	dodoc README
-	dodoc -r examples
-}
diff --git a/app-misc/empty/empty-0.6.21b.ebuild b/app-misc/empty/empty-0.6.21b.ebuild
index 95c42481ff4f..ab9493016850 100644
--- a/app-misc/empty/empty-0.6.21b.ebuild
+++ b/app-misc/empty/empty-0.6.21b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/empty/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="virtual/logger"
 
@@ -20,7 +20,7 @@ PATCHES=( "${FILESDIR}/${PN}-respect-LDFLAGS.patch" )
 S="${WORKDIR}"
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {