diff options
Diffstat (limited to 'games-roguelike')
17 files changed, 199 insertions, 899 deletions
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz Binary files differindex eb4b4778347c..cf4f5c634183 100644 --- a/games-roguelike/Manifest.gz +++ b/games-roguelike/Manifest.gz diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest index 8593a29dce34..609c88b78794 100644 --- a/games-roguelike/dwarf-fortress/Manifest +++ b/games-roguelike/dwarf-fortress/Manifest @@ -1,6 +1,10 @@ AUX Makefile.native 1016 BLAKE2B ea40a1f90bf52e52c7cf88e99c73c981c00506eddb4ad9c57200bd272ae37d5871793d5a0308cde8b4c3be9824b5549a23429d465f874e0ca018862f3072dc3b SHA512 d390c65f406cf8b43f3d493cd6513167c122a5811e3bc8614a66dc080eac21df9fc1d5f110503c8f6815f683eaeb5ddcdd833d310400ccc2426ae81c2b8159f8 AUX dwarf-fortress 516 BLAKE2B 9d2faffac265e99698fa1c481eec8598fbe66b4ab205b18c76d285cd16fe1b32d3bfa9bc415bceae6e1e350e955ac3b3cebd7d46943a06ff71715fd1cb5402df SHA512 1f1fada35e33cb99c28835d600f6567ecaaf7b2c6111a2e96b1a88c54e5d727f94ae1c0213327bc70a623dbdf19a8433e3c59edcab5a40e898b0124eb2eb9006 -DIST df_44_12_linux.tar.bz2 12081683 BLAKE2B 2410e8da6af6a8ced45d3e95dc06e2d0f4e31dbdcd6b8d9945a761d2278532bb24c1095418aa22639eedded256b3d485fa128984e6282a491d4dc7bd9af8671b SHA512 03cd7f6800d44873b573cc5bffb12c7a246c3aba0ee8535001372df689a5179dc02592670fd87f2fd5de82421605f34152f6241307c8f7b9fb4d7b8704aed70c -DIST df_44_12_linux32.tar.bz2 12686340 BLAKE2B bf1e1370930d91d2c9e72d3366bc79706092d1505853eb63c6160fea39822551d3276958ac6d2916b8f7825be0c054a037219210f0c2c18a731065a2dd1bb842 SHA512 5cd352acf310592c7e30442205b7fe590f421c5e3562959dcfd32a17d3d562347c2b32e3bc5835637c5550ce2c696c17b6dc910ee4cf766be07af306e83537db -EBUILD dwarf-fortress-0.44.12.ebuild 2344 BLAKE2B b6657167f0c9191e9cdc76b7ca4d149238b50b5526eb9f236c2f12166dce93e2ebc0c7ae692f70ac456b9b8cd50d2606a76859835b1db9d289cb67de90aef5af SHA512 b82d7d1782d70635cdcba237d5a847becef9eabe4f814cffc0c397a3a662a511848f49a783303707e6820e6bbf0b2cfb843edb5fc91c32eb87cd16ab7ad025f0 +AUX dwarf-fortress-0.47.05-missing-cmath.patch 202 BLAKE2B 2f735f4cc82d56015282acf2584678e3ded323c0740c5692752359f167b24f2c7439e6e75b82e65e48daa26eb8ab47e6072f6c0e76c259cd1d7f43595bdfb722 SHA512 548a4077ae40fc8edec75e655efe1c3032fcf49f59c1cd7477c1939e9a5313c4fa2a1589e4c43769290b4e3e27e5ca532faa9d153d0878919d2b3866f2e20f56 +AUX dwarf-fortress-0.47.05-ncurses6.patch 806 BLAKE2B 7c87d059476fafbbf7cca652574b41774e9a74c9b96852dc7a1743cca00280313864a585f7cd4892296d88d916c7f478f497006e94fe320989c5c4d591c77cb8 SHA512 febd94b0b1ec856f0b5cf57f7c68631435e3e369a72a0e692a6139d9068473ede37a647d51ff56e5fe8db28aafe95badd9af62c6913aa9fce92c91c93dda0e83 +AUX dwarf-fortress-0.47.05-segfault-fixes.patch 1542 BLAKE2B 97e0e460edcf96ed65d08f5dde98ef39a8d07300951545acaec36b577d81b5465b4f42f3d15db6d6be8a97d5d9a86149fbfb56cf0b283242ce24a178b86125af SHA512 82f710c6a10ca933fbbd4ef5a02b3c6f70012bef61665c0cf536996b57fbe8bbc6ddf3bf7e20430b82f9eda9503afcfc131e46b2956b6478b266861e12e3a7d1 +DIST df_47_05_linux.tar.bz2 12725420 BLAKE2B 80987f05de2db2796a53cc8767ee7aa5c78674dff725efc0dafe07dc4118e56c7814cbf92507fe9b76a385e182405c7d6759cb6bcc942385110df1dc1a3b3af4 SHA512 9ea46fa12a80266cd09363f1aea8cdd059a5ebeefb453c4a46ffbb1115486409003c3caca95a1b6010da4040d04b781182c59e57a6cc033cd7de4507299f7534 +DIST df_47_05_linux32.tar.bz2 13487455 BLAKE2B be604dd2fd480c5609da801013dfdae26964760c0a92c4b3d2d8369800eee7ca9c1b1c2313cc67357feee3c6d425bf7f9f67cab53d2e771ab59055bc4c3329d0 SHA512 e9b9cf6995c24b403347159a35cfe4b57603bdb777c78639beb2799d9bf31317edec54fb92b17dbb90df6001b905d43285a35e9446768d12a746492b2fd34fe7 +DIST dwarf-fortress.png 271 BLAKE2B cbc14917de1556b25d3817298215beedc4cb01075b8454e38b2d314bdf22f8c20c4bf2332f0d731c7e4c6d6a60056361565221ce3db2c7a15fdf934bff01df54 SHA512 08bdc0e084f861b6e6a8b12e3bc93b9703f2a4cbc133d62d1c2931daf81ccd70b728853d5c05bed19a1ef477cf4ad10fce263bbab7d9cad3b60658f17063acf6 +EBUILD dwarf-fortress-0.47.05.ebuild 2367 BLAKE2B a270f71327f763e06230d33f7f8218f76e4bbd777ff144f39e02c71ebb8b92c5d8d6e6cc9d008beed7d976db9cc30c6abd3d27fa5608acd2443e61c3d1418618 SHA512 ebd6469dbfffc8aaccfd794375a25fce7bb5dde7e4df11e6cf35c59b165560cd8dddd3aaf7a43c1deaf07decb74915abadf8fb87e486c84f85580d46f9143e3b MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135 diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild deleted file mode 100644 index 7a4dab115c0c..000000000000 --- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator toolchain-funcs - -MY_PV=$(replace_all_version_separators _ "$(get_version_component_range 2-)") -MY_PN=df -MY_P=${MY_PN}_${MY_PV} - -DESCRIPTION="A single-player fantasy game" -HOMEPAGE="https://www.bay12games.com/dwarves" -SRC_URI="amd64? ( https://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 ) - x86? ( https://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )" -S="${WORKDIR}"/${MY_PN}_linux - -LICENSE="free-noncomm BSD BitstreamVera" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="debug" -RESTRICT="strip" - -RDEPEND="media-libs/glew:0 - media-libs/libsdl[joystick,video] - media-libs/sdl-image[png] - media-libs/sdl-ttf - sys-libs/zlib - virtual/glu - x11-libs/gtk+:2" -# Yup, libsndfile, openal and ncurses are only needed at compile-time; the code -# dlopens them at runtime if requested. -DEPEND="${RDEPEND} - media-libs/libsndfile - media-libs/openal - sys-libs/ncurses-compat:5[unicode] - virtual/pkgconfig" - -gamesdir="/opt/${PN}" -QA_PREBUILT="${gamesdir#/}/libs/Dwarf_Fortress" - -src_prepare() { - rm -f libs/*.so* || die - sed -i -e '1i#include <cmath>' g_src/ttf_manager.cpp || die - default -} - -src_configure() { - tc-export CXX PKG_CONFIG - CXXFLAGS+=" -D$(use debug || echo N)DEBUG" -} - -src_compile() { - emake -f "${FILESDIR}/Makefile.native" - sed -e "s:^gamesdir=.*:gamesdir=${gamesdir}:" "${FILESDIR}/dwarf-fortress" > dwarf-fortress || die -} - -src_install() { - # install data-files and libs - insinto "${gamesdir}" - doins -r raw data libs - - # install our wrapper - dobin dwarf-fortress - - # install docs - dodoc README.linux *.txt - - fperms 755 "${gamesdir}"/libs/Dwarf_Fortress -} - -pkg_postinst() { - elog "System-wide Dwarf Fortress has been installed to ${gamesdir}. This is" - elog "symlinked to ~/.dwarf-fortress when dwarf-fortress is run." - elog "For more information on what exactly is replaced, see /usr/bin/dwarf-fortress." - elog "Note: This means that the primary entry point is /usr/bin/dwarf-fortress." - elog "Do not run ${gamesdir}/libs/Dwarf_Fortress." - elog - elog "Optional runtime dependencies:" - elog "Install sys-libs/ncurses[unicode] for [PRINT_MODE:TEXT]" - elog "Install media-libs/openal and media-libs/libsndfile for audio output" - elog "Install media-libs/libsdl[opengl] for the OpenGL PRINT_MODE settings" -} diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild new file mode 100644 index 000000000000..dac5c1c75c94 --- /dev/null +++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop flag-o-matic optfeature prefix readme.gentoo-r1 toolchain-funcs + +MY_P="df_$(ver_rs 1- _ $(ver_cut 2-))" + +DESCRIPTION="Single-player fantasy game" +HOMEPAGE="https://www.bay12games.com/dwarves/" +SRC_URI=" + amd64? ( https://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 ) + x86? ( https://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 ) + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" +S="${WORKDIR}/df_linux" + +LICENSE="free-noncomm BSD BitstreamVera" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="debug" + +RDEPEND=" + dev-libs/glib:2 + media-libs/glew:0= + media-libs/libglvnd[X] + media-libs/libsdl[joystick,opengl,video] + media-libs/sdl-image[png] + media-libs/sdl-ttf + sys-libs/zlib:= + virtual/glu + x11-libs/gtk+:2" +# libsndfile, openal and ncurses are only needed at compile-time, +# optfeature through dlopen() at runtime if requested +DEPEND=" + ${RDEPEND} + media-libs/libsndfile + media-libs/openal + sys-libs/ncurses" +BDEPEND="virtual/pkgconfig" + +QA_PREBUILT="opt/${PN}/libs/Dwarf_Fortress" + +PATCHES=( + "${FILESDIR}"/${P}-missing-cmath.patch + "${FILESDIR}"/${P}-ncurses6.patch + "${FILESDIR}"/${P}-segfault-fixes.patch +) + +src_prepare() { + default + + # remove prebuilt libraries that are provided by the system + rm libs/*.so* || die +} + +src_compile() { + tc-export CXX PKG_CONFIG + + # -DDEBUG is recognized to give additional debug output + append-cppflags -D$(usev !debug N)DEBUG + + emake -f "${FILESDIR}"/Makefile.native +} + +src_install() { + insinto /opt/${PN} + doins -r data libs raw + + fperms +x /opt/${PN}/libs/Dwarf_Fortress + + dobin "$(prefixify_ro "${FILESDIR}"/dwarf-fortress)" + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry dwarf-fortress "Dwarf Fortress" + + dodoc README.linux *.txt + + local DOC_CONTENTS=" + Dwarf Fortress has been installed to ${EPREFIX}/opt/${PN}. This is + symlinked to ~/.${PN} when ${PN} is run. For more information on what + exactly is replaced, see ${EPREFIX}/usr/bin/${PN}. Note: This means + that the primary entry point is ${EPREFIX}/usr/bin/${PN}, do not run + ${EPREFIX}/opt/${PN}/libs/Dwarf_Fortress." + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + optfeature "text PRINT_MODE" sys-libs/ncurses + optfeature "audio output" "media-libs/openal media-libs/libsndfile[-minimal]" +} diff --git a/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-missing-cmath.patch b/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-missing-cmath.patch new file mode 100644 index 000000000000..a3028764afac --- /dev/null +++ b/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-missing-cmath.patch @@ -0,0 +1,8 @@ +Fixes compilation due to missing <cmath> header required in this file. + +--- a/g_src/ttf_manager.cpp ++++ b/g_src/ttf_manager.cpp +@@ -2,2 +2,3 @@ + #include "init.h" ++#include <cmath> + #include <iostream> diff --git a/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-ncurses6.patch b/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-ncurses6.patch new file mode 100644 index 000000000000..dda54296d06f --- /dev/null +++ b/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-ncurses6.patch @@ -0,0 +1,22 @@ +Gentoo does not have ncurses5 headers anymore, and this fails with 6 +when using wattrset that it currently expects to be a macro. +--- a/g_src/curses.h ++++ b/g_src/curses.h +@@ -9,2 +9,5 @@ + #else
++# ifndef NCURSES_WATTR_MACROS
++# define NCURSES_WATTR_MACROS 1
++# endif
+ # include <ncursesw/curses.h>
+--- a/g_src/renderer_curses.cpp ++++ b/g_src/renderer_curses.cpp +@@ -296,3 +296,3 @@ + // We prefer libncursesw, but we'll accept libncurses if we have to
+- handle = dlopen("libncursesw.so.5", RTLD_LAZY);
++ handle = dlopen("libncursesw.so.6", RTLD_LAZY);
+ if (handle) goto opened;
+@@ -304,3 +304,3 @@ + if (handle) goto opened;
+- handle = dlopen("libncurses.so.5", RTLD_LAZY);
++ handle = dlopen("libncurses.so.6", RTLD_LAZY);
+ if (handle) goto opened;
diff --git a/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-segfault-fixes.patch b/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-segfault-fixes.patch new file mode 100644 index 000000000000..24c43be41188 --- /dev/null +++ b/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-segfault-fixes.patch @@ -0,0 +1,38 @@ +Fixes segfault / infinite loop with OpenAL and anything higher +than -O1 mostly due to missing return values. + +https://bugs.gentoo.org/703384 +https://bugs.gentoo.org/703386 +https://bugs.gentoo.org/729002 +https://www.bay12games.com/dwarves/mantisbt/view.php?id=11564 +--- a/g_src/enabler.cpp ++++ b/g_src/enabler.cpp +@@ -591,4 +591,6 @@ + // Clean up graphical resources + delete renderer; ++ ++ return 0; + } + +--- a/g_src/music_and_sound_openal.cpp ++++ b/g_src/music_and_sound_openal.cpp +@@ -251,5 +251,4 @@ + }
+ // Deinit OpenAL
+- alcMakeContextCurrent(NULL);
+ alcDestroyContext(context);
+ alcCloseDevice(device);
+@@ -481,5 +480,5 @@ + void alEnable( ALenum capability ) { _alEnable(capability); }
+ void alDisable( ALenum capability ) { _alDisable(capability); }
+-ALboolean alIsEnabled( ALenum capability ) { _alIsEnabled(capability); }
++ALboolean alIsEnabled( ALenum capability ) { return _alIsEnabled(capability); }
+ const ALchar* alGetString( ALenum param ) { return _alGetString(param); }
+ void alGetBooleanv( ALenum param, ALboolean* data ) { _alGetBooleanv(param, data); }
+@@ -491,5 +490,5 @@ + ALfloat alGetFloat( ALenum param ) { return _alGetFloat(param); }
+ ALdouble alGetDouble( ALenum param ) { return _alGetDouble(param); }
+-ALenum alGetError( void ) { _alGetError(); }
++ALenum alGetError( void ) { return _alGetError(); }
+ ALboolean alIsExtensionPresent( const ALchar* extname ) { return _alIsExtensionPresent(extname); }
+ void* alGetProcAddress( const ALchar* fname ) { return _alGetProcAddress(fname); }
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest index 55f976d75da7..1e14a07950a0 100644 --- a/games-roguelike/stone-soup/Manifest +++ b/games-roguelike/stone-soup/Manifest @@ -10,20 +10,16 @@ DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f -DIST stone-soup-0.29.0_pre20220522.tar.gz 16361027 BLAKE2B 6155ce9a56a99b5845ae9ab1747adaed5c3b0e6155eeb42a3a7cba026819701e9b8de72a7e83996f8a3892bfc8119c446feffeb639831be76c626e130ccd8cda SHA512 e026b314d94c45bb91ca41d0ab52003902718dadd16c536fbef6a49348b837a04d48d7eccf43d3e6b810ab4b38d11fe5ede3cd88b6925762b6a7fcadfdf8f936 +DIST stone-soup-0.29.0_pre20220701.tar.gz 16490746 BLAKE2B dfc4251a3c4eda66867833ac2a97178c24ebd03ce23b63d067143d7c8046821bb9f658bc53242ad56053aa117b09a5ffb7dcf499035bf5ee1aff6c8bd06b64c8 SHA512 66e95e32067e281adb3195823d34e9a13fdc8089c4bc747e35844718a29657674a0c89d2c9823a60c2bc479caa5b6eb8b4cc7e7ade990c8f14bbc34ed11555ed DIST stone-soup-0.29.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d DIST stone_soup-0.27.1.zip 96934633 BLAKE2B 8821920a4faad9474f08a34ae3c272cb9dcd3ddeb9029e033c22eb8e6650ef20bbc30e0c0ca1556d08c1b7b898fdbdd3667a3ac9a8527e0c322cd8c78ab391bb SHA512 845dafc9895ada3712903de63b95cca9eeb66160e4a04ba21193d916447fca8e7248b851f1e938f43b8d3937cf4f4437443bdc4fe2da893fe3918fed4e0b5204 DIST stone_soup-0.28.0.zip 98876317 BLAKE2B 10f554ea004778b6a2537caa2f994c8e7b12e190ddaaf55f9fb5d2499b91ee6d15d63a9d50167528c1625058bc262c5cba8ba08235fc377e83329ba5f80158be SHA512 7316175ccf6efea376a8a9157f9c4d1786f59c544af39e5ff28a9fcd889e23ef58c2a3680df46807c84b2ce0feb347e661c929195e8affb3d3f98c24832b17e0 -EBUILD stone-soup-0.25.1-r102.ebuild 4864 BLAKE2B db1579a905e9830253e473268b703d93bcdb4049ee4b8baf05727ba9e09546f60c384599fcbf55e7b17859b0cf50cdffdec6bafe3828ab862f43927e7e979cfc SHA512 d805258ec6059b690c9ba762ae39ec4e34d9d7a9b3bce7c0edb0645da8caf44bdabdf36e8d9b454cfb27179894ce81b3f01e32ae99d900f05261d2ef047f7cd0 -EBUILD stone-soup-0.25.1-r103.ebuild 5009 BLAKE2B f5b8398549c5795bd7be3f2fab6fa3f152b3df6a8fc12edaec850361d79edb429d8e155dc5ef36740f7776961fbd8f09275f2822553126bd401e8a39bbfdf72c SHA512 0bd3db7af966b4a880bcfb62cec62743aaf4ce071973f7f953f64095d19eb34fc4a40762b89a6973d198dce4a704ef89db53459472c8c4041feafbabdc8c0a9c -EBUILD stone-soup-0.26.1-r1.ebuild 5077 BLAKE2B 2c5a311b29921349f247095ff15282510e6d9563a973a533bc49f25cb05a6d423befff60eeeea1739a1e39bcffc17b779663c423eef03322edfd968093d4f034 SHA512 ecb2951cdfb3f73e2c122eed0f7a86f6323e0eb28ae4ae40b2f6b8a455817ec07a216a782c9ed85449994ab735f0d93c7e17c95e1963a9e077da3a6fe7b21de3 -EBUILD stone-soup-0.26.1-r2.ebuild 5222 BLAKE2B 7191e7b373999c69b41a17615d30847d9c3adc03cf5a79ceffc9f7ad7d0b0660b09d87d00ae7fe087dd04fd44b18ce4019326f21420035d4273a698ce264f41f SHA512 d192d73c7be60ed413c05aa8b383b2158d81a40c7b875ac231943447fce6a72d26b0f5337c68adb4bc7518c832e51f5dcfe60049e7979a0eff2ae2fff1e62b2f -EBUILD stone-soup-0.27.1-r1.ebuild 5009 BLAKE2B 7011dba6c4c08ad5d72192da939e87fa5431da161a6696c76382d8e53ac94d5dd02c218b66d80c2280304ca5730752e7ff1682da688fbec04158d8099a67a899 SHA512 1565168d6e6469fde1d27c493c5825eafaf663f167685969519d9526c5a1a0acbc96bd7468ba2aa860444af06d700bc9f5b3e18187819f1eb0df3efc585e47aa -EBUILD stone-soup-0.27.1.ebuild 4864 BLAKE2B fe2fcb78fadb8e8dc9cd9084e511e82867d39d9254be85769aabf8e8075be5d1d3f35dcc7ae81ae027ed9826c1e0b092fe3887afdf72f9f41d6c518c6ab01de0 SHA512 4cf1ce6683e724bc2bc9d46aaec73f63e13a45837d594e4715731b1effa2152e51e7d79ea2ed969c0967c8a824688875fc8b89002bab904313b8e5868272fbfd -EBUILD stone-soup-0.28.0-r1.ebuild 5606 BLAKE2B 16cb82e4f0a74ea25f8395c37495e0efe8016fda3c77b1c50fb19241a8bba7f6fd7b857ceea182389753061de622f64783089a8c703ba884fdb11ce0581592e9 SHA512 63c39af14be89ca6dcfc715ecf65c5ab4787985294cb3de8f2b1f8ca5b6ee12f00fd5e1f7776adf8c9f2560a1df30f46e7909602d0768c7305e459502aa93fe7 -EBUILD stone-soup-0.28.0.ebuild 5461 BLAKE2B ae415f1b9690d72a233697326651d44c5534d69a8e290ec12e06c42ca2df47c31d3572f229665f52ee70ada828e26b7ea4057c1ac64bce208274031df6efc45b SHA512 c7bf67b85583f0e0ef2e3ed394ba950574360fc804697f0f3fe90b35a8ab636855305616b677a83c9ad8c43005bea2088e2ceb7322d720d235a04f50eebe978f -EBUILD stone-soup-0.29.0_pre20220522.ebuild 5646 BLAKE2B fc9496550abd9d4aac1e84e459c100f25cc470d15dc68823d46f423e2c7b374bc4f80fa7b72188595cafc934d37c212e798b5a65d4445321f6eebf11d2005270 SHA512 dfb0844d8b3a7b82179d15796ee8918eb5a4a4c5c4c009f755c40f41ae3d3a755ffe49b6ba6d8c9fee257112b0bd78780a055ff71476793ce17896d6a49f4fae +EBUILD stone-soup-0.25.1-r103.ebuild 5045 BLAKE2B dd667e1a7aec2c09754368bcc5615d8414bcc1cc35196a22fe2bf91ee15a9caec22def457838b1cc2391dd18537da2031674b6ff6cd5f6c87ce5fa3cdd943cd0 SHA512 9ba30cfdf08045689e4d7d2492cd710c4d15b00bdd57bdc64424ec1a415ccfae7da9c5a1eab7ec1c759310458dd3903b07e5fe18803a724b5f0a427c5c44afaf +EBUILD stone-soup-0.26.1-r2.ebuild 5258 BLAKE2B ee0d6bbfd5de52ac1e5b2bc3518220a3607f8999d1f9d5974690bede75ea4791878f561f5df4d185dc3985a57008c5bd153a369b1e86c5cf88b1c1a603661267 SHA512 c0c2186645788bb0a1e3828f8128af490e4ba9b83998de8e32015b49b42a6cf46cc4eb08e1b14e30e5d574d5bb17f11882959074a5686d6faae3bb9d1ceccd5b +EBUILD stone-soup-0.27.1-r1.ebuild 5045 BLAKE2B 8e4b3dba98685164149d18286c2ff099fe8a056a8109753eed3b5739802365c7f724c17cce70809bbcbdb990d6cc6ec11b1b9dea2b7e02b537fa6189221a389c SHA512 679f39c530dea70ac4ad9d80aae30bd0163f61f7507b2886121a0db5c28919fc583724ba92ae2c777bdc7f0d99a580592c5e0b3f7434442554632ea348ece2f5 +EBUILD stone-soup-0.28.0-r1.ebuild 5642 BLAKE2B 94fc53cce648497c8a322909a124fd0cd76d35118bf79298321b21098d391f97eab34df479beab53ee3f96505984e89a969ee9dd74e5915692e214bb555509c8 SHA512 a7a9ef2963243322926b33d3fb36956924a8f1b4086bbd5aa69661d3042ed50761a749b59ab4b7af2a35db3fb9623a04aa0b57d81c02453e82f520206e2bca8e +EBUILD stone-soup-0.29.0_pre20220701.ebuild 5684 BLAKE2B a9da6b0296448bfe1b17643ac19880ae982ee50dd6dbc33e92c702540e66b58acf66bcfa3580498deb3215bd7d15791c755c182f66ded009e2224e22f6fad039 SHA512 723c3a4e4f37da62143111624b1fdda29192995d17645db4488015b06922cc981a3963aa9cc7410fd5386423c14ea2e6fa09fd5cc28619e84a29e5adfa3f675e MISC metadata.xml 1684 BLAKE2B 4d3fe12186ce860f5b049b5b2cdb626f9ab095d688163739a972e0f53a7d835c191dbec0ee4868bb575648cbd3c818ed2fdec44b75730855ea5d8bc3eaf4996c SHA512 9dbe6b3c720b81887c74b0a5e81a0ba5e410d947a6560f66cbb4605c090dfa46a897f8550191e6c6ce7ec06a7460d0e3c625afe7f5ee41e32ab3b800887463cd diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild deleted file mode 100644 index caf09a0a1313..000000000000 --- a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..3} ) -PYTHON_COMPAT=( python3_{7,8,9,10} ) -VIRTUALX_REQUIRED="manual" -inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs - -MY_P="stone_soup-${PV}" -DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons" -HOMEPAGE="https://crawl.develz.org" -SLOT="0.25" -SRC_URI=" - https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip - https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png - https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg -" - -# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h -# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs -# Public Domain|CC0: most of tiles -# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/ -LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT" -KEYWORDS="amd64 x86" -IUSE="debug ncurses sound test +tiles" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${LUA_DEPS} - dev-db/sqlite:3 - sys-libs/zlib - !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) - ncurses? ( sys-libs/ncurses:0 ) - tiles? ( - media-fonts/dejavu - media-libs/freetype:2 - media-libs/libpng:0 - sound? ( - media-libs/libsdl2[X,opengl,sound,video] - media-libs/sdl2-mixer - ) - !sound? ( media-libs/libsdl2[X,opengl,video] ) - media-libs/sdl2-image[png] - virtual/glu - virtual/opengl - )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-lang/perl - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - sys-devel/flex - test? ( dev-cpp/catch:0 ) - tiles? ( - media-gfx/pngcrush - sys-libs/ncurses:0 - ) - virtual/pkgconfig - virtual/yacc - " - -S=${WORKDIR}/${MY_P}/source -PATCHES=( - "${FILESDIR}"/make-no-png-dep-fix.patch - "${FILESDIR}"/rltiles-make.patch -) - -python_check_deps() { - has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" -} - -pkg_setup() { - - python-any-r1_pkg_setup - - if use !ncurses && use !tiles ; then - ewarn "Neither ncurses nor tiles frontend" - ewarn "selected, choosing ncurses only." - ewarn "Note that you can also enable both." - fi - - if use sound && use !tiles ; then - ewarn "Sound support is only available with tiles." - fi -} - -src_prepare() { - default - python_fix_shebang "${S}/util/species-gen.py" - - sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \ - || die "Couldn't append slot to executable name" - - # Replace bundled catch2 package with system implementation - # https://bugs.gentoo.org/829950 - if use test; then - cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2" - fi -} - -src_compile() { - - # Insurance that we're not using bundled lib sources - rm -rf contrib || die "Couldn't delete contrib directory" - - myemakeargs=( - $(usex debug "FULLDEBUG=y DEBUG=y" "") - BUILD_LUA= - AR="$(tc-getAR)" - CFOPTIMIZE='' - CFOTHERS="${CXXFLAGS}" - CONTRIBS= - DATADIR="/usr/share/${PN}-${SLOT}" - FORCE_CC="$(tc-getCC)" - FORCE_CXX="$(tc-getCXX)" - LDFLAGS="${LDFLAGS}" - MAKEOPTS="${MAKEOPTS}" - PKGCONFIG="$(tc-getPKG_CONFIG)" - RANLIB="$(tc-getRANLIB)" - SAVEDIR="~/.crawl-${SLOT}" - SOUND=$(usex sound "y" "") - STRIP=touch - USE_LUAJIT= - V=1 - prefix="/usr" - ) - - if use ncurses || (use !ncurses && use !tiles) ; then - emake "${myemakeargs[@]}" - # move it in case we build both variants - use tiles && { mv "crawl-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;} - fi - - if use tiles ; then - emake "${myemakeargs[@]}" clean - emake "${myemakeargs[@]}" "TILES=y" - fi -} - -src_test() { - emake "${myemakeargs[@]}" \ - $(usex tiles "TILES=y" "") \ - catch2-tests -} - -src_install() { - emake "${myemakeargs[@]}" \ - $(usex tiles "TILES=y" "") \ - DESTDIR="${D}" \ - prefix_fp="" \ - bin_prefix="${D}/usr/bin" \ - install - - [[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}" - - # don't relocate docs, needed at runtime - rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license - - mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \ - || die "Couldn't append slot to man page name" - doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" - - # icons and menu for graphical build - if use tiles ; then - doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png - doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg - make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}" - fi -} - -pkg_postinst() { - xdg_icon_cache_update - - elog "crawl is a slotted install that supports having" - elog "multiple versions installed. The binary has the" - elog "slot appended, e.g. 'crawl-"${SLOT}"'." - - if use tiles && use ncurses ; then - elog - elog "Since you have enabled both tiles and ncurses frontends" - elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the" - elog "tiles binary is called 'crawl-"${SLOT}"'." - fi -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild index 67a30f696915..4c0c3c29ddd9 100644 --- a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild +++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild @@ -3,8 +3,8 @@ EAPI=8 -LUA_COMPAT=( lua5-{1..3} ) -PYTHON_COMPAT=( python3_{7,8,9,10} ) +LUA_COMPAT=( lua5-1 ) +PYTHON_COMPAT=( python3_{8,9,10,11} ) VIRTUALX_REQUIRED="manual" inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs @@ -23,9 +23,10 @@ SRC_URI=" # Public Domain|CC0: most of tiles # MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/ LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="advpng debug ncurses sound test +tiles" RESTRICT="!test? ( test )" +REQUIRED_USE="${LUA_REQUIRED_USE}" RDEPEND=" ${LUA_DEPS} @@ -47,7 +48,7 @@ RDEPEND=" virtual/opengl )" DEPEND="${RDEPEND} - test? ( dev-cpp/catch:0 ) + test? ( <dev-cpp/catch-3.0.0:0 ) tiles? ( sys-libs/ncurses:0 ) diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild deleted file mode 100644 index 21a11669794b..000000000000 --- a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..3} ) -PYTHON_COMPAT=( python3_{7,8,9,10} ) -VIRTUALX_REQUIRED="manual" -inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs - -MY_P="stone_soup-${PV}" -DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons" -HOMEPAGE="https://crawl.develz.org" -SLOT="0.26" -SRC_URI=" - https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip - https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png - https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg -" - -# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h -# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs -# Public Domain|CC0: most of tiles -# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/ -LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT" -KEYWORDS="amd64 x86" -IUSE="debug ncurses sound test +tiles" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${LUA_DEPS} - dev-db/sqlite:3 - sys-libs/zlib - !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) - ncurses? ( sys-libs/ncurses:0 ) - tiles? ( - media-fonts/dejavu - media-libs/freetype:2 - media-libs/libpng:0 - sound? ( - media-libs/libsdl2[X,opengl,sound,video] - media-libs/sdl2-mixer - ) - !sound? ( media-libs/libsdl2[X,opengl,video] ) - media-libs/sdl2-image[png] - virtual/glu - virtual/opengl - )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-lang/perl - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - sys-devel/flex - test? ( dev-cpp/catch:0 ) - tiles? ( - media-gfx/pngcrush - sys-libs/ncurses:0 - ) - virtual/pkgconfig - virtual/yacc - " - -S=${WORKDIR}/${MY_P}/source -PATCHES=( - "${FILESDIR}"/make-no-png-dep-fix.patch - "${FILESDIR}"/rltiles-make.patch -) - -python_check_deps() { - has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" -} - -pkg_setup() { - - python-any-r1_pkg_setup - - if use !ncurses && use !tiles ; then - ewarn "Neither ncurses nor tiles frontend" - ewarn "selected, choosing ncurses only." - ewarn "Note that you can also enable both." - fi - - if use sound && use !tiles ; then - ewarn "Sound support is only available with tiles." - fi -} - -src_prepare() { - default - python_fix_shebang "${S}/util/species-gen.py" - - sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \ - || die "Couldn't append slot to executable name" - - # Replace bundled catch2 package with system implementation - # https://bugs.gentoo.org/829950 - if use test; then - cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2" - fi -} - -src_compile() { - - # Insurance that we're not using bundled lib sources - rm -rf contrib || die "Couldn't delete contrib directory" - - myemakeargs=( - $(usex debug "FULLDEBUG=y DEBUG=y" "") - BUILD_LUA= - AR="$(tc-getAR)" - CFOPTIMIZE='' - CFOTHERS="${CXXFLAGS}" - CONTRIBS= - DATADIR="/usr/share/${PN}-${SLOT}" - FORCE_CC="$(tc-getCC)" - FORCE_CXX="$(tc-getCXX)" - LDFLAGS="${LDFLAGS}" - MAKEOPTS="${MAKEOPTS}" - PKGCONFIG="$(tc-getPKG_CONFIG)" - RANLIB="$(tc-getRANLIB)" - SAVEDIR="~/.crawl-${SLOT}" - SOUND=$(usex sound "y" "") - STRIP=touch - USE_LUAJIT= - V=1 - prefix="/usr" - ) - - if use ncurses || (use !ncurses && use !tiles) ; then - emake "${myemakeargs[@]}" - # move it in case we build both variants - use tiles && { mv "crawl-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;} - fi - - if use tiles ; then - emake "${myemakeargs[@]}" clean - emake "${myemakeargs[@]}" "TILES=y" - fi -} - -src_test() { - emake "${myemakeargs[@]}" \ - $(usex tiles "TILES=y" "") \ - catch2-tests -} - -src_install() { - emake "${myemakeargs[@]}" \ - $(usex tiles "TILES=y" "") \ - DESTDIR="${D}" \ - prefix_fp="" \ - bin_prefix="${D}/usr/bin" \ - install - - [[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}" - - # don't relocate docs, needed at runtime - rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license - - mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \ - || die "Couldn't append slot to man page name" - doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" - - # icons and menu for graphical build - if use tiles ; then - doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png - doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg - make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}" - fi -} - -pkg_postinst() { - xdg_icon_cache_update - - elog "Since version 0.25.1-r101, crawl is a slotted install" - elog "that supports having multiple versions installed. The" - elog "binary has the slot appended, e.g. 'crawl-"${SLOT}"'." - elog - elog "The local save directory also has the slot appended." - elog "If you have saved games from 0.25 but before 0.25.1-r101" - elog "you can 'mv ~/.crawl ~/.crawl-0.25' to fix it" - - if use tiles && use ncurses ; then - elog - elog "Since you have enabled both tiles and ncurses frontends" - elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the" - elog "tiles binary is called 'crawl-"${SLOT}"'." - fi -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild index 0d4c15a1cafe..4c2d6d1cfdc7 100644 --- a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild +++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild @@ -3,8 +3,8 @@ EAPI=8 -LUA_COMPAT=( lua5-{1..3} ) -PYTHON_COMPAT=( python3_{7,8,9,10} ) +LUA_COMPAT=( lua5-1 ) +PYTHON_COMPAT=( python3_{8,9,10,11} ) VIRTUALX_REQUIRED="manual" inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs @@ -23,9 +23,10 @@ SRC_URI=" # Public Domain|CC0: most of tiles # MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/ LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="advpng debug ncurses sound test +tiles" RESTRICT="!test? ( test )" +REQUIRED_USE="${LUA_REQUIRED_USE}" RDEPEND=" ${LUA_DEPS} @@ -47,7 +48,7 @@ RDEPEND=" virtual/opengl )" DEPEND="${RDEPEND} - test? ( dev-cpp/catch:0 ) + test? ( <dev-cpp/catch-3.0.0:0 ) tiles? ( sys-libs/ncurses:0 ) diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild index b4a89576bda6..92a8dd503ef3 100644 --- a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild +++ b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild @@ -3,8 +3,8 @@ EAPI=8 -LUA_COMPAT=( lua5-{1..3} ) -PYTHON_COMPAT=( python3_{7,8,9,10} ) +LUA_COMPAT=( lua5-1 ) +PYTHON_COMPAT=( python3_{8,9,10,11} ) VIRTUALX_REQUIRED="manual" inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs @@ -23,9 +23,10 @@ SRC_URI=" # Public Domain|CC0: most of tiles # MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/ LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="advpng debug ncurses sound test +tiles" RESTRICT="!test? ( test )" +REQUIRED_USE="${LUA_REQUIRED_USE}" RDEPEND=" ${LUA_DEPS} @@ -47,7 +48,7 @@ RDEPEND=" virtual/opengl )" DEPEND="${RDEPEND} - test? ( dev-cpp/catch:0 ) + test? ( <dev-cpp/catch-3.0.0:0 ) tiles? ( sys-libs/ncurses:0 ) diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild deleted file mode 100644 index 8c7c910c42ba..000000000000 --- a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..3} ) -PYTHON_COMPAT=( python3_{7,8,9,10} ) -VIRTUALX_REQUIRED="manual" -inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs - -MY_P="stone_soup-${PV}" -DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons" -HOMEPAGE="https://crawl.develz.org" -SLOT="0.27" -SRC_URI=" - https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip - https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png - https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg -" - -# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h -# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs -# Public Domain|CC0: most of tiles -# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/ -LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT" -KEYWORDS="amd64 x86" -IUSE="debug ncurses sound test +tiles" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${LUA_DEPS} - dev-db/sqlite:3 - sys-libs/zlib - !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) - ncurses? ( sys-libs/ncurses:0 ) - tiles? ( - media-fonts/dejavu - media-libs/freetype:2 - media-libs/libpng:0 - sound? ( - media-libs/libsdl2[X,opengl,sound,video] - media-libs/sdl2-mixer - ) - !sound? ( media-libs/libsdl2[X,opengl,video] ) - media-libs/sdl2-image[png] - virtual/glu - virtual/opengl - )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-lang/perl - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - sys-devel/flex - test? ( dev-cpp/catch:0 ) - tiles? ( - media-gfx/pngcrush - sys-libs/ncurses:0 - ) - virtual/pkgconfig - virtual/yacc - " - -S=${WORKDIR}/${MY_P}/source -PATCHES=( - "${FILESDIR}"/make-no-png-dep-fix.patch - "${FILESDIR}"/rltiles-make.patch -) - -python_check_deps() { - has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" -} - -pkg_setup() { - - python-any-r1_pkg_setup - - if use !ncurses && use !tiles ; then - ewarn "Neither ncurses nor tiles frontend" - ewarn "selected, choosing ncurses only." - ewarn "Note that you can also enable both." - fi - - if use sound && use !tiles ; then - ewarn "Sound support is only available with tiles." - fi -} - -src_prepare() { - default - python_fix_shebang "${S}/util/species-gen.py" - - sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \ - || die "Couldn't append slot to executable name" - - # Replace bundled catch2 package with system implementation - # https://bugs.gentoo.org/829950 - if use test; then - cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2" - fi -} - -src_compile() { - - # Insurance that we're not using bundled lib sources - rm -rf contrib || die "Couldn't delete contrib directory" - - myemakeargs=( - $(usex debug "FULLDEBUG=y DEBUG=y" "") - BUILD_LUA= - AR="$(tc-getAR)" - CFOPTIMIZE='' - CFOTHERS="${CXXFLAGS}" - CONTRIBS= - DATADIR="/usr/share/${PN}-${SLOT}" - FORCE_CC="$(tc-getCC)" - FORCE_CXX="$(tc-getCXX)" - LDFLAGS="${LDFLAGS}" - MAKEOPTS="${MAKEOPTS}" - PKGCONFIG="$(tc-getPKG_CONFIG)" - RANLIB="$(tc-getRANLIB)" - SAVEDIR="~/.crawl-${SLOT}" - SOUND=$(usex sound "y" "") - STRIP=touch - USE_LUAJIT= - V=1 - prefix="/usr" - ) - - if use ncurses || (use !ncurses && use !tiles) ; then - emake "${myemakeargs[@]}" - # move it in case we build both variants - use tiles && { mv "crawl-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;} - fi - - if use tiles ; then - emake "${myemakeargs[@]}" clean - emake "${myemakeargs[@]}" "TILES=y" - fi -} - -src_test() { - emake "${myemakeargs[@]}" \ - $(usex tiles "TILES=y" "") \ - catch2-tests -} - -src_install() { - emake "${myemakeargs[@]}" \ - $(usex tiles "TILES=y" "") \ - DESTDIR="${D}" \ - prefix_fp="" \ - bin_prefix="${D}/usr/bin" \ - install - - [[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}" - - # don't relocate docs, needed at runtime - rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license - - mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \ - || die "Couldn't append slot to man page name" - doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" - - # icons and menu for graphical build - if use tiles ; then - doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png - doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg - make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}" - fi -} - -pkg_postinst() { - xdg_icon_cache_update - - elog "crawl is a slotted install that supports having" - elog "multiple versions installed. The binary has the" - elog "slot appended, e.g. 'crawl-"${SLOT}"'." - - if use tiles && use ncurses ; then - elog - elog "Since you have enabled both tiles and ncurses frontends" - elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the" - elog "tiles binary is called 'crawl-"${SLOT}"'." - fi -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild index c75e955a01e0..f0bb11286771 100644 --- a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild +++ b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild @@ -3,8 +3,8 @@ EAPI=8 -LUA_COMPAT=( lua5-{1..3} ) -PYTHON_COMPAT=( python3_{7,8,9,10} ) +LUA_COMPAT=( lua5-1 ) +PYTHON_COMPAT=( python3_{8,9,10,11} ) VIRTUALX_REQUIRED="manual" inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs @@ -37,9 +37,10 @@ fi # Public Domain|CC0: most of tiles # MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/ LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="advpng debug ncurses sound test +tiles" RESTRICT="!test? ( test )" +REQUIRED_USE="${LUA_REQUIRED_USE}" S=${WORKDIR}/${MY_P}/source RDEPEND=" @@ -62,7 +63,7 @@ RDEPEND=" virtual/opengl )" DEPEND="${RDEPEND} - test? ( dev-cpp/catch:0 ) + test? ( <dev-cpp/catch-3.0.0:0 ) tiles? ( sys-libs/ncurses:0 ) diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0.ebuild deleted file mode 100644 index 9922b64db97c..000000000000 --- a/games-roguelike/stone-soup/stone-soup-0.28.0.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..3} ) -PYTHON_COMPAT=( python3_{7,8,9,10} ) -VIRTUALX_REQUIRED="manual" -inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs - -DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons" -HOMEPAGE="https://crawl.develz.org" -SLOT="0.28" - -# Leave empty string if not a _pre release -COMMITSHA="" -if [ -z "${COMMITSHA}" ]; then - # This is a proper release - SRC_URI=" - https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip - https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png - https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg - " - MY_P="stone_soup-${PV}" -else - # This is a _pre release - SRC_URI=" - https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png - https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg - " - MY_P="crawl-${COMMITSHA}/crawl-ref" -fi - -# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h -# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs -# Public Domain|CC0: most of tiles -# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/ -LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT" -KEYWORDS="amd64 x86" -IUSE="debug ncurses sound test +tiles" -RESTRICT="!test? ( test )" - -S=${WORKDIR}/${MY_P}/source -RDEPEND=" - ${LUA_DEPS} - dev-db/sqlite:3 - sys-libs/zlib - !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) - ncurses? ( sys-libs/ncurses:0 ) - tiles? ( - media-fonts/dejavu - media-libs/freetype:2 - media-libs/libpng:0 - sound? ( - media-libs/libsdl2[X,opengl,sound,video] - media-libs/sdl2-mixer - ) - !sound? ( media-libs/libsdl2[X,opengl,video] ) - media-libs/sdl2-image[png] - virtual/glu - virtual/opengl - )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-lang/perl - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - sys-devel/flex - test? ( dev-cpp/catch:0 ) - tiles? ( - media-gfx/pngcrush - sys-libs/ncurses:0 - ) - virtual/pkgconfig - virtual/yacc - " - -PATCHES=( - "${FILESDIR}"/make-no-png-dep-fix.patch - "${FILESDIR}"/rltiles-make.patch -) - -python_check_deps() { - has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" -} - -pkg_setup() { - - python-any-r1_pkg_setup - - if use !ncurses && use !tiles ; then - ewarn "Neither ncurses nor tiles frontend" - ewarn "selected, choosing ncurses only." - ewarn "Note that you can also enable both." - fi - - if use sound && use !tiles ; then - ewarn "Sound support is only available with tiles." - fi -} - -src_prepare() { - default - python_fix_shebang "${S}/util/species-gen.py" - - sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \ - || die "Couldn't append slot to executable name" - - # File required for a _pre build - if ! [ -f "${S}/util/release_ver" ]; then - echo "${SLOT}" >"${S}/util/release_ver" || die "Couldn't write release_ver" - fi - - # Replace bundled catch2 package with system implementation - # https://bugs.gentoo.org/829950 - if use test; then - cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2" - fi -} - -src_compile() { - - # Insurance that we're not using bundled lib sources - rm -rf contrib || die "Couldn't delete contrib directory" - - myemakeargs=( - $(usex debug "FULLDEBUG=y DEBUG=y" "") - BUILD_LUA= - AR="$(tc-getAR)" - CFOPTIMIZE='' - CFOTHERS="${CXXFLAGS}" - CONTRIBS= - DATADIR="/usr/share/${PN}-${SLOT}" - FORCE_CC="$(tc-getCC)" - FORCE_CXX="$(tc-getCXX)" - LDFLAGS="${LDFLAGS}" - MAKEOPTS="${MAKEOPTS}" - PKGCONFIG="$(tc-getPKG_CONFIG)" - RANLIB="$(tc-getRANLIB)" - SAVEDIR="~/.crawl-${SLOT}" - SOUND=$(usex sound "y" "") - STRIP=touch - USE_LUAJIT= - V=1 - prefix="/usr" - ) - - if use ncurses || (use !ncurses && use !tiles) ; then - emake "${myemakeargs[@]}" - # move it in case we build both variants - use tiles && { mv "crawl-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;} - fi - - if use tiles ; then - emake "${myemakeargs[@]}" clean - emake "${myemakeargs[@]}" "TILES=y" - fi -} - -src_test() { - emake "${myemakeargs[@]}" \ - $(usex tiles "TILES=y" "") \ - catch2-tests -} - -src_install() { - emake "${myemakeargs[@]}" \ - $(usex tiles "TILES=y" "") \ - DESTDIR="${D}" \ - prefix_fp="" \ - bin_prefix="${D}/usr/bin" \ - install - - [[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}" - - # don't relocate docs, needed at runtime - rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license - - mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \ - || die "Couldn't append slot to man page name" - doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" - - # icons and menu for graphical build - if use tiles ; then - doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png - doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg - make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}" - fi -} - -pkg_postinst() { - xdg_icon_cache_update - - elog "crawl is a slotted install that supports having" - elog "multiple versions installed. The binary has the" - elog "slot appended, e.g. 'crawl-"${SLOT}"'." - - if use tiles && use ncurses ; then - elog - elog "Since you have enabled both tiles and ncurses frontends" - elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the" - elog "tiles binary is called 'crawl-"${SLOT}"'." - fi -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220522.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild index 581562af2424..a78e930788f1 100644 --- a/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220522.ebuild +++ b/games-roguelike/stone-soup/stone-soup-0.29.0_pre20220701.ebuild @@ -3,8 +3,8 @@ EAPI=8 -LUA_COMPAT=( lua5-{1..3} ) -PYTHON_COMPAT=( python3_{7,8,9,10} ) +LUA_COMPAT=( lua5-1 ) +PYTHON_COMPAT=( python3_{8,9,10,11} ) VIRTUALX_REQUIRED="manual" inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs @@ -13,7 +13,7 @@ HOMEPAGE="https://crawl.develz.org" SLOT="0.29" # Leave empty string if not a _pre release -COMMITSHA="acb4ef3bc58aea425821c9a58552bf662dc29f07" +COMMITSHA="40bbea3e7347d6647ea791ba38964496f292cc81" if [ -z "${COMMITSHA}" ]; then # This is a proper release SRC_URI=" @@ -40,6 +40,7 @@ LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT" KEYWORDS="~amd64 ~x86" IUSE="advpng debug ncurses sound test +tiles" RESTRICT="!test? ( test )" +REQUIRED_USE="${LUA_REQUIRED_USE}" S=${WORKDIR}/${MY_P}/source RDEPEND=" @@ -62,7 +63,7 @@ RDEPEND=" virtual/opengl )" DEPEND="${RDEPEND} - test? ( dev-cpp/catch:0 ) + test? ( <dev-cpp/catch-3.0.0:0 ) tiles? ( sys-libs/ncurses:0 ) |