Version bump

(Portage version: 2.1.3_rc5)

6 files changed, 23 insertions, 86 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 7251c254bde5..a8cc83e22a0b 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,15 @@
 # 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.112 2007/06/02 02:52:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.113 2007/06/29 14:10:11 leio Exp $
+
+*epiphany-2.18.2 (29 Jun 2007)
+
+  29 Jun 2007; Mart Raudsepp <leio@gentoo.org> -epiphany-2.16.2.ebuild,
+  -epiphany-2.18.0.ebuild, +epiphany-2.18.2.ebuild:
+  Version bump
+  - Middle clicking the Go button opens the URL in a new tab
+  - Recognize quicktime mime types as safe
+  - Avoid opening nautilus if downloads go on Desktop
 
   02 Jun 2007; Brent Baude <ranger@gentoo.org> epiphany-2.16.3.ebuild:
   Marking epiphany-2.16.3 ppc stable for bug #171107
diff --git a/www-client/epiphany/epiphany-2.16.2.ebuild b/www-client/epiphany/epiphany-2.16.2.ebuild
deleted file mode 100644
index 936258bf9760..000000000000
--- a/www-client/epiphany/epiphany-2.16.2.ebuild
+++ /dev/null
@@ -1,76 +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.2.ebuild,v 1.11 2007/02/04 08:58:23 corsair Exp $
-
-WANT_AUTOMAKE=1.9
-WANT_AUTOCONF=2.5
-
-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"
-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
-		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) )
-	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
-
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR=". ${S}/m4" \
-	eautoreconf || die "Failed to reconfigure"
-}
-
-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.0.ebuild b/www-client/epiphany/epiphany-2.18.2.ebuild
index e4b09f17929c..64d4b2a6998b 100644
--- a/www-client/epiphany/epiphany-2.18.0.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.0.ebuild,v 1.1 2007/03/27 18:25:09 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.18.2.ebuild,v 1.1 2007/06/29 14:10:11 leio Exp $
 
 WANT_AUTOMAKE=1.9
 inherit eutils gnome2 multilib autotools
@@ -23,8 +23,7 @@ RDEPEND=">=dev-libs/glib-2.12
 	>=gnome-base/libgnomeui-2.14
 	>=gnome-base/gnome-desktop-2.9.91
 	>=x11-libs/startup-notification-0.5
-	|| ( >=dev-libs/dbus-glib-0.71
-		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) )
+	>=dev-libs/dbus-glib-0.71
 	>=gnome-base/gconf-2
 	>=app-text/iso-codes-0.35
 	!xulrunner? ( >=www-client/mozilla-firefox-1.5 )
@@ -58,6 +57,14 @@ pkg_setup() {
 	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
+}
+
 src_compile() {
 	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat
 	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat.tmp
diff --git a/www-client/epiphany/files/digest-epiphany-2.16.2 b/www-client/epiphany/files/digest-epiphany-2.16.2
deleted file mode 100644
index 07252d42eb92..000000000000
--- a/www-client/epiphany/files/digest-epiphany-2.16.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6d4ca4c3c1fb52b432ad3f5006866b6b epiphany-2.16.2.tar.bz2 4229155
-RMD160 f9c65ccae1328ae3f0032950dff409a4eb6ad299 epiphany-2.16.2.tar.bz2 4229155
-SHA256 3b0ce7104ef9f2b9c22998aa28e715d48c76c3333f573472fbbabb1ed7ad13c6 epiphany-2.16.2.tar.bz2 4229155
diff --git a/www-client/epiphany/files/digest-epiphany-2.18.0 b/www-client/epiphany/files/digest-epiphany-2.18.0
deleted file mode 100644
index 332a2b69851c..000000000000
--- a/www-client/epiphany/files/digest-epiphany-2.18.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3ac47fcf7e9875885c3f4d53dac24b7c epiphany-2.18.0.tar.bz2 4658364
-RMD160 c3299202ae57688e3f7a17a4b0c202b219ebc9a8 epiphany-2.18.0.tar.bz2 4658364
-SHA256 92c8f698a101ff2fdd9a83b96a5a37376be839df9d918c084c6551a7db587fd5 epiphany-2.18.0.tar.bz2 4658364
diff --git a/www-client/epiphany/files/digest-epiphany-2.18.2 b/www-client/epiphany/files/digest-epiphany-2.18.2
new file mode 100644
index 000000000000..05a27f51f98a
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-2.18.2
@@ -0,0 +1,3 @@
+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