sys-apps/dbus-broker: bump to 21

Package-Manager: Portage-2.3.71, Repoman-2.3.16_p24
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

3 files changed, 108 insertions, 26 deletions

diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index f8b4b61ed607..80f851b42da9 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,8 +1,16 @@
+DIST c-dvar-7c0833f9cae446163077b204b2296287bbee7c67.tar.gz 24727 BLAKE2B e18de53ac8014e77cffbcd9c71230847db0055e43e54b5cdfc3f48367570878b34d6fc7c299e4312708455ef2fa4ddff9fa5b48b603a05d6fbe28ce84e5e5906 SHA512 a006bdfc8a5a8e9a803ffa29f152858cb699cbf0e59d4f0550a4736ad29f85cfdef6bd8ef3cfbe8770045c76ed092db00c7338d62a8b0cd54ae5bd03f1c8b422
 DIST c-dvar-9fcd89593f8b7fb5c9f1c32f0b82f518eda4be46.tar.gz 36281 BLAKE2B 4a1ee57e1aeec5010bd5b84d355aa94a923dc6e03f5cd1b58db3af9b64f15e9e565a0930e9e1d8ca79602ac7e366a3231ed66d7a2429b0ff769e0c3428742493 SHA512 b77ce063fbaf92d3ee4462eb440229870fe3bb41ea3d02e79502cca48eb8983da4f8e3d6fa29fb2f066879af0d7e9166e0105ca56d1ff12d47f2592f2be1b2e2
+DIST c-ini-847c55f5b3d33baa47af9a1286175d58b34f91d5.tar.gz 14094 BLAKE2B 49ac949d4fc46ec63f253d48921be0acd585b3d301d56144e9477baaf81a0cfb3fb5f0706d1673c921962d1bbbeb89b2d83e07dba9265dff7b1f57da6059eaef SHA512 eec3a4d2a3e1a4d9d65385b2e3cfd87dfb482b365731bc15f989faa59fb7f2c6e88abcef6612f3718817b1d1953f12fcc9981fc36b01fa82d3146305e24eaa16
 DIST c-ini-979a18fdd59f05f927d6cdf624d8ded6f81c6776.tar.gz 26116 BLAKE2B 23d6feca93bd48905745c8ab0ae5798be315e79fe189e1f8d181922db0a2cfc9cbef8e250796bdabd46fe8cd434010912ddffbe280f99a0967a6ef0ef68e263b SHA512 a17f1202ee019814251d0d4225ce41fad471cd7d40f2f0c1f80415562019305cdc98f903f37e47a1493f7d135b656210b61b0718a0d19d65ecbb0d24496e785a
+DIST c-list-2e4b605c6217cd3c8a1ef773f82f5cc329ba650d.tar.gz 9383 BLAKE2B 70f8ed083a784a08da3b5d5fe75709cf9dcbaaee523ab9b1cd3b36931f5bb0c1e920cc38561c002f4de2efeda7b4edaf9b5fb9411f0fcd8aa1055ab966066789 SHA512 4db91e8af837d6739b9becbc2b405300e2006a82e39c01ade015eabf39ba550dc38879e800fd415bc5fa4ac220090cfdfa3a13d4f748a1278e51544c4a6183be
 DIST c-list-dda36d30c7d655b4d61358519168fa7ce0e9dae9.tar.gz 21457 BLAKE2B cec1ffbc7591479c8a7b1fbbfbef69a8dfc8b756a864f31910202967be431027d85191b4f412f04507152d5d81113e3668ab1e22319547607d21a139f75ea4a5 SHA512 0b0add65248cd17a5d3c52adf3f709ce8a7c5739f153516fb9577b0a44b709242b3571637efbaa0f78f0afba2691ec0993561b1fb643df4d1eb6a45167f50473
+DIST c-rbtree-b46392d25de7a7bab67d48ef18bf8350b429cff5.tar.gz 26065 BLAKE2B ec5486b2e1b9b835a3aac42b9f87275bbdbc73cdb0698304db01a80f0d52bf542b8df56d6e58bd98cbceccee9418d7115e90605c8077ac8670b6326304806c9e SHA512 8177c111390f8491a3b535ec5a3b8de13a3b9d0358166494e503d68bd5748dae0cd2b092b0311258be885ecbeee2bb83a2389d9734bc28e4f78e85de3ed9b3f5
 DIST c-rbtree-bf627e0c32241915108f66ad9738444e4d045b45.tar.gz 37838 BLAKE2B 5c40f444f43cb2f76c60fbd3ecedfb084ca39e90db9a297d630f6ca8ef931e52917e1ef1bd310d1024b003a37214d6549dce6f3d2b49f9b7e1f19441d04c64fa SHA512 6ac8e0eb7b704e2dfd1b69f9dd20ad08d490d13bcf7198d30825d5c8fb20d001998df3e5beece7346a1bda4341c900f63e3c67da9648ea8492607851946a1265
