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 1QmFj8-0004em-99 for garchives@archives.gentoo.org; Thu, 28 Jul 2011 01:49:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C44621C0FD; Thu, 28 Jul 2011 01:49:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2ABAD21C0FD for ; Thu, 28 Jul 2011 01:49:22 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 976871B4011 for ; Thu, 28 Jul 2011 01:49:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F3A0A8003D for ; Thu, 28 Jul 2011 01:49:21 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <3e79354f73b9c090eb59cf9fff3d77abf6094f87.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/dconf/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/dconf/dconf-0.9.0.ebuild X-VCS-Directories: gnome-base/dconf/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 3e79354f73b9c090eb59cf9fff3d77abf6094f87 Date: Thu, 28 Jul 2011 01:49:21 +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: 45abe729ef849e3791563defc00d92fe commit: 3e79354f73b9c090eb59cf9fff3d77abf6094f87 Author: Alexandre Rostovtsev gmail com> AuthorDate: Thu Jul 28 01:46:50 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Thu Jul 28 01:46:50 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D3e79354f gnome-base/dconf: make vala optional Sync the tarball version of the ebuild with changes in gx86 and make vala optional, since the patch apparently works (at least for the tarball releases). --- gnome-base/dconf/dconf-0.9.0.ebuild | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gnome-base/dconf/dconf-0.9.0.ebuild b/gnome-base/dconf/dconf= -0.9.0.ebuild index 013cc37..f9a78e7 100644 --- a/gnome-base/dconf/dconf-0.9.0.ebuild +++ b/gnome-base/dconf/dconf-0.9.0.ebuild @@ -5,7 +5,7 @@ EAPI=3D"4" GCONF_DEBUG=3D"no" =20 -inherit gnome2 bash-completion +inherit autotools eutils gnome2 bash-completion if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -15,7 +15,7 @@ HOMEPAGE=3D"http://live.gnome.org/dconf" =20 LICENSE=3D"LGPL-2.1" SLOT=3D"0" -IUSE=3D"doc +X" +IUSE=3D"doc vala +X" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else @@ -29,15 +29,15 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.27.2:2 x11-libs/gtk+:3 )" # vala:0.14 due to an automagic version-check #ifdef (commit a15d9621) DEPEND=3D"${COMMON_DEPEND} - dev-lang/vala:0.14 - doc? ( >=3Ddev-util/gtk-doc-1.15 )" + doc? ( >=3Ddev-util/gtk-doc-1.15 ) + vala? ( dev-lang/vala:0.14 )" =20 pkg_setup() { G2CONF=3D"${G2CONF} --disable-schemas-compile - VALAC=3D$(type -p valac-0.14) - $(use_enable X editor)" - #$(use_enable vala) + $(use_enable vala) + $(use_enable X editor) + VALAC=3D$(type -p valac-0.14)" } =20 src_prepare() { @@ -49,9 +49,13 @@ src_prepare() { fi =20 # Fix vala automagic support, upstream bug #634171 - # FIXME: patch doesn't actually work, forcing vala support above - #epatch "${FILESDIR}/${PN}-automagic-vala.patch" + epatch "${FILESDIR}/${PN}-automagic-vala.patch" =20 + if [[ ${PV} !=3D 9999 ]]; then + mkdir -p m4 || die + AT_M4DIR=3D"." eautoreconf + eautoreconf + fi gnome2_src_prepare } =20 @@ -63,11 +67,10 @@ src_install() { # must have it enabled over gconf if both are installed echo 'CONFIG_PROTECT_MASK=3D"/etc/dconf"' >> 51dconf echo 'GSETTINGS_BACKEND=3D"dconf"' >> 51dconf - doenvd 51dconf || die "doenvd failed" + doenvd 51dconf =20 # 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} }