gentoo resync : 24.12.2018

2 files changed, 22 insertions, 17 deletions

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index fa4bfb1ff94c..c5d969273715 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -4,9 +4,9 @@ AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e
 DIST dbus-1.10.18.tar.gz 1986589 BLAKE2B 95b8a04362e78001e723301e5f170e923bca8b7b1728e6a7658d606550923d2bd60a6a6916c0fcd88205ecdc4a25ab58309bdcabaeb32c2f6c5e4ef8686af02c SHA512 726f97d0a2016f4f0625ba332e93e2d33bb16857cd35cb6c79da0f44fff297df948c3df62c31ffbec34713a7b85b3ff5b65f31517fe3511ddbd3bf18bd4748ed
 DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5c73ac8a570e1e13f37f9d6b8c2aea2545b1a3979d3a94ce7a2ddda7280afde4ecd9b682d3d31355f82af217f7 SHA512 fc0b88b756affdb4fc7a62e84a6f7757121293afeadc38acf8aac48b6c2b82531e136a575be2ab503a39d7669cb7b609a021e20c1064e28c965c091e94c4f68c
 DIST dbus-1.12.10.tar.gz 2073510 BLAKE2B 27ecd31e2535666a06cb77ab8df4f4a0990e21d43bc9e18e62f2385b9c05515a2f7ea452d4a376ecb4f764379c05235c908cd6392303300b1ff14d9cfeb25554 SHA512 36a16393af6630c32474b971fb8864ded0fb5fe08c5ff5243a4ca312b95af4f20335c5f166b72526a0b8162c1ccfe6542ad6953c5d21a0542d920d7cb4a9ac76
-DIST dbus-1.12.8.tar.gz 2071751 BLAKE2B 9ba26d48f34b4d328335917bbc40d5f4423a48f90b0436783a8d6d290bc8b99c54aa31d23efaf52ef90748d53e68b7c0e3ddce0f4ce26ea5369acbd57d726b84 SHA512 8177898bf2db22e5c6abff0d9ffec8f248f0d155a83b7ae906c1ce3b61d289e7ba7bef9799102e6de3ca64198c7d293dccecf92c7e8b7403c1d9b1bb86e99ea3
+DIST dbus-1.12.12.tar.gz 2077301 BLAKE2B 6245559fc3419bfdca1bdb2da7f6f5a34e5377dc67e0c8ecb7a87914ea65d044a95be59b749d9cfef7008ad09854b549b86863ca987b8a3949cf0d58cc5a2cb6 SHA512 51af4e86ab7d36e1c9a861164e7cd7aa1605fdd82f90aed8728b34c45a87864a00671de9db00d88ea6f96be97459c7eb53d2517ea9d9687ae9ebf81c58c3a80f
 EBUILD dbus-1.10.18.ebuild 7366 BLAKE2B ec30593cceffe5a927529a64a895e4ab3913aacce6d9a6aeea54e613c38f4b557c81b7b3a7c968ce2f08e9d019f17d15c56dd4ab51b3014ed3f2d382328e14ce SHA512 1a8ee80dd263512afa76aeea6e0442b6c8fc58c69c6c3c04b760772d15964bbdc5ca4172af6bb5d5d1669514e56a4dedb73dc534f91e33609e2a85d3ec1167f5
 EBUILD dbus-1.10.24.ebuild 7373 BLAKE2B 21ad1bff164e2e67786c1e9b7f74c5c9772316429763bf2dc597c2c85fe6b3706d6f87c20cbfe55c0f297dc99342bc58c6b2ab7e443dfefe1d1b4652c9de3bff SHA512 b820553d81073c0bfd754c56014a40639d26ccf6a42c967f97c74c7c4d71be96b5b534f616caded46774d5d29693985fffdecde10d401f30803b39da4400aca1
 EBUILD dbus-1.12.10.ebuild 7439 BLAKE2B 16efc9593e81017f0240d83353a5c5ddfa164ac2025bede136db78fc01018a598ebb935489cad5a58b4d12b1c6e2db7937968eba891034a327a4a8db33023dcc SHA512 69e05a16ad00c4abd3ea535ce0b9c39ce9269285f859a782d30019a847293dcaed666a48ce0068e33d593b6ffc75bd90880a6c9cf487ec7727e239d46cf55a47
-EBUILD dbus-1.12.8.ebuild 7430 BLAKE2B 53a94a457042bbb44fa1f7838c73d51c5c806c8c54fe1bc4d00b28a5fca40b5c0e5a0fe92e22862435c242897ca3883f16d5bb5e0376da27f0def4a595d8aa2a SHA512 f8ceea6cbcfbcbc91940e01b15969a5d0095171ec92a9154c88d27712b91f2f4ff6bcbf19cffa45280824300cc3cfb7d59d8db9da4de590e35c695230ad68917
+EBUILD dbus-1.12.12.ebuild 7486 BLAKE2B 89d68d0d6ad86df6040c5bf447d122f70887f892a9f71daa246e481d2889ca43e68604f64077e1d3f71b7bab9de35efa2d174ab70fa0026a7bb54ba3ff02177d SHA512 863c3a121179fb631fa9e0c0bac534a836351b052d57179fff59ab1d5b545bede8e0bd7f71e9b9859b56ca2956e4d3420dc402b9256f9802e892a660aefe30af
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.8.ebuild b/sys-apps/dbus/dbus-1.12.12.ebuild
index e1fbd7884034..a11d0021b821 100644
--- a/sys-apps/dbus/dbus-1.12.8.ebuild
+++ b/sys-apps/dbus/dbus-1.12.12.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
-inherit autotools ltprune linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
+inherit autotools linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
 
 DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
 HOMEPAGE="https://dbus.freedesktop.org/"
@@ -19,7 +19,6 @@ IUSE="debug doc elogind selinux static-libs systemd test user-session X"
 
 REQUIRED_USE="
 	?? ( elogind systemd )
-	test? ( debug )
 "
 
 CDEPEND="
@@ -37,17 +36,20 @@ DEPEND="${CDEPEND}
 	app-text/docbook-xml-dtd:4.4
 	dev-libs/expat
 	sys-devel/autoconf-archive
-	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	test? (
 		>=dev-libs/glib-2.40:2
 		${PYTHON_DEPS}
-		)
+	)
 "
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-dbus )
 "
 
+BDEPEND="
+	virtual/pkgconfig
+"
+
 DOC_CONTENTS="
 	Some applications require a session bus in addition to the system
 	bus. Please see \`man dbus-launch\` for more information.
@@ -86,7 +88,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	local docconf myconf
+	local docconf myconf testconf
 
 	# so we can get backtraces from apps
 	case ${CHOST} in
@@ -163,12 +165,15 @@ multilib_src_configure() {
 	if multilib_is_native_abi && use test; then
 		mkdir "${TBD}" || die
 		cd "${TBD}" || die
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf "${myconf[@]}" \
-			$(use_enable test asserts) \
-			$(use_enable test checks) \
-			$(use_enable test embedded-tests) \
+		testconf=(
+			$(use_enable test asserts)
+			$(use_enable test checks)
+			$(use_enable test embedded-tests)
+			$(use_enable test stats)
 			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+		)
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
 	fi
 }
 
@@ -224,10 +229,10 @@ multilib_src_install_all() {
 	# let the init script create the /var/run/dbus directory
 	rm -rf "${ED}"/var/run
 
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
+	dodoc AUTHORS ChangeLog NEWS README doc/TODO
 	readme.gentoo_create_doc
 
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {