gentoo resync : 13.05.2018

15 files changed, 266 insertions, 6 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 8196ef68ab10..8530f6152642 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/aerospike-amc-community/Manifest b/app-admin/aerospike-amc-community/Manifest
index 9a4e96146beb..10e39dbbc517 100644
--- a/app-admin/aerospike-amc-community/Manifest
+++ b/app-admin/aerospike-amc-community/Manifest
@@ -1,4 +1,5 @@
 AUX amc.init 562 BLAKE2B f4aed655b924f345905aa8d3f149799ad299086cca1555e4902e09b376a47e2da8a34445446b00f7508cf4b6ef1d7eb83df93ae6af7c89d9b6e23d027ea5ce45 SHA512 4f50237b23ec1d2257791266ee5ee4c8b963bb0429c7386d50e4ba74ee8a451cd99a8dde277ed92b490a9b40bf33f5f6920e66c777e388bae43cfe402d255094
+AUX amc.init.3 422 BLAKE2B d7ad7a2a2e610da62542728da59d581f3bd69fdd5a7bf077f42cf2057e6c6bed05c298c73aee7ae9dee8ef93c3d684fc467619d202f2dd7a371b566b4e8cdf7c SHA512 71109e0779408e0cad3b4073a680ff40500daab6f2efe9af7d69286939437de0bc2b6e3a406ac65355f11b56d84077a04d98a2a6e06aac1147e1e516fe4e5181
 AUX amc.init2 583 BLAKE2B 0745a48ecfdc060ac9995c0634761d9b16d7d190df9d6a3d8fd7ec415fda486157e22f6f7ff03b2d4a3afe93632a67e7ad07214831007101bd9ebc71557f6003 SHA512 c91d1e66a6bcd286efec425295fc168c7d277f0d4886c9e0cd43f49e58b9c9ae0b0c2c453d278404d4d07935c55baf91bffe272699de095df13028316cc0d317
 DIST aerospike-amc-community-3.6.10.1.all.x86_64.deb 1434334 BLAKE2B a632ebfece64b9cb2d86246819b3c57df9970b002e6503d1768b5d590058bc1e3c0eafdf4e9cc8061c128c5438542160b8c9039718ac18e7053b6213169dad98 SHA512 2f9d208c501800d7a73d419347883ff9b4f8d65e76238c8676f1f04ad6c38aae2c9746ea65ed0d4ef36bcc9419a3a70b4d95f42aea72556935cdb3e82d943f05
 DIST aerospike-amc-community-3.6.11.all.x86_64.deb 1434296 BLAKE2B 9892604fb2a5b88e45b1b857bb5ec37c49376cf3f33be4d4ae9ad010336c3c2ac81ec9311fc314b0cb4f50dd01f102e3210fa3e126af699eb94dd4476a546f10 SHA512 e6396d8328f1021bbe4505bd63d4b4835857f151d58e0bb089f18ad7b3115d4893e9b3aaac18321f26150e6d1d2f15eadcd39d2f361af145426dee0c8fd9e90d
@@ -7,6 +8,7 @@ DIST aerospike-amc-community-3.6.13.all.x86_64.deb 1436414 BLAKE2B cd823dd1c546f
 DIST aerospike-amc-community-3.6.8.2.all.x86_64.deb 1429424 BLAKE2B 591f9982af0f9c696211fca341fc521b7e096f0cb57a0c0f0ff8d807422dfbcf121f31d87c7c3d89143c2e1e1bf96b2161531c3bad998cc5d3a069e545951e3f SHA512 ed1b82f825888ce2985b77d75e2e9988f87a241159fc0452af12892f66c37ec0d88f7edd2be6fce6d06184a5c09305f5e9727af48774e55b6290402fa406abc3
 DIST aerospike-amc-community-3.6.8.all.x86_64.deb 1429404 BLAKE2B efebdb3d1d9136b0a1fcf5aa09d8c293cc552b32895070afc1557752d304a88f3da9970f178b8e30a0c8b9ac0762c18af93ab9446e3ba6e12a70b57c8d179370 SHA512 de44333471307410461bd53266b84fdc9fa92f7115012eb4b29b3ad415dd471ca3d9bf1a7c52bec7063df02a7e600dce9366910a089751dd19163cc212574d28
 DIST aerospike-amc-community-3.6.9.all.x86_64.deb 1431182 BLAKE2B 6ba0618d048e7aa57b11a13dc92b9a838de2e26a316ae1fa35bf157656c3463e2933667dc96323648f28c5013093d59c7bf460906e2f7ff04ac3d9bd94f7e7c2 SHA512 67059ef2b96c4cf69b8a2edacb3edc711a18889b7eee16a038c63e8176d80e4b5ff23f126c0c16113a529e181b9c6f16601cbfa0251b0b12231ad7a23b8bc65e
