gentoo auto-resync : 28:02:2024 - 11:40:46

3 files changed, 18 insertions, 13 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 64f152958058..aa74f957c92b 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile-zlib/Manifest b/dev-scheme/guile-zlib/Manifest
index 13afc180a4c2..d67761148814 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-r1.ebuild 1194 BLAKE2B 3ac7e750b103ff924e5d99cb3e5995e031fc3ed96b9465dfae2badff837ee1732414f721012489ee9c0338d9f0ba118ab19855ce116e1c59faf47f21e6ad149c SHA512 ca2330925c1f78cbc261fb8ce2aa14726bd4e8c38bdac537ad1c568f9d191d8bece3db7bd45f976cd74f2a1e335613720a9b0bc094d50db44b755c98312f8bb1
+EBUILD guile-zlib-0.1.0-r2.ebuild 1156 BLAKE2B 6309745c7189daf4c3430062a0cefe013cde8735d0e0e46ff2a898c54208e24add2df4ecb6acbb7d8e8178008493f9dc4742c04b1860fb21f2eed5fa448dde95 SHA512 d491e2edda416e825471356d79172718119d82e6704ea1cd8d013cb3d3be8db91a19e39a041e4877007d36c88bdb7ce7e22d1adea683c424a28af13b580bcd1c
 MISC metadata.xml 356 BLAKE2B 00ef20bfe70a10b0072b2da74e20aeba0e5292c10b93d76ae9745dd470f1ed1b31cf4b76160d5556305985ad89468403a0f3449c7a87c9c977540eddc28a22c5 SHA512 677dba48d7789520b3f3b57b162e58258a587357885a70e5ff6d4f1a1aca93301b76c51cd51b0add254c2b588ef5b22423a74abaf37c59e7d18f63e0e491147e
diff --git a/dev-scheme/guile-zlib/guile-zlib-0.1.0-r1.ebuild b/dev-scheme/guile-zlib/guile-zlib-0.1.0-r2.ebuild
index 46d194b84e7f..6a0b2a379b87 100644
--- a/dev-scheme/guile-zlib/guile-zlib-0.1.0-r1.ebuild
+++ b/dev-scheme/guile-zlib/guile-zlib-0.1.0-r2.ebuild
@@ -7,21 +7,32 @@ inherit autotools
 
 DESCRIPTION="GNU Guile library providing bindings to zlib"
 HOMEPAGE="https://notabug.org/guile-zlib/guile-zlib/"
-SRC_URI="https://notabug.org/${PN}/${PN}/archive/v${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/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.0:=
-	sys-libs/zlib
+	>=sys-libs/zlib-1.3-r4
+"
+DEPEND="
+	${RDEPEND}
 "
-DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog HACKING NEWS README.org )
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=( "${FILESDIR}/${PN}-0.1.0-gentoo.patch" )
 
 # guile generates ELF files without use of C or machine code
 # It's a portage's false positive. bug #677600
@@ -36,12 +47,6 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	# Gentoo installs zlib to /${libdir} and to /usr/${libdir}.
-	# We need /${libdir} with shared library here.
-	econf LIBZ_LIBDIR="${EPREFIX}/$(get_libdir)"
-}
-
 src_install() {
 	default