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 7CD6E138010 for ; Sat, 18 Aug 2012 10:41:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2865EE06D7; Sat, 18 Aug 2012 10:41:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DC1E3E06D7 for ; Sat, 18 Aug 2012 10:41:00 +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 22F301B4045 for ; Sat, 18 Aug 2012 10:41:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E08DDE5441 for ; Sat, 18 Aug 2012 10:40:58 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <1345280579.b0bb9f9080b0afc7fcdc17ea0f7779f8c40fb4c6.plaes@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.5.ebuild gnome-base/dconf/dconf-9999.ebuild X-VCS-Directories: gnome-base/dconf/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: b0bb9f9080b0afc7fcdc17ea0f7779f8c40fb4c6 X-VCS-Branch: master Date: Sat, 18 Aug 2012 10:40:58 +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: 4a9331d4-b6b5-44de-8500-6ab24fddd311 X-Archives-Hash: 4027509b95c7d159a85e3bb600fa495e commit: b0bb9f9080b0afc7fcdc17ea0f7779f8c40fb4c6 Author: Priit Laes plaes org> AuthorDate: Sat Aug 18 09:02:16 2012 +0000 Commit: Priit Laes plaes org> CommitDate: Sat Aug 18 09:02:59 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b0bb9f90 gnome-base/dconf: Added 0.13.5 to overlay --- .../{dconf-9999.ebuild => dconf-0.13.5.ebuild} | 14 ++++++++------ gnome-base/dconf/dconf-9999.ebuild | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-0.13.5.ebuild similarity index 84% copy from gnome-base/dconf/dconf-9999.ebuild copy to gnome-base/dconf/dconf-0.13.5.ebuild index 05e5991..b1127f9 100644 --- a/gnome-base/dconf/dconf-9999.ebuild +++ b/gnome-base/dconf/dconf-0.13.5.ebuild @@ -15,6 +15,7 @@ HOMEPAGE="http://live.gnome.org/dconf" LICENSE="LGPL-2.1" SLOT="0" +# TODO: coverage ? IUSE="doc +X" if [[ ${PV} = 9999 ]]; then KEYWORDS="" @@ -22,24 +23,25 @@ else KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" fi -RDEPEND=">=dev-libs/glib-2.31.18:2 +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-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.15.1:0.16" + dev-lang/vala:0.18" fi pkg_setup() { G2CONF="${G2CONF} --disable-schemas-compile $(use_enable X editor) - VALAC=$(type -P valac-0.16)" # harmless even if valac-0.16 not found + VALAC=$(type -P valac-0.18)" } src_install() { @@ -52,9 +54,9 @@ src_install() { echo 'GSETTINGS_BACKEND="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} + # Install bash-completion file properly to the system + rm -rv "${ED}usr/share/bash-completion" || die + newbashcomp "${S}/bin/completion/dconf" ${PN} } pkg_postinst() { diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-9999.ebuild index 05e5991..b1127f9 100644 --- a/gnome-base/dconf/dconf-9999.ebuild +++ b/gnome-base/dconf/dconf-9999.ebuild @@ -15,6 +15,7 @@ HOMEPAGE="http://live.gnome.org/dconf" LICENSE="LGPL-2.1" SLOT="0" +# TODO: coverage ? IUSE="doc +X" if [[ ${PV} = 9999 ]]; then KEYWORDS="" @@ -22,24 +23,25 @@ else KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" fi -RDEPEND=">=dev-libs/glib-2.31.18:2 +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-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.15.1:0.16" + dev-lang/vala:0.18" fi pkg_setup() { G2CONF="${G2CONF} --disable-schemas-compile $(use_enable X editor) - VALAC=$(type -P valac-0.16)" # harmless even if valac-0.16 not found + VALAC=$(type -P valac-0.18)" } src_install() { @@ -52,9 +54,9 @@ src_install() { echo 'GSETTINGS_BACKEND="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} + # Install bash-completion file properly to the system + rm -rv "${ED}usr/share/bash-completion" || die + newbashcomp "${S}/bin/completion/dconf" ${PN} } pkg_postinst() {