gentoo auto-resync : 19:04:2024 - 12:05:02

5 files changed, 178 insertions, 5 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 90d9c3fb41cb..e3f859661b75 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest
index 201c1c0f6a59..5a412adec9fe 100644
--- a/games-strategy/megaglest/Manifest
+++ b/games-strategy/megaglest/Manifest
@@ -12,5 +12,6 @@ DIST megaglest-3.13.0-e09ba53c.patch 3485 BLAKE2B fa0c94b88726f239957b3fb950c6be
 DIST megaglest-3.13.0-fbd0cfb1.patch 1820 BLAKE2B b3a1bf7ca1b51d948b354e4b9cd2d675dadac7b9f072e11032f117479c5199d1f7cfd87146da46a40387bfeaef8433144e37410aa8c92865048744ae31ffd730 SHA512 960fe1be66eb1737e9292c5956c09902e6761ed8de56d864950268e3e8a5184f59b7cf3521629aeb460842f4423699526d5dd71fa0494c7ac2899cab117e7f45
 DIST megaglest-source-3.13.0.tar.xz 1979440 BLAKE2B 9df70502e0dddc754897c989222d0bddbebbb781a16f49ffa2dd30ee1dbd3e88249ccd600fbde8dab712a1286e29651bebfc9add0d255b675e9eb0ca5ba60153 SHA512 5ae74efce55d7ec9f38d7701da9c865458e15223b5a3c5ac829e09dc81e63fbea2a235cae99450ea7333044c5166af82a762a29c5793c75711d1200688518b5c
 EBUILD megaglest-3.13.0-r1.ebuild 4714 BLAKE2B 9b0138ae3875091cd0c1b2fbb70eb659c81de2febacb4016c7256f8d58f994d60d53f80bfbece0f8a825a3a69faffa7fbcce1e18981f84666bef4c5c23834ac6 SHA512 ae2aadbb0902837f8189c0e5d1df6b1b6e948bb0885fcf18ad33b30da99e0d47bd6865718a79d3bb4dd88eb40ee58c5bc153190a3e9ed3d09aa862cce39f2465
+EBUILD megaglest-3.13.0-r2.ebuild 4726 BLAKE2B 9a26abeecbe5788d9c726d2b30f3b7f557c456868a2d41da0e50cc00444c24373509fbd01958f4175610924e8f345e1c7cfff3b3a0fcd203c429460fdee68e5c SHA512 2a1644a038dd69d264aaa0be34f6f4777d3be7efa7d2168d4f32ed3f85189c446aba455d4e7efdb00ffbf8b580c41bac106ce881f782eef15689675e7dac7096
 EBUILD megaglest-3.13.0.ebuild 3681 BLAKE2B 637c56194556b157e5eabf97051e27a3c988a92d52ba028299490ce5038fb9ff46186e2d59fc689931c4582789d5ef5738f79588c901b14c5ad2a211dc6d613d SHA512 36f9bd1b500ee3c5d05b0df26a862a11db2b7602ff87608a6af8b7191fe3b93def37c697879862fbf038900d1327510f8da64d6cb897a0abb2a5e5fcfc3935a6
 MISC metadata.xml 1622 BLAKE2B f4d7dddd0d654cefb22fe3acc00d366501a5fa93243bef3336965fffe2f8500f94eed915e5adf7655a8e1f7a28fcbc2fc49d99a2cdf2899173ffe819cdfdfa80 SHA512 5b65d3bf4ccf9619350293d3669e7a001fcb0f4addcb0c50f56c6ccba2239b87507a796a34d5fc5c3b2d144e740057496220aff2d0699a41db5f37ae8eaad2bc
