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

[Gilles Dartiguelongue]

commit:     f7df23d50854653faba2f95d5cbba294a8449a6c
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 23:03:09 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 23:31:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f7df23d5

gnome-base/dconf: 0.16.1 → 0.18.0

---
 .../{dconf-9999.ebuild => dconf-0.18.0.ebuild}     | 52 ++++++++++------------
 gnome-base/dconf/dconf-9999.ebuild                 | 41 ++++++++++-------
 gnome-base/dconf/metadata.xml                      |  5 +++
 3 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-0.18.0.ebuild
similarity index 64%
copy from gnome-base/dconf/dconf-9999.ebuild
copy to gnome-base/dconf/dconf-0.18.0.ebuild
index 8acaac5..719e684 100644
--- a/gnome-base/dconf/dconf-9999.ebuild
+++ b/gnome-base/dconf/dconf-0.18.0.ebuild
@@ -1,51 +1,45 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2 bash-completion-r1 virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Simple low-level configuration system"
-HOMEPAGE="http://live.gnome.org/dconf"
+HOMEPAGE="https://wiki.gnome.org/dconf"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
+
 # TODO: coverage ?
-IUSE="doc test +X"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
+IUSE="test +X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
 
-RDEPEND=">=dev-libs/glib-2.33.3:2
+RDEPEND="
+	>=dev-libs/glib-2.35.2:2
 	sys-apps/dbus
-	X? ( >=dev-libs/libxml2-2.7.7:2
-		x11-libs/gtk+:3 )"
+	X? (
+		>=dev-libs/libxml2-2.7.7:2
+		>=x11-libs/gtk+-3.4:3 )
+"
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
-	sys-devel/gettext
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.15
 	>=dev-util/intltool-0.50
+	sys-devel/gettext
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.15 )"
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		dev-util/gtk-doc-am
-		>=dev-lang/vala-0.17.0:0.18"
-fi
+"
 
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		--disable-gcov
-		$(use_enable X editor)
-		VALAC=$(type -P valac-0.18)" # harmless even if valac-0.18 not found
+src_configure() {
+	gnome2_src_configure \
+		--disable-gcov \
+		--enable-man \
+		$(use_enable X editor) \
+		VALAC=$(type -P valac-0.18) # harmless even if valac-0.18 not found
 }
 
 src_test() {

diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-9999.ebuild
index 8acaac5..9d83a8e 100644
--- a/gnome-base/dconf/dconf-9999.ebuild
+++ b/gnome-base/dconf/dconf-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2 bash-completion-r1 virtualx
@@ -11,41 +11,48 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="Simple low-level configuration system"
-HOMEPAGE="http://live.gnome.org/dconf"
+HOMEPAGE="https://wiki.gnome.org/dconf"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
+
 # TODO: coverage ?
-IUSE="doc test +X"
+IUSE="test +X"
 if [[ ${PV} = 9999 ]]; then
+	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
 fi
 
-RDEPEND=">=dev-libs/glib-2.33.3:2
+RDEPEND="
+	>=dev-libs/glib-2.35.2:2
 	sys-apps/dbus
-	X? ( >=dev-libs/libxml2-2.7.7:2
-		x11-libs/gtk+:3 )"
+	X? (
+		>=dev-libs/libxml2-2.7.7:2
+		>=x11-libs/gtk+-3.4:3 )
+"
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
-	sys-devel/gettext
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.15
 	>=dev-util/intltool-0.50
+	sys-devel/gettext
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.15 )"
+"
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
-		dev-util/gtk-doc-am
+		doc? ( >=dev-util/gtk-doc-1.15 )
 		>=dev-lang/vala-0.17.0:0.18"
 fi
 
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		--disable-gcov
-		$(use_enable X editor)
-		VALAC=$(type -P valac-0.18)" # harmless even if valac-0.18 not found
+src_configure() {
+	gnome2_src_configure \
+		--disable-gcov \
+		--enable-man \
+		$(use_enable X editor) \
+		VALAC=$(type -P valac-0.18) # harmless even if valac-0.18 not found
 }
 
 src_test() {

diff --git a/gnome-base/dconf/metadata.xml b/gnome-base/dconf/metadata.xml
new file mode 100644
index 0000000..6e0e2ec
--- /dev/null
+++ b/gnome-base/dconf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+</pkgmetadata>