1 |
commit: 9565273ac9876e5709c7745b0b9feda0c8ea1d9c |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 30 15:07:04 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 30 15:24:59 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9565273a |
7 |
|
8 |
dev-games/guichan: EAPI 7, fix slibtool build |
9 |
|
10 |
Thanks-to: orbea <orbea <AT> riseup.net> |
11 |
Closes: https://bugs.gentoo.org/779040 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
.../guichan/files/guichan-0.8.2-as-needed.patch | 8 ++-- |
15 |
.../files/guichan-0.8.2-automake-1.13.patch | 4 +- |
16 |
...ichan-0.8.2-slibtool-undefined-references.patch | 48 ++++++++++++++++++++++ |
17 |
dev-games/guichan/guichan-0.8.2.ebuild | 28 ++++++++----- |
18 |
4 files changed, 72 insertions(+), 16 deletions(-) |
19 |
|
20 |
diff --git a/dev-games/guichan/files/guichan-0.8.2-as-needed.patch b/dev-games/guichan/files/guichan-0.8.2-as-needed.patch |
21 |
index 79eb563c0f8..c4d8228e9ac 100644 |
22 |
--- a/dev-games/guichan/files/guichan-0.8.2-as-needed.patch |
23 |
+++ b/dev-games/guichan/files/guichan-0.8.2-as-needed.patch |
24 |
@@ -1,13 +1,13 @@ |
25 |
---- src/Makefile.am |
26 |
-+++ src/Makefile.am |
27 |
+--- a/src/Makefile.am |
28 |
++++ b/src/Makefile.am |
29 |
@@ -1,4 +1,4 @@ |
30 |
-SUBDIRS = widgets @GUICHAN_EXTRADIRS@ hge openlayer contrib |
31 |
+SUBDIRS = widgets . @GUICHAN_EXTRADIRS@ hge openlayer contrib |
32 |
|
33 |
INCLUDES = -I$(top_srcdir)/include |
34 |
|
35 |
---- src/sdl/Makefile.am |
36 |
-+++ src/sdl/Makefile.am |
37 |
+--- a/src/sdl/Makefile.am |
38 |
++++ b/src/sdl/Makefile.am |
39 |
@@ -6,6 +6,8 @@ |
40 |
|
41 |
libguichan_sdl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) |
42 |
|
43 |
diff --git a/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch b/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch |
44 |
index e2f46097b82..abc0d80ef62 100644 |
45 |
--- a/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch |
46 |
+++ b/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch |
47 |
@@ -1,5 +1,5 @@ |
48 |
---- guichan-0.8.2/configure.in |
49 |
-+++ guichan-0.8.2/configure.in |
50 |
+--- a/configure.in |
51 |
++++ b/configure.in |
52 |
@@ -38,7 +38,7 @@ |
53 |
AC_SUBST(LT_AGE) |
54 |
|
55 |
|
56 |
diff --git a/dev-games/guichan/files/guichan-0.8.2-slibtool-undefined-references.patch b/dev-games/guichan/files/guichan-0.8.2-slibtool-undefined-references.patch |
57 |
new file mode 100644 |
58 |
index 00000000000..bec3cc9bb48 |
59 |
--- /dev/null |
60 |
+++ b/dev-games/guichan/files/guichan-0.8.2-slibtool-undefined-references.patch |
61 |
@@ -0,0 +1,48 @@ |
62 |
+https://bugs.gentoo.org/779040 |
63 |
+ |
64 |
+commit a1e784de2edc4784c440246998fb8ad28065cc39 |
65 |
+Author: orbea <orbea@××××××.net> |
66 |
+Date: Tue Mar 30 07:34:15 2021 -0700 |
67 |
+ |
68 |
+ build: Fix the build with -no-undefined. |
69 |
+ |
70 |
+--- a/src/allegro/Makefile.am |
71 |
++++ b/src/allegro/Makefile.am |
72 |
+@@ -3,6 +3,7 @@ lib_LTLIBRARIES = libguichan_allegro.la |
73 |
+ INCLUDES = -I$(top_srcdir)/include |
74 |
+ |
75 |
+ libguichan_allegro_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) |
76 |
++libguichan_allegro_la_LIBADD = $(top_srcdir)/src/libguichan.la -lalleg |
77 |
+ |
78 |
+ libguichan_allegro_la_SOURCES = \ |
79 |
+ allegro.cpp \ |
80 |
+@@ -10,4 +11,4 @@ libguichan_allegro_la_SOURCES = \ |
81 |
+ allegrographics.cpp \ |
82 |
+ allegroimage.cpp \ |
83 |
+ allegroimageloader.cpp \ |
84 |
+- allegroinput.cpp |
85 |
+\ No newline at end of file |
86 |
++ allegroinput.cpp |
87 |
+--- a/src/opengl/Makefile.am |
88 |
++++ b/src/opengl/Makefile.am |
89 |
+@@ -3,6 +3,7 @@ lib_LTLIBRARIES = libguichan_opengl.la |
90 |
+ INCLUDES = -I$(top_srcdir)/include |
91 |
+ |
92 |
+ libguichan_opengl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) |
93 |
++libguichan_opengl_la_LIBADD = $(top_srcdir)/src/libguichan.la -lGL |
94 |
+ |
95 |
+ libguichan_opengl_la_SOURCES = \ |
96 |
+ opengl.cpp \ |
97 |
+diff --git a/src/sdl/Makefile.am b/src/sdl/Makefile.am |
98 |
+index 61b3d50..728ca3c 100644 |
99 |
+--- a/src/sdl/Makefile.am |
100 |
++++ b/src/sdl/Makefile.am |
101 |
+@@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/include |
102 |
+ |
103 |
+ libguichan_sdl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) |
104 |
+ |
105 |
+-libguichan_sdl_la_LIBADD = -lSDL_image -L$(top_srcdir)/src -lguichan |
106 |
++libguichan_sdl_la_LIBADD = $(top_srcdir)/src/libguichan.la -lSDL -lSDL_image |
107 |
+ |
108 |
+ libguichan_sdl_la_SOURCES = \ |
109 |
+ sdl.cpp \ |
110 |
|
111 |
diff --git a/dev-games/guichan/guichan-0.8.2.ebuild b/dev-games/guichan/guichan-0.8.2.ebuild |
112 |
index 049a09d0547..9ecf5c198b8 100644 |
113 |
--- a/dev-games/guichan/guichan-0.8.2.ebuild |
114 |
+++ b/dev-games/guichan/guichan-0.8.2.ebuild |
115 |
@@ -1,10 +1,11 @@ |
116 |
-# Copyright 1999-2020 Gentoo Authors |
117 |
+# Copyright 1999-2021 Gentoo Authors |
118 |
# Distributed under the terms of the GNU General Public License v2 |
119 |
|
120 |
-EAPI=5 |
121 |
-inherit eutils autotools ltprune |
122 |
+EAPI=7 |
123 |
|
124 |
-DESCRIPTION="a portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL" |
125 |
+inherit autotools |
126 |
+ |
127 |
+DESCRIPTION="A portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL" |
128 |
HOMEPAGE="http://guichan.sourceforge.net/" |
129 |
SRC_URI="https://guichan.googlecode.com/files/${P}.tar.gz" |
130 |
|
131 |
@@ -13,18 +14,24 @@ SLOT="0" |
132 |
KEYWORDS="amd64 x86" |
133 |
IUSE="allegro opengl sdl static-libs" |
134 |
|
135 |
-DEPEND="allegro? ( <media-libs/allegro-5 ) |
136 |
+DEPEND=" |
137 |
+ allegro? ( media-libs/allegro:0 ) |
138 |
opengl? ( virtual/opengl ) |
139 |
sdl? ( |
140 |
media-libs/libsdl |
141 |
media-libs/sdl-image |
142 |
)" |
143 |
-RDEPEND=${DEPEND} |
144 |
+RDEPEND="${DEPEND}" |
145 |
+ |
146 |
+PATCHES=( |
147 |
+ "${FILESDIR}"/${P}-as-needed.patch |
148 |
+ "${FILESDIR}"/${P}-automake-1.13.patch |
149 |
+ "${FILESDIR}"/${P}-slibtool-undefined-references.patch |
150 |
+) |
151 |
|
152 |
src_prepare() { |
153 |
- epatch \ |
154 |
- "${FILESDIR}"/${P}-as-needed.patch \ |
155 |
- "${FILESDIR}"/${P}-automake-1.13.patch |
156 |
+ default |
157 |
+ |
158 |
mv configure.in configure.ac || die |
159 |
eautoreconf |
160 |
} |
161 |
@@ -40,5 +47,6 @@ src_configure() { |
162 |
|
163 |
src_install() { |
164 |
default |
165 |
- prune_libtool_files |
166 |
+ |
167 |
+ find "${ED}" -name '*.la' -delete || die |
168 |
} |