diff --git a/games-strategy/megaglest/megaglest-3.13.0-r2.ebuild b/games-strategy/megaglest/megaglest-3.13.0-r2.ebuild
new file mode 100644
index 000000000000..f5fd5ca2f90c
--- /dev/null
+++ b/games-strategy/megaglest/megaglest-3.13.0-r2.ebuild
@@ -0,0 +1,173 @@
+# Copyright 2010-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Todo: google-breakpad?
+
+EAPI=8
+
+# src_install() currently requires this
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+LUA_COMPAT=( lua5-{1..4} )
+
+# Only needed by certain features
+VIRTUALX_REQUIRED="manual"
+
+WX_GTK_VER="3.2-gtk3"
+inherit cmake desktop flag-o-matic lua-single readme.gentoo-r1 virtualx wxwidgets xdg-utils
+
+DESCRIPTION="Cross-platform 3D realtime strategy game"
+HOMEPAGE="https://megaglest.org/ https://github.com/MegaGlest/megaglest-source"
+SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz
+	https://github.com/MegaGlest/megaglest-source/commit/789e1cdf.patch -> ${P}-789e1cdf.patch
+	https://github.com/MegaGlest/megaglest-source/commit/5801b1fa.patch -> ${P}-5801b1fa.patch
+	https://github.com/MegaGlest/megaglest-source/commit/412b37d0.patch -> ${P}-412b37d0.patch
+	https://github.com/MegaGlest/megaglest-source/commit/e09ba53c.patch -> ${P}-e09ba53c.patch
+	https://github.com/MegaGlest/megaglest-source/commit/fbd0cfb1.patch -> ${P}-fbd0cfb1.patch
+"
+
+LICENSE="GPL-3 BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 +streflop +tools +unicode wxuniversal +model-viewer videos"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${LUA_DEPS}
+	dev-libs/libxml2
+	dev-libs/xerces-c[icu]
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/ftgl
+	media-libs/glew:=
+	net-libs/libircclient
+	media-libs/libpng:0
+	media-libs/libsdl2[X,sound,joystick,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/gnutls:=
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/opengl
+	virtual/glu
+	media-libs/libjpeg-turbo:0=
+	x11-libs/libX11
+	x11-libs/libXext
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	fribidi? ( dev-libs/fribidi )
+	model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+	videos? ( media-video/vlc )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	~games-strategy/${PN}-data-${PV}
+"
+
+BDEPEND="sys-apps/help2man
+	virtual/pkgconfig
+	editor? ( ${VIRTUALX_DEPEND} )
+	model-viewer? ( ${VIRTUALX_DEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.11.1-cmake-lua.patch"
+
+	# From Fedora and Arch
+	"${FILESDIR}/${P}-underlink.patch"
+	"${FILESDIR}/${P}-fix-lua-version-ordering.patch"
+	"${FILESDIR}/${P}-multiple-definitions.patch"
+	"${FILESDIR}/${P}-GLEW_ERROR_NO_GLX_DISPLAY.patch"
+	"${FILESDIR}/${P}-help2man.patch"
+
+	# Fix build with wxWidgets 3.2
+	"${DISTDIR}/${P}-789e1cdf.patch"
+	"${DISTDIR}/${P}-5801b1fa.patch"
+	"${DISTDIR}/${P}-412b37d0.patch"
+	"${DISTDIR}/${P}-e09ba53c.patch"
+	"${FILESDIR}/${P}-fbd0cfb1.patch"
+)
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini
+and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride
+values in these files.
+
+If you have an older graphics card which only supports OpenGL 1.2, and the
+game crashes when you try to play, try starting with 'megaglest --disable-vbo'
+Some graphics cards may require setting Max Lights to 1.
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use editor || use model-viewer ; then
+		setup-wxwidgets
+	fi
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/926143
+	# https://github.com/MegaGlest/megaglest-source/issues/275
+	filter-lto
+
+	if use cpu_flags_x86_sse3; then
+		SSE=3
+	elif use cpu_flags_x86_sse2; then
+		SSE=2
+	elif use cpu_flags_x86_sse; then
+		SSE=1
+	else
+		SSE=0
+	fi
+
+	local mycmakeargs=(
+		-DWANT_GIT_STAMP=OFF
+		-DWANT_USE_FriBiDi="$(usex fribidi)"
+		-DBUILD_MEGAGLEST_MAP_EDITOR="$(usex editor)"
+		-DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS="$(usex tools)"
+		-DBUILD_MEGAGLEST_MODEL_VIEWER="$(usex model-viewer)"
+		-DWANT_USE_VLC="$(usex videos)"
+		-DFORCE_LUA_VERSION="$(lua_get_version)"
+		-DFORCE_MAX_SSE_LEVEL="${SSE}"
+		-DWANT_USE_FTGL=ON
+		-DWANT_STATIC_LIBS=OFF
+		-DWANT_USE_STREFLOP="$(usex streflop)"
+		-DwxWidgets_USE_STATIC=OFF
+		-DwxWidgets_USE_UNICODE="$(usex unicode)"
+		-DwxWidgets_USE_UNIVERSAL="$(usex wxuniversal)"
+
+		$(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "")
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	# rebuilds some targets randomly without fast option
+	emake -C "${BUILD_DIR}" DESTDIR="${D}" "$@" install/fast
+
+	dodoc docs/{AUTHORS.source_code,CHANGELOG,README}.txt
+
+	use editor &&
+		make_desktop_entry ${PN}_editor "MegaGlest Map Editor"
+	use model-viewer &&
+		make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer"
+
+	readme.gentoo_create_doc
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-strategy/ufoai/Manifest b/games-strategy/ufoai/Manifest
index c4d4b6b91a44..c32a8e36248a 100644
--- a/games-strategy/ufoai/Manifest
+++ b/games-strategy/ufoai/Manifest
@@ -2,5 +2,5 @@ AUX ufoai-2.5.0_p20180603-install.patch 1097 BLAKE2B b2c1f2761429dafd2ffad037e5a
 AUX ufoai-2.5.0_p20180603-mxml3.patch 913 BLAKE2B e9d731a506bfd04d1e6fcf323c9acfcf3c895cf26dc8de308dcbc2ea62b67c643f1dcf58f8ff6087919887d0c8107ffac513c49bcd72a811238dea60edaf7dc6 SHA512 4197a7d444d1180362535f69a03bac3ab28473b1349b3c1d5daf2b360d0a7c5c00b07b6996274d08d3a52f9322f709478bd2c077c786e9501b596a6471eec74d
 DIST ufoai-2.5-data.tar 1277143040 BLAKE2B 20795ec6ebc976087f28fd0e912190bd9094494cc1b206bcc8e1956dec148cb7ab96f244db22e4836b91c0ecfae794cd206296e898015453d8ad6625d4e4ab32 SHA512 9a7be359c82cd633db657c8619cb488b5d41b9f93cd10bdeffd5896d8a1ba3bb828b5969acd14c2a69abb3f53f18113af4ca19435aea80ded94d8df68b11deec
 DIST ufoai-code-8b4533e85fdc0665889ff285e1521432084ee784.zip 33194032 BLAKE2B caebfe5ca0eaa6376659d4aa69132c29aa4af870135a769af3541bd919164d79ab9dfe8007a40bb95507a443f6f1d968bb85b1befe8b6999f9033a0d74d7a7fb SHA512 825ca6f8ac76a3a60746ac1be4406445dd18bab80372c21c2ddfcf4d999db8549614df41386e94197013bb7b4b342ac6d9be8c969b5e1be79e8ee25cf45719c6
-EBUILD ufoai-2.5.0_p20180603-r1.ebuild 3010 BLAKE2B 3d9a041d7af0ca564310e9db827a4dcc9d24a36720e153f1cda5165b6a00bdcf1a58f0f9b40662941b0fadb4c1c897644a950f19017dc77456f66b136e7e3d6d SHA512 9db4c7ca4e37cffa8fa21c915b5d88ea276acd27ccabd1ba113293f8e34a397f3eba7c55482f050dbd78e910fc93b8ec955edcc3b5461647c2be81e6547c870d
+EBUILD ufoai-2.5.0_p20180603-r2.ebuild 3011 BLAKE2B 89e07a664232de4cb0811d90ad4250e4ffe14756e84414afa16d74f6d6f29880803404c7fb7ed283dd8314c313fc03ca1507be652e3326884e11de4f7676aaf4 SHA512 191a933d3630f4baf357ce52548b7e90bf03f693278643992c616ffd8921c5c4accfd7d0eee16bb870ff66e7a6229dbb9c319f05f89f1440b1a63deb33c863f8
 MISC metadata.xml 472 BLAKE2B 4bdf68fa50e31f6df39abec4af2ff8ebb862870ef203c0403ed6b920ab63a40434e8fa66f6fe7335b82e3c509d56ded7f97dca146d44b7c91ab0f0523ab38101 SHA512 2a91f143f6c488bfd81bd0fe5e670f21b9f678b49a06b3ab701e4dadb6455f057c7c66bd3e9b6938572ccc20712ba17c371743b7b3ab65d23434f182cf362dda
diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r2.ebuild
index cd7b93cf6ac2..93c67404831c 100644
--- a/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild
+++ b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,7 @@ SRC_URI="
 	https://dev.gentoo.org/~chewi/distfiles/${PN}-code-${COMMIT}.zip
 	mirror://sourceforge/${PN}/${PN}-${DIST_VERSION}-data.tar
 "
+S="${WORKDIR}/${PN}-code-${COMMIT}"
 
 # https://ufoai.org/licenses/
 LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0 MIT"
@@ -29,7 +30,7 @@ IUSE="+client cpu_flags_x86_sse debug server"
 REQUIRED_USE="|| ( client server )"
 
 RDEPEND="
-	dev-libs/mxml
+	dev-libs/mxml:0
 	net-misc/curl
 	sys-libs/zlib
 
@@ -58,8 +59,6 @@ DEPEND="
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/${PN}-code-${COMMIT}"
-
 PATCHES=(
 	"${FILESDIR}"/${P}-install.patch
 	"${FILESDIR}"/${P}-mxml3.patch