Version bump for Gnome 3.6. Switch to EAPI=5 and python-single-r1 eclass.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 161 insertions, 18 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index a68b76a354b0..798051cee6bd 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.346 2012/12/15 18:17:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.347 2012/12/24 12:40:39 eva Exp $
+
+*totem-3.6.3-r1 (24 Dec 2012)
+
+  24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> +totem-3.6.3-r1.ebuild,
+  metadata.xml:
+  Version bump for Gnome 3.6. Switch to EAPI=5 and python-single-r1 eclass.
 
   15 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   totem-2.32.0-r2.ebuild, -totem-3.2.2.ebuild, -totem-3.4.2.ebuild,
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 04a9530321ce..582036dc1bf3 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -6,18 +6,16 @@ AUX totem-2.32.0-smclient-target-detection.patch 1546 SHA256 c2c454e1a1776cc7c07
 DIST totem-2.32.0-patches.tar.bz2 13355 SHA256 fdf1d04e5c2325ba5b982a4fb59b9c70bbdf018418dfc7d0fa8bd28929335a30 SHA512 cedb71ecd244dad6667e67eccae3fcf912de975b7ce5911257438303abe50ae8cf488c4dad4bc8557f5049846ce7d98503cefe0aeeda7aec70028f8dec81b0bc WHIRLPOOL be4c5c8cbe7d700ca18b942cb5fd546d95434fe13535fc96b4baf9fc3b2ac5d39d4b4cc3af8e920a54d8c929e29b2a88799e8f5b984f495a3def50bcd6dc9981
 DIST totem-2.32.0.tar.bz2 3278758 SHA256 982d6aaeca3e4844694fc0a2540d792bea753e24b55cf33203188b32b5914f47 SHA512 67d5d3e06a57fc355867f288f620be384c7ec3078ecfa0a223ae09d7d8b34d5b9b16de1d97e1d1bfe2b3b12cc87eed8bd8305b9f5a1bba1c4fe37cf7355e0f0f WHIRLPOOL 301f7727e1255b1fcf4b8546cc8973d5bae45bca5b84e4a516d1a1d006eb695632a33bcb04c00d360c0d00d8ba21057fab4a05b1870023febf076e35887ef40d
 DIST totem-3.4.3.tar.xz 3163404 SHA256 fce76e3c924d0ffd3d4eef2e69af4c44b3537b26c2df86745e900b4c829b38db SHA512 6a2947e0d472da9587b275bb4bf546b4566cda50c3475369b941d2f81f9909c754ac9b50b64715a6acfa38231e2a4fb3047b0b64f45da371572c1d554df9ab11 WHIRLPOOL 2c5bb18871e57a09bf4bb7ad03392d34b93e482d1aba553bc816d55c686eb9f28cf29260d5490f74063640e320e7c8ab7a1b9820b66878aa555421fc48df5f1a
+DIST totem-3.6.3.tar.xz 3120056 SHA256 ad9f2ff207c8a965975670e262394953b37b2dc25cff7ee59f138f961f88ce60 SHA512 adb8c568aafd09fb87ef93b48a9c9bc490471690c0c52d66cde5ba00e527d342be99d54b40e4f0293604bee5ef2f3200a200047a7c92ac1920723e6fb18e5b6d WHIRLPOOL 53e1ce226f124295c8eca321c9a513d01bb07454232aa2d2dd6623d6501e9270193e5a8668e81f0fd51e3746720a79bc88903b79741a7dda4c452e8e281f9568
 EBUILD totem-2.32.0-r2.ebuild 5837 SHA256 a86879d5c09e7ecdf717aebdf01e3db99804db3b2bed49325bb4a1912768ddac SHA512 0ee9b9c1c8964f103777731cdb4f7499f6a5d7a0455d36b83a1099c158c2543e8140c748adfe5e691e88f9a046eb314e9aa18fc43b7181139005a2b80fab2af1 WHIRLPOOL 85bea8934aae02c15fef723ce02ffa8335c32c96ada367f154e10a231219ddd4938a8316d484592a29bd805a33cabfbd576b9f3dee0ee4e9ce265cd9ad896d75
 EBUILD totem-3.4.3.ebuild 5508 SHA256 88ee4136adb9347f4d1a6668b08dfa51099be82593df6455aa0d7a42da4f7c00 SHA512 32d9c9ff0008119466a57ece7aa2ae6b384f22593e95a47cfffd7fd9c78b8ed208263a3f398a6a876b423d2baa2df262aa610d1e4c84f3aa06b0be9f1c66f397 WHIRLPOOL 92d0a76c93642c0a103d5f0b8112dc961c827a1ab306fefd8deb4d7a933dc15d9f4d9a7155ff55424176671c0dae9d0e18b5aeb981e5acd062f19403b4039f18
-MISC ChangeLog 51921 SHA256 f4485b5613ead7a5096942e656c3de8e4582421f2654f6b89eb89a364acf7206 SHA512 03ba9be2360ab96cf6e5d108a6aa811940fdd1345071f5db7525c4dc34e59416582d7234f88f4a614dd87258aabc4e52c81c86e31f261de817aad57a07fdf0cc WHIRLPOOL 5f5e14801d7359cc5415f971a6c67b50965f78020ce23590f9bde5c2d3761a89a08dcfe0052d13ef895f613899ede8ad587180e3574514bac40066581c5d0f1f
-MISC metadata.xml 1710 SHA256 2a0220735852926dcb940774a050565e3e379d8ed6fb7d93d077d6ff43dfd336 SHA512 7c42958e6e24edfbd57e09eeb2784decda1a91053e00e7bbdb7baf15e294de8856245d5ac51a57d889f24f454bc18f8a68b3ea41c094971bac23156ad6e61503 WHIRLPOOL 865c815ca293a4252b834eb4a940e531e2af4d8560d70565801111efe29ac9e01b7680a5d4d4d39467e63382278050d55610f796e1f4a98cc52a8a1ba62a8fa9
+EBUILD totem-3.6.3-r1.ebuild 4162 SHA256 6ff0d174f91a7c69f5c5d34d78a40f1869cc48ece4d6f3aada72bb2bfdced6a3 SHA512 853b30061b6c2004a6de010dbe1151f831d74de0b1203a3b2d3bb1c89659ea96a4c846ae4c21e1807726b416ec635496d64eeff33d9853003af51fbd515193e0 WHIRLPOOL 872a33cb94c69527af3edfd91d7b71ef6b22c6a7a0105f4ae3d64d516ccc22129b5f41ffd898c012a5d9b24b03ba228f89f485d603024ffc4dcc08d0d87fbbb0
+MISC ChangeLog 52117 SHA256 330439d695d44d7d2b0b45ba5e3a5606e98179dfe961ab4852137168293782b7 SHA512 a26fd56be65fc9cee2a3f4fbd2216876b182db8d0fcfcfb5acaa29b696f79c6123f709c5119360db6838df16adcb08e82843c6792e43852484a80b4a9b207e46 WHIRLPOOL 3c85c563a949f5de14c6fdbd1ce2caaf5c28cc1a04c61bcbb2ff63f38ff6de6f744e9e22f332e15cc01dbeedb2fe4891ce86d353c7375c8e9c67338ec7e02873
+MISC metadata.xml 1614 SHA256 dec13a6edcbc4b0fc4324d74937f6423883019cdb32397eb2bc8102b93d9957d SHA512 74f4affccb613b5cdaa015f10d018ffac89104e6bec13fc26acee08cde973b2e93f9b1106f92aaa52134d1340852c9e29b850a9751d9f52ab5f43639f7d9f464 WHIRLPOOL 8051fe6e2d0f4d1426c6ff9270756e4996723274a107a2882b01e3a08bda826172fa8cb12e2e675934352d10cf8b51da5498842e6e7ecb02c6f4c658cc0727e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQzL7AAAoJEJ0WA1zPCt1ha00IAK5lcXHyBTqYrYBN35NGlzoZ
-F+oHOmeKn01YUCkzOJsrJGPfWrm+2VA5Kojs1BAb1wZc4qz0AyGhKrqDgBYi974p
-IO0ohiwGI5irGigq4sMNoAHrI7Xhi2lV3MsWjHSyoNry5wnKD1ItzUfRXvPcIQOM
-s9LdMDLCV1DOq4eHjmD/YcANpE37Nz0Lg/3c0KDWUfnh76kLjZhZuxMVUpS/2CUQ
-8WTGFPTVyVkZXkSkkSRxhmFFpbY8xL6ihjST3otixIYEvTaSiWTM3sI2tW3x4+xh
-p2omOV6FV/AGx2UEnHQxuE3V/1xbUBiFJRTVdM8rAOc7l37zmmkZ048+57jM7M8=
-=uMXR
+iEYEAREIAAYFAlDYTUgACgkQ1fmVwcYIWAZTFACgl8BR4Vh6WEmIgolCj+sWwwEM
+ssoAoK06+v7oOSJ7exHOgmNqeOvhhSgg
+=GvIx
 -----END PGP SIGNATURE-----
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index 93928e147594..609750893b70 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -6,23 +6,21 @@
 	<herd>gstreamer</herd>
 	<longdescription>
 Totem is movie player for the GNOME desktop. It features a playlist, fullscreen mode, seek and volume controls, as well as a pretty complete keyboard navigation. It comes with added functionality such as a video thumbnailer for Nautilus, Nautilus properties tab and a webcam utility.
-</longdescription>
+	</longdescription>
 	<use>
 		<flag name="bluetooth">Enable support for user-presence detection via the
-		user's bluetooth handset using <pkg>net-wireless/bluez</pkg></flag>
+			user's bluetooth handset using <pkg>net-wireless/bluez</pkg></flag>
 		<flag name="flash">Install browser plugin for playing embedded Adobe Flash
