bump to 2.22.2. Fix libsoup detection in youtube plugin, fix a warning in gstreamer backend and fix some documentation links to pass make check.

Package-Manager: portage-2.1.5_rc6

3 files changed, 86 insertions, 59 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 82bc117d6cef..95265a023201 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,13 @@
 # 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.213 2008/04/24 18:22:33 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.214 2008/05/01 13:48:06 eva Exp $
+
+*totem-2.22.2 (01 May 2008)
+
+  01 May 2008; Gilles Dartiguelongue <eva@gentoo.org> -totem-2.22.0.ebuild,
+  +totem-2.22.2.ebuild:
+  bump to 2.22.2. Fix libsoup detection in youtube plugin, fix a warning in
+  gstreamer backend and fix some documentation links to pass make check.
 
   24 Apr 2008; Markus Rothe <corsair@gentoo.org> totem-2.22.1.ebuild:
   Added ~ppc64; bug #218794
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index e36a4bf56414..c4fffde337de 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,15 +1,25 @@
+-----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
 DIST totem-2.22.1.tar.bz2 2403707 RMD160 db68b251c44e01eef2247b05772ae7de19d41a40 SHA1 d66e0a6c31b5dc98ea09d3865c47b2a9363190b7 SHA256 345a0960532e0d74c23fd4720a8db4649300b5d09ac87d8d8aaa6be3e45ccc2f
+DIST totem-2.22.2.tar.bz2 2403730 RMD160 0c0de7fbcf1495158be7fa7850b52ca982eba734 SHA1 c552809554bf341bbe2e6cafd453e019efc7cb44 SHA256 7dd755e3b9a9610989661bfe7e09388e67ba6aca960c33e65e6a39682c00ffd4
 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
 EBUILD totem-2.22.1.ebuild 4497 RMD160 0331ea25c1534db566a566a89183baa3ea4fe8f8 SHA1 4b2dd1cc07dcab036e2d199e12f0ea936a4a916a SHA256 c74da97237735dcd3282fc5e254b5643b2fa6e014401f4b61c0422a43d205e89
-MISC ChangeLog 29961 RMD160 6b671a85495eb51dbee212783b4a2a40c5d97057 SHA1 27f7de7f072ace1ee1b51db6babbabfd57bb3489 SHA256 696111a66c77efaf8af291dbfd5773223c979b01f476e7676076ab9b01fa74fc
+EBUILD totem-2.22.2.ebuild 4493 RMD160 aa435e0ee4d62bc8032a64dc65fee42f82bab9f1 SHA1 e4b6c9466331f1d10f8bf7b356c29b74503a774a SHA256 405fc545991a084ad02b0a18f667762279c8adc8c79ab908ac5f1ceb22249418
+MISC ChangeLog 30236 RMD160 d874ee0bf7d2cfa59ed4143ffbc48e627aa95936 SHA1 ffd1f2906d04da2bc76efc205120915561e21215 SHA256 67c8ea43489a7667596c46c5add9c7850a75e57bd421646a1687479d46fe5b1d
 MISC metadata.xml 1580 RMD160 ed7c2b9b1ad10978b40716c2198517ae9ec0a61c SHA1 c03e158022ebba6e612d385ce59c24f08016e5ca SHA256 128e95f1294aa4924a0c5523717c84f09c9b0329e363c817321a2b1bf58beed9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgZ5j4ACgkQ1fmVwcYIWAYJgwCgtNuj7hrm6iEfrpj0SLzgbfWg
+kHAAoLCoBMtkFAiEsjN3R3rC/75RAB4g
+=Yhmi
+-----END PGP SIGNATURE-----
diff --git a/media-video/totem/totem-2.22.0.ebuild b/media-video/totem/totem-2.22.2.ebuild
index d27691cb1c74..18c05b2c5c84 100644
--- a/media-video/totem/totem-2.22.0.ebuild
+++ b/media-video/totem/totem-2.22.2.ebuild
@@ -1,6 +1,6 @@
 # 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.22.0.ebuild,v 1.2 2008/03/27 00:24:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.22.2.ebuild,v 1.1 2008/05/01 13:48:06 eva Exp $
 
 inherit autotools eutils gnome2 multilib
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://gnome.org/projects/totem/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86"
 
 IUSE="bluetooth debug galago gnome lirc nautilus nsplugin nvtv python seamonkey tracker xulrunner"
 
