bump to 2.20.1, fix DEPEND on 2.20.0 and quoting on the rest

(Portage version: 2.1.3.15)

7 files changed, 214 insertions, 22 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 72cf517bd094..5a6bf88f4787 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-video/totem
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.186 2007/10/04 21:03:23 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.187 2007/10/23 21:19:09 eva Exp $
+
+  23 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org> totem-2.16.5.ebuild,
+  totem-2.18.2.ebuild, totem-2.18.3.ebuild:
+  fix quoting
+
+*totem-2.20.1 (23 Oct 2007)
+
+  23 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org> totem-2.20.0.ebuild,
+  +totem-2.20.1.ebuild:
+  bump to 2.20.1
+  fix DEPEND of 2.20.0 and 2.20.1
+  removing intltoolize call from 2.20.1 as it look not necessary anymore
 
   04 Oct 2007; Mart Raudsepp <leio@gentoo.org> totem-2.18.2.ebuild,
   totem-2.18.3.ebuild:
diff --git a/media-video/totem/files/digest-totem-2.20.1 b/media-video/totem/files/digest-totem-2.20.1
new file mode 100644
index 000000000000..cee66f665f28
--- /dev/null
+++ b/media-video/totem/files/digest-totem-2.20.1
@@ -0,0 +1,3 @@
+MD5 6627727e7abd7a7f95257be8df6359a6 totem-2.20.1.tar.bz2 2196437
+RMD160 2f7746cee2f4a16fbee3242979b974c698824d0b totem-2.20.1.tar.bz2 2196437
+SHA256 59bd1fcbc723d32a678eeacf200394da4d8ae16dcd8ab36352659b55c29d04f5 totem-2.20.1.tar.bz2 2196437
diff --git a/media-video/totem/totem-2.16.5.ebuild b/media-video/totem/totem-2.16.5.ebuild
index dff80329136d..67289827173a 100644
--- a/media-video/totem/totem-2.16.5.ebuild
+++ b/media-video/totem/totem-2.16.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.16.5.ebuild,v 1.11 2007/08/25 14:19:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.16.5.ebuild,v 1.12 2007/10/23 21:19:09 eva Exp $
 
 inherit autotools eutils multilib gnome2
 
@@ -123,18 +123,18 @@ src_unpack() {
 	# Fix hardcoded plugindir
 	sed -i -e \
 		's|mozilla|nsbrowser|' \
-		${S}/browser-plugin/Makefile.in \
-		${S}/browser-plugin/idl/Makefile.in
+		"${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
+		epatch "${FILESDIR}"/${PN}-1.5.91-mozilla-firefox-include-fix.patch
 
 		# Patch borrowed from ubuntu (link xpcom)
-		epatch ${FILESDIR}/01_build_mozilla_plugin_with_firefox_xpcom.patch
+		epatch "${FILESDIR}"/01_build_mozilla_plugin_with_firefox_xpcom.patch
 	elif use nsplugin ; then
 		# Patch borrowed from ubuntu (link xpcom)
-		epatch ${FILESDIR}/01_build_mozilla_plugin_with_seamonkey_xpcom.patch
+		epatch "${FILESDIR}"/01_build_mozilla_plugin_with_seamonkey_xpcom.patch
 	fi
 }
 
diff --git a/media-video/totem/totem-2.18.2.ebuild b/media-video/totem/totem-2.18.2.ebuild
index 6e978022e5a0..ffef9ec40cb4 100644
--- a/media-video/totem/totem-2.18.2.ebuild
+++ b/media-video/totem/totem-2.18.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.18.2.ebuild,v 1.16 2007/10/04 21:03:24 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.18.2.ebuild,v 1.17 2007/10/23 21:19:09 eva Exp $
 
 inherit autotools eutils gnome2 multilib
 
