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 4C2631381F3 for ; Sun, 13 Oct 2013 16:45:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63750E09DE; Sun, 13 Oct 2013 16:45:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DA049E09DE for ; Sun, 13 Oct 2013 16:45:13 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BBB2033DA56 for ; Sun, 13 Oct 2013 16:45:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 70F21E5308 for ; Sun, 13 Oct 2013 16:45:11 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1381682684.225087d1593751b732d73ab6a7d67b92d379e2fb.eva@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.10.0.ebuild media-video/cheese/cheese-9999.ebuild X-VCS-Directories: media-video/cheese/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 225087d1593751b732d73ab6a7d67b92d379e2fb X-VCS-Branch: master Date: Sun, 13 Oct 2013 16:45:11 +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: cd34f975-aed2-4373-9cb2-7ce73f0621dd X-Archives-Hash: 8f9343ad41d05f4a6dc2d47c296ec9b0 commit: 225087d1593751b732d73ab6a7d67b92d379e2fb Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Oct 13 16:41:55 2013 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Oct 13 16:44:44 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=225087d1 media-video/cheese: 3.8.3 → 3.10.0 --- .../{cheese-9999.ebuild => cheese-3.10.0.ebuild} | 71 +++++++--------------- media-video/cheese/cheese-9999.ebuild | 61 ++++++++----------- 2 files changed, 47 insertions(+), 85 deletions(-) diff --git a/media-video/cheese/cheese-9999.ebuild b/media-video/cheese/cheese-3.10.0.ebuild similarity index 53% copy from media-video/cheese/cheese-9999.ebuild copy to media-video/cheese/cheese-3.10.0.ebuild index b86951e..655e037 100644 --- a/media-video/cheese/cheese-9999.ebuild +++ b/media-video/cheese/cheese-3.10.0.ebuild @@ -1,41 +1,33 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI="5" GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" +VALA_MIN_API_VERSION="0.18" -inherit eutils gnome2 multilib virtualx -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi +inherit gnome2 vala virtualx DESCRIPTION="A cheesy program to take pictures and videos from your webcam" -HOMEPAGE="http://www.gnome.org/projects/cheese/" +HOMEPAGE="http://projects.gnome.org/cheese/" LICENSE="GPL-2+" SLOT="0/7" # subslot = libcheese soname version -IUSE="+introspection sendto test" -if [[ ${PV} = 9999 ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -fi +IUSE="+introspection test" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +# using clutter-gst-2.0.0 results in GLSL errors; bug #478702 COMMON_DEPEND=" - >=dev-libs/glib-2.28:2 - >=dev-libs/libgee-0.6.3:0 + >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4.4:3[introspection?] >=x11-libs/cairo-1.10:= >=x11-libs/pango-1.28.0 >=gnome-base/gnome-desktop-2.91.6:3= >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] - >=media-libs/clutter-1.10:1.0[introspection?] + >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 - >=media-libs/clutter-gst-1.9:2.0 + >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects @@ -47,7 +39,8 @@ COMMON_DEPEND=" media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] >=virtual/udev-171:=[gudev] - 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-good:1.0 @@ -55,9 +48,9 @@ RDEPEND="${COMMON_DEPEND} media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-v4l2:1.0 media-plugins/gst-plugins-vpx:1.0 - - sendto? ( >=gnome-extra/nautilus-sendto-2.91 )" +" DEPEND="${COMMON_DEPEND} + $(vala_depend) app-text/docbook-xml-dtd:4.3 dev-libs/libxml2:2 >=dev-util/gtk-doc-1.14 @@ -65,24 +58,16 @@ DEPEND="${COMMON_DEPEND} dev-util/itstool virtual/pkgconfig x11-proto/xf86vidmodeproto - test? ( dev-libs/glib:2[utils] )" - -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - dev-lang/vala:0.18 - doc? ( >=dev-util/gtk-doc-1.14 )" -fi + test? ( dev-libs/glib:2[utils] ) +" src_configure() { - G2CONF="${G2CONF} - GST_INSPECT=$(type -P true) - VALAC=$(type -P valac-0.18) - $(use_enable introspection) - --disable-lcov - --disable-static" - [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" - - gnome2_src_configure + gnome2_src_configure \ + GST_INSPECT=$(type -P true) \ + $(use_enable introspection) \ + --disable-lcov \ + --disable-static \ + ITSTOOL=$(type -P true) } src_compile() { @@ -95,15 +80,3 @@ src_compile() { src_test() { Xemake check } - -pkg_preinst() { - gnome2_pkg_preinst - preserve_old_lib /usr/$(get_libdir)/libcheese.so.3 \ - /usr/$(get_libdir)/libcheese-gtk.so.21 -} - -pkg_postinst() { - gnome2_pkg_postinst - preserve_old_lib_notify /usr/$(get_libdir)/libcheese.so.3 \ - /usr/$(get_libdir)/libcheese-gtk.so.21 -} diff --git a/media-video/cheese/cheese-9999.ebuild b/media-video/cheese/cheese-9999.ebuild index b86951e..cad84dc 100644 --- a/media-video/cheese/cheese-9999.ebuild +++ b/media-video/cheese/cheese-9999.ebuild @@ -1,41 +1,41 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI="5" GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" +VALA_MIN_API_VERSION="0.18" -inherit eutils gnome2 multilib virtualx +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="http://www.gnome.org/projects/cheese/" +HOMEPAGE="http://projects.gnome.org/cheese/" LICENSE="GPL-2+" SLOT="0/7" # subslot = libcheese soname version -IUSE="+introspection sendto test" +IUSE="+introspection test" if [[ ${PV} = 9999 ]]; then IUSE="${IUSE} doc" KEYWORDS="" else - KEYWORDS="~amd64 ~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.28:2 - >=dev-libs/libgee-0.6.3:0 + >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4.4:3[introspection?] >=x11-libs/cairo-1.10:= >=x11-libs/pango-1.28.0 >=gnome-base/gnome-desktop-2.91.6:3= >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] - >=media-libs/clutter-1.10:1.0[introspection?] + >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 - >=media-libs/clutter-gst-1.9:2.0 + >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects @@ -47,7 +47,8 @@ COMMON_DEPEND=" media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] >=virtual/udev-171:=[gudev] - 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-good:1.0 @@ -55,9 +56,9 @@ RDEPEND="${COMMON_DEPEND} media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-v4l2:1.0 media-plugins/gst-plugins-vpx:1.0 - - sendto? ( >=gnome-extra/nautilus-sendto-2.91 )" +" DEPEND="${COMMON_DEPEND} + $(vala_depend) app-text/docbook-xml-dtd:4.3 dev-libs/libxml2:2 >=dev-util/gtk-doc-1.14 @@ -65,24 +66,24 @@ DEPEND="${COMMON_DEPEND} dev-util/itstool virtual/pkgconfig x11-proto/xf86vidmodeproto - test? ( dev-libs/glib:2[utils] )" + test? ( dev-libs/glib:2[utils] ) +" if [[ ${PV} = 9999 ]]; then DEPEND="${DEPEND} - dev-lang/vala:0.18 doc? ( >=dev-util/gtk-doc-1.14 )" fi src_configure() { - G2CONF="${G2CONF} - GST_INSPECT=$(type -P true) - VALAC=$(type -P valac-0.18) - $(use_enable introspection) - --disable-lcov - --disable-static" - [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" - - gnome2_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() { @@ -95,15 +96,3 @@ src_compile() { src_test() { Xemake check } - -pkg_preinst() { - gnome2_pkg_preinst - preserve_old_lib /usr/$(get_libdir)/libcheese.so.3 \ - /usr/$(get_libdir)/libcheese-gtk.so.21 -} - -pkg_postinst() { - gnome2_pkg_postinst - preserve_old_lib_notify /usr/$(get_libdir)/libcheese.so.3 \ - /usr/$(get_libdir)/libcheese-gtk.so.21 -}