[gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     dcef6d97f6c96a3ae40d83f90e09e1ad6495eac5
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 23:02:17 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 23:02:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dcef6d97

gnome-extra/yelp: 3.5.92 → 3.6.1

---
 .../yelp/{yelp-9999.ebuild => yelp-3.6.1.ebuild}   |    6 ++----
 gnome-extra/yelp/yelp-9999.ebuild                  |    6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/gnome-extra/yelp/yelp-9999.ebuild b/gnome-extra/yelp/yelp-3.6.1.ebuild
similarity index 97%
copy from gnome-extra/yelp/yelp-9999.ebuild
copy to gnome-extra/yelp/yelp-3.6.1.ebuild
index b46642f..98bb032 100644
--- a/gnome-extra/yelp/yelp-9999.ebuild
+++ b/gnome-extra/yelp/yelp-3.6.1.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
 	x11-themes/gnome-icon-theme-symbolic"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.41.0
-	dev-util/itstool
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	gnome-base/gnome-common
@@ -50,10 +49,11 @@ DEPEND="${RDEPEND}
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
 		app-text/yelp-tools
+		dev-util/itstool
 		gnome-base/gnome-common"
 fi
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 	G2CONF="${G2CONF}
 		--disable-static
@@ -61,9 +61,7 @@ pkg_setup() {
 		--enable-bz2
 		--enable-lzma"
 	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-}
 
-src_prepare() {
 	# Fix compatibility with Gentoo's sys-apps/man
 	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
 	epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch"

diff --git a/gnome-extra/yelp/yelp-9999.ebuild b/gnome-extra/yelp/yelp-9999.ebuild
index b46642f..98bb032 100644
--- a/gnome-extra/yelp/yelp-9999.ebuild
+++ b/gnome-extra/yelp/yelp-9999.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
 	x11-themes/gnome-icon-theme-symbolic"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.41.0
-	dev-util/itstool
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	gnome-base/gnome-common
@@ -50,10 +49,11 @@ DEPEND="${RDEPEND}
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
 		app-text/yelp-tools
+		dev-util/itstool
 		gnome-base/gnome-common"
 fi
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 	G2CONF="${G2CONF}
 		--disable-static
@@ -61,9 +61,7 @@ pkg_setup() {
 		--enable-bz2
 		--enable-lzma"
 	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-}
 
-src_prepare() {
 	# Fix compatibility with Gentoo's sys-apps/man
 	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
 	epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch"