Drop gtk3 support for now as it is currently a bit broken.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux i686

3 files changed, 10 insertions, 20 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 11e323750524..502fab8ed4bc 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.250 2012/06/06 13:22:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.251 2012/06/10 18:44:25 jdhore Exp $
+
+  10 Jun 2012; Jeff Horelick <jdhore@gentoo.org> audacious-plugins-3.2.3.ebuild:
+  Drop gtk3 support for now as it is currently a bit broken.
 
   06 Jun 2012; Jeroen Roovers <jer@gentoo.org>
   audacious-plugins-3.2.2-r1.ebuild:
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 00c766ce8cec..03ad0f5d6261 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX audacious-plugins-2.x-fix-skins-build-glib-2.32.patch 373 RMD160 098cc04132eeea011073bf50357dc5cd111fa4ff SHA1 99c581446e4fa2157c6285fd0f9655f3aa5ee718 SHA256 35511091a09198cc52c272748da35f3bce44b0cdafc2284843c41033e0f2bbde
 AUX audacious-plugins-3.2.2-fix-build-gmodule.patch 1244 RMD160 35437408a10eba1c616b2b78f605ab82c51f21ba SHA1 17e73f9d886b961d12053d1ee2a21dd1260333a3 SHA256 c86428993218ea785d740cc0e051a4c2401aadc17f35940048dd39347f1acdd5
 AUX audacious-plugins-3.2.2-fix-build-sdl.patch 622 RMD160 9c6e99012e5377031524b7024bc33ce2e10d2abf SHA1 4b3dcd60754c8d8aac1a10a5d41f35a6929b4b05 SHA256 c6b13de9284cb918a749b8c1356685af233c26065a1aff41290c5fff94074eb3
@@ -16,13 +13,6 @@ EBUILD audacious-plugins-2.5.4.ebuild 3560 RMD160 1650be795a77e34760ce3691b72fb0
 EBUILD audacious-plugins-3.1.1.ebuild 3423 RMD160 030fdccd6afcee56d36db05452f279b5fe1855c2 SHA1 1681d1209d99d8654664bb394da90e57d79dbe83 SHA256 6ea2321331a8deaed3daea89219de3abf9147c0a6cac5b2457d88585956e901a
 EBUILD audacious-plugins-3.1.ebuild 3414 RMD160 b8157d106a57f250f52e1b065bde98a9dba94b66 SHA1 448acfd7afd57ca9385d3ff1eb1269b5ff36ae39 SHA256 29e41512a80145bdf089e7ae76db7ccb8eb81d2daa2d4bfdc329ddaf31d97ce1
 EBUILD audacious-plugins-3.2.2-r1.ebuild 3442 RMD160 3bee28bf23dbd653810260013940c31fce033832 SHA1 234e58826cbd38f885d4608a7b908b3f5ddc41af SHA256 fc35a84ddc8979c6ef29e177b6963539c7240192a9b3b27496298218fcf15533
-EBUILD audacious-plugins-3.2.3.ebuild 3208 RMD160 fff4b6c2f8cc904bc3d5b1dab88c668b134a501e SHA1 51a4fde187e827894c8004885b9d948801e5ca99 SHA256 e1d32b8d264a2028fd68af8eeb8fd3e9428addbf886654dbc5631a5edac01ac5
-MISC ChangeLog 51631 RMD160 0b8ffb5d64a2d8ab5a7236b92fcf520c1a4134bb SHA1 454faa9bf6cb47a173620f15bbbe3a003ef2c9f2 SHA256 fe9bbfd356f087e6c36e357e8a27e217c66c305817a33b33106310f3b2d6853b
+EBUILD audacious-plugins-3.2.3.ebuild 3126 RMD160 cadb1ce8e21a196b0fd7036f025081160ee99874 SHA1 8685ad950ccb08ece58b66bc49178059b8ecfa54 SHA256 88f593960cd7f143d9850aa902229f9fab01c9a62f3d65f5289d437ea04ef63e
+MISC ChangeLog 51777 RMD160 7e58c28f267d0218742d83c2ecf014af4dc96fa3 SHA1 122871a9b902c09194744191b8be1bc1312f845f SHA256 5f4141fd0c0d6ea2cf51380ab44cd8394a0d16454a4f78ef377f34971ec596aa
 MISC metadata.xml 900 RMD160 bbe25dee100a0a3158ca5cdb78e142adbc8a7cd6 SHA1 0d199202747a7e8fc420f4fa7172877d865e16c9 SHA256 67b5344a7a88e6d04a4df5958625bc175514692e5e0f5a9c441ebbbcf9bb2750
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk/PWZoACgkQVWmRsqeSphMexgCfaejnc8hgRNipO26N88za9FBx
-ptYAnjlbkR3uGyCTOmuptV8JgMoXr/N/
-=mKYH
------END PGP SIGNATURE-----
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild
index 283c0458a661..c8213b1323f1 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild,v 1.1 2012/05/27 21:02:42 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild,v 1.2 2012/06/10 18:44:25 jdhore Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome +gtk gtk3 ipv6 jack
+IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
 lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
 
 RDEPEND="app-arch/unzip
@@ -22,8 +22,7 @@ RDEPEND="app-arch/unzip
 	media-libs/libmodplug
 	>=media-sound/audacious-3.2.3
 	>=net-libs/neon-0.26.4
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
+	x11-libs/gtk+:2
 	aac? ( >=media-libs/faad2-2.7 )
 	adplug? ( >=dev-cpp/libbinio-1.4 )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
@@ -56,8 +55,6 @@ DEPEND="${RDEPEND}
 	nls? ( dev-util/intltool )
 	virtual/pkgconfig"
 
-REQUIRED_USE="^^ ( gtk gtk3 )"
-
 DOCS="AUTHORS"
 
 mp3_warning() {
@@ -72,6 +69,7 @@ src_configure() {
 	econf \
 		--enable-modplug \
 		--enable-neon \
+		--disable-gtk3 \
 		$(use_enable adplug) \
 		$(use_enable aac) \
 		$(use_enable alsa) \
@@ -83,7 +81,6 @@ src_configure() {
 		$(use_enable flac flacng) \
 		$(use_enable fluidsynth amidiplug-flsyn) \
 		$(use_enable flac filewriter_flac) \
-		$(use_enable gtk3) \
 		$(use_enable ipv6) \
 		$(use_enable jack) \
 		$(use_enable gnome gnomeshortcuts) \