@@ -19,57 +19,67 @@ IUSE="bluetooth debug galago gnome lirc nautilus nsplugin nvtv python seamonkey
 # Youtube plugin as been far too unstable in my tests to be enabled for now
 
 RDEPEND=">=dev-libs/glib-2.15
-	 >=x11-libs/gtk+-2.12.6
-	 >=gnome-base/gconf-2.0
-	 >=gnome-base/gnome-vfs-2.16
-	 >=dev-libs/totem-pl-parser-2.21.90
-	 >=x11-themes/gnome-icon-theme-2.16
-	   app-text/iso-codes
-	   dev-libs/libxml2
-	 >=dev-libs/dbus-glib-0.71
-	 >=media-libs/gstreamer-0.10.16
-	 >=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
-
-	 >=media-plugins/gst-plugins-x-0.10
-	 >=media-plugins/gst-plugins-meta-0.10-r2
-
-	 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
-			)
-	 lirc? ( app-misc/lirc )
-	 nautilus? ( >=gnome-base/nautilus-2.10 )
-	 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
-			)
-	 nvtv? ( >=media-tv/nvtv-0.4.5 )
-	 python? ( >=dev-python/pygtk-2.12 >=dev-python/gdata-1 )
-	 tracker? ( >=app-misc/tracker-0.5.3 >=gnome-base/libgnomeui-2 )"
+		 >=x11-libs/gtk+-2.12.6
+		 >=gnome-base/gconf-2.0
+		 >=gnome-base/gnome-vfs-2.16
+		 >=dev-libs/totem-pl-parser-2.21.90
+		 >=x11-themes/gnome-icon-theme-2.16
+		   app-text/iso-codes
+		   dev-libs/libxml2
+		 >=dev-libs/dbus-glib-0.71
+		 >=media-libs/gstreamer-0.10.16
+		 >=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
+
+		 >=media-plugins/gst-plugins-x-0.10
+		 >=media-plugins/gst-plugins-meta-0.10-r2
+
+		 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
+				)
+		 lirc? ( app-misc/lirc )
+		 nautilus? ( >=gnome-base/nautilus-2.10 )
+		 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
+					)
+		 nvtv? ( >=media-tv/nvtv-0.4.5 )
+		 python? ( >=dev-python/pygtk-2.12 >=dev-python/gdata-1 )
+		 tracker? ( >=app-misc/tracker-0.5.3 >=gnome-base/libgnomeui-2 )"
 DEPEND="${RDEPEND}
-	  app-text/scrollkeeper
-	  gnome-base/gnome-common
-	  app-text/gnome-doc-utils
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.20"
+		  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 use python ; then
+		if ! built_with_use --missing false dev-lang/python threads ; then
+			if built_with_use --missing true dev-lang/python nothreads ; then
+				elog "totem's python support requires that python be built with threading support"
+				elog "Please rebuild python with threading support and then build totem again."
+				eerror "python built without threading support"
+			fi
+		fi
+	fi
+
 	# use global mozilla plugin dir
 	G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins"
 
@@ -88,7 +98,7 @@ pkg_setup() {
 			G2CONF="${G2CONF} --with-gecko=firefox"
 		fi
 	else
-	    G2CONF="${G2CONF} --disable-browser-plugins"
+		G2CONF="${G2CONF} --disable-browser-plugins"
 	fi
 
 	# Plugin Configuration
@@ -104,12 +114,12 @@ pkg_setup() {
 	G2CONF="${G2CONF} --with-plugins=${plugins}"
 
 	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable gnome)
-		$(use_enable lirc)
-		$(use_enable nautilus)
-		$(use_enable nvtv)
-		$(use_enable python)"
+			$(use_enable debug)
+			$(use_enable gnome)
+			$(use_enable lirc)
+			$(use_enable nautilus)
+			$(use_enable nvtv)
+			$(use_enable python)"
 }
 
 src_unpack() {