[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Nirbheek Chauhan]

commit:     ed845bf185be4bf7c50853acd8e26b72359653cf
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 20:52:42 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 20:52:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ed845bf1

www-client/epiphany: 2.91.6 -> 2.91.90, remove old, update live

---
 www-client/epiphany/epiphany-2.91.5.ebuild         |   75 --------------------
 ...phany-2.91.6.ebuild => epiphany-2.91.90.ebuild} |    6 +-
 www-client/epiphany/epiphany-9999.ebuild           |    6 +-
 3 files changed, 6 insertions(+), 81 deletions(-)

diff --git a/www-client/epiphany/epiphany-2.91.5.ebuild b/www-client/epiphany/epiphany-2.91.5.ebuild
deleted file mode 100644
index 8f829ea..0000000
--- a/www-client/epiphany/epiphany-2.91.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.2.ebuild,v 1.1 2010/06/13 21:09:33 pacho Exp $
-
-EAPI="2"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="avahi doc +introspection networkmanager +nss test"
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
-fi
-
-# XXX: Should we add seed support? Seed seems to be unmaintained now.
-RDEPEND=">=dev-libs/glib-2.25.3
-	>=x11-libs/gtk+-2.99.0:3[introspection?]
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=x11-libs/startup-notification-0.5
-	>=dev-libs/dbus-glib-0.71
-	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.3.9:3[introspection?]
-	>=net-libs/libsoup-gnome-2.29.91
-	>=gnome-base/gnome-keyring-2.26.0
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	networkmanager? ( net-misc/networkmanager )
-	nss? ( dev-libs/nss )
-	x11-themes/gnome-icon-theme"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	gnome-base/gnome-common
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-shared
-		--disable-maintainer-mode
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-static
-		--with-distributor-name=Gentoo
-		--with-ca-file=${ROOT}/etc/ssl/certs/ca-certificates.crt
-		$(use_enable avahi zeroconf)
-		$(use_enable introspection)
-		$(use_enable networkmanager network-manager)
-		$(use_enable nss)
-		$(use_enable test tests)"
-}
-
-src_compile() {
-	# Fix sandbox error with USE="introspection"
-	# https://bugs.webkit.org/show_bug.cgi?id=35471
-	addpredict "$(unset HOME; echo ~)/.local"
-	emake || die "Compile failed"
-}

diff --git a/www-client/epiphany/epiphany-2.91.6.ebuild b/www-client/epiphany/epiphany-2.91.90.ebuild
similarity index 94%
rename from www-client/epiphany/epiphany-2.91.6.ebuild
rename to www-client/epiphany/epiphany-2.91.90.ebuild
index 47e30be..2101146 100644
--- a/www-client/epiphany/epiphany-2.91.6.ebuild
+++ b/www-client/epiphany/epiphany-2.91.90.ebuild
@@ -20,15 +20,15 @@ else
 fi
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-RDEPEND=">=dev-libs/glib-2.25.3
-	>=x11-libs/gtk+-2.99.0:3[introspection?]
+RDEPEND=">=dev-libs/glib-2.25.3:2
+	>=x11-libs/gtk+-3.0.0:3[introspection?]
 	>=dev-libs/libxml2-2.6.12
 	>=dev-libs/libxslt-1.1.7
 	>=x11-libs/startup-notification-0.5
 	>=dev-libs/dbus-glib-0.71
 	>=app-text/iso-codes-0.35
 	>=net-libs/webkit-gtk-1.3.11:3[introspection?]
-	>=net-libs/libsoup-gnome-2.33.1
+	>=net-libs/libsoup-gnome-2.33.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 47e30be..2101146 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -20,15 +20,15 @@ else
 fi
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-RDEPEND=">=dev-libs/glib-2.25.3
-	>=x11-libs/gtk+-2.99.0:3[introspection?]
+RDEPEND=">=dev-libs/glib-2.25.3:2
+	>=x11-libs/gtk+-3.0.0:3[introspection?]
 	>=dev-libs/libxml2-2.6.12
 	>=dev-libs/libxslt-1.1.7
 	>=x11-libs/startup-notification-0.5
 	>=dev-libs/dbus-glib-0.71
 	>=app-text/iso-codes-0.35
 	>=net-libs/webkit-gtk-1.3.11:3[introspection?]
-	>=net-libs/libsoup-gnome-2.33.1
+	>=net-libs/libsoup-gnome-2.33.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1