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

Package-Manager: portage-2.1.5_rc7

4 files changed, 221 insertions, 12 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/Manifest b/media-video/totem/Manifest
index c4fffde337de..939235e91159 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,9 +1,7 @@
------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
+AUX totem-2.22.2-fix-python-and-libtool-2.2.patch 1539 RMD160 344c21712640e8e7694c673299fb857d5915eb5a SHA1 186afa164e57c39d75b38ee81be1be50c9711420 SHA256 4451eb5264a9b6fd5c977bfcad558f391fe1e92e0a216d845f81cc6939cf6cd1
 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
@@ -13,13 +11,7 @@ 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.1.ebuild 4497 RMD160 0331ea25c1534db566a566a89183baa3ea4fe8f8 SHA1 4b2dd1cc07dcab036e2d199e12f0ea936a4a916a SHA256 c74da97237735dcd3282fc5e254b5643b2fa6e014401f4b61c0422a43d205e89
+EBUILD totem-2.22.2-r1.ebuild 4465 RMD160 557b0274d402a0999c62f4da6f49c108db52f7e6 SHA1 95537da9c78ef2042980c35c565da01711975301 SHA256 75cbb7843e0917feb2622d78362a80f5234e75e8817d99dcbb375cb1ae1a94de
 EBUILD totem-2.22.2.ebuild 4493 RMD160 aa435e0ee4d62bc8032a64dc65fee42f82bab9f1 SHA1 e4b6c9466331f1d10f8bf7b356c29b74503a774a SHA256 405fc545991a084ad02b0a18f667762279c8adc8c79ab908ac5f1ceb22249418
-MISC ChangeLog 30236 RMD160 d874ee0bf7d2cfa59ed4143ffbc48e627aa95936 SHA1 ffd1f2906d04da2bc76efc205120915561e21215 SHA256 67c8ea43489a7667596c46c5add9c7850a75e57bd421646a1687479d46fe5b1d
+MISC ChangeLog 30477 RMD160 1e936595e9f26e9c383b166acb873d86d96a0ecf SHA1 75bf8120c52de47a24bcaf08fa30819809dfba3c SHA256 177af4709e7d84ecacd37dc0527e8b3438a6be72c8bd4466a9d25fe12bf8fd68
 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/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
+}