gentoo auto-resync : 18:08:2024 - 12:24:44

5 files changed, 28 insertions, 14 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 23bb3494ec90..adc9356c60eb 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
index f4ea1410362e..2616652f2a3c 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -6,13 +6,14 @@ AUX bsd-games-2.17-sigpause-gnusource.patch 329 BLAKE2B 3aa6451a298c6b7d1a403984
 AUX bsd-games-3.1-no-install-manpages-automatically.patch 295 BLAKE2B e0c02a1fda3a79e6263a52a2155075b286239ac58da3b84bab14d1e3c203806b75928968e89db80f02661011b19ee12758e6f2c6a848661ef7219ee704ca6d59 SHA512 266f523c7bdf46599f99f3bbbf728705a7fa6fbf71548033198dd361468dfe5e233e40c975235b166a099cba5fa4fe0fa88b05825935c3449c2c7e5f884198fd
 AUX bsd-games-3.2-no-strip.patch 1054 BLAKE2B 38d65b9f2b9357d0b2e95fb59bfa331586eafb0494694333e72f5eb36694ff4c40e8d2cbcab195432045018b989a7685a0f578aa23f0e928b37438151c507d3e SHA512 f0eef9ea37174de638389abc7c8751db80bc5ced7d406fab82be54f92af4cfadc58e2485187a928120f422d857e77c416fd578334425de12be27c23bb8f1519f
 AUX bsd-games-3.2-no-which.patch 1037 BLAKE2B 2d105e334d7a4f5248bd6dde0260c6a4e9267efce52f6fa5cf65591873ec1d25fb5c9ab33c9fe53e96b9cfa6f7b80ac0b98771ec1e0276073e69a986e0fa81c3 SHA512 e5a1362fb7260f6dc84ced322433d11b28d0e33055614296b0c5a73ae21b7145aa0dd37b3d9543f90fe3959d91d577cf132bfec6afa38b6d1893d07b6804d64a
+AUX bsd-games-3.3-no-strip.patch 333 BLAKE2B 3b220ae796d840bce2fe653029f7437a8ff2cabe28925944df011a40c736d6358a66efe25e9e7a438aaf95b014aee0b7332f9e16ddfc03543e369167d375b002 SHA512 dcb98548814a6783a92ba26a4d7703744fa56f32b7efa7fd0b94293b8b898ac796b35e4e09a4c4690b31ffb0e79b77446e1785ea4032ea5cdcd8dc0f576a964d
 AUX config.params-gentoo 1204 BLAKE2B 638b52df3c92928a78a0e0833c2bc84a76906144b36d5a6b3523f4de24452aeeab355268afadb9d32933e5c0c19ab4145062bf3968a9d440af1a659a403b32c4 SHA512 b6734409235caec3deb531bbcdb37527b3090c41b803ccc11895ea403543722437f84bdfa044c6aa70b306384ce94a40979a347e6031bc1d937841c7222d6618
 DIST bsd-games-3.1-verbose-build.patch.gz 4633 BLAKE2B cc75175ac2ef9d476c03bdb08b8c054d13090d6cdd1a14dd44022d13290112c68a7663d0c03f9ca7535ea10f2bb5e49a84acca4f782f0ced59685f762efd5151 SHA512 120c0859bb73a026dae017bcc2bc7505ca156b454bf5f87c91b4887417d5ac62f3dec706af91b22b11be8b5bce11d168f9205d722a9fd30dea654f682a66b1c8
-DIST bsd-games-3.1.tar.gz 267636 BLAKE2B 116b340e383430fc56e9d2379a398494b43664aa124157bfa01f2c6a76ebdc90128cc676abae83b6d74680b0ad9396d24f1c0d11adcff1f552a3e68717b8cc8f SHA512 3f311e89481913b734a21fc7d0765628637af8251228d5a38349c27cc702c307240e81711785bbd7428e208a142bd07597630d29e97e2c7bf5bd9cac1ebc6ada
 DIST bsd-games-3.2.tar.gz 270345 BLAKE2B 3d984601a71e157dd65e4102e68b3cddc9552d13ec546c599d26a501361616e6223f5fba8990ad8c7ba4559b3982e89a7f1064ff7de2422d1eb71f6c8838bcf1 SHA512 cf5f5a9e5d215ee553486580f9a7dfc9801d254a2806172df201dfc42ecbb05326db7bc25b7624eb8a8e541ad61ec319d258687609bddae2bc07edcbade2291a
