From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-503403-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id C229D138010
for <garchives@archives.gentoo.org>; Wed, 5 Sep 2012 15:50:35 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 353CB21C050;
Wed, 5 Sep 2012 15:49:03 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id E9D6821C047
for <gentoo-commits@lists.gentoo.org>; Wed, 5 Sep 2012 15:49:02 +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 5DEC533D7A3
for <gentoo-commits@lists.gentoo.org>; Wed, 5 Sep 2012 15:49:02 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id D1A5AE5447
for <gentoo-commits@lists.gentoo.org>; Wed, 5 Sep 2012 15:48:59 +0000 (UTC)
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" <nirbheek@gentoo.org>
Message-ID: <1346860102.060981ab0438120d29a3cfadb55109836e63bd5e.nirbheek@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/
X-VCS-Repository: proj/gnome
X-VCS-Files: gnome-base/gnome-desktop/gnome-desktop-3.5.90.ebuild gnome-base/gnome-desktop/gnome-desktop-3.5.91.ebuild gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
X-VCS-Directories: gnome-base/gnome-desktop/
X-VCS-Committer: nirbheek
X-VCS-Committer-Name: Nirbheek Chauhan
X-VCS-Revision: 060981ab0438120d29a3cfadb55109836e63bd5e
X-VCS-Branch: master
Date: Wed, 5 Sep 2012 15:48:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: aaee9044-4f15-4c70-ae95-a64f09b5b442
X-Archives-Hash: 5c119adeca38e8158c50b4e2d47a6b62
commit: 060981ab0438120d29a3cfadb55109836e63bd5e
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 4 22:45:31 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Sep 5 15:48:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=060981ab
gnome-base/gnome-desktop: 3.5.90 → 3.5.91
---
...p-3.5.90.ebuild => gnome-desktop-3.5.91.ebuild} | 7 ++++++-
gnome-base/gnome-desktop/gnome-desktop-9999.ebuild | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.5.90.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.5.91.ebuild
similarity index 94%
rename from gnome-base/gnome-desktop/gnome-desktop-3.5.90.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.5.91.ebuild
index 8af80b4..c97e502 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.5.90.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.5.91.ebuild
@@ -40,7 +40,6 @@ RDEPEND="
doc? ( !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] )
introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
DEPEND="${RDEPEND}
- app-text/yelp-tools
app-text/docbook-xml-dtd:4.1.2
>=dev-util/intltool-0.40.6
sys-devel/gettext
@@ -49,6 +48,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( >=dev-util/gtk-doc-1.4 )"
+if [[ ${PV} = 9999 ]]; then
+ DEPEND="${DEPEND}
+ app-text/yelp-tools"
+fi
+
# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
# eventually libXrandr shouldn't RDEPEND on randrproto)
@@ -63,6 +67,7 @@ pkg_setup() {
--with-gnome-distributor=Gentoo
$(use_enable doc desktop-docs)
$(use_enable introspection)"
+ [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
}
src_unpack() {
diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index 8af80b4..c97e502 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -40,7 +40,6 @@ RDEPEND="
doc? ( !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] )
introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
DEPEND="${RDEPEND}
- app-text/yelp-tools
app-text/docbook-xml-dtd:4.1.2
>=dev-util/intltool-0.40.6
sys-devel/gettext
@@ -49,6 +48,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( >=dev-util/gtk-doc-1.4 )"
+if [[ ${PV} = 9999 ]]; then
+ DEPEND="${DEPEND}
+ app-text/yelp-tools"
+fi
+
# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
# eventually libXrandr shouldn't RDEPEND on randrproto)
@@ -63,6 +67,7 @@ pkg_setup() {
--with-gnome-distributor=Gentoo
$(use_enable doc desktop-docs)
$(use_enable introspection)"
+ [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
}
src_unpack() {