fix Makefile.am to include nspr. otherwise will fail to find prtypes.h when firefox is not in use flags. fixes #126841, thanks to seemant for testing.

(Portage version: 2.1_pre6-r4)

4 files changed, 38 insertions, 9 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index d510dc986a72..8a56c3a02d38 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.108 2006/03/14 20:24:11 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.109 2006/03/20 14:51:40 allanonjl Exp $
+
+  20 Mar 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +files/yelp-2.14.0-mozilla-include-fix.patch, yelp-2.14.0.ebuild:
+  fix Makefile.am to include nspr. otherwise will fail to find prtypes.h when
+  firefox is not in use flags. fixes #126841, thanks to seemant for testing.
 
 *yelp-2.14.0 (14 Mar 2006)
 
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 48a077c7b839..50ba83b5dfd5 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,6 +1,6 @@
-MD5 06bedd3f1c78cb3fa883dd8de64e3bfc ChangeLog 11347
-RMD160 afb7f6ca2ff3d71c63307d252fe7b212dda91177 ChangeLog 11347
-SHA256 a3ab846fbfb2c81fb4e5458848ffb39582b44923debaf49ac5513fac40fbd778 ChangeLog 11347
+MD5 b31e6814b1bffcb451f22607ef35d050 ChangeLog 11627
+RMD160 bcc7d374ad162f60d8e87ad5e4f90ad65bb167b9 ChangeLog 11627
+SHA256 c07716a392cd70842e21e37d11e13e34d309cefc845c6f4f92b42762fd28fe5f ChangeLog 11627
 MD5 c4833a2e4e1d587c717ca61ce83cc55b files/digest-yelp-2.10.0 64
 RMD160 f77ffaff1ce6afc821f6b7721cdc0c1ee1db6a5f files/digest-yelp-2.10.0 64
 SHA256 411584d0ebf1268dcd1ec3746bcff7621a96c3d8ea2cbab00e62dbb910f47078 files/digest-yelp-2.10.0 64
@@ -16,6 +16,9 @@ SHA256 07391a0f92d93c6ce3c2e92d7520dfca448f2eb6495c15c42416659a436a839c files/di
 MD5 0cf1e0f8c2d2235fc75a784741638f77 files/digest-yelp-2.6.5 63
 RMD160 d43a06780cf0ecfd8c473f6781875db4619e9fcc files/digest-yelp-2.6.5 63
 SHA256 3405c3ae08a54b40a8f3f9f7aec66de05b2ee95a731eb4d8712530567cf6ac16 files/digest-yelp-2.6.5 63
+MD5 d3dd0a00ede7b453249075c979ddc6cc files/yelp-2.14.0-mozilla-include-fix.patch 276
+RMD160 24d8144d6655617da708b7048536582bad257795 files/yelp-2.14.0-mozilla-include-fix.patch 276
+SHA256 d8d44922f7710eeb7f80d57c68187fc138c318473f3c24455e53b9b2f2114356 files/yelp-2.14.0-mozilla-include-fix.patch 276
 MD5 d13c2fbe43ee623230084d6f7bd6ec25 files/yelp-2.6.4-makedepfix.patch 948
 RMD160 542dd07b408f8075168e69b99d5818996cdde1b8 files/yelp-2.6.4-makedepfix.patch 948
 SHA256 47e7193f55b1c5c8094199554de39a427a17ab767764c5b9ffd7f24674b184f9 files/yelp-2.6.4-makedepfix.patch 948
@@ -31,9 +34,9 @@ SHA256 2b1e0d901d71d805776a812a90655cf084b6a0db89a0b0f1e9c451c55f7da43e yelp-2.1
 MD5 0d91584cfc26ac9d980fb1cfdfad0349 yelp-2.12.2.ebuild 1279
 RMD160 65b05300e801cb51522181e10e29f77a13c14dd2 yelp-2.12.2.ebuild 1279
 SHA256 9a2959d6009f126a55057a949d195c7552444f742eba47ef88ce7375a92d5089 yelp-2.12.2.ebuild 1279
-MD5 1088cd6ed1aa7d425c02166817d82002 yelp-2.14.0.ebuild 1301
-RMD160 1a65bdd3616b95e6fb246fe15ed1ef28f3c55b3d yelp-2.14.0.ebuild 1301
-SHA256 85f4d859504c06aca1523799f1ad905f8d1d54d9dec1fe796a1bb2ae7ec3f9c0 yelp-2.14.0.ebuild 1301
+MD5 ab749175c606453d659697f942d712b4 yelp-2.14.0.ebuild 1441
+RMD160 700e2339961d9a00c46aafc4b881bb14a3695ef5 yelp-2.14.0.ebuild 1441
+SHA256 0d2ee517ae12d4a9f572e2346c61436cb2cfc6465fa4c0c4f43f99b92bee7a03 yelp-2.14.0.ebuild 1441
 MD5 3bcd3d6aaeffc6b43c1c04057f031df6 yelp-2.6.5.ebuild 949
 RMD160 07622e6527ca83026c8ff39688009b405ed4faa3 yelp-2.6.5.ebuild 949
 SHA256 43909bc49919a3e89aed3e5e9f73c3bd12fe0cd453723d71d147ce1537227e3a yelp-2.6.5.ebuild 949
diff --git a/gnome-extra/yelp/files/yelp-2.14.0-mozilla-include-fix.patch b/gnome-extra/yelp/files/yelp-2.14.0-mozilla-include-fix.patch
new file mode 100644
index 000000000000..ab846bed6e6e
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-2.14.0-mozilla-include-fix.patch
@@ -0,0 +1,12 @@
+--- yelp-2.14.0/src/Makefile.am	2006-01-19 14:01:20.000000000 -0500
++++ yelp-2.14.0.new/src/Makefile.am	2006-03-20 09:33:06.000000000 -0500
+@@ -68,7 +68,8 @@
+ 	uriloader	\
+ 	content		\
+ 	gfx		\
+-	necko
++	necko		\
++	nspr
+ 
+ yelp_CPPFLAGS =									\
+ 	-I$(top_srcdir)								\
diff --git a/gnome-extra/yelp/yelp-2.14.0.ebuild b/gnome-extra/yelp/yelp-2.14.0.ebuild
index 48441fb0d3da..99c248ecc775 100644
--- a/gnome-extra/yelp/yelp-2.14.0.ebuild
+++ b/gnome-extra/yelp/yelp-2.14.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.14.0.ebuild,v 1.1 2006/03/14 20:24:11 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.14.0.ebuild,v 1.2 2006/03/20 14:51:40 allanonjl Exp $
 
-inherit eutils gnome2
+inherit eutils gnome2 autotools
 
 DESCRIPTION="Help browser for GNOME"
 HOMEPAGE="http://www.gnome.org/"
@@ -50,3 +50,12 @@ pkg_setup() {
 		G2CONF="${G2CONF} --with-mozilla=mozilla"
 	fi
 }
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch ${FILESDIR}/${PN}-2.14.0-mozilla-include-fix.patch
+
+	AT_M4DIR="m4 ." \
+	eautoreconf
+}