commit: a35501c8975b92912b067a0c5ec442dc1dd702f1
Author: Arsen Arsenović <arsen <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 9 13:16:53 2023 +0000
Commit: Arsen Arsenović <arsen <AT> gentoo <DOT> org>
CommitDate: Sun Aug 18 17:43:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a35501c8
dev-build/make: switch to new guile mechanism
Signed-off-by: Arsen Arsenović <arsen <AT> gentoo.org>
.../make/{make-9999.ebuild => make-4.4.1-r100.ebuild} | 19 +++++++++++++++++--
dev-build/make/make-9999.ebuild | 14 ++++++++++++--
profiles/package.mask | 1 +
3 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/dev-build/make/make-9999.ebuild
b/dev-build/make/make-4.4.1-r100.ebuild
similarity index 86%
copy from dev-build/make/make-9999.ebuild
copy to dev-build/make/make-4.4.1-r100.ebuild
index 6ed0e9b00642..190cab823489 100644
--- a/dev-build/make/make-9999.ebuild
+++ b/dev-build/make/make-4.4.1-r100.ebuild
@@ -4,7 +4,8 @@
EAPI=8
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/make.asc
-inherit flag-o-matic unpacker verify-sig
+GUILE_COMPAT=( 2-2 3-0 )
+inherit flag-o-matic unpacker verify-sig guile-single
DESCRIPTION="Standard tool to compile source trees"
HOMEPAGE="https://www.gnu.org/software/make/make.html";
@@ -24,8 +25,11 @@ LICENSE="GPL-3+"
SLOT="0"
IUSE="doc guile nls static test"
RESTRICT="!test? ( test )"
+REQUIRED_USE="guile? ( ${GUILE_REQUIRED_USE} )"
-DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
+DEPEND="
+ guile? ( ${GUILE_DEPS} )
+"
RDEPEND="
${DEPEND}
nls? ( virtual/libintl )
@@ -62,6 +66,16 @@ src_prepare() {
if [[ ${PV} == 9999 ]] ; then
eautoreconf
fi
+
+ if use guile; then
+ guile-single_src_prepare
+ fi
+}
+
+pkg_setup() {
+ if use guile; then
+ guile-single_pkg_setup
+ fi
}
src_configure() {
@@ -84,4 +98,5 @@ src_install() {
dosym gmake /usr/bin/make
dosym gmake.1 /usr/share/man/man1/make.1
+ guile_unstrip_ccache
}
diff --git a/dev-build/make/make-9999.ebuild b/dev-build/make/make-9999.ebuild
index 6ed0e9b00642..182219be856b 100644
--- a/dev-build/make/make-9999.ebuild
+++ b/dev-build/make/make-9999.ebuild
@@ -4,7 +4,8 @@
EAPI=8
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/make.asc
-inherit flag-o-matic unpacker verify-sig
+GUILE_COMPAT=( 2-2 3-0 )
+inherit flag-o-matic unpacker verify-sig guile-single
DESCRIPTION="Standard tool to compile source trees"
HOMEPAGE="https://www.gnu.org/software/make/make.html";
@@ -24,8 +25,11 @@ LICENSE="GPL-3+"
SLOT="0"
IUSE="doc guile nls static test"
RESTRICT="!test? ( test )"
+REQUIRED_USE="guile? ( ${GUILE_REQUIRED_USE} )"
-DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
+DEPEND="
+ guile? ( ${GUILE_DEPS} )
+"
RDEPEND="
${DEPEND}
nls? ( virtual/libintl )
@@ -64,6 +68,12 @@ src_prepare() {
fi
}
+pkg_setup() {
+ if use guile; then
+ guile-single_pkg_setup
+ fi
+}
+
src_configure() {
use static && append-ldflags -static
local myeconfargs=(
diff --git a/profiles/package.mask b/profiles/package.mask
index 3af559d8e0d7..5cc0d172f413 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -39,6 +39,7 @@
# Masked until the whole Guile ecosystem is updated.
dev-scheme/guile:2.2
dev-scheme/guile:3.0
+>=dev-build/make-4.4.1-r100
# Eli Schwartz <[email protected]> (2024-08-15)
# Abandoned upstream since 2011, unmaintained in gentoo since 2017. Tons of
