| 1 |
commit: 2dd075ec0529815eed235a7eb2ec24ec94de1ec0 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 15 19:52:33 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 15 19:52:33 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd075ec |
| 7 |
|
| 8 |
sys-devel/pmake: Port to EAPI 7 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/724214 |
| 11 |
Package-Manager: Portage-3.0.7, Repoman-3.0.1 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-devel/pmake/pmake-1.111.3.3.ebuild | 42 +++++++++++++++------------------- |
| 15 |
1 file changed, 19 insertions(+), 23 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-devel/pmake/pmake-1.111.3.3.ebuild b/sys-devel/pmake/pmake-1.111.3.3.ebuild |
| 18 |
index 2ef5424fa65..53db11c875d 100644 |
| 19 |
--- a/sys-devel/pmake/pmake-1.111.3.3.ebuild |
| 20 |
+++ b/sys-devel/pmake/pmake-1.111.3.3.ebuild |
| 21 |
@@ -1,43 +1,37 @@ |
| 22 |
# Copyright 1999-2020 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=4 |
| 26 |
+EAPI=7 |
| 27 |
|
| 28 |
-inherit eutils toolchain-funcs versionator linux-info |
| 29 |
+inherit toolchain-funcs linux-info |
| 30 |
|
| 31 |
-MY_P="${PN}-$(get_version_component_range 1-2)" |
| 32 |
-DEBIAN_SOURCE="${PN}_$(get_version_component_range 1-2).orig.tar.gz" |
| 33 |
-DEBIAN_PATCH="${PN}_$(replace_version_separator 2 '-').debian.tar.gz" |
| 34 |
+MY_P="${PN}-$(ver_cut 1-2)" |
| 35 |
+DEBIAN_SOURCE="${PN}_$(ver_cut 1-2).orig.tar.gz" |
| 36 |
+DEBIAN_PATCH="${PN}_$(ver_rs 2 '-').debian.tar.gz" |
| 37 |
|
| 38 |
DESCRIPTION="BSD build tool to create programs in parallel. Debian's version of NetBSD's make" |
| 39 |
HOMEPAGE="http://www.netbsd.org/" |
| 40 |
-SRC_URI="mirror://debian/pool/main/p/pmake/${DEBIAN_SOURCE} |
| 41 |
+SRC_URI=" |
| 42 |
+ mirror://debian/pool/main/p/pmake/${DEBIAN_SOURCE} |
| 43 |
mirror://debian/pool/main/p/pmake/${DEBIAN_PATCH}" |
| 44 |
|
| 45 |
LICENSE="BSD" |
| 46 |
SLOT="0" |
| 47 |
KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" |
| 48 |
-IUSE="" |
| 49 |
- |
| 50 |
-RDEPEND="" |
| 51 |
-DEPEND="" |
| 52 |
|
| 53 |
S="${WORKDIR}/${PN}" |
| 54 |
|
| 55 |
-src_prepare() { |
| 56 |
- EPATCH_FORCE="yes" \ |
| 57 |
- EPATCH_OPTS="-g0 -E --no-backup-if-mismatch -p1" \ |
| 58 |
- EPATCH_SUFFIX="diff" \ |
| 59 |
- epatch "${WORKDIR}/debian/patches" |
| 60 |
+PATCHES=( |
| 61 |
+ "${WORKDIR}"/debian/patches |
| 62 |
|
| 63 |
# pmake makes the assumption that . and .. are the first two |
| 64 |
# entries in a directory, which doesn't always appear to be the |
| 65 |
# case on ext3... (05 Apr 2004 agriffis) |
| 66 |
- epatch "${FILESDIR}/${PN}-1.98-skipdots.patch" |
| 67 |
+ "${FILESDIR}"/${PN}-1.98-skipdots.patch |
| 68 |
|
| 69 |
# Don't ignore ldflags |
| 70 |
- epatch "${FILESDIR}/${PN}-1.111.1-ldflags.patch" |
| 71 |
-} |
| 72 |
+ "${FILESDIR}"/${PN}-1.111.1-ldflags.patch |
| 73 |
+) |
| 74 |
|
| 75 |
src_compile() { |
| 76 |
# The following CFLAGS are almost directly from Red Hat 8.0 and |
| 77 |
@@ -62,18 +56,20 @@ src_compile() { |
| 78 |
|
| 79 |
src_install() { |
| 80 |
# Don't install these on BSD, else they conflict |
| 81 |
- if [[ "${USERLAND}" == "GNU" ]]; then |
| 82 |
+ if [[ ${USERLAND} == GNU ]]; then |
| 83 |
insinto /usr/share/mk/${PN} |
| 84 |
- doins mk/* |
| 85 |
+ doins -r mk/. |
| 86 |
fi |
| 87 |
|
| 88 |
newbin bmake pmake |
| 89 |
dobin mkdep |
| 90 |
- mv make.1 pmake.1 |
| 91 |
- doman mkdep.1 pmake.1 |
| 92 |
+ |
| 93 |
+ doman mkdep.1 |
| 94 |
+ newman make.1 pmake.1 |
| 95 |
+ |
| 96 |
dodoc PSD.doc/tutorial.ms |
| 97 |
|
| 98 |
- if [[ "${USERLAND}" == "BSD" ]]; then |
| 99 |
+ if [[ ${USERLAND} == BSD ]]; then |
| 100 |
dosym pmake /usr/bin/make |
| 101 |
dosym pmake.1.gz /usr/share/man/man1/make.1.gz |
| 102 |
fi |
Archives