gentoo resync : 12.08.2018

3 files changed, 15 insertions, 80 deletions

diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index 640fc6cf37fa..e9399688c163 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,18 +1,11 @@
-DIST c-dvar-7706828ecda2d8c508d6fc233dc9d198bab482ad.tar.gz 28454 BLAKE2B e109755fc3392f1c91820606af81852464a45b32ef43a9bce6fe32095f463336df8c5fe2410573830a1ac368d99d7e3da4cedb7e5ec89761459a5c6b9f54af11 SHA512 b6d69b11b3e47e8538c8eab04780966480db3881bf642f732b883f0b995ba374382fff54abe81eabe377d029445cc4af5bf52c8740282b0c03b959d8d5ae944d
 DIST c-dvar-f0a525477142f64c45b0be9393cc3b5dc3a6d6f9.tar.gz 26255 BLAKE2B 10941922212219f3b4c09306b8daf26cd921b078472c15db85205adcd65d503de5f58bc05eef3a2e60ca1485ebe44d282c2966ddd732d42ee092fe7880db5bbf SHA512 bf1593ca794ca973e8336954b527733f61c0bd389a729da32c84bc35ba6decea6434ea9728789e92f1663d2ec10cf3e4d4f50c8db907ed1566790214c40eaf5c
-DIST c-list-05bada3508c21027dbbbf1319f27ed65c7c03bc0.tar.gz 20726 BLAKE2B b9a4dd6d490136571600eeb790320986e8cd1e330772da28a6c5d7708f3f4026b5938369dc38827d8c19033feb254c58e155cb5c4359898be431cffb297fd393 SHA512 c9e5cdd30de45ead06565530eae996dd95712cb15880e33ae95bcc2a0ee65223177d1c46627f564eaf3edf13786410c870dec996a5103ea7ec02e280f0dbd650
 DIST c-list-071841c28d96e9104761af815a7ea367390c3174.tar.gz 24662 BLAKE2B d1d859d4c6c80540d984083c70b58fde62eed2074d942222d15430c475ee46280af098c2a4dbe00ccd81a80884432ae3043480f9a050cb73fe5c1675c0a3d6ef SHA512 de4fc5ed4d893b122ef320ad0323d44e616210fe590fedad8e38c3c3f8a6c0778178fb85e6e970913ff441f9b3e8861491f59fcef2c2c02ddf59120620d8cbe3
-DIST c-list-72c59181d677a3f50b201d51f190b1bff02d4279.tar.gz 20474 BLAKE2B e1459b064cf0bfd7656338b03f2f591b56308bab8541f72be0822a7849630d05d11c5f9df31753ae9cb6ca25389eef1e24a2e50791c81faea1d6e487bd06a46e SHA512 9f271160d1f3e40128ba158409730216c829060fa9f9844e7243826fd0219c3f678980eed5b8e15e13d65c6408b959bd47e07197791e06d03f6864fe9a9cf359
-DIST c-rbtree-825f626a16257c5f0b0c523c11ce1bca16851180.tar.gz 27988 BLAKE2B 9a6b47cee256e96c3cd7db1e3de684b7628427e90f3000cb69f7d177085322e37d8636b3d14d659c3619316e248ec9e970466b066491483c2e8787d1d8942d04 SHA512 649aff910fb38b49462f794fd908d6d6071c9b064ed8445255d674df2184277bd54ff04c2c1789b61585f377aa1fd611c4e241b5104641d60ae5ec803d675894
 DIST c-rbtree-ba0527e9157316cdb60522f23fb884ea196b1346.tar.gz 28400 BLAKE2B 35a0529bd262cbd8aa11228714ac331d7cd8202bd79165db4bebe5d5a1895adb58440d52edd7fcbfffb8d9a2f86c44d7642b0328ffae0bbcbdcd5c48999fdd12 SHA512 425c4525b7aead4f68ed401eefdff81b3fe1f444c76e934a67e0f18a3ba17b52bf3a1398879fa929d97186da7d4cb485618aec74b671145560ba251f5d24af8b
 DIST c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz 26702 BLAKE2B c67af60b180b80c358c94d43961423cd18b147ec98dd71fa9e858ae6b67ad29d1d1484816be9eff1ce5c7193aa22b7b754f4cc535888c2a62b88ea43155f71c6 SHA512 44fccf4509ad752f7ef8aef7e1afd62eb51660f2daba42f0ad8b1711a62ec53aa2bde78b895fbdd939ba9a1ba1fc06621c2506eb068948da4d6e7192cb8df29e
 DIST c-utf8-a77769a6c5b40c4a2e900cb4d1b59535696ef7e8.tar.gz 24767 BLAKE2B 064b2b7eabf8b23fcbd841a863c6c10c5079a534c5cdc9326486b2c5a0d754c86300c58edfb1fafc3972335fd3a90eeb0b8a14531d1f911ab3148c332fb48ed0 SHA512 d7e6b4162b452cd6e05bf9cdea039a7acbb02a1d72bc0197149745c9416b11ec394c0ea1363c72a3082931f0f738b34a11124d9e2aa962e83f4739e65e571065
