commit: 254220aa2813bc236233412e638fe5bd496a9bdd
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu May 31 06:51:34 2018 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu May 31 07:09:45 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=254220aa
media-video/cheese: synchronize live ebuild
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0x5A56C8CD0C13248A
media-video/cheese/cheese-9999.ebuild | 42 +++++++++++++----------------------
1 file changed, 15 insertions(+), 27 deletions(-)
diff --git a/media-video/cheese/cheese-9999.ebuild
b/media-video/cheese/cheese-9999.ebuild
index faf364f9..b5efd8bb 100644
--- a/media-video/cheese/cheese-9999.ebuild
+++ b/media-video/cheese/cheese-9999.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=6
VALA_MIN_API_VERSION="0.26"
inherit gnome2 vala virtualx
@@ -21,17 +19,16 @@ if [[ ${PV} = 9999 ]]; then
IUSE="${IUSE} doc"
KEYWORDS=""
else
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi
-# using clutter-gst-2.0.0 results in GLSL errors; bug #478702
COMMON_DEPEND="
>=dev-libs/glib-2.39.90:2
>=x11-libs/gtk+-3.13.4:3[introspection?]
>=gnome-base/gnome-desktop-2.91.6:3=
>=media-libs/libcanberra-0.26[gtk3]
>=media-libs/clutter-1.13.2:1.0[introspection?]
- >=media-libs/clutter-gtk-0.91.8:1.0
+ >=media-libs/clutter-gtk-1:1.0
media-libs/clutter-gst:3.0
media-libs/cogl:1.0=[introspection?]
@@ -40,28 +37,30 @@ COMMON_DEPEND="
x11-libs/libX11
x11-libs/libXtst
- media-libs/gstreamer:1.0[introspection?]
-
media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X]
+ >=media-libs/gstreamer-1.4:1.0[introspection?]
+
>=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X]
introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
"
RDEPEND="${COMMON_DEPEND}
>=media-libs/gst-plugins-bad-1.4:1.0
- media-libs/gst-plugins-good:1.0
+ >=media-libs/gst-plugins-good-1.4:1.0
- media-plugins/gst-plugins-jpeg:1.0
- media-plugins/gst-plugins-v4l2:1.0
- media-plugins/gst-plugins-vpx:1.0
+ >=media-plugins/gst-plugins-jpeg-1.4:1.0
+ >=media-plugins/gst-plugins-v4l2-1.4:1.0
+ >=media-plugins/gst-plugins-vpx-1.4:1.0
"
+# libxml2+gdk-pixbuf required for glib-compile-resources
DEPEND="${COMMON_DEPEND}
$(vala_depend)
app-text/docbook-xml-dtd:4.3
app-text/yelp-tools
dev-libs/appstream-glib
dev-libs/libxml2:2
- dev-util/gdbus-codegen
+ dev-libs/libxslt
>=dev-util/gtk-doc-am-1.14
>=dev-util/intltool-0.50
+ dev-util/itstool
virtual/pkgconfig
x11-base/xorg-proto
test? ( dev-libs/glib:2[utils] )
@@ -78,24 +77,13 @@ src_prepare() {
}
src_configure() {
- local myconf=""
- [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
-
gnome2_src_configure \
GST_INSPECT=$(type -P true) \
$(use_enable introspection) \
--disable-lcov \
- --disable-static \
- ${myconf}
-}
-
-src_compile() {
- # Clutter-related sandbox violations when USE="doc introspection" and
- # FEATURES="-userpriv" (see bug #385917).
- unset DISPLAY
- gnome2_src_compile
+ --disable-static
}
src_test() {
- Xemake check
+ virtx emake check
}
