1 |
commit: 3b9cedf4da105de40fe70438aae8b36b59575638 |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 3 10:28:49 2017 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 3 10:28:49 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3b9cedf4 |
7 |
|
8 |
games-board/aisleriot: sync live ebuild |
9 |
|
10 |
Drop CVS era $Id$. |
11 |
|
12 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
13 |
Manifest-Sign-Key: 0x5A56C8CD0C13248A |
14 |
|
15 |
games-board/aisleriot/aisleriot-3.22.2.ebuild | 3 +-- |
16 |
games-board/aisleriot/aisleriot-9999.ebuild | 20 ++++++++++---------- |
17 |
2 files changed, 11 insertions(+), 12 deletions(-) |
18 |
|
19 |
diff --git a/games-board/aisleriot/aisleriot-3.22.2.ebuild b/games-board/aisleriot/aisleriot-3.22.2.ebuild |
20 |
index c492247a..99832f9a 100644 |
21 |
--- a/games-board/aisleriot/aisleriot-3.22.2.ebuild |
22 |
+++ b/games-board/aisleriot/aisleriot-3.22.2.ebuild |
23 |
@@ -1,6 +1,5 @@ |
24 |
# Copyright 1999-2017 Gentoo Foundation |
25 |
-# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Id$ |
27 |
+# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
EAPI=6 |
30 |
GNOME2_EAUTORECONF="yes" |
31 |
|
32 |
diff --git a/games-board/aisleriot/aisleriot-9999.ebuild b/games-board/aisleriot/aisleriot-9999.ebuild |
33 |
index 77df6e25..235e0ac6 100644 |
34 |
--- a/games-board/aisleriot/aisleriot-9999.ebuild |
35 |
+++ b/games-board/aisleriot/aisleriot-9999.ebuild |
36 |
@@ -1,10 +1,10 @@ |
37 |
-# Copyright 1999-2016 Gentoo Foundation |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
-# $Id$ |
40 |
+# Copyright 1999-2017 Gentoo Foundation |
41 |
+# Distributed under the terms of the GNU General Public License v2 |
42 |
|
43 |
EAPI=6 |
44 |
+GNOME2_EAUTORECONF="yes" |
45 |
|
46 |
-inherit autotools gnome2 |
47 |
+inherit gnome2 |
48 |
if [[ ${PV} = 9999 ]]; then |
49 |
inherit gnome2-live |
50 |
fi |
51 |
@@ -39,18 +39,18 @@ DEPEND="${COMMON_DEPEND} |
52 |
>=dev-util/intltool-0.40.4 |
53 |
gnome-base/gnome-common |
54 |
sys-apps/lsb-release |
55 |
+ sys-devel/autoconf-archive |
56 |
>=sys-devel/gettext-0.12 |
57 |
virtual/pkgconfig |
58 |
gnome? ( app-text/docbook-xml-dtd:4.3 ) |
59 |
" |
60 |
|
61 |
-src_prepare() { |
62 |
+PATCHES=( |
63 |
# Fix SVG detection and usage |
64 |
- eapply "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch |
65 |
- |
66 |
- eautoreconf |
67 |
- gnome2_src_prepare |
68 |
-} |
69 |
+ "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch |
70 |
+ # Fix build with Qt5, bug #617256 |
71 |
+ "${FILESDIR}"/${PN}-3.22.2-qt5-requires-cxx11.patch |
72 |
+) |
73 |
|
74 |
src_configure() { |
75 |
local myconf=() |