kde-misc/kde-gtk-config -> kde-plasma/kde-gtk-config

5 files changed, 126 insertions, 2 deletions

diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index b10c5b2f5d28..40d19e60ce4b 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,2 +1,3 @@
+DIST kde-gtk-config-2.2.1.tar.xz 86472 SHA256 9c890d7e39ab6ebfad13c5453051f0759cb61beac9f7fc2df7e331c9a4415c85 SHA512 24623b5f668cb7d5dd46b96bcd0ee1ba4f2c9068995716f6658c2bdf8a41a81d76848cf63c1749d3ff365ece0399d4a54e98be4d03f992d49a04616e26f1baeb WHIRLPOOL 49f0186c6a265eef8aa8972a77502b34bc130fd2df04faab4145c6b181ab80fdefc2b9ca7d2d7979c89a5b57e36b8d0787c986e584bd6f332915316d73c07802
 DIST kde-gtk-config-5.7.5.tar.xz 147732 SHA256 3603055a4821a0aa4250a42261004b4384b53c337ee201d03e494bb18e9602e5 SHA512 88635c51a41a5a47351fa77483ad76c27b3881be28124e53fe0e4fc571dff1596c41e61d22a3e842a81180e9e3f955d8206dfc332965f84be20e47295142ffcb WHIRLPOOL 28231cbc4ac576b8b3d059e9b17faef099b103784386c0f54a6c86a1ccecebc500183fb200a438383c36211a49171b48096b0ce0218598746aed7662d847009c
 DIST kde-gtk-config-5.8.3.tar.xz 149984 SHA256 6d548f2143c0f7f2624aa857cb54c79a40cdb868942f68ab487eac86fef47d78 SHA512 247b8a07f077adc767b727b58406dff1148e9e21b695e98d63ef34c0590444933f0120a035a9e9df9e74570132f72f317396c7b7c6a68765733c5e1600286720 WHIRLPOOL 593998e11325e3cde9a9c6bfffbf11fd55ef877c6e24f27d5c6edbb7553cd844f0002d013e20598c98e832e0450327588ea59f306a17d85e1cca144c2ee6db82
diff --git a/kde-plasma/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch b/kde-plasma/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch
new file mode 100644
index 000000000000..86c8b4c32582
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch
@@ -0,0 +1,79 @@
+From 386f6af25a4f5276765a121f98dd00d0bf6a743d Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 26 Jul 2015 17:04:43 +0200
+Subject: [PATCH] set proper cmake min req, matching kdelibs4, before project;
+ fix build accordingly
+
+---
+ CMakeLists.txt             | 2 +-
+ gtk3proxies/CMakeLists.txt | 2 +-
+ gtkproxies/CMakeLists.txt  | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0ef2243..9d77fcd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,5 @@
++cmake_minimum_required(VERSION 2.8.9)
+ project(kdegtkconfig)
+-cmake_minimum_required(VERSION 2.6)
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+ 
+ find_package(KDE4 REQUIRED)
+diff --git a/gtk3proxies/CMakeLists.txt b/gtk3proxies/CMakeLists.txt
+index 856a3f6..d43597e 100644
+--- a/gtk3proxies/CMakeLists.txt
++++ b/gtk3proxies/CMakeLists.txt
+@@ -2,7 +2,7 @@ find_package(GTK3 REQUIRED)
+ 
+ include_directories(${GTK3_INCLUDE_DIRS})
+ 
+-add_definitions("-DDATA_DIR=\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"")
++add_definitions(-DDATA_DIR="\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"")
+ 
+ add_executable(gtk3_preview preview3.c)
+ target_link_libraries(gtk3_preview ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} ${GLIB2_LIBRARY})
+diff --git a/gtkproxies/CMakeLists.txt b/gtkproxies/CMakeLists.txt
+index 9821cbf..18ee2d5 100644
+--- a/gtkproxies/CMakeLists.txt
++++ b/gtkproxies/CMakeLists.txt
+@@ -6,7 +6,7 @@ add_executable(reload_gtk_apps reload.c)
+ target_link_libraries(reload_gtk_apps ${GTK2_LIBRARIES})
+ install(TARGETS reload_gtk_apps RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}")
+ 
+-add_definitions("-DDATA_DIR=\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"")
++add_definitions(-DDATA_DIR="\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"")
+ 
+ add_executable(gtk_preview preview.c)
+ target_link_libraries(gtk_preview ${GTK2_LIBRARIES} ${GTK2_GIOMM_LIBRARY})
+-- 
+2.4.6
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,6 +47,4 @@
+ add_subdirectory(gtkproxies)
+ add_subdirectory(gtk3proxies)
+ add_subdirectory(icons)
+-find_package(Msgfmt REQUIRED)
+-find_package(Gettext REQUIRED)
+ add_subdirectory( po )
+
+--- a/po/CMakeLists.txt
++++ b/po/CMakeLists.txt
+@@ -0,0 +1,14 @@
++# The pofiles macro creates in some versions same name targets
++# which since cmake 2.8 leads to target clashes.
++# Hence force the old policy for all po directories.
++# http://public.kitware.com/Bug/view.php?id=12952
++cmake_policy(SET CMP0002 OLD)
++
++find_package(Gettext REQUIRED)
++if (NOT GETTEXT_MSGMERGE_EXECUTABLE)
++MESSAGE(FATAL_ERROR "Please install msgmerge binary")
++endif (NOT GETTEXT_MSGMERGE_EXECUTABLE)
++if (NOT GETTEXT_MSGFMT_EXECUTABLE)
++MESSAGE(FATAL_ERROR "Please install msgmerge binary")
++endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
++
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-2.2.1.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-2.2.1.ebuild
new file mode 100644
index 000000000000..a28e70ef1bcd
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-2.2.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia cs da de el es et eu fi fr ga gl hu id it ja kk
+km lt mr nb nds nl pl pt pt_BR ro ru sk sl sv uk zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
+HOMEPAGE="https://projects.kde.org/kde-gtk-config"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-3"
+KEYWORDS="amd64 ~arm x86 ~x86-fbsd"
+SLOT="4"
+IUSE="debug"
+
+CDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+"
+DEPEND="
+	${CDEPEND}
+	dev-util/automoc
+"
+RDEPEND="
+	${CDEPEND}
+	!kde-misc/kcm_gtk
+	$(add_kdeapps_dep kcmshell)
+"
+
+PATCHES=( "${FILESDIR}/${P}-kdelibs-4.14.11.patch" )
+
+pkg_postinst() {
+	kde4-base_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.7.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.7.5.ebuild
index e3a9a65cfa23..b199a37dfad1 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.7.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.7.5.ebuild
@@ -34,7 +34,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	!kde-base/kde-gtk-config:4
-	!kde-misc/kde-gtk-config
+	!kde-plasma/kde-gtk-config:4
 "
 
 PATCHES=(
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.3.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.3.ebuild
index 581afc8ee1e4..a460448ab0bd 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.3.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.3.ebuild
@@ -34,7 +34,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	!kde-base/kde-gtk-config:4
-	!kde-misc/kde-gtk-config
+	!kde-plasma/kde-gtk-config:4
 "
 
 PATCHES=( "${FILESDIR}/${PN}-5.4.2-gtk3-optional.patch" )