-DIST c-utf8-cc67174f455c9196ebffc37b4d4f249da3dbc66f.tar.gz 21436 BLAKE2B d94c87a8ce99f3585da45678f36e59bbeded5d66f4cf7908da9fee3a4691fc704a0deefe66ddc3c7d8f653ec4bd7b2e8ed5892548a34930a10d1e5132f0954db SHA512 915258ea1d0f4e575c5f37746d34f98aebd6c9dd0c42e137f117dea1a8bbc895b775d9f9a6b2d91a6b008b095eb322332b3ec4d3de1a2333c8cbfcd7b89364b5
-DIST dbus-broker-11.tar.gz 160473 BLAKE2B b043709f5fcf18f27d0d76792c2f11f227764233d9362b65485fd76601f4cbabf4426065d6b2e659434a38b020901f2a8b3bdce86e8f5fef7acd8161df877c3e SHA512 c46f1739e289d82ef86d0d640c66f13ac97e10a483f513a4e6158e489ca1f05c45967131dd326a75f98d6b84e7891efcf605dde91ed73da4bfe2f076fcada56e
 DIST dbus-broker-14.tar.gz 179880 BLAKE2B bce75a5dacef22166c244151a1960119b1fb853357ffcdf5adf523223ed5a7beb2173fa872983cb1672c6fa2713e0a36916d7ff2ae6251c19bc0ec4ccc4e917d SHA512 7313a30facf2e64e98ac9d5e109b4ea2d5d0ad70bb4b82edd168ad7a7188b17710651b870827ae4d3b88db6dfdd41d4e9d0becea12307c481a581bfb524b572d
-DIST dbus-broker-9.tar.gz 155810 BLAKE2B ebb64f35303de988ea081b6dc9186a53317c5e610ca826afc4243191148f6d8d7038d6aa6f94bdd7b5225ebd2f2d93394d467605e5f878617becfd487ad0dfb6 SHA512 4eed5dede2ba6d45b883b1a484d59b774655063334611413e165558cb1e2efb21a5e17a182e836ae43cbfbfd366737c709d53ed0b9ec29ba3a9cd3718b29ec40
-EBUILD dbus-broker-11.ebuild 1959 BLAKE2B 1036ae55a30b7052a269494f1b7a30983e34ca312031f2e7f59f69e92cdf63dcf753f98edf46d7a93a6ae98e45d9cde260df70e21305dcb0757eb9c1ddab0072 SHA512 b11c2accaf059da089d98fd29b9b88ce39ce9a558bd31f721ccdf0a0d47a60ac73953dde929ee5bcd0ea6f9bffc7cc35de77387de0dc9436a4eef8a8a2701d03
+DIST dbus-broker-15.tar.gz 181175 BLAKE2B 94a51451e17e898d2c83b49c2d5415fc97ae38d035464268a9036e980fc5de6c65a436c2c019f92d1244a57a620b4dd3c3cccb2681afc26047e124b41c15ddcd SHA512 efb54ec7bc1918918794b106066219d9367cbaffa777ca9b3809af2d5c42c704dd4255cfb69e93afdb0f4db2d1a9adcbd491998201057ad656754908b177e1d6
 EBUILD dbus-broker-14.ebuild 2081 BLAKE2B 978622f99b77458cc54661f7a64b3986eb6775a556a5f66cb206a498570c7454e2f6dd74075792d5eea13490ad681df893cdd06f67a1902c08446f8b8400b951 SHA512 eca7c81a3c5b08c4488dd06245ab76a5dca3078ae26135188719a38da2916f2b9a0bc728511bea352ee2b7b4570c695bcedcc8e2a7bc4b0fc0ee652266921d03
