New version for GNOME 2.28.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 111 insertions, 3 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index ae253f33e81d..2ea7aab8fabb 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.219 2009/10/24 16:46:23 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.220 2009/10/29 22:24:45 eva Exp $
+
+*yelp-2.28.0 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org> yelp-2.24.0.ebuild,
+  +yelp-2.28.0.ebuild, +files/yelp-2.28.0-include-warning-fix.patch:
+  New version for GNOME 2.28.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> yelp-2.26.0.ebuild:
   ppc stable #281427
diff --git a/gnome-extra/yelp/files/yelp-2.28.0-include-warning-fix.patch b/gnome-extra/yelp/files/yelp-2.28.0-include-warning-fix.patch
new file mode 100644
index 000000000000..aa850968d4a3
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-2.28.0-include-warning-fix.patch
@@ -0,0 +1,29 @@
+bug 287132 -- gnome-extra/yelp-2.28.0 dies install_qa
+
+Has been committed upstream, won't be needed in 2.28.1
+https://bugzilla.gnome.org/show_bug.cgi?id=596903
+---
+From fb76b4e570cb144c5e06bd707a268615b69a9b34 Mon Sep 17 00:00:00 2001
+From: Xake <xake@rymdraket.net>
+Date: Wed, 30 Sep 2009 20:02:48 +0200
+Subject: [PATCH] Forgotten include, fix warning.
+
+---
+ tests/test-uri.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/tests/test-uri.c b/tests/test-uri.c
+index 73f44df..5715874 100644
+--- a/tests/test-uri.c
++++ b/tests/test-uri.c
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ 
+ #include <gio/gio.h>
++#include <gio/gunixoutputstream.h>
+ 
+ #include "yelp-uri.h"
+ 
+-- 
+1.6.5.rc1
+
diff --git a/gnome-extra/yelp/yelp-2.24.0.ebuild b/gnome-extra/yelp/yelp-2.24.0.ebuild
index 9a58fad2e1ba..0bdbd4aba813 100644
--- a/gnome-extra/yelp/yelp-2.24.0.ebuild
+++ b/gnome-extra/yelp/yelp-2.24.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.24.0.ebuild,v 1.5 2009/09/10 20:43:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.24.0.ebuild,v 1.6 2009/10/29 22:24:45 eva Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd"
+KEYWORDS="~mips ~x86-fbsd"
 IUSE="beagle lzma xulrunner"
 
 RDEPEND=">=gnome-base/gconf-2
diff --git a/gnome-extra/yelp/yelp-2.28.0.ebuild b/gnome-extra/yelp/yelp-2.28.0.ebuild
new file mode 100644
index 000000000000..93fd6ab70c73
--- /dev/null
+++ b/gnome-extra/yelp/yelp-2.28.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.28.0.ebuild,v 1.1 2009/10/29 22:24:45 eva Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86"
+IUSE="beagle lzma"
+
+RDEPEND=">=gnome-base/gconf-2
+	>=app-text/gnome-doc-utils-0.17.2
+	>=x11-libs/gtk+-2.10
+	>=dev-libs/glib-2.16
+	>=dev-libs/libxml2-2.6.5
+	>=dev-libs/libxslt-1.1.4
+	>=x11-libs/startup-notification-0.8
+	>=dev-libs/dbus-glib-0.71
+	beagle? ( || (
+		>=dev-libs/libbeagle-0.3.0
+		=app-misc/beagle-0.2* ) )
+	net-libs/xulrunner:1.9
+	sys-libs/zlib
+	app-arch/bzip2
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma-utils ) )
+	>=app-text/rarian-0.7
+	>=app-text/scrollkeeper-9999"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	gnome-base/gnome-common"
+# If eautoreconf:
+#	gnome-base/gnome-common
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--with-gecko=libxul-embedding
+		$(use_enable lzma)"
+
+	if use beagle; then
+		G2CONF="${G2CONF} --with-search=beagle"
+	else
+		G2CONF="${G2CONF} --with-search=basic"
+	fi
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix install_qa failure, bug #287132
+	# Won't be needed in 2.28.1
+	epatch "${FILESDIR}/${P}-include-warning-fix.patch"
+
+	# Fix automagic lzma support, bug #266128
+	epatch "${FILESDIR}/${PN}-2.26.0-automagic-lzma.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+
+	# strip stupid options in configure, see bug #196621
+	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure || die "sed	failed"
+}
\ No newline at end of file