bump to 2.20.3 and clean up old revisions

(Portage version: 2.1.4_rc14)

6 files changed, 16 insertions, 64 deletions

diff --git a/www-client/epiphany-extensions/ChangeLog b/www-client/epiphany-extensions/ChangeLog
index ea27206802fe..3fca773109b1 100644
--- a/www-client/epiphany-extensions/ChangeLog
+++ b/www-client/epiphany-extensions/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/epiphany-extensions
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.69 2007/12/04 20:21:20 jer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.70 2008/01/09 22:57:37 eva Exp $
+
+*epiphany-extensions-2.20.3 (09 Jan 2008)
+
+  09 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -epiphany-extensions-2.16.1-r1.ebuild, -epiphany-extensions-2.20.0.ebuild,
+  +epiphany-extensions-2.20.3.ebuild:
+  bump to 2.20.3 and clean up old revisions
 
   04 Dec 2007; Jeroen Roovers <jer@gentoo.org>
   epiphany-extensions-2.20.1.ebuild:
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.16.1-r1.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.16.1-r1.ebuild
deleted file mode 100644
index 1b9efa662975..000000000000
--- a/www-client/epiphany-extensions/epiphany-extensions-2.16.1-r1.ebuild
+++ /dev/null
@@ -1,50 +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-extensions/epiphany-extensions-2.16.1-r1.ebuild,v 1.8 2007/08/02 06:40:55 mr_bones_ Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Extensions for the Epiphany web browser"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/extensions.html"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE="debug pcre python"
-
-RDEPEND=">=www-client/epiphany-2.16
-	>=dev-libs/libxml2-2.6
-	>=dev-libs/glib-2.12
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/libglade-2
-	app-text/opensp
-	>=www-client/mozilla-firefox-1.0.2-r1
-	pcre? ( >=dev-libs/libpcre-3.9-r2 )
-	>=dev-libs/dbus-glib-0.71
-	python? ( >=dev-lang/python-2.3 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	local extensions="actions auto-reload auto-scroller certificates
-	error-viewer extensions-manager-ui gestures java-console
-	livehttpheaders page-info permissions push-scroller rss
-	select-stylesheet sidebar smart-bookmarks tab-groups tab-states"
-
-	use pcre && extensions="${extensions} greasemonkey adblock"
-
-	use python && extensions="${extensions} python-console favicon"
-
-	local list_exts=""
-	for ext in $extensions; do
-		[ "x${list_exts}" != "x" ] && list_exts="${list_exts},"
-		list_exts="${list_exts}${ext}"
-	done
-
-	G2CONF="${G2CONF} --with-extensions=${list_exts} --with-mozilla=firefox"
-}
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.20.0.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild
index 071463a0b525..60ec23710240 100644
--- a/www-client/epiphany-extensions/epiphany-extensions-2.20.0.ebuild
+++ b/www-client/epiphany-extensions/epiphany-extensions-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-extensions/epiphany-extensions-2.20.0.ebuild,v 1.1 2007/10/11 22:54:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild,v 1.1 2008/01/09 22:57:37 eva Exp $
 
 WANT_AUTOMAKE="1.10"
 inherit eutils gnome2 autotools
@@ -20,10 +20,8 @@ RDEPEND=">=www-client/epiphany-2.20
 	gnome-base/gconf
 	>=gnome-base/libglade-2
 	app-text/opensp
-	|| (
-		xulrunner? ( net-libs/xulrunner )
-		>=www-client/mozilla-firefox-1.5
-	)
+	xulrunner? ( net-libs/xulrunner )
+	!xulrunner? ( >=www-client/mozilla-firefox-1.5 )
 	pcre? ( >=dev-libs/libpcre-3.9-r2 )
 	>=dev-libs/dbus-glib-0.71
 	python? ( >=dev-python/pygtk-2.11 )"
diff --git a/www-client/epiphany-extensions/files/digest-epiphany-extensions-2.16.1-r1 b/www-client/epiphany-extensions/files/digest-epiphany-extensions-2.16.1-r1
deleted file mode 100644
index 30ea03a2358b..000000000000
--- a/www-client/epiphany-extensions/files/digest-epiphany-extensions-2.16.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 93a8d37175dc1f173c0185c254de5c38 epiphany-extensions-2.16.1.tar.bz2 810858
-RMD160 95e11ed5b39bc1662fa606797c32c413c08326b3 epiphany-extensions-2.16.1.tar.bz2 810858
-SHA256 315ef2eeaf2943830bdf04958af613dce62574aa6697acfab335a0b9e4f699c5 epiphany-extensions-2.16.1.tar.bz2 810858
diff --git a/www-client/epiphany-extensions/files/digest-epiphany-extensions-2.20.0 b/www-client/epiphany-extensions/files/digest-epiphany-extensions-2.20.0
deleted file mode 100644
index 0a652f26ae98..000000000000
--- a/www-client/epiphany-extensions/files/digest-epiphany-extensions-2.20.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8405528808ec2cc287d1ba6547203c75 epiphany-extensions-2.20.0.tar.bz2 908747
-RMD160 b4050ec523fb68bd8c838181cd30a0ae871f6aad epiphany-extensions-2.20.0.tar.bz2 908747
-SHA256 39fcc2ba3a92567dd0f2462c9bac7cc6a52543ebc0807a039077df92c6043906 epiphany-extensions-2.20.0.tar.bz2 908747
diff --git a/www-client/epiphany-extensions/files/digest-epiphany-extensions-2.20.3 b/www-client/epiphany-extensions/files/digest-epiphany-extensions-2.20.3
new file mode 100644
index 000000000000..afc25ac458a0
--- /dev/null
+++ b/www-client/epiphany-extensions/files/digest-epiphany-extensions-2.20.3
@@ -0,0 +1,3 @@
+MD5 86563cb1e7cda31d45f220ae2e185fef epiphany-extensions-2.20.3.tar.bz2 909040
+RMD160 f3fac0a4cc17b3120f0414f0467ff36c24e77dd2 epiphany-extensions-2.20.3.tar.bz2 909040
+SHA256 3b19652c6717d9f1dbfc2b855e9777e58623247765accbe8cfc7b86cb840aea2 epiphany-extensions-2.20.3.tar.bz2 909040