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 1S54ny-0002Tn-La for garchives@archives.gentoo.org; Wed, 07 Mar 2012 00:32:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D595E0D35; Wed, 7 Mar 2012 00:32:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2E320E0D35 for ; Wed, 7 Mar 2012 00:32:22 +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 5288C1B4008 for ; Wed, 7 Mar 2012 00:32:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EC216E542E for ; Wed, 7 Mar 2012 00:32:18 +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: <1331079955.ce57a84690c31c024c193ca866f7783d3b91c8e5.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-libs/gtk+/gtk+-3.3.16.ebuild x11-libs/gtk+/gtk+-3.3.18.ebuild x11-libs/gtk+/gtk+-9999.ebuild X-VCS-Directories: x11-libs/gtk+/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: ce57a84690c31c024c193ca866f7783d3b91c8e5 X-VCS-Branch: master Date: Wed, 7 Mar 2012 00:32:18 +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: a87d3fb6-22c9-4c81-acd4-8a51dc95b2fa X-Archives-Hash: db3dd8240e8e5165317ebb51ff66109c commit: ce57a84690c31c024c193ca866f7783d3b91c8e5 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Wed Mar 7 00:25:55 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Wed Mar 7 00:25:55 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dce57a846 x11-libs/gtk+: 3.3.16 =E2=86=92 3.3.18 Instead of restricting tests, we should simply skip them if a new enough version of gnome-themes-standard is not installed. --- .../{gtk+-3.3.16.ebuild =3D> gtk+-3.3.18.ebuild} | 15 ++++++++++--= --- x11-libs/gtk+/gtk+-9999.ebuild | 15 ++++++++++----= - 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/x11-libs/gtk+/gtk+-3.3.16.ebuild b/x11-libs/gtk+/gtk+-3.3.18= .ebuild similarity index 92% rename from x11-libs/gtk+/gtk+-3.3.16.ebuild rename to x11-libs/gtk+/gtk+-3.3.18.ebuild index 10fe626..d82c7c6 100644 --- a/x11-libs/gtk+/gtk+-3.3.16.ebuild +++ b/x11-libs/gtk+/gtk+-3.3.18.ebuild @@ -26,10 +26,6 @@ else KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc= ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-ma= cos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi =20 -# Testing is broken badly: -# https://bugzilla.gnome.org/show_bug.cgi?id=3D669562 -RESTRICT=3D"test" - # FIXME: introspection data is built against system installation of gtk+= :3 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautor= econf) # Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert @@ -53,7 +49,7 @@ COMMON_DEPEND=3D"!aqua? ( >=3Dx11-libs/gdk-pixbuf-2.25.2:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) - >=3Ddev-libs/glib-2.31.18 + >=3Ddev-libs/glib-2.31.20 >=3Dx11-libs/pango-1.29.0[introspection?] >=3Ddev-libs/atk-2.1.5[introspection?] >=3Dx11-libs/gtk+-2.24:2 @@ -154,6 +150,15 @@ src_configure() { } =20 src_test() { + # Tests require a new gnome-themes-standard, but adding it to DEPEND + # would result in circular dependencies. + # https://bugzilla.gnome.org/show_bug.cgi?id=3D669562 + if ! has_version '>=3Dx11-themes/gnome-themes-standard-3.3.91'; then + ewarn "Tests will be skipped beecause >=3Dgnome-themes-standard-3.3.90= " + 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 defau= lts # are based on $HOME. It is also backward compatible with functions not diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebu= ild index 10fe626..d82c7c6 100644 --- a/x11-libs/gtk+/gtk+-9999.ebuild +++ b/x11-libs/gtk+/gtk+-9999.ebuild @@ -26,10 +26,6 @@ else KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc= ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-ma= cos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi =20 -# Testing is broken badly: -# https://bugzilla.gnome.org/show_bug.cgi?id=3D669562 -RESTRICT=3D"test" - # FIXME: introspection data is built against system installation of gtk+= :3 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautor= econf) # Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert @@ -53,7 +49,7 @@ COMMON_DEPEND=3D"!aqua? ( >=3Dx11-libs/gdk-pixbuf-2.25.2:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) - >=3Ddev-libs/glib-2.31.18 + >=3Ddev-libs/glib-2.31.20 >=3Dx11-libs/pango-1.29.0[introspection?] >=3Ddev-libs/atk-2.1.5[introspection?] >=3Dx11-libs/gtk+-2.24:2 @@ -154,6 +150,15 @@ src_configure() { } =20 src_test() { + # Tests require a new gnome-themes-standard, but adding it to DEPEND + # would result in circular dependencies. + # https://bugzilla.gnome.org/show_bug.cgi?id=3D669562 + if ! has_version '>=3Dx11-themes/gnome-themes-standard-3.3.91'; then + ewarn "Tests will be skipped beecause >=3Dgnome-themes-standard-3.3.90= " + 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 defau= lts # are based on $HOME. It is also backward compatible with functions not