apply as-needed patch, fixes #128466

(Portage version: 2.1_pre10-r5)

3 files changed, 112 insertions, 7 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 9660ff1292f8..a4bd10e7f849 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/totem
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.108 2006/05/06 13:01:15 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.109 2006/05/11 23:40:17 allanonjl Exp $
+
+  11 May 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +files/totem-1.4.0-as-needed.patch, totem-1.4.0.ebuild:
+  apply as-needed patch, fixes #128466
 
   06 May 2006; John N. Laliberte <allanonjl@gentoo.org> totem-1.4.0.ebuild:
   drop alpha,hppa,ia64, bug filed. prep for 2.14 unmask
diff --git a/media-video/totem/files/totem-1.4.0-as-needed.patch b/media-video/totem/files/totem-1.4.0-as-needed.patch
new file mode 100644
index 000000000000..8b245d451f7f
--- /dev/null
+++ b/media-video/totem/files/totem-1.4.0-as-needed.patch
@@ -0,0 +1,101 @@
+diff -ru totem-1.4.0/src/backend/Makefile.am totem-1.4.0-patched/src/backend/Makefile.am
+--- totem-1.4.0/src/backend/Makefile.am	2006-02-10 17:45:18.000000000 -0500
++++ totem-1.4.0-patched/src/backend/Makefile.am	2006-04-02 13:10:16.000000000 -0400
+@@ -12,8 +12,8 @@
+ 	-DDATADIR=\""$(datadir)"\" \
+ 	-DLOGO_PATH=DATADIR\"\"G_DIR_SEPARATOR_S\"totem\"G_DIR_SEPARATOR_S\"totem_logo.png\"
+ bvw_test_LDADD = \
+-	$(GTK_LIBS) $(XVIDMODE_LIBS) $(NVTV_LIBS) $(XTEST_LIBS) $(X_LIBS) \
+-	libbaconvideowidget.la
++	libbaconvideowidget.la \
++	$(GTK_LIBS) $(XVIDMODE_LIBS) $(NVTV_LIBS) $(XTEST_LIBS) $(X_LIBS)
+ 
+ if TOTEM_GST_010
+ MM = bacon-video-widget-gst-0.10.c \
+diff -ru totem-1.4.0/src/Makefile.am totem-1.4.0-patched/src/Makefile.am
+--- totem-1.4.0/src/Makefile.am	2006-02-10 17:44:54.000000000 -0500
++++ totem-1.4.0-patched/src/Makefile.am	2006-04-02 13:18:00.000000000 -0400
+@@ -100,16 +100,17 @@
+ 	ev-sidebar.c ev-sidebar.h
+ 
+ totem_LDADD = \
++	plparse/libtotem-plparser.la backend/libbaconvideowidget.la \
++	libbaconpropertiespage.la libbaconmessageconnection.la \
+ 	$(EXTRA_GNOME_LIBS) $(REMOTE_LIBS) \
+-	$(XVIDMODE_LIBS) $(NVTV_LIBS) plparse/libtotem-plparser.la \
+-	backend/libbaconvideowidget.la libbaconpropertiespage.la \
+-	libbaconmessageconnection.la $(DBUS_LIBS) \
+-	$(XTEST_LIBS) $(X_LIBS)
++	$(XVIDMODE_LIBS) $(NVTV_LIBS) \
++	$(DBUS_LIBS) $(XTEST_LIBS) $(X_LIBS)
+ 
+ totem_video_thumbnailer_SOURCES = totem-video-thumbnailer.c
+ totem_video_thumbnailer_LDADD = \
++	backend/libbaconvideowidget.la \
+ 	$(GTK_LIBS) $(XVIDMODE_LIBS) \
+-	$(NVTV_LIBS) $(EXTRA_GNOME_LIBS) backend/libbaconvideowidget.la \
++	$(NVTV_LIBS) $(EXTRA_GNOME_LIBS) \
+ 	$(XTEST_LIBS) $(X_LIBS) 
+ 
+ nautilusdir = $(libdir)/nautilus/extensions-1.0/
+@@ -119,9 +120,9 @@
+ 	totem-properties-view.c		\
+ 	totem-properties-view.h
+ libtotem_properties_page_la_LIBADD = \
++	backend/libbaconvideowidget.la libbaconpropertiespage.la \
+ 	$(EXTRA_GNOME_LIBS) $(XVIDMODE_LIBS) \
+ 	$(NVTV_LIBS) $(NAUTILUS_LIBS) \
+-	backend/libbaconvideowidget.la libbaconpropertiespage.la \
+ 	$(XTEST_LIBS) $(X_LIBS)
+ 
+ libtotem_properties_page_la_LDFLAGS = $(module_flags)
+@@ -133,9 +134,9 @@
+ 	totem-properties-view.h		\
+ 	test-properties-page.c
+ test_properties_page_LDADD =		\
++	backend/libbaconvideowidget.la libbaconpropertiespage.la \
+ 	$(EXTRA_GNOME_LIBS) $(XVIDMODE_LIBS) \
+ 	$(NVTV_LIBS) $(NAUTILUS_LIBS) \
+-	backend/libbaconvideowidget.la libbaconpropertiespage.la \
+ 	$(XTEST_LIBS) $(X_LIBS) 
+ 
+ if HAVE_MOZILLA
+@@ -173,9 +174,9 @@
+ 	totem-mozilla-options.h		\
+ 	bacon-volume.c bacon-volume.h
+ totem_mozilla_viewer_LDADD = \
++	backend/libbaconvideowidget.la libbaconpropertiespage.la \
+ 	$(EXTRA_GNOME_LIBS) $(XVIDMODE_LIBS) \
+ 	$(DBUS_LIBS) $(NVTV_LIBS) \
+-	backend/libbaconvideowidget.la libbaconpropertiespage.la \
+ 	$(XTEST_LIBS) $(X_LIBS) 
+ 
+ module_flags = -export_dynamic -avoid-version
+@@ -192,20 +193,22 @@
+ 	vanity.c
+ 
+ vanity_LDADD = \
++	backend/libbaconvideowidget.la \
+ 	$(EXTRA_GNOME_LIBS) $(XVIDMODE_LIBS) \
+-	$(NVTV_LIBS) backend/libbaconvideowidget.la \
+-	$(XTEST_LIBS) $(X_LIBS) 
++	$(NVTV_LIBS) $(XTEST_LIBS) \
++	$(X_LIBS) 
+ 
+ metadata_test_SOURCES = metadata-test.c
+ metadata_test_LDADD = \
++	backend/libbaconvideowidget.la \
+ 	$(GTK_LIBS) $(XVIDMODE_LIBS) $(NVTV_LIBS) \
+-	$(EXTRA_GNOME_LIBS) backend/libbaconvideowidget.la \
++	$(EXTRA_GNOME_LIBS) 
+ 	$(XTEST_LIBS) $(X_LIBS) 
+ 
+ disc_test_SOURCES = disc-test.c
+ disc_test_LDADD = \
+-	$(GTK_LIBS) $(EXTRA_GNOME_LIBS) \
+-	plparse/libtotem-plparser.la
++	plparse/libtotem-plparser.la \
++	$(GTK_LIBS) $(EXTRA_GNOME_LIBS)
+ 
+ list_v4l_SOURCES = list_v4l.c $(BACON_V4L_SELECTION)
+ list_v4l_LDADD = $(GTK_LIBS)
diff --git a/media-video/totem/totem-1.4.0.ebuild b/media-video/totem/totem-1.4.0.ebuild
index d13cebfeaafd..163b89972cab 100644
--- a/media-video/totem/totem-1.4.0.ebuild
+++ b/media-video/totem/totem-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.4.0.ebuild,v 1.5 2006/05/06 13:01:15 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.4.0.ebuild,v 1.6 2006/05/11 23:40:17 allanonjl Exp $
 
 inherit autotools eutils multilib gnome2
 
@@ -101,15 +101,15 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${A}
-	cd "${S}"
+	gnome2_src_unpack
 
 	# Recognize gecko-sdk as a valid toolkit to compile the plugin
-	epatch ${FILESDIR}/${PN}-1.3.0-gecko-sdk.patch
+	epatch "${FILESDIR}"/${PN}-1.3.0-gecko-sdk.patch
 
-	eautoreconf
+	# fix for as-needed #128466
+	epatch "${FILESDIR}"/${PN}-1.4.0-as-needed.patch
 
-	gnome2_omf_fix
+	eautoreconf
 }
 
 src_compile() {