From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 17E6F138010 for ; Fri, 28 Sep 2012 00:08:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F47821C031; Fri, 28 Sep 2012 00:07:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2BD3DE002E for ; Fri, 28 Sep 2012 00:07:47 +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 6205A33D737 for ; Fri, 28 Sep 2012 00:07:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2E580E544B for ; Fri, 28 Sep 2012 00:07:44 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1348790825.0d4d44bf15963cd4fe6b4ccb2bc0b958515a6bf0.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.13.90.ebuild gnome-base/dconf/dconf-9999.ebuild X-VCS-Directories: gnome-base/dconf/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: 0d4d44bf15963cd4fe6b4ccb2bc0b958515a6bf0 X-VCS-Branch: master Date: Fri, 28 Sep 2012 00:07:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c014f7d2-9644-41dd-8474-f58c6eafe571 X-Archives-Hash: f694e4f01a5cd7ded1644045c72b9d65 commit: 0d4d44bf15963cd4fe6b4ccb2bc0b958515a6bf0 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Fri Sep 28 00:07:05 2012 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Fri Sep 28 00:07:05 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0d4d44bf gnome-base/dconf: 0.14.0 now in gx86; sync live ebuild with gx86 --- gnome-base/dconf/dconf-0.13.90.ebuild | 76 --------------------------------- gnome-base/dconf/dconf-9999.ebuild | 17 +++++--- 2 files changed, 11 insertions(+), 82 deletions(-) diff --git a/gnome-base/dconf/dconf-0.13.90.ebuild b/gnome-base/dconf/dconf-0.13.90.ebuild deleted file mode 100644 index e6bb5b9..0000000 --- a/gnome-base/dconf/dconf-0.13.90.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="4" -GCONF_DEBUG="no" - -inherit 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" -# TODO: coverage ? -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.33.3:2 - sys-apps/dbus - X? ( >=dev-libs/libxml2-2.7.7:2 - x11-libs/gtk+:3 )" -DEPEND="${RDEPEND} - dev-libs/libxslt - sys-devel/gettext - >=dev-util/intltool-0.50 - doc? ( >=dev-util/gtk-doc-1.15 )" - -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - dev-util/gtk-doc-am - >=dev-lang/vala-0.17.0:0.18" -fi - -pkg_setup() { - G2CONF="${G2CONF} - --disable-schemas-compile - --disable-gcov - $(use_enable X editor) - VALAC=$(type -P valac-0.18)" -} - -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 - - # Install bash-completion file properly to the system - rm -rv "${ED}usr/share/bash-completion" || die - newbashcomp "${S}/bin/completion/dconf" ${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=$(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/dconf-9999.ebuild b/gnome-base/dconf/dconf-9999.ebuild index e6bb5b9..8acaac5 100644 --- a/gnome-base/dconf/dconf-9999.ebuild +++ b/gnome-base/dconf/dconf-9999.ebuild @@ -1,11 +1,11 @@ # 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 $ +# $Header: $ EAPI="4" GCONF_DEBUG="no" -inherit gnome2 bash-completion-r1 +inherit gnome2 bash-completion-r1 virtualx if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -13,10 +13,10 @@ fi DESCRIPTION="Simple low-level configuration system" HOMEPAGE="http://live.gnome.org/dconf" -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+" SLOT="0" # TODO: coverage ? -IUSE="doc +X" +IUSE="doc test +X" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else @@ -31,6 +31,7 @@ DEPEND="${RDEPEND} dev-libs/libxslt sys-devel/gettext >=dev-util/intltool-0.50 + virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.15 )" if [[ ${PV} = 9999 ]]; then @@ -44,7 +45,11 @@ pkg_setup() { --disable-schemas-compile --disable-gcov $(use_enable X editor) - VALAC=$(type -P valac-0.18)" + VALAC=$(type -P valac-0.18)" # harmless even if valac-0.18 not found +} + +src_test() { + Xemake check } src_install() { @@ -59,7 +64,7 @@ src_install() { # Install bash-completion file properly to the system rm -rv "${ED}usr/share/bash-completion" || die - newbashcomp "${S}/bin/completion/dconf" ${PN} + dobashcomp "${S}/bin/completion/dconf" } pkg_postinst() {