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

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

commit:     7019f11a205427bdfe4a104b4ed7af8e25dfb9b3
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  6 16:59:39 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr  6 17:06:41 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7019f11a

gnome-extra/yelp: 3.10.2 → 3.12.0

---
 .../yelp/{yelp-9999.ebuild => yelp-3.12.0.ebuild}  | 32 +++++-----------------
 gnome-extra/yelp/yelp-9999.ebuild                  |  6 ++--
 2 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/gnome-extra/yelp/yelp-9999.ebuild b/gnome-extra/yelp/yelp-3.12.0.ebuild
similarity index 59%
copy from gnome-extra/yelp/yelp-9999.ebuild
copy to gnome-extra/yelp/yelp-3.12.0.ebuild
index 1c86823..f23f6f1 100644
--- a/gnome-extra/yelp/yelp-9999.ebuild
+++ b/gnome-extra/yelp/yelp-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,21 +6,14 @@ EAPI="5"
 GCONF_DEBUG="yes"
 
 inherit autotools eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://projects.gnome.org/yelp/ https://live.gnome.org/Yelp"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
 
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	app-arch/bzip2:=
@@ -29,9 +22,9 @@ RDEPEND="
 	>=dev-libs/glib-2.25.11:2
 	>=dev-libs/libxml2-2.6.5:2
 	>=dev-libs/libxslt-1.1.4
-	>=gnome-extra/yelp-xsl-${PV}
+	>=gnome-extra/yelp-xsl-3.6.1
 	>=net-libs/webkit-gtk-1.3.10:3
-	>=x11-libs/gtk+-2.91.8:3
+	>=x11-libs/gtk+-3.8:3
 	x11-themes/gnome-icon-theme-symbolic
 "
 DEPEND="${RDEPEND}
@@ -44,29 +37,18 @@ DEPEND="${RDEPEND}
 # If eautoreconf:
 #	gnome-base/gnome-common
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools
-		dev-util/itstool
-		gnome-base/gnome-common"
-fi
-
 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"
-
-	[[ ${PV} != 9999 ]] && eautoreconf
-
+	eautoreconf
 	gnome2_src_prepare
 }
 
 src_configure() {
-	local myconf=""
-	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
 	gnome2_src_configure \
 		--disable-static \
 		--enable-bz2 \
 		--enable-lzma \
-		${myconf}
+		ITSTOOL=$(type -P true)
 }

diff --git a/gnome-extra/yelp/yelp-9999.ebuild b/gnome-extra/yelp/yelp-9999.ebuild
index 1c86823..04ee7fe 100644
--- a/gnome-extra/yelp/yelp-9999.ebuild
+++ b/gnome-extra/yelp/yelp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://projects.gnome.org/yelp/ https://live.gnome.org/Yelp"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-libs/libxslt-1.1.4
 	>=gnome-extra/yelp-xsl-${PV}
 	>=net-libs/webkit-gtk-1.3.10:3
-	>=x11-libs/gtk+-2.91.8:3
+	>=x11-libs/gtk+-3.8:3
 	x11-themes/gnome-icon-theme-symbolic
 "
 DEPEND="${RDEPEND}