gentoo resync : 29.12.2022

4 files changed, 222 insertions, 64 deletions

diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
index 04c6cf5c12ea..ad3e9421e103 100644
--- a/app-text/psutils/Manifest
+++ b/app-text/psutils/Manifest
@@ -1,5 +1,5 @@
-AUX psutils-1.17-ldflags.patch 1417 BLAKE2B fa54e0f8cab31336dbe95db96313e345e9cd3a03f2c92855c5bc5fbc4054e89193ade6b346f52edf61f58f20330dacc8d7df32a5ec1769ed7ff62b4eacb36368 SHA512 179b1551516a8acc9f4f9859b4bbe06a6d6e2ba0ddfe20c147a143e6795d61d9cb4f55107866d7a891f0be0dbebaf11d836f4c129205da44ba561a133d69ab08
+AUX psutils-1.17-makefile.patch 6367 BLAKE2B 72ea65d478993bf2c8b0f9254fdac6ef705d6dbd69a7e2fc85a8be4147abd4a67d16f55a1eeaa6f3e3b6d286a40cb4ff3948d1c572a379c5b9cc2ee7d7f3c536 SHA512 6e82c1d219d80de1245d94f5b6fec37f178c3121cf3add5b2895b2dda2fe01b48ea214c7983229601c224d6145f6c7997cdb2a3bfd2a51f2c5bd9e4e6afa763a
 AUX psutils-1.17-no-fixmacps.patch 1176 BLAKE2B fdf9653e881e05340445560ba5cb3303bc42e46a1605ee19d675023174aa7bf73d9b4cc37ba3bbafee9b3829974981ff58284acf7079f9b2a3fedbac9d28b2af SHA512 707ebb4594b341044e27cd3fb35402b4d3144eb52f9baffcc633dbde69b53717da148b6c03074411cb95dcf50b48ba87df4ad6c2ec3b24f37b0951c40012efdc
 DIST psutils_1.17.dfsg.orig.tar.gz 40296 BLAKE2B c74cde600e841e876892f3c0cfd20ab5d1ed87135e0bc952b19baf90315b95f89bf177b66deeeb91862fc2c620f688ba49972673bf9f4b4ff250590f0b2fc848 SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3
-EBUILD psutils-1.17-r3.ebuild 967 BLAKE2B afb29ef8ccc04185c3aae15d95d0218ee663263bf87ce4423395e28a2261069af7f62715d67cc1aac6bcdba18f846d30df4116b7b0287e2418c88eceb5541b45 SHA512 3b0a5e16d39cf06926663de53e64756446290b8dc439409a74f7f471ffe3ebde3ca93ce33c4cb06c3a3da4d44aa75ba521602b8a609a2ad3dc59b9978da0860f
+EBUILD psutils-1.17-r5.ebuild 845 BLAKE2B 2e0b0b0ae1c9a1cef158db267fc10411484b2f0ea9f115a61e3afd44e70ed18f55129f594d752217579c41cc2025db819efd7633ac250661efe02c5fcd7b6437 SHA512 66f0c4ad7f1743864bb223705f40ce8258f1c4cbca0b8fbd63e007a030cc0c601a19ea30b5a9e770b87cb758816f5323b40a750131042e8b3a360348fe14273c
 MISC metadata.xml 246 BLAKE2B b56c934f8eecd3492d6abe15cf5883fdbc1979c37abbc5ad196e345ee17bb865db5eab10ac7de93bbfce94c4e865bf6b86d5f8bc081b5cb1d3d58d1158b81921 SHA512 b61f56c5e078714565ff9e33c81217e788f78bae9cf10d6ca78a82703a8e08119dff3afa68306eced0b7c62db9220d28efa4c9782e943c991e30b25b9ead82f5
diff --git a/app-text/psutils/files/psutils-1.17-ldflags.patch b/app-text/psutils/files/psutils-1.17-ldflags.patch
deleted file mode 100644
index 124768062a43..000000000000
--- a/app-text/psutils/files/psutils-1.17-ldflags.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
--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
- epsffit.o: epsffit.c pserror.h patchlev.h
- 
- epsffit: epsffit.o pserror.o
--	$(CC) $(CCFLAGS) -o epsffit pserror.o epsffit.o
- 
- psnup: psnup.o psutil.o psspec.o pserror.o
--	$(CC) $(CCFLAGS) -o psnup psutil.o psspec.o pserror.o psnup.o
- 
- psnup.o: psutil.h patchlev.h psspec.h pserror.h psnup.c
- 
- psresize: psresize.o psutil.o pserror.o psspec.o
--	$(CC) $(CCFLAGS) -o psresize psutil.o psspec.o pserror.o psresize.o
- 
- psresize.o: psutil.h patchlev.h psspec.h pserror.h psresize.c
- 
- psbook: psbook.o psutil.o pserror.o
--	$(CC) $(CCFLAGS) -o psbook psutil.o pserror.o psbook.o
- 
- psbook.o: psutil.h patchlev.h pserror.h psbook.c
- 
- psselect: psselect.o psutil.o pserror.o
--	$(CC) $(CCFLAGS) -o psselect psutil.o pserror.o psselect.o
- 
- psselect.o: psutil.h patchlev.h pserror.h psselect.c
- 
- pstops: pstops.o psutil.o psspec.o pserror.o
--	$(CC) $(CCFLAGS) -o pstops psutil.o psspec.o pserror.o pstops.o
- 
- pstops.o: psutil.h patchlev.h psspec.h pserror.h pstops.c
- 
diff --git a/app-text/psutils/files/psutils-1.17-makefile.patch b/app-text/psutils/files/psutils-1.17-makefile.patch
new file mode 100644
index 000000000000..8e8f03208f78
--- /dev/null
+++ b/app-text/psutils/files/psutils-1.17-makefile.patch
@@ -0,0 +1,210 @@
+--- 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 = "/usr/bin/env 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 +64,24 @@
+ epsffit.o: epsffit.c pserror.h patchlev.h
+ 
+ epsffit: epsffit.o pserror.o
+-	$(CC) $(CCFLAGS) -o epsffit pserror.o epsffit.o
+ 
+ psnup: psnup.o psutil.o psspec.o pserror.o
+-	$(CC) $(CCFLAGS) -o psnup psutil.o psspec.o pserror.o psnup.o
+ 
+ psnup.o: psutil.h patchlev.h psspec.h pserror.h psnup.c
+ 
+ psresize: psresize.o psutil.o pserror.o psspec.o
+-	$(CC) $(CCFLAGS) -o psresize psutil.o psspec.o pserror.o psresize.o
+ 
+ psresize.o: psutil.h patchlev.h psspec.h pserror.h psresize.c
+ 
+ psbook: psbook.o psutil.o pserror.o
+-	$(CC) $(CCFLAGS) -o psbook psutil.o pserror.o psbook.o
+ 
+ psbook.o: psutil.h patchlev.h pserror.h psbook.c
+ 
+ psselect: psselect.o psutil.o pserror.o
+-	$(CC) $(CCFLAGS) -o psselect psutil.o pserror.o psselect.o
+ 
+ psselect.o: psutil.h patchlev.h pserror.h psselect.c
+ 
+ pstops: pstops.o psutil.o psspec.o pserror.o
+-	$(CC) $(CCFLAGS) -o pstops psutil.o psspec.o pserror.o pstops.o
+ 
+ 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-r3.ebuild b/app-text/psutils/psutils-1.17-r5.ebuild
index f1c0d00de2e4..dd64aadab49c 100644
--- a/app-text/psutils/psutils-1.17-r3.ebuild
+++ b/app-text/psutils/psutils-1.17-r5.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
 }