gentoo auto-resync : 11:08:2023 - 15:35:17

5 files changed, 43 insertions, 61 deletions

diff --git a/dev-scheme/owl-lisp/Manifest b/dev-scheme/owl-lisp/Manifest
index d840ccb4a3fc..33697f7462d8 100644
--- a/dev-scheme/owl-lisp/Manifest
+++ b/dev-scheme/owl-lisp/Manifest
@@ -1,6 +1,5 @@
+AUX owl-lisp-0.2.1-make-no-test.patch 298 BLAKE2B bef51b887f1706451237547530408214d68122a4ee9d78684925922fa842b2ac2ba5a8efd060aff53045bd87dfa76c219354fe4bcb347bdafe088b75f5eb6104 SHA512 49921b6cbd15918c30281f80b47776b443ef4fec9277365d3dedef1e666af268360f8924e6f0ac8e6f20eca96edb6e9f83bfe241350445e7072f7a8ad5e4f80c
 DIST owl-v0.2.1.tar.bz2 456751 BLAKE2B 15447cc71b633a97f48086a986c8015f1bc5664b993faa7f4537878fefb805d824c49174ef5a225e4cc870bb4c5b8d256cb887c83eba58d67c64bf5db6d2d7f9 SHA512 b69296e9be60ea4e8103c8100de9d02d00fc50e13624c87c1c4a78852b58aea403459f8b4a2f88826630e7204d58d522b58df489ce194c04e9424186309f5c8e
-DIST owl-v0.2.tar.gz 515574 BLAKE2B 054a06d33554cc31f5e1c756bf3ff5ea4fb5cec220048fb939aa9dcd19c586cef54ae8ddc80e1ee8befedfa2e42fc1bf9ea4bcfe37e6743154ff678346444e87 SHA512 f0dc4badc84be1ebd1ad8f6a84c8fc292449b0f66a9416f202f9010e89aa2971c6470599173db67bf3db3e4b6a61d777ee369eda76fa7c42114748e8fe48b7b2
-EBUILD owl-lisp-0.2.1.ebuild 852 BLAKE2B 726ab9ca49aa52d1f914ec478b8de93aef615e30df692d6437affc752ce044117d5137b73dde8b4c2ea23e16d320fbe29fe17f1a3648b75f5c7481f364d4527f SHA512 66d84f7c6c993dc6227ee99cb880aab14004109032ee58e436c3e3742b844a2f0890f5f1ccaf0454226b1e91e56bdf21776c6d09f3bc8412a001ba29d7d5bbf6
-EBUILD owl-lisp-0.2.ebuild 832 BLAKE2B cdccee2f7ebaae77bf3229f758e751319b28b9d486cfe9925303f7c11a2c480ad8cf9d72bb0b1bfd4b52ca16a983d9007e65b3c19ea1195cf52ede7865c677c6 SHA512 d91dac0bbf14235e62510f6d3a79de1b380b5990d5bda492176529bab2ed0436cd58162966f535b9b379f4f1aad67f3c0a592013fe3106bdb82ee94566830272
-EBUILD owl-lisp-9999.ebuild 744 BLAKE2B d779b2bbb626900c9d5108be0d4bfaa90752d6d8a374f6e7b39eb921b800476285ccb6ebd80a6d7a8e54d4b4fcefa538d0d46c73bbca159c1c7dcb5f8b8db557 SHA512 323b47dc6a45f0452b0ccf26396847110fcb65bc1b923969d0272333affb45cc256670b20e9c9e47bd8dbab43fcec4cd7c9454a4a7328b0f2301c1326c3378a6
+EBUILD owl-lisp-0.2.1.ebuild 988 BLAKE2B ce649334ad7f34373b0730612f4abe880d2119702d73a8dff63204bc5efce66049f351673729c2bd9a4eecfbb4a8e29924ab8ed29f1380632274dc3e4f47f50c SHA512 8a46f05e409eac6b448a2221eba8231d56a5240bb92160363c06915140346887c28b532190474e33fc907aaabdc01c03e85f011985f9fd6c00a4fc44e87dac89
+EBUILD owl-lisp-9999.ebuild 923 BLAKE2B f4f2181d459eb9175da7f85bbbe45fcc6d57ea482c5e1b2daf4996522c5bf9010f41078b5c760185a618e6c669a35428d981b33dc7733d40fc9eecab0527ac0b SHA512 250737072101d82e33a5c72fa1050cac6403d11602f8d27927621ab217c781ad426eb31d0ebd1c5dc62baff231da44050a2ec6234ab82eb61c329dee8bc5a3cd
 MISC metadata.xml 793 BLAKE2B 54cc42daf49b4f39ad4119e2128e9cdc9e2749dafbb5a1ff63c84e60a6d410caa39034de5fcafd82ca36ac7291b6f3afe92cad929c4c59270f0fec01c0828d4d SHA512 7e360c32aedf4ec42abac5b1df86c1225f863a885087363d0f16ba5c971b342743f49afccfbb9d81c821ba180c4f6033b27ab46dedcbdbafb597dee8a1820c15
