gentoo resync : 11.05.2018

6 files changed, 7 insertions, 7 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index f4b7ca42e4ae..52d19811c811 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 145bbc4b07cb..27a3c34536ce 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-desktop-5.11.5.tar.xz 8534060 BLAKE2B 3d3405c5ed1b85cad172c6c5f92c4da9a9204e901a3f3f3e4a581f20726881baeb086df71cc9d7df36715f809856f9fd01487497543efa7d3a28be206381b29c SHA512 328b6a75def1343c87cc783dd9cf6fcbd17a000f5ef7d28f2d558225a38de6d879767335036c97743d1f6ea029c9b932671dec8436d0bdba5a0f27b1afdd82a7
 DIST plasma-desktop-5.12.5.tar.xz 8558436 BLAKE2B ecd8a0ce7532dadde5f435e4c620333572b30e50a5003493495784bb31f7e9a4c1b0b1a023290b0443fa90ee7e663fefb9854016bb8eb5a03f82f879d6522fc6 SHA512 d19f8d640304bc1ffa0839e8ba453ddea76710f26fe580789c64e1b97d2a67c151ec62b2d0503fc35ad31cb8da4ef1125f3154e366b7f2bb4b8fb9bb2e0a6abb
 EBUILD plasma-desktop-5.11.5.ebuild 4372 BLAKE2B a5353650f3eec32961ba02cbdb16afd389767a69c9b50cf0971e3a05bbc74d09dc606fa9c7946d15b69396c8a3b809e1ffda365f6d32c7019a772719ba4817fb SHA512 8c578b6c7602ed9b4e3fe16687cf04960a29e6821d5773b6760fe676ff5587b30c2b619faebce69141cd4454a15bbadc02308ee2bc56906730d831927189099a
