gentoo auto-resync : 08:08:2023 - 09:27:00

8 files changed, 104 insertions, 124 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index c71b8bf7ca18..5e247b96a2d3 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/colobot-data/Manifest b/games-strategy/colobot-data/Manifest
index 432fef979b55..769dd390c5c1 100644
--- a/games-strategy/colobot-data/Manifest
+++ b/games-strategy/colobot-data/Manifest
@@ -1,7 +1,7 @@
-DIST colobot-gold-0.1.12-alpha.data.tar.gz 54732267 BLAKE2B 8cf36911764beb921e2b1009fd8550a1a146f594033cfc4de2d8587866780e22f060949735b03c2e355fab412c70c8557587f859edb86ca815ef249edc348926 SHA512 599cc72e1383826b5c840446f52f53b0f325b1de2ce08826bbd6b04072a51f1c4007b5683f2608dd7be67ab358ef2856e790bbbe5c73d8514141e3284be47508
 DIST colobot-gold-0.2.0-alpha.data.tar.gz 57792452 BLAKE2B 10cea12a220bb69db239e220a2ab4935177deea2c18181815b7a8dec9375c0f791f1fbabf7ac086bedb893e3a5b9543492635bf59cb3ab913ba4b3404bf273a5 SHA512 e36af1ad1e5470bec22a4923580be3ea5da69407b79af7c82a9d8c6ceff566b2f1e8e5aeb42f07098bbc459cc77ec391900ee79e8d0315a5abed7b36c44eafbb
-DIST colobot-music_ogg_0.1.12-alpha.tar.gz 55596353 BLAKE2B 63be871fc2000c1cb041658b7395d5175cefc24c81661b366396965951efdadf1cf064211f3f543c4a4b1b7da5bd91db5e397844f1e8771318302c9d80788eb4 SHA512 486d084adc1b28a9fe36c530d261e48a89553c822989f493b0a92dabb9c3435953bda6fe98fcdabc72c6969b5e9be4ff9f3803066f6115fc7740c3de5d183764
+DIST colobot-gold-0.2.1-alpha.data.tar.gz 57884236 BLAKE2B e8e357960ce70e0ad008307fa34c87d69be89f656289af2c4de345a24a3478b6b6330035a49992ed591720606f4ea37e33f92b977c457ca0efffd1842f924e4c SHA512 6a0865fbf2389e3df6a17c5cb34c7baec5c4b019d18949f2a624afa1c43bfb4d71c8afc33d101eb307e872ff1ad2d8e93763ebcd7502932c510c868c03def188
 DIST colobot-music_ogg_0.2.0-alpha.tar.gz 55596353 BLAKE2B 63be871fc2000c1cb041658b7395d5175cefc24c81661b366396965951efdadf1cf064211f3f543c4a4b1b7da5bd91db5e397844f1e8771318302c9d80788eb4 SHA512 486d084adc1b28a9fe36c530d261e48a89553c822989f493b0a92dabb9c3435953bda6fe98fcdabc72c6969b5e9be4ff9f3803066f6115fc7740c3de5d183764
-EBUILD colobot-data-0.1.12.ebuild 1040 BLAKE2B 664ea208d4c8ad12379531e161d6487aebeb0915fc7f9df08380f7ab6119cd871f5c200c4f59ea3987f6e3aebf00f142999ed73a822155910437a96170ba9d73 SHA512 fd648634e79ce491834bffd30165e1431765fcc33af73675ec3c455ed173ebca8173e856407196f73ac5bc35598f69565f3e73f42283d768cab0854ef04fbf8a
+DIST colobot-music_ogg_0.2.1-alpha.tar.gz 55596353 BLAKE2B 63be871fc2000c1cb041658b7395d5175cefc24c81661b366396965951efdadf1cf064211f3f543c4a4b1b7da5bd91db5e397844f1e8771318302c9d80788eb4 SHA512 486d084adc1b28a9fe36c530d261e48a89553c822989f493b0a92dabb9c3435953bda6fe98fcdabc72c6969b5e9be4ff9f3803066f6115fc7740c3de5d183764
 EBUILD colobot-data-0.2.0_alpha.ebuild 1057 BLAKE2B b0bfbab42a0f6741b617d7fa33eff6baebfb32cb8cc6162e304b5d36f74d796b3531fab96b7a60679cd0719853a11a5ed823622bcb77397bf85a992cad4f9f82 SHA512 858ddd46d14c288eed9027826127651769ae70e788c89366bfddf5639570969b856a7409c4bae90c9d8fc572caabe7b377c3da809ca6a552990db5af57946712