+DIST aerospike-amc-community-4.0.17.tar.gz 7868123 BLAKE2B 86ada2e5af69b9306dc10b5386d21bd4459fff8a05672f289511f1b4efc27b1bd114cdd7bf9e5d6656fa3911ca111c8eabaa178a564f2ff9e6ab64c4a88a0145 SHA512 3dce8e8d435f70685498083d50818c1655faa61125391424c0ff99ea50618df4f9f3c3ddc7be5c64aba7118e75c5c3f24f7c5bfe834ba7fb504fa7d72bd00db3
 EBUILD aerospike-amc-community-3.6.10.1.ebuild 1403 BLAKE2B 43ab0bd0890e9b6876b18b18ea44adf33b75abde9bdca7d0f8881c353ffe11039ceb67cd37555f3ad6559d52b6ebbad55ad40f03f8b2c94f801565f0c59639a4 SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798
 EBUILD aerospike-amc-community-3.6.11.ebuild 1403 BLAKE2B 43ab0bd0890e9b6876b18b18ea44adf33b75abde9bdca7d0f8881c353ffe11039ceb67cd37555f3ad6559d52b6ebbad55ad40f03f8b2c94f801565f0c59639a4 SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798
 EBUILD aerospike-amc-community-3.6.12.ebuild 1403 BLAKE2B 43ab0bd0890e9b6876b18b18ea44adf33b75abde9bdca7d0f8881c353ffe11039ceb67cd37555f3ad6559d52b6ebbad55ad40f03f8b2c94f801565f0c59639a4 SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798
@@ -15,4 +17,5 @@ EBUILD aerospike-amc-community-3.6.13.ebuild 1403 BLAKE2B 43ab0bd0890e9b6876b18b
 EBUILD aerospike-amc-community-3.6.8.2.ebuild 1403 BLAKE2B 43ab0bd0890e9b6876b18b18ea44adf33b75abde9bdca7d0f8881c353ffe11039ceb67cd37555f3ad6559d52b6ebbad55ad40f03f8b2c94f801565f0c59639a4 SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798
 EBUILD aerospike-amc-community-3.6.8.ebuild 1403 BLAKE2B 43ab0bd0890e9b6876b18b18ea44adf33b75abde9bdca7d0f8881c353ffe11039ceb67cd37555f3ad6559d52b6ebbad55ad40f03f8b2c94f801565f0c59639a4 SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798
 EBUILD aerospike-amc-community-3.6.9.ebuild 1403 BLAKE2B 43ab0bd0890e9b6876b18b18ea44adf33b75abde9bdca7d0f8881c353ffe11039ceb67cd37555f3ad6559d52b6ebbad55ad40f03f8b2c94f801565f0c59639a4 SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798
