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[@]} +}