+EBUILD colobot-data-0.2.1_alpha.ebuild 1120 BLAKE2B eb847412282c045215c7e947b8447385a217cf46700a71b624b19832ed04e872805ced103f9d01d7964e3ea9c054bf23fa40f24215a78a89dac0edca96977497 SHA512 02e905d60050740126d37f20ced798cb6dc803a473049e88a9847257eaa4ae8fac4d4eef418b559012a9002dd046854cc6896b0f759e58ca9203e40c015171a0
 MISC metadata.xml 397 BLAKE2B 7ce40a327011c92036bc77a1cba1fe66f75395ab27a4099ca6d70dbca306b39ba23fab6d9b4066379c446e4f72f3484563e2c6399acac6a7571209f534ea848a SHA512 e6d71d298321a5e693e387d9900e8ceb019e115f1e83113e67a0a6c34c2c6620e5393aa31603ef0df63ff4ebb27a008e70b5a4951e95a37295261e3eca9d440a
diff --git a/games-strategy/colobot-data/colobot-data-0.1.12.ebuild b/games-strategy/colobot-data/colobot-data-0.1.12.ebuild
deleted file mode 100644
index 6c8bf5115441..000000000000
--- a/games-strategy/colobot-data/colobot-data-0.1.12.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake python-any-r1
-
-MY_P=colobot-gold-${PV}-alpha
-MUSIC_P=colobot-music_ogg_${PV}-alpha
-
-DESCRIPTION="Data package for colobot (Colonize with Bots)"
-HOMEPAGE="https://colobot.info/"
-SRC_URI="
-	https://github.com/colobot/colobot-data/archive/${MY_P}.tar.gz -> ${MY_P}.data.tar.gz
-	music? (
-		https://colobot.info/files/music/${MUSIC_P}.tar.gz )"
-S=${WORKDIR}/${PN}-${MY_P}
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+music"
-
-BDEPEND=${PYTHON_DEPS}
-
-src_unpack() {
-	unpack "${MY_P}.data.tar.gz"
-	if use music; then
-		tar -x -f "${DISTDIR}/${MUSIC_P}.tar.gz" -C "${S}/music" || die "Failed to unpack music"
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use music; then
-		sed -i -e '/find_program(WGET wget)/d' -e '/if(NOT WGET)/,+2 d' music/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DMUSIC=$(usex music)
-		-DMUSIC_FLAC=OFF
-	)
-	cmake_src_configure
-}
diff --git a/games-strategy/colobot-data/colobot-data-0.2.1_alpha.ebuild b/games-strategy/colobot-data/colobot-data-0.2.1_alpha.ebuild
new file mode 100644
index 000000000000..121f7662821e
--- /dev/null
+++ b/games-strategy/colobot-data/colobot-data-0.2.1_alpha.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake python-any-r1
+
+MY_PV=${PV/_/-}
+MY_P=colobot-gold-${MY_PV}
+MUSIC_P=colobot-music_ogg_${MY_PV}
+
+DESCRIPTION="Data package for colobot (Colonize with Bots)"
+HOMEPAGE="
+	https://colobot.info/
+	https://github.com/colobot/colobot-data/
+"
+SRC_URI="
+	https://github.com/colobot/colobot-data/archive/${MY_P}.tar.gz
+		-> ${MY_P}.data.tar.gz
+	music? (
+		https://colobot.info/files/music/${MUSIC_P}.tar.gz
+	)
+"
+S=${WORKDIR}/${PN}-${MY_P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+music"
+
+BDEPEND=${PYTHON_DEPS}
+
+src_unpack() {
+	unpack "${MY_P}.data.tar.gz"
+	if use music; then
+		tar -x -f "${DISTDIR}/${MUSIC_P}.tar.gz" -C "${S}/music" ||
+			die "Failed to unpack music"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use music; then
+		sed -e '/find_program(WGET wget)/d' \
+			-e '/if(NOT WGET)/,+2 d' \
+			-i music/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMUSIC=$(usex music)
+		-DMUSIC_FLAC=OFF
+	)
+	cmake_src_configure
+}
diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
index d6edc636f801..2d663188d899 100644
--- a/games-strategy/colobot/Manifest
+++ b/games-strategy/colobot/Manifest
@@ -1,10 +1,9 @@
-AUX colobot-0.1.12-includes.patch 1283 BLAKE2B 0f1e402e770d57365d53488b86838f401815e0749065bf2581d228a566873b31d021a1486ce7cf4a051407b96c540c954ce56ef9efc168522f0ea94ec1606fcd SHA512 26c1bbbd9605482a5a6ffef4b3a919518224e3802bcf0d7248bba94227039bf69a5d6a41bcacdb1ec170e58e719f1cde722f869c4ec26cf20ecd7d1eae091cd0
 AUX colobot-0.1.12-sndfile-link.patch 2114 BLAKE2B 11aebe223c809301fd7851ed20ab0867f47ca6d41d198951a81dc4d23a80d203a6955bc4df06dd09f9131fc6ed5f5cb5c1c001503564e89dde3143f58fa7cb59 SHA512 c4f15073aa7f9f84ca369f56944d8c3daba67b419f7d1a4e886b23bd210f84268beddeb13bb9dcb88a86e9dd1bc24a4364ed4bd2065062eac771002f367150e1
 AUX colobot-0.2.0_alpha-gcc13.patch 623 BLAKE2B 33d5a6596a3f256af030e7bab37a4985374b98bded72b682aaaee162ed3360d26a407611d58ffc04bc08295de443183e7e4fa14152b204bb92d66ab7de6160df SHA512 009cc5fe8193fc9a014b8aaeb7203a257eeea08ee27e0fb9867a1ad1d7bd9652ed9a8a1df26f7b44dbc6753179b789abc5283d6e408e09229afda8c675bf59a6
 AUX colobot-0.2.0_alpha-werror.patch 1253 BLAKE2B e4536598161ed2868acdd63105016a6ce2f29e8c5d3577d21b7d8171fb6d21b638502bcae72760dd1c6ead63c3306d8612a5e2cc4438625e20e227412a743a44 SHA512 78e9e52311ff1b2c01f722df00fb9c5ece7427f83ed5a317007e456974edb8ba77606e0ff7757d081ead1e92099382584fdc4d9d31cae463c28acd37249d2612
