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

[Gilles Dartiguelongue]

commit:     cf7a8f0b6e9a4f199318a2658626ba537438e12f
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 16:06:12 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 10 16:09:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=cf7a8f0b

gnome-base/dconf: 0.22.0 → 0.24.0

 .../{dconf-9999.ebuild => dconf-0.24.0.ebuild}     | 26 ++++------------------
 gnome-base/dconf/dconf-9999.ebuild                 | 11 +++------
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/gnome-base/dconf/dconf-9999.ebuild 
b/gnome-base/dconf/dconf-0.24.0.ebuild
similarity index 74%
copy from gnome-base/dconf/dconf-9999.ebuild
copy to gnome-base/dconf/dconf-0.24.0.ebuild
index 354a0af..1301389 100644
--- a/gnome-base/dconf/dconf-9999.ebuild
+++ b/gnome-base/dconf/dconf-0.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,9 +6,6 @@ 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="https://wiki.gnome.org/dconf";
@@ -17,41 +14,26 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 
 # TODO: coverage ?
-IUSE="test +X"
-if [[ ${PV} = 9999 ]]; then
-       IUSE="${IUSE} doc"
-       KEYWORDS=""
-else
-       KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd ~arm-linux ~x86-linux"
-fi
+IUSE="test"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd ~arm-linux ~x86-linux"
 
 RDEPEND="
        >=dev-libs/glib-2.39.1:2
        sys-apps/dbus
-       X? (
-               >=dev-libs/libxml2-2.7.7:2
-               >=x11-libs/gtk+-3.4:3 )
 "
 DEPEND="${RDEPEND}
        dev-libs/libxslt
        dev-util/gdbus-codegen
        >=dev-util/gtk-doc-am-1.15
-       >=dev-util/intltool-0.50
        sys-devel/gettext
        virtual/pkgconfig
 "
 
-if [[ ${PV} = 9999 ]]; then
-       DEPEND="${DEPEND}
-               doc? ( >=dev-util/gtk-doc-1.15 )
-               >=dev-lang/vala-0.17.0:0.18"
-fi
-
 src_configure() {
        gnome2_src_configure \
                --disable-gcov \
                --enable-man \
-               $(use_enable X editor) \
                VALAC=$(type -P true)
 }
 

diff --git a/gnome-base/dconf/dconf-9999.ebuild 
b/gnome-base/dconf/dconf-9999.ebuild
index 354a0af..373f4b5 100644
--- a/gnome-base/dconf/dconf-9999.ebuild
+++ b/gnome-base/dconf/dconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,26 +17,22 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 
 # TODO: coverage ?
-IUSE="test +X"
+IUSE="test"
 if [[ ${PV} = 9999 ]]; then
        IUSE="${IUSE} doc"
        KEYWORDS=""
 else
-       KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd ~arm-linux ~x86-linux"
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~x86-fbsd ~arm-linux ~x86-linux"
 fi
 
 RDEPEND="
        >=dev-libs/glib-2.39.1:2
        sys-apps/dbus
-       X? (
-               >=dev-libs/libxml2-2.7.7:2
-               >=x11-libs/gtk+-3.4:3 )
 "
 DEPEND="${RDEPEND}
        dev-libs/libxslt
        dev-util/gdbus-codegen
        >=dev-util/gtk-doc-am-1.15
-       >=dev-util/intltool-0.50
        sys-devel/gettext
        virtual/pkgconfig
 "
@@ -51,7 +47,6 @@ src_configure() {
        gnome2_src_configure \
                --disable-gcov \
                --enable-man \
-               $(use_enable X editor) \
                VALAC=$(type -P true)
 }