From 555a88281f43630dbef92c4447f189b405f6933c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 25 Mar 2024 07:10:43 +0000 Subject: [PATCH] dev-build/make: Sync with Gentoo It's from Gentoo commit f41c12dac57827e5af88404a24bb0706f306b4bb. --- .../dev-build/make/make-4.4.1-r1.ebuild | 15 ++++++++++++--- .../dev-build/make/make-9999.ebuild | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-build/make/make-4.4.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/make/make-4.4.1-r1.ebuild index 61fbc91f24..3a67d090b6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/make/make-4.4.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/make/make-4.4.1-r1.ebuild @@ -22,7 +22,8 @@ fi LICENSE="GPL-3+" SLOT="0" -IUSE="guile nls static" +IUSE="doc guile nls static test" +RESTRICT="!test? ( test )" DEPEND="guile? ( >=dev-scheme/guile-1.8:= )" RDEPEND=" @@ -30,10 +31,14 @@ RDEPEND=" nls? ( virtual/libintl ) " BDEPEND=" + doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) + test? ( dev-lang/perl ) " +DOCS="AUTHORS NEWS README*" + PATCHES=( "${FILESDIR}"/${PN}-4.4-default-cxx.patch ) @@ -67,9 +72,13 @@ src_configure() { econf "${myeconfargs[@]}" } +src_compile() { + emake all $(usev doc 'pdf html') +} + src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS NEWS README* + use doc && HTML_DOCS=( doc/make.html/. ) DOCS="$DOCS doc/make.pdf" + default dosym gmake /usr/bin/make dosym gmake.1 /usr/share/man/man1/make.1 diff --git a/sdk_container/src/third_party/portage-stable/dev-build/make/make-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/make/make-9999.ebuild index 2be7d7adb8..568476904f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/make/make-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/make/make-9999.ebuild @@ -22,7 +22,8 @@ fi LICENSE="GPL-3+" SLOT="0" -IUSE="guile nls static" +IUSE="doc guile nls static test" +RESTRICT="!test? ( test )" DEPEND="guile? ( >=dev-scheme/guile-1.8:= )" RDEPEND=" @@ -30,10 +31,14 @@ RDEPEND=" nls? ( virtual/libintl ) " BDEPEND=" + doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) + test? ( dev-lang/perl ) " +DOCS="AUTHORS NEWS README*" + PATCHES=( "${FILESDIR}"/${PN}-4.4-default-cxx.patch ) @@ -67,9 +72,13 @@ src_configure() { econf "${myeconfargs[@]}" } +src_compile() { + emake all $(usev doc 'pdf html') +} + src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS NEWS README* + use doc && HTML_DOCS=( doc/make.html/. ) DOCS="$DOCS doc/make.pdf" + default dosym gmake /usr/bin/make dosym gmake.1 /usr/share/man/man1/make.1