gentoo auto-resync : 11:02:2025 - 00:12:37

3 files changed, 69 insertions, 0 deletions

diff --git a/games-server/crossfire-server/Manifest b/games-server/crossfire-server/Manifest
index 5a4b3a75dbc8..8c4d4bc7feeb 100644
--- a/games-server/crossfire-server/Manifest
+++ b/games-server/crossfire-server/Manifest
@@ -1,6 +1,10 @@
 AUX crossfire-server-1.71.0-format.patch 1115 BLAKE2B 7bce8fa52889ec1f1ca636c48995ac5110f5fc62965b0e7a8db01f37df8f6339756b290028425fbbe3e93b559126e8571d619ffe55f119007b3416abe5ae71eb SHA512 3d1cf04cc787177776f8f65afbe585ebe5982687313219a6cc64797bf4a992c1b6077ad2ad75b1f7c3372041c9cb0eaadbebee3fb27a25ff5664a8adb48e986f
+AUX crossfire-server-1.75.0-format.patch 642 BLAKE2B c5f6c6451ec1828daa6ffed0ea3ebdf7b331eada42c1ae0c4ffc22276edbd6245485be4c3e40a222ecfae75b96d9785c0d37f47f2465ad1749cb11eb63fce706 SHA512 b96e2ee8a5b5c06988159ef1789ac689fcab0fcaafac6165eb09fb1507e6add09ceff05a5603728771068c54af2fe6a797d6ff9edd0a46dafd8720e4030ef585
 DIST crossfire-1.71.0.arch.tar.bz2 3462161 BLAKE2B 4f2c7e9619ceca3aafea03a681e59c04e31c954c91b94e4065a6446d537c6f039fe58c04f50fd5eddb8290b9cb93533772c6c7963b526c537bf297f469ad5bb5 SHA512 f9707dc5dab24d0ba74654c6433e016a58ab4e99da5dade6614491eca00736965bb7fd9a24db4188c3409a0479a88bb0ea55282e519ffcbabf23d82e6a5b975e
 DIST crossfire-1.71.0.maps.tar.bz2 19463076 BLAKE2B a6b1935985d82b53ef1dfd76b91e8d9417f03dceeddbc69154799703597d14d3ffb3dba8cec809345b62e99294ed3adec66cb2c9fae52fface96db8ba75daa7d SHA512 c3940b0a48f1badc14eb81610cfcd4241d140b666b5cb123845dca6ad742a18977ad7ada1d75d738f15f44374896c4dd6047989122257d7cd87362a3af0f97e8
 DIST crossfire-1.71.0.tar.bz2 6712638 BLAKE2B 91957fab3f19e52839eadfcb015a2fd8dfc551230fa55dd00254f39608ffbb8648227f3d2a244a609538ee2e426675e6b58dac73cf565554611ccb40d2839873 SHA512 d867f3393cb18ed78158c9a724d386dd642f0193ace86fef592e7bdc80885b7f7ce3c37be34b77d73b31c939d41e533029f2e7dea405c00d7a67aa3baebd146d
+DIST crossfire-1.75.0.tar.gz 7199792 BLAKE2B cf9c8f40bfa3970ab28b21694fe85dc2a6849976903f1488fd3d3858927af6a0a47d47f382560f13f0d3d39c28f31c5f9dc55ec4e03cc290a13320c0831f795d SHA512 1e730fcccf302ab72850928a4f16a4b779558db57713fc9d8678f41df6c48139a87e8fda621a931a2a5530da924ab7c5e8a31cfe830b825cf369e743051036f4
+DIST crossfire-maps-1.75.0.tar.gz 33892228 BLAKE2B 47546d19eeb89ed19949a5ed1be4bc545d2347ee64d04fb803a66d7a7657cf3d98233f2fa32c89f5ba884535a7f6cffe2e7385860351334450ea9689cef3b8a0 SHA512 00b7ac1957d85d5f4ea847eaa59a80dda31b0518ecdfd31984349e5d7ca5ac5d526bbb1c7f64a0e5e0d60ec727bfe8f849bad6ad6d36fe570250c7f20c2b1220
 EBUILD crossfire-server-1.71.0-r2.ebuild 1191 BLAKE2B ea0f0a8dfd5552a2a473147fe461ecb595eae41e235fe4a4ee61695a0333f65ce0ed35e68149e223372d341c619f227d0b02c96d4c0e52a7938f554a3a97d6e0 SHA512 c90aade0ca595f9645fc510ccc5b57fb46a1715a5e19f4ba8279695113d8617af620e033f14e4aeba00ccfca6f3b70c07b94208cfc75eecf335237574f4b785c
