From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 18FB6138334 for ; Wed, 28 Nov 2018 13:08:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C7B2E07C9; Wed, 28 Nov 2018 13:08:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E029AE07C9 for ; Wed, 28 Nov 2018 13:08:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1DA60335C7F for ; Wed, 28 Nov 2018 13:08:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D06A7326 for ; Wed, 28 Nov 2018 13:08:12 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1543410485.8e378e2ee36fffd0adbfd6d42382584930554273.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/ X-VCS-Repository: proj/gnome X-VCS-Files: games-board/aisleriot/aisleriot-3.22.7.ebuild games-board/aisleriot/aisleriot-9999.ebuild X-VCS-Directories: games-board/aisleriot/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 8e378e2ee36fffd0adbfd6d42382584930554273 X-VCS-Branch: master Date: Wed, 28 Nov 2018 13:08:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ea71eeab-0732-485c-98bf-e2bd8c97f3cf X-Archives-Hash: 032e084eb21cf23e9667d12b7a1c8421 commit: 8e378e2ee36fffd0adbfd6d42382584930554273 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Wed Nov 28 13:02:54 2018 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Wed Nov 28 13:08:05 2018 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8e378e2e games-board/aisleriot: 3.22.5 → 3.22.7 Switch to guile-2.2. Drop unneeded USE-flag dependencies. Add missing glib-utils and libxml2 to DEPEND. Closes: https://bugs.gentoo.org/644068 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Manifest-Sign-Key: 0x5A56C8CD0C13248A Signed-off-by: Gilles Dartiguelongue gentoo.org> games-board/aisleriot/aisleriot-3.22.7.ebuild | 11 ++++++----- games-board/aisleriot/aisleriot-9999.ebuild | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/games-board/aisleriot/aisleriot-3.22.7.ebuild b/games-board/aisleriot/aisleriot-3.22.7.ebuild index 5f9a65ab..d103a6a9 100644 --- a/games-board/aisleriot/aisleriot-3.22.7.ebuild +++ b/games-board/aisleriot/aisleriot-3.22.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,11 +15,10 @@ KEYWORDS="~amd64 ~x86" IUSE="debug gnome qt5" # FIXME: quartz support? -# Does not build with guile-2.0.0 or 2.0.1 +# Lookup guile modules grep "use-modules" *.scm COMMON_DEPEND=" >=dev-libs/glib-2.32:2 - >=dev-scheme/guile-2.0.5:12[deprecated,regex] - =dev-scheme/guile-2.2:12 >=gnome-base/librsvg-2.32:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/cairo-1.10 @@ -30,6 +29,8 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} app-arch/gzip app-text/yelp-tools + dev-libs/libxml2:2 + dev-util/glib-utils >=dev-util/intltool-0.40.4 gnome-base/gnome-common sys-apps/lsb-release @@ -72,7 +73,7 @@ src_configure() { gnome2_src_configure \ --with-gtk=3.0 \ - --with-guile=2.0 \ + --with-guile=2.2 \ $(usex debug --enable-debug=yes --enable-debug=minimum) \ --enable-sound \ --with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \ diff --git a/games-board/aisleriot/aisleriot-9999.ebuild b/games-board/aisleriot/aisleriot-9999.ebuild index 16094c91..3ace1d8e 100644 --- a/games-board/aisleriot/aisleriot-9999.ebuild +++ b/games-board/aisleriot/aisleriot-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,11 +22,10 @@ fi IUSE="debug gnome qt5" # FIXME: quartz support? -# Does not build with guile-2.0.0 or 2.0.1 +# Lookup guile modules grep "use-modules" *.scm COMMON_DEPEND=" >=dev-libs/glib-2.32:2 - >=dev-scheme/guile-2.0.5:12[deprecated,regex] - =dev-scheme/guile-2.2:12 >=gnome-base/librsvg-2.32:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/cairo-1.10 @@ -37,6 +36,8 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} app-arch/gzip app-text/yelp-tools + dev-libs/libxml2:2 + dev-util/glib-utils >=dev-util/intltool-0.40.4 gnome-base/gnome-common sys-apps/lsb-release @@ -79,7 +80,7 @@ src_configure() { gnome2_src_configure \ --with-gtk=3.0 \ - --with-guile=2.0 \ + --with-guile=2.2 \ $(usex debug --enable-debug=yes --enable-debug=minimum) \ --enable-sound \ --with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \