Add gtk USE flag on clutter, otherwise builds fails with undefined symbols in while linking to clutter-gtk. Drop old revision.

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

4 files changed, 13 insertions, 162 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index f56e29735b1c..9639e1cf6eba 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.375 2014/06/16 11:32:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.376 2014/06/29 17:03:50 eva Exp $
+
+  29 Jun 2014; Gilles Dartiguelongue <eva@gentoo.org> -totem-3.12.0.ebuild,
+  totem-3.12.1.ebuild:
+  Add gtk USE flag on clutter, otherwise builds fails with undefined symbols in
+  while linking to clutter-gtk. Drop old revision.
 
   16 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org> totem-3.10.1.ebuild,
   totem-3.12.0.ebuild, totem-3.12.1.ebuild:
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index e3b9234d2de4..5c1a5e7862a4 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -7,22 +7,16 @@ AUX totem-3.8.2-vimeo-compat.patch 5232 SHA256 c259bd44d66828f918ad78931755a875a
 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.10.1.tar.xz 3266668 SHA256 b6b6038c9104965671a6d25e98496a487c3a9c590c9c104f668bd9f4fa7be9e2 SHA512 cd83065e91d8dbc25be886c85542d5a1c2e99d64dd5563ddfcec984080c4755e1924d3dc44ce7fdfb3c9135d5f55d093d206c4392fb2ebb11551a6aede4dff17 WHIRLPOOL 8f9d3e543d22c392d40087b97cff23512fd833cff5a640f6497ac25dd995d2f107aebaa0bcc656b0ee29c6e85b09cf310102e415dec45e361e615406c8baafe5
-DIST totem-3.12.0.tar.xz 3309516 SHA256 96762a1c2026f7bbc6ef8a431cf7626647e54ac2d195eb573a71d62dc3a2c430 SHA512 c4d546363ee688ebab843a7b63f65d39c6eed407cbd4caf59ab85075191f1036855dbfd4582212add3b56881e67f3006170f94933b1f20d590df4b988e47f0e1 WHIRLPOOL 7a4695d578d83ed1933d4b3c9e7183633b8aed53eb7a554061376318fc372174cd46fe748955a4771512452a06cca8cb625515607a74179617e57b7d17d8dcfa
 DIST totem-3.12.1.tar.xz 3316056 SHA256 dd168cdd4051d01131d47c24fa45bfd08b6ccf45900ac4b64bae47f6f47a35e3 SHA512 7b2601764b9715001e52345330e1ede2ba74f9588b5c63b0da595ee06609ec0971b24eed4ad9c3dc4c989e7708b03afcbd782f8d0368fc95a49aa035caccb103 WHIRLPOOL 810704760e941b17df3b2d1e44f8a6480468bd8c8fee3883cde04a884ae369ce52a02c594fd21b8fcbcd564978dd30bc131aba8c9b5065b274a1f20499f09e78
 EBUILD totem-2.32.0-r2.ebuild 6083 SHA256 602096eca2fbb7fa7d09215044ac96361f5b378b8646e8daba33ea0190bab160 SHA512 93fb7e90e73d796fc50a4de32248b417485b4d3f7fbad6cb337b5e9cbff01552c31df59ed6fe8af1b57bccd226217de32d55447c3db950606ba5d4891b86823f WHIRLPOOL 6cbf5edefe1a4dec0709d3ef169269a881dfef31a9774594467816730fa796bd5472c3b11b98c004e51347810d6e65ca2904799dde94bb311327cf778f7cb0af
 EBUILD totem-3.10.1.ebuild 4584 SHA256 4c059b7ea2b4f1f757e1188d9372bba5d2eb778b0fb6f52971c2650f63d20050 SHA512 1cc29f8043ae6c0c72e5ae4e694f601ebded2001424f223723eba853fa83bde1575640d11e4580f016ce299b00fc75ca2038445c447ce072e777bdd882c51be1 WHIRLPOOL e1a880d89d756f1a5cace098383c2b3524cd7ca617d78d4432051673dc2a981ba31b174ff971e39683404aca7214dff06a7d04944b976ba6cd1ae83ad1df921d
