New version for GNOME 2.28. Clean up old revision.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

5 files changed, 199 insertions, 151 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 556ebf588df4..c871f3bfd307 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,12 @@
 # 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.258 2009/10/24 16:56:54 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.259 2009/10/29 22:39:44 eva Exp $
+
+*totem-2.28.1 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org> -totem-2.24.3.ebuild,
+  +totem-2.28.1.ebuild, metadata.xml:
+  New version for GNOME 2.28. Clean up old revision.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> totem-2.26.3-r1.ebuild:
   ppc stable #281427
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index d5b2a6796f93..2cf2c5edbb4b 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,16 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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.26.1-smclient-target-detection.patch 1420 RMD160 4808f108ff486f5dc992ce3ea7aa1ac5d0e463da SHA1 d56ea9d8bbe96cd2edf0c68607732d4a8345c29e SHA256 5270fdce107cf60566bcd3a3eac49edeb85307503cc5228bad8ddbfbfcb695b3
 AUX totem-2.26.3-youtube-plugin-404-error.patch 1050 RMD160 4c570c8d9a8479cb483826cee7e638cb857d6004 SHA1 038aa80f3ab24130987e8d329dca931147e931c9 SHA256 c9e3e054c3e220281e457c39e1a5b0a4f352b4bd9baac557c5c5d5f5c4e3cb6a
 DIST totem-2.20.3.tar.bz2 2194842 RMD160 4ccd9f7cca2a7380f2cc40bebf43ddf2c0678c6f SHA1 a3ae4b9f6cabf4e09b192840b92f02da42aea021 SHA256 9d51de9549c9913f91c34986f31edf55f7604e2f784e9ceea783f6102b140897
-DIST totem-2.24.3.tar.bz2 2545808 RMD160 0598c20f7adc3d6c088cf37456641add8925424b SHA1 b398b37dc54e6a48e2871b5fd0e11ff1dfff37e5 SHA256 235a2e39959e7da3dc49f5d1d9c7259a74047d32a52b0eefeec5265174769836
 DIST totem-2.24.4.tar.bz2 2603181 RMD160 42bfbace2d213c7c51adcc4d72852d7793928472 SHA1 0fadda7c9eb70f3407866b18f97a9757ed65c6a2 SHA256 31d30ec19c11a22c9ce4d9923388a9c750c6afd92158a0070856a8e88aabaaa3
 DIST totem-2.26.3.tar.bz2 3193956 RMD160 f265ec3997c130f28bf5e5455c0aef6921e71ece SHA1 ea6fa7244eb993a3038bc76f5e561c8a0661466c SHA256 ae1bd6682385ad401effda4a856f4ba8150b5ef4eab113a288b29e9335170d70
 DIST totem-2.26.4.tar.bz2 3203004 RMD160 cb5f2eba3d9f18551461e80246ed95522c86d91f SHA1 81158a273086083e80aae9fdb69eeee90cb40bbb SHA256 51036710b5d3f478cfde1c7864c2af6db8b5ed2cfdacb1b9eb1a0d49c3774bb9
+DIST totem-2.28.1.tar.bz2 3027102 RMD160 1270f7188d4307251a4178e0890cd0eb30175294 SHA1 abed5ad0de334853024bc32756b5852496e00e9b SHA256 18121f17c37faaa9cc245d46293a24f58f2bba9dc9b84af5e1ffe0ac6e697b04
 EBUILD totem-2.20.3.ebuild 5032 RMD160 2b784ab3e1fe07fc5846e3f0e241c34a1de2a3d0 SHA1 df543761b7eb778820057231ed5adac85231fca3 SHA256 ff7ffe9233c8c168288118d3c55e520c0d6f955804a0a3c13ad292d580392320