+EBUILD aerospike-amc-community-4.0.17.ebuild 539 BLAKE2B f1b3f5551986370c16c24fae02ecc0c733fe52057bb0e47d770267a7103313421c54e2292381e04475cb4c2dbd2e538ee34546249f051b06f2e5abc6317b2089 SHA512 ae0703242bc3706586d021d58738cab5ab7babf9427e63d0a421fda4f5c25b75d103d9f40489f219058710919425c6ab3e2ce1c07277893e372dcac0a047a0d0
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.17.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.17.ebuild
new file mode 100644
index 000000000000..ee583da80e5f
--- /dev/null
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.17.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils user
+
+DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/download/amc/${PV}/artifact/linux -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S=$WORKDIR
+
+src_install() {
+	cp -r "$S/"* "$D"
+	rm "${D}/etc/init.d/*"
+	newinitd "${FILESDIR}/amc.init.3" amc
+}
diff --git a/app-admin/aerospike-amc-community/files/amc.init.3 b/app-admin/aerospike-amc-community/files/amc.init.3
new file mode 100644
index 000000000000..6fd8097b18f1
--- /dev/null
+++ b/app-admin/aerospike-amc-community/files/amc.init.3
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+run_dir=${run_dir:-/run}
+
+command="/opt/amc/amc"
+command_progress="true"
+retry='TERM/30/KILL/5'
+pidfile=${run_dir}/${SVCNAME}.pid
+user=${user:-root}
+group=${group:-root}
+start_stop_daemon_args="--user ${user} --group ${group}"
+
+depend() {
+	use net
+}
+
+start_post() {
+	ewaitfile 60 "${pidfile}"
+}
diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index 760d1057f8ec..6a7dfda3d006 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -7,5 +7,5 @@ DIST fam-2.7.0.tar.gz 301974 BLAKE2B 9a915e61b2898717cac1b7bbe9b2049aee070131471
 DIST fam_2.7.0-17.2.diff.gz 28826 BLAKE2B 880f8614304b048a24be03231ec26a02901befd75c8c5d51abf07d5afb42f370f4d3702d0db790f2f651f040372791024d9cbfbea15a1932629fb13a7b6a5ec8 SHA512 295c954fcecb7357a72ecf3c7469bb37c29e8969fc7be3a0e92e40e79911c9578f44c42a0a6f900610c8a9886f1addc62e50f258105aaadb61c718f526608697
 DIST fam_2.7.0-17.diff.gz 28056 BLAKE2B 4db010fdf7a2548f5651e9da876df63d3bd0d1a5f184b26df99f7d4204bbcbadf4c7672d248d9d1af2e7297b0ec17a5ec80e6b57016774877465a957ae3c6ae8 SHA512 76b14e1d17713eb86d52cb804d34012e5369b5f4e8bcbdc73a063d2ad9219e0c4a261cef9e144ee07744a953a2e893bdf2ceeefcf21edc7a2ac5e70a51a8e209
 EBUILD fam-2.7.0-r7.ebuild 1477 BLAKE2B b105c2c3183f1a39a062d7e64ac507af7b1ab4b33f0e974ccf7f4c3d607db7b9284e85f5d570ab2536910f415f2a00b2a346dad6f8a693dda2a63ffcb67dbe81 SHA512 e3ab8591d5bb3cced1c603e1379195f7f0826a019e1cee7902239116d625db383023d9ee3581f0258477f88ea191f353425f817771303e5916dca1234d2a1ac8
-EBUILD fam-2.7.0_p17_p2.ebuild 1767 BLAKE2B 9e79b10067faa4edec26c4c698ca43de136b7afcfb80bad400b246d758051a7df8033be04521246ef1a4ee1e97744a6437105240bfee69e7ef82e6d9485d64d1 SHA512 764fe44abd020c1f027f07a85e5c57323b4546f384323b78b2eb15b92ce4fafae04267b1d7ce7668043b2d8b2ec09bc5d2bd1ff9db0a1556b116070d8b0d2c1f
+EBUILD fam-2.7.0_p17_p2.ebuild 1765 BLAKE2B f2d4d32fc4238f97ffb1dfd477cbf7c4b795944e7d0cf48a745d0cf1791c15b57660e0fd429764b257170540bafbb357cf34e65825a78124f797c9310f23e19f SHA512 bab80a3b4cc9b3f8c54a25d2d89f0d833681c6fcbd24d252b5fee449ba8920b284f0bcffb46e497aff357835f8e0b255c03e13407620b8736fb4ce722391407b
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/app-admin/fam/fam-2.7.0_p17_p2.ebuild b/app-admin/fam/fam-2.7.0_p17_p2.ebuild
index 2872f6a3d335..17f0cd66b854 100644
--- a/app-admin/fam/fam-2.7.0_p17_p2.ebuild
+++ b/app-admin/fam/fam-2.7.0_p17_p2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 28be08666d88..21416e0b2603 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,6 +1,8 @@
 DIST keepassxc-2.2.4.tar.gz 3895421 BLAKE2B 0de35f394dae8cf8d70f75d73783965826cc03ac9f0921afa547d02e61cb04be167891d92aa0db09f007c47e96a5a7e5793772c50de14bf65a7f80a603ca6611 SHA512 f3308138d63b65a8b384a52f4723507be921d7bbf19031724886fcd12266bf2683326f5531c8f665b0e98ff63cd97251694199ef748191e59a5a8cceb3710025
 DIST keepassxc-2.3.1-src.tar.xz 4085284 BLAKE2B 87ffb8a266056a147e84f97980eb19df64947fc56a6e39733269f4b88287c01dd8508792c22f247b05918f8beb98ea651c3bf91b642f863be2a4742e3e425fd0 SHA512 06c1b42e699b21c0cc2a6e7340649fa8964d8a0c880efad512f3ba16e12ee07a1b2b5ff13e0b3dc8d3f58fdf4f523cee3d1ef477a83ea434d97690dfea0633c9
