Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/files/, games-emulation/openmsx/
Date: Wed, 29 Aug 2018 22:18:14
Message-Id: 1535581078.79b3c537aa2945a8cd29334f5a07fd1dfe508833.chewi@gentoo
1 commit: 79b3c537aa2945a8cd29334f5a07fd1dfe508833
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 29 22:16:44 2018 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 29 22:17:58 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b3c537
7
8 games-emulation/openmsx: Fix SDL_ttf probe, add Python dep, EAPI 7
9
10 Closes: https://bugs.gentoo.org/655888
11 Package-Manager: Portage-2.3.48, Repoman-2.3.10
12
13 games-emulation/openmsx/files/sdl-ttf.patch | 12 ++++++++++++
14 games-emulation/openmsx/openmsx-0.14.0.ebuild | 19 ++++++++++++++-----
15 2 files changed, 26 insertions(+), 5 deletions(-)
16
17 diff --git a/games-emulation/openmsx/files/sdl-ttf.patch b/games-emulation/openmsx/files/sdl-ttf.patch
18 new file mode 100644
19 index 00000000000..6ff469e509e
20 --- /dev/null
21 +++ b/games-emulation/openmsx/files/sdl-ttf.patch
22 @@ -0,0 +1,12 @@
23 +diff -Naur a/build/libraries.py b/build/libraries.py
24 +--- a/build/libraries.py 2017-08-03 11:26:28.000000000 +0100
25 ++++ b/build/libraries.py 2018-08-29 23:11:04.392981071 +0100
26 +@@ -304,7 +304,7 @@
27 + class SDL_ttf(Library):
28 + libName = 'SDL_ttf'
29 + makeName = 'SDL_TTF'
30 +- header = '<SDL_ttf.h>'
31 ++ header = '<SDL/SDL_ttf.h>'
32 + function = 'TTF_OpenFont'
33 + dependsOn = ('SDL', 'FREETYPE')
34 +
35
36 diff --git a/games-emulation/openmsx/openmsx-0.14.0.ebuild b/games-emulation/openmsx/openmsx-0.14.0.ebuild
37 index 8b39565b4be..42d560e04cd 100644
38 --- a/games-emulation/openmsx/openmsx-0.14.0.ebuild
39 +++ b/games-emulation/openmsx/openmsx-0.14.0.ebuild
40 @@ -1,17 +1,19 @@
41 # Copyright 1999-2018 Gentoo Foundation
42 # Distributed under the terms of the GNU General Public License v2
43
44 -EAPI=6
45 -inherit desktop readme.gentoo-r1
46 +EAPI=7
47 +
48 +PYTHON_COMPAT=( python2_7 )
49 +
50 +inherit desktop python-any-r1 readme.gentoo-r1
51
52 DESCRIPTION="MSX emulator that aims for perfection"
53 HOMEPAGE="http://openmsx.org/"
54 -SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_0_14_0/${P}.tar.gz"
55 +SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz"
56
57 LICENSE="GPL-2"
58 SLOT="0"
59 KEYWORDS="~amd64 ~ppc64 ~x86"
60 -IUSE=""
61
62 RDEPEND="
63 dev-lang/tcl:0=
64 @@ -23,7 +25,14 @@ RDEPEND="
65 media-libs/sdl-ttf
66 virtual/opengl
67 "
68 -DEPEND="${RDEPEND}"
69 +DEPEND="
70 + ${RDEPEND}
71 + ${PYTHON_DEPS}
72 +"
73 +
74 +PATCHES=(
75 + "${FILESDIR}"/sdl-ttf.patch
76 +)
77
78 DOC_CONTENTS="
79 If you want to if you want to emulate real MSX systems and not