gentoo resync : 05.12.2021

3 files changed, 2 insertions, 83 deletions

diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index b857071791d8..6a88a1aea983 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,17 +1,11 @@
 DIST c-dvar-c8ea9712a94186512c22c32f32c421d6a2db6feb.tar.gz 25212 BLAKE2B 37f02df4f0a4c7372826cd9db37de883cf40027b12f72f0d43cf08f08682d90e6c7e8c3756f90a9e6184713c98e331ad2b2c9cd3373a148b05e2a3a2305db413 SHA512 c134892b43a1b572c45f0f24d7c9c7e70b1326c8bc896995b491d86271a000e83707e5d5eeff631b66be31f3980df7146cd18c385263a3a8bd07f30840cf829c
-DIST c-dvar-eeb91604574f7c5b12b270f8355f7e6cf1720f4c.tar.gz 24723 BLAKE2B 5206b4e85cdeffabc91e0feca17762ce10bf69815bad8d739af5eacf499ee4fe03058db1d2f4b2fe06cd93fa48eb637e68b50726a40e8b431f0fc526f830f114 SHA512 21d793ae449290c21c98904a43482ce1cbdead9fd1cd857214feeedd2e04e829f6ec4a8372f6b237eeeb5fcb5f96901ef8374d497afe6f70316f6a944a385443
 DIST c-ini-204410a08d3a6c8221f6f0baf0355ce5af0232ed.tar.gz 13952 BLAKE2B 42c34e4ebe17d4c0904c395c72e56b0587c5f6b2cdf422cb800678844cf8516f9645718a04e9a10f6e747d1f56b2f1e563d1fa07db078e745761ae1e40ad395a SHA512 72eeaecbe0b9434b48d2ca9674dd1e722e612a730fd07ef27babb346a10ed7311b11c9d85f2aaf0cd84ddca7f926a78d76d066f453289bcbe849c4cacf72ec58
 DIST c-list-a0970f12f1f406a5578a5dedf3580cd682e55812.tar.gz 10124 BLAKE2B adb0face335aaa8206e597e404dcfea2b9d22035d4297442473918878ff9928ff5d614b20cb96de8a50c1418da83da5a49837c0677fe2a5f3db4e78cf3f2bfdb SHA512 51958b4c35acd84da89e694fc58a045b28d265f77043d302fe98f3507432363d20bfa611948fad37d0e5feb36b6232f742cde80e6243bafa3cd976c8b11cfc4e
-DIST c-list-f1eadf27377ef2f74b3cfd16185f54a219df2aae.tar.gz 9350 BLAKE2B c2db7f5e67f9575362c059545f3fa0bef4672e1195aeb57edbf50d8265e72f120540178cfaee8f49e0a9494e3ed56a4a10d23de237035d15b529dcfc47184da9 SHA512 c2a0f21bbf90b7dcfe9858aeb4f141202a7f5d7b980189f7ec6dec2eed9b70d78b82be5009ec7ae1a99911e2489a1734b8017cfb709d7625addda5b1a738dff6
 DIST c-rbtree-8aa7bd1828eedb19960f9eef98d15543ec9f34eb.tar.gz 25957 BLAKE2B 76b67a5efeafbf68fe3f1db732d1ad878cee7c23596dda096649c30205582f3d7fca99c5b99ced69b027cd3100351da03aacad00c3aa24d3a0604b09093ecb99 SHA512 57305a5a438a2dd69662dec02117d2636e50f901cb92a251c3844a343108ebeeaa208bb09dbeb22dc1b8d1171719442f4ccc248d89909cdd7310b7db6cfcd6cb
 DIST c-shquote-83ccc2893385fcca1424b188f0f6c45a62f2b38d.tar.gz 10622 BLAKE2B 1c705c47ca22dfb3cb0a277ea96156806d1c0e9913da48a2baeea4e2e455e7f417f48db24c94770b7e471655a1c109a23679ce11ed802447e0b41ac3c60f822e SHA512 499fb764a2f72e1151c0007975720b56912f88f0ef92bb88c6b1870fcc8e815af8b377e1e6fb9829426757781134d9ec20cf04cda273ca2a5c128705b36dd3ef
 DIST c-stdaux-8652c488b8f1c29629a5179d4551d0a691ae5901.tar.gz 13075 BLAKE2B ef08451574ea695151cbfdad2060324423c8abcf46ac8a86b3216b85017c9b4dd8399d0561cb4f2c731e9eb2883481db59292769560cbcbfc3e96823ceb70e9a SHA512 bb669b659955ea62734f401c9745059349b23e6ddbca56e72437929b9527647ff7ac6bba4bb06506e4d8d35f3a1e7c4eacd2d5b1e7cb21098faa144c932f2bb0