@@ -139,16 +139,16 @@ src_unpack() {
 	intltoolize --force || die
 
 	if use nsplugin ; then
-		epatch ${FILESDIR}/${PN}-2.18.1-browser-plugins.patch
+		epatch "${FILESDIR}"/${PN}-2.18.1-browser-plugins.patch
 		eautoreconf
 	fi
 
 	# Remove this when POTFILES.in will be fixed
-	echo "data/totem-handlers.schemas.in" >> ${S}/po/POTFILES.skip
-	echo "data/totem-video-thumbnail.schemas.in" >> ${S}/po/POTFILES.skip
-	echo "data/totem.desktop.in" >> ${S}/po/POTFILES.skip
-	echo "data/totem.desktop.in.in" >> ${S}/po/POTFILES.skip
-	echo "data/vanity.desktop.in" >> ${S}/po/POTFILES.skip
+	echo "data/totem-handlers.schemas.in" >> "${S}"/po/POTFILES.skip
+	echo "data/totem-video-thumbnail.schemas.in" >> "${S}"/po/POTFILES.skip
+	echo "data/totem.desktop.in" >> "${S}"/po/POTFILES.skip
+	echo "data/totem.desktop.in.in" >> "${S}"/po/POTFILES.skip
+	echo "data/vanity.desktop.in" >> "${S}"/po/POTFILES.skip
 }
 
 src_install() {
diff --git a/media-video/totem/totem-2.18.3.ebuild b/media-video/totem/totem-2.18.3.ebuild
index b797d7606253..d8f18f15f813 100644
--- a/media-video/totem/totem-2.18.3.ebuild
+++ b/media-video/totem/totem-2.18.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.18.3.ebuild,v 1.6 2007/10/04 21:03:24 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.18.3.ebuild,v 1.7 2007/10/23 21:19:09 eva Exp $
 
 inherit autotools eutils gnome2 multilib
 
@@ -139,16 +139,16 @@ src_unpack() {
 	intltoolize --force || die
 
 	if use nsplugin ; then
-		epatch ${FILESDIR}/${PN}-2.18.1-browser-plugins.patch
+		epatch "${FILESDIR}"/${PN}-2.18.1-browser-plugins.patch
 		eautoreconf
 	fi
 
 	# Remove this when POTFILES.in will be fixed
-	echo "data/totem-handlers.schemas.in" >> ${S}/po/POTFILES.skip
-	echo "data/totem-video-thumbnail.schemas.in" >> ${S}/po/POTFILES.skip
-	echo "data/totem.desktop.in" >> ${S}/po/POTFILES.skip
-	echo "data/totem.desktop.in.in" >> ${S}/po/POTFILES.skip
-	echo "data/vanity.desktop.in" >> ${S}/po/POTFILES.skip
+	echo "data/totem-handlers.schemas.in" >> "${S}"/po/POTFILES.skip
+	echo "data/totem-video-thumbnail.schemas.in" >> "${S}"/po/POTFILES.skip
+	echo "data/totem.desktop.in" >> "${S}"/po/POTFILES.skip
+	echo "data/totem.desktop.in.in" >> "${S}"/po/POTFILES.skip
+	echo "data/vanity.desktop.in" >> "${S}"/po/POTFILES.skip
 }
 
 src_install() {
diff --git a/media-video/totem/totem-2.20.0.ebuild b/media-video/totem/totem-2.20.0.ebuild
index 76b1d37fb600..09be3de09738 100644
--- a/media-video/totem/totem-2.20.0.ebuild
+++ b/media-video/totem/totem-2.20.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.20.0.ebuild,v 1.1 2007/10/01 20:46:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.20.0.ebuild,v 1.2 2007/10/23 21:19:09 eva Exp $
 
 inherit autotools eutils gnome2 multilib
 
@@ -92,6 +92,7 @@ DEPEND="${RDEPEND}
 	  x11-proto/inputproto
 	  app-text/scrollkeeper
 	  gnome-base/gnome-common
+	  app-text/gnome-doc-utils
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.20"
 
diff --git a/media-video/totem/totem-2.20.1.ebuild b/media-video/totem/totem-2.20.1.ebuild
new file mode 100644
index 000000000000..fa007f6edc0c
--- /dev/null
+++ b/media-video/totem/totem-2.20.1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.20.1.ebuild,v 1.1 2007/10/23 21:19:09 eva Exp $
+
+inherit autotools eutils gnome2 multilib
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="http://gnome.org/projects/totem/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+# No 0.10.0 release for gst-plugins-pitdfdll yet
+# IUSE="win32codecs"
+
+IUSE="a52 bluetooth debug dvd ffmpeg flac galago gnome hal lirc mad mpeg nsplugin nvtv ogg python seamonkey theora vorbis xulrunner xv"
+
+RDEPEND=">=dev-libs/glib-2.13.4
+	 >=x11-libs/gtk+-2.12.1
+	 >=gnome-base/gconf-2.0
+	 >=gnome-base/libglade-2.0
+	 >=gnome-base/gnome-vfs-2.16
+	 >=x11-themes/gnome-icon-theme-2.16
+	 >=x11-libs/startup-notification-0.8
+	   app-text/iso-codes
+	   dev-libs/libxml2
+	 >=dev-libs/dbus-glib-0.71
+	 >=media-libs/gstreamer-0.10.12
+	 >=media-libs/gst-plugins-good-0.10
+	 >=media-libs/gst-plugins-base-0.10.12
+	 >=media-plugins/gst-plugins-pango-0.10
+	 >=media-plugins/gst-plugins-gconf-0.10
+	 >=media-plugins/gst-plugins-gnomevfs-0.10
+
+	 x11-libs/libX11
+	 x11-libs/libXtst
+	 >=x11-libs/libXrandr-1.1.1
+	 >=x11-libs/libXxf86vm-1.0.1
+
+	 bluetooth? ( net-wireless/bluez-libs )
+	 galago? ( >=dev-libs/libgalago-0.5.2 )
+	 gnome? (
+				>=gnome-base/libgnome-2.14
+				>=gnome-base/libgnomeui-2.4
+				>=gnome-base/gnome-desktop-2.2
+				>=gnome-base/nautilus-2.10
+	 			>=gnome-base/control-center-2.18
+			)
+	 hal? ( =sys-apps/hal-0.5* )
+	 lirc? ( app-misc/lirc )
+	 nsplugin?	(
+	 			|| (
+					xulrunner? ( net-libs/xulrunner )
+					seamonkey? ( www-client/seamonkey )
+					www-client/mozilla-firefox
+				)
+				>=x11-misc/shared-mime-info-0.22
+				>=x11-libs/startup-notification-0.8
+			)
+	 python? ( >=dev-python/pygtk-2.8 )
+	 nvtv? ( >=media-tv/nvtv-0.4.5 )
+
+	 a52? ( >=media-plugins/gst-plugins-a52dec-0.10 )
+	 !sparc? ( dvd? (
+						>=media-libs/gst-plugins-ugly-0.10
+						>=media-plugins/gst-plugins-a52dec-0.10
+						>=media-plugins/gst-plugins-dvdread-0.10
+						>=media-plugins/gst-plugins-mpeg2dec-0.10
+					)
+			 )
+	 !sparc? ( ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-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 )"
+
+# this belongs above xv? above.
+# win32codecs? ( >=media-plugins/gst-plugins-pitfdll-0.10 )
+
+DEPEND="${RDEPEND}
+	  x11-proto/xproto
+	  x11-proto/inputproto
+	  app-text/scrollkeeper
+	  gnome-base/gnome-common
+	  app-text/gnome-doc-utils
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.20"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	if ! built_with_use 'media-libs/gst-plugins-base' 'X' ; then
+		einfo "Build gst-plugins-base with the X useflag"
+		einfo "echo \"media-libs/gst-plugins-base X\" >> /etc/portage/package.use"
+		einfo "emerge -1 gst-plugins-base"
+		die "gst-plugins-base requires X useflag"
+	fi
+
+	# use global mozilla plugin dir
+	G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins"
+
+	G2CONF="${G2CONF} --disable-vala --disable-vanity --enable-gstreamer --with-dbus"
+
+	if use gnome ; then
+	    G2CONF="${G2CONF} --disable-gtk --enable-nautilus"
+	else
+	    G2CONF="${G2CONF} --enable-gtk --disable-nautilus"
+	fi
+
+	if use nsplugin ; then
+	    G2CONF="${G2CONF} --enable-browser-plugins"
+		if use xulrunner ; then
+			G2CONF="${G2CONF} --with-gecko=xulrunner"
+		elif use seamonkey ; then
+			G2CONF="${G2CONF} --with-gecko=seamonkey"
+		else
+			G2CONF="${G2CONF} --with-gecko=firefox"
+		fi
+	else
+	    G2CONF="${G2CONF} --disable-browser-plugins"
+	fi
+
+	# Plugin Configuration
+	G2CONF="${G2CONF} PLUGINDIR=/usr/$(get_libdir)/totem/plugins"
+	local plugins="screensaver,ontop,gromit,skipto"
+	use bluetooth && plugins="${plugins},bemused"
+	use galago && plugins="${plugins},galago"
+	use gnome && plugins="${plugins},media-player-keys,properties"
+	use lirc && plugins="${plugins},lirc"
+
+	G2CONF="${G2CONF} --with-plugins=${plugins}"
+
+	G2CONF="${G2CONF}		\
+		$(use_enable debug)	\
+		$(use_with hal)		\
+		$(use_enable lirc)	\
+		$(use_enable nvtv)	\
+		$(use_enable python)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	if use nsplugin ; then
+		epatch "${FILESDIR}"/${PN}-2.18.1-browser-plugins.patch
+		eautoreconf
+	fi
+
+	sed -i -e 's:mozilla/plugins:nsbrowser/plugins:' browser-plugin/Makefile* || die "sed failed"
+
+	sed -i -e 's:.totem-plugin.desktop.in:.totem-plugin.in:' \
+		src/plugins/{galago,lirc,media-player-keys,ontop,screensaver}/Makefile* \
+	|| die "sed failed"
+
+}
+
+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
+}