From 3b08f674e3f771b49370edb144dab0958c8cf721 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 31 Aug 2021 08:59:54 +0100 Subject: gentoo resync : 31.08.2021 --- sys-process/Manifest.gz | Bin 9676 -> 9679 bytes sys-process/glances/Manifest | 2 +- sys-process/glances/glances-3.2.2.ebuild | 2 +- sys-process/htop/Manifest | 10 +- sys-process/htop/files/htop-3.0.3-tinfo.patch | 38 ----- .../htop-3.0.4-sort_column_header_highlight.patch | 153 --------------------- sys-process/htop/htop-3.0.2-r1.ebuild | 62 --------- sys-process/htop/htop-3.0.4-r2.ebuild | 71 ---------- sys-process/htop/htop-3.1.0_rc1.ebuild | 92 +++++++++++++ sys-process/htop/metadata.xml | 1 + sys-process/nmon/Manifest | 2 +- sys-process/nmon/metadata.xml | 9 +- sys-process/procps/Manifest | 3 +- .../procps/files/procps-3.3.17-musl-fix.patch | 78 +++++++++++ sys-process/procps/procps-3.3.17-r1.ebuild | 20 ++- sys-process/psmisc/Manifest | 2 +- sys-process/psmisc/psmisc-23.4-r1.ebuild | 12 ++ 17 files changed, 212 insertions(+), 345 deletions(-) delete mode 100644 sys-process/htop/files/htop-3.0.3-tinfo.patch delete mode 100644 sys-process/htop/files/htop-3.0.4-sort_column_header_highlight.patch delete mode 100644 sys-process/htop/htop-3.0.2-r1.ebuild delete mode 100644 sys-process/htop/htop-3.0.4-r2.ebuild create mode 100644 sys-process/htop/htop-3.1.0_rc1.ebuild create mode 100644 sys-process/procps/files/procps-3.3.17-musl-fix.patch (limited to 'sys-process') diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz index f3e55c18f0e0..d21c81855885 100644 Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest index e345d0b5f96c..0b2cc006038f 100644 --- a/sys-process/glances/Manifest +++ b/sys-process/glances/Manifest @@ -2,5 +2,5 @@ AUX disable-update-check.patch 992 BLAKE2B d06bc123aef2aec89bb4cca40334183aa5b6d DIST glances-3.2.1.tar.gz 6851329 BLAKE2B 3f8eb91a0957961d0ed2465d8025d25158303cc8332b7a976c2af0bbd671405aae3b71b1d3a63eeb86ddb0d6e500b955bb0e1e5a93c0ba0b88835f88872eb979 SHA512 e2f8a46a9bc3b2e3aa16d0716b34e06991029df9dec4c29ef70c65b5fb7c96dee3c71cc565b551e35a31aa1c7e1a92538b158c2e660d15b22defad8ae04c4eb3 DIST glances-3.2.2.tar.gz 6861708 BLAKE2B 99ed3298724a82f036660f05cfd374f8dfa4883ef3c710dfe789ed9f9986bfe873117096564f1dd46d91cd3d0304e0cd1876d17ecd6e3aad98c7dd9df2095265 SHA512 e77b62e5fa6131914b56f0b5249789b3bcac0c625cd429eeb0870a14be55f15c401956c002376e5868fa1332bbb219e9bd3a5bd14c739e3404b068a063af6821 EBUILD glances-3.2.1.ebuild 2697 BLAKE2B 085491a6c554e3ed9ae6c4f7e9a2351deb76926be98e2acc74222541f94d44655dbb08239e6ae4a01080ea5c86dcf77aa3bb2208ab9e2c40042fa1767ea2ef77 SHA512 f9b16b89a0bec90bdb9286c6a8ba3b320d22d4c311128ad5d90be0ac82b50fdad98181466fddc558c85993ed63970b6f877549ae77e12e0f1a740a9dccb14005 -EBUILD glances-3.2.2.ebuild 2646 BLAKE2B f785e68002a48d0bdbf14c66df5c98f7a863460803a39c602905ff9ea8fad06871c7a38796910e671de41d06bd67715033603fbb64f9fd56db734856025af5d7 SHA512 ed80caa62c7251ad95d8893c9d116405df45e04488e80b0e60b9efd1351d7015f476f8935bc02ba296d856fe7624bd03efbfcb911d4402489d61158c80bba5df +EBUILD glances-3.2.2.ebuild 2643 BLAKE2B 167af3433c5fc72643a5c291efaa30c762d55c321042cfd6e7c18914aa08cf55cb61fabcfb237e30caa7f101b1acf29092e3ca519e86a8325acabf8963d973e6 SHA512 ced4681e8a96f559bdca362b1eecfebdcc04e9c9d35b984efd6128a18dd66630e025266b44676285ee9238bbd62e1df0d28a97fe5a9749b756b5fc3802831fce MISC metadata.xml 856 BLAKE2B e3d750f1586383ffabb204739bd0636a1b7729b4b704f03f03b356afd540482571780aa4de84620ac2aa4e832e4250867228e59cb5ed3f0f6867e7bc65104246 SHA512 8315a7896acc1068a2f7a6efa2a99078090677f685a90bd2c5220c043fd25e03d137ea0aeea1cd3660544f139970508037e9447cfb08d82fdb4023c856709e73 diff --git a/sys-process/glances/glances-3.2.2.ebuild b/sys-process/glances/glances-3.2.2.ebuild index e755051c8045..fc337c591a1a 100644 --- a/sys-process/glances/glances-3.2.2.ebuild +++ b/sys-process/glances/glances-3.2.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=" diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest index a0bda6cccb2b..1d694e548a10 100644 --- a/sys-process/htop/Manifest +++ b/sys-process/htop/Manifest @@ -1,9 +1,5 @@ -AUX htop-3.0.3-tinfo.patch 1643 BLAKE2B d3aadf6f244fda024cf4d129a9972fa864f24768a9e6bd5858af1964832064669d034f86a63163568e3c982efc11ce6593a81d108fbbbe8a0c507b39241cfe16 SHA512 9fc5763418f3a380d1841febf2f09ef795a012ca91454f4f36c763d9c74660806a1cfc527d3a686cdfe94e7d6efafaef79ad2d312fd1f8431da24ddbf7f7cb6e -AUX htop-3.0.4-sort_column_header_highlight.patch 5294 BLAKE2B f046ca56c10151d534b533af9e76a84311283729a9f1c145833354f184593ae6b4a18e4b007904e00746524cdf07a6756bfea7137516fd12f7fa4be1bafe9645 SHA512 e04046dde72ae3ba0b9ff89160ba3fa1d6c3f45ed3ef98ff5fda61746f26d304b5e2b157589375f781d2a298437a8e554a332bc913ead915b37cda43701796c3 -DIST htop-3.0.2.tar.gz 176132 BLAKE2B 9abc28461d346eeac7f9741bc1ba08c898d00be013abce972be4370b9b35d92661fcb4521fa715bc779c1c9b56bc3c0eeb5375c0df8ec7585df3774ac67ca504 SHA512 5b578972e40e3229aa8b2bdc931c4c8bceaafd2a150b02e0257ab35a4fbac25852e959ecc472bd6747be57ea8734b59cc4b872a5ac829624cc80e1722c54d868 -DIST htop-3.0.4.tar.gz 296224 BLAKE2B b8fc4fe7c595f0a22b253f1eeea24d571c87401a426b8f6dba0ce15d98ea77ca94bc286428386cbf478f0e7ea4afde0e86e5e6b93bb88af616ba474e45e745f5 SHA512 d57e4fd326791bd2306f4a6ce2c4f4bf0499a0050efbaeb71a211148fa52993f707d8afdf0292dc26234cffdcba84a97e1d4422bc61aec40ba3ef9ebd91ebf6c DIST htop-3.0.5.tar.gz 297931 BLAKE2B a6e62f99ef349809d11bb14b4d515036601aa457507b34a96354607f136cc4e0d3d40a715f1576c70833db051d989fa55142b4f8bba0f5f432ea3676364d9575 SHA512 7dae83ceff6b3f30e69c30c9559dbb3bf69281df006c6a26e4e2c49dd5a147e05ed7bafeeac8ec5bedc8ba670470100cc128209a92654858f98df09a9394594f -EBUILD htop-3.0.2-r1.ebuild 1516 BLAKE2B fe9bbfd4beefe5b298e3a314034d3311687d6aaac92c08ccb4ac0d0f36240d61f7cb7f232cdffc1e01597123d8ae43ddfb375843b6ca098ff22fedf3fd06ac0f SHA512 8bd0acf1647cbad6e7c9f153adde078d8d4e9532cd5bcc1ea57b69419d88f504b8fde95822d1ea636740430349e279df7b544bfae588140f3e09b7c5b990dcbe -EBUILD htop-3.0.4-r2.ebuild 1701 BLAKE2B b7b42f6d53516ee41e3121c0b3b8aa806b777b44ac7363884e9a4d9c55a561b9237929687e5eaf4ef59c7d1f0da0205cd4986daa648c4836db4f358b88af2bce SHA512 ac7b7d938bf10a7bd1879d804b91570bd0b431844ebd354490a46b7fd1cce99027d5f991529a746f42ffd9d94a76ef66d9c5072a636941bd36c79589967f2986 +DIST htop-3.1.0_rc1.tar.gz 378045 BLAKE2B 65d5f2bdb6e41fb0a4edd76c62a36e951bd86a67ebb9908ca712b2ee7b5f9714c3fe5cd4193885b869b96dcd73bbf945ab22fcd31aa11d90598f9d9953ed4b0e SHA512 f917dbb8ba0de1a9f703423c13cec19f0f69da765df320739eeabf0e928495ec70cdd8eb0cca2871226cd6b472a713ee5ebc43aefa02b2ffbd6c29b1208f5cad EBUILD htop-3.0.5-r1.ebuild 1778 BLAKE2B 7019c1a5668339b8e9efe626e01d8c44d6d802659cf8283069dad92943912d34d40f77e75bfd7834e35e07c129edcd71681fe621a3f61731d3f35aa85b72668c SHA512 1d3af3d7c65d6808eee5083f95a865715a7302da4d2b90f91c84b2fb6ba355cf474eb8f89946704af006d33dc5ad44f4cae430175193af5a65cfac0b8650788b -MISC metadata.xml 911 BLAKE2B e92af64c9d4ead9348cecca14425e8778d3d69e63cd45063e76c1a8052610e6155299c01606aa3a3540ec3b432629d074cda74130ad86f1d31bb09957fb51a75 SHA512 686e8459e279182fcba99f65d67491c11ed144149207e2ac952797b6d66f145ef7b2ea19a5116e9e9a70d6a6ad6d4ecbf106c8f3734e45019f7e274311437ece +EBUILD htop-3.1.0_rc1.ebuild 2012 BLAKE2B 3a61c733c911ee1941cf015857f97ba204fa347ecbbd62af5f77580981d8a69d2e7885b833ed7e32c2b45d387601fe1284dd80dd8bdea3de60a965c656218a33 SHA512 e900adff6e53f58da94986ea81d59f9b6cc33314ac91976d4c18436ba416b76977a0d2f7035403443dc6ffc6b690269add0b683465e88918689f6be01dd4adf1 +MISC metadata.xml 1011 BLAKE2B 9986489fee7883f5b6619255ed00835d169d6cfcde7bb4d8cbeecc2670a623ad8f6f0aa1195dad8fa8a1cc6c77e327a2ae87c027ce47417255401abb68cbee48 SHA512 8ae67f87cbb4ab8e8875a530da7e3a8efe1b3d7f351161114c2077095fe05adcad60b5d4e0728f60ed9bec416dfd09530d8416df13bd6154d31809b73b5415b1 diff --git a/sys-process/htop/files/htop-3.0.3-tinfo.patch b/sys-process/htop/files/htop-3.0.3-tinfo.patch deleted file mode 100644 index ea65a799ed7a..000000000000 --- a/sys-process/htop/files/htop-3.0.3-tinfo.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ead978bce6236a55d75b72e059686766fa708db4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= -Date: Mon, 7 Dec 2020 15:30:56 +0100 -Subject: [PATCH] configure: check for additional linker flags for keypad(3) - -Gentoo requires an explicit addition of -ltinfo - -Resolves: https://bugs.gentoo.org/show_bug.cgi?id=690840 ---- - configure.ac | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 460b16aa..f91d8e92 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -217,6 +217,10 @@ if test "x$enable_unicode" = xyes; then - [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], - [AC_CHECK_HEADERS([ncurses/curses.h],[:], - [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) -+ -+ # check if additional linker flags are needed for keypad(3) -+ # (at this point we already link against a working ncurses library with wide character support) -+ AC_SEARCH_LIBS([keypad], [tinfow tinfo]) - else - HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", - HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", -@@ -229,6 +233,10 @@ else - [AC_CHECK_HEADERS([ncurses/curses.h],[:], - [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], - [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) -+ -+ # check if additional linker flags are needed for keypad(3) -+ # (at this point we already link against a working ncurses library) -+ AC_SEARCH_LIBS([keypad], [tinfo]) - fi - - if test "$my_htop_platform" = "freebsd"; then diff --git a/sys-process/htop/files/htop-3.0.4-sort_column_header_highlight.patch b/sys-process/htop/files/htop-3.0.4-sort_column_header_highlight.patch deleted file mode 100644 index a2b6a0d4259a..000000000000 --- a/sys-process/htop/files/htop-3.0.4-sort_column_header_highlight.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 86d293125565a15bbd94683080dbc755c5d7edee Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= -Date: Tue, 22 Dec 2020 17:12:38 +0100 -Subject: [PATCH] Restore highlighted header of current sorted process column - ---- - MainPanel.c | 10 ++++++++-- - Panel.c | 22 ++++++++++------------ - Panel.h | 6 ++++-- - ScreenManager.c | 2 +- - htop.c | 2 -- - 5 files changed, 23 insertions(+), 19 deletions(-) - -diff --git a/MainPanel.c b/MainPanel.c -index 949138dc..c8a4c059 100644 ---- a/MainPanel.c -+++ b/MainPanel.c -@@ -102,7 +102,7 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) { - MainPanel_updateTreeFunctions(this, this->state->settings->treeView); - } - if (reaction & HTOP_UPDATE_PANELHDR) { -- ProcessList_printHeader(this->state->pl, Panel_getHeader(super)); -+ result |= REDRAW; - } - if (reaction & HTOP_REFRESH) { - result |= REFRESH; -@@ -168,13 +168,19 @@ static void MainPanel_drawFunctionBar(Panel* super) { - } - } - -+static void MainPanel_printHeader(Panel* super) { -+ MainPanel* this = (MainPanel*) super; -+ ProcessList_printHeader(this->state->pl, &super->header); -+} -+ - const PanelClass MainPanel_class = { - .super = { - .extends = Class(Panel), - .delete = MainPanel_delete - }, - .eventHandler = MainPanel_eventHandler, -- .drawFunctionBar = MainPanel_drawFunctionBar -+ .drawFunctionBar = MainPanel_drawFunctionBar, -+ .printHeader = MainPanel_printHeader - }; - - MainPanel* MainPanel_new() { -diff --git a/Panel.c b/Panel.c -index b36f1efc..26a0c0ec 100644 ---- a/Panel.c -+++ b/Panel.c -@@ -76,13 +76,6 @@ void Panel_setSelectionColor(Panel* this, ColorElements colorId) { - this->selectionColorId = colorId; - } - --RichString* Panel_getHeader(Panel* this) { -- assert (this != NULL); -- -- this->needsRedraw = true; -- return &(this->header); --} -- - inline void Panel_setHeader(Panel* this, const char* header) { - RichString_writeWide(&(this->header), CRT_colors[PANEL_HEADER_FOCUS], header); - this->needsRedraw = true; -@@ -228,15 +221,20 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect - int x = this->x; - int h = this->h; - -+ const int header_attr = focus -+ ? CRT_colors[PANEL_HEADER_FOCUS] -+ : CRT_colors[PANEL_HEADER_UNFOCUS]; -+ if (force_redraw) { -+ if (Panel_printHeaderFn(this)) -+ Panel_printHeader(this); -+ else -+ RichString_setAttr(&this->header, header_attr); -+ } - int headerLen = RichString_sizeVal(this->header); - if (headerLen > 0) { -- int attr = focus -- ? CRT_colors[PANEL_HEADER_FOCUS] -- : CRT_colors[PANEL_HEADER_UNFOCUS]; -- attrset(attr); -+ attrset(header_attr); - mvhline(y, x, ' ', this->w); - if (scrollH < headerLen) { -- RichString_setAttr(&this->header, attr); - RichString_printoffnVal(this->header, y, x, scrollH, - MINIMUM(headerLen - scrollH, this->w)); - } -diff --git a/Panel.h b/Panel.h -index 959c0b78..63659e3c 100644 ---- a/Panel.h -+++ b/Panel.h -@@ -37,11 +37,13 @@ typedef enum HandlerResult_ { - - typedef HandlerResult (*Panel_EventHandler)(Panel*, int); - typedef void (*Panel_DrawFunctionBar)(Panel*); -+typedef void (*Panel_PrintHeader)(Panel*); - - typedef struct PanelClass_ { - const ObjectClass super; - const Panel_EventHandler eventHandler; - const Panel_DrawFunctionBar drawFunctionBar; -+ const Panel_PrintHeader printHeader; - } PanelClass; - - #define As_Panel(this_) ((const PanelClass*)((this_)->super.klass)) -@@ -49,6 +51,8 @@ typedef struct PanelClass_ { - #define Panel_eventHandler(this_, ev_) (assert(As_Panel(this_)->eventHandler), As_Panel(this_)->eventHandler((Panel*)(this_), ev_)) - #define Panel_drawFunctionBarFn(this_) As_Panel(this_)->drawFunctionBar - #define Panel_drawFunctionBar(this_) (assert(As_Panel(this_)->drawFunctionBar), As_Panel(this_)->drawFunctionBar((Panel*)(this_))) -+#define Panel_printHeaderFn(this_) As_Panel(this_)->printHeader -+#define Panel_printHeader(this_) (assert(As_Panel(this_)->printHeader), As_Panel(this_)->printHeader((Panel*)(this_))) - - struct Panel_ { - Object super; -@@ -84,8 +88,6 @@ void Panel_done(Panel* this); - - void Panel_setSelectionColor(Panel* this, ColorElements colorId); - --RichString* Panel_getHeader(Panel* this); -- - void Panel_setHeader(Panel* this, const char* header); - - void Panel_move(Panel* this, int x, int y); -diff --git a/ScreenManager.c b/ScreenManager.c -index 57cb564d..4c74e477 100644 ---- a/ScreenManager.c -+++ b/ScreenManager.c -@@ -141,7 +141,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) { - - bool timedOut = true; - bool redraw = true; -- bool force_redraw = false; -+ bool force_redraw = true; - bool rescan = false; - int sortTimeout = 0; - int resetSortTimeout = 5; -diff --git a/htop.c b/htop.c -index 4b43ed2a..aa6d9147 100644 ---- a/htop.c -+++ b/htop.c -@@ -313,8 +313,6 @@ int main(int argc, char** argv) { - - MainPanel_updateTreeFunctions(panel, settings->treeView); - -- ProcessList_printHeader(pl, Panel_getHeader((Panel*)panel)); -- - State state = { - .settings = settings, - .ut = ut, diff --git a/sys-process/htop/htop-3.0.2-r1.ebuild b/sys-process/htop/htop-3.0.2-r1.ebuild deleted file mode 100644 index 13b5c03ad252..000000000000 --- a/sys-process/htop/htop-3.0.2-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit autotools linux-info python-any-r1 - -DESCRIPTION="interactive process viewer" -HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop" -SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" - -LICENSE="BSD GPL-2" -SLOT="0" -IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver" - -BDEPEND="virtual/pkgconfig" -RDEPEND="sys-libs/ncurses:=[unicode(+)?]" -DEPEND="${RDEPEND} - ${PYTHON_DEPS}" - -DOCS=( ChangeLog README ) - -CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" - -PATCHES=( - "${FILESDIR}/${PN}-3.0.3-tinfo.patch" #690840 -) - -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() { - default - - eautoreconf -} - -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[@]} -} diff --git a/sys-process/htop/htop-3.0.4-r2.ebuild b/sys-process/htop/htop-3.0.4-r2.ebuild deleted file mode 100644 index 65e53029fa21..000000000000 --- a/sys-process/htop/htop-3.0.4-r2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools linux-info python-any-r1 - -DESCRIPTION="interactive process viewer" -HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop" -SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" - -LICENSE="BSD GPL-2" -SLOT="0" -IUSE="debug hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver" - -BDEPEND="virtual/pkgconfig" -RDEPEND="sys-libs/ncurses:=[unicode(+)?] - hwloc? ( sys-apps/hwloc ) - lm-sensors? ( sys-apps/lm-sensors )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS}" - -DOCS=( ChangeLog README ) - -CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" - -S="${WORKDIR}/${P/_}" - -PATCHES=( - "${FILESDIR}/${P}-sort_column_header_highlight.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() { - default - - eautoreconf -} - -src_configure() { - [[ ${CBUILD} != ${CHOST} ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971 - - local myeconfargs=( - $(use_enable debug) - $(use_enable hwloc) - $(use_enable openvz) - $(use_enable unicode) - $(use_enable vserver) - $(use_with lm-sensors sensors) - ) - - if ! use hwloc && use kernel_linux ; then - myeconfargs+=( --enable-linux-affinity ) - else - myeconfargs+=( --disable-linux-affinity ) - fi - - econf ${myeconfargs[@]} -} diff --git a/sys-process/htop/htop-3.1.0_rc1.ebuild b/sys-process/htop/htop-3.1.0_rc1.ebuild new file mode 100644 index 000000000000..97f75eb53fee --- /dev/null +++ b/sys-process/htop/htop-3.1.0_rc1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit autotools linux-info python-any-r1 xdg-utils + +DESCRIPTION="interactive process viewer" +HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop" +SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +LICENSE="BSD GPL-2" +SLOT="0" +IUSE="caps debug delayacct hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + sys-libs/ncurses:=[unicode(+)?] + hwloc? ( sys-apps/hwloc ) + kernel_linux? ( + caps? ( sys-libs/libcap ) + delayacct? ( dev-libs/libnl:3 ) + lm-sensors? ( sys-apps/lm-sensors ) + ) +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS}" + +DOCS=( ChangeLog README ) + +CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" + +S="${WORKDIR}/${P/_}" + +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() { + default + + eautoreconf +} + +src_configure() { + [[ ${CBUILD} != ${CHOST} ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971 + + local myeconfargs=( + --enable-unicode + $(use_enable debug) + $(use_enable hwloc) + $(use_enable !hwloc affinity) + $(use_enable openvz) + $(use_enable unicode) + $(use_enable vserver) + ) + + if use kernel_linux ; then + myeconfargs+=( + $(use_enable caps capabilities) + $(use_enable delayacct) + $(use_enable lm-sensors sensors) + ) + else + myeconfargs+=( + --disable-capabilities + --disable-delayacct + --disable-sensors + ) + fi + + econf ${myeconfargs[@]} +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/sys-process/htop/metadata.xml b/sys-process/htop/metadata.xml index ffeb36553655..a2e53594d437 100644 --- a/sys-process/htop/metadata.xml +++ b/sys-process/htop/metadata.xml @@ -10,6 +10,7 @@ Lars Wendler + Enable Linux delay accounting support via dev-libs/libnl Use sys-apps/hwloc for CPU affinity support Enable openvz support Enable vserver support diff --git a/sys-process/nmon/Manifest b/sys-process/nmon/Manifest index 4676c3adddd2..9bd315d8554b 100644 --- a/sys-process/nmon/Manifest +++ b/sys-process/nmon/Manifest @@ -6,4 +6,4 @@ EBUILD nmon-16g.ebuild 958 BLAKE2B 5086bd2d5d81c935022974c242b9de9fcb5126bb5f5d3 EBUILD nmon-16i.ebuild 975 BLAKE2B 16379dca3964be32acdb9ff417607183eee128c7c5b2677cbe3ec581522f60577220004fe2da6ed13910eb2b51fd73e8c0f518a8d8f0b543d36d5cde1a187288 SHA512 1787a9fe96a4b24024bf6c1cc53f4a3001b8cbdbafe8b554ab2c31b4d1fb72252ae33c46f52d74e8a57eff7f20bd76522f0b1044425ff8495946caa3267b6415 EBUILD nmon-16j.ebuild 975 BLAKE2B 16379dca3964be32acdb9ff417607183eee128c7c5b2677cbe3ec581522f60577220004fe2da6ed13910eb2b51fd73e8c0f518a8d8f0b543d36d5cde1a187288 SHA512 1787a9fe96a4b24024bf6c1cc53f4a3001b8cbdbafe8b554ab2c31b4d1fb72252ae33c46f52d74e8a57eff7f20bd76522f0b1044425ff8495946caa3267b6415 EBUILD nmon-16m.ebuild 982 BLAKE2B d88ef3baa7bfc7830aa188d666af5da401603d6d1843c46c09e37b05bd7625a4825d8cd82dfa43c1d8c8ee34e1bf535d08d1dacf5deaaea9786b3a566d2b6484 SHA512 5fe6863a6dbf54b616d4515af9fba21955a48790498d83e3548a47d005450b55eafc2a4b442e03912e4964b305bd479d9a26572704e52e7753e1222c14968b0f -MISC metadata.xml 447 BLAKE2B 180b02575186902ff2a329c61ef825c31fdee2f58653f8a7cb5e69fad53ffba96bb8a8dc04cc8acc83382ff1f0208c46d3fa436a26b4cef4478772fa3de81452 SHA512 888120a59bacab218df029d22938d0c090ca387d4cc727635df6238caf524a7c6d27c60208364b050ea876e7f6b3a6699da5b5b35becae00345169dc2ee17183 +MISC metadata.xml 241 BLAKE2B 3f604959c5ca0bc5bdf691340e69abadabaf9d80b44dce507177553e6de383b351e73654ae2bc0e9e23fe1b39b2104ace806e407d4647200fa473fe7d4cdc6d5 SHA512 8022b2b038362c72cfe9a9a03dc61a6d4e84aa5ac020fca6d96cd9be16db603809f90e26fbf00f024ebf33de5e471de3ff7cf85f212ee89e48c1d0f05d086437 diff --git a/sys-process/nmon/metadata.xml b/sys-process/nmon/metadata.xml index 205cb1a80050..36047b5fcb80 100644 --- a/sys-process/nmon/metadata.xml +++ b/sys-process/nmon/metadata.xml @@ -1,14 +1,7 @@ - - nelo@wallus.de - Nelo-Thara Wallus - - - polynomial-c@gentoo.org - Lars Wendler - + nmon diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest index 7da274107a9f..b8cf91331d7c 100644 --- a/sys-process/procps/Manifest +++ b/sys-process/procps/Manifest @@ -1,5 +1,6 @@ AUX procps-3.3.11-sysctl-manpage.patch 941 BLAKE2B e10b6f85325d1ea23b327dffe4ba35662d5110492d0d5fcffad41edff21ddea4ea8c8bcb66582f63abd100a20d0d406e1c3fb176a8c290ba2cc6ecb02aa98248 SHA512 df8b233bde879fa675742baf8b38d43dd7c306fe52013ace715dff02c126d8c5ea12bd93087da10f5e722294eef59577b264309cbdc6f9f3727fa7111c5db313 AUX procps-3.3.12-proc-tests.patch 1835 BLAKE2B 99fe8d63620f37f98cddc60e8bcbaadbe5e7c54c4b0a65abad6ebe8a89f1b8f7f6bd29114b50678aa89cd0c89d26a95a10aa403d48bcc8371f16eaf34c823390 SHA512 ecc94717366a314ac4bba550b84472555f7b217be2174b68778d3364e16586ab9c21756d2041e2ac9d1449856fcd6aa691d8bd1a8558b4653d068dc1d59c2c71 +AUX procps-3.3.17-musl-fix.patch 1907 BLAKE2B 211d5512d9546592b23815bf4085447f6d07c0ac07cb03be01b520a56dc60fdfd07e9c055b0b40196efa2748f54eb5d8070cda80c5001d74fa5f261f53bd234c SHA512 5cf9852e54c307fedbf17b3a331ea992ea2c137120b6f89e4eeb7643091c09872e7e3bdcd2e80b83c46c02b2a0e0d56792afb7fe0564fa4f97e56f304b5792bd DIST procps-ng-3.3.17.tar.xz 1008428 BLAKE2B 43aa1a21d4f0725b1c02457f343cf1fc66bc1771b25c6eaf689c9775c190e90545bfac1729f027abc4d3d13de37ffac4828554b5b25e12bcf6af9540de1695f3 SHA512 59e9a5013430fd9da508c4655d58375dc32e025bb502bb28fb9a92a48e4f2838b3355e92b4648f7384b2050064d17079bf4595d889822ebb5030006bc154a1a7 -EBUILD procps-3.3.17-r1.ebuild 2265 BLAKE2B cc8434921eac0274927fba6182113c980ac44e60760a11adf68dc6e9a598f20c4357568a2d08db10efda96964f307b6305929575e56167eec3c3c9c177e3e254 SHA512 1b39c4eb70e7e687b21e17933f446bc62b299c611e61b11691b1a9608277e5dcd87a97c5285015d1fe75122fdade7c378ddd7abfae3ca83c788155a9e4d103ba +EBUILD procps-3.3.17-r1.ebuild 2895 BLAKE2B fe51fed783509ee3328e5f5cb990164a2a459cdf9a5e100c504e5a8ebc73af71af50ed323af45888c233826daa14620f4d4d750ddec100e1c5171a830212f3b1 SHA512 f3a7812a0209b2e2d4524056baaa122207349b867a2d07268e203fdd6c36cdd6d85fa88d54a85bebdd12c80f13779a0d076cef4bc139ab3b19832996ca153c8d MISC metadata.xml 717 BLAKE2B caae5760de6bc3dbb19fef321255f8951a8ca70139511121dc6d497c8eac4a19ea1d08032e0b6538c74bb34242c8b394360e1fcbf65bd15ef3554e318fa2d4e3 SHA512 3a6a2fcf2dad8784e270bde8e6bc8b183e3dec14abe8c51a17316debac0b599a4f95dabd5e3e05344f500e8eb60b901062d17d644201bf4596e4580ba4d9494b diff --git a/sys-process/procps/files/procps-3.3.17-musl-fix.patch b/sys-process/procps/files/procps-3.3.17-musl-fix.patch new file mode 100644 index 000000000000..4402354c21e4 --- /dev/null +++ b/sys-process/procps/files/procps-3.3.17-musl-fix.patch @@ -0,0 +1,78 @@ +Temporary stopgap patch (a different solution was used upstream +in the next release, should be in the next after 3.3.17 -- we'll need to +add --disable-w instead). + +https://bugs.gentoo.org/794997 + +From 7bfe2b7c12b33aabca71491360c433d2d3f7bbf4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 24 Feb 2021 21:14:31 +0000 +Subject: [PATCH 1/2] w.c: correct musl builds + +No need to redefine UT_ stuff to something that does not exist. + +UT_ is already provided in musl but via utmp.h header, so include +it always. + +Signed-off-by: Alexander Kanavin +--- + w.c | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/w.c b/w.c +index 9d07ac9e..d10639b8 100644 +--- a/w.c ++++ b/w.c +@@ -57,9 +57,8 @@ + #include + #ifdef HAVE_UTMPX_H + # include +-#else +-# include + #endif ++#include + #include + + static int ignoreuser = 0; /* for '-u' */ +@@ -72,12 +71,6 @@ typedef struct utmpx utmp_t; + typedef struct utmp utmp_t; + #endif + +-#if !defined(UT_HOSTSIZE) || defined(__UT_HOSTSIZE) +-# define UT_HOSTSIZE __UT_HOSTSIZE +-# define UT_LINESIZE __UT_LINESIZE +-# define UT_NAMESIZE __UT_NAMESIZE +-#endif +- + #ifdef W_SHOWFROM + # define FROM_STRING "on" + #else +-- +GitLab + + +From 145165aba6c659f3f0f3567a323a3e6170408ea6 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 24 Feb 2021 21:16:14 +0000 +Subject: [PATCH 2/2] proc/escape.c: add missing include + +Signed-off-by: Alexander Kanavin +--- + proc/escape.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/proc/escape.c b/proc/escape.c +index 2e8fb7dd..e1f4612d 100644 +--- a/proc/escape.c ++++ b/proc/escape.c +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include "procps.h" + #include "escape.h" + #include "readproc.h" +-- +GitLab + diff --git a/sys-process/procps/procps-3.3.17-r1.ebuild b/sys-process/procps/procps-3.3.17-r1.ebuild index 77bbf988516b..7045b992c869 100644 --- a/sys-process/procps/procps-3.3.17-r1.ebuild +++ b/sys-process/procps/procps-3.3.17-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic multilib-minimal usr-ldscript +inherit flag-o-matic multilib-minimal toolchain-funcs usr-ldscript DESCRIPTION="Standard informational utilities and process-handling tools" HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps" @@ -42,7 +42,25 @@ PATCHES=( "${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036 ) +src_prepare() { + default + + # Please drop this after 3.3.17 and instead use --disable-w on musl. + # bug #794997 + use elibc_musl && eapply "${FILESDIR}"/${PN}-3.3.17-musl-fix.patch +} + multilib_src_configure() { + if tc-is-cross-compiler ; then + # This isn't ideal but upstream don't provide a placement + # when malloc is missing anyway, leading to errors like: + # pslog.c:(.text.startup+0x108): undefined reference to `rpl_malloc' + # See https://sourceforge.net/p/psmisc/bugs/71/ + # (and https://lists.gnu.org/archive/html/autoconf/2011-04/msg00019.html) + export ac_cv_func_malloc_0_nonnull=yes \ + ac_cv_func_realloc_0_nonnull=yes + fi + # http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support append-lfs-flags #471102 local myeconfargs=( diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest index cc271959b251..149dff65bfe1 100644 --- a/sys-process/psmisc/Manifest +++ b/sys-process/psmisc/Manifest @@ -1,4 +1,4 @@ AUX psmisc-23.4-fuser_regression_revert.patch 1577 BLAKE2B 89f346146ca2fb71bc5bee87f880abcc6e2e9c6b5c3e911fb806ced2a89ba096de6ce052bf238f1c8df948ec1fba5b979763fd2baa6e0a7b46ba977482f82501 SHA512 b129d3355a022b0bd743a06a4912b1ddea386af0d1551fadbe8155e1733ac03df3c795a4997759c4db6299196af3b49dfb2c9e6840dc33174ee1f4afe4ef9df7 DIST psmisc-23.4.tar.xz 370000 BLAKE2B e762171c4d3252421a49b352fadb3e892f66862f003a313a0cc692f973364b06d2652a51d331314462784d94ad55189e74c4d7a023d5d7c917c5e5c05009f46b SHA512 b05781fdb283a6f132bd385d64437f8080e6bc0e11cd2e3e02227678682bb67b3c89edec34a6d067d77312811d072dc60b47ebb32b168c4c69bbc36df643a471 -EBUILD psmisc-23.4-r1.ebuild 1304 BLAKE2B 466b11d75bec320b9a6253c8517c99ddc51f64ed0e841080722d23edcba9576ca8d3b462e7c4b7eef84a307388e14adba63edf23f7815f670b12097de84b3a29 SHA512 0a4893e53ba75acf59fbebeaed4909667b3332a01445021e53adea7b0962d7506324e9ce239dce6a058d64aaec034d6d241024a5e5b63bb25a3b6e4778e21e54 +EBUILD psmisc-23.4-r1.ebuild 1761 BLAKE2B 636664ab34fdee14a9cf3c9b1f644326092b992c06f095d1adee0fdbddf3220c393551f428340a9ec70d9e7db3701c6fbb22751d972f4f0eced005fe2ce51f60 SHA512 ed6e26e015afcd55f786cd1a3be73c4eed2962fe281f59acea6837a56dfbf7e4f6d8075f7d7c5e243bad1125186144a0ab222db4e5b87e88ecd8a8b29bb4dc41 MISC metadata.xml 326 BLAKE2B 899a2f3fa295d2e0e8d6114542a149db37c730b845d7ba720127ca2b9b85044c53ff7aa107f866a6e2ece895a8159e25350b17d9665fc9ff915aed3640ac22cf SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c diff --git a/sys-process/psmisc/psmisc-23.4-r1.ebuild b/sys-process/psmisc/psmisc-23.4-r1.ebuild index 513db3dbf38b..8f354d0fbc94 100644 --- a/sys-process/psmisc/psmisc-23.4-r1.ebuild +++ b/sys-process/psmisc/psmisc-23.4-r1.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit toolchain-funcs + DESCRIPTION="A set of tools that use the proc filesystem" HOMEPAGE="http://psmisc.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" @@ -28,6 +30,16 @@ PATCHES=( ) src_configure() { + if tc-is-cross-compiler ; then + # This isn't ideal but upstream don't provide a placement + # when malloc is missing anyway, leading to errors like: + # pslog.c:(.text.startup+0x108): undefined reference to `rpl_malloc' + # See https://sourceforge.net/p/psmisc/bugs/71/ + # (and https://lists.gnu.org/archive/html/autoconf/2011-04/msg00019.html) + export ac_cv_func_malloc_0_nonnull=yes \ + ac_cv_func_realloc_0_nonnull=yes + fi + local myeconfargs=( --disable-harden-flags $(use_enable ipv6) -- cgit v1.2.3