public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/breeze/
Date: Wed, 25 Apr 2018 23:30:09 +0000 (UTC)	[thread overview]
Message-ID: <1524698885.6b1497726c4b71fecc25ff142899690d385d095c.asturm@gentoo> (raw)

commit:     6b1497726c4b71fecc25ff142899690d385d095c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 23:26:27 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 23:28:05 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6b149772

kde-plasma/breeze: Drop USE=qt4, flag-o-matic and multibuild eclasses

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 kde-plasma/breeze/breeze-5.12.49.9999.ebuild | 53 ++++------------------------
 1 file changed, 7 insertions(+), 46 deletions(-)

diff --git a/kde-plasma/breeze/breeze-5.12.49.9999.ebuild b/kde-plasma/breeze/breeze-5.12.49.9999.ebuild
index fd7cc65eeb..3bf55c5b42 100644
--- a/kde-plasma/breeze/breeze-5.12.49.9999.ebuild
+++ b/kde-plasma/breeze/breeze-5.12.49.9999.ebuild
@@ -3,14 +3,12 @@
 
 EAPI=6
 
-inherit flag-o-matic kde5 multibuild
+inherit kde5
 
 DESCRIPTION="Breeze visual style for the Plasma desktop"
 HOMEPAGE="https://cgit.kde.org/breeze.git"
 KEYWORDS=""
-IUSE="qt4 wayland X"
-
-REQUIRED_USE="qt4? ( X )"
+IUSE="wayland X"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep frameworkintegration)
@@ -27,10 +25,6 @@ COMMON_DEPEND="
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	qt4? (
-		kde-frameworks/kdelibs:4
-		x11-libs/libX11
-	)
 	wayland? ( $(add_frameworks_dep kwayland) )
 	X? (
 		$(add_qt_dep qtx11extras)
@@ -39,49 +33,16 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kpackage)
-	qt4? ( dev-util/automoc:0 )
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep breeze-icons)
 	$(add_plasma_dep kde-cli-tools)
 "
 
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
-}
-
 src_configure() {
-	myconfigure() {
-		local mycmakeargs=()
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			use debug || append-cppflags -DQT_NO_DEBUG
-			mycmakeargs+=(
-				-DUSE_KDE4=true
-				-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-			)
-			cmake-utils_src_configure
-		else
-			mycmakeargs+=(
-				$(cmake-utils_use_find_package wayland KF5Wayland)
-				$(cmake-utils_use_find_package X XCB)
-			)
-			kde5_src_configure
-		fi
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake-utils_use_find_package X XCB)
+	)
+	kde5_src_configure
 }


             reply	other threads:[~2018-04-25 23:30 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-25 23:30 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-12-02 19:25 [gentoo-commits] proj/kde:master commit in: kde-plasma/breeze/ Andreas Sturmlechner
2023-11-26 22:21 Andreas Sturmlechner
2023-11-26 22:21 Andreas Sturmlechner
2023-09-19 14:31 Andreas Sturmlechner
2023-02-21  9:04 Andreas Sturmlechner
2023-02-21  9:04 Andreas Sturmlechner
2022-10-09 16:39 Andreas Sturmlechner
2022-01-15 15:28 Andreas Sturmlechner
2020-12-31  7:46 Andreas Sturmlechner
2020-09-17 20:07 Andreas Sturmlechner
2020-04-04  0:41 Andreas Sturmlechner
2019-10-28 23:56 Andreas Sturmlechner
2018-07-15 17:27 Andreas Sturmlechner
2018-04-24 21:12 Andreas Sturmlechner
2018-04-05 18:17 Andreas Sturmlechner
2017-10-23 23:19 Andreas Sturmlechner
2017-10-23 23:19 Andreas Sturmlechner
2017-10-23 23:19 Andreas Sturmlechner
2017-01-28 19:45 Johannes Huber
2016-07-20 18:07 Michael Palimaka
2016-07-06 13:15 Michael Palimaka
2016-06-19  9:07 Michael Palimaka
2015-11-11  7:42 Manuel Rüger
2015-11-10 17:05 Michael Palimaka
2015-11-10 17:05 Michael Palimaka
2015-11-10 17:05 Michael Palimaka
2015-09-04 15:11 Michael Palimaka
2015-08-07 19:09 Michael Palimaka
2015-06-30 17:10 Johannes Huber
2015-04-10 18:23 Michael Palimaka
2015-03-13 17:28 Michael Palimaka
2015-01-30 20:54 Johannes Huber
2015-01-28 19:07 Michael Palimaka
2015-01-17 19:10 Johannes Huber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1524698885.6b1497726c4b71fecc25ff142899690d385d095c.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox