gentoo resync : 24.03.2019

4 files changed, 31 insertions, 24 deletions

diff --git a/sys-process/tiptop/Manifest b/sys-process/tiptop/Manifest
index 532ce7872655..acfd53e876d8 100644
--- a/sys-process/tiptop/Manifest
+++ b/sys-process/tiptop/Manifest
@@ -1,7 +1,6 @@
+AUX tiptop-2.3.1-tinfo.patch 428 BLAKE2B d055899343b616e8c487be4285c86659f4912cd817c58639c206af365981440c3c6daefebc086409bcbdf294b5db60d477a9994be29eda89245c10d4e0916dfa SHA512 c22e2129deb1f41531ac515a4ded03f8d2afd9c12eb6fbb132758c239d3107443b80ac1f8318dd273ec701afd7ef247e914d7fa3fcd5e908ef5951ae31d953c2
 DIST tiptop-2.2.tar.gz 99602 BLAKE2B 26983a1fe8952a78220d88861ccc7f773a6fe04797951729a50d6b2c288acb65399a8d887f0d37c0957364224c7f0aebab7d76c7ecd122622c8dc146c9f540ae SHA512 533624a134fcab5e30126412b32bd6a484851ba192ef452877a2199ee3c083fe0222af28c556a8f0769457b5ee7229769b163b8d07e13d03f9f14e192a541d34
 DIST tiptop-2.3.1.tar.gz 100993 BLAKE2B fd05d9d59fda2e81c194dedabb7d9d94220e790a8118048ebc3edd84706471a8892a918e02ebc7436c3c75e7a98c5c3ab98e11d614ced304ac81fdf8ce1951ed SHA512 73d275bc3957583524c872b401cf4fa773de7b4e7b7177f1787851f43e7c4aeefd953eb50b2dbce3babfc7a1c46707370ba4ad06998260177994b2eafb91395b
-DIST tiptop-2.3.tar.gz 101006 BLAKE2B 1fadec537398f7818302fef8e3d982bbea5bacb26fcf7d84f47704260f0d526b318c1614e94827737332ab51636dea62a479999446d2500ded377c79f2a1e03d SHA512 e09ad1fd7063c9b8b7351b5c114cfa1f8e1737b1cfb73c4c869612c3887b060a838c33bdee330349225b48cd73d295fef24cd36c6eb36b566d20adff2dae53d5
 EBUILD tiptop-2.2.ebuild 382 BLAKE2B 572daf9bb396b19b1a2a8c838b06ed6d091d319088dad2bb735f381116ce34fb3f88d833d4f6fac4294f3f790cf64c9cc7732a006f31d0df63757e5f2a9097eb SHA512 f6a183d723696e31046edace659567aba706f86a526d29d589ee0c88a8b6c0afe090aa7ff749d5ba0f2054ea090b8d670d64b36002910387b728e685442b5d41
-EBUILD tiptop-2.3.1.ebuild 384 BLAKE2B 69b5702ec87d73bb58a069218efdadd8f56d4ff7599c639211aaf6f568a1dd26c01c953a29af0b458964575c2b1a525e920e271549b1f1d9b86433829eecf011 SHA512 7fbfe5784397b5819fee8c696d270a79cc4b2ee5cff752d0ff19420766ef0c639d470bb1d190c031ba1737a3e9bc6ade1ff013b5783070390bf3b0d52b8e07da
-EBUILD tiptop-2.3.ebuild 384 BLAKE2B ad7197f52bb5e10f78ad239a895fce2c3368a01288323b32517db82d4036bffd0c23c931f81a5a2c19a7c675da9f07358ea3c83548350835a4f255ab4210100a SHA512 adfe01fc9670f696a28d0779ea78a2731705459e7336eb9f6f77c84ed12155eb9ba70dabf4f4ad9e6f2f997f7281c51e2dcef3e0947ff9ee38525643adc22e8b
+EBUILD tiptop-2.3.1.ebuild 517 BLAKE2B 4c5e191edd28705fc19d5b96535d718166039b674d54aea0ddd238db6ede76a04558fc7a920c40317c1e7da8177a89a843b01c3cc94bb59b2463a65310f67798 SHA512 539ed6c8274949fbc7bd868aa96996025df6b990846b681c1e952591a7de4b65abd8ab67612cb3ddbbcd321d66060292f3db495c5abf4e169d5ebc1e39677017
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/sys-process/tiptop/files/tiptop-2.3.1-tinfo.patch b/sys-process/tiptop/files/tiptop-2.3.1-tinfo.patch
new file mode 100644
index 000000000000..0f6c3c740a1e
--- /dev/null
+++ b/sys-process/tiptop/files/tiptop-2.3.1-tinfo.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/618124
+
+--- tiptop-2.3.1/configure.ac
++++ tiptop-2.3.1/configure.ac
+@@ -24,6 +24,7 @@
+                   AC_DEFINE([HAVE_LIBCURSES], [1], [Define to 1 if you have the `curses' library (-lcurses).])
+                   LIBS="-lcurses $LIBS"],
+              [have_curses=no])
++AC_CHECK_LIB([tinfo], [keypad], LIBS="-ltinfo $LIBS")
+ fi
+ 
+ if test ! x$disable_libxml2 = xno; then # check only if not disabled
diff --git a/sys-process/tiptop/tiptop-2.3.1.ebuild b/sys-process/tiptop/tiptop-2.3.1.ebuild
index 0f5fd18600fe..fcbc8c638170 100644
--- a/sys-process/tiptop/tiptop-2.3.1.ebuild
+++ b/sys-process/tiptop/tiptop-2.3.1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="top for performance counters"
 HOMEPAGE="http://tiptop.gforge.inria.fr/"
@@ -12,6 +14,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="sys-libs/ncurses
-	dev-libs/libxml2"
+RDEPEND="
+	sys-libs/ncurses:0=
+	dev-libs/libxml2:=
+"
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.1-tinfo.patch #618124
+)
+
+src_prepare() {
+	default
+	eautoreconf #618124
+}
diff --git a/sys-process/tiptop/tiptop-2.3.ebuild b/sys-process/tiptop/tiptop-2.3.ebuild
deleted file mode 100644
index 4d1b047023d6..000000000000
--- a/sys-process/tiptop/tiptop-2.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="top for performance counters"
-HOMEPAGE="http://tiptop.gforge.inria.fr/"
-SRC_URI="http://${PN}.gforge.inria.fr/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}"