gentoo resync : 14.08.2021

9 files changed, 11 insertions, 148 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 1e6b712e229e..7469d74f9dd1 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index 365229f87452..673f2b996261 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -3,14 +3,12 @@ DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
 DIST binutils-2.35.2-patches-1.tar.xz 11836 BLAKE2B 0141349c9618992d1ab1e0309f7ed8fbc43b60a58be1dfed05eae8a8fee857241d9e112ae673da6fc9778767675f536ece818cb85567367bb1c8f87a0693623f SHA512 35de5f227c745c5fb800784fe657b2a6216faf43e2498e8481e7b0dc79b0d2f86b3b6a10b896e060319a77a51c61d2e1b7a951ae962b3a6ef8c1a2a261d9bb6c
 DIST binutils-2.35.2.tar.xz 22056908 BLAKE2B 9c392e0db2b482442f9476f30bd80cf2796321cbf7be79cf21af7bef167b6074c4ae009dcf9b438d2f2f4a23381c935176b2cfa85de1a526ab46e0fd844a7ca5 SHA512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348
-DIST binutils-2.36.1-patches-3.tar.xz 32720 BLAKE2B 2a5a60168ec5ff612e7e58530092f306460cdb4a963320978dffcc22d73684486a14a5981f6eab2f7fc270def22cdc9954de455d680b2de4befc1ad4916347ba SHA512 e429cc82451675f14715d4e7640fe7b995495c8759a8e919c4291f8ca8358a663012f05c1ec6e60b1261114848379fefc9df723929770462dd676fa04fc7aa54
 DIST binutils-2.36.1-patches-5.tar.xz 44388 BLAKE2B 1dadb012fe35ec5fb0c5a15d348ab535bc5e3765375c97a3768c6b9f7126e0fda15d35163c9f9c33a4be98662dd120d7c1b21930a20c18dbb5345f56ecd9ecc1 SHA512 a2ce3388f1f1a77ff865481ff4b625121fd55f5234fed0a885312744f2f9c504717de1499b68252c6de64fa45866db7692df91c5838b43fbeb178938811cbe84
 DIST binutils-2.36.1.tar.xz 22772248 BLAKE2B 03fbfbedd6dba2beaa836b1ed254eddd7a54a163d3061fd93edd2b9591cae24ba049b26658c524b5ccecc2f22d431dfa168218d2531aa356945c994fbbe896fa SHA512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9
 DIST binutils-2.37-patches-2.tar.xz 79304 BLAKE2B bdcbe29efba3582f2d1be9057a39aedb655cbc225abe8ea656c1bcf090a53930c74197505c8de2dcfd9a105f1b1cc8fa84a0d532547221d2df34a77b06e7fa15 SHA512 5cea876cfbdcd1409f5ef8ee138a8c29ad5b3d38b5d72ce312f2eb94fb8b2165e9a10018c46bdc36bc59ade2e2764e5da4ac653d15690bfc0bc9784202cc0164
 DIST binutils-2.37.tar.xz 22916924 BLAKE2B f5a374fdf0300f7734d1e462333296b16c9d5ed6eba167e1742a4da7082f4388c929e286bf76c3933b3e434937380340732a31790723654b491ea0c8ab5b9ba5 SHA512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7
 EBUILD binutils-libs-2.34-r2.ebuild 3680 BLAKE2B 96fbeb96af93c6db271250870c4df85773db022aa7dd070ccfa33ed2dae57ecb0d543d93cb2ff0666e1b403f325e035a1f9988a05a16f53c167d168e3d6bec4a SHA512 9d540bd681a08451091742e9dba7044ab77a9d8c7920b8f078146fa7eacaa31b872f20c30477a33ec5bec3070408e1b2ac51e145af86d56fae794ace5f2972a2
 EBUILD binutils-libs-2.35.2.ebuild 4102 BLAKE2B e988ab2daeb4f77f469f76af9a56d5509100d6dda39cbebfd41e554d944ef2f4aba2f4c320477947b2979ede808dc4b9a06747e10f878d885e8339e58e7e4f24 SHA512 384c2b9e3819516b9191e65793e32c54b492f31fefbe17c6cb61357452ffb5e6916f9b1dc6bb90ae8c9603f805e3c601aca12b7bd66ebafb2b3106f436185a03