-EBUILD dbus-broker-9.ebuild 1823 BLAKE2B a9060cc64329fc18816ac961d0ea4a11894f031ffc2c98ca301cc4f19472523c3d124850fe5ef33b897fdbf11006d3d4f9f71d8032abef7c5c12adfb0b17dc9a SHA512 04978b559c3f7178e2f909c33450b7160bf249de10483f952ebb1b6b6893dabea3c98854daec1b3318af817cc16516d4dc7cbf51f6cdc146b32fc076e86c9425
+EBUILD dbus-broker-15.ebuild 2081 BLAKE2B 978622f99b77458cc54661f7a64b3986eb6775a556a5f66cb206a498570c7454e2f6dd74075792d5eea13490ad681df893cdd06f67a1902c08446f8b8400b951 SHA512 eca7c81a3c5b08c4488dd06245ab76a5dca3078ae26135188719a38da2916f2b9a0bc728511bea352ee2b7b4570c695bcedcc8e2a7bc4b0fc0ee652266921d03
 EBUILD dbus-broker-9999.ebuild 2081 BLAKE2B 978622f99b77458cc54661f7a64b3986eb6775a556a5f66cb206a498570c7454e2f6dd74075792d5eea13490ad681df893cdd06f67a1902c08446f8b8400b951 SHA512 eca7c81a3c5b08c4488dd06245ab76a5dca3078ae26135188719a38da2916f2b9a0bc728511bea352ee2b7b4570c695bcedcc8e2a7bc4b0fc0ee652266921d03
 MISC metadata.xml 327 BLAKE2B baaa6c7be634d16ffbe1196a29bcc2254c77d857dd1b807d50dac7adbd3d20370bf55ac0ea8f60b0fb160bf9ae69d42a5002b4150c4b22c101b37ecab96028a2 SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1
diff --git a/sys-apps/dbus-broker/dbus-broker-11.ebuild b/sys-apps/dbus-broker/dbus-broker-15.ebuild
index a21aaabdae9f..f3dd9cd82a47 100644
--- a/sys-apps/dbus-broker/dbus-broker-11.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-15.ebuild
@@ -10,10 +10,10 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
 	dvar=f0a525477142f64c45b0be9393cc3b5dc3a6d6f9
-	list=05bada3508c21027dbbbf1319f27ed65c7c03bc0
+	list=071841c28d96e9104761af815a7ea367390c3174
 	rbtree=ba0527e9157316cdb60522f23fb884ea196b1346
 	sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
-	utf8=cc67174f455c9196ebffc37b4d4f249da3dbc66f
+	utf8=a77769a6c5b40c4a2e900cb4d1b59535696ef7e8
 	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-list/archive/${list}/c-list-${list}.tar.gz
@@ -29,11 +29,16 @@ HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="audit +launcher selinux"
+IUSE="audit doc +launcher selinux"
 
 RDEPEND="
-	audit? ( sys-process/audit )
+	audit? (
+		>=sys-process/audit-2.7
+		>=sys-libs/libcap-ng-0.6
+	)
+	doc? ( dev-python/docutils )
 	launcher? (
+		>=sys-apps/dbus-1.10
 		>=dev-libs/expat-2.2
 		>=dev-libs/glib-2.50:2
 		>=sys-apps/systemd-230
@@ -59,9 +64,10 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		-D audit=$(usex audit true false)
-		-D launcher=$(usex launcher true false)
-		-D selinux=$(usex selinux true false)
+		-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-9.ebuild b/sys-apps/dbus-broker/dbus-broker-9.ebuild
deleted file mode 100644
index 62c8053832d1..000000000000
--- a/sys-apps/dbus-broker/dbus-broker-9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
-else
-	dvar=7706828ecda2d8c508d6fc233dc9d198bab482ad
-	list=72c59181d677a3f50b201d51f190b1bff02d4279
-	rbtree=825f626a16257c5f0b0c523c11ce1bca16851180
-	sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
-	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/c-util/c-dvar/archive/${dvar}.tar.gz -> c-dvar-${dvar}.tar.gz
-		https://github.com/c-util/c-list/archive/${list}.tar.gz -> c-list-${list}.tar.gz
-		https://github.com/c-util/c-rbtree/archive/${rbtree}.tar.gz -> c-rbtree-${rbtree}.tar.gz
-		https://github.com/c-util/c-sundry/archive/${sundry}.tar.gz -> c-sundry-${sundry}.tar.gz
-	"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Linux D-Bus Message Broker"
-HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="audit +launcher selinux"
-
-RDEPEND="
-	audit? ( sys-process/audit )
-	launcher? (
-		>=dev-libs/expat-2.2
-		>=dev-libs/glib-2.50:2
-		>=sys-apps/systemd-230
-	)
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="${RDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	if [[ ${PV} != 9999 ]]; then
-		rmdir subprojects/{c-dvar,c-list,c-rbtree,c-sundry} || die
-		mv "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die
-		mv "${WORKDIR}/c-list-${list}" subprojects/c-list || die
-		mv "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die
-		mv "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die
-	fi
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-D audit=$(usex audit true false)
-		-D launcher=$(usex launcher true false)
-		-D selinux=$(usex selinux true false)
-	)
-	meson_src_configure
-}