From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C6C871382C5 for ; Sat, 24 Feb 2018 09:48:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12E60E07FA; Sat, 24 Feb 2018 09:48:58 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D5F8DE07FA for ; Sat, 24 Feb 2018 09:48:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C9825335C09 for ; Sat, 24 Feb 2018 09:48:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25F4C1FE for ; Sat, 24 Feb 2018 09:48:55 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1519465716.a9dcfd77d6f9d6583cb2039e8e420955c214f811.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/phonon/phonon-9999.ebuild X-VCS-Directories: media-libs/phonon/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a9dcfd77d6f9d6583cb2039e8e420955c214f811 X-VCS-Branch: master Date: Sat, 24 Feb 2018 09:48:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: aa2561ad-f878-4789-b3a5-7e440558c4bf X-Archives-Hash: 3722e3d668f7e9b5b2301d3750e76e88 commit: a9dcfd77d6f9d6583cb2039e8e420955c214f811 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 19 12:25:10 2018 +0000 Commit: Andreas Sturmlechner gentoo 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 -}