add built_with_use check for python threading support in the use python case

Package-Manager: portage-2.1.5_rc2

3 files changed, 70 insertions, 67 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index b0b7e518dc74..46cf71467102 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,9 @@
 # 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.210 2008/04/14 21:29:53 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.211 2008/04/21 03:52:20 compnerd Exp $
+
+  21 Apr 2008; Saleem Abdulrasool <compnerd@gentoo.org> totem-2.22.1.ebuild:
+  Add built_with_use check for threading in python in the use=python case
 
   14 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org> metadata.xml:
   integrate USE flag documentation from bheekling's and Ford_Prefect's
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index f37d6f72e7e8..3c98c1faf3f2 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,6 +1,3 @@
------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
@@ -13,13 +10,6 @@ EBUILD totem-2.18.3.ebuild 4581 RMD160 67d0694266f70feb882e448dbf48e2351ee8f635
 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 4001 RMD160 d1f11dcb24c729769322200904e6a687a919e172 SHA1 114a149d01dd2072ca7b02f9e34c69d99512b6cd SHA256 d9e0d2eccff0696a05c3f526776ef03b828e8988a15f2783d064925822b6a1e5
-MISC ChangeLog 29597 RMD160 d3cbf4c6cc538042bd1e7a0dae1ac0d83fe99476 SHA1 571f871f5ac1f02654e993b295d7c05ca3b51606 SHA256 f40886c2384d2e9e81ced564a6595f8d12f7615d5422a4e3ec608b42e57d6b65
+EBUILD totem-2.22.1.ebuild 4471 RMD160 048513d60d5054535187c42850a791adff3df874 SHA1 04e19ca71730d0eac080f021e90c5ed727c160df SHA256 fdd0445968ea41d10b1f7cf2caf29d7ccd0f4d111204d4fea174169ab6f0faed
+MISC ChangeLog 29754 RMD160 3cbcd1541fb050fd7b7530eaa1ff1cfd6a193572 SHA1 aa224fdccbd1cf216bd698fc1c0acf4c0d930e61 SHA256 d31fb4d2e01fc4dfae071ba979b5388ecb6176a6dfc87b5b61746f1ef8aedf91
 MISC metadata.xml 1580 RMD160 ed7c2b9b1ad10978b40716c2198517ae9ec0a61c SHA1 c03e158022ebba6e612d385ce59c24f08016e5ca SHA256 128e95f1294aa4924a0c5523717c84f09c9b0329e363c817321a2b1bf58beed9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgDzNkACgkQ1fmVwcYIWAbN+gCeI/4GSaek3xsKFbx7jKdsWvPa
-dQkAnih/G8zQz0n3MmBclaGtNG2ex80G
-=3+9Z
------END PGP SIGNATURE-----
diff --git a/media-video/totem/totem-2.22.1.ebuild b/media-video/totem/totem-2.22.1.ebuild
index b0d500ce9b1a..2f252cbed1a6 100644
--- a/media-video/totem/totem-2.22.1.ebuild
+++ b/media-video/totem/totem-2.22.1.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.1.ebuild,v 1.1 2008/04/10 21:18:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.22.1.ebuild,v 1.2 2008/04/21 03:52:20 compnerd Exp $
 
 inherit autotools eutils gnome2 multilib
 
@@ -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() {