+EBUILD crossfire-server-1.75.0.ebuild 1126 BLAKE2B 7de0b19f284da530a44acd9c5f14da81ca137c9635716bf7f998e5a16500be8501213c5fc1bc451a9147c1cf374b625ff83daa34b6829d5e249134239a6182a2 SHA512 f5680c25b2ec98d20e11d37e7a10bed5096f7d11530d195452b9c4b7855551161b47cebcacdad0368b9ee6bec94e32ce98a8db93e5685d220115ec1186ddd1f1
 MISC metadata.xml 333 BLAKE2B 53fc5f88b9809cfd1c674619a402f29bd6a70abf38acaefd1437cc9ea5fd2d50e8452bdb27739aafa04f03a8ec9221c15547f79926f6156d1418b2829d7d9ba1 SHA512 a18d6f05ec05d995f6b9c826db60a0635c20e389fc40b350be8c2f99984c54f2c8b48b9ee3fce3efa5183b73276bbced75eeb3eecd15e6210047a46bc09e073c
diff --git a/games-server/crossfire-server/crossfire-server-1.75.0.ebuild b/games-server/crossfire-server/crossfire-server-1.75.0.ebuild
new file mode 100644
index 000000000000..17c9af84474b
--- /dev/null
+++ b/games-server/crossfire-server/crossfire-server-1.75.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${P/-server/}"
+DESCRIPTION="Server for the crossfire clients"
+HOMEPAGE="https://crossfire.real-time.com/"
+SRC_URI="https://downloads.sourceforge.net/crossfire/crossfire-server/${PV}/crossfire-${PV}.tar.gz
+	https://downloads.sourceforge.net/crossfire/crossfire-maps/${PV}/crossfire-maps-${PV}.tar.gz"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+RESTRICT="test"
+
+RDEPEND="
+	net-misc/curl
+	sys-libs/zlib
+	virtual/libcrypt:=
+	X? (
+		x11-libs/libXaw
+		media-libs/libpng:0=
+	)
+"
+
+src_prepare() {
+	default
+
+	# bug #236205
+	rm -f "${WORKDIR}"/maps/Info/combine.pl || die
+#	ln -s "${WORKDIR}"/arch "${S}"/lib || die
+
+	eapply "${FILESDIR}"/${P}-format.patch
+}
+
+src_compile() {
+	# work around the collect.pl locking
+	emake -j1 -C lib
+	emake
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/crossfire/{account,datafiles,maps,players,template-maps,unique-items}
+
+	insinto /usr/share/crossfire
+	doins -r "${WORKDIR}"/maps
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/games-server/crossfire-server/files/crossfire-server-1.75.0-format.patch b/games-server/crossfire-server/files/crossfire-server-1.75.0-format.patch
new file mode 100644
index 000000000000..f051dc9f48b6
--- /dev/null
+++ b/games-server/crossfire-server/files/crossfire-server-1.75.0-format.patch
@@ -0,0 +1,11 @@
+--- a/server/c_chat.c	2024-06-24 08:49:34.803705760 -0000
++++ b/server/c_chat.c	2024-06-24 08:50:21.532557066 -0000
+@@ -651,7 +651,7 @@
+         const char *self_reply;
+         if (emotion > EMOTE_FIRST && emotion < EMOTE_LAST && single_emotes[emotion - 1][0] != NULL) {
+             self_reply = single_emotes[emotion - 1][0];
+-            snprintf(buf2, sizeof(buf2), single_emotes[emotion - 1][1], op->name);
++            snprintf(buf2, sizeof(buf2), "%s", single_emotes[emotion - 1][1], op->name);
+         } else {
+             self_reply = "You are a nut.";
+             snprintf(buf2, sizeof(buf2), "%s dances with glee.", op->name);