gentoo Easter resync : 12.04.2020

5 files changed, 82 insertions, 33 deletions

diff --git a/app-admin/procinfo-ng/Manifest b/app-admin/procinfo-ng/Manifest
index 09404a5c59aa..b761e401921e 100644
--- a/app-admin/procinfo-ng/Manifest
+++ b/app-admin/procinfo-ng/Manifest
@@ -1,5 +1,5 @@
-AUX procinfo-ng-2.0.304-as-needed.patch 441 BLAKE2B a9abe2b26ef8932f944ce93547afea7876906a28e813221a6afa76e69f9301dfe9c1d3391ccc9235644a6b817b441251b048e5cb8fdb6e2fe9c13472c267d5d5 SHA512 70a95c828a7a9bcea8559e1709bfcb2a88fd53a9aaf3c58c51faa04f32b50ec2f0db2705f6093e06ae0efdf2aafa7854b9f7aadf072ee8cd667fb2dce48e5ba0
-AUX procinfo-ng-2.0.304-man.patch 243 BLAKE2B c2fb0f07d440e4101717dfbc20b4f16947b4b40c770c9e72feb6a2af6eb94b2d3e8d05b9c3da14a040530ec67390ee36850f97cb3439e45e164175833c53f2c6 SHA512 2541b4738e6323627625e7d65ee2ddc88d61e76f7b5bfbd382472d048ad21e3b63eb8a92feb7af6e62ac54045aa25ffbdfe36d67c1a4dc0c7a7be9abeb5ba9ed
+AUX procinfo-ng-2.0.304-autotools.patch 1521 BLAKE2B 900b0605e17dfe22512399aac73f79109c12524f53e9924d5f240e10422a1b53d3e171c89b292748bbf5515c4ea99610c39cc8d94bfe1c968a225c5a36f41955 SHA512 3b13f4eb5ebad4d9d9dc6a31f7a46b49b76aeee19042029d7c37c5fe21555c7c98c990cdf57ce9583469058fed315903efe919f7f25cc5354a6800086f56cd28
+AUX procinfo-ng-2.0.304-man.patch 130 BLAKE2B d06416e6302ca0b8952b2f01c2e6d64dbf913c5009248d187bfbf91af938d1f253ff5ff12c467041bcced2f460c3116cfd2192177d3bc7004168ee024c3aedb6 SHA512 acc1ce2abda6099b31faf4d1d6e940e8cbb8a3accfd6ca2af550d226b7f12aebc84cd68b118f7c1362895f63a800416e538ebc43e7ae98a1b348656b09373056
 DIST procinfo-ng-2.0.304.tar.bz2 62469 BLAKE2B fc08cc69ebb4f21c52a314c19eea820bc69408d609e59f122c939c14c9159e4348c4ccc07f39f63e96ec046d8af79abd6456a56397eb952d2fff1dd31f89a3e5 SHA512 db336d2ff3bb3b31ac83a51a9d273fae8d16d36bd805f548eda06cb501699473fd8e4b4f9b722165fbf685d76c3fc09bfea9e516eabc37a888e2fae7679c08cf
-EBUILD procinfo-ng-2.0.304-r1.ebuild 932 BLAKE2B fd1d929924cdc3ecdcd7a8c34ce8600b178c617c02e1c186781d2f66625564750df88a3ad300dcdc3879b1a6fa2211e02b69f95c108b2c899afb5c14eb65ff18 SHA512 66eb0269634e24a485465d267988ef4ba31872635a06ace7d624c2c1af5b7ae7de484d82d775f913a9002f4378dc0b292deeb6a10bac166adfd917ddcb982979
+EBUILD procinfo-ng-2.0.304-r1.ebuild 633 BLAKE2B 3af32c93b016576af990545043ebadbdb8507bc82e9ed91e7b76f1d85a6e0d79030a444369f7741bb3c62e173593a7487faaed620b1eea9e6596621c013c594c SHA512 d3d4d45b5d5b4b17ad8c629c627eef37f0326147e2c7ed032049ade6ab85c0c6810efaa6675f3071b0de65fad0c864deae59a7172e16aa59537a7b238f3e9daf
 MISC metadata.xml 356 BLAKE2B afc57b07ed4eea867d788e4d860b9a115d34cfcee6925b81527401556f2d68d1bb94deb1bd4dbf11183c62945caa6584dcf6bb2f02021aaffc6deef5cb9091ec SHA512 3b442e3aff5a26f504f930a0698b376cb0091daa868579ea436aad142222b101c88ace8faaf8fdf9e79dfdb2c7feaeb44f863c0b0d43e7ec85237c56e892255e
