Revert commit 255f0218..92e8d28f

Those commits are improperly tested and were not meant to be pushed yet.

3 files changed, 51 insertions, 211 deletions

diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
deleted file mode 100644
index baa200fe..00000000
--- a/media-video/totem/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-DIST totem-3.10.0.tar.xz 3146376 SHA256 c223e953f9697cc932f3b7efd87cea767a3e5a2ba0e3cda08628aa364caee094 SHA512 8c4e3a94575281eaddbc10254f00d034ca8ce4ff437d4d01c1521cc8ffcd769c13cebc7a27abdf49afd29a622211f823fe8f258eebc50ef0733df03c61edd0b5 WHIRLPOOL 939617fdbd7a49118e36606f7eb88d29c546e6c6626944d9e1d3e33409ba955cb002d9625363c3ca09397f2b748c9fa97c8df32b6eda81a37053c23c8eaa12e6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
-
-iEYEAREKAAYFAlJbHOkACgkQ1fmVwcYIWAZ17wCgnkjTsyo0qU/6378DXRl9CZEA
-KK4AnAtqEpGy2pAH315r6QsH2nO8vgn7
-=NRSn
------END PGP SIGNATURE-----
diff --git a/media-video/totem/totem-3.10.0.ebuild b/media-video/totem/totem-3.10.0.ebuild
deleted file mode 100644
index 7d79b35c..00000000
--- a/media-video/totem/totem-3.10.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="threads"
-
-inherit autotools eutils 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"
-# see bug #359379
-REQUIRED_USE="
-	flash? ( nsplugin )
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	zeitgeist? ( introspection )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# 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.7.10:3[introspection?]
-	>=dev-libs/totem-pl-parser-3.9.92[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.10: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
-		media-plugins/grilo-plugins: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+-3.5.2:3[introspection] )
-	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	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
-"
-# docbook-xml-dtd is needed for user doc
-# Prevent dev-python/pylint dep, bug #482538
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prevent pylint usage by tests, bug #482538
-	sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
-
-	eautoreconf
-	gnome2_src_prepare
-
-	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
-	# gst-inspect causes sandbox violations when a plugin needs write access to
-	# /dev/dri/card* in its init phase.
-	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
-		-i configure || die
-}
-
-src_configure() {
-	use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
-
-	# 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,vimeo"
-	use grilo && plugins+=",grilo"
-	use lirc && plugins+=",lirc"
-	use nautilus && plugins+=",save-file"
-	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
-	use zeitgeist && plugins+=",zeitgeist-dp"
-
-	#--with-smclient=auto needed to correctly link to libICE and libSM
-	# 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
-	gnome2_src_configure \
-		--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) \
-		PYLINT=$(type -P true) \
-		VALAC=$(type -P true) \
-		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins \
-		--with-plugins=${plugins}
-}
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 46d373f0..edea6401 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes" # plugins are dlopened
 PYTHON_COMPAT=( python2_{6,7} )
 PYTHON_REQ_USE="threads"
 
-inherit autotools eutils gnome2 multilib python-single-r1
+inherit gnome2 multilib python-single-r1
 if [[ ${PV} = 9999 ]]; then
 	VALA_MIN_API_VERSION="0.14"
 	inherit gnome2-live vala
@@ -21,18 +21,16 @@ LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
 # see bug #359379
-REQUIRED_USE="
-	flash? ( nsplugin )
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	zeitgeist? ( introspection )
-"
+REQUIRED_USE="flash? ( nsplugin )
+	python? ( introspection )
+	zeitgeist? ( introspection )"
 
 if [[ ${PV} = 9999 ]]; then
 	IUSE+=" doc vala"
 	REQUIRED_USE+=" zeitgeist? ( vala )"
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 fi
 
 # TODO:
@@ -44,13 +42,13 @@ fi
 RDEPEND="
 	>=dev-libs/glib-2.33:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.7.10:3[introspection?]
-	>=dev-libs/totem-pl-parser-3.9.92[introspection?]
+	>=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.10:1.0
+	>=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
@@ -71,9 +69,7 @@ RDEPEND="
 	x11-themes/gnome-icon-theme-symbolic
 
 	flash? ( dev-libs/totem-pl-parser[quvi] )
-	grilo? (
-		media-libs/grilo:0.2
-		media-plugins/grilo-plugins:0.2 )
+	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 )
@@ -85,11 +81,12 @@ RDEPEND="
 		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
 		dev-python/pyxdg[${PYTHON_USEDEP}]
 		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=x11-libs/gtk+-3.5.2:3[introspection] )
-	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
+		>=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
@@ -100,79 +97,77 @@ DEPEND="${RDEPEND}
 	test? ( python? ( dev-python/pylint ) )
 "
 # docbook-xml-dtd is needed for user doc
-# Prevent dev-python/pylint dep, bug #482538
 # Only needed when regenerating C sources from Vala files
 if [[ ${PV} = 9999 ]]; then
 	DEPEND+=" vala? ( $(vala_depend) )
-		app-text/yelp-tools
 		doc? ( >=dev-util/gtk-doc-1.14 )"
 fi
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
 	mkdir -p m4
 
-	# Prevent pylint usage by tests, bug #482538
-	sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
-
 	if [[ ${PV} = 9999 ]]; then
 		# Only needed when regenerating C sources from Vala files
 		use vala && vala_src_prepare
 	fi
 	gnome2_src_prepare
-
-	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
-	# gst-inspect causes sandbox violations when a plugin needs write access to
-	# /dev/dri/card* in its init phase.
-	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
-		-i configure || die
 }
 
 src_configure() {
-	local myconf=""
+	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
+		$(use_enable flash vegas-plugin)
+		$(use_enable introspection)
+		$(use_enable nautilus)
+		$(use_enable nsplugin browser-plugins)
+		$(use_enable python)
+		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,vimeo"
+	plugins+=",properties,recent,screensaver,screenshot,sidebar-test"
+	plugins+=",skipto"
 	use grilo && plugins+=",grilo"
 	use lirc && plugins+=",lirc"
 	use nautilus && plugins+=",save-file"
 	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
 	if [[ ${PV} = 9999 ]]; then
 		# Only needed when regenerating C sources from Vala files
-		myconf="${myconf} $(use_enable vala)"
+		G2CONF="${G2CONF} $(use_enable vala)"
 		use vala && plugins+=",rotation"
 	else
-		myconf="${myconf} --enable-vala VALAC=$(type -P true)"
+		G2CONF="${G2CONF} --enable-vala VALAC=$(type -P true)"
 		plugins+=",rotation"
 	fi
 	use zeitgeist && plugins+=",zeitgeist-dp"
 
-	#--with-smclient=auto needed to correctly link to libICE and libSM
-	# 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
-	gnome2_src_configure \
-		--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) \
-		PYLINT=$(type -P true) \
-		VALAC=$(type -P true) \
-		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins \
-		--with-plugins=${plugins} \
-		${myconf}
+	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
 }