gentoo auto-resync : 29:08:2022 - 22:47:16

3 files changed, 103 insertions, 4 deletions

diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index 07b792f1eab6..f1f2abed1a1c 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -2,5 +2,6 @@ AUX make-3.82-darwin-library_search-dylib.patch 394 BLAKE2B abd83733bc3036e412a5
 AUX make-4.2-default-cxx.patch 212 BLAKE2B 16ab647e54b27b2be8fe3b8abc37940690e828a1f68a21856377dec4b282ef489246f5de7c2b364654327166fb9b3f2a0dae755dc15db786c607c6d7f1fd76d1 SHA512 9b9be230f8c74ee438851d1c10409ebd188f818d04e99b799a353fc26c2da78d2e298b907287ceece7b6e64f9ac0908ae65e33c35634b9338b246225b63cb409
 DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b
 DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c8111179e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99
-EBUILD make-4.3.ebuild 1610 BLAKE2B 130d351a1f54c87757a28d6715457d7cb7e5c460fed7c048b17e78438c6864e9302eef9b4fa69e0203d0d9a2a945674835f2c5f4ff174a2995b840ec8b166a11 SHA512 ed04765cc73f0d2a050103e7638e3b55e6eeac0f7d7e537a2fefdbda9260a651380bad9ccea8544b0918d2dc9f31a559c7fa6a8005c302992b9483f2e5e0781b
+EBUILD make-4.3.ebuild 1931 BLAKE2B 84d538027ac0a84300ccce7f1b446407796a10a9314e016850b092f7e2d5d62dfcf96cc68d013f6b12d682cc3bf94ba4a97a7b0a6247314fee10d864e8ebf6b6 SHA512 2f764ad5b425038139fec36c56a194284ed34c0f2991d0d4c94cc81ea111ef6662646c3ba96968c2d13debbcdede5a0000abe091ff970b67c13cc49958d113e8
+EBUILD make-9999.ebuild 1939 BLAKE2B 7c6349508d3a303c15cea60503d8dd343931f43c5f93af2f3e12b838bca498c612ed89e2a4400b041106901087b6d069fa3e50af7095b02255fcf959f9b1759d SHA512 96b3f9d9057c82351c3dd554390860dc3cb8d77f2cbc2b89c0f0dcdaec1607088766d6de79a9b63a7a2312dc1573394253798b9238933c9b13f19638cc54dc1c
 MISC metadata.xml 328 BLAKE2B 97a05dd19a59e516a070a39cbe636db4c1b13e5aabe3c0030e6b6000fe4fd0f10fa7e5979771f0d55bbe11f1fa149035554286af9c3415727afcbe44938e0515 SHA512 30dbabfa767feae8a452b25faab445cdaaf84a0ba0b294dd41b3dc276224693837104080b01801a8f44e99c7b159d24d3a9eb53a2553ff23a831a0a2f012a4c7
diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild
index 50caf0365bb0..e924bf762998 100644
--- a/sys-devel/make/make-4.3.ebuild
+++ b/sys-devel/make/make-4.3.ebuild
@@ -8,9 +8,12 @@ inherit flag-o-matic verify-sig
 
 DESCRIPTION="Standard tool to compile source trees"
 HOMEPAGE="https://www.gnu.org/software/make/make.html"
-if [[ "$(ver_cut 3)" -ge 90 ]] ; then
-	SRC_URI="https://alpha.gnu.org/gnu//make/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu//make/${P}.tar.gz.sig )"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git"
+	inherit autotools git-r3
+elif [[ $(ver_cut 3) -ge 90 ]] ; then
+	SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )"
 else
 	SRC_URI="mirror://gnu//make/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu//make/${P}.tar.gz.sig )"
@@ -32,6 +35,25 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2-default-cxx.patch
 )
 
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+
+		cd "${S}" || die
+		./bootstrap || die
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
+}
+
 src_configure() {
 	use static && append-ldflags -static
 	local myeconfargs=(
diff --git a/sys-devel/make/make-9999.ebuild b/sys-devel/make/make-9999.ebuild
new file mode 100644
index 000000000000..c0a4aa6ff54a
--- /dev/null
+++ b/sys-devel/make/make-9999.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/make.asc
+inherit flag-o-matic verify-sig
+
+DESCRIPTION="Standard tool to compile source trees"
+HOMEPAGE="https://www.gnu.org/software/make/make.html"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git"
+	inherit autotools git-r3
+elif [[ $(ver_cut 3) -ge 90 ]] ; then
+	SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )"
+else
+	SRC_URI="mirror://gnu//make/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu//make/${P}.tar.gz.sig )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="guile nls static"
+
+DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
+BDEPEND="nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-make )"
+RDEPEND="${DEPEND}
+	nls? ( virtual/libintl )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
+	"${FILESDIR}"/${PN}-4.2-default-cxx.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+
+		cd "${S}" || die
+		./bootstrap || die
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myeconfargs=(
+		--program-prefix=g
+		$(use_with guile)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS README*
+	if [[ ${USERLAND} == "GNU" ]] ; then
+		# we install everywhere as 'gmake' but on GNU systems,
+		# symlink 'make' to 'gmake'
+		dosym gmake /usr/bin/make
+		dosym gmake.1 /usr/share/man/man1/make.1
+	fi
+}