From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S1mWz-0007bl-TS for garchives@archives.gentoo.org; Sun, 26 Feb 2012 22:25:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5837DE1417; Sun, 26 Feb 2012 22:25:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 11955E1417 for ; Sun, 26 Feb 2012 22:25:15 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35C5064273 for ; Sun, 26 Feb 2012 22:25:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C6C20E53FD for ; Sun, 26 Feb 2012 22:25:13 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1330295038.97dc4791c6de898efcce3cf856db2c90a96b9db0.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: www-client/epiphany/ X-VCS-Repository: proj/gnome X-VCS-Files: www-client/epiphany/epiphany-3.3.5.ebuild www-client/epiphany/epiphany-3.3.90.ebuild www-client/epiphany/epiphany-9999.ebuild X-VCS-Directories: www-client/epiphany/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 97dc4791c6de898efcce3cf856db2c90a96b9db0 X-VCS-Branch: master Date: Sun, 26 Feb 2012 22:25:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b64e4722-bd78-4b33-bcc6-2bc068a0ee5c X-Archives-Hash: 0c29f638cc5c012a4340ea422a34d204 commit: 97dc4791c6de898efcce3cf856db2c90a96b9db0 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Sun Feb 26 22:01:37 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Sun Feb 26 22:23:58 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D97dc4791 www-client/epiphany: 3.3.5 =E2=86=92 3.3.90 Bump and clean up ebuild. Test suite requires gsettings schemas from epiphany-3.3.5. --- ...piphany-3.3.5.ebuild =3D> 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/epiph= any/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=3D"4" GCONF_DEBUG=3D"yes" =20 -inherit eutils gnome2 +inherit eutils gnome2 versionator virtualx =20 DESCRIPTION=3D"GNOME webbrowser based on Webkit" HOMEPAGE=3D"http://projects.gnome.org/epiphany/" @@ -16,7 +16,7 @@ IUSE=3D"avahi doc +introspection +nss test" KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" =20 # XXX: Should we add seed support? Seed seems to be unmaintained now. -COMMON_DEPEND=3D">=3Ddev-libs/glib-2.31.2:2 +RDEPEND=3D">=3Ddev-libs/glib-2.31.2:2 >=3Dx11-libs/gtk+-3.3.14:3[introspection?] >=3Ddev-libs/libxml2-2.6.12:2 >=3Ddev-libs/libxslt-1.1.7 @@ -31,14 +31,13 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.31.2:2 x11-libs/libSM x11-libs/libX11 =20 - app-misc/ca-certificates x11-themes/gnome-icon-theme + x11-themes/gnome-icon-theme-symbolic =20 avahi? ( >=3Dnet-dns/avahi-0.6.22 ) introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 ) nss? ( dev-libs/nss )" -DEPEND=3D"${COMMON_DEPEND}" -DEPEND=3D"${COMMON_DEPEND} +DEPEND=3D"${RDEPEND} app-text/gnome-doc-utils >=3Ddev-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 >=3Depiphany-3.3.5 to be install= ed + local v=3D$(best_version www-client/epiphany) + v=3D${v/www-client\/epiphany-/} + if version_is_at_least 3.3.5 "${v}"; then + Xemake check + else + ewarn "Skipping tests. To run tests, >=3D${PN}-3.3.5 needs to be alrea= dy" + ewarn "installed on the system." + fi +} diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epipha= ny/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.e= build,v 1.1 2010/06/13 21:09:33 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.2.1.eb= uild,v 1.1 2011/11/06 04:57:01 tetromino Exp $ =20 EAPI=3D"4" GCONF_DEBUG=3D"yes" =20 -inherit eutils gnome2 +inherit eutils gnome2 versionator virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -15,15 +15,15 @@ HOMEPAGE=3D"http://projects.gnome.org/epiphany/" =20 LICENSE=3D"GPL-2" SLOT=3D"0" -IUSE=3D"avahi doc +introspection nss test" +IUSE=3D"avahi doc +introspection +nss test" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else - KEYWORDS=3D"~alpha ~amd64 ~ia64 ~sparc ~x86" + KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" fi =20 # XXX: Should we add seed support? Seed seems to be unmaintained now. -COMMON_DEPEND=3D">=3Ddev-libs/glib-2.31.2:2 +RDEPEND=3D">=3Ddev-libs/glib-2.31.2:2 >=3Dx11-libs/gtk+-3.3.14:3[introspection?] >=3Ddev-libs/libxml2-2.6.12:2 >=3Ddev-libs/libxslt-1.1.7 @@ -38,21 +38,19 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.31.2:2 x11-libs/libSM x11-libs/libX11 =20 - app-misc/ca-certificates x11-themes/gnome-icon-theme + x11-themes/gnome-icon-theme-symbolic =20 avahi? ( >=3Dnet-dns/avahi-0.6.22 ) introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 ) nss? ( dev-libs/nss )" -RDEPEND=3D"${COMMON_DEPEND}" -DEPEND=3D"${COMMON_DEPEND} +DEPEND=3D"${RDEPEND} app-text/gnome-doc-utils >=3Ddev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext doc? ( >=3Ddev-util/gtk-doc-1 )" =20 - pkg_setup() { DOCS=3D"AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO" G2CONF=3D"${G2CONF} @@ -66,3 +64,15 @@ pkg_setup() { $(use_enable nss) $(use_enable test tests)" } + +src_test() { + # Tests require gsettings schemas from >=3Depiphany-3.3.5 to be install= ed + local v=3D$(best_version www-client/epiphany) + v=3D${v/www-client\/epiphany-/} + if version_is_at_least 3.3.5 "${v}"; then + Xemake check + else + ewarn "Skipping tests. To run tests, >=3D${PN}-3.3.5 needs to be alrea= dy" + ewarn "installed on the system." + fi +}