add patch to fix test in configure and fix include. fixes #139021

Package-Manager: portage-2.1.1_pre2-r2

4 files changed, 50 insertions, 12 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 6dd2efc92997..59dce52a845d 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/epiphany
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.72 2006/07/02 19:28:10 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.73 2006/07/03 19:48:13 allanonjl Exp $
+
+  03 Jul 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +files/epiphany-1.8.4.1-seamonkey.patch, epiphany-1.8.4.1-r1.ebuild:
+  add patch to fix test in configure and fix include.  fixes #139021
 
 *epiphany-2.14.2.1-r1 (02 Jul 2006)
 *epiphany-1.8.4.1-r1 (02 Jul 2006)
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 8e1cf63586f4..1c5518dfabb1 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,13 +1,17 @@
+AUX epiphany-1.8.4.1-seamonkey.patch 789 RMD160 92244e522a5b2405add24009b5d900b411f3cc0e SHA1 5ba131f070c531952943116ba618219e3799f374 SHA256 17bd7ad4738591a68fc86662b09fcf526a7130ee2a57efda08381246f9b896d8
+MD5 3569cd36dc553140ba6fee476aa26fde files/epiphany-1.8.4.1-seamonkey.patch 789
+RMD160 92244e522a5b2405add24009b5d900b411f3cc0e files/epiphany-1.8.4.1-seamonkey.patch 789
+SHA256 17bd7ad4738591a68fc86662b09fcf526a7130ee2a57efda08381246f9b896d8 files/epiphany-1.8.4.1-seamonkey.patch 789
 AUX epiphany-1.9.2-broken-firefox.patch 563 RMD160 ae6d867b1168ef98b2c50bcc2002f5fb088da7c8 SHA1 1628d707e8aff03dd3992f9db30e2189ff7e2197 SHA256 7012e6b2dcc15eea073be4e082f79ad549840216f315f339271539b9c469775e
 MD5 9bff9c987534a9f2cbefa291a28affe7 files/epiphany-1.9.2-broken-firefox.patch 563
 RMD160 ae6d867b1168ef98b2c50bcc2002f5fb088da7c8 files/epiphany-1.9.2-broken-firefox.patch 563
 SHA256 7012e6b2dcc15eea073be4e082f79ad549840216f315f339271539b9c469775e files/epiphany-1.9.2-broken-firefox.patch 563
 DIST epiphany-1.8.4.1.tar.bz2 3360178 RMD160 de5e4f6bfed1269300145c015fea34b03238a771 SHA1 1651f328351469fbdcdd9aaa3ba7ab6c58016274 SHA256 ccdcfddbd0dfaa5eeca57e868c3b77c90369bb1126eaa0175efeee823e67f112
 DIST epiphany-2.14.2.1.tar.bz2 3599395 RMD160 c25bc2d22fee0eeaa32ce1e1f71b6d5f3de06cbb SHA1 c1b20979670755f2e82beedb475c42a54be8f993 SHA256 f5cc3aa382fb9b0eec4117dcbfb5a7744943602d1a76bf260c7e5c66741ee6d0
-EBUILD epiphany-1.8.4.1-r1.ebuild 1965 RMD160 c470a891ccd61955e694e22f2d8b94b550ea1395 SHA1 7c140fbdf1655e5746a8e1a928aa7fd409baaedc SHA256 c9c5b40c3a6ab1300e90d089228ea654467419769dcdab87095476a528a8114f
-MD5 160c2c7976779af48cb8cbdf78d1e34a epiphany-1.8.4.1-r1.ebuild 1965
-RMD160 c470a891ccd61955e694e22f2d8b94b550ea1395 epiphany-1.8.4.1-r1.ebuild 1965
-SHA256 c9c5b40c3a6ab1300e90d089228ea654467419769dcdab87095476a528a8114f epiphany-1.8.4.1-r1.ebuild 1965
+EBUILD epiphany-1.8.4.1-r1.ebuild 2090 RMD160 cee576cfc8b4eba9b967226f51277b7c424f946f SHA1 f7c195301e74bbc1db1530fc91c9148d9e31bd65 SHA256 7700f78563b0a7dc19f4ac3263c5518a27267866c3e284705504b348fffd9cc5
+MD5 dd91ad29f90a2e64e8c19962fa8746b9 epiphany-1.8.4.1-r1.ebuild 2090
+RMD160 cee576cfc8b4eba9b967226f51277b7c424f946f epiphany-1.8.4.1-r1.ebuild 2090
+SHA256 7700f78563b0a7dc19f4ac3263c5518a27267866c3e284705504b348fffd9cc5 epiphany-1.8.4.1-r1.ebuild 2090
 EBUILD epiphany-1.8.4.1.ebuild 1817 RMD160 983f69a2ee756c8f0e82d7643337cb2da851e43b SHA1 60d473f3dd7c4cade0ea4a2b1473c7d78204fb56 SHA256 df7e9556413855c1f6ce1fe87668e9a22523311195b0ac85c509da5559ad9996
 MD5 8a9d604bd0df162154fc85372470052c epiphany-1.8.4.1.ebuild 1817
 RMD160 983f69a2ee756c8f0e82d7643337cb2da851e43b epiphany-1.8.4.1.ebuild 1817