+DIST keepassxc-2.3.3-src.tar.xz 4113768 BLAKE2B 7c599471b775ff8612968596765d05f2862ae21adc0bb0d595b5366ce55354c156e1df3940549bb955dd9e6609cbebbae3f108ae3eb8ccb0e85c83e9183a60d8 SHA512 155dda3c81ecb3be4638c634fe2dd7f96a54076b371a1f6ab95c33319ff2a50eaf941a1415f42724444749a40d7fbcb3972604199f6a0445df4a22a4bac73c0b
 EBUILD keepassxc-2.2.4.ebuild 1542 BLAKE2B 63efe9d8d0b4f52d74c8b7d192163d731c338585fd9fc00b51af2aeda9d47b17ec8989b292c6c65add2fe09d5172c9f66a9447a7525d50463ce1128ea8d07119 SHA512 9ffed685b6d159f5db669b199b0984af19e90e4ed7759e67f52865a97983533524f3f800d4611a5e4efdf27e0f3cf1d2a177d8f3c3bbbeab0b71fda7fe168cdf
 EBUILD keepassxc-2.3.1.ebuild 1749 BLAKE2B f40cfce681a8fddbbdc39b727fc5d36bf45e533a5cd36d0fbca4853928d27e945bac88a9ef84af0b5c2a3bfed1b2603543584c4bdaafedc9cc003da1afa20869 SHA512 1a40422bb5e84a7f6a57ae72ea8dd1252fbd865fcfc8da243b1a87ca5b2d399bf481ed160726ce30a2cad5fa1de5135c0a7feffd48b1bd7e759d857049a23c10
+EBUILD keepassxc-2.3.3.ebuild 1749 BLAKE2B f40cfce681a8fddbbdc39b727fc5d36bf45e533a5cd36d0fbca4853928d27e945bac88a9ef84af0b5c2a3bfed1b2603543584c4bdaafedc9cc003da1afa20869 SHA512 1a40422bb5e84a7f6a57ae72ea8dd1252fbd865fcfc8da243b1a87ca5b2d399bf481ed160726ce30a2cad5fa1de5135c0a7feffd48b1bd7e759d857049a23c10
 EBUILD keepassxc-9999.ebuild 1749 BLAKE2B f40cfce681a8fddbbdc39b727fc5d36bf45e533a5cd36d0fbca4853928d27e945bac88a9ef84af0b5c2a3bfed1b2603543584c4bdaafedc9cc003da1afa20869 SHA512 1a40422bb5e84a7f6a57ae72ea8dd1252fbd865fcfc8da243b1a87ca5b2d399bf481ed160726ce30a2cad5fa1de5135c0a7feffd48b1bd7e759d857049a23c10
 MISC metadata.xml 937 BLAKE2B 21a284b7ee94184c22cdb740d9a24f8371cfb6f62d97361cb3a2f853409b3044e8ddad30f58f4f8ad27277739533972d22c7009808c7ae9e6a1c4b8e02003d7b SHA512 bd2e47e2ba3911323f0b5bee78e9e394edef7722e934c70a1e7d3509044d566b2e6d46fd77bde2c303d0c97a8ce4f756e0b32b476af253274a3a941b059da3f9
