[gentoo-commits] gentoo-x86 commit in gnome-extra/yelp: yelp-2.28.1-r2.ebuild ChangeLog

[Romain Perier (mrpouet)]

mrpouet     10/01/27 17:18:24

  Modified:             ChangeLog
  Added:                yelp-2.28.1-r2.ebuild
  Log:
  Fix issues introduced by xulrunner 1.9.2, per bug #301831
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.229                gnome-extra/yelp/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/yelp/ChangeLog?rev=1.229&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/yelp/ChangeLog?rev=1.229&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/yelp/ChangeLog?r1=1.228&r2=1.229

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- ChangeLog	14 Jan 2010 01:41:22 -0000	1.228
+++ ChangeLog	27 Jan 2010 17:18:23 -0000	1.229
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.228 2010/01/14 01:41:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.229 2010/01/27 17:18:23 mrpouet Exp $
+
+*yelp-2.28.1-r2 (27 Jan 2010)
+
+  27 Jan 2010; Romain Perier <mrpouet@g.o> +yelp-2.28.1-r2.ebuild,
+  +files/yelp-2.28.1-xul192-compat.patch:
+  Fix issues introduced by xulrunner 1.9.2, per bug #301831.
 
   14 Jan 2010; Jeroen Roovers <jer@g.o> yelp-2.26.0.ebuild:
   Stable for HPPA (bug #281427).



1.1                  gnome-extra/yelp/yelp-2.28.1-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/yelp/yelp-2.28.1-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/yelp/yelp-2.28.1-r2.ebuild?rev=1.1&content-type=text/plain

Index: yelp-2.28.1-r2.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.28.1-r2.ebuild,v 1.1 2010/01/27 17:18:23 mrpouet 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 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
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 automagic lzma support, bug #266128
	epatch "${FILESDIR}/${PN}-2.26.0-automagic-lzma.patch"

	# Fix build with xulrunner-1.9.2
	epatch "${FILESDIR}/${PN}-2.28.1-system-nspr.patch"

	# Fix issues introduced by xulrunner 1.9.2, bug 301831.
	epatch "${FILESDIR}/${P}-xul192-compat.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"
}