commit: d1070e5d582c9252cc8c2e9e0869043e3e93016b
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat May 9 18:15:14 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat May 9 23:10:30 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=d1070e5d
media-video/totem: 3.14.3 → 3.16.1
Clean up the ebuild removing unneeded dependencies, mx, libICE, libSM,
etc.
.../{totem-9999.ebuild => totem-3.16.1.ebuild} | 81 ++++++----------------
media-video/totem/totem-9999.ebuild | 38 +++++-----
2 files changed, 39 insertions(+), 80 deletions(-)
diff --git a/media-video/totem/totem-9999.ebuild
b/media-video/totem/totem-3.16.1.ebuild
similarity index 66%
copy from media-video/totem/totem-9999.ebuild
copy to media-video/totem/totem-3.16.1.ebuild
index 698bc70..1f181a5 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-3.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -9,10 +9,6 @@ PYTHON_COMPAT=( python2_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="https://wiki.gnome.org/Apps/Videos";
@@ -26,45 +22,31 @@ 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
-
-# TODO:
-# Cone (VLC) plugin needs someone with the right setup to test it
-#
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
# 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-libs/cairo
+ >=dev-libs/libpeas-1.1[gtk]
>=dev-libs/libxml2-2.6:2
+ >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
>=media-libs/clutter-1.17.3:1.0[gtk]
- >=media-libs/clutter-gst-1.5.5:2.0
+ >=media-libs/clutter-gst-2.99.2:3.0
>=media-libs/clutter-gtk-1.5.5:1.0
- x11-libs/mx:1.0
+ >=x11-libs/cairo-1.14
+ >=x11-libs/gdk-pixbuf-2.23.0:2
+ >=x11-libs/gtk+-3.16:3[introspection?]
- >=media-libs/grilo-0.2.10:0.2[playlist]
+ >=media-libs/grilo-0.2.12:0.2[playlist]
media-plugins/grilo-plugins:0.2
>=media-libs/gstreamer-1.3.1:1.0
>=media-libs/gst-plugins-base-1.4.2: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
+ media-plugins/gst-plugins-taglib:1.0
- x11-libs/libICE
- x11-libs/libSM
x11-libs/libX11
- >=x11-libs/libXxf86vm-1.0.1
gnome-base/gnome-desktop:3
gnome-base/gsettings-desktop-schemas
@@ -88,39 +70,31 @@ DEPEND="${RDEPEND}
app-text/yelp-tools
dev-libs/appstream-glib
>=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40
+ >=dev-util/intltool-0.50.1
sys-devel/gettext
+ virtual/pkgconfig
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
-# 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,17 @@ src_prepare() {
src_configure() {
# Disabled: sample-python, sample-vala
local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
- plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
+ plugins+=",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"
- 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
- # 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
+ # appstream-util overriding necessary until upstream fixes their macro
+ # to respect configure switch
gnome2_src_configure \
--disable-run-in-source-tree \
--disable-static \
@@ -163,6 +128,6 @@ src_configure() {
$(use_enable python) \
PYLINT=$(type -P true) \
VALAC=$(type -P true) \
- --with-plugins=${plugins} \
- ${myconf}
+ APPSTREAM_UTIL=$(type -P true) \
+ --with-plugins=${plugins}
}
diff --git a/media-video/totem/totem-9999.ebuild
b/media-video/totem/totem-9999.ebuild
index 698bc70..20351bd 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -31,40 +31,32 @@ if [[ ${PV} = 9999 ]]; then
REQUIRED_USE+=" zeitgeist? ( vala )"
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
-# 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-libs/cairo
+ >=dev-libs/libpeas-1.1[gtk]
>=dev-libs/libxml2-2.6:2
+ >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
>=media-libs/clutter-1.17.3:1.0[gtk]
- >=media-libs/clutter-gst-1.5.5:2.0
+ >=media-libs/clutter-gst-2.99.2:3.0
>=media-libs/clutter-gtk-1.5.5:1.0
- x11-libs/mx:1.0
+ >=x11-libs/cairo-1.14
+ >=x11-libs/gdk-pixbuf-2.23.0:2
+ >=x11-libs/gtk+-3.16:3[introspection?]
- >=media-libs/grilo-0.2.10:0.2[playlist]
+ >=media-libs/grilo-0.2.12:0.2[playlist]
media-plugins/grilo-plugins:0.2
>=media-libs/gstreamer-1.3.1:1.0
>=media-libs/gst-plugins-base-1.4.2: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
+ media-plugins/gst-plugins-taglib:1.0
- x11-libs/libICE
- x11-libs/libSM
x11-libs/libX11
- >=x11-libs/libXxf86vm-1.0.1
gnome-base/gnome-desktop:3
gnome-base/gsettings-desktop-schemas
@@ -88,11 +80,11 @@ DEPEND="${RDEPEND}
app-text/yelp-tools
dev-libs/appstream-glib
>=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40
+ >=dev-util/intltool-0.50.1
sys-devel/gettext
+ virtual/pkgconfig
x11-proto/xextproto
x11-proto/xproto
- virtual/pkgconfig
dev-libs/gobject-introspection-common
gnome-base/gnome-common
@@ -133,7 +125,7 @@ src_prepare() {
src_configure() {
# Disabled: sample-python, sample-vala
local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
- plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
+ plugins+=",im-status,gromit,media-player-keys,ontop"
plugins+=",properties,recent,rotation,screensaver,screenshot"
plugins+=",skipto,vimeo"
use lirc && plugins+=",lirc"
@@ -149,10 +141,11 @@ src_configure() {
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
+ # appstream-util overriding necessary until upstream fixes their macro
+ # to respect configure switch
gnome2_src_configure \
--disable-run-in-source-tree \
--disable-static \
@@ -163,6 +156,7 @@ src_configure() {
$(use_enable python) \
PYLINT=$(type -P true) \
VALAC=$(type -P true) \
+ APPSTREAM_UTIL=$(type -P true) \
--with-plugins=${plugins} \
${myconf}
}
