gentoo auto-resync : 28:02:2024 - 23:41:01

18 files changed, 122 insertions, 233 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index aa74f957c92b..6e5099e87dbb 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile-gcrypt/Manifest b/dev-scheme/guile-gcrypt/Manifest
index b2d858335a22..97549908d47d 100644
--- a/dev-scheme/guile-gcrypt/Manifest
+++ b/dev-scheme/guile-gcrypt/Manifest
@@ -1,3 +1,3 @@
 DIST guile-gcrypt-0.4.0.tar.gz 56915 BLAKE2B 0b1ca0b23531f1dd28422798f235d15898ec67dd77fa08b52f9ccbfc9b9c1ed55abd1ec7cd15c9a129444e9d7411e24ef5b73ebc8547ca9e0408e7e5a552a200 SHA512 5dbb5ca9f00a607200c600d438f5d96db271a5e889f4e92d361793073ef618b1f731c3bc31dc39c7b939c2e9111da7905ed68845f55fe7fd24b064496e9d2677
-EBUILD guile-gcrypt-0.4.0.ebuild 986 BLAKE2B 13c689ef770d811f999b8a7eccd4b9fd7fcb70ba1fa3a060f147cab756bf3a5ccebc0d49aa7a04f3bdc1c2f2d27d34b43563a3168ed2c8843cf3cc44c67a0a89 SHA512 31de611d06a635ee98e99c00edc7b4929e72c07decf386c19e0702bb9565749231dd1c93ac4a73f6af7fefc728450345da415febaf60206549a1f5c4a0e6ba0c
+EBUILD guile-gcrypt-0.4.0-r1.ebuild 1074 BLAKE2B 55dc43df4ccc24c9c5d176d3acb225dddc66d0fcd18d51afe53c8ed9ca286786e36b31da6f7e8d89324b3e800892db00f71eab5b0bff02941837f3e40c99684b SHA512 b0d02c24ab2da46fe2f1b6e1d98bcfc2344d62347119f0d88e16372dc172e6d092c9d8aa5e006ba718dc8da17beb7699601591ee1a06fc3d4cb9e6b9cfaaea87
 MISC metadata.xml 354 BLAKE2B bfe98c34fd1d916fab0de0b611ffe99c1c12acbd27549ec4fbe2dda90ef1e66b970e4df253c3c1ae878472c20fff522f23771eb2bfbd115e51130b1b4e9a8c14 SHA512 a1f5eccd97377c4e1c44f435322d786335c9eadb1d8e2cd7fe39bb695aa62b40879634c9dc0e3968cf51eeec50f596472f882fdc5daf81eb9a4715f8a7ca24da
diff --git a/dev-scheme/guile-gcrypt/guile-gcrypt-0.4.0.ebuild b/dev-scheme/guile-gcrypt/guile-gcrypt-0.4.0-r1.ebuild
index 925cd6308503..e435603ff2d5 100644
--- a/dev-scheme/guile-gcrypt/guile-gcrypt-0.4.0.ebuild
+++ b/dev-scheme/guile-gcrypt/guile-gcrypt-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,18 +7,32 @@ inherit autotools
 
 DESCRIPTION="Guile bindings of libgcrypt"
 HOMEPAGE="https://notabug.org/cwebber/guile-gcrypt"
-SRC_URI="https://notabug.org/cwebber/guile-gcrypt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://notabug.org/cwebber/${PN}.git"
+else
+	SRC_URI="https://notabug.org/cwebber/guile-gcrypt/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-scheme/guile-2.0.11:=
 	dev-libs/libgcrypt:0=
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 # guile generates ELF files without use of C or machine code
 # It's a portage's false positive. bug #677600
