migrate from mozilla and gecko-sdk to seamonkey. remove old versions.

(Portage version: 2.1.1_pre2-r1)

7 files changed, 297 insertions, 1 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 17680bf0461e..266a5ec37c09 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,17 @@
 # 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.114 2006/07/01 19:41:41 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.115 2006/07/03 11:49:37 allanonjl Exp $
+
+*totem-1.4.2-r1 (03 Jul 2006)
+*totem-1.2.1-r1 (03 Jul 2006)
+
+  03 Jul 2006; John N. Laliberte <allanonjl@gentoo.org>
+  -files/totem-1.0.4-fbsd.patch, -files/totem-1.2.0-gecko-sdk.patch,
+  -files/totem-1.2.0-gmoduledep.patch, -files/totem-1.2.0-lang_it_fix.patch,
+  +files/totem-1.4.1-nsIDOMWINDOW.patch, +files/totem-1.4.2-nsIURI.patch,
+  -totem-1.0.4.ebuild, -totem-1.2.0-r1.ebuild, -totem-1.2.0-r2.ebuild,
+  +totem-1.2.1-r1.ebuild, -totem-1.4.0.ebuild, +totem-1.4.2-r1.ebuild:
+  migrate from mozilla and gecko-sdk to seamonkey.  remove old versions.
 
   01 Jul 2006; Daniel Gryniewicz <dang@gentoo.org> totem-1.4.2.ebuild:
   Fix bad gst-plugins-base dep.  Bug #138689
