1 |
commit: b6e9568e7b9ab7f19fe69371cec68dd8e6453b01 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 19 21:31:05 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 19 21:52:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e9568e |
7 |
|
8 |
media-sound/audacious: Drop USE gtk3 from live ebuild |
9 |
|
10 |
- git master has no concept of 'Gtk+3' |
11 |
- USE gtk3 was permanently broken by src_unpack phase anyway |
12 |
|
13 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
15 |
|
16 |
media-sound/audacious/audacious-9999.ebuild | 27 +++++++++------------------ |
17 |
1 file changed, 9 insertions(+), 18 deletions(-) |
18 |
|
19 |
diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild |
20 |
index 47a2fb25528..bbfcac0816d 100644 |
21 |
--- a/media-sound/audacious/audacious-9999.ebuild |
22 |
+++ b/media-sound/audacious/audacious-9999.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2018 Gentoo Foundation |
25 |
+# Copyright 1999-2018 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI=6 |
29 |
@@ -15,9 +15,7 @@ if [[ ${PV} == *9999 ]]; then |
30 |
inherit autotools git-r3 |
31 |
EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git" |
32 |
else |
33 |
- SRC_URI=" |
34 |
- !gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 ) |
35 |
- gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )" |
36 |
+ SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2" |
37 |
KEYWORDS="~amd64 ~x86" |
38 |
fi |
39 |
|
40 |
@@ -25,8 +23,8 @@ SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2" |
41 |
|
42 |
LICENSE="BSD-2" |
43 |
SLOT="0" |
44 |
-IUSE="gtk gtk3 nls qt5" |
45 |
-REQUIRED_USE="^^ ( gtk gtk3 qt5 )" |
46 |
+IUSE="gtk nls qt5" |
47 |
+REQUIRED_USE="^^ ( gtk qt5 )" |
48 |
|
49 |
RDEPEND=" |
50 |
>=dev-libs/dbus-glib-0.60 |
51 |
@@ -35,25 +33,18 @@ RDEPEND=" |
52 |
>=x11-libs/pango-1.8.0 |
53 |
virtual/freedesktop-icon-theme |
54 |
gtk? ( x11-libs/gtk+:2 ) |
55 |
- gtk3? ( x11-libs/gtk+:3 ) |
56 |
qt5? ( |
57 |
dev-qt/qtcore:5 |
58 |
dev-qt/qtgui:5 |
59 |
dev-qt/qtwidgets:5 |
60 |
- )" |
61 |
+ ) |
62 |
+" |
63 |
DEPEND="${RDEPEND} |
64 |
virtual/pkgconfig |
65 |
- nls? ( dev-util/intltool )" |
66 |
+ nls? ( dev-util/intltool ) |
67 |
+" |
68 |
PDEPEND="~media-plugins/audacious-plugins-${PV}" |
69 |
|
70 |
-src_unpack() { |
71 |
- default |
72 |
- if use gtk3; then |
73 |
- mv "${MY_P}"{-gtk3,} || die |
74 |
- fi |
75 |
- [[ ${PV} == *9999 ]] && git-r3_src_unpack |
76 |
-} |
77 |
- |
78 |
src_prepare() { |
79 |
default |
80 |
[[ ${PV} == *9999 ]] && eautoreconf |
81 |
@@ -68,7 +59,7 @@ src_configure() { |
82 |
econf \ |
83 |
--disable-valgrind \ |
84 |
--enable-dbus \ |
85 |
- $(use_enable $(usex gtk gtk gtk3) gtk) \ |
86 |
+ $(use_enable gtk) \ |
87 |
$(use_enable nls) \ |
88 |
$(use_enable qt5 qt) |
89 |
} |