Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

13 files changed, 686 insertions, 9 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index aece9780eab8..e231ce8dc005 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/acct/Manifest b/sys-process/acct/Manifest
index 7a4ea212cfc2..1ce3c7ba598c 100644
--- a/sys-process/acct/Manifest
+++ b/sys-process/acct/Manifest
@@ -4,5 +4,5 @@ AUX acct.initd-r2 1080 BLAKE2B c1d2a49530df32adf143b4b3b50059602494df57efe0ef414
 AUX acct.logrotate-r1 304 BLAKE2B 60ddfe6b5a8fdf75c82bdf43308ad6f2e1da0c533e532277eabff670c46bb874b5dee90f1bd0d98cba9218cc47e82fd4a91e66170ffd1d367d2d8a01c1e3e00d SHA512 54fcb419f433df2a64eb51ecfc8122c4945960ca7d745d7a8816fec441586e15321cdfacb2db1feeec23c66b1b02b4191d3fc53355379a75c2956a00bc743332
 AUX acct.service 382 BLAKE2B 7a777c0d9195676d897bf95087a3af2175587e365969956de0d458e842144b6fa97c3e7e1bac402467c8611ef19915c55b562466104b6cbc75279225870c25dc SHA512 8c2523526eb3185765eac62676761af6758d0090d68ba48aeacc59c7a45f0722c867fb97d02ff3ceaa8d77637d2b915938d545f7d782e4f7aa46861f25364bd3
 DIST acct-6.6.4.tar.gz 853273 BLAKE2B 2ee42ae849f8e7c5c6dbe33d45e944f945cef87a5fef0074ac31848547ab9b7068509bce3c4b47b35bfde49b02daf43ae812cc58284c50185e4bdc660dccae52 SHA512 413aa446caece8fd773c92e2995bbaa034f63dd0ced521815a676c49f118e02982862b9c0ab7e60be5212c87d1e82ba6325bda212cf4857392a068d359a1e2c2
-EBUILD acct-6.6.4-r1.ebuild 1065 BLAKE2B f5ffa36955d4ac1c1631183c1622929e799e2364241227906366e233a899f71cc10fbce8aaccb0d9855756a8807887aedd44d5c98423fc1d0d088e0fc8ae2a06 SHA512 33eb3779d43ea49c52f44cebbc3a677bee2318194056fd31269acd23c2876e270f23b03717b279b8d388cfccf46b559f66acbbd855ae468bac0102d29585c13b
+EBUILD acct-6.6.4-r1.ebuild 1038 BLAKE2B 2503f0cb1b51e166be8da3bd4e67289ce9e811d07a512adee0b1dcbf9dd55c16761c709d546836f06f5e2eaf72fb1daf5afd20901e780f643c3798ca8ec31f9d SHA512 0a2559f74a0a09720ebf619b3d9e888708c68e6773eecc829ee44f1ced942734f7b83787fb60db49c7e0eb3a959325a7454db9a33a18a0c5700dde777eb442ef
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/acct/acct-6.6.4-r1.ebuild b/sys-process/acct/acct-6.6.4-r1.ebuild
index b24a5088384d..4109af22e13b 100644
--- a/sys-process/acct/acct-6.6.4-r1.ebuild
+++ b/sys-process/acct/acct-6.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,8 +13,6 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND="sys-apps/texinfo"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.4-cross-compile.patch
 )
diff --git a/sys-process/minit/Manifest b/sys-process/minit/Manifest
index bcc68c68384c..aed1e95c729c 100644
--- a/sys-process/minit/Manifest
+++ b/sys-process/minit/Manifest
@@ -2,7 +2,7 @@ AUX 0.9.1-destdir.patch 622 BLAKE2B 7272237f8bc03cd7a19fac768ab69d12521f7b153779
 AUX minit-0.10-fixes.diff 1916 BLAKE2B 4c277a5f25838533074515edf5b11244ad94350ebb5dce0bfef66ba7c022f5d68e54e568da851c610c2da832cfec6b0a1d53d990b5e9725b4b7b5bcdfbcfdea6 SHA512 dca96b6a5c6dba7d72f0df32a2d615aee7ffd9f640a20fa67b4fcd9a0f56e991033196e91090fd78c2ba1c38d013a4ca4b0a74e7ddc39f488354a8aafb281b00
 DIST minit-0.10.tar.bz2 26119 BLAKE2B 3520cb53192df3da87f2cd40247623a1c1c77cd728890aa7ee24804729429d955abe430e9f90e6786a5c4f8dc733aae8ea17f7488ef0650bb4ece356c2033713 SHA512 9c617ca9f3638a430ae8347ec4b3dc36c5b23c703f11c4d445c9abebb2e7cb2460424f5ed71112bb21e862818a45338926bc4de3d0ed8b2e99f7d296ca37479c
 DIST minit-0.9.1.tar.bz2 21894 BLAKE2B f9ec822a80f67ed575937d8fc69cb842077864185a489780233a924c4b63be708faa9a57a411390ad14c0e0c51436dc0c8fd8da036d87b0d0ec9037addb8c74b SHA512 896ed2eb163c63daebea50e1edc8ce4de02dce619d5bc5bf08f76dc19df82c1fdeee1e8dc0f89f5662ea5975436bdfcb4690f367b89bcb92f7a5f8328c03cfb1
