Version bump for Gnome 3.10

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 15 insertions, 118 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index e4ffc5abab70..e97cc72b9123 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.299 2013/12/08 19:41:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.300 2013/12/24 17:42:03 pacho Exp $
+
+*epiphany-3.10.3 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +epiphany-3.10.3.ebuild,
+  -epiphany-3.6.1.ebuild, -epiphany-3.8.1.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> epiphany-3.8.2.ebuild:
   x86 stable, bug #478252
diff --git a/www-client/epiphany/epiphany-3.8.1.ebuild b/www-client/epiphany/epiphany-3.10.3.ebuild
index 7ab677ec6ae0..99e59767d86a 100644
--- a/www-client/epiphany/epiphany-3.8.1.ebuild
+++ b/www-client/epiphany/epiphany-3.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.8.1.ebuild,v 1.1 2013/04/17 17:45:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.10.3.ebuild,v 1.1 2013/12/24 17:42:03 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -24,12 +24,11 @@ RDEPEND="
 	>=dev-libs/glib-2.35.6:2
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-1.11.92:3[jit?]
+	>=net-libs/webkit-gtk-2.2.2:3[jit?]
 	>=net-libs/libsoup-2.42.1:2.4
-	>=x11-libs/gtk+-3.7.10:3
+	>=x11-libs/gtk+-3.9.12:3
 	>=x11-libs/libnotify-0.5.1:=
 	gnome-base/gnome-desktop:3=
 
@@ -45,23 +44,14 @@ RDEPEND="
 # paxctl needed for bug #407085
 # eautoreconf requires gnome-common-3.5.5
 DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1
 	>=dev-util/intltool-0.50
 	sys-apps/paxctl
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	# Fix testsuite, upstream bug #698221
-	# FIXME: patches don't fix above bug, but I cannot then reach
-	# the test they are supposed to solve.
-#	epatch "${FILESDIR}/${PN}-3.7.5-test-gwarning.patch"
-#	sed -e '/\/do_migration_invalid/,+1 d' \
-#		-i tests/ephy-migration-test.c || die
-
-	gnome2_src_prepare
-}
+# Tests refuse to run with the gsettings trick for some reason
+RESTRICT="test"
 
 src_configure() {
 	gnome2_src_configure \
@@ -69,7 +59,8 @@ src_configure() {
 		--disable-static \
 		--with-distributor-name=Gentoo \
 		$(use_enable nss) \
-		$(use_enable test tests)
+		$(use_enable test tests) \
+		ITSTOOL=$(type -P true)
 }
 
 src_compile() {
@@ -82,9 +73,7 @@ src_test() {
 	# FIXME: this should be handled at eclass level
 	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
 
-	# FIXME:
-	#use jit && pax-mark m $(list-paxables tests/test*) #415801
-
+	unset DISPLAY
 	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
 }
 
diff --git a/www-client/epiphany/epiphany-3.6.1.ebuild b/www-client/epiphany/epiphany-3.6.1.ebuild
deleted file mode 100644
index ddb320b9ca06..000000000000
--- a/www-client/epiphany/epiphany-3.6.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.6.1.ebuild,v 1.5 2013/02/02 23:13:52 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 pax-utils versionator virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-# TODO: coverage
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+introspection +jit +nss test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=app-crypt/gcr-3.5.5
-	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.31.2:2
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gnome-keyring-2.26.0
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-1.9.6:3[jit?,introspection?]
-	>=net-libs/libsoup-gnome-2.39.6:2.4
-	>=x11-libs/gtk+-3.5.2:3[introspection?]
-	>=x11-libs/libnotify-0.5.1:=
-	gnome-base/gnome-desktop:3=
-
-	dev-db/sqlite:3
-	x11-libs/libX11
-
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	nss? ( dev-libs/nss )
-"
-# paxctl needed for bug #407085
-# eautoreconf requires gnome-common-3.5.5
-DEPEND="${RDEPEND}
-	introspection? ( jit? ( >=gnome-base/gnome-common-3.5.5 ) )
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.50
-	sys-apps/paxctl
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix testsuite
-	epatch "${FILESDIR}/${PN}-3.6.1-test-gwarning.patch"
-	sed -e '/\/do_migration_invalid/,+1 d' \
-		-i tests/ephy-migration-test.c || die
-
-	# Build-time segfaults under PaX with USE=introspection when building
-	# against webkit-gtk[introspection,jit]
-	if use introspection && use jit; then
-		epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
-		cp "${FILESDIR}/paxctl.sh" "${S}/" || die
-		eautoreconf
-	fi
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-shared \
-		--disable-static \
-		--with-distributor-name=Gentoo \
-		$(use_enable introspection) \
-		$(use_enable nss) \
-		$(use_enable test tests)
-}
-
-src_compile() {
-	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	use jit && pax-mark m $(list-paxables tests/test*) #415801
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	gnome2_src_install
-	use jit && pax-mark m "${ED}usr/bin/epiphany"
-}