Revision bump to fix building for some people(?). Also, drop broken 3.2.2

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

4 files changed, 71 insertions, 6 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index e0bc117c2e16..a12bb747dc48 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/audacious
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.259 2012/04/15 22:28:13 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.260 2012/04/16 00:34:42 jdhore Exp $
+
+*audacious-3.2.2-r1 (16 Apr 2012)
+
+  16 Apr 2012; Jeff Horelick <jdhore@gentoo.org> +audacious-3.2.2-r1.ebuild,
+  +files/audacious-3.2.2-fix-build-gmodule.patch, -audacious-3.2.2.ebuild:
+  Revision bump to fix building for some people(?). Also, drop broken 3.2.2
 
 *audacious-3.2.2 (15 Apr 2012)
 
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 93332d356848..506379ece231 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,3 +1,4 @@
+AUX audacious-3.2.2-fix-build-gmodule.patch 1668 RMD160 0f2f76725463b9710fbfe5f24b79e5a0928c44ec SHA1 930f888d7b95669ed36212cf6c9416483b7cf94d SHA256 21641fa4c35d4e3aeabbd0f0d51e71e3ee2b50a979b2154e00fbdd86399c55fa
 AUX audacious_ldflags.patch 392 RMD160 270aba025929c216069e71b9b18edab76093a5c2 SHA1 358d3f3784e7a1563a6e3237dc318b5262f2a33f SHA256 b50f57ccc80ab472876b2a3726a5d894be11f5b6bfc70ac1411ece67c839d767
 DIST audacious-2.4.4.tgz 1344519 RMD160 75c960b158b3b6367cca4a7da65d98d8a35a13d9 SHA1 697b2cc217cef9785cf7ec0c4ee617bc174fbe98 SHA256 76f84038a0360da80aeaddd1ec23e5a55fee5a120abffce97c4609958cdb30e8
 DIST audacious-2.5.4.tar.gz 1221134 RMD160 40c4482a0ed35c76e214180cf5c3a308b4d83d7a SHA1 6374b09690fba540b82f7fbaa9a4d763c5ea7d79 SHA256 47bc36010e84c2c9638537a42a8451743d55a699bf85c614f3b913596f6e2fcd
@@ -14,7 +15,7 @@ EBUILD audacious-3.0.3-r1.ebuild 1809 RMD160 1afbf2921d6a8f824f6d8df2f2a242ad842
 EBUILD audacious-3.1.1.ebuild 1919 RMD160 2b2252be7cf772c654ae0d37b91a17cdfd00beb6 SHA1 94f25eceb8cf45de30cd8129ddd16b03e8117b39 SHA256 36014d9929616147afec539aad6997be33b33326805838af826ee4e087568f33
 EBUILD audacious-3.1.ebuild 1903 RMD160 7d4df33bdb21f8ab6d08e7456ed9ebcb81538ba1 SHA1 7cde46a77b3cd6c6d802f5e180e944b7f0aede28 SHA256 fbfd70cd334a6fe8410b4268f166edee2c15b771cbc29fc23d3c04812aaa81e9
 EBUILD audacious-3.2.1.ebuild 1799 RMD160 05d7066a086ab15af0ef7debc922f412416a1e58 SHA1 816d6c30e21eb90ab40d8608431202074eb89656 SHA256 d973f6ae9f3460b5974a2e3ad78ec524eee72c43929578cf76b135ff32e760e7
-EBUILD audacious-3.2.2.ebuild 1799 RMD160 174958828f59e00794cd96354bc8d90061d82eea SHA1 7f1ff3a186ba738e6919320ae335c374600d0c8e SHA256 f936dbe2dada8421272d02f6904b04d41b5685c903fe3979163059c2f5751933
+EBUILD audacious-3.2.2-r1.ebuild 1923 RMD160 9bcc0ef3f2c402a7fee8a4d7578fb7867bb8177d SHA1 5a7b13f78d8d0b21f7b1d1e6dc3234b91cc2a472 SHA256 8a29b5e8becf148d849b3de9c0d5e9a56a7925bedfc9198dd1d6caeb9102eaad
 EBUILD audacious-3.2.ebuild 1795 RMD160 c16757e129455210ba017eafca20bd28e1931fb6 SHA1 378c04d47a6314c4bbb09b73ab1acbffd9768680 SHA256 e9941ed0aab7cfea6ddd6d49fbc1962e98a5d5c6e1c614b907438029788967b3
-MISC ChangeLog 45019 RMD160 899a03c862a92e518a6ae5cf80733a0c1b2da79f SHA1 eae4b62c4abc3274eb196db6c473f5492c62607b SHA256 77f9f45ce78c4d6b9f11dd05f941925b88a416ec84771ebc65cc9e518d54d539
+MISC ChangeLog 45283 RMD160 c63ea06239e9897ded63c486996230c255363e8c SHA1 ee64515a129b69737ddedd39bbd8364fc9c5ddf3 SHA256 a0cd74c03a0b6a6d077db15ca337b99f1ce7cedb10d218cb31279911e6f05c53
 MISC metadata.xml 470 RMD160 93b2078a69da3e04398a89e2dae4ea4a780df80b SHA1 980b09dfad5e13b7c63eb933ec9c3b2c72f09839 SHA256 36f1b9c65ec01a55e194084dd8549b7369938e5cf689c8165f4a3aa266f48798
