From 027b31c4fdec87ae2548c4bfea631cf5c9b1fd08 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 29 Jul 2018 10:49:00 +0100
Subject: lxqt-base/lxqt-meta : allow a vanilla lxqt build, without Redcore's
 patches that change the default platformplugin

---
 lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild   |  9 +++++++--
 lxqt-base/lxqt-meta/lxqt-meta-0.13.0.ebuild       |  6 ++++--
 lxqt-base/lxqt-session/lxqt-session-0.13.0.ebuild | 12 +++++++++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild
index 0bb4c209..a2a1d5a5 100644
--- a/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-0.13.0.ebuild
@@ -9,6 +9,7 @@ HOMEPAGE="http://lxqt.org/"
 
 SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
 KEYWORDS="~amd64"
+IUSE="+gtk"
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
@@ -39,8 +40,12 @@ RDEPEND="${CDEPEND}
 	x11-apps/setxkbmap"
 
 src_prepare() {
-	epatch "${FILESDIR}"/"${PN}"-hide-unwanted-appearance-settings.patch
-	cmake-utils_src_prepare
+	if use gtk; then
+		epatch "${FILESDIR}"/"${PN}"-hide-unwanted-appearance-settings.patch
+		cmake-utils_src_prepare
+	else
+		cmake-utils_src_prepare
+	fi
 }
 
 src_configure() {
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.13.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.13.0.ebuild
index 3faec4f4..38d4501c 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.13.0.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.13.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://lxqt.org/"
 LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+about +admin +branding +compton +filemanager +gtkstyle +icons +sddm +lximage minimal +oxygen +policykit
+IUSE="+about +admin +branding +compton +filemanager +gtk +icons +sddm +lximage minimal +oxygen +policykit
 	+powermanagement +ssh-askpass sudo"
 REQUIRED_USE="oxygen? ( icons )"
 DEPEND="!!lxqt-base/lxqt-common"
@@ -32,7 +32,9 @@ RDEPEND="${DEPEND}
 	branding? ( x11-themes/redcore-theme-lxqt )
 	compton? ( x11-misc/compton x11-misc/compton-conf )
 	filemanager? ( >=x11-misc/pcmanfm-qt-${PV} )
-	gtkstyle? ( dev-qt/qt5-styleplugins )
+	gtk? ( dev-qt/qt5-styleplugins
+		x11-libs/gtk+:2 )
+	!gtk? ( ~lxqt-base/lxqt-qtplugin-${PV} )
 	icons? ( oxygen? ( kde-frameworks/oxygen-icons )
 		!oxygen? ( virtual/freedesktop-icon-theme ) )
 	sddm? ( x11-misc/sddm )
diff --git a/lxqt-base/lxqt-session/lxqt-session-0.13.0.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.13.0.ebuild
index fbd4003a..b76d15fd 100644
--- a/lxqt-base/lxqt-session/lxqt-session-0.13.0.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-0.13.0.ebuild
@@ -10,6 +10,7 @@ HOMEPAGE="http://lxqt.org/"
 
 SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
 KEYWORDS="~amd64"
+IUSE="+gtk"
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
@@ -25,7 +26,8 @@ CDEPEND="
 	kde-frameworks/kwindowsystem:5[X]
 	~lxqt-base/liblxqt-${PV}
 	x11-libs/libX11
-	x11-misc/xdg-user-dirs"
+	x11-misc/xdg-user-dirs
+	gtk? ( ~lxqt-base/lxqt-config-${PV}[gtk] )"
 DEPEND="${CDEPEND}
 	dev-qt/linguist-tools:5
 	dev-util/intltool
@@ -36,8 +38,12 @@ RDEPEND="${CDEPEND}
 	~lxqt-base/lxqt-themes-${PV}"
 
 src_prepare () {
-	epatch ${FILESDIR}/${PN}-override-default-platformplugin.patch
-	cmake-utils_src_prepare
+	if use gtk; then
+		epatch ${FILESDIR}/${PN}-override-default-platformplugin.patch
+		cmake-utils_src_prepare
+	else
+		cmake-utils_src_prepare
+	fi
 }
 
 src_configure() {
-- 
cgit v1.2.3