[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/

[Gilles Dartiguelongue]

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=()