| 1 |
commit: 5fa8041c6e3cfb5b627ddd9ed7410caf2362a7a4 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 31 20:30:37 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 31 23:38:46 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fa8041c |
| 7 |
|
| 8 |
games-misc/bsd-games: drop 2.17-r5 (games.eclass) => rebase patches as -p1 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
games-misc/bsd-games/Manifest | 2 - |
| 13 |
games-misc/bsd-games/bsd-games-2.17-r5.ebuild | 132 --------------------- |
| 14 |
games-misc/bsd-games/bsd-games-2.17_p28.ebuild | 10 +- |
| 15 |
.../bsd-games/files/bsd-games-2.17-64bitutmp.patch | 4 +- |
| 16 |
games-misc/bsd-games/files/bsd-games-2.17-bg.patch | 4 +- |
| 17 |
.../bsd-games/files/bsd-games-2.17-gcc4.patch | 8 +- |
| 18 |
.../bsd-games/files/bsd-games-2.17-headers.patch | 4 +- |
| 19 |
.../bsd-games-2.17-rename-getdate-clash.patch | 6 - |
| 20 |
...mes-3.1-no-install-manpages-automatically.patch | 2 - |
| 21 |
9 files changed, 14 insertions(+), 158 deletions(-) |
| 22 |
|
| 23 |
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest |
| 24 |
index fa75813e015..7bc99d0ea37 100644 |
| 25 |
--- a/games-misc/bsd-games/Manifest |
| 26 |
+++ b/games-misc/bsd-games/Manifest |
| 27 |
@@ -1,6 +1,4 @@ |
| 28 |
-DIST bsd-games-2.17.tar.gz 2563311 BLAKE2B 9dfff4e70929e14a422c536c661cd95c5f1ac81d9112494525b9ef13d7a39b66bd59b6a264e614cfb29784fdb63364f56b12b4d284b125b5b3c12e92def07fb0 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f |
| 29 |
DIST bsd-games-3.1-verbose-build.patch.gz 4633 BLAKE2B cc75175ac2ef9d476c03bdb08b8c054d13090d6cdd1a14dd44022d13290112c68a7663d0c03f9ca7535ea10f2bb5e49a84acca4f782f0ced59685f762efd5151 SHA512 120c0859bb73a026dae017bcc2bc7505ca156b454bf5f87c91b4887417d5ac62f3dec706af91b22b11be8b5bce11d168f9205d722a9fd30dea654f682a66b1c8 |
| 30 |
DIST bsd-games-3.1.tar.gz 267636 BLAKE2B 116b340e383430fc56e9d2379a398494b43664aa124157bfa01f2c6a76ebdc90128cc676abae83b6d74680b0ad9396d24f1c0d11adcff1f552a3e68717b8cc8f SHA512 3f311e89481913b734a21fc7d0765628637af8251228d5a38349c27cc702c307240e81711785bbd7428e208a142bd07597630d29e97e2c7bf5bd9cac1ebc6ada |
| 31 |
-DIST bsdgames_2.17-22.debian.tar.xz 32268 BLAKE2B 2485abc1d80b8319c7eb68e2747c0a4166d18079047eca67c1de549cd011f75a767b6fe69021cb4ce09aaf029823a097e6ac658efcab5e19e976a89ed798d06f SHA512 902d86557dd3813c31333fe18437d8046ae100814c9c1b340ab1f8266c817545f21e000702b1ca93babb9d632896ea5bada1e146436abfa7916b469681fceed5 |
| 32 |
DIST bsdgames_2.17-28.debian.tar.xz 58464 BLAKE2B 3f5a70322341b153a8b3cb8df81fea1e773971d0f3b79ba8fb0c0877e95c61c8e8689952333f8ac4263948d781c2dc64c8178f9dac6a1c09ae702f91794b9583 SHA512 7e2db9f830c0657f3fcd1371635bda4a87e7a68180e486e44752904740c0710c02271522ff2d4b606542b3c502dd28795fcecf883360c3ac5bea78c148281f6a |
| 33 |
DIST bsdgames_2.17.orig.tar.gz 2563311 BLAKE2B 9dfff4e70929e14a422c536c661cd95c5f1ac81d9112494525b9ef13d7a39b66bd59b6a264e614cfb29784fdb63364f56b12b4d284b125b5b3c12e92def07fb0 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f |
| 34 |
|
| 35 |
diff --git a/games-misc/bsd-games/bsd-games-2.17-r5.ebuild b/games-misc/bsd-games/bsd-games-2.17-r5.ebuild |
| 36 |
deleted file mode 100644 |
| 37 |
index 6679e61b5fc..00000000000 |
| 38 |
--- a/games-misc/bsd-games/bsd-games-2.17-r5.ebuild |
| 39 |
+++ /dev/null |
| 40 |
@@ -1,132 +0,0 @@ |
| 41 |
-# Copyright 1999-2019 Gentoo Authors |
| 42 |
-# Distributed under the terms of the GNU General Public License v2 |
| 43 |
- |
| 44 |
-EAPI=5 |
| 45 |
-inherit eutils toolchain-funcs games |
| 46 |
- |
| 47 |
-DEB_PATCH_VER=22 |
| 48 |
-DESCRIPTION="collection of games from NetBSD" |
| 49 |
-HOMEPAGE="https://www.polyomino.org.uk/computer/software/bsd-games/" |
| 50 |
-SRC_URI="https://www.polyomino.org.uk/computer/software/bsd-games/${P}.tar.gz |
| 51 |
- mirror://debian/pool/main/b/bsdgames/bsdgames_${PV}-${DEB_PATCH_VER}.debian.tar.xz" |
| 52 |
- |
| 53 |
-LICENSE="BSD" |
| 54 |
-SLOT="0" |
| 55 |
-KEYWORDS="~alpha ~amd64 ~x86" |
| 56 |
-IUSE="" |
| 57 |
- |
| 58 |
-RDEPEND="!games-misc/wtf |
| 59 |
- !app-misc/banner |
| 60 |
- !games-puzzle/hangman |
| 61 |
- sys-libs/ncurses:0 |
| 62 |
- sys-apps/miscfiles" |
| 63 |
-DEPEND="${RDEPEND} |
| 64 |
- sys-devel/flex |
| 65 |
- sys-devel/bison |
| 66 |
- virtual/pkgconfig" |
| 67 |
- |
| 68 |
-# Set GAMES_TO_BUILD variable to whatever you want |
| 69 |
-GAMES_TO_BUILD=${GAMES_TO_BUILD:=adventure arithmetic atc |
| 70 |
-backgammon banner battlestar bcd boggle caesar canfield countmail cribbage |
| 71 |
-dab dm factor fish gomoku hack hangman hunt mille monop morse |
| 72 |
-number phantasia pig pom ppt primes quiz rain random robots sail snake |
| 73 |
-tetris trek wargames worm worms wtf} |
| 74 |
- |
| 75 |
-src_prepare() { |
| 76 |
- local d="${WORKDIR}"/debian/patches |
| 77 |
- EPATCH_SOURCE="${d}" epatch $(<"${d}"/series) |
| 78 |
- |
| 79 |
- # Used by gentoo config.params. See bug 531200 |
| 80 |
- export GAMES_BINDIR GAMES_DATADIR GAMES_STATEDIR |
| 81 |
- |
| 82 |
- epatch \ |
| 83 |
- "${FILESDIR}"/${P}-64bitutmp.patch \ |
| 84 |
- "${FILESDIR}"/${P}-headers.patch \ |
| 85 |
- "${FILESDIR}"/${P}-bg.patch \ |
| 86 |
- "${FILESDIR}"/${P}-gcc4.patch |
| 87 |
- |
| 88 |
- # Use pkg-config to query Libs: from ncurses.pc (for eg. -ltinfo) wrt #459652 |
| 89 |
- sed -i \ |
| 90 |
- -e "/ncurses_lib/s:-lncurses:'$($(tc-getPKG_CONFIG) --libs-only-l ncurses)':" \ |
| 91 |
- configure || die |
| 92 |
- |
| 93 |
- sed -i \ |
| 94 |
- -e "s:/usr/games:${GAMES_BINDIR}:" \ |
| 95 |
- wargames/wargames || die |
| 96 |
- |
| 97 |
- sed -i \ |
| 98 |
- -e '/^CC :=/d' \ |
| 99 |
- -e '/^CXX :=/d' \ |
| 100 |
- -e '/^CFLAGS/s/OPTIMIZE/CFLAGS/' \ |
| 101 |
- -e '/^CXXFLAGS/s/OPTIMIZE/CXXFLAGS/' \ |
| 102 |
- -e '/^LDFLAGS/s/LDFLAGS := /LDFLAGS := \$(LDFLAGS) /' \ |
| 103 |
- Makeconfig.in || die |
| 104 |
- |
| 105 |
- cp "${FILESDIR}"/config.params-gentoo config.params || die |
| 106 |
- echo bsd_games_cfg_usrlibdir=\"$(games_get_libdir)\" >> ./config.params || die |
| 107 |
- echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params || die |
| 108 |
- echo bsd_games_cfg_docdir=\"/usr/share/doc/${PF}\" >> ./config.params || die |
| 109 |
-} |
| 110 |
- |
| 111 |
-src_test() { |
| 112 |
- addwrite /dev/full |
| 113 |
- emake -j1 check |
| 114 |
-} |
| 115 |
- |
| 116 |
-build_game() { |
| 117 |
- has ${1} ${GAMES_TO_BUILD} |
| 118 |
-} |
| 119 |
- |
| 120 |
-do_statefile() { |
| 121 |
- touch "${D}/${GAMES_STATEDIR}/${1}" || die |
| 122 |
- chmod ug+rw "${D}/${GAMES_STATEDIR}/${1}" || die |
| 123 |
-} |
| 124 |
- |
| 125 |
-src_install() { |
| 126 |
- dodir "${GAMES_BINDIR}" "${GAMES_STATEDIR}" /usr/share/man/man{1,6} |
| 127 |
- emake -j1 DESTDIR="${D}" install |
| 128 |
- |
| 129 |
- dodoc AUTHORS BUGS ChangeLog ChangeLog.0 \ |
| 130 |
- README PACKAGING SECURITY THANKS TODO YEAR2000 |
| 131 |
- |
| 132 |
- # set some binaries to run as games group (+S) |
| 133 |
- build_game atc && fperms g+s "${GAMES_BINDIR}"/atc |
| 134 |
- build_game battlestar && fperms g+s "${GAMES_BINDIR}"/battlestar |
| 135 |
- build_game canfield && fperms g+s "${GAMES_BINDIR}"/canfield |
| 136 |
- build_game cribbage && fperms g+s "${GAMES_BINDIR}"/cribbage |
| 137 |
- build_game phantasia && fperms g+s "${GAMES_BINDIR}"/phantasia |
| 138 |
- build_game robots && fperms g+s "${GAMES_BINDIR}"/robots |
| 139 |
- build_game sail && fperms g+s "${GAMES_BINDIR}"/sail |
| 140 |
- build_game snake && fperms g+s "${GAMES_BINDIR}"/snake |
| 141 |
- build_game tetris && fperms g+s "${GAMES_BINDIR}"/tetris-bsd |
| 142 |
- |
| 143 |
- # state files |
| 144 |
- build_game atc && do_statefile atc_score |
| 145 |
- build_game battlestar && do_statefile battlestar.log |
| 146 |
- build_game canfield && do_statefile cfscores |
| 147 |
- build_game cribbage && do_statefile criblog |
| 148 |
- build_game hack && keepdir "${GAMES_STATEDIR}"/hack |
| 149 |
- build_game robots && do_statefile robots_roll |
| 150 |
- build_game sail && do_statefile saillog |
| 151 |
- build_game snake && do_statefile snake.log && do_statefile snakerawscores |
| 152 |
- build_game tetris && do_statefile tetris-bsd.scores |
| 153 |
- |
| 154 |
- # extra docs |
| 155 |
- build_game atc && { docinto atc ; dodoc atc/BUGS; } |
| 156 |
- build_game boggle && { docinto boggle ; dodoc boggle/README; } |
| 157 |
- build_game hack && { docinto hack ; dodoc hack/{OWNER,Original_READ_ME,READ_ME,help}; } |
| 158 |
- build_game hunt && { docinto hunt ; dodoc hunt/README; } |
| 159 |
- build_game phantasia && { docinto phantasia ; dodoc phantasia/{OWNER,README}; } |
| 160 |
- |
| 161 |
- # Since factor is usually not installed, and primes.6 is a symlink to |
| 162 |
- # factor.6, make sure that primes.6 is ok ... |
| 163 |
- if build_game primes && [[ ! $(build_game factor) ]] ; then |
| 164 |
- rm -f "${D}"/usr/share/man/man6/{factor,primes}.6 |
| 165 |
- newman factor/factor.6 primes.6 |
| 166 |
- fi |
| 167 |
- |
| 168 |
- prepgamesdirs |
| 169 |
- |
| 170 |
- # state dirs |
| 171 |
- chmod -R ug+rw "${D}/${GAMES_STATEDIR}"/* || die |
| 172 |
-} |
| 173 |
|
| 174 |
diff --git a/games-misc/bsd-games/bsd-games-2.17_p28.ebuild b/games-misc/bsd-games/bsd-games-2.17_p28.ebuild |
| 175 |
index fc382f97d8c..2ed12a52b33 100644 |
| 176 |
--- a/games-misc/bsd-games/bsd-games-2.17_p28.ebuild |
| 177 |
+++ b/games-misc/bsd-games/bsd-games-2.17_p28.ebuild |
| 178 |
@@ -47,16 +47,14 @@ src_prepare() { |
| 179 |
eapply "${debian_patch_dir}"/${patch} |
| 180 |
done |
| 181 |
|
| 182 |
+ # Additional patches on top of Debian patchset |
| 183 |
eapply "${FILESDIR}"/${PN}-2.17-64bitutmp.patch |
| 184 |
- eapply -p0 "${FILESDIR}"/${PN}-2.17-bg.patch |
| 185 |
- eapply -p0 "${FILESDIR}"/${PN}-2.17-gcc4.patch |
| 186 |
+ eapply "${FILESDIR}"/${PN}-2.17-bg.patch |
| 187 |
+ eapply "${FILESDIR}"/${PN}-2.17-gcc4.patch |
| 188 |
eapply "${FILESDIR}"/${PN}-2.17-rename-getdate-clash.patch |
| 189 |
|
| 190 |
default |
| 191 |
|
| 192 |
- # TODO: Check this? |
| 193 |
- # Used by gentoo config.params. See bug 531200 |
| 194 |
- |
| 195 |
# Use pkg-config to query Libs: from ncurses.pc (for eg. -ltinfo) wrt #459652 |
| 196 |
sed -i \ |
| 197 |
-e "/ncurses_lib/s:-lncurses:'$($(tc-getPKG_CONFIG) --libs-only-l ncurses)':" \ |
| 198 |
@@ -74,7 +72,7 @@ src_prepare() { |
| 199 |
-e '/^LDFLAGS/s/LDFLAGS := /LDFLAGS := \$(LDFLAGS) /' \ |
| 200 |
Makeconfig.in || die |
| 201 |
|
| 202 |
- # export GAMES_BINDIR GAMES_DATADIR GAMES_STATEDIR |
| 203 |
+ # Used by config.params |
| 204 |
export GAMES_BINDIR=/usr/bin |
| 205 |
export GAMES_DATADIR=/usr/share |
| 206 |
export GAMES_STATEDIR=/var/games |
| 207 |
|
| 208 |
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch b/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch |
| 209 |
index 3be1b3de074..7afd0019efb 100644 |
| 210 |
--- a/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch |
| 211 |
+++ b/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch |
| 212 |
@@ -7,8 +7,8 @@ structure. Work around is to assign the submembers instead. |
| 213 |
|
| 214 |
http://bugs.gentoo.org/show_bug.cgi?id=102667 |
| 215 |
|
| 216 |
---- bsd-games/dm/utmpentry.c |
| 217 |
-+++ bsd-games/dm/utmpentry.c |
| 218 |
+--- a/dm/utmpentry.c |
| 219 |
++++ b/dm/utmpentry.c |
| 220 |
@@ -291,7 +291,8 @@ |
| 221 |
e->line[sizeof(e->line) - 1] = '\0'; |
| 222 |
(void)strncpy(e->host, up->ut_host, sizeof(up->ut_host)); |
| 223 |
|
| 224 |
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-bg.patch b/games-misc/bsd-games/files/bsd-games-2.17-bg.patch |
| 225 |
index 07dc520b77e..6503d9afcb5 100644 |
| 226 |
--- a/games-misc/bsd-games/files/bsd-games-2.17-bg.patch |
| 227 |
+++ b/games-misc/bsd-games/files/bsd-games-2.17-bg.patch |
| 228 |
@@ -1,5 +1,5 @@ |
| 229 |
---- backgammon/common_source/fancy.c.old 2007-05-16 20:16:46.000000000 +0200 |
| 230 |
-+++ backgammon/common_source/fancy.c 2007-05-16 20:19:00.000000000 +0200 |
| 231 |
+--- a/backgammon/common_source/fancy.c |
| 232 |
++++ b/backgammon/common_source/fancy.c |
| 233 |
@@ -58,7 +58,7 @@ |
| 234 |
int lUP; /* length of UP */ |
| 235 |
int CO; /* number of columns */ |
| 236 |
|
| 237 |
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch b/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch |
| 238 |
index 7de07effc25..dabb38460a6 100644 |
| 239 |
--- a/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch |
| 240 |
+++ b/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch |
| 241 |
@@ -1,5 +1,5 @@ |
| 242 |
---- trek/getpar.h.orig 2005-08-14 19:45:29.000000000 -0400 |
| 243 |
-+++ trek/getpar.h 2005-08-14 19:46:33.000000000 -0400 |
| 244 |
+--- a/trek/getpar.h |
| 245 |
++++ b/trek/getpar.h |
| 246 |
@@ -31,6 +31,9 @@ |
| 247 |
* @(#)getpar.h 8.1 (Berkeley) 5/31/93 |
| 248 |
*/ |
| 249 |
@@ -16,8 +16,8 @@ |
| 250 |
int readdelim(int); |
| 251 |
+ |
| 252 |
+#endif /*__GETPAR_H_*/ |
| 253 |
---- trek/trek.h.orig 2005-08-14 19:45:37.000000000 -0400 |
| 254 |
-+++ trek/trek.h 2005-08-14 19:48:17.000000000 -0400 |
| 255 |
+--- a/trek/trek.h |
| 256 |
++++ b/trek/trek.h |
| 257 |
@@ -31,6 +31,13 @@ |
| 258 |
* @(#)trek.h 8.1 (Berkeley) 5/31/93 |
| 259 |
*/ |
| 260 |
|
| 261 |
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-headers.patch b/games-misc/bsd-games/files/bsd-games-2.17-headers.patch |
| 262 |
index 953a5d35765..418d411660e 100644 |
| 263 |
--- a/games-misc/bsd-games/files/bsd-games-2.17-headers.patch |
| 264 |
+++ b/games-misc/bsd-games/files/bsd-games-2.17-headers.patch |
| 265 |
@@ -1,7 +1,7 @@ |
| 266 |
http://bugs.gentoo.org/128348 |
| 267 |
|
| 268 |
---- include/stdio.h |
| 269 |
-+++ include/stdio.h |
| 270 |
+--- a/include/stdio.h |
| 271 |
++++ b/include/stdio.h |
| 272 |
@@ -35,5 +35,11 @@ |
| 273 |
#include_next <stdio.h> |
| 274 |
|
| 275 |
|
| 276 |
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-rename-getdate-clash.patch b/games-misc/bsd-games/files/bsd-games-2.17-rename-getdate-clash.patch |
| 277 |
index 6cda335d7ae..0618abd0d3d 100644 |
| 278 |
--- a/games-misc/bsd-games/files/bsd-games-2.17-rename-getdate-clash.patch |
| 279 |
+++ b/games-misc/bsd-games/files/bsd-games-2.17-rename-getdate-clash.patch |
| 280 |
@@ -1,5 +1,3 @@ |
| 281 |
-diff --git a/hack/extern.h b/hack/extern.h |
| 282 |
-index e2ef242..7c5085f 100644 |
| 283 |
--- a/hack/extern.h |
| 284 |
+++ b/hack/extern.h |
| 285 |
@@ -583,7 +583,7 @@ int role_index(int); |
| 286 |
@@ -11,8 +9,6 @@ index e2ef242..7c5085f 100644 |
| 287 |
int phase_of_the_moon(void); |
| 288 |
int night(void); |
| 289 |
int midnight(void); |
| 290 |
-diff --git a/hack/hack.end.c b/hack/hack.end.c |
| 291 |
-index 3145fd7..36e4796 100644 |
| 292 |
--- a/hack/hack.end.c |
| 293 |
+++ b/hack/hack.end.c |
| 294 |
@@ -360,7 +360,7 @@ topten() |
| 295 |
@@ -24,8 +20,6 @@ index 3145fd7..36e4796 100644 |
| 296 |
|
| 297 |
/* assure minimum number of points */ |
| 298 |
if (t0->points < POINTSMIN) |
| 299 |
-diff --git a/hack/hack.unix.c b/hack/hack.unix.c |
| 300 |
-index 13f9724..ef17788 100644 |
| 301 |
--- a/hack/hack.unix.c |
| 302 |
+++ b/hack/hack.unix.c |
| 303 |
@@ -118,7 +118,7 @@ getyear() |
| 304 |
|
| 305 |
diff --git a/games-misc/bsd-games/files/bsd-games-3.1-no-install-manpages-automatically.patch b/games-misc/bsd-games/files/bsd-games-3.1-no-install-manpages-automatically.patch |
| 306 |
index 46645e162a4..590b595afa5 100644 |
| 307 |
--- a/games-misc/bsd-games/files/bsd-games-3.1-no-install-manpages-automatically.patch |
| 308 |
+++ b/games-misc/bsd-games/files/bsd-games-3.1-no-install-manpages-automatically.patch |
| 309 |
@@ -1,5 +1,3 @@ |
| 310 |
-diff --git a/Makefile b/Makefile |
| 311 |
-index 9de05a8..e047213 100644 |
| 312 |
--- a/Makefile |
| 313 |
+++ b/Makefile |
| 314 |
@@ -20,10 +20,6 @@ $O%.o: %.c |
Archives