gentoo resync : 29.05.2018

5 files changed, 3 insertions, 86 deletions

diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 1cbff5b1f845..cb663b40623e 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,6 +1,3 @@
-AUX kde-gtk-config-5.4.2-gtk3-optional.patch 578 BLAKE2B 7e528903187c1cd4e8f3edf4d3b7234d5e944761740a1d6ed1b0bf7b34375781e9c4b2a283f544614ce07c71131698dc6cbd6f7e6066cbcef7d6f8fc2f902d13 SHA512 f4cfdae004dd0c6d26eca2b46a1d28bded9576c3488320b4436742020835ac5029a163f7e5859542d087181e07651b66777cb3199d79c1aa1fac682edbf20617
-DIST kde-gtk-config-5.11.5.tar.xz 159700 BLAKE2B 3de3d056f47cedc7d04191853a7642e783d8e03af60a5198e9dc3f8eb49d14f2422324972a1e3569816df36869c19c1d34bfb5e7c0ce9bf20b8543c26029ab20 SHA512 bcaf0e8c6495fa2418caa92e4fa30f6369b7ed6d45ed288a6f4d071661cefad9240e990c57727aa709e398c1947a4caa6bcf77f3ef53c24127a5696186c989df
 DIST kde-gtk-config-5.12.5.tar.xz 156896 BLAKE2B 72a8b5430bffd08bc7714ca65bc2eacd757862b207300a35c451f311afb183cc5c1cd189cb73cea60784c16bfb2aa23ad53c4195d39e39e1ae2f13ee23784576 SHA512 bd433166e65d65c0978ed01d2f1a891a2ea8fdcc2687af0eb02bd593c87ba05f33361623b4a984dc752c0a5cc88e1d68093bd28bd32f79370fa66835b13c1698
-EBUILD kde-gtk-config-5.11.5.ebuild 1355 BLAKE2B c4b16ad68736ba32664ea01fdda00bd66ca2836669346f17373c61ac379e2c4aa46b8fdb03df1225e205159fe3101c12977e9418a9b4edf806bbc30ce4a41b5d SHA512 9ed7f5bf17eb3408d632860a9062180f567f2cb10d572f122b094cca866c02f830195dc5d26bb7a75f14271d3b22a064e7fe38251d6fd27101ca0185a4df1acd
-EBUILD kde-gtk-config-5.12.5.ebuild 1252 BLAKE2B 53346784e40f4baa8c87034d3eaf5387048c53425ceab197024d453d3d946908630674993d1fa3f2a2beb3ba0a496fabb2e42c2309828769369384a7ff8e7390 SHA512 e017069f6ae2fb5595255e799cadc83e90b4ba3342e741ae2775d08a05e2585127764ab032b5b4a205dd3f8955678206968754bdc2ab7d432eb975c6147ead38
-MISC metadata.xml 333 BLAKE2B fe2211e8c1798fa7f3d3863ca5182a360f3ce2c5091f57c6ec14cd64733c1bb16a15fb57007e19502a2fca7761a54f0aeb2f228df10d23db3ee1e9a4911e1283 SHA512 ce7ff5491e0b8e230a07d5170efa584645eeb59b83f5e446569d230ba1b7e86e0419648fb11d91d81dcbe96139524b2371ad9b9266d1b97f147784674c64c326
+EBUILD kde-gtk-config-5.12.5.ebuild 1251 BLAKE2B 89caef72d7afc767b8e7fe245f01cc87b4b31306c6cee36654a3e9f147d6419a0d3677fd996883e0ab22ef8c8e56496ebacc0900df1f1d6baaf99ac9c3e66aaf SHA512 aaf94b4008e155657afbd6aefe358d4fefcff2c329da066fdd3fdf2897c21bee03b42526c1e3d0496d2b06dd80328c02024ef9b1fb67b40911c86175dcf4fa5e
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.4.2-gtk3-optional.patch b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.4.2-gtk3-optional.patch
deleted file mode 100644
index e1e8de2b1748..000000000000
--- a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.4.2-gtk3-optional.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/CMakeLists.txt	2015-10-02 22:36:55.186480671 +0200
-+++ b/CMakeLists.txt	2015-10-02 22:38:40.048169719 +0200
-@@ -17,6 +17,7 @@
- include(ECMSetupVersion)
- include(ECMInstallIcons)
- include(ECMMarkAsTest)
-+include(ECMOptionalAddSubdirectory)
- include(GenerateExportHeader)
- include(FeatureSummary)
- include(KDEInstallDirs)
-@@ -62,7 +63,7 @@
- install(FILES kde-gtk-config.desktop DESTINATION ${SERVICES_INSTALL_DIR})
- 
- add_subdirectory(gtkproxies)
--add_subdirectory(gtk3proxies)
-+ecm_optional_add_subdirectory(gtk3proxies)
- add_subdirectory(icons)
- add_subdirectory(tests)
- 
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.11.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.11.5.ebuild
deleted file mode 100644
index f0e2cdc22482..000000000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.11.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
-HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+gtk3"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/libXcursor
-	gtk3? ( x11-libs/gtk+:3 )
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/kde-gtk-config:4
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-5.4.2-gtk3-optional.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
-		-DBUILD_gtk3proxies=$(usex gtk3)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	einfo
-	elog "If you notice missing icons in your GTK applications, you may have to install"
-	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
-	elog "for example."
-	einfo
-}
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.5.ebuild
index 8275ffca8ae6..e43fd2b58da3 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.5.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
 HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kde-gtk-config/metadata.xml b/kde-plasma/kde-gtk-config/metadata.xml
index cc0d26405581..2fdbf33d963d 100644
--- a/kde-plasma/kde-gtk-config/metadata.xml
+++ b/kde-plasma/kde-gtk-config/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Add support for gtk+3-based applications.</flag>
-	</use>
 </pkgmetadata>