-		videos. Warning: breaks non-video Flash objects on many websites.</flag>
+			videos. Warning: breaks non-video Flash objects on many websites.</flag>
 		<flag name="grilo">Use <pkg>media-libs/grilo</pkg> to browse media content
-		from various sources</flag>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-		for introspection</flag>
+			from various sources</flag>
 		<flag name="iplayer">Enable BBC player support</flag>
 		<flag name="lirc">Enable support for controlling Totem with a remote control
-		using <pkg>app-misc/lirc</pkg></flag>
+			using <pkg>app-misc/lirc</pkg></flag>
 		<flag name="nautilus">Enable the nautilus extension</flag>
 		<flag name="python">Build support for <pkg>dev-lang/python</pkg> plugins</flag>
 		<flag name="tracker">Enable support for searching media files using the
-		indexer <pkg>app-misc/tracker</pkg></flag>
+			indexer <pkg>app-misc/tracker</pkg></flag>
 		<flag name="youtube">Enable youtube plugin</flag>
 		<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 		<flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
diff --git a/media-video/totem/totem-3.6.3-r1.ebuild b/media-video/totem/totem-3.6.3-r1.ebuild
new file mode 100644
index 000000000000..f50bbf1f188d
--- /dev/null
+++ b/media-video/totem/totem-3.6.3-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.6.3-r1.ebuild,v 1.1 2012/12/24 12:40:39 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="threads"
+
+inherit gnome2 multilib python-single-r1
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="http://projects.gnome.org/totem/"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+# see bug #359379
+REQUIRED_USE="flash? ( nsplugin )
+	python? ( introspection )
+	zeitgeist? ( introspection )"
+
+# TODO:
+# Cone (VLC) plugin needs someone with the right setup to test it
+#
+# FIXME:
+# Automagic tracker-0.9.0
+# Runtime dependency on gnome-session-2.91
+RDEPEND="
+	>=dev-libs/glib-2.33:2
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.5.2:3[introspection?]
+	>=dev-libs/totem-pl-parser-2.32.4[introspection?]
+	>=dev-libs/libpeas-1.1.0[gtk]
+	>=x11-themes/gnome-icon-theme-2.16
+	x11-libs/cairo
+	>=dev-libs/libxml2-2.6:2
+	>=media-libs/clutter-1.6.8:1.0
+	>=media-libs/clutter-gst-1.5.5:2.0
+	>=media-libs/clutter-gtk-1.0.2:1.0
+	x11-libs/mx:1.0
+
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0[X,introspection?,pango]
+	>=media-libs/gst-plugins-bad-1.0.2:1.0
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	media-plugins/gst-plugins-meta:1.0
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXxf86vm-1.0.1
+
+	gnome-base/gsettings-desktop-schemas
+	x11-themes/gnome-icon-theme-symbolic
+
+	flash? ( dev-libs/totem-pl-parser[quvi] )
+	grilo? ( media-libs/grilo:0.2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+	lirc? ( app-misc/lirc )
+	nautilus? ( >=gnome-base/nautilus-2.91.3 )
+	nsplugin? (
+		>=dev-libs/dbus-glib-0.82
+		>=x11-misc/shared-mime-info-0.22 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=x11-libs/gtk+-2.91.7:3[introspection] )
+	zeitgeist? ( dev-libs/libzeitgeist )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/gnome-doc-utils-0.20.3
+	app-text/scrollkeeper
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	x11-proto/xextproto
+	x11-proto/xproto
+	virtual/pkgconfig
+	test? ( python? ( dev-python/pylint ) )
+"
+# docbook-xml-dtd is needed for user doc
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
+
+	#--with-smclient=auto needed to correctly link to libICE and libSM
+	G2CONF="${G2CONF}
+		--disable-run-in-source-tree
+		--disable-static
+		--with-smclient=auto
+		--enable-easy-codec-installation
+		--enable-vala
+		$(use_enable flash vegas-plugin)
+		$(use_enable introspection)
+		$(use_enable nautilus)
+		$(use_enable nsplugin browser-plugins)
+		$(use_enable python)
+		VALAC=$(type -P true)
+		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+
+	# XXX: always set to true otherwise tests fails due to pylint not
+	# respecting EPYTHON (wait for python-r1)
+	# pylint is checked unconditionally, but is only used for make check
+	G2CONF="${G2CONF} PYLINT=$(type -P true)"
+
+	# Disabled: sample-python, sample-vala
+	local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
+	plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
+	plugins+=",properties,recent,rotation,screensaver,screenshot"
+	plugins+=",sidebar-test,skipto"
+	use grilo && plugins+=",grilo"
+	use lirc && plugins+=",lirc"
+	use nautilus && plugins+=",save-file"
+	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
+	use zeitgeist && plugins+=",zeitgeist-dp"
+
+	G2CONF="${G2CONF} --with-plugins=${plugins}"
+
+	# Work around sandbox violations when FEATURES=-userpriv caused by
+	# gst-inspect-1.0(bug #358755)
+	unset DISPLAY
+	gnome2_src_configure
+}
+
+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
+}