diff options
| author |   David Seifert <soap@gentoo.org> | 2022-06-21 18:29:30 +0200 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2022-06-21 18:29:30 +0200 |
| commit | b629b4c82f0e52140c2b86767399bc47fbf23df8 (patch) | |
| tree | 49e9f7ee3f95b455bcf1829575ae04d685a59204 /app-text | |
| parent | app-text/libepubgen: update EAPI 6 -> 8 (diff) | |
| download | gentoo-b629b4c82f0e52140c2b86767399bc47fbf23df8.tar.gz gentoo-b629b4c82f0e52140c2b86767399bc47fbf23df8.tar.bz2 gentoo-b629b4c82f0e52140c2b86767399bc47fbf23df8.zip | |
app-text/psutils: update EAPI 6 -> 8
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/psutils/files/psutils-1.17-makefile.patch (renamed from app-text/psutils/files/psutils-1.17-ldflags.patch) | 34 | ||||
| -rw-r--r-- | app-text/psutils/psutils-1.17-r4.ebuild (renamed from app-text/psutils/psutils-1.17-r3.ebuild) | 28 |
2 files changed, 35 insertions, 27 deletions
diff --git a/app-text/psutils/files/psutils-1.17-ldflags.patch b/app-text/psutils/files/psutils-1.17-makefile.patch index 124768062a43..241ea284c66e 100644 --- a/app-text/psutils/files/psutils-1.17-ldflags.patch +++ b/app-text/psutils/files/psutils-1.17-makefile.patch @@ -1,17 +1,33 @@ -Index: psutils/Makefile.unix -=================================================================== ---- psutils.orig/Makefile.unix -+++ psutils/Makefile.unix -@@ -39,7 +39,7 @@ MANEXT = 1 - MANDIR = /usr/local/share/man/man$(MANEXT) - - CC = gcc +--- a/Makefile.unix ++++ b/Makefile.unix +@@ -25,10 +25,10 @@ + + OS = UNIX + +-BINDIR = /usr/local/bin ++BINDIR = $(DESTDIR)$(EPREFIX)/usr/bin + SCRIPTDIR = $(BINDIR) +-INCLUDEDIR = /usr/local/share/psutils +-PERL = /usr/local/bin/perl ++INCLUDEDIR = $(DESTDIR)$(EPREFIX)/usr/share/psutils ++PERL = perl + + BINMODE = 0755 + MANMODE = 0644 +@@ -36,10 +36,9 @@ + INSTALL = install -c -m $(BINMODE) + INSTALLMAN = install -c -m $(MANMODE) + MANEXT = 1 +-MANDIR = /usr/local/share/man/man$(MANEXT) ++MANDIR = $(DESTDIR)$(EPREFIX)/usr/share/man/man$(MANEXT) + +-CC = gcc -CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall +CFLAGS += -DPAPER=\"$(PAPER)\" -DUNIX -Wall BIN = psbook psselect pstops epsffit psnup \ psresize -@@ -65,30 +65,24 @@ pserror.o: psutil.h patchlev.h pserror.h +@@ -65,30 +64,24 @@ epsffit.o: epsffit.c pserror.h patchlev.h epsffit: epsffit.o pserror.o diff --git a/app-text/psutils/psutils-1.17-r3.ebuild b/app-text/psutils/psutils-1.17-r4.ebuild index f1c0d00de2e4..dd64aadab49c 100644 --- a/app-text/psutils/psutils-1.17-r3.ebuild +++ b/app-text/psutils/psutils-1.17-r4.ebuild @@ -1,40 +1,32 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs DESCRIPTION="PostScript Utilities" HOMEPAGE="http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/" SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz" +S="${WORKDIR}/${P}.orig" LICENSE="psutils" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-lang/perl" -S="${WORKDIR}/${P}.orig" +BDEPEND="dev-lang/perl" -src_prepare() { - eapply "${FILESDIR}/${P}-ldflags.patch" - eapply "${FILESDIR}/${P}-no-fixmacps.patch" - sed \ - -e "s:/usr/local:\$(DESTDIR)${EPREFIX}/usr:" \ - "${S}/Makefile.unix" > "${S}/Makefile" - default -} +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-no-fixmacps.patch +) src_compile() { - emake CC="$(tc-getCC)" + emake -f Makefile.unix CC="$(tc-getCC)" } src_install() { dodir /usr/{bin,share/man} - emake DESTDIR="${D}" install + emake -f Makefile.unix DESTDIR="${D}" install dodoc README } |