Rename upnp USE flag to upnp-av (bug #435776, thanks to Michał Górny). Drop old.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 21 insertions, 402 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index d79ef5161c24..a68b76a354b0 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.345 2012/09/21 04:33:56 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.346 2012/12/15 18:17:35 tetromino Exp $
+
+  15 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  totem-2.32.0-r2.ebuild, -totem-3.2.2.ebuild, -totem-3.4.2.ebuild,
+  metadata.xml:
+  Rename upnp USE flag to upnp-av (bug #435776, thanks to Michał Górny). Drop
+  old.
 
   21 Sep 2012; Nirbheek Chauhan <nirbheek@gentoo.org> totem-3.4.3.ebuild:
   We don't really need vala for building from the source tarball
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index e23274d06f92..04a9530321ce 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -5,29 +5,19 @@ AUX totem-2.30.2-mp2t-support.patch 522 SHA256 fd75446210f92e4abfb0d80018f1e5aad
 AUX totem-2.32.0-smclient-target-detection.patch 1546 SHA256 c2c454e1a1776cc7c07ba4ee069105f6010e92478e9598af23956fac0fb13e63 SHA512 ea97c322cc3d47804682120b90500274ad107c0de1b188d7c7a5426e701829a1d93dcf59766c317239f33aeab44af4311a1be38e0539345fbb5bedf8df4573bb WHIRLPOOL c2255cc3bafcd565c2fe41114922e814ab6b1de3ac90b776da8907daa3892021a863d615a4d89d1a04dc5e6ad9fac1ee0c7a4ff58f1248edadf372d41c7f7cc5
 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.2.2.tar.xz 3141664 SHA256 b065e486e6b70b27d3a589e70c5459ff16a7affeff0b219ead5942585d4d0c9a SHA512 0a683e2b28f304d56552b7094f76ed48a8c876ab7a65cfdf8d092688f6d0a1c92020614d6d129d90558df626150719b83ae01e9e73d76f7fd8650b1507f02c59 WHIRLPOOL 0fe687b5438473b1da13ef46996ff00b12016db51e9c00fd16794aed1de8cff99f6f1b449e4475fc430d6b1a88496700851dd49a96a54fff28e6a36107af609e
-DIST totem-3.4.2.tar.xz 3162288 SHA256 e1532b471a14612b5f44d29b8392716c1123f4d874cd9d01e06a11f32637341e SHA512 a928ceae372de7877c3ab633f6fdacf5c94c980490da72c50520ee8c869dd74e78e6b1148fdf1d025d046de8e12e47de3a852c1367ca17cb0976d5a880dcf7ed WHIRLPOOL c48380be6a0b7227eb41c28ab5431d4a82c5cdcd3bee81fd46531a8fce10430402faa150e9a51c2bc3685e2407e23c2b3c56723d0f82fead7e2876477ac840ff
 DIST totem-3.4.3.tar.xz 3163404 SHA256 fce76e3c924d0ffd3d4eef2e69af4c44b3537b26c2df86745e900b4c829b38db SHA512 6a2947e0d472da9587b275bb4bf546b4566cda50c3475369b941d2f81f9909c754ac9b50b64715a6acfa38231e2a4fb3047b0b64f45da371572c1d554df9ab11 WHIRLPOOL 2c5bb18871e57a09bf4bb7ad03392d34b93e482d1aba553bc816d55c686eb9f28cf29260d5490f74063640e320e7c8ab7a1b9820b66878aa555421fc48df5f1a
-EBUILD totem-2.32.0-r2.ebuild 5825 SHA256 7a1ff47ebc7e9304f9ac695983e8e2bead2f664889655ab0b48b120d8b9cfe67 SHA512 97fcac3b0c0cab52cfd82d8f6917f9fb3632821050ea9199a035523f3901e364ed38ef262bd1af5dfcbef1ce4514599fb27bea7e489ebde027776ae7342245fb WHIRLPOOL fe0a4af418eb118b753f24de23df6726536163455936523cb6483735dcdcd6b053564efcb86a6711115468bf7a7fc9ce394ae36ef75907a425e4af3eb4a70d89
-EBUILD totem-3.2.2.ebuild 5469 SHA256 8eff94a239ca2d00bcc88aa235cc641f29ece86825af1bf9857066aff94d7e7a SHA512 d6ab93a31705ef4df2697daa4d647ca60480052a4d7beaab195a9ee6a4231fce55275cd012970d5261640b4cccd744f493758b5d722d601fb8bbd46dcf0a1135 WHIRLPOOL aa97934da6f064f853c872444ef59a3ecde9db393bc4c197991f6d57de1c4b2f986ef576892b87e088d071d6eb406a4ea7820d531e1517a4181cecf6c472020a
-EBUILD totem-3.4.2.ebuild 5347 SHA256 60ea28763061d19a268e40747a8537e9f1d3dac06bf539867aa99c0bdbe2e730 SHA512 362e77bd93f9c08bbbdedd9e7621c49bf0681c10b9228a75f724da0c30eb180be1e3af1f810b2f5d0a24ceba7348e672a82e752ccbeb74226581dc8da4b6a509 WHIRLPOOL 7e311e1215cb07d345e6d448dcd4b4068489724aaa5fcf5f1106566a36ab080f5a4f1e2f6fc84c841c5403d97e7c83427713d76834d88fa427f969ccdd94b47c
+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 51689 SHA256 b7339225d294681a377a1bac7b53791760aa683e349f84cfd1ecf02e8b7f7cfb SHA512 30efed7d509dec36188ed43b70ec9696905f39a36319e55df1c44b468b2eca5739d01458a5abae0790cb295a83c0f753e41df4a552c9b786d11e41560ff40246 WHIRLPOOL 09f89a5e380c2de658e08bf32fbf5dbec0c7899031b4fc3eb0bca50e4ac1d7d20fe39fe63ac912f38cfdb176aece81ae4ff517e64027e75dfb139c70fadff341
-MISC metadata.xml 1800 SHA256 d5478ecc6ef045dcdaeab363be952807d8f2a6eab87abc7ca11c26063b8a6a4d SHA512 271ba51e94e1ece5ad03f9cb2285dca669a485a10ec26d237b6ba4abaae5c8032aa3f78e9c58738ec63362837520a99f8d1828de90b1c02cfe5e374f61da81d9 WHIRLPOOL e6ba605362d064fdc68035842220faa01eea8e5912cbd720b73527a9c6d6538125bbe62591dccf24649822a02a3aed33372095cd625acba86217787c63cbb169
+MISC ChangeLog 51921 SHA256 f4485b5613ead7a5096942e656c3de8e4582421f2654f6b89eb89a364acf7206 SHA512 03ba9be2360ab96cf6e5d108a6aa811940fdd1345071f5db7525c4dc34e59416582d7234f88f4a614dd87258aabc4e52c81c86e31f261de817aad57a07fdf0cc WHIRLPOOL 5f5e14801d7359cc5415f971a6c67b50965f78020ce23590f9bde5c2d3761a89a08dcfe0052d13ef895f613899ede8ad587180e3574514bac40066581c5d0f1f
+MISC metadata.xml 1710 SHA256 2a0220735852926dcb940774a050565e3e379d8ed6fb7d93d077d6ff43dfd336 SHA512 7c42958e6e24edfbd57e09eeb2784decda1a91053e00e7bbdb7baf15e294de8856245d5ac51a57d889f24f454bc18f8a68b3ea41c094971bac23156ad6e61503 WHIRLPOOL 865c815ca293a4252b834eb4a940e531e2af4d8560d70565801111efe29ac9e01b7680a5d4d4d39467e63382278050d55610f796e1f4a98cc52a8a1ba62a8fa9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQW+5DAAoJEO/kOhxWD91kOSYQAJf5UiiHKziqzDID3ZJd7e9/
-rpOYFDaIykr5H+MAPvrXAEI1GiclwC8UB2pefPgOc8uOQe06A08SQ1tSerHivN6D
-Im7hjHjUouAJWvfueNW3i97/N6tqG2KXlpRkZ57/O+ZCBkDY2GmOlZWoeCyX/MQ0
-Q265I7ySflEiMejMQ/Z6rKxBY18SdW+Cafrn44FP0q6JCSGTHl9N/N5yAZXMru4M
-SyNpZg11QN7Qj2wew2wih1uBD4J+3Q6Md3IkCrK+Vnej5Bbw8SsbkiLEAsda7CAA
-7iQ4Q3Rq+v2XruENCw62RD6S9OWQYWIYo/cBnKwlGmCSw4GfGTiZZZo/hZ/oxejX
-EC7mKh1ud0zEMVaee+vVU6HHyXibZisrtuovYQp2d5hhAtSWuOFrjAfnVomNv8Uh
-HrrBozcoVnXH76oXKo8nJxBumRfym/Jm84fEwJOdNLYa1BgOGLAhFXSXVGjeeS0n
-8Y7MMtNEKsEvIZmx73PumSFYlsNko7xVdMNdsTfgMnlJS7wvNTvnh9eWKxCNGJxc
-3AkEZUGzJ8svopIEJwd5QBQFKhRd0TUFDxuI3ircFSW/wsABaLWPgUNwNpOXtq+u
-Jus9yBawnVv/lSPaysn4zrFSaIA9tOe7tkeEeJIu93mue6W7SS4y2GNDROR6CmIl
-+90OZHj5rlPIEgykcGnp
-=Q/gV
+iQEcBAEBCAAGBQJQzL7AAAoJEJ0WA1zPCt1ha00IAK5lcXHyBTqYrYBN35NGlzoZ
+F+oHOmeKn01YUCkzOJsrJGPfWrm+2VA5Kojs1BAb1wZc4qz0AyGhKrqDgBYi974p
+IO0ohiwGI5irGigq4sMNoAHrI7Xhi2lV3MsWjHSyoNry5wnKD1ItzUfRXvPcIQOM
+s9LdMDLCV1DOq4eHjmD/YcANpE37Nz0Lg/3c0KDWUfnh76kLjZhZuxMVUpS/2CUQ
+8WTGFPTVyVkZXkSkkSRxhmFFpbY8xL6ihjST3otixIYEvTaSiWTM3sI2tW3x4+xh
+p2omOV6FV/AGx2UEnHQxuE3V/1xbUBiFJRTVdM8rAOc7l37zmmkZ048+57jM7M8=
+=uMXR
 -----END PGP SIGNATURE-----
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index b33af20d95b5..93928e147594 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -23,8 +23,6 @@ Totem is movie player for the GNOME desktop. It features a playlist, fullscreen
 		<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>
-		<flag name="upnp">Enable DLNA support through
-		<pkg>media-video/coherence</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-2.32.0-r2.ebuild b/media-video/totem/totem-2.32.0-r2.ebuild
index e3db6dda06bc..735c9d56e2c2 100644
--- a/media-video/totem/totem-2.32.0-r2.ebuild
+++ b/media-video/totem/totem-2.32.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-2.32.0-r2.ebuild,v 1.12 2012/05/05 08:58:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.32.0-r2.ebuild,v 1.13 2012/12/15 18:17:35 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 
-IUSE="bluetooth debug doc iplayer lirc nautilus nsplugin python tracker upnp +youtube" #zeroconf
+IUSE="bluetooth debug doc iplayer lirc nautilus nsplugin python tracker upnp-av +youtube" #zeroconf
 
 # TODO:
 # Cone (VLC) plugin needs someone with the right setup (remi ?)
@@ -69,7 +69,7 @@ RDEPEND=">=dev-libs/glib-2.25.11:2
 	nsplugin? ( media-plugins/gst-plugins-soup:0.10 )
 	python? ( ${PYTHON_DEPS} )
 	tracker? ( >=app-misc/tracker-0.8.1 )
-	upnp? ( media-video/coherence )
+	upnp-av? ( media-video/coherence )
 	youtube? (
 		<dev-libs/libgdata-0.9
 		>=dev-libs/libgdata-0.4
@@ -121,7 +121,7 @@ pkg_setup() {
 	use lirc && plugins="${plugins},lirc"
 	use python && plugins="${plugins},opensubtitles,jamendo,pythonconsole,dbus-service"
 	use tracker && plugins="${plugins},tracker"
-	use upnp && plugins="${plugins},coherence_upnp"
+	use upnp-av && plugins="${plugins},coherence_upnp"
 	use youtube && plugins="${plugins},youtube"
 	#use vala && plugins="${plugins},sample-vala"
 	#use zeroconf && plugins="${plugins},publish"
diff --git a/media-video/totem/totem-3.2.2.ebuild b/media-video/totem/totem-3.2.2.ebuild
deleted file mode 100644
index 8a3440f420f8..000000000000
--- a/media-video/totem/totem-3.2.2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# 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.2.2.ebuild,v 1.6 2012/09/16 02:55:45 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-WANT_AUTOMAKE="1.11"
-PYTHON_DEPEND="python? 2:2.5"
-PYTHON_USE_WITH="threads"
-PYTHON_USE_WITH_OPT="python"
-
-inherit gnome2 multilib python
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://projects.gnome.org/totem/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="bluetooth doc grilo +introspection iplayer lirc nautilus nsplugin +python +youtube vala zeitgeist" # test zeroconf
-
-# TODO:
-# Cone (VLC) plugin needs someone with the right setup (remi ?)
-# coherence plugin broken upstream
-#
-# FIXME: Automagic tracker-0.9.0
-# Runtime dependency on gnome-session-2.91
-RDEPEND=">=dev-libs/glib-2.27.92:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-2.99.3: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.3.9:1.0
-	>=media-libs/clutter-gtk-1.0.2:1.0
-	>=media-libs/gstreamer-0.10.30:0.10
-	>=media-libs/gst-plugins-base-0.10.30:0.10
-	x11-libs/mx:1.0
-
-	media-libs/gst-plugins-good: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
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXtst
-	>=x11-libs/libXxf86vm-1.0.1
-
-	gnome-base/gsettings-desktop-schemas
-	x11-themes/gnome-icon-theme-symbolic
-
-	bluetooth? ( net-wireless/bluez )
-	grilo? ( >=media-libs/grilo-0.1.16:0.1 )
-	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? (
-		>=dev-libs/gobject-introspection-0.6.7
-		>=dev-python/pygobject-2.90.3:3
-		>=x11-libs/gtk+-2.91.7:3[introspection]
-		dev-python/pyxdg
-		dev-python/gst-python:0.10
-		dev-python/dbus-python
-		iplayer? (
-			dev-python/httplib2
-			dev-python/feedparser
-			dev-python/beautifulsoup ) )
-	vala? ( >=dev-lang/vala-0.14.2-r1:0.14 )
-	youtube? (
-		>=dev-libs/libgdata-0.7.0
-		net-libs/libsoup:2.4
-		media-plugins/gst-plugins-soup:0.10
-		>=dev-libs/totem-pl-parser-2.32.4[quvi] )
-	zeitgeist? ( dev-libs/libzeitgeist )"
-#	zeroconf? ( >=net-libs/libepc-0.5.0 )
-# XXX: zeroconf requires unreleased version of libepc
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	x11-proto/xproto
-	x11-proto/xextproto
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.20.3
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	app-text/docbook-xml-dtd:4.5
-	gnome-base/gnome-common
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.14 )"
-#	test? ( python? ( dev-python/pylint ) )
-# docbook-xml-dtd is needed for user doc
-
-# see bug #359379
-REQUIRED_USE="python? ( introspection )
-	zeitgeist? ( vala )"
-
-# XXX: pylint checks fail, need to investigate why
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-run-in-source-tree
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-static
-		--with-smclient=auto
-		--enable-easy-codec-installation
-		$(use_enable introspection)
-		$(use_enable nautilus)
-		$(use_enable nsplugin browser-plugins)
-		$(use_enable python)
-		$(use_enable python introspection)
-		$(use_enable vala)
-		VALAC=$(type -P valac-0.14)
-		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
-	#--with-smclient=auto needed to correctly link to libICE and libSM
-
-	# Disabled: sample-python, sample-vala, zeitgeist-dp
-	local plugins="brasero-disc-recorder,chapters,im-status,gromit"
-	plugins="${plugins},media-player-keys,ontop,properties,screensaver"
-	plugins="${plugins},screenshot,sidebar-test,skipto"
-	use bluetooth && plugins="${plugins},bemused"
-	use grilo && plugins="${plugins},grilo"
-	use iplayer && plugins="${plugins},iplayer"
-	use lirc && plugins="${plugins},lirc"
-	use nautilus && plugins="${plugins},save-file"
-	use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
-	use vala && plugins="${plugins},rotation"
-	use youtube && plugins="${plugins},youtube"
-	use zeitgeist && plugins="${plugins},zeitgeist-dp"
-	# XXX: zeroconf requires unreleased version of libepc
-	# use zeroconf && plugins="${plugins},publish"
-
-	G2CONF="${G2CONF} --with-plugins=${plugins}"
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
-	mkdir -p m4
-
-	#if [[ ${PV} != 9999 ]]; then
-	#	intltoolize --force --copy --automake || die "intltoolize failed"
-	#	eautoreconf
-	#fi
-
-	use python && python_clean_py-compile_files
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Work around sandbox violations when FEATURES=-userpriv caused by
-	# gst-inspect-0.10 (bug #358755, #419187)
-	unset DISPLAY
-	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
-	use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins
-}
diff --git a/media-video/totem/totem-3.4.2.ebuild b/media-video/totem/totem-3.4.2.ebuild
deleted file mode 100644
index 320a1e2d0c79..000000000000
--- a/media-video/totem/totem-3.4.2.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# 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.4.2.ebuild,v 1.4 2012/09/16 02:55:45 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-WANT_AUTOMAKE="1.11"
-PYTHON_DEPEND="python? 2:2.5"
-PYTHON_USE_WITH="threads"
-PYTHON_USE_WITH_OPT="python"
-
-inherit gnome2 multilib python
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://projects.gnome.org/totem/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="doc flash grilo +introspection iplayer lirc nautilus nsplugin +python test vala zeitgeist zeroconf"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-
-# TODO:
-# Cone (VLC) plugin needs someone with the right setup (remi ?)
-# coherence plugin broken upstream
-#
-# FIXME: Automagic tracker-0.9.0
-# Runtime dependency on gnome-session-2.91
-RDEPEND=">=dev-libs/glib-2.27.92:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.3.6: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.3.9:1.0
-	>=media-libs/clutter-gtk-1.0.2:1.0
-	>=media-libs/gstreamer-0.10.30:0.10
-	>=media-libs/gst-plugins-base-0.10.30:0.10
-	x11-libs/mx:1.0
-
-	media-libs/gst-plugins-good: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
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXtst
-	>=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.1.16:0.1 )
-	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? (
-		>=dev-libs/gobject-introspection-0.6.7
-		>=dev-python/pygobject-2.90.3:3
-		>=x11-libs/gtk+-2.91.7:3[introspection]
-		dev-python/pyxdg
-		dev-python/gst-python:0.10
-		dev-python/dbus-python
-		iplayer? (
-			dev-python/httplib2
-			dev-python/feedparser
-			dev-python/beautifulsoup ) )
-	vala? ( >=dev-lang/vala-0.14.2-r1:0.14 )
-	zeitgeist? ( dev-libs/libzeitgeist )
-	zeroconf? ( >net-libs/libepc-0.4.0 )"
-# XXX: zeroconf requires unreleased version of libepc
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/gnome-doc-utils-0.20.3
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	x11-proto/xextproto
-	x11-proto/xproto
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.14 )
-	test? ( python? ( dev-python/pylint ) )"
-# docbook-xml-dtd is needed for user doc
-
-# see bug #359379
-REQUIRED_USE="flash? ( nsplugin )
-	python? ( introspection )
-	zeitgeist? ( introspection vala )"
-
-# XXX: pylint checks fail because of bad code
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
-	G2CONF="${G2CONF}
-		--disable-run-in-source-tree
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--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)
-		$(use_enable vala)
-		VALAC=$(type -P valac-0.14)
-		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
-
-	if ! use test; then
-		# pylint is checked unconditionally, but is only used for make check
-		G2CONF="${G2CONF} PYLINT=$(type -P true)"
-	fi
-	#--with-smclient=auto needed to correctly link to libICE and libSM
-
-	# Disabled: sample-python, sample-vala, zeitgeist-dp
-	local plugins="brasero-disc-recorder,chapters,im-status,gromit"
-	plugins="${plugins},media-player-keys,ontop,properties,screensaver"
-	plugins="${plugins},screenshot,sidebar-test,skipto"
-	use grilo && plugins="${plugins},grilo"
-	use iplayer && plugins="${plugins},iplayer"
-	use lirc && plugins="${plugins},lirc"
-	use nautilus && plugins="${plugins},save-file"
-	use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
-	use vala && plugins="${plugins},rotation"
-	use zeitgeist && plugins="${plugins},zeitgeist-dp"
-	use zeroconf && plugins="${plugins},publish"
-
-	G2CONF="${G2CONF} --with-plugins=${plugins}"
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
-	mkdir -p m4
-
-	#if [[ ${PV} != 9999 ]]; then
-	#	intltoolize --force --copy --automake || die "intltoolize failed"
-	#	eautoreconf
-	#fi
-
-	use python && python_clean_py-compile_files
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Work around sandbox violations when FEATURES=-userpriv caused by
-	# gst-inspect-0.10 (bug #358755)
-	unset DISPLAY
-	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
-	use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins
-}