media-video/totem: Add a patch for python detection (and libtool 2.2) and clean up the ebuild

(Portage version: 2.1.5_rc7)

3 files changed, 218 insertions, 1 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 95265a023201..d8840b6fd6d1 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.214 2008/05/01 13:48:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.215 2008/05/09 17:09:33 remi Exp $
+
+*totem-2.22.2-r1 (09 May 2008)
+
+  09 May 2008; Rémi Cardona <remi@gentoo.org>
+  +files/totem-2.22.2-fix-python-and-libtool-2.2.patch,
+  +totem-2.22.2-r1.ebuild:
+  Add a patch for python detection (and libtool 2.2) and clean up the ebuild
 
 *totem-2.22.2 (01 May 2008)
 
diff --git a/media-video/totem/files/totem-2.22.2-fix-python-and-libtool-2.2.patch b/media-video/totem/files/totem-2.22.2-fix-python-and-libtool-2.2.patch
new file mode 100644
index 000000000000..55c0b3c9d56e
--- /dev/null
+++ b/media-video/totem/files/totem-2.22.2-fix-python-and-libtool-2.2.patch
@@ -0,0 +1,58 @@
+Index: configure.in
+===================================================================
+--- configure.in	(revision 5399)
++++ configure.in	(working copy)
+@@ -24,7 +24,10 @@
+ 
+ AC_PROG_CXX
+ AM_PROG_CC_C_O
+-AC_PROG_LIBTOOL()
++
++AC_PROG_LIBTOOL
++m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
++
+ PKG_PROG_PKG_CONFIG
+ 
+ AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal])
+@@ -266,23 +269,14 @@
+ 	[enable_python=autodetect have_python=yes])
+ AC_MSG_RESULT([$enable_python])
+ 
+-if test "x$have_python" != "xyes"; then
+-	if test "x$enable_python" = "xyes"; then
+-		AC_MSG_ERROR([Python not found])
+-	elif test "x$enable_python" = "xautodetect"; then
+-		enable_python=no
+-		AC_MSG_WARN([Python not found, disabling python support])
+-	fi
+-fi
+-
+-if test "x$have_python" != "xno"; then
++if test "x$enable_python" != "xno"; then
+ 	AM_PATH_PYTHON([2.3],[],[have_python=no])
+ 	if test "x$PYTHON" = "x:"; then
+ 		have_python=no
+ 	fi
+ fi
+ 
+-if test "x$have_python" != "xno"; then
++if test "x$enable_python" != "xno"; then
+ 	PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
+ 	PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
+ 	PYTHON_LIBS="-lpython$PYTHON_VERSION"
+@@ -329,6 +323,15 @@
+ 	AC_MSG_RESULT([$result])
+ fi
+ 
++if test "x$have_python" != "xyes"; then
++	if test "x$enable_python" = "xyes"; then
++		AC_MSG_ERROR([Python not found])
++	elif test "x$enable_python" = "xautodetect"; then
++		enable_python=no
++		AC_MSG_WARN([Python not found, disabling python support])
++	fi
++fi
++
+ if test "x$have_python" != "xno"; then
+ 	PYGTK_REQUIRED=2.12.0
+ 
diff --git a/media-video/totem/totem-2.22.2-r1.ebuild b/media-video/totem/totem-2.22.2-r1.ebuild
new file mode 100644
index 000000000000..541b5694c40d
--- /dev/null
+++ b/media-video/totem/totem-2.22.2-r1.ebuild
@@ -0,0 +1,152 @@
+# 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.2-r1.ebuild,v 1.1 2008/05/09 17:09:33 remi 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 ~ia64 ~ppc64 ~sparc ~x86"
+
+IUSE="bluetooth debug galago gnome lirc nautilus nsplugin nvtv python seamonkey tracker xulrunner"
+
+# TODO:
+# easy-publish-and-consume is not in tree (epc)
+# Cone (VLC) plugin needs someone with the right setup (remi ?)
+# 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 )"
+DEPEND="${RDEPEND}
+		  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"
+
+	G2CONF="${G2CONF} --disable-vala --with-dbus"
+	G2CONF="${G2CONF} --enable-easy-codec-installation"
+
+	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="properties,thumbnail,screensaver,ontop,gromit,media-player-keys,skipto"
+	use bluetooth && plugins="${plugins},bemused"
+	use galago && plugins="${plugins},galago"
+	use lirc && plugins="${plugins},lirc"
+	#use python && plugins="${plugins},youtube"
+	use tracker && plugins="${plugins},tracker"
+
+	G2CONF="${G2CONF} --with-plugins=${plugins}"
+
+	G2CONF="${G2CONF}
+			$(use_enable debug)
+			$(use_enable nautilus)
+			$(use_enable nvtv)
+			$(use_enable python)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	if use nsplugin && ! use xulrunner && ! use seamonkey ; then
+		epatch "${FILESDIR}/${PN}-2.20.1-xpcom-hack.patch"
+	fi
+
+	epatch "${FILESDIR}/${PN}-2.22.2-fix-python-and-libtool-2.2.patch"
+
+	eautoreconf
+}
+
+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
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	ewarn
+	ewarn "If totem doesn't play some video format, please check your"
+	ewarn "USE flags on media-plugins/gst-plugins-meta"
+	ewarn
+}