-EBUILD binutils-libs-2.36.1-r1.ebuild 4062 BLAKE2B 0e41ac1f70816696b908c79376acb43c313d6337e39420a1b6f03a961e3e599c9b75ff1e18dd7c1998375b0b15b49f00812bfb50d114f2c3d87c93d2070a0410 SHA512 5c62e3511ed4d6eaa21671a2c1332b8b1857863f0adaefffe23f23f0d0455e916665a6c5a047b8bfa85484a52be1ddfc3a03a1ca4317b52926220fe8c7edda61
 EBUILD binutils-libs-2.36.1-r2.ebuild 4062 BLAKE2B ca5eff3b25b8751376d3d4cc1e3416df0fea3dbbdecbfa230aebb7458b648215a375a5d94356a23a0d7ddb4109b6bee26247d4cca967ef13a7ca060ca9d7e7f3 SHA512 ac433565e145f2b19073926998bb74c2b17dbe4343b3d191c7b5e239cd13844d0011cd3d71140ad2bdb3f36a56cea84ee282ed52b54bec6783ebd99b1a040d13
 EBUILD binutils-libs-2.37.ebuild 4063 BLAKE2B 1b7152d900fc718a94aeafab935262dc7fc49099d0b130cd6230518f3d35fb1e18db761f3afcb51f8dedeef1975fa29e5465e27266c1ab149ebfbffa694d4939 SHA512 944f41a606462eec1abcf80ea120de610334cd684465ba3f9d1d587b1f94ca8da391cc4ad2380d24949aa2f5a75eb3415dd2d0d0d2ad94819a3b261e72cdd564
 MISC metadata.xml 611 BLAKE2B 6093d3768ff4bc40fa0f8d1ebb3d9a5454f5e492030892d4791e7aafeef0ab4bd2902b818602725bf54e9045be762c1f495eeaf3742ec3ec4c4beda127e2c8d6 SHA512 21b771eb04b2e6f642e3ac48f13c2db19b728c8ed13821c39bfae696b8726f6f68ee65bb89ec0e90adfcee0e7f07a3109ab35e0699fd555ce0b84ad23ef81d1b
