7 files changed, 199 insertions, 2 deletions
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index cb1c765e36f9..ba1735970c5d 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
index db377e1e5196..e8ed915d7e6f 100644
--- a/games-strategy/freecol/Manifest
+++ b/games-strategy/freecol/Manifest
@@ -1,5 +1,7 @@
 AUX commons-cli-1.3.patch 791 BLAKE2B 3fde34112ae8fba464a1dc9d282fce6a7eddb37c802861588005c44e3b5f1cf22d9b2495553954ab47681fa016c1c7cb9ff5b0887e48e67381d1d73a7ec58ea6 SHA512 eb2e1eeb5fe02d8d8601b1577847195f2b5a83ba875d70010f33ef8fe1fe57706e01a84ee442cd43bcbb72dc22d79a8e6de832be0e23742dae23e8e38bf6aa48
 AUX freecol-0.11.6-gentoo.patch 923 BLAKE2B f1e8632a75a3a9e4c1b2433eefdf50dc6b437da7052b2531e1a8d67fac1887a4ebad888795a9e96567ce4e5faaf5a2bc643b93f72cf72165de1b4e4146aed4d2 SHA512 85a1a7f9ac9031e61e57bbe88a292716d0249109308a6da0ef60f2e0ea547674f0d379b1f516980bfde567e2d8a2c518eef873fe40159af772b950791bec7bdf
 DIST freecol-0.11.6-src.zip 45002451 BLAKE2B 1d0e56b43f63557e3a520d6d30b8831db6c0284ac6cfebf68f3a11264d8bcfc80b883c8d4fe82e4fbd992f02a82ffdf36ed102613010d28375b61cfa30874f68 SHA512 fbfec95ad7128477d631be92b750d639d42bde3e052c94265590933e841adf66e670d5e1b2f6e8ef05629afeafded60cbb495ef93272ebc14ce7fd2f2eaa53de
+DIST freecol-1.0.0-src.zip 159875314 BLAKE2B 6153be9553ded4c2a1f9635d67e48165d07b5d1634f26a44d2f01195e1610d6cb525ffa60368f3225cdf62ffd7751242942fd86b5735455e7396deca68d8350d SHA512 68b313b42fc38e6ea95a4a04ca5af534c4487709fb036018d6d09f6de3455325031ad1fd0ae4c6415cbbeebd3f181e598a2602ad7be6cca9150ad9523b8bb3c2
 EBUILD freecol-0.11.6-r1.ebuild 1180 BLAKE2B d7aef2d83596f0c8ff17a9804efc58c0c260777fe90bdf8f9cf32eb74923caa4869ec2532d567b0f224601fe3735e102dd8cc81f5f7e78b16743432040d37850 SHA512 d852bc225ec08cb7b86a2dfa57ce40fe4fa64a4ef4b7a7c62dab6b994dd28646662d46a98729de88886e460eb6528a5c5158830dbc09f2dc95875afbffa88784
-MISC metadata.xml 331 BLAKE2B 0fb24fdd71c8c9a1bbaf56edf8f996eb05f35dc0783a38a77aa2cba930d3054c88a6002e79825baf273062dcc8ade2b9e01bd62850a46e980c1170ed96b1b1d6 SHA512 a4afba79448310d83eb3e5d91bfcf7b03ab1a7f77069478b8ff44ed3b07c79ffc7d83aa1d9d715294bdb5ee661c22736f0fe9414511ab9894fb93ecfed79c0a0
+EBUILD freecol-1.0.0.ebuild 1648 BLAKE2B cfa5ed492fe69aed6ce6b785654e59edae9a4068643f0a0915553275605cfc248240248116907df8dd4c6ca99afd23ada5e9526d9129a3291fd08a395f6173d6 SHA512 5392551c5961322b332110d619813d17ca000f467eeaafd27296d812db9c4aeb356c1a26f9b0b86bf397e86e9fafad18832eeb112910c621730894f36a56a686
+MISC metadata.xml 445 BLAKE2B ce65886f52a3797fbe4b09ad23da333563076d76e9d4bc88a10dfbe6740c9e3d354f0765022f2e59eeb0e94aa21d237c455150ff4e0a4bff5fa761d9e51e3fd3 SHA512 0ed4f4f69b731aa67d73f222f69bc6e4bbafb2c56b00ff3e42a1f03646d6e48e141e59179fefb6e8b9ec2c4ec06b3983c38c4eb14d7ecd47f26e28a9909ffbdc
diff --git a/games-strategy/freecol/freecol-1.0.0.ebuild b/games-strategy/freecol/freecol-1.0.0.ebuild
new file mode 100644
index 000000000000..11a7bf783240
--- /dev/null
+++ b/games-strategy/freecol/freecol-1.0.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit desktop java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An open source clone of the game Colonization"
+HOMEPAGE="https://www.freecol.org/"
+SRC_URI="mirror://sourceforge/project/freecol/freecol/freecol-${PV}/freecol-${PV}-src.zip"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="
+	dev-java/commons-cli:1
+	dev-java/cortado:0
+	dev-java/findbugs-annotations:0
+	dev-java/miglayout:5
+"
+
+DEPEND=">=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+# error: variables in try-with-resources are not supported in -source 8
+RDEPEND=">=virtual/jre-11:*
+	${CP_DEPEND}"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=(
+	CHANGELOG.md
+	COPYING
+	README
+	README.md
+	SECURITY.md
+)
+
+JAVA_JAR_FILENAME="FreeCol.jar"
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="src"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RUN_ONLY="net.sf.freecol.AllTests"
+JAVA_TEST_SRC_DIR="test/src"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_clean
+	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
+	cp build/splash.jpg "${JAVA_RESOURCE_DIRS}" || die
+	grep Main-Class src/MANIFEST.MF \
+		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	local datadir=/usr/share/${PN}
+
+	# launcher of java-pkg-simple.eclass seems not to support --pwd
+	java-pkg_dolauncher ${PN} \
+		--pwd ${datadir} \
+		--main net.sf.freecol.FreeCol \
+		--java_args -Xmx2000M
+
+	insinto ${datadir}
+	doins -r data schema
+
+	doicon data/${PN}.png
+	make_desktop_entry ${PN} FreeCol
+}
diff --git a/games-strategy/freecol/metadata.xml b/games-strategy/freecol/metadata.xml
index 30c9c8e0510b..ef642e3b3ea4 100644
--- a/games-strategy/freecol/metadata.xml
+++ b/games-strategy/freecol/metadata.xml
@@ -6,6 +6,8 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<bugs-to>https://sourceforge.net/p/freecol/bugs/</bugs-to>
+		<doc>https://github.com/FreeCol/freecol/wiki</doc>
 		<remote-id type="sourceforge">freecol</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index 7339dff40576..621dc2773cb9 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -3,5 +3,7 @@ AUX hedgewars-1.0.0-cmake_lua_version.patch 282 BLAKE2B 0a65ddbc5b69264e51b5ca6b
 AUX hedgewars-1.0.0-fpc-3.2.patch 648 BLAKE2B 117727c993ea33e4c54037fc31b89f982ebff2cf19578380cb6fa19e0797522f6fe7f03f996d2eb641e526725958bc3f9833297c77b21c0a1324d32df4e9eb56 SHA512 5fb7c71574ece92ce5151d54c3dae4d7d97af963b63d4fcf69b97a98223cad74c5083777e3ba95374a022b7ac03ac6ea9a8f50a9d5e9effad0f610201e1f2b28
 AUX hedgewars-1.0.0-qt-5.15.patch 328 BLAKE2B 9304e4e1811e2aab876b5a6c3edea584c3271c5531035bfb2a53369000a30c61264464df655396146a26e08750ee29ffd9eb25aca8f89fa91409247b69675ad1 SHA512 f45985e878c9380f4bdcf755a79f1c906bdc6a8fa243faaa15f1c73b50d7b619c461821271ae151076f631ca0aecae31ddbe00d3d97945f13afc94610e216856
 DIST hedgewars-src-1.0.0.tar.bz2 177668452 BLAKE2B cbd99a4403b911023fb4a522ed1ed04272f07705321585b0e7a8f56785ef11bf8c654df95016b0af94f603c387f73804cbd95e13a92e875990adf5fec149e334 SHA512 9aeb904550239040a878a0e7ae5006aa4d824124b61d813b9e6f6dfe1bd1c8f5fe395e0fd6e58d685ef1259abd4669e03b985be129c620be15f6e5ad82519ec2