-EBUILD minit-0.10-r1.ebuild 926 BLAKE2B fe2b8295ba6a9a156083ca01177aa95511c05550e0d44873b591da15add38d59bfd0a43e42c0c78b870077fb5e2a63fd9dd7f1fb37274b2c1b3004d125b08db0 SHA512 65c7b41b6524dad29f524ca1c29a030997991b5bdced87ee82369579caabba59e039589486a195af000f2bb9232ca823b35a69d1e9792d21336dd2dbd478d023
+EBUILD minit-0.10-r1.ebuild 927 BLAKE2B 1f99056e08e96cbe3001c975873d169d6c212d91e36250c410ba9ecd1bedda089dfb7657183198d1a6d54a626d1d53ad829b3ca03bde217744127eedbeba97cb SHA512 a6ab53764eded985db3d889b008edc54b4780ce206802469ec6dbc70c012149e37350d35c03af53c55b5d13ebad6d8ba5a2582024123a7e973ebce26f811fad4
 EBUILD minit-0.10.ebuild 959 BLAKE2B 398dcf95f9efb5a9f8fbf97a5c406bd82136118ca4aba76511f40405ebd055eb7fcda387184481bf3c418a2b9654816add71cea0fcca4e448dc9a63b2ccd69e0 SHA512 6c4d884ecebe1bf367d9fdc7f439adb9fd6e9fbdefcd0bb75594260831b04e3d832652631262aaffb41308a125a124f4e3c6f7b15912a044fb44b88b938d2a7c
 EBUILD minit-0.9.1.ebuild 572 BLAKE2B 1ec853c19a5a3f745aa46e9e921a677952c5c9d413a04eee69799c89b8b6945fc32966be2d862aa53a39923089c6c85915a3433878318be59c0ec9247ea5d0a7 SHA512 61d26777c79aff39d44829b4c601918db2bf67887999378879af992ed76239663e65984c10a50cf074619d29dc05976d3948e29667a5163e50ffdea3383280ce
 MISC metadata.xml 1237 BLAKE2B 2da4c9ab4f1627e17f1f580ed4402fe1524605ba15e30028bcbf2dc82faaccf0837518adc0ca08f21b0a7c732e4ed4937d719f61408e676e82b178e65d6b8356 SHA512 c219e5b11f7fa3dd1eaed9570722ec050c93f4b372ac35f11b031a96a8ea3740a64f885e87fe6547e9a4f66f899b4ccbbfa6c0787ca6ff835925c94b9eb3326b
diff --git a/sys-process/minit/minit-0.10-r1.ebuild b/sys-process/minit/minit-0.10-r1.ebuild
index ce5816b6454a..b5e5a674cca0 100644
--- a/sys-process/minit/minit-0.10-r1.ebuild
+++ b/sys-process/minit/minit-0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	dev-libs/libowfat
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index b0399e22da41..b15378604e99 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -1,5 +1,13 @@
 AUX procps-3.3.11-sysctl-manpage.patch 941 BLAKE2B e10b6f85325d1ea23b327dffe4ba35662d5110492d0d5fcffad41edff21ddea4ea8c8bcb66582f63abd100a20d0d406e1c3fb176a8c290ba2cc6ecb02aa98248 SHA512 df8b233bde879fa675742baf8b38d43dd7c306fe52013ace715dff02c126d8c5ea12bd93087da10f5e722294eef59577b264309cbdc6f9f3727fa7111c5db313