-DIST colobot-gold-0.1.12-alpha.tar.gz 1468594 BLAKE2B 2b470e8b074e4a973b751062dca2358396066d8816c2b1b5b44649b798610dccd73ab5fed4086f2aa8d4495f3de69dd8b72b45f97f23f66b18a50fc976bf25ef SHA512 63647a16b376db6544830f96e7d323c0f58003645bf636abd1cab0ffd47b39b0bef47191d584f5156b75324d75dfdfdcabe8b89be565087c37c367ca366f3cbe
 DIST colobot-gold-0.2.0-alpha.tar.gz 1514455 BLAKE2B 9cc1480d342cfa14b12e437c41ce8e65b173cd30ca5f62e574ac17f452e6cd0622b5c2706fcfd427222cf78fce1700cb07b82fac75dd9b4a3ace4389ea3381bc SHA512 9c35ce6da319ef20ff68a9722f0b683adaa2fcada2b89bb322ba5772dfd9371adacd045ae160550780083902c024400c29e1d1f11dcb8b6547ba7d48e401c4c3
-EBUILD colobot-0.1.12.ebuild 1616 BLAKE2B 0044f75977deebfdd035bc6b0a0815613a2f9bc00aad6a5898737b8884089842d2d8d1185bbb0cfdb04356a431ee35aea37c53610daaf6276088a7d7f55d811a SHA512 58ffa32138e8f26109bbfcd8604bfa358db0fffb49949ae5efef9d3e638643b9edd1da7f972278e4285fcee0bbeaacd69dba82a828ad89accd1564d7dbfdf4fb
+DIST colobot-gold-0.2.1-alpha.tar.gz 1331366 BLAKE2B a4ff7eb10514b829a066654d6800cdf4ddf7c3331c60e8a552b78feb9e153bf666d1a16395be58e3093c98fc2caad8145fd436f66f5afc6b9f9c5d91e9094700 SHA512 cdfe410b30a89bd98513347ba64bbd0569d9f9f9227b063bf99c86101a099de0893b24c2d2e85e718ec0e64e0e428fb6dbdbf88d35f814d99ed31a7f3632f9cd
 EBUILD colobot-0.2.0_alpha.ebuild 1710 BLAKE2B 4d90f3c7e52b75ea0838613e8fa41ac8e8c01882dd4a08a252c9cbee184a1dc2ada30364095bff464208c01553a9df28109357d85f4ac6ae37ebfbeed1656ab1 SHA512 5fc007e57d6a675d012e32d924201fa43545ebdadfdeaa2909fd7fc7ebfcad4445240e6832509dbd120e802ea8c5987877d0fe8e07169ecca1f3349e26b90214
