[gentoo-commits] proj/gnome:master commit in: media-video/cheese/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     6b2d9b084193bcbbd3efe3ddaf20d595c0a86b5d
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 23 22:00:35 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 23 22:00:35 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6b2d9b08

media-video/cheese: 3.14.1 → 3.14.2

---
 media-video/cheese/{cheese-3.14.1.ebuild => cheese-3.14.2.ebuild} | 7 +------
 media-video/cheese/cheese-9999.ebuild                             | 7 ++++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/media-video/cheese/cheese-3.14.1.ebuild b/media-video/cheese/cheese-3.14.2.ebuild
similarity index 89%
rename from media-video/cheese/cheese-3.14.1.ebuild
rename to media-video/cheese/cheese-3.14.2.ebuild
index b75470b..05c0ce9 100644
--- a/media-video/cheese/cheese-3.14.1.ebuild
+++ b/media-video/cheese/cheese-3.14.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.24"
+VALA_MIN_API_VERSION="0.26"
 
 inherit gnome2 vala virtualx
 
@@ -61,11 +61,6 @@ DEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
-	# FIXME: looks like a regression from an underlying library
-	#sed -e 's|\(g_test_add_func.*photo_path.*;\)|/*\1*/|' \
-	#    -e 's|\(g_test_add_func.*video_path.*;\)|/*\1*/|' \
-	#	-i "${S}"/tests/test-libcheese.c || die
-
 	vala_src_prepare
 	gnome2_src_prepare
 }

diff --git a/media-video/cheese/cheese-9999.ebuild b/media-video/cheese/cheese-9999.ebuild
index 21754d4..4edafd6 100644
--- a/media-video/cheese/cheese-9999.ebuild
+++ b/media-video/cheese/cheese-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.24"
+VALA_MIN_API_VERSION="0.26"
 
 inherit gnome2 vala virtualx
 if [[ ${PV} = 9999 ]]; then
@@ -73,6 +73,11 @@ if [[ ${PV} = 9999 ]]; then
 		doc? ( >=dev-util/gtk-doc-1.14 )"
 fi
 
+src_prepare() {
+	gnome2-live_src_prepare
+	vala_src_prepare
+}
+
 src_configure() {
 	local myconf=""
 	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"