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

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

commit:     35cadda382bdf7396cdc88b0b029e9aaec0980df
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 16:30:54 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 16:33:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=35cadda3

gnome-extra/yelp: 3.8.1 → 3.10.0

---
 .../yelp/{yelp-9999.ebuild => yelp-3.10.0.ebuild}  | 50 ++++++++--------------
 gnome-extra/yelp/yelp-9999.ebuild                  | 32 ++++++++------
 2 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/gnome-extra/yelp/yelp-9999.ebuild b/gnome-extra/yelp/yelp-3.10.0.ebuild
similarity index 51%
copy from gnome-extra/yelp/yelp-9999.ebuild
copy to gnome-extra/yelp/yelp-3.10.0.ebuild
index 2b5177b..49846df 100644
--- a/gnome-extra/yelp/yelp-9999.ebuild
+++ b/gnome-extra/yelp/yelp-3.10.0.ebuild
@@ -1,27 +1,19 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="http://projects.gnome.org/yelp/ https://live.gnome.org/Yelp"
 
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~mips ~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:=
@@ -30,39 +22,33 @@ 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}
-	>=net-libs/webkit-gtk-1.3.2:3
+	>=gnome-extra/yelp-xsl-3.6.1
+	>=net-libs/webkit-gtk-1.3.10:3
 	>=x11-libs/gtk+-2.91.8:3
-	x11-themes/gnome-icon-theme-symbolic"
+	x11-themes/gnome-icon-theme-symbolic
+"
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.13
 	>=dev-util/intltool-0.41.0
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	gnome-base/gnome-common"
+	gnome-base/gnome-common
+"
 # 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() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		--enable-bz2
-		--enable-lzma"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-
 	# 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() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-bz2 \
+		--enable-lzma \
+		ITSTOOL=$(type -P true)
+}

diff --git a/gnome-extra/yelp/yelp-9999.ebuild b/gnome-extra/yelp/yelp-9999.ebuild
index 2b5177b..1c86823 100644
--- a/gnome-extra/yelp/yelp-9999.ebuild
+++ b/gnome-extra/yelp/yelp-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
 if [[ ${PV} = 9999 ]]; then
@@ -12,7 +11,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="http://projects.gnome.org/yelp/ https://live.gnome.org/Yelp"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -20,7 +19,7 @@ IUSE=""
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~mips ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
 
 RDEPEND="
@@ -31,15 +30,17 @@ RDEPEND="
 	>=dev-libs/libxml2-2.6.5:2
 	>=dev-libs/libxslt-1.1.4
 	>=gnome-extra/yelp-xsl-${PV}
-	>=net-libs/webkit-gtk-1.3.2:3
+	>=net-libs/webkit-gtk-1.3.10:3
 	>=x11-libs/gtk+-2.91.8:3
-	x11-themes/gnome-icon-theme-symbolic"
+	x11-themes/gnome-icon-theme-symbolic
+"
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.13
 	>=dev-util/intltool-0.41.0
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	gnome-base/gnome-common"
+	gnome-base/gnome-common
+"
 # If eautoreconf:
 #	gnome-base/gnome-common
 
@@ -51,13 +52,6 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		--enable-bz2
-		--enable-lzma"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-
 	# 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"
@@ -66,3 +60,13 @@ src_prepare() {
 
 	gnome2_src_prepare
 }
+
+src_configure() {
+	local myconf=""
+	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
+	gnome2_src_configure \
+		--disable-static \
+		--enable-bz2 \
+		--enable-lzma \
+		${myconf}
+}