diff --git a/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-as-needed.patch b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-as-needed.patch
deleted file mode 100644
index a489f5337879..000000000000
--- a/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in	2009-04-27 05:33:50.000000000 +0200
-+++ Makefile.in.new	2009-10-11 15:22:23.458985416 +0200
-@@ -44,7 +44,7 @@
- cygwin_procstat.cpp cygwin_rendercpupagestat.cpp \
- lib/routines.cpp lib/timeRoutines.cpp lib/prettyPrint.cpp \
- Makefile
--	$(CXX) $(CFLAGS) $(LDFLAGS) procinfo.cpp -o $@
-+	$(CXX) $(CFLAGS) $(LDFLAGS) procinfo.cpp -o $@ $(LIBS)
- 
- #procinfo.o: procinfo.cpp procinfo.h
- #	$(XX) $(CFLAGS) procinfo.cpp -o procinfo.o
diff --git a/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-autotools.patch b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-autotools.patch
new file mode 100644
index 000000000000..9035a5987c37
--- /dev/null
+++ b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-autotools.patch
@@ -0,0 +1,69 @@
+--- a/configure.in
++++ b/configure.in
+@@ -37,13 +37,9 @@
+ AC_ARG_ENABLE(maintainer-mode, [ --enable-maintainer-mode	Enables debug symbols and disables optimizations [default=no]],
+ [ enable_maintainer_mode=yes ])
+ 
+-if test "$enable_maintainer_mode" = "yes"; then
+-	CFLAGS="-O0 -g3 --pipe -Wall"
+-	LDFLAGS="-lncurses"
+-else
+-	CFLAGS="$CFLAGS -pipe -Wall"
+-	LDFLAGS="-s -lncurses"
+-fi
++CXXFLAGS+=" -Wall"
++
++PKG_CHECK_MODULES([NCURSES], [ncurses])
+ 
+ AC_OUTPUT(Makefile)
+ #AC_CONFIG_FILES([Makefile])
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -6,24 +6,30 @@
+ 
+ mandir= @mandir@
+ 
++CC = @CC@
+ CXX = @CXX@
+ 
+ CFLAGS = @CFLAGS@
++CXXFLAGS = @CXXFLAGS@
++
+ LDFLAGS = @LDFLAGS@
+ 
++CPPFLAGS += @NCURSES_CFLAGS@
++LIBS = @NCURSES_LIBS@
++
+ #LDLIBS = -levent
+ 
+ ### Add to taste:
+ 
+-# CFLAGS  = -g 
++# CXXFLAGS  = -g 
+ # LDFLAGS = -g
+ 
+-# CFLAGS += -DPROC_DIR=\"extra2/\"
++# CXXFLAGS += -DPROC_DIR=\"extra2/\"
+ 
+-# CFLAGS += -DDEBUG
++# CXXFLAGS += -DDEBUG
+ # LDLIBS += -ldmalloc
+ 
+-# CFLAGS += -pg
++# CXXFLAGS += -pg
+ # LDFLAGS = -pg
+ 
+ ### End of configurable options.
+@@ -44,10 +50,10 @@
+ cygwin_procstat.cpp cygwin_rendercpupagestat.cpp \
+ lib/routines.cpp lib/timeRoutines.cpp lib/prettyPrint.cpp \
+ Makefile
+-	$(CXX) $(CFLAGS) $(LDFLAGS) procinfo.cpp -o $@
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) procinfo.cpp -o $@ $(LIBS)
+ 
+ #procinfo.o: procinfo.cpp procinfo.h
+-#	$(XX) $(CFLAGS) procinfo.cpp -o procinfo.o
++#	$(CXX) $(CXXFLAGS) procinfo.cpp -o procinfo.o
+ 
+ install: procinfo procinfo.8
+ 	-mkdir -p $(DESTDIR)/$(prefix)/bin
diff --git a/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-man.patch b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-man.patch
index ce818fcd3e77..954281258a24 100644
--- a/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-man.patch
+++ b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-man.patch
@@ -1,5 +1,5 @@
---- procinfo-ng-2.0.217/procinfo.8.orig	2009-01-11 11:21:23.000000000 +0100
-+++ procinfo-ng-2.0.217/procinfo.8	2009-01-11 11:21:48.000000000 +0100
+--- a/procinfo.8
++++ b/procinfo.8
 @@ -6,7 +6,7 @@
  .SH SYNOPSIS
  .B procinfo
diff --git a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
index 791cfbd4c7fb..49ce7d2cac57 100644
--- a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
+++ b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils toolchain-funcs
+inherit autotools
 
 DESCRIPTION="Completely rewrite of the old system monitoring app procinfo"
 HOMEPAGE="https://sourceforge.net/projects/procinfo-ng/"
@@ -12,29 +12,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="|| ( GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="amd64 hppa x86"
-IUSE=""
 
 RDEPEND="
 	sys-libs/ncurses:0=
 	!app-admin/procinfo"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-autotools.patch
 	"${FILESDIR}"/${P}-man.patch
 )
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
-	# removing -s flag as portage does the stripping part and add support
-	# for custom LDFLAGS. Plus correct for --as-needed
-	sed \
-		-e 's:-s -lncurses:${LDFLAGS}:' \
-		-i configure.in || die "sed configure.in failed"
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
-
-src_compile() {
-	emake LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)"
-}