summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-03-10 07:44:23 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-03-10 07:44:23 +0000
commit9ecabe4ec1c27ce20dbe674d23b5c8382c91b785 (patch)
tree049625e6c23434eb9e9a0ef6186705711531e014 /x11-libs
parentStable for arm (bug #391473). (diff)
downloadgentoo-2-9ecabe4ec1c27ce20dbe674d23b5c8382c91b785.tar.gz
gentoo-2-9ecabe4ec1c27ce20dbe674d23b5c8382c91b785.tar.bz2
gentoo-2-9ecabe4ec1c27ce20dbe674d23b5c8382c91b785.zip
Skip tests if gnome-themes-standard-3.2 is not installed (see bug #398789, reported by Pacho Ramos).
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/gtk+/ChangeLog6
-rw-r--r--x11-libs/gtk+/gtk+-3.2.3.ebuild13
2 files changed, 16 insertions, 3 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 39c3397326e1..f717546444d5 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/gtk+
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.567 2012/03/05 22:19:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.568 2012/03/10 07:44:23 tetromino Exp $
+
+ 10 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gtk+-3.2.3.ebuild:
+ Skip tests if gnome-themes-standard-3.2 is not installed (see bug #398789,
+ reported by Pacho Ramos).
05 Mar 2012; Brent Baude <ranger@gentoo.org> gtk+-2.24.8-r1.ebuild:
Marking gtk+-2.24.8-r1 ppc stable for bug 393007
diff --git a/x11-libs/gtk+/gtk+-3.2.3.ebuild b/x11-libs/gtk+/gtk+-3.2.3.ebuild
index 1ab9647fdf4c..2ac32cadae67 100644
--- a/x11-libs/gtk+/gtk+-3.2.3.ebuild
+++ b/x11-libs/gtk+/gtk+-3.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.3.ebuild,v 1.1 2011/12/28 04:54:15 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.3.ebuild,v 1.2 2012/03/10 07:44:23 tetromino Exp $
EAPI="4"
@@ -150,6 +150,15 @@ src_configure() {
}
src_test() {
+ # Tests require a new gnome-themes-standard, but adding it to DEPEND
+ # would result in circular dependencies.
+ # bug #398789, https://bugzilla.gnome.org/show_bug.cgi?id=669562
+ if ! has_version '=x11-themes/gnome-themes-standard-3.2*'; then
+ ewarn "Tests will be skipped beecause =gnome-themes-standard-3.2*"
+ ewarn "is not installed. Please re-run tests after installing the"
+ ewarn "required version of gnome-themes-standard."
+ return 0
+ fi
unset DBUS_SESSION_BUS_ADDRESS
# Exporting HOME fixes tests using XDG directories spec since all defaults
# are based on $HOME. It is also backward compatible with functions not