From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 691B8158094 for ; Mon, 29 Aug 2022 15:31:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9094BE0893; Mon, 29 Aug 2022 15:31:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 76AC1E0893 for ; Mon, 29 Aug 2022 15:31:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 745AC335C7D for ; Mon, 29 Aug 2022 15:31:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 809CF57D for ; Mon, 29 Aug 2022 15:31:31 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1661787085.4933c3aa36b15cb369014552e50cd1a2d720fd68.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/make/make-4.3.ebuild sys-devel/make/make-9999.ebuild X-VCS-Directories: sys-devel/make/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4933c3aa36b15cb369014552e50cd1a2d720fd68 X-VCS-Branch: master Date: Mon, 29 Aug 2022 15:31:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7c9297f9-6dfb-4c88-9605-08ba718762b7 X-Archives-Hash: e638d48168b19cc7d60a514886d49cdd commit: 4933c3aa36b15cb369014552e50cd1a2d720fd68 Author: Sam James gentoo org> AuthorDate: Mon Aug 29 15:28:42 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Aug 29 15:31:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4933c3aa sys-devel/make: add 9999 Desirable for make --shuffle [0][1]. [0] https://trofi.github.io/posts/238-new-make-shuffle-mode.html [1] https://trofi.github.io/posts/249-an-update-on-make-shuffle.html Signed-off-by: Sam James gentoo.org> sys-devel/make/make-4.3.ebuild | 28 +++++++++++++++++-- .../make/{make-4.3.ebuild => make-9999.ebuild} | 32 ++++++++++++++++++---- 2 files changed, 52 insertions(+), 8 deletions(-) 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-4.3.ebuild b/sys-devel/make/make-9999.ebuild similarity index 62% copy from sys-devel/make/make-4.3.ebuild copy to sys-devel/make/make-9999.ebuild index 50caf0365bb0..c0a4aa6ff54a 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-9999.ebuild @@ -1,20 +1,23 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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 [[ "$(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 )" - 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" + 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+" @@ -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=(