+AUX procps-3.3.12-elogind.patch 8365 BLAKE2B 5ce96eddc3cf6de4f9e631aab11ed5d887f691594eab844be966027696abb9fe2257c5c3d5456b9fce127117dd61b98f96f0399f1a21ec41e8dde8c40f5c37bb SHA512 090f523c1b06e60cb82e4b73a29fa192b164923315dcba0d1511e454ee06d0616ba4a2c3b2b5a62048fb289ff4ae81c36920c77177cce09ceda06be019efa271
 AUX procps-3.3.12-proc-tests.patch 1835 BLAKE2B 99fe8d63620f37f98cddc60e8bcbaadbe5e7c54c4b0a65abad6ebe8a89f1b8f7f6bd29114b50678aa89cd0c89d26a95a10aa403d48bcc8371f16eaf34c823390 SHA512 ecc94717366a314ac4bba550b84472555f7b217be2174b68778d3364e16586ab9c21756d2041e2ac9d1449856fcd6aa691d8bd1a8558b4653d068dc1d59c2c71
+AUX procps-3.3.12-strtod_nol_err.patch 3328 BLAKE2B f880817bf85fc32668a10ec099444adc047aa2ba92c4ddf3ed74193acc2b3c496c35bcb3aed228a12cc06dfaa21899ee725c295ab3de10382b225785a8a2278f SHA512 00618dcf62dd2c054060eb9cef223ab8d7d93a53649fc8d0cc8251d5763e98deca97433d0017f0118dcce9d4c920ccf0a60998865efb569544e1fa47cb1c11b3
+AUX procps-3.3.8-kill-neg-pid.patch 1446 BLAKE2B b55d7c52f1d28b3ef8a6964490afaf3c74f7a89376fc50dfc7efae85caff0c7265e1f09db73da5b911c42ed1060735d83a37f3d8ce05ced33c53c0b98fc126fe SHA512 3ed4e83d81f7dd574ff68bbcae9ad9f8649a39d46a17de5fd4297f215d8f70cd28e415b1d3c7b5142e7719343af28f4b393061a60eb012caece81dfe5ff6c271
+DIST procps-ng-3.3.12.tar.xz 845484 BLAKE2B d317935e28de45ca5afa59ce33f85e286820a630c7fe036bddcf7a4418fa347cbc9cab39ef380f482ce13f47555598fd2419c67c3f861d7e4e2e89a9b2f4ae4a SHA512 ea816740ff72cc53d99b5d2e78a511b627ea5b295e0efff67605c56d1ab075abc6b0e2da3df4facbfe903fc9d679e892d351b6884a966d37c6f4bfd9141a924b
+DIST procps-ng-3.3.14.tar.xz 926924 BLAKE2B b18f8ec50a1449008b01a52be51a3a509266945b82fbb6964f54b9746d71b90e4a1a37be29b4bf07fedc70d4528fac7f7099d7b245bd9c6ed033e77eb49aae77 SHA512 45617924ae1520765c15d71b76278dc80cac04f5985f83c9b65a8ba379d9a80a2ff0dc14c5a6edee7d6cfa66ce50ec019e8b5203704175ff94547ae6ff2b18c5
 DIST procps-ng-3.3.15.tar.xz 904416 BLAKE2B 9fc1384df1d51a13bdf3aaad173160a11c5a7e016a8c397a076b5115e350d2c6fd8ff8d9ad5d83b959020bcd6a1ef9e1bca02e9a63d56881816c5c7d7c9a8bc3 SHA512 bc83ccc1941e7be8266588fdfbba17e2424b30163a215873ee6dee96215d66249f5d5e46fec2278d030b42bd7599861c4878360042dacec4c221ce411453747c
