Merge updates from master

18 files changed, 5 insertions, 902 deletions

diff --git a/app-admin/mongo-tools/files/mongo-tools-3.0.0-build.patch b/app-admin/mongo-tools/files/mongo-tools-3.0.0-build.patch
deleted file mode 100644
index f7fd93b04a51..000000000000
--- a/app-admin/mongo-tools/files/mongo-tools-3.0.0-build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- build.sh.orig	2015-02-17 16:55:47.000000000 +0000
-+++ build.sh	2015-02-18 09:22:30.671123198 +0000
-@@ -19,5 +19,5 @@
- for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do
- 	echo "Building ${i}..."
-   	# Build the tool, using -ldflags to link in the current gitspec
--	go build -o "bin/$i" -ldflags "-X github.com/mongodb/mongo-tools/common/options.Gitspec `git rev-parse HEAD`" -tags "$tags" "$i/main/$i.go"
-+	go build -o "bin/$i" -tags "$tags" "$i/main/$i.go"
- done
-
diff --git a/app-admin/mongo-tools/files/mongo-tools-3.0.12-build.patch b/app-admin/mongo-tools/files/mongo-tools-3.0.12-build.patch
deleted file mode 100644
index f3d881948679..000000000000
--- a/app-admin/mongo-tools/files/mongo-tools-3.0.12-build.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/build.sh	2016-04-29 20:14:54.000000000 +0200
-+++ b/build.sh	2016-05-17 17:22:50.830113156 +0200
-@@ -19,5 +19,5 @@
- for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do
- 	echo "Building ${i}..."
-   	# Build the tool, using -ldflags to link in the current gitspec
--        go build -o "bin/$i" -ldflags "-X github.com/mongodb/mongo-tools/common/options.Gitspec=`git rev-parse HEAD` -X github.com/mongodb/mongo-tools/common/options.VersionStr=$(git describe)" -tags "$tags" "$i/main/$i.go"
-+        go build -o "bin/$i" -tags "$tags" "$i/main/$i.go" || exit 1
- done
diff --git a/app-admin/mongo-tools/files/mongo-tools-3.2.5-build.patch b/app-admin/mongo-tools/files/mongo-tools-3.2.5-build.patch
deleted file mode 100644
index 31d94dd65cad..000000000000
--- a/app-admin/mongo-tools/files/mongo-tools-3.2.5-build.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/build.sh	2016-04-21 17:31:22.156178084 +0200
-+++ b/build.sh	2016-04-21 17:32:07.723421116 +0200
-@@ -19,5 +19,5 @@
- for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do
- 	echo "Building ${i}..."
-   	# Build the tool, using -ldflags to link in the current gitspec
--        go build -o "bin/$i" -ldflags "-X github.com/mongodb/mongo-tools/common/options.Gitspec `git rev-parse HEAD` -X github.com/mongodb/mongo-tools/common/options.VersionStr $(git describe)" -tags "$tags" "$i/main/$i.go"
-+	go build -o "bin/$i" -tags "$tags" "$i/main/$i.go"
- done
diff --git a/app-doc/doxygen/files/doxygen-1.8.10-fix_flex_check.patch b/app-doc/doxygen/files/doxygen-1.8.10-fix_flex_check.patch
deleted file mode 100644
index 24a3b64ad3e1..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.10-fix_flex_check.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 5fcb13572417a3b4a05217e9023c683864f35643 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Thu, 19 Nov 2015 12:00:54 +0100
-Subject: [PATCH] Support flex-2.6.0
-
-The version checks only considered YY_FLEX_SUBMINOR_VERSION and did not
-take YY_FLEX_MINOR_VERSION into account, which made them fail with
-flex-2.6.0.
-
-diff --git a/src/code.l b/src/code.l
-index 3323580..25719af 100644
---- a/src/code.l
-+++ b/src/code.l
-@@ -3700,7 +3700,7 @@ void codeFreeScanner()
- extern "C" { // some bogus code to keep the compiler happy
-   void codeYYdummy() { yy_flex_realloc(0,0); } 
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
- #endif
- 
-diff --git a/src/commentscan.l b/src/commentscan.l
-index cf892a0..2629857 100644
---- a/src/commentscan.l
-+++ b/src/commentscan.l
-@@ -1128,7 +1128,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
- 					      // but we need to know the position in the input buffer where this 
- 					      // rule matched.
- 					      // for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
--#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
-+#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
- 					      inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
- #else
- 					      inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
-@@ -1190,7 +1190,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
-                                           g_memberGroupHeader.resize(0);
- 					  parseMore=TRUE;
-                                           needNewEntry = TRUE;
--#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
-+#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
- 				          inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
- #else
- 				          inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);
-diff --git a/src/fortrancode.l b/src/fortrancode.l
-index fb91a83..352912b 100644
---- a/src/fortrancode.l
-+++ b/src/fortrancode.l
-@@ -1306,7 +1306,7 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
- extern "C" { // some bogus code to keep the compiler happy
-   void fortrancodeYYdummy() { yy_flex_realloc(0,0); } 
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
- #else
- extern "C" { // some bogus code to keep the compiler happy
-diff --git a/src/pycode.l b/src/pycode.l
-index 3c41a69..f58f7c1 100644
---- a/src/pycode.l
-+++ b/src/pycode.l
-@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/,
- extern "C" { // some bogus code to keep the compiler happy
-   void pycodeYYdummy() { yy_flex_realloc(0,0); } 
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
- #endif
- 
-diff --git a/src/vhdlcode.l b/src/vhdlcode.l
-index 369ae48..6957048 100644
---- a/src/vhdlcode.l
-+++ b/src/vhdlcode.l
-@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner()
- extern "C" { // some bogus code to keep the compiler happy
-   void vhdlcodeYYdummy() { yy_flex_realloc(0,0); } 
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
- #endif
- 
-diff --git a/src/xmlcode.l b/src/xmlcode.l
-index 15b5d7e..2bef4a0 100644
---- a/src/xmlcode.l
-+++ b/src/xmlcode.l
-@@ -407,7 +407,7 @@ void resetXmlCodeParserState()
- extern "C" { // some bogus code to keep the compiler happy
-   void xmlcodeYYdummy() { yy_flex_realloc(0,0); } 
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
- #endif
- 
diff --git a/app-text/sword/files/sword-1.6.2-gcc47.patch b/app-text/sword/files/sword-1.6.2-gcc47.patch
deleted file mode 100644
index 7b55de75b646..000000000000
--- a/app-text/sword/files/sword-1.6.2-gcc47.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/419505
-
-
---- a/include/multimapwdef.h
-+++ b/include/multimapwdef.h
-@@ -12,21 +12,21 @@ class multimapwithdefault : public std::multimap<Key, T, Compare> {
- public:
- 	typedef std::pair<const Key, T> value_type;
- 	T& getWithDefault(const Key& k, const T& defaultValue) {
--		if (find(k) == this->end()) {
--			insert(value_type(k, defaultValue));
-+		if (this->find(k) == this->end()) {
-+			this->insert(value_type(k, defaultValue));
- 		}
--		return (*(find(k))).second;
-+		return (*(this->find(k))).second;
- 	}
- 
- 	T& operator[](const Key& k) {
--		if (find(k) == this->end()) {
--			insert(value_type(k, T()));
-+		if (this->find(k) == this->end()) {
-+			this->insert(value_type(k, T()));
- 		}
--		return (*(find(k))).second;
-+		return (*(this->find(k))).second;
- 	}
- 	bool has(const Key& k, const T &val) const {
--		typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k);
--		typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k);
-+		typename std::multimap<Key, T, Compare>::const_iterator start = this->lower_bound(k);
-+		typename std::multimap<Key, T, Compare>::const_iterator end = this->upper_bound(k);
- 		for (; start!=end; start++) {
- 			if (start->second == val)
- 				return true;
diff --git a/dev-tcltk/expect/files/expect-5.44.1.15-expectk.patch b/dev-tcltk/expect/files/expect-5.44.1.15-expectk.patch
deleted file mode 100644
index 0c0ba80293e0..000000000000
--- a/dev-tcltk/expect/files/expect-5.44.1.15-expectk.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-expectk is only built when TK_BIN_DIR is defined.  the configure script
-takes care of figuring out this value, but then they forgot to actually
-write it out to the Makefile.
-
---- Makefile.in
-+++ Makefile.in
-@@ -24,6 +24,7 @@
- # SETUID = chmod u+s
- 
- LIB_RUNTIME_DIR = $(DESTDIR)@libdir@
-+TK_BIN_DIR = @TK_BIN_DIR@
- 
- # The following Expect scripts are not necessary to have installed as
- # commands, but are very useful. Edit out what you don't want
diff --git a/dev-tcltk/expect/files/expect-5.44.1.15-gfbsd.patch b/dev-tcltk/expect/files/expect-5.44.1.15-gfbsd.patch
deleted file mode 100644
index d67de2126a07..000000000000
--- a/dev-tcltk/expect/files/expect-5.44.1.15-gfbsd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- expect-5.44.1.15/tclconfig/tcl.m4.orig	2010-04-08 22:49:51.568043292 -0700
-+++ expect-5.44.1.15/tclconfig/tcl.m4	2010-04-08 22:50:28.207915301 -0700
-@@ -1579,12 +1579,12 @@
- 	FreeBSD-*)
- 	    # FreeBSD 3.* and greater have ELF.
- 	    SHLIB_CFLAGS="-fPIC"
--	    SHLIB_LD="ld -Bshareable -x"
-+	    SHLIB_LD="${CC} -shared"
- 	    SHLIB_LD_LIBS='${LIBS}'
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
--	    LDFLAGS="$LDFLAGS -export-dynamic"
-+	    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
- 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- 	    if test "${TCL_THREADS}" = "1" ; then
diff --git a/dev-tcltk/expect/files/expect-5.44.1.15-headers.patch b/dev-tcltk/expect/files/expect-5.44.1.15-headers.patch
deleted file mode 100644
index 77e4d91f4bf9..000000000000
--- a/dev-tcltk/expect/files/expect-5.44.1.15-headers.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3071706&group_id=13179&atid=113179
-
---- a/exp_clib.c
-+++ b/exp_clib.c
-@@ -15,6 +15,12 @@
- #endif
- #include <sys/types.h>
- #include <sys/ioctl.h>
-+#ifdef HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif
-+#ifdef HAVE_SYS_WAIT_H
-+#include <sys/wait.h>
-+#endif
- 
- #ifdef TIME_WITH_SYS_TIME
- # include <sys/time.h>
---- a/exp_trap.c
-+++ b/exp_trap.c
-@@ -13,6 +13,7 @@
- #include <stdio.h>
- #include <signal.h>
- #include <sys/types.h>
-+#include <string.h>
- 
- #ifdef HAVE_SYS_WAIT_H
- #include <sys/wait.h>
---- a/pty_termios.c
-+++ b/pty_termios.c
-@@ -9,6 +9,8 @@
- 
- #include <stdio.h>
- #include <signal.h>
-+#include <string.h>
-+#include <pty.h>
- 
- #if defined(SIGCLD) && !defined(SIGCHLD)
- #define SIGCHLD SIGCLD
-@@ -100,6 +100,7 @@
- 
- #include "exp_tty_in.h"
- #include "exp_rename.h"
-+#include "exp_int.h"
- #include "exp_pty.h"
- 
- void expDiagLog();
---- a/exp_chan.c
-+++ b/exp_chan.c
-@@ -34,6 +34,7 @@
- #include "exp_rename.h"
- #include "exp_prog.h"
- #include "exp_command.h"
-+#include "exp_event.h"
- #include "exp_log.h"
- #include "tcldbg.h" /* Dbg_StdinMode */
- 
---- a/exp_clib.c
-+++ b/exp_clib.c
-@@ -1955,6 +1955,7 @@
- 
- #include "expect.h"
- #include "exp_int.h"
-+EXTERN void		exp_init_tty _ANSI_ARGS_((void));
- 
- /* exp_glob.c - expect functions for doing glob
-  *
---- a/exp_tty.h
-+++ b/exp_tty.h
-@@ -17,6 +17,7 @@
- 
- void exp_tty_raw(int set);
- void exp_tty_echo(int set);
-+int exp_tty_cooked_echo(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo);
- void exp_tty_break(Tcl_Interp *interp, int fd);
- int exp_tty_raw_noecho(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo);
- int exp_israw(void);
---- a/exp_main_tk.c
-+++ b/exp_main_tk.c
-@@ -32,6 +32,7 @@
- static char sccsid[] = "@(#) tkAppInit.c 1.19 95/12/23 17:09:24";
- #endif /* not lint */
- 
-+#include <string.h>
- #include <ctype.h>
- 
- #include "tk.h"
diff --git a/dev-tcltk/expect/files/expect-5.44.1.15_with-tk-no.patch b/dev-tcltk/expect/files/expect-5.44.1.15_with-tk-no.patch
deleted file mode 100644
index cea372daaacb..000000000000
--- a/dev-tcltk/expect/files/expect-5.44.1.15_with-tk-no.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-This is a minimal patch that does not keep indentation consistent in tcl.m4
-Updating indentation would make the patch much bigger and less readable.
-
-Signed-off-by: Gilles Espinasse <g.esp@free.fr>
-
-Index: INSTALL
-===================================================================
-RCS file: /cvsroot/expect/expect/INSTALL,v
-retrieving revision 5.30
-diff -u -r5.30 INSTALL
---- INSTALL	21 Jun 1999 18:41:41 -0000	5.30
-+++ INSTALL	30 May 2009 11:51:21 -0000
-@@ -152,6 +152,7 @@
- 
- 	--with-tk=...		Specifies the directory containing Tk's
- 				configure file (tkConfig.sh).
-+				--with-tk=no disable Tk usage in expect
- 
- 	--with-tkinclude=...	Specifies the directory containing Tk's
- 				private include files (such as tkInt.h)
-Index: Makefile.in
-===================================================================
-RCS file: /cvsroot/expect/expect/Makefile.in,v
-retrieving revision 5.45
-diff -u -r5.45 Makefile.in
---- Makefile.in	3 Oct 2008 17:05:14 -0000	5.45
-+++ Makefile.in	30 May 2009 11:51:21 -0000
-@@ -103,7 +103,11 @@
- PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
- 
- lib_BINARIES	= $(PKG_LIB_FILE)
--bin_BINARIES	= expect expectk
-+bin_BINARIES	= expect
-+ifneq ($(TK_BIN_DIR),)
-+  bin_BINARIES	+= expectk
-+endif
-+
- BINARIES	= $(lib_BINARIES) $(bin_BINARIES)
- 
- SHELL		= @SHELL@
-Index: tclconfig/tcl.m4
-===================================================================
-RCS file: /cvsroot/expect/expect/tclconfig/tcl.m4,v
-retrieving revision 1.3
-diff -u -r1.3 tcl.m4
---- tclconfig/tcl.m4	25 Jan 2006 21:52:11 -0000	1.3
-+++ tclconfig/tcl.m4	30 May 2009 11:51:23 -0000
-@@ -181,10 +181,12 @@
- #
- #	Adds the following arguments to configure:
- #		--with-tk=...
-+#		--with-tk=no disable Tk usage
- #
- #	Defines the following vars:
- #		TK_BIN_DIR	Full path to the directory containing
- #				the tkConfig.sh file
-+#				Empty if Tk is disabled
- #------------------------------------------------------------------------
- 
- AC_DEFUN(TEA_PATH_TKCONFIG, [
-@@ -201,6 +203,12 @@
- 	    AC_HELP_STRING([--with-tk],
- 		[directory containing tk configuration (tkConfig.sh)]),
- 	    with_tkconfig=${withval})
-+
-+	if test x"${with_tkconfig}" = x"no" ; then
-+	    AC_MSG_RESULT([Tk is disabled by --with-tk=no])
-+	    unset TK_BIN_DIR
-+	else
-+
- 	AC_MSG_CHECKING([for Tk configuration])
- 	AC_CACHE_VAL(ac_cv_c_tkconfig,[
- 
-@@ -309,6 +317,7 @@
- 	    TK_BIN_DIR=${ac_cv_c_tkconfig}
- 	    AC_MSG_RESULT([found ${TK_BIN_DIR}/tkConfig.sh])
- 	fi
-+	fi
-     fi
- ])
- 
-@@ -420,6 +429,7 @@
- #------------------------------------------------------------------------
- 
- AC_DEFUN(TEA_LOAD_TKCONFIG, [
-+    if test x"${with_tkconfig}" != x"no" ; then
-     AC_MSG_CHECKING([for existence of ${TK_BIN_DIR}/tkConfig.sh])
- 
-     if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then
-@@ -501,6 +511,7 @@
- 
-     AC_SUBST(TK_LIBS)
-     AC_SUBST(TK_XINCLUDES)
-+    fi
- ])
- 
- #------------------------------------------------------------------------
-@@ -3528,6 +3539,11 @@
- #------------------------------------------------------------------------
- 
- AC_DEFUN(TEA_PUBLIC_TK_HEADERS, [
-+    if test x"${with_tkconfig}" = x"no" ; then
-+	TK_INCLUDES=""
-+	AC_SUBST(TK_INCLUDES)
-+    else
-+
-     AC_MSG_CHECKING([for Tk public headers])
- 
-     AC_ARG_WITH(tkinclude, [  --with-tkinclude      directory containing the public Tk header files.], with_tkinclude=${withval})
-@@ -3608,6 +3624,7 @@
- 	fi
- 	AC_MSG_RESULT([${INCLUDE_DIR_NATIVE}])
-     fi
-+    fi
- ])
- 
- #------------------------------------------------------------------------
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 28b29eb3f0f9..7b12a6e7d7f3 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -110,7 +110,7 @@ case ${EAPI} in
 esac
 
 inherit toolchain-funcs multilib ninja-utils flag-o-matic eutils \
-	multiprocessing versionator
+	multiprocessing versionator xdg-utils
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
@@ -491,7 +491,7 @@ cmake-utils_src_configure() {
 	_cmake_check_build_dir
 
 	# Fix xdg collision with sandbox
-	local -x XDG_CONFIG_HOME="${T}"
+	xdg_environment_reset
 
 	# @SEE CMAKE_BUILD_TYPE
 	if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then
diff --git a/mail-client/alpine/alpine-2.21.1.ebuild b/mail-client/alpine/alpine-2.21.1.ebuild
index 3c3ac27426b4..e9150d277470 100644
--- a/mail-client/alpine/alpine-2.21.1.ebuild
+++ b/mail-client/alpine/alpine-2.21.1.ebuild
@@ -63,13 +63,13 @@ src_configure() {
 }
 
 src_compile() {
-	emake -j1 AR=$(tc-getAR)
+	emake AR=$(tc-getAR)
 }
 
 src_install() {
 	if use onlyalpine ; then
 		dobin alpine/alpine
-		doman doc/alpine.1
+		doman doc/man1/alpine.1
 	else
 		emake DESTDIR="${D}" install
 		doman doc/man1/*.1
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index dd8d880a7fd9..54cf368c1efc 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1 +1 @@
-DIST signal-desktop_1.0.39_amd64.deb 94702074 BLAKE2B b9f727a70e6e27dafd193699769870e4abf30916f0826a10a2337a3dac1dcbf75a00c0396b144864c534905ab2a85ee04ae039e150823830860a8251508155c8 SHA512 24e7a40c11117f4fe67c84ebe2f361f7513831cdffdb84c508318db823e8a41a9a51a4449a60ecc276a8f31581c036166c76df2e4b395fe65c09607d82bb766a
+DIST signal-desktop_1.0.40_amd64.deb 94694618 BLAKE2B ed6824f3e2ab2ee7a9872d19b8b8938547be8e3904d62d646b4e7c2dafb1caea3a8f847b7ac6fbbe6d905f5af45a02f83d766d7f55205a1a6fbc0927c2b464ad SHA512 b11f9b537a862c496a942a17977c7cc4f5ffc7b5892c6287e13711b2705163692d7b014083de770144df6d51bfc9a8b0f128e3b1a8c0f507fc042d27d5136d32
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.0.39.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.0.40.ebuild
index 55d852466784..55d852466784 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.0.39.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.0.40.ebuild
diff --git a/net-libs/libupnp/files/libupnp-1.8.0-docs-install.patch b/net-libs/libupnp/files/libupnp-1.8.0-docs-install.patch
deleted file mode 100644
index f0fbd04fc353..000000000000
--- a/net-libs/libupnp/files/libupnp-1.8.0-docs-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libupnp-1.6.19/upnp/sample/Makefile.am.orig	2013-11-15 19:50:02.000000000 +0400
-+++ libupnp-1.6.19/upnp/sample/Makefile.am	2016-06-03 20:30:43.545081667 +0300
-@@ -65,8 +65,8 @@
- if WITH_DOCUMENTATION
- examplesdir = $(docdir)/examples
- examples_DATA = \
--	$(tv_ctrlpt_1_8_SOURCES) \
--	$(tv_device_1_8_SOURCES)
-+	$(sort $(tv_ctrlpt_1_8_SOURCES) \
-+	$(tv_device_1_8_SOURCES) )
- endif
- 
- EXTRA_DIST = \
diff --git a/net-misc/ptpd/ptpd-2.3.1.ebuild b/net-misc/ptpd/ptpd-2.3.1.ebuild
deleted file mode 100644
index 3fcbbbc2a23e..000000000000
--- a/net-misc/ptpd/ptpd-2.3.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic systemd
-
-DESCRIPTION="Precision Time Protocol daemon"
-HOMEPAGE="https://github.com/ptpd/ptpd"
-
-SRC_URI="https://github.com/ptpd/ptpd/archive/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="debug experimental ntp +pcap snmp slave-only +statistics"
-RDEPEND="
-	pcap? ( net-libs/libpcap )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	ntp? ( net-misc/ntp )"
-
-S=${WORKDIR}/ptpd-${P}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	econf \
-		--enable-daemon \
-		$(use_enable snmp) \
-		$(use_enable experimental experimental-options) \
-		$(use_enable statistics) \
-		$(use_enable debug runtime-debug) \
-		$(use_enable pcap) \
-		$(use_enable slave-only)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	insinto /etc
-	newins "src/ptpd2.conf.minimal" ptpd2.conf
-
-	newinitd "${FILESDIR}/ptpd2.rc" ptpd2
-	newconfd "${FILESDIR}/ptpd2.confd" ptpd2
-
-	systemd_dounit "${FILESDIR}/ptpd2.service"
-}
-
-pkg_postinst() {
-	elog "Do not forget to setup correct network interface."
-	elog "Change the config file /etc/ptpd2.conf to suit your needs."
-}
diff --git a/sys-fs/udev/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch b/sys-fs/udev/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
deleted file mode 100644
index 440ec75bd3bb..000000000000
--- a/sys-fs/udev/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From 016fb3b83b861cfe58694996076a9764dcb46475 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppymaster@gmail.com>
-Date: Tue, 10 Jan 2017 02:39:05 -0500
-Subject: [PATCH 2/2] build-sys: add check for gperf lookup function signature
- (#5055)
-
-gperf-3.1 generates lookup functions that take a size_t length
-parameter instead of unsigned int. Test for this at configure time.
-
-Fixes: https://github.com/systemd/systemd/issues/5039
----
- configure.ac                     | 22 ++++++++++++++++++++++
- src/basic/af-list.c              |  2 +-
- src/basic/arphrd-list.c          |  2 +-
- src/basic/cap-list.c             |  2 +-
- src/basic/errno-list.c           |  2 +-
- src/core/load-fragment.h         |  2 +-
- src/journal/journald-server.h    |  2 +-
- src/login/logind.h               |  2 +-
- src/network/networkd-conf.h      |  2 +-
- src/network/networkd-netdev.h    |  2 +-
- src/network/networkd-network.h   |  2 +-
- src/nspawn/nspawn-settings.h     |  2 +-
- src/resolve/dns-type.c           |  2 +-
- src/resolve/resolved-conf.h      |  2 +-
- src/test/test-af-list.c          |  2 +-
- src/test/test-arphrd-list.c      |  2 +-
- src/timesync/timesyncd-conf.h    |  2 +-
- src/udev/net/link-config.h       |  2 +-
- src/udev/udev-builtin-keyboard.c |  2 +-
- 19 files changed, 40 insertions(+), 18 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1928e65bd..5c639e32d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -258,6 +258,28 @@ AC_CHECK_SIZEOF(rlim_t,,[
-        #include <sys/resource.h>
- ])
- 
-+GPERF_TEST="$(echo foo,bar | ${GPERF} -L ANSI-C)"
-+
-+AC_COMPILE_IFELSE(
-+        [AC_LANG_PROGRAM([
-+                #include <string.h>
-+                const char * in_word_set(const char *, size_t);
-+                $GPERF_TEST]
-+        )],
-+        [GPERF_LEN_TYPE=size_t],
-+        [AC_COMPILE_IFELSE(
-+                [AC_LANG_PROGRAM([
-+                        #include <string.h>
-+                        const char * in_word_set(const char *, unsigned);
-+                        $GPERF_TEST]
-+                )],
-+                [GPERF_LEN_TYPE=unsigned],
-+                [AC_MSG_ERROR([** unable to determine gperf len type])]
-+        )]
-+)
-+
-+AC_DEFINE_UNQUOTED([GPERF_LEN_TYPE], [$GPERF_LEN_TYPE], [gperf len type])
-+
- # ------------------------------------------------------------------------------
- # we use python to build the man page index
- have_python=no
-diff --git a/src/basic/af-list.c b/src/basic/af-list.c
-index 3fac9c508..4b291d177 100644
---- a/src/basic/af-list.c
-+++ b/src/basic/af-list.c
-@@ -23,7 +23,7 @@
- #include "af-list.h"
- #include "macro.h"
- 
--static const struct af_name* lookup_af(register const char *str, register unsigned int len);
-+static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len);
- 
- #include "af-from-name.h"
- #include "af-to-name.h"
-diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c
-index 6792d1ee3..2d598dc66 100644
---- a/src/basic/arphrd-list.c
-+++ b/src/basic/arphrd-list.c
-@@ -23,7 +23,7 @@
- #include "arphrd-list.h"
- #include "macro.h"
- 
--static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len);
-+static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len);
- 
- #include "arphrd-from-name.h"
- #include "arphrd-to-name.h"
-diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
-index 3e773a06f..d68cc78d0 100644
---- a/src/basic/cap-list.c
-+++ b/src/basic/cap-list.c
-@@ -26,7 +26,7 @@
- #include "parse-util.h"
- #include "util.h"
- 
--static const struct capability_name* lookup_capability(register const char *str, register unsigned int len);
-+static const struct capability_name* lookup_capability(register const char *str, register GPERF_LEN_TYPE len);
- 
- #include "cap-from-name.h"
- #include "cap-to-name.h"
-diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c
-index 31b66bad5..c6a01eec8 100644
---- a/src/basic/errno-list.c
-+++ b/src/basic/errno-list.c
-@@ -23,7 +23,7 @@
- #include "macro.h"
- 
- static const struct errno_name* lookup_errno(register const char *str,
--                                             register unsigned int len);
-+                                             register GPERF_LEN_TYPE len);
- 
- #include "errno-from-name.h"
- #include "errno-to-name.h"
-diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
-index c05f205c3..ede6b1f73 100644
---- a/src/core/load-fragment.h
-+++ b/src/core/load-fragment.h
-@@ -118,7 +118,7 @@ int config_parse_user_group(const char *unit, const char *filename, unsigned lin
- int config_parse_user_group_strv(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- 
- /* gperf prototypes */
--const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- extern const char load_fragment_gperf_nulstr[];
- 
- typedef enum Disabled {
-diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
-index 99d91496b..d1520c45d 100644
---- a/src/journal/journald-server.h
-+++ b/src/journal/journald-server.h
-@@ -179,7 +179,7 @@ void server_dispatch_message(Server *s, struct iovec *iovec, unsigned n, unsigne
- void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ...) _printf_(3,0) _sentinel_;
- 
- /* gperf lookup function */
--const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* journald_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- int config_parse_storage(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- 
-diff --git a/src/login/logind.h b/src/login/logind.h
-index 086fa1eeb..7556ee2e4 100644
---- a/src/login/logind.h
-+++ b/src/login/logind.h
-@@ -182,7 +182,7 @@ int manager_unit_is_active(Manager *manager, const char *unit);
- int manager_job_is_active(Manager *manager, const char *path);
- 
- /* gperf lookup function */
--const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* logind_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- int manager_set_lid_switch_ignore(Manager *m, usec_t until);
- 
-diff --git a/src/network/networkd-conf.h b/src/network/networkd-conf.h
-index c7bfb42a7..00ddb7672 100644
---- a/src/network/networkd-conf.h
-+++ b/src/network/networkd-conf.h
-@@ -23,7 +23,7 @@
- 
- int manager_parse_config_file(Manager *m);
- 
--const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- int config_parse_duid_type(
-                 const char *unit,
-diff --git a/src/network/networkd-netdev.h b/src/network/networkd-netdev.h
-index 70ff947b9..37c743121 100644
---- a/src/network/networkd-netdev.h
-+++ b/src/network/networkd-netdev.h
-@@ -175,7 +175,7 @@ NetDevKind netdev_kind_from_string(const char *d) _pure_;
- int config_parse_netdev_kind(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- 
- /* gperf */
--const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- /* Macros which append INTERFACE= to the message */
- 
-diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
-index 42fc82d39..09c3b3a3a 100644
---- a/src/network/networkd-network.h
-+++ b/src/network/networkd-network.h
-@@ -236,7 +236,7 @@ int config_parse_dhcp_route_table(const char *unit, const char *filename, unsign
- /* Legacy IPv4LL support */
- int config_parse_ipv4ll(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- 
--const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- extern const sd_bus_vtable network_vtable[];
- 
-diff --git a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h
-index 231e6d726..4ae34f8e2 100644
---- a/src/nspawn/nspawn-settings.h
-+++ b/src/nspawn/nspawn-settings.h
-@@ -103,7 +103,7 @@ bool settings_private_network(Settings *s);
- 
- DEFINE_TRIVIAL_CLEANUP_FUNC(Settings*, settings_free);
- 
--const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- int config_parse_capability(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- int config_parse_id128(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-diff --git a/src/resolve/dns-type.c b/src/resolve/dns-type.c
-index aaf5ed62c..d89ae28dc 100644
---- a/src/resolve/dns-type.c
-+++ b/src/resolve/dns-type.c
-@@ -29,7 +29,7 @@ typedef const struct {
- } dns_type;
- 
- static const struct dns_type_name *
--lookup_dns_type (register const char *str, register unsigned int len);
-+lookup_dns_type (register const char *str, register GPERF_LEN_TYPE len);
- 
- #include "dns_type-from-name.h"
- #include "dns_type-to-name.h"
-diff --git a/src/resolve/resolved-conf.h b/src/resolve/resolved-conf.h
-index fc425a36b..8184d6cad 100644
---- a/src/resolve/resolved-conf.h
-+++ b/src/resolve/resolved-conf.h
-@@ -41,7 +41,7 @@ int manager_parse_search_domains_and_warn(Manager *m, const char *string);
- int manager_add_dns_server_by_string(Manager *m, DnsServerType type, const char *word);
- int manager_parse_dns_server_string_and_warn(Manager *m, DnsServerType type, const char *string);
- 
--const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- int config_parse_dns_servers(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- int config_parse_search_domains(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c
-index aeaa0929b..e2479133d 100644
---- a/src/test/test-af-list.c
-+++ b/src/test/test-af-list.c
-@@ -24,7 +24,7 @@
- #include "string-util.h"
- #include "util.h"
- 
--static const struct af_name* lookup_af(register const char *str, register unsigned int len);
-+static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len);
- 
- #include "af-from-name.h"
- #include "af-list.h"
-diff --git a/src/test/test-arphrd-list.c b/src/test/test-arphrd-list.c
-index f3989ad20..8f4f342fa 100644
---- a/src/test/test-arphrd-list.c
-+++ b/src/test/test-arphrd-list.c
-@@ -24,7 +24,7 @@
- #include "string-util.h"
- #include "util.h"
- 
--static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len);
-+static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len);
- 
- #include "arphrd-from-name.h"
- #include "arphrd-list.h"
-diff --git a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h
-index cba0724b1..0280697e9 100644
---- a/src/timesync/timesyncd-conf.h
-+++ b/src/timesync/timesyncd-conf.h
-@@ -22,7 +22,7 @@
- #include "conf-parser.h"
- #include "timesyncd-manager.h"
- 
--const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- int manager_parse_server_string(Manager *m, ServerType type, const char *string);
- 
-diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h
-index 91cc0357c..b0d8ceb76 100644
---- a/src/udev/net/link-config.h
-+++ b/src/udev/net/link-config.h
-@@ -93,7 +93,7 @@ const char *mac_policy_to_string(MACPolicy p) _const_;
- MACPolicy mac_policy_from_string(const char *p) _pure_;
- 
- /* gperf lookup function */
--const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- int config_parse_mac_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- int config_parse_name_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
-index aa10beafb..09024116f 100644
---- a/src/udev/udev-builtin-keyboard.c
-+++ b/src/udev/udev-builtin-keyboard.c
-@@ -29,7 +29,7 @@
- #include "string-util.h"
- #include "udev.h"
- 
--static const struct key *keyboard_lookup_key(const char *str, unsigned len);
-+static const struct key *keyboard_lookup_key(const char *str, GPERF_LEN_TYPE len);
- #include "keyboard-keys-from-name.h"
- 
- static int install_force_release(struct udev_device *dev, const unsigned *release, unsigned release_count) {
--- 
-2.11.0
-
diff --git a/sys-fs/udev/files/systemd-232-pkgconfig.patch b/sys-fs/udev/files/systemd-232-pkgconfig.patch
deleted file mode 100644
index 50f7921b565d..000000000000
--- a/sys-fs/udev/files/systemd-232-pkgconfig.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From a36dad95c447a5cf65f9e3b66c86e906e7f05890 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 5 Nov 2016 09:17:34 -0400
-Subject: [PATCH] Adjust pkgconfig files to point at rootlibdir
-
-The .so symlinks got moved to rootlibdir in 082210c7.
----
- Makefile.am                     | 1 +
- src/libsystemd/libsystemd.pc.in | 2 +-
- src/libudev/libudev.pc.in       | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index f2d8bf5..73144b1 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6054,6 +6054,7 @@ EXTRA_DIST += \
- 
- # ------------------------------------------------------------------------------
- substitutions = \
-+       '|rootlibdir=$(rootlibdir)|' \
-        '|rootlibexecdir=$(rootlibexecdir)|' \
-        '|rootbindir=$(rootbindir)|' \
-        '|bindir=$(bindir)|' \
-diff --git a/src/libsystemd/libsystemd.pc.in b/src/libsystemd/libsystemd.pc.in
-index e8f7950..7e6d499 100644
---- a/src/libsystemd/libsystemd.pc.in
-+++ b/src/libsystemd/libsystemd.pc.in
-@@ -7,7 +7,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=@rootlibdir@
- includedir=@includedir@
- 
- Name: systemd
-diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in
-index a0f3f52..770c922 100644
---- a/src/libudev/libudev.pc.in
-+++ b/src/libudev/libudev.pc.in
-@@ -7,7 +7,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=@rootlibdir@
- includedir=@includedir@
- 
- Name: libudev
diff --git a/sys-fs/udev/files/udev-229-sysmacros.patch b/sys-fs/udev/files/udev-229-sysmacros.patch
deleted file mode 100644
index d72eb5907da7..000000000000
--- a/sys-fs/udev/files/udev-229-sysmacros.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-https://bugs.gentoo.org/580200
-https://github.com/systemd/systemd/commit/27d13af71c3af6b2f9b60556d2c046dbb6e36e23
-
-From 27d13af71c3af6b2f9b60556d2c046dbb6e36e23 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 14 Mar 2016 17:44:49 -0400
-Subject: [PATCH] include sys/sysmacros.h in more places
-
-Since glibc is moving away from implicitly including sys/sysmacros.h
-all the time via sys/types.h, include the header directly in more
-places.  This seems to cover most makedev/major/minor usage.
----
- src/basic/macro.h       | 1 +
- src/basic/util.h        | 1 +
- src/libudev/libudev.h   | 1 +
- src/systemd/sd-device.h | 1 +
- src/udev/udev.h         | 1 +
- 5 files changed, 5 insertions(+)
-
-diff --git a/src/basic/macro.h b/src/basic/macro.h
-index c34441d..b36a956 100644
---- a/src/basic/macro.h
-+++ b/src/basic/macro.h
-@@ -23,6 +23,7 @@
- #include <inttypes.h>
- #include <stdbool.h>
- #include <sys/param.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- 
- #define _printf_(a,b) __attribute__ ((format (printf, a, b)))
-diff --git a/src/basic/util.h b/src/basic/util.h
-index e095254..286db05 100644
---- a/src/basic/util.h
-+++ b/src/basic/util.h
-@@ -36,6 +36,7 @@
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/statfs.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <time.h>
- #include <unistd.h>
-diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h
-index eb58740..3f6d0ed 100644
---- a/src/libudev/libudev.h
-+++ b/src/libudev/libudev.h
-@@ -21,6 +21,7 @@
- #define _LIBUDEV_H_
- 
- #include <stdarg.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- 
- #ifdef __cplusplus
-diff --git a/src/systemd/sd-device.h b/src/systemd/sd-device.h
-index 5bfca6e..c1d0756 100644
---- a/src/systemd/sd-device.h
-+++ b/src/systemd/sd-device.h
-@@ -22,6 +22,7 @@
- ***/
- 
- #include <inttypes.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- 
- #include "_sd-common.h"
-diff --git a/src/udev/udev.h b/src/udev/udev.h
-index 5659051..8433e8d 100644
---- a/src/udev/udev.h
-+++ b/src/udev/udev.h
-@@ -19,6 +19,7 @@
-  */
- 
- #include <sys/param.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- 
- #include "libudev.h"
--- 
-2.7.4
-