Bump to 3.0.4, from gnome overlay for GNOME 3, remove old

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

3 files changed, 73 insertions, 87 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 196b019064d6..4f1c3aed38d0 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.273 2011/04/30 17:38:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.274 2011/08/19 14:55:22 nirbheek Exp $
+
+*epiphany-3.0.4 (19 Aug 2011)
+
+  19 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -epiphany-2.30.6.ebuild,
+  +epiphany-3.0.4.ebuild:
+  Bump to 3.0.4, from gnome overlay for GNOME 3, remove old
 
   30 Apr 2011; Raúl Porcel <armin76@gentoo.org> epiphany-2.30.6-r1.ebuild:
   alpha/ia64/sparc stable wrt #364973
diff --git a/www-client/epiphany/epiphany-2.30.6.ebuild b/www-client/epiphany/epiphany-2.30.6.ebuild
deleted file mode 100644
index 90109cd8c7fb..000000000000
--- a/www-client/epiphany/epiphany-2.30.6.ebuild
+++ /dev/null
@@ -1,86 +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.6.ebuild,v 1.11 2011/03/22 19:46:27 ranger Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-
-# We are not ready for introspection yet
-IUSE="avahi doc +introspection networkmanager +nss test"
-
-# TODO: add seed support
-RDEPEND=">=dev-libs/glib-2.19.7:2
-	>=x11-libs/gtk+-2.19.5:2[introspection?]
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=x11-libs/startup-notification-0.5
-	>=x11-libs/libnotify-0.4
-	>=dev-libs/dbus-glib-0.71
-	>=gnome-base/gconf-2:2
-	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.2.3:2[introspection?]
-	>=net-libs/libsoup-gnome-2.29.91:2.4
-	>=gnome-base/gnome-keyring-2.26
-
-	x11-libs/libICE
-	x11-libs/libSM
-
-	app-misc/ca-certificates
-	x11-themes/gnome-icon-theme
-
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	networkmanager? ( net-misc/networkmanager )
-	nss? ( dev-libs/nss )"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1 )
-	gnome-base/gnome-common"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-maintainer-mode
-		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
-		$(use_enable introspection)
-		$(use_enable networkmanager network-manager)
-		$(use_enable nss)
-		$(use_enable test tests)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-
-	# introspection: Fix build by telling g-ir-scanner what the prefix is
-	epatch "${FILESDIR}"/${P}-introspection-prefix.patch
-
-	# DBUS_LIBS is needed for libephymain.la
-	epatch "${FILESDIR}"/${P}-dbus-fix.patch
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_compile() {
-	# Fix sandbox error with USE="introspection" and "doc"
-	# https://bugs.webkit.org/show_bug.cgi?id=35471
-	addpredict "$(unset HOME; echo ~)/.local"
-	gnome2_src_compile
-}
diff --git a/www-client/epiphany/epiphany-3.0.4.ebuild b/www-client/epiphany/epiphany-3.0.4.ebuild
new file mode 100644
index 000000000000..af764864b09d
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.0.4.ebuild
@@ -0,0 +1,66 @@
+# 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-3.0.4.ebuild,v 1.1 2011/08/19 14:55:22 nirbheek Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="http://projects.gnome.org/epiphany/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="avahi doc +introspection networkmanager +nss test"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# XXX: Should we add seed support? Seed seems to be unmaintained now.
+RDEPEND=">=dev-libs/glib-2.25.13:2
+	>=x11-libs/gtk+-3.0.2:3[introspection?]
+	>=dev-libs/libxml2-2.6.12:2
+	>=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.4.2:3[introspection?]
+	>=net-libs/libsoup-gnome-2.33.1:2.4
+	>=gnome-base/gnome-keyring-2.26.0
+	>=gnome-base/gsettings-desktop-schemas-0.0.1
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+
+	app-misc/ca-certificates
+	x11-themes/gnome-icon-theme
+
+	avahi? ( >=net-dns/avahi-0.6.22 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	networkmanager? ( net-misc/networkmanager )
+	nss? ( dev-libs/nss )
+"
+DEPEND="${RDEPEND}
+	app-text/gnome-doc-utils
+	>=dev-util/intltool-0.40
+	dev-util/pkgconfig
+	sys-devel/gettext
+	doc? ( >=dev-util/gtk-doc-1 )
+"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+	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)"
+}