-EBUILD procps-3.3.15-r1.ebuild 1981 BLAKE2B 0e8018a3a12a4ef851c571769b7ce081b9e40a6024c31e287d14f66c0f1f99b6fc78fd8f5dc31e2f1fcee84de8c69a13f008aa1408780d9b7977f91217dd25a6 SHA512 9b88a6a07a0e0cdb3628f3d569d191ed2d79f719947b64ce8827f7db9c7f9c5fe0760d2f7dbd83d937a1bd7ec25a9c6d891e1f86b643acd6c8c9b7f7bb573334
+EBUILD procps-3.3.12-r1.ebuild 2328 BLAKE2B 389b25d2ed9e1855392b6fea552d4fc7c9a5d8ebfb81502a9f7125b9687d8195905ee9550a75a8e44e59d1cae4dea0abada40cdcf895b032f4deb1d518bd4e96 SHA512 6ec0d09ae0afa59d2880d88873db63c8091e3d95ebfa1cc76e729bf6c139a7afe11f4ee1649f830839fbce61e756c792b528c15655544587a8ed0ffe52a8246b
+EBUILD procps-3.3.12.ebuild 1984 BLAKE2B 64041bcd297cca29ee4702ad4ee2555da2abb24c749e7070402981efb359d0017235f30e94fa6aa94e01f54b03fbc4d6e602c6b90810645935e0a3a0e84fbc16 SHA512 ebdf9a402bf2682892fc8b2628da524fd85d7fc1c0593b6c4e4e742743bcedfc643d2076863e863a35cbb894bd8d37a0771c58f1eaeb6447a367ad5f445cf5db
+EBUILD procps-3.3.14.ebuild 2066 BLAKE2B 476532905b101230dc1818448f870abf2934939104859943c6389965bbc846aaf724bace914ee319d179af032d957ce18c3b9b3638a33290b2c8e196c6edd60e SHA512 a3308497a5ff3f280d27db1e988574177141424648e43c7062e8e53159e21ffb91e08aae33ffbb1b7d581387f16ca27b220b555d011903446a8225c70d85e696
+EBUILD procps-3.3.15-r1.ebuild 1986 BLAKE2B cdcde7f954cdd7d1c06379de0d7214e88bc7471420c74ab7185f33de81d1a79d6cb5a391648165b2973af4f06cb378b5388da9b255f9121482f48eeaac695732 SHA512 4182c8789a06943727e019ffa77cc8c24f064a52f20dfddb5e618a33e48a278ebab73cdc678de6226f6fb29dafc0caf969e1563efaa82f1e3ad50adf6abe139f
 MISC metadata.xml 653 BLAKE2B de137950217a24b13838a10e3dddacd94898c4d4be18c9080e31d666fe74d6f8e5fe3edfb4f3caf369fde1c82858e4c8828883c21f3ed32867a5f35d0771dc89 SHA512 d98bc7ed5e5437134c30db0a2ecbe4f430143aad2b91775e128fe735ddc39801e8d8fe62905cabbd8a41c4d07698110605b74056296282a74ac7622a09272703
diff --git a/sys-process/procps/files/procps-3.3.12-elogind.patch b/sys-process/procps/files/procps-3.3.12-elogind.patch
new file mode 100644
index 000000000000..07c165310ce4
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.12-elogind.patch
@@ -0,0 +1,265 @@
+--- procps-ng-3.3.12/configure	2016-07-10 07:32:09.862265237 +0200
++++ procps-ng-3.3.12/configure	2016-07-10 07:32:09.862265237 +0200
+@@ -650,6 +650,10 @@
+ BUILD_KILL_TRUE
+ BUILD_PIDOF_FALSE
+ BUILD_PIDOF_TRUE
++WITH_ELOGIND_FALSE
++WITH_ELOGIND_TRUE
++ELOGIND_LIBS
++ELOGIND_CFLAGS
+ WITH_SYSTEMD_FALSE
+ WITH_SYSTEMD_TRUE
+ SYSTEMD_LIBS
+@@ -815,6 +819,7 @@
+ enable_libselinux
+ with_ncurses
+ with_systemd
++with_elogind
+ enable_pidof
+ enable_kill
+ enable_skill
+@@ -845,7 +850,9 @@
+ NCURSESW_CFLAGS
+ NCURSESW_LIBS
+ SYSTEMD_CFLAGS
+-SYSTEMD_LIBS'
++SYSTEMD_LIBS
++ELOGIND_CFLAGS
++ELOGIND_LIBS'
+ 
+ 
+ # Initialize some variables set by options.
+@@ -1521,6 +1528,7 @@
+   --without-libintl-prefix     don't search for libintl in includedir and libdir
+   --without-ncurses       build only applications not needing ncurses
+   --with-systemd          enable systemd support
++  --with-elogind          enable elogind support
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -1550,6 +1558,10 @@
+               C compiler flags for SYSTEMD, overriding pkg-config
+   SYSTEMD_LIBS
+               linker flags for SYSTEMD, overriding pkg-config
++  ELOGIND_CFLAGS
++              C compiler flags for ELOGIND, overriding pkg-config
++  ELOGIND_LIBS
++              linker flags for ELOGIND, overriding pkg-config
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -17295,6 +17307,127 @@
+ fi
+ 
+ 
++
++# Check whether --with-elogind was given.
++if test "${with_elogind+set}" = set; then :
++  withval=$with_elogind;
++else
++  with_elogind=no
++
++fi
++
++# Do not allow elogind if systemd is wanted and found
++if test "x$with_systemd" != "xno"; then :
++  with_elogind=no
++fi
++
++if test "x$with_elogind" != "xno"; then :
++
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libelogind" >&5
++$as_echo_n "checking for libelogind... " >&6; }
++
++if test -n "$ELOGIND_CFLAGS"; then
++    pkg_cv_ELOGIND_CFLAGS="$ELOGIND_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_ELOGIND_CFLAGS=`$PKG_CONFIG --cflags "libelogind" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
++else
++  pkg_failed=yes
++fi
++ else
++    pkg_failed=untried
++fi
++if test -n "$ELOGIND_LIBS"; then
++    pkg_cv_ELOGIND_LIBS="$ELOGIND_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_ELOGIND_LIBS=`$PKG_CONFIG --libs "libelogind" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
++else
++  pkg_failed=yes
++fi
++ else
++    pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi
++        if test $_pkg_short_errors_supported = yes; then
++	        ELOGIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind" 2>&1`
++        else
++	        ELOGIND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind" 2>&1`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$ELOGIND_PKG_ERRORS" >&5
++
++	as_fn_error $? "Package requirements (libelogind) were not met:
++
++$ELOGIND_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables ELOGIND_CFLAGS
++and ELOGIND_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details." "$LINENO" 5
++elif test $pkg_failed = untried; then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables ELOGIND_CFLAGS
++and ELOGIND_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details" "$LINENO" 5; }
++else
++	ELOGIND_CFLAGS=$pkg_cv_ELOGIND_CFLAGS
++	ELOGIND_LIBS=$pkg_cv_ELOGIND_LIBS
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++fi
++
++$as_echo "#define WITH_ELOGIND 1" >>confdefs.h
++
++
++fi
++ if test x$with_elogind != xno; then
++  WITH_ELOGIND_TRUE=
++  WITH_ELOGIND_FALSE='#'
++else
++  WITH_ELOGIND_TRUE='#'
++  WITH_ELOGIND_FALSE=
++fi
++
++
+ # AC_ARG_ENABLEs
+ # Check whether --enable-pidof was given.
+ if test "${enable_pidof+set}" = set; then :
+@@ -17712,6 +17845,10 @@
+   as_fn_error $? "conditional \"WITH_SYSTEMD\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${WITH_ELOGIND_TRUE}" && test -z "${WITH_ELOGIND_FALSE}"; then
++  as_fn_error $? "conditional \"WITH_ELOGIND\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${BUILD_PIDOF_TRUE}" && test -z "${BUILD_PIDOF_FALSE}"; then
+   as_fn_error $? "conditional \"BUILD_PIDOF\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+--- procps-ng-3.3.12/configure.ac	2016-07-09 23:49:25.817307031 +0200
++++ procps-ng-3.3.12/configure.ac	2016-07-09 23:49:25.817307031 +0200
+@@ -155,6 +155,19 @@
+ ])
+ AM_CONDITIONAL([WITH_SYSTEMD], [test x$with_systemd != xno])
+ 
++AC_ARG_WITH([elogind],
++  [AS_HELP_STRING([--with-elogind], [enable elogind support])],
++  [], [with_elogind=no]
++)
++# Do not allow elogind if systemd is wanted and found
++AS_IF([test "x$with_systemd" != "xno"], [with_elogind=no])
++
++AS_IF([test "x$with_elogind" != "xno"], [
++  PKG_CHECK_MODULES([ELOGIND], [libelogind])
++  AC_DEFINE(WITH_ELOGIND, 1, [enable elogind support])
++])
++AM_CONDITIONAL([WITH_ELOGIND], [test x$with_elogind != xno])
++
+ # AC_ARG_ENABLEs
+ AC_ARG_ENABLE([pidof],
+   AS_HELP_STRING([--disable-pidof], [do not build pidof]),
+--- procps-ng-3.3.12/Makefile.am	2016-07-10 00:40:44.235121270 +0200
++++ procps-ng-3.3.12/Makefile.am	2016-07-10 00:40:44.235121270 +0200
+@@ -155,6 +155,10 @@
+ proc_libprocps_la_LIBADD += @SYSTEMD_LIBS@
+ endif
+ 
++if WITH_ELOGIND
++proc_libprocps_la_LIBADD += @ELOGIND_LIBS@
++endif
++
+ proc_libprocps_la_LDFLAGS = \
+ 	-version-info $(LIBprocps_CURRENT):$(LIBprocps_REVISION):$(LIBprocps_AGE) \
+ 	-no-undefined \
+--- procps-ng-3.3.12/Makefile.in	2016-07-10 07:32:11.170237828 +0200
++++ procps-ng-3.3.12/Makefile.in	2016-07-10 07:32:11.170237828 +0200
+@@ -126,6 +126,7 @@
+ @BUILD_SKILL_FALSE@	snice.1
+ 
+ @WITH_SYSTEMD_TRUE@am__append_14 = @SYSTEMD_LIBS@
++@WITH_ELOGIND_TRUE@am__append_15 = @ELOGIND_LIBS@
+ TESTS = lib/test_strtod_nol$(EXEEXT)
+ check_PROGRAMS = $(am__EXEEXT_5)
+ noinst_PROGRAMS = lib/test_strutils$(EXEEXT) \
+@@ -688,6 +689,8 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ELOGIND_CFLAGS = @ELOGIND_CFLAGS@
++ELOGIND_LIBS = @ELOGIND_LIBS@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+ GMSGFMT = @GMSGFMT@
+--- procps-ng-3.3.12/proc/readproc.c	2016-07-09 23:49:25.825306872 +0200
++++ procps-ng-3.3.12/proc/readproc.c	2016-07-09 23:49:25.825306872 +0200
+@@ -40,6 +40,9 @@
+ #ifdef WITH_SYSTEMD
+ #include <systemd/sd-login.h>
+ #endif
++#ifdef WITH_ELOGIND
++#include <elogind/sd-login.h>
++#endif
+ 
+ // sometimes it's easier to do this manually, w/o gcc helping
+ #ifdef PROF
+@@ -518,7 +521,7 @@
+ }
+ 
+ static void sd2proc(proc_t *restrict p) {
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+     char buf[64];
+     uid_t uid;
+ 
diff --git a/sys-process/procps/files/procps-3.3.12-strtod_nol_err.patch b/sys-process/procps/files/procps-3.3.12-strtod_nol_err.patch
new file mode 100644
index 000000000000..1a298c87f700
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.12-strtod_nol_err.patch
@@ -0,0 +1,110 @@
+From 4ed44ab58e27a9a09902b9c5b49df484842b6c9a Mon Sep 17 00:00:00 2001
+From: Dr. Werner Fink <werner@suse.de>
+Date: Wed, 13 Jul 2016 20:08:51 +1000
+Subject: [PATCH] misc: fix strtod_nol_err tests
+
+A better way of implementing the string to double
+conversion and a better way of testing it.
+
+Signed-off-by: Craig Small <csmall@enc.com.au>
+---
+diff --git a/include/strutils.h b/include/strutils.h
+index 85a6192..a5a15c9 100644
+--- a/include/strutils.h
++++ b/include/strutils.h
+@@ -7,6 +7,6 @@
+ 
+ extern long strtol_or_err(const char *str, const char *errmesg);
+ extern double strtod_or_err(const char *str, const char *errmesg);
+-double strtod_nol_or_err(char *str, const char *errmesg);
++extern double strtod_nol_or_err(char *str, const char *errmesg);
+ 
+ #endif
+diff --git a/lib/strutils.c b/lib/strutils.c
+index e5245db..e0632c4 100644
+--- a/lib/strutils.c
++++ b/lib/strutils.c
+@@ -20,6 +20,8 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  */
+ 
++#include <float.h>
++#include <math.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+ 
+@@ -71,9 +73,9 @@ double strtod_or_err(const char *str, const char *errmesg)
+  */
+ double strtod_nol_or_err(char *str, const char *errmesg)
+ {
+-    double num;
++    long double num;
+     const char *cp, *radix;
+-    double mult;
++    long double mult;
+     int negative = 0;
+ 
+     if (str != NULL && *str != '\0') {
+@@ -95,29 +97,29 @@ double strtod_nol_or_err(char *str, const char *errmesg)
+         mult=0.1;
+         while(isdigit(*radix)) {
+             radix++;
+-            mult *= 10;
++            mult *= 10.0;
+         }
+         while(isdigit(*cp)) {
+-            num += (*cp - '0') * mult;
+-            mult /= 10;
++            num += (long double)(*cp - '0') * mult;
++            mult /= 10.0;
+             cp++;
+         }
+         /* got the integers */
+         if (*cp == '\0')
+-            return (negative?-num:num);
++            return (double)(negative?-num:num);
+         if (*cp != '.' && *cp != ',')
+             error(EXIT_FAILURE, EINVAL, "%s: '%s'", errmesg, str);
+ 
+         cp++;
+         mult = 0.1;
+         while(isdigit(*cp)) {
+-            num += (*cp - '0') * mult;
+-            mult /= 10;
++            num += (long double)(*cp - '0') * mult;
++            mult /= 10.0;
+             cp++;
+         }
+         if (*cp == '\0')
+-            return (negative?-num:num);
++            return (double)(negative?-num:num);
+     }
+     error(EXIT_FAILURE, errno, "%s: '%s'", errmesg, str);
+-    return 0;
++    return (double)0;
+ }
+diff --git a/lib/test_strtod_nol.c b/lib/test_strtod_nol.c
+index 0be798c..736768a 100644
+--- a/lib/test_strtod_nol.c
++++ b/lib/test_strtod_nol.c
+@@ -1,4 +1,5 @@
+-
++#include <float.h>
++#include <math.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include "strutils.h"
+@@ -33,8 +34,8 @@ int main(int argc, char *argv[])
+     double val;
+ 
+     for(i=0; tests[i].string != NULL; i++) {
+-        if(strtod_nol_or_err(tests[i].string, "Cannot parse number") !=
+-           tests[i].result) {
++        val = strtod_nol_or_err(tests[i].string, "Cannot parse number");
++        if(fabs(tests[i].result - val) > DBL_EPSILON) {
+             fprintf(stderr, "FAIL: strtod_nol_or_err(\"%s\") != %f\n",
+                     tests[i].string, tests[i].result);
+             return EXIT_FAILURE;
+--
+libgit2 0.24.0
+
diff --git a/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch b/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch
new file mode 100644
index 000000000000..00397480ca3b
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch
@@ -0,0 +1,46 @@
+From 396cbc4cf36166217d877e2ff7e0a290758b0bc2 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 27 Jun 2013 18:37:17 -0400
+Subject: [PATCH] kill: fix -PID handling
+
+Commit 19b6f48990b02aeca211b480625b95b2033c1017 tried to fix -PID
+handling, but the new logic ends up skipping over the arg.  This is
+because getopt increments optind after it processed the -PID (even
+though it was an unknown option).  We need to decrement it by one
+so the loop at the end of the code will process it for us.
+
+I also fixed some whitespace errors in that same commit.
+
+URL: http://code.google.com/p/chromium/issues/detail?id=255209
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ skill.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/skill.c b/skill.c
+index fb57305..074c5d7 100644
+--- a/skill.c
++++ b/skill.c
+@@ -390,7 +390,7 @@ static void __attribute__ ((__noreturn__))
+ 	else
+ 		sigopt++;
+ 
+-	opterr=0; /* suppress errors on -123 */
++	opterr = 0; /* suppress errors on -123 */
+ 	while (loop == 1 && (i = getopt_long(argc, argv, "l::Ls:hV", longopts, NULL)) != -1)
+ 		switch (i) {
+ 		case 'l':
+@@ -423,7 +423,9 @@ static void __attribute__ ((__noreturn__))
+ 				xwarnx(_("invalid argument %c"), optopt);
+ 				kill_usage(stderr);
+ 			}
+-			loop=0;
++			/* We need to back off by one since getopt() ate the -PID */
++			--optind;
++			loop = 0;
+ 			break;
+ 		default:
+ 			kill_usage(stderr);
+-- 
+1.8.2.1
+
diff --git a/sys-process/procps/procps-3.3.12-r1.ebuild b/sys-process/procps/procps-3.3.12-r1.ebuild
new file mode 100644
index 000000000000..118aed2504ba
--- /dev/null
+++ b/sys-process/procps/procps-3.3.12-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit epatch toolchain-funcs flag-o-matic
+
+DESCRIPTION="standard informational utilities and process-handling tools"
+HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
+SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/5" # libprocps.so
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
+
+COMMON_DEPEND="
+	elogind? ( sys-auth/elogind )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${COMMON_DEPEND}
+	elogind? ( virtual/pkgconfig )
+	ncurses? ( virtual/pkgconfig )
+	systemd? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )"
+RDEPEND="
+	${COMMON_DEPEND}
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-apps/util-linux[kill]
+	)
+	!<sys-apps/sysvinit-2.88-r6
+"
+
+S="${WORKDIR}/${PN}-ng-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209
+	"${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
+	"${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
+
+	# Upstream fixes
+	"${FILESDIR}"/${P}-strtod_nol_err.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	# Requires special handling or autoreconf gets triggered which we don't
+	# want to happen in a base-system package.
+	EPATCH_OPTS="-Z" \
+	epatch "${FILESDIR}"/${PN}-3.3.12-elogind.patch # 599504
+
+	epatch_user
+}
+
+src_configure() {
+	# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
+	append-lfs-flags #471102
+	econf \
+		--docdir='$(datarootdir)'/doc/${PF} \
+		$(use_with elogind) \
+		$(use_enable kill) \
+		$(use_enable modern-top) \
+		$(use_with ncurses) \
+		$(use_enable nls) \
+		$(use_enable selinux libselinux) \
+		$(use_enable static-libs static) \
+		$(use_with systemd) \
+		$(use_enable unicode watch8bit)
+}
+
+src_test() {
+	emake check </dev/null #461302
+}
+
+src_install() {
+	default
+	#dodoc sysctl.conf
+
+	dodir /bin
+	mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die
+	if use kill; then
+		mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
+	fi
+
+	gen_usr_ldscript -a procps
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-process/procps/procps-3.3.12.ebuild b/sys-process/procps/procps-3.3.12.ebuild
new file mode 100644
index 000000000000..57528f8ba618
--- /dev/null
+++ b/sys-process/procps/procps-3.3.12.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="standard informational utilities and process-handling tools"
+HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
+SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/5" # libprocps.so
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="+kill +ncurses modern-top nls selinux static-libs systemd test unicode"
+
+RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209 )"
+DEPEND="${RDEPEND}
+	ncurses? ( virtual/pkgconfig )
+	systemd? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )"
+RDEPEND+="
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-apps/util-linux[kill]
+	)
+	!<sys-apps/sysvinit-2.88-r6"
+
+S="${WORKDIR}/${PN}-ng-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209
+	"${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
+	"${FILESDIR}"/${PN}-3.3.12-proc-tests.patch #583036
+
+	# Upstream fixes
+	"${FILESDIR}"/${P}-strtod_nol_err.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	epatch_user
+}
+
+src_configure() {
+	# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
+	append-lfs-flags #471102
+	econf \
+		--docdir='$(datarootdir)'/doc/${PF} \
+		$(use_enable kill) \
+		$(use_enable modern-top) \
+		$(use_with ncurses) \
+		$(use_enable nls) \
+		$(use_enable selinux libselinux) \
+		$(use_enable static-libs static) \
+		$(use_with systemd) \
+		$(use_enable unicode watch8bit)
+}
+
+src_test() {
+	emake check </dev/null #461302
+}
+
+src_install() {
+	default
+	#dodoc sysctl.conf
+
+	dodir /bin
+	mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die
+	if use kill; then
+		mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
+	fi
+
+	gen_usr_ldscript -a procps
+	prune_libtool_files
+}
diff --git a/sys-process/procps/procps-3.3.14.ebuild b/sys-process/procps/procps-3.3.14.ebuild
new file mode 100644
index 000000000000..5e9a2b13394f
--- /dev/null
+++ b/sys-process/procps/procps-3.3.14.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="standard informational utilities and process-handling tools"
+HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
+SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/5" # libprocps.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
+
+COMMON_DEPEND="
+	elogind? ( sys-auth/elogind )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${COMMON_DEPEND}
+	elogind? ( virtual/pkgconfig )
+	ncurses? ( virtual/pkgconfig )
+	systemd? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )"
+RDEPEND="
+	${COMMON_DEPEND}
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-apps/util-linux[kill]
+	)
+	!<sys-apps/sysvinit-2.88-r6
+"
+
+S="${WORKDIR}/${PN}-ng-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209
+	"${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
+	"${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
+
+	# Upstream fixes
+)
+
+src_configure() {
+	# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
+	append-lfs-flags #471102
+	local myeconfargs=(
+		--docdir='$(datarootdir)'/doc/${PF}
+		$(use_with elogind)
+		$(use_enable kill)
+		$(use_enable modern-top)
+		$(use_with ncurses)
+		$(use_enable nls)
+		$(use_enable selinux libselinux)
+		$(use_enable static-libs static)
+		$(use_with systemd)
+		$(use_enable unicode watch8bit)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check </dev/null #461302
+}
+
+src_install() {
+	default
+	#dodoc sysctl.conf
+
+	dodir /bin
+	mv "${ED%/}"/usr/bin/ps "${ED%/}"/bin/ || die
+	if use kill; then
+		mv "${ED%/}"/usr/bin/kill "${ED}"/bin/ || die
+	fi
+
+	gen_usr_ldscript -a procps
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-process/procps/procps-3.3.15-r1.ebuild b/sys-process/procps/procps-3.3.15-r1.ebuild
index 94391f0e37f3..4d77ea25184a 100644
--- a/sys-process/procps/procps-3.3.15-r1.ebuild
+++ b/sys-process/procps/procps-3.3.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/6" # libprocps.so
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
 
 COMMON_DEPEND="