-EBUILD colobot-9999.ebuild 1377 BLAKE2B 98d1de0557f5edc06166bc191e5fe1beb4bf0f7f8975069d81f2a8aaf005c17348f649f477a3c16ab5aa5b35130a10607bb5395266c1c983816fed0b9f811bb2 SHA512 61b61b0cdb4c29348333c30a13c1986d69587164734bc2c52e07e63b1d5b795270bae19642055662155563b1cc91cd5cb7697b1172fecd1ae375702e879dcbe8
+EBUILD colobot-0.2.1_alpha.ebuild 1546 BLAKE2B 19b6ce1fda7e52edceff51ddf3abac3ddcd2c63e2817df2458e65f7a8462dfd955f277560e0b2dd6b3778491d7953b245e8dda09eb31f36f47c945719bb0df7b SHA512 d811625a33f3dcb76c11c0bf3866f93713beed759f2a51cc8a2fbb20106ce7b7799c62235ea3751af7754266794cd67668f4133a16ee987e25df50ed590108f8
+EBUILD colobot-9999.ebuild 1480 BLAKE2B 09794857e04d5a12b86c3fe10041b27ea16eb10f8360920fa6c5cc35db29c5cd5240036da8692c6be551e68ca516f3a59ff72dff98bd6e97d2c489e17e7a06c6 SHA512 c8c103982f91ca41fd960fd2863187829dbe643e0276846120c7beb4dcc5cbd481866542b2e0d4d7000535a975f796a6abe54f9b313706367793c396a20301e1
 MISC metadata.xml 419 BLAKE2B 8f91e92cb3ad10979daf436e225f9a19c0b69f71e6ad33ea6fcdcc49eefac1c4373615ebc54ac24888377c63b797e06a9479bfc485fef0208667b19602f88f2b SHA512 d8fae70775286b79f9a0942dc89bcb5214f4833fa7cd539d9e30e2b8e6762968c8a8ea933765ab9c81f2cad30a4aedc88377221c7be1b342267b8a79b9bb04e7
diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.2.1_alpha.ebuild
index 152ba200e160..731b33cd8a2d 100644
--- a/games-strategy/colobot/colobot-0.1.12.ebuild
+++ b/games-strategy/colobot/colobot-0.2.1_alpha.ebuild
@@ -1,26 +1,32 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg-utils
 
+MY_P=colobot-gold-${PV/_/-}
 DESCRIPTION="A real-time strategy game, where you can program your bots"
-HOMEPAGE="https://colobot.info/"
-SRC_URI="https://github.com/colobot/colobot/archive/${PN}-gold-${PV}-alpha.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-gold-${PV}-alpha"
+HOMEPAGE="
+	https://colobot.info/
+	https://github.com/colobot/colobot/
+"
+SRC_URI="https://github.com/colobot/colobot/archive/${MY_P}.tar.gz"
+S=${WORKDIR}/${PN}-${MY_P}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="devbuild doc +openal test tools"
 RESTRICT="!test? ( test )"
 
 # perl for pod2man
 BDEPEND="
 	app-text/po4a
+	app-text/xmlstarlet
 	dev-lang/perl
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 DEPEND="
 	dev-games/physfs
 	dev-libs/boost:=