-DIST c-stdaux-c5f166d02ff68af5cdcbad1bdcea2cb134e34ce4.tar.gz 13054 BLAKE2B 9a550b2eece549f9e7dbc6c69aa58b940e933106cca931a503c12220b3632bf1d48bcd1a2d6fa3a9f3e29e34fbd5bc11eba1751d05a9db40d0c2af21d8e1e066 SHA512 a138d9a8672d63537e6c082946777bdd62d651e837121bf180d5ad0591d12fe2b13fc63499da39a68d2e3ca8da6a0826701ae4807ea78d5a7604e9f2d28760ca
 DIST c-utf8-0837214a9780b7d771a3b3ce9a49196ac0a9d52f.tar.gz 9340 BLAKE2B 4bfa39c39aa8db8b7d797d78081b5f3104c659e2ceefef65aa2d3c03ffb5889d772cb78328473e3557c943b2487b7bcb7b68d7dc7f2b95940b0448b3479f1b23 SHA512 2df368af5023fac6c7f2e018c0cbfd73225bf1c4e0d0387931352909323175652bcd3739e9e6b76a099aea5d3f0290198aa70c69ecc5e9ef22df214f8c75da79
-DIST c-utf8-8a8f07d623492d4b45532527f945b118a2b4299b.tar.gz 9331 BLAKE2B f5b380da37ba0fcef7f8324777180683748639dbbcaf8b16dcc3432cf69b58caed7b93c2de0ef590876ae7c2ee9fa02a26d8ae94c1fc58281812ccd9b705eb17 SHA512 04a3e4e744ae50e9e06080b05d4ad8bb08ced945dc42625a4c47e47feccd2dbae1205555a8857c98f344357c28846cc5d7273bd5fe2e13f454c4d11ee1303b28
-DIST dbus-broker-28.tar.gz 216484 BLAKE2B 8d8dd9d15efa8c276d6db5c4f50320c7d18498c93205f9cda2bb849b781def17c387d5768ef62963024ee99f163ea1a72e457098612a9e6cac39238f3eac533e SHA512 d8b8e0c665e3c0e33f50da99330ff4cfba8107bff2c7e03a9653bd89f740e69ed1dce750c7f737c78454e07294821ff545007f3927f12d7f35f53339e4747791
 DIST dbus-broker-29.tar.gz 216639 BLAKE2B 94c8b7ea01367eae176d9411af064a960a054d6fbeb2bdebe9ba983d0938443abeb521f32e0eb9ae28155d5c5ebcf461317223387ccfad624ddd24e6bc8e227b SHA512 4c31b8c15f5d1ada0eb9c63c905c9fc9b3b8336beb533974b9c2b2a6a89c306b77d029d1ddbccbad873f62cc0d02cc373a090907dd19eae1a8a7fc2e3a4c2113
-EBUILD dbus-broker-28.ebuild 1830 BLAKE2B b12f4e076b1744abfb216f5e37f6fd5f589d43546ad3b652fa181671d3ccbc865cf300cf720d4aa89ee72794c61650adaeab104c2b9340f51ad23ef65c580ae2 SHA512 9bc28978b7c72b6b22790cec8335ee9450c09a7cb73e3b4083227cbf9124eeebb7870c575f64dd133163fb81d9776dd264759111a315f96bdf940ed49296b7bf
-EBUILD dbus-broker-29.ebuild 1842 BLAKE2B 08bab1715b6da38bbeac3ca7f3ec47d39da680bebb958a1c4d2435250842414542ebde00f558ce681c2d18ae406330fda5549e3fd787273fc6dcd465b4bd7f1d SHA512 905b42bb284cac7a025308a6bb78728f4c66ffe687ae7923dddf358e1be820308bad9ab7a6ff07e97c1ed3bce4c4a76c173c9503cacda3363f3b5d82d8e9671a
+EBUILD dbus-broker-29.ebuild 1840 BLAKE2B 0e21056b3ef0afc032120cae741d3726315c66b42551ad0ace86f9fea9e0730ef5b2bc065b06f42184f282ec2dc783d31969f2ecd9d13485de9492911393ed46 SHA512 8e033bddf399be99b7c06ce0590a5a285922eb1f79457146f172641d1650005856417cda9b7bb5f65331afe3c3532cbde323f0f695ad1ea5e021f4c417d71bb5
 EBUILD dbus-broker-9999.ebuild 1837 BLAKE2B 228f861cbd77eb330ae11d954191869b859f1734f9761ba68db9d5bf0bc5bd35b6b00120841b188f23e598026599b8fd446e0324f45411efb1c4a9b7fc785ef4 SHA512 ecad5c3a76d37243daed86f5fb34e3510f9d502199feb3c707b85073c0cda4577d96f7ede49ae81cee66266e47e243bdbc07f335caad6e7855c91fe21ae7759e
 MISC metadata.xml 328 BLAKE2B 8d8eea6a3d5e3309106ec3e6f248c4b5cad557ccd5095794bd153cd270c5f43de508363646afce491d5e6cc3bff1dca1ca024c2e87e656401432ac2d833cca90 SHA512 971b4214d0a9f9a68ca12a309096b7345014d2e0f57e85e6e10ff0a09b533d5cafe153fa8082ac01609e3417a31afc319cb285a822194c9c672a57ce316340c4
diff --git a/sys-apps/dbus-broker/dbus-broker-28.ebuild b/sys-apps/dbus-broker/dbus-broker-28.ebuild
deleted file mode 100644
index 0f00dd372abd..000000000000
--- a/sys-apps/dbus-broker/dbus-broker-28.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
-else
-	KEYWORDS="~amd64 ~ppc64"
-	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
-	declare -Ag SUBPROJECTS=(
-		[c-dvar]=eeb91604574f7c5b12b270f8355f7e6cf1720f4c
-		[c-ini]=204410a08d3a6c8221f6f0baf0355ce5af0232ed
-		[c-list]=f1eadf27377ef2f74b3cfd16185f54a219df2aae
-		[c-rbtree]=8aa7bd1828eedb19960f9eef98d15543ec9f34eb
-		[c-shquote]=83ccc2893385fcca1424b188f0f6c45a62f2b38d
-		[c-stdaux]=c5f166d02ff68af5cdcbad1bdcea2cb134e34ce4
-		[c-utf8]=8a8f07d623492d4b45532527f945b118a2b4299b
-	)
-	for sp in "${!SUBPROJECTS[@]}"; do
-		commit=${SUBPROJECTS[${sp}]}
-		SRC_URI+=" https://github.com/c-util/${sp}/archive/${commit}/${sp}-${commit}.tar.gz"
-	done
-	unset sp commit
-fi
-
-DESCRIPTION="Linux D-Bus Message Broker"
-HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="audit doc +launcher selinux"
-
-DEPEND="
-	audit? (
-		>=sys-process/audit-2.7
-		>=sys-libs/libcap-ng-0.6
-	)
-	launcher? (
-		>=dev-libs/expat-2.2
-		>=sys-apps/systemd-230:0=
-	)
-	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${DEPEND}
-	launcher? ( sys-apps/dbus )"
-BDEPEND="
-	doc? ( dev-python/docutils )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	if [[ ${PV} != 9999 ]]; then
-		local sp commit
-		for sp in "${!SUBPROJECTS[@]}"; do
-			commit=${SUBPROJECTS[${sp}]}
-			rmdir "subprojects/${sp}" || die
-			mv "${WORKDIR}/${sp}-${commit}" "subprojects/${sp}" || die
-		done
-	fi
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Daudit=$(usex audit true false)
-		-Ddocs=$(usex doc true false)
-		-Dlauncher=$(usex launcher true false)
-		-Dselinux=$(usex selinux true false)
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/dbus-broker/dbus-broker-29.ebuild b/sys-apps/dbus-broker/dbus-broker-29.ebuild
index 3016acfe03f1..b26194a37d38 100644
--- a/sys-apps/dbus-broker/dbus-broker-29.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-29.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
-	KEYWORDS="amd64 ~arm64 ~ppc64"
+	KEYWORDS="amd64 arm64 ppc64"
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
 	declare -Ag SUBPROJECTS=(
 		[c-dvar]=c8ea9712a94186512c22c32f32c421d6a2db6feb