public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: media-libs/liblastfm/
Date: Sun, 12 Oct 2014 16:47:30 +0000 (UTC)	[thread overview]
Message-ID: <1413132422.0d3d080336d868dcd43f568cfe7a2979e75538cb.kensington@gentoo> (raw)

commit:     0d3d080336d868dcd43f568cfe7a2979e75538cb
Author:     Uwe L. Korn <uwelk <AT> xhochy <DOT> com>
AuthorDate: Sat Oct 11 13:53:51 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Oct 12 16:47:02 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0d3d0803

[media-libs/liblastfm] Add support for Qt4/5 co-installability

Package-Manager: portage-2.2.12

---
 media-libs/liblastfm/liblastfm-9999.ebuild | 49 ++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/media-libs/liblastfm/liblastfm-9999.ebuild b/media-libs/liblastfm/liblastfm-9999.ebuild
index 67c770d..19447a5 100644
--- a/media-libs/liblastfm/liblastfm-9999.ebuild
+++ b/media-libs/liblastfm/liblastfm-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit cmake-utils git-r3
+inherit cmake-utils multibuild git-r3
 
 DESCRIPTION="Collection of libraries to integrate Last.fm services"
 HOMEPAGE="https://github.com/lastfm/liblastfm"
@@ -14,7 +14,6 @@ LICENSE="GPL-3"
 KEYWORDS=""
 SLOT="0/0"
 IUSE="fingerprint test +qt4 qt5"
-REQUIRED_USE="^^ ( qt4 qt5 )"
 
 COMMON_DEPEND="
 	qt4? (
@@ -47,14 +46,44 @@ RDEPEND="${COMMON_DEPEND}
 # 1 of 2 is failing, last checked 2012-06-22 / version 1.0.1
 RESTRICT="test"
 
+pkg_setup() {
+	MULTIBUILD_VARIANTS=()
+	if use qt4; then
+		MULTIBUILD_VARIANTS+=(qt4)
+	fi
+	if use qt5; then
+		MULTIBUILD_VARIANTS+=(qt5)
+	fi
+}
+
 src_configure() {
-	# demos not working
-	local mycmakeargs=(
-		-DBUILD_DEMOS=OFF
-		$(cmake-utils_use_build qt4 WITH_QT4)
-		$(cmake-utils_use_build fingerprint)
-		$(cmake-utils_use_build test TESTS)
-	)
+	myconfigure() {
+		# demos not working
+		local mycmakeargs=(
+			-DBUILD_DEMOS=OFF
+			$(cmake-utils_use_build fingerprint)
+			$(cmake-utils_use_build test TESTS)
+		)
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			mycmakeargs+=(-DBUILD_WITH_QT4=ON)
+		fi
+		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			mycmakeargs+=(-DBUILD_WITH_OT4=OFF)
+		fi
+		cmake-utils_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant cmake-utils_src_test
+}
 
-	cmake-utils_src_configure
+src_install() {
+	multibuild_foreach_variant cmake-utils_src_install
 }


             reply	other threads:[~2014-10-12 16:47 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-12 16:47 Michael Palimaka [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-03 11:34 [gentoo-commits] proj/kde:master commit in: media-libs/liblastfm/ Andreas Sturmlechner
2022-09-14 14:49 Andreas Sturmlechner
2019-02-17 11:11 Andreas Sturmlechner
2018-12-12 14:05 Andreas Sturmlechner
2018-10-13 12:11 Andreas Sturmlechner
2018-03-22 18:45 Andreas Sturmlechner
2018-03-19 20:58 Johannes Huber
2017-08-30 21:42 Andreas Sturmlechner
2016-07-06 13:45 Michael Palimaka
2016-05-03 11:17 Johannes Huber
2016-05-03 11:17 Johannes Huber
2016-02-23 14:15 Michael Palimaka
2015-01-30 20:54 Johannes Huber
2014-10-22 13:59 Michael Palimaka
2014-03-11 11:27 Johannes Huber
2013-10-13 17:03 Johannes Huber
2013-01-20 16:06 Michael Palimaka

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=1413132422.0d3d080336d868dcd43f568cfe7a2979e75538cb.kensington@gentoo \
    --to=kensington@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