gnome 2.8 release & 2.6 security bump

9 files changed, 225 insertions, 1 deletions

diff --git a/net-www/epiphany/ChangeLog b/net-www/epiphany/ChangeLog
index 22a878808706..121648e1e213 100644
--- a/net-www/epiphany/ChangeLog
+++ b/net-www/epiphany/ChangeLog
@@ -1,6 +1,15 @@
 # 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.68 2004/09/13 16:54:34 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.69 2004/09/16 14:48:00 foser Exp $
+
+*epiphany-1.4.0 (16 Sep 2004)
+*epiphany-1.2.9-r1 (16 Sep 2004)
+
+  16 Sep 2004; foser <foser@gentoo.org> epiphany-1.2.9-r1.ebuild :
+  1.4.0 : gnome 2.8 release, remove deprecated gnome USE
+  Add patch to fix the buildtime include paths
+  1.2.9-r1,1.4.0 : Update mozilla dep to 1.7.3, security fix (#63996)
+  Add fix to make epi build with moz 1.7.3
 
 *epiphany-1.2.9 (14 Sep 2004)
 
diff --git a/net-www/epiphany/Manifest b/net-www/epiphany/Manifest
index 11b8943d356d..4d03a63d8ac7 100644
--- a/net-www/epiphany/Manifest
+++ b/net-www/epiphany/Manifest
@@ -3,15 +3,22 @@ MD5 39be10338c1b2c4a4dd37f967510a245 epiphany-1.2.7-r1.ebuild 1454
 MD5 a4a8e1e7c1bb63b8f458ab86cd147017 epiphany-1.2.8.ebuild 1339
 MD5 2ff8d4998d0bc1d1d68c8d79f15e4f3f epiphany-1.2.7.ebuild 1452
 MD5 531286c9b403250588a2b93dc3b35f5e epiphany-1.2.2.ebuild 1316
+MD5 07847c99554000dfd4d9d330db8a3024 epiphany-1.2.9-r1.ebuild 1415
 MD5 ef30333da59f07c3e007e69519052155 epiphany-1.2.9.ebuild 1327
 MD5 ffab6c4e7ef4daa4b8f0b924beafaa1e ChangeLog 8901
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 375662315f1da42bc6ac9370396a9a5f epiphany-1.4.0.ebuild 1425
 MD5 bae0dc5f6bfd90560eba9e9f6021e1c8 files/epiphany-1.2.6-moz-1.7.2.patch 836
+MD5 f06f6e1c83f9668cfe31e9da7129ba4a files/epiphany-1.3.4-fix_includes.patch 720
+MD5 cae59ac7b2a7e92a93f6190e20caaffb files/epiphany-1.4.0-mozilla-1.7.3.patch 2581
+MD5 042e22ed37a2f644284c403b5823c6e3 files/epiphany-1.2.9-mozilla-1.7.3.patch 3571
 MD5 771a6412c25bf38ed285c69e27f7cdcd files/epiphany-1.2.5-gcc2_fix.patch 539
 MD5 bb7ec0bea74a36ed1d7274167e580f63 files/epiphany-1.2.7-nautilus_view.patch 757
 MD5 4bbb4c198b340ac287571eb51c02188c files/digest-epiphany-1.2.7-r1 68
+MD5 86259cda058c165aeb287a2b885b1b7a files/digest-epiphany-1.2.9-r1 68
 MD5 5edb401fcdae44c283b7d8b7fbdeba84 files/digest-epiphany-1.0.7 68
 MD5 a3d36d0b5e57c13bc93e3c3e0cedb08a files/digest-epiphany-1.2.2 68
 MD5 4bbb4c198b340ac287571eb51c02188c files/digest-epiphany-1.2.7 68
 MD5 87ab7ee247b558e4b938a742a24ea8f2 files/digest-epiphany-1.2.8 68
 MD5 86259cda058c165aeb287a2b885b1b7a files/digest-epiphany-1.2.9 68
+MD5 a96fe7c4908f8708e948b0ba459c95aa files/digest-epiphany-1.4.0 68
diff --git a/net-www/epiphany/epiphany-1.2.9-r1.ebuild b/net-www/epiphany/epiphany-1.2.9-r1.ebuild
new file mode 100644
index 000000000000..b8c3cbca2dd9
--- /dev/null
+++ b/net-www/epiphany/epiphany-1.2.9-r1.ebuild
@@ -0,0 +1,61 @@
+# 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.9-r1.ebuild,v 1.1 2004/09/16 14:48:00 foser 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.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 COPYING* ChangeLog* 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}/${P}-mozilla-1.7.3.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
+
+}
+
+#CXXFLAGS="${CXXFLAGS} -DMOZILLA_SNAPSHOT=17"
diff --git a/net-www/epiphany/epiphany-1.4.0.ebuild b/net-www/epiphany/epiphany-1.4.0.ebuild
new file mode 100644
index 000000000000..4ef4d187f2b5
--- /dev/null
+++ b/net-www/epiphany/epiphany-1.4.0.ebuild
@@ -0,0 +1,58 @@
+# 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.0.ebuild,v 1.1 2004/09/16 14:48:00 foser 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/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 COPYING* ChangeLog INSTALL 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 to build with moz 1.7.3
+	epatch ${FILESDIR}/${P}-mozilla-1.7.3.patch
+	# Fix include paths for our mozilla
+	epatch ${FILESDIR}/${PN}-1.3.4-fix_includes.patch
+
+}
diff --git a/net-www/epiphany/files/digest-epiphany-1.2.9-r1 b/net-www/epiphany/files/digest-epiphany-1.2.9-r1
new file mode 100644
index 000000000000..2a97f76025d2
--- /dev/null
+++ b/net-www/epiphany/files/digest-epiphany-1.2.9-r1
@@ -0,0 +1 @@
+MD5 8d85d921a1c0ccec165960dc650c5104 epiphany-1.2.9.tar.bz2 3004225
diff --git a/net-www/epiphany/files/digest-epiphany-1.4.0 b/net-www/epiphany/files/digest-epiphany-1.4.0
new file mode 100644
index 000000000000..64797d3f9751
--- /dev/null
+++ b/net-www/epiphany/files/digest-epiphany-1.4.0
@@ -0,0 +1 @@
+MD5 f9453cded23dd5c432dc2efc4303f796 epiphany-1.4.0.tar.bz2 3381335
diff --git a/net-www/epiphany/files/epiphany-1.2.9-mozilla-1.7.3.patch b/net-www/epiphany/files/epiphany-1.2.9-mozilla-1.7.3.patch
new file mode 100644
index 000000000000..06eaf5462f67
--- /dev/null
+++ b/net-www/epiphany/files/epiphany-1.2.9-mozilla-1.7.3.patch
@@ -0,0 +1,24 @@
+diff -uNr epiphany-1.2.9/configure epiphany-1.2.9.patched/configure
+--- epiphany-1.2.9/configure	2004-09-11 16:32:47.000000000 +0200
++++ epiphany-1.2.9.patched/configure	2004-09-16 16:01:43.000000000 +0200
+@@ -22061,7 +22061,7 @@
+   1.7) MOZILLA_SNAPSHOT=17 ;;
+ 1.7.1) MOZILLA_SNAPSHOT=17 ;;
+ 1.7.2) MOZILLA_SNAPSHOT=17 ;;
+-1.7.3) MOZILLA_SNAPSHOT=18 ;;
++1.7.3) MOZILLA_SNAPSHOT=17 ;;
+ 1.7.4) MOZILLA_SNAPSHOT=18 ;;
+ 1.7.5) MOZILLA_SNAPSHOT=18 ;;
+ branch1.7) MOZILLA_SNAPSHOT=18 ;;
+diff -uNr epiphany-1.2.9/configure.in epiphany-1.2.9.patched/configure.in
+--- epiphany-1.2.9/configure.in	2004-09-05 01:02:32.000000000 +0200
++++ epiphany-1.2.9.patched/configure.in	2004-09-16 16:01:19.000000000 +0200
+@@ -205,7 +205,7 @@
+   1.7) MOZILLA_SNAPSHOT=17 ;;
+ 1.7.1) MOZILLA_SNAPSHOT=17 ;;
+ 1.7.2) MOZILLA_SNAPSHOT=17 ;;
+-1.7.3) MOZILLA_SNAPSHOT=18 ;;
++1.7.3) MOZILLA_SNAPSHOT=17 ;;
+ 1.7.4) MOZILLA_SNAPSHOT=18 ;;
+ 1.7.5) MOZILLA_SNAPSHOT=18 ;;
+ branch1.7) MOZILLA_SNAPSHOT=18 ;;
diff --git a/net-www/epiphany/files/epiphany-1.3.4-fix_includes.patch b/net-www/epiphany/files/epiphany-1.3.4-fix_includes.patch
new file mode 100644
index 000000000000..d3081aababcb
--- /dev/null
+++ b/net-www/epiphany/files/epiphany-1.3.4-fix_includes.patch
@@ -0,0 +1,18 @@
+--- embed/mozilla/Makefile.in.bak	2004-07-08 05:02:19.678210368 -0500
++++ embed/mozilla/Makefile.in	2004-07-08 05:02:54.573905416 -0500
+@@ -218,6 +218,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)/history		\
+@@ -228,6 +229,7 @@
+ 	-I$(MOZILLA_INCLUDE_ROOT)/nkcache		\
+ 	-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		
diff --git a/net-www/epiphany/files/epiphany-1.4.0-mozilla-1.7.3.patch b/net-www/epiphany/files/epiphany-1.4.0-mozilla-1.7.3.patch
new file mode 100644
index 000000000000..b055f3c8a375
--- /dev/null
+++ b/net-www/epiphany/files/epiphany-1.4.0-mozilla-1.7.3.patch
@@ -0,0 +1,45 @@
+diff -uNr epiphany-1.4.0/embed/mozilla/EphyBrowser.cpp epiphany-1.4.0.patched/embed/mozilla/EphyBrowser.cpp
+--- epiphany-1.4.0/embed/mozilla/EphyBrowser.cpp	2004-08-08 20:11:56.000000000 +0200
++++ epiphany-1.4.0.patched/embed/mozilla/EphyBrowser.cpp	2004-09-16 12:13:46.664381872 +0200
+@@ -411,7 +411,7 @@
+ 	return ContentNav->GotoIndex (index);
+ }
+ 
+-#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 3)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
++#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 4)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
+ /* Workaround for broken reload with frames, see mozilla bug
+  * http://bugzilla.mozilla.org/show_bug.cgi?id=246392
+  */
+diff -uNr epiphany-1.4.0/embed/mozilla/EphyBrowser.h epiphany-1.4.0.patched/embed/mozilla/EphyBrowser.h
+--- epiphany-1.4.0/embed/mozilla/EphyBrowser.h	2004-08-08 20:11:56.000000000 +0200
++++ epiphany-1.4.0.patched/embed/mozilla/EphyBrowser.h	2004-09-16 12:14:09.170960352 +0200
+@@ -112,7 +112,7 @@
+ 	nsresult GetSHUrlAtIndex (PRInt32 index, nsACString &url);
+ 	nsresult GoToHistoryIndex (PRInt16 index);
+ 
+-#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 3)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
++#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 4)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
+ 	enum ReloadType { RELOAD_NORMAL		 = 0,
+ 			  RELOAD_FORCE		 = 1,
+ 			  RELOAD_ENCODING_CHANGE = 2 };
+diff -uNr epiphany-1.4.0/embed/mozilla/GlobalHistory.cpp epiphany-1.4.0.patched/embed/mozilla/GlobalHistory.cpp
+--- epiphany-1.4.0/embed/mozilla/GlobalHistory.cpp	2004-08-27 22:39:10.000000000 +0200
++++ epiphany-1.4.0.patched/embed/mozilla/GlobalHistory.cpp	2004-09-16 12:14:47.772092088 +0200
+@@ -133,7 +133,7 @@
+ 	return NS_ERROR_NOT_IMPLEMENTED;
+ }
+ 
+-#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 3)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
++#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 4)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
+ /* void removePage (in nsIURI aURI); */
+ NS_IMETHODIMP MozGlobalHistory::RemovePage(nsIURI *aURI)
+ {
+@@ -179,7 +179,7 @@
+     return NS_ERROR_NOT_IMPLEMENTED;
+ }
+ 
+-#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 3)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
++#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 4)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
+ /* void markPageAsTyped (in AUTF8String aURI) */
+ NS_IMETHODIMP MozGlobalHistory::MarkPageAsTyped(nsIURI *aURI)
+ {