bump to 2.20.0 and fix quoting

(Portage version: 2.1.3.12)

6 files changed, 98 insertions, 9 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 0e20c6aea40e..eb6706f21a44 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-client/epiphany
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.131 2007/09/27 12:00:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.132 2007/10/11 22:54:16 eva Exp $
+
+  11 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  epiphany-2.16.3.ebuild, epiphany-2.18.2.ebuild, epiphany-2.18.3.ebuild:
+  fix quoting
+
+*epiphany-2.20.0 (11 Oct 2007)
+
+  11 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +epiphany-2.20.0.ebuild:
+  bump to 2.20.0
 
   27 Sep 2007; Raúl Porcel <armin76@gentoo.org> epiphany-2.18.3.ebuild:
   alpha/ia64 stable wrt #193339
diff --git a/www-client/epiphany/epiphany-2.16.3.ebuild b/www-client/epiphany/epiphany-2.16.3.ebuild
index 7a04203a9d05..031c9634234e 100644
--- a/www-client/epiphany/epiphany-2.16.3.ebuild
+++ b/www-client/epiphany/epiphany-2.16.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.16.3.ebuild,v 1.10 2007/08/02 06:38:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.16.3.ebuild,v 1.11 2007/10/11 22:54:16 eva Exp $
 
 inherit eutils gnome2 multilib
 
@@ -53,7 +53,7 @@ pkg_setup() {
 src_unpack() {
 	gnome2_src_unpack
 
-	epatch ${FILESDIR}/${PN}-1.9.2-broken-firefox.patch
+	epatch "${FILESDIR}"/${PN}-1.9.2-broken-firefox.patch
 }
 
 src_compile() {
diff --git a/www-client/epiphany/epiphany-2.18.2.ebuild b/www-client/epiphany/epiphany-2.18.2.ebuild
index adee3d659b1d..9b99ae5fa49a 100644
--- a/www-client/epiphany/epiphany-2.18.2.ebuild
+++ b/www-client/epiphany/epiphany-2.18.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.18.2.ebuild,v 1.9 2007/08/28 19:30:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.18.2.ebuild,v 1.10 2007/10/11 22:54:16 eva Exp $
 
 WANT_AUTOMAKE=1.9
 inherit eutils gnome2 multilib autotools
@@ -65,8 +65,8 @@ src_unpack() {
 	intltoolize --force || die
 
 	# Fix tests
-	echo "data/bme.desktop.in" >> ${S}/po/POTFILES.skip
-	echo "data/epiphany.desktop.in" >> ${S}/po/POTFILES.skip
+	echo "data/bme.desktop.in" >> "${S}"/po/POTFILES.skip
+	echo "data/epiphany.desktop.in" >> "${S}"/po/POTFILES.skip
 }
 
 src_compile() {
diff --git a/www-client/epiphany/epiphany-2.18.3.ebuild b/www-client/epiphany/epiphany-2.18.3.ebuild
index 086b63288a17..658c8b52a7a8 100644
--- a/www-client/epiphany/epiphany-2.18.3.ebuild
+++ b/www-client/epiphany/epiphany-2.18.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.18.3.ebuild,v 1.7 2007/09/27 12:00:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.18.3.ebuild,v 1.8 2007/10/11 22:54:16 eva Exp $
 
 WANT_AUTOMAKE=1.9
 inherit eutils gnome2 multilib autotools
@@ -65,8 +65,8 @@ src_unpack() {
 	intltoolize --force || die
 
 	# Fix tests
-	echo "data/bme.desktop.in" >> ${S}/po/POTFILES.skip
-	echo "data/epiphany.desktop.in" >> ${S}/po/POTFILES.skip
+	echo "data/bme.desktop.in" >> "${S}"/po/POTFILES.skip
+	echo "data/epiphany.desktop.in" >> "${S}"/po/POTFILES.skip
 }
 
 src_compile() {
diff --git a/www-client/epiphany/epiphany-2.20.0.ebuild b/www-client/epiphany/epiphany-2.20.0.ebuild
new file mode 100644
index 000000000000..feb3c0822f44
--- /dev/null
+++ b/www-client/epiphany/epiphany-2.20.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.20.0.ebuild,v 1.1 2007/10/11 22:54:16 eva Exp $
+
+inherit gnome2 eutils multilib
+
+DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
+HOMEPAGE="http://www.gnome.org/projects/epiphany/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc python xulrunner spell"
+
+# FIXME: add webkit/gecko switch possibility
+# dang: *after* webkit actually works.
+
+RDEPEND=">=dev-libs/glib-2.13.4
+	>=x11-libs/gtk+-2.11.6
+	>=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/libgnome-2.14
+	>=gnome-base/libgnomeui-2.14
+	>=gnome-base/gnome-desktop-2.9.91
+	>=x11-libs/startup-notification-0.5
+	>=dev-libs/dbus-glib-0.71
+	>=gnome-base/gconf-2
+	>=app-text/iso-codes-0.35
+	!xulrunner? ( >=www-client/mozilla-firefox-1.5 )
+	xulrunner? ( net-libs/xulrunner )
+	python? (
+		>=dev-lang/python-2.3
+		>=dev-python/pygtk-2.7.1
+		>=dev-python/gnome-python-2.6 )
+	spell? ( app-text/enchant )
+	x11-themes/gnome-icon-theme"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	>=app-text/gnome-doc-utils-0.3.2
+	>=gnome-base/gnome-common-2.12.0
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="--disable-scrollkeeper \
+		--with-engine=mozilla \
+		$(use_enable spell spell-checker)
+		$(use_enable python)"
+
+	if use xulrunner; then
+		G2CONF="${G2CONF} --with-gecko=xulrunner"
+	else
+		G2CONF="${G2CONF} --with-gecko=firefox"
+	fi
+}
+
+src_compile() {
+	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat
+	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat.tmp
+	addpredict /usr/$(get_libdir)/mozilla-firefox/components/compreg.dat.tmp
+
+	addpredict /usr/$(get_libdir)/xulrunner/components/xpti.dat
+	addpredict /usr/$(get_libdir)/xulrunner/components/xpti.dat.tmp
+	addpredict /usr/$(get_libdir)/xulrunner/components/compreg.dat.tmp
+
+	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
+	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
+
+	gnome2_src_compile
+}
diff --git a/www-client/epiphany/files/digest-epiphany-2.20.0 b/www-client/epiphany/files/digest-epiphany-2.20.0
new file mode 100644
index 000000000000..37cacd2c6ab6
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-2.20.0
@@ -0,0 +1,3 @@
+MD5 651beab72c7a3c0b42b45f5087d4e9b0 epiphany-2.20.0.tar.bz2 4874847
+RMD160 5ba02a0c77f3716e6d4385df2b795908cfd768eb epiphany-2.20.0.tar.bz2 4874847
+SHA256 ea62002a9190e8207a0b3d09e4e414b2416b790ad011060b8be9d30d41f3135a epiphany-2.20.0.tar.bz2 4874847