commit: 49be2fee2e5b86b39030eef664498f17fc6b1f18
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 21:05:32 2016 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 21:05:58 2016 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=49be2fee
media-video/totem: Bump version to 3.20.0
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Manifest-Sign-Key: 0xE9E568677E8B4D42
.../{totem-9999.ebuild => totem-3.20.0.ebuild} | 64 ++++++----------------
media-video/totem/totem-9999.ebuild | 28 +++++-----
2 files changed, 30 insertions(+), 62 deletions(-)
diff --git a/media-video/totem/totem-9999.ebuild
b/media-video/totem/totem-3.20.0.ebuild
similarity index 68%
copy from media-video/totem/totem-9999.ebuild
copy to media-video/totem/totem-3.20.0.ebuild
index e5dde0f..5620866 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,11 +8,7 @@ GNOME2_LA_PUNT="yes" # plugins are dlopened
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads"
-inherit eutils gnome2 multilib python-single-r1
-if [[ ${PV} = 9999 ]]; then
- VALA_MIN_API_VERSION="0.14"
- inherit gnome2-live vala
-fi
+inherit autotools eutils gnome2 multilib python-single-r1
DESCRIPTION="Media player for GNOME"
HOMEPAGE="https://wiki.gnome.org/Apps/Videos";
@@ -26,18 +22,12 @@ REQUIRED_USE="
zeitgeist? ( introspection )
"
-if [[ ${PV} = 9999 ]]; then
- IUSE+=" doc vala"
- REQUIRED_USE+=" zeitgeist? ( vala )"
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
# FIXME:
# Runtime dependency on gnome-session-2.91
RDEPEND="
- >=dev-libs/glib-2.35:2
+ >=dev-libs/glib-2.35:2[dbus]
>=dev-libs/libpeas-1.1[gtk]
>=dev-libs/libxml2-2.6:2
>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
@@ -46,23 +36,23 @@ RDEPEND="
>=media-libs/clutter-gtk-1.5.5:1.0
>=x11-libs/cairo-1.14
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.16:3[introspection?]
+ >=x11-libs/gtk+-3.19.4:3[introspection?]
- >=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/grilo-0.3.0:0.3[playlist]
+ media-plugins/grilo-plugins:0.3
+ >=media-libs/gstreamer-1.6.0:1.0
+ >=media-libs/gst-plugins-base-1.6.0:1.0[X,introspection?,pango]
media-libs/gst-plugins-good:1.0
media-plugins/gst-plugins-meta:1.0
media-plugins/gst-plugins-taglib:1.0
x11-libs/libX11
- gnome-base/gnome-desktop:3
+ gnome-base/gnome-desktop:3=
gnome-base/gsettings-desktop-schemas
x11-themes/gnome-icon-theme-symbolic
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
python? (
@@ -76,7 +66,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
- app-text/scrollkeeper
app-text/yelp-tools
dev-libs/appstream-glib
>=dev-util/gtk-doc-am-1.14
@@ -89,30 +78,22 @@ DEPEND="${RDEPEND}
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.
@@ -131,18 +112,8 @@ src_configure() {
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"
- # 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
@@ -157,6 +128,5 @@ src_configure() {
PYLINT=$(type -P true) \
VALAC=$(type -P true) \
APPSTREAM_UTIL=$(type -P true) \
- --with-plugins=${plugins} \
- ${myconf}
+ --with-plugins=${plugins}
}
diff --git a/media-video/totem/totem-9999.ebuild
b/media-video/totem/totem-9999.ebuild
index e5dde0f..a6682d8 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -37,7 +37,7 @@ fi
# FIXME:
# Runtime dependency on gnome-session-2.91
RDEPEND="
- >=dev-libs/glib-2.35:2
+ >=dev-libs/glib-2.35:2[dbus]
>=dev-libs/libpeas-1.1[gtk]
>=dev-libs/libxml2-2.6:2
>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
@@ -46,23 +46,23 @@ RDEPEND="
>=media-libs/clutter-gtk-1.5.5:1.0
>=x11-libs/cairo-1.14
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.16:3[introspection?]
+ >=x11-libs/gtk+-3.19.4:3[introspection?]
- >=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/grilo-0.3.0:0.3[playlist]
+ media-plugins/grilo-plugins:0.3
+ >=media-libs/gstreamer-1.6.0:1.0
+ >=media-libs/gst-plugins-base-1.6.0:1.0[X,introspection?,pango]
media-libs/gst-plugins-good:1.0
media-plugins/gst-plugins-meta:1.0
media-plugins/gst-plugins-taglib:1.0
x11-libs/libX11
- gnome-base/gnome-desktop:3
+ gnome-base/gnome-desktop:3=
gnome-base/gsettings-desktop-schemas
x11-themes/gnome-icon-theme-symbolic
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
python? (
@@ -76,7 +76,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
- app-text/scrollkeeper
app-text/yelp-tools
dev-libs/appstream-glib
>=dev-util/gtk-doc-am-1.14
@@ -89,6 +88,10 @@ DEPEND="${RDEPEND}
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
@@ -103,9 +106,6 @@ 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
@@ -141,8 +141,6 @@ src_configure() {
fi
use zeitgeist && plugins+=",zeitgeist-dp"
- # 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
