From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2236159CAF for ; Sat, 2 Apr 2016 11:36:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA8AAE083A; Sat, 2 Apr 2016 11:36:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 45942E083A for ; Sat, 2 Apr 2016 11:36:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4762E340D4F for ; Sat, 2 Apr 2016 11:36:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8ACADC6 for ; Sat, 2 Apr 2016 11:36:37 +0000 (UTC) From: "Ole Reifschneider" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ole Reifschneider" Message-ID: <1459596977.1171e04482494001c7df33ab842f2024adc9f7bc.tranquility@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: media-video/cheese/ X-VCS-Repository: proj/gnome X-VCS-Files: media-video/cheese/cheese-3.20.0.ebuild media-video/cheese/cheese-9999.ebuild X-VCS-Directories: media-video/cheese/ X-VCS-Committer: tranquility X-VCS-Committer-Name: Ole Reifschneider X-VCS-Revision: 1171e04482494001c7df33ab842f2024adc9f7bc X-VCS-Branch: master Date: Sat, 2 Apr 2016 11:36:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: adcc9a66-1896-475a-ac31-6811598d2fb6 X-Archives-Hash: eabed813d7ba45b642cca5bd30be87aa commit: 1171e04482494001c7df33ab842f2024adc9f7bc Author: Ole Reifschneider gentoo org> AuthorDate: Sat Apr 2 11:36:17 2016 +0000 Commit: Ole Reifschneider gentoo org> CommitDate: Sat Apr 2 11:36:17 2016 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=1171e044 media-video/cheese: Bump version to 3.20.0 Package-Manager: portage-2.2.28 Manifest-Sign-Key: 0xE9E568677E8B4D42 .../{cheese-9999.ebuild => cheese-3.20.0.ebuild} | 35 ++++++---------------- media-video/cheese/cheese-9999.ebuild | 13 ++++---- 2 files changed, 15 insertions(+), 33 deletions(-) diff --git a/media-video/cheese/cheese-9999.ebuild b/media-video/cheese/cheese-3.20.0.ebuild similarity index 73% copy from media-video/cheese/cheese-9999.ebuild copy to media-video/cheese/cheese-3.20.0.ebuild index 82a8e62..0d4d0be 100644 --- a/media-video/cheese/cheese-9999.ebuild +++ b/media-video/cheese/cheese-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$ @@ -7,22 +7,14 @@ GCONF_DEBUG="no" VALA_MIN_API_VERSION="0.26" inherit gnome2 vala virtualx -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi DESCRIPTION="A cheesy program to take pictures and videos from your webcam" HOMEPAGE="https://wiki.gnome.org/Apps/Cheese" LICENSE="GPL-2+" -SLOT="0/7" # subslot = libcheese soname version +SLOT="0/8" # subslot = libcheese soname version IUSE="+introspection test" -if [[ ${PV} = 9999 ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" -fi +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" # using clutter-gst-2.0.0 results in GLSL errors; bug #478702 COMMON_DEPEND=" @@ -32,7 +24,7 @@ COMMON_DEPEND=" >=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-gst-2.0.6:2.0 + media-libs/clutter-gst:3.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects @@ -43,11 +35,10 @@ COMMON_DEPEND=" media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] - virtual/libgudev:= - introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) " RDEPEND="${COMMON_DEPEND} - media-libs/gst-plugins-bad:1.0 + >=media-libs/gst-plugins-bad-1.4:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-jpeg:1.0 @@ -63,31 +54,23 @@ DEPEND="${COMMON_DEPEND} dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50 + dev-util/itstool virtual/pkgconfig x11-proto/xf86vidmodeproto test? ( dev-libs/glib:2[utils] ) " -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - doc? ( >=dev-util/gtk-doc-1.14 )" -fi - src_prepare() { - gnome2-live_src_prepare vala_src_prepare + gnome2_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} + --disable-static } src_compile() { diff --git a/media-video/cheese/cheese-9999.ebuild b/media-video/cheese/cheese-9999.ebuild index 82a8e62..ecc673e 100644 --- a/media-video/cheese/cheese-9999.ebuild +++ b/media-video/cheese/cheese-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$ @@ -15,7 +15,7 @@ DESCRIPTION="A cheesy program to take pictures and videos from your webcam" HOMEPAGE="https://wiki.gnome.org/Apps/Cheese" LICENSE="GPL-2+" -SLOT="0/7" # subslot = libcheese soname version +SLOT="0/8" # subslot = libcheese soname version IUSE="+introspection test" if [[ ${PV} = 9999 ]]; then IUSE="${IUSE} doc" @@ -32,7 +32,7 @@ COMMON_DEPEND=" >=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-gst-2.0.6:2.0 + media-libs/clutter-gst:3.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects @@ -43,11 +43,10 @@ COMMON_DEPEND=" media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] - virtual/libgudev:= - introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) " RDEPEND="${COMMON_DEPEND} - media-libs/gst-plugins-bad:1.0 + >=media-libs/gst-plugins-bad-1.4:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-jpeg:1.0 @@ -74,8 +73,8 @@ if [[ ${PV} = 9999 ]]; then fi src_prepare() { - gnome2-live_src_prepare vala_src_prepare + gnome2-live_src_prepare } src_configure() {