gentoo resync : 29.10.2017

3 files changed, 79 insertions, 8 deletions

diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index ae8009673b21..fb3980227ab1 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,8 +1,12 @@
+DIST c-dvar-7706828ecda2d8c508d6fc233dc9d198bab482ad.tar.gz 28454 SHA256 07377af5a5ab46e2c1cca5c7a7c743a9e9e34c68b1409c70e7c9b654c9b88f51 SHA512 b6d69b11b3e47e8538c8eab04780966480db3881bf642f732b883f0b995ba374382fff54abe81eabe377d029445cc4af5bf52c8740282b0c03b959d8d5ae944d WHIRLPOOL 9d0af964224e28d62f598355c9c9e477db957a5991e9ed077c1d3b4c586604004ccf4477c5e024c1d220ad7e978dacb93099e1cc5955fd5758a2c1d4a4139645
 DIST c-dvar-e1c94e3c3c42ca9bcb336ccd7c3693bcd330c6fc.tar.gz 28449 SHA256 9004cb8073292beddf6ad410ad029c447d2732a8f2cf5243b0b43538e5f70d33 SHA512 a752a5d8c67c97d672502e814c6930c60d9588f7f77f38a6d027dede71c11cb18e7debcf10fa2f405a117123af386944bb7cf70c90504aed874056c8de1fab05 WHIRLPOOL 2510dabf7273f68c78487cdd354be184181fbdecfc3a15dd32093cece56924c6c83bec2be569d27c2dbc30fd1f87dcd24b131b68c383cfe04a11f507d6cfb769
 DIST c-list-9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574.tar.gz 20459 SHA256 5ed9fc0286507a08f4e4aeae436be45ee05d0c071c1d8418fa77ed777e2f5a25 SHA512 d45630c8a54ca9145862b673afc3a15a19d330f46c9a1eb451c2282c2701d596cead45e6bb57a9e32aab344a3732f70ff8fe27d13065ebd8b402dd37a252ad05 WHIRLPOOL 21fc689d1d7551bfc957e83630ad81b5093b8e67c3c754e2b4173681829f78835ef7fcc94f46c34f7379c21ebdb96ebc83cd50d4e816a25179c60274c9c0c2e0
 DIST c-rbtree-6181232360c9b517a6af3d82ebdbdce5fe36933a.tar.gz 24927 SHA256 5831113e793af5e583cc7844a8961b05ded70dc487877b64bbbf0fef0869c711 SHA512 4ff8d8def07882850b1983f8eb9b4c82e444429beafbf249385717805a5a89427bb91bde6dcfb60565866f90ee3daa8d35e681ab65cb0a1f20dcb96dcd9e0756 WHIRLPOOL 5c8d42a9601362197ba890bc056d46b3cf7f0a99dd07189fd2c1c037a339b58726e5929b7e22d0c960ad6ba380f134b2040fb32aa9da2a95fbe192d3c8f575e0
+DIST c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz 26702 SHA256 4041b610d0bae181ce8998ccba5114f7caf19269d108ded28c778022b94bbbd8 SHA512 44fccf4509ad752f7ef8aef7e1afd62eb51660f2daba42f0ad8b1711a62ec53aa2bde78b895fbdd939ba9a1ba1fc06621c2506eb068948da4d6e7192cb8df29e WHIRLPOOL 58b22aedf2c15224acf23a2a5bbb89673ed28097b655f5ed4b503b12cb0f5db5026b2d8df79970d1cbaa088bf37fc0d45b8be169b6edb9d040658f47f6da2458
 DIST c-sundry-644ea3c2ce5b78d2433c111694f5d602d1aa7fa9.tar.gz 26611 SHA256 9ebf3f9e90004b7483d71bf41e2786586e0b192feb1d397536730b0d2304c7cc SHA512 503da82b8cea9eddffbea70ce05c8a6b2684a90a104f6df46a5183ab46844543db1d02e8aaabc4e5d50aa21e239af147309fa9abed5f13cb751bcee310c8234a WHIRLPOOL beff440ecfdff3d636710ab197d73cd628ba3615d6890540ea5014d0fcc318353f083b0d4885a88d3fef502c0fbf801fac7bacaaf0cb4939a7b4251b838309d9
 DIST dbus-broker-4.tar.gz 148231 SHA256 165fab697e0f9ef66588688758edb601c89b65ee3240d462cc278f0755c6e122 SHA512 d4c9974e730d0b6374edb2afb6f928f35e3912f7d5d7d908429581e235ebc013dbab1bd0f0c446547d2a960e762868e2d98ab1cd3ff5e1169240f3e6886236d8 WHIRLPOOL e25075a2cee78bc0be56267a9140a0392bf12ed69c23ea3a8f0b9f8abdc9f86581428a7dbcb8afffa9fba8f03e9b588f896e95ecd53a8317c51030cd94940192
