gentoo auto-resync : 23:06:2023 - 01:23:10

5 files changed, 49 insertions, 74 deletions

diff --git a/app-emulation/uxn/Manifest b/app-emulation/uxn/Manifest
index d4bf75ab6cf4..5f51dba6017c 100644
--- a/app-emulation/uxn/Manifest
+++ b/app-emulation/uxn/Manifest
@@ -1,9 +1,8 @@
+AUX uxn-0_p20230609-build.sh.patch 626 BLAKE2B 08b58d26f892354e5a6b6e19bfd11584ed62ae4b4640fee99f5baf636eb42a3c9e28d073d95e30e6fcba2ef17b3ad59ae9d06568e0883c244233b42f60b284f9 SHA512 b95e1026abbb28dc152cc5ecb176921d7ff3db9356c2dce95220ab0d360b9535bfc5996839ad19b77a9346304c51e430b9f69747b7dd39a6621f86330e382cb3
 AUX uxn-build.sh.patch 363 BLAKE2B 5283c0a42a2e2ec96bbc15ea88bd7a4ff2a3b0f81274f87f6508fde09f1b6563b0bda6d96c2939e4a6d7bf4fc2fa5cadc1c79a7ab29bb0ffebaa3cdf03b86eb3 SHA512 f5b1df9b62ee9dc88a11e0950f7dd606e699ef6b23664cb37ba75c96e663cca1364fbff1597333db06bd6b3a7b5f797af612e2ea52002254dd30f03f13d723d0
-DIST uxn-0_p20221211.tar.gz 284943 BLAKE2B de116e87120bc71975271c9ad0c1b01cba6e13a78cba0faaf811a2cace72204f15fca620bb4c87518542208e1c2af49e6db98b1b3b442ec3a855fb8b592acb2d SHA512 d59504f994b487aff151fefdb2f0f87a707fe998c1ea08539dc8d67aed28a4c93c9ff4bde036a9eb44401e8e6a12b7a15c17e434d5cab7b44a17e2e18e50e978
-DIST uxn-0_p20230201.tar.gz 285942 BLAKE2B 2ace9aba9e7c5c7cd60c8db2208e16b4af4830dee5bb10eaa228028ada8701154069423a6b920a09821f63e52dd8955c48e2f13b58061aa08256045e20aaf020 SHA512 e33ff693124d14ee94c8192adb47d940f08d37c22067264afdcae7f4f9ac713915c4daa3bbee3e38385cb71b988a30991ca8ea123dd542438367eaf3a4c88f84
 DIST uxn-0_p20230501.tar.gz 285942 BLAKE2B 2ace9aba9e7c5c7cd60c8db2208e16b4af4830dee5bb10eaa228028ada8701154069423a6b920a09821f63e52dd8955c48e2f13b58061aa08256045e20aaf020 SHA512 e33ff693124d14ee94c8192adb47d940f08d37c22067264afdcae7f4f9ac713915c4daa3bbee3e38385cb71b988a30991ca8ea123dd542438367eaf3a4c88f84
-EBUILD uxn-0_p20221211.ebuild 1178 BLAKE2B d8f89630b2f5d252ee4d1f216e1a2dfe68f3ae6f9e57bc56ec50a33413baad113400f56bb1e2731d80b94e1a4ebab6c5e27709d90f40a785b0de6602e6c427a8 SHA512 c0f601c7df28c96ebdba6fa3e923077ba30dd38e3a3709b7efcceccb2ac219dd85d564da9dbcd9709bc4f177e2591bb330b0482fc5289728ea976a3ed046778a
-EBUILD uxn-0_p20230201.ebuild 1178 BLAKE2B 8371b030d0946cb1c6fef4d9fe7561f9e0ba426bfaa71376c8cff75224a18c437b0ab18c5ae1e0ad6bbb5b27a5b73f94b9d3739e602771998fd33fe7ba936fa0 SHA512 42a876b28750380fb885ebc85ed4dfba5d2a5e75a500d10e60931d629529002500d4ec7797d687fe30d017ad7270c922d2187afa7b7d8250bed940ff07fc87f7
+DIST uxn-0_p20230609.tar.gz 289620 BLAKE2B 35d9cdc8266012d5762641b739099aef9ecd1619dd9c650aba3fc8ad285aa80e9a77dc2d7f53a6e8d56f05936a49f561b53cc4d50720be2bf8028f7479efe4ba SHA512 862be7246597fb54e759eee39d2d4a06ca1e6f8a42c1a336c25c5e2d7657ea086a546c9346da911cc4ec73705274794879b22f6da5f7ce88b66210cc1649dc39
 EBUILD uxn-0_p20230501.ebuild 1316 BLAKE2B 569b8ad50713d896a1d13ebe2f8f58ec8a31a7b2a162f7e2456158260861fdd5216e2fe5af9981e67c82b4a2fdf123cc882e1704976039b7b899223a7b33c535 SHA512 077fc59a2941bc7b265acf086461e2eba8d8fcb9ea8c7069531503434a8c439a9bd1808d3aa812163e6d6ed744aae3d7646a3fa3c79c977bf539279bc7a01c60