@@ -16,10 +20,10 @@ EBUILD epiphany-2.14.2.1-r1.ebuild 2790 RMD160 240e8465626d0a4100e6883a7fcc69ba6
 MD5 0cba3945d6cae02ae60b949dc8f60e32 epiphany-2.14.2.1-r1.ebuild 2790
 RMD160 240e8465626d0a4100e6883a7fcc69ba698ae8bf epiphany-2.14.2.1-r1.ebuild 2790
 SHA256 6ba1b8c9e2dced4989632982774f20581cd34ea385e038f3c865ddbc1a37fdb5 epiphany-2.14.2.1-r1.ebuild 2790
-MISC ChangeLog 22288 RMD160 0bedaebef895845fc10412e9e5532316bbe7616f SHA1 cd191a6938e126170d66299be80ff3af2354d8ce SHA256 be9e4a9fe26fc8b06c2676fccd1ad539710ff33db6667a3c6f01262f4a9e3c32
-MD5 3d55eeafdb74a17fc9176813bdbc2795 ChangeLog 22288
-RMD160 0bedaebef895845fc10412e9e5532316bbe7616f ChangeLog 22288
-SHA256 be9e4a9fe26fc8b06c2676fccd1ad539710ff33db6667a3c6f01262f4a9e3c32 ChangeLog 22288
+MISC ChangeLog 22485 RMD160 907fb81035a4b1414ab1b622f09caf87d65bb31a SHA1 419cb6f35c32014c59bfadfb2b1832e4471453fa SHA256 c6be4b27d83f27f96a9d16bbab4057229ec54b918c9abfd02f25eb96e1d6f1ae
+MD5 77b6462d6e1b3bd22cbeefe3ec71146b ChangeLog 22485
+RMD160 907fb81035a4b1414ab1b622f09caf87d65bb31a ChangeLog 22485
+SHA256 c6be4b27d83f27f96a9d16bbab4057229ec54b918c9abfd02f25eb96e1d6f1ae ChangeLog 22485
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
diff --git a/www-client/epiphany/epiphany-1.8.4.1-r1.ebuild b/www-client/epiphany/epiphany-1.8.4.1-r1.ebuild
index baef2f19d271..83fc08cd53ab 100644
--- a/www-client/epiphany/epiphany-1.8.4.1-r1.ebuild
+++ b/www-client/epiphany/epiphany-1.8.4.1-r1.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/www-client/epiphany/epiphany-1.8.4.1-r1.ebuild,v 1.1 2006/07/02 19:28:10 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.8.4.1-r1.ebuild,v 1.2 2006/07/03 19:48:13 allanonjl Exp $
 
-inherit eutils gnome2
+inherit eutils gnome2 autotools
 
 DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
 HOMEPAGE="http://www.gnome.org/projects/epiphany/"
@@ -53,7 +53,6 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 DOCS="AUTHORS COPYING.README ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-USE_DESTDIR="1"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
@@ -69,3 +68,12 @@ pkg_setup() {
 		G2CONF="${G2CONF} --with-mozilla=seamonkey"
 	fi
 }
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# include fix
+	epatch ${FILESDIR}/${PN}-1.8.4.1-seamonkey.patch
+
+	AT_M4DIR="m4" eautoreconf
+}
diff --git a/www-client/epiphany/files/epiphany-1.8.4.1-seamonkey.patch b/www-client/epiphany/files/epiphany-1.8.4.1-seamonkey.patch
new file mode 100644
index 000000000000..00704de5a4d6
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-1.8.4.1-seamonkey.patch
@@ -0,0 +1,22 @@
+--- epiphany-1.8.4.1/embed/mozilla/EphyContentPolicy.cpp	2005-11-26 10:51:51.000000000 -0500
++++ epiphany-1.8.4.1.new/embed/mozilla/EphyContentPolicy.cpp	2006-07-03 15:15:11.000000000 -0400
+@@ -32,6 +32,8 @@
+ 
+ #include <nsCOMPtr.h>
+ #include <nsIURI.h>
++#include <dom/nsIDOMWindow.h>
++#include <necko/nsIURI.h>
+ #undef MOZILLA_INTERNAL_API
+ #include <nsEmbedString.h>
+ #define MOZILLA_INTERNAL_API 1
+--- epiphany-1.8.4.1/configure.ac	2006-02-05 13:57:53.000000000 -0500
++++ epiphany-1.8.4.1.new/configure.ac	2006-07-03 15:21:50.000000000 -0400
+@@ -359,7 +359,7 @@
+ AC_COMPILE_IFELSE(
+ 	[AC_LANG_PROGRAM(
+ 		[[#include <nsEmbedString.h>
+-		  #include <nsIURI.h>
++		  #include <necko/nsIURI.h>
+ 		  #include <content/nsIContentPolicy.h>]],
+ 		[[nsIContentPolicy *p;
+ 		  nsISupports *arg4;