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 F0402138010 for ; Sun, 28 Oct 2012 18:10:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6C4321C034; Sun, 28 Oct 2012 18:10:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BC18F21C05B for ; Sun, 28 Oct 2012 18:10:07 +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 BD2BB33D956 for ; Sun, 28 Oct 2012 18:10:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id F400CE5447 for ; Sun, 28 Oct 2012 18:10:03 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1351447676.3e071a1f7359e833776e8386e15d93359d93e429.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/libgweather/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-libs/libgweather/libgweather-3.5.92.ebuild dev-libs/libgweather/libgweather-3.6.1.ebuild dev-libs/libgweather/libgweather-9999.ebuild X-VCS-Directories: dev-libs/libgweather/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 3e071a1f7359e833776e8386e15d93359d93e429 X-VCS-Branch: master Date: Sun, 28 Oct 2012 18:10:03 +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: e6b15eda-ace8-4d53-a4c2-f6d1055c525c X-Archives-Hash: 70ec3aa9a50588aa5710ea8f8e6e2262 commit: 3e071a1f7359e833776e8386e15d93359d93e429 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Oct 28 17:48:19 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Oct 28 18:07:56 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3e071a1f dev-libs/libgweather: 3.5.92 → 3.6.1 --- ...ther-3.5.92.ebuild => libgweather-3.6.1.ebuild} | 23 +++++++++++++------ dev-libs/libgweather/libgweather-9999.ebuild | 23 +++++++++++++------ 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/dev-libs/libgweather/libgweather-3.5.92.ebuild b/dev-libs/libgweather/libgweather-3.6.1.ebuild similarity index 80% rename from dev-libs/libgweather/libgweather-3.5.92.ebuild rename to dev-libs/libgweather/libgweather-3.6.1.ebuild index d739a4a..1af5ed3 100644 --- a/dev-libs/libgweather/libgweather-3.5.92.ebuild +++ b/dev-libs/libgweather/libgweather-3.6.1.ebuild @@ -16,8 +16,9 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2" SLOT="2" -IUSE="+introspection doc" +IUSE="+introspection" if [[ ${PV} = 9999 ]]; then + IUSE="${IUSE} doc" KEYWORDS="" else KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" @@ -31,21 +32,29 @@ COMMON_DEPEND=">=x11-libs/gtk+-2.90.0:3[introspection?] >=dev-libs/libxml2-2.6.0 >=sys-libs/timezone-data-2010k - introspection? ( >=dev-libs/gobject-introspection-0.9.5 )" + introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) +" +RDEPEND="${COMMON_DEPEND} + !=dev-util/gtk-doc-am-1.11 +" + +if [[ ${PV} = 9999 ]]; then + DEPEND="${DEPEND} + doc? ( >=dev-util/gtk-doc-1.9 )" +fi -pkg_setup() { +src_configure() { DOCS="AUTHORS ChangeLog MAINTAINERS NEWS" # Do not add --disable-all-translations-in-one-xml : it will enable them G2CONF="${G2CONF} --enable-locations-compression --disable-static $(use_enable introspection)" + gnome2_src_configure } diff --git a/dev-libs/libgweather/libgweather-9999.ebuild b/dev-libs/libgweather/libgweather-9999.ebuild index d739a4a..1af5ed3 100644 --- a/dev-libs/libgweather/libgweather-9999.ebuild +++ b/dev-libs/libgweather/libgweather-9999.ebuild @@ -16,8 +16,9 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2" SLOT="2" -IUSE="+introspection doc" +IUSE="+introspection" if [[ ${PV} = 9999 ]]; then + IUSE="${IUSE} doc" KEYWORDS="" else KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" @@ -31,21 +32,29 @@ COMMON_DEPEND=">=x11-libs/gtk+-2.90.0:3[introspection?] >=dev-libs/libxml2-2.6.0 >=sys-libs/timezone-data-2010k - introspection? ( >=dev-libs/gobject-introspection-0.9.5 )" + introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) +" +RDEPEND="${COMMON_DEPEND} + !=dev-util/gtk-doc-am-1.11 +" + +if [[ ${PV} = 9999 ]]; then + DEPEND="${DEPEND} + doc? ( >=dev-util/gtk-doc-1.9 )" +fi -pkg_setup() { +src_configure() { DOCS="AUTHORS ChangeLog MAINTAINERS NEWS" # Do not add --disable-all-translations-in-one-xml : it will enable them G2CONF="${G2CONF} --enable-locations-compression --disable-static $(use_enable introspection)" + gnome2_src_configure }