diff --git a/media-video/totem/files/digest-totem-1.2.1-r1 b/media-video/totem/files/digest-totem-1.2.1-r1
new file mode 100644
index 000000000000..2ba499b2249c
--- /dev/null
+++ b/media-video/totem/files/digest-totem-1.2.1-r1
@@ -0,0 +1,3 @@
+MD5 7915469973500dba01d51edfd9e49cf3 totem-1.2.1.tar.bz2 1411347
+RMD160 7d7e69003cd73e060c3e0f9f8b25e23ac484db63 totem-1.2.1.tar.bz2 1411347
+SHA256 569c265cd184ef559cf2e266812f09f93d1642c6fd612c92e1a639e0f91c6621 totem-1.2.1.tar.bz2 1411347
diff --git a/media-video/totem/files/digest-totem-1.4.2-r1 b/media-video/totem/files/digest-totem-1.4.2-r1
new file mode 100644
index 000000000000..fe7b5018ae0b
--- /dev/null
+++ b/media-video/totem/files/digest-totem-1.4.2-r1
@@ -0,0 +1,3 @@
+MD5 5a9b9d127d5065c0ea2a3c8a3c255597 totem-1.4.2.tar.bz2 1707854
+RMD160 87d844ac490adf6210f47a652e17b6fb17c10d3f totem-1.4.2.tar.bz2 1707854
+SHA256 31141a6c55f3252ea01742aecba4c01cb438d7fc93d71a18b53bf06f2e65c03b totem-1.4.2.tar.bz2 1707854
diff --git a/media-video/totem/files/totem-1.4.1-nsIDOMWINDOW.patch b/media-video/totem/files/totem-1.4.1-nsIDOMWINDOW.patch
new file mode 100644
index 000000000000..0c31e56b0481
--- /dev/null
+++ b/media-video/totem/files/totem-1.4.1-nsIDOMWINDOW.patch
@@ -0,0 +1,12 @@
+diff -urN totem-1.4.1-orig/src/totem-mozilla-plugin.cpp totem-1.4.1/src/totem-mozilla-plugin.cpp
+--- totem-1.4.1-orig/src/totem-mozilla-plugin.cpp	2006-06-22 18:39:17.172913352 -0500
++++ totem-1.4.1/src/totem-mozilla-plugin.cpp	2006-06-22 18:39:37.162874416 -0500
+@@ -43,7 +43,7 @@
+ #include "npapi.h"
+ #include "npupp.h"
+ 
+-#include <nsIDOMWindow.h>
++#include <dom/nsIDOMWindow.h>
+ #include <nsIURI.h>
+ #include <nsEmbedString.h>
+ #include <nsIInterfaceRequestorUtils.h>
diff --git a/media-video/totem/files/totem-1.4.2-nsIURI.patch b/media-video/totem/files/totem-1.4.2-nsIURI.patch
new file mode 100644
index 000000000000..edcd824ad1ec
--- /dev/null
+++ b/media-video/totem/files/totem-1.4.2-nsIURI.patch
@@ -0,0 +1,11 @@
+--- totem-1.4.2/src/totem-mozilla-plugin.cpp-orig	2006-07-01 11:52:26.000000000 -0500
++++ totem-1.4.2/src/totem-mozilla-plugin.cpp	2006-07-01 11:52:28.000000000 -0500
+@@ -44,7 +44,7 @@
+ #include "npupp.h"
+ 
+ #include <dom/nsIDOMWindow.h>
+-#include <nsIURI.h>
++#include <necko/nsIURI.h>
+ #include <nsEmbedString.h>
+ #include <nsIInterfaceRequestorUtils.h>
+ #include <docshell/nsIWebNavigation.h>
diff --git a/media-video/totem/totem-1.2.1-r1.ebuild b/media-video/totem/totem-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..fe523d14ac9d
--- /dev/null
+++ b/media-video/totem/totem-1.2.1-r1.ebuild
@@ -0,0 +1,111 @@
+# 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.2.1-r1.ebuild,v 1.1 2006/07/03 11:49:37 allanonjl 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="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="a52 dvd firefox flac gnome lirc mad mpeg nsplugin ogg theora vorbis win32codecs xine xv"
+
+RDEPEND=">=dev-libs/glib-2.6.3
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/gnome-vfs-2.9.92
+	>=gnome-base/libglade-2
+	>=gnome-base/gnome-desktop-2.2
+	>=gnome-base/libgnomeui-2.4
+	>=x11-themes/gnome-icon-theme-2.10
+	app-text/iso-codes
+	media-libs/musicbrainz
+	gnome? ( >=gnome-base/nautilus-2.10 )
+	lirc? ( app-misc/lirc )
+	xine? (
+		>=media-libs/xine-lib-1.0.1
+		>=gnome-base/gconf-2 )
+	!xine? (
+		|| ( =media-libs/gstreamer-0.8.10 =media-libs/gstreamer-0.8.11
+		=media-libs/gstreamer-0.8.12 )
+		=media-libs/gst-plugins-0.8*
+		=media-plugins/gst-plugins-gnomevfs-0.8*
+		=media-plugins/gst-plugins-pango-0.8*
+		|| ( =media-plugins/gst-plugins-ffmpeg-0.8.6
+			~media-plugins/gst-plugins-ffmpeg-0.8.7 )
+		mad? ( =media-plugins/gst-plugins-mad-0.8* )
+		mpeg? ( =media-plugins/gst-plugins-mpeg2dec-0.8* )
+		ogg? ( =media-plugins/gst-plugins-ogg-0.8* )
+		xv? ( =media-plugins/gst-plugins-xvideo-0.8* )
+		vorbis? (
+			=media-plugins/gst-plugins-ogg-0.8*
+			=media-plugins/gst-plugins-vorbis-0.8* )
+		a52? ( =media-plugins/gst-plugins-a52dec-0.8* )
+		flac? ( =media-plugins/gst-plugins-flac-0.8* )
+		theora? (
+			=media-plugins/gst-plugins-ogg-0.8*
+			=media-plugins/gst-plugins-theora-0.8* )
+		mad? ( =media-plugins/gst-plugins-mad-0.8* )
+		!sparc? ( dvd? (
+			=media-plugins/gst-plugins-a52dec-0.8*
+			=media-plugins/gst-plugins-dvdread-0.8*
+			=media-plugins/gst-plugins-mpeg2dec-0.8*
+			|| ( =media-plugins/gst-plugins-dvdnav-0.8.11
+			=media-plugins/gst-plugins-dvdnav-0.8.12 ) ) )
+		win32codecs? ( =media-plugins/gst-plugins-pitfdll-0.8* ) )
+	sparc? ( >=www-client/mozilla-firefox-1.0 )
+	ia64? ( >=www-client/mozilla-firefox-1.0 )
+	!ppc64? ( nsplugin? ( firefox? ( >=www-client/mozilla-firefox-1.0 )
+				!sparc? ( !ia64? ( !firefox? ( >=www-client/seamonkey-1.0 ) ) )
+		>=sys-apps/dbus-0.35 ) )"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.28
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+USE_DESTDIR="1"
+
+
+pkg_setup() {
+	G2CONF="--disable-gtk \
+		$(use_enable lirc)             \
+		$(use_enable gnome nautilus)"
+
+	if use firefox || use sparc || use ia64; then
+		G2CONF="${G2CONF} \
+				$(use_enable nsplugin mozilla) \
+				$(use_with nsplugin mozilla firefox)"
+	else
+		G2CONF="${G2CONF} \
+				$(use_enable nsplugin mozilla) \
+				$(use_with nsplugin mozilla seamonkey)"
+	fi
+
+	# gstreamer is default backend
+	use xine || G2CONF="${G2CONF} --enable-gstreamer"
+
+	# Use global nsplugins dir
+	G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# fixes for seamonkey / ff compiles.
+	epatch ${FILESDIR}/${PN}-1.4.1-nsIDOMWINDOW.patch
+	epatch ${FILESDIR}/${PN}-1.4.2-nsIURI.patch
+
+	eautoreconf
+}
+
+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."
+
+}
diff --git a/media-video/totem/totem-1.4.2-r1.ebuild b/media-video/totem/totem-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..4eb00758799e
--- /dev/null
+++ b/media-video/totem/totem-1.4.2-r1.ebuild
@@ -0,0 +1,145 @@
+# 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.2-r1.ebuild,v 1.1 2006/07/03 11:49:37 allanonjl 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 ~ppc ~ppc64 ~sparc ~x86"
+
+# pitdfall has not come out with a 0.10 release, should be soon though -AJL
+#IUSE="a52 dbus dvd flac gnome lirc mad mpeg nsplugin nvtv ogg theora vorbis win32codecs xine xv"
+
+IUSE="a52 dbus dvd firefox flac gnome lirc mad mpeg nsplugin nvtv ogg theora vorbis xine xv"
+
+RDEPEND=">=dev-libs/glib-2.6.3
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/gnome-vfs-2.9.92
+	>=gnome-base/libgnomeui-2.4
+	>=x11-themes/gnome-icon-theme-2.10
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=gnome-base/gnome-desktop-2.2
+	app-text/iso-codes
+	|| (
+			(
+				x11-libs/libXtst
+				x11-libs/libX11
+				x11-libs/libXxf86vm
+				x11-libs/libXext
+				x11-libs/libXrandr
+				x11-libs/libXrender
+			)
+			virtual/x11
+		)
+	dbus? ( >=sys-apps/dbus-0.35 )
+	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
+			)
+	xine? ( >=media-libs/xine-lib-1.0.1 )
+	!xine?	(
+				>=media-libs/gstreamer-0.10
+				>=media-libs/gst-plugins-base-0.10.7
+				>=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
+								)
+						)
+				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.28
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-vanity \
+			--disable-gtk \
+			$(use_with dbus) \
+			$(use_enable gnome nautilus) \
+			$(use_enable lirc) \
+			$(use_enable nvtv)"
+
+	if use firefox || use sparc; then
+		G2CONF="${G2CONF} \
+				$(use_enable nsplugin mozilla) \
+				$(use_with nsplugin mozilla firefox)"
+	else
+		G2CONF="${G2CONF} \
+				$(use_enable nsplugin mozilla) \
+				$(use_with nsplugin mozilla seamonkey)"
+	fi
+
+	# gstreamer is default backend
+	use xine || G2CONF="${G2CONF} --enable-gstreamer=0.10"
+
+	# Use global nsplugins dir
+	G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix failure with autoconf 2.60, bug #138210
+	epatch ${FILESDIR}/${PN}-1.4.0-autoconf.patch
+
+	# fixes for seamonkey / ff compiles.
+	epatch ${FILESDIR}/${PN}-1.4.1-nsIDOMWINDOW.patch
+	epatch ${FILESDIR}/${PN}-1.4.2-nsIURI.patch
+
+	eautoreconf
+}
+
+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"
+	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."
+
+}