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 1SEXys-0008IS-7m for garchives@archives.gentoo.org; Mon, 02 Apr 2012 03:30:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64350E0AC7; Mon, 2 Apr 2012 03:30:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2385AE0AC7 for ; Mon, 2 Apr 2012 03:30:45 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F89A1B4017 for ; Mon, 2 Apr 2012 03:30:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E6077E542C for ; Mon, 2 Apr 2012 03:30:43 +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: <1333337334.8a2ed13c8e2224817a58f3353d5b8a664f52c5b2.tetromino@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.12.0.ebuild gnome-base/dconf/dconf-9999.ebuild X-VCS-Directories: gnome-base/dconf/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 8a2ed13c8e2224817a58f3353d5b8a664f52c5b2 X-VCS-Branch: master Date: Mon, 2 Apr 2012 03:30:43 +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: 4c52fa39-f047-4e88-a74d-37371bac7478 X-Archives-Hash: 2fcc43dbcc0f7eff857c035e493a770e commit: 8a2ed13c8e2224817a58f3353d5b8a664f52c5b2 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Mon Apr 2 03:25:03 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Mon Apr 2 03:28:54 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D8a2ed13c gnome-base/dconf: moved to gx86 + simplify valac-0.16 fix --- gnome-base/dconf/dconf-0.12.0.ebuild | 76 ----------------------------= ------ gnome-base/dconf/dconf-9999.ebuild | 11 +---- 2 files changed, 3 insertions(+), 84 deletions(-) diff --git a/gnome-base/dconf/dconf-0.12.0.ebuild b/gnome-base/dconf/dcon= f-0.12.0.ebuild deleted file mode 100644 index e58a8bd..0000000 --- a/gnome-base/dconf/dconf-0.12.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $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=3D"4" -GCONF_DEBUG=3D"no" - -inherit eutils gnome2 bash-completion-r1 -if [[ ${PV} =3D 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION=3D"Simple low-level configuration system" -HOMEPAGE=3D"http://live.gnome.org/dconf" - -LICENSE=3D"LGPL-2.1" -SLOT=3D"0" -IUSE=3D"doc +X" -if [[ ${PV} =3D 9999 ]]; then - KEYWORDS=3D"" -else - KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd" -fi - -RDEPEND=3D">=3Ddev-libs/glib-2.31.18:2 - sys-apps/dbus - X? ( >=3Ddev-libs/libxml2-2.7.7:2 - x11-libs/gtk+:3 )" -DEPEND=3D"${RDEPEND} - doc? ( >=3Ddev-util/gtk-doc-1.15 )" - -if [[ ${PV} =3D 9999 ]]; then - DEPEND=3D"${DEPEND} - dev-util/gtk-doc-am - >=3Ddev-lang/vala-0.15.1:0.16 )" -fi - -pkg_setup() { - G2CONF=3D"${G2CONF} - --disable-schemas-compile - VALAC=3D$(type -p false) - $(use_enable X editor)" - - if [[ ${PV} =3D 9999 ]]; then - G2CONF=3D"${G2CONF} - VALAC=3D$(type -p valac-0.16)" - fi -} - -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=3D"/etc/dconf"' >> 51dconf - echo 'GSETTINGS_BACKEND=3D"dconf"' >> 51dconf - doenvd 51dconf - - # Remove bash-completion file installed by build system - rm -rv "${ED}etc/bash_completion.d/" || die - newbashcomp "${S}/bin/dconf-bash-completion.sh" ${PN} -} - -pkg_postinst() { - gnome2_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=3D$(pgrep -x dconf-service) - if [[ $? =3D=3D 0 ]]; then - ebegin "Stopping dconf-service; it will automatically restart on deman= d" - kill ${pids} - eend $? - fi -} diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-= 9999.ebuild index e58a8bd..cfc3ffe 100644 --- a/gnome-base/dconf/dconf-9999.ebuild +++ b/gnome-base/dconf/dconf-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D"4" GCONF_DEBUG=3D"no" =20 -inherit eutils gnome2 bash-completion-r1 +inherit gnome2 bash-completion-r1 if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -38,13 +38,8 @@ fi pkg_setup() { G2CONF=3D"${G2CONF} --disable-schemas-compile - VALAC=3D$(type -p false) - $(use_enable X editor)" - - if [[ ${PV} =3D 9999 ]]; then - G2CONF=3D"${G2CONF} - VALAC=3D$(type -p valac-0.16)" - fi + $(use_enable X editor) + VALAC=3D$(type -P valac-0.16)" # harmless even if valac-0.16 not found } =20 src_install() {