From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-970709-garchives=archives.gentoo.org@lists.gentoo.org>
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 53A7B1396D2
for <garchives@archives.gentoo.org>; Sun, 3 Sep 2017 10:30:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5A621E0BCF;
Sun, 3 Sep 2017 10:30:27 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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 3039DE0BCF
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Sep 2017 10:30:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 E4FBA3416A1
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Sep 2017 10:30:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A4DF18C69
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Sep 2017 10:30:24 +0000 (UTC)
From: "Gilles Dartiguelongue" <eva@gentoo.org>
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" <eva@gentoo.org>
Message-ID: <1504434529.3b9cedf4da105de40fe70438aae8b36b59575638.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.2.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: 3b9cedf4da105de40fe70438aae8b36b59575638
X-VCS-Branch: master
Date: Sun, 3 Sep 2017 10:30:24 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 26eee9d6-334f-425b-83c0-70fa1ca000f5
X-Archives-Hash: c658a278dcb77840cd8557c4f4df79ff
commit: 3b9cedf4da105de40fe70438aae8b36b59575638
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 3 10:28:49 2017 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Sep 3 10:28:49 2017 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3b9cedf4
games-board/aisleriot: sync live ebuild
Drop CVS era $Id$.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Manifest-Sign-Key: 0x5A56C8CD0C13248A
games-board/aisleriot/aisleriot-3.22.2.ebuild | 3 +--
games-board/aisleriot/aisleriot-9999.ebuild | 20 ++++++++++----------
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/games-board/aisleriot/aisleriot-3.22.2.ebuild b/games-board/aisleriot/aisleriot-3.22.2.ebuild
index c492247a..99832f9a 100644
--- a/games-board/aisleriot/aisleriot-3.22.2.ebuild
+++ b/games-board/aisleriot/aisleriot-3.22.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
+# Distributed under the terms of the GNU General Public License v2
EAPI=6
GNOME2_EAUTORECONF="yes"
diff --git a/games-board/aisleriot/aisleriot-9999.ebuild b/games-board/aisleriot/aisleriot-9999.ebuild
index 77df6e25..235e0ac6 100644
--- a/games-board/aisleriot/aisleriot-9999.ebuild
+++ b/games-board/aisleriot/aisleriot-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
EAPI=6
+GNOME2_EAUTORECONF="yes"
-inherit autotools gnome2
+inherit gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -39,18 +39,18 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/intltool-0.40.4
gnome-base/gnome-common
sys-apps/lsb-release
+ sys-devel/autoconf-archive
>=sys-devel/gettext-0.12
virtual/pkgconfig
gnome? ( app-text/docbook-xml-dtd:4.3 )
"
-src_prepare() {
+PATCHES=(
# Fix SVG detection and usage
- eapply "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
-
- eautoreconf
- gnome2_src_prepare
-}
+ "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
+ # Fix build with Qt5, bug #617256
+ "${FILESDIR}"/${PN}-3.22.2-qt5-requires-cxx11.patch
+)
src_configure() {
local myconf=()