From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/
Date: Wed, 5 Sep 2012 15:48:59 +0000 (UTC) [thread overview]
Message-ID: <1346860102.060981ab0438120d29a3cfadb55109836e63bd5e.nirbheek@gentoo> (raw)
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() {
next reply other threads:[~2012-09-05 15:50 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-05 15:48 Nirbheek Chauhan [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-09-10 21:33 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/ Gilles Dartiguelongue
2018-02-09 15:55 Sobhan Mohammadpour
2018-01-12 12:43 Dennis Lamm
2016-03-25 0:56 Ole Reifschneider
2015-10-02 12:50 Ole Reifschneider
2015-05-12 19:31 Gilles Dartiguelongue
2015-05-10 22:29 Gilles Dartiguelongue
2015-04-29 19:00 Ole Reifschneider
2014-12-22 23:11 Gilles Dartiguelongue
2014-11-23 19:37 Gilles Dartiguelongue
2014-10-26 17:25 Gilles Dartiguelongue
2014-10-15 22:26 Gilles Dartiguelongue
2014-10-11 16:43 Gilles Dartiguelongue
2014-04-22 21:38 Gilles Dartiguelongue
2014-04-15 22:05 Gilles Dartiguelongue
2014-02-12 20:58 Gilles Dartiguelongue
2013-12-08 22:59 Gilles Dartiguelongue
2012-12-19 8:38 Alexandre Rostovtsev
2012-12-08 17:34 Alexandre Rostovtsev
2012-10-27 19:40 Gilles Dartiguelongue
2012-09-30 0:15 Alexandre Rostovtsev
2012-09-02 18:59 Nirbheek Chauhan
2012-08-18 12:09 Priit Laes
2012-05-24 7:49 Alexandre Restovtsev
2012-04-06 9:03 Alexandre Restovtsev
2012-03-26 8:20 Nirbheek Chauhan
2011-06-28 3:44 Alexandre Restovtsev
2011-06-24 17:31 Alexandre Restovtsev
2011-04-27 22:22 Gilles Dartiguelongue
2011-04-05 14:50 Gilles Dartiguelongue
2011-04-05 0:57 Nirbheek Chauhan
2011-03-25 4:56 Nirbheek Chauhan
2011-03-23 5:20 Nirbheek Chauhan
2011-03-09 11:34 Nirbheek Chauhan
2011-02-22 0:31 Nirbheek Chauhan
2011-02-07 18:55 Nirbheek Chauhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346860102.060981ab0438120d29a3cfadb55109836e63bd5e.nirbheek@gentoo \
--to=nirbheek@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox