[gentoo-commits] proj/gnome:master commit in: gnome-base/dconf/, gnome-base/dconf/files/

[Alexandre Restovtsev]

commit:     6144b5dbf93ba5268b09394a74f5aecc77216226
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 23:11:26 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Feb 26 23:16:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6144b5db

gnome-base/dconf: add 0.11.5

---
 .../{dconf-9999.ebuild => dconf-0.11.5.ebuild}     |   33 +++++---------------
 gnome-base/dconf/dconf-9999.ebuild                 |   15 ++++-----
 .../dconf/files/dconf-0.11.5-automagic-vala.patch  |   33 ++++++++++++++++++++
 .../dconf/files/dconf-0.8.0-automagic-vala.patch   |   19 -----------
 4 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-0.11.5.ebuild
similarity index 66%
copy from gnome-base/dconf/dconf-9999.ebuild
copy to gnome-base/dconf/dconf-0.11.5.ebuild
index 05945f9..6d735a6 100644
--- a/gnome-base/dconf/dconf-9999.ebuild
+++ b/gnome-base/dconf/dconf-0.11.5.ebuild
@@ -1,36 +1,28 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.10.0.ebuild,v 1.6 2012/01/18 20:33:49 maekke Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 
 inherit autotools eutils gnome2 bash-completion-r1
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Simple low-level configuration system"
 HOMEPAGE="http://live.gnome.org/dconf"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc vala +X"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-fi
 
 RDEPEND=">=dev-libs/glib-2.29.90:2
 	sys-apps/dbus
 	X? ( >=dev-libs/libxml2-2.7.7:2
 		x11-libs/gtk+:3 )"
-# vala:0.14 due to an automagic version-check #ifdef (commit a15d9621)
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	doc? ( >=dev-util/gtk-doc-1.15 )
-	vala? ( dev-lang/vala:0.14 )"
+	vala? ( >=dev-lang/vala-0.15.1:0.16 )"
 # eautoreconf requires gtk-doc-am
 
 pkg_setup() {
@@ -38,24 +30,15 @@ pkg_setup() {
 		--disable-schemas-compile
 		$(use_enable vala)
 		$(use_enable X editor)
-		VALAC=$(type -p valac-0.14)"
+		VALAC=$(type -p valac-0.16)"
 }
 
 src_prepare() {
-	if [[ ${PV} = 9999 ]]; then
-		# XXX: gtk-doc.make should be in top_srcdir -- file a bug for this
-		# Let's only do this in the live version to avoid gtkdocize in releases
-		sed -e 's:^include gtk-doc.make:include $(top_srcdir)/gtk-doc.make:' \
-			-i docs/Makefile.am || die "Fixing gtk-doc.make failed"
-	fi
-
 	# Fix vala automagic support, upstream bug #634171
-	epatch "${FILESDIR}/${PN}-0.8.0-automagic-vala.patch"
+	epatch "${FILESDIR}/${PN}-0.11.5-automagic-vala.patch"
 
-	if [[ ${PV} != 9999 ]]; then
-		mkdir -p m4 || die
-		eautoreconf
-	fi
+	mkdir -p m4 || die
+	eautoreconf
 
 	gnome2_src_prepare
 }

diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-9999.ebuild
index 05945f9..9859ec2 100644
--- a/gnome-base/dconf/dconf-9999.ebuild
+++ b/gnome-base/dconf/dconf-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.10.0.ebuild,v 1.6 2012/01/18 20:33:49 maekke Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -15,22 +15,21 @@ HOMEPAGE="http://live.gnome.org/dconf"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="doc vala +X"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
+IUSE="doc vala +X"
 
 RDEPEND=">=dev-libs/glib-2.29.90:2
 	sys-apps/dbus
 	X? ( >=dev-libs/libxml2-2.7.7:2
 		x11-libs/gtk+:3 )"
-# vala:0.14 due to an automagic version-check #ifdef (commit a15d9621)
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	doc? ( >=dev-util/gtk-doc-1.15 )
-	vala? ( dev-lang/vala:0.14 )"
+	vala? ( >=dev-lang/vala-0.15.1:0.16 )"
 # eautoreconf requires gtk-doc-am
 
 pkg_setup() {
@@ -38,7 +37,7 @@ pkg_setup() {
 		--disable-schemas-compile
 		$(use_enable vala)
 		$(use_enable X editor)
-		VALAC=$(type -p valac-0.14)"
+		VALAC=$(type -p valac-0.16)"
 }
 
 src_prepare() {
@@ -50,7 +49,7 @@ src_prepare() {
 	fi
 
 	# Fix vala automagic support, upstream bug #634171
-	epatch "${FILESDIR}/${PN}-0.8.0-automagic-vala.patch"
+	epatch "${FILESDIR}/${PN}-0.11.5-automagic-vala.patch"
 
 	if [[ ${PV} != 9999 ]]; then
 		mkdir -p m4 || die

diff --git a/gnome-base/dconf/files/dconf-0.11.5-automagic-vala.patch b/gnome-base/dconf/files/dconf-0.11.5-automagic-vala.patch
new file mode 100644
index 0000000..cda55cb
--- /dev/null
+++ b/gnome-base/dconf/files/dconf-0.11.5-automagic-vala.patch
@@ -0,0 +1,33 @@
+From 09f3a2a4b6d997b5fd9b42add27de465dd529d43 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@g.o>
+Date: Sun, 26 Feb 2012 18:15:50 -0500
+Subject: [PATCH] Make vala dependency non-automagic
+
+---
+ configure.ac |   10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2e21d48..40cfe36 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,7 +13,15 @@ AM_SILENT_RULES([yes])
+ 
+ # Check for programs
+ AC_PROG_CC
+-AM_PROG_VALAC([0.15.1])
++
++AC_ARG_ENABLE(vala,
++              AC_HELP_STRING([--disable-vala],
++                             [Disable vala support]))
++AM_CONDITIONAL(ENABLE_VALA, test "x$enable_vala" != "xno")
++
++if test "x$enable_vala" != "xno"; then
++  AM_PROG_VALAC([0.15.1])
++fi
+ 
+ # Use GSettings
+ GLIB_GSETTINGS
+-- 
+1.7.8.4
+

diff --git a/gnome-base/dconf/files/dconf-0.8.0-automagic-vala.patch b/gnome-base/dconf/files/dconf-0.8.0-automagic-vala.patch
deleted file mode 100644
index 9f680a0..0000000
--- a/gnome-base/dconf/files/dconf-0.8.0-automagic-vala.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.ac.orig	2010-11-06 16:24:36.000000000 +0100
-+++ configure.ac	2010-11-06 16:24:19.000000000 +0100
-@@ -12,7 +12,15 @@
- 
- # Check for programs
- AC_PROG_CC
--AM_PROG_VALAC([0.11.7])
-+
-+AC_ARG_ENABLE(vala,
-+		AC_HELP_STRING([--disable-vala],
-+				[Disable vala support]))
-+AM_CONDITIONAL(ENABLE_VALA, test "x$enable_vala" != "xno")
-+
-+if test "x$enable_vala" != "xno"; then
-+	AM_PROG_VALAC([0.11.7])
-+fi
- 
- # Use GSettings
- GLIB_GSETTINGS