commit: 0670e86033365cf41f689fbd1f24e6cbe83f79e5
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 6 21:01:52 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 18:16:32 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0670e860
media-video/totem: 3.10.1 → 3.12.0
---
.../{totem-9999.ebuild => totem-3.12.0.ebuild} | 69 +++++-----------------
media-video/totem/totem-9999.ebuild | 27 ++++-----
2 files changed, 27 insertions(+), 69 deletions(-)
diff --git a/media-video/totem/totem-9999.ebuild
b/media-video/totem/totem-3.12.0.ebuild
similarity index 69%
copy from media-video/totem/totem-9999.ebuild
copy to media-video/totem/totem-3.12.0.ebuild
index ab6bf90..2151d50 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -9,17 +9,13 @@ PYTHON_COMPAT=( python2_{6,7} )
PYTHON_REQ_USE="threads"
inherit autotools eutils gnome2 multilib python-single-r1
-if [[ ${PV} = 9999 ]]; then
- VALA_MIN_API_VERSION="0.14"
- inherit gnome2-live vala
-fi
DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://projects.gnome.org/totem/";
+HOMEPAGE="https://wiki.gnome.org/Apps/Videos";
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
+IUSE="flash +introspection lirc nautilus nsplugin +python test zeitgeist"
# see bug #359379
REQUIRED_USE="
flash? ( nsplugin )
@@ -27,13 +23,7 @@ REQUIRED_USE="
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"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
# TODO:
# Cone (VLC) plugin needs someone with the right setup to test it
@@ -42,22 +32,23 @@ fi
# Automagic tracker-0.9.0
# Runtime dependency on gnome-session-2.91
RDEPEND="
- >=dev-libs/glib-2.33:2
+ >=dev-libs/glib-2.35: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:0=[introspection?]
+ >=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.10:1.0
+ >=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-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
@@ -71,15 +62,10 @@ 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 )
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 )
+ nsplugin? ( >=x11-misc/shared-mime-info-0.22 )
python? (
${PYTHON_DEPS}
>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
@@ -91,38 +77,26 @@ RDEPEND="
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
- 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
+ eautoreconf
gnome2_src_prepare
# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755
& co.
@@ -133,26 +107,16 @@ src_prepare() {
}
src_configure() {
- local myconf=""
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"
+ plugins+=",skipto,vimeo"
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)"
- use vala && plugins+=",rotation"
- else
- myconf="${myconf} --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
@@ -173,6 +137,5 @@ src_configure() {
PYLINT=$(type -P true) \
VALAC=$(type -P true) \
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins \
- --with-plugins=${plugins} \
- ${myconf}
+ --with-plugins=${plugins}
}
diff --git a/media-video/totem/totem-9999.ebuild
b/media-video/totem/totem-9999.ebuild
index ab6bf90..2ef9f04 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-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -15,11 +15,11 @@ if [[ ${PV} = 9999 ]]; then
fi
DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://projects.gnome.org/totem/";
+HOMEPAGE="https://wiki.gnome.org/Apps/Videos";
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
+IUSE="flash +introspection lirc nautilus nsplugin +python test zeitgeist"
# see bug #359379
REQUIRED_USE="
flash? ( nsplugin )
@@ -42,22 +42,23 @@ fi
# Automagic tracker-0.9.0
# Runtime dependency on gnome-session-2.91
RDEPEND="
- >=dev-libs/glib-2.33:2
+ >=dev-libs/glib-2.35: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:0=[introspection?]
+ >=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.10:1.0
+ >=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.9: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-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
@@ -71,15 +72,10 @@ 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 )
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 )
+ nsplugin? ( >=x11-misc/shared-mime-info-0.22 )
python? (
${PYTHON_DEPS}
>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
@@ -140,8 +136,7 @@ src_configure() {
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"
+ plugins+=",skipto,vimeo"
use lirc && plugins+=",lirc"
use nautilus && plugins+=",save-file"
use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
