summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2020-05-30 12:12:53 +0200
committerFabian Groffen <grobian@gentoo.org>2020-05-30 12:13:08 +0200
commited270e4a02b2450c9e18d01710baa7860478f1cc (patch)
tree177953f9b8c3acfcb99cf71f6389af452ae3a29a /sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
parentnet-dns/pdns: Mark 4.3.0 stable on amd64/x86 (diff)
downloadgentoo-ed270e4a02b2450c9e18d01710baa7860478f1cc.tar.gz
gentoo-ed270e4a02b2450c9e18d01710baa7860478f1cc.tar.bz2
gentoo-ed270e4a02b2450c9e18d01710baa7860478f1cc.zip
sys-process/unixtop-3.8_beta1-r3: fix compilation on Linux #726052
Albeit not really keyworded, fix compilation on Linux, and add some other fixes too: - block sys-process/procps for conflicting /usr/bin/top - add resize crash patch - add patch to allow compilation on Linux - fix curses patch to work with ncurses[tinfo] Closes: https://bugs.gentoo.org/726052 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild')
-rw-r--r--sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild b/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
index c4f9598cf00b..c4ee3dd47486 100644
--- a/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
+++ b/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,8 @@ KEYWORDS="~amd64-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
IUSE=""
RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ !sys-process/procps"
S=${WORKDIR}/top-${PV/_/}
@@ -26,6 +27,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.8_beta1-memleak-fix-v2.patch
"${FILESDIR}"/${PN}-3.8_beta1-high-threadid-crash.patch
"${FILESDIR}"/${PN}-3.8_beta1-percent-cpu.patch
+ "${FILESDIR}"/${PN}-3.8_beta1-winch-segfault.patch
+ "${FILESDIR}"/${PN}-3.8_beta1-recent-linux.patch
)
src_prepare() {