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 DFA1B15810D 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 D90C7E0AD8; 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 B9405E0AD8 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 A762833BEB9 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 1847BA76 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: <1684772772.03781b932231f0d873ea308bfadc6e16b68bf1bc.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/pmake/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/pmake/pmake-1.111.3.3-r1.ebuild sys-devel/pmake/pmake-1.111.3.3.ebuild X-VCS-Directories: sys-devel/pmake/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 03781b932231f0d873ea308bfadc6e16b68bf1bc 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: 7b886689-c7be-463f-a6e8-2cde71898434 X-Archives-Hash: 1537dbe1a34c7a4f91348706df596a0d commit: 03781b932231f0d873ea308bfadc6e16b68bf1bc Author: David Seifert gentoo org> AuthorDate: Mon May 22 16:26:12 2023 +0000 Commit: David Seifert gentoo org> CommitDate: Mon May 22 16:26:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03781b93 sys-devel/pmake: remove ${USERLAND} Signed-off-by: David Seifert gentoo.org> ...ake-1.111.3.3.ebuild => pmake-1.111.3.3-r1.ebuild} | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/sys-devel/pmake/pmake-1.111.3.3.ebuild b/sys-devel/pmake/pmake-1.111.3.3-r1.ebuild similarity index 79% rename from sys-devel/pmake/pmake-1.111.3.3.ebuild rename to sys-devel/pmake/pmake-1.111.3.3-r1.ebuild index 53db11c875df..ff51a3b25bbc 100644 --- a/sys-devel/pmake/pmake-1.111.3.3.ebuild +++ b/sys-devel/pmake/pmake-1.111.3.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -44,10 +44,7 @@ src_compile() { -DMACHINE=\\\"gentoo\\\" -DMACHINE_ARCH=\\\"$(tc-arch-kernel)\\\" \ -D_PATH_DEFSHELLDIR=\\\"${EPREFIX}/bin\\\" \ -D_PATH_DEFSYSPATH=\\\"${EPREFIX}/usr/share/mk\\\" \ - -DHAVE_VSNPRINTF" - if [[ "${USERLAND}" == "GNU" ]]; then - CFLAGS="${CFLAGS} -D_PATH_DEFSYSPATH=\\\"${EPREFIX}/usr/share/mk/${PN}\\\"" - fi + -DHAVE_VSNPRINTF -D_PATH_DEFSYSPATH=\\\"${EPREFIX}/usr/share/mk/${PN}\\\"" emake -f Makefile.boot \ CC="$(tc-getCC)" \ @@ -55,11 +52,8 @@ src_compile() { } src_install() { - # Don't install these on BSD, else they conflict - if [[ ${USERLAND} == GNU ]]; then - insinto /usr/share/mk/${PN} - doins -r mk/. - fi + insinto /usr/share/mk/${PN} + doins -r mk/. newbin bmake pmake dobin mkdep @@ -68,9 +62,4 @@ src_install() { newman make.1 pmake.1 dodoc PSD.doc/tutorial.ms - - if [[ ${USERLAND} == BSD ]]; then - dosym pmake /usr/bin/make - dosym pmake.1.gz /usr/share/man/man1/make.1.gz - fi }