[gentoo-commits] repo/gentoo:master commit in: games-strategy/xbattleai/files/, games-strategy/xbattleai/
commit: ecf18f9a6d7ea696a4b11aa58f1d64736bba920c
Author: NHOrus yahoo com>
AuthorDate: Fri May 10 09:59:19 2024 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat May 11 20:31:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf18f9a
games-strategy/xbattleai: Port to C99, update EAPI 7 -> 8
Autoreconf fixes configuration failure due to C99 error, includes
are added unconditionally, because we now live in sane, homogenous
world, those are system files that ought to be on by default on any
linux system with libc and I don't want to touch autoconfig files
any more than what I need to.
Closes: https://bugs.gentoo.org/882271
Signed-off-by: NHOrus yahoo.com>
Signed-off-by: James Le Cuirot gentoo.org>
.../xbattleai/files/xbattleai-1.2.2-C99.patch | 43 ++
games-strategy/xbattleai/xbattleai-1.2.2-r3.ebuild | 52 ++
2 files changed, 95 insertions(+)
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 ..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 -
b/Makefile.in 2024-05-10 09:50:14.532113463 -
+@@ -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 -
b/sound.c 2024-05-10 09:54:18.646600643 -
+@@ -51,6 +51,8 @@
+ #ifdef HAVE_LINUX_SOUNDCARD_H
+ # include
+ #endif
++
++#include
+ #include "extern.h"
+ #include "options2.h"
+ #include "constant.h"
+--- a/victory.c2024-05-10 09:53:25.752928434 -
b/victory.c2024-05-10 09:55:09.470285679 -
+@@ -7,6 +7,9 @@
+ # include
+ #endif
+
++#include
++#include
++
+ #include "constant.h"
+ #include "extern.h"
+
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 ..7eca7dc94dec
--- /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/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
+"
+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
+}
[gentoo-commits] repo/gentoo:master commit in: games-strategy/xbattleai/
commit: d7f1cb66a4e86a173e9b2cf94f74d462bc78fc0d
Author: NHOrus yahoo com>
AuthorDate: Fri May 10 16:06:45 2024 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat May 11 20:31:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f1cb66
games-strategy/xbattleai: Update HOMEPAGE and SRC_URI
Co-authored-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: NHOrus yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/36626
Signed-off-by: James Le Cuirot gentoo.org>
games-strategy/xbattleai/xbattleai-1.2.2-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r3.ebuild
b/games-strategy/xbattleai/xbattleai-1.2.2-r3.ebuild
index 7eca7dc94dec..2a47887ecf45 100644
--- a/games-strategy/xbattleai/xbattleai-1.2.2-r3.ebuild
+++ b/games-strategy/xbattleai/xbattleai-1.2.2-r3.ebuild
@@ -6,8 +6,8 @@ EAPI=8
inherit toolchain-funcs autotools
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;
+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"
[gentoo-commits] repo/gentoo:master commit in: games-strategy/xbattleai/
commit: a7124c90d1f2d215566f70b709922ebf25047ac3
Author: James Le Cuirot gentoo org>
AuthorDate: Sat May 11 20:31:21 2024 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat May 11 20:31:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7124c90
games-strategy/xbattleai: Drop old 1.2.2-r2
Signed-off-by: James Le Cuirot gentoo.org>
games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild | 51 --
1 file changed, 51 deletions(-)
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..
--- 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
-}
[gentoo-commits] repo/gentoo:master commit in: games-strategy/xbattleai/
commit: 118d06ce8f36c7e5742f26accba085444f1cb4de Author: Sam James gentoo org> AuthorDate: Tue Apr 6 01:49:37 2021 + Commit: Sam James gentoo org> CommitDate: Tue Apr 6 18:18:09 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118d06ce games-strategy/xbattleai: eutils-- Signed-off-by: Sam James gentoo.org> games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild index e7b53bcc541..34735392b6c 100644 --- a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild +++ b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils DESCRIPTION="A multi-player game of strategy and coordination" HOMEPAGE="https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/; @@ -11,7 +10,6 @@ SRC_URI="https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattle LICENSE="xbattle" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" # 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
[gentoo-commits] repo/gentoo:master commit in: games-strategy/xbattleai/, games-strategy/freeciv/
commit: d5e85171d11b4559b601ca424b285bad24b04dfe
Author: Matt Turner gentoo org>
AuthorDate: Mon Jun 11 01:49:11 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Jun 11 01:49:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5e85171
games-strategy/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto)
games-strategy/freeciv/freeciv-2.5.11.ebuild | 2 +-
games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild | 2 +-
games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/games-strategy/freeciv/freeciv-2.5.11.ebuild
b/games-strategy/freeciv/freeciv-2.5.11.ebuild
index d2e9a55ac11..149823db319 100644
--- a/games-strategy/freeciv/freeciv-2.5.11.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.11.ebuild
@@ -53,7 +53,7 @@ RDEPEND="app-arch/bzip2
DEPEND="${RDEPEND}
virtual/pkgconfig
!dedicated? (
- x11-proto/xextproto
+ x11-base/xorg-proto
nls? ( sys-devel/gettext )
)"
diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
b/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
index 85687658671..ceb9ae038ec 100644
--- a/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
@@ -54,7 +54,7 @@ RDEPEND="app-arch/bzip2
DEPEND="${RDEPEND}
virtual/pkgconfig
!dedicated? (
- x11-proto/xextproto
+ x11-base/xorg-proto
nls? ( sys-devel/gettext )
)"
diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
index 119e643d3fa..e7b53bcc541 100644
--- a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
+++ b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
DEPEND="${RDEPEND}
app-text/rman
x11-misc/imake
- x11-proto/xproto"
+ x11-base/xorg-proto"
PATCHES=(
"${FILESDIR}"/${P}-sandbox.patch
[gentoo-commits] repo/gentoo:master commit in: games-strategy/xbattleai/
commit: de2ac47144f4a5ee02603b570f060eb3c769da2d
Author: David Seifert gentoo org>
AuthorDate: Wed Dec 20 21:30:33 2017 +
Commit: David Seifert gentoo org>
CommitDate: Thu Dec 21 01:56:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2ac471
games-strategy/xbattleai: Remove old
Package-Manager: Portage-2.3.16, Repoman-2.3.6
games-strategy/xbattleai/xbattleai-1.2.2-r1.ebuild | 39 --
1 file changed, 39 deletions(-)
diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r1.ebuild
b/games-strategy/xbattleai/xbattleai-1.2.2-r1.ebuild
deleted file mode 100644
index 9fc6c592862..000
--- a/games-strategy/xbattleai/xbattleai-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-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"
-IUSE=""
-
-# 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="
- x11-libs/libXext
- x11-libs/libX11
- dev-lang/tcl:0
- dev-lang/tk:0
- !games-strategy/xbattle"
-DEPEND="${RDEPEND}
- x11-proto/xproto
- app-text/rman
- x11-misc/imake"
-
-src_prepare() {
- rm -f xbcs/foo.xbc~
- epatch "${FILESDIR}"/${P}-sandbox.patch
-}
-
-src_install() {
- DOCS="CONTRIBUTORS README README.AI TODO xbattle.dot" \
- default
- mv "${D}/${GAMES_BINDIR}"/{,xb_}gauntletCampaign
- prepgamesdirs
-}
[gentoo-commits] repo/gentoo:master commit in: games-strategy/xbattleai/, games-strategy/xbattleai/files/
commit: 46956ffca6909f456da8a29be20e5185f5e04de0
Author: Austin English gentoo org>
AuthorDate: Tue Aug 2 21:43:09 2016 +
Commit: Austin English gentoo org>
CommitDate: Wed Aug 3 20:59:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46956ffc
games-strategy/xbattleai: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
Package-Manager: portage-2.3.0
.../xbattleai/files/xbattleai-1.2.2-sandbox.patch | 4 +-
games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild | 43 ++
2 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/games-strategy/xbattleai/files/xbattleai-1.2.2-sandbox.patch
b/games-strategy/xbattleai/files/xbattleai-1.2.2-sandbox.patch
index 566d4ee..56d63ac 100644
--- a/games-strategy/xbattleai/files/xbattleai-1.2.2-sandbox.patch
+++ b/games-strategy/xbattleai/files/xbattleai-1.2.2-sandbox.patch
@@ -1,5 +1,5 @@
Makefile.in
-+++ Makefile.in
+--- a/Makefile.in
b/Makefile.in
@@ -200,87 +200,87 @@
.PHONY: install-bin
diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
new file mode 100644
index 000..3cace4d
--- /dev/null
+++ b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils
+
+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"
+IUSE=""
+
+# 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}
+ app-text/rman
+ x11-misc/imake
+ x11-proto/xproto"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-sandbox.patch
+)
+
+src_prepare() {
+ default
+ rm -f xbcs/foo.xbc~ || die
+}
+
+src_install() {
+ DOCS="CONTRIBUTORS README README.AI TODO xbattle.dot" \
+ default
+ mv "${D}/usr/bin/"{,xb_}gauntletCampaign || die
+}
