Version bump. Bugs/crash fixes. Clean up old revisions.

(Portage version: 2.2_rc42/cvs/Linux x86_64)

5 files changed, 10 insertions, 291 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 0503dcc59cea..3643f3420164 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.255 2009/10/16 23:57:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.256 2009/10/22 22:25:26 eva Exp $
+
+*totem-2.26.4 (22 Oct 2009)
+
+  22 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/totem-2.18.1-browser-plugins.patch,
+  -files/totem-2.22.2-fix-python-and-libtool-2.2.patch,
+  -totem-2.26.2.ebuild, -totem-2.26.3.ebuild, +totem-2.26.4.ebuild:
+  Version bump. Bugs/crash fixes. Clean up old revisions.
 
   16 Oct 2009; Markus Meier <maekke@gentoo.org> totem-2.26.3-r1.ebuild:
   x86 stable, bug #281427
diff --git a/media-video/totem/files/totem-2.18.1-browser-plugins.patch b/media-video/totem/files/totem-2.18.1-browser-plugins.patch
deleted file mode 100644
index 78f149b38faa..000000000000
--- a/media-video/totem/files/totem-2.18.1-browser-plugins.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN totem-2.18.1.orig/browser-plugin/Makefile.am totem-2.18.1/browser-plugin/Makefile.am
---- totem-2.18.1.orig/browser-plugin/Makefile.am	2007-03-25 20:50:03.000000000 -0400
-+++ totem-2.18.1/browser-plugin/Makefile.am	2007-04-16 10:01:41.000000000 -0400
-@@ -80,6 +80,7 @@ totem_plugin_viewer_CFLAGS = \
- 	$(WARN_CFLAGS)		\
- 	$(DBUS_CFLAGS)		\
- 	$(NVTV_CFLAGS)		\
-+	$(SN_CFLAGS)		\
- 	$(AM_CFLAGS)
- 
- totem_plugin_viewer_LDADD =						\
-@@ -93,6 +94,7 @@ totem_plugin_viewer_LDADD =						\
- 	$(DBUS_LIBS)		\
- 	$(NVTV_LIBS) 		\
- 	$(XTEST_LIBS)		\
-+	$(SN_LIBS)		\
- 	$(X_LIBS)
- 
- BUILT_SOURCES += \
-@@ -155,7 +157,7 @@ libtotem_basic_plugin_la_LIBADD =					\
- 	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
- 	libtotempluginviewer_marshal.la					\
- 	$(DBUS_LIBS)	\
--	$(MOZILLA_LIBS)	\
-+	$(BROWSER_PLUGIN_LIBS)	\
- 	$(LIBXPCOMGLUE_S)
- 
- libtotem_basic_plugin_la_LDFLAGS = \
-@@ -223,7 +225,7 @@ libtotem_gmp_plugin_la_LIBADD =						\
- 	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
- 	libtotempluginviewer_marshal.la	\
- 	$(DBUS_LIBS)	\
--	$(MOZILLA_LIBS)	\
-+	$(BROWSER_PLUGIN_LIBS)	\
- 	$(LIBXPCOMGLUE_S)
- 
- libtotem_gmp_plugin_la_LDFLAGS = \
-@@ -285,7 +287,7 @@ libtotem_complex_plugin_la_LIBADD =					
- 	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
- 	libtotempluginviewer_marshal.la					\
- 	$(DBUS_LIBS)	\
--	$(MOZILLA_LIBS)	\
-+	$(BROWSER_PLUGIN_LIBS)	\
- 	$(LIBXPCOMGLUE_S)
- 
- libtotem_complex_plugin_la_LDFLAGS = \
-@@ -347,7 +349,7 @@ libtotem_narrowspace_plugin_la_LIBADD =	
- 	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
- 	libtotempluginviewer_marshal.la					\
- 	$(DBUS_LIBS)	\
--	$(MOZILLA_LIBS)	\
-+	$(BROWSER_PLUGIN_LIBS)	\
- 	$(LIBXPCOMGLUE_S)
- 
- libtotem_narrowspace_plugin_la_LDFLAGS = \
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN totem-2.18.1.orig/configure.in totem-2.18.1/configure.in
---- totem-2.18.1.orig/configure.in	2007-04-04 10:40:41.000000000 -0400
-+++ totem-2.18.1/configure.in	2007-04-16 09:58:58.000000000 -0400
-@@ -575,6 +575,10 @@ AC_ARG_ENABLE([mully-plugin],
- 	[],[enable_mully_plugin=yes])
- AC_MSG_RESULT([$enable_mully_plugin])
- 
-+PKG_CHECK_MODULES([SN], [ libstartup-notification-1.0 >= 0.8 ])
-+AC_SUBST([SN_CFLAGS])
-+AC_SUBST([SN_LIBS])
-+
- fi
- 
- AM_CONDITIONAL([ENABLE_BASIC_PLUGIN],[test "$enable_basic_plugin" = "yes"])
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
deleted file mode 100644
index 55c0b3c9d56e..000000000000
--- a/media-video/totem/files/totem-2.22.2-fix-python-and-libtool-2.2.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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.26.2.ebuild b/media-video/totem/totem-2.26.2.ebuild
deleted file mode 100644
index a62f1f3499c8..000000000000
--- a/media-video/totem/totem-2.26.2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.26.2.ebuild,v 1.3 2009/07/18 19:17:31 armin76 Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2 multilib python
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://gnome.org/projects/totem/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="bluetooth debug doc galago lirc nautilus nsplugin python tracker"
-
-# TODO:
-# easy-publish-and-consume is not in tree (epc)
-# Cone (VLC) plugin needs someone with the right setup (remi ?)
-# check gmyth requirement ? -> waiting for updates in tree
-# coherence plugin not enabled until we have deps in tree
-
-# youtube plugin depends on gst-plugins-soup
-RDEPEND=">=dev-libs/glib-2.15
-	>=x11-libs/gtk+-2.13.0
-	>=gnome-base/gconf-2.0
-	>=dev-libs/totem-pl-parser-2.23.91
-	>=x11-themes/gnome-icon-theme-2.16
-	x11-libs/cairo
-	app-text/iso-codes
-	>=dev-libs/libxml2-2.6
-	>=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-gconf-0.10
-
-	>=media-plugins/gst-plugins-gio-0.10
-	>=media-plugins/gst-plugins-pango-0.10
-	>=media-plugins/gst-plugins-x-0.10
-	>=media-plugins/gst-plugins-meta-0.10-r2
-
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXtst
-	>=x11-libs/libXrandr-1.1.1
-	>=x11-libs/libXxf86vm-1.0.1
-
-	bluetooth? ( || (
-		net-wireless/bluez
-		net-wireless/bluez-libs ) )
-	galago? ( >=dev-libs/libgalago-0.5.2 )
-	lirc? ( app-misc/lirc )
-	nautilus? ( >=gnome-base/nautilus-2.10 )
-	python? (
-		dev-lang/python[threads]
-		>=dev-python/pygtk-2.12
-		dev-python/pyxdg
-		dev-python/gdata
-		dev-python/gst-python
-		dev-python/gconf-python
-		media-plugins/gst-plugins-soup )
-	tracker? ( >=app-misc/tracker-0.5.3 )"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto
-	app-text/scrollkeeper
-	gnome-base/gnome-common
-	app-text/gnome-doc-utils
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.20
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.11 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-# FIXME: tests broken with USE="-doc" upstream bug #577774
-RESTRICT="test"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--disable-vala
-		--with-dbus
-		--with-smclient
-		--enable-easy-codec-installation
-		$(use_enable nsplugin browser-plugins)"
-
-	# Plugin configuration
-	G2CONF="${G2CONF}
-		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins
-		PLUGINDIR=/usr/$(get_libdir)/totem/plugins"
-
-	local plugins="properties,thumbnail,screensaver,ontop,gromit,media-player-keys,skipto,brasero-disc-recorder,screenshot"
-	use bluetooth && plugins="${plugins},bemused"
-	use galago && plugins="${plugins},galago"
-	use lirc && plugins="${plugins},lirc"
-	use python && plugins="${plugins},youtube,opensubtitles,jamendo,pythonconsole"
-	use tracker && plugins="${plugins},tracker"
-
-	G2CONF="${G2CONF} --with-plugins=${plugins}"
-
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable nautilus)
-		$(use_enable python)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix broken smclient option passing
-	epatch "${FILESDIR}/${PN}-2.26.1-smclient-target-detection.patch"
-
-	# FIXME: tarball generated with broken gtk-doc, revisit me.
-	if use doc; then
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
-			-i gtk-doc.make || die "sed 1 failed"
-	else
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \
-			-i gtk-doc.make || die "sed 2 failed"
-	fi
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-src_configure() {
-	# FIXME: why does it need write access here, probably need to set up a fake
-	# home in /var/tmp like other pkgs do
-
-	addpredict "$(unset HOME; echo ~)/.gconf"
-	addpredict "$(unset HOME; echo ~)/.gconfd"
-	addpredict "$(unset HOME; echo ~)/.gnome2"
-
-	gnome2_src_configure
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize /usr/$(get_libdir)/totem/plugins
-	fi
-
-	ewarn
-	ewarn "If totem doesn't play some video format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/totem/plugins
-}
diff --git a/media-video/totem/totem-2.26.3.ebuild b/media-video/totem/totem-2.26.4.ebuild
index 94c188ee796c..2c2eb97041aa 100644
--- a/media-video/totem/totem-2.26.3.ebuild
+++ b/media-video/totem/totem-2.26.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.26.3.ebuild,v 1.2 2009/07/18 19:17:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.26.4.ebuild,v 1.1 2009/10/22 22:25:26 eva Exp $
 
 EAPI="2"