-EBUILD totem-3.12.0.ebuild 4498 SHA256 262b13a89e37babc3a3b67fe84421da9b8f6f31eebf013844389f38231e2baf6 SHA512 a03778a2e2fc8013764aa65e067f5add307ce08846588f720a3287c550cbcc9421af924251d76b9af72d579fe7e347e2de4b6ef8544b79cc20732830222baeac WHIRLPOOL 3e735a928f6248300cc67627029f44fb99464e1bc05d914669f86fe228aaa3ecda7b82489413bd35361c634f6c2f47c34d600694ff06583ddc92fe8e91f201a2
-EBUILD totem-3.12.1.ebuild 4470 SHA256 ca067ea03e4e8fb9471887a8da32df39da666f75a5828b637ef5ce506fdc27d2 SHA512 17f09a1806348953c480c119b68e9028c674ca17cdf6699d4654698f0e839894042b36b243edc910ddeb31e384a29f78182b40ac3e65d6f01a61308b9274f5ea WHIRLPOOL 90c333da78eea61a6985fdd6958078d37ce4a55690e2ae275e85be45939efc4987a2c2a5fa290912d3c7136cd7733b16adc9f4c6201bddc7c7c452817342a870
-MISC ChangeLog 56053 SHA256 4e2074897271867f6dd4e9303c8d2c4e673e6315a8e89cfb75ba90c5b30b44c5 SHA512 e985abd78f16e21c3e4bed2f1e5bf1a5b65c38f3c56bce5f51b8064aec2cbbb277b0aef95ef39b29737e3032ddc499acc0ec84fc089e992539a8e0fadec9cc97 WHIRLPOOL ebf44bf41516df6d467c0f5db7fad41f08d5e05093cdffb6eb006f28fcb710fc25f4d4a511d5df1ac47b4c34aa5be4eac9ad479324dc209ff715bfdaa3c85599
+EBUILD totem-3.12.1.ebuild 4469 SHA256 d4849b1812df567da54b9a3dec6c8ccce63b8c6656192c3a31236421795047bd SHA512 99fd5bd2b52be578a5051400c0df5c7cca543b74e27aea67daf8a538edb437e90c532d1141d3d3acc3526bac496ac6c6ac71fa5133607498f4a29c04dd3e0c87 WHIRLPOOL a56665caeb58be006d53de99bfb3573dc810473f7399003d225ec0e56ede5d0a22cf9d21798396c840bfc3119cd00f1377dcae7fc5f203253f13fbbbca67b869
+MISC ChangeLog 56278 SHA256 1027176f300ce7741d8af2fb7f5297dd09564d3d41efd611ee2ebb0b815f59f3 SHA512 a49ef079bf5e618543f45b6e054d1b6800cf77c586494cde476c5f0c589f30b548c59a5f15433ace1790a9974434d61985479c952d3028556f331f38dede966a WHIRLPOOL d908fae2f343f5e6015ac58d6e7669d4676909fd079ce7f00f4c81db495477db3a0dd056c4d31f8226b076cc37579776742dd8ba2057be07390f8b668c551d29
 MISC metadata.xml 1542 SHA256 f20cc9630af8b7ba34b66ae995e734417ab8f4b1142eaf8458a6c385a6f85c1e SHA512 92ae20c93f396d8d1cbee93dbf48ee4bffcb67041ad9af0a4505eb7a0a8b181794da8dafdd575f7113f0d53ec39ccd5612223dc379ed8a25b0545a89b6e4c7fb WHIRLPOOL f64c55c6728a63e82624d895bc4127c7eb34e2d230d4f43007a5cbcc324aabb0184318185c3acf54322a454bb22d65e8392436f7f40c036a2369d8695e0e419d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTntV1AAoJEJ0WA1zPCt1hfcoH/1f6CUi/zEEoC6D+5No7K+Tu
-AP94yBZ5eQRy1mczPWZPTs64jpCgdE4EG8tYOcE9w91LijgW1mCzE+7YefDn33CR
-gvv2bxA/UbvSY8esjRhxbBn8Dqx7R9mbbMLF4SPpHwrLyVEsoDxAWP8jqaV+YiAT
-1mgC2BecDsbuQjMUcCiA8axu2WSFOSduEEbmzemoKWpVMP7FZEcn6tTDx8ldkXV9
-tc/s45ibJntFoWLffRrOPhf/tB/5N2CBPbmFfH/E9t3QfhrlpACZpGkBaQN6FsqN
-P6g+8I5kNSvQNn1Sg7IQBjdnQB0NTVlcGhbm9zWJUeHPgR/hH2PBYyQciv1iz+w=
-=G45v
+iEYEAREIAAYFAlOwRvcACgkQ1fmVwcYIWAbaoQCg0U5379OcJhOOH8M/RvDvBrG6
+/sEAn161vsKV/oD4wV+wuvGrb7Skcd0F
+=ipJY
 -----END PGP SIGNATURE-----
diff --git a/media-video/totem/totem-3.12.0.ebuild b/media-video/totem/totem-3.12.0.ebuild
deleted file mode 100644
index 421511840c12..000000000000
--- a/media-video/totem/totem-3.12.0.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.12.0.ebuild,v 1.2 2014/06/16 11:32:05 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit autotools eutils gnome2 multilib python-single-r1
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="flash +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.35:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.11.5:3[introspection?]
-	>=dev-libs/totem-pl-parser-3.10.1:0=[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.17.3: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/grilo-0.2.10:0.2[playlist]
-	media-plugins/grilo-plugins:0.2
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0[X,introspection?,pango]
-	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] )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	lirc? ( app-misc/lirc )
-	nautilus? ( >=gnome-base/nautilus-2.91.3 )
-	nsplugin? ( >=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
-	app-text/yelp-tools
-	dev-util/appdata-tools
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	x11-proto/xextproto
-	x11-proto/xproto
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf needs:
-#	app-text/yelp-tools
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-# 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+=",skipto,vimeo"
-	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-3.12.1.ebuild b/media-video/totem/totem-3.12.1.ebuild
index eaf75dab0d0c..8021633923ad 100644
--- a/media-video/totem/totem-3.12.1.ebuild
+++ b/media-video/totem/totem-3.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.12.1.ebuild,v 1.2 2014/06/16 11:32:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.12.1.ebuild,v 1.3 2014/06/29 17:03:50 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -39,7 +39,7 @@ RDEPEND="
 	>=dev-libs/libpeas-1.1.0[gtk]
 	x11-libs/cairo
 	>=dev-libs/libxml2-2.6:2
-	>=media-libs/clutter-1.17.3:1.0
+	>=media-libs/clutter-1.17.3:1.0[gtk]
 	>=media-libs/clutter-gst-1.5.5:2.0
 	>=media-libs/clutter-gtk-1.5.2:1.0
 	x11-libs/mx:1.0