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 1SDuOe-0003Nv-Cj for garchives@archives.gentoo.org; Sat, 31 Mar 2012 09:14:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 539FEE0DE2; Sat, 31 Mar 2012 09:14:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0E682E0DD3 for ; Sat, 31 Mar 2012 09:14:35 +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 54AE11B4013 for ; Sat, 31 Mar 2012 09:14:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 18574E5402 for ; Sat, 31 Mar 2012 09:14:34 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <1333134111.1b31ea2f0c44345d6a9e257cfb9afabf711ed21a.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/dconf/, gnome-base/dconf/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/dconf/dconf-0.11.7.ebuild gnome-base/dconf/dconf-0.12.0.ebuild gnome-base/dconf/dconf-9999.ebuild gnome-base/dconf/files/dconf-0.11.5-automagic-vala.patch X-VCS-Directories: gnome-base/dconf/ gnome-base/dconf/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 1b31ea2f0c44345d6a9e257cfb9afabf711ed21a X-VCS-Branch: master Date: Sat, 31 Mar 2012 09:14:34 +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: d543a004-9f45-4656-ae77-583108e11f3c X-Archives-Hash: 50031abd4b6830d9bd43aa45f33cd966 commit: 1b31ea2f0c44345d6a9e257cfb9afabf711ed21a Author: Nirbheek Chauhan gentoo org> AuthorDate: Fri Mar 30 18:59:26 2012 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Fri Mar 30 19:01:51 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D1b31ea2f gnome-base/dconf: bump, and fix vala stuff --- .../{dconf-0.11.7.ebuild =3D> dconf-0.12.0.ebuild} | 42 +++++++++++-= -------- gnome-base/dconf/dconf-9999.ebuild | 38 ++++++--------= ---- .../dconf/files/dconf-0.11.5-automagic-vala.patch | 33 --------------= - 3 files changed, 36 insertions(+), 77 deletions(-) diff --git a/gnome-base/dconf/dconf-0.11.7.ebuild b/gnome-base/dconf/dcon= f-0.12.0.ebuild similarity index 72% rename from gnome-base/dconf/dconf-0.11.7.ebuild rename to gnome-base/dconf/dconf-0.12.0.ebuild index 313c2d5..e58a8bd 100644 --- a/gnome-base/dconf/dconf-0.11.7.ebuild +++ b/gnome-base/dconf/dconf-0.12.0.ebuild @@ -5,42 +5,46 @@ EAPI=3D"4" GCONF_DEBUG=3D"no" =20 -inherit autotools eutils gnome2 bash-completion-r1 +inherit eutils gnome2 bash-completion-r1 +if [[ ${PV} =3D 9999 ]]; then + inherit gnome2-live +fi =20 DESCRIPTION=3D"Simple low-level configuration system" HOMEPAGE=3D"http://live.gnome.org/dconf" =20 LICENSE=3D"LGPL-2.1" SLOT=3D"0" -KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fb= sd" -IUSE=3D"doc vala +X" +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 =20 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} - dev-util/gtk-doc-am - doc? ( >=3Ddev-util/gtk-doc-1.15 ) - vala? ( >=3Ddev-lang/vala-0.15.1:0.16 )" -# eautoreconf requires gtk-doc-am + 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 =20 pkg_setup() { G2CONF=3D"${G2CONF} --disable-schemas-compile - $(use_enable vala) - $(use_enable X editor) - VALAC=3D$(type -p valac-0.16)" -} - -src_prepare() { - # Fix vala automagic support, upstream bug #634171 - epatch "${FILESDIR}/${PN}-0.11.5-automagic-vala.patch" + VALAC=3D$(type -p false) + $(use_enable X editor)" =20 - mkdir -p m4 || die - eautoreconf - - gnome2_src_prepare + if [[ ${PV} =3D 9999 ]]; then + G2CONF=3D"${G2CONF} + VALAC=3D$(type -p valac-0.16)" + fi } =20 src_install() { diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-= 9999.ebuild index 8b7f9a4..e58a8bd 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 autotools eutils gnome2 bash-completion-r1 +inherit eutils gnome2 bash-completion-r1 if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -15,48 +15,36 @@ HOMEPAGE=3D"http://live.gnome.org/dconf" =20 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 -IUSE=3D"doc vala +X" =20 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} - dev-util/gtk-doc-am - doc? ( >=3Ddev-util/gtk-doc-1.15 ) - vala? ( >=3Ddev-lang/vala-0.15.1:0.16 )" -# eautoreconf requires gtk-doc-am + 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 =20 pkg_setup() { G2CONF=3D"${G2CONF} --disable-schemas-compile - $(use_enable vala) - $(use_enable X editor) - VALAC=3D$(type -p valac-0.16)" -} + VALAC=3D$(type -p false) + $(use_enable X editor)" =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 - sed -e 's:^include gtk-doc.make:include $(top_srcdir)/gtk-doc.make:' \ - -i docs/Makefile.am || die "Fixing gtk-doc.make failed" + G2CONF=3D"${G2CONF} + VALAC=3D$(type -p valac-0.16)" fi - - # Fix vala automagic support, upstream bug #634171 - epatch "${FILESDIR}/${PN}-0.11.5-automagic-vala.patch" - - if [[ ${PV} !=3D 9999 ]]; then - mkdir -p m4 || die - eautoreconf - fi - - gnome2_src_prepare } =20 src_install() { diff --git a/gnome-base/dconf/files/dconf-0.11.5-automagic-vala.patch b/g= nome-base/dconf/files/dconf-0.11.5-automagic-vala.patch deleted file mode 100644 index cda55cb..0000000 --- a/gnome-base/dconf/files/dconf-0.11.5-automagic-vala.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 09f3a2a4b6d997b5fd9b42add27de465dd529d43 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Sun, 26 Feb 2012 18:15:50 -0500 -Subject: [PATCH] Make vala dependency non-automagic - ---- - configure.ac | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2e21d48..40cfe36 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,7 +13,15 @@ AM_SILENT_RULES([yes]) -=20 - # Check for programs - AC_PROG_CC --AM_PROG_VALAC([0.15.1]) -+ -+AC_ARG_ENABLE(vala, -+ AC_HELP_STRING([--disable-vala], -+ [Disable vala support])) -+AM_CONDITIONAL(ENABLE_VALA, test "x$enable_vala" !=3D "xno") -+ -+if test "x$enable_vala" !=3D "xno"; then -+ AM_PROG_VALAC([0.15.1]) -+fi -=20 - # Use GSettings - GLIB_GSETTINGS ---=20 -1.7.8.4 -