@@ -26,12 +40,10 @@ QA_PREBUILT='*[.]go'
 
 src_prepare() {
 	default
+	eautoreconf
 
 	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
 	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	# upstream tag on top of source tree. has no autogenerated files
-	eautoreconf
 }
 
 src_install() {
diff --git a/dev-scheme/guile-git/Manifest b/dev-scheme/guile-git/Manifest
index 90efab000950..028820ff744c 100644
--- a/dev-scheme/guile-git/Manifest
+++ b/dev-scheme/guile-git/Manifest
@@ -1,5 +1,3 @@
-DIST guile-git-0.5.2.tar.gz 305493 BLAKE2B 03fa85e1943fadc5e7e2da4bed2b6476e5a275856ed087a1730815defc17586f43eb2006bc3970d6f97d42822bcf83ef3d57a74c9a7ddb2fb877f5f0f8237a49 SHA512 4ac55c04c555f1a343f842bbda80d54314697d5bbc28bc3967edfdfacb8afa07c673ef7fd651388a6c55b6977b041174732cde14359a0127f0b931364a7eeda9
 DIST guile-git-v0.6.0.tar.bz2 99833 BLAKE2B 51109cc5f037cffd5e8a6dd1b0ce99631ffb524e209a8b081c33a188ead78d26c76dbb9590e3891c056eb7853da57b7e3f3f08ef3723465bd7ab43671c3d018b SHA512 519b5dafd83b5967403929e347fa2b81fcec97136459722fdc95357cbeba9d519807b8863b17a85fc426e53e8f78f5d3979f96bbb32548bcf598827f3f228219
-EBUILD guile-git-0.5.2.ebuild 1761 BLAKE2B 47c65bf6bd4370f8f97c3b5fe2cc940f1e7965354332a2b169843928d9432ceeefe1a844f78d87521951f3258132ea4cc360a94a62ca3d34b149ca6d71979502 SHA512 8fec635307f653cfc923e0099823f2c5dab377b7fb06cc023301070fa95e41cb244cf3148acfd00ba44d2781ef057a0892b51887025f8c0050147b89c54f30cf
-EBUILD guile-git-0.6.0.ebuild 1633 BLAKE2B c2ee957391e66f4e4e8eb4a3f8cd83c026690a5a27a49e56484d0830c84de3cd2417400c0fbe5e4f519dc17567366d99a4c3f7a8e835a4c788623fa461bea989 SHA512 c4628920662bd4c0bbeccdcfbc03e326e8aac9c8c2c76f0cc4142f2d569b115692f33a2e5f5742eae2bf0290cefe41a28aab21fd2d555e19dadb31d35ddd0d9f
+EBUILD guile-git-0.6.0-r1.ebuild 1667 BLAKE2B 40f51e40576023e6e3773d8d492cb753c3f1014d097c33c26ad4e199b9a2a5244b9f2d33d0bd8ba0de3aba53135c535d22a70691323fd11bbc34501505e3c86f SHA512 6793e1699969048c9b50ca9231de41bc3c7da4fdebb74c1d1d99b2c1089be8699555108402269282a8bb5589b444dc5be625a12346f0fa66377a86db152d9de2
 MISC metadata.xml 413 BLAKE2B c7d3ae8db8c3905597982f1fead9c98736c237dceca107585e6ee9c7055feaab9d365725de7d8350b1da181aa84fc75d8691fdfca8656fbe78c50d618a48ddab SHA512 1dcf94683f43b26168cf7acd3e49c0d257c5398d89676a361ec1347fd51970dd4b6c1e25d49454e4eef086dea134cb2facf5036322131ec3e6ab32c19a790e86
diff --git a/dev-scheme/guile-git/guile-git-0.5.2.ebuild b/dev-scheme/guile-git/guile-git-0.5.2.ebuild
deleted file mode 100644
index 2aac37120828..000000000000
--- a/dev-scheme/guile-git/guile-git-0.5.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# I extract those manually from https://gitlab.com/guile-git/guile-git/-/releases
-# from 'source tarball' link. Is there a better stable link?
-UPLOAD_PV=0.5.2
-UPLOAD_ID=6450f3991aa524484038cdcea3fb248d
-
-[[ $PV == ${UPLOAD_PV} ]] || die "${CATEGORY}/${P}: update 'UPLOAD_ID' to match ${PV}"
-
-DESCRIPTION="Guile bindings of git"
-HOMEPAGE="https://gitlab.com/guile-git/guile-git"
-SRC_URI="https://gitlab.com/guile-git/guile-git/uploads/${UPLOAD_ID}/guile-git-${PV}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Works without sandbox. But under sandbox sshd claims to break the protocol.
-RESTRICT="test"
-
-# older libgit seems to be incompatible with guile-git bindings
-# https://github.com/trofi/nix-guix-gentoo/issues/7
-RDEPEND="
-	>=dev-scheme/guile-2.0.11:=
-	dev-scheme/bytestructures
-	>=dev-libs/libgit2-1:=
-"
-DEPEND="${RDEPEND}"
-
-# guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
-QA_PREBUILT='*[.]go'
-
-src_prepare() {
-	default
-
-	# guile is trying to avoid recompilation by checking if file
-	#     /usr/lib64/guile/2.2/site-ccache/<foo>
-	# is newer than
-	#     <foo>
-	# In case it is instead of using <foo> guile
-	# loads system one (from potentially older version of package).
-	# To work it around we bump last modification timestamp of
-	# '*.scm' files.
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-}
-
-src_test() {
-	emake check VERBOSE=1
-}
-
-src_install() {
-	default
-
-	# Workaround llvm-strip problem of mangling guile ELF debug
-	# sections: https://bugs.gentoo.org/905898
-	dostrip -x "/usr/$(get_libdir)/guile"
-}
diff --git a/dev-scheme/guile-git/guile-git-0.6.0.ebuild b/dev-scheme/guile-git/guile-git-0.6.0-r1.ebuild
index 69f8ffc6fe95..7bf4dc097034 100644
--- a/dev-scheme/guile-git/guile-git-0.6.0.ebuild
+++ b/dev-scheme/guile-git/guile-git-0.6.0-r1.ebuild
@@ -32,7 +32,12 @@ RDEPEND="
 	>=dev-scheme/guile-2.0.11:=
 	dev-scheme/bytestructures
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 # guile generates ELF files without use of C or machine code
 # It's a portage's false positive. bug #677600
diff --git a/dev-scheme/guile-gnutls/Manifest b/dev-scheme/guile-gnutls/Manifest
index bac599a832c7..96c8f7d6cdaf 100644
--- a/dev-scheme/guile-gnutls/Manifest
+++ b/dev-scheme/guile-gnutls/Manifest
@@ -1,5 +1,3 @@
-DIST guile-gnutls-3.7.14.tar.bz2 176631 BLAKE2B 9d21a90e066d4360a329b5bd8f4375856b90fd0c262250064fa8ec92a76372b2c8cb746c10c5d8465353e49d1e8dae0a5897eba4831e1f947b9102b72b05b756 SHA512 7f690ea7c09e5017eef2a660f9db022d627fd562b90d1ce663915e5f28c38cafd3c8fdb459afe98a6ae973cc25283ec5dac00e590ba674f4af2f955abdb75ae7
 DIST guile-gnutls-4.0.0.tar.bz2 177122 BLAKE2B a427c0bb84fd6bb937c52930b6281c8f1b691a728d93475774b4d490c6418595deb15483716bcab1e3b03949633d0604112ebae4be8921791b257234e8d31870 SHA512 15cbfff19b9cd799a8a1bb344d0ab4a098707e8544a84047fdd5b919349f02018c39aaa927b6bbff86ec24620df8f7b343b4b4854ec26585edc66f6a8e442887
-EBUILD guile-gnutls-3.7.14.ebuild 1133 BLAKE2B e15aae52022b4e21c44dfb6e59ea38b6c89b1169d0ebcda2a67ccce631fcdd2f561ff534ca6a830b325a8056851e1bc8f7695c5ab3d4c352e64384068ffcd37c SHA512 19b37729546cde2ca5f9d2218a445c1e453410dec7723770f7fedbe029efc6348077e9a1435688dc3636bff0937e73b8520fbf766bb2cb169c36f3dc082dbce6
-EBUILD guile-gnutls-4.0.0.ebuild 1133 BLAKE2B e15aae52022b4e21c44dfb6e59ea38b6c89b1169d0ebcda2a67ccce631fcdd2f561ff534ca6a830b325a8056851e1bc8f7695c5ab3d4c352e64384068ffcd37c SHA512 19b37729546cde2ca5f9d2218a445c1e453410dec7723770f7fedbe029efc6348077e9a1435688dc3636bff0937e73b8520fbf766bb2cb169c36f3dc082dbce6
+EBUILD guile-gnutls-4.0.0-r1.ebuild 1284 BLAKE2B 2bccf4d997535f9d0285c08a6d2724c24928e2fe9b44c2fe5679c2200ce7df6121a41457455fae19ab2d7ed95bb8c6190950f5182cb3cb12e1460c3e6dd0fc52 SHA512 e1914abe407523af32d3b36a472f666bd2a3529f4df38a8092166e7f14ce608e5c8744b535f817b24692a65d035f47310101dabdb596e91f062fabea1eb2d635
 MISC metadata.xml 463 BLAKE2B a94ab7691c343e2d12f8f4efece84c4848d1b85fcdb598a2cb4b451cea6a628631857eaa5eb57e73dda4589d72f24efacd99dd74ae9bbf0823eb5f2024f5e321 SHA512 9194a577fd0a60cf1fd795b9b73d3f638673f0ae4f48aad152c72c6f37072493b7c342637d2f37f1d516a86083ed10e99f90a12d73f1fd9eb458b8d1f1260957
diff --git a/dev-scheme/guile-gnutls/guile-gnutls-3.7.14.ebuild b/dev-scheme/guile-gnutls/guile-gnutls-3.7.14.ebuild
deleted file mode 100644
index 2ddce6cbaeee..000000000000
--- a/dev-scheme/guile-gnutls/guile-gnutls-3.7.14.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Guile-GnuTLS provides Guile bindings for the GnuTLS library"
-HOMEPAGE="https://gnutls.gitlab.io/guile/manual/
-	https://gitlab.com/gnutls/guile/"
-SRC_URI="https://gitlab.com/gnutls/guile/-/archive/v${PV}/guile-v${PV}.tar.bz2
-	-> ${P}.tar.bz2"
-S="${WORKDIR}"/guile-v${PV}
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-scheme/guile-2.0.0:=
-	net-libs/gnutls:=[-guile(-)]
-"
-DEPEND="${RDEPEND}"
-
-# guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
-QA_PREBUILT='*[.]go'
-
-src_prepare() {
-	default
-
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-srp-authentication  # bug #894050
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	# Workaround llvm-strip problem of mangling guile ELF debug
-	# sections: https://bugs.gentoo.org/905898
-	dostrip -x "/usr/$(get_libdir)/guile"
-}
diff --git a/dev-scheme/guile-gnutls/guile-gnutls-4.0.0.ebuild b/dev-scheme/guile-gnutls/guile-gnutls-4.0.0-r1.ebuild
index 2ddce6cbaeee..ca5e5aab27ac 100644
--- a/dev-scheme/guile-gnutls/guile-gnutls-4.0.0.ebuild
+++ b/dev-scheme/guile-gnutls/guile-gnutls-4.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,19 +8,32 @@ inherit autotools
 DESCRIPTION="Guile-GnuTLS provides Guile bindings for the GnuTLS library"
 HOMEPAGE="https://gnutls.gitlab.io/guile/manual/
 	https://gitlab.com/gnutls/guile/"
-SRC_URI="https://gitlab.com/gnutls/guile/-/archive/v${PV}/guile-v${PV}.tar.bz2
-	-> ${P}.tar.bz2"
-S="${WORKDIR}"/guile-v${PV}
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/gnutls/guile.git"
+else
+	SRC_URI="https://gitlab.com/gnutls/guile/-/archive/v${PV}/guile-v${PV}.tar.bz2
+		-> ${P}.tar.bz2"
+	S="${WORKDIR}/guile-v${PV}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-scheme/guile-2.0.0:=
 	net-libs/gnutls:=[-guile(-)]
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 # guile generates ELF files without use of C or machine code
 # It's a portage's false positive. bug #677600
@@ -28,11 +41,10 @@ QA_PREBUILT='*[.]go'
 
 src_prepare() {
 	default
+	eautoreconf
 
 	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
 	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	eautoreconf
 }
 
 src_configure() {
diff --git a/dev-scheme/guile-lzlib/Manifest b/dev-scheme/guile-lzlib/Manifest
index 212c595827df..f70b763f1ca3 100644
--- a/dev-scheme/guile-lzlib/Manifest
+++ b/dev-scheme/guile-lzlib/Manifest
@@ -1,3 +1,3 @@
 DIST guile-lzlib-0.0.2.tar.gz 13291 BLAKE2B 0f43292a4616cfb218e3a2cbc7ba5ebccc0825d8df9a0874a55764a0a0d2961c581689be1142d586ac6926d32fc9023b27905f52ed131057fac15ba69d7d0b41 SHA512 1cede0d0194b2a8839979600ce680850e6cc2405912dcc84265b1f920c4069e94a85e79de3d61e5e7ccabc8ad8719d3759e28b45c16e70cc7c696af40e09cf1a
-EBUILD guile-lzlib-0.0.2-r1.ebuild 978 BLAKE2B cf5c455fa1b8861d3d46f4fa574a1083136ff99f9ab2d85d35162aca3bcbb82b21ca4413bc4a4dfb9e26bc1b38279f2064ba4555421169f08460cce276a5edf3 SHA512 4e56e88e8cbddf316a1630874991f56213d4cd5aed21961e0a95953ad8374c9462680f8c19a824dfe60ee966f9373a13d47f0a8a9928879c90514d0917fde4e4
+EBUILD guile-lzlib-0.0.2-r2.ebuild 1129 BLAKE2B e9a3686bb0b77f323c6fc44cc6fec55d77a1f2efe9a26297991871b7fd145327e91f29edc234697e8cd7f4c4fd8fa8a66433e646083d1e8a3b76fac6a9339952 SHA512 10720bdcdf4f2c872a60e6024eefc53f78e640d41aa6ba2978f8c4550dffe7a7cbef75e05b8ff2021390c42f058e8ae40c5b9afa99710cb9255095178dbf41ba
 MISC metadata.xml 365 BLAKE2B 129cfdbc98decfeb950220492754bb19b5558264e8edc26ba45a63d930b5164c82bb89d665af4e0961aa565862234f34118f8ccc745c73812c6eca8bf37e5648 SHA512 947e9e40a7c9770bc67031c0d1c6614a9d9eb16be451f1ea7d39f131dfdcb3a4e477e67a5908bf4bdebc7ec9dd810f5ba1fa524c4092fe7e55d07a505c7525c0
diff --git a/dev-scheme/guile-lzlib/guile-lzlib-0.0.2-r1.ebuild b/dev-scheme/guile-lzlib/guile-lzlib-0.0.2-r2.ebuild
index 099b269f0587..228c3c646d40 100644
--- a/dev-scheme/guile-lzlib/guile-lzlib-0.0.2-r1.ebuild
+++ b/dev-scheme/guile-lzlib/guile-lzlib-0.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,19 +7,32 @@ inherit autotools
 
 DESCRIPTION="GNU Guile library providing bindings to lzlib"
 HOMEPAGE="https://notabug.org/guile-lzlib/guile-lzlib/"
-SRC_URI="https://notabug.org/${PN}/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://notabug.org/${PN}/${PN}.git"
+else
+	SRC_URI="https://notabug.org/${PN}/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-scheme/guile-2.0.0:=
 	app-arch/lzlib
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS ChangeLog HACKING NEWS README.org )
 
@@ -29,11 +42,10 @@ QA_PREBUILT='*[.]go'
 
 src_prepare() {
 	default
+	eautoreconf
 
 	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
 	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	eautoreconf
 }
 
 src_install() {
diff --git a/dev-scheme/guile-ssh/Manifest b/dev-scheme/guile-ssh/Manifest
index 22b3288bb813..76da1caf3315 100644
--- a/dev-scheme/guile-ssh/Manifest
+++ b/dev-scheme/guile-ssh/Manifest
@@ -1,6 +1,4 @@
 AUX guile-ssh-0.16.2-tests.patch 295 BLAKE2B 6935922a090f542773bf7c9a910bcb5c09648553677745faa29e46e9383981a65324e4895cb2b4e89e795b00a42e866e78e1924e97de393a43f4f99c512e9232 SHA512 b5014323f972b423864631299986bc8ccaaec49f70d5394ab90f9b72a1d3efa81ebe886e02858b517db77b0496561761546279ddee285601a3dd04083eca5863
-DIST guile-ssh-0.16.3.tar.gz 524546 BLAKE2B e8cbe500493d80962f31b1d9ab97f5dc45c2e3612f419244528676b6cc3cf517a7dd84022b84356b0da456cdca404cca3ee25bef1762da9f0e126e086f34a721 SHA512 7b66dd5a29d47f3f7beaefb6576f74f62fe30736ddf97870a72612b44a608d61edd5ba9bc520e577b6f19a9de9044743e880601bae26b9645dafbef2c3134609
 DIST guile-ssh-0.16.4.tar.gz 532702 BLAKE2B 47dd2fde37aa2047d836f464d567736208bfed8afee668bf76d35910a866b1c3e869f346b89b4fce7b747d5806a004933cd673851015f8d76afc61c06a398ad2 SHA512 1c70d4885a6f821c3018650d2537316de981ad5f76eadc51ed2c5dd51225e39e67ad1b979769b1b81a0f061ddeecd11d878b3844d9f8e78fdd0915e2f1a28838
-EBUILD guile-ssh-0.16.3.ebuild 1141 BLAKE2B 2a25d17ee39d004b1b2098de9643d7b9e093b38619b59272a0451a863585fd052a726e7925e42a2e7b43ce162e350967cb1093ecfad064289a4895791e27edf9 SHA512 021e9295348361e90bb3078ddba3c82bb2564a16972330cf0c208d4118b2b0c799765019da9d2d23eb1dca4eaddbff04450dea6241a64de27ba7fde9691bb540
-EBUILD guile-ssh-0.16.4.ebuild 1141 BLAKE2B 2a25d17ee39d004b1b2098de9643d7b9e093b38619b59272a0451a863585fd052a726e7925e42a2e7b43ce162e350967cb1093ecfad064289a4895791e27edf9 SHA512 021e9295348361e90bb3078ddba3c82bb2564a16972330cf0c208d4118b2b0c799765019da9d2d23eb1dca4eaddbff04450dea6241a64de27ba7fde9691bb540
+EBUILD guile-ssh-0.16.4-r1.ebuild 1299 BLAKE2B be0acdfb064d9ef9fd819e9e5fffb0418cc372a1679be94d0a24e1be416d8e81264a6ef8eea14d798d379a1ee804261ff1fd9794f9831353a440199bf41d8d20 SHA512 9d93d71acabcbe9ea7fb344280bc33d212856fc3e3607d4afb86d22791fb4d9932c19738d9662529e626153e1da86521687e2b2a8ce5865bd0dc66c0956d3bda
 MISC metadata.xml 431 BLAKE2B ffc50f05ec61ce0379d33825d3a8a6785160b534f958ee50baf65a4724780c116a92802c35d58af7303a161c77cb330e304e9a0d4c67e7ce5287f7f9c727c8f2 SHA512 54b85f6747b45a37e792aed4a4ded07c9f9bdae0e48fcc3f9ba249007f9027018bb5831a872912eee73d834d0e42cbd9c130fb101755d9691e0dc0948738b4f0
diff --git a/dev-scheme/guile-ssh/guile-ssh-0.16.3.ebuild b/dev-scheme/guile-ssh/guile-ssh-0.16.4-r1.ebuild
index bda391d671fb..5a331431ce4e 100644
--- a/dev-scheme/guile-ssh/guile-ssh-0.16.3.ebuild
+++ b/dev-scheme/guile-ssh/guile-ssh-0.16.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,22 +8,35 @@ inherit autotools
 DESCRIPTION="Library providing access to the SSH protocol for GNU Guile"
 HOMEPAGE="https://memory-heap.org/~avp/projects/guile-ssh/
 	https://github.com/artyom-poptsov/guile-ssh/"
-SRC_URI="https://github.com/artyom-poptsov/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/artyom-poptsov/${PN}.git"
+else
+	SRC_URI="https://github.com/artyom-poptsov/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-scheme/guile-2.0.0:=
 	net-libs/libssh:0=[server,sftp]
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.16.2-tests.patch
+	"${FILESDIR}/${PN}-0.16.2-tests.patch"
 )
 
 # guile generates ELF files without use of C or machine code
@@ -32,11 +45,10 @@ QA_PREBUILT='*[.]go'
 
 src_prepare() {
 	default
+	eautoreconf
 
 	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
 	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	eautoreconf
 }
 
 src_install() {
diff --git a/dev-scheme/guile-zlib/Manifest b/dev-scheme/guile-zlib/Manifest
index d67761148814..47b0ba283621 100644
--- a/dev-scheme/guile-zlib/Manifest
+++ b/dev-scheme/guile-zlib/Manifest
@@ -1,4 +1,4 @@
 AUX guile-zlib-0.1.0-gentoo.patch 379 BLAKE2B 02d2736a3eccc61d4999aeea3772fe453c5ca1f342b9cf7572440f99d49c9eb354ee54a3fca43573db7a26ef2ec010dcd339265e80850672c2f058b8700e8089 SHA512 bca1126732448a48dc0885cc372a5deb55e89b1aff3799a050a380ceef64d8e52d1a8db6004cb31280b1573fe461d247556cb64397aaa349f7267a26d6ee931c
 DIST guile-zlib-0.1.0.tar.gz 14652 BLAKE2B 10f0c4d312b07415f3846927a3a1d59aa62106bf0e4a4446ba6764486104053da544fc994491af6611154edb459bba7c55e79095695b90c28ce4237e24e3b98b SHA512 bf9201c7c01324a44ae86a673f4d1b92fd6f346d0be9d5a6390cc8be11d79d00a1cdee88c28ceb7fc5b99215198cf3ac368884381933e40babc85a21cbd300e3
-EBUILD guile-zlib-0.1.0-r2.ebuild 1156 BLAKE2B 6309745c7189daf4c3430062a0cefe013cde8735d0e0e46ff2a898c54208e24add2df4ecb6acbb7d8e8178008493f9dc4742c04b1860fb21f2eed5fa448dde95 SHA512 d491e2edda416e825471356d79172718119d82e6704ea1cd8d013cb3d3be8db91a19e39a041e4877007d36c88bdb7ce7e22d1adea683c424a28af13b580bcd1c
+EBUILD guile-zlib-0.1.0-r3.ebuild 1187 BLAKE2B f7305652e6f01ae5ea7ffd85340b565d03235bff55dc73128f9a092c0b7662cd3ebff3d798a497a085a0b501b38068bf3e9edf9a857c39f9c47d4dd345cb5ba2 SHA512 beb80259e02ff9217593335261e2ab5cf31569205046c6a79bc51bbca5950ce9f3cb87d9cbb615f33f3e0f6a436b19c0284753e1d6a693c8cf98373cd8f4b39e
 MISC metadata.xml 356 BLAKE2B 00ef20bfe70a10b0072b2da74e20aeba0e5292c10b93d76ae9745dd470f1ed1b31cf4b76160d5556305985ad89468403a0f3449c7a87c9c977540eddc28a22c5 SHA512 677dba48d7789520b3f3b57b162e58258a587357885a70e5ff6d4f1a1aca93301b76c51cd51b0add254c2b588ef5b22423a74abaf37c59e7d18f63e0e491147e
diff --git a/dev-scheme/guile-zlib/guile-zlib-0.1.0-r2.ebuild b/dev-scheme/guile-zlib/guile-zlib-0.1.0-r3.ebuild
index 6a0b2a379b87..b9ab27ef9a39 100644
--- a/dev-scheme/guile-zlib/guile-zlib-0.1.0-r2.ebuild
+++ b/dev-scheme/guile-zlib/guile-zlib-0.1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,6 +30,9 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 "
+BDEPEND="
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS ChangeLog HACKING NEWS README.org )
 PATCHES=( "${FILESDIR}/${PN}-0.1.0-gentoo.patch" )
diff --git a/dev-scheme/guile-zstd/Manifest b/dev-scheme/guile-zstd/Manifest
index a4c93b1f2ff1..44154c5fc2d5 100644
--- a/dev-scheme/guile-zstd/Manifest
+++ b/dev-scheme/guile-zstd/Manifest
@@ -1,3 +1,3 @@
 DIST guile-zstd-0.1.1.tar.gz 21402 BLAKE2B 995034f977649b31308690a5a53372cb80274b6457b6b0344bc31f4451d00e61cc33b6ef890e8b7a75cb6a656e8db506a2390bc2c5d29552af7c68788a6388ee SHA512 23bd4b201a427eb02ae32bcd81d05adefcac3b4446dcb8a91d8ad2bed389d4ea92ffd81dfb6b3e7427b891fd25b7466ca53a97b1a943e390f13de977986fcad0
-EBUILD guile-zstd-0.1.1-r1.ebuild 1611 BLAKE2B e6e27493fc6385725e00ca1760740108a326343fec3de01bb8bbbe197a56bfd6a02b5a138c66ee557dce5b6e4ee1c7a221271ecc9f66b4328a5cf8a78f1dd7cb SHA512 dd4ceff67e1bdc71c7b3153f0400552e3fd21def0deefbb2929d2c6ca6fb7cc4b996737e4a856e19e8f2b0c5d62fdb6cd1d990a211bdb6d21ced2bfc3df5ae04
+EBUILD guile-zstd-0.1.1-r3.ebuild 1200 BLAKE2B ab4e1dd1d686ba8bbd7d268d0b39243ff81347860965bd0fad9221656116bb74817205f2b8e90243e1ff7a8f46c4c33744c3ab5c4fa1a7c31e2b55dbf8a4d6fd SHA512 691bb2aed5c243ad1b734e7f3decf34398c8758a7aef7db3f10482b85e718401e21b77dcdf98ae76c28e4865707f973bfb770d52f498d5095af92d65e4641822
 MISC metadata.xml 356 BLAKE2B 3976b42db1d89d5cb88ef463628a6636f15075b069d3189ee4f5132fec86f2dbc137d0f213dcc0acb2300f213338b9e1922da72d24b3c96c73278d8883c57e8d SHA512 5874174dd23fd3039132fca418e6f5bd6910884f93c7364afe8bf930559e60cc881761b48710f475366c65b76e1d254e2cb1389fda037e907a58deb222dfac0a
diff --git a/dev-scheme/guile-zstd/guile-zstd-0.1.1-r1.ebuild b/dev-scheme/guile-zstd/guile-zstd-0.1.1-r1.ebuild
deleted file mode 100644
index 7d00f87e4450..000000000000
--- a/dev-scheme/guile-zstd/guile-zstd-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="GNU Guile bindings to the zstd compression library"
-HOMEPAGE="https://notabug.org/guile-zstd/guile-zstd/"
-SRC_URI="https://notabug.org/${PN}/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# In zstd-1.5.2-r2 library was moved from /usr/lib to /lib
-RDEPEND="
-	>=dev-scheme/guile-2.0.0:=
-	>=app-arch/zstd-1.5.2-r2
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-# guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
-QA_PREBUILT='*[.]go'
-
-src_prepare() {
-	default
-
-	# Workaround gentoo-specific deviation where
-	# /usr/lib64/libzstd.so is a linker script that points to:
-	#   GROUP ( /lib64/libzstd.so.1 )
-	# This confuses guile-zstd and fails to open the library:
-	#   substitute: ice-9/boot-9.scm:1685:16: In procedure raise-exception:
-	#   substitute: In procedure load-foreign-library: file: "/usr/lib64/libzstd.so.1",
-	#     message: "file not found"
-	#   guix environment: error: `/usr/bin/guix substitute' died unexpectedly
-	sed "s|@ZSTD_LIBDIR@/libzstd.so.1|/$(get_libdir)/libzstd.so.1|" \
-		-i "${S}"/zstd/config.scm.in || die
-
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	# Workaround llvm-strip problem of mangling guile ELF debug
-	# sections: https://bugs.gentoo.org/905898
-	dostrip -x "/usr/$(get_libdir)/guile"
-}
diff --git a/dev-scheme/guile-ssh/guile-ssh-0.16.4.ebuild b/dev-scheme/guile-zstd/guile-zstd-0.1.1-r3.ebuild
index bda391d671fb..72aca48dc92f 100644
--- a/dev-scheme/guile-ssh/guile-ssh-0.16.4.ebuild
+++ b/dev-scheme/guile-zstd/guile-zstd-0.1.1-r3.ebuild
@@ -1,30 +1,41 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit autotools
 
-DESCRIPTION="Library providing access to the SSH protocol for GNU Guile"
-HOMEPAGE="https://memory-heap.org/~avp/projects/guile-ssh/
-	https://github.com/artyom-poptsov/guile-ssh/"
-SRC_URI="https://github.com/artyom-poptsov/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
+DESCRIPTION="GNU Guile bindings to the zstd compression library"
+HOMEPAGE="https://notabug.org/guile-zstd/guile-zstd/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://notabug.org/${PN}/${PN}.git"
+else
+	SRC_URI="https://notabug.org/${PN}/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
+# In zstd-1.5.5-r1 library was moved back from "/lib" to "/usr/lib".
 RDEPEND="
+	>=app-arch/zstd-1.5.5-r1
 	>=dev-scheme/guile-2.0.0:=
-	net-libs/libssh:0=[server,sftp]
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.16.2-tests.patch
-)
+DOCS=( AUTHORS ChangeLog NEWS README )
 
 # guile generates ELF files without use of C or machine code
 # It's a portage's false positive. bug #677600
@@ -32,18 +43,15 @@ QA_PREBUILT='*[.]go'
 
 src_prepare() {
 	default
+	eautoreconf
 
 	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
 	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	eautoreconf
 }
 
 src_install() {
 	default
 
-	find "${ED}" -name "*.la" -delete || die
-
 	# Workaround llvm-strip problem of mangling guile ELF debug
 	# sections: https://bugs.gentoo.org/905898
 	dostrip -x "/usr/$(get_libdir)/guile"