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 0DC3B1381F3 for ; Wed, 19 Dec 2012 08:39:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55304E06B4; Wed, 19 Dec 2012 08:38:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8AEC2E06B4 for ; Wed, 19 Dec 2012 08:38:27 +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 6915133DBBD for ; Wed, 19 Dec 2012 08:38:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4D2DDE5450 for ; Wed, 19 Dec 2012 08:38:23 +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: <1355905936.4a124863bc9d22fb2f25aa00b25a82b59ede253d.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gsettings-desktop-schemas/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.6.1.ebuild gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild gnome-base/gsettings-desktop-schemas/metadata.xml X-VCS-Directories: gnome-base/gsettings-desktop-schemas/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: 4a124863bc9d22fb2f25aa00b25a82b59ede253d X-VCS-Branch: master Date: Wed, 19 Dec 2012 08:38:23 +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: 87ec4d7a-9dd2-4b37-9627-84802be31537 X-Archives-Hash: 3c1f9fc22b3ae5ef18b41fc234d417bc commit: 4a124863bc9d22fb2f25aa00b25a82b59ede253d Author: Alexandre Rostovtsev gentoo org> AuthorDate: Wed Dec 19 08:32:16 2012 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Wed Dec 19 08:32:16 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4a124863 gnome-base/gsettings-desktop-schemas: moved to gx86 Sync live with gx86 --- .../gsettings-desktop-schemas-3.6.1.ebuild | 36 -------------------- .../gsettings-desktop-schemas-9999.ebuild | 7 ++-- gnome-base/gsettings-desktop-schemas/metadata.xml | 4 -- 3 files changed, 4 insertions(+), 43 deletions(-) diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.6.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.6.1.ebuild deleted file mode 100644 index 77d655a..0000000 --- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.6.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="no" - -inherit gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION="Collection of GSettings schemas for GNOME desktop" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="+introspection" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -fi - -RDEPEND=">=dev-libs/glib-2.31:2 - introspection? ( >=dev-libs/gobject-introspection-1.31.0 )" -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/intltool-0.40 - virtual/pkgconfig" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_enable introspection)" - DOCS="AUTHORS HACKING NEWS README" -} diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild index 77d655a..44c56a2 100644 --- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild +++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="4" +EAPI="5" GCONF_DEBUG="no" inherit gnome2 @@ -19,7 +19,7 @@ IUSE="+introspection" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" fi RDEPEND=">=dev-libs/glib-2.31:2 @@ -29,8 +29,9 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.40 virtual/pkgconfig" -pkg_setup() { +src_configure() { G2CONF="${G2CONF} $(use_enable introspection)" DOCS="AUTHORS HACKING NEWS README" + gnome2_src_configure } diff --git a/gnome-base/gsettings-desktop-schemas/metadata.xml b/gnome-base/gsettings-desktop-schemas/metadata.xml index afc72e7..6e0e2ec 100644 --- a/gnome-base/gsettings-desktop-schemas/metadata.xml +++ b/gnome-base/gsettings-desktop-schemas/metadata.xml @@ -2,8 +2,4 @@ gnome - - Use dev-libs/gobject-introspection - for introspection -