fix plugin install for 2.18 and add 2.20

Package-Manager: portage-2.1.3.11

6 files changed, 222 insertions, 17 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index e2513d2e172f..e84aed9e0e5e 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,12 @@
 # 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.184 2007/09/23 13:15:57 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.185 2007/10/01 20:46:08 eva Exp $
+
+*totem-2.20.0 (01 Oct 2007)
+
+  01 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org> totem-2.18.2.ebuild,
+  totem-2.18.3.ebuild, +totem-2.20.0.ebuild:
+  fix plugindir and add totem-2.20
 
   23 Sep 2007; Tom Gall <tgall@gentoo.org> totem-2.18.3.ebuild:
   stable on ppc64
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index db818707f75f..efb6bcb25c40 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 01_build_mozilla_plugin_with_firefox_xpcom.patch 1994 RMD160 a77cbdf94118eea56a9fdec60470d816da621b50 SHA1 a637293d27af9c3a1c7044aa15813b1637c1e269 SHA256 d198c31c00563798468abfa7d6de8329d208bb71c830599176ba355649a9c24b
 MD5 6c254a486d447e680d77048262dfe78d files/01_build_mozilla_plugin_with_firefox_xpcom.patch 1994
 RMD160 a77cbdf94118eea56a9fdec60470d816da621b50 files/01_build_mozilla_plugin_with_firefox_xpcom.patch 1994
@@ -17,22 +20,27 @@ SHA256 ae6d8ba52b4b30e746d628b057d2274e03a7d9ff5e91bfb5f4c76f3eeb18363f files/to
 DIST totem-2.16.5.tar.bz2 1820880 RMD160 1a93768600860dc1dec7782039cfd27c45577bef SHA1 9f5d646207bff371744d63f376d891bad5da85af SHA256 7dab6a72cbf9d242a8eb13e4fce70aa3e730f7f74dad84181034022edfbb37df
 DIST totem-2.18.2.tar.bz2 2076779 RMD160 b77f862d511e9332d7c0416f41846e1ae12dd69f SHA1 156bd3fd4e46865b5e1880bde3be6551610e89c4 SHA256 ee310ae84cd8607548f25e802415262e247cb242bbe33c050fde34ce9a4cc2de
 DIST totem-2.18.3.tar.bz2 2079989 RMD160 6ff89df93be257de2de62f7258eeb1b43a41e02f SHA1 d2d77aef1db6fd058276d5cd06f91fe9899ebf2a SHA256 cb74597a28823b1e8e6190061edeede72612d205e64677715f9a6c77586c5081
+DIST totem-2.20.0.tar.bz2 2192747 RMD160 3ce496724dc388e18f594ea87500b25f60e74582 SHA1 3e92d6af1afa48c241810c93b0a48abd3afe6fb1 SHA256 449fd64a425cfad5923fe679b57e8969142560148ae679c4f846f6011ee02f35
 EBUILD totem-2.16.5.ebuild 4569 RMD160 47201e39089d054f3cd527e7d64a44699d0b4ed0 SHA1 a5e4acdb299e2724665ac3ec272b72f5e742ae73 SHA256 09e16ed07a744d69a78a0bc4d70a655031d3e1f1b5352d12401c95a30c74a239
 MD5 59376d0f98e43a46680930d483ced5e4 totem-2.16.5.ebuild 4569
 RMD160 47201e39089d054f3cd527e7d64a44699d0b4ed0 totem-2.16.5.ebuild 4569
 SHA256 09e16ed07a744d69a78a0bc4d70a655031d3e1f1b5352d12401c95a30c74a239 totem-2.16.5.ebuild 4569
