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 C3BE115806E for ; Mon, 22 May 2023 16:26:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D19E8E0AD6; Mon, 22 May 2023 16:26:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 B3582E0AD6 for ; Mon, 22 May 2023 16:26:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9384C33BE6D for ; Mon, 22 May 2023 16:26:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 05017A75 for ; Mon, 22 May 2023 16:26:22 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1684772770.9d013f33f52d11c480ad0accd75a4793b36a53b3.soap@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-r1.ebuild sys-devel/make/make-4.3.ebuild sys-devel/make/make-4.4.1-r1.ebuild sys-devel/make/make-4.4.1.ebuild sys-devel/make/make-9999.ebuild X-VCS-Directories: sys-devel/make/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 9d013f33f52d11c480ad0accd75a4793b36a53b3 X-VCS-Branch: master Date: Mon, 22 May 2023 16:26:22 +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: 8965064e-aec8-40ec-8628-b6c8ecb3c18a X-Archives-Hash: 967f2ab53b71d2176b8cb512942004f1 commit: 9d013f33f52d11c480ad0accd75a4793b36a53b3 Author: David Seifert gentoo org> AuthorDate: Mon May 22 16:26:10 2023 +0000 Commit: David Seifert gentoo org> CommitDate: Mon May 22 16:26:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d013f33 sys-devel/make: remove ${USERLAND} Signed-off-by: David Seifert gentoo.org> sys-devel/make/{make-4.3.ebuild => make-4.3-r1.ebuild} | 9 +++------ sys-devel/make/{make-4.4.1.ebuild => make-4.4.1-r1.ebuild} | 9 +++------ sys-devel/make/make-9999.ebuild | 9 +++------ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3-r1.ebuild similarity index 89% rename from sys-devel/make/make-4.3.ebuild rename to sys-devel/make/make-4.3-r1.ebuild index c219f5ff1bee..892d5910d144 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3-r1.ebuild @@ -67,10 +67,7 @@ src_configure() { 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 + + dosym gmake /usr/bin/make + dosym gmake.1 /usr/share/man/man1/make.1 } diff --git a/sys-devel/make/make-4.4.1.ebuild b/sys-devel/make/make-4.4.1-r1.ebuild similarity index 89% rename from sys-devel/make/make-4.4.1.ebuild rename to sys-devel/make/make-4.4.1-r1.ebuild index 8d425cc7108a..142bc1e77077 100644 --- a/sys-devel/make/make-4.4.1.ebuild +++ b/sys-devel/make/make-4.4.1-r1.ebuild @@ -70,10 +70,7 @@ src_configure() { 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 + + dosym gmake /usr/bin/make + dosym gmake.1 /usr/share/man/man1/make.1 } diff --git a/sys-devel/make/make-9999.ebuild b/sys-devel/make/make-9999.ebuild index de7a808ae4c1..a230283d6685 100644 --- a/sys-devel/make/make-9999.ebuild +++ b/sys-devel/make/make-9999.ebuild @@ -70,10 +70,7 @@ src_configure() { 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 + + dosym gmake /usr/bin/make + dosym gmake.1 /usr/share/man/man1/make.1 }