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 0190E139694 for ; Sun, 26 Mar 2017 09:49:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74C4321C07F; Sun, 26 Mar 2017 09:49:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5021221C07F for ; Sun, 26 Mar 2017 09:49:34 +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 30D4B341664 for ; Sun, 26 Mar 2017 09:49:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA8DC73DE for ; Sun, 26 Mar 2017 09:49:31 +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: <1490521533.730c3d504e064cdc1f1447bca1dc91406ebb9f34.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-news/quiterss/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-news/quiterss/quiterss-9999.ebuild X-VCS-Directories: net-news/quiterss/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 730c3d504e064cdc1f1447bca1dc91406ebb9f34 X-VCS-Branch: master Date: Sun, 26 Mar 2017 09:49:31 +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: 8332fcb5-6085-4873-b553-51153d5b068d X-Archives-Hash: 0a79cb14d670f88b7db0b6292cbd9965 commit: 730c3d504e064cdc1f1447bca1dc91406ebb9f34 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 25 16:09:34 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 26 09:45:33 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=730c3d50 net-news/quiterss: Drop USE=phonon,qt5 from live Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/4297 net-news/quiterss/quiterss-9999.ebuild | 50 ++++++++++++++-------------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/net-news/quiterss/quiterss-9999.ebuild b/net-news/quiterss/quiterss-9999.ebuild index c1f850d011e..9f9841e363a 100644 --- a/net-news/quiterss/quiterss-9999.ebuild +++ b/net-news/quiterss/quiterss-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,27 +19,24 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="phonon qt5" - -RDEPEND=">=dev-db/sqlite-3.11.1:3 - !qt5? ( dev-qt/qtcore:4[ssl] - dev-qt/qtgui:4 - dev-qt/qtsingleapplication[X,qt4(+)] - dev-qt/qtsql:4[sqlite] - dev-qt/qtwebkit:4 - phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) ) - qt5? ( dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtprintsupport:5 - dev-qt/qtsingleapplication[X,qt5(-)] - dev-qt/qtsql:5[sqlite] - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 )" +IUSE="" + +RDEPEND=" + >=dev-db/sqlite-3.11.1:3 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtprintsupport:5 + dev-qt/qtsingleapplication[X,qt5] + dev-qt/qtsql:5[sqlite] + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 +" DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/pkgconfig +" DOCS=( AUTHORS CHANGELOG README.md ) @@ -58,16 +55,9 @@ src_prepare() { } src_configure() { - local myqmakeargs=( - PREFIX="${EPREFIX}/usr" + eqmake5 \ + PREFIX="${EPREFIX}/usr" \ SYSTEMQTSA=1 - ) - if use qt5; then - eqmake5 "${myqmakeargs[@]}" - else - eqmake4 "${myqmakeargs[@]}" \ - $(usex phonon '' 'DISABLE_PHONON=1') - fi } src_install() {