From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- sys-devel/pmake/Manifest | 2 +- sys-devel/pmake/pmake-1.111.3.3.ebuild | 42 +++++++++++++++------------------- 2 files changed, 20 insertions(+), 24 deletions(-) (limited to 'sys-devel/pmake') diff --git a/sys-devel/pmake/Manifest b/sys-devel/pmake/Manifest index f6ae4aa2e789..51bb2f5c832f 100644 --- a/sys-devel/pmake/Manifest +++ b/sys-devel/pmake/Manifest @@ -2,5 +2,5 @@ AUX pmake-1.111.1-ldflags.patch 484 BLAKE2B d94f955c6ec149b7617c26010e7364fe2ad5 AUX pmake-1.98-skipdots.patch 513 BLAKE2B 03f63f698b3d147dc0d1df0140f40657cecd445d7c7659f18369e5fa541b0370ced4cddafd27639149aa93053440f7d43b715baf1893cf4613ba15fe6820bdc9 SHA512 ccd751cca406abdb763f251c147f7b7efd7b001e415bc8c98a4fa8069420b64c3a5819b4abd5f174606390f903f8cba5e560e02a14519619713da26ab52c54ad 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 -EBUILD pmake-1.111.3.3.ebuild 2378 BLAKE2B a56d9ec5d5e08350eee2b0bee423ccc9d5ff2ef8f05945feee652f41e84b13d9e18fa22944e8458a2d32ebd2c8c28887505d9a477b79ddb0a806c2fcfd395c9b SHA512 42ddfaf022aec438bf7cf5c4f277ead8121e31248c764778cfac5c693777906de6805e3b1bd0e5d4fda063017ce4ee421932a89af3e7e6a6b2b7ef212af66f04 +EBUILD pmake-1.111.3.3.ebuild 2137 BLAKE2B e17500d1eedf6568eb9fe9c61b55f53697e3130368b0ba48bbedbf182aab31a46baef12876cd4fc9defb31ca9b1aeede3381b61b67a77f793183ecb411310019 SHA512 e8b91a44159b3b34b750f1322449992062060e4da0a44674eed42c253eab5c0c832b588584dd47644d62ab743a7d3b0b190baf07d1d0675f1330c86b1a511b32 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/sys-devel/pmake/pmake-1.111.3.3.ebuild b/sys-devel/pmake/pmake-1.111.3.3.ebuild index 2ef5424fa653..53db11c875df 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 -- cgit v1.2.3