From b833f1a0939de985479d6548b9133403b35f4ac2 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Thu, 23 Jun 2022 22:53:29 +0200 Subject: app-text/psutils: fix perl shebangs Closes: https://bugs.gentoo.org/853922 Signed-off-by: David Seifert --- app-text/psutils/files/psutils-1.17-makefile.patch | 152 ++++++++++++++++++++- app-text/psutils/psutils-1.17-r4.ebuild | 32 ----- app-text/psutils/psutils-1.17-r5.ebuild | 32 +++++ 3 files changed, 183 insertions(+), 33 deletions(-) delete mode 100644 app-text/psutils/psutils-1.17-r4.ebuild create mode 100644 app-text/psutils/psutils-1.17-r5.ebuild (limited to 'app-text') diff --git a/app-text/psutils/files/psutils-1.17-makefile.patch b/app-text/psutils/files/psutils-1.17-makefile.patch index 241ea284c66e..8e8f03208f78 100644 --- a/app-text/psutils/files/psutils-1.17-makefile.patch +++ b/app-text/psutils/files/psutils-1.17-makefile.patch @@ -10,7 +10,7 @@ -INCLUDEDIR = /usr/local/share/psutils -PERL = /usr/local/bin/perl +INCLUDEDIR = $(DESTDIR)$(EPREFIX)/usr/share/psutils -+PERL = perl ++PERL = "/usr/bin/env perl" BINMODE = 0755 MANMODE = 0644 @@ -58,3 +58,153 @@ pstops.o: psutil.h patchlev.h psspec.h pserror.h pstops.c +@@ -99,116 +92,116 @@ + cp $? $@ + + psmerge: psmerge.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixfmps: fixfmps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixmacps: fixmacps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixpsditps: fixpsditps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixpspps: fixpspps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixscribeps: fixscribeps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixtpps: fixtpps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixwfwps: fixwfwps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixwpps: fixwpps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixwwps: fixwwps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixdlsrps: fixdlsrps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + extractres: extractres.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + includeres: includeres.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@ + $(CHMOD) $(BINMODE) $@ + + epsffit.$(MANEXT): epsffit.man +- $(PERL) maketext MAN="$(MANPAGES)" $? > $@ ++ perl maketext MAN="$(MANPAGES)" $? > $@ + + psnup.$(MANEXT): psnup.man +- $(PERL) maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@ ++ perl maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@ + + psresize.$(MANEXT): psresize.man +- $(PERL) maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@ ++ perl maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@ + + psbook.$(MANEXT): psbook.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + psselect.$(MANEXT): psselect.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + pstops.$(MANEXT): pstops.man +- $(PERL) maketext "MAN=$(MANPAGES)" PAPER=$(PAPER) $? > $@ ++ perl maketext "MAN=$(MANPAGES)" PAPER=$(PAPER) $? > $@ + + psmerge.$(MANEXT): psmerge.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixfmps.$(MANEXT): fixfmps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixmacps.$(MANEXT): fixmacps.man +- $(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@ ++ perl maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@ + + fixpsditps.$(MANEXT): fixpsditps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixpspps.$(MANEXT): fixpspps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixscribeps.$(MANEXT): fixscribeps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixtpps.$(MANEXT): fixtpps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixwfwps.$(MANEXT): fixwfwps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixwpps.$(MANEXT): fixwpps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixwwps.$(MANEXT): fixwwps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixdlsrps.$(MANEXT): fixdlsrps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + extractres.$(MANEXT): extractres.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + includeres.$(MANEXT): includeres.man +- $(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@ ++ perl maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@ + + getafm.$(MANEXT): getafm.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + clean: + rm -f *.o diff --git a/app-text/psutils/psutils-1.17-r4.ebuild b/app-text/psutils/psutils-1.17-r4.ebuild deleted file mode 100644 index dd64aadab49c..000000000000 --- a/app-text/psutils/psutils-1.17-r4.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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" - -BDEPEND="dev-lang/perl" - -PATCHES=( - "${FILESDIR}"/${P}-makefile.patch - "${FILESDIR}"/${P}-no-fixmacps.patch -) - -src_compile() { - emake -f Makefile.unix CC="$(tc-getCC)" -} - -src_install() { - dodir /usr/{bin,share/man} - emake -f Makefile.unix DESTDIR="${D}" install - dodoc README -} diff --git a/app-text/psutils/psutils-1.17-r5.ebuild b/app-text/psutils/psutils-1.17-r5.ebuild new file mode 100644 index 000000000000..dd64aadab49c --- /dev/null +++ b/app-text/psutils/psutils-1.17-r5.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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" + +BDEPEND="dev-lang/perl" + +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-no-fixmacps.patch +) + +src_compile() { + emake -f Makefile.unix CC="$(tc-getCC)" +} + +src_install() { + dodir /usr/{bin,share/man} + emake -f Makefile.unix DESTDIR="${D}" install + dodoc README +} -- cgit v1.2.3-65-gdbad