-EBUILD uxn-9999.ebuild 1103 BLAKE2B e96ef87b30263310787425c109694b3d15c3d3733ea1ead43546fe225380bb6621738d134c9a1b8492db1e9f1bd643f2283e9106eae3e17738fd131e3311e8c1 SHA512 63afc5ea36ac4c5a96121ed8081db3efd1a9b0eaf7474849b3829449ab67ce174c619bcc266fff8f703450cc624c2cdb445aabeda1e238da76d0bc61b65e6d3a
+EBUILD uxn-0_p20230609.ebuild 1327 BLAKE2B d883346f2a64655eaa12dba1d4d36862c3d8209573ea0686e42b3f816e4ccd5fa3ff1e0bd2b8041f9c1378407eadab5174d1a40524131ad5c2ece7b97e977e89 SHA512 918521bb7d9bf53a52f5df784a4b14c16766c87d2cca9dc283053ce8fd917a87d82c9f06eb928cb66d1e105111026527ddfbb9112375bd7f25272156b819b939
+EBUILD uxn-9999.ebuild 1327 BLAKE2B d883346f2a64655eaa12dba1d4d36862c3d8209573ea0686e42b3f816e4ccd5fa3ff1e0bd2b8041f9c1378407eadab5174d1a40524131ad5c2ece7b97e977e89 SHA512 918521bb7d9bf53a52f5df784a4b14c16766c87d2cca9dc283053ce8fd917a87d82c9f06eb928cb66d1e105111026527ddfbb9112375bd7f25272156b819b939
 MISC metadata.xml 643 BLAKE2B 11f4437dbab961e620e204294cb8b18e1ef43c2c79411f8b1224a36276c6a4781e3cb5e854040c979eaa27dc145eb606576ba20076d16a301e33aea6bdcd0df4 SHA512 b5bf43fdcafed44459ac77576f631105175691078b8094d505657fdacc0519856ca063890d432051aa5bff8853ca55f7b10d3b8f680230605de63f69b0acf997
