Fix for bug #60501

5 files changed, 95 insertions, 7 deletions

diff --git a/net-www/epiphany/ChangeLog b/net-www/epiphany/ChangeLog
index 1507e350747c..d9196ae2109f 100644
--- a/net-www/epiphany/ChangeLog
+++ b/net-www/epiphany/ChangeLog
@@ -1,6 +1,14 @@
 # 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.62 2004/08/09 14:01:47 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.63 2004/08/17 16:39:09 stuart Exp $
+
+*epiphany-1.2.6-r1 (17 Aug 2004)
+
+  17 Aug 2004; Stuart Herbert <stuart@gentoo.org>
+  +files/epiphany-1.2.6-moz-1.7.2.patch, +epiphany-1.2.6-r1.ebuild:
+  Fix for epiphany not compiling against stable Mozilla; fix for bug # 60501;
+  thanks to Lorenzo Hernández García-Hierro <lorenzo@gnu.org> for the basis of
+  the patch
 
   09 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> epiphany-1.2.7.ebuild:
   Stable on sparc wrt #59419
diff --git a/net-www/epiphany/Manifest b/net-www/epiphany/Manifest
index 0028d2156dbe..78ed0c1a4bfe 100644
--- a/net-www/epiphany/Manifest
+++ b/net-www/epiphany/Manifest
@@ -1,16 +1,19 @@
-MD5 a31f7abc74b3af3d2be80b2f8fabcc8c ChangeLog 7915
 MD5 fa3cf7d91a4f072dba0b5fc4095c843a epiphany-1.0.7.ebuild 1225
 MD5 7716f725a5a7f9033dadb777ad59c7f7 epiphany-1.2.2.ebuild 1318
 MD5 5fc85b60cb72b58f37a820a0f10685da epiphany-1.2.3.ebuild 1323
 MD5 e1e44a01a23ebc21a287784f91cec9ac epiphany-1.2.5.ebuild 1457
 MD5 cb3779875c8eda93ea8f9c9fbb9b711a epiphany-1.2.6.ebuild 1331
-MD5 0e60917c1dfc14850db624f93a49cecb epiphany-1.2.7.ebuild 1456
+MD5 4203b0d7ebdfe047a62332811deb630c ChangeLog 8235
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 5edb401fcdae44c283b7d8b7fbdeba84 files/digest-epiphany-1.0.7 68
-MD5 a3d36d0b5e57c13bc93e3c3e0cedb08a files/digest-epiphany-1.2.2 68
-MD5 1651ad3aab0f207db7e39a5601a5fa3e files/digest-epiphany-1.2.3 68
-MD5 44b01636ae8eda75498104ec559c14bf files/digest-epiphany-1.2.5 68
+MD5 0e60917c1dfc14850db624f93a49cecb epiphany-1.2.7.ebuild 1456
+MD5 c73a4b84c1807f19b726ba56c9ccae36 epiphany-1.2.6-r1.ebuild 1424
 MD5 771a6412c25bf38ed285c69e27f7cdcd files/epiphany-1.2.5-gcc2_fix.patch 539
 MD5 ac323ac94ea3225d8cb548bdd586a9ad files/digest-epiphany-1.2.6 68
 MD5 4bbb4c198b340ac287571eb51c02188c files/digest-epiphany-1.2.7 68
+MD5 a3d36d0b5e57c13bc93e3c3e0cedb08a files/digest-epiphany-1.2.2 68
+MD5 1651ad3aab0f207db7e39a5601a5fa3e files/digest-epiphany-1.2.3 68
+MD5 44b01636ae8eda75498104ec559c14bf files/digest-epiphany-1.2.5 68
+MD5 ac323ac94ea3225d8cb548bdd586a9ad files/digest-epiphany-1.2.6-r1 68
+MD5 5edb401fcdae44c283b7d8b7fbdeba84 files/digest-epiphany-1.0.7 68
 MD5 bb7ec0bea74a36ed1d7274167e580f63 files/epiphany-1.2.7-nautilus_view.patch 757
