1 |
commit: 1ca61f87d38274aff4380d99e8e9534d495fd187 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 23 10:44:41 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 23 10:44:41 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ca61f87 |
7 |
|
8 |
games-arcade/gav: Port to EAPI 7 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/710348 |
11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
games-arcade/gav/files/gav-0.9.0-ldflags.patch | 21 ++++++++++--- |
15 |
games-arcade/gav/gav-0.9.0-r1.ebuild | 43 ++++++++++++++------------ |
16 |
2 files changed, 40 insertions(+), 24 deletions(-) |
17 |
|
18 |
diff --git a/games-arcade/gav/files/gav-0.9.0-ldflags.patch b/games-arcade/gav/files/gav-0.9.0-ldflags.patch |
19 |
index dd49e616166..8579ce878e7 100644 |
20 |
--- a/games-arcade/gav/files/gav-0.9.0-ldflags.patch |
21 |
+++ b/games-arcade/gav/files/gav-0.9.0-ldflags.patch |
22 |
@@ -1,6 +1,17 @@ |
23 |
---- a/CommonHeader.old 2010-10-12 13:08:23.000000000 +0200 |
24 |
-+++ b/CommonHeader 2010-10-12 13:08:48.000000000 +0200 |
25 |
-@@ -31,9 +31,9 @@ |
26 |
+--- a/CommonHeader |
27 |
++++ b/CommonHeader |
28 |
+@@ -22,18 +22,18 @@ |
29 |
+ NET = true |
30 |
+ |
31 |
+ LD = ld |
32 |
+-CXX = g++ |
33 |
+ |
34 |
+-CXXFLAGS= `sdl-config --cflags` -g -Wall -DAUDIO |
35 |
++CXXFLAGS+= `sdl-config --cflags` -Wall |
36 |
++CPPFLAGS+= -DAUDIO |
37 |
+ |
38 |
+ ifndef NET |
39 |
+ CXXFLAGS+= -DNONET |
40 |
endif |
41 |
|
42 |
ifdef NET |
43 |
@@ -12,8 +23,8 @@ |
44 |
endif |
45 |
|
46 |
SRCS = $(wildcard *.cpp) |
47 |
---- a/Makefile.Linux.old 2010-10-12 14:36:47.000000000 +0200 |
48 |
-+++ b/Makefile.Linux 2010-10-12 14:37:02.000000000 +0200 |
49 |
+--- a/Makefile.Linux |
50 |
++++ b/Makefile.Linux |
51 |
@@ -38,8 +38,7 @@ |
52 |
$(MAKE) -C $(@D:%_module.o=%) |
53 |
|
54 |
|
55 |
diff --git a/games-arcade/gav/gav-0.9.0-r1.ebuild b/games-arcade/gav/gav-0.9.0-r1.ebuild |
56 |
index 47e97a0e85a..06d00b3ebba 100644 |
57 |
--- a/games-arcade/gav/gav-0.9.0-r1.ebuild |
58 |
+++ b/games-arcade/gav/gav-0.9.0-r1.ebuild |
59 |
@@ -1,13 +1,15 @@ |
60 |
-# Copyright 1999-2018 Gentoo Foundation |
61 |
+# Copyright 1999-2020 Gentoo Authors |
62 |
# Distributed under the terms of the GNU General Public License v2 |
63 |
|
64 |
-EAPI=6 |
65 |
-inherit desktop |
66 |
+EAPI=7 |
67 |
+ |
68 |
+inherit desktop toolchain-funcs |
69 |
|
70 |
DESCRIPTION="GPL Arcade Volleyball" |
71 |
HOMEPAGE="http://gav.sourceforge.net/" |
72 |
# the themes are behind a lame php-counter script. |
73 |
-SRC_URI="mirror://sourceforge/gav/${P}.tar.gz |
74 |
+SRC_URI=" |
75 |
+ mirror://sourceforge/gav/${P}.tar.gz |
76 |
mirror://gentoo/fabeach.tgz |
77 |
mirror://gentoo/florindo.tgz |
78 |
mirror://gentoo/inverted.tgz |
79 |
@@ -19,34 +21,35 @@ SRC_URI="mirror://sourceforge/gav/${P}.tar.gz |
80 |
LICENSE="GPL-2" |
81 |
SLOT="0" |
82 |
KEYWORDS="~amd64 ~x86" |
83 |
-IUSE="" |
84 |
|
85 |
-DEPEND="media-libs/sdl-image[jpeg,png] |
86 |
+RDEPEND=" |
87 |
+ media-libs/sdl-image[jpeg,png] |
88 |
media-libs/sdl-net |
89 |
media-libs/libsdl[joystick,video]" |
90 |
-RDEPEND="${DEPEND}" |
91 |
+DEPEND="${RDEPEND}" |
92 |
+ |
93 |
+PATCHES=( |
94 |
+ "${FILESDIR}"/${P}-ldflags.patch |
95 |
+ "${FILESDIR}"/${P}-gcc43.patch |
96 |
+) |
97 |
|
98 |
src_prepare() { |
99 |
default |
100 |
|
101 |
local d |
102 |
- |
103 |
- eapply "${FILESDIR}"/${P}-ldflags.patch |
104 |
- |
105 |
- for d in . automa menu net ; do |
106 |
+ for d in . automa menu net; do |
107 |
cp ${d}/Makefile.Linux ${d}/Makefile || die "cp ${d}/Makefile failed" |
108 |
done |
109 |
|
110 |
- eapply "${FILESDIR}"/${P}-gcc43.patch |
111 |
- sed -i \ |
112 |
- -e "/^CXXFLAGS=/s: -g : ${CXXFLAGS} :" CommonHeader \ |
113 |
- || die "sed failed" |
114 |
- |
115 |
# Now, move the additional themes in the proper directory |
116 |
- mv ../{fabeach,florindo,inverted,naive,unnamed,yisus,yisus2} themes |
117 |
+ mv ../{fabeach,florindo,inverted,naive,unnamed,yisus,yisus2} themes || die |
118 |
|
119 |
- # no reason to have executable files in the themes |
120 |
- find themes -type f -exec chmod a-x \{\} \; |
121 |
+ # no reason to have executable bit set on themes |
122 |
+ find themes -type f -exec chmod a-x '{}' \; || die |
123 |
+} |
124 |
+ |
125 |
+src_configure() { |
126 |
+ tc-export CXX |
127 |
} |
128 |
|
129 |
src_compile() { |
130 |
@@ -60,7 +63,9 @@ src_compile() { |
131 |
src_install() { |
132 |
dodir /usr/bin |
133 |
emake ROOT="${D}" install |
134 |
+ |
135 |
insinto /usr/share/${PN} |
136 |
doins -r sounds |
137 |
+ |
138 |
einstalldocs |
139 |
} |