gentoo auto-resync : 09:09:2022 - 22:41:02

6 files changed, 75 insertions, 91 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index cb6c30b8e2ff..7f1d28a56487 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index 3bbec643f4cb..621df86f053e 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,13 +1,6 @@
-DIST c-dvar-c8ea9712a94186512c22c32f32c421d6a2db6feb.tar.gz 25212 BLAKE2B 37f02df4f0a4c7372826cd9db37de883cf40027b12f72f0d43cf08f08682d90e6c7e8c3756f90a9e6184713c98e331ad2b2c9cd3373a148b05e2a3a2305db413 SHA512 c134892b43a1b572c45f0f24d7c9c7e70b1326c8bc896995b491d86271a000e83707e5d5eeff631b66be31f3980df7146cd18c385263a3a8bd07f30840cf829c
-DIST c-ini-204410a08d3a6c8221f6f0baf0355ce5af0232ed.tar.gz 13952 BLAKE2B 42c34e4ebe17d4c0904c395c72e56b0587c5f6b2cdf422cb800678844cf8516f9645718a04e9a10f6e747d1f56b2f1e563d1fa07db078e745761ae1e40ad395a SHA512 72eeaecbe0b9434b48d2ca9674dd1e722e612a730fd07ef27babb346a10ed7311b11c9d85f2aaf0cd84ddca7f926a78d76d066f453289bcbe849c4cacf72ec58
-DIST c-list-a0970f12f1f406a5578a5dedf3580cd682e55812.tar.gz 10124 BLAKE2B adb0face335aaa8206e597e404dcfea2b9d22035d4297442473918878ff9928ff5d614b20cb96de8a50c1418da83da5a49837c0677fe2a5f3db4e78cf3f2bfdb SHA512 51958b4c35acd84da89e694fc58a045b28d265f77043d302fe98f3507432363d20bfa611948fad37d0e5feb36b6232f742cde80e6243bafa3cd976c8b11cfc4e
-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-utf8-0837214a9780b7d771a3b3ce9a49196ac0a9d52f.tar.gz 9340 BLAKE2B 4bfa39c39aa8db8b7d797d78081b5f3104c659e2ceefef65aa2d3c03ffb5889d772cb78328473e3557c943b2487b7bcb7b68d7dc7f2b95940b0448b3479f1b23 SHA512 2df368af5023fac6c7f2e018c0cbfd73225bf1c4e0d0387931352909323175652bcd3739e9e6b76a099aea5d3f0290198aa70c69ecc5e9ef22df214f8c75da79
-DIST dbus-broker-29.tar.gz 216639 BLAKE2B 94c8b7ea01367eae176d9411af064a960a054d6fbeb2bdebe9ba983d0938443abeb521f32e0eb9ae28155d5c5ebcf461317223387ccfad624ddd24e6bc8e227b SHA512 4c31b8c15f5d1ada0eb9c63c905c9fc9b3b8336beb533974b9c2b2a6a89c306b77d029d1ddbccbad873f62cc0d02cc373a090907dd19eae1a8a7fc2e3a4c2113
 DIST dbus-broker-31.tar.xz 239520 BLAKE2B ba34308de7c598e72ac3874894fb90ebc6970840eb2fc193a2b3294033759b39d7d712695ddbc88c3b947842b0131e0a068ffe3cef616ce431d9a8c021f30593 SHA512 22fd53cff84e48ae1c11303b5340e16dc9b7124c9e562174c1f0af465c55d69bb8b2768063de281f6f791442126a29ab864ad6b8acf110247a500f6425eae5d9
