1 |
commit: a036e0fc13782c8f6f3ab56c8c52e789058069d5 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 11 08:36:18 2021 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 11 08:36:18 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a036e0fc |
7 |
|
8 |
games-strategy/s25rttr: Drop old 0.9.0_pre20200723-r100 |
9 |
|
10 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
11 |
|
12 |
games-strategy/s25rttr/Manifest | 11 -- |
13 |
....0_pre20200723-boost-1.77-missing-include.patch | 17 --- |
14 |
.../s25rttr-0.9.0_pre20200723-gcc11-include.patch | 12 -- |
15 |
.../s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild | 141 --------------------- |
16 |
4 files changed, 181 deletions(-) |
17 |
|
18 |
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest |
19 |
index d80aad01563..1ff5968c027 100644 |
20 |
--- a/games-strategy/s25rttr/Manifest |
21 |
+++ b/games-strategy/s25rttr/Manifest |
22 |
@@ -1,12 +1 @@ |
23 |
-DIST s25client-f0b97b120140c96bbeacae9c22633f899931db69.tar.gz 20184306 BLAKE2B 4204a62e0a57a614c5ae1a947741f8f92fd7cd75b203467716483baa6f68a7c608033f403337e66b00bc8c2851b03f04c25bf84cda124548cfe09a110478fc54 SHA512 c4f0b59a68a0d5ece57f06f51e7a977be0b41ae85ff57821b317c2bb822a2533a192e1dfaa1a738c6738e65505a70ec34b3e7b22a8bd6effc95a4279d5eb19da |
24 |
DIST s25client_src_v0.9.1.tar.gz 31042856 BLAKE2B 296e61467f5ba64f2a833e3f6627844db3757604d9b239d18f3a2b42afc7f46df09ff3b9e8d8a26865e5220f8996b6e78fd4d5fe6252510bbdf8fc238de40bfc SHA512 b7478f76e0246c52a219d9ef5293d56fe682dc87bcd1269d1647417d86c5174632bf05f1fe09e91a9bf9d6738f58e1cac51abdc54df47c00d228687767e19510 |
25 |
-DIST s25rttr-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz 156126 BLAKE2B 05eeccc890549b8dd3fa004c61b73be65f1fcf20867b7f4a46d0963f80b4a76fca611915ea72a401bdc49a81997d3d4500c5f5378a7cd55cbbfab6bcf647261a SHA512 470414d41cb6bad4e428858114f3c91139abfb1bf3ae02bb322d51bfabba8c0aad6796e183ccbb57624ed3484fea3f463636561ac8a359b6be7b90cfd5c0696a |
26 |
-DIST s25rttr-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz 698512 BLAKE2B 82bc98077ed18622083894a63044194f599375c93aa745e330ad8ba390e14d9829ebb7c8e62141758f41dff2b72d3afbe2a5b6ebb584c3293c244e6f0c88ff89 SHA512 47de2791a4d4707fa17344de8fff8a15dd4436dd6e8c75adbd95273739cf5022e39a1024edee228eb27294e4f1f0b2a91110a1249b3d4fe64641cace051e4544 |
27 |
-DIST s25rttr-libendian-dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz 17008 BLAKE2B 98486acff6e56581b5dd06bba9892da739bf1947151f036ade31354c340b6dd79e1b77cd42475bc38225515392062c4e5dbf9ab28349356368db0ca90a81ee65 SHA512 1827edf6470f20a4b6a1b991a31af411e2cc5ceae36a65d54dbd6927dcf46949c4ad729ac982242da9a8ec9d141531d6c99792af761370b2252872bdbb7da8f0 |
28 |
-DIST s25rttr-liblobby-9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz 24127 BLAKE2B 841ddec14b88cb057978bad87a710bafe9a358bd31614f0c855343f148ff52485894771c5fde85e4f31a769e679307e5608db71e2365e5205de2b72ea5429ffd SHA512 5334e84ff0f7aecd666b4f3832131c9d82767304d705fd51ac1a1d90beb68e65f7d9b16d89c8af682960f6639aa5c3e61403278685dc7f240c5c94c6148a8100 |
29 |
-DIST s25rttr-libsiedler2-5cb9993a32504337c63fd894266991445e0dcd65.tar.gz 495357 BLAKE2B ef421becde207866e3d88a3978e56e2ba289dbe86d83b682051dd8776f865eb7ce57a4fc7af42ef581fddd1d816be0d087e282ea1ec27eca9f5d1be429c6adc6 SHA512 9c4fa600d89d859a8336b672f56b697538a6ca6f6fa411236e53b6d0d2972487feba5c0ba024242dc8be2e65464290f95926224d74fa3b75e1531e798561ebf4 |
30 |
-DIST s25rttr-libutil-6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz 92326 BLAKE2B 3245cd7d6e5828b6b69dc99b920d8682d1e33a5d32b0ff21ae9f20fa31f2f6019245f7919ba4c9d1da30b166c56c903e8aafca77da4216338c612b5b812fc252 SHA512 afdda736dcf4f848df171b806a9cc4f667187f5ce525894471791ab6bebe004a589865654c973df71788019c0a2ac4621bf47d7202b772e895e51df628f494d6 |
31 |
-DIST s25rttr-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz 19270 BLAKE2B 76cacab478205f45897a75a868114211d4cfcc08cbfa9fa694ac0011dc9e6272d9d0e63b34d60264e6923038f830c06dd32279233f9d0ca42732b3963152f6e3 SHA512 22ce4169feb5fa7e5567c66a245e71d98a02dd6eee9214b2387b70ff5a592cca8445fc4e95b5403b33215fe418ed3cfeee9fe6a7d96ecddc7661556cb718cc35 |
32 |
-DIST s25rttr-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz 198489 BLAKE2B 47ffced26f1cceb78c0137e31114e463f0f5ad15fdb47e6a2809080a7874ce484918a0527e97b33db98c4a0daa338712c1b1a8b4992ac47d96f4e3b7056ee5e8 SHA512 0f5b4a4eeb72a906c86dac74c1bb41f5d4756c58240f59403932e388e523bed7d841ffa1d18dfd87454ab8c60b33e74cef27aec93995e37539868148bbee9900 |
33 |
-DIST s25rttr-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz 8013451 BLAKE2B 042ab804f4ec9babf7c975629fa3bd6856fb1fa4de0c4715420bca7e0f2dd72cc0909134750ba70c69344985bdd7a3a74576536cee80d6dfaf688c8cf82da8c0 SHA512 3339ced1fcca0fc9a37382d23c3c43f46c5e51d4c14b2657a79cd15dbd79ba8025bf8133dbbe45eb125b5c88370c90422faf21b65d95f471af3bb43de54a3210 |
34 |
-DIST s25rttr-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz 98611 BLAKE2B 6187ab3109f1c9c20524752920e7b9f0e1de2c882bb09ce8c4d2d29899fbaf8a0e2627afc475f6c1527428d77e9a7a7c7332136ba5a79e33cad9c570fbc19042 SHA512 ba85c03cb3e857c501fcec0223ccb7dfccb99a961dd6594820640e133523f14275e764e196197ead05b739f490003b412e16ca2d0fcae8263ef4c256d252570a |
35 |
|
36 |
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch |
37 |
deleted file mode 100644 |
38 |
index 9a69797ea27..00000000000 |
39 |
--- a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch |
40 |
+++ /dev/null |
41 |
@@ -1,17 +0,0 @@ |
42 |
-https://github.com/Return-To-The-Roots/s25client/pull/1431 |
43 |
- |
44 |
-From: Sam James <sam@g.o> |
45 |
-Date: Thu, 19 Aug 2021 02:41:42 +0100 |
46 |
-Subject: [PATCH] Fix build with Boost 1.77 (missing <algorithm> include) |
47 |
- |
48 |
-Closes: https://bugs.gentoo.org/808767 |
49 |
---- a/libs/s25main/convertSounds.cpp |
50 |
-+++ b/libs/s25main/convertSounds.cpp |
51 |
-@@ -20,6 +20,7 @@ |
52 |
- #include <libsiedler2/ArchivItem_Sound_Wave.h> |
53 |
- #include <libsiedler2/loadMapping.h> |
54 |
- #include <s25util/StringConversion.h> |
55 |
-+#include <algorithm> |
56 |
- #include <cmath> |
57 |
- #include <samplerate.hpp> |
58 |
- #include <sstream> |
59 |
|
60 |
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-gcc11-include.patch b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-gcc11-include.patch |
61 |
deleted file mode 100644 |
62 |
index 31cca620a3f..00000000000 |
63 |
--- a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-gcc11-include.patch |
64 |
+++ /dev/null |
65 |
@@ -1,12 +0,0 @@ |
66 |
-https://github.com/Return-To-The-Roots/libsiedler2/commit/cb2994d5bb6407d4b12f681268e6b123d9b366f5.patch |
67 |
-https://bugs.gentoo.org/787299 |
68 |
---- a/external/libsiedler2/include/libsiedler2/XMIDI_TrackConverter.h |
69 |
-+++ b/external/libsiedler2/include/libsiedler2/XMIDI_TrackConverter.h |
70 |
-@@ -18,6 +18,7 @@ |
71 |
- #pragma once |
72 |
- |
73 |
- #include <array> |
74 |
-+#include <cstddef> |
75 |
- #include <cstdint> |
76 |
- #include <vector> |
77 |
- |
78 |
|
79 |
diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild |
80 |
deleted file mode 100644 |
81 |
index f15c62bc0c1..00000000000 |
82 |
--- a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild |
83 |
+++ /dev/null |
84 |
@@ -1,141 +0,0 @@ |
85 |
-# Copyright 1999-2021 Gentoo Authors |
86 |
-# Distributed under the terms of the GNU General Public License v2 |
87 |
- |
88 |
-EAPI=7 |
89 |
- |
90 |
-LUA_COMPAT=( lua5-{1..3} ) |
91 |
- |
92 |
-inherit desktop flag-o-matic lua-single toolchain-funcs xdg cmake |
93 |
- |
94 |
-DESCRIPTION="Open source remake of The Settlers II: Gold Edition (needs original data files)" |
95 |
-HOMEPAGE="https://www.siedler25.org/" |
96 |
- |
97 |
-# To generate from git repo: |
98 |
-# echo -e "COMMIT=\"$(git rev-parse HEAD)\"\nSRC_URI=\"\n\thttps://github.com/Return-To-The-Roots/s25client/archive/\${COMMIT}.tar.gz -> s25client-\${COMMIT}.tar.gz" && git submodule --quiet foreach --recursive 'url=$(git remote get-url origin); gh=${url#*github.com[:/]}; gh=${gh%.git}; echo -e "\thttps://github.com/${gh}/archive/${sha1}.tar.gz -> \${PN}-${gh##*/}-${sha1}.tar.gz"' | egrep -v "/(dev-tools|libsamplerate|s25update)/" | sort && echo '"' |
99 |
-COMMIT="f0b97b120140c96bbeacae9c22633f899931db69" |
100 |
-SRC_URI=" |
101 |
- https://github.com/Return-To-The-Roots/s25client/archive/${COMMIT}.tar.gz -> s25client-${COMMIT}.tar.gz |
102 |
- https://github.com/mat007/turtle/archive/9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz -> ${PN}-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz |
103 |
- https://github.com/Return-To-The-Roots/languages/archive/6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz -> ${PN}-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz |
104 |
- https://github.com/Return-To-The-Roots/libendian/archive/dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz -> ${PN}-libendian-dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz |
105 |
- https://github.com/Return-To-The-Roots/liblobby/archive/9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz -> ${PN}-liblobby-9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz |
106 |
- https://github.com/Return-To-The-Roots/libsiedler2/archive/5cb9993a32504337c63fd894266991445e0dcd65.tar.gz -> ${PN}-libsiedler2-5cb9993a32504337c63fd894266991445e0dcd65.tar.gz |
107 |
- https://github.com/Return-To-The-Roots/libutil/archive/6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz -> ${PN}-libutil-6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz |
108 |
- https://github.com/Return-To-The-Roots/mygettext/archive/b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz -> ${PN}-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz |
109 |
- https://github.com/Return-To-The-Roots/s25edit/archive/677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz -> ${PN}-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz |
110 |
- https://github.com/Return-To-The-Roots/s25maps/archive/5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz -> ${PN}-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz |
111 |
- https://github.com/satoren/kaguya/archive/38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz -> ${PN}-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz |
112 |
-" |
113 |
- |
114 |
-LICENSE="GPL-2+ GPL-3 Boost-1.0" |
115 |
-SLOT="0" |
116 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
117 |
-IUSE="test" |
118 |
- |
119 |
-REQUIRED_USE="${LUA_REQUIRED_USE}" |
120 |
- |
121 |
-RESTRICT="!test? ( test )" |
122 |
- |
123 |
-RDEPEND="${LUA_DEPS} |
124 |
- app-arch/bzip2 |
125 |
- >=dev-libs/boost-1.73:0=[nls] |
126 |
- >=media-libs/libsamplerate-0.1.9 |
127 |
- >=media-libs/libsdl2-2.0.10-r2[opengl,sound,video] |
128 |
- media-libs/libsndfile |
129 |
- media-libs/sdl2-mixer[vorbis,wav] |
130 |
- net-libs/miniupnpc |
131 |
- virtual/opengl |
132 |
-" |
133 |
- |
134 |
-DEPEND=" |
135 |
- ${RDEPEND} |
136 |
- test? ( >=sys-devel/clang-5 ) |
137 |
-" |
138 |
- |
139 |
-BDEPEND=" |
140 |
- sys-devel/gettext |
141 |
- virtual/pkgconfig |
142 |
-" |
143 |
- |
144 |
-PATCHES=( |
145 |
- "${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch |
146 |
- "${FILESDIR}"/${P}-gcc11-include.patch |
147 |
- "${FILESDIR}"/${P}-boost-1.77-missing-include.patch |
148 |
-) |
149 |
- |
150 |
-S="${WORKDIR}/s25client-${COMMIT}" |
151 |
- |
152 |
-# Build type is checked but blank is valid. |
153 |
-CMAKE_BUILD_TYPE= |
154 |
- |
155 |
-src_unpack() { |
156 |
- default |
157 |
- |
158 |
- local SRC DST |
159 |
- for SRC in */; do |
160 |
- case "${SRC}" in |
161 |
- s25client-*) |
162 |
- continue ;; |
163 |
- s25maps-*) |
164 |
- DST=data/RTTR/MAPS ;; |
165 |
- *) |
166 |
- DST=${SRC%-*} |
167 |
- DST=external/${DST,,} ;; |
168 |
- esac |
169 |
- |
170 |
- rmdir "${S}/${DST}" || die |
171 |
- mv "${SRC}" "${S}/${DST}" || die |
172 |
- done |
173 |
-} |
174 |
- |
175 |
-src_configure() { |
176 |
- local mycmakeargs=( |
177 |
- -DBUILD_TESTING=$(usex test) |
178 |
- -DCCACHE_PROGRAM=OFF |
179 |
- -DCMAKE_SKIP_RPATH=ON |
180 |
- -DRTTR_BUILD_UPDATER=OFF |
181 |
- -DRTTR_ENABLE_OPTIMIZATIONS=OFF |
182 |
- -DRTTR_ENABLE_SANITIZERS=$(usex test) |
183 |
- -DRTTR_INCLUDE_DEVTOOLS=OFF |
184 |
- -DRTTR_LIBDIR="$(get_libdir)/${PN}" |
185 |
- -DRTTR_REVISION="${COMMIT}" |
186 |
- -DRTTR_USE_SYSTEM_LIBS=ON |
187 |
- # Just to be ultra explicit. |
188 |
- -DRTTR_USE_SYSTEM_LIBSAMPLERATE=ON |
189 |
- -DRTTR_VERSION="${PV##*_pre}" # Tests expect a date. |
190 |
- -DLUA_VERSION=$(lua_get_version) |
191 |
- ) |
192 |
- |
193 |
- # bug #787299 |
194 |
- append-cxxflags -std=gnu++14 |
195 |
- |
196 |
- if use test && tc-is-gcc; then |
197 |
- # Work around libasan and libsandbox both wanting to be first. |
198 |
- append-ldflags -static-libasan |
199 |
- fi |
200 |
- |
201 |
- cmake_src_configure |
202 |
-} |
203 |
- |
204 |
-src_test() { |
205 |
- SDL_AUDIODRIVER=dummy \ |
206 |
- SDL_VIDEODRIVER=dummy \ |
207 |
- cmake_src_test |
208 |
-} |
209 |
- |
210 |
-src_install() { |
211 |
- cmake_src_install |
212 |
- |
213 |
- doicon -s 64 tools/release/debian/s25rttr.png |
214 |
- make_desktop_entry s25client "Return to the Roots" |
215 |
-} |
216 |
- |
217 |
-pkg_postinst() { |
218 |
- xdg_pkg_postinst |
219 |
- |
220 |
- if ! has_version -r games-strategy/settlers-2-gold-data; then |
221 |
- elog "Install games-strategy/settlers-2-gold-data or manually copy the DATA" |
222 |
- elog "and GFX directories from original data files into" |
223 |
- elog "${EPREFIX}/usr/share/${PN}/S2." |
224 |
- fi |
225 |
-} |