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 2387C139083 for ; Tue, 19 Dec 2017 14:41:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7AA3FE0F97; Tue, 19 Dec 2017 14:41:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 59362E0F97 for ; Tue, 19 Dec 2017 14:41:58 +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 5EF0E33C1EB for ; Tue, 19 Dec 2017 14:41:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB78F9C2F for ; Tue, 19 Dec 2017 14:41: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: <1513694501.2ec76afed4def01c8a054764a8915b902d262465.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-4.9.1-r1.ebuild 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: 2ec76afed4def01c8a054764a8915b902d262465 X-VCS-Branch: master Date: Tue, 19 Dec 2017 14:41: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: c7e03c9e-7adc-4d8b-8a74-dba172f64ce3 X-Archives-Hash: fb1ab0d04eaa675ab68bba285ac82ef5 commit: 2ec76afed4def01c8a054764a8915b902d262465 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Dec 19 14:41:24 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Dec 19 14:41:41 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ec76afe media-libs/phonon: Re-add pkg_setup Closes: https://bugs.gentoo.org/641726 Package-Manager: Portage-2.3.13, Repoman-2.3.4 media-libs/phonon/phonon-4.9.1-r1.ebuild | 4 ++++ media-libs/phonon/phonon-9999.ebuild | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/media-libs/phonon/phonon-4.9.1-r1.ebuild b/media-libs/phonon/phonon-4.9.1-r1.ebuild index 8cf0541b4fe..7f91cb3281f 100644 --- a/media-libs/phonon/phonon-4.9.1-r1.ebuild +++ b/media-libs/phonon/phonon-4.9.1-r1.ebuild @@ -53,6 +53,10 @@ PDEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" ) +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) +} + multilib_src_configure() { local mycmakeargs=( -DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer) diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild index 72b330e232c..b16a70f4b3c 100644 --- a/media-libs/phonon/phonon-9999.ebuild +++ b/media-libs/phonon/phonon-9999.ebuild @@ -49,6 +49,10 @@ PDEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" ) +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt4) qt5 ) +} + multilib_src_configure() { local mycmakeargs=( -DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)