diff --git a/media-sound/audacious/audacious-3.2.2.ebuild b/media-sound/audacious/audacious-3.2.2-r1.ebuild
index 503a22127908..f6f1608fba56 100644
--- a/media-sound/audacious/audacious-3.2.2.ebuild
+++ b/media-sound/audacious/audacious-3.2.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.2.2.ebuild,v 1.1 2012/04/15 22:28:13 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.2.2-r1.ebuild,v 1.1 2012/04/16 00:34:42 jdhore Exp $
 
 EAPI=4
-inherit eutils
+inherit eutils autotools
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
@@ -31,9 +31,16 @@ DEPEND="${RDEPEND}
 	chardet? ( >=app-i18n/libguess-1.1 )
 	nls? ( dev-util/intltool )"
 
-PDEPEND=">=media-plugins/audacious-plugins-3.2.2"
+PDEPEND=">=media-plugins/audacious-plugins-3.2.2-r1"
 REQUIRED_USE="^^ ( gtk gtk3 )"
 
+src_prepare() {
+	epatch "$FILESDIR"/${P}-fix-build-gmodule.patch
+	eaclocal -I m4
+	eautoheader
+	eautoconf
+}
+
 src_configure() {
 	# D-Bus is a mandatory dependency, remote control,
 	# session management and some plugins depend on this.
diff --git a/media-sound/audacious/files/audacious-3.2.2-fix-build-gmodule.patch b/media-sound/audacious/files/audacious-3.2.2-fix-build-gmodule.patch
new file mode 100644
index 000000000000..587b68fa1a49
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.2.2-fix-build-gmodule.patch
@@ -0,0 +1,51 @@
+commit 7b68fdab1dbd2ec3e8eeb37a7a0837d4d0e20851
+Author: John Lindgren <john.lindgren@aol.com>
+Date:   Mon Apr 2 16:50:39 2012 -0400
+
+    Use GMODULE_{CFLAGS,LIBS}.
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 6f6f293..5acb6b7 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -194,6 +194,7 @@ AC_PATH_PROG([WINDRES], [windres])
+ dnl Check for Gtk+/GLib and pals
+ dnl ============================
+ AUD_CHECK_MODULE([GLIB], [glib-2.0], [>= 2.16], [Glib2])
++AUD_CHECK_MODULE([GMODULE], [gmodule-2.0], [>= 2.16], [GModule])
+ AUD_CHECK_MODULE([GTHREAD], [gthread-2.0], [>= 2.16], [GThread])
+ AUD_CHECK_MODULE([PANGO], [pango], [>= 1.20], [Pango])
+ AUD_CHECK_MODULE([CAIRO], [cairo], [>= 1.6], [Cairo])
+diff --git a/extra.mk.in b/extra.mk.in
+index 464bbb0..1ff2a08 100644
+--- a/extra.mk.in
++++ b/extra.mk.in
+@@ -21,6 +21,8 @@ DBUS_CFLAGS ?= @DBUS_CFLAGS@
+ DBUS_LIBS ?= @DBUS_LIBS@
+ GLIB_CFLAGS ?= @GLIB_CFLAGS@
+ GLIB_LIBS ?= @GLIB_LIBS@
++GMODULE_CFLAGS ?= @GMODULE_CFLAGS@
++GMODULE_LIBS ?= @GMODULE_LIBS@
+ GTHREAD_CFLAGS ?= @GTHREAD_CFLAGS@
+ GTHREAD_LIBS ?= @GTHREAD_LIBS@
+ GTK_CFLAGS ?= @GTK_CFLAGS@
+diff --git a/src/audacious/Makefile b/src/audacious/Makefile
+index ea95c85..22dad64 100644
+--- a/src/audacious/Makefile
++++ b/src/audacious/Makefile
+@@ -99,6 +99,7 @@ pre-depend: ${DBUS_BINDINGS}
+ CPPFLAGS := -I.. -I../.. \
+             ${CPPFLAGS} \
+ 		${GLIB_CFLAGS}			\
++		${GMODULE_LIBS} \
+ 		${GTHREAD_CFLAGS} \
+ 		${GTK_CFLAGS}			\
+ 		${AUDACIOUS_DEFINES}	\
+@@ -119,6 +120,7 @@ LIBS := -L../libaudcore -laudcore \
+ 		${LIBINTL}						\
+ 		${EGGSM_LIBS}					\
+ 		${GLIB_LIBS}					\
++		${GMODULE_LIBS} \
+ 		${GTHREAD_LIBS} \
+ 		${GTK_LIBS}						\
+ 		${DBUS_LIBS}					\