+DIST bsd-games-3.3.tar.gz 268373 BLAKE2B 1d2bfac6191469d2a30c9cbdd370740cfafd218dad1e10d056b5e04a126ea074883088a6a11cf11a23ac22d87a8d2933ebca8f38ed7cef76f098aa77e67fe32a SHA512 aaf36d09d4fe68514a5c279063d7e77a9a9a84c447037cba974b29faa07eb80c2aab2379d0699c196b5c27ffe1b2bb2c68d3390143e0e62d5e3d210ccfb61294
 DIST bsdgames_2.17-28.debian.tar.xz 58464 BLAKE2B 3f5a70322341b153a8b3cb8df81fea1e773971d0f3b79ba8fb0c0877e95c61c8e8689952333f8ac4263948d781c2dc64c8178f9dac6a1c09ae702f91794b9583 SHA512 7e2db9f830c0657f3fcd1371635bda4a87e7a68180e486e44752904740c0710c02271522ff2d4b606542b3c502dd28795fcecf883360c3ac5bea78c148281f6a
 DIST bsdgames_2.17.orig.tar.gz 2563311 BLAKE2B 9dfff4e70929e14a422c536c661cd95c5f1ac81d9112494525b9ef13d7a39b66bd59b6a264e614cfb29784fdb63364f56b12b4d284b125b5b3c12e92def07fb0 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f
 EBUILD bsd-games-2.17_p28-r2.ebuild 4765 BLAKE2B a6dd415738b8641a1c4bd95106e3f440cd1221b0f2340e232f87056ced6257d0112cf2ed2604e2dc50180035d06e3f6a8861ba5ed7203ca753880429191ecbd1 SHA512 008abc5bef04f252124772c3bda11adf3c6c2bdfa6672efedd109bf440f6c0a748c4e5504093749741f2f7289e2ed237a5da2a324e1cbed52cb940cd2a321c50
-EBUILD bsd-games-3.1-r2.ebuild 4673 BLAKE2B 9ac11356204a1944e143541acdf3556008d162730cb5831614444d13d0030e96857d4bd8b3fc1ecec65556f571befbadafd9b6d36f654486688e66c411ef719e SHA512 32cda04e09350f71ba0892c92b4d16973c80b7f83b28ee8d837a9d80deb35f42ede89c4c84215ce6d531985b9efb9e8c3ee3b37a4135b1c68f945d214c0837a5
-EBUILD bsd-games-3.2.ebuild 4790 BLAKE2B 3ec93de1cf7a117937f261a836c160e4797107ac51a6751465fec5fb9492faf5f794e46af9ae2eb55cc398e4042e7554309fa7a0ddce8f53aacdffc28c36306c SHA512 9824e7c841fa5f33b929e9f1332cadd1817e0e893fc62cbad4e5983299e83484465e212b764f7f9a5e16ae4dd50730751bdcfc4bbc8de0aeafed567f2bf229c5
+EBUILD bsd-games-3.2.ebuild 4776 BLAKE2B 76b5a5992911102bcd9cbdabbb88af3e00eb12989c88bf7a16c582af367462d756f5bf9650c09e70a0c83915f672b285d4f36f06798a044622cd2a6e5ee08a9a SHA512 ea4b5d8c2a8ad56cbaf49ebbfe7c5a16ed9fdd0651ad929176ef6464b49db6245eaddb735320c4915f3e6a9c52f068bee681a2b1a0028ac62a0ddfc836a9d38a
+EBUILD bsd-games-3.3.ebuild 4744 BLAKE2B 9a1eb24ba848f1445b8ed5bf68b57b8f37d2bef13a6c2875b6dabe2c5746633ff21191b8db8abeee82ef43ac0c16feb842ec71e05ed3470a4c6fdcc456bb0390 SHA512 fd2044b9ab39675138018792f7ae87052bab7292dc2d8690b52314a9977e5b410b5a666f6352f19de514ca92bdd5d1f342214d64a2804acfefb5c29b48f7dcee
 MISC metadata.xml 380 BLAKE2B 1f6db3bdbd129c048fa8438c21235d9445e77f050d51130f5bdaa61ac963e53e65bceb685d08ce911e36d01728df4a90ae9abdf7e5f9fa90fdc9ae4fb7358222 SHA512 5990baea0b96e0b6448d6002735550b01b79da2254fb986401fa518c413257a05e096535937ebf4d9bafd7857507da9e76b02788e3ff62170cd7f62d57e122af