+DIST hedgewars-src-1.0.2.tar.bz2 177564706 BLAKE2B 3644209cc42443b845d6a4497ba6ca8f34ffe249b99ac0ca26e5fcb5e86a0e705389e3b6db75d16b671cd2c899cecef2b6065d1755dfaab0860a6eb4c6ddb099 SHA512 dc79cc48eee305d8dd2b64fcbfe598d48f8aec918d9065a6af4aef9be4e4940ad858836fc6bda46e02128b80dbba8c443a4f8a702a16b0ac969f8d0a0e080502
 EBUILD hedgewars-1.0.0-r100.ebuild 2573 BLAKE2B b9ca08422aef21b94c6cf0d91d66b12ba903f38cb11ae39727c4b760098237e8306bf7de2033ce38d92b53a3d7c591d73abd51e154f8fbe6f9166debdd3a7109 SHA512 f38048050a4152ef89496bb65acfa8e5f1a1eea59c3e2a7d6c3ca0ecb170b49a5b4f25c8dfba487f57a538b85f61899b00666a9b0515aeef429e99d7800b9b27
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
+EBUILD hedgewars-1.0.2.ebuild 2749 BLAKE2B c493d3fa409056fb922650498d1cd45f896011e6c833a265a182b741a06ec009ebebb833a60cc3b1e038e745006b21d96891eeab1837689c26c26609ed41c75a SHA512 0d73ac4f3222673c440611aa233374574a86a36ca0d29d5bb655919dfafe29ccdb9e9756f5542908334eee6ed9e6e1c6cd2e512c7d8b7089485e32c3b7218276
+MISC metadata.xml 311 BLAKE2B c8f817744d528ffb468e39945617e2750441fc97a7d8e74f2e54587ab0cb761db0365b86ce7149d24a96d58f49e2d1e8232f0ffffc7834d1062562fd6fe44263 SHA512 8ede719d9e856c9929109c728838bfb2f7761a30efdcba229207352dd3275ec3de67192eb2c5fb2c712910eb7d1ef3e2f9cf15b03795abaf8078ae485cde11c7
diff --git a/games-strategy/hedgewars/hedgewars-1.0.2.ebuild b/games-strategy/hedgewars/hedgewars-1.0.2.ebuild
new file mode 100644
index 000000000000..d0ddc1cfbea0
--- /dev/null
+++ b/games-strategy/hedgewars/hedgewars-1.0.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR=emake
+LUA_COMPAT=( lua5-1 )
+
+inherit cmake lua-single xdg-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="A turn-based strategy, artillery, action and comedy game"
+HOMEPAGE="https://www.hedgewars.org/"
+SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 Apache-2.0 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="server"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks
+QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks
+
+# qtcore:5= - depends on private header
+DEPEND="${LUA_DEPS}
+	>=dev-games/physfs-3.0.1
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/libpng:0=
+	media-libs/libsdl2:=
+	media-libs/sdl2-image:=
+	media-libs/sdl2-mixer:=[vorbis]
+	media-libs/sdl2-net:=
+	media-libs/sdl2-ttf:=
+	sys-libs/zlib
+	!x86? ( media-video/ffmpeg:= )
+	"
+RDEPEND="${DEPEND}
+	app-arch/xz-utils
+	>=media-fonts/dejavu-2.28
+	media-fonts/wqy-zenhei"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	server? (
+		>=dev-lang/ghc-6.10
+		dev-haskell/entropy
+		dev-haskell/hslogger
+		>=dev-haskell/mtl-2
+		>=dev-haskell/network-2.3
+		dev-haskell/random
+		dev-haskell/regex-tdfa
+		dev-haskell/sandi
+		dev-haskell/sha
+		dev-haskell/vector
+		dev-haskell/utf8-string
+		dev-haskell/yaml
+		>=dev-haskell/zlib-0.5.3
+	)
+	!x86? ( >=dev-lang/fpc-2.4 )
+	x86? (
+		>=dev-lang/ghc-6.10
+		dev-haskell/parsec
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-qt-5.15.patch"
+	"${FILESDIR}/${PN}-1.0.0-cmake_lua_version.patch"
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMINIMAL_FLAGS=ON
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share/${PN}"
+		-Dtarget_binary_install_dir="${EPREFIX}/usr/bin"
+		-Dtarget_library_install_dir="${EPREFIX}/usr/$(get_libdir)"
+		-DNOSERVER=$(usex !server)
+		-DBUILD_ENGINE_C=$(usex x86)
+		-DNOVIDEOREC=$(usex !x86)
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+		# Need to tell the build system where the fonts are located
+		# as it uses PhysFS' symbolic link protection mode which
+		# prevents us from symlinking the fonts into the right directory
+		#   https://hg.hedgewars.org/hedgewars/rev/76ad55807c24
+		#   https://icculus.org/physfs/docs/html/physfs_8h.html#aad451d9b3f46f627a1be8caee2eef9b7
+		-DFONTS_DIRS="${EPREFIX}/usr/share/fonts/wqy-zenhei;${EPREFIX}/usr/share/fonts/dejavu"
+		# upstream sets RPATH that leads to weird breakage
+		# https://bugzilla.redhat.com/show_bug.cgi?id=1200193
+		-DCMAKE_SKIP_RPATH=ON
+		-DLUA_VERSION=$(lua_get_version)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doman man/${PN}.6
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/games-strategy/hedgewars/metadata.xml b/games-strategy/hedgewars/metadata.xml
index 1c3ba213c494..8beda0c43150 100644
--- a/games-strategy/hedgewars/metadata.xml
+++ b/games-strategy/hedgewars/metadata.xml
@@ -5,4 +5,7 @@
 	<email>games@gentoo.org</email>
 	<name>Gentoo Games Project</name>
 </maintainer>
+<use>
+	<flag name="server">Enable local server</flag>
+</use>
 </pkgmetadata>