Fix building with asneeded wrt #273018, thanks to Sander Sweers and Kevin DeKorte.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 53 insertions, 5 deletions

diff --git a/media-video/gnome-mplayer/ChangeLog b/media-video/gnome-mplayer/ChangeLog
index 91e0dfdb0d9f..3c922c0b50e2 100644
--- a/media-video/gnome-mplayer/ChangeLog
+++ b/media-video/gnome-mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/gnome-mplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.21 2009/06/07 17:18:33 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.22 2009/06/07 18:58:42 ssuominen Exp $
+
+  07 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-mplayer-0.9.6.ebuild, +files/gnome-mplayer-0.9.6-asneeded.patch:
+  Fix building with asneeded wrt #273018, thanks to Sander Sweers and Kevin
+  DeKorte.
 
   07 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
   gnome-mplayer-0.9.5-r2.ebuild:
diff --git a/media-video/gnome-mplayer/Manifest b/media-video/gnome-mplayer/Manifest
index d78c0aaf53c3..3ef32eec6fb2 100644
--- a/media-video/gnome-mplayer/Manifest
+++ b/media-video/gnome-mplayer/Manifest
@@ -1,8 +1,9 @@
+AUX gnome-mplayer-0.9.6-asneeded.patch 1016 RMD160 4a8d49b103ebb7c488e52f9d083bb276dc5a1a8a SHA1 37886d04935f4be709bf77b461208efbb496c8b1 SHA256 d850efe8cc1041e0b376a4ffc4ebf59f419a65a11f9cc91bf311fbbbc31508ac
 DIST gnome-mplayer-0.6.0.tar.gz 450727 RMD160 bceccc4966c70d2a734e2e2c361883e2d2ed0ac0 SHA1 48ddf50d02f956a0b6258973897ab66861ca9285 SHA256 1309c69f90b75a8a8503c321b5652b239ce6a0c3c150476d831df2e00cdc661e
 DIST gnome-mplayer-0.9.5.tar.gz 747308 RMD160 474cc743f36254e92e171656a05e19c9addffc34 SHA1 d6a46e32d5d305eed68b25ae280b77d74095e873 SHA256 4cefb2afa08d8e75c1273980e2cad0e13f4b872e2f90019f1ac0d75ec9fa41b7
 DIST gnome-mplayer-0.9.6.tar.gz 813872 RMD160 9c1f9be01a4fc7be880ab7b5fa01e849a435078e SHA1 39fa5f7978bd67adab4fc055541d4d1c719afdf7 SHA256 5dec27feee7971d3b88e3b23ccc0e47ef2e7040ebc526b72629b78507c8c6c3f
 EBUILD gnome-mplayer-0.6.0.ebuild 842 RMD160 50100d067a9a71c5264278ee83fdc7c04458edb5 SHA1 052236a7dba16ce0da860d02fac5ae176755251b SHA256 6b9d3170b59aceb1ee1bad3f83efa6b12ead466740eecf147ba0507fb890fcfa
 EBUILD gnome-mplayer-0.9.5-r2.ebuild 1432 RMD160 7c3c3711a35f5f55c4eea6467050f23de067dfae SHA1 78b982506c803c19c9e810b7153828d792707a1b SHA256 64f4549ddf747edc2a477fcd6e17b136aed9c25592763a7401a1d76b32ffea85
