summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2008-02-03 19:16:08 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2008-02-03 19:16:08 +0000
commitfb946c35776d4cb45ae0f521684a611d400436cc (patch)
treed0aa5bbc66afd343d6152f30b9d97bbc386d5ad0 /gnome-extra
parentMarking cadaver-0.22.5 ppc64 for bug 208697 (diff)
downloadgentoo-2-fb946c35776d4cb45ae0f521684a611d400436cc.tar.gz
gentoo-2-fb946c35776d4cb45ae0f521684a611d400436cc.tar.bz2
gentoo-2-fb946c35776d4cb45ae0f521684a611d400436cc.zip
* fix bug #196621 and autodetection of beagle support
(Portage version: 2.1.4.1)
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/yelp/ChangeLog7
-rw-r--r--gnome-extra/yelp/yelp-2.20.0.ebuild17
2 files changed, 20 insertions, 4 deletions
diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index ffa114ffb509..61f20f5778ff 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for gnome-extra/yelp
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.176 2007/11/29 06:17:18 jer Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.177 2008/02/03 19:16:08 eva Exp $
+
+ 03 Feb 2008; Gilles Dartiguelongue <eva@gentoo.org> yelp-2.20.0.ebuild:
+ fix bug #196621 and autodetection of beagle support
29 Nov 2007; Jeroen Roovers <jer@gentoo.org> yelp-2.20.0.ebuild:
Stable for HPPA (bug #199740).
diff --git a/gnome-extra/yelp/yelp-2.20.0.ebuild b/gnome-extra/yelp/yelp-2.20.0.ebuild
index 1501437141cd..5d541a766603 100644
--- a/gnome-extra/yelp/yelp-2.20.0.ebuild
+++ b/gnome-extra/yelp/yelp-2.20.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.20.0.ebuild,v 1.14 2007/11/29 06:17:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.20.0.ebuild,v 1.15 2008/02/03 19:16:08 eva Exp $
inherit gnome2
@@ -39,9 +39,22 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS ChangeLog NEWS README TODO"
+src_unpack() {
+ gnome2_src_unpack
+
+ # strip stupid options in configure, see bug #196621
+ sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure
+}
+
pkg_setup() {
G2CONF="${G2CONF} --enable-man --enable-info"
+ if use beagle; then
+ G2CONF="${G2CONF} --with-search=beagle"
+ else
+ G2CONF="${G2CONF} --with-search=basic"
+ fi
+
if use xulrunner; then
G2CONF="${G2CONF} --with-gecko=xulrunner"
else