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

(Portage version: 2.1.5_rc2)

2 files changed, 68 insertions, 55 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/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() {