* [gentoo-commits] proj/gnome:master commit in: gnome-base/dconf/, gnome-base/dconf/files/
@ 2011-03-23 5:20 Nirbheek Chauhan
0 siblings, 0 replies; 4+ messages in thread
From: Nirbheek Chauhan @ 2011-03-23 5:20 UTC (permalink / raw
To: gentoo-commits
commit: 447ff1fce8eb08f372ac9e4b66a17a18b48952e0
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 02:27:34 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 04:12:19 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=447ff1fc
gnome-base/dconf: 0.7.2 → 0.7.3
---
.../{dconf-0.7.2.ebuild => dconf-0.7.3.ebuild} | 4 ++--
gnome-base/dconf/dconf-9999.ebuild | 4 ++--
gnome-base/dconf/files/dconf-automagic-vala.patch | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnome-base/dconf/dconf-0.7.2.ebuild b/gnome-base/dconf/dconf-0.7.3.ebuild
similarity index 95%
rename from gnome-base/dconf/dconf-0.7.2.ebuild
rename to gnome-base/dconf/dconf-0.7.3.ebuild
index 24e9cf6..1431a36 100644
--- a/gnome-base/dconf/dconf-0.7.2.ebuild
+++ b/gnome-base/dconf/dconf-0.7.3.ebuild
@@ -21,13 +21,13 @@ else
KEYWORDS="~amd64 ~arm ~sparc ~x86"
fi
-RDEPEND=">=dev-libs/glib-2.25.10
+RDEPEND=">=dev-libs/glib-2.27.2
>=dev-libs/libgee-0.5.1
>=dev-libs/libxml2-2.7.7
sys-apps/dbus
x11-libs/gtk+:3"
DEPEND="${RDEPEND}
- >=dev-lang/vala-0.11.4:0.12
+ >=dev-lang/vala-0.11.7:0.12
doc? ( >=dev-util/gtk-doc-1.15 )"
#vala? ( >=dev-lang/vala-0.9.5:0.10 )
diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-9999.ebuild
index 24e9cf6..1431a36 100644
--- a/gnome-base/dconf/dconf-9999.ebuild
+++ b/gnome-base/dconf/dconf-9999.ebuild
@@ -21,13 +21,13 @@ else
KEYWORDS="~amd64 ~arm ~sparc ~x86"
fi
-RDEPEND=">=dev-libs/glib-2.25.10
+RDEPEND=">=dev-libs/glib-2.27.2
>=dev-libs/libgee-0.5.1
>=dev-libs/libxml2-2.7.7
sys-apps/dbus
x11-libs/gtk+:3"
DEPEND="${RDEPEND}
- >=dev-lang/vala-0.11.4:0.12
+ >=dev-lang/vala-0.11.7:0.12
doc? ( >=dev-util/gtk-doc-1.15 )"
#vala? ( >=dev-lang/vala-0.9.5:0.10 )
diff --git a/gnome-base/dconf/files/dconf-automagic-vala.patch b/gnome-base/dconf/files/dconf-automagic-vala.patch
index b17e9ef..11e1616 100644
--- a/gnome-base/dconf/files/dconf-automagic-vala.patch
+++ b/gnome-base/dconf/files/dconf-automagic-vala.patch
@@ -4,7 +4,7 @@
# Check for programs
AC_PROG_CC
--AM_PROG_VALAC([0.11.4])
+-AM_PROG_VALAC([0.11.7])
+
+AC_ARG_ENABLE(vala,
+ AC_HELP_STRING([--disable-vala],
@@ -12,7 +12,7 @@
+AM_CONDITIONAL(ENABLE_VALA, test "x$enable_vala" != "xno")
+
+if test "x$enable_vala" != "xno"; then
-+ AM_PROG_VALAC([0.11.4])
++ AM_PROG_VALAC([0.11.7])
+fi
# Gtk-doc support
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/dconf/, gnome-base/dconf/files/
@ 2011-10-29 19:56 Alexandre Restovtsev
0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Restovtsev @ 2011-10-29 19:56 UTC (permalink / raw
To: gentoo-commits
commit: f5e99a16062991fab7dc44324347120e40fc568e
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 19:49:00 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Oct 29 19:49:00 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f5e99a16
gnome-base/dconf: moved 0.10.0 to gx86 + sync with gx86 changes
Sync with the following gx86 changes:
bash-completion migration
new keywords
gtk-doc-am dependency
duplicate eautoreconf
kill running dconf-service processes in pkg_postinst
---
gnome-base/dconf/dconf-0.10.0.ebuild | 81 --------------------
gnome-base/dconf/dconf-9999.ebuild | 30 +++++---
...vala.patch => dconf-0.8.0-automagic-vala.patch} | 8 +-
3 files changed, 23 insertions(+), 96 deletions(-)
diff --git a/gnome-base/dconf/dconf-0.10.0.ebuild b/gnome-base/dconf/dconf-0.10.0.ebuild
deleted file mode 100644
index 66809c7..0000000
--- a/gnome-base/dconf/dconf-0.10.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2 bash-completion
-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"
-IUSE="doc vala +X"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~arm ~sparc ~x86"
-fi
-
-COMMON_DEPEND=">=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="${COMMON_DEPEND}
- doc? ( >=dev-util/gtk-doc-1.15 )
- vala? ( dev-lang/vala:0.14 )"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-schemas-compile
- $(use_enable vala)
- $(use_enable X editor)
- VALAC=$(type -p valac-0.14)"
-}
-
-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}-automagic-vala.patch"
-
- if [[ ${PV} != 9999 ]]; then
- mkdir -p m4 || die
- AT_M4DIR="." eautoreconf
- eautoreconf
- fi
- gnome2_src_prepare
-}
-
-src_install() {
- gnome2_src_install
-
- # GSettings backend may be one of: memory, gconf, dconf
- # Only dconf is really considered functional by upstream
- # must have it enabled over gconf if both are installed
- echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
- echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
- doenvd 51dconf
-
- # Remove bash-completion file installed by build system
- rm -rv "${ED}/etc/bash_completion.d/" || die
- use bash-completion && \
- dobashcompletion "${S}/bin/dconf-bash-completion.sh" ${PN}
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- use bash-completion && bash-completion_pkg_postinst
-}
diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-9999.ebuild
index 66809c7..05945f9 100644
--- a/gnome-base/dconf/dconf-9999.ebuild
+++ b/gnome-base/dconf/dconf-9999.ebuild
@@ -5,7 +5,7 @@
EAPI="4"
GCONF_DEBUG="no"
-inherit autotools eutils gnome2 bash-completion
+inherit autotools eutils gnome2 bash-completion-r1
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -19,18 +19,19 @@ IUSE="doc vala +X"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~arm ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
fi
-COMMON_DEPEND=">=dev-libs/glib-2.29.90:2
+RDEPEND=">=dev-libs/glib-2.29.90:2
sys-apps/dbus
- X? (
- >=dev-libs/libxml2-2.7.7:2
+ 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="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
doc? ( >=dev-util/gtk-doc-1.15 )
vala? ( dev-lang/vala:0.14 )"
+# eautoreconf requires gtk-doc-am
pkg_setup() {
G2CONF="${G2CONF}
@@ -49,13 +50,13 @@ src_prepare() {
fi
# Fix vala automagic support, upstream bug #634171
- epatch "${FILESDIR}/${PN}-automagic-vala.patch"
+ epatch "${FILESDIR}/${PN}-0.8.0-automagic-vala.patch"
if [[ ${PV} != 9999 ]]; then
mkdir -p m4 || die
- AT_M4DIR="." eautoreconf
eautoreconf
fi
+
gnome2_src_prepare
}
@@ -71,11 +72,18 @@ src_install() {
# Remove bash-completion file installed by build system
rm -rv "${ED}/etc/bash_completion.d/" || die
- use bash-completion && \
- dobashcompletion "${S}/bin/dconf-bash-completion.sh" ${PN}
+ newbashcomp "${S}/bin/dconf-bash-completion.sh" ${PN}
}
pkg_postinst() {
gnome2_pkg_postinst
- use bash-completion && bash-completion_pkg_postinst
+ # Kill existing dconf-service processes as recommended by upstream due to
+ # possible changes in the dconf private dbus API.
+ # dconf-service will be dbus-activated on next use.
+ pids=$(pgrep -x dconf-service)
+ if [[ $? == 0 ]]; then
+ ebegin "Stopping dconf-service; it will automatically restart on demand"
+ kill ${pids}
+ eend $?
+ fi
}
diff --git a/gnome-base/dconf/files/dconf-automagic-vala.patch b/gnome-base/dconf/files/dconf-0.8.0-automagic-vala.patch
similarity index 67%
rename from gnome-base/dconf/files/dconf-automagic-vala.patch
rename to gnome-base/dconf/files/dconf-0.8.0-automagic-vala.patch
index 11e1616..9f680a0 100644
--- a/gnome-base/dconf/files/dconf-automagic-vala.patch
+++ b/gnome-base/dconf/files/dconf-0.8.0-automagic-vala.patch
@@ -1,5 +1,5 @@
---- configure.ac
-+++ configure.ac
+--- 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
@@ -15,5 +15,5 @@
+ AM_PROG_VALAC([0.11.7])
+fi
- # Gtk-doc support
- GTK_DOC_CHECK([1.15])
+ # Use GSettings
+ GLIB_GSETTINGS
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/dconf/, gnome-base/dconf/files/
@ 2012-02-26 23:19 Alexandre Restovtsev
0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Restovtsev @ 2012-02-26 23:19 UTC (permalink / raw
To: gentoo-commits
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@gentoo.org>
+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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/dconf/, gnome-base/dconf/files/
@ 2012-03-31 9:14 Nirbheek Chauhan
0 siblings, 0 replies; 4+ messages in thread
From: Nirbheek Chauhan @ 2012-03-31 9:14 UTC (permalink / raw
To: gentoo-commits
commit: 1b31ea2f0c44345d6a9e257cfb9afabf711ed21a
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 18:59:26 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 19:01:51 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1b31ea2f
gnome-base/dconf: bump, and fix vala stuff
---
.../{dconf-0.11.7.ebuild => dconf-0.12.0.ebuild} | 42 +++++++++++---------
gnome-base/dconf/dconf-9999.ebuild | 38 ++++++------------
.../dconf/files/dconf-0.11.5-automagic-vala.patch | 33 ---------------
3 files changed, 36 insertions(+), 77 deletions(-)
diff --git a/gnome-base/dconf/dconf-0.11.7.ebuild b/gnome-base/dconf/dconf-0.12.0.ebuild
similarity index 72%
rename from gnome-base/dconf/dconf-0.11.7.ebuild
rename to gnome-base/dconf/dconf-0.12.0.ebuild
index 313c2d5..e58a8bd 100644
--- a/gnome-base/dconf/dconf-0.11.7.ebuild
+++ b/gnome-base/dconf/dconf-0.12.0.ebuild
@@ -5,42 +5,46 @@
EAPI="4"
GCONF_DEBUG="no"
-inherit autotools eutils gnome2 bash-completion-r1
+inherit 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"
+IUSE="doc +X"
+if [[ ${PV} = 9999 ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+fi
RDEPEND=">=dev-libs/glib-2.31.18:2
sys-apps/dbus
X? ( >=dev-libs/libxml2-2.7.7:2
x11-libs/gtk+:3 )"
DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- doc? ( >=dev-util/gtk-doc-1.15 )
- vala? ( >=dev-lang/vala-0.15.1:0.16 )"
-# eautoreconf requires gtk-doc-am
+ doc? ( >=dev-util/gtk-doc-1.15 )"
+
+if [[ ${PV} = 9999 ]]; then
+ DEPEND="${DEPEND}
+ dev-util/gtk-doc-am
+ >=dev-lang/vala-0.15.1:0.16 )"
+fi
pkg_setup() {
G2CONF="${G2CONF}
--disable-schemas-compile
- $(use_enable vala)
- $(use_enable X editor)
- VALAC=$(type -p valac-0.16)"
-}
-
-src_prepare() {
- # Fix vala automagic support, upstream bug #634171
- epatch "${FILESDIR}/${PN}-0.11.5-automagic-vala.patch"
+ VALAC=$(type -p false)
+ $(use_enable X editor)"
- mkdir -p m4 || die
- eautoreconf
-
- gnome2_src_prepare
+ if [[ ${PV} = 9999 ]]; then
+ G2CONF="${G2CONF}
+ VALAC=$(type -p valac-0.16)"
+ fi
}
src_install() {
diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-9999.ebuild
index 8b7f9a4..e58a8bd 100644
--- a/gnome-base/dconf/dconf-9999.ebuild
+++ b/gnome-base/dconf/dconf-9999.ebuild
@@ -5,7 +5,7 @@
EAPI="4"
GCONF_DEBUG="no"
-inherit autotools eutils gnome2 bash-completion-r1
+inherit eutils gnome2 bash-completion-r1
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -15,48 +15,36 @@ HOMEPAGE="http://live.gnome.org/dconf"
LICENSE="LGPL-2.1"
SLOT="0"
+IUSE="doc +X"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
fi
-IUSE="doc vala +X"
RDEPEND=">=dev-libs/glib-2.31.18:2
sys-apps/dbus
X? ( >=dev-libs/libxml2-2.7.7:2
x11-libs/gtk+:3 )"
DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- doc? ( >=dev-util/gtk-doc-1.15 )
- vala? ( >=dev-lang/vala-0.15.1:0.16 )"
-# eautoreconf requires gtk-doc-am
+ doc? ( >=dev-util/gtk-doc-1.15 )"
+
+if [[ ${PV} = 9999 ]]; then
+ DEPEND="${DEPEND}
+ dev-util/gtk-doc-am
+ >=dev-lang/vala-0.15.1:0.16 )"
+fi
pkg_setup() {
G2CONF="${G2CONF}
--disable-schemas-compile
- $(use_enable vala)
- $(use_enable X editor)
- VALAC=$(type -p valac-0.16)"
-}
+ VALAC=$(type -p false)
+ $(use_enable X editor)"
-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"
+ G2CONF="${G2CONF}
+ VALAC=$(type -p valac-0.16)"
fi
-
- # Fix vala automagic support, upstream bug #634171
- epatch "${FILESDIR}/${PN}-0.11.5-automagic-vala.patch"
-
- if [[ ${PV} != 9999 ]]; then
- mkdir -p m4 || die
- eautoreconf
- fi
-
- gnome2_src_prepare
}
src_install() {
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
deleted file mode 100644
index cda55cb..0000000
--- a/gnome-base/dconf/files/dconf-0.11.5-automagic-vala.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 09f3a2a4b6d997b5fd9b42add27de465dd529d43 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-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
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-31 9:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-31 9:14 [gentoo-commits] proj/gnome:master commit in: gnome-base/dconf/, gnome-base/dconf/files/ Nirbheek Chauhan
-- strict thread matches above, loose matches on Subject: below --
2012-02-26 23:19 Alexandre Restovtsev
2011-10-29 19:56 Alexandre Restovtsev
2011-03-23 5:20 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox