gentoo resync : 11.02.2018

3 files changed, 38 insertions, 144 deletions

diff --git a/sys-process/htop/files/htop-1.0.3-tinfo.patch b/sys-process/htop/files/htop-1.0.3-tinfo.patch
deleted file mode 100644
index 62a887baf376..000000000000
--- a/sys-process/htop/files/htop-1.0.3-tinfo.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 820e2e5..85f49e9 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="-pg" AM_CPPFLAGS="-pg -O2 -DNDEBUG"
- 
-diff --git a/configure.ac b/configure.ac
-index 2b934e8..3593885 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,6 +20,7 @@ AM_PROG_CC_C_O
- 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,20 +90,24 @@ 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/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
--   AC_CHECK_LIB([ncurses], [refresh], [], [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"])])])])
-+   PKG_CHECK_MODULES([NCURSES], [ncurses],[
-+      AC_CHECK_LIB([ncurses], [refresh], [], [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"])])])])
-+   ])
- fi
- 
- if test ! -z "$missing_libraries"; then
diff --git a/sys-process/htop/files/htop-2.0.0-tinfo.patch b/sys-process/htop/files/htop-2.0.0-tinfo.patch
deleted file mode 100644
index e04019519e0c..000000000000
--- a/sys-process/htop/files/htop-2.0.0-tinfo.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- 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/files/htop-2.1.0-sysmacros.patch b/sys-process/htop/files/htop-2.1.0-sysmacros.patch
new file mode 100644
index 000000000000..08f023b442e5
--- /dev/null
+++ b/sys-process/htop/files/htop-2.1.0-sysmacros.patch
@@ -0,0 +1,38 @@
+From 25c50af220c2de4542b440b7470a644caf2a3b65 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 5 Feb 2018 16:02:19 +0100
+Subject: [PATCH] Add <sys/sysmacros.h> to two files.
+
+Future glibc releases will no longer include sysmacros implicitly.
+---
+ Process.c                | 1 +
+ linux/LinuxProcessList.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/Process.c b/Process.c
+index 1836080..5122afb 100644
+--- a/Process.c
++++ b/Process.c
+@@ -19,6 +19,7 @@ in the source distribution for its full text.
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <signal.h>
+diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
+index 6f2631a..7522fb1 100644
+--- a/linux/LinuxProcessList.c
++++ b/linux/LinuxProcessList.c
+@@ -25,6 +25,7 @@ in the source distribution for its full text.
+ #include <time.h>
+ #include <assert.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <fcntl.h>
+ 
+ #ifdef HAVE_DELAYACCT
+-- 
+2.16.1
+