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

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     97dc4791c6de898efcce3cf856db2c90a96b9db0
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 22:01:37 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Feb 26 22:23:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=97dc4791

www-client/epiphany: 3.3.5 → 3.3.90

Bump and clean up ebuild. Test suite requires gsettings schemas from
epiphany-3.3.5.

---
 ...piphany-3.3.5.ebuild => epiphany-3.3.90.ebuild} |   21 +++++++++++---
 www-client/epiphany/epiphany-9999.ebuild           |   28 +++++++++++++------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.3.5.ebuild b/www-client/epiphany/epiphany-3.3.90.ebuild
similarity index 76%
rename from www-client/epiphany/epiphany-3.3.5.ebuild
rename to www-client/epiphany/epiphany-3.3.90.ebuild
index 37028b7..7196555 100644
--- a/www-client/epiphany/epiphany-3.3.5.ebuild
+++ b/www-client/epiphany/epiphany-3.3.90.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2
+inherit eutils gnome2 versionator virtualx
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
@@ -16,7 +16,7 @@ IUSE="avahi doc +introspection +nss test"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-COMMON_DEPEND=">=dev-libs/glib-2.31.2:2
+RDEPEND=">=dev-libs/glib-2.31.2:2
 	>=x11-libs/gtk+-3.3.14:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
@@ -31,14 +31,13 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.2:2
 	x11-libs/libSM
 	x11-libs/libX11
 
-	app-misc/ca-certificates
 	x11-themes/gnome-icon-theme
+	x11-themes/gnome-icon-theme-symbolic
 
 	avahi? ( >=net-dns/avahi-0.6.22 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	nss? ( dev-libs/nss )"
-DEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
@@ -58,3 +57,15 @@ pkg_setup() {
 		$(use_enable nss)
 		$(use_enable test tests)"
 }
+
+src_test() {
+	# Tests require gsettings schemas from >=epiphany-3.3.5 to be installed
+	local v=$(best_version www-client/epiphany)
+	v=${v/www-client\/epiphany-/}
+	if version_is_at_least 3.3.5 "${v}"; then
+		Xemake check
+	else
+		ewarn "Skipping tests. To run tests, >=${PN}-3.3.5 needs to be already"
+		ewarn "installed on the system."
+	fi
+}

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 6216de9..1377caf 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -1,11 +1,11 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.2.1.ebuild,v 1.1 2011/11/06 04:57:01 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2
+inherit eutils gnome2 versionator virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -15,15 +15,15 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avahi doc +introspection nss test"
+IUSE="avahi doc +introspection +nss test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-COMMON_DEPEND=">=dev-libs/glib-2.31.2:2
+RDEPEND=">=dev-libs/glib-2.31.2:2
 	>=x11-libs/gtk+-3.3.14:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
@@ -38,21 +38,19 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.2:2
 	x11-libs/libSM
 	x11-libs/libX11
 
-	app-misc/ca-certificates
 	x11-themes/gnome-icon-theme
+	x11-themes/gnome-icon-theme-symbolic
 
 	avahi? ( >=net-dns/avahi-0.6.22 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	nss? ( dev-libs/nss )"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
+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}
@@ -66,3 +64,15 @@ pkg_setup() {
 		$(use_enable nss)
 		$(use_enable test tests)"
 }
+
+src_test() {
+	# Tests require gsettings schemas from >=epiphany-3.3.5 to be installed
+	local v=$(best_version www-client/epiphany)
+	v=${v/www-client\/epiphany-/}
+	if version_is_at_least 3.3.5 "${v}"; then
+		Xemake check
+	else
+		ewarn "Skipping tests. To run tests, >=${PN}-3.3.5 needs to be already"
+		ewarn "installed on the system."
+	fi
+}