+MD5 bae0dc5f6bfd90560eba9e9f6021e1c8 files/epiphany-1.2.6-moz-1.7.2.patch 836
diff --git a/net-www/epiphany/epiphany-1.2.6-r1.ebuild b/net-www/epiphany/epiphany-1.2.6-r1.ebuild
new file mode 100644
index 000000000000..a7d2c55273f1
--- /dev/null
+++ b/net-www/epiphany/epiphany-1.2.6-r1.ebuild
@@ -0,0 +1,57 @@
+# 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.2.6-r1.ebuild,v 1.1 2004/08/17 16:39:09 stuart 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="gnome doc"
+
+RDEPEND=">=dev-libs/glib-2.4.1
+	>=x11-libs/gtk+-2.4
+	>=gnome-base/gconf-1.2
+	>=dev-libs/libxml2-2.6.6
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libglade-2.3.1
+	>=gnome-base/libbonoboui-2.2
+	>=gnome-base/ORBit2-2
+	>=gnome-base/gnome-vfs-2.3.1
+	>=net-www/mozilla-1.4
+	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 COPYING* ChangeLog INSTALL NEWS README TODO"
+
+use gnome \
+	&& G2CONF="${G2CONF} --enable-nautilus-view=yes" \
+	|| G2CONF="${G2CONF} --enable-nautilus-view=no"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/epiphany-1.2.6-moz-1.7.2.patch
+}
+
+pkg_setup () {
+
+	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
+	then
+		eerror "you need mozilla-1.4+ compiled against gtk+-2"
+		eerror "export USE=\"gtk2\" ;emerge mozilla -p "
+		die "Need Mozilla compiled with gtk+-2.0!"
+	fi
+
+}
+
diff --git a/net-www/epiphany/files/digest-epiphany-1.2.6-r1 b/net-www/epiphany/files/digest-epiphany-1.2.6-r1
new file mode 100644
index 000000000000..6a96bb89477f
--- /dev/null
+++ b/net-www/epiphany/files/digest-epiphany-1.2.6-r1
@@ -0,0 +1 @@
+MD5 6dedf570ddb9106ecd6be624f009a35a epiphany-1.2.6.tar.bz2 2807440
diff --git a/net-www/epiphany/files/epiphany-1.2.6-moz-1.7.2.patch b/net-www/epiphany/files/epiphany-1.2.6-moz-1.7.2.patch
new file mode 100644
index 000000000000..159a61189dea
--- /dev/null
+++ b/net-www/epiphany/files/epiphany-1.2.6-moz-1.7.2.patch
@@ -0,0 +1,19 @@
+--- configure.orig	2004-08-17 17:22:14.243530601 +0100
++++ configure	2004-08-17 17:23:27.836122375 +0100
+@@ -21923,6 +21923,7 @@
+ 1.7rc2) MOZILLA_SNAPSHOT=16 ;;
+ 1.7rc3) MOZILLA_SNAPSHOT=17 ;;
+   1.7) MOZILLA_SNAPSHOT=17 ;;
++  1.7.2) MOZILLA_SNAPSHOT=17 ;;
+ branch1.7) MOZILLA_SNAPSHOT=17 ;;
+  1.8a) MOZILLA_SNAPSHOT=18 ;;
+ 1.8a1) MOZILLA_SNAPSHOT=18 ;;
+@@ -21930,7 +21931,7 @@
+ trunk) MOZILLA_SNAPSHOT=19 ;;
+     *) { { echo "$as_me:$LINENO: error:
+ *****************************************************************************
+-Epiphany can be built using Mozilla 1.4, 1.4.1, 1.4.2, 1.5, 1.6 or 1.7,
++Epiphany can be built using Mozilla 1.4, 1.4.1, 1.4.2, 1.5, 1.6, 1.7 or 1.7.2,
+ but the version available is $MOZILLA_VERSION.
+ *****************************************************************************" >&5
+ echo "$as_me: error: