[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-panel/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     2bdbcf6b858cb093c394bc8eb1372edfdc3e7624
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  7 02:20:34 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Sep  8 08:42:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2bdbcf6b

gnome-base/gnome-panel: 3.5.4 → 3.5.91

---
 ...anel-3.5.4.ebuild => gnome-panel-3.5.91.ebuild} |    7 ++++++-
 gnome-base/gnome-panel/gnome-panel-9999.ebuild     |    7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnome-base/gnome-panel/gnome-panel-3.5.4.ebuild b/gnome-base/gnome-panel/gnome-panel-3.5.91.ebuild
similarity index 94%
rename from gnome-base/gnome-panel/gnome-panel-3.5.4.ebuild
rename to gnome-base/gnome-panel/gnome-panel-3.5.91.ebuild
index f8e8d55..6982aa0 100644
--- a/gnome-base/gnome-panel/gnome-panel-3.5.4.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-3.5.91.ebuild
@@ -50,7 +50,6 @@ RDEPEND=">=dev-libs/glib-2.31.14:2
 	networkmanager? ( >=net-misc/networkmanager-0.6.7 )"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-lang/perl-5
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
@@ -59,6 +58,11 @@ DEPEND="${RDEPEND}
 #	gnome-base/gnome-common
 #	dev-util/gtk-doc-am
 
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/yelp-tools"
+fi
+
 pkg_setup() {
 	# XXX: Make presence/telepathy-glib support optional?
 	#      We can do that if we intend to support fallback-only as a setup
@@ -73,6 +77,7 @@ pkg_setup() {
 		$(use_enable networkmanager network-manager)
 		$(use_enable introspection)
 		$(use_enable eds)"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 }
 

diff --git a/gnome-base/gnome-panel/gnome-panel-9999.ebuild b/gnome-base/gnome-panel/gnome-panel-9999.ebuild
index f8e8d55..6982aa0 100644
--- a/gnome-base/gnome-panel/gnome-panel-9999.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-9999.ebuild
@@ -50,7 +50,6 @@ RDEPEND=">=dev-libs/glib-2.31.14:2
 	networkmanager? ( >=net-misc/networkmanager-0.6.7 )"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-lang/perl-5
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
@@ -59,6 +58,11 @@ DEPEND="${RDEPEND}
 #	gnome-base/gnome-common
 #	dev-util/gtk-doc-am
 
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/yelp-tools"
+fi
+
 pkg_setup() {
 	# XXX: Make presence/telepathy-glib support optional?
 	#      We can do that if we intend to support fallback-only as a setup
@@ -73,6 +77,7 @@ pkg_setup() {
 		$(use_enable networkmanager network-manager)
 		$(use_enable introspection)
 		$(use_enable eds)"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 }