public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: media-video/cheese/
Date: Sun, 13 Oct 2013 16:45:11 +0000 (UTC)	[thread overview]
Message-ID: <1381682684.225087d1593751b732d73ab6a7d67b92d379e2fb.eva@gentoo> (raw)

commit:     225087d1593751b732d73ab6a7d67b92d379e2fb
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 16:41:55 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> 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
-}


             reply	other threads:[~2013-10-13 16:45 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-13 16:45 Gilles Dartiguelongue [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-08-03 11:51 [gentoo-commits] proj/gnome:master commit in: media-video/cheese/ Mart Raudsepp
2018-08-03 11:51 Mart Raudsepp
2018-05-31  7:10 Gilles Dartiguelongue
2018-05-31  7:10 Gilles Dartiguelongue
2018-01-12 14:22 Dennis Lamm
2017-12-20 19:39 Sobhan Mohammadpour
2016-04-02 11:36 Ole Reifschneider
2015-06-10 10:37 Gilles Dartiguelongue
2014-12-26 21:53 Gilles Dartiguelongue
2014-11-23 22:28 Gilles Dartiguelongue
2014-10-13 21:51 Gilles Dartiguelongue
2014-04-23 22:14 Gilles Dartiguelongue
2014-04-20 23:44 Gilles Dartiguelongue
2014-04-20 13:54 Gilles Dartiguelongue
2013-11-16 11:54 Gilles Dartiguelongue
2013-11-16 11:46 Gilles Dartiguelongue
2012-12-19  8:38 Alexandre Rostovtsev
2012-12-09  5:47 Alexandre Rostovtsev
2012-12-08 17:34 Alexandre Rostovtsev
2012-11-22 22:29 Gilles Dartiguelongue
2012-11-01 22:48 Gilles Dartiguelongue
2012-11-01 22:48 Gilles Dartiguelongue
2012-10-28 19:36 Gilles Dartiguelongue
2012-09-10  6:22 Nirbheek Chauhan
2012-05-24  8:05 Alexandre Restovtsev
2012-04-11  8:48 Priit Laes
2012-04-08 16:06 Alexandre Restovtsev
2012-03-26  8:20 Nirbheek Chauhan
2011-10-18  7:37 Alexandre Restovtsev
2011-10-07  3:02 Alexandre Restovtsev
2011-10-01  3:22 Alexandre Restovtsev
2011-07-19  0:22 Alexandre Restovtsev
2011-04-27 22:22 Gilles Dartiguelongue
2011-04-08 10:52 Gilles Dartiguelongue
2011-04-05  0:57 Nirbheek Chauhan
2011-03-26  3:07 Nirbheek Chauhan
2011-03-23 23:03 Nirbheek Chauhan
2011-03-23 21:59 Nirbheek Chauhan
2011-03-17 17:12 Nirbheek Chauhan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1381682684.225087d1593751b732d73ab6a7d67b92d379e2fb.eva@gentoo \
    --to=eva@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox