Add patch from cvs to fix personaldata/passwords.Also add patch from mailing list to fix problem with mozilla-1.7 wallet code. Remove bogus deps as well

(Portage version: 2.0.51.19)

8 files changed, 149 insertions, 17 deletions

diff --git a/net-www/epiphany/ChangeLog b/net-www/epiphany/ChangeLog
index 3b4e26adc3ea..1c811e735382 100644
--- a/net-www/epiphany/ChangeLog
+++ b/net-www/epiphany/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-www/epiphany
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.89 2005/03/09 05:10:24 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.90 2005/03/12 20:24:43 joem Exp $
+
+*epiphany-1.6.0-r1 (12 Mar 2005)
+
+  12 Mar 2005; Joe McCann <joem@gentoo.org>
+  +files/epiphany-1.6.0-fix_includes.patch,
+  +files/epiphany-1.6.0-wallet_fix.patch,
+  +files/epiphany-1.6.0-wallet_password.patch, +epiphany-1.6.0-r1.ebuild,
+  epiphany-1.6.0.ebuild:
+  Add patch from cvs to fix personaldata/passwords.Also add patch from mailing
+  list to fix problem with mozilla-1.7 wallet code. Remove bogus deps as well
 
 *epiphany-1.6.0 (08 Mar 2005)
 
diff --git a/net-www/epiphany/Manifest b/net-www/epiphany/Manifest
index 6d83822aa3cf..9f9fe0581c18 100644
--- a/net-www/epiphany/Manifest
+++ b/net-www/epiphany/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 26e41f2f5e52db7bed7bd1e0eb3cfc40 ChangeLog 11662
 MD5 8da5866972eed701acafd009e1d54868 epiphany-1.2.10.ebuild 1331
 MD5 09bb39f25615e6ff9ce62d7c03eb23ab epiphany-1.2.9-r1.ebuild 1461
@@ -10,7 +7,8 @@ MD5 abe687e85216825b7ae281bb0c8b18d7 epiphany-1.4.6.ebuild 1463
 MD5 f2a8a872d65430499911adf1f331f86f epiphany-1.4.7.ebuild 1490
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 8a332f75a2547d65bfb4305622152e1d epiphany-1.4.8.ebuild 1450
-MD5 ece7dd48cbd59c3629d6d83a1ec03971 epiphany-1.6.0.ebuild 1527
+MD5 d5086a97c6cd2656474eab45ab8beb41 epiphany-1.6.0.ebuild 1569
+MD5 d5086a97c6cd2656474eab45ab8beb41 epiphany-1.6.0-r1.ebuild 1569
 MD5 56ee35e359c12574247645a59250f5f8 files/digest-epiphany-1.2.10 69
 MD5 86259cda058c165aeb287a2b885b1b7a files/digest-epiphany-1.2.9-r1 68
 MD5 ebbdfe54389d750d3f1772e17d28a790 files/digest-epiphany-1.4.4 68
@@ -24,10 +22,7 @@ MD5 5dd8a008a5612c492c8d0b648f5b0954 files/epiphany-1.4.6-moz-nsiurip.patch 1071
 MD5 24ec843041b5b9fd528431dd8e291297 files/digest-epiphany-1.4.8 68
 MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0 68
 MD5 30122eb94b387560a22559fecccf1d84 files/epiphany-1.5.5-fix_includes.patch 497
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCLoUqXjcVihsel0ERAs8iAKCt0nS6iryLSp4z2a+QeY3lkWpSIQCgx57u
-QArCWMSsFgPG5OyG8cw1UCQ=
-=KZOd
------END PGP SIGNATURE-----
+MD5 febe27332928e38fb57115a08f66d590 files/epiphany-1.6.0-fix_includes.patch 505
+MD5 2a6d9343d321b67fb737cb87301facfc files/epiphany-1.6.0-wallet_password.patch 1307
+MD5 40c2cd3b20e5f2847e868edbc4f58915 files/epiphany-1.6.0-wallet_fix.patch 598
+MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r1 68
diff --git a/net-www/epiphany/epiphany-1.6.0-r1.ebuild b/net-www/epiphany/epiphany-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..d9e44576a448
--- /dev/null
+++ b/net-www/epiphany/epiphany-1.6.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.6.0-r1.ebuild,v 1.1 2005/03/12 20:24:43 joem Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
+HOMEPAGE="http://www.gnome.org/projects/epiphany/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2.6
+	>=x11-libs/pango-1.8
+	>=x11-libs/gtk+-2.6.3
+	>=gnome-base/gconf-1.2
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.7
+	>=gnome-base/libgnomeui-2.6.0
+	>=gnome-base/libglade-2.3.1
+	>=gnome-base/libbonoboui-2.2
+	>=gnome-base/orbit-2
+	>=gnome-base/gnome-vfs-2.3.1
+	>=net-www/mozilla-1.7.3
+	>=x11-themes/gnome-icon-theme-2.9.3"
+# dbus? ( >=sys-apps/dbus-0.22 )
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_setup() {
+
+	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
+	then
+		eerror "you need mozilla-1.7.3+ compiled against gtk+-2"
+		eerror "export USE=\"gtk2\" ;emerge mozilla -p "
+		die "Need Mozilla compiled with gtk+-2.0!"
+	fi
+
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# Fix include paths for our mozilla
+	epatch ${FILESDIR}/${P}-fix_includes.patch
+	epatch ${FILESDIR}/${P}-wallet_password.patch
+	epatch ${FILESDIR}/${P}-wallet_fix.patch
+
+}
+USE_DESTDIR="1"
diff --git a/net-www/epiphany/epiphany-1.6.0.ebuild b/net-www/epiphany/epiphany-1.6.0.ebuild
index f2557180c96d..d313e13b8274 100644
--- a/net-www/epiphany/epiphany-1.6.0.ebuild
+++ b/net-www/epiphany/epiphany-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.6.0.ebuild,v 1.1 2005/03/09 05:10:24 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.6.0.ebuild,v 1.2 2005/03/12 20:24:43 joem Exp $
 
 inherit eutils gnome2
 
