From 4392d53af7ce45ccfe6eb14146479ef0e2bd790a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 14 Oct 2022 19:44:42 +0100 Subject: gentoo auto-resync : 14:10:2022 - 19:44:42 --- games-arcade/netris/Manifest | 3 +- .../netris/files/netris-0.52-clang16.patch | 31 ++++++++++ games-arcade/netris/netris-0.52-r3.ebuild | 63 -------------------- games-arcade/netris/netris-0.52-r4.ebuild | 68 ++++++++++++++++++++++ 4 files changed, 101 insertions(+), 64 deletions(-) create mode 100644 games-arcade/netris/files/netris-0.52-clang16.patch delete mode 100644 games-arcade/netris/netris-0.52-r3.ebuild create mode 100644 games-arcade/netris/netris-0.52-r4.ebuild (limited to 'games-arcade/netris') diff --git a/games-arcade/netris/Manifest b/games-arcade/netris/Manifest index 1d8a053435a6..2b6725cc16e8 100644 --- a/games-arcade/netris/Manifest +++ b/games-arcade/netris/Manifest @@ -1,5 +1,6 @@ +AUX netris-0.52-clang16.patch 767 BLAKE2B 17012ac66bd05869fdef1bd547dba0d9d748821a17d09aa3b6e0d05ff7f6789405bfa6d88de67c804ff3cb5b48d80deef64211eedfdf87950b4dfdafd8c9f93c SHA512 1557ca9251a9ca98640ff2fd9b35af2d6c39dbc074cd00cfe6ba4038558ac081fefcaf8eb2d83703a1492adc747d9f0b04927c2195b3e5829a9622b8e52f0955 AUX netris-0.52-tinfo.patch 397 BLAKE2B 0c5d840b741020e0aee26fb3dcda29bfeb845aa4f29a21319c5b749846595424b6ea7eeb7e2e13311a5469b42333eec27d0518ce49fdfc8b82b50777aa2bafc0 SHA512 0994b7b034102f78db4555a3c0575a789e363ae33b9349603c034e1536df80fa3e043a84c0ad1f742d2eef30de7c56fd6061c1b89d6028df63626530821280c0 DIST netris-0.52.tar.gz 33135 BLAKE2B e6958494b3f1e269b87d5e6833355af98c3936e282870afd8153711603b8115998cebe91f5e86afacc58b20cc8ad9ea2fae69906fa544948de7cb6ad77425cfd SHA512 842ad8602394dee929c3c4ba222f9f5ffe628e52348c3faf7c9098bbd5b0b0279fffc7927320f8ee8a5102537c995a8ed605d851f1cd32e4bd8976a7889c84e1 DIST netris_0.52-10.debian.tar.xz 13160 BLAKE2B 80c4a27ecef79b63ddf72deffe10bcb9b4f83d1be8982d9b8761f2a5e7c1622ab03042fe51112882a188f431ecbf17db05ede7339dadcead98012ea5ad334873 SHA512 94b6fd6a938efe156a44687fdf3d4ba141513a13130548e552ec20864ee73625817d79c6821030bfcff7d05edecec69c78b5a1048b9597c932c7731165877469 -EBUILD netris-0.52-r3.ebuild 1264 BLAKE2B 1304d9a49f235cf2f51516b04ffddd5dbae6e8625ec34f456bd7ef01fd9a415b2ca8d848957b0e5baed239de3cd34c9f2c277c3e85ffe273444fd3845ea8a108 SHA512 7733572ce021e88501d569fad1ac522d019448ab30ebd2672b7b621309a71453e3768eb218e2deea61eba1dcca8f856a196fa78e71607eec6e2db121298a1d48 +EBUILD netris-0.52-r4.ebuild 1468 BLAKE2B b21951f6114b825f9a8af9f4d43466e47489db0245c58e0b18405557bb4604109a155013dd69367b97abad8263ace44d2c6ac8bfcbfdddb2ab338effe068d20e SHA512 0968a0eb70b267b9f1747600930d71e6c51f6a1a86b947a0cedd6520616798c0fa9aa4f49cd99a8f693dc13d12de21a33d3e73b5a4294d93894921a7b02e747d MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610 diff --git a/games-arcade/netris/files/netris-0.52-clang16.patch b/games-arcade/netris/files/netris-0.52-clang16.patch new file mode 100644 index 000000000000..7d13d02975bf --- /dev/null +++ b/games-arcade/netris/files/netris-0.52-clang16.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/874021 +--- a/Configure ++++ b/Configure +@@ -78,3 +78,3 @@ + echo "Checking for libraries" +-echo 'main(){}' > test.c ++echo 'int main(void){return 0;}' > test.c + LFLAGS="" +@@ -96,4 +96,5 @@ + cat << END > test.c +-void handler(void) {} +-main() { on_exit(handler, (void *)0); } ++#include ++void handler(int a, void *b) {} ++int main(void) { on_exit(handler, (void *)0); return 0; } + END +@@ -108,3 +109,3 @@ + #include +-main() { sigset_t set; sigprocmask(SIG_BLOCK, &set, &set); } ++int main(void) { sigset_t set; sigprocmask(SIG_BLOCK, &set, &set); return 0; } + END +@@ -119,3 +120,3 @@ + #include +-main(){} ++int main(void){return 0;} + END +@@ -131,3 +132,3 @@ + #include +-main(){} ++int main(void){return 0;} + END diff --git a/games-arcade/netris/netris-0.52-r3.ebuild b/games-arcade/netris/netris-0.52-r3.ebuild deleted file mode 100644 index 54f80a22be4d..000000000000 --- a/games-arcade/netris/netris-0.52-r3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DEB_VER="10" -DESCRIPTION="Classic networked version of T*tris" -HOMEPAGE="http://www.netris.org/" -SRC_URI="ftp://ftp.netris.org/pub/netris/${P}.tar.gz - mirror://debian/pool/main/n/netris/netris_${PV}-${DEB_VER}.debian.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~mips ~x86" -IUSE="" - -DEPEND="sys-libs/ncurses:0=" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - tc-export CC CXX LD AR RANLIB - - eapply "${S}"/../debian/patches/[01]* - eapply "${FILESDIR}"/${P}-tinfo.patch - - # bug #185332 - sed -i \ - -e '/sys\/time/ i\ -#include \ -#include -' \ - -e '/netint2/ s/short/int16_t/' \ - -e '/netint4/ s/long/int32_t/' \ - netris.h || die - sed -i \ - -e 's/volatile //g' \ - -e '/Be more forgiving/d' \ - -e 's/static myRandSeed/static int myRandSeed/' \ - util.c || die - sed -i \ - -e 's/\(long pauseTimeLeft\)/\1 = 0/' \ - game.c || die - sed -i \ - -e '/^CC/d' \ - -e '/^COPT/d' \ - -e '/^CFLAGS/d' \ - -e 's/(LFLAGS)/(LDFLAGS) $(LFLAGS)/' \ - Configure || die -} - -src_configure() { - bash ./Configure -O || die -} - -src_install() { - dobin netris - newbin sr netris-sample-robot - dodoc FAQ README robot_desc -} diff --git a/games-arcade/netris/netris-0.52-r4.ebuild b/games-arcade/netris/netris-0.52-r4.ebuild new file mode 100644 index 000000000000..6f5c8b733523 --- /dev/null +++ b/games-arcade/netris/netris-0.52-r4.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DEB_VER="10" +DESCRIPTION="Classic networked version of T*tris" +HOMEPAGE="http://www.netris.org/" +SRC_URI="ftp://ftp.netris.org/pub/netris/${P}.tar.gz + mirror://debian/pool/main/n/netris/netris_${PV}-${DEB_VER}.debian.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~mips ~x86" +IUSE="" + +DEPEND="sys-libs/ncurses:0=" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + tc-export CC CXX LD AR RANLIB + + eapply "${S}"/../debian/patches/[01]* + eapply "${FILESDIR}"/${P}-tinfo.patch + eapply "${FILESDIR}"/${P}-clang16.patch + + # bug #185332 + sed -i \ + -e '/sys\/time/ i\ +#include \ +#include +' \ + -e '/netint2/ s/short/int16_t/' \ + -e '/netint4/ s/long/int32_t/' \ + netris.h || die + sed -i \ + -e 's/volatile //g' \ + -e '/Be more forgiving/d' \ + -e 's/static myRandSeed/static int myRandSeed/' \ + util.c || die + sed -i \ + -e 's/\(long pauseTimeLeft\)/\1 = 0/' \ + game.c || die + sed -i \ + -e '/^CC/d' \ + -e '/^COPT/d' \ + -e '/^CFLAGS/d' \ + -e 's/(LFLAGS)/(LDFLAGS) $(LFLAGS)/' \ + Configure || die +} + +src_configure() { + append-cflags -std=gnu89 # old codebase, incompatible with c2x + append-cppflags -D_DEFAULT_SOURCE #874021, for on_exit() + append-cflags ${CPPFLAGS} + + bash ./Configure -O || die +} + +src_install() { + dobin netris + newbin sr netris-sample-robot + dodoc FAQ README robot_desc +} -- cgit v1.2.3