bump to 2.20.3 and clean up old revisions

(Portage version: 2.1.4_rc14)

8 files changed, 23 insertions, 169 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 5353db4e8822..8cb6b775da9b 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.142 2007/12/14 15:51:25 dang Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.143 2008/01/09 22:40:48 eva Exp $
+
+  09 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -epiphany-2.16.3.ebuild, -epiphany-2.18.2.ebuild, -epiphany-2.20.0.ebuild:
+  clean up old revisions
+
+*epiphany-2.20.3 (09 Jan 2008)
+
+  09 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +epiphany-2.20.3.ebuild:
+  bump to 2.20.3
 
   14 Dec 2007; Daniel Gryniewicz <dang@gentoo.org> epiphany-2.20.2.ebuild:
   Add networkmanager support. bug #201694
diff --git a/www-client/epiphany/epiphany-2.16.3.ebuild b/www-client/epiphany/epiphany-2.16.3.ebuild
deleted file mode 100644
index 031c9634234e..000000000000
--- a/www-client/epiphany/epiphany-2.16.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.11 2007/10/11 22:54:16 eva Exp $
-
-inherit eutils gnome2 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"
-IUSE="doc python"
-
-RDEPEND=">=dev-libs/glib-2.12
-	>=x11-libs/gtk+-2.10
-	>=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
-	>=gnome-base/gconf-2
-	>=app-text/iso-codes-0.35
-	>=www-client/mozilla-firefox-1.5
-	>=dev-libs/dbus-glib-0.71
-	python? (
-		>=dev-lang/python-2.3
-		>=dev-python/pygtk-2.7.1
-		>=dev-python/gnome-python-2.6 )
-	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"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	G2CONF="--disable-scrollkeeper \
-		--with-mozilla=firefox \
-		$(use_enable python)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch "${FILESDIR}"/${PN}-1.9.2-broken-firefox.patch
-}
-
-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)/mozilla/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
-
-	gnome2_src_compile
-}
diff --git a/www-client/epiphany/epiphany-2.18.2.ebuild b/www-client/epiphany/epiphany-2.18.2.ebuild
deleted file mode 100644
index 9b99ae5fa49a..000000000000
--- a/www-client/epiphany/epiphany-2.18.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.10 2007/10/11 22:54:16 eva Exp $
-
-WANT_AUTOMAKE=1.9
-inherit eutils gnome2 multilib autotools
-
-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"
-
-RDEPEND=">=dev-libs/glib-2.12
-	>=x11-libs/gtk+-2.10
-	>=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 \
-		$(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_unpack() {
-	gnome2_src_unpack
-
-	# This is for honoring LINGUAS env vars.
-	# Remove this once upstream starts using intltool-0.35.5 for making tarballs:
-	intltoolize --force || die
-
-	# Fix tests
-	echo "data/bme.desktop.in" >> "${S}"/po/POTFILES.skip
-	echo "data/epiphany.desktop.in" >> "${S}"/po/POTFILES.skip
-}
-
-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/epiphany-2.20.0.ebuild b/www-client/epiphany/epiphany-2.20.3.ebuild
index feb3c0822f44..8aa287fee754 100644
--- a/www-client/epiphany/epiphany-2.20.0.ebuild
+++ b/www-client/epiphany/epiphany-2.20.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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 $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.20.3.ebuild,v 1.1 2008/01/09 22:40:48 eva Exp $
 
 inherit gnome2 eutils multilib
 
@@ -10,7 +10,7 @@ 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"
+IUSE="doc networkmanager python spell xulrunner"
 
 # FIXME: add webkit/gecko switch possibility
 # dang: *after* webkit actually works.
@@ -28,6 +28,7 @@ RDEPEND=">=dev-libs/glib-2.13.4
 	>=dev-libs/dbus-glib-0.71
 	>=gnome-base/gconf-2
 	>=app-text/iso-codes-0.35
+	networkmanager? ( net-misc/networkmanager )
 	!xulrunner? ( >=www-client/mozilla-firefox-1.5 )
 	xulrunner? ( net-libs/xulrunner )
 	python? (
@@ -48,8 +49,10 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
 
 pkg_setup() {
-	G2CONF="--disable-scrollkeeper \
-		--with-engine=mozilla \
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--with-engine=mozilla
+		$(use_enable networkmanager network-manager)
 		$(use_enable spell spell-checker)
 		$(use_enable python)"
 
diff --git a/www-client/epiphany/files/digest-epiphany-2.16.3 b/www-client/epiphany/files/digest-epiphany-2.16.3
deleted file mode 100644
index 7799903d30a1..000000000000
--- a/www-client/epiphany/files/digest-epiphany-2.16.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3ee93d168eb5720a96f4c7adf2cdf2d4 epiphany-2.16.3.tar.bz2 4232106
-RMD160 1eb60d36af50cc4d56cfeaf3c9772f033e9e1e3f epiphany-2.16.3.tar.bz2 4232106
-SHA256 a1a328d65dc95bd30d79b6434ae25db760f0d383baa9f25bb6862177e4d6f12d epiphany-2.16.3.tar.bz2 4232106
diff --git a/www-client/epiphany/files/digest-epiphany-2.18.2 b/www-client/epiphany/files/digest-epiphany-2.18.2
deleted file mode 100644
index 05a27f51f98a..000000000000
--- a/www-client/epiphany/files/digest-epiphany-2.18.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d9a82160bafa4e80091681b19a70ba79 epiphany-2.18.2.tar.bz2 4656317
-RMD160 6bf82260d6e030e9a97cb9a59de97293149faca8 epiphany-2.18.2.tar.bz2 4656317
-SHA256 e1d9c24ae119d8872cfd819014072ece7aee8990ed41d2c809e16dd6f84d4675 epiphany-2.18.2.tar.bz2 4656317
diff --git a/www-client/epiphany/files/digest-epiphany-2.20.0 b/www-client/epiphany/files/digest-epiphany-2.20.0
deleted file mode 100644
index 37cacd2c6ab6..000000000000
--- a/www-client/epiphany/files/digest-epiphany-2.20.0
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/www-client/epiphany/files/digest-epiphany-2.20.3 b/www-client/epiphany/files/digest-epiphany-2.20.3
new file mode 100644
index 000000000000..524b3f8676a9
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-2.20.3
@@ -0,0 +1,3 @@
+MD5 df2861b3e91bef6d365f50187b6170cb epiphany-2.20.3.tar.bz2 4945544
+RMD160 1af464d3b694bb30e9491ea49162d79b655fa140 epiphany-2.20.3.tar.bz2 4945544
+SHA256 a76268f0b842b9f9f2545717273062aeba84351208110064da55f3fe5277a9ca epiphany-2.20.3.tar.bz2 4945544