-EBUILD totem-2.24.3.ebuild 4118 RMD160 bb761f52a5a283d649f2047ab6628bc6ea1582cd SHA1 23cacd8f52bddd0634557fae39b2ede0293e8929 SHA256 ab17b9d0edae61f91e8a68a8dfa8f52101346222139e59bce428d410ac686b28
 EBUILD totem-2.24.4-r1.ebuild 4146 RMD160 0bbec55a118f60f3a93ccbffbc488c500aa8de0c SHA1 a0142a4c7822b14dece5c7558acc37aafc995947 SHA256 aea75b6d792c5008f19e369e26532d5d04929c8917c1617ea0cf084584cbb255
 EBUILD totem-2.26.3-r1.ebuild 4612 RMD160 c3bb00e398b516ce2bd9673a7b87d9348562f513 SHA1 6c4c6270000472e4433a390dea0059635dec97f8 SHA256 60d1014877f474c51802132e6fc3c186bfc875ae8de00c2d2de4a14a58fc5e1b
 EBUILD totem-2.26.4.ebuild 4425 RMD160 d688dc204178f4f90bb849b12a952e80b3cafadf SHA1 bd1fc196affa885fbc45f09e91fb79fcc989cf0e SHA256 baadf63c0cebe53a78b845d7b3341637ebbd575d332dccbe9ce64b6487779cb3
-MISC ChangeLog 36501 RMD160 ea46de6777c3d216eeb6d4cf1d256525286ee63f SHA1 bb89518fe380083971b6d226a37251e71b221545 SHA256 9fcee593fcdd0b8c05ae5ee5909bad17c8cbb7b6bc629cd0fba89d544d2d8a6d
-MISC metadata.xml 1766 RMD160 44965691ce5fe28964c2a196ea64fbaa4eaae9b5 SHA1 f134e8d940dbbe4c28c9953d1e564578fc89d88a SHA256 1e2cf36fd98de416b771a195686b658e4e0b74bb16f25dd780cff39486966fb5
+EBUILD totem-2.28.1.ebuild 4692 RMD160 a3943c1938c3bad5dc426590b920b7760ae1e51f SHA1 d267053748ab9c3406fb6219138e20bac13d0990 SHA256 e26122dd810563d3c99b48180576938cf1bf4101852d61515b999e8cda71dd8c
+MISC ChangeLog 36695 RMD160 2afeb55a47bfa3d987641ef994d8a78d0d0d502c SHA1 e6f48b9eb9c03c5a5d5d6b92d07e2c6906f18ef6 SHA256 83c9c15a94370e8e5c884dfe7afcaf80a7e89d9d38f5d070922a00321b57a7dc
+MISC metadata.xml 1872 RMD160 0678604a8be6f8432186df7ce003b9e4be9e0fc4 SHA1 63b76103e6b7c2c5aec965a5610643f4a25df37e SHA256 31b4e571c11c47e62c7f7e66698ac12e79159d59bad01de42461cf308d31f833
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrqGbYACgkQ1fmVwcYIWAbaqwCg6z4yf8BqSa3gL52MTz+UquzV
+T8cAn2DvfRLOFEg7DYSnKrDcj3re5p6t
+=SyFQ
+-----END PGP SIGNATURE-----
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index c9a4804d82e9..fa86c3f95df8 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -26,5 +26,7 @@ Totem is movie player for the GNOME desktop. It features a playlist, fullscreen
     <flag name="nautilus">Enable the nautilus extension</flag>
     <flag name="nvtv">Support for nvtv to use tv in on nvidia cards</flag>
     <flag name="tracker">Enable the search plugin using app-misc/tracker</flag>
+	<flag name="iplayer">Enable BBC player support</flag>
+	<flag name="youtube">Enable youtube plugin</flag>
   </use>
 </pkgmetadata>
diff --git a/media-video/totem/totem-2.24.3.ebuild b/media-video/totem/totem-2.24.3.ebuild
deleted file mode 100644
index 7efe15dc3707..000000000000
--- a/media-video/totem/totem-2.24.3.ebuild
+++ /dev/null
@@ -1,146 +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.3.ebuild,v 1.11 2009/04/27 10:14:27 armin76 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-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.28.1.ebuild b/media-video/totem/totem-2.28.1.ebuild
new file mode 100644
index 000000000000..b48cbbe13ecf
--- /dev/null
+++ b/media-video/totem/totem-2.28.1.ebuild
@@ -0,0 +1,176 @@
+# 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.1.ebuild,v 1.1 2009/10/29 22:39:44 eva 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.24
+	>=media-libs/gst-plugins-good-0.10
+	>=media-libs/gst-plugins-base-0.10.24
+	>=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 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+# FIXME: tests broken with USE="doc" upstream bug #598805.
+
+pkg_setup() {
+	# Installed for plugins, but they're dlopen()-ed
+	# firefox, totem as well as nautilus
+	G2PUNT_LA="yes"
+
+	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
+	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
+}