New release: 1.6.4. Adds support for 'dbus' and 'firefox' USE flags (part of bug #88649)

(Portage version: 2.0.51.22-r1)

4 files changed, 82 insertions, 9 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 5c3bab4ac4ea..921a3b099402 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,19 +1,25 @@
 # ChangeLog for www-client/epiphany
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.21 2005/06/23 09:47:19 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.22 2005/07/06 00:42:55 leonardop Exp $
+
+*epiphany-1.6.4 (05 Jul 2005)
+
+  05 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> epiphany-1.6.4.ebuild:
+  New release. Added support for the 'dbus' and 'firefox' USE flags.
+  Resolves bug #88649.
 
   23 Jun 2005; Guy Martin <gmsoft@gentoo.org> epiphany-1.6.0-r3.ebuild,
   epiphany-1.6.3.ebuild:
   Stable on hppa.
 
-  12 Jun 2005; Olivier Crête <tester@gentoo.org> epiphany-1.6.0-r3.ebuild:
+  12 Jun 2005; Olivier Crête <tester@gentoo.org> epiphany-1.6.0-r3.ebuild:
   Stable on amd64
 
   12 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org>
   epiphany-1.6.0-r3.ebuild:
   Stable on ppc.
 
-  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
   epiphany-1.6.0-r3.ebuild:
   Stable on alpha.
 
@@ -45,7 +51,7 @@
   +files/epiphany-1.6.3-fix_includes.patch, +epiphany-1.6.3.ebuild:
   new version that incorporates several patches from previous release
 
-  27 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> epiphany-1.4.8.ebuild:
+  27 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> epiphany-1.4.8.ebuild:
   Stable on alpha.
 
   25 Apr 2005; Mike Gardiner <obz@gentoo.org> epiphany-1.4.8.ebuild:
@@ -122,7 +128,7 @@
   08 Jan 2005; Tom Martin <slarti@gentoo.org> epiphany-1.4.6.ebuild:
   Stable on amd64, resolving bug 77102.
 
-  24 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> epiphany-1.4.6.ebuild:
+  24 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> epiphany-1.4.6.ebuild:
   Stable on alpha.
 
   21 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> epiphany-1.4.6.ebuild:
@@ -141,7 +147,7 @@
   19 Dec 2004; Mike Gardiner <obz@gentoo.org> epiphany-1.4.6.ebuild:
   Keyworded x86 and ppc for GNOME 2.8.1
 
-  11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> epiphany-1.4.5.ebuild:
+  11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> epiphany-1.4.5.ebuild:
   Stable on alpha.
 
   06 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> epiphany-1.4.5.ebuild:
@@ -204,7 +210,7 @@
   Versionbump, patch unnecessary, this fixes some mozilla issues to be more
   futureproof
 
-  23 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> epiphany-1.2.7-r1.ebuild:
+  23 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> epiphany-1.2.7-r1.ebuild:
   Stable on alpha.
 
   18 Aug 2004; Travis Tilley <lv@gentoo.org> epiphany-1.2.7-r1.ebuild:
@@ -221,7 +227,7 @@
   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
+  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:
@@ -244,7 +250,7 @@
   Marked 1.2.6 x86 as mozilla 1.7 has moved to x86. See bug #55005 or brad[] for
   more information
 
-  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> epiphany-1.2.2.ebuild:
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> epiphany-1.2.2.ebuild:
   Stable on alpha.
 
 *epiphany-1.2.6 (19 Jun 2004)
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index d41dacf7da8b..05c684284dec 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,8 +1,11 @@
 MD5 b26e68bd588f869c996a550b9b916a60 ChangeLog 15490
+MD5 8a43dd6de02cb20fa413e570385ec008 epiphany-1.6.4.ebuild 1398
+MD5 f8f906dacb11c6a87587ae47ce9793f7 .epiphany-1.6.4.ebuild.swp 12288
 MD5 367a39d041ceb2efe66ccac8426e610d epiphany-1.4.8.ebuild 1458
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 5ef08e685400da84661b9f037d81a668 epiphany-1.6.0-r3.ebuild 1539
 MD5 bf205714e7c540de9a756afa02cf5b06 epiphany-1.6.3.ebuild 1391
+MD5 f5e29a6e660b776ab387ee60f32007da files/digest-epiphany-1.6.4 68
 MD5 24ec843041b5b9fd528431dd8e291297 files/digest-epiphany-1.4.8 68
 MD5 124caf61eb374940967a1d4c561270ca files/epiphany-1.4.6-fix_includes.patch 869
 MD5 5dd8a008a5612c492c8d0b648f5b0954 files/epiphany-1.4.6-moz-nsiurip.patch 1071
diff --git a/www-client/epiphany/epiphany-1.6.4.ebuild b/www-client/epiphany/epiphany-1.6.4.ebuild
new file mode 100644
index 000000000000..0643360c80dd
--- /dev/null
+++ b/www-client/epiphany/epiphany-1.6.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.6.4.ebuild,v 1.1 2005/07/06 00:42:55 leonardop 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 ~amd64 ~ia64"
+IUSE="dbus debug doc firefox"
+
+RDEPEND=">=dev-libs/glib-2.6
+	>=x11-libs/pango-1.8
+	>=x11-libs/gtk+-2.6.3
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.7
+	>=gnome-base/libglade-2.3.1
+	>=gnome-base/gnome-vfs-2.9.2
+	>=gnome-base/libgnomeui-2.6.0
+	>=gnome-base/gnome-desktop-2.9.91
+	>=x11-libs/startup-notification-0.5
+	>=gnome-base/libbonobo-2.2
+	>=gnome-base/orbit-2
+	>=gnome-base/gconf-2
+	!firefox? ( >=www-client/mozilla-1.7.3 )
+	firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 )
+	dbus? ( >=sys-apps/dbus-0.22 )
+	x11-themes/gnome-icon-theme"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+USE_DESTDIR="1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix include paths for our mozilla
+	epatch ${FILESDIR}/${PN}-1.6.3-fix_includes.patch
+}
+
+src_compile() {
+	G2CONF="${G2CONF} $(use_enable dbus)"
+
+	if use firefox; then
+		G2CONF="${G2CONF} --with-mozilla=firefox"
+	else
+		G2CONF="${G2CONF} --with-mozilla=mozilla"
+	fi
+
+	gnome2_src_compile
+}
diff --git a/www-client/epiphany/files/digest-epiphany-1.6.4 b/www-client/epiphany/files/digest-epiphany-1.6.4
new file mode 100644
index 000000000000..dd7bb0faaf22
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-1.6.4
@@ -0,0 +1 @@
+MD5 fbe9925593968c2f78abfa1e3a08e6d4 epiphany-1.6.4.tar.bz2 3036153