[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/

[David Seifert]

commit:     9d013f33f52d11c480ad0accd75a4793b36a53b3
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon May 22 16:26:10 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> 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 <soap <AT> 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
 }