+DIST c-shquote-34e1e25299fb82ab9fd0c8bfd8a66010ead1497b.tar.gz 10824 BLAKE2B e2cc32acdb83a9d2c759d5068ef69feb4b0fbcdf908bbce08c9229c26dc1d1d421e522b844232328b62af851ebb93cbdc282be04b26ec04e327eb59e9e5173c7 SHA512 8f5ae3554239d42ec50b093f81b13715a55215b406a2000853da5a8581a11650ba1020f06eb8f7551d0ec372e786ea6cc56c2c803d0fc86d016db69895b391eb
 DIST c-shquote-b7e325c7ff098787f2937dd91597677374f038b6.tar.gz 22764 BLAKE2B 9fd0c7e17c7dc3614748e54125bc04d34c03c97f6ee148c66e2398827872e005aaff3326fdca32e01efcc04efdcc735059070e50fb0b5a5a6cef80e271110fde SHA512 1403bcc57f45df33509d7e9c03e964cbdbc5bb8dc3c853e6fd6bcebe304bf7c21e4f887ed471cd9cb4a8aa6000d7017e8ae02adfdbb43cdeac6415a15f29fa40
+DIST c-stdaux-11930d259212605a15430523472ef54e0c7654ee.tar.gz 13215 BLAKE2B f8022583c224e911ecf65f10f1ada2ae631f0dca1c0306c113a2ad1b6a996ff4fa45eba14fafa5146feabebef0ae9e275a46fa0bb78af454fc37e49c465c7e3f SHA512 7c0a5d1266462482674f9fc98ba19af65566d638e7a407969de9ccb66d5884692e0562c16b37e64269919e5c0d0c2a8ffd147e88159b9226f1bb738d460b78b8
 DIST c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz 26702 BLAKE2B c67af60b180b80c358c94d43961423cd18b147ec98dd71fa9e858ae6b67ad29d1d1484816be9eff1ce5c7193aa22b7b754f4cc535888c2a62b88ea43155f71c6 SHA512 44fccf4509ad752f7ef8aef7e1afd62eb51660f2daba42f0ad8b1711a62ec53aa2bde78b895fbdd939ba9a1ba1fc06621c2506eb068948da4d6e7192cb8df29e
+DIST c-utf8-34f5df0f4b28fc7ea6747680a432e666047082e4.tar.gz 9480 BLAKE2B 206d1b74a187e56cc1dbc6a657eb0935cbc4bf5344d4567b5aa99f0f3c559eb442e6ba2f05647f6fff1244874d64aca36062ddd290e368c4ca933802046165d8 SHA512 5b6c0de7d5b3f2a563442ca139ee1ca788a137cb0f5eede6c6e190e748dbe39b3489a2446682e1049dd6c91fdafff7743c819113eaedf370f4c3b1a28e97b22a
 DIST c-utf8-b245df543717ee19ad398f8139447e3807c11c96.tar.gz 21611 BLAKE2B 17ae3aa209361629e02ddd8d2725da85cf54c06d8c27ff706d736b130a854711efbeacce87f4cc20703dbeb8479efc6c4e67e9196d65b0f92e41a67a6d0cf987 SHA512 c868587efc0d14ff13525edcb4149f84fb9ac7a4cd7ef5e29fed9f374436c36ff318d54a4d2555874ec06ec60b40eb6399ada1fb32daa023727694d0a4a6190d
 DIST dbus-broker-18.tar.gz 190294 BLAKE2B 0af9646183ac0942b5137a93ee2d1ccfcb7e59c34ef17566c52afa51f0b4b408a8f8a5864865528c12a448a7dc08a6ed1fc50e187b28023e0955b20788a52844 SHA512 fa175fb64b70e9c46ad6527bc0c3793929b1813cca81e55c358a09fd997de33bab3fc430ef943b9d57eb5cf66dfa52f42cb94a0d3a465ceba37ee78b1c0bd33d
