[gentoo-commits] proj/kde:master commit in: kde-plasma/breeze/

[Johannes Huber]

commit:     90b8462b9935d43e4366f976b430cc4387252821
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Jun 29 21:42:00 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 17:10:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=90b8462b

[kde-plasma/breeze] USE kde4 -> qt4

Setting affects the look of all Qt4 applications,
so use of more common qt4 flag seems appropriate.

Package-Manager: portage-2.2.18

 kde-plasma/breeze/breeze-5.3.2.ebuild       | 8 ++++----
 kde-plasma/breeze/breeze-5.3.49.9999.ebuild | 8 ++++----
 kde-plasma/breeze/breeze-9999.ebuild        | 8 ++++----
 kde-plasma/breeze/metadata.xml              | 3 ---
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/kde-plasma/breeze/breeze-5.3.2.ebuild b/kde-plasma/breeze/breeze-5.3.2.ebuild
index 512e556..6dd952d 100644
--- a/kde-plasma/breeze/breeze-5.3.2.ebuild
+++ b/kde-plasma/breeze/breeze-5.3.2.ebuild
@@ -9,7 +9,7 @@ inherit kde5 multibuild
 DESCRIPTION="Breeze visual style for the Plasma desktop"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
 KEYWORDS="~amd64"
-IUSE="kde4"
+IUSE="qt4"
 
 DEPEND="
 	$(add_frameworks_dep frameworkintegration)
@@ -26,7 +26,7 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	x11-libs/libxcb
-	kde4? (
+	qt4? (
 		kde-base/kdelibs:4
 		x11-libs/libX11
 	)
@@ -38,14 +38,14 @@ RDEPEND="${DEPEND}
 
 pkg_setup() {
 	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev kde4) )
+	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
 }
 
 src_configure() {
 	myconfigure() {
 		local mycmakeargs=()
 
-		if [[ ${MULTIBUILD_VARIANT} = kde4 ]] ; then
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
 			mycmakeargs+=( -DUSE_KDE4=true )
 		fi
 

diff --git a/kde-plasma/breeze/breeze-5.3.49.9999.ebuild b/kde-plasma/breeze/breeze-5.3.49.9999.ebuild
index 9844ba5..dbec4fa 100644
--- a/kde-plasma/breeze/breeze-5.3.49.9999.ebuild
+++ b/kde-plasma/breeze/breeze-5.3.49.9999.ebuild
@@ -9,7 +9,7 @@ inherit kde5 multibuild
 DESCRIPTION="Breeze visual style for the Plasma desktop"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
 KEYWORDS=""
-IUSE="kde4"
+IUSE="qt4"
 
 DEPEND="
 	$(add_frameworks_dep frameworkintegration)
@@ -26,7 +26,7 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	x11-libs/libxcb
-	kde4? (
+	qt4? (
 		kde-base/kdelibs:4
 		x11-libs/libX11
 	)
@@ -38,14 +38,14 @@ RDEPEND="${DEPEND}
 
 pkg_setup() {
 	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev kde4) )
+	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
 }
 
 src_configure() {
 	myconfigure() {
 		local mycmakeargs=()
 
-		if [[ ${MULTIBUILD_VARIANT} = kde4 ]] ; then
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
 			mycmakeargs+=( -DUSE_KDE4=true )
 		fi
 

diff --git a/kde-plasma/breeze/breeze-9999.ebuild b/kde-plasma/breeze/breeze-9999.ebuild
index 9844ba5..dbec4fa 100644
--- a/kde-plasma/breeze/breeze-9999.ebuild
+++ b/kde-plasma/breeze/breeze-9999.ebuild
@@ -9,7 +9,7 @@ inherit kde5 multibuild
 DESCRIPTION="Breeze visual style for the Plasma desktop"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
 KEYWORDS=""
-IUSE="kde4"
+IUSE="qt4"
 
 DEPEND="
 	$(add_frameworks_dep frameworkintegration)
@@ -26,7 +26,7 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	x11-libs/libxcb
-	kde4? (
+	qt4? (
 		kde-base/kdelibs:4
 		x11-libs/libX11
 	)
@@ -38,14 +38,14 @@ RDEPEND="${DEPEND}
 
 pkg_setup() {
 	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev kde4) )
+	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
 }
 
 src_configure() {
 	myconfigure() {
 		local mycmakeargs=()
 
-		if [[ ${MULTIBUILD_VARIANT} = kde4 ]] ; then
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
 			mycmakeargs+=( -DUSE_KDE4=true )
 		fi
 

diff --git a/kde-plasma/breeze/metadata.xml b/kde-plasma/breeze/metadata.xml
index 603058a..a23f444 100644
--- a/kde-plasma/breeze/metadata.xml
+++ b/kde-plasma/breeze/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
-	<use>
-		<flag name="kde4">Build the Breeze style for KDE 4</flag>
-	</use>
 </pkgmetadata>