-EBUILD totem-2.18.2.ebuild 4782 RMD160 5a0d1db8722ef9b2b7d0a4da2b5165296d5fe1c0 SHA1 bc4e790686aac2d1a3adba7d51d79732d43b91bc SHA256 6a079d28f94138eaf276701c7038ca3ef77d1172bacaeceb56356e2d777da5a4
-MD5 726fde32b0f2cd3267f67c647e7bbecc totem-2.18.2.ebuild 4782
-RMD160 5a0d1db8722ef9b2b7d0a4da2b5165296d5fe1c0 totem-2.18.2.ebuild 4782
-SHA256 6a079d28f94138eaf276701c7038ca3ef77d1172bacaeceb56356e2d777da5a4 totem-2.18.2.ebuild 4782
-EBUILD totem-2.18.3.ebuild 4782 RMD160 434fcbc4e295df2c83a5cb7a269bbd947e1686d4 SHA1 4eff7196a5c8dc2bc9b520f8f74a467a1fdd61e1 SHA256 ff740537a9624c1bb918e252dc0245b1d7ef00cd10b5f661a220e96ba4fcf409
-MD5 9a8b05b04919151c4bec09ebe62ad28f totem-2.18.3.ebuild 4782
-RMD160 434fcbc4e295df2c83a5cb7a269bbd947e1686d4 totem-2.18.3.ebuild 4782
-SHA256 ff740537a9624c1bb918e252dc0245b1d7ef00cd10b5f661a220e96ba4fcf409 totem-2.18.3.ebuild 4782
-MISC ChangeLog 25499 RMD160 31375b2c181ea2339b05007398de81d39ee513a1 SHA1 87c811118ed3e925d2db93f904bf8212590c62dc SHA256 4f765318c21cc349eb1638c0f0a5deddd4fcd0ed798217f72163f2b01d27c43a
-MD5 927b353c75174f25f8047e7ec2c90649 ChangeLog 25499
-RMD160 31375b2c181ea2339b05007398de81d39ee513a1 ChangeLog 25499
-SHA256 4f765318c21cc349eb1638c0f0a5deddd4fcd0ed798217f72163f2b01d27c43a ChangeLog 25499
+EBUILD totem-2.18.2.ebuild 4790 RMD160 e61cc64a80df8c7796837baa226022f297023f72 SHA1 cbbd35200369605cc99ae9fe4513d128ba31eef5 SHA256 b0e681aa4dc414ddbc8a76cf61e8b2a5570f12ca0e9c665adf2804a657136424
+MD5 3664135a2922ff26b0168d939182da1a totem-2.18.2.ebuild 4790
+RMD160 e61cc64a80df8c7796837baa226022f297023f72 totem-2.18.2.ebuild 4790
+SHA256 b0e681aa4dc414ddbc8a76cf61e8b2a5570f12ca0e9c665adf2804a657136424 totem-2.18.2.ebuild 4790
+EBUILD totem-2.18.3.ebuild 4788 RMD160 b04dc7df0e4f033f1dbf70f82425dd8b8160a7bb SHA1 a99c3f4d406d487e190de97bcbbac8413a361950 SHA256 c977046f1160c0e2a8fb1fb8e756b7f3ba38894cf7cce3e91e23837da9d5268c
+MD5 2620961c8529ad77164593add21f25ea totem-2.18.3.ebuild 4788
+RMD160 b04dc7df0e4f033f1dbf70f82425dd8b8160a7bb totem-2.18.3.ebuild 4788
+SHA256 c977046f1160c0e2a8fb1fb8e756b7f3ba38894cf7cce3e91e23837da9d5268c totem-2.18.3.ebuild 4788
+EBUILD totem-2.20.0.ebuild 5242 RMD160 2056673e7547396bb0a93d087616d4ddd5954288 SHA1 c7d0432b205ae72018d1c0b8e3afcd8aef6e4878 SHA256 eedce2b87a0dba75c50c061142ef122b66153808e0401d72c23061b22aee9d2a
+MD5 f00fd7bd5f15d0170711afcca9a22e3e totem-2.20.0.ebuild 5242
+RMD160 2056673e7547396bb0a93d087616d4ddd5954288 totem-2.20.0.ebuild 5242
+SHA256 eedce2b87a0dba75c50c061142ef122b66153808e0401d72c23061b22aee9d2a totem-2.20.0.ebuild 5242
+MISC ChangeLog 25682 RMD160 95fe40d2bbba84e6882b1c34c075f6fd23aa1c65 SHA1 c36e287ce998c71976c674f9af175d3eafee8e48 SHA256 9cd8c6a8ebecbbaf541ac5cb16048195b8827b7b6beaff1f60a6222e31bcd6f6
+MD5 1ac6e2a943d66048997580941936226d ChangeLog 25682
+RMD160 95fe40d2bbba84e6882b1c34c075f6fd23aa1c65 ChangeLog 25682
+SHA256 9cd8c6a8ebecbbaf541ac5cb16048195b8827b7b6beaff1f60a6222e31bcd6f6 ChangeLog 25682
 MISC metadata.xml 521 RMD160 d715631cdb935e3f1cfc70e88d8dfbd10ae3159c SHA1 cbf35cd1be8178679cc8dc62463fedb4a11042f9 SHA256 67adda7ef1db1c932df3f4a03186d86119e9c26c96f2c17d554150dc133f6197
 MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521
 RMD160 d715631cdb935e3f1cfc70e88d8dfbd10ae3159c metadata.xml 521
@@ -46,3 +54,13 @@ SHA256 d69b94be29c2b1d9e8253d16bf457f8aa932921e10e813d2f46a2e4a9ee20e36 files/di
 MD5 5096ee31aea7cc2cc7d80e9f607cc2c2 files/digest-totem-2.18.3 244
 RMD160 0b668edb856e43a185308ec19bd749db14170e06 files/digest-totem-2.18.3 244
 SHA256 58cfe44745994cd81c7dee7a0bccb9e53c060664886e4f0d556588e7df139ce6 files/digest-totem-2.18.3 244
+MD5 8e13693077bd89c0ef4d1a69eb896100 files/digest-totem-2.20.0 244
+RMD160 8a83e6770763f31ea4f9c1951bf76a39fc52aed7 files/digest-totem-2.20.0 244
+SHA256 d9c5985678d2f9b2754622c786e62133b304565efce1b4857354f5a4eecba5ab files/digest-totem-2.20.0 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHAVyt1fmVwcYIWAYRAqLPAJ9ysD/yBdO0TqGXuSwLBommSKgVPQCfbUgo
+Ax9qMbBjI1xVODU9UCaPqBg=
+=Nm78
+-----END PGP SIGNATURE-----
diff --git a/media-video/totem/files/digest-totem-2.20.0 b/media-video/totem/files/digest-totem-2.20.0
new file mode 100644
index 000000000000..ce83b9210b01
--- /dev/null
+++ b/media-video/totem/files/digest-totem-2.20.0
@@ -0,0 +1,3 @@
+MD5 e7f289179b8ac304738d599d4a5c14a9 totem-2.20.0.tar.bz2 2192747
+RMD160 3ce496724dc388e18f594ea87500b25f60e74582 totem-2.20.0.tar.bz2 2192747
+SHA256 449fd64a425cfad5923fe679b57e8969142560148ae679c4f846f6011ee02f35 totem-2.20.0.tar.bz2 2192747
diff --git a/media-video/totem/totem-2.18.2.ebuild b/media-video/totem/totem-2.18.2.ebuild
index effdc0107299..f6174b1477f9 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.14 2007/09/06 16:03:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.18.2.ebuild,v 1.15 2007/10/01 20:46:08 eva Exp $
 
 inherit autotools eutils gnome2 multilib
 
@@ -102,7 +102,7 @@ pkg_setup() {
 	fi
 
 	# use global mozilla plugin dir
-	G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser"
+	G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins"
 
 	G2CONF="${G2CONF} --disable-vanity --enable-gstreamer --with-dbus"
 
diff --git a/media-video/totem/totem-2.18.3.ebuild b/media-video/totem/totem-2.18.3.ebuild
index bd74b2f3c983..19f5557c7c2d 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.4 2007/09/23 13:15:57 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.18.3.ebuild,v 1.5 2007/10/01 20:46:08 eva Exp $
 
 inherit autotools eutils gnome2 multilib
 
@@ -102,7 +102,7 @@ pkg_setup() {
 	fi
 
 	# use global mozilla plugin dir
-	G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser"
+	G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins"
 
 	G2CONF="${G2CONF} --disable-vanity --enable-gstreamer --with-dbus"
 
diff --git a/media-video/totem/totem-2.20.0.ebuild b/media-video/totem/totem-2.20.0.ebuild
new file mode 100644
index 000000000000..76b1d37fb600
--- /dev/null
+++ b/media-video/totem/totem-2.20.0.ebuild
@@ -0,0 +1,178 @@
+# 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 $
+
+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.11.6
+	 >=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
+	>=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
+
+	# Remove the intltoolize call when tarballs are made with >=intltool-0.35.5
+	intltoolize --force || die "intltoolize failed"
+
+	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
+}