+DIST dbus-broker-21.tar.gz 203390 BLAKE2B 9024c5545b4a09ce43ef44f7bc78ceb52407047f88f73575c60b5ddd6f4fa188c0f65c23d787c91679d1ab2a07f8e19fa06b8a1b60b327a0cc8d79a6006ba50e SHA512 527a8b5f27458a6443c7a5ad33ac39e4e31b32348a3b4cfd6679acd9de635add272f182fe8f72b493e0812ff6e07523a35e53507f3656d05b56705ed8a00e643
diff --git a/sys-apps/dbus-broker/dbus-broker-21.ebuild b/sys-apps/dbus-broker/dbus-broker-21.ebuild
new file mode 100644
index 000000000000..20cbb6de4c14
--- /dev/null
+++ b/sys-apps/dbus-broker/dbus-broker-21.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2017-2019 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"
+	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
+	declare -A SUBPROJECTS=(
+		[c-dvar]=7c0833f9cae446163077b204b2296287bbee7c67
+		[c-ini]=847c55f5b3d33baa47af9a1286175d58b34f91d5
+		[c-list]=2e4b605c6217cd3c8a1ef773f82f5cc329ba650d
+		[c-rbtree]=b46392d25de7a7bab67d48ef18bf8350b429cff5
+		[c-shquote]=34e1e25299fb82ab9fd0c8bfd8a66010ead1497b
+		[c-stdaux]=11930d259212605a15430523472ef54e0c7654ee
+		[c-utf8]=34f5df0f4b28fc7ea6747680a432e666047082e4
+	)
+	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 )
+	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-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index 12db86f7f160..20cbb6de4c14 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -9,23 +9,22 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
-	dvar=9fcd89593f8b7fb5c9f1c32f0b82f518eda4be46
-	ini=979a18fdd59f05f927d6cdf624d8ded6f81c6776
-	list=dda36d30c7d655b4d61358519168fa7ce0e9dae9
-	rbtree=bf627e0c32241915108f66ad9738444e4d045b45
-	shquote=b7e325c7ff098787f2937dd91597677374f038b6
-	sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
-	utf8=b245df543717ee19ad398f8139447e3807c11c96
-	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz
-		https://github.com/c-util/c-dvar/archive/${dvar}/c-dvar-${dvar}.tar.gz
-		https://github.com/c-util/c-ini/archive/${ini}/c-ini-${ini}.tar.gz
-		https://github.com/c-util/c-list/archive/${list}/c-list-${list}.tar.gz
-		https://github.com/c-util/c-rbtree/archive/${rbtree}/c-rbtree-${rbtree}.tar.gz
-		https://github.com/c-util/c-shquote/archive/${shquote}/c-shquote-${shquote}.tar.gz
-		https://github.com/c-util/c-sundry/archive/${sundry}/c-sundry-${sundry}.tar.gz
-		https://github.com/c-util/c-utf8/archive/${utf8}/c-utf8-${utf8}.tar.gz
-	"
 	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
+	declare -A SUBPROJECTS=(
+		[c-dvar]=7c0833f9cae446163077b204b2296287bbee7c67
+		[c-ini]=847c55f5b3d33baa47af9a1286175d58b34f91d5
+		[c-list]=2e4b605c6217cd3c8a1ef773f82f5cc329ba650d
+		[c-rbtree]=b46392d25de7a7bab67d48ef18bf8350b429cff5
+		[c-shquote]=34e1e25299fb82ab9fd0c8bfd8a66010ead1497b
+		[c-stdaux]=11930d259212605a15430523472ef54e0c7654ee
+		[c-utf8]=34f5df0f4b28fc7ea6747680a432e666047082e4
+	)
+	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"
@@ -35,7 +34,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="audit doc +launcher selinux"
 
-RDEPEND="
+DEPEND="
 	audit? (
 		>=sys-process/audit-2.7
 		>=sys-libs/libcap-ng-0.6
@@ -46,7 +45,8 @@ RDEPEND="
 	)
 	selinux? ( sys-libs/libselinux )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+	launcher? ( sys-apps/dbus )"
 BDEPEND="
 	doc? ( dev-python/docutils )
 	dev-python/docutils
@@ -55,14 +55,12 @@ BDEPEND="
 
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
-		rmdir subprojects/c-{dvar,ini,list,rbtree,shquote,sundry,utf8} || die
-		mv "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die
-		mv "${WORKDIR}/c-ini-${ini}" subprojects/c-ini || die
-		mv "${WORKDIR}/c-list-${list}" subprojects/c-list || die
-		mv "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die
-		mv "${WORKDIR}/c-shquote-${shquote}" subprojects/c-shquote || die
-		mv "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die
-		mv "${WORKDIR}/c-utf8-${utf8}" subprojects/c-utf8 || die
+		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
 }