From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q89J5-0005Ia-RV for garchives@archives.gentoo.org; Fri, 08 Apr 2011 10:52:52 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9C261C043; Fri, 8 Apr 2011 10:52:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 922D11C040 for ; Fri, 8 Apr 2011 10:52:14 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 179151B413F for ; Fri, 8 Apr 2011 10:52:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 80AC480073 for ; Fri, 8 Apr 2011 10:52:12 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <21702d2e4f838a7393aa091558cf1a0678ed9eb2.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/dconf/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/dconf/dconf-0.7.3.ebuild gnome-base/dconf/dconf-9999.ebuild X-VCS-Directories: gnome-base/dconf/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 21702d2e4f838a7393aa091558cf1a0678ed9eb2 Date: Fri, 8 Apr 2011 10:52:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 03209241134a89539626225338d9edaa commit: 21702d2e4f838a7393aa091558cf1a0678ed9eb2 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Fri Apr 8 08:15:42 2011 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Fri Apr 8 10:51:45 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D21702d2e gnome-base/dconf: QAed * Moved gtk editor dependencies behind X use flag. * Split phases properly * Add slot notation for glib * Install env file for GSettings (Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --forc= e, signed Manifest commit with key C6085806) --- gnome-base/dconf/dconf-0.7.3.ebuild | 31 ++++++++++++++++++++---------= -- gnome-base/dconf/dconf-9999.ebuild | 31 ++++++++++++++++++++---------= -- 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/gnome-base/dconf/dconf-0.7.3.ebuild b/gnome-base/dconf/dconf= -0.7.3.ebuild index 460ca3e..bd594f7 100644 --- a/gnome-base/dconf/dconf-0.7.3.ebuild +++ b/gnome-base/dconf/dconf-0.7.3.ebuild @@ -12,8 +12,7 @@ HOMEPAGE=3D"http://live.gnome.org/dconf" =20 LICENSE=3D"LGPL-2.1" SLOT=3D"0" -#IUSE=3D"doc vala" -IUSE=3D"doc" +IUSE=3D"doc +X" if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live KEYWORDS=3D"" @@ -21,23 +20,23 @@ else KEYWORDS=3D"~amd64 ~arm ~sparc ~x86" fi =20 -COMMON_DEPEND=3D">=3Ddev-libs/glib-2.27.2 - >=3Ddev-libs/libgee-0.5.1 - >=3Ddev-libs/libxml2-2.7.7 +COMMON_DEPEND=3D">=3Ddev-libs/glib-2.27.2:2 sys-apps/dbus - x11-libs/gtk+:3" + X? ( + >=3Ddev-libs/libxml2-2.7.7:2 + x11-libs/gtk+:3 )" DEPEND=3D"${COMMON_DEPEND} >=3Ddev-lang/vala-0.11.7:0.12 doc? ( >=3Ddev-util/gtk-doc-1.15 )" -#vala? ( >=3Ddev-lang/vala-0.9.5:0.10 ) -RDEPEND=3D"${COMMON_DEPEND} - !dev-lang/vala:0" =20 -src_prepare() { +pkg_setup() { G2CONF=3D"${G2CONF} - VALAC=3D$(type -p valac-0.12)" + VALAC=3D$(type -p valac-0.12) + $(use_enable X editor)" #$(use_enable vala) +} =20 +src_prepare() { if [[ ${PV} =3D 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 release= s @@ -51,3 +50,13 @@ src_prepare() { =20 gnome2_src_prepare } + +src_install() { + gnome2_src_install + + # GSettings backend may be one of: memory, gconf, dcon + # Only dconf is really considered functional by upstream + # must have it enabled over gconf if both are installed + echo 'GSETTINGS_BACKEND=3D"dconf"' >> 51dconf + doenvd 51dconf || die "doenvd failed" +} diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-= 9999.ebuild index a2b564b..fe3ca24 100644 --- a/gnome-base/dconf/dconf-9999.ebuild +++ b/gnome-base/dconf/dconf-9999.ebuild @@ -12,8 +12,7 @@ HOMEPAGE=3D"http://live.gnome.org/dconf" =20 LICENSE=3D"LGPL-2.1" SLOT=3D"0" -#IUSE=3D"doc vala" -IUSE=3D"doc" +IUSE=3D"doc +X" if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live KEYWORDS=3D"" @@ -21,23 +20,23 @@ else KEYWORDS=3D"~amd64 ~arm ~sparc ~x86" fi =20 -COMMON_DEPEND=3D">=3Ddev-libs/glib-2.27.2 - >=3Ddev-libs/libgee-0.5.1 - >=3Ddev-libs/libxml2-2.7.7 +COMMON_DEPEND=3D">=3Ddev-libs/glib-2.27.2:2 sys-apps/dbus - x11-libs/gtk+:3" + X? ( + >=3Ddev-libs/libxml2-2.7.7:2 + x11-libs/gtk+:3 )" DEPEND=3D"${COMMON_DEPEND} >=3Ddev-lang/vala-0.11.7:0.12 doc? ( >=3Ddev-util/gtk-doc-1.15 )" -RDEPEND=3D"${COMMON_DEPEND} - !dev-lang/vala:0" -#vala? ( >=3Ddev-lang/vala-0.9.5:0.10 ) =20 -src_prepare() { +pkg_setup() { G2CONF=3D"${G2CONF} - VALAC=3D$(type -p valac-0.12)" + VALAC=3D$(type -p valac-0.12) + $(use_enable X editor)" #$(use_enable vala) +} =20 +src_prepare() { if [[ ${PV} =3D 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 release= s @@ -51,3 +50,13 @@ src_prepare() { =20 gnome2_src_prepare } + +src_install() { + gnome2_src_install + + # GSettings backend may be one of: memory, gconf, dcon + # Only dconf is really considered functional by upstream + # must have it enabled over gconf if both are installed + echo 'GSETTINGS_BACKEND=3D"dconf"' >> 51dconf + doenvd 51gsettings-dconf || die "doenvd failed" +}