New version

6 files changed, 94 insertions, 9 deletions

diff --git a/net-www/epiphany/ChangeLog b/net-www/epiphany/ChangeLog
index 32544d43eb02..ef3487b560bc 100644
--- a/net-www/epiphany/ChangeLog
+++ b/net-www/epiphany/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/epiphany
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.78 2004/11/22 18:14:09 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.79 2004/12/06 06:27:01 obz Exp $
+
+*epiphany-1.4.6 (06 Dec 2004)
+
+  06 Dec 2004; Mike Gardiner <obz@gentoo.org>
+  +files/epiphany-1.4.6-fix_includes.patch, +epiphany-1.4.6.ebuild:
+  New version
 
 *epiphany-1.2.10 (22 Nov 2004)
 
diff --git a/net-www/epiphany/Manifest b/net-www/epiphany/Manifest
index 88f653ba7306..0466e76506ca 100644
--- a/net-www/epiphany/Manifest
+++ b/net-www/epiphany/Manifest
@@ -1,12 +1,15 @@
-MD5 c9cf6a2a70106972f1ad261dac39b963 ChangeLog 10235
-MD5 c0c9a502eef6ab123b58eaaa83c46a78 epiphany-1.2.9-r1.ebuild 1464
+MD5 71abaf1357baf25a58119f151b6cfd96 epiphany-1.2.10.ebuild 1328
 MD5 9dbacb408083855f29a9d7e2cd564952 epiphany-1.4.4.ebuild 1370
+MD5 0009c98ee9743a799ce03f1101a75bb0 epiphany-1.4.6.ebuild 1335
+MD5 c0c9a502eef6ab123b58eaaa83c46a78 epiphany-1.2.9-r1.ebuild 1464
+MD5 92bbcfe0e10afdf02d4ae63aa40563fd ChangeLog 10395
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 ad209ba7662096331c1737d72fd54fff epiphany-1.4.5.ebuild 1368
-MD5 71abaf1357baf25a58119f151b6cfd96 epiphany-1.2.10.ebuild 1328
+MD5 cafb7f0a51ca58f2cecfcdd74b385dd5 epiphany-1.4.5.ebuild 1367
+MD5 f06f6e1c83f9668cfe31e9da7129ba4a files/epiphany-1.3.4-fix_includes.patch 720
+MD5 687a46caa636617d50fcf56d46f4c9f2 files/epiphany-1.2.9-mozilla-1.7.3.patch 972
 MD5 86259cda058c165aeb287a2b885b1b7a files/digest-epiphany-1.2.9-r1 68
+MD5 124caf61eb374940967a1d4c561270ca files/epiphany-1.4.6-fix_includes.patch 869
 MD5 ebbdfe54389d750d3f1772e17d28a790 files/digest-epiphany-1.4.4 68
-MD5 687a46caa636617d50fcf56d46f4c9f2 files/epiphany-1.2.9-mozilla-1.7.3.patch 972
-MD5 f06f6e1c83f9668cfe31e9da7129ba4a files/epiphany-1.3.4-fix_includes.patch 720
 MD5 7b909f5b1fad8adc32b25e92037b010f files/digest-epiphany-1.4.5 68
+MD5 8b89ef168d67e7ae303ae92d4997d401 files/digest-epiphany-1.4.6 68
 MD5 56ee35e359c12574247645a59250f5f8 files/digest-epiphany-1.2.10 69
diff --git a/net-www/epiphany/epiphany-1.4.5.ebuild b/net-www/epiphany/epiphany-1.4.5.ebuild
index 65d2973120a0..5e7cabe24401 100644
--- a/net-www/epiphany/epiphany-1.4.5.ebuild
+++ b/net-www/epiphany/epiphany-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.4.5.ebuild,v 1.1 2004/11/22 18:14:09 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.4.5.ebuild,v 1.2 2004/12/06 06:27:01 obz Exp $
 
 inherit eutils gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/projects/epiphany/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/glib-2.4.1
diff --git a/net-www/epiphany/epiphany-1.4.6.ebuild b/net-www/epiphany/epiphany-1.4.6.ebuild
new file mode 100644
index 000000000000..e97d89964996
--- /dev/null
+++ b/net-www/epiphany/epiphany-1.4.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.4.6.ebuild,v 1.1 2004/12/06 06:27:01 obz 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.4.1
+	>=x11-libs/pango-1.6
+	>=x11-libs/gtk+-2.4
+	>=gnome-base/gconf-1.2
+	>=dev-libs/libxml2-2.6.6
+	>=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
+	gnome? ( >=gnome-base/nautilus-2.5 )"
+
+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}
+
+	# Fix include paths for our mozilla
+	epatch ${FILESDIR}/${P}-fix_includes.patch
+
+}
diff --git a/net-www/epiphany/files/digest-epiphany-1.4.6 b/net-www/epiphany/files/digest-epiphany-1.4.6
new file mode 100644
index 000000000000..99809df30bab
--- /dev/null
+++ b/net-www/epiphany/files/digest-epiphany-1.4.6
@@ -0,0 +1 @@
+MD5 82e44449cc615e729d5fb218719b1d58 epiphany-1.4.6.tar.bz2 3541516
diff --git a/net-www/epiphany/files/epiphany-1.4.6-fix_includes.patch b/net-www/epiphany/files/epiphany-1.4.6-fix_includes.patch
new file mode 100644
index 000000000000..08f707e024d6
--- /dev/null
+++ b/net-www/epiphany/files/epiphany-1.4.6-fix_includes.patch
@@ -0,0 +1,19 @@
+diff -ur epiphany-1.4.6/embed/mozilla/Makefile.in epiphany-1.4.6-patched/embed/mozilla/Makefile.in
+--- epiphany-1.4.6/embed/mozilla/Makefile.in	2004-11-29 03:54:32.000000000 +0800
++++ epiphany-1.4.6-patched/embed/mozilla/Makefile.in	2004-12-06 14:13:54.858691504 +0800
+@@ -296,6 +296,7 @@
+ 	-I$(MOZILLA_INCLUDE_ROOT)/docshell \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/dom \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/exthandler \
++	-I$(MOZILLA_INCLUDE_ROOT)/find \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/gfx \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/helperAppDlg \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/js -I$(MOZILLA_INCLUDE_ROOT)/history \
+@@ -307,6 +308,7 @@
+ 	-I$(MOZILLA_INCLUDE_ROOT)/passwordmgr \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/pipboot \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/pipnss \
++	-I$(MOZILLA_INCLUDE_ROOT)/pref \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/shistory \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/uriloader \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/uconv \