+DIST dbus-broker-7.tar.gz 150606 SHA256 7114ef715b9ea18fea3ed0994e50fa8c0468451f3a1c4d4abaeaa67eeda73fe0 SHA512 529d5b6de402185336eeafb37d70f3fafe19a059c6b766f173eb17c375d3b298871bf7ba36ec3a27cc9e32c1af2669715d9707ac3fdd43f8f8cb8f24740f8c74 WHIRLPOOL a416466e6ac7cfadbddb77ee91a53131da15129451ef5dfe60155a516f402661812143248c25365223b5e0bcf5c88d58323f79c053026ff3b38d74a57de2e1cd
 EBUILD dbus-broker-4.ebuild 1878 SHA256 9b9f020a5f8a76aa6cf85f1889ee74ea4d8ee9b2f021a3d34ba509ace5b871bd SHA512 ab9a8ba244c13c3e836675a841ebbbe2cceb0df0389f5ec2541f04464bce0f74beb31f5eb033e7df7bf918091bc66cf9195e315e7a35d6f4411729c3979eaac3 WHIRLPOOL c80aeb18dea1e256f676df572f189c21b26a82510918105796c91ff4810c036d6003f9655ae431f4b8ea784c9ec22fdc2f02193781c2a49bf140b4dd448b20f9
-EBUILD dbus-broker-9999.ebuild 1878 SHA256 9b9f020a5f8a76aa6cf85f1889ee74ea4d8ee9b2f021a3d34ba509ace5b871bd SHA512 ab9a8ba244c13c3e836675a841ebbbe2cceb0df0389f5ec2541f04464bce0f74beb31f5eb033e7df7bf918091bc66cf9195e315e7a35d6f4411729c3979eaac3 WHIRLPOOL c80aeb18dea1e256f676df572f189c21b26a82510918105796c91ff4810c036d6003f9655ae431f4b8ea784c9ec22fdc2f02193781c2a49bf140b4dd448b20f9
+EBUILD dbus-broker-7.ebuild 1887 SHA256 7c1e3840e589756eceb30bf683564a4cc2a9e25df7b1cdae2d531f9a9583e708 SHA512 68eb24dbfcc75d32953258a6d2fc91254872407a6b5f2bac03a8b3d6d2998c2cfba829890b5495bcb406b7c9d52898f59a36668f4827332472573775340bdcf8 WHIRLPOOL 4befbbdb2cf31246adec47b774448b7b3a7d8144e935c4de9c6a994dacb95a88f40b3cf09efd77c8905ae07552506a411859d42e774f8af2115fa2da7d678c3e
+EBUILD dbus-broker-9999.ebuild 1887 SHA256 7c1e3840e589756eceb30bf683564a4cc2a9e25df7b1cdae2d531f9a9583e708 SHA512 68eb24dbfcc75d32953258a6d2fc91254872407a6b5f2bac03a8b3d6d2998c2cfba829890b5495bcb406b7c9d52898f59a36668f4827332472573775340bdcf8 WHIRLPOOL 4befbbdb2cf31246adec47b774448b7b3a7d8144e935c4de9c6a994dacb95a88f40b3cf09efd77c8905ae07552506a411859d42e774f8af2115fa2da7d678c3e
 MISC metadata.xml 327 SHA256 555a246c137ae0586dc4f3be05f103eba8415e7cd8aafe2336c5b9b659493d8e SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1 WHIRLPOOL 6de0c19b78e79898cd78488c3f9d780f26684dea03924ce8efcd532ddf25cc5e1e82477d2069fd0c53f796ce46d0a1348e4a2128dfca0b764102fab35937404c
diff --git a/sys-apps/dbus-broker/dbus-broker-7.ebuild b/sys-apps/dbus-broker/dbus-broker-7.ebuild
new file mode 100644
index 000000000000..ba718173881c
--- /dev/null
+++ b/sys-apps/dbus-broker/dbus-broker-7.ebuild
@@ -0,0 +1,66 @@
+# 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=9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574
+	rbtree=6181232360c9b517a6af3d82ebdbdce5fe36933a
+	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 test"
+RESTRICT="!test? ( test )"
+
+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
+	test? ( >=sys-apps/dbus-1.10 )
+"
+
+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
+}
diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index a71009e17e72..ba718173881c 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -9,10 +9,10 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
-	dvar=e1c94e3c3c42ca9bcb336ccd7c3693bcd330c6fc
+	dvar=7706828ecda2d8c508d6fc233dc9d198bab482ad
 	list=9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574
 	rbtree=6181232360c9b517a6af3d82ebdbdce5fe36933a
-	sundry=644ea3c2ce5b78d2433c111694f5d602d1aa7fa9
+	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
@@ -40,19 +40,20 @@ RDEPEND="
 	selinux? ( sys-libs/libselinux )
 "
 DEPEND="${RDEPEND}
+	dev-python/docutils
 	virtual/pkgconfig
 	test? ( >=sys-apps/dbus-1.10 )
 "
 
 src_prepare() {
-	default
 	if [[ ${PV} != 9999 ]]; then
 		rmdir subprojects/{c-dvar,c-list,c-rbtree,c-sundry} || die
-		ln -s "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die
-		ln -s "${WORKDIR}/c-list-${list}" subprojects/c-list || die
-		ln -s "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die
-		ln -s "${WORKDIR}/c-sundry-${sundry}" subprojects/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() {