@@ -24,10 +24,7 @@ RDEPEND=">=dev-libs/glib-2.6
 	>=gnome-base/orbit-2
 	>=gnome-base/gnome-vfs-2.3.1
 	>=net-www/mozilla-1.7.3
-	>=x11-themes/gnome-icon-theme-2.9.3
-	gnome? ( >=gnome-base/nautilus-2.5 )
-	|| ( >=net-www/mozilla-1.7
-		 >=net-www/mozilla-firefox-0.10 )"
+	>=x11-themes/gnome-icon-theme-2.9.3"
 # dbus? ( >=sys-apps/dbus-0.22 )
 
 DEPEND="${RDEPEND}
diff --git a/net-www/epiphany/files/digest-epiphany-1.6.0-r1 b/net-www/epiphany/files/digest-epiphany-1.6.0-r1
new file mode 100644
index 000000000000..3b6ddf3ac56b
--- /dev/null
+++ b/net-www/epiphany/files/digest-epiphany-1.6.0-r1
@@ -0,0 +1 @@
+MD5 53eda1c713aec26a51fb806210c8afa7 epiphany-1.6.0.tar.bz2 2983514
diff --git a/net-www/epiphany/files/epiphany-1.6.0-fix_includes.patch b/net-www/epiphany/files/epiphany-1.6.0-fix_includes.patch
new file mode 100644
index 000000000000..c2cd2beb3323
--- /dev/null
+++ b/net-www/epiphany/files/epiphany-1.6.0-fix_includes.patch
@@ -0,0 +1,25 @@
+diff -ur epiphany-1.6.0/embed/mozilla/Makefile.in epiphany-1.6.0-patched/embed/mozilla/Makefile.in
+--- epiphany-1.6.0/embed/mozilla/Makefile.in
++++ epiphany-1.6.0-patched/embed/mozilla/Makefile.in
+@@ -343,6 +343,7 @@
+ 	docshell		\
+ 	dom			\
+ 	exthandler		\
++	find			\
+ 	helperAppDlg		\
+ 	gfx			\
+ 	history			\
+@@ -355,10 +356,12 @@
+ 	passwordmgr		\
+ 	pipboot			\
+ 	pipnss			\
++	pref			\
+ 	shistory		\
+ 	sidebar			\
+ 	uriloader		\
+ 	uconv			\
++	wallet			\
+ 	webbrowserpersist	\
+ 	webbrwsr		\
+ 	widget			\
+
diff --git a/net-www/epiphany/files/epiphany-1.6.0-wallet_fix.patch b/net-www/epiphany/files/epiphany-1.6.0-wallet_fix.patch
new file mode 100644
index 000000000000..b5c6b447a4f8
--- /dev/null
+++ b/net-www/epiphany/files/epiphany-1.6.0-wallet_fix.patch
@@ -0,0 +1,15 @@
+Index: data/default-prefs-toolkit.js
+===================================================================
+RCS file: /cvs/gnome/epiphany/data/default-prefs-toolkit.js,v
+retrieving revision 1.1
+diff -p -u -u -p -r1.1 default-prefs-toolkit.js
+--- data/default-prefs-toolkit.js       28 Sep 2004 12:46:24 -0000      1.1
++++ data/default-prefs-toolkit.js       19 Jan 2005 13:59:38 -0000
+@@ -4,3 +4,6 @@ pref("plugin.default_plugin_disabled", t
+ // enable locale matching
+ pref("intl.locale.matchOS", true);
+ 
++// enable fixed-up typeaheadfind extension
++pref("accessibility.typeaheadfindsea", true);
++
+
diff --git a/net-www/epiphany/files/epiphany-1.6.0-wallet_password.patch b/net-www/epiphany/files/epiphany-1.6.0-wallet_password.patch
new file mode 100644
index 000000000000..f46ca6a3eb60
--- /dev/null
+++ b/net-www/epiphany/files/epiphany-1.6.0-wallet_password.patch
@@ -0,0 +1,28 @@
+--- configure.orig	2005-03-12 14:05:28.427700360 +0100
++++ configure	2005-03-12 14:05:33.591915280 +0100
+@@ -23596,12 +23596,10 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-
+-
+ if test "x$flavour" = "xmozilla"; then
+-	as_ac_File=`echo "ac_cv_file_$MOZILLA_INCLUDE_ROOT/nsIPassword.h" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $MOZILLA_INCLUDE_ROOT/nsIPassword.h" >&5
+-echo $ECHO_N "checking for $MOZILLA_INCLUDE_ROOT/nsIPassword.h... $ECHO_C" >&6
++	as_ac_File=`echo "ac_cv_file_$MOZILLA_INCLUDE_ROOT/wallet/nsIPassword.h" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $MOZILLA_INCLUDE_ROOT/wallet/nsIPassword.h" >&5
++echo $ECHO_N "checking for $MOZILLA_INCLUDE_ROOT/wallet/nsIPassword.h... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_File+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23609,7 +23607,7 @@
+   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+ echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+-if test -r "$MOZILLA_INCLUDE_ROOT/nsIPassword.h"; then
++if test -r "$MOZILLA_INCLUDE_ROOT/wallet/nsIPassword.h"; then
+   eval "$as_ac_File=yes"
+ else
+   eval "$as_ac_File=no"
+