From d72a987a342949e200b5e9decbd71f246da53788 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 May 2024 00:01:15 +0100 Subject: gentoo auto-resync : 12:05:2024 - 00:01:15 --- games-strategy/Manifest.gz | Bin 8087 -> 8089 bytes games-strategy/xbattleai/Manifest | 3 +- .../xbattleai/files/xbattleai-1.2.2-C99.patch | 43 +++++++++++++++++ games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild | 51 -------------------- games-strategy/xbattleai/xbattleai-1.2.2-r3.ebuild | 52 +++++++++++++++++++++ 5 files changed, 97 insertions(+), 52 deletions(-) create mode 100644 games-strategy/xbattleai/files/xbattleai-1.2.2-C99.patch delete mode 100644 games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild create mode 100644 games-strategy/xbattleai/xbattleai-1.2.2-r3.ebuild (limited to 'games-strategy') diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz index af832445a85c..a59a8993b08d 100644 Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ diff --git a/games-strategy/xbattleai/Manifest b/games-strategy/xbattleai/Manifest index 8e49c2a855ee..c91a2659a04e 100644 --- a/games-strategy/xbattleai/Manifest +++ b/games-strategy/xbattleai/Manifest @@ -1,4 +1,5 @@ +AUX xbattleai-1.2.2-C99.patch 1229 BLAKE2B 9f1890e8d7e78b024082fae2f78bf3e62ffc5550e36dd396161916f3ad41413c6ab9763f710cabb9bed7667b94babfe9bae0f3cc68be8c8a449b27cb81171775 SHA512 9a096df97920cfd8155f52aa992a2b2e99c8558ee6f7aa1a1050fbe4bfc36527bb07453a5dbe658401f90a2ce0925ef323c0a513d18973ef5e6d467b2a769dd1 AUX xbattleai-1.2.2-sandbox.patch 4167 BLAKE2B e6336e72f4c466475e164e997bcef44d4c5fd96f457d08f2d1326761fade15e911ab048f05e63e4cadfdd955a90adce763c9b1facace8c33145e49b61482ad54 SHA512 013bd282c53f9a99b530b5a75907f7cc7b6829a0b20b7f77668325e1e12f2d8257019f68d1ccd147ac69d14d217412a31a3dcb3feaf2b55c39ae80545f956076 DIST xbattleai-1.2.2.tgz 1511991 BLAKE2B f4372d9521ba878b53132a00392b3254d90642e0993920b44235eeb6ef1d874a32c7583983aecabf96ad245795820bb42c59a07c850db655ef7803f9216b61ed SHA512 41ac0f558b3adc697897903f5c9ed0d411867c405f0452282958083db7637c97a19f0ac9727e5123648a12dd2dcc5a304031efaab6089068b9f542e5db185e18 -EBUILD xbattleai-1.2.2-r2.ebuild 1043 BLAKE2B e67dcaab1d14fc3a1f1e32c61af26cbc6fd083d58735406ad385cbc955336d2f5a49c2a06ec23308cdd621706e61f2fd07ad0ca52ee842529a74b3c90a59e446 SHA512 61eb7f6c7db69f66a14190efa86c5321961e664ebe60ab4957211ccf221254661b80ebf52721c89ad58a1013d9e56d73e55937c489e33d452774668e04ec00a0 +EBUILD xbattleai-1.2.2-r3.ebuild 1085 BLAKE2B 3768a6f7c0cde5965cf0bed74e08142f28cd3226af88f819daebeda949a57fac81d9a4352646629fa2ec8986cc2f12715bafe9011d39d6489fcd3e23b3a36652 SHA512 f39d5b58238feb0abe35ee49d97d80c5893e2b6799b5498581973e94eed93d676f4cbdb61458c4aeef930784d89fa1fbd413c3fda1862adf3b53b12668bc75c8 MISC metadata.xml 1357 BLAKE2B 28204cd74121fd6de8bfdc622dd9be8a0b61bb0010d0e9483e55fd24f2674d0efe2c40b6777bcab17e0d75bdf99f00c67904213569e16072fe431652d7085516 SHA512 c50c845e69a5e2b2064c62903aa9cdcd1dc88291a8851a86d3924206c30b5caa44261ca21f6ac2e9af242bb5c89ce99c4583290c566f8194154c59942f609a8f diff --git a/games-strategy/xbattleai/files/xbattleai-1.2.2-C99.patch b/games-strategy/xbattleai/files/xbattleai-1.2.2-C99.patch new file mode 100644 index 000000000000..22912c03fc58 --- /dev/null +++ b/games-strategy/xbattleai/files/xbattleai-1.2.2-C99.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/882271 +Also change to automake file as consequence of eautoreconf +--- a/Makefile.in 2024-05-10 09:49:47.696279770 -0000 ++++ b/Makefile.in 2024-05-10 09:50:14.532113463 -0000 +@@ -144,13 +144,13 @@ + .PHONY: config + config: ${SRC_DIR}/Makefile ${SRC_DIR}/config.h + +-${SRC_DIR}/configure: ${SRC_DIR}/configure.in ++${SRC_DIR}/configure: ${SRC_DIR}/configure.ac + @${ECHO} "The configure script is out of date; rebuilding..." + autoconf + @${ECHO} >> ${SRC_DIR}/config.h.in + @${ECHO} >> $@ + +-${SRC_DIR}/config.h.in: ${SRC_DIR}/configure.in ++${SRC_DIR}/config.h.in: ${SRC_DIR}/configure.ac + @${ECHO} "The config.h.in header is out of date; rebuilding..." + autoheader + @${ECHO} >> $@ +--- a/sound.c 2024-05-10 09:53:25.753928428 -0000 ++++ b/sound.c 2024-05-10 09:54:18.646600643 -0000 +@@ -51,6 +51,8 @@ + #ifdef HAVE_LINUX_SOUNDCARD_H + # include + #endif ++ ++#include + #include "extern.h" + #include "options2.h" + #include "constant.h" +--- a/victory.c 2024-05-10 09:53:25.752928434 -0000 ++++ b/victory.c 2024-05-10 09:55:09.470285679 -0000 +@@ -7,6 +7,9 @@ + # include + #endif + ++#include ++#include ++ + #include "constant.h" + #include "extern.h" + diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild deleted file mode 100644 index f76d66031ae2..000000000000 --- a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="A multi-player game of strategy and coordination" -HOMEPAGE="https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/" -SRC_URI="https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/${P}.tgz" - -LICENSE="xbattle" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -# Since this uses similar code and the same binary name as the original XBattle, -# we want to make sure you can't install both at the same time -RDEPEND=" - dev-lang/tcl:0 - dev-lang/tk:0 - x11-libs/libX11 - x11-libs/libXext - !games-strategy/xbattle -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - app-text/rman - x11-misc/imake -" - -DOCS=( CONTRIBUTORS README README.AI TODO xbattle.dot ) - -PATCHES=( - "${FILESDIR}"/${P}-sandbox.patch -) - -src_prepare() { - default - rm -f xbcs/foo.xbc~ || die - rm config.cache || die - - tc-export CC -} - -src_install() { - default - mv "${ED}/usr/bin/"{,xb_}gauntletCampaign || die -} diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r3.ebuild b/games-strategy/xbattleai/xbattleai-1.2.2-r3.ebuild new file mode 100644 index 000000000000..2a47887ecf45 --- /dev/null +++ b/games-strategy/xbattleai/xbattleai-1.2.2-r3.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs autotools + +DESCRIPTION="A multi-player game of strategy and coordination" +HOMEPAGE="https://inf.ug.edu.pl/~piotao/zasoby/xbattle/mirror/www.lysator.liu.se/XBattleAI/" +SRC_URI="https://inf.ug.edu.pl/~piotao/zasoby/xbattle/mirror/www.lysator.liu.se/XBattleAI/${P}.tgz" + +LICENSE="xbattle" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +# Since this uses similar code and the same binary name as the original XBattle, +# we want to make sure you can't install both at the same time +RDEPEND=" + dev-lang/tcl:0 + dev-lang/tk:0 + x11-libs/libX11 + x11-libs/libXext +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + app-text/rman + x11-misc/imake +" + +DOCS=( CONTRIBUTORS README README.AI TODO xbattle.dot ) + +PATCHES=( + "${FILESDIR}"/${P}-sandbox.patch + "${FILESDIR}"/${P}-C99.patch +) + +src_prepare() { + default + rm -f xbcs/foo.xbc~ || die + rm config.cache || die + + tc-export CC + eautoreconf +} + +src_install() { + default + mv "${ED}/usr/bin/"{,xb_}gauntletCampaign || die +} -- cgit v1.2.3