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, 53 insertions, 6 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 32b8b269e995..e673cf06f278 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # 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.240 2012/04/15 22:29:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.241 2012/04/16 00:37:55 jdhore Exp $
+
+*audacious-plugins-3.2.2-r1 (16 Apr 2012)
+
+  16 Apr 2012; Jeff Horelick <jdhore@gentoo.org>
+  +audacious-plugins-3.2.2-r1.ebuild,
+  +files/audacious-plugins-3.2.2-fix-build-gmodule.patch,
+  -audacious-plugins-3.2.2.ebuild:
+  Revision bump to fix building for some people(?). Also, drop broken 3.2.2
 
 *audacious-plugins-3.2.2 (15 Apr 2012)
 
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index f244b0990689..d2d35db685c6 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,3 +1,4 @@
+AUX audacious-plugins-3.2.2-fix-build-gmodule.patch 1244 RMD160 35437408a10eba1c616b2b78f605ab82c51f21ba SHA1 17e73f9d886b961d12053d1ee2a21dd1260333a3 SHA256 c86428993218ea785d740cc0e051a4c2401aadc17f35940048dd39347f1acdd5
 AUX audacious-plugins_ldflags.patch 392 RMD160 4d606042a86ecc360fdd51131286027fbb5c991c SHA1 12929db542e94db329f50fec1d01a296b764c032 SHA256 1c22569d2a5c54656713f57b74412f61d09e002b87c6af2c291e771217d91a6a
 DIST audacious-plugins-2.4.4.tgz 3425914 RMD160 d8ec95fb678efcb9acd17e77b890d4c685c2b892 SHA1 33a43cdcb699578accbc181918b96da6ab04cedc SHA256 24948ae2161ddde580bcad27dbc11faed0cacd142252749e64da5f8f5e8084e4
 DIST audacious-plugins-2.5.4.tar.gz 3500309 RMD160 a2cf4b9407492758c7ee9b858c7c75b9d906c524 SHA1 8aedcc58c3b5a9415345374014d809ccb9a7541a SHA256 149fd27f476670d8ab3b8e9beaad9ab9de5955c8cbec70bf27e26446168148d8
@@ -13,7 +14,7 @@ EBUILD audacious-plugins-3.0.3.ebuild 3358 RMD160 b4a0377e24710d13ba8e440bf35945
 EBUILD audacious-plugins-3.1.1.ebuild 3456 RMD160 cf022a7bdb67c98402a5573af5eb9105531cccb9 SHA1 4fe0861c76fee2d933e731a94bab270e7f744400 SHA256 f450e4a073f9799ca9c1b788444ef1dde3e552cfa2f57a1c9ed3aa3cff3366a1
 EBUILD audacious-plugins-3.1.ebuild 3447 RMD160 c10654159eb92a78f2d8a8f810b1191e0e467c61 SHA1 512c70de9b368e9f71543d7ca4e23a2662153664 SHA256 9bb02a2feabddf18b97b9c3c4bb7dfe702af097b5284d59a5fecc422115f97c4
 EBUILD audacious-plugins-3.2.1.ebuild 3350 RMD160 f3c9b345e6d3045b2dfe10b8fc069732f490af49 SHA1 df007752bf4042b1179633a99a2463824d615252 SHA256 5086738e01ad2717006d619c80d63fa66bc8afaf82889326019ac605ad23d44e
-EBUILD audacious-plugins-3.2.2.ebuild 3248 RMD160 94498af0819e3679646112faec1cd0199098e40e SHA1 8933fccea507c9c00127c0a969546d2d9937a4f2 SHA256 1c6c80e7ab6e6712df1777e5d5bb90023041a9abdcb4fca5c71f6318f41ab5b1
+EBUILD audacious-plugins-3.2.2-r1.ebuild 3372 RMD160 88343b4192d7ab920917a7906bc6ca6b446a7e55 SHA1 cdaef1758ddc9d4712a58d0188f0002cf989b66b SHA256 29144d6773053d032267578151719bb827c8fec9210f684c89efc7db1f3dd040
 EBUILD audacious-plugins-3.2.ebuild 3346 RMD160 8053326b00a4cbef3b3cf9f4f578ba3caf3857d0 SHA1 6b361fbd5f15a5d03b05b6508401c1e339b59d7b SHA256 8ef75f784ce890dec192c9f6aacc64bb65adc21d3b185a7ae41be81c635623c1
-MISC ChangeLog 49674 RMD160 7c8186cbb864fe14501f27af0184b869b954ac5b SHA1 ca439dedc554d5d32de0c7a243d8e4353c299d94 SHA256 e92a1afbf862083fb988266243607333f486a5a4c81a55b00df87e87a0d50a01
+MISC ChangeLog 49974 RMD160 1e3106bfb144f0cc67026df85e61e037e337bf3b SHA1 0fd0ac77c27ffb74f79f9a04cafee6011185ddb8 SHA256 8e4d4a07102a53143ce32ad9ce20a68894ef4d1bee8f191ec89184aa4fa66ece
 MISC metadata.xml 900 RMD160 bbe25dee100a0a3158ca5cdb78e142adbc8a7cd6 SHA1 0d199202747a7e8fc420f4fa7172877d865e16c9 SHA256 67b5344a7a88e6d04a4df5958625bc175514692e5e0f5a9c441ebbbcf9bb2750
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.2.2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild
index 14178aec4a2b..6d83f0a23575 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.2.2.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.2.ebuild,v 1.1 2012/04/15 22:29:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild,v 1.1 2012/04/16 00:37:55 jdhore Exp $
 
 EAPI=4
 
-inherit eutils flag-o-matic
+inherit eutils autotools flag-o-matic
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
@@ -22,7 +22,7 @@ RDEPEND="app-arch/unzip
 	>=dev-libs/dbus-glib-0.60
 	dev-libs/libxml2:2
 	media-libs/libmodplug
-	>=media-sound/audacious-3.2.2
+	>=media-sound/audacious-3.2.2-r1
 	>=net-libs/neon-0.26.4
 	gtk? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
@@ -68,6 +68,13 @@ mp3_warning() {
 	fi
 }
 
+src_prepare() {
+	epatch "$FILESDIR"/${P}-fix-build-gmodule.patch
+	eaclocal -I m4
+	eautoheader
+	eautoconf
+}
+
 src_configure() {
 	mp3_warning
 
diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.2.2-fix-build-gmodule.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.2.2-fix-build-gmodule.patch
new file mode 100644
index 000000000000..2f06396e8d1a
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/audacious-plugins-3.2.2-fix-build-gmodule.patch
@@ -0,0 +1,31 @@
+commit a29df1ab4ba9f3964ca475c0c727136357ddfb86
+Author: John Lindgren <john.lindgren@aol.com>
+Date:   Mon Apr 2 02:10:32 2012 -0400
+
+    Make check for GMODULE_{CFLAGS,LIBS} unconditional; LADSPA plugin needs it also.
+
+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/configure.ac b/configure.ac
+index d976576..358f841 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -757,8 +757,6 @@ fi
+ 
+ if test "x$enable_amidiplug" = "xyes"; then
+   INPUT_PLUGINS="$INPUT_PLUGINS amidi-plug"
+-  PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0],,)
+-  PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.6.0],,)
+   AMIDIPLUG_BACKEND_DIR=amidi-plug
+   AC_SUBST(AMIDIPLUG_BACKEND_DIR)
+   if test "x$enable_amidiplug_alsa" = "xauto" -o "x$enable_amidiplug_alsa" = "xyes"; then