-EBUILD plasma-desktop-5.12.5.ebuild 4331 BLAKE2B 3408266b840dd79a7eaeae9717ee7212e45ee6cbed7ca8c7ed8c9f375078e2711e8a0313af99522f1d606ae8a8b429dc6f5e332e650119485b6366d630148418 SHA512 c151d70e784175edd121ad4011ab90063998e752e53a62f1abeca31c834746e70257f5a968872fe0f52f2b84dcd1496563854973fa4bbc5839fb7e873479ed8d
+EBUILD plasma-desktop-5.12.5.ebuild 4373 BLAKE2B 582459258d212c96eed6d294f2c1ead0cdbc3c717e86cc9b6cb7f6ce076fee251ba8011f47727e7c0ab14af9b5fd68784b54a0064e1332824bdbbe56853d644b SHA512 e5f973247ecdc8cb42288610b8c389a4cb58ff6f214f415fd85fd596c8bd399e2f4ef451e3d5912e872548f8ac182d05ca1bc7f6270f6386f86dd342f1d6061b
 MISC metadata.xml 936 BLAKE2B 36f03184c29147611b8db767332ac26008ede1379844401486b1a9c0b82118c88a63d03c4260601069adc4b3e73d9e7087fd947c99b4e834dfc3aeea5347eb0a SHA512 cbdfc40a4ec80d01d0fd11e695259e4525347f4294a4ff786be7b863b4c679daea38187e1a8eac0239396ccea84ef83c5a7cc18dce387829edc69096e29041f8
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.12.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.12.5.ebuild
index f0fe29cc991b..649b3d4be611 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.12.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.12.5.ebuild
@@ -140,8 +140,10 @@ src_configure() {
 }
 
 src_test() {
+	# parallel tests hang, bug #646890
 	# needs D-Bus, bug #634166
 	local myctestargs=(
+		-j1
 		-E "(test_kio_fonts)"
 	)
 
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 15dd1199e99f..dabacf2d6aff 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -6,5 +6,5 @@ AUX 50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla 308 BLAKE
 DIST powerdevil-5.11.5.tar.xz 392664 BLAKE2B c348dd3258a9724f0f4b79dd20e7bc4b96d6e1a062322c07b6f86c20c36319b723b9ab1fcb622b7e55001ab79db24e91b1c8f7baa5b84706bb3fab79835ba445 SHA512 8d3658b5cfe53fbe43880f6ca2346edcfb715975798b20d2059267b4daa47511fe9fb17a5b9882c21b75f80a57763a434373607a79594684fb044aae39cd0fb3
 DIST powerdevil-5.12.5.tar.xz 382664 BLAKE2B f94788e91455dcf17340f1b3041f15db218481360e5d0979d0a785acedd74378ea195610a9b01457f06259176db998e328c2d05cb67d706d456b671bf6a110e4 SHA512 e40342c5565276671c9752b071c84b1c5d648c8c8c56dd127bc57d690be28518cd5782809ffe0253bbb1241034c14652ea29880c1ba0266e1df300e771a4d117
 EBUILD powerdevil-5.11.5.ebuild 2252 BLAKE2B d4f9db9d39cbed2225803934c83bb9449187002ed76aff2770990a5f583c8ec7cb184a0db0c4f68e9b17637dfb9dfdfc4f83614705825e9e7341a38cb9a47c1a SHA512 d3405de703cf20d706014e9207157f029a10412cf8763db86840923b68966e3e8ff20ec5618dbbc4d022b5d8eb70eb4dedb9ae785811871d84054ac6014d1672
-EBUILD powerdevil-5.12.5.ebuild 1788 BLAKE2B 340f9d5dc53957dbe0a3097b28393ecd7ed9af90c73c037d896afa94c3d59ce58011ac9c7070d97f89505ebe4a2c153256c84aac5eb70de5b998c3871b8dd0f7 SHA512 ae488943f2012b8c5b4a87181492665fc62cfdd3f6fbf183f84cbdd00dd5074fe9ba5a8156d51ecc8ee6d5581b22b22987b26860b6e7bca19ae6ec03afb52801
-MISC metadata.xml 642 BLAKE2B 51a6b9a3c4cd0040241ac6be1b9669d7b7b77bda831ddec18380fb4f2b1af4072d0ede8281d3b05da41a6744db95b588dde3efccd4b339e289aee053645231c1 SHA512 870a09abe650b373cd7a4050308fbcc83da772acaf615c36232701fe53835f8bf9d4d092259da42417f97387ed2b37f19d4f4fffbec31087dfa7188bb8bb7056
+EBUILD powerdevil-5.12.5.ebuild 1704 BLAKE2B 4bdc0745eac643a9cc4671736d1e0eb0a054c360c63587f823ecdc2941717697a1e5ff1c793713a11c35574e2b0d56860eeb45fac11fb9653838a18687db09c7 SHA512 dd1e730e8af4c771326521707272cbef59c3914405a01f4841569a06af203825689e273d8a5a15ce6b100b4ad65eb105f00de6a3d1917f6a93822fafa0106353
+MISC metadata.xml 534 BLAKE2B 97d15a7a27a14bea3c3301845fa9fced477357f50b4c507c469be325b427559e3740d2b2242de37c6e5139244ef2ca5ae7e89746cb0f1cbbf45725973e53ff57 SHA512 5bb040940f1c41b842305cdc4b25a3422fd0b4252009006f1c149081c56ebb4e234fe59bc5e1de593854c8846f9b1f890ba4ad54c160b9d381ad45b35a831c5e
diff --git a/kde-plasma/powerdevil/metadata.xml b/kde-plasma/powerdevil/metadata.xml
index 35e126c72166..86d83ec7bd61 100644
--- a/kde-plasma/powerdevil/metadata.xml
+++ b/kde-plasma/powerdevil/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="brightness-control">Enable screen brightness control using <pkg>app-misc/ddcutil</pkg></flag>
 		<flag name="consolekit">Enable <pkg>sys-auth/consolekit</pkg> support instead of logind session tracking</flag>
 		<flag name="wireless">Enable wireless energy saving actions via <pkg>kde-frameworks/bluez-qt</pkg> and <pkg>kde-frameworks/networkmanager-qt</pkg></flag>
 	</use>
diff --git a/kde-plasma/powerdevil/powerdevil-5.12.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.12.5.ebuild
index ed23ce04aed6..e072de3d3b22 100644
--- a/kde-plasma/powerdevil/powerdevil-5.12.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.12.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Power management for KDE Plasma Shell"
 HOMEPAGE="https://cgit.kde.org/powerdevil.git"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="brightness-control consolekit +wireless"
+IUSE="consolekit +wireless"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -40,7 +40,6 @@ DEPEND="
 	$(add_qt_dep qtx11extras)
 	virtual/libudev:=
 	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil )
 	wireless? (
 		$(add_frameworks_dep bluez-qt)
 		$(add_frameworks_dep networkmanager-qt)
@@ -59,7 +58,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_DDCUTIL=$(usex brightness-control)
+		-DWITH_DDCUTIL=OFF
 		$(cmake-utils_use_find_package wireless KF5BluezQt)
 		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
 	)