* [gentoo-commits] repo/gentoo:master commit in: sys-process/htop/, sys-process/htop/files/
@ 2016-02-11 13:37 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2016-02-11 13:37 UTC (permalink / raw
To: gentoo-commits
commit: bf9faf8ecd2d59d79eb9cebd07724c88e91d225e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 11 13:37:11 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 13:37:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf9faf8e
sys-process/htop: Bump to version 2.0.0 (bug #574424).
With kind permission from idl0r.
Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-process/htop/Manifest | 1 +
sys-process/htop/files/htop-2.0.0-tinfo.patch | 82 +++++++++++++++++++++++++++
sys-process/htop/htop-2.0.0.ebuild | 75 ++++++++++++++++++++++++
3 files changed, 158 insertions(+)
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index c8d23ca..b60549d 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1 +1,2 @@
DIST htop-1.0.3.tar.gz 399306 SHA256 055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f55d1829 SHA512 4c5c784b093bcad06eb2e8d8bb215e14f6e838a3d47d8da8402344c270c1724f85d0bcde2899571ba5d0e5a02274a0c3390a76fed61785b2604b51351f08f232 WHIRLPOOL 14b8879210025aff9a1e098314a1b35d2bb6fcfaab42b95670e3726c61d471b1618486e6fc3dbbc97043e85f9a22196d97e676f3b2dd98250326be8527bdebbe
+DIST htop-2.0.0.tar.gz 473765 SHA256 d15ca2a0abd6d91d6d17fd685043929cfe7aa91199a9f4b3ebbb370a2c2424b5 SHA512 2df1b96e4c07a1de360dc7b7b20db0e663d7fa2c9a8a9dcc3d7dc1ce5e5b59f72d927e8e7ae919631cf0e950a82450b45116a1f8d788f63c5762bd73332ec32c WHIRLPOOL b7a64593bd69d8ebbac2e69c8030e197647dacfe0c53b5e4550e77fe79db87b1d106cb4ea1adfa5338628afb1f5d46244b95d4522718142e2f966f2cad59db02
diff --git a/sys-process/htop/files/htop-2.0.0-tinfo.patch b/sys-process/htop/files/htop-2.0.0-tinfo.patch
new file mode 100644
index 0000000..e040195
--- /dev/null
+++ b/sys-process/htop/files/htop-2.0.0-tinfo.patch
@@ -0,0 +1,82 @@
+--- htop-2.0.0/configure.ac
++++ htop-2.0.0/configure.ac
+@@ -23,6 +23,7 @@
+ AC_DISABLE_SHARED
+ AC_ENABLE_STATIC
+ AC_PROG_LIBTOOL
++PKG_PROG_PKG_CONFIG
+
+ # Checks for platform.
+ # ----------------------------------------------------------------------
+@@ -175,32 +176,36 @@
+
+ AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
+ if test "x$enable_unicode" = xyes; then
+- HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
+- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
+- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
+- HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
+- HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
+- HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
+- missing_libraries="$missing_libraries libncursesw"
+- AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
+- ))))))
+-
+- AC_CHECK_HEADERS([ncursesw/curses.h],[:],
+- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
+- [AC_CHECK_HEADERS([ncurses/curses.h],[:],
+- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
++ PKG_CHECK_MODULES([NCURSES], [ncursesw],[
++ HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
++ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
++ HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
++ HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
++ HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
++ HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
++ missing_libraries="$missing_libraries libncursesw"
++ AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
++ ))))))
++
++ AC_CHECK_HEADERS([ncursesw/curses.h],[:],
++ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
++ [AC_CHECK_HEADERS([ncurses/curses.h],[:],
++ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
++ ])
+ else
+- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
+- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
+- HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
+- HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
+- missing_libraries="$missing_libraries libncurses"
+- ))))
++ PKG_CHECK_MODULES([NCURSES], [ncurses],[
++ HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
++ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
++ HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
++ HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
++ missing_libraries="$missing_libraries libncurses"
++ ))))
+
+- AC_CHECK_HEADERS([curses.h],[:],
+- [AC_CHECK_HEADERS([ncurses/curses.h],[:],
+- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
+- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
++ AC_CHECK_HEADERS([curses.h],[:],
++ [AC_CHECK_HEADERS([ncurses/curses.h],[:],
++ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
++ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
++ ])
+ fi
+
+ if test "$my_htop_platform" = "freebsd"; then
+--- htop-2.0.0/Makefile.am
++++ htop-2.0.0/Makefile.am
+@@ -85,6 +85,8 @@
+ BUILT_SOURCES = $(myhtopheaders) $(myhtopplatheaders)
+ htop_SOURCES = $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources) config.h
+
++htop_LDADD = $(NCURSES_LIBS)
++
+ target:
+ echo $(htop_SOURCES)
+
diff --git a/sys-process/htop/htop-2.0.0.ebuild b/sys-process/htop/htop-2.0.0.ebuild
new file mode 100644
index 0000000..40725cb
--- /dev/null
+++ b/sys-process/htop/htop-2.0.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools linux-info
+
+DESCRIPTION="interactive process viewer"
+HOMEPAGE="http://hisham.hm/htop/"
+SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
+
+RDEPEND="sys-libs/ncurses:0=[unicode?]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( ChangeLog README )
+
+CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.0.0-tinfo.patch"
+)
+
+pkg_setup() {
+ if use kernel_FreeBSD && ! [[ -f ${ROOT}/compat/linux/proc/stat && -f ${ROOT}/compat/linux/proc/meminfo ]]; then
+ echo
+ eerror "htop requires linprocfs mounted at /compat/linux/proc to build and function."
+ eerror "To mount it, type:"
+ [ -d /compat/linux/proc ] || eerror "mkdir -p /compat/linux/proc"
+ eerror "mount -t linprocfs none /compat/linux/proc"
+ eerror "Alternatively, place this information into /etc/fstab"
+ echo
+ die "htop needs /compat/linux/proc mounted"
+ fi
+
+ 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
+
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ rm missing || die
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
+
+ local myeconfargs=()
+
+ use kernel_FreeBSD && myeconfargs+=( --with-proc=/compat/linux/proc )
+
+ myeconfargs+=(
+ # fails to build against recent hwloc versions
+ --disable-hwloc
+ --enable-native-affinity
+ --enable-taskstats
+ $(use_enable kernel_linux cgroup)
+ $(use_enable openvz)
+ $(use_enable unicode)
+ $(use_enable vserver)
+ )
+ econf ${myeconfargs[@]}
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/htop/, sys-process/htop/files/
@ 2016-07-22 8:53 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2016-07-22 8:53 UTC (permalink / raw
To: gentoo-commits
commit: c141b6b91c7c21b326e77d00768798343bce3275
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 08:48:55 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 08:53:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c141b6b9
sys-process/htop: Bump to version 2.0.2
Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-process/htop/Manifest | 1 +
sys-process/htop/files/htop-2.0.2-tinfo.patch | 73 +++++++++++++++++++++++++++
sys-process/htop/htop-2.0.2.ebuild | 62 +++++++++++++++++++++++
3 files changed, 136 insertions(+)
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 58c4866..3b35738 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,3 +1,4 @@
DIST htop-1.0.3.tar.gz 399306 SHA256 055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f55d1829 SHA512 4c5c784b093bcad06eb2e8d8bb215e14f6e838a3d47d8da8402344c270c1724f85d0bcde2899571ba5d0e5a02274a0c3390a76fed61785b2604b51351f08f232 WHIRLPOOL 14b8879210025aff9a1e098314a1b35d2bb6fcfaab42b95670e3726c61d471b1618486e6fc3dbbc97043e85f9a22196d97e676f3b2dd98250326be8527bdebbe
DIST htop-2.0.0.tar.gz 473765 SHA256 d15ca2a0abd6d91d6d17fd685043929cfe7aa91199a9f4b3ebbb370a2c2424b5 SHA512 2df1b96e4c07a1de360dc7b7b20db0e663d7fa2c9a8a9dcc3d7dc1ce5e5b59f72d927e8e7ae919631cf0e950a82450b45116a1f8d788f63c5762bd73332ec32c WHIRLPOOL b7a64593bd69d8ebbac2e69c8030e197647dacfe0c53b5e4550e77fe79db87b1d106cb4ea1adfa5338628afb1f5d46244b95d4522718142e2f966f2cad59db02
DIST htop-2.0.1.tar.gz 477196 SHA256 f410626dfaf6b70fdf73cd7bb33cae768869707028d847fed94a978e974f5666 SHA512 57991a55b69028c01549b067ec749099466df5b08a0ed9a65dd779e6d2c8ee0a5d9c330bb6c727b04a349146ad441b7115718e433d1f8232f74b28903fb351ff WHIRLPOOL 0bfd3bd5eff3a4597b349e83510cefaf8dbf0dacf8161ab0fea50216a44915cbf7d506d1479daf4e064803e0b6a0f65180fa7aa52d6ab161774a579ccb1dfe7d
+DIST htop-2.0.2.tar.gz 476364 SHA256 179be9dccb80cee0c5e1a1f58c8f72ce7b2328ede30fb71dcdf336539be2f487 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda WHIRLPOOL 24468bbe22b67e84302561c4e3b593f7fa29a862e29ac66a0c5a2605c47885edf0cdfbbda7cd61519cea8ae51cb50e57ad3284e1fc728199088c60400a48b631
diff --git a/sys-process/htop/files/htop-2.0.2-tinfo.patch b/sys-process/htop/files/htop-2.0.2-tinfo.patch
new file mode 100644
index 0000000..4a536c0
--- /dev/null
+++ b/sys-process/htop/files/htop-2.0.2-tinfo.patch
@@ -0,0 +1,73 @@
+--- htop-2.0.2/configure.ac
++++ htop-2.0.2/configure.ac
+@@ -185,32 +185,36 @@
+
+ AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
+ if test "x$enable_unicode" = xyes; then
+- HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
+- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
+- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
+- HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
+- HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
+- HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
+- missing_libraries="$missing_libraries libncursesw"
+- AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
+- ))))))
++ PKG_CHECK_MODULES([NCURSES], [ncursesw],[
++ HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
++ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
++ HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
++ HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
++ HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
++ HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
++ missing_libraries="$missing_libraries libncursesw"
++ AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
++ ))))))
+
+- AC_CHECK_HEADERS([ncursesw/curses.h],[:],
+- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
+- [AC_CHECK_HEADERS([ncurses/curses.h],[:],
+- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
++ AC_CHECK_HEADERS([ncursesw/curses.h],[:],
++ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
++ [AC_CHECK_HEADERS([ncurses/curses.h],[:],
++ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
++ ])
+ else
+- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
+- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
+- HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
+- HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
+- missing_libraries="$missing_libraries libncurses"
+- ))))
++ PKG_CHECK_MODULES([NCURSES], [ncurses],[
++ HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
++ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
++ HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
++ HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
++ missing_libraries="$missing_libraries libncurses"
++ ))))
+
+- AC_CHECK_HEADERS([curses.h],[:],
+- [AC_CHECK_HEADERS([ncurses/curses.h],[:],
+- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
+- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
++ AC_CHECK_HEADERS([curses.h],[:],
++ [AC_CHECK_HEADERS([ncurses/curses.h],[:],
++ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
++ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
++ ])
+ fi
+
+ if test "$my_htop_platform" = "freebsd"; then
+--- htop-2.0.2/Makefile.am
++++ htop-2.0.2/Makefile.am
+@@ -85,6 +85,8 @@
+ BUILT_SOURCES = $(myhtopheaders) $(myhtopplatheaders)
+ htop_SOURCES = $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources) config.h
+
++htop_LDADD = $(NCURSES_LIBS)
++
+ target:
+ echo $(htop_SOURCES)
+
diff --git a/sys-process/htop/htop-2.0.2.ebuild b/sys-process/htop/htop-2.0.2.ebuild
new file mode 100644
index 0000000..a64dffe
--- /dev/null
+++ b/sys-process/htop/htop-2.0.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools linux-info
+
+DESCRIPTION="interactive process viewer"
+HOMEPAGE="http://hisham.hm/htop/"
+SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
+
+RDEPEND="sys-libs/ncurses:0=[unicode?]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( ChangeLog README )
+
+CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.0.2-tinfo.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
+
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ rm missing || die
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
+
+ local myeconfargs=()
+
+ 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[@]}
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/htop/, sys-process/htop/files/
@ 2016-07-22 8:53 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2016-07-22 8:53 UTC (permalink / raw
To: gentoo-commits
commit: c06f4414489da74b277b08f37e1c4f11c48258ce
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 08:50:49 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 08:53:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06f4414
sys-process/htop: Removed old.
Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-process/htop/Manifest | 1 -
sys-process/htop/files/htop-1.0.2-out-of-src.patch | 30 -----------
sys-process/htop/files/htop-1.0.2-process.patch | 13 -----
sys-process/htop/files/htop-1.0.2-tinfo.patch | 58 --------------------
sys-process/htop/files/htop-2.0.0-commlen.patch | 22 --------
sys-process/htop/htop-2.0.0-r1.ebuild | 63 ----------------------
6 files changed, 187 deletions(-)
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 3b35738..63ea152 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,4 +1,3 @@
DIST htop-1.0.3.tar.gz 399306 SHA256 055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f55d1829 SHA512 4c5c784b093bcad06eb2e8d8bb215e14f6e838a3d47d8da8402344c270c1724f85d0bcde2899571ba5d0e5a02274a0c3390a76fed61785b2604b51351f08f232 WHIRLPOOL 14b8879210025aff9a1e098314a1b35d2bb6fcfaab42b95670e3726c61d471b1618486e6fc3dbbc97043e85f9a22196d97e676f3b2dd98250326be8527bdebbe
-DIST htop-2.0.0.tar.gz 473765 SHA256 d15ca2a0abd6d91d6d17fd685043929cfe7aa91199a9f4b3ebbb370a2c2424b5 SHA512 2df1b96e4c07a1de360dc7b7b20db0e663d7fa2c9a8a9dcc3d7dc1ce5e5b59f72d927e8e7ae919631cf0e950a82450b45116a1f8d788f63c5762bd73332ec32c WHIRLPOOL b7a64593bd69d8ebbac2e69c8030e197647dacfe0c53b5e4550e77fe79db87b1d106cb4ea1adfa5338628afb1f5d46244b95d4522718142e2f966f2cad59db02
DIST htop-2.0.1.tar.gz 477196 SHA256 f410626dfaf6b70fdf73cd7bb33cae768869707028d847fed94a978e974f5666 SHA512 57991a55b69028c01549b067ec749099466df5b08a0ed9a65dd779e6d2c8ee0a5d9c330bb6c727b04a349146ad441b7115718e433d1f8232f74b28903fb351ff WHIRLPOOL 0bfd3bd5eff3a4597b349e83510cefaf8dbf0dacf8161ab0fea50216a44915cbf7d506d1479daf4e064803e0b6a0f65180fa7aa52d6ab161774a579ccb1dfe7d
DIST htop-2.0.2.tar.gz 476364 SHA256 179be9dccb80cee0c5e1a1f58c8f72ce7b2328ede30fb71dcdf336539be2f487 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda WHIRLPOOL 24468bbe22b67e84302561c4e3b593f7fa29a862e29ac66a0c5a2605c47885edf0cdfbbda7cd61519cea8ae51cb50e57ad3284e1fc728199088c60400a48b631
diff --git a/sys-process/htop/files/htop-1.0.2-out-of-src.patch b/sys-process/htop/files/htop-1.0.2-out-of-src.patch
deleted file mode 100644
index d67abe7..0000000
--- a/sys-process/htop/files/htop-1.0.2-out-of-src.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- Makefile.am | 2 +-
- scripts/MakeHeader.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 05a72e7..dd28a87 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -43,7 +43,7 @@ debug:
- $(MAKE) all CFLAGS="" AM_CPPFLAGS="-ggdb -DDEBUG"
-
- .c.h:
-- scripts/MakeHeader.py $<
-+ $(top_srcdir)/scripts/MakeHeader.py $<
-
- cppcheck:
- cppcheck -q -v . --enable=all -DHAVE_CGROUP -DHAVE_OPENVZ -DHAVE_TASKSTATS
-diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py
-index 55eeed4..46af921 100755
---- a/scripts/MakeHeader.py
-+++ b/scripts/MakeHeader.py
-@@ -11,7 +11,7 @@ state = ANY
- static = 0
-
- file = open(sys.argv[1])
--name = sys.argv[1][:-2]
-+name = os.path.basename(sys.argv[1][:-2])
-
- out = open(name + ".h", "w")
- class writer:
diff --git a/sys-process/htop/files/htop-1.0.2-process.patch b/sys-process/htop/files/htop-1.0.2-process.patch
deleted file mode 100644
index b949e26..0000000
--- a/sys-process/htop/files/htop-1.0.2-process.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: Process.c
-===================================================================
---- Process.c (revision 302)
-+++ Process.c (working copy)
-@@ -371,7 +371,7 @@
- }
-
- static void Process_writeField(Process* this, RichString* str, ProcessField field) {
-- char buffer[128]; buffer[127] = '\0';
-+ char buffer[256]; buffer[255] = '\0';
- int attr = CRT_colors[DEFAULT_COLOR];
- int baseattr = CRT_colors[PROCESS_BASENAME];
- int n = sizeof(buffer) - 1;
diff --git a/sys-process/htop/files/htop-1.0.2-tinfo.patch b/sys-process/htop/files/htop-1.0.2-tinfo.patch
deleted file mode 100644
index 4e13459..0000000
--- a/sys-process/htop/files/htop-1.0.2-tinfo.patch
+++ /dev/null
@@ -1,58 +0,0 @@
- Makefile.am | 2 ++
- configure.ac | 20 ++++++++++++--------
- 2 files changed, 14 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 05a72e7..7908937 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -36,6 +36,8 @@ SUFFIXES = .h
- BUILT_SOURCES = $(myhtopheaders)
- htop_SOURCES = $(myhtopheaders) $(myhtopsources) config.h
-
-+htop_LDADD = $(NCURSES_LIBS)
-+
- profile:
- $(MAKE) all CFLAGS="" AM_CPPFLAGS="-pg -O2"
-
-diff --git a/configure.ac b/configure.ac
-index ff6901b..6226d90 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,6 +20,7 @@
- AC_DISABLE_SHARED
- AC_ENABLE_STATIC
- AC_PROG_LIBTOOL
-+PKG_PROG_PKG_CONFIG
-
- # Checks for libraries.
- AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"])
-@@ -89,16 +89,20 @@ fi
-
- AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
- if test "x$enable_unicode" = xyes; then
-- AC_CHECK_LIB([ncursesw], [refresh], [], [
-- missing_libraries="$missing_libraries libncursesw"
-- AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
-+ PKG_CHECK_MODULES([NCURSES], [ncursesw],[
-+ AC_CHECK_LIB([ncursesw], [refresh], [], [
-+ missing_libraries="$missing_libraries libncursesw"
-+ AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
-+ ])
-+ AC_CHECK_HEADERS([ncursesw/curses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])
- ])
-- AC_CHECK_HEADERS([ncursesw/curses.h],[:],
-- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])
- else
-- AC_CHECK_LIB([ncurses], [refresh], [], [missing_libraries="$missing_libraries libncurses"])
-- AC_CHECK_HEADERS([curses.h],[:],[missing_headers="$missing_headers $ac_header"])
-+ PKG_CHECK_MODULES([NCURSES], [ncurses],[
-+ AC_CHECK_LIB([ncurses], [refresh], [], [missing_libraries="$missing_libraries libncurses"])
-+ AC_CHECK_HEADERS([curses.h],[:],[missing_headers="$missing_headers $ac_header"])
-+ ])
- fi
-
- if test ! -z "$missing_libraries"; then
diff --git a/sys-process/htop/files/htop-2.0.0-commlen.patch b/sys-process/htop/files/htop-2.0.0-commlen.patch
deleted file mode 100644
index f44e43e..0000000
--- a/sys-process/htop/files/htop-2.0.0-commlen.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0b70439316b4e4608c0916317ded7e6e56982de6 Mon Sep 17 00:00:00 2001
-From: Hisham <hisham@gobolinux.org>
-Date: Sat, 13 Feb 2016 02:18:28 -0200
-Subject: [PATCH] Fix buffer reuse.
-
----
- linux/LinuxProcessList.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
-index 591210e..ec643ab 100644
---- a/linux/LinuxProcessList.c
-+++ b/linux/LinuxProcessList.c
-@@ -446,7 +446,7 @@ static void LinuxProcessList_readOomData(LinuxProcess* process, const char* dirn
- }
-
- static void setCommand(Process* process, const char* command, int len) {
-- if (process->comm && process->commLen <= len) {
-+ if (process->comm && process->commLen >= len) {
- strncpy(process->comm, command, len + 1);
- } else {
- free(process->comm);
diff --git a/sys-process/htop/htop-2.0.0-r1.ebuild b/sys-process/htop/htop-2.0.0-r1.ebuild
deleted file mode 100644
index e589b84..0000000
--- a/sys-process/htop/htop-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools linux-info
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://hisham.hm/htop/"
-SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses:0=[unicode?]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-DOCS=( ChangeLog README )
-
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.0.0-tinfo.patch"
- "${FILESDIR}/${P}-commlen.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
-
- linux-info_pkg_setup
-}
-
-src_prepare() {
- rm missing || die
-
- default
- eautoreconf
-}
-
-src_configure() {
- [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
- local myeconfargs=()
-
- myeconfargs+=(
- # fails to build against recent hwloc versions
- --disable-hwloc
- --enable-native-affinity
- --enable-taskstats
- $(use_enable kernel_linux cgroup)
- $(use_enable openvz)
- $(use_enable unicode)
- $(use_enable vserver)
- )
- econf ${myeconfargs[@]}
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/htop/, sys-process/htop/files/
@ 2018-10-09 13:22 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2018-10-09 13:22 UTC (permalink / raw
To: gentoo-commits
commit: b5c59cd9c14353728b310e075c647c0c8ecc260e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 9 13:21:36 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Oct 9 13:22:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5c59cd9
sys-process/htop: Removed old.
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sys-process/htop/Manifest | 1 -
| 29 --------
sys-process/htop/files/htop-2.1.0-bashisms.patch | 37 ---------
.../htop/files/htop-2.1.0-clear_on_sigwinch.patch | 21 ------
.../htop/files/htop-2.1.0-color_issues.patch | 87 ----------------------
sys-process/htop/files/htop-2.1.0-ldflags.patch | 21 ------
.../htop/files/htop-2.1.0-ncurses_cflags.patch | 46 ------------
sys-process/htop/files/htop-2.1.0-sysmacros.patch | 81 --------------------
sys-process/htop/htop-2.1.0-r1.ebuild | 76 -------------------
9 files changed, 399 deletions(-)
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index edcf3a82aed..01c2fd6812c 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,4 +1,3 @@
DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b30056a43e259ab39a69f84083d310bbefefe8408c7ca99918f1ea9ae775808b9afe9d0f78097ac6bb88dc7 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda
-DIST htop-2.1.0.tar.gz 302938 BLAKE2B 3e290a3dbb0bf5424780ba5dcb9de8ea478bf4cabbbde202c19eb3db7e0f8d1e108ec3ea41544ac095097c39100417c72477dab96f104a6317f4edd06d69199f SHA512 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb
DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
DIST htop-3.0.0_beta5.tar.gz 175780 BLAKE2B f7d03485e74387c656e5a576f0a53c832bac668cee79750402335b2051a17d405392b99316f1546cc76fa83dc3bc85055ca58b928225df0e162ffdb9c1889a5f SHA512 eaa04a278257a1447cd60825083c864d3c23a4a5607447ce05356d550f42ff68a810f14bf91314b7266f9741aab8141d67d98316a31fa7806fb6b858cc804344
diff --git a/sys-process/htop/files/htop-2.1.0-MakeHeader-python3.patch b/sys-process/htop/files/htop-2.1.0-MakeHeader-python3.patch
deleted file mode 100644
index 7c8590a2991..00000000000
--- a/sys-process/htop/files/htop-2.1.0-MakeHeader-python3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/646880
-
---- a/scripts/MakeHeader.py
-+++ b/scripts/MakeHeader.py
-@@ -1,5 +1,5 @@
- #!/usr/bin/env python
--import os, sys, string
-+import os, sys, string, io
- try:
- from cStringIO import StringIO
- except ImportError:
-@@ -16,7 +16,7 @@ SKIPONE=4
- state = ANY
- static = 0
-
--file = open(sys.argv[1])
-+file = io.open(sys.argv[1], "r", errors="ignore")
- name = sys.argv[1][:-2]
-
- out = StringIO()
-@@ -94,7 +94,7 @@ out.write( "#endif\n" )
- # This prevents a lot of recompilation during development
- out.seek(0)
- try:
-- with open(name + ".h", "r") as orig:
-+ with io.open(name + ".h", "r", errors="ignore") as orig:
- origcontents = orig.readlines()
- except:
- origcontents = ""
diff --git a/sys-process/htop/files/htop-2.1.0-bashisms.patch b/sys-process/htop/files/htop-2.1.0-bashisms.patch
deleted file mode 100644
index 3b5bdabe82f..00000000000
--- a/sys-process/htop/files/htop-2.1.0-bashisms.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d4ea7cd65ccf8551cabb0706167b2c15aad7866d Mon Sep 17 00:00:00 2001
-From: Jesin <jesin00@gmail.com>
-Date: Mon, 26 Feb 2018 18:07:52 -0500
-Subject: [PATCH] Fix bashisms (#749)
-
-The configure script relied on bash-specific extensions to shell syntax
-and behavior, causing build failures on systems with other /bin/sh
-implementations. This commit replaces those with equivalent constructs
-that should work in all POSIX shells.
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d4bb36b0..3d69756d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -66,7 +66,7 @@ dnl glibc 2.25 deprecates 'major' and 'minor' in <sys/types.h> and requires to
- dnl include <sys/sysmacros.h>. However the logic in AC_HEADER_MAJOR has not yet
- dnl been updated in Autoconf 2.69, so use a workaround:
- m4_version_prereq([2.70], [],
--[if test $ac_cv_header_sys_mkdev_h = no; then
-+[if test "x$ac_cv_header_sys_mkdev_h" = xno; then
- AC_CHECK_HEADER(sys/sysmacros.h, [AC_DEFINE(MAJOR_IN_SYSMACROS, 1,
- [Define to 1 if `major', `minor', and `makedev' are declared in <sys/sysmacros.h>.])])
- fi])
-@@ -278,8 +278,8 @@ then
- PKG_PROG_PKG_CONFIG()
- PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [], [missing_libraries="$missing_libraries libnl-3"])
- PKG_CHECK_MODULES(LIBNL3GENL, libnl-genl-3.0, [], [missing_libraries="$missing_libraries libnl-genl-3"])
-- CFLAGS+=" $LIBNL3_CFLAGS $LIBNL3GENL_CFLAGS"
-- LIBS+=" $LIBNL3_LIBS $LIBNL3GENL_LIBS"
-+ CFLAGS="$CFLAGS $LIBNL3_CFLAGS $LIBNL3GENL_CFLAGS"
-+ LIBS="$LIBS $LIBNL3_LIBS $LIBNL3GENL_LIBS"
- AC_DEFINE(HAVE_DELAYACCT, 1, [Define if delay accounting support should be enabled.])
- fi
-
diff --git a/sys-process/htop/files/htop-2.1.0-clear_on_sigwinch.patch b/sys-process/htop/files/htop-2.1.0-clear_on_sigwinch.patch
deleted file mode 100644
index 3ba7147e3b4..00000000000
--- a/sys-process/htop/files/htop-2.1.0-clear_on_sigwinch.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 5fca258f33e08cd7733940391edbf9e22208de83 Mon Sep 17 00:00:00 2001
-From: guoci <zguoci@gmail.com>
-Date: Sat, 17 Feb 2018 13:25:57 -0500
-Subject: [PATCH] call clear() function when SIGWINCH is received. (#660)
-
----
- Action.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Action.c b/Action.c
-index a6394ac3..50ab0bb9 100644
---- a/Action.c
-+++ b/Action.c
-@@ -185,6 +185,7 @@ static Htop_Reaction sortBy(State* st) {
- // ----------------------------------------
-
- static Htop_Reaction actionResize(State* st) {
-+ clear();
- Panel_resize(st->panel, COLS, LINES-(st->panel->y)-1);
- return HTOP_REDRAW_BAR;
- }
diff --git a/sys-process/htop/files/htop-2.1.0-color_issues.patch b/sys-process/htop/files/htop-2.1.0-color_issues.patch
deleted file mode 100644
index 0b4bea8bb95..00000000000
--- a/sys-process/htop/files/htop-2.1.0-color_issues.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From ac2dff2881a7ab203750e8edf7a46b69ae492ed0 Mon Sep 17 00:00:00 2001
-From: Hisham Muhammad <hisham@gobolinux.org>
-Date: Mon, 5 Feb 2018 07:01:12 +0100
-Subject: [PATCH] Fix color behavior on some terminals.
-
-Fixes #635.
----
- CRT.c | 32 +++++++++++++++++---------------
- CRT.h | 1 +
- ColorsPanel.c | 1 +
- 3 files changed, 19 insertions(+), 15 deletions(-)
-
-diff --git a/CRT.c b/CRT.c
-index 237e30ef..ca9a10dd 100644
---- a/CRT.c
-+++ b/CRT.c
-@@ -37,6 +37,7 @@ in the source distribution for its full text.
- #define White COLOR_WHITE
-
- #define ColorPairGrayBlack ColorPair(Magenta,Magenta)
-+#define ColorIndexGrayBlack ColorIndex(Magenta,Magenta)
-
- #define KEY_WHEELUP KEY_F(20)
- #define KEY_WHEELDOWN KEY_F(21)
-@@ -713,22 +714,23 @@ void CRT_enableDelay() {
-
- void CRT_setColors(int colorScheme) {
- CRT_colorScheme = colorScheme;
-- if (colorScheme == COLORSCHEME_BLACKNIGHT) {
-- for (int i = 0; i < 8; i++)
-- for (int j = 0; j < 8; j++) {
-- if (ColorIndex(i,j) != ColorIndex(Magenta,Magenta)) {
-- init_pair(ColorIndex(i,j), i, j);
-- }
-- }
-- init_pair(ColorIndex(Magenta,Magenta), 8, 0);
-- } else {
-- for (int i = 0; i < 8; i++)
-- for (int j = 0; j < 8; j++) {
-- if (ColorIndex(i,j) != ColorIndex(Magenta,Magenta)) {
-- init_pair(ColorIndex(i,j), i, (j==0?-1:j));
-- }
-+
-+ for (int i = 0; i < 8; i++) {
-+ for (int j = 0; j < 8; j++) {
-+ if (ColorIndex(i,j) != ColorPairGrayBlack) {
-+ int bg = (colorScheme != COLORSCHEME_BLACKNIGHT)
-+ ? (j==0 ? -1 : j)
-+ : j;
-+ init_pair(ColorIndex(i,j), i, bg);
- }
-- init_pair(ColorIndex(Magenta,Magenta), 8, -1);
-+ }
- }
-+
-+ int grayBlackFg = COLORS > 8 ? 8 : 0;
-+ int grayBlackBg = (colorScheme != COLORSCHEME_BLACKNIGHT)
-+ ? -1
-+ : 0;
-+ init_pair(ColorIndexGrayBlack, grayBlackFg, grayBlackBg);
-+
- CRT_colors = CRT_colorSchemes[colorScheme];
- }
-diff --git a/CRT.h b/CRT.h
-index 590fff6e..933fe068 100644
---- a/CRT.h
-+++ b/CRT.h
-@@ -26,6 +26,7 @@ in the source distribution for its full text.
- #define White COLOR_WHITE
-
- #define ColorPairGrayBlack ColorPair(Magenta,Magenta)
-+#define ColorIndexGrayBlack ColorIndex(Magenta,Magenta)
-
- #define KEY_WHEELUP KEY_F(20)
- #define KEY_WHEELDOWN KEY_F(21)
-diff --git a/ColorsPanel.c b/ColorsPanel.c
-index 627a516a..2028335f 100644
---- a/ColorsPanel.c
-+++ b/ColorsPanel.c
-@@ -78,6 +78,7 @@ static HandlerResult ColorsPanel_eventHandler(Panel* super, int ch) {
- this->settings->changed = true;
- const Header* header = this->scr->header;
- CRT_setColors(mark);
-+ clear();
- Panel* menu = (Panel*) Vector_get(this->scr->panels, 0);
- Header_draw(header);
- RichString_setAttr(&(super->header), CRT_colors[PANEL_HEADER_FOCUS]);
diff --git a/sys-process/htop/files/htop-2.1.0-ldflags.patch b/sys-process/htop/files/htop-2.1.0-ldflags.patch
deleted file mode 100644
index 386542f3547..00000000000
--- a/sys-process/htop/files/htop-2.1.0-ldflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From df9922a67eb8e02ab4cf1ff8f24b40f14094e699 Mon Sep 17 00:00:00 2001
-From: Hisham Muhammad <hisham@gobolinux.org>
-Date: Sat, 17 Feb 2018 14:50:55 -0200
-Subject: [PATCH] Fix preservation of LDFLAGS value during configure script
-
-Fixes #738.
----
-
-diff --git a/configure.ac b/configure.ac
-index df922e07..44595050 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -167,7 +167,7 @@ m4_define([HTOP_CHECK_SCRIPT],
- LIBS="$htop_config_script $LIBS "
- htop_script_success=yes
- ], [])
-- LDFLAGS="$save_LDFLAGS"
-+ LDFLAGS="$htop_save_LDFLAGS"
- fi
- if test "x$htop_script_success" = xno; then
- [$5]
diff --git a/sys-process/htop/files/htop-2.1.0-ncurses_cflags.patch b/sys-process/htop/files/htop-2.1.0-ncurses_cflags.patch
deleted file mode 100644
index 0a25aeb7fa2..00000000000
--- a/sys-process/htop/files/htop-2.1.0-ncurses_cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bc5d46982f3504000567e00f59e4f7a5905597a9 Mon Sep 17 00:00:00 2001
-From: Michael Klein <michael.klein@puffin.lb.shuttle.de>
-Date: Mon, 26 Feb 2018 14:19:01 +0100
-Subject: [PATCH] use CFLAGS from ncurses*-config, if present (#745)
-
-Fixes #695.
----
- configure.ac | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 36aebc5e..d4bb36b0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -164,19 +164,25 @@ m4_define([HTOP_CHECK_SCRIPT],
- [
- if test ! -z "m4_toupper($HTOP_[$1]_CONFIG_SCRIPT)"; then
- # to be used to set the path to ncurses*-config when cross-compiling
-- htop_config_script=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --libs 2> /dev/null)
-+ htop_config_script_libs=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --libs 2> /dev/null)
-+ htop_config_script_cflags=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --cflags 2> /dev/null)
- else
-- htop_config_script=$([$4] --libs 2> /dev/null)
-+ htop_config_script_libs=$([$4] --libs 2> /dev/null)
-+ htop_config_script_cflags=$([$4] --cflags 2> /dev/null)
- fi
- htop_script_success=no
- htop_save_LDFLAGS="$LDFLAGS"
-- if test ! "x$htop_config_script" = x; then
-- LDFLAGS="$htop_config_script $LDFLAGS"
-+ htop_save_CFLAGS="$CFLAGS"
-+ if test ! "x$htop_config_script_libs" = x; then
-+ LDFLAGS="$htop_config_script_libs $LDFLAGS"
-+ CFLAGS="$htop_config_script_cflags $CFLAGS"
- AC_CHECK_LIB([$1], [$2], [
- AC_DEFINE([$3], 1, [The library is present.])
-- LIBS="$htop_config_script $LIBS "
-+ LIBS="$htop_config_script_libs $LIBS "
- htop_script_success=yes
-- ], [])
-+ ], [
-+ CFLAGS="$htop_save_CFLAGS"
-+ ])
- LDFLAGS="$htop_save_LDFLAGS"
- fi
- if test "x$htop_script_success" = xno; then
diff --git a/sys-process/htop/files/htop-2.1.0-sysmacros.patch b/sys-process/htop/files/htop-2.1.0-sysmacros.patch
deleted file mode 100644
index 0ab1bb0c02a..00000000000
--- a/sys-process/htop/files/htop-2.1.0-sysmacros.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From d2d413161bbdf009f232faa5789131326225f838 Mon Sep 17 00:00:00 2001
-From: Explorer09 <explorer09@gmail.com>
-Date: Sat, 24 Feb 2018 11:57:18 +0800
-Subject: [PATCH] Fix build failure ('major' undefined) in glibc 2.28.
-
-glibc 2.28 no longer defines 'major' and 'minor' in <sys/types.h> and
-requires us to include <sys/sysmacros.h>. (glibc 2.25 starts
-deprecating the macros in <sys/types.h>.) Now do include the latter if
-found on the system.
-
-At the moment, let's also utilize AC_HEADER_MAJOR in configure script.
-However as Autoconf 2.69 has not yet updated the AC_HEADER_MAJOR macro
-to reflect the glibc change [1], so add a workaround code.
-
-Fixes #663. Supersedes pull request #729.
-
-Reference:
-[1] https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=e17a30e987d7ee695fb4294a82d987ec3dc9b974
-
-Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
----
- Process.c | 6 ++++++
- configure.ac | 10 ++++++++++
- linux/LinuxProcessList.c | 6 ++++++
- 3 files changed, 22 insertions(+)
-
-diff --git a/Process.c b/Process.c
-index 2ff778df..845ca54b 100644
---- a/Process.c
-+++ b/Process.c
-@@ -28,6 +28,12 @@ in the source distribution for its full text.
- #include <time.h>
- #include <assert.h>
- #include <math.h>
-+#ifdef MAJOR_IN_MKDEV
-+#include <sys/mkdev.h>
-+#elif defined(MAJOR_IN_SYSMACROS) || \
-+ (defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H)
-+#include <sys/sysmacros.h>
-+#endif
-
- #ifdef __ANDROID__
- #define SYS_ioprio_get __NR_ioprio_get
-diff --git a/configure.ac b/configure.ac
-index 44595050..36aebc5e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -61,6 +61,16 @@ AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h],[
- ])
- AC_CHECK_HEADERS([execinfo.h],[:],[:])
-
-+AC_HEADER_MAJOR
-+dnl glibc 2.25 deprecates 'major' and 'minor' in <sys/types.h> and requires to
-+dnl include <sys/sysmacros.h>. However the logic in AC_HEADER_MAJOR has not yet
-+dnl been updated in Autoconf 2.69, so use a workaround:
-+m4_version_prereq([2.70], [],
-+[if test $ac_cv_header_sys_mkdev_h = no; then
-+ AC_CHECK_HEADER(sys/sysmacros.h, [AC_DEFINE(MAJOR_IN_SYSMACROS, 1,
-+ [Define to 1 if `major', `minor', and `makedev' are declared in <sys/sysmacros.h>.])])
-+fi])
-+
- # Checks for typedefs, structures, and compiler characteristics.
- # ----------------------------------------------------------------------
- AC_HEADER_STDBOOL
-diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
-index c8ba89d2..158a7ea2 100644
---- a/linux/LinuxProcessList.c
-+++ b/linux/LinuxProcessList.c
-@@ -26,6 +26,12 @@ in the source distribution for its full text.
- #include <assert.h>
- #include <sys/types.h>
- #include <fcntl.h>
-+#ifdef MAJOR_IN_MKDEV
-+#include <sys/mkdev.h>
-+#elif defined(MAJOR_IN_SYSMACROS) || \
-+ (defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H)
-+#include <sys/sysmacros.h>
-+#endif
-
- #ifdef HAVE_DELAYACCT
- #include <netlink/attr.h>
diff --git a/sys-process/htop/htop-2.1.0-r1.ebuild b/sys-process/htop/htop-2.1.0-r1.ebuild
deleted file mode 100644
index c0f863a1c76..00000000000
--- a/sys-process/htop/htop-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit autotools linux-info python-single-r1
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="https://hisham.hm/htop/"
-SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses:0=[unicode?]"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-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}/${P}-sysmacros.patch"
- "${FILESDIR}/${P}-ldflags.patch"
- "${FILESDIR}/${P}-bashisms.patch"
- "${FILESDIR}/${P}-ncurses_cflags.patch"
- "${FILESDIR}/${P}-clear_on_sigwinch.patch"
- "${FILESDIR}/${P}-header_updates.patch"
- "${FILESDIR}/${P}-color_issues.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-single-r1_pkg_setup
- linux-info_pkg_setup
-}
-
-src_prepare() {
- rm missing || die
-
- default
- use python_single_target_python2_7 || \
- eapply "${FILESDIR}/${PN}-2.1.0-MakeHeader-python3.patch" #646880
- 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[@]}
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/htop/, sys-process/htop/files/
@ 2018-11-27 14:35 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2018-11-27 14:35 UTC (permalink / raw
To: gentoo-commits
commit: 9f20fabce7e1778e143ce849820c61cc18904b83
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 27 14:35:38 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov 27 14:35:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f20fabc
sys-process/htop: Removed old.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-process/htop/Manifest | 1 -
sys-process/htop/files/htop-2.0.2-tinfo.patch | 73 ---------------------------
sys-process/htop/htop-2.0.2.ebuild | 61 ----------------------
3 files changed, 135 deletions(-)
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 01c2fd6812c..47f15a7d70f 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,3 +1,2 @@
-DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b30056a43e259ab39a69f84083d310bbefefe8408c7ca99918f1ea9ae775808b9afe9d0f78097ac6bb88dc7 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda
DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
DIST htop-3.0.0_beta5.tar.gz 175780 BLAKE2B f7d03485e74387c656e5a576f0a53c832bac668cee79750402335b2051a17d405392b99316f1546cc76fa83dc3bc85055ca58b928225df0e162ffdb9c1889a5f SHA512 eaa04a278257a1447cd60825083c864d3c23a4a5607447ce05356d550f42ff68a810f14bf91314b7266f9741aab8141d67d98316a31fa7806fb6b858cc804344
diff --git a/sys-process/htop/files/htop-2.0.2-tinfo.patch b/sys-process/htop/files/htop-2.0.2-tinfo.patch
deleted file mode 100644
index 4a536c0251a..00000000000
--- a/sys-process/htop/files/htop-2.0.2-tinfo.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- htop-2.0.2/configure.ac
-+++ htop-2.0.2/configure.ac
-@@ -185,32 +185,36 @@
-
- AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
- if test "x$enable_unicode" = xyes; then
-- HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
-- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
-- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
-- HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
-- HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
-- HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
-- missing_libraries="$missing_libraries libncursesw"
-- AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
-- ))))))
-+ PKG_CHECK_MODULES([NCURSES], [ncursesw],[
-+ HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
-+ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
-+ HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
-+ HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
-+ HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
-+ HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
-+ missing_libraries="$missing_libraries libncursesw"
-+ AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
-+ ))))))
-
-- AC_CHECK_HEADERS([ncursesw/curses.h],[:],
-- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-- [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-+ AC_CHECK_HEADERS([ncursesw/curses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-+ ])
- else
-- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
-- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
-- HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
-- HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
-- missing_libraries="$missing_libraries libncurses"
-- ))))
-+ PKG_CHECK_MODULES([NCURSES], [ncurses],[
-+ HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
-+ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
-+ HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
-+ HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
-+ missing_libraries="$missing_libraries libncurses"
-+ ))))
-
-- AC_CHECK_HEADERS([curses.h],[:],
-- [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-+ AC_CHECK_HEADERS([curses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-+ ])
- fi
-
- if test "$my_htop_platform" = "freebsd"; then
---- htop-2.0.2/Makefile.am
-+++ htop-2.0.2/Makefile.am
-@@ -85,6 +85,8 @@
- BUILT_SOURCES = $(myhtopheaders) $(myhtopplatheaders)
- htop_SOURCES = $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources) config.h
-
-+htop_LDADD = $(NCURSES_LIBS)
-+
- target:
- echo $(htop_SOURCES)
-
diff --git a/sys-process/htop/htop-2.0.2.ebuild b/sys-process/htop/htop-2.0.2.ebuild
deleted file mode 100644
index 68515359d77..00000000000
--- a/sys-process/htop/htop-2.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="https://hisham.hm/htop/"
-SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~amd64-fbsd"
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses:0=[unicode?]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-DOCS=( ChangeLog README )
-
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.0.2-tinfo.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
-
- linux-info_pkg_setup
-}
-
-src_prepare() {
- rm missing || die
-
- default
- eautoreconf
-}
-
-src_configure() {
- [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
- local myeconfargs=()
-
- 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[@]}
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/htop/, sys-process/htop/files/
@ 2020-02-11 10:59 David Seifert
0 siblings, 0 replies; 9+ messages in thread
From: David Seifert @ 2020-02-11 10:59 UTC (permalink / raw
To: gentoo-commits
commit: d73d1c70594d18629f3ff35896363cc33aa1fad6
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 10:59:33 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 10:59:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d73d1c70
sys-process/htop: Fix building with -fno-common
Closes: https://bugs.gentoo.org/706358
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-process/htop/files/htop-2.2.0-gcc-10.patch | 27 ++++++++++++++++++++++++++
sys-process/htop/htop-2.2.0.ebuild | 1 +
2 files changed, 28 insertions(+)
diff --git a/sys-process/htop/files/htop-2.2.0-gcc-10.patch b/sys-process/htop/files/htop-2.2.0-gcc-10.patch
new file mode 100644
index 00000000000..dc49b0bb850
--- /dev/null
+++ b/sys-process/htop/files/htop-2.2.0-gcc-10.patch
@@ -0,0 +1,27 @@
+--- 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/sys-process/htop/htop-2.2.0.ebuild b/sys-process/htop/htop-2.2.0.ebuild
index 8e121bcacff..318bdf97c5c 100644
--- a/sys-process/htop/htop-2.2.0.ebuild
+++ b/sys-process/htop/htop-2.2.0.ebuild
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
${PYTHON_DEPS}
virtual/pkgconfig"
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
DOCS=( ChangeLog README )
CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/htop/, sys-process/htop/files/
@ 2020-02-11 11:23 David Seifert
0 siblings, 0 replies; 9+ messages in thread
From: David Seifert @ 2020-02-11 11:23 UTC (permalink / raw
To: gentoo-commits
commit: 5fa347583c1bf30e212cb38d529bbed3d233c9cc
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 11:22:36 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 11:22:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fa34758
sys-process/htop: Fix building with -fno-common
Closes: https://bugs.gentoo.org/706358
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../htop/files/htop-3.0.0_beta5-gcc-10.patch | 52 ++++++++++++++++++++++
sys-process/htop/htop-3.0.0_beta5.ebuild | 4 +-
2 files changed, 54 insertions(+), 2 deletions(-)
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
new file mode 100644
index 00000000000..6a2004b3cf7
--- /dev/null
+++ b/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch
@@ -0,0 +1,52 @@
+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
index 9ee89943272..3351359ceb6 100644
--- a/sys-process/htop/htop-3.0.0_beta5.ebuild
+++ b/sys-process/htop/htop-3.0.0_beta5.ebuild
@@ -30,9 +30,9 @@ 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}-2.1.0-header_updates.patch
+ "${FILESDIR}"/${PN}-3.0.0_beta5-gcc-10.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/htop/, sys-process/htop/files/
@ 2020-08-27 11:48 Thomas Deutschmann
0 siblings, 0 replies; 9+ messages in thread
From: Thomas Deutschmann @ 2020-08-27 11:48 UTC (permalink / raw
To: gentoo-commits
commit: 31400e1313739f5aec35d7582dc643abf783f714
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 11:47:46 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 11:48:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31400e13
sys-process/htop: drop old
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-process/htop/Manifest | 1 -
.../htop/files/htop-3.0.0_beta5-gcc-10.patch | 52 ----------------
sys-process/htop/htop-3.0.0_beta5.ebuild | 72 ----------------------
3 files changed, 125 deletions(-)
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 9498c38b03f..eb502eadccb 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 6a2004b3cf7..00000000000
--- 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 241e898507e..00000000000
--- 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[@]}
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/htop/, sys-process/htop/files/
@ 2021-08-29 14:31 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2021-08-29 14:31 UTC (permalink / raw
To: gentoo-commits
commit: ec16067bb1ed0297ce5d38698df511c7d30c4ebb
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 29 14:30:06 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Aug 29 14:31:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec16067b
sys-process/htop: Removed old
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-process/htop/Manifest | 2 -
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 ----------
5 files changed, 326 deletions(-)
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index dc292c95277..847ac7b4faa 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,4 +1,2 @@
-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
DIST htop-3.1.0_rc1.tar.gz 378045 BLAKE2B 65d5f2bdb6e41fb0a4edd76c62a36e951bd86a67ebb9908ca712b2ee7b5f9714c3fe5cd4193885b869b96dcd73bbf945ab22fcd31aa11d90598f9d9953ed4b0e SHA512 f917dbb8ba0de1a9f703423c13cec19f0f69da765df320739eeabf0e928495ec70cdd8eb0cca2871226cd6b472a713ee5ebc43aefa02b2ffbd6c29b1208f5cad
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 ea65a799ed7..00000000000
--- 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?= <cgzones@googlemail.com>
-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 a2b6a0d4259..00000000000
--- 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?= <cgzones@googlemail.com>
-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 13b5c03ad25..00000000000
--- 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 65e53029fa2..00000000000
--- 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[@]}
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-08-29 14:31 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-09 13:22 [gentoo-commits] repo/gentoo:master commit in: sys-process/htop/, sys-process/htop/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2021-08-29 14:31 Lars Wendler
2020-08-27 11:48 Thomas Deutschmann
2020-02-11 11:23 David Seifert
2020-02-11 10:59 David Seifert
2018-11-27 14:35 Lars Wendler
2016-07-22 8:53 Lars Wendler
2016-07-22 8:53 Lars Wendler
2016-02-11 13:37 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox