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

["David Seifert" <soap@gentoo.org>]

commit:     5600ec12e40a15a4e9cffab37a765c4cd1867059
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  6 07:10:47 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Nov  6 07:10:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5600ec12

media-plugins/audacious-plugins: Readd support for GTK+3

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-plugins/audacious-plugins/Manifest           |  1 +
 .../audacious-plugins/audacious-plugins-3.9.ebuild | 29 ++++++++++++++++------
 .../audacious-plugins-9999.ebuild                  | 29 ++++++++++++++++------
 3 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 441eea5275a..f9b500752f7 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -4,4 +4,5 @@ DIST audacious-plugins-3.7.1-gtk3.tar.bz2 1838067 SHA256 75469b52694fcfce237a937
 DIST audacious-plugins-3.7.1.tar.bz2 1838045 SHA256 228a384f26afb000099166776d3454539956aa00fde90dcb4612ce8910ed4116 SHA512 2d22131babba572af235ec5f27135061a1602be55a2f709e327b7cd4052f7c11bc31398d01574a6f07197daa6b79cb42d5fa7b26f75764680420a46aede5cd9a WHIRLPOOL 026c355c6323aa6b56b09c119d9320ec5a7306f11b90504631f8a25c05b4f9bd1641ff223e0122a7b5be48f341a3820b759d1829ca60274285cfe19897c9edae
 DIST audacious-plugins-3.8.2-gtk3.tar.bz2 1821924 SHA256 7849024beae61b8af3874b166cf3977905aec77859e53901158b531b31ef0cef SHA512 a5457cecc72ca4d57a3fad686b5ff42b2110d8ef65203fa49ad063c8944fc41af5d231b0870126e21c4cc8b3152de36c13726813075d26ba86450ef2132a6d33 WHIRLPOOL 0a75dd8a439dd30dce4764385fa60f317c521c3f45b5e4ae6c1d14f6a677774854d4c1650ba59facc7d204cbd53b7a8b3fca8dd94ee1b040fc2c8f444b179e4f
 DIST audacious-plugins-3.8.2.tar.bz2 1821558 SHA256 d7cefca7a0e32bf4e58bb6e84df157268b5e9a6771a0e8c2da98b03f92a5fdd4 SHA512 61be2ee962853ed05366d4089ae1bef96c282ff61a947dc32f06651a9b620035a33cf4d75f4c4d74821099f36f9124f2b2266940f4844d14ca43ef70a81cde08 WHIRLPOOL 9d87947da3a7d90f0e5262d27dcbbbff2cfc833d340e87448a11d7c5fdfd5a64d8e1f49823a50e7f6ff33214a93594051e561e75eab422aa6321402067076e75
+DIST audacious-plugins-3.9-gtk3.tar.bz2 1883096 SHA256 10b393885ce19161abbae73d39daf470b7bb1e98f5322e4853b95ea9b59802f7 SHA512 b46f76aa0b49b8f4430e6a9d6369e96cfc07cdc7b5014bd512dc6bfdfbc19c5ae171cb5c19083a1b2150ae67d9ff91e1c342d32a1a53074daeeee4b7d6fe51a2 WHIRLPOOL a6c286ffd6ffa10a14434cd0b05bbcd5dc01693fe23d75d4cfaafa6ebe053021362035abfe33cfa10d4a035bc49d094c64467e75ab86e08680970f4e49e8f43c
 DIST audacious-plugins-3.9.tar.bz2 1843084 SHA256 8bf7f21089cb3406968cc9c71307774aee7100ec4607f28f63cf5690d5c927b8 SHA512 00c8c53d69995ca1fedb91c7df609cc6c65b13e1af23b98a2fbda143c02ac554cc2c42c01f1c593af252e36bfb85b6324f2daca8632d3b672c69fb4dead2e3fa WHIRLPOOL e0b7cb6a6fb97d7cd69be4d2efc7867bb8510e6ea94af84055e3c61ffb8b06e716f7ac30b961155d560f4e646b82c7df894a7024cfe68c0ee47c64b9e66e9665

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.9.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.9.ebuild
index 2b9250e2722..0593e968060 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.9.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.9.ebuild
@@ -12,16 +12,18 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
 else
-	SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
+	SRC_URI="
+		!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+		gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth gnome hotkeys http gme gtk jack lame libav
+IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth gnome hotkeys http gme gtk gtk3 jack lame libav
 	libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr vorbis wavpack"
 REQUIRED_USE="
-	^^ ( gtk qt5 )
+	^^ ( gtk gtk3 qt5 )
 	qt5? ( !libnotify )
 	|| ( alsa jack pulseaudio sdl )"
 
@@ -47,7 +49,7 @@ RDEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib[utils]
 	dev-libs/libxml2:2
-	~media-sound/audacious-${PV}[gtk?,qt5?]
+	~media-sound/audacious-${PV}[gtk?,gtk3?,qt5?]
 	aac? ( >=media-libs/faad2-2.7 )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
 	ampache? ( www-apps/ampache )
@@ -68,9 +70,8 @@ RDEPEND="
 	)
 	fluidsynth? ( media-sound/fluidsynth )
 	http? ( >=net-libs/neon-0.26.4 )
-	gtk? (
-		x11-libs/gtk+:2
-	)
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -108,6 +109,18 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+
+		if use gtk3; then
+			mv "${MY_P}"{-gtk3,} || die
+		fi
+	fi
+}
+
 src_prepare() {
 	default
 	[[ ${PV} == *9999 ]] && eautoreconf
@@ -138,7 +151,7 @@ src_configure() {
 		$(use_enable fluidsynth amidiplug) \
 		$(use_enable flac filewriter) \
 		$(use_enable gme console) \
-		$(use_enable gtk) \
+		$(use_enable $(usex gtk gtk gtk3) gtk) \
 		$(use_enable hotkeys hotkey) \
 		$(use_enable http neon) \
 		$(use_enable jack) \

diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index 2b9250e2722..0593e968060 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -12,16 +12,18 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
 else
-	SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
+	SRC_URI="
+		!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+		gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth gnome hotkeys http gme gtk jack lame libav
+IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth gnome hotkeys http gme gtk gtk3 jack lame libav
 	libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr vorbis wavpack"
 REQUIRED_USE="
-	^^ ( gtk qt5 )
+	^^ ( gtk gtk3 qt5 )
 	qt5? ( !libnotify )
 	|| ( alsa jack pulseaudio sdl )"
 
@@ -47,7 +49,7 @@ RDEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib[utils]
 	dev-libs/libxml2:2
-	~media-sound/audacious-${PV}[gtk?,qt5?]
+	~media-sound/audacious-${PV}[gtk?,gtk3?,qt5?]
 	aac? ( >=media-libs/faad2-2.7 )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
 	ampache? ( www-apps/ampache )
@@ -68,9 +70,8 @@ RDEPEND="
 	)
 	fluidsynth? ( media-sound/fluidsynth )
 	http? ( >=net-libs/neon-0.26.4 )
-	gtk? (
-		x11-libs/gtk+:2
-	)
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -108,6 +109,18 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+
+		if use gtk3; then
+			mv "${MY_P}"{-gtk3,} || die
+		fi
+	fi
+}
+
 src_prepare() {
 	default
 	[[ ${PV} == *9999 ]] && eautoreconf
@@ -138,7 +151,7 @@ src_configure() {
 		$(use_enable fluidsynth amidiplug) \
 		$(use_enable flac filewriter) \
 		$(use_enable gme console) \
-		$(use_enable gtk) \
+		$(use_enable $(usex gtk gtk gtk3) gtk) \
 		$(use_enable hotkeys hotkey) \
 		$(use_enable http neon) \
 		$(use_enable jack) \