Fix automagic dependency on libindicate (bug #369215)

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 46 insertions, 8 deletions

diff --git a/media-sound/xnoise/ChangeLog b/media-sound/xnoise/ChangeLog
index 59dd08e0a953..2c7d9af6b358 100644
--- a/media-sound/xnoise/ChangeLog
+++ b/media-sound/xnoise/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/xnoise
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/ChangeLog,v 1.7 2011/05/26 16:06:50 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/ChangeLog,v 1.8 2011/05/30 09:53:23 angelos Exp $
+
+  30 May 2011; Christoph Mende <angelos@gentoo.org> xnoise-0.1.23.ebuild,
+  +files/xnoise-0.1.23-automagic-libindicate.patch:
+  Fix automagic dependency on libindicate (bug #369215)
 
   26 May 2011; Christoph Mende <angelos@gentoo.org> xnoise-9999.ebuild:
   Bump autoconf dep to >=2.67 (bug #368789)
diff --git a/media-sound/xnoise/Manifest b/media-sound/xnoise/Manifest
index 86e4d0614a77..fbf721a439ed 100644
--- a/media-sound/xnoise/Manifest
+++ b/media-sound/xnoise/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xnoise-0.1.23-automagic-libindicate.patch 852 RMD160 974466b0f54ff3edd6017f09b577ffe46a38b04f SHA1 d622af4bac46a91e20237dc3ba7db45f796cc5d8 SHA256 4addc42c595126720db177149858297d18c8392511b869faebd3192b8fff234a
 DIST xnoise-0.1.23.tar.bz2 877182 RMD160 dbdb185a5ca731cb7ca1cb142f96f70bb3f48a23 SHA1 397220d8a7a9f903b6718b8c3976fd84b7b81f3f SHA256 23d70427211817bd6a11118cb2bbd6ca08f950aa9dc9ca7ca882373f361e6d0f
-EBUILD xnoise-0.1.23.ebuild 1607 RMD160 eadc2d7f4266aa4e4e66715528c64b0b55ed5964 SHA1 7339fde507213a8400c0481348dc945e131dd4f3 SHA256 eb14a86695251bff79a0d09d6e4a73572c3a4cfca018ed098ff9adbff4c9df73
+EBUILD xnoise-0.1.23.ebuild 1711 RMD160 85b791ce74ca19bbd78e1ea056dce57b4a1d51c9 SHA1 573bb6b855ba260904db6808341d62bf9943ac99 SHA256 3f83cc75c71297e437c3cf25d926176eb57d9ac25cd8a00d36451ba875771ece
 EBUILD xnoise-9999.ebuild 1761 RMD160 c027999edca3eb25efd0c5d1dfc33714d6661f4e SHA1 985282dbf7103163242f8e64ea70ff824142d9d0 SHA256 9099cee78f85dc992ee638b6f795b48343b3e77fad91c26d1c3f8052fbfcd321
-MISC ChangeLog 1059 RMD160 a5ae7f9f3e44e664131bb6b9daba75009e73bd77 SHA1 4be74cc28b2ef8ffcb058774ebe94effcf7de8be SHA256 a01e1c1348bab7cca8a776471a143a91bc6b0032a3ea0d277646c7519befe5f4
+MISC ChangeLog 1242 RMD160 e0be01609105727db8d79512c9ccf04e976cb24f SHA1 309c4a98e3ef21f53f8aa772d9dcc91abf8acc0f SHA256 febe3da102a2ba4a83ed26d1d758fae87a7fa295bdbf90cd6ab013201308c2ff
 MISC metadata.xml 401 RMD160 201e1e7f96beb67a9938c39b2aef2a4eaa138d85 SHA1 b875d409088f64e68643b54ac8b446364d18c1ab SHA256 f78e0e4e25c27ab05eb5b9cccd613b86c1d25320bc923c8a46c74e75cbcaa21c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3eeqAACgkQmWq1bYTyC0P9owD+K3KfGkc9D5j0QmeUx0nZq5+T
-YicGUui4CKnmAICgRekBAKMhQcuwo4W4DxRBJoKHKNjo3fT8NBIIjV7ZADb9pthk
-=mZzp
+iF4EAREIAAYFAk3jaRoACgkQmWq1bYTyC0Oc/wD7BGx6767+H2w/vY7tJ0LhzNb1
+CWqj33UtAJS/M8/FgZwBAMJm+memnvKvbrY9QxHo6uz+r+h0ueJKM7wZZYZJjfZA
+=lzHR
 -----END PGP SIGNATURE-----
diff --git a/media-sound/xnoise/files/xnoise-0.1.23-automagic-libindicate.patch b/media-sound/xnoise/files/xnoise-0.1.23-automagic-libindicate.patch
new file mode 100644
index 000000000000..9cb6b63fc9c1
--- /dev/null
+++ b/media-sound/xnoise/files/xnoise-0.1.23-automagic-libindicate.patch
@@ -0,0 +1,28 @@
+diff --git a/plugins/mpris/Makefile.am b/plugins/mpris/Makefile.am
+index b5f5cbb..3bbd192 100644
+--- a/plugins/mpris/Makefile.am
++++ b/plugins/mpris/Makefile.am
+@@ -13,7 +13,6 @@ INCLUDES = \
+     -DLOCALE_DIR=\"${datarootdir}/locale\" \
+     -include $(CONFIG_HEADER) \
+     -I$(top_srcdir)/src \
+-    $(LIBINDICATE_CFLAGS) \
+     -DGIO_DISABLE_DEPRECATED=1 \
+     -DGDK_DISABLE_DEPRECATED=1 \
+     -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+@@ -36,7 +35,6 @@ libmpris_la_VALAFLAGS = \
+     --vapidir $(top_srcdir)/vapi \
+     --basedir $(top_srcdir)/plugins/mpris \
+     --vapidir $(top_srcdir)/src \
+-    --pkg indicate \
+     --pkg xnoise-1.0 \
+     @XNOISE_PACKAGES@ \
+     $(NULL)
+@@ -47,7 +45,6 @@ libmpris_la_LDFLAGS = \
+ 
+ libmpris_la_LIBADD = \
+     $(XNOISE_LIBS) \
+-    $(LIBINDICATE_LIBS) \
+     $(NULL)
+ 
+ mprisinformation_DATA = mpris.xnplugin
diff --git a/media-sound/xnoise/xnoise-0.1.23.ebuild b/media-sound/xnoise/xnoise-0.1.23.ebuild
index ea8a1a3990f8..2a37abc384d0 100644
--- a/media-sound/xnoise/xnoise-0.1.23.ebuild
+++ b/media-sound/xnoise/xnoise-0.1.23.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/xnoise-0.1.23.ebuild,v 1.3 2011/05/24 17:38:04 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/xnoise-0.1.23.ebuild,v 1.4 2011/05/30 09:53:23 angelos Exp $
 
 EAPI=4
-inherit fdo-mime gnome2-utils
+inherit autotools eutils fdo-mime gnome2-utils
 
 DESCRIPTION="A media player for Gtk+ with a slick GUI, great speed and lots of
 features"
@@ -35,6 +35,11 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS NEWS README )
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-automagic-libindicate.patch
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--disable-soundmenu \