commit: bf804f20e7338502351895349f9f3e6d503b85c5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 14:06:48 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 14:06:48 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bf804f20
kde-plasma/kde-gtk-config: Drop USE=gtk3
It is no longer optional and patching is non-trivial (need moar ifdefs).
Upstream commit 87040960da7e9e587b4cb61251807e164aa53483
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../files/kde-gtk-config-5.4.2-gtk3-optional.patch | 19 -------------------
.../kde-gtk-config/kde-gtk-config-5.11.95.ebuild | 8 +++-----
.../kde-gtk-config/kde-gtk-config-5.12.49.9999.ebuild | 8 +++-----
kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild | 8 +++-----
kde-plasma/kde-gtk-config/metadata.xml | 3 ---
5 files changed, 9 insertions(+), 37 deletions(-)
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 e1e8de2b17..0000000000
--- 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.95.ebuild
b/kde-plasma/kde-gtk-config/kde-gtk-config-5.11.95.ebuild
index aa52af7a9f..13b77b96dd 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.11.95.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.11.95.ebuild
@@ -11,7 +11,7 @@ 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"
+IUSE=""
DEPEND="
$(add_frameworks_dep karchive)
@@ -26,21 +26,19 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
dev-libs/glib:2
+ gnome-base/gsettings-desktop-schemas
x11-libs/gtk+:2
+ x11-libs/gtk+:3
x11-libs/libXcursor
- gtk3? ( x11-libs/gtk+:3 )
"
RDEPEND="${DEPEND}
$(add_plasma_dep kde-cli-tools)
!kde-plasma/kde-gtk-config:4
"
-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
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.49.9999.ebuild
b/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.49.9999.ebuild
index 31dd0e9727..2b362704c5 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.49.9999.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.49.9999.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Plasma systemsettings kcm to set GTK
application look&feel"
HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git";
LICENSE="GPL-3"
KEYWORDS=""
-IUSE="+gtk3"
+IUSE=""
DEPEND="
$(add_frameworks_dep karchive)
@@ -26,21 +26,19 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
dev-libs/glib:2
+ gnome-base/gsettings-desktop-schemas
x11-libs/gtk+:2
+ x11-libs/gtk+:3
x11-libs/libXcursor
- gtk3? ( x11-libs/gtk+:3 )
"
RDEPEND="${DEPEND}
$(add_plasma_dep kde-cli-tools)
!kde-plasma/kde-gtk-config:4
"
-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
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
index 31dd0e9727..2b362704c5 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Plasma systemsettings kcm to set GTK
application look&feel"
HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git";
LICENSE="GPL-3"
KEYWORDS=""
-IUSE="+gtk3"
+IUSE=""
DEPEND="
$(add_frameworks_dep karchive)
@@ -26,21 +26,19 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
dev-libs/glib:2
+ gnome-base/gsettings-desktop-schemas
x11-libs/gtk+:2
+ x11-libs/gtk+:3
x11-libs/libXcursor
- gtk3? ( x11-libs/gtk+:3 )
"
RDEPEND="${DEPEND}
$(add_plasma_dep kde-cli-tools)
!kde-plasma/kde-gtk-config:4
"
-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
diff --git a/kde-plasma/kde-gtk-config/metadata.xml
b/kde-plasma/kde-gtk-config/metadata.xml
index cc0d264055..2fdbf33d96 100644
--- a/kde-plasma/kde-gtk-config/metadata.xml
+++ b/kde-plasma/kde-gtk-config/metadata.xml
@@ -5,7 +5,4 @@
<email>k...@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
- <use>
- <flag name="gtk3">Add support for gtk+3-based
applications.</flag>
- </use>
</pkgmetadata>
