[gentoo-commits] repo/gentoo:master commit in: sys-apps/dbus-broker/

[Mike Gilbert]

commit:     f2a132239e469b0b52d1cd60a085fdacbbf1151c
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 02:48:49 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu May 12 02:48:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a13223

sys-apps/dbus-broker: update live ebuild

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/dbus-broker/dbus-broker-9999.ebuild | 37 +++++++---------------------
 1 file changed, 9 insertions(+), 28 deletions(-)

diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index 83f7734dc680..628f0de368a5 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
@@ -10,21 +10,6 @@ if [[ ${PV} == 9999 ]]; then
 	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]=9e1a5b4363aaece7169df2b2852944a1434b2df5
-		[c-ini]=43f379396a320940d0661c15780f618f84d29348
-		[c-list]=b1cd4dbf967d73b24dfe6cc56aaf3fdd668692e3
-		[c-rbtree]=fa97402c3faa18c2ddd8325eb66e2bd58a224477
-		[c-shquote]=1d171fe52c23944c3c0be1f2603595f2488a9ff8
-		[c-stdaux]=d6ecce8afbb7703e1469cc5e7a59a8bd32e2d4a4
-		[c-utf8]=1f7e2ff1164bd2161cb480532b2b34cb2074bde1
-	)
-	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"
@@ -36,14 +21,14 @@ IUSE="audit doc +launcher selinux"
 
 DEPEND="
 	audit? (
-		>=sys-process/audit-2.7
+		>=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 )
+	selinux? ( >=sys-libs/libselinux-3.2 )
 "
 RDEPEND="${DEPEND}
 	launcher? ( sys-apps/dbus )"
@@ -52,17 +37,13 @@ BDEPEND="
 	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
+if [[ ${PV} == 9999 ]]; then
+src_unpack() {
+	git-r3_src_unpack
+	cd "${P}" || die
+	meson subprojects download
 }
+fi
 
 src_configure() {
 	local emesonargs=(