diff --git a/app-admin/keepassxc/keepassxc-2.3.3.ebuild b/app-admin/keepassxc/keepassxc-2.3.3.ebuild
new file mode 100644
index 000000000000..69a100508278
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.3.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org"
+
+if [[ "${PV}" != 9999 ]] ; then
+	#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype browser debug network test yubikey"
+
+RDEPEND="
+	app-crypt/argon2:=
+	dev-libs/libgcrypt:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	autotype? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXtst
+	)
+	browser? ( >=dev-libs/libsodium-1.0.12 )
+	yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	dev-qt/qtconcurrent:5
+"
+
+src_prepare() {
+	 use test || \
+		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+	 cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_GUI_TESTS=OFF
+		-DWITH_TESTS="$(usex test)"
+		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_HTTP=OFF
+		-DWITH_XC_NETWORKING="$(usex network)"
+		-DWITH_XC_SSHAGENT=ON
+		-DWITH_XC_YUBIKEY="$(usex yubikey)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index ccab813f4741..49a63c7dc912 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -3,5 +3,7 @@ AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de412158
 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
 AUX mcelog.service 213 BLAKE2B 08da6eac0afe17a04948f5ff958aba5c64ff491f6842a0b84e914a82cce16782b2c9dfdc83123d609cabd4e9e60eb38a9e43fe7a22a2afca8f53c3dc8e65ac87 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75
 DIST mcelog-154.tar.gz 297148 BLAKE2B 80b2b6b13222d0194d63516607b3132e2146894189e2c3c793c953dc43705a5b386ecb76ae3c8b7b345f8d440f547b3e566b16bf0802d17188cce978e1ad2fc1 SHA512 8a160aaa8a0ed736cb81082321e199e6a6e4f7f6528915752af545db28918e89dcb6bf321a92472d776c61914d08c613900273b3d265a375684e3212547abe38
+DIST mcelog-157.tar.gz 297194 BLAKE2B f34e57f282828941b7023b6f043084dec4591b071f4e23fff318ea4ff49c8be2c0eab3279d7803d3cf029351f51d2acdf16d4eb1998042a8002f6667c81df90d SHA512 831835058ab820497aed5640a424908e3ee138431041b1c70e2d4f601a242e0437d240a842de1c0bc10f41790f1ddff64054e79ff2a6de1c814710acd9210bbd
 EBUILD mcelog-154.ebuild 1370 BLAKE2B 3ba5600340047d02065bf402c29bdc96059865758b0d4cfc72c1251f85f7de20b37253bfc0d1f988d93f8dd9b7453e341f30e2e45c6f67401afea1463dbb8e8f SHA512 40cbe04aa5aba05eaedd1c1c9a3da4ea309be834864d405e532a20ba1190ec2aa44fc40cb968e43f37ddebb2698d380774b6601aaf4b0ad48559a929d4c526d7
+EBUILD mcelog-157.ebuild 1372 BLAKE2B 8f76fa2b653872ebf5362b7b3497732f02c2592f2356fdc417ce9b35f4a18b7f6ca12df960ffb2228d0bec5b8e4af5641f766c300d3d8ef99aea5c0b6c210840 SHA512 de8e5340fb345789fb4e5255e3a15997b387bab2b834db81f5682d8e043ae4f91bf034e4965bad82a963b055ffbe1294ab49dd7ab0598dbfbe43fbfced1a2db6
 MISC metadata.xml 837 BLAKE2B f807ddd64ddb222c1956ce95040ece7f5dffdcf157539d79c492505787a28bc161e52d2017fb8040374d335ec3e9b5df4701cb945a45e1da3819905dd03e815e SHA512 f6e69af6afc0de8c5436fbe468a3afbcb96e808c5e21d8a5fa65878bbff0c31ee883c4cda638acfeef1dabd77c85d0fbb3091b180b0cd16df14471e64db8df80
diff --git a/app-admin/mcelog/mcelog-157.ebuild b/app-admin/mcelog/mcelog-157.ebuild
new file mode 100644
index 000000000000..22442f62abb9
--- /dev/null
+++ b/app-admin/mcelog/mcelog-157.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~X86_MCE"
+		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+		"${FILESDIR}"/${PN}-129-debugflags.patch
+	eapply_user
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	insinto /etc/cron.daily
+	newins ${PN}.cron ${PN}
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodoc *.pdf
+}
+
+pkg_postinst() {
+	einfo "The default configuration set is now installed in /etc/${PN}"
+	einfo "you might want to edit those files."
+	einfo
+	einfo "A sample cronjob is installed into /etc/cron.daily"
+	einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/needrestart/Manifest b/app-admin/needrestart/Manifest
index 817a24c03197..e5b705740d3a 100644
--- a/app-admin/needrestart/Manifest
+++ b/app-admin/needrestart/Manifest
@@ -1,9 +1,11 @@
+AUX needrestart-3.1-gentoo-kernel-detection.patch 870 BLAKE2B 9d56a445bdda0af61fa0303c0b3dcc04f241687727f1fd94ac74d3f1f25583c9b0248a1d06a9007b31032fb01244246f8bec4d9a40e66de5f1b06a76de4ade19 SHA512 ddbda09aa655beb918883029b5137cc50f4bf2ad225ed2096551a13c6ccba352a04b96257da6c60085a86ecb4106569ed323d2beac924e76e37baf4810745857
 DIST needrestart-2.11.tar.gz 52156 BLAKE2B fb3ffbf6f7876625ad0b7db4feb629c80f0798b7b117f5c94058533e8ed53e695fca5de76670a184245e23720886c79b97c3cfdcc5e9400c1e6988fdb2f64459 SHA512 e987ebafe77aba6920645088fa12e609b52f55edfd545ede1c0a93ee1d6b91ed3ea84cb8db69cd067aaabe8ba973b366da61301b5527ec176a29e3ba30605311
 DIST needrestart-3.0.tar.gz 58437 BLAKE2B 6f3b79f793dab85af2a68f3796926b958c077b16c357969943db867dead470cef20aadb076a12a0e3161efc64c82cd1df7f6cdbc70f73cce563a11dec472f69a SHA512 6b653e29b10e497563e67102e11833f7c97d2bde697a99130ff89d5fcd2e616fec279328656f44ccdbb62a2c533bf10827b035efad7785ef5d0556c7f37e625f
 DIST needrestart-3.1.tar.gz 58882 BLAKE2B c29d7a56905b047f73743075f520116004a8eed8d88ca402e958fc6a4a430213c9ba4dec469dd1221cbad5b8c6123a9e1acb451f63c6dfdfcd11dc27bce147af SHA512 a55f4e83be676d26d815f28df2a7d56c17bd74d6c1a801f5d1ee05344853d7272dda018b3c19b7753dd6f256e793261d5581df49449c4c9577309add15d4bb70
 EBUILD needrestart-2.11-r1.ebuild 855 BLAKE2B cf57592733872915455d20c0c10ce8f0e6438fbeae4bf998efb7d5613d3968f33369f3e37406fdb02d913ced830905bb34761db7cffd711663df16a207bdb6cc SHA512 dd8451935fd7e9ae0d80bf8d78193e0ae5eb1a9ad2babf895b223271024fe8fb968e2b2e0c153744fb9bece1a7d82d0864bdb093642504c061d225a5a4d2ce33
 EBUILD needrestart-2.11.ebuild 825 BLAKE2B 42e2af640eb7aa73c5012e05de007554612b9c915d04e24bce1f7d9866e0072b799a5725782db0d743c8ca0e958b9f923ae46657e0f9172d936cd834de2c2d50 SHA512 feeeaf8e9f7644db79f63735677d21c14e9c047ee392b1ab342c7174fd701ad098d4c5d9e903a9f5a1d0575537261e5526970c3fe287320b5985c1b8aacd714d
 EBUILD needrestart-3.0.ebuild 855 BLAKE2B e1c5709c7a1891b7719606258337def8a0bc67c7afa23983e583433c664efeab7b555751fdac08ac74230015fde860abd14f57cea297a0e98b89b1205d74682e SHA512 08ce4d08db3de0d76c57f1ae89d7827d2a34483a28125a0d627b9d57aee3d1da6a3d5c13e19d25df9a7481541bdec4147881c6cc1fb2953050f0d054861ee5f0
+EBUILD needrestart-3.1-r1.ebuild 918 BLAKE2B 776c121b6e60ba62d84de3c5fe19a431ebce26567e194ca68f2f085b0fd82a1302b6602726ca9951e65a436505626061c0beec0139217e35e517d4b5271b90bc SHA512 e3f335c3111e497f8102930b0a28f4fee5f1fb418f2cfdeebeea3982053f560942cda52b83486898efca38d1d041d9b0e4fd25e5e9e5cfaca50a1cb09d430b68
 EBUILD needrestart-3.1.ebuild 855 BLAKE2B e1c5709c7a1891b7719606258337def8a0bc67c7afa23983e583433c664efeab7b555751fdac08ac74230015fde860abd14f57cea297a0e98b89b1205d74682e SHA512 08ce4d08db3de0d76c57f1ae89d7827d2a34483a28125a0d627b9d57aee3d1da6a3d5c13e19d25df9a7481541bdec4147881c6cc1fb2953050f0d054861ee5f0
 EBUILD needrestart-9999.ebuild 855 BLAKE2B cf57592733872915455d20c0c10ce8f0e6438fbeae4bf998efb7d5613d3968f33369f3e37406fdb02d913ced830905bb34761db7cffd711663df16a207bdb6cc SHA512 dd8451935fd7e9ae0d80bf8d78193e0ae5eb1a9ad2babf895b223271024fe8fb968e2b2e0c153744fb9bece1a7d82d0864bdb093642504c061d225a5a4d2ce33
 MISC metadata.xml 461 BLAKE2B 28793d229fbcb27f6ad2bf256bfae268236133d14302a72693b90e319af2bc2dc4c1928546b9f3c5e5fc657fa4013fb28acedb1762b84bed60850e5ba0852c23 SHA512 6b8877f41545dafdb30cc0ed3664e568901cc13c68c5221817631be63d454ef30d1b2e923f3a8fd9b0d77be825e1f183601e7a7d474a1d196b2a8eef099095b4
diff --git a/app-admin/needrestart/files/needrestart-3.1-gentoo-kernel-detection.patch b/app-admin/needrestart/files/needrestart-3.1-gentoo-kernel-detection.patch
new file mode 100644
index 000000000000..6b8c221098b3
--- /dev/null
+++ b/app-admin/needrestart/files/needrestart-3.1-gentoo-kernel-detection.patch
@@ -0,0 +1,24 @@
+From bbd98c32fb5d33f42d1b9257f55a07d62b8de164 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Mon, 7 May 2018 11:28:33 -0400
+Subject: [PATCH] [Kernel] Include /boot/kernel* while looking for linux kernel
+ images
+
+Fixes kernel detection on Gentoo
+---
+ perl/lib/NeedRestart/Kernel/Linux.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/perl/lib/NeedRestart/Kernel/Linux.pm b/perl/lib/NeedRestart/Kernel/Linux.pm
+index 6f284f3..69a919c 100644
+--- a/perl/lib/NeedRestart/Kernel/Linux.pm
++++ b/perl/lib/NeedRestart/Kernel/Linux.pm
+@@ -131,7 +131,7 @@ sub nr_kernel_check_real($$) {
+     } grep {
+ 	# filter initrd images
+ 	(!m@^/boot/init@);
+-    } (</boot/vmlinu*>, </boot/*.img>);
++    } (</boot/vmlinu*>, </boot/*.img>, </boot/kernel*>);
+ 
+     $ui->progress_prep(scalar keys %kfiles, __ 'Scanning linux images...');
+ 
diff --git a/app-admin/needrestart/needrestart-3.1-r1.ebuild b/app-admin/needrestart/needrestart-3.1-r1.ebuild
new file mode 100644
index 000000000000..d3e017750bdd
--- /dev/null
+++ b/app-admin/needrestart/needrestart-3.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+	>=sys-apps/sed-4.2.2
+	dev-lang/perl:=
+	dev-perl/libintl-perl
+	dev-perl/Module-Find
+	dev-perl/Module-ScanDeps
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/TermReadKey
+	sys-apps/init-system-helpers
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gentoo-kernel-detection.patch"
+)
+
+src_install() {
+	default
+	doman man/*.1
+	dodoc -r ex
+}
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index 0011e75ac717..fdad5334b772 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -10,4 +10,4 @@ EBUILD perl-cleaner-2.24.ebuild 1065 BLAKE2B f30cc85033cedcee4f02bf062e7331864fa
 EBUILD perl-cleaner-2.25.ebuild 1052 BLAKE2B 9ec3cfc3c17e3ea15805c9587d4120eee87cafbe8664300f7bf1ccf871ceecee63cd5c83fc6c3fd63e4f1750dc0bbc3aa0f786c3b33731f4e8211edd989c40db SHA512 5cf28cf372371dfc165d64ea4fdfc989ea153357ff678b6f97716d7870df4d2a8e0140e33ba02762c62befb0bb647b1b0655e3cdcc0ea9c7f231f9be4b00e04c
 EBUILD perl-cleaner-2.26-r1.ebuild 1121 BLAKE2B d7a35aad10f2da2ac07c49824d5a64c4a4ed4ad490d57e6a3187757feaff228f726f9563f926b23fa895ed25ce2544e6a17db10e06bbf4ab51c3d2075e31d365 SHA512 43484532b8b93ebc67c5003ed94d4d3a524cd38dfbf78cc889b52e260fc55e45d2bfff2bccb8917b34d6080dcc7b1fc4bb79a41ac578481199f95c425485c2ac
 EBUILD perl-cleaner-9999.ebuild 1121 BLAKE2B d7a35aad10f2da2ac07c49824d5a64c4a4ed4ad490d57e6a3187757feaff228f726f9563f926b23fa895ed25ce2544e6a17db10e06bbf4ab51c3d2075e31d365 SHA512 43484532b8b93ebc67c5003ed94d4d3a524cd38dfbf78cc889b52e260fc55e45d2bfff2bccb8917b34d6080dcc7b1fc4bb79a41ac578481199f95c425485c2ac
-MISC metadata.xml 324 BLAKE2B 1b9c0b988ac947c06e4b82d99fb3c8df1a523806054e0a450705a439e5718f5815d16d70ff4fa11e8adb21c37b9ea3d8b526c28280de003b2dbfbe897c4052f9 SHA512 7537c6aa3ef90ae5cc28b7f20c104832dada1d354462e79f7bdb8cdb73c8dc87b021d72427b4accf001d3d4d31c913de9e5df1e5cf02f3efc640ae1cbdb233e8
+MISC metadata.xml 248 BLAKE2B 7e969e31666e369b4b1826230eb9c103e51962ac23701a7d5e49d211d6da6ee2f6a8372d72b3ba454140d2c1fb7ab6d122f011e9c8144e95a9cc11f01d2e6481 SHA512 53fd9b61e8fd7f18f9493861896a34938e5f6ee4efb3d2c71703dfa81587d0943f0d439fac0e0c106966dabba08d6aeb4b0a2ff85addf30d992c9b7c78ab6314
diff --git a/app-admin/perl-cleaner/metadata.xml b/app-admin/perl-cleaner/metadata.xml
index ca2feac61717..408ad0201f65 100644
--- a/app-admin/perl-cleaner/metadata.xml
+++ b/app-admin/perl-cleaner/metadata.xml
@@ -5,7 +5,5 @@
 	<email>perl@gentoo.org</email>
 	<name>Gentoo Perl Project</name>
 </maintainer>
-<maintainer type="person">
-	<email>fuzzyray@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
+