4 files changed, 5 insertions, 488 deletions
diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 885f3c1a1d03..2e418aa6d7cc 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.271 2010/01/18 01:14:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.272 2010/02/24 22:56:40 eva Exp $
+
+  24 Feb 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -totem-2.24.4-r1.ebuild, -totem-2.26.5.ebuild, -totem-2.28.4.ebuild:
+  Clean up old revisions.
 
   18 Jan 2010; Jeroen Roovers <jer@gentoo.org> totem-2.26.3-r1.ebuild,
   totem-2.26.5.ebuild, totem-2.26.5-r1.ebuild:
diff --git a/media-video/totem/totem-2.24.4-r1.ebuild b/media-video/totem/totem-2.24.4-r1.ebuild
deleted file mode 100644
index a8721f2db1a4..000000000000
--- a/media-video/totem/totem-2.24.4-r1.ebuild
+++ /dev/null
@@ -1,148 +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.24.4-r1.ebuild,v 1.9 2009/10/24 11:06:43 nixnut Exp $
-
-inherit 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 galago gnome lirc nautilus nsplugin nvtv python tracker"
-
-# TODO:
-# easy-publish-and-consume is not in tree (epc)
-# Cone (VLC) plugin needs someone with the right setup (remi ?)
-# youtube plugins requires gst-plugins-soup
-# check gmyth requirement ?
-
-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
-	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-gio-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
-		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? (
-		>=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}
-	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"
-
-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
-
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--disable-vala
-		--with-dbus
-		--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"
-	use bluetooth && plugins="${plugins},bemused"
-	use galago && plugins="${plugins},galago"
-	use lirc && plugins="${plugins},lirc"
-
-	# Test again before pushing to the tree.
-	# use python && plugins="${plugins},youtube"
-	use python && plugins="${plugins},pythonconsole"
-
-	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
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-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 "$(unset HOME; echo ~)/.gconf"
-	addpredict "$(unset HOME; echo ~)/.gconfd"
-	addpredict "$(unset HOME; echo ~)/.gnome2"
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use python && python_mod_optimize /usr/$(get_libdir)/totem/plugins
-
-	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
-	use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins
-}
diff --git a/media-video/totem/totem-2.26.5.ebuild b/media-video/totem/totem-2.26.5.ebuild
deleted file mode 100644
index 430dcdb23161..000000000000
--- a/media-video/totem/totem-2.26.5.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.26.5.ebuild,v 1.2 2010/01/18 01:14:50 jer 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 ~hppa ~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-static
-		--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"
-	# YouTube plugin broken, when we try to load some videos, bug #292839
-	epatch "${FILESDIR}/${PN}-2.26.4-youtube-plug-play-vids.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.28.4.ebuild b/media-video/totem/totem-2.28.4.ebuild
deleted file mode 100644
index bb1389954c05..000000000000
--- a/media-video/totem/totem-2.28.4.ebuild
+++ /dev/null
@@ -1,174 +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.28.4.ebuild,v 1.1 2009/11/21 10:13:00 mrpouet 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="~amd64 ~x86 ~x86-fbsd"
-
-IUSE="bluetooth debug doc galago iplayer lirc nautilus nsplugin python tracker +youtube" #zeroconf
-
-# TODO:
-# 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
-RDEPEND=">=dev-libs/glib-2.15
-	>=x11-libs/gtk+-2.16.0
-	>=gnome-base/gconf-2.0
-	>=dev-libs/totem-pl-parser-2.27.0
-	>=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.25
-	>=media-libs/gst-plugins-good-0.10
-	>=media-libs/gst-plugins-base-0.10.25
-	>=media-plugins/gst-plugins-gconf-0.10
-
-	>=media-plugins/gst-plugins-taglib-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
-
-	dev-libs/libunique
-	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 )
-	iplayer? (
-		dev-python/pygobject
-		dev-python/pygtk
-		dev-python/httplib2
-		dev-python/feedparser
-		dev-python/beautifulsoup )
-	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/gst-python
-		dev-python/dbus-python
-		dev-python/gconf-python )
-	tracker? (
-		>=app-misc/tracker-0.6
-		<app-misc/tracker-0.7 )
-	youtube? (
-		>=dev-libs/libgdata-0.4.0
-		media-plugins/gst-plugins-soup )"
-# FIXME: freezes totem
-#	zeroconf? ( >=net-libs/libepc-0.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 )
-	app-text/docbook-xml-dtd:4.5"
-# docbook-xml-dtd is needed for user doc
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--disable-static
-		--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 iplayer && plugins="${plugins},iplayer"
-	use lirc && plugins="${plugins},lirc"
-	use python && plugins="${plugins},opensubtitles,jamendo,pythonconsole,dbus-service"
-	use tracker && plugins="${plugins},tracker"
-	use youtube && plugins="${plugins},youtube"
-	#use zeroconf && plugins="${plugins},publish"
-
-	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"
-
-	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
-}
-
-src_install() {
-	gnome2_src_install
-	# Installed for plugins, but they're dlopen()-ed
-	# firefox, totem as well as nautilus
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
-
-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
-}