summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Barć <xgqt@gentoo.org>2024-02-28 09:39:33 +0100
committerMaciej Barć <xgqt@gentoo.org>2024-02-28 09:46:32 +0100
commit0011cfe79cc62c70148f90026adbbe6f3367f6fc (patch)
tree4260e7185e5c64ce0c54e4c90d113f4e0e55d506 /dev-scheme
parentapp-pda/iripdb: add die in src_compile (diff)
downloadgentoo-0011cfe79cc62c70148f90026adbbe6f3367f6fc.tar.gz
gentoo-0011cfe79cc62c70148f90026adbbe6f3367f6fc.tar.bz2
gentoo-0011cfe79cc62c70148f90026adbbe6f3367f6fc.zip
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@gentoo.org>
Diffstat (limited to 'dev-scheme')
-rw-r--r--dev-scheme/guile-zlib/guile-zlib-0.1.0-r2.ebuild (renamed from dev-scheme/guile-zlib/guile-zlib-0.1.0-r1.ebuild)29
1 files 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
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