From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild | 231 --------------------- games-strategy/0ad/0ad-0.0.25b_alpha.ebuild | 3 +- games-strategy/0ad/Manifest | 9 +- .../0ad-0.0.24_alpha_pre20210116040036-build.patch | 105 ---------- ...0.24b_alpha-fix-hang-on-quit-without-nvtt.patch | 98 --------- .../0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch | 82 -------- .../files/0ad-0.0.25b_alpha-fix-setuptools.patch | 188 +++++++++++++++++ games-strategy/Manifest.gz | Bin 8411 -> 8419 bytes games-strategy/freeciv/Manifest | 4 +- games-strategy/freeciv/freeciv-2.6.4.ebuild | 188 ----------------- games-strategy/freeciv/freeciv-2.6.6.ebuild | 188 +++++++++++++++++ games-strategy/naev/Manifest | 6 +- games-strategy/naev/metadata.xml | 6 - games-strategy/naev/naev-0.8.2.ebuild | 73 ------- games-strategy/naev/naev-0.9.1.ebuild | 91 -------- games-strategy/warzone2100/Manifest | 2 + .../warzone2100/warzone2100-4.2.6.ebuild | 116 +++++++++++ games-strategy/wesnoth/Manifest | 2 +- games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild | 4 +- 19 files changed, 504 insertions(+), 892 deletions(-) delete mode 100644 games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild delete mode 100644 games-strategy/0ad/files/0ad-0.0.24_alpha_pre20210116040036-build.patch delete mode 100644 games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch delete mode 100644 games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch create mode 100644 games-strategy/0ad/files/0ad-0.0.25b_alpha-fix-setuptools.patch delete mode 100644 games-strategy/freeciv/freeciv-2.6.4.ebuild create mode 100644 games-strategy/freeciv/freeciv-2.6.6.ebuild delete mode 100644 games-strategy/naev/naev-0.8.2.ebuild delete mode 100644 games-strategy/naev/naev-0.9.1.ebuild create mode 100644 games-strategy/warzone2100/warzone2100-4.2.6.ebuild (limited to 'games-strategy') diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild deleted file mode 100644 index 6307e21c5b2a..000000000000 --- a/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 2014-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" -PYTHON_COMPAT=( python3_{7..9} ) -inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/0ad/0ad" -elif [[ ${PV} == *_pre* ]]; then - ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7" -else - MY_P="0ad-${PV/_/-}" -fi - -DESCRIPTION="A free, real-time strategy game" -HOMEPAGE="https://play0ad.com/" - -if [[ ${PV} == 9999 ]]; then - S="${WORKDIR}/${P}" -elif [[ ${PV} == *_pre* ]]; then - SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}" -else - SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz" - SRC_URI+=" https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="editor +lobby nvtt pch test" -RESTRICT="test" - -# virtual/rust is for bundled SpiderMonkey -# Build-time Python dependency is for SM too -# TODO: Unbundle premake5 -# See bug #773472 which may help (bump for it) -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - virtual/rust - test? ( dev-lang/perl ) -" -# Removed dependency on nvtt as we use the bundled one -# bug #768930 -DEPEND=" - dev-libs/boost:= - dev-libs/icu:= - dev-libs/libfmt:0= - dev-libs/libsodium - dev-libs/libxml2 - media-libs/libpng:0 - media-libs/libsdl2[X,opengl,video] - media-libs/libvorbis - media-libs/openal - net-libs/enet:1.3 - net-libs/miniupnpc:= - net-misc/curl - sys-libs/zlib - virtual/opengl - x11-libs/libX11 - editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) - lobby? ( >=net-libs/gloox-1.0.20 ) -" -RDEPEND=" - ${DEPEND} - !games-strategy/0ad-data -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.0.24_alpha_pre20210116040036-build.patch - "${FILESDIR}"/${PN}-0.0.24b_alpha-rust-1.50.patch - "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch - "${FILESDIR}"/${PN}-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch -) - -pkg_setup() { - use editor && setup-wxwidgets - - python-any-r1_pkg_setup -} - -src_prepare() { - default - - # SpiderMonkey's configure no longer recognises --build for - # the build tuple - sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die - - # Originally from 0ad-data - rm binaries/data/tools/fontbuilder/fonts/*.txt || die -} - -src_configure() { - local myconf=( - --minimal-flags - $(usex nvtt "" "--without-nvtt") - $(usex pch "" "--without-pch") - $(usex test "" "--without-tests") - $(usex editor "--atlas" "") - $(usex lobby "" "--without-lobby") - --bindir="/usr/bin" - --libdir="/usr/$(get_libdir)"/${PN} - --datadir="/usr/share/${PN}" - ) - - tc-export AR CC CXX RANLIB - - # Stock premake5 does not work, use the shipped one - # TODO: revisit this, see above BDEPEND note re premake5 - emake -C "${S}"/build/premake/premake5/build/gmake2.unix - - # Regenerate scripts.c so our patch applies - cd "${S}"/build/premake/premake5 || die - "${S}"/build/premake/premake5/bin/release/premake5 embed || die - - # Rebuild premake again - emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean - emake -C "${S}"/build/premake/premake5/build/gmake2.unix - - # Run premake to create build scripts - cd "${S}"/build/premake || die - "${S}"/build/premake/premake5/bin/release/premake5 \ - --file="premake5.lua" \ - --outpath="../workspaces/gcc/" \ - --os=linux \ - "${myconf[@]}" \ - gmake2 \ - || die "Premake failed" -} - -src_compile() { - # Build 3rd party fcollada - einfo "Building bundled fcollada" - emake -C libraries/source/fcollada/src - - # Build bundled NVTT - # nvtt is abandoned upstream and 0ad have forked it and added fixes. - # Use their copy. bug #768930 - if use nvtt ; then - cd libraries/source/nvtt || die - elog "Building bundled NVTT (bug #768930)" - JOBS="-j$(makeopts_jobs)" ./build.sh || die "Failed to build bundled NVTT" - cd "${S}" || die - fi - - # Build bundled SpiderMonkey - # We really can't use the system SpiderMonkey right now. - # Breakages occur even on minor bumps in upstream SM, - # e.g. bug #768840. - cd libraries/source/spidermonkey || die - elog "Building bundled SpiderMonkey (bug #768840)" - XARGS="${EPREFIX}/usr/bin/xargs" \ - JOBS="-j$(makeopts_jobs)" \ - ./build.sh \ - || die "Failed to build bundled SpiderMonkey" - - cd "${S}" || die - - # Build 0ad itself! - elog "Building 0ad" - JOBS="-j$(makeopts_jobs)" emake -C build/workspaces/gcc verbose=1 - - # Build assets - # (We only do this if we're using a snapshot/non-release) - # See bug #771147 (comment 3) and the old 0ad-data ebuild - # Warning: fragile! - if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then - # source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing. - addpredict /proc/self/task - - # Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh. - local archivebuild_input archivebuild_output mod_name - for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do - mod_name="${archivebuild_input##*/}" - archivebuild_output="archives/${mod_name}" - - mkdir -p "${archivebuild_output}" || die - - einfo pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip" - LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis \ - -archivebuild="${archivebuild_input}" \ - -archivebuild-output="${archivebuild_output}/${mod_name}.zip" \ - || die "Failed to build assets" - - if [[ -f "${archivebuild_input}/mod.json" ]]; then - cp "${archivebuild_input}/mod.json" "${archivebuild_output}" || die - fi - - rm -r "${archivebuild_input}" || die - mv "${archivebuild_output}" "${archivebuild_input}" || die - done - - # Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh. - rm binaries/data/config/dev.cfg || die - rm -r binaries/data/mods/_test.* || die - fi -} - -src_test() { - cd binaries/system || die - ./test -libdir "${S}/binaries/system" || die "Failed tests" -} - -src_install() { - newbin binaries/system/pyrogenesis 0ad - use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor - - # Merged from 0ad-data - # bug #771147 (comment 3) - insinto /usr/share/${PN} - doins -r binaries/data/{l10n,config,mods,tools} - - # Install bundled SpiderMonkey and nvtt - # bug #771147 (comment 1) - exeinto /usr/$(get_libdir)/${PN} - doexe binaries/system/{libCollada,libmozjs78-ps-release}.so - - use nvtt && doexe binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so - use editor && doexe binaries/system/libAtlasUI.so - - dodoc binaries/system/readme.txt - doicon -s 128 build/resources/${PN}.png - make_desktop_entry ${PN} -} diff --git a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild index e01f6242d2cd..d7b282a68f35 100644 --- a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild +++ b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild @@ -1,4 +1,4 @@ -# Copyright 2014-2021 Gentoo Authors +# Copyright 2014-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -90,6 +90,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch + "${FILESDIR}"/${PN}-0.0.25b_alpha-fix-setuptools.patch ) pkg_setup() { diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest index b4bc529c2b16..e967fbdd870f 100644 --- a/games-strategy/0ad/Manifest +++ b/games-strategy/0ad/Manifest @@ -1,13 +1,8 @@ -AUX 0ad-0.0.24_alpha_pre20210116040036-build.patch 5971 BLAKE2B 968ab7cbfa2b84312937c1f317e15ad9165fd951995dba90eef9b262448a066dc0403f0acf5fb4d40e372455b47d6b0f79c7a078601a8172d185e35463b383ed SHA512 391dc3c02184c9e67c21460833d19e386c0cb53c0bed663df531cc0efecfbe4b9a85c75b8ca682b2cd40891dd0719603108d96a21f8e5ba989fb0951713a1571 -AUX 0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch 2594 BLAKE2B 05c84cf91c8da8258719bdacacf35e7c57e4b5dd867c76a0aa320d919b6a30d68f3334bf9fe3aaaaf13c462d5a2ddd051a610ebe7b100e2d55583a5d0871d1be SHA512 787dc9287c6856c8fa2aabbad0f996801fcf98b5447574893ffbfc39fa2c2b626e60fc48023ff9c39293977749da4841e8a44930bdfb909272ee727dab4215a1 AUX 0ad-0.0.24b_alpha-respect-tc.patch 1095 BLAKE2B c7f2747ae832de76da3711687ce8e6d52039e23cbe31ca1114d27e93ec2b3ef150f4b241a0d869ec393c9f73e702f35ce5610f9b383bbe43e958989bbcfa0c17 SHA512 00c439a086da6553b09230cf57e76c9abcf8c13093a4d439ccb5724d6dee5474c46f924c5a0c5b43cdc8572445347dcf2a77eba3fcff17b16d492ca4bef90594 -AUX 0ad-0.0.24b_alpha-rust-1.50.patch 3529 BLAKE2B 0f354b806399f1cf9fc515a1f799d119fe5d53c6c48cc5de93cd3762c4df1f2e79b1d6fc34fe2c002b002c73ac2e259556d7464b665f4eb60a186820b9f40ae4 SHA512 71884811ed0c6acbc7fec4aa4f0c3700214fd325c28eb8149c9f65fe4018d968b1dfbe0746aea940aa08a0d656f866f40cfc67fcb62965fdc861583376256602 -DIST 0ad-0.0.24b-alpha-unix-build.tar.xz 75546740 BLAKE2B a724abba6bed4b580670588e9dcfe0f75f6cef0fbde6ad666356e96213c685932edd0a1daafb5dd04206870c2c8222340c9c51e83076ec2911cbb5377ca00666 SHA512 8173d393eb1bc57c38bef0076ba973ef46c877c06644365189c0887cd3152adba51d26b553e42221fd14343e9830a3a275bfcd9b28f66281e282ea3f247730ea -DIST 0ad-0.0.24b-alpha-unix-data.tar.xz 828553992 BLAKE2B 2081225d88d475ed0899648994a900677bc3280bb2ba6cf92354ece82b90ddcefddb48458fa23e2de97100e58f4db8db408d4b50d0306a8c3efe47d263064bf0 SHA512 d7804d25ddf376028f230a31c6fc1201dfa366b3d5434569a1a7852bb4c400fb14e5c8934c5d6c6295320cf2e62c64be83b1e3c4c27fd116115bfe7d01106726 +AUX 0ad-0.0.25b_alpha-fix-setuptools.patch 8270 BLAKE2B 65ec2d7be8602427a39b3b426dea0b4aa5741385d8416ae4db94f0f94d73b3c7ae2b3a851fbb5afe4e8d07d9d65739b5323d3f40e239fcb0d3d39e479419c3cf SHA512 b08424de3685c87901b3caeb39c415f0814f5a5a0a5df6890cf1fe829a822f4d52711c4219b230414c9144ecd1a6ff2b68973f91be415cff350df6f5b5f91fc9 DIST 0ad-0.0.25b-alpha-unix-build.tar.xz 75579956 BLAKE2B 674d69d625137709a186f9273607dc353fc99aea68ef3f2ea5031dbe2f684176910d757c3f03c7fbdac475d30708be448b71f5020d27a65c346bf147223bcb9d SHA512 e8069897b97b381099ab5ec5868d27e96c699105b3307054d1bc7bf9236a537f02625ba9034892d91f3e951b4f95c9ce5fb75ed0a7c14b8a294882482fd9c1b4 DIST 0ad-0.0.25b-alpha-unix-build.tar.xz.minisig 327 BLAKE2B 547a7a1c8a83167fa40976efb2efaf691fc5434eb1be227b481a70d308381b20dcdc90bb4652e190f8e329fb33cc19ebbaab43977329f8971e49436f7f1ce636 SHA512 9d6a235ea50183e1db16f4bf2dc59af9042a52e4e18ccd0c34c481a7e9021f19e2bc370e594aa97911bb7ca33bcc5ebe23a4b206cd74357060371ca06b6010d2 DIST 0ad-0.0.25b-alpha-unix-data.tar.xz 1249684600 BLAKE2B d77546ba9d21b512f106645c07fa92ecc343e0a01d9a70a83f2a2b3ade912e72d095982f7d4c4cd64e18fb71a67a01c419763744dd4cad1e8c081e5f77ec17c9 SHA512 d6bbe484acb7fbd507d303f5c75f8a2ccbaf8fe9dd30ff408b082f170bfd96eb9235db1b710c15656ef465b44fa5597679a694515e0c153a35fe24c0915f29f1 DIST 0ad-0.0.25b-alpha-unix-data.tar.xz.minisig 326 BLAKE2B 41975d4c4369780bd36edef448ab928c91ece0d60ddad04fbccd1da0ed5068b56c86fd57708c6158277c5db9faadc768f5e455d97fe5ae3c30a7522005c374e6 SHA512 ad3ef78b785db9eb37d547a86d2bf274e0b6635118a9c512d013adc45e4a0f071b86f0fb5bf696631596e0713b2de153b0ad245cbba86beb3ea153036178b07e -EBUILD 0ad-0.0.24b_alpha-r1.ebuild 6677 BLAKE2B fa0a10b1bc832dde551110b75696b0c31e8106e5c481d360d43b929577a9d774dd3bd5e6daa02cfe12e23f06221a46b9b56610a5fb28a1d44625bdc5e929106b SHA512 64169f56f044ac730b0258977f94558e793f9460e465dacf601eb4c07cc3063d62f26657956701abdd6c9cea71e028e8bda866477988b2a1b441176262656b21 -EBUILD 0ad-0.0.25b_alpha.ebuild 7766 BLAKE2B eca6038111d6bdda22432186a3811dfb8bd11073c1cc01eadc0bed78036b86f568bfb8b28ab44d3f2347056fa2333ffca4e06bd7655b5d1817c3e8bc91ae60a1 SHA512 ac174cb3284f742cdcac781e869943dd5811a01b0c8feacaf11589c4b66bc8f2a5602cd3391be737fd55c0a967bd06dfcecc14f3159f608110a014672c78881b +EBUILD 0ad-0.0.25b_alpha.ebuild 7822 BLAKE2B ccdbd4df870acb3cfb41e004156979fac8b0f73f3de307e529131884b1a7514e23a0ffe90e2ab42d2cb9c67fa0778d7400fd88e171cdd66d1efc0ce7227e108c SHA512 8ecbde1520772d00f224c7fc9e3846f23164b886a5e4cf95c70eb793dca633ed1b485cdfebe301f0bf6d31d3c93f3d43c798033b7b19e9f90f0a03383fac9f62 MISC metadata.xml 716 BLAKE2B d7a466a2c5de2f182b096d36266225800370484b1bec656766e174f7a7b70b019d67c563f6f5eb9bfe983c874dca850a8b906ee1db1418723d20bf4d7a3a3efc SHA512 20bec043e136ea27267ad9f18753d77235f90a760f6497ae27a9440741c1d3a82193401c201b9941299d281cba62589367c84de3e30d393abe1bf452c70fde81 diff --git a/games-strategy/0ad/files/0ad-0.0.24_alpha_pre20210116040036-build.patch b/games-strategy/0ad/files/0ad-0.0.24_alpha_pre20210116040036-build.patch deleted file mode 100644 index 1e643adb41a9..000000000000 --- a/games-strategy/0ad/files/0ad-0.0.24_alpha_pre20210116040036-build.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- /build/premake/premake5/build/gmake2.bsd/Premake5.make -+++ /build/premake/premake5/build/gmake2.bsd/Premake5.make -@@ -36,19 +36,19 @@ - TARGET = $(TARGETDIR)/premake5 - OBJDIR = obj/Release/Premake5 - DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN --ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra --ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector -+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -fno-stack-protector - LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a -lm - LDDEPS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a --ALL_LDFLAGS += $(LDFLAGS) -s -rdynamic -+ALL_LDFLAGS += $(LDFLAGS) -rdynamic - - else ifeq ($(config),debug) - TARGETDIR = ../../bin/debug - TARGET = $(TARGETDIR)/premake5 - OBJDIR = obj/Debug/Premake5 - DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN --ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra --ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra -+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra - LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a -lm - LDDEPS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a - ALL_LDFLAGS += $(LDFLAGS) -rdynamic ---- /build/premake/premake5/build/gmake2.macosx/Premake5.make -+++ /build/premake/premake5/build/gmake2.macosx/Premake5.make -@@ -45,8 +45,8 @@ - TARGET = $(TARGETDIR)/premake5 - OBJDIR = obj/Release/Premake5 - DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -DNDEBUG -DLUA_USE_MACOSX --ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra --ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector -+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -fno-stack-protector - LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a -framework CoreServices -framework Foundation -framework Security -lreadline - LDDEPS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a - -@@ -55,8 +55,8 @@ - TARGET = $(TARGETDIR)/premake5 - OBJDIR = obj/Debug/Premake5 - DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -D_DEBUG -DLUA_USE_MACOSX --ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra --ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra -+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra - LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a -framework CoreServices -framework Foundation -framework Security -lreadline - LDDEPS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a - ---- /build/premake/premake5/build/gmake2.unix/Premake5.make -+++ /build/premake/premake5/build/gmake2.unix/Premake5.make -@@ -36,19 +36,19 @@ - TARGET = $(TARGETDIR)/premake5 - OBJDIR = obj/Release/Premake5 - DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN --ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra --ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector -+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -fno-stack-protector - LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a -lm -ldl -lrt - LDDEPS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a --ALL_LDFLAGS += $(LDFLAGS) -s -rdynamic -+ALL_LDFLAGS += $(LDFLAGS) -rdynamic - - else ifeq ($(config),debug) - TARGETDIR = ../../bin/debug - TARGET = $(TARGETDIR)/premake5 - OBJDIR = obj/Debug/Premake5 - DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN --ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra --ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra -+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra - LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a -lm -ldl -lrt - LDDEPS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a - ALL_LDFLAGS += $(LDFLAGS) -rdynamic ---- /build/premake/premake5/src/tools/gcc.lua -+++ /build/premake/premake5/src/tools/gcc.lua -@@ -346,8 +346,7 @@ - -- - - function gcc.ldsymbols(cfg) -- -- OS X has a bug, see http://lists.apple.com/archives/Darwin-dev/2006/Sep/msg00084.html -- return iif(table.contains(os.getSystemTags(cfg.system), "darwin"), "-Wl,-x", "-s") -+ return "" - end - - gcc.ldflags = { ---- /libraries/source/fcollada/src/Makefile -+++ /libraries/source/fcollada/src/Makefile -@@ -9,9 +9,9 @@ - - CXX ?= g++ - CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) --CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL --CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL --CXXFLAGS_TEST := -O0 -g -D_DEBUG -+CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL -+CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL -+CXXFLAGS_TEST := -D_DEBUG - LDFLAGS_TEST= -ldl - LIBS += `pkg-config libxml-2.0 --libs` - INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags` diff --git a/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch b/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch deleted file mode 100644 index fe054eccac51..000000000000 --- a/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch +++ /dev/null @@ -1,98 +0,0 @@ -# Nils Freydank (2021-06-17) -Apply the patch from upstream with minor adoption. - -Gentoo bug: https://bugs.gentoo.org/779757 -Upstream Bug: https://trac.wildfiregames.com/ticket/6107 -Upstream Patch: https://trac.wildfiregames.com/changeset/25766 - ---- a/source/graphics/TextureConverter.cpp (revision 25765) -+++ b/source/graphics/TextureConverter.cpp (revision 25766) -@@ -294,9 +294,8 @@ - m_VFS(vfs), m_HighQuality(highQuality), m_Shutdown(false) - { -+#if CONFIG2_NVTT - // Verify that we are running with at least the version we were compiled with, - // to avoid bugs caused by ABI changes --#if CONFIG2_NVTT - ENSURE(nvtt::version() >= NVTT_VERSION); --#endif - - m_WorkerThread = std::thread(Threading::HandleExceptions::Wrapper, this); -@@ -304,8 +303,10 @@ - // Maybe we should share some centralised pool of worker threads? - // For now we'll just stick with a single thread for this specific use. -+#endif // CONFIG2_NVTT - } - - CTextureConverter::~CTextureConverter() - { -+#if CONFIG2_NVTT - // Tell the thread to shut down - { -@@ -327,4 +328,5 @@ - // Wait for it to shut down cleanly - m_WorkerThread.join(); -+#endif // CONFIG2_NVTT - } - -@@ -477,8 +479,8 @@ - return true; - --#else -+#else // CONFIG2_NVTT - LOGERROR("Failed to convert texture \"%s\" (NVTT not available)", src.string8()); - return false; --#endif -+#endif // !CONFIG2_NVTT - } - -@@ -529,22 +531,24 @@ - return true; - --#else // #if CONFIG2_NVTT -+#else // CONFIG2_NVTT - return false; --#endif -+#endif // !CONFIG2_NVTT - } - - bool CTextureConverter::IsBusy() - { -+#if CONFIG2_NVTT - std::lock_guard lock(m_WorkerMutex); - return !m_RequestQueue.empty(); -+#else // CONFIG2_NVTT -+ return false; -+#endif // !CONFIG2_NVTT - } - - void CTextureConverter::RunThread(CTextureConverter* textureConverter) - { -+#if CONFIG2_NVTT - debug_SetThreadName("TextureConverter"); - g_Profiler2.RegisterCurrentThread("texconv"); -- --#if CONFIG2_NVTT -- - // Wait until the main thread wakes us up - while (true) -@@ -596,4 +600,4 @@ - std::lock_guard wait_lock(textureConverter->m_WorkerMutex); - textureConverter->m_Shutdown = false; --#endif --} -+#endif // CONFIG2_NVTT -+} - ---- a/source/graphics/TextureConverter.h (revision 25765) -+++ b/source/graphics/TextureConverter.h (revision 25766) -@@ -208,7 +208,9 @@ - bool m_HighQuality; - -+#if CONFIG2_NVTT - std::thread m_WorkerThread; - std::mutex m_WorkerMutex; - std::condition_variable m_WorkerCV; -+#endif // CONFIG2_NVTT - - struct ConversionRequest; diff --git a/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch b/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch deleted file mode 100644 index f4436a7b92c4..000000000000 --- a/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch +++ /dev/null @@ -1,82 +0,0 @@ -https://bugs.gentoo.org/773493 ---- a/libraries/source/spidermonkey/FixRust150.diff -+++ b/libraries/source/spidermonkey/FixRust150.diff -@@ -0,0 +1,65 @@ -+ -+# HG changeset patch -+# User Emilio Cobos Álvarez -+# Date 1609006565 0 -+# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582 -+# Parent 55097a5cf353f1b2a2228820bdf26bb69a1372a0 -+Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM -+ -+Fixes errors like: -+ -+ dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed. -+ -+I've left the most specific dependency, but for wgpu the rev is not -+right, so I've kept the branch which effectively preserves behavior. -+ -+Differential Revision: https://phabricator.services.mozilla.com/D100485 -+ -+diff --git a/.cargo/config.in b/.cargo/config.in -+--- a/.cargo/config.in -++++ b/.cargo/config.in -+@@ -1,16 +1,16 @@ -+ # This file contains vendoring instructions for cargo. -+ # It was generated by `mach vendor rust`. -+ # Please do not edit. -+ -+ [source."https://github.com/shravanrn/nix/"] -+-branch = "r0.13.1" -+ git = "https://github.com/shravanrn/nix/" -+ replace-with = "vendored-sources" -++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e" -+ -+ [source."https://github.com/mozilla/rkv"] -+ git = "https://github.com/mozilla/rkv" -+ replace-with = "vendored-sources" -+ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731" -+ -+ [source."https://github.com/mozilla/neqo"] -+ git = "https://github.com/mozilla/neqo" -+diff --git a/Cargo.lock b/Cargo.lock -+--- a/Cargo.lock -++++ b/Cargo.lock -+@@ -3200,7 +3200,7 @@ -+ [[package]] -+ name = "nix" -+ version = "0.13.1" -+-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e" -++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e" -+ dependencies = [ -+ "bitflags", -+ "cc", -+diff --git a/Cargo.toml b/Cargo.toml -+--- a/Cargo.toml -++++ b/Cargo.toml -+@@ -60,8 +60,8 @@ -+ [patch.crates-io] -+ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" } -+ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" } -+-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } -+-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" } -++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } -++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" } -+ # failure's backtrace feature might break our builds, see bug 1608157. -+ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } -+ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } -+ ---- a/libraries/source/spidermonkey/patch.sh -+++ b/libraries/source/spidermonkey/patch.sh -@@ -39,6 +39,10 @@ - # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491 - patch -p1 < ../FixRpiUnalignedFpAccess.diff - -+# Bug 1684261 upstreamed from 78.8: https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb -+# Note that this isn't quite the upstream patch to match our version. -+patch -p1 < ../FixRust150.diff -+ - # Patch those separately, as they might interfere with normal behaviour. - if [ "$(uname -s)" = "FreeBSD" ]; - then diff --git a/games-strategy/0ad/files/0ad-0.0.25b_alpha-fix-setuptools.patch b/games-strategy/0ad/files/0ad-0.0.25b_alpha-fix-setuptools.patch new file mode 100644 index 000000000000..ea0626fadadd --- /dev/null +++ b/games-strategy/0ad/files/0ad-0.0.25b_alpha-fix-setuptools.patch @@ -0,0 +1,188 @@ +https://bugs.gentoo.org/826762 +https://bugzilla.mozilla.org/show_bug.cgi?id=1665675 +https://phabricator.services.mozilla.com/D90627 +--- a/libraries/source/spidermonkey/patch.sh ++++ b/libraries/source/spidermonkey/patch.sh +@@ -51,5 +51,7 @@ then + # https://svnweb.freebsd.org/ports/head/lang/spidermonkey78/files/patch-third__party_rust_cc_.cargo-checksum.json?view=log + patch -p1 < ../FixFreeBSDCargoChecksum.diff + # https://svnweb.freebsd.org/ports/head/lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs?view=log + patch -p1 < ../FixFreeBSDRustThirdPartyOSDetection.diff + fi ++ ++patch -p1 < ../FixSysconfigImport.diff +--- a/libraries/source/spidermonkey/FixSysconfigImport.diff ++++ b/libraries/source/spidermonkey/FixSysconfigImport.diff +@@ -0,0 +1,171 @@ ++diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py ++--- a/python/mozbuild/mozbuild/configure/__init__.py +++++ b/python/mozbuild/mozbuild/configure/__init__.py ++@@ -877,17 +877,56 @@ ++ ++ def _apply_imports(self, func, glob): ++ for _from, _import, _as in self._imports.pop(func, ()): ++- _from = '%s.' % _from if _from else '' ++- if _as: ++- glob[_as] = self._get_one_import('%s%s' % (_from, _import)) +++ self._get_one_import(_from, _import, _as, glob) +++ +++ def _handle_wrapped_import(self, _from, _import, _as, glob): +++ """Given the name of a module, "import" a mocked package into the glob +++ iff the module is one that we wrap (either for the sandbox or for the +++ purpose of testing). Applies if the wrapped module is exposed by an +++ attribute of `self`. +++ +++ For example, if the import statement is `from os import environ`, then +++ this function will set +++ glob['environ'] = self._wrapped_os.environ. +++ +++ Iff this function handles the given import, return True. +++ """ +++ module = (_from or _import).split('.')[0] +++ attr = '_wrapped_' + module +++ wrapped = getattr(self, attr, None) +++ if wrapped: +++ if _as or _from: +++ obj = self._recursively_get_property( +++ module, (_from + '.' if _from else '') + _import, wrapped) +++ glob[_as or _import] = obj ++ else: ++- what = _import.split('.')[0] ++- glob[what] = self._get_one_import('%s%s' % (_from, what)) +++ glob[module] = wrapped +++ return True +++ else: +++ return False +++ +++ def _recursively_get_property(self, module, what, wrapped): +++ """Traverse the wrapper object `wrapped` (which represents the module +++ `module`) and return the property represented by `what`, which may be a +++ series of nested attributes. +++ +++ For example, if `module` is 'os' and `what` is 'os.path.join', +++ return `wrapped.path.join`. +++ """ +++ if what == module: +++ return wrapped +++ assert what.startswith(module + '.') +++ attrs = what[len(module + '.'):].split('.') +++ for attr in attrs: +++ wrapped = getattr(wrapped, attr) +++ return wrapped ++ ++ @memoized_property ++ def _wrapped_os(self): ++ wrapped_os = {} ++ exec_('from os import *', {}, wrapped_os) +++ # Special case os and os.environ so that os.environ is our copy of +++ # the environment. ++ wrapped_os['environ'] = self._environ ++ return ReadOnlyNamespace(**wrapped_os) ++ ++@@ -913,57 +952,62 @@ ++ ++ return ReadOnlyNamespace(**wrapped_subprocess) ++ ++- def _get_one_import(self, what): ++- # The special `__sandbox__` module gives access to the sandbox ++- # instance. ++- if what == '__sandbox__': ++- return self +++ @memoized_property +++ def _wrapped_six(self): +++ if six.PY3: +++ return six +++ wrapped_six = {} +++ exec_('from six import *', {}, wrapped_six) +++ wrapped_six_moves = {} +++ exec_('from six.moves import *', {}, wrapped_six_moves) +++ wrapped_six_moves_builtins = {} +++ exec_('from six.moves.builtins import *', {}, +++ wrapped_six_moves_builtins) +++ ++ # Special case for the open() builtin, because otherwise, using it ++ # fails with "IOError: file() constructor not accessible in ++ # restricted mode". We also make open() look more like python 3's, ++ # decoding to unicode strings unless the mode says otherwise. ++- if what == '__builtin__.open' or what == 'builtins.open': ++- if six.PY3: ++- return open +++ def wrapped_open(name, mode=None, buffering=None): +++ args = (name,) +++ kwargs = {} +++ if buffering is not None: +++ kwargs['buffering'] = buffering +++ if mode is not None: +++ args += (mode,) +++ if 'b' in mode: +++ return open(*args, **kwargs) +++ kwargs['encoding'] = system_encoding +++ return codecs.open(*args, **kwargs) +++ +++ wrapped_six_moves_builtins['open'] = wrapped_open +++ wrapped_six_moves['builtins'] = ReadOnlyNamespace( +++ **wrapped_six_moves_builtins) +++ wrapped_six['moves'] = ReadOnlyNamespace(**wrapped_six_moves) ++ ++- def wrapped_open(name, mode=None, buffering=None): ++- args = (name,) ++- kwargs = {} ++- if buffering is not None: ++- kwargs['buffering'] = buffering ++- if mode is not None: ++- args += (mode,) ++- if 'b' in mode: ++- return open(*args, **kwargs) ++- kwargs['encoding'] = system_encoding ++- return codecs.open(*args, **kwargs) ++- return wrapped_open ++- # Special case os and os.environ so that os.environ is our copy of ++- # the environment. ++- if what == 'os.environ': ++- return self._environ ++- if what == 'os': ++- return self._wrapped_os ++- # And subprocess, so that its functions use our os.environ ++- if what == 'subprocess': ++- return self._wrapped_subprocess ++- if what in ('subprocess.call', 'subprocess.check_call', ++- 'subprocess.check_output', 'subprocess.Popen'): ++- return getattr(self._wrapped_subprocess, what[len('subprocess.'):]) +++ return ReadOnlyNamespace(**wrapped_six) +++ +++ def _get_one_import(self, _from, _import, _as, glob): +++ """Perform the given import, placing the result into the dict glob.""" +++ if not _from and _import == '__builtin__': +++ glob[_as or '__builtin__'] = __builtin__ +++ return +++ if _from == '__builtin__': +++ _from = 'six.moves.builtins' +++ # The special `__sandbox__` module gives access to the sandbox +++ # instance. +++ if not _from and _import == '__sandbox__': +++ glob[_as or _import] = self +++ return +++ if self._handle_wrapped_import(_from, _import, _as, glob): +++ return +++ # If we've gotten this far, we should just do a normal import. ++ # Until this proves to be a performance problem, just construct an ++ # import statement and execute it. ++- import_line = '' ++- if '.' in what: ++- _from, what = what.rsplit('.', 1) ++- if _from == '__builtin__' or _from.startswith('__builtin__.'): ++- _from = _from.replace('__builtin__', 'six.moves.builtins') ++- import_line += 'from %s ' % _from ++- if what == '__builtin__': ++- what = 'six.moves.builtins' ++- import_line += 'import %s as imported' % what ++- glob = {} +++ import_line = '%simport %s%s' % ( +++ ('from %s ' % _from) if _from else '', _import, +++ (' as %s' % _as) if _as else '') ++ exec_(import_line, {}, glob) ++- return glob['imported'] ++ ++ def _resolve_and_set(self, data, name, value, when=None): ++ # Don't set anything when --help was on the command line + diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz index de012676d319..18add33f6733 100644 Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest index db82146b025f..527bdcfa4894 100644 --- a/games-strategy/freeciv/Manifest +++ b/games-strategy/freeciv/Manifest @@ -1,3 +1,3 @@ -DIST freeciv-2.6.4.tar.bz2 52087948 BLAKE2B 00392974707d9a11e626ac7855fcb27780492b7bead020f6849726ad39833d9ada288bad7245664f8446d0905f027dccc205ee6c943361ba9ba455c55c52cd04 SHA512 4dca3a09f4538ce865f5bfef2fa0cdd00b21e30d80bd24343a6d77564bb5239101254155295ccc18593af6f9a32b77ecb8d50c38d0710a37960372e9b1227221 -EBUILD freeciv-2.6.4.ebuild 4820 BLAKE2B a771f44d0ccc7839b1e0c267918ca8a146c695bd6df319a56777034d162d86e6ee9df3d46ab7f616e629940434045d68eb3c7724dfe837cbe0883b482c16b950 SHA512 4a00c160a3425bc03e773e0cf9ce93c7412695c3a2ad00f8931884e3e2e56e29885afaf3d0a0f42e7396d5bd053125b0232c8ab398da4d9dfa45582cc4ffdce9 +DIST freeciv-2.6.6.tar.bz2 52244748 BLAKE2B 88f85b8345b0a2baaa6626a6ab0c8a68e1e7a9a189f661b4fb800572090bf999c62e64641eae36a48b5d90a988bf43b839a411a60af285fbc234e2ca20fadd0c SHA512 97723d260c4e40328aaf26606a4f37871958b58a475cd3fc635edf2e94d28d486c6e28a75b42126e9e69580a60d24fc490da086877d0c912a544d643ff69b103 +EBUILD freeciv-2.6.6.ebuild 4820 BLAKE2B f6c511a8f73375a1aefd77eac76d715b47c70a6d2be8027ca4b3905235125bdec4e35054dd4c84b420fcc90c8b350af6a3a7873fae03a18cfc9a69fa857147f9 SHA512 79a66156a12c6677a05bd6d0f2f9585865cee0c8a3738810ddfa8fbe4f350a7ccee59314bbfa0507dee4571ba4d968a78ebb0effb5c0d0d231b65e1b53d03fbf MISC metadata.xml 1032 BLAKE2B cbb77e1508bd7149685571dddad89fde9e9f4f8e7c1893b689f508470e11892d5f363af4721e7a21d4026cb3338e161e527149f661020e8d4c04dae9550b6658 SHA512 88937e8b06608fadb6448c7bf61b3f095dab2c5962535d609fc341343e8e27171da8f247ecbd160df49ab6dddc10e17136754cab4624102df49da6a026e2df94 diff --git a/games-strategy/freeciv/freeciv-2.6.4.ebuild b/games-strategy/freeciv/freeciv-2.6.4.ebuild deleted file mode 100644 index e95f07c0aced..000000000000 --- a/games-strategy/freeciv/freeciv-2.6.4.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-3 ) - -inherit desktop lua-single qmake-utils xdg - -MY_PV="${PV/_beta/-beta}" -MY_PV="${MY_PV/_rc/-RC}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Multiplayer strategy game (Civilization Clone)" -HOMEPAGE="http://www.freeciv.org/" - -if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then - SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2" - KEYWORDS="~amd64 ~ppc64 ~x86" -fi - -LICENSE="GPL-2+" -SLOT="0" -IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua" - -REQUIRED_USE="system-lua? ( ${LUA_REQUIRED_USE} )" - -RDEPEND=" - app-arch/bzip2 - app-arch/xz-utils - net-misc/curl - sys-libs/zlib - auth? ( - !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) ) - mysql? ( dev-db/mysql-connector-c:0= ) - sqlite? ( dev-db/sqlite:3 ) - ) - dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) - !dedicated? ( - media-libs/libpng:0 - gtk? ( x11-libs/gtk+:3 ) - mapimg? ( media-gfx/imagemagick:= ) - modpack? ( x11-libs/gtk+:3 ) - nls? ( virtual/libintl ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - !sdl? ( !gtk? ( x11-libs/gtk+:3 ) ) - sdl? ( - media-libs/libsdl2[video] - media-libs/sdl2-gfx - media-libs/sdl2-image[png] - media-libs/sdl2-ttf - ) - server? ( aimodules? ( sys-devel/libtool:2 ) ) - sound? ( - media-libs/libsdl2[sound] - media-libs/sdl2-mixer[vorbis] - ) - ) - readline? ( sys-libs/readline:0= ) - system-lua? ( ${LUA_DEPS} ) -" -DEPEND="${RDEPEND} - !dedicated? ( x11-base/xorg-proto ) -" -# postgres isn't yet really supported by upstream -BDEPEND=" - virtual/pkgconfig - !dedicated? ( nls? ( sys-devel/gettext ) ) -" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use dedicated && ! use server ; then - ewarn "Disabling server USE flag will make it impossible to start local" - ewarn "games, but you will still be able to join multiplayer games." - fi - - use system-lua && lua-single_pkg_setup -} - -src_prepare() { - default - - # install the .desktop in /usr/share/applications - # install the icons in /usr/share/pixmaps - sed -i \ - -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \ - -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \ - -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \ - client/Makefile.in \ - server/Makefile.in \ - tools/Makefile.in \ - data/icons/Makefile.in || die -} - -src_configure() { - local myclient=() mydatabase=() myeconfargs=() - - if use auth ; then - if ! use mysql && ! use sqlite ; then - einfo "No database backend chosen, defaulting" - einfo "to mysql!" - mydatabase=( mysql ) - else - use mysql && mydatabase+=( mysql ) - use sqlite && mydatabase+=( sqlite3 ) - fi - else - mydatabase=( no ) - fi - - if use dedicated ; then - myclient=( no ) - myeconfargs+=( - --enable-server - --enable-freeciv-manual=html - ) - else - if use !sdl && use !gtk && ! use qt5 ; then - einfo "No client backend given, defaulting to gtk3 client!" - myclient=( gtk3 ) - else - use sdl && myclient+=( sdl2 ) - use gtk && myclient+=( gtk3 ) - if use qt5 ; then - local -x MOCCMD=$(qt5_get_bindir)/moc - myclient+=( qt ) - fi - fi - myeconfargs+=( - $(use_enable server) - $(use_enable server freeciv-manual html ) - ) - fi - - myeconfargs+=( - --enable-aimodules="$(usex aimodules "yes" "no")" - --enable-client="${myclient[*]}" - --enable-fcdb="${mydatabase[*]}" - --enable-fcmp="$(usex modpack "gtk3" "no")" - # disabling shared libs will break aimodules USE flag - --enable-shared - --localedir=/usr/share/locale - --with-appdatadir="${EPREFIX}"/usr/share/metainfo - $(use_enable ipv6) - $(use_enable mapimg) - $(use_enable nls) - $(use_enable sound sdl-mixer) - $(use_enable system-lua sys-lua) - $(use_with readline) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - if use dedicated ; then - rm -rf "${ED}"/usr/share/pixmaps || die - rm -f "${ED}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}* || die - else - if use server ; then - # Create and install the html manual. It can't be done for dedicated - # servers, because the 'freeciv-manual' tool is then not built. Also - # delete freeciv-manual from the GAMES_BINDIR, because it's useless. - # Note: to have it localized, it should be ran from _postinst, or - # something like that, but then it's a PITA to avoid orphan files... - ./tools/freeciv-manual || die - docinto html - dodoc classic*.html - fi - if use sdl ; then - make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client - else - rm -f "${ED}"/usr/share/man/man6/freeciv-sdl* || die - fi - rm -f "${ED}"/usr/share/man/man6/freeciv-xaw* || die - fi - find "${ED}" -name "freeciv-manual*" -delete || die - - rm -f "${ED}/usr/$(get_libdir)"/*.a || die - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/games-strategy/freeciv/freeciv-2.6.6.ebuild b/games-strategy/freeciv/freeciv-2.6.6.ebuild new file mode 100644 index 000000000000..3f7037e7e0e1 --- /dev/null +++ b/games-strategy/freeciv/freeciv-2.6.6.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-3 ) + +inherit desktop lua-single qmake-utils xdg + +MY_PV="${PV/_beta/-beta}" +MY_PV="${MY_PV/_rc/-RC}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Multiplayer strategy game (Civilization Clone)" +HOMEPAGE="http://www.freeciv.org/" + +if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then + SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2" + KEYWORDS="~amd64 ~ppc64 ~x86" +fi + +LICENSE="GPL-2+" +SLOT="0" +IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua" + +REQUIRED_USE="system-lua? ( ${LUA_REQUIRED_USE} )" + +RDEPEND=" + app-arch/bzip2 + app-arch/xz-utils + net-misc/curl + sys-libs/zlib + auth? ( + !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) ) + mysql? ( dev-db/mysql-connector-c:0= ) + sqlite? ( dev-db/sqlite:3 ) + ) + dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) + !dedicated? ( + media-libs/libpng:0 + gtk? ( x11-libs/gtk+:3 ) + mapimg? ( media-gfx/imagemagick:= ) + modpack? ( x11-libs/gtk+:3 ) + nls? ( virtual/libintl ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + !sdl? ( !gtk? ( x11-libs/gtk+:3 ) ) + sdl? ( + media-libs/libsdl2[video] + media-libs/sdl2-gfx + media-libs/sdl2-image[png] + media-libs/sdl2-ttf + ) + server? ( aimodules? ( sys-devel/libtool:2 ) ) + sound? ( + media-libs/libsdl2[sound] + media-libs/sdl2-mixer[vorbis] + ) + ) + readline? ( sys-libs/readline:0= ) + system-lua? ( ${LUA_DEPS} ) +" +DEPEND="${RDEPEND} + !dedicated? ( x11-base/xorg-proto ) +" +# postgres isn't yet really supported by upstream +BDEPEND=" + virtual/pkgconfig + !dedicated? ( nls? ( sys-devel/gettext ) ) +" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if ! use dedicated && ! use server ; then + ewarn "Disabling server USE flag will make it impossible to start local" + ewarn "games, but you will still be able to join multiplayer games." + fi + + use system-lua && lua-single_pkg_setup +} + +src_prepare() { + default + + # install the .desktop in /usr/share/applications + # install the icons in /usr/share/pixmaps + sed -i \ + -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \ + -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \ + -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \ + client/Makefile.in \ + server/Makefile.in \ + tools/Makefile.in \ + data/icons/Makefile.in || die +} + +src_configure() { + local myclient=() mydatabase=() myeconfargs=() + + if use auth ; then + if ! use mysql && ! use sqlite ; then + einfo "No database backend chosen, defaulting" + einfo "to mysql!" + mydatabase=( mysql ) + else + use mysql && mydatabase+=( mysql ) + use sqlite && mydatabase+=( sqlite3 ) + fi + else + mydatabase=( no ) + fi + + if use dedicated ; then + myclient=( no ) + myeconfargs+=( + --enable-server + --enable-freeciv-manual=html + ) + else + if use !sdl && use !gtk && ! use qt5 ; then + einfo "No client backend given, defaulting to gtk3 client!" + myclient=( gtk3 ) + else + use sdl && myclient+=( sdl2 ) + use gtk && myclient+=( gtk3 ) + if use qt5 ; then + local -x MOCCMD=$(qt5_get_bindir)/moc + myclient+=( qt ) + fi + fi + myeconfargs+=( + $(use_enable server) + $(use_enable server freeciv-manual html ) + ) + fi + + myeconfargs+=( + --enable-aimodules="$(usex aimodules "yes" "no")" + --enable-client="${myclient[*]}" + --enable-fcdb="${mydatabase[*]}" + --enable-fcmp="$(usex modpack "gtk3" "no")" + # disabling shared libs will break aimodules USE flag + --enable-shared + --localedir=/usr/share/locale + --with-appdatadir="${EPREFIX}"/usr/share/metainfo + $(use_enable ipv6) + $(use_enable mapimg) + $(use_enable nls) + $(use_enable sound sdl-mixer) + $(use_enable system-lua sys-lua) + $(use_with readline) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + if use dedicated ; then + rm -rf "${ED}"/usr/share/pixmaps || die + rm -f "${ED}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}* || die + else + if use server ; then + # Create and install the html manual. It can't be done for dedicated + # servers, because the 'freeciv-manual' tool is then not built. Also + # delete freeciv-manual from the GAMES_BINDIR, because it's useless. + # Note: to have it localized, it should be ran from _postinst, or + # something like that, but then it's a PITA to avoid orphan files... + ./tools/freeciv-manual || die + docinto html + dodoc classic*.html + fi + if use sdl ; then + make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client + else + rm -f "${ED}"/usr/share/man/man6/freeciv-sdl* || die + fi + rm -f "${ED}"/usr/share/man/man6/freeciv-xaw* || die + fi + find "${ED}" -name "freeciv-manual*" -delete || die + + rm -f "${ED}/usr/$(get_libdir)"/*.a || die + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest index fb66d6d942a4..46c2c7d406a7 100644 --- a/games-strategy/naev/Manifest +++ b/games-strategy/naev/Manifest @@ -1,7 +1,3 @@ -DIST naev-0.8.2-source.tar.gz 394232958 BLAKE2B 2e109636cb1d282bc8236c84ee40b9b96224baf70bf315677b6a02bf9c4c0059d34c5225c31b925a8c66c5995fd9ab8fc022816b66a7e1c174e017e3ebf5e956 SHA512 2ad120639efc13635370bb498d0a4100b2306779cf593e6aecffd331e0f4dec1b8af4729b2c4d484af1be9069d2ac7e47e17ebdc8ce65af878fcff9484f810b0 -DIST naev-0.9.1-source.tar.xz 394715556 BLAKE2B d90cbbc19f10a00060b3ca5ad3f62ef4291e352c7546c11141bd065ebc20efc0f676fb64af1d3dcf43957c62e59819445a5aa0babde579cdb936af136dd538a4 SHA512 d822eb2e22bcb564a0aec38c33205eedacf8399450725fc9709809e0c19a5c426b9a739f9c004691da8bf7b5393d1ed719a36a256a9e3e29d5a0917c9f72bd0f DIST naev-0.9.2-source.tar.xz 394764972 BLAKE2B 003a82cfc1fcfb6b597732d2e6691efb0f11867be6d82f7c18bc6c943e9a48dbaa5c126a39740a8d5f7a6e6ac0d3ff2f0b5f6c7c0504787c4d6872543fe99f3d SHA512 2bc31b78ee069d5d5b983e41b456a077101688dee31ad12d54016aa517d6cc3c970c7ff3b4a89b80ab04315e2e227a397c8202e7cbe3ee57cdac6c153032fc29 -EBUILD naev-0.8.2.ebuild 1690 BLAKE2B e2fd7e87ab1d24b31533f66ba5a9530b2bb2ef5ee8290253db169bb736e55e5bc1a0925c2bfea002bafbcea21128ad3454a980dba40626f21da2abc841e46e47 SHA512 8f8fc8c8f105c4b68808b01501415849755bee3d61ab1cb3ed02532e671e74f75785ca10bac5a8c1a56f95742c9c3cfdd5a864bed723d37fb8d74e3c79a8e415 -EBUILD naev-0.9.1.ebuild 1877 BLAKE2B bc9fb41a687e887126b0dec12e48aaea83b8464828bf466e4a8c757ba5e68e1926a2f14304f8438d7f87e2b6a21e86bec188f1dd2214d1e0995e4b1848b19fa2 SHA512 0d93a0dc4cc2c582cbf8f217e11faf80c53afebdcd11d634eceb440f4caa10c5167fd90450c3adb33ec483abec64fe5e30bbfb9a3e34060a4a205ed9557d11cc EBUILD naev-0.9.2.ebuild 1899 BLAKE2B 2b7451f9f777ad8003fa3b7a760ff8a8baf0e5c06f26319737da4a2ca2a561218ee9c41dfe948baacabbae460dd8f651895bc56c8c2b2ea748cd31efc34d868b SHA512 5ee93b553b522bcc4d98ba1043188cb7515cfc5d7e3b1fd2dd8a7964239ca2f811e0f69788ac5f8a442f7aa798e6fc87fb44d058ddbab0437e7b34dbf3113b13 -MISC metadata.xml 481 BLAKE2B d6a7459d0d2fb4410f583ea55041a67608358722841c09b49d1085d1cf995bc21b8c1630904abbcb2c1aaad3202da63c9ca987d23aab3712d89b3e27bfb5b4a9 SHA512 41ba5d7ee0c9c5eff0124320c04d6a366e7c01b21a6ff481fafb59e187940a9fe963988054162d6de19f6d89f60464f6ee9fddedba2f7b0745ca6d3ce267f2b5 +MISC metadata.xml 328 BLAKE2B 2c831943c7eee723e5c707906bcec96e97abd71e5d6fc3256010cca9626aebe95ecd7dca316a9567fe41186f0a656a434d774f83f088f414a95b3aba425c23b9 SHA512 426ac4b34b6cb45db05f5a7768a15947f67f5e90cda1bafa817320988aeb96ade18d774b2aa5e92d12c1fd1fd7a4964ac1bbdacbca6655325ccccc6a9405dfa4 diff --git a/games-strategy/naev/metadata.xml b/games-strategy/naev/metadata.xml index a088fbbc3917..9ba85e2d4d33 100644 --- a/games-strategy/naev/metadata.xml +++ b/games-strategy/naev/metadata.xml @@ -5,12 +5,6 @@ games@gentoo.org Gentoo Games Project - - - Enables media-libs/sdl-mixer sound backend in addition to - media-libs/openal one. - - naev/naev diff --git a/games-strategy/naev/naev-0.8.2.ebuild b/games-strategy/naev/naev-0.8.2.ebuild deleted file mode 100644 index 7289b7904c55..000000000000 --- a/games-strategy/naev/naev-0.8.2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-1 luajit ) -PYTHON_COMPAT=( python3_{7..10} ) -inherit lua-single meson python-any-r1 virtualx xdg - -DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity" -HOMEPAGE="https://naev.org/ https://github.com/naev/naev" -SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}-source.tar.gz" - -LICENSE="GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc +mixer +openal" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RDEPEND=" - ${LUA_DEPS} - dev-libs/libzip - dev-libs/libxml2 - media-libs/libsdl2[opengl,sound,video,X] - media-libs/libpng:0= - media-libs/freetype:2 - sci-libs/suitesparse - virtual/glu - virtual/libintl - virtual/opengl - mixer? ( media-libs/sdl2-mixer ) - openal? ( - media-libs/libvorbis - media-libs/openal - )" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - sys-devel/gettext - doc? ( - app-doc/doxygen - dev-lua/ldoc - )" - -pkg_setup() { - lua-single_pkg_setup - python-any-r1_pkg_setup -} - -src_prepare() { - default - sed -i -e "s:lua51:lua5.1:g" meson.build || die - # meson can't into docdir! - sed -i -e "s:doc/naev:doc/${PF}:g" meson.build || die - sed -i -e "s:'doc/naev':get_option('datadir') / 'doc/${PF}':g" docs/meson.build || die - # remove license file from install - sed -i -e "/'LICENSE'/d" meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_feature doc docs_c) - $(meson_feature doc docs_lua) - $(meson_feature lua_single_target_luajit luajit) - $(meson_feature openal) - $(meson_feature mixer sdl_mixer) - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} diff --git a/games-strategy/naev/naev-0.9.1.ebuild b/games-strategy/naev/naev-0.9.1.ebuild deleted file mode 100644 index e4bd429a52f1..000000000000 --- a/games-strategy/naev/naev-0.9.1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-1 luajit ) -PYTHON_COMPAT=( python3_{8..10} ) -inherit lua-single meson python-any-r1 virtualx xdg - -DESCRIPTION="2D space trading and combat game, in a similar vein to Escape Velocity" -HOMEPAGE="https://naev.org/" -SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}-source.tar.xz" - -LICENSE=" - GPL-3+ BSD BSD-2 CC-BY-2.0 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-2.0 - CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 MIT public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RDEPEND=" - ${LUA_DEPS} - dev-games/physfs - dev-libs/libunibreak:= - dev-libs/libxml2 - media-libs/freetype:2 - media-libs/libsdl2[X,joystick,opengl,video] - media-libs/libvorbis - media-libs/openal - media-libs/sdl2-image[png,webp] - sci-libs/cholmod - sci-libs/cxsparse - sci-libs/openblas - sci-libs/suitesparse - sci-mathematics/glpk:= - virtual/libintl - virtual/opengl" -DEPEND=" - ${RDEPEND} - test? ( - dev-games/physfs[zip] - media-libs/mesa[llvm] - )" -BDEPEND=" - $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - sys-devel/gettext - doc? ( - app-doc/doxygen[dot] - dev-lua/ldoc - )" - -python_check_deps() { - has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" -} - -pkg_setup() { - lua-single_pkg_setup - python-any-r1_pkg_setup -} - -src_prepare() { - default - - sed -i "s/'lua51'/'lua'/" meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_feature doc docs_c) - $(meson_feature doc docs_lua) - $(meson_feature lua_single_target_luajit luajit) - ) - - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -src_install() { - local DOCS=( CHANGELOG Readme.md ) - meson_src_install - - if use doc; then - mv "${ED}"/usr/{doc/naev/{c,lua},share/doc/${PF}} || die - rm -r "${ED}"/usr/doc || die - fi - rm -r "${ED}"/usr/share/doc/naev || die -} diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest index a68cf842d080..97b40a92560a 100644 --- a/games-strategy/warzone2100/Manifest +++ b/games-strategy/warzone2100/Manifest @@ -1,7 +1,9 @@ AUX warzone2100-4.1.3-no-compress-manpages.patch 2317 BLAKE2B 00d67b7df0898b1a6343b38ffb7e1655d3f16a94bffe94894f3cff5e25f1e7f426046beda9983eea963bac5fb2a7e49aca473b8b78d141ac00baa250710093c1 SHA512 48b8c3f651bf7d504da88a6351799cc9cd19bf84191f52e9ca5b0c5c60b52a81587c8a03fde5e3d8d19e7770dc7b17dd60b59d8441b47221a7cda5a8008f9558 DIST warzone2100-4.2.2.tar.xz 338585896 BLAKE2B e90ff6f5843a1750971a2cb7e77aac1e7c03ebeae90ea112d1eb735ea4a9cfee35de860e52f81824cde69543af6172ee630b6451ea39c141c188e4469f9200b9 SHA512 ea02207a27a01114daaf0819a98a63a5189570844dd69f50f493a1caafab7c05d85fb0d5c8a8b1b061ee3a050081e9786a1c090f4490134e93e8bbfa1903bd1b DIST warzone2100-4.2.4.tar.xz 338685080 BLAKE2B d83fc41d7bb7ff062ca6d3ce924c5e50560737b309db5a31e9fa81ed4dd5c079cf53aed472d1686daaa2e758583e79c3310575191e95d0b01d0f692786ff015f SHA512 26f470c137d9f53b759d182058080a07b7a505aa900fc0e6ff8349783564e0e298216f162032ff43c15f1e5811a8192e161498f87d8cc624a1a653a4044fcfb7 +DIST warzone2100-4.2.6.tar.xz 338691628 BLAKE2B 234d78feb1fceb0eff23c2c1b8d85a5fd9e5ef8912b324ae159ffdb43be728d6e4aa78bdf01561e60c64826083936bc36c2dfd1cee443aed06a52eaa047e8517 SHA512 5cddeff5b66d9e710b0c4d6d2863100106a901c17815220b7a97633a3980be41eaa192921d39bffff60f547fb5f5358fa1e63a54f41b5083203916314bb3d2a1 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6 EBUILD warzone2100-4.2.2.ebuild 2678 BLAKE2B 4c3db36d5f39189d1e43fbedeb894546bc133fc9d772f6fed8bb5bb7d1b39d84db2d6f66ac337a2c80cd24eef2d7fbd8cb230f1d2f6814d8f26ca658b13fa0ef SHA512 9459049e8aff4cb3a481699fbc1ebc2ba92d780cfe4984e9ddfdda8f03de5a465fb91d1da5b1a4d84d957a2fba23decdb4c7ab917e52b1f8e8367a97f46393d7 EBUILD warzone2100-4.2.4.ebuild 2678 BLAKE2B eb14053d289202f6c2678b70f56ab28c44608cfc035fcb290dad7aaa003cb35978811c31181e2395f9f3205aa79ce820a744a861e6aef1381cb1eec4cad541d3 SHA512 6ef716767cc4665be642a00281f76c51bbcd7baa18265f8f1f3648da5bc0af4c7207f65fda367f7faff231e5ba566509b11bb303b56a0134972da48124a07302 +EBUILD warzone2100-4.2.6.ebuild 2678 BLAKE2B abbd712501c57c331e199ff6d75ecfba88660576549f181e21e8e769f0525d2096b9781434031a10f1a8990313ccad49a609258ba8099836e4d8499726c396a7 SHA512 f30803098c061db711c06b007cb384d31c9a4888044815308ea74cbaf748cba05db41b3b90ba7a400b32a82155379ceb1f5bddfeda628f160aa19b7a4c5377f2 MISC metadata.xml 812 BLAKE2B b2b9ab08275974118342f645f9c6fee90fb2f8904a3c6708666d71d57ec71ab86e9f905669cc3fe9424cec8329d434c979e9ae87324f0b47ed313b28c66d6070 SHA512 0af92d46baaf497a9f5aa57e45f0860e94c36f008386c1f483a49d8df50719ef11532a8473b4068a5cc63286d7af72b71e4de2e883b178c278b7aecf27f8389d diff --git a/games-strategy/warzone2100/warzone2100-4.2.6.ebuild b/games-strategy/warzone2100/warzone2100-4.2.6.ebuild new file mode 100644 index 000000000000..c52979b65465 --- /dev/null +++ b/games-strategy/warzone2100/warzone2100-4.2.6.ebuild @@ -0,0 +1,116 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="af_ZA bg_BG ca_ES cs da de el en_GB eo es et_EE fa_IR fi fr fy ga he_IL hr hu id_ID id it ko la lt nb nl pl pt_BR pt ro ru sk sl tr tt_RU uk_UA zh_CN zh_TW" +inherit cmake plocale xdg + +MY_PV=$(ver_cut 1-2) +VIDEOS_PV=2.2 +VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz +DESCRIPTION="3D real-time strategy game" +HOMEPAGE="https://wz2100.net/" +SRC_URI="mirror://sourceforge/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P}.tar.xz + videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )" +S="${WORKDIR}/${PN}" + +LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain vulkan? ( GPL-3 )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +# Upstream requested debug support +IUSE="debug discord nls videos vulkan" + +CDEPEND=" + >=dev-games/physfs-2[zip] + dev-db/sqlite:3 + >=dev-libs/libsodium-1.0.14:= + media-libs/freetype:2 + media-libs/harfbuzz:= + media-libs/libogg + media-libs/libpng:= + media-libs/libsdl2[opengl,video,X] + media-libs/libtheora + media-libs/libvorbis + media-libs/openal + net-libs/miniupnpc:= + net-misc/curl + sys-libs/zlib + nls? ( virtual/libintl ) + vulkan? ( media-libs/libsdl2:=[vulkan] ) +" +DEPEND=" + ${CDEPEND} + dev-libs/fribidi + media-libs/fontconfig +" +RDEPEND=" + ${CDEPEND} + media-fonts/dejavu +" +BDEPEND=" + app-arch/zip + app-text/asciidoc + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +HTML_DOCS=( doc/quickstartguide.html doc/docbook-xsl.css doc/ScriptingManual.htm ) +DOCS=( README.md doc/images doc/Scripting.md doc/js-globals.md ) + +PATCHES=( + "${FILESDIR}"/${PN}-4.1.3-no-compress-manpages.patch +) + +src_unpack() { + unpack ${P}.tar.xz +} + +src_prepare() { + sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die + + # Delete translations we're not using + cleanup_po() { + local locale=${1} + einfo "Cleaning up disabled locale: ${locale}" + rm po/${locale}.po || die + } + + plocale_for_each_disabled_locale cleanup_po + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DWZ_DISTRIBUTOR="Gentoo Linux" + -DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF + -DWZ_ENABLE_BACKEND_VULKAN=$(usex vulkan) + -DBUILD_SHARED_LIBS=OFF + -DENABLE_NLS=$(usex nls) + -DENABLE_DISCORD=$(usex discord) + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + asciidoc -b html5 doc/quickstartguide.asciidoc || die +} + +src_install() { + cmake_src_install + + rm "${ED}"/usr/bin/.portable || die + + # We cover licencing within the ebuild itself + rm "${ED}"/usr/share/doc/${PF}/COPYING* \ + "${ED}"/usr/share/doc/${PF}/copyright || die + + if use videos ; then + insinto /usr/share/${PN} + newins "${DISTDIR}"/${VIDEOS_P} sequences.wz + fi +} diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index e566ec3d84a3..7e267c574b6a 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -5,5 +5,5 @@ DIST wesnoth-1.15.15.tar.gz 512968280 BLAKE2B 2b5c979244fb168e674d120a5eeef39055 DIST wesnoth-1.16.0.tar.gz 515780018 BLAKE2B 1a9d6aa9b294b9919d3b51528928f43d786f30fda739f0af2e62ebbb210b8f071945fe6130c00e2055d3726ae7eabf63b57fd2f1d5d8981a4cd0feedbfbffbfb SHA512 6d999a99e140916ef2070c524898ef69c7b45b3240f208aa380e81a1d1822a02c05a7fc9c5049a05a230e5126d8ff8723e16b6a62ba532b81c031f78ad8c85fe EBUILD wesnoth-1.14.14-r1.ebuild 2524 BLAKE2B e53ddf2cac6ffd8d95edd0708e00c595e2ab9f015ff98fb314e85683d1f2a42b76ceff356095ae70d010694baa6343dc8c99341c38ea260c624a20f7b847e321 SHA512 dc3e7c29bb2273d175b899b82c95499dfb44e9f167bf1e1990fc5da4fe8c27b4e409534efbb3217267c581c9453ecacc9a3fee8e1c1ee704a550136a9a2a0f27 EBUILD wesnoth-1.15.15.ebuild 2454 BLAKE2B 063e06beb12e8b609dd355655c55d7771b6df994c6f89892fdd5ec5e1308997e3c4cbae69259c8a4e8110b3cfff43040e4748a7a231f3854b9e4c1c8e62b6ffe SHA512 8a1ac9bc1f80882d56a94ac76d1abc0c47cacc6fa870b74cb979e41094ea54cbe494ba7f623735f5526b591a892139f0b259a822854dc89306c711e7710c0ec6 -EBUILD wesnoth-1.16.0-r1.ebuild 2361 BLAKE2B 544e8395aff4b66cff7ae0eafdac30fc26ad9fcd6408dd8b57d55f722eaee190aafd1ab3dbefd4e1753cbe1fd77c3d6b8da7129e7eaf93055f0d0ce0f03b2e83 SHA512 2659d205ec460b6b6c75965cd8f8c8c5c5fa8c279ab12a3f6a403ad2c0878894faca8772fbf5ab2d273c752b5367cfaa637a745b1baadada20b9e47574fff8d1 +EBUILD wesnoth-1.16.0-r1.ebuild 2373 BLAKE2B d9a7061e0de3223fd2fd0b7ecc85d101949e0ee0689953e19fc6fc3be1d725db6c1d9863757517a72e261c9ae588ddec834e0751ca125cfe4582415976a6fa78 SHA512 4813c803874ede90b4b2a84f6e3cd533756ee5918c2f59fb122d3f6b8490918365b7a8bc141b2083e955bbf48e4499659c98ac91c3d7f1a09ab9c9fa180aadda MISC metadata.xml 486 BLAKE2B a9dc64cc59fd1a47f9e6e13f6ebb9ba05845437efb6ec4e4fa68b5f1a1018d12fa7d1371fb4fb9ac0f83a3e2dbcc9eaade90a15ddd2213891dd8dff37280cb1d SHA512 10477ca40a5c3ba502f85841bed2ae73e8125b94c6c504288d8c9fc5742c0084f17c7b0901a298772a28e5c813c9d5034058b68d32ee4ec37513fadaf49442d1 diff --git a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild b/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild index 0d53e174d56e..12aaafe9867e 100644 --- a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ LICENSE="GPL-2" SLOT="0" # uneven minor versions are development versions if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" fi IUSE="dbus dedicated doc nls server" -- cgit v1.2.3