Fix nsplugin flag (bug #147280)

(Portage version: 2.1.2_pre3-r1)

3 files changed, 160 insertions, 1 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index a2611016bfc6..21370fdb8399 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,11 @@
 # 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.133 2006/10/13 07:31:23 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.134 2006/10/16 00:01:22 compnerd Exp $
+
+*totem-2.16.2-r1 (16 Oct 2006)
+
+  16 Oct 2006; <compnerd@gentoo.org> +totem-2.16.2-r1.ebuild:
+  Fix browser plugin issue (bug #147280)
 
 *totem-2.16.2 (13 Oct 2006)
 
diff --git a/media-video/totem/files/digest-totem-2.16.2-r1 b/media-video/totem/files/digest-totem-2.16.2-r1
new file mode 100644
index 000000000000..a41d079c45f9
--- /dev/null
+++ b/media-video/totem/files/digest-totem-2.16.2-r1
@@ -0,0 +1,3 @@
+MD5 6e98e3bc2b8531611906bd2bca73f743 totem-2.16.2.tar.bz2 1831393
+RMD160 1eb3a5bbcf082b7d3808a1e582100d9fbe507809 totem-2.16.2.tar.bz2 1831393
+SHA256 7f088dc3630d040b44a5ddb84d07baae6fb5593d6fa6fd25b86bd9c46e82101d totem-2.16.2.tar.bz2 1831393
diff --git a/media-video/totem/totem-2.16.2-r1.ebuild b/media-video/totem/totem-2.16.2-r1.ebuild
new file mode 100644
index 000000000000..82dca42e3a37
--- /dev/null
+++ b/media-video/totem/totem-2.16.2-r1.ebuild
@@ -0,0 +1,151 @@
+# 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-2.16.2-r1.ebuild,v 1.1 2006/10/16 00:01:22 compnerd Exp $
+
+inherit autotools eutils multilib gnome2
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="http://gnome.org/projects/totem/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# pitdfdll has not come out with a 0.10 release, should be soon though -AJL
+# IUSE="win32codecs"
+
+IUSE="a52 dbus dvd firefox flac gnome hal lirc mad mpeg nsplugin nvtv ogg theora vorbis xine xv"
+
+RDEPEND=">=dev-libs/glib-2.8.0
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/gnome-vfs-2.10
+	>=gnome-base/libgnomeui-2.4
+	>=x11-themes/gnome-icon-theme-2.10
+	>=gnome-base/libglade-2
+	>=gnome-base/gnome-desktop-2.2
+	app-text/iso-codes
+	>=gnome-base/gconf-2
+	x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	dbus? ( >=sys-apps/dbus-0.35 )
+	hal? ( =sys-apps/hal-0.5* )
+	gnome? ( >=gnome-base/nautilus-2.10 )
+	lirc? ( app-misc/lirc )
+	sparc? ( >=www-client/mozilla-firefox-1.5 )
+	ppc64? ( >=www-client/seamonkey-1.0 )
+	nsplugin?	(
+					firefox? ( >=www-client/mozilla-firefox-1.5 )
+					!sparc? ( !firefox? ( >=www-client/seamonkey-1.0 ) )
+					>=sys-apps/dbus-0.35
+					>=x11-misc/shared-mime-info-0.17
+				)
+	xine? ( >=media-libs/xine-lib-1.1.2 )
+	!xine?	(
+				>=media-libs/gstreamer-0.10.1
+				>=media-libs/gst-plugins-base-0.10.7
+				>=media-libs/gst-plugins-good-0.10
+				>=media-plugins/gst-plugins-pango-0.10
+				>=media-plugins/gst-plugins-gconf-0.10
+				!sparc? ( >=media-plugins/gst-plugins-ffmpeg-0.10 )
+				>=media-plugins/gst-plugins-gnomevfs-0.10
+				a52? ( >=media-plugins/gst-plugins-a52dec-0.10 )
+				!sparc?	(
+							dvd?
+								(
+									>=media-plugins/gst-plugins-a52dec-0.10
+									>=media-plugins/gst-plugins-mpeg2dec-0.10
+									>=media-libs/gst-plugins-ugly-0.10
+									>=media-plugins/gst-plugins-dvdread-0.10
+								)
+						)
+				flac? ( >=media-plugins/gst-plugins-flac-0.10 )
+				mad? ( >=media-plugins/gst-plugins-mad-0.10 )
+				!sparc? ( mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10 ) )
+				ogg? ( >=media-plugins/gst-plugins-ogg-0.10 )
+				theora?	(
+							>=media-plugins/gst-plugins-ogg-0.10
+							>=media-plugins/gst-plugins-theora-0.10
+						)
+				vorbis? (
+							>=media-plugins/gst-plugins-ogg-0.10
+							>=media-plugins/gst-plugins-vorbis-0.10
+						)
+				xv? ( >=media-plugins/gst-plugins-xvideo-0.10 )
+			)
+	nvtv? ( >=media-tv/nvtv-0.4.5 )"
+
+# this belongs above xv? above.
+# win32codecs? ( >=media-plugins/gst-plugins-pitfdll-0.10 )
+
+DEPEND="${RDEPEND}
+		app-text/scrollkeeper
+		>=dev-util/intltool-0.35
+		>=dev-util/pkgconfig-0.20"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+			--disable-vanity \
+			--disable-gtk \
+			$(use_with dbus) \
+			$(use_with hal) \
+			$(use_enable gnome nautilus) \
+			$(use_enable lirc) \
+			$(use_enable nvtv)"
+
+	if use nsplugin ; then
+		G2CONF="${G2CONF} --enable-browser-plugins"
+
+		if use firefox || use sparc; then
+			G2CONF="${G2CONF} --with-mozilla=firefox"
+		else
+			G2CONF="${G2CONF} --with-mozilla=seamonkey"
+		fi
+	else
+		G2CONF="${G2CONF} --disable-browser-plugins"
+	fi
+
+	# gstreamer is default backend
+	use xine || G2CONF="${G2CONF} --enable-gstreamer=yes"
+
+	# Use global nsplugins dir
+	G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix hardcoded plugindir
+	sed -i -e \
+		's|mozilla|nsbrowser|' \
+		${S}/browser-plugin/Makefile.in \
+		${S}/browser-plugin/idl/Makefile.in
+
+	# fixes for ff compiles.
+	if use nsplugin && ( use firefox || use sparc ); then
+		epatch ${FILESDIR}/${PN}-1.5.91-mozilla-firefox-include-fix.patch
+	fi
+}
+
+src_compile() {
+	#fixme: why does it need write access here, probably need to set up a fake
+	#home in /var/tmp like other pkgs do
+	addpredict "/root/.gconfd"
+	addpredict "/root/.gconf"
+	addpredict "/root/.gnome2"
+	addpredict "/root/.gstreamer-0.10"
+
+	gnome2_src_compile
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	einfo "Note that the default totem backend has switched to gstreamer."
+	einfo "DVD menus will only work with the xine backend."
+}