[gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/

[Andreas Sturmlechner]

commit:     b6e9568e7b9ab7f19fe69371cec68dd8e6453b01
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 19 21:31:05 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 21:52:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e9568e

media-sound/audacious: Drop USE gtk3 from live ebuild

- git master has no concept of 'Gtk+3'
- USE gtk3 was permanently broken by src_unpack phase anyway

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/audacious/audacious-9999.ebuild | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/media-sound/audacious/audacious-9999.ebuild 
b/media-sound/audacious/audacious-9999.ebuild
index 47a2fb25528..bbfcac0816d 100644
--- a/media-sound/audacious/audacious-9999.ebuild
+++ b/media-sound/audacious/audacious-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,9 +15,7 @@ if [[ ${PV} == *9999 ]]; then
        inherit autotools git-r3
        EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git";
 else
-       SRC_URI="
-               !gtk3? ( 
https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
-               gtk3? ( 
https://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
+       SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2";
        KEYWORDS="~amd64 ~x86"
 fi
 
@@ -25,8 +23,8 @@ SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="gtk gtk3 nls qt5"
-REQUIRED_USE="^^ ( gtk gtk3 qt5 )"
+IUSE="gtk nls qt5"
+REQUIRED_USE="^^ ( gtk qt5 )"
 
 RDEPEND="
        >=dev-libs/dbus-glib-0.60
@@ -35,25 +33,18 @@ RDEPEND="
        >=x11-libs/pango-1.8.0
        virtual/freedesktop-icon-theme
        gtk? ( x11-libs/gtk+:2 )
-       gtk3? ( x11-libs/gtk+:3 )
        qt5? (
                dev-qt/qtcore:5
                dev-qt/qtgui:5
                dev-qt/qtwidgets:5
-       )"
+       )
+"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       nls? ( dev-util/intltool )"
+       nls? ( dev-util/intltool )
+"
 PDEPEND="~media-plugins/audacious-plugins-${PV}"
 
-src_unpack() {
-       default
-       if use gtk3; then
-               mv "${MY_P}"{-gtk3,} || die
-       fi
-       [[ ${PV} == *9999 ]] && git-r3_src_unpack
-}
-
 src_prepare() {
        default
        [[ ${PV} == *9999 ]] && eautoreconf
@@ -68,7 +59,7 @@ src_configure() {
        econf \
                --disable-valgrind \
                --enable-dbus \
-               $(use_enable $(usex gtk gtk gtk3) gtk) \
+               $(use_enable gtk) \
                $(use_enable nls) \
                $(use_enable qt5 qt)
 }