diff --git a/games-misc/bsd-games/bsd-games-3.2.ebuild b/games-misc/bsd-games/bsd-games-3.2.ebuild
index 7230c1b5e586..2d92210a59fd 100644
--- a/games-misc/bsd-games/bsd-games-3.2.ebuild
+++ b/games-misc/bsd-games/bsd-games-3.2.ebuild
@@ -5,8 +5,8 @@ EAPI=8
 
 inherit toolchain-funcs
 
-DESCRIPTION="collection of games from NetBSD"
-HOMEPAGE="https://www.polyomino.org.uk/computer/software/bsd-games/"
+DESCRIPTION="Collection of games from NetBSD"
+HOMEPAGE="https://sourceforge.net/projects/bsd-games/"
 SRC_URI="https://github.com/msharov/bsd-games/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.1-verbose-build.patch.gz"
 
diff --git a/games-misc/bsd-games/bsd-games-3.1-r2.ebuild b/games-misc/bsd-games/bsd-games-3.3.ebuild
index 48ee4118167d..b0889a163f1f 100644
--- a/games-misc/bsd-games/bsd-games-3.1-r2.ebuild
+++ b/games-misc/bsd-games/bsd-games-3.3.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
-DESCRIPTION="collection of games from NetBSD"
-HOMEPAGE="https://www.polyomino.org.uk/computer/software/bsd-games/"
-SRC_URI="https://github.com/msharov/bsd-games/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-verbose-build.patch.gz"
+DESCRIPTION="Collection of games from NetBSD"
+HOMEPAGE="https://sourceforge.net/projects/bsd-games/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.1-verbose-build.patch.gz"
 
 LICENSE="BSD"
 # Subslot indicates the fork / new version
 # 3 doesn't include the same games as the classic variant, etc
 SLOT="0/3"
-KEYWORDS="~amd64 ~hppa ~mips ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~riscv ~x86"
 
 # 'check' target doesn't exist, nor do any actual tests
 # bug #779649
@@ -31,7 +31,6 @@ RDEPEND="
 	acct-group/gamestat
 "
 BDEPEND="
-	sys-apps/which
 	app-alternatives/yacc
 	app-alternatives/lex
 	virtual/pkgconfig
@@ -40,6 +39,8 @@ BDEPEND="
 PATCHES=(
 	"${WORKDIR}"/${PN}-3.1-verbose-build.patch
 	"${FILESDIR}"/${PN}-3.1-no-install-manpages-automatically.patch
+	"${FILESDIR}"/${PN}-3.2-no-which.patch
+	"${FILESDIR}"/${P}-no-strip.patch
 )
 
 # Set GAMES_TO_BUILD variable to whatever you want
@@ -52,7 +53,7 @@ src_prepare() {
 
 	# Use completely our own CFLAGS/LDFLAGS, no stripping and so on
 	sed -i \
-		-e 's/+= -std=c11 @pkgcflags@ ${CFLAGS}/= -std=c11 @pkgcflags@ ${CFLAGS}/' \
+		-e 's/+= -std=c11 @pkgcflags@ ${CFLAGS}/= -std=c11 @pkgcflags@ ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}/' \
 		-e 's/+= @pkgldflags@ ${LDFLAGS}/= @pkgldflags@ ${LDFLAGS}/' \
 		-e s'/${INSTALL} -m 755 -s/${INSTALL} -m 755/' \
 		-e '/man[6]dir/d' \
@@ -80,7 +81,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/games-misc/bsd-games/files/bsd-games-3.3-no-strip.patch b/games-misc/bsd-games/files/bsd-games-3.3-no-strip.patch
new file mode 100644
index 000000000000..a94d439558d9
--- /dev/null
+++ b/games-misc/bsd-games/files/bsd-games-3.3-no-strip.patch
@@ -0,0 +1,12 @@
+diff --git a/Config.mk.in b/Config.mk.in
+index e069054..d9ee2cb 100644
+--- a/Config.mk.in
++++ b/Config.mk.in
+@@ -30,7 +30,6 @@ ifdef debug
+     ldflags	:= -g -rdynamic
+ else
+     cflags	:= -Os -g0 -DNDEBUG=1
+-    ldflags	:= -s
+ endif
+ CFLAGS		:= -Wall -Wextra -Wstrict-prototypes -Wshadow
+ cflags		+= -std=c11 @pkg_cflags@ ${CFLAGS}