diff --git a/dev-scheme/owl-lisp/files/owl-lisp-0.2.1-make-no-test.patch b/dev-scheme/owl-lisp/files/owl-lisp-0.2.1-make-no-test.patch
new file mode 100644
index 000000000000..34a4b8ab2288
--- /dev/null
+++ b/dev-scheme/owl-lisp/files/owl-lisp-0.2.1-make-no-test.patch
@@ -0,0 +1,10 @@
+--- a/Makefile
++++ b/Makefile
+@@ -49,7 +49,6 @@ c/ol.c: fasl/ol.fasl
+ bin/ol: c/ol.c
+ 	# compile the real owl repl binary
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/olp $?
+-	CC="$(CC)" LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" sh tests/run all bin/olp
+ 	test '!' -f $@ || mv $@ bin/ol-old
+ 	mv bin/olp $@
+ 
diff --git a/dev-scheme/owl-lisp/owl-lisp-0.2.1.ebuild b/dev-scheme/owl-lisp/owl-lisp-0.2.1.ebuild
index 9a3d4efc4581..569d3b931745 100644
--- a/dev-scheme/owl-lisp/owl-lisp-0.2.1.ebuild
+++ b/dev-scheme/owl-lisp/owl-lisp-0.2.1.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# NOTICE: Because it is "purely functional" it is not scheme-compatible ootb
-
 EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Purely functional dialect of Scheme"
-HOMEPAGE="https://haltp.org/posts/owl.html"
+HOMEPAGE="https://haltp.org/posts/owl.html
+	https://gitlab.com/owl-lisp/owl/"
 
 if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
@@ -22,10 +21,15 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
+PATCHES=( "${FILESDIR}"/${PN}-0.2.1-make-no-test.patch )
+
 src_prepare() {
 	default
 
 	sed -i 's|make bin/vm|$(MAKE) bin/vm|g' "${S}"/Makefile || die
+
+	# Skip "tests/char-ready.sh", "does not work in background subshell".
+	rm tests/char-ready.sh || die
 }
 
 src_compile(){
@@ -33,9 +37,11 @@ src_compile(){
 }
 
 src_install() {
-	einstalldocs
+	exeinto /usr/bin
+	doexe "${S}"/bin/ol
+	newexe "${S}"/bin/vm ovm
 
-	dobin "${S}"/bin/ol
-	newbin "${S}"/bin/vm ovm
 	doman "${S}"/doc/*.1
+
+	einstalldocs
 }
diff --git a/dev-scheme/owl-lisp/owl-lisp-0.2.ebuild b/dev-scheme/owl-lisp/owl-lisp-0.2.ebuild
deleted file mode 100644
index 05adcbd2ae8e..000000000000
--- a/dev-scheme/owl-lisp/owl-lisp-0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NOTICE: Because it is "purely functional" it is not scheme-compatible ootb
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Purely functional dialect of Scheme"
-HOMEPAGE="https://haltp.org/posts/owl.html"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/owl-lisp/owl.git"
-else
-	SRC_URI="https://gitlab.com/owl-lisp/owl/-/archive/v${PV}/owl-v${PV}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/owl-v${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-src_prepare() {
-	default
-
-	sed -i 's|make bin/vm|$(MAKE) bin/vm|g' ./Makefile || die
-}
-
-src_compile(){
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" owl
-}
-
-src_install() {
-	einstalldocs
-
-	dobin ./bin/ol
-	newbin ./bin/vm ovm
-
-	doman ./doc/*.1
-}
diff --git a/dev-scheme/owl-lisp/owl-lisp-9999.ebuild b/dev-scheme/owl-lisp/owl-lisp-9999.ebuild
index 551dda855179..b1789ff9873e 100644
--- a/dev-scheme/owl-lisp/owl-lisp-9999.ebuild
+++ b/dev-scheme/owl-lisp/owl-lisp-9999.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# NOTICE: Because it is "purely functional" it is not scheme-compatible ootb
-
 EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Purely functional dialect of Scheme"
-HOMEPAGE="https://haltp.org/posts/owl.html"
+HOMEPAGE="https://haltp.org/posts/owl.html
+	https://gitlab.com/owl-lisp/owl/"
 
 if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/owl-lisp/owl.git"
 else
-	SRC_URI="https://gitlab.com/owl-lisp/owl/-/archive/v${PV}/owl-v${PV}.tar.gz"
+	SRC_URI="https://gitlab.com/owl-lisp/owl/-/archive/v${PV}/owl-v${PV}.tar.bz2"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/owl-v${PV}"
 fi
@@ -22,15 +21,25 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
+PATCHES=( "${FILESDIR}"/${PN}-0.2.1-make-no-test.patch )
+
+src_prepare() {
+	default
+
+	# Skip "tests/char-ready.sh", "does not work in background subshell".
+	rm tests/char-ready.sh || die
+}
+
 src_compile(){
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" owl
 }
 
 src_install() {
-	einstalldocs
+	exeinto /usr/bin
+	doexe "${S}"/bin/ol
+	newexe "${S}"/bin/vm ovm
 
-	dobin ./bin/ol
-	newbin ./bin/vm ovm
+	doman "${S}"/doc/*.1
 
-	doman ./doc/*.1
+	einstalldocs
 }