| 1 |
commit: 8d91ca78fd4248d6d9f13a9cef48b56d013e22d7 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 4 07:37:41 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 4 07:37:52 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d91ca78 |
| 7 |
|
| 8 |
net-news/quiterss: remove phonon and qt4 USE flags |
| 9 |
|
| 10 |
The qt4 USE flag depends on dev-qt/qtwebkit:4 which is ancient and will not see |
| 11 |
any future security updates, and the phonon USE flag does nothing for the qt5 |
| 12 |
build. |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 15 |
|
| 16 |
net-news/quiterss/metadata.xml | 4 ---- |
| 17 |
net-news/quiterss/quiterss-0.18.4.ebuild | 36 +++++++++++--------------------- |
| 18 |
2 files changed, 12 insertions(+), 28 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-news/quiterss/metadata.xml b/net-news/quiterss/metadata.xml |
| 21 |
index 329100ec2fc..56fe54721bb 100644 |
| 22 |
--- a/net-news/quiterss/metadata.xml |
| 23 |
+++ b/net-news/quiterss/metadata.xml |
| 24 |
@@ -5,10 +5,6 @@ |
| 25 |
<email>qt@g.o</email> |
| 26 |
<name>Gentoo Qt Project</name> |
| 27 |
</maintainer> |
| 28 |
- <use> |
| 29 |
- <flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg> |
| 30 |
- or <pkg>dev-qt/qtphonon</pkg></flag> |
| 31 |
- </use> |
| 32 |
<upstream> |
| 33 |
<remote-id type="github">QuiteRSS/quiterss</remote-id> |
| 34 |
</upstream> |
| 35 |
|
| 36 |
diff --git a/net-news/quiterss/quiterss-0.18.4.ebuild b/net-news/quiterss/quiterss-0.18.4.ebuild |
| 37 |
index 70273ffe420..76a7d9d1ffa 100644 |
| 38 |
--- a/net-news/quiterss/quiterss-0.18.4.ebuild |
| 39 |
+++ b/net-news/quiterss/quiterss-0.18.4.ebuild |
| 40 |
@@ -1,4 +1,4 @@ |
| 41 |
-# Copyright 1999-2016 Gentoo Foundation |
| 42 |
+# Copyright 1999-2017 Gentoo Foundation |
| 43 |
# Distributed under the terms of the GNU General Public License v2 |
| 44 |
|
| 45 |
EAPI=6 |
| 46 |
@@ -19,25 +19,18 @@ fi |
| 47 |
|
| 48 |
LICENSE="GPL-3" |
| 49 |
SLOT="0" |
| 50 |
-IUSE="phonon qt5" |
| 51 |
+IUSE="" |
| 52 |
|
| 53 |
RDEPEND=">=dev-db/sqlite-3.11.1:3 |
| 54 |
- !qt5? ( dev-qt/qtcore:4[ssl] |
| 55 |
- dev-qt/qtgui:4 |
| 56 |
- dev-qt/qtsingleapplication[X,qt4(+)] |
| 57 |
- dev-qt/qtsql:4[sqlite] |
| 58 |
- dev-qt/qtwebkit:4 |
| 59 |
- phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) ) |
| 60 |
- qt5? ( dev-qt/qtcore:5 |
| 61 |
- dev-qt/qtgui:5 |
| 62 |
- dev-qt/qtmultimedia:5 |
| 63 |
- dev-qt/qtnetwork:5[ssl] |
| 64 |
- dev-qt/qtprintsupport:5 |
| 65 |
- dev-qt/qtsingleapplication[X,qt5(-)] |
| 66 |
- dev-qt/qtsql:5[sqlite] |
| 67 |
- dev-qt/qtwebkit:5 |
| 68 |
- dev-qt/qtwidgets:5 |
| 69 |
- dev-qt/qtxml:5 )" |
| 70 |
+ dev-qt/qtgui:5 |
| 71 |
+ dev-qt/qtmultimedia:5 |
| 72 |
+ dev-qt/qtnetwork:5[ssl] |
| 73 |
+ dev-qt/qtprintsupport:5 |
| 74 |
+ dev-qt/qtsingleapplication[X,qt5(-)] |
| 75 |
+ dev-qt/qtsql:5[sqlite] |
| 76 |
+ dev-qt/qtwebkit:5 |
| 77 |
+ dev-qt/qtwidgets:5 |
| 78 |
+ dev-qt/qtxml:5" |
| 79 |
DEPEND="${RDEPEND} |
| 80 |
virtual/pkgconfig" |
| 81 |
|
| 82 |
@@ -62,12 +55,7 @@ src_configure() { |
| 83 |
PREFIX="${EPREFIX}/usr" |
| 84 |
SYSTEMQTSA=1 |
| 85 |
) |
| 86 |
- if use qt5; then |
| 87 |
- eqmake5 "${myqmakeargs[@]}" |
| 88 |
- else |
| 89 |
- eqmake4 "${myqmakeargs[@]}" \ |
| 90 |
- $(usex phonon '' 'DISABLE_PHONON=1') |
| 91 |
- fi |
| 92 |
+ eqmake5 "${myqmakeargs[@]}" |
| 93 |
} |
| 94 |
|
| 95 |
src_install() { |
Archives