gentoo auto-resync : 30:01:2024 - 23:49:25

6 files changed, 21 insertions, 56 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 902cdff34208..2b852f65f519 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/fennel/Manifest b/dev-lang/fennel/Manifest
index d2562d4d1736..a4159ecbeba5 100644
--- a/dev-lang/fennel/Manifest
+++ b/dev-lang/fennel/Manifest
@@ -1,5 +1,3 @@
-DIST fennel-1.3.1.tar.gz 293564 BLAKE2B 9fc465a06d8df86468197408dbb2c4e1c20a630911d1d999763cb274ed5bafa8dc4260416f10edc294bb9b7e56379f7842137d016059f0f2bc61d15391449447 SHA512 421d479c4527898123020ecc231e5eea38c5f5f1216f4a0bed0a39b8123d6a21ba1b0e876d281dfde447fe000e34a81f706303b4daa2626cc7559c063990cd5f
 DIST fennel-1.4.0.tar.gz 299561 BLAKE2B a94bb15c04b69154dbea1bc562347cef0b9ddd9ec3c3994bf5999593ef89422338f54dfb0bbd6c8e6f487eeb6d1178cc916ed8a92ec7755c43108ff58d3a842e SHA512 0c92496db478eb5445d95057433b54a945c38a40541c6891c1d887a296ce3c89468c688702249488b34192ce1783b4891e292b9b1702a0620e51cc103602694a
-EBUILD fennel-1.3.1.ebuild 921 BLAKE2B cb433616b7e14b7462fc0167c14cad50436adc84d949d838019606a1a8d1f8414a550470f950e3fdc1a0430b4fbf3664140dd3a6f585113be7f49956a6c7c5f2 SHA512 8e3c313f82fe8fea9727e7129d7efb86abee9be87109708d3d86d674dbceaff52dab4abb81002cf7410a90552694667b507fd3573a145d3b79cd4857b5f82040
-EBUILD fennel-1.4.0.ebuild 973 BLAKE2B 3052a73264643740720bd81625c94945bb67beb7119f25b05fb436066ed6ee66c9b93ab1434c94195b202b71fc18466a8592db7eff939b4ecf091a453060c59c SHA512 7a50ff74844d77efe9134349e0449ed9cf404da687e5ad0afc720b0918702e72e21d7a956e14a8ac21b352529b31fcfbd38c11e1a69ed6321d35c24eee01d896
+EBUILD fennel-1.4.0-r1.ebuild 966 BLAKE2B a1cccf24264fc0918347f73763a4217d82643b48fc233f62caa12c9017fcd4ffb912a37878d8210559aaeb7b60b18964afe40e991c12dc0608ac4d6af0a079f6 SHA512 9401b68939798af20c56caf019f28990d479d8e97e5b2f950d0e93f5cd07a75dc01e85e9daacd57575bcc32b9aa55ab2f4276a3de7bc6e409df75f27fb08d304
 MISC metadata.xml 1061 BLAKE2B 49ef84fd44f2efd7526055bfc6fd1a37fa0d426a0746d769844ad6fd4ae1efc7dcc541f61fe6f3d8e0e92cb324c6bdfb061312c15ed1d696cf1985aa4cb4097d SHA512 3381a38c5c2ae6482325e6aeea556db767cc6166e89280511d0597c06fbc532a6592d526954f8b1fd40badcac7a951eece9f6aeaf18802f85ca16ccb5da4510d
diff --git a/dev-lang/fennel/fennel-1.3.1.ebuild b/dev-lang/fennel/fennel-1.3.1.ebuild
deleted file mode 100644
index c411efc01ac9..000000000000
--- a/dev-lang/fennel/fennel-1.3.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Fails to build with with "lua5-1".
-LUA_COMPAT=( lua5-{3,4} luajit )
-
-inherit lua-single
-
-DESCRIPTION="Lisp-like language that compiles to Lua"
-HOMEPAGE="https://fennel-lang.org/
-	https://sr.ht/~technomancy/fennel/"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~technomancy/${PN}"
-else
-	SRC_URI="https://git.sr.ht/~technomancy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="${LUA_DEPS}"
-BDEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# Turn off broken(?) tests. bug https://bugs.gentoo.org/906351
-	sed -i -e 's|"failures",||' -e 's|"repl",||' test/init.lua || die
-}
-
-src_install() {
-	emake LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" PREFIX="${ED}/usr" install
-
-	dodoc *.md
-}
diff --git a/dev-lang/fennel/fennel-1.4.0.ebuild b/dev-lang/fennel/fennel-1.4.0-r1.ebuild
index 8357adfce671..a43a19c20397 100644
--- a/dev-lang/fennel/fennel-1.4.0.ebuild
+++ b/dev-lang/fennel/fennel-1.4.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 # Fails to build with with "lua5-1".
-LUA_COMPAT=( lua5-{3,4} luajit )
+LUA_COMPAT=( lua5-{3,4} )
 
 inherit lua-single
 
diff --git a/dev-lang/fuzion/Manifest b/dev-lang/fuzion/Manifest
index eea2ff3d9c03..45a17c679a00 100644
--- a/dev-lang/fuzion/Manifest
+++ b/dev-lang/fuzion/Manifest
@@ -1,5 +1,5 @@
 DIST fuzion-0.085.tar.gz 951247 BLAKE2B 5ae8999453759e0a8e5fb44b0aec833adb2c66ca9fea3e3092e2f298cc27a98c75abe0947337e9bb43920009d3bed8aa526a325fc58791d6177cb4f2d7ae7f23 SHA512 4a40eeffaa40b0568d90a20cf4125e7bddcc651fbe55b38866bb3cc90517749259336f776c33b762969986accae01e532b09418114b7c60e98377074bf144a17
 DIST fuzion-0.086.tar.gz 994894 BLAKE2B e698ea7b8de215c55e84e0f55f405156d5c386c1001c7b29e0c7c49e7a7e7babf7cb64cf30726a24aa7b6ccdc0eaf01cc543867361e2554f258d76be1fc08b97 SHA512 6d2df12d1dced9c5a61bb183767fc205ddbc0d04db8cae3f5e3eabd9ab60f18b3c2b3fa8f57702dc792882b1a6f79da1cfcb7801d84ecc2cff1844a4bc226f67
 EBUILD fuzion-0.085-r1.ebuild 1380 BLAKE2B da167769b57e7e8b62bf37bfbb8bf2a003eb3f9e70f76a052d4d09e836b70eb404ca849ad678e74e49cb78cc45237da6448a8c6d999561a8b811d95bc547f85e SHA512 9d753062541caac1fbab3371f3c04f01c109e96257de50f898878a5f8960995a9483e17602d0d303db21855bf2f281bc2c82f10fc2336e38c46797593f21c1e2
-EBUILD fuzion-0.086.ebuild 1381 BLAKE2B fb209253b3168ad91fbe52b12631977dc33471d3e3b5e160a5d991dae7b9bd29e6bdea868d9c94b4932047544d0b22896e5bbbc75f18aae43a9a1298983013b5 SHA512 bf563b165f67b680e23420fd234a4ec26ae25fffa29be3373dd5abcbc6f006466e0ac7ace4da9030867b64ff5dc8366d0d4aea5a1cc60050697f2e6a5570dadc
+EBUILD fuzion-0.086.ebuild 1489 BLAKE2B 24d2178299d91327838b96cf26544c5fde24d8b33ba809cabaf974d0e1988b0b98188a4cceb28b5eea2bf0a4200c2bdc347b9834eb443322b4863aa739468a24 SHA512 1c3db9ea8151a01f0ff03f8378b6a283940df8fdbcbee71f5bb4c20f3014d0b88dfd4ad6bbb8ae744353d5bb0bb75974be4e82543a84589b39250c0f95fce387
 MISC metadata.xml 678 BLAKE2B 1785e807c53bd64819e1e7510d96a6d81bf316351d38633cd45f506fe79faad7334fb13ca646366c31146f66301dfbe638a71fffee0726867f6863340b7d14f3 SHA512 d61ffbe425b6a6b84dc1f813f279c0e655650e8b5273c69492f1092414ae956c8f1413bda3a87e5a28783a1d219d7d69282eeeaab1c8e6227a04c05ca0bea27b
diff --git a/dev-lang/fuzion/fuzion-0.086.ebuild b/dev-lang/fuzion/fuzion-0.086.ebuild
index 388f1e28729c..25e1fa2bc8ef 100644
--- a/dev-lang/fuzion/fuzion-0.086.ebuild
+++ b/dev-lang/fuzion/fuzion-0.086.ebuild
@@ -34,11 +34,19 @@ DEPEND="
 	virtual/jdk:17
 "
 BDEPEND="
-	test? ( sys-devel/clang:* )
+	test? (
+		sys-devel/clang:*
+	)
 "
 
 DOCS=( README.md release_notes.md )
 
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	rm -fr tests/sockets || die
+}
+
 src_compile() {
 	emake -j1
 }
@@ -49,13 +57,13 @@ src_test() {
 
 src_install() {
 	# Remove unnecessary files from build directory. bug #893450
-	local torm
-	local torm_path
-	for torm in tests run_tests.{failures,results} ; do
-		torm_path="${S}/build/${torm}"
+	local toremove
+	local toremove_path
+	for toremove in tests run_tests.{failures,results} ; do
+		toremove_path="${S}/build/${toremove}"
 
-		if [[ -e "${torm_path}" ]] ; then
-			rm -r "${torm_path}" || die "failed to remove ${torm_path}"
+		if [[ -e "${toremove_path}" ]] ; then
+			rm -r "${toremove_path}" || die "failed to remove ${toremove_path}"
 		fi
 	done
 
@@ -64,9 +72,9 @@ src_install() {
 	insopts -m755
 	doins -r build/bin
 
-	local bin
-	for bin in fz fzjava ; do
-		dosym -r "/usr/share/${PN}/bin/${bin}" "/usr/bin/${bin}"
+	local exe
+	for exe in fz fzjava ; do
+		dosym -r "/usr/share/${PN}/bin/${exe}" "/usr/bin/${exe}"
 	done
 
 	einstalldocs