From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1149199-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 248BB138350
for <garchives@archives.gentoo.org>; Sun, 1 Mar 2020 16:18:59 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 21D77E0993;
Sun, 1 Mar 2020 16:18:54 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id EA447E0993
for <gentoo-commits@lists.gentoo.org>; Sun, 1 Mar 2020 16:18:53 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BA73534F14C
for <gentoo-commits@lists.gentoo.org>; Sun, 1 Mar 2020 16:18:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 57396171
for <gentoo-commits@lists.gentoo.org>; Sun, 1 Mar 2020 16:18:48 +0000 (UTC)
From: "Mart Raudsepp" <leio@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" <leio@gentoo.org>
Message-ID: <1583079460.ebd97f5185301f60902cef42029db41cfce53580.leio@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/cheese/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-video/cheese/cheese-3.34.0-r1.ebuild media-video/cheese/cheese-3.34.0.ebuild
X-VCS-Directories: media-video/cheese/
X-VCS-Committer: leio
X-VCS-Committer-Name: Mart Raudsepp
X-VCS-Revision: ebd97f5185301f60902cef42029db41cfce53580
X-VCS-Branch: master
Date: Sun, 1 Mar 2020 16:18:48 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 17926639-a0c1-4e12-844d-70d2660b099c
X-Archives-Hash: 0b43f418d0c83234bea95f5e5b1ed926
commit: ebd97f5185301f60902cef42029db41cfce53580
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 1 15:09:31 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Mar 1 16:17:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd97f51
media-video/cheese-3.34: various packaging fixes
* Drop IUSE=X, it is NOT optional
* Replace wrong intltool dep with gettext
* Fix USE=gtk-doc deps
* Fix lack of gnome2_schemas_update calls
* Use xdg.eclass instead of xdg-utils.eclass (and get missing env reset
from that added back)
* Re-enable tests, they appear to work fine
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
...heese-3.34.0.ebuild => cheese-3.34.0-r1.ebuild} | 63 ++++++++++------------
1 file changed, 28 insertions(+), 35 deletions(-)
diff --git a/media-video/cheese/cheese-3.34.0.ebuild b/media-video/cheese/cheese-3.34.0-r1.ebuild
similarity index 76%
rename from media-video/cheese/cheese-3.34.0.ebuild
rename to media-video/cheese/cheese-3.34.0-r1.ebuild
index 5260911df0d..17d4540d988 100644
--- a/media-video/cheese/cheese-3.34.0.ebuild
+++ b/media-video/cheese/cheese-3.34.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit gnome.org meson vala virtualx xdg-utils
+inherit gnome.org meson vala virtualx xdg
DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
@@ -11,41 +11,30 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
LICENSE="GPL-2+"
SLOT="0/8" # subslot = libcheese soname version
KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk-doc +introspection test X"
-RESTRICT="test" # Tests fail
+IUSE="gtk-doc +introspection test"
+RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( X )"
-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]
+DEPEND="
>=media-libs/clutter-1.13.2:1.0[introspection?]
- >=media-libs/clutter-gtk-0.91.8:1.0
media-libs/clutter-gst:3.0
- media-libs/cogl:1.0=[introspection?]
-
- media-video/gnome-video-effects
+ >=media-libs/clutter-gtk-0.91.8:1.0
x11-libs/gdk-pixbuf:2[jpeg,introspection?]
-
+ >=dev-libs/glib-2.39.90:2
+ >=gnome-base/gnome-desktop-2.91.6:3=
>=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:= )
+ >=media-libs/gst-plugins-base-1.4:1.0[ogg,pango,theora,vorbis]
+ >=media-libs/gst-plugins-bad-1.4:1.0
+ >=x11-libs/gtk+-3.13.4:3
+ >=media-libs/libcanberra-0.26[gtk3]
+ x11-libs/libX11
+ sys-apps/dbus
+ media-video/gnome-video-effects
+ introspection? ( >=dev-libs/gobject-introspection-1.56:= )
- X? (
- x11-base/xorg-proto
- x11-libs/libX11
- )
-"
+ media-libs/cogl:1.0=[introspection?]
-DEPEND="
- ${COMMON_DEPEND}
- test? ( x11-libs/libXtst )
"
-
-RDEPEND="${COMMON_DEPEND}
- >=media-libs/gst-plugins-bad-1.4:1.0
+RDEPEND="${DEPEND}
>=media-libs/gst-plugins-good-1.4:1.0
>=media-plugins/gst-plugins-jpeg-1.4:1.0
@@ -54,15 +43,18 @@ RDEPEND="${COMMON_DEPEND}
"
BDEPEND="
- $(vala_depend)
+ gtk-doc? ( dev-util/gtk-doc )
+ dev-libs/libxslt
app-text/docbook-xml-dtd:4.3
dev-util/itstool
dev-libs/appstream-glib
- >=dev-util/intltool-0.50
- dev-libs/libxslt
dev-libs/libxml2:2
dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
virtual/pkgconfig
+ x11-base/xorg-proto
+ test? ( x11-libs/libXtst )
+ $(vala_depend)
"
PATCHES=(
@@ -71,9 +63,8 @@ PATCHES=(
)
src_prepare() {
+ xdg_src_prepare
vala_src_prepare
-
- default
}
src_configure() {
@@ -95,9 +86,11 @@ src_test() {
}
pkg_postinst() {
- xdg_icon_cache_update
+ xdg_pkg_postinst
+ gnome2_schemas_update
}
pkg_postrm() {
- xdg_icon_cache_update
+ xdg_pkg_postrm
+ gnome2_schemas_update
}