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] repo/gentoo:master commit in: media-libs/phonon/
Date: Sat, 24 Feb 2018 09:48:55 +0000 (UTC)	[thread overview]
Message-ID: <1519465716.a9dcfd77d6f9d6583cb2039e8e420955c214f811.asturm@gentoo> (raw)

commit:     a9dcfd77d6f9d6583cb2039e8e420955c214f811
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 12:25:10 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 09:48:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9dcfd77

media-libs/phonon: Drop USE=qt4 and remove cmake-multilib

Qt5 does not support multilib.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-libs/phonon/phonon-9999.ebuild | 99 +++++-------------------------------
 1 file changed, 13 insertions(+), 86 deletions(-)

diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index b16a70f4b3c..e560a9e5983 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,14 +11,14 @@ else
 	inherit git-r3
 fi
 
-inherit cmake-multilib multibuild qmake-utils
+inherit cmake-utils qmake-utils
 
 DESCRIPTION="KDE multimedia API"
 HOMEPAGE="https://phonon.kde.org/"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-IUSE="debug designer gstreamer pulseaudio qt4 +vlc"
+IUSE="debug designer gstreamer pulseaudio +vlc"
 
 RDEPEND="
 	!!dev-qt/qtphonon:4
@@ -28,101 +28,28 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	designer? ( dev-qt/designer:5 )
 	pulseaudio? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		>=media-sound/pulseaudio-0.9.21[glib,${MULTILIB_USEDEP}]
-	)
-	qt4? (
-		>=dev-qt/qtcore-4.8.7-r2:4[${MULTILIB_USEDEP}]
-		>=dev-qt/qtdbus-4.8.7:4[${MULTILIB_USEDEP}]
-		>=dev-qt/qtgui-4.8.7:4[${MULTILIB_USEDEP}]
-		designer? ( >=dev-qt/designer-4.8.7:4[${MULTILIB_USEDEP}] )
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-0.9.21[glib]
 	)
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig
 "
 PDEPEND="
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt4?,qt5(+)] )
-	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt4?,qt5(+)] )
+	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] )
+	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) qt5 )
-}
-
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
-		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
+		-DPHONON_BUILD_PHONON4QT5=ON
 		-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
+		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
 		-DWITH_GLIB2=$(usex pulseaudio)
 		-DWITH_PulseAudio=$(usex pulseaudio)
-		-DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake
+		-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)"/qmake
 	)
-
-	if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
-		mycmakeargs+=(
-			-DPHONON_BUILD_PHONON4QT5=OFF
-			-DWITH_QZeitgeist=OFF
-		)
-	fi
-	if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
-		mycmakeargs+=(
-			-DPHONON_BUILD_PHONON4QT5=ON
-			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
-		)
-	fi
-
 	cmake-utils_src_configure
 }
-
-src_configure() {
-	myconfigure() {
-		local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
-		if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
-			cmake-multilib_src_configure
-		elif [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
-			multilib_src_configure
-		fi
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	mycompile() {
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			cmake-multilib_src_compile
-		elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			cmake-utils_src_compile
-		fi
-	}
-
-	multibuild_foreach_variant mycompile
-}
-
-src_test() {
-	mytest() {
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			cmake-multilib_src_test
-		elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			cmake-utils_src_test
-		fi
-	}
-
-	multibuild_foreach_variant mytest
-}
-
-src_install() {
-	myinstall() {
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			cmake-multilib_src_install
-		elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			cmake-utils_src_install
-		fi
-	}
-
-	multibuild_foreach_variant myinstall
-}


             reply	other threads:[~2018-02-24  9:48 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-24  9:48 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-26  3:39 [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/ Arthur Zamarin
2024-07-22 18:37 Arthur Zamarin
2024-07-01 20:47 Andreas Sturmlechner
2024-06-28 15:56 Sam James
2024-06-28 15:45 Sam James
2024-06-28 15:45 Sam James
2024-06-28 13:34 Andreas Sturmlechner
2024-04-25 20:43 Andreas Sturmlechner
2024-03-03 16:37 Andreas Sturmlechner
2024-02-02 12:44 Arthur Zamarin
2022-07-14 20:32 Andreas Sturmlechner
2019-12-03  5:04 Andreas Sturmlechner
2019-12-02 23:29 Aaron Bauman
2019-12-02 16:33 Mikle Kolyada
2019-12-02 16:12 Mikle Kolyada
2019-11-22 13:08 Andreas Sturmlechner
2019-11-22 13:08 Andreas Sturmlechner
2019-11-13 21:25 Andreas Sturmlechner
2019-09-26 13:58 Andreas Sturmlechner
2019-09-26 13:58 Andreas Sturmlechner
2019-08-27 19:59 Andreas Sturmlechner
2019-08-27 19:59 Andreas Sturmlechner
2019-08-27 19:59 Andreas Sturmlechner
2019-08-25  8:10 Andreas Sturmlechner
2019-08-22 14:16 Andreas Sturmlechner
2019-08-22 14:16 Andreas Sturmlechner
2019-08-08 22:00 Andreas Sturmlechner
2019-08-08 21:50 Andreas Sturmlechner
2019-07-20  7:43 Andreas Sturmlechner
2019-01-16 12:01 Andreas Sturmlechner
2019-01-15 22:10 Thomas Deutschmann
2019-01-14 14:33 Mikle Kolyada
2019-01-09 18:46 Andreas Sturmlechner
2018-05-25 23:58 Thomas Deutschmann
2018-05-24 14:31 Agostino Sarubbo
2018-04-27 23:05 Andreas Sturmlechner
2018-04-27 17:59 Johannes Huber
2018-03-13 19:51 Michał Górny
2018-02-24  9:48 Andreas Sturmlechner
2017-12-19 14:41 Andreas Sturmlechner
2017-12-19  0:20 Andreas Sturmlechner
2017-12-19  0:20 Andreas Sturmlechner
2017-08-31 20:54 Andreas Sturmlechner
2017-08-26 19:19 Andreas Sturmlechner
2017-07-30 20:46 Andreas Sturmlechner
2017-06-24  9:11 Markus Meier
2017-06-23 11:44 Alexis Ballier
2017-06-13 12:31 Agostino Sarubbo
2017-06-04 10:42 Agostino Sarubbo
2017-06-03  7:54 Agostino Sarubbo
2017-06-02  0:38 Andreas Sturmlechner
2017-06-02  0:38 Andreas Sturmlechner
2017-01-24 17:15 Johannes Huber
2017-01-03 19:10 Johannes Huber
2016-12-29 16:23 Johannes Huber
2016-11-13 19:18 Markus Meier
2016-10-13  9:47 Agostino Sarubbo
2016-10-02  8:11 Jeroen Roovers
2016-09-27  9:09 Tobias Klausmann
2016-07-22 17:40 Michael Palimaka
2016-07-13 18:13 Michael Palimaka
2016-07-13 17:25 Michael Palimaka
2016-07-11  7:57 Johannes Huber
2016-05-31 17:21 Johannes Huber
2016-04-24 12:26 Johannes Huber
2016-04-21 17:15 Michael Palimaka
2016-04-21 17:15 Michael Palimaka
2016-04-21 17:15 Michael Palimaka
2016-04-21 17:15 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=1519465716.a9dcfd77d6f9d6583cb2039e8e420955c214f811.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