[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-zlib/

[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-zlib/

[Maciej Barć]

commit:     30fe460e5275811feac4ac68c024c1e4ba1cae54
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue May 16 11:43:57 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue May 16 11:50:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30fe460e

dev-scheme/guile-zlib: do not strip guile bytecode

Bug: https://bugs.gentoo.org/905898
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../{guile-zlib-0.1.0.ebuild => guile-zlib-0.1.0-r1.ebuild}    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dev-scheme/guile-zlib/guile-zlib-0.1.0.ebuild b/dev-scheme/guile-zlib/guile-zlib-0.1.0-r1.ebuild
similarity index 82%
rename from dev-scheme/guile-zlib/guile-zlib-0.1.0.ebuild
rename to dev-scheme/guile-zlib/guile-zlib-0.1.0-r1.ebuild
index fb293dfdba44..46d194b84e7f 100644
--- a/dev-scheme/guile-zlib/guile-zlib-0.1.0.ebuild
+++ b/dev-scheme/guile-zlib/guile-zlib-0.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -41,3 +41,11 @@ src_configure() {
 	# We need /${libdir} with shared library here.
 	econf LIBZ_LIBDIR="${EPREFIX}/$(get_libdir)"
 }
+
+src_install() {
+	default
+
+	# Workaround llvm-strip problem of mangling guile ELF debug
+	# sections: https://bugs.gentoo.org/905898
+	dostrip -x "/usr/$(get_libdir)/guile"
+}

[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-zlib/

[Maciej Barć]

commit:     0011cfe79cc62c70148f90026adbbe6f3367f6fc
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 08:39:33 2024 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 08:46:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0011cfe7

dev-scheme/guile-zlib: let pkg-config find zlib dir

See-also: https://github.com/trofi/nix-guix-gentoo/commit/30bafb179db756c568ee498856a1f137cfa50530
Bug: https://github.com/trofi/nix-guix-gentoo/issues/23
Closes: https://bugs.gentoo.org/877383
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 ...-0.1.0-r1.ebuild => guile-zlib-0.1.0-r2.ebuild} | 29 +++++++++++++---------
 1 file changed, 17 insertions(+), 12 deletions(-)

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
similarity index 68%
rename from dev-scheme/guile-zlib/guile-zlib-0.1.0-r1.ebuild
rename to 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
 

[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-zlib/

[Maciej Barć]

commit:     81e2f85bf3be7de84e8f74b152a8cd6fe4a24fbb
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 20:26:38 2024 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 21:21:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81e2f85b

dev-scheme/guile-zlib: add missing pkgconfig dependencies

as also declared inside this pkg guix.scm

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../{guile-zlib-0.1.0-r2.ebuild => guile-zlib-0.1.0-r3.ebuild}       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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
similarity index 94%
rename from dev-scheme/guile-zlib/guile-zlib-0.1.0-r2.ebuild
rename to 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" )

[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-zlib/

[Sam James]

commit:     3cc81ef164e72d2be66c2ec34c50f20e758fb40a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 30 13:48:02 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 30 13:51:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cc81ef1

dev-scheme/guile-zlib: drop 0.1.0-r3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-scheme/guile-zlib/guile-zlib-0.1.0-r3.ebuild | 59 ------------------------
 1 file changed, 59 deletions(-)

diff --git a/dev-scheme/guile-zlib/guile-zlib-0.1.0-r3.ebuild b/dev-scheme/guile-zlib/guile-zlib-0.1.0-r3.ebuild
deleted file mode 100644
index b9ab27ef9a39..000000000000
--- a/dev-scheme/guile-zlib/guile-zlib-0.1.0-r3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="GNU Guile library providing bindings to zlib"
-HOMEPAGE="https://notabug.org/guile-zlib/guile-zlib/"
-
-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"
-
-RDEPEND="
-	>=dev-scheme/guile-2.0.0:=
-	>=sys-libs/zlib-1.3-r4
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README.org )
-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
-QA_PREBUILT='*[.]go'
-
-src_prepare() {
-	default
-
-	# 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"
-}