diff --git a/sys-libs/binutils-libs/binutils-libs-2.36.1-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.36.1-r1.ebuild
deleted file mode 100644
index 60e0e7e544e8..000000000000
--- a/sys-libs/binutils-libs/binutils-libs-2.36.1-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCH_VER=3
-PATCH_DEV=dilfridge
-
-inherit libtool toolchain-funcs multilib-minimal
-
-MY_PN="binutils"
-MY_P="${MY_PN}-${PV}"
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
-HOMEPAGE="https://sourceware.org/binutils/"
-SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0/${PV}"
-IUSE="64-bit-bfd cet multitarget nls static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-# Need a newer binutils-config that'll reset include/lib symlinks for us.
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-config-5
-"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/bfd.h
-)
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# Fix cross-compile relinking issue, bug #626402
-	elibtoolize
-
-	default
-}
-
-pkgversion() {
-	printf "Gentoo ${PVR}"
-	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="https://bugs.gentoo.org/"
-		--with-pkgversion="$(pkgversion)"
-		$(use_enable static-libs static)
-		# The binutils eclass enables this flag for all bi-arch builds,
-		# but other tools often don't care about that support.  Put it
-		# beyond a flag if people really want it, but otherwise leave
-		# it disabled as it can slow things down on 32bit arches. #438522
-		$(use_enable 64-bit-bfd)
-		# This only disables building in the zlib subdir.
-		# For binutils itself, it'll use the system version. #591516
-		--without-zlib
-		--with-system-zlib
-		# We only care about the libs, so disable programs. #528088
-		--disable-{binutils,etc,ld,gas,gold,gprof}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# We pull in all USE-flags that change ABI in an incompatible
-		# way. #666100
-		# USE=multitarget change size of global arrays
-		# USE=64-bit-bfd changes data structures of exported API
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
-
-		# avoid automagic dependency on (currently prefix) systems
-		# systems with debuginfod library, bug #754753
-		--without-debuginfod
-
-		# Allow user to opt into CET for host libraries.
-		# Ideally we would like automagic-or-disabled here.
-		# But the check does not quite work on i686: bug #760926.
-		$(use_enable cet)
-	)
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	use nls \
-		&& myconf+=( --without-included-gettext ) \
-		|| myconf+=( --disable-nls )
-
-	if [[ ${CHOST} == *-darwin* ]] && use nls ; then
-		# fix underlinking in opcodes
-		sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \
-			"${S}"/opcodes/Makefile.in || die
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-
-	# Prevent makeinfo from running as we don't build docs here.
-	# bug #622652
-	sed -i \
-		-e '/^MAKEINFO/s:=.*:= true:' \
-		Makefile || die
-}
-
-multilib_src_install() {
-	default
-	# Provide libiberty.h directly.
-	dosym libiberty/libiberty.h /usr/include/libiberty.h
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index eba52a40b9c4..23d1c70c4326 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -2,5 +2,5 @@ AUX gdbm-1.18.1-gettext.patch 444 BLAKE2B 43496bf0e950e1af452439f881bca4fe5e3187
 DIST gdbm-1.19.tar.gz 967861 BLAKE2B 92a1a9c461c763b01d7abced58800aa8db200ae746240c8ef8079a615d920efe95f0d805a8cfa63d8aa6bcbda637bcb07d98d630f58de5678b7633c3fcf6bf9b SHA512 118c5b8cdf74898bfb7c2100302fedf80096be017bf08e80a44486563cad5d93b93567622f2e7c7aceb72f30460504bd0b4ddfccf34df994ed65166e12ecd495
 DIST gdbm-1.20.tar.gz 987628 BLAKE2B b0e01e63714b0485f9ac28f4a2260bf9309d2b3a87f6ccf6c9901619d383b6527d068b8614220eb6a6dec909fbf3fab5162a6c67bb928cfedaef36f1df26d0df SHA512 5f2fbd4318259e5b879ea2bff09e22defbb4e566ebbe11c44ac5b5369fd00745d7ed9f72ec1206153027eba245c4ee4a515a8ec6d67f84ec477483e72753590b
 EBUILD gdbm-1.19.ebuild 1316 BLAKE2B 93f38c5f423af1033a05b2225589ce5643941b7bb158b9369d58494356333017ce0eea2e74fdd64b2beccf6754bc192729bdaab24ae703be268fc61ffdb757f4 SHA512 2198bd55c2d87547d3fa4eed0893947b6e33c11299bcbeca744c45c5df5ccb770a66c441c717d3b908e5d72c2a5ce4d9842e962f82bdd2d86b40fdc519724f69
-EBUILD gdbm-1.20.ebuild 1320 BLAKE2B c9594181a5e6c7c1eb093836a8f1eac1bb899245dae58ff6a7080be807e125aa7c2dd490bbfc92e9d4e5cb3ff18307963a795ea8cf3583ed1bccbcce4caaa173 SHA512 1a2dca6004abbc7a6078b48ce1c90a5e8f169c426e7ba234d6811c7d5698833645d7cf8efb346110e8c2836e01c62442afe2cd124a6e9d7bc40e7a25c4768bf4
+EBUILD gdbm-1.20.ebuild 1319 BLAKE2B deb8dfa4bd9562d0b80b4a0f6b0634414badf363e4fe17ce395eb3d9c04021fff9d833c15e5178c9b4c58055ef6a4ea75d736a721a2d1abdf7dbb45dbe87454f SHA512 12681ee5d353f44c439d5614988348d7b9dde410084ce7afc5d4fc1a56d2d6b28a6ba05c561938f4a3928a2647fdc8fca0740f1121edda6b1b72b78a61eab7d7
 MISC metadata.xml 359 BLAKE2B f58b008f8cd663d499052f6d3ea0f658b3816d28c044a4fb8a341a8ce7382104962f58b5ba881bb1dcfc8835cbfc22782471eb48088c547706caa63c35e21e97 SHA512 12da6a0492c269ebff68bf1b1d5ea44b9e011a9197c353157da04283fe865ffff01d6f6c28ecc73b5985ec39959c1c7911b2aa5c3e905929f41521b7cae0b169
diff --git a/sys-libs/gdbm/gdbm-1.20.ebuild b/sys-libs/gdbm/gdbm-1.20.ebuild
index b040990ecb8d..62c125e0e4eb 100644
--- a/sys-libs/gdbm/gdbm-1.20.ebuild
+++ b/sys-libs/gdbm/gdbm-1.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/6" # libgdbm.so version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+berkdb nls +readline static-libs"
 
 DEPEND="
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 326441fd9535..6bf37b9d6460 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -3,7 +3,7 @@ AUX 2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch 1360 BLAKE2B 19d218e91b1d3d38c
 AUX 2.19/glibc-2.19-kernel-2.6.16-compat.patch 3214 BLAKE2B 64af88703bddaa301ce25d4400e00140fae536882443510466510766a60ac1cf4ceca35ca0ad4384f0cdc05b79352ac7da92f555561d1f6cdd65f7cc8464c6d7 SHA512 c21d80b7ae5b2691e5b6d43a42153193822ccc2b4418728edd5f2fa72412992d103b61418b57f9cf26e72378b24aa7cbaed05eeb31a4ec312a715d258cf5232b
 AUX 2.19/glibc-2.19-kernel-2.6.16-hide-pipe2.patch 620 BLAKE2B 216e728e40b044684843bff97eae31d65689595bcc3e345ef019a68e15c190cbd7fa685ff39e6363cf213f3f5676dee49f235beb1984a9e150e2b4ab72fcf605 SHA512 b93822269e67262fa45cbc50c5ec562d60ef69b2338afd56421b2d74d97360823dd4252abb0faee83231e4b3fd3f7357ef0249be8721f48fe176e512c6f5e447
 AUX 2.25/glibc-2.25-gentoo-chk_fail.c 9068 BLAKE2B 6fabcbb981d92101ff3b97e8eed4da3c0ee4fc3d09ca344c2d0b7ee5e04fec66b5db314263541beeb1290bafa837795fef1a6300986de938d2958ba89a9c1f2f SHA512 4503002b0e2cee0b6efc4599152d24fcff330157d4e35992a77d0d83a2decc4cf2da2b8645a44d90d428a1d82300a4fd8d13c5937b7c89f368c12b3c9139be6f
-AUX host.conf-1 936 BLAKE2B 1576b57e079c8596ae86d518da364b4d50f0dafb6879c2a7eb1f67f12057f3207c58a7f98dbc4e09acaa23fc152d63547176ba8bfd050a60413ff4d000f6c11f SHA512 0b2729ee91a6fcec4dd391b31088fab7257c698284a7f757855a9bdbce4d38037e81a58c62a28b591966099bdec3b307bab697f3015c7adbf5d5f33626658c72
+AUX host.conf-1 826 BLAKE2B 32fe7f016325e781d477a0f855c32d0df12626edd11d58c0ec368fc579811b73e4851dec6bfca9e9f53d1c2de1bb2b3b4406e50b7f665870958d727fbeab2f87 SHA512 91102a5383b49199eceb94fb1ecd223ce0f585021de94dc1646af1095a220ba1acf540271af908da47a3ee1aa55c35f5f372d61e34d0e14f1718e67633a13e76
 AUX nscd-1 1897 BLAKE2B aefa781de3181c5609ac2659632f0a5bdfa6bbc8e22b73fdf5c28ca36184b5614bb2febd581d0c41a1f3dd72c45a191866cbc827f5e7009722b6d839518a27d6 SHA512 b2edbdc33fb4290378d9520bfcefcbb5183e8b8f0e80cf3573fb4ce6cf309e21f59178f31eec4ada90b4b37e502038e71b31f93b2ba2c7fa36a7eef1b1d9bf70
 AUX nscd.service 337 BLAKE2B 6b163465dd8db024652921892dc913da8dfc0984eec7ffce621229e48fa99dcedc3b5944844529190122c81f4884b6a6fe7836d37d2d812f34059c530856dec1 SHA512 2001100f3b054843c69b6fd2d38852c7c824282aa8998c25a3c0352db993705429d25c70d8ce6cb3579f836b7089644c520acac423ebd69cb1b36e94a77c5bea
 AUX nscd.tmpfilesd 111 BLAKE2B 4abb7220564e248fc7eeeced41077f186f42594facbfac9a4c0ff36209baac529c219ad6ead8d8aa53ab2b092002f1006a4479459b9e9a7c5a0294cb7d822100 SHA512 53b80b331e1a85d8ee16eb2ce547a7249e944926c3d1cdd4a47a5301a5c842ffc7ec1e3dc0a731542a8facf8261c1c57121802d01741aa89898a3476c09da340
diff --git a/sys-libs/glibc/files/host.conf-1 b/sys-libs/glibc/files/host.conf-1
index 4c58e52d6b3f..661b4af5d959 100644
--- a/sys-libs/glibc/files/host.conf-1
+++ b/sys-libs/glibc/files/host.conf-1
@@ -1,5 +1,4 @@
 # /etc/host.conf:
-# $Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/etc/host.conf,v 1.1 2006/09/29 23:52:23 vapier Exp $
 
 # The  file /etc/host.conf contains configuration information specific to
 # the resolver library.  It should contain one configuration keyword  per
diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
index be80a3202c47..dfb39c59d891 100644
--- a/sys-libs/kpmcore/Manifest
+++ b/sys-libs/kpmcore/Manifest
@@ -1,5 +1,5 @@
-DIST kpmcore-20.12.3.tar.xz 584264 BLAKE2B de80d48bb6becb3e8d6f5b9b4456e4ad4e220ca52d76700c6be33942c5d762e1fc39b43b3595894a3d28605d7010662ebec588c3f1d3a4525a9efe797dbf65ed SHA512 90083374bbc4b91e948e9ef8e3e272cf7bd6b038261414c7e08eea1a903bd61c723f29a4afe462e29c1a083c6771be435fd4dfbf8a364c2c167f1eed19d04323
 DIST kpmcore-21.04.3.tar.xz 586264 BLAKE2B b9733f8b941fed98503e78b9c0357e002df92a39c4e70885822f6bb8944cf2c76be1fbba23e4cedf104b46a95832e72d2384c0d78abde312e0b2be40aa4d5745 SHA512 44614e3a0db646b81e56b87daa841b7b7e03ff97699ea393d83b6cc61e6c12efa36ac6b8aba87da612f2973a1d108bdad21ef0d73fc2db98595e5b711e5a0fcf
-EBUILD kpmcore-20.12.3.ebuild 749 BLAKE2B 0e0cd54e67d6fed17f721cf615ac5ebb0a405ed67a7338834d235e15e156119cbd0f8fe9489abb13231e47b89b975314f0fc84f7576833b1262cd6823a4cc1ba SHA512 4db6919ded366d2c343f68c84e929727a0cc6cc2762f886f4a087829b1c30b1f350d20fdaa57fe89cc041f96b30150e79f5966b7f9f968c41a5b79cc63af67d9
+DIST kpmcore-21.08.0.tar.xz 589504 BLAKE2B 95f5ae6f85293200390e9396e0b38998f60e7740d9cb2cca60ab2434eade19704e199325c9865d463526af445374d2e49f4223128c17ac14d3a65b7b15f06fd0 SHA512 9e5e8c2fcbb2a24df7d0b85dc774259d885b247b9d9e8c960982e67e5b7e7adf778e0a9318f8b924f44fdb18db1bd264fb4580cf2235973ea40f6c4d3cfa3c58
 EBUILD kpmcore-21.04.3.ebuild 738 BLAKE2B 283bdba57268a73410f37b011dc4b1d975bd4319497aed024073950a695c13ceb7b7912966da86ebbd71181a70539b443c81062f4abdf60895cb672e39688d4e SHA512 ec32c6db3717e1c8be8fff04cd566ef313fb5a7c6c6de2dc6d7b3dd18fcd4ebec16ee24d92bd8ff094dba7dc1ccb51f4eb921cc193eb4023096c346e5e955f6b
+EBUILD kpmcore-21.08.0.ebuild 741 BLAKE2B 134c4f5b06548a7b3010ce0034a172b4a15dc2b6e254490906b649fe99b937e941f867e1f210f97d9ebecfb156f9dc3ef2a778023a44b3db54328091b07fe95b SHA512 22d98cab594cb9ee3ac55347a1f3b1b9bd751be5221d631906fdc43601a3c3833aca770c97a121eabab9ce975f2661a8b6247a4b2dee1d9b44914049db15ca83
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-libs/kpmcore/kpmcore-20.12.3.ebuild b/sys-libs/kpmcore/kpmcore-21.08.0.ebuild
index 7b9e3fb35fe9..49b9b6a5b624 100644
--- a/sys-libs/kpmcore/kpmcore-20.12.3.ebuild
+++ b/sys-libs/kpmcore/kpmcore-21.08.0.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 ECM_NONGUI="true"
-KDE_RELEASE_SERVICE="true"
-KFMIN=5.74.0
+KDE_GEAR="true"
+KFMIN=5.84.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,9 +14,12 @@ HOMEPAGE="https://apps.kde.org/partitionmanager/"
 
 LICENSE="GPL-3"
 SLOT="5/10"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
+# bug 689468, tests need polkit etc.
+RESTRICT+=" test"
+
 BDEPEND="virtual/pkgconfig"
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -29,6 +32,3 @@ DEPEND="
 	sys-auth/polkit-qt
 "
 RDEPEND="${DEPEND}"
-
-# bug 689468, tests need polkit etc.
-RESTRICT+=" test"