gentoo resync : 24.02.2018

4 files changed, 12 insertions, 12 deletions

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index f4a77ff6b161..3a777265087d 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -6,7 +6,7 @@ DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5
 DIST dbus-1.12.2.tar.gz 2063143 BLAKE2B 0618381befb7af7d4e0c2f1d9e32ee7ee70f17905783e414ab47acd7dcf5993329e430869a6cd9de33cc5919c880fed73eb1246d3ac2929c3d50d331efc92ca7 SHA512 523698ae543a4f1d9142898351ed38827882a3ca583ca7934676af48d09219ea562ae77d734cd142e5ca0d5e74f9e8d0fdeb1019592ca3524e2b690c6283f7cd
 DIST dbus-1.12.4.tar.gz 2067402 BLAKE2B 621a9223c9d20a76415935d421a506100bbdf4852dc3c2a4f221750f739757a4945d60cb4a1f9032602f2993b868b502e7eb1835c8d2764666902c01daa01ba5 SHA512 ca9f7c76f705aca0f71366627fadf8b5c68992d5bcb6fae1746a8c14e9dc93c4492e80c63b6fd522b8753ec264df046e33482a5ce20be82adf181a6dd69b36a5
 EBUILD dbus-1.10.18.ebuild 7511 BLAKE2B 723c6e71e73b4ed5c3b2a664da5b00fd37efca9103e96e19ca0e0a58482e3e60ddc3325c1ad50b2cf58862ea2f1f1ea9944c3a7093a729f3a712b3e4e42255a3 SHA512 1623a683105edaf9f495b18ca770ff788e528302a50235fe584b9eab2b91cd655a5ed0eb3b3e60ca810382a7637a7bdfa736b8b1129a86e56e4040bb16a4d81b
-EBUILD dbus-1.10.24.ebuild 7400 BLAKE2B 427844c3730c2c4ad0fb3fcbdc3f4daa759762d8d402ed27d90e96bc3add483eccb1864a30b600e5c53260488c2346bf49d2d476f650fe5319ded8fa26619e3a SHA512 4bede00f1cee6da6680303d989331773838530783921d0ffa8a7d2b1876a4856d2b6db13fbf38dbd66ab8f40375cc7e10648ee6d1ef0948781ed9d04793485ba
-EBUILD dbus-1.12.2.ebuild 7447 BLAKE2B b69f8902777f70dbcb638a81455f20e979d097eb143b84f6fb390b170126879a9dd9a78867d834dd3a74e5ad5da5d3a1d43536257661722962cd8581ee669b08 SHA512 24293ab30ea439ff6869b55592a6bb45fb12a3110edb33a4429578faa41195b10dd1cba4ba8390afc43584c3723f66ffd8610b5a8e9fdde1dc61485d29fb3459
-EBUILD dbus-1.12.4.ebuild 7447 BLAKE2B 2ba5b8880e6224b726e1b29b233542874fe90ff72d0a4a79df3415a63ce66f013f06462aec960f7ce071b5bc47395dd084b4a6b1d29fc2a0d2032d79f6ca56b0 SHA512 d745021ef16d3de72b7aaf0b3c29c0df8d8505acf151c658ae8922be21191b88635a306dc56fd808e9b0515061e1212d411823b233434d4fb8111a907e039758
+EBUILD dbus-1.10.24.ebuild 7393 BLAKE2B 35ef55bb33062bebbd00fb69a2399e5a170708b66aca3d99a6977d217f2c35afa80bad1afe31f9d2482ca496ed2ce14c9a5a291e3f32fa63a7acbec718e3e6bc SHA512 09b0a0f9bc3729c6833b068211ca76332a65bf47a28a50d3bfdaa386adfab41004c4cff81cf8cc677a7a72521cffca03092d858819d9fc7acb633b5cedcc463c
+EBUILD dbus-1.12.2.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
+EBUILD dbus-1.12.4.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.10.24.ebuild b/sys-apps/dbus/dbus-1.10.24.ebuild
index 4a700ffad463..a7c2766ec442 100644
--- a/sys-apps/dbus/dbus-1.10.24.ebuild
+++ b/sys-apps/dbus/dbus-1.10.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc elogind selinux static-libs systemd test user-session X"
 
 #RESTRICT="test"
@@ -234,8 +234,8 @@ pkg_postinst() {
 	# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
 	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
 	# dependencies with hardcoded paths (although the known ones got fixed already)
-	dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
-	ln -sf "${EPREFIX%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+	dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		local plist="org.freedesktop.dbus-session.plist"
diff --git a/sys-apps/dbus/dbus-1.12.2.ebuild b/sys-apps/dbus/dbus-1.12.2.ebuild
index d795c5b67e5b..d53c2a80ec6f 100644
--- a/sys-apps/dbus/dbus-1.12.2.ebuild
+++ b/sys-apps/dbus/dbus-1.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -236,8 +236,8 @@ pkg_postinst() {
 	# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
 	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
 	# dependencies with hardcoded paths (although the known ones got fixed already)
-	dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
-	ln -sf "${EPREFIX%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+	dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		local plist="org.freedesktop.dbus-session.plist"
diff --git a/sys-apps/dbus/dbus-1.12.4.ebuild b/sys-apps/dbus/dbus-1.12.4.ebuild
index cfd65c2af31b..d53c2a80ec6f 100644
--- a/sys-apps/dbus/dbus-1.12.4.ebuild
+++ b/sys-apps/dbus/dbus-1.12.4.ebuild
@@ -236,8 +236,8 @@ pkg_postinst() {
 	# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
 	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
 	# dependencies with hardcoded paths (although the known ones got fixed already)
-	dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
-	ln -sf "${EPREFIX%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+	dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		local plist="org.freedesktop.dbus-session.plist"