-EBUILD dbus-broker-29.ebuild 1847 BLAKE2B 8d6fb46de8ff8d95c3ea0ec5e08ac4958cff7862d2db7db767d4e722fc5c3f736607b01dfdbb1f567701a38f9d20b33a8fd44684967bce8bac57fc5d63c9dc89 SHA512 779128c4987833c4773bf37d5c0d3716c2cd4e2d7c3933883b87d198155b29145485bba2ebc21dcd3fb25562613e6b577e2001a15b8c3b84711395e2b4bc26c1
+DIST dbus-broker-32.tar.xz 248196 BLAKE2B 511159673f0e3a2260e611b85b80719506e9eafe9d93d743891be664e4a79e3ade48f6ec047fa085c414087673290d6b958eec30d3b0d27048e2c1a1521d6c10 SHA512 aa23d058771f56e6378df0a17ac413813b6350b77e61128c0887f35a546f10534b1a6d598868e9f5c642244c3632a8ce5e315e6794305a56f5abbebd36bf822c
 EBUILD dbus-broker-31.ebuild 1142 BLAKE2B 8ad73709c37e5c7e6aa134cdafb5f9226114af6378fb90c32d2f8e509b2529377cbb3f51d3e49ddaef9bca544f5b1a368495059688d6c86a7d55d50b18f89f54 SHA512 07fdd1101c415cfbc43d9aa1ed51a9ff72db52ef1f5e8044d43af922f1d82e6c6c48c2b1eddbf6db85ae8266a25cdd4c897755d7711ab4e5ef7b9be16f511c5f
-EBUILD dbus-broker-9999.ebuild 1145 BLAKE2B 1921b4cd7bda537fecc3336c39e21378bf73ef2fa3820774bfa49ee9ca0a5a3895f2a538f00ef8a3f7c7ce35e00663887970a583443f69463fdd575896c0f3b7 SHA512 cfd7c4ebc82b1e70d56a9f1138c56115688bfe3e8d19d48f3089fb6c829037629d9b7f891a19554b1f5e5e541dd9f576257bbb7443ddb98a0496a7c29d3a19a9
-MISC metadata.xml 328 BLAKE2B 8d8eea6a3d5e3309106ec3e6f248c4b5cad557ccd5095794bd153cd270c5f43de508363646afce491d5e6cc3bff1dca1ca024c2e87e656401432ac2d833cca90 SHA512 971b4214d0a9f9a68ca12a309096b7345014d2e0f57e85e6e10ff0a09b533d5cafe153fa8082ac01609e3417a31afc319cb285a822194c9c672a57ce316340c4
+EBUILD dbus-broker-32.ebuild 1168 BLAKE2B 8b47edc4c79dfbfec304ea6507aae368f32f203f5dd851e95082f0eaed0bbc28abb82aee9c35ea318b3e43e3c3e79c229fe1e2fde318ee5a1ecaa53d0ec0a53f SHA512 ad9345d70303c62ecc7e692a5bcea503209fe8f21e73ac994f8e601c17069477b5113b0f65e756b490fadb9ae1ad31d938a6f8fc439601897285daa09c9f4040
+EBUILD dbus-broker-9999.ebuild 1168 BLAKE2B 8b47edc4c79dfbfec304ea6507aae368f32f203f5dd851e95082f0eaed0bbc28abb82aee9c35ea318b3e43e3c3e79c229fe1e2fde318ee5a1ecaa53d0ec0a53f SHA512 ad9345d70303c62ecc7e692a5bcea503209fe8f21e73ac994f8e601c17069477b5113b0f65e756b490fadb9ae1ad31d938a6f8fc439601897285daa09c9f4040
+MISC metadata.xml 383 BLAKE2B 514c4d227a434188b31db3a565dfe7275ffdfd30bcaf9caad098376567a5116ae2fe5d25bea89d6d267248f950264c20f75ec050d72013a3cd05b238218ee1f2 SHA512 ac7f7ee8e807284f16944c53b487a7eac3cfa47d0a11302f3cfcac5a58a6d339fc1892339730c34b51ddfccff714811a25faee135746c9e323b8385932c8f738
diff --git a/sys-apps/dbus-broker/dbus-broker-29.ebuild b/sys-apps/dbus-broker/dbus-broker-29.ebuild
deleted file mode 100644
index c9cca56ea57a..000000000000
--- a/sys-apps/dbus-broker/dbus-broker-29.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2017-2022 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 arm64 ppc64 ~riscv"
-	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
-	declare -Ag SUBPROJECTS=(
-		[c-dvar]=c8ea9712a94186512c22c32f32c421d6a2db6feb
-		[c-ini]=204410a08d3a6c8221f6f0baf0355ce5af0232ed
-		[c-list]=a0970f12f1f406a5578a5dedf3580cd682e55812
-		[c-rbtree]=8aa7bd1828eedb19960f9eef98d15543ec9f34eb
-		[c-shquote]=83ccc2893385fcca1424b188f0f6c45a62f2b38d
-		[c-stdaux]=8652c488b8f1c29629a5179d4551d0a691ae5901
-		[c-utf8]=0837214a9780b7d771a3b3ce9a49196ac0a9d52f
-	)
-	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-3.0
-		>=sys-libs/libcap-ng-0.6
-	)
-	launcher? (
-		>=dev-libs/expat-2.2
-		>=sys-apps/systemd-230:0=
-	)
-	selinux? ( >=sys-libs/libselinux-3.2 )
-"
-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-32.ebuild b/sys-apps/dbus-broker/dbus-broker-32.ebuild
new file mode 100644
index 000000000000..9345691d61b5
--- /dev/null
+++ b/sys-apps/dbus-broker/dbus-broker-32.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2017-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
+else
+	SRC_URI="https://github.com/bus1/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+fi
+
+DESCRIPTION="Linux D-Bus Message Broker"
+HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor audit doc +launcher selinux"
+
+DEPEND="
+	apparmor? (
+		>=sys-libs/libapparmor-3.0
+	)
+	audit? (
+		>=sys-process/audit-3.0
+		>=sys-libs/libcap-ng-0.6
+	)
+	launcher? (
+		>=dev-libs/expat-2.2
+		>=sys-apps/systemd-230:0=
+	)
+	selinux? ( >=sys-libs/libselinux-3.2 )
+"
+RDEPEND="${DEPEND}
+	launcher? ( sys-apps/dbus )"
+BDEPEND="
+	doc? ( dev-python/docutils )
+	virtual/pkgconfig
+"
+
+if [[ ${PV} == 9999 ]]; then
+src_unpack() {
+	git-r3_src_unpack
+	cd "${P}" || die
+	meson subprojects download || die
+}
+fi
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use apparmor)
+		$(meson_use audit)
+		$(meson_use doc docs)
+		$(meson_use launcher)
+		$(meson_use selinux)
+	)
+	meson_src_configure
+}
diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index cf73e0592faf..9345691d61b5 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -18,9 +18,12 @@ HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="audit doc +launcher selinux"
+IUSE="apparmor audit doc +launcher selinux"
 
 DEPEND="
+	apparmor? (
+		>=sys-libs/libapparmor-3.0
+	)
 	audit? (
 		>=sys-process/audit-3.0
 		>=sys-libs/libcap-ng-0.6
@@ -48,10 +51,11 @@ fi
 
 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_use apparmor)
+		$(meson_use audit)
+		$(meson_use doc docs)
+		$(meson_use launcher)
+		$(meson_use selinux)
 	)
 	meson_src_configure
 }
diff --git a/sys-apps/dbus-broker/metadata.xml b/sys-apps/dbus-broker/metadata.xml
index 4c5fa33d8b08..38ad8e3af8dd 100644
--- a/sys-apps/dbus-broker/metadata.xml
+++ b/sys-apps/dbus-broker/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Mike Gilbert</name>
 	</maintainer>
 	<use>
+		<flag name="apparmor">Enable AppArmor support</flag>
 		<flag name="launcher">dbus-daemon compatibility launcher</flag>
 	</use>
 </pkgmetadata>