diff --git a/app-emulation/uxn/files/uxn-0_p20230609-build.sh.patch b/app-emulation/uxn/files/uxn-0_p20230609-build.sh.patch
new file mode 100644
index 000000000000..a8b75458da43
--- /dev/null
+++ b/app-emulation/uxn/files/uxn-0_p20230609-build.sh.patch
@@ -0,0 +1,20 @@
+--- a/build.sh
++++ b/build.sh
+@@ -52,7 +52,7 @@ fi
+ 
+ mkdir -p bin
+ CC="${CC:-cc}"
+-CFLAGS="${CFLAGS:--std=c89 -Wall -Wno-unknown-pragmas}"
++CFLAGS="${CFLAGS} --std=c89 "
+ case "$(uname -s 2>/dev/null)" in
+ MSYS_NT*|MINGW*) # MSYS2 on Windows
+ 	FILE_LDFLAGS="-liberty"
+@@ -77,7 +77,7 @@ then
+ 	echo "[debug]"
+ 	CFLAGS="${CFLAGS} -DDEBUG -Wpedantic -Wshadow -Wextra -Werror=implicit-int -Werror=incompatible-pointer-types -Werror=int-conversion -Wvla -g -Og -fsanitize=address -fsanitize=undefined"
+ else
+-	CFLAGS="${CFLAGS} -DNDEBUG -O2 -g0 -s"
++	CFLAGS="${CFLAGS} -DNDEBUG "
+ fi
+ 
+ ${CC} ${CFLAGS} src/uxnasm.c -o bin/uxnasm
diff --git a/app-emulation/uxn/uxn-0_p20230201.ebuild b/app-emulation/uxn/uxn-0_p20230201.ebuild
deleted file mode 100644
index a71b2f9fcd3a..000000000000
--- a/app-emulation/uxn/uxn-0_p20230201.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-[[ ${PV} == *_p20230201 ]] && COMMIT=0dcc3b4c2e12bf2a61e682e9168e8bdb469caae0
-
-inherit toolchain-funcs
-
-DESCRIPTION="An assembler and emulator for the Uxn stack-machine, written in ANSI C"
-HOMEPAGE="https://wiki.xxiivv.com/site/uxn.html
-	https://git.sr.ht/~rabbits/uxn/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~rabbits/uxn.git"
-else
-	SRC_URI="https://git.sr.ht/~rabbits/uxn/archive/${COMMIT}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${COMMIT}
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="media-libs/libsdl2:="
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/uxn-build.sh.patch )
-
-src_compile() {
-	CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" ./build.sh --no-run ||
-		die "build failed"
-
-	local f
-	for f in ./projects/{examples/*,software,utils}/*.tal ; do
-		./bin/uxnasm "${f}" "$(dirname "${f}")"/"$(basename "${f}" .tal)".rom ||
-			die "failed to assemble ${f}"
-	done
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe bin/uxn*
-
-	insinto /usr/share/uxn
-	doins bin/*.rom
-	doins -r projects
-
-	einstalldocs
-}
diff --git a/app-emulation/uxn/uxn-0_p20221211.ebuild b/app-emulation/uxn/uxn-0_p20230609.ebuild
index 9fadbd8e8644..55a5c6f70c66 100644
--- a/app-emulation/uxn/uxn-0_p20221211.ebuild
+++ b/app-emulation/uxn/uxn-0_p20230609.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=8
 
-[[ ${PV} == *_p20221211 ]] && COMMIT=6317b5cf181e56253da10e0e5051ac75bbb5c4b2
-
 inherit toolchain-funcs
 
 DESCRIPTION="An assembler and emulator for the Uxn stack-machine, written in ANSI C"
@@ -14,11 +12,14 @@ HOMEPAGE="https://wiki.xxiivv.com/site/uxn.html
 if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~rabbits/uxn.git"
-else
+elif [[ ${PV} == *_p20230609 ]] ; then
+	COMMIT=f3674b2562e6c5557fc008edbac71d9fcfde64ff
 	SRC_URI="https://git.sr.ht/~rabbits/uxn/archive/${COMMIT}.tar.gz
 		-> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${COMMIT}
-	KEYWORDS="amd64 ~x86"
+	S="${WORKDIR}"/uxn-${COMMIT}
+	KEYWORDS="~amd64 ~x86"
+else
+	die "wrong package version (PV), given: ${PV}"
 fi
 
 LICENSE="MIT"
@@ -27,16 +28,19 @@ SLOT="0"
 RDEPEND="media-libs/libsdl2:="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/uxn-build.sh.patch )
+PATCHES=( "${FILESDIR}"/uxn-0_p20230609-build.sh.patch )
 
 src_compile() {
 	CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" ./build.sh --no-run ||
 		die "build failed"
 
 	local f
+	local f_base
 	for f in ./projects/{examples/*,software,utils}/*.tal ; do
-		./bin/uxnasm "${f}" "$(dirname "${f}")"/"$(basename "${f}" .tal)".rom ||
-			die "failed to assemble ${f}"
+		f_base="$(basename "${f}" .tal)"
+		ebegin "Assembling ROM ${f_base}"
+		./bin/uxnasm "${f}" "$(dirname "${f}")"/"${f_base}".rom
+		eend ${?} ||  die "failed to assemble ${f}"
 	done
 }
 
diff --git a/app-emulation/uxn/uxn-9999.ebuild b/app-emulation/uxn/uxn-9999.ebuild
index 1b6c4a1a5ff4..55a5c6f70c66 100644
--- a/app-emulation/uxn/uxn-9999.ebuild
+++ b/app-emulation/uxn/uxn-9999.ebuild
@@ -6,19 +6,20 @@ EAPI=8
 inherit toolchain-funcs
 
 DESCRIPTION="An assembler and emulator for the Uxn stack-machine, written in ANSI C"
-HOMEPAGE="
-	https://wiki.xxiivv.com/site/uxn.html
-	https://git.sr.ht/~rabbits/uxn/
-"
+HOMEPAGE="https://wiki.xxiivv.com/site/uxn.html
+	https://git.sr.ht/~rabbits/uxn/"
 
 if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~rabbits/uxn.git"
-else
+elif [[ ${PV} == *_p20230609 ]] ; then
+	COMMIT=f3674b2562e6c5557fc008edbac71d9fcfde64ff
 	SRC_URI="https://git.sr.ht/~rabbits/uxn/archive/${COMMIT}.tar.gz
 		-> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${COMMIT}
+	S="${WORKDIR}"/uxn-${COMMIT}
 	KEYWORDS="~amd64 ~x86"
+else
+	die "wrong package version (PV), given: ${PV}"
 fi
 
 LICENSE="MIT"
@@ -27,16 +28,19 @@ SLOT="0"
 RDEPEND="media-libs/libsdl2:="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/uxn-build.sh.patch )
+PATCHES=( "${FILESDIR}"/uxn-0_p20230609-build.sh.patch )
 
 src_compile() {
 	CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" ./build.sh --no-run ||
 		die "build failed"
 
 	local f
+	local f_base
 	for f in ./projects/{examples/*,software,utils}/*.tal ; do
-		./bin/uxnasm "${f}" "$(dirname "${f}")"/"$(basename "${f}" .tal)".rom ||
-			die "failed to assemble ${f}"
+		f_base="$(basename "${f}" .tal)"
+		ebegin "Assembling ROM ${f_base}"
+		./bin/uxnasm "${f}" "$(dirname "${f}")"/"${f_base}".rom
+		eend ${?} ||  die "failed to assemble ${f}"
 	done
 }