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 812FF1382C5 for ; Sat, 24 Feb 2018 09:48:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C02D4E07F6; Sat, 24 Feb 2018 09:48:57 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 8DB54E07F6 for ; Sat, 24 Feb 2018 09:48:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 7A289335C07 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 38E3D231 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.10ed3e571406f084e0bc433fe1f9add9dedd4f63.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-vlc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/phonon-vlc/phonon-vlc-9999.ebuild X-VCS-Directories: media-libs/phonon-vlc/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 10ed3e571406f084e0bc433fe1f9add9dedd4f63 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: 3af84ba6-546c-4c57-bfb5-fa91f5882aa6 X-Archives-Hash: fe608bf3dadec52ac8a713e4ff453375 commit: 10ed3e571406f084e0bc433fe1f9add9dedd4f63 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 19 12:27:24 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=10ed3e57 media-libs/phonon-vlc: Drop USE=qt4 Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-libs/phonon-vlc/phonon-vlc-9999.ebuild | 54 +++++----------------------- 1 file changed, 8 insertions(+), 46 deletions(-) diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild index aee83519e54..18a2f10173c 100644 --- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild +++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild @@ -1,77 +1,39 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 MY_PN="phonon-backend-vlc" -MY_P="${MY_PN}-${PV}" if [[ ${PV} != *9999* ]]; then - SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz" + SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - S="${WORKDIR}/${MY_P}" else EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" ) inherit git-r3 fi -inherit cmake-utils multibuild +inherit cmake-utils DESCRIPTION="Phonon VLC backend" HOMEPAGE="https://phonon.kde.org/" LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )" SLOT="0" -IUSE="debug qt4" +IUSE="debug" RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 - >=media-libs/phonon-4.9.0[qt4=,qt5(+)] - >=media-video/vlc-2.0.1:=[dbus,ogg,vorbis] - qt4? ( - >=dev-qt/qtcore-4.8.7-r2:4 - >=dev-qt/qtgui-4.8.7:4 - ) + >=media-libs/phonon-4.10.0 + media-video/vlc:=[dbus,ogg,vorbis] " DEPEND="${RDEPEND} virtual/pkgconfig " -DOCS=( AUTHORS ) - -pkg_setup() { - if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then - ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618" - fi - - MULTIBUILD_VARIANTS=( $(usev qt4) qt5 ) -} - src_configure() { - myconfigure() { - local mycmakeargs=() - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF ) - fi - if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON ) - 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 -} - -src_install() { - multibuild_foreach_variant cmake-utils_src_install + local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON ) + cmake-utils_src_configure }