[gentoo-commits] repo/gentoo:master commit in: sys-devel/pmake/
commit: 03781b932231f0d873ea308bfadc6e16b68bf1bc
Author: David Seifert gentoo org>
AuthorDate: Mon May 22 16:26:12 2023 +
Commit: David Seifert gentoo org>
CommitDate: Mon May 22 16:26:12 2023 +
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
}
[gentoo-commits] repo/gentoo:master commit in: sys-devel/pmake/
commit: 2dd075ec0529815eed235a7eb2ec24ec94de1ec0
Author: David Seifert gentoo org>
AuthorDate: Tue Sep 15 19:52:33 2020 +
Commit: David Seifert gentoo org>
CommitDate: Tue Sep 15 19:52:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd075ec
sys-devel/pmake: Port to EAPI 7
Closes: https://bugs.gentoo.org/724214
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: David Seifert gentoo.org>
sys-devel/pmake/pmake-1.111.3.3.ebuild | 42 +++---
1 file changed, 19 insertions(+), 23 deletions(-)
diff --git a/sys-devel/pmake/pmake-1.111.3.3.ebuild
b/sys-devel/pmake/pmake-1.111.3.3.ebuild
index 2ef5424fa65..53db11c875d 100644
--- a/sys-devel/pmake/pmake-1.111.3.3.ebuild
+++ b/sys-devel/pmake/pmake-1.111.3.3.ebuild
@@ -1,43 +1,37 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
-inherit eutils toolchain-funcs versionator linux-info
+inherit toolchain-funcs linux-info
-MY_P="${PN}-$(get_version_component_range 1-2)"
-DEBIAN_SOURCE="${PN}_$(get_version_component_range 1-2).orig.tar.gz"
-DEBIAN_PATCH="${PN}_$(replace_version_separator 2 '-').debian.tar.gz"
+MY_P="${PN}-$(ver_cut 1-2)"
+DEBIAN_SOURCE="${PN}_$(ver_cut 1-2).orig.tar.gz"
+DEBIAN_PATCH="${PN}_$(ver_rs 2 '-').debian.tar.gz"
DESCRIPTION="BSD build tool to create programs in parallel. Debian's version
of NetBSD's make"
HOMEPAGE="http://www.netbsd.org/;
-SRC_URI="mirror://debian/pool/main/p/pmake/${DEBIAN_SOURCE}
+SRC_URI="
+ mirror://debian/pool/main/p/pmake/${DEBIAN_SOURCE}
mirror://debian/pool/main/p/pmake/${DEBIAN_PATCH}"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux
~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
S="${WORKDIR}/${PN}"
-src_prepare() {
- EPATCH_FORCE="yes" \
- EPATCH_OPTS="-g0 -E --no-backup-if-mismatch -p1" \
- EPATCH_SUFFIX="diff" \
- epatch "${WORKDIR}/debian/patches"
+PATCHES=(
+ "${WORKDIR}"/debian/patches
# pmake makes the assumption that . and .. are the first two
# entries in a directory, which doesn't always appear to be the
# case on ext3... (05 Apr 2004 agriffis)
- epatch "${FILESDIR}/${PN}-1.98-skipdots.patch"
+ "${FILESDIR}"/${PN}-1.98-skipdots.patch
# Don't ignore ldflags
- epatch "${FILESDIR}/${PN}-1.111.1-ldflags.patch"
-}
+ "${FILESDIR}"/${PN}-1.111.1-ldflags.patch
+)
src_compile() {
# The following CFLAGS are almost directly from Red Hat 8.0 and
@@ -62,18 +56,20 @@ src_compile() {
src_install() {
# Don't install these on BSD, else they conflict
- if [[ "${USERLAND}" == "GNU" ]]; then
+ if [[ ${USERLAND} == GNU ]]; then
insinto /usr/share/mk/${PN}
- doins mk/*
+ doins -r mk/.
fi
newbin bmake pmake
dobin mkdep
- mv make.1 pmake.1
- doman mkdep.1 pmake.1
+
+ doman mkdep.1
+ newman make.1 pmake.1
+
dodoc PSD.doc/tutorial.ms
- if [[ "${USERLAND}" == "BSD" ]]; then
+ if [[ ${USERLAND} == BSD ]]; then
dosym pmake /usr/bin/make
dosym pmake.1.gz /usr/share/man/man1/make.1.gz
fi
[gentoo-commits] repo/gentoo:master commit in: sys-devel/pmake/
commit: 122399643ea48c64965b0195689e623b30de7499
Author: Aaron Bauman gentoo org>
AuthorDate: Wed Nov 13 19:49:56 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Wed Nov 13 19:58:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12239964
sys-devel/pmake: drop old EAPI
Signed-off-by: Aaron Bauman gentoo.org>
sys-devel/pmake/Manifest | 1 -
sys-devel/pmake/pmake-1.111.3.1.ebuild | 80 --
2 files changed, 81 deletions(-)
diff --git a/sys-devel/pmake/Manifest b/sys-devel/pmake/Manifest
index 48036fba4b5..149a5aafe34 100644
--- a/sys-devel/pmake/Manifest
+++ b/sys-devel/pmake/Manifest
@@ -1,3 +1,2 @@
-DIST pmake_1.111-3.1.debian.tar.gz 32176 BLAKE2B
b1e9508a4f14ca856dedca8bf52af119f988b4f1ee50af1170f0afb6c5f1f6a5524cb1debf21e620be59cd8084ae6b1e3becd664ca522b8e04928933a085d0dc
SHA512
a5743c0b0478119cf8ac01b0182f14cf213b275078b1cd2badee9ac26a3b40660bf4fd430af079fdaa7bc8117ed8a1cdf855166e34e151204e34e7d2b67beee3
DIST pmake_1.111-3.3.debian.tar.gz 31648 BLAKE2B
31aca433bbeac4275d4c2af0cfd33ef81b0086b0dec107edfc1fba55b15480367ebf62abccd6e2e48f0c7ccc25c59f0b07eed7ac950a5037b73c267b066a9638
SHA512
b22a1d9e371712732f196d91ac3eb9239fa98ee8ee05754576e7a5878cab88976cb10bb6be90706df5ac738373f519468403c23f6a3ff3860a2968b3222a66ed
DIST pmake_1.111.orig.tar.gz 264383 BLAKE2B
54dd510251441b54c9f5d7f6061109b0222191b3acdded1394b51b72b87bbd4255edd80fab46976d92c58929693b6809a9f2c4f001cab8c9cdaabfac9f3adac9
SHA512
ad48708ea014d6a38ad36303504c52992b51a1e815564f1710849d859b1fc3cd58c4a1a71f54ec902c9b69112e9cd1e1a64282ff738439cdb209a4f75c364c22
diff --git a/sys-devel/pmake/pmake-1.111.3.1.ebuild
b/sys-devel/pmake/pmake-1.111.3.1.ebuild
deleted file mode 100644
index cbd8c14db38..000
--- a/sys-devel/pmake/pmake-1.111.3.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs versionator
-
-MY_P="${PN}-$(get_version_component_range 1-2)"
-DEBIAN_SOURCE="${PN}_$(get_version_component_range 1-2).orig.tar.gz"
-DEBIAN_PATCH="${PN}_$(replace_version_separator 2 '-').debian.tar.gz"
-
-DESCRIPTION="BSD build tool to create programs in parallel. Debian's version
of NetBSD's make"
-HOMEPAGE="http://www.netbsd.org/;
-SRC_URI="mirror://debian/pool/main/p/pmake/${DEBIAN_SOURCE}
- mirror://debian/pool/main/p/pmake/${DEBIAN_PATCH}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux
~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- EPATCH_FORCE="yes" \
- EPATCH_OPTS="-g0 -E --no-backup-if-mismatch -p1" \
- EPATCH_SUFFIX="diff" \
- epatch "${WORKDIR}/debian/patches"
-
- # pmake makes the assumption that . and .. are the first two
- # entries in a directory, which doesn't always appear to be the
- # case on ext3... (05 Apr 2004 agriffis)
- epatch "${FILESDIR}/${PN}-1.98-skipdots.patch"
-
- # Don't ignore ldflags
- epatch "${FILESDIR}/${PN}-1.111.1-ldflags.patch"
-}
-
-src_compile() {
- # The following CFLAGS are almost directly from Red Hat 8.0 and
- # debian/rules, so assume it's okay to void out the __COPYRIGHT
- # and __RCSID. I've checked the source and don't see the point,
- # but whatever... (07 Feb 2004 agriffis)
- CFLAGS="${CFLAGS} -Wall -Wno-unused -D_GNU_SOURCE \
- -DHAVE_STRERROR -DHAVE_STRDUP -DHAVE_SETENV \
- -D__COPYRIGHT\(x\)= -D__RCSID\(x\)= -I. \
- -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
-
- emake -f Makefile.boot \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- # Don't install these on BSD, else they conflict
- if [[ "${USERLAND}" == "GNU" ]]; then
- insinto /usr/share/mk/${PN}
- doins mk/*
- fi
-
- newbin bmake pmake
- dobin mkdep
- mv make.1 pmake.1
- doman mkdep.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
-}
[gentoo-commits] repo/gentoo:master commit in: sys-devel/pmake/
commit: 2b5286e2ddce0478d5e806c1740d3acf400092c5
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Jun 21 10:26:32 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Jun 21 10:26:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5286e2
sys-devel/pmake: keyword ~arm64
Package-Manager: Portage-2.3.6, Repoman-2.3.2
sys-devel/pmake/pmake-1.111.3.3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-devel/pmake/pmake-1.111.3.3.ebuild
b/sys-devel/pmake/pmake-1.111.3.3.ebuild
index c44afa346d6..7da945dc1cf 100644
--- a/sys-devel/pmake/pmake-1.111.3.3.ebuild
+++ b/sys-devel/pmake/pmake-1.111.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/p/pmake/${DEBIAN_SOURCE}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux
~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux
~x86-linux"
IUSE=""
RDEPEND=""