-EBUILD gnome-mplayer-0.9.6.ebuild 1410 RMD160 d99540fe9b82e8e750719c9164d566ffcdbfadb5 SHA1 751ec371bde2c85abe4634d88b4aa69dad5f45f7 SHA256 67e05441774d69025207c888abfd2a5c8520089d6fd6e9471039548fc41aebc5
-MISC ChangeLog 3603 RMD160 0e406a7add2cc945c656011b57488b4b85ba68f4 SHA1 640c4ff0bb6056414f387500ce23c229f9da3cc9 SHA256 e8f5e45f3d987e7ca6056f3335a51551601b373b506866d2e0c460d049dee8b1
+EBUILD gnome-mplayer-0.9.6.ebuild 1501 RMD160 cfa4b3f9fd4620c77ec45fbdb4a98c47462a1326 SHA1 ec01919c27dd88f936d7465442011da29ae2e050 SHA256 a64805e60aa08d8dd589c9c9aff506c831573aff41077c2a7f6378272abec907
+MISC ChangeLog 3819 RMD160 47126ee186c2d403a95c4811b0804c120dbd7a80 SHA1 5307e1fc9dafeacbf73a4ec9dd3340c0aab3981d SHA256 fc01836192473e0ec79f912d7fcd8cffdbf9143d7bfabd5593ef2434361f1823
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
diff --git a/media-video/gnome-mplayer/files/gnome-mplayer-0.9.6-asneeded.patch b/media-video/gnome-mplayer/files/gnome-mplayer-0.9.6-asneeded.patch
new file mode 100644
index 000000000000..34b7ac2e9aec
--- /dev/null
+++ b/media-video/gnome-mplayer/files/gnome-mplayer-0.9.6-asneeded.patch
@@ -0,0 +1,37 @@
+diff -aurN gnome-mplayer-0.9.6.orig/src/Makefile.am gnome-mplayer-0.9.6/src/Makefile.am
+--- gnome-mplayer-0.9.6.orig/src/Makefile.am	2009-06-07 10:34:12.000000000 +0200
++++ gnome-mplayer-0.9.6/src/Makefile.am	2009-06-07 10:39:18.000000000 +0200
+@@ -59,11 +59,19 @@
+ 	langlist.h
+ 
+ 
+-gnome_mplayer_LDFLAGS = 
++gnome_mplayer_LDFLAGS =
+ 
+-gnome_mplayer_LDADD = $(GTK_LIBS) $(GIO_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) $(ALSA_LIBS) $(NOTIFY_LIBS) $(GPOD_LIBS) $(MUSICBRAINZ_LIBS) \
+-    libgmtk/libgmtk.la \
+-    libgmlib/libgmlib.la
++gnome_mplayer_LDADD =		\
++    libgmtk/libgmtk.la		\
++    libgmlib/libgmlib.la	\
++    $(GTK_LIBS)			\
++    $(GIO_LIBS)			\
++    $(DBUS_LIBS)		\
++    $(GCONF_LIBS)		\
++    $(ALSA_LIBS)		\
++    $(NOTIFY_LIBS)		\
++    $(GPOD_LIBS)		\
++    $(MUSICBRAINZ_LIBS)
+ 
+ if HAVE_NAUTILUS
+ 
+@@ -78,7 +86,8 @@
+ libgnome_mplayer_properties_page_la_CFLAGS = \
+     $(NAUTILUS_CFLAGS) \
+     $(AM_CFLAGS)
+-    
++
++libgnome_mplayer_properties_page_la_LDFLAGS = -module -avoid-version
+ 
+ endif #HAVE_NAUTILUS
+ 
diff --git a/media-video/gnome-mplayer/gnome-mplayer-0.9.6.ebuild b/media-video/gnome-mplayer/gnome-mplayer-0.9.6.ebuild
index d07d7d710701..3ae1d1239da8 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-0.9.6.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-0.9.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-0.9.6.ebuild,v 1.1 2009/06/07 09:20:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-0.9.6.ebuild,v 1.2 2009/06/07 18:58:42 ssuominen Exp $
 
 EAPI=2
 GCONF_DEBUG=no
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="MPlayer GUI for GNOME Desktop Environment"
 HOMEPAGE="http://code.google.com/p/gnome-mplayer"
@@ -45,6 +45,11 @@ pkg_setup() {
 		$(use_with musicbrainz libmusicbrainz3)"
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}
+
 src_install() {
 	gnome2_src_install
 	# remove duplicate doc dir