diff options
author | Thomas Deutschmann <whissi@gentoo.org> | 2020-08-27 13:47:46 +0200 |
---|---|---|
committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-08-27 13:48:15 +0200 |
commit | 31400e1313739f5aec35d7582dc643abf783f714 (patch) | |
tree | e2216df462872c445a3fc9598bc4f7dd24a8566b /sys-process | |
parent | sys-process/htop: bump to v3.0.0 (diff) | |
download | gentoo-31400e1313739f5aec35d7582dc643abf783f714.tar.gz gentoo-31400e1313739f5aec35d7582dc643abf783f714.tar.bz2 gentoo-31400e1313739f5aec35d7582dc643abf783f714.zip |
sys-process/htop: drop old
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'sys-process')
-rw-r--r-- | sys-process/htop/Manifest | 1 | ||||
-rw-r--r-- | sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch | 52 | ||||
-rw-r--r-- | sys-process/htop/htop-3.0.0_beta5.ebuild | 72 |
3 files changed, 0 insertions, 125 deletions
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest index 9498c38b03fe..eb502eadccb8 100644 --- a/sys-process/htop/Manifest +++ b/sys-process/htop/Manifest @@ -1,3 +1,2 @@ DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e DIST htop-3.0.0.tar.gz 179371 BLAKE2B 7501d8277eb97e39f7a8e2e9191bdde97deca6f3240a3e497ce55e71b0659122223356d4ff03086f9303b82ea4de0fa4e7909baca6de063ac6b22d7b6530f9be SHA512 36dc37b416b9917005007448fe73fdd6475a3f7f8442a083923d3f5dfb706d0f1731255522a99b67cc547b239acb1c68b144f8d600e243eeba160b2a43e8339a -DIST htop-3.0.0_beta5.tar.gz 175780 BLAKE2B f7d03485e74387c656e5a576f0a53c832bac668cee79750402335b2051a17d405392b99316f1546cc76fa83dc3bc85055ca58b928225df0e162ffdb9c1889a5f SHA512 eaa04a278257a1447cd60825083c864d3c23a4a5607447ce05356d550f42ff68a810f14bf91314b7266f9741aab8141d67d98316a31fa7806fb6b858cc804344 diff --git a/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch b/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch deleted file mode 100644 index 6a2004b3cf77..000000000000 --- a/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ee711740d2809e7aa3ebd57d58bfc02b1e9b034b Mon Sep 17 00:00:00 2001 -From: David Seifert <soap@gentoo.org> -Date: Thu, 23 Jan 2020 17:27:10 +0100 -Subject: [PATCH] Fix GCC 10 switch to `-fno-common` default - ---- - CRT.h | 6 +++--- - linux/LinuxProcess.h | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CRT.h b/CRT.h -index 933fe068..65998ac6 100644 ---- a/CRT.h -+++ b/CRT.h -@@ -140,7 +140,7 @@ extern const char **CRT_treeStr; - - extern int CRT_delay; - --int* CRT_colors; -+extern int* CRT_colors; - - extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT]; - -@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount; - - extern int CRT_scrollWheelVAmount; - --char* CRT_termType; -+extern char* CRT_termType; - - // TODO move color scheme to Settings, perhaps? - - extern int CRT_colorScheme; - --void *backtraceArray[128]; -+extern void *backtraceArray[128]; - - #if HAVE_SETUID_ENABLED - -diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h -index 6ce3037d..cbd77be9 100644 ---- a/linux/LinuxProcess.h -+++ b/linux/LinuxProcess.h -@@ -144,7 +144,7 @@ typedef struct LinuxProcess_ { - #endif - - --long long btime; /* semi-global */ -+extern long long btime; /* semi-global */ - - extern ProcessFieldData Process_fields[]; - diff --git a/sys-process/htop/htop-3.0.0_beta5.ebuild b/sys-process/htop/htop-3.0.0_beta5.ebuild deleted file mode 100644 index 241e898507e0..000000000000 --- a/sys-process/htop/htop-3.0.0_beta5.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit autotools linux-info python-any-r1 - -DESCRIPTION="interactive process viewer" -HOMEPAGE="https://hisham.hm/htop/" -if [[ "${PV}" = *_beta* ]] ; then - SRC_URI="https://github.com/hishamhm/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P/_}" -else - SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -fi -LICENSE="BSD GPL-2" -SLOT="0" -IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver" - -RDEPEND="sys-libs/ncurses:0=[unicode?]" -DEPEND="${RDEPEND} - ${PYTHON_DEPS}" -BDEPEND="virtual/pkgconfig" - -DOCS=( ChangeLog README ) - -CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" - -PATCHES=( - # Fixes from upstream (can usually be removed with next version bump) - "${FILESDIR}"/${PN}-2.1.0-header_updates.patch - "${FILESDIR}"/${PN}-3.0.0_beta5-gcc-10.patch -) - -pkg_setup() { - if ! has_version sys-process/lsof; then - ewarn "To use lsof features in htop (what processes are accessing" - ewarn "what files), you must have sys-process/lsof installed." - fi - - python-any-r1_pkg_setup - linux-info_pkg_setup -} - -src_prepare() { - if [[ "${PV}" != *_beta* ]] ; then - rm missing || die - fi - - default - eautoreconf - python_fix_shebang scripts/MakeHeader.py -} - -src_configure() { - [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971 - - local myeconfargs=( - # fails to build against recent hwloc versions - --disable-hwloc - --enable-taskstats - $(use_enable kernel_linux cgroup) - $(use_enable kernel_linux linux-affinity) - $(use_enable openvz) - $(use_enable unicode) - $(use_enable vserver) - ) - econf ${myeconfargs[@]} -} |