[gentoo-commits] repo/gentoo:master commit in: app-text/psutils/, app-text/psutils/files/

[gentoo-commits] repo/gentoo:master commit in: app-text/psutils/, app-text/psutils/files/

[David Seifert]

commit:     b629b4c82f0e52140c2b86767399bc47fbf23df8
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 16:29:30 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 16:29:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b629b4c8

app-text/psutils: update EAPI 6 -> 8

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...7-ldflags.patch => psutils-1.17-makefile.patch} | 34 ++++++++++++++++------
 ...utils-1.17-r3.ebuild => psutils-1.17-r4.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
similarity index 66%
rename from app-text/psutils/files/psutils-1.17-ldflags.patch
rename to 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
similarity index 62%
rename from app-text/psutils/psutils-1.17-r3.ebuild
rename to 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
 }

[gentoo-commits] repo/gentoo:master commit in: app-text/psutils/, app-text/psutils/files/

[Sam James]

commit:     ffcf06f5e11b47daae87b336b8f3fda4c25919ad
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  9 02:21:48 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep  9 02:26:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffcf06f5

app-text/psutils: fix build w/ Clang 15 for old too

Bug: https://bugs.gentoo.org/869242
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../psutils/files/psutils-1.17-clang-implicit-int.patch  | 16 ++++++++++++++++
 app-text/psutils/psutils-1.17-r5.ebuild                  |  1 +
 2 files changed, 17 insertions(+)

diff --git a/app-text/psutils/files/psutils-1.17-clang-implicit-int.patch b/app-text/psutils/files/psutils-1.17-clang-implicit-int.patch
new file mode 100644
index 000000000000..0f70648dd600
--- /dev/null
+++ b/app-text/psutils/files/psutils-1.17-clang-implicit-int.patch
@@ -0,0 +1,16 @@
+--- a/pserror.c
++++ b/pserror.c
+@@ -22,11 +22,11 @@ extern char *program ;	/* Defined by mai
+ #define MAX_COLUMN	78	/* maximum column to print upto */
+ 
+ void message(int flags, char *format, ...)
+ {
+   va_list args ;
+-  static column = 0 ;		/* current screen column for message wrap */
++  static int column = 0 ;	/* current screen column for message wrap */
+   char msgbuf[MAX_MESSAGE] ;	/* buffer in which to put the message */
+   char *bufptr = msgbuf ;	/* message buffer pointer */
+ 
+   if ( (flags & MESSAGE_NL) && column != 0 ) {	/* new line if not already */
+     putc('\n', stderr) ;
+

diff --git a/app-text/psutils/psutils-1.17-r5.ebuild b/app-text/psutils/psutils-1.17-r5.ebuild
index dd64aadab49c..87cb65425884 100644
--- a/app-text/psutils/psutils-1.17-r5.ebuild
+++ b/app-text/psutils/psutils-1.17-r5.ebuild
@@ -19,6 +19,7 @@ BDEPEND="dev-lang/perl"
 PATCHES=(
 	"${FILESDIR}"/${P}-makefile.patch
 	"${FILESDIR}"/${P}-no-fixmacps.patch
+	"${FILESDIR}"/${P}-clang-implicit-int.patch
 )
 
 src_compile() {