[gentoo-commits] gentoo-x86 commit in gnome-extra/yelp: ChangeLog yelp-2.22.1-r1.ebuild yelp-2.22.0.ebuild

[gentoo-commits] gentoo-x86 commit in gnome-extra/yelp: ChangeLog yelp-2.22.1-r1.ebuild yelp-2.22.0.ebuild

[Gilles Dartiguelongue (eva)]

eva         08/04/21 21:53:49

  Modified:             ChangeLog
  Added:                yelp-2.22.1-r1.ebuild
  Removed:              yelp-2.22.0.ebuild
  Log:
  apply patch to allow compilation against libbeagle, bug #215026
  (Portage version: 2.1.5_rc5)

Revision  Changes    Path
1.181                gnome-extra/yelp/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- ChangeLog	10 Apr 2008 23:02:11 -0000	1.180
+++ ChangeLog	21 Apr 2008 21:53:48 -0000	1.181
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.180 2008/04/10 23:02:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.181 2008/04/21 21:53:48 eva Exp $
+
+*yelp-2.22.1-r1 (21 Apr 2008)
+
+  21 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/yelp-2.22-with-beagle-0.3.patch, -yelp-2.22.0.ebuild,
+  +yelp-2.22.1-r1.ebuild:
+  apply patch to allow compilation against libbeagle, bug #215026
 
 *yelp-2.22.1 (10 Apr 2008)
 



1.1                  gnome-extra/yelp/yelp-2.22.1-r1.ebuild

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

Index: yelp-2.22.1-r1.ebuild
===================================================================
# 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.22.1-r1.ebuild,v 1.1 2008/04/21 21:53:48 eva Exp $

inherit eutils autotools gnome2

DESCRIPTION="Help browser for GNOME"
HOMEPAGE="http://www.gnome.org/"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="beagle lzma xulrunner"

RDEPEND=">=gnome-base/gconf-2
	>=app-text/gnome-doc-utils-0.11.1
	>=x11-libs/gtk+-2.10
	>=gnome-base/gnome-vfs-2
	>=gnome-base/libglade-2
	>=gnome-base/libgnome-2.14
	>=gnome-base/libgnomeui-2.14
	>=dev-libs/libxml2-2.6.5
	>=dev-libs/libxslt-1.1.4
	>=x11-libs/startup-notification-0.8
	>=dev-libs/glib-2
	>=dev-libs/dbus-glib-0.71
	beagle? ( || ( >=dev-libs/libbeagle-0.3.0 =app-misc/beagle-0.2* ) )
	!xulrunner? ( =www-client/mozilla-firefox-2* )
	xulrunner? ( =net-libs/xulrunner-1.8* )
	sys-libs/zlib
	app-arch/bzip2
	lzma? ( 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"

DOCS="AUTHORS ChangeLog NEWS README TODO"

src_unpack() {
	gnome2_src_unpack

	# patch to work with >=libbeagle-0.3, bug #215026
	epatch "${FILESDIR}"/yelp-2.22-with-beagle-0.3.patch

	AT_M4DIR="${AT_M4DIR} m4" eautoreconf

	# strip stupid options in configure, see bug #196621
	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure
}

pkg_setup() {
	# FIXME: Add patch to make lzma-utils not automagic and use_enable here
	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
		G2CONF="${G2CONF} --with-gecko=firefox"
	fi
}



-- 
gentoo-commits@lists.gentoo.org mailing list