@@ -33,16 +39,15 @@ DEPEND="
 	media-libs/sdl2-image
 	media-libs/sdl2-ttf
 	media-sound/vorbis-tools
-	openal? ( media-libs/openal )"
-RDEPEND="${DEPEND}
-	games-strategy/colobot-data"
-
-PATCHES=(
-	# https://github.com/colobot/colobot/pull/1300
-	"${FILESDIR}"/${P}-includes.patch
-	# https://github.com/colobot/colobot/pull/1453
-	"${FILESDIR}"/${P}-sndfile-link.patch
-)
+	openal? ( media-libs/openal )
+"
+RDEPEND="
+	${DEPEND}
+	~games-strategy/colobot-data-${PV}
+"
+DEPEND+="
+	test? ( dev-cpp/gtest )
+"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/games-strategy/colobot/colobot-9999.ebuild b/games-strategy/colobot/colobot-9999.ebuild
index c70b50c9fba1..8b82af05c62b 100644
--- a/games-strategy/colobot/colobot-9999.ebuild
+++ b/games-strategy/colobot/colobot-9999.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake git-r3 xdg-utils
 
 DESCRIPTION="A real-time strategy game, where you can program your bots"
-HOMEPAGE="https://colobot.info/"
+HOMEPAGE="
+	https://colobot.info/
+	https://github.com/colobot/colobot/
+"
 EGIT_REPO_URI="https://github.com/colobot/colobot"
 EGIT_SUBMODULES=()
 
@@ -19,8 +22,10 @@ RESTRICT="!test? ( test )"
 # perl for pod2man
 BDEPEND="
 	app-text/po4a
+	app-text/xmlstarlet
 	dev-lang/perl
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 DEPEND="
 	dev-games/physfs
 	dev-libs/boost:=
@@ -33,9 +38,15 @@ DEPEND="
 	media-libs/sdl2-image
 	media-libs/sdl2-ttf
 	media-sound/vorbis-tools
-	openal? ( media-libs/openal )"
-RDEPEND="${DEPEND}
-	games-strategy/colobot-data"
+	openal? ( media-libs/openal )
+"
+RDEPEND="
+	${DEPEND}
+	games-strategy/colobot-data
+"
+DEPEND+="
+	test? ( dev-cpp/gtest )
+"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/games-strategy/colobot/files/colobot-0.1.12-includes.patch b/games-strategy/colobot/files/colobot-0.1.12-includes.patch
deleted file mode 100644
index 3bd118a1ef1d..000000000000
--- a/games-strategy/colobot/files/colobot-0.1.12-includes.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2cfab017938e1cf44f633647eec2ccc2ed1da38b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 14 May 2020 10:35:01 +0200
-Subject: [PATCH] Fix missing <limits> include
-
-Add missing <limits> include for std::numeric_limits.  This fixes
-build failure after boost stopped implicitly including it for us.
----
- src/script/script.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/script/script.h b/src/script/script.h
-index bc64dc232..dd4e02ff4 100644
---- a/src/script/script.h
-+++ b/src/script/script.h
-@@ -27,6 +27,7 @@
- #include "CBot/CBot.h"
- 
- #include <memory>
-+#include <limits>
- #include <string>
- #include <boost/optional.hpp>
- 
-From fc2bd68876ac6302dbc8e91e8ffa33592db14b21 Mon Sep 17 00:00:00 2001
-From: suve <veg@svgames.pl>
-Date: Sun, 9 Feb 2020 00:36:05 +0100
-Subject: [PATCH] Fix missing std includes
-
----
- src/CBot/CBotInstr/CBotExprLitString.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/CBot/CBotInstr/CBotExprLitString.cpp b/src/CBot/CBotInstr/CBotExprLitString.cpp
-index fc2541624..69e42d607 100644
---- a/src/CBot/CBotInstr/CBotExprLitString.cpp
-+++ b/src/CBot/CBotInstr/CBotExprLitString.cpp
-@@ -24,6 +24,8 @@
- 
- #include "CBot/CBotVar/CBotVar.h"
- 
-+#include <stdexcept>
-+
- namespace CBot
- {
-