New version for the 2.20 series - removes gnome-desktop dependency, fixes DVD ISO detection on some platforms, and a few corner-case crash fixes

Package-Manager: portage-2.1.4.4

3 files changed, 180 insertions, 12 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index c0667170b355..1f2cd5b1c825 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/totem
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.207 2008/03/27 00:24:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.208 2008/03/28 19:59:55 leio Exp $
+
+*totem-2.20.4 (28 Mar 2008)
+
+  28 Mar 2008; Mart Raudsepp <leio@gentoo.org> +totem-2.20.4.ebuild:
+  New version for the 2.20 series - removes gnome-desktop dependency, fixes
+  DVD ISO detection on some platforms, and a few corner-case crash fixes
 
   27 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org> totem-2.22.0.ebuild:
   drop most keywords because of gst-plugins-meta dependency
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 276f6632c12a..989d49594866 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX totem-2.18.1-browser-plugins.patch 2354 RMD160 bf6848064f870120462ad2c877142496b0bee53a SHA1 03cb04a700ffcfc205429ab9ad2594a92dc3787d SHA256 ae6d8ba52b4b30e746d628b057d2274e03a7d9ff5e91bfb5f4c76f3eeb18363f
 AUX totem-2.20.1-startup-notification.patch 1235 RMD160 2b2f1dc18a7910019adf1a831aa2ca3a1febb080 SHA1 1a26bd044901ef3969a042b621c59bd7c2bb86a9 SHA256 88ec75d7ad5d3e637592b91301e28d8241c652e576f1fade9c34e0d2016865e2
 AUX totem-2.20.1-xpcom-hack.patch 414 RMD160 11f8440cd1798c161ef7070dda90fa8c7abf5ccd SHA1 ccfb2c9e4f422454f3ee0ec97850d8e9a272ed4f SHA256 0db11c34b49c80c13e8385fc207a5fcd66f25d17aea1edca65f67a96ee663e71
 DIST totem-2.18.3.tar.bz2 2079989 RMD160 6ff89df93be257de2de62f7258eeb1b43a41e02f SHA1 d2d77aef1db6fd058276d5cd06f91fe9899ebf2a SHA256 cb74597a28823b1e8e6190061edeede72612d205e64677715f9a6c77586c5081
 DIST totem-2.20.3.tar.bz2 2194842 RMD160 4ccd9f7cca2a7380f2cc40bebf43ddf2c0678c6f SHA1 a3ae4b9f6cabf4e09b192840b92f02da42aea021 SHA256 9d51de9549c9913f91c34986f31edf55f7604e2f784e9ceea783f6102b140897
+DIST totem-2.20.4.tar.bz2 2194332 RMD160 e55d4530bfc06c32634813141c3963ef8d3b684e SHA1 41b0bda70a7162059a21928054b0218534eb9778 SHA256 1bb9223916400675ce27b91491979466edb5ada25f85eb20b23cc005319b6d5f
 DIST totem-2.22.0.tar.bz2 2321288 RMD160 634b1e42c7224bd573bc6bd0998f2dd7516edd36 SHA1 3c433ef38d0b075200adfe20c970d80b90d852b0 SHA256 b0f9dd826089fc976ed4e57723613fb518f84e79c3f7cc7a0814b7254911f351
 EBUILD totem-2.18.3.ebuild 4581 RMD160 67d0694266f70feb882e448dbf48e2351ee8f635 SHA1 0eaaba0080f4ba5fe1013344e97a4720e7f4d96e SHA256 d87803e0b57a0db5b7a440d748625205d03a027b2b663072457994678b0384f2
 EBUILD totem-2.20.3.ebuild 5053 RMD160 2c03a7b90ad0b6b484181030a32590af91494d18 SHA1 92f6f062b2e076bfc42461c3ddfafb016358be7d SHA256 38f51ce4d8f8edc71def57989e9d2dab6cf5ee12dd322c354c35e1e037c5831e
+EBUILD totem-2.20.4.ebuild 5023 RMD160 ebbd220061539974fe4524aae4ea32d027457b93 SHA1 fada823b13dbb38ad149fc99a88b7d7e1e189ec0 SHA256 b870cb577cc0227ef07b09ad77eb7276ab1aef68b44b03d3c15d310c292a5d12
 EBUILD totem-2.22.0.ebuild 4001 RMD160 509b2a8d9599fbcba148f4f6676420f74cfef5bd SHA1 680f50dc08202c9e48ee8bbb2419db4b6cd28212 SHA256 9b8a8eacedf7293ac7f7013f5bb95b65aa16d3978c4aebf98764ddbe4978034a
-MISC ChangeLog 29052 RMD160 59c00833c4bce5474c332015d384b885cc472f45 SHA1 2b25cb2095fd171083f0870d4d5acbbb1de6ed89 SHA256 48f326e5816d32cf567434e4b11b397f7427c37170380fecb4e53f0f5c7f938f
+MISC ChangeLog 29301 RMD160 a52b6255f60e708d63813e026608487339aa09be SHA1 72555db0def473069f1bc1e76290b73efd310d75 SHA256 7458558eabf2c395e9661791220e2685a45141d87faa2a397411a8e8025a349b
 MISC metadata.xml 521 RMD160 d715631cdb935e3f1cfc70e88d8dfbd10ae3159c SHA1 cbf35cd1be8178679cc8dc62463fedb4a11042f9 SHA256 67adda7ef1db1c932df3f4a03186d86119e9c26c96f2c17d554150dc133f6197
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH6ukt1fmVwcYIWAYRAkOhAJ9qy4dAk6fpp/n6esz/Ju7CsUoRigCeJV2a
-Qp/ep0nvUBuKOsqOTTAyXdg=
-=2DGy
------END PGP SIGNATURE-----
diff --git a/media-video/totem/totem-2.20.4.ebuild b/media-video/totem/totem-2.20.4.ebuild
new file mode 100644
index 000000000000..a8b34698de5a
--- /dev/null
+++ b/media-video/totem/totem-2.20.4.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.20.4.ebuild,v 1.1 2008/03/28 19:59:55 leio 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/nautilus-2.10
+	 			>=gnome-base/control-center-2.18
+			)
+	 hal? ( =sys-apps/hal-0.5* )
+	 lirc? ( app-misc/lirc )
+	 nsplugin?	(
+	 			xulrunner? ( =net-libs/xulrunner-1.8* )
+				!xulrunner? ( seamonkey? ( =www-client/seamonkey-1* ) )
+				!xulrunner? ( !seamonkey? ( =www-client/mozilla-firefox-2* ) )
+				>=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 )
+	>=media-plugins/gst-plugins-x-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() {
+	# 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.20.1-startup-notification.patch"
+		if ! use xulrunner && ! use seamonkey ; then
+			epatch "${FILESDIR}/${PN}-2.20.1-xpcom-hack.patch"
+		fi
+		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
+}