gentoo resync : 21.07.2018

29 files changed, 376 insertions, 60 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index a97901a31479..2db61eb2bc9f 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/conmux/Manifest b/app-misc/conmux/Manifest
index a72e8f14e2e4..e069e11f603b 100644
--- a/app-misc/conmux/Manifest
+++ b/app-misc/conmux/Manifest
@@ -4,4 +4,4 @@ AUX conmux.confd 432 BLAKE2B 6dd0169032c849f1c131cfa0409430689249919cd8015f7f59c
 AUX conmux.initd 892 BLAKE2B 3a724a77e47f4e0b8ac77581fdcd8f2be0aedbe6a71557f19eaba1517948736263fa36192dd3fbd8a2eb3db4ec5ad90c964b94fa01b1a3c00a12152b14edad8a SHA512 68a15b73bef6ee90504fe5a910d587ae6aad5735082af3dda3f390b66d87ac121fc8b1a846d7fce0432b6d4f06a9c355d881303f9586ea6497c64c0080798098
 DIST conmux-0.15.1.tar.gz 50713 BLAKE2B d764d63f03318614ad0d7088911dee02fbd36d24da7dc988bb3db03cda3e60c5b185f50b5545b086e2a3a7b278aa47af7bfd211c39c88f7ada32e83666eea0c5 SHA512 8138d6d10b4382709828277503d1c23c52fd43109ebad79073be9003c39a9e62c2b7d9d6e78a9e81797c22871985e50a58df0d538ff63e3f580c9a229b520107
 EBUILD conmux-0.15.1-r3.ebuild 1993 BLAKE2B 7c291575b489396038573dffbe566b1d901fc0376fd70636466410f729c9cf23557d834d03bcbcecc5b2e4389da8fb282af4a815c46c87dd163243f9a10c1d56 SHA512 e400f8f46f8a78c01d9bf90959351d5e681efde1398970bfc1d906c62c6584255c3bcb678f48d5caba32737988933fe434309f06f1fb9f8d48ba8f579a5d0643
-MISC metadata.xml 610 BLAKE2B 379832b8245fc3f2354260535108e77ab035e5f0a90cc0c48747883295830ca42781db38f074c99b208846b86ee2be34ed166b001725e98a186b0eb21c58aee7 SHA512 c1bbd52895ee9a132f52fbe92a4e74f469f47fd70b78440bda8ffb4ac6c6b0878da144cf9efe551c45480eb242e76ff75a4e2e61a5359d342c214733e48d48f1
+MISC metadata.xml 522 BLAKE2B f6851b7a54d8a950c978f4fc05c3ca0d59831240c0917f1a273dce7c754b241caed3b44eb781405da2d2b71bc79adb1b0d384a59d2cc4ae85acab88af5550996 SHA512 e4395400b272ba794b9ef5115f3c7e03ecceebb9a8c30aff9543fd1e79681adca085f41a97dd1f672831071a811c8e17eb6f771b304a5eec568405a5fe8fb691
diff --git a/app-misc/conmux/metadata.xml b/app-misc/conmux/metadata.xml
index 41c74b92fdb7..cd58741eb231 100644
--- a/app-misc/conmux/metadata.xml
+++ b/app-misc/conmux/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hwoarang@gentoo.org</email>
-    <name>Markos Chandras</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
 CONMUX is a console abstractor.  Presenting any console with a
 consistent location, naming and semantic.  Access to the console,
diff --git a/app-misc/datovka/Manifest b/app-misc/datovka/Manifest
index 14121b6d5a58..04d522413bd6 100644
--- a/app-misc/datovka/Manifest
+++ b/app-misc/datovka/Manifest
@@ -1,7 +1,9 @@
 DIST datovka-3.0.3.tar.gz 671555 BLAKE2B e8fd9a196ed2d3c353dd94c4be4d734666f5a90866de7ddf0a8efd3ff9b6e96343719810cf585b8f4321c5028b9f229a0224cbc9ee4cb1ddb18727012bfa4d5d SHA512 c3dfa23125849fb1c5691a4ad6077fedd307b8c0417c72e014876f56c1185a2da73478927fb594cac45ada77a71a3798f57a75032a4d83cd81c194fe3257397d
 DIST datovka-4.10.2.tar.xz 2465696 BLAKE2B 1c355070c4bce005f1a601875edbf40c279e11f32653e59d52321f284b93abd6e404774f41d3bc0430b9b01a13bd1667223e8aafd60f89058ba4eee2ebeb8269 SHA512 e1338d9448b042b26b9829341b93cd8d07fd7d2b854dce33b80731c9a9d41965ea646ac95c7883615ac4f682ed28fb1d3184554505acfb5e76b4ef03ab32bc98
+DIST datovka-4.10.3.tar.xz 2554488 BLAKE2B a06c122403f7571c19abddca93e4d7270b66dbac9b86eb073634cc2c22dd26ad230ad36580b8f977e7033656d8f7066be89532c786ea554b293a2fab46309b9f SHA512 8a07c338b214bd0fdac216d6b278ebceee48aeb4df2d97a77a42f627479641d1824c5ed16f336f5da3205c46e753203aadfd0f83934b7caff4dc9c819e0cee0a
 DIST datovka-4.9.2.tar.xz 2373540 BLAKE2B 2de754a5a9b59b5184f63dd8e1790b3345cc6fc2429aeafc60d6944a8f7372b898e11bfab7aaf21b9041697532b454cd7d91a968435a0cb297183902881b705b SHA512 a906a032d138be33f6011c9e5869c5c8ae44f305279fc531e6e21e7911a04d3f3f2a360d561f0553c581806fe3ac8344dbb30bcdc604e79db37fc948f12a7e1a
 EBUILD datovka-3.0.3-r1.ebuild 664 BLAKE2B 5dfcc4bfa7843f007dc01985d9e18cefa9176774b11680b58cc1ea5fa774971f7084d439ba18afc57abd5f0290ac1c28277bb4118800a3601763c20773c0862d SHA512 9531c13e5ecc9d26fbee745f7399132b18adf3c595dcf91ac0cb5ea55252614ba53e54b55f54f6fefd3e34d286dc08b95dc67a27d551c3e01b2e6a472c398b0c
 EBUILD datovka-4.10.2.ebuild 1083 BLAKE2B e3537122d6e380ace728d89aa18f255ec391f13bfcb239db588e1a8ed7153e64bf5019b84606a9f372e28b7eb0d4274fd79cfedbe1a573982666a3f569f06a79 SHA512 dc5192ec3a6434396365da91d638b677d03b15d2c63d64f1874bda635445917e9097c3aa8c72a10f3d9256d3902e70bf0d6f7d465cb87325edc20bcb0c57ce05
+EBUILD datovka-4.10.3.ebuild 1083 BLAKE2B 5786e753c11d3c73611a61b2778eff825549adeb7418aefb71846f4a92ed6910136828f768eb04f7cb62313928a9cf7519e84f49fe2c1e713ae49a3897f01748 SHA512 1be92e4dbca5fa461c5df8906b7b1cf79fb86ef7478f6850db43d0629db280a22477e6d97f09f884e553011e8cc308c3458e94b09a291c84da46cb2541bc5ece
 EBUILD datovka-4.9.2.ebuild 989 BLAKE2B 928649d617d216fcfbb4d3960b30625de0a2b7211350681903d660cc6ca67be1f9d1cc237b4eeb084c26f82efc7019a6dcda9435156de72981d045f16da76413 SHA512 48753345ccb14d1328ba38211f7577b370e1c9835bb5d51bbfde8a60df02eba182eb4166fcb2deff1f6f0161e3724187910bdba59a56f55c0ca62d8698be7275
 MISC metadata.xml 445 BLAKE2B 52a23fa53d98a5f8a9890ee261fb8021f5125eb8981a9826f64747022668a26da1d74e7e5acc025d984324eb8c4996728cca0e856ff1435c4b35d6cf015e96a7 SHA512 682fca99a52a692346a2dc85281b1108c4c660afc70924e52e79be01fdd7122e76d0a9dbed4aa7816ff3020c4d4782d4bf9f79d880c46ab2bb02f99039f34a16
diff --git a/app-misc/datovka/datovka-4.10.3.ebuild b/app-misc/datovka/datovka-4.10.3.ebuild
new file mode 100644
index 000000000000..79feb345fb84
--- /dev/null
+++ b/app-misc/datovka/datovka-4.10.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils qmake-utils
+
+DESCRIPTION="GUI to access the Czech eGov system of Datove schranky"
+HOMEPAGE="https://www.datovka.cz/"
+SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# minimum Qt version required
+QT_PV="5.3.2:5"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=net-libs/libisds-0.10.8
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+	lrelease datovka.pro || die
+	eqmake5 PREFIX="/usr" DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index a03390cef4b7..7dfb9b720e98 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,4 +1,4 @@
-AUX elasticsearch-systemd-pre-exec 221 BLAKE2B 22176ca536032f7a7e3724a85100ed3ab5e15a7acacdacf185d733ff272d65712c9166f1d3123cd09a6e3de9a65a29340e0ca7ebb246d359a4d843eddd0ea25b SHA512 1dc41303da367122779759fc1967540357a21aac6df4f5d8761d36dc643673df660b47e5c1b595ecf9316265fe7684ddcb5290df8369379c1bdbc8c933726644
+AUX elasticsearch-systemd-pre-exec 369 BLAKE2B 18fae13aa27931cfc3952309ab76847790f4f785d14efa93bb24cfa66b3b0fc655c19a17d5a7a1b431b6c037cf3596a04eed8f650cf51beb1917560e8817bd2d SHA512 fae1d6e4e52df7d0d3111d6d6bbddf12182de931d461669d8784b524e5671ad40fb645dc6a6cf3de0de08f032c0327da8b25d7cbc4c4a49e3e3a7a791c6cfcdd
 AUX elasticsearch.conf.2 2070 BLAKE2B b620bc7bddfb57c0d1c409c8af919c85fd28df79fe3329a770c7e5a46e7a6898b9b7f6b0340a19af6e5536856620aa5981e3df0c0c1fa50dd57a204d752ce248 SHA512 e10d7699046e7db71d822154be6e21785906977d991cae6709a4fd0439c262915ddbf5499b8dd501da86985644f402b96c92fa5d83feb9d0684d3eec766164f9
 AUX elasticsearch.conf.3 2196 BLAKE2B e711aa58eca0df5857fa48a4dc21f5dd144977f3cd0209a58c15868531a108175ecdd21ddc18e1daf1e83c0bbd26da7c00b260698b3ef87c938b6d18928df733 SHA512 36a98d788cff404ccfe0fdff7bbe358750df8db9e5a5f419991b90e257e97331ec93c5f9a84bed57099dd239abb572ef450a191582e7145d8d7517c242707e49
 AUX elasticsearch.init.2 1830 BLAKE2B 57dea653c636c7ccb40fa6ab777f0713b245bf9d344b39de23aaaad753c229196cb81acd01c4ac1c9ae29c166b1dbfa38e829d60172106dbc384aeb6e21a544e SHA512 babc54a225f1ea5c98a6c2e0a680635a5af30305a869e35db65f5f6ddeb00577b3011f83b3190567646b7d67a314710c83212a233dc31a0fb78691eb1358b96a
@@ -6,6 +6,8 @@ AUX elasticsearch.init.3 1873 BLAKE2B 58c1fa6be05b4fc28ee0b65bb5f95522b5dee4fed7
 AUX elasticsearch.init.4 2018 BLAKE2B 5cce066d530afb57e4bc55026d68f57ab41419c6967145efa621051159efdeb5f12e5cbf97d50048d7b7266cc3d2c41e2957c212623cc9139d4b8558dda42864 SHA512 648bb8cf6a5223920db6685be68e439a6854a3d7532ecf6f2fcfaabfc95a5cb768982e7168063926b40eabb0e3a8d4e0a3b4a30213b2a8cbe59eafbeae5cb7c6
 AUX elasticsearch.service 1718 BLAKE2B 1d3df50f9b521a897f6f57c411265ce3d5da849c23a6d5274959739531ec1f1373f59adb9d0ac94318eefbe90cf10218b67aa47530bdd162ed306354fb9cf2db SHA512 98530c01f41a2d98254033a1a292075abc6086e0608062dfbe28385e4f57da390a9c43521bfce72193c2b710e58e590f08f514257b8150140dbb9ade40ef5470
 AUX elasticsearch.service.2 1544 BLAKE2B bb66a0e945df66f84937804461ed51216f8bc4585dbdfbd5e834aad0632cc7fbf1005322509183705b62fdfe0f0d105bcc238810056ec066102d8ea84dbb1020 SHA512 33dc3efc736501d6e04ab1aa1b13a4d5f5cb235f7d9ff9674715dd47afdf1e8da8db0a4b82ce46c8c6b71d8258917e8943613eff8a0371a82b5d2e490acefd77
+AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cddce2d5d2bfde2263bf088001ba1dff9bbbc8eaafb4e1d9012176fbeb4964dcd6f25f6e49935bdda90cec52f6d SHA512 adcc3147ce8d52f64fa21e7cb377ba88d4ea32254eaea03c68d45296bac46d7ff084b93469ca9dbabe013bf8bd183a96a219117b68fb91648b595206b60cebbc
+AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed275b6c7a9f55e77fdcec1919d374818683403a2a7a7c2c2839db2b8afcd66f7667d5080ecb52cade853a400f972a6 SHA512 b300dbc1b3c341ebbcac68385c651133427f342dc0351501b47730b392cc176b7b8dc53877affc6ab384d2834d246a3d0c63b6015dddf2c90d4bcf41cee9968c
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
 DIST elasticsearch-5.6.10.tar.gz 33796721 BLAKE2B 4e9d1d910a70acf32ca63cec811b711f692f3cf32dcec084a07f92d281eed07c067740bb5c5447055a6d0b6126e55a635edcd08c105dc59985db72bcd031a8a5 SHA512 17bd5710cfc3efa455428a79c74e63aacc9b9481d59a0b0df07ad4e4c25ef32dd41b3dbbde464a2801363b6d428a23eb52cc935640ce86bbc4d8a01dca8a1585
@@ -13,5 +15,5 @@ DIST elasticsearch-6.2.4.tar.gz 29056810 BLAKE2B 121be27ac1db4fa6bbe285161b3f2b2
 DIST elasticsearch-oss-6.3.1.tar.gz 29417012 BLAKE2B 356665cde2f12ae5813d95302398f5fced07c53d25e6e1dc7ad41c8dc8ad42cd3d5bd4ffa6cab24af8088c29800f6ec59a483710272b756af2f76b5967d4b932 SHA512 3df0f7f35e150198f7ff660cf4d90fbd1c2ca587287c6340d427f968711b6390123bfafd09a744c9bdf328d57423bcb75f6e4701ce14a7257388611abea62545
 EBUILD elasticsearch-5.6.10.ebuild 1689 BLAKE2B 7520b1676de4ded7fbb3691cca543c3a5c6de99cfa1ffff09e40ba55991d086f7004c372387e932213bbf5dbab42952266f4da9cbaf051c1795089c420949dbf SHA512 36d5128d2779abddd535e0918bbe4569c3d1414dbfc43e57fc037ca3056aabf73dbfd43b58811c5a4d0bc3d0e3edbf093ca458add2b90b87b62cb22416552fb0
 EBUILD elasticsearch-6.2.4.ebuild 1747 BLAKE2B 2e8ad76bb75a927499cb73a89ede57629db4426ee267a0721e65e8893cdff2799830f7cd136b7e82185effdac60ab8f0d9314edc0179fe2261066514f3c60519 SHA512 e7be527f28b482278376316dd3d6bc969e4d70a8d95a067ac1932f5be0dcffaaaa47064e463bb043665725f73d9605cd150128660ed923de7094f3eeb8af5a3c
-EBUILD elasticsearch-6.3.1.ebuild 1758 BLAKE2B a4105ef73d07a7f8c5796b8457fdf417ad1dd30f8ff4444eaa064e8a36501c56379eaae07725be98b66776ad9777a66e0844ae625cc1f486d547d49ab13acfbd SHA512 c05e0e1fb1d05178001948a8be071326cac3e7b1e75afdfa22512e498d97603eb6ab6d4b1fcc791388e69170f93bcd493bc41eaf6d8108c50da50f85c371a38c
+EBUILD elasticsearch-6.3.1-r1.ebuild 2106 BLAKE2B fab4c1d557642ef3cb4728e297a5e95e0752272a19180d5febb7d2a4b5a3174533840d37e9aaa43cb931f278ff25e93d8dcdc200b03c2bbcc94b7e61608def1b SHA512 315019c24210c3f28f3e8359c5a2cabc2f3efa005ebf3e812b0539ad1a4b6af81ffa47d79ec7a76b26766f65babbd944d55556004b8f4d95c2027d4179c5a2e2
 MISC metadata.xml 493 BLAKE2B 8149c45c1eb86d156ec0a32f016e8eed79d8e8fb7b6f0294ad606eebe9c63208e3d450796cdfc123fb7b2b2bcd10ff0cf23f2b6d2a99c177cb1e795965984892 SHA512 ce03769abc314d3bf561ff5820a8c8582196e9e6755e1e695dcf1224afbc04b609fdec7a1499d2d7a3aa0a350ad9fea94e0e3b46eff7c3c6150a524edd28d399
diff --git a/app-misc/elasticsearch/elasticsearch-6.3.1.ebuild b/app-misc/elasticsearch/elasticsearch-6.3.1-r1.ebuild
index f3e63754b4a0..1a6bec30a73a 100644
--- a/app-misc/elasticsearch/elasticsearch-6.3.1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.3.1-r1.ebuild
@@ -55,8 +55,9 @@ src_install() {
 	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
 	newinitd "${FILESDIR}/${PN}.init.4" ${PN}
 
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
 	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service.2 ${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
 }
 
 pkg_postinst() {
@@ -66,7 +67,11 @@ pkg_postinst() {
 	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
 	elog
 	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/elasticsearch into the configuration directory of the instance:"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
 	elog "/etc/${PN}/instance"
 	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
 }
diff --git a/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec b/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec
index a51d639bf7d4..30f773638d37 100755
--- a/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec
+++ b/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec
@@ -5,3 +5,8 @@ if [ ! -z "$CONF_FILE" ]; then
     echo "CONF_FILE setting is no longer supported. elasticsearch.yml must be placed in the config directory and cannot be renamed."
     exit 1
 fi
+
+# fails to start without keystore
+if [ ! -f "${ES_PATH_CONF}/elasticsearch.keystore" ]; then
+    "${ES_HOME}/bin/elasticsearch-keystore" create
+fi
diff --git a/app-misc/elasticsearch/files/elasticsearch.service.3 b/app-misc/elasticsearch/files/elasticsearch.service.3
new file mode 100644
index 000000000000..69d3550e7d98
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.service.3
@@ -0,0 +1,51 @@
+[Unit]
+Description=Elasticsearch
+Documentation=https://www.elastic.co
+Wants=network.target
+After=network.target
+
+[Service]
+Environment=ES_HOME=/usr/share/elasticsearch
+Environment=ES_PATH_CONF=/etc/elasticsearch
+Environment=DATA_DIR=/var/lib/elasticsearch
+Environment=LOG_DIR=/var/log/elasticsearch
+Environment=PID_DIR=/run/elasticsearch
+
+WorkingDirectory=/usr/share/elasticsearch
+
+User=elasticsearch
+Group=elasticsearch
+
+PermissionsStartOnly=true
+ExecStartPre=/usr/share/elasticsearch/bin/elasticsearch-systemd-pre-exec
+
+ExecStart=/usr/share/elasticsearch/bin/elasticsearch \
+                                                -p ${PID_DIR}/elasticsearch.pid \
+                                                -Epath.logs=${LOG_DIR} \
+                                                -Epath.data=${DATA_DIR}
+
+StandardOutput=journal
+StandardError=inherit
+
+# Specifies the maximum file descriptor number that can be opened by this process
+LimitNOFILE=65536
+
+# Specifies the maximum number of bytes of memory that may be locked into RAM
+# Set to "infinity" if you use the 'bootstrap.memory_lock: true' option
+# in elasticsearch.yml and 'MAX_LOCKED_MEMORY=unlimited' in /etc/conf.d/elasticsearch
+#LimitMEMLOCK=infinity
+
+# Disable timeout logic and wait until process is stopped
+TimeoutStopSec=0
+
+# SIGTERM signal is used to stop the Java process
+KillSignal=SIGTERM
+
+# Java process is never killed
+SendSIGKILL=no
+
+# When a JVM receives a SIGTERM signal it exits with code 143
+SuccessExitStatus=143
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/elasticsearch/files/elasticsearch.service.conf b/app-misc/elasticsearch/files/elasticsearch.service.conf
new file mode 100644
index 000000000000..489f8c42c04d
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.service.conf
@@ -0,0 +1,6 @@
+[Service]
+Environment="ES_HOME=/usr/share/elasticsearch"
+Environment="ES_PATH_CONF=/etc/elasticsearch"
+Environment="DATA_DIR=/var/lib/elasticsearch"
+Environment="LOG_DIR=/var/log/elasticsearch"
+Environment="PID_DIR=/run/elasticsearch"
diff --git a/app-misc/faq/Manifest b/app-misc/faq/Manifest
index 64013ec3ce07..df2ed3ed1b9f 100644
--- a/app-misc/faq/Manifest
+++ b/app-misc/faq/Manifest
@@ -1,18 +1,32 @@
 DIST faq-0.0.1.tar.gz 9916 BLAKE2B 1a585f56e72818978f5a79e0df3d59533a422127e8eacc79a05bb8704c0321b85c85e8cc9fd6eb633a1d5c39ea0b03d546d8da39462a94f369495ca0279a516d SHA512 38d5789dcf83042cc909424864e37d7adaf49bd3f2ab3da851005d528d3deb1e13ea37f68ba9245cf05e1fd1e45d1ab80c5d6d027ed785983d279cb8de05f718
+DIST faq-0.0.2.tar.gz 47842 BLAKE2B 7568da2ea59d6d2888116fa7cfb920d2c07fff56fcf8c0b7f568b6ed3545da8497ad72854d62041db8160b50004034524e928fe89bb4c9e02c426c722fcb887c SHA512 d9f33f1dfd2210a77ff9bfc4b08095a9d4689c81d1effda573a794272d5dc3461beca7294e3fe3652adb322e4b15ec11bd532f0a013a420ec82f7c6d782391c5
 DIST github.com-Azure-draft-53924464463d2474f410415f1310d2b95fb8965f.tar.gz 1417651 BLAKE2B 3d8743ac35e813116ca7c093878669b721a1af052e2a8e48daa48736132bbf85326a363638dc4f253f825a730e4325c6bd6f83fccb319c507cdfc82c2ba978a4 SHA512 464b6cb5250bf35b505c6c40c509c357a46b32b96cee4c06917b35fb66cb5f21841fd5c812079356565d5ca2045c5e51eec74106f0d4731e9096e8224286f68e
+DIST github.com-Azure-draft-fdc29c553a45600ac4f795f3485d4bb9a80c7862.tar.gz 1461279 BLAKE2B f15dd35c476dab9e8c8c8699a14ef1d26f208c29512917b3c16a75e36b9435f158f66505ba88d8820ad1c3b37cff06edf1b90f71b178b17f67705033f0f270d4 SHA512 5e4a526ff4f3a22d6e8e5a84592ba8b3c075ffb3867f9781a106f07f26b6ad7176e4bec2bb9829eb2dfbb45bf76569dc03ecb3eba1e71b119d3e70748eb1a4c5
 DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
+DIST github.com-alecthomas-chroma-d7b2ed20a4989ab604703f61f86523560f8a6a87.tar.gz 307488 BLAKE2B 1b4e373e2896fdf9126eb8f8f9b4c9137921d2067b13d14d91582fd83d44976f894f32fa1bd89750a04914fb6e14b37bea01ce7c893fc7b8b94093457855d809 SHA512 ba1e4eacd22006ee32bfd4ab4f56579d332d1fa8e3206e3670edf9270743cc87a8743f00deac30c2ac449b4eea0ab99dc14e829acde039d9cdb4593fd0dfc2c5
 DIST github.com-ashb-jqrepl-70de3caa122cf7c7a737f28b666ab0d541560598.tar.gz 14761 BLAKE2B fe636cf5425d2b717647404a012ff297d3c792e6ac11998004c3813e30768ba9dbee7b12aefbfd8793db398c7e24dad805e54207f689399bf9ce7f5632cfa7bc SHA512 f0f6529ad9561919fe5ffecb2acb2a432560a01b24292eb3b2746ba45491455f5e7bb023ceee0de1fdc147471e9733f3946a3bde599d2bf8122177626ea54424
+DIST github.com-cheekybits-is-68e9c0620927fb5427fda3708222d0edee89eae9.tar.gz 5848 BLAKE2B f3afe8bc17c2edf7cd334e8a54c34073772b26dd05268536eeccbcac2e210aac0159c6257aa02bb19b2cc76ddcec9b2b2b99db975535a900b44c8e42caee8227 SHA512 bbbfadfce1cdb7f8ea0fa7b319ed56df64630031aa85ca04e74b9da0d2eb8c6b5e02b5446ff4bbca11650592992cb4b2f63061686130e37089d2fa37a547de07
+DIST github.com-clbanning-mxj-32282164326064599d3a83e53adcb9b318d78d90.tar.gz 1089017 BLAKE2B 036c33acd4919dd228c90a5a7fc408244290ab38f66fa9875f60e4d8bfa8e5369ef9350b199b84b95ee74ea2803358313c3f8ac07110561f2892dd56435a7b65 SHA512 cc10b7f2eb440f7e553efd55adbfe024273ec85ed5447739919472123dba00638e1ce1683fe91927c2eabd53cfae9ead26e78a047002ffc56b638ab3f98c3e7f
 DIST github.com-clbanning-mxj-eb2e8a1ed220896d2b16890436447a0eae496fae.tar.gz 1071238 BLAKE2B 34a7cfe6e46fd80ee49c05c4efa6ba615ca516af34828dc291029d3f8efc83548204930a2487ed0fc86590f1443c8ca2b5574071189872ac9578739c1ecb6445 SHA512 742f9ff55eda7785cc733189018f487c2a7debcbc2d4446f8631b1e66457aa433319d9b5e81ed405ca54581a300d6e979367422eb7729d2cd9edde36717414b9
+DIST github.com-danwakefield-fnmatch-cbb64ac3d964b81592e64f957ad53df015803288.tar.gz 4952 BLAKE2B 92a7cfe2f3c07bdf2c61b445e35531150869dc181138d3438d7173ee38130d411a0de770ba40958471ea61d9aebe8881b51eb0ca9340deced89fd94df267e299 SHA512 5904008003ac80d34581dd1d33130fef27c6a523196aafef1231a2e63c5296cd30f8c3c517090b6b4c7ebb6a57d24bb0bff10cc40876e3fa1c9e74b65bc13154
+DIST github.com-dlclark-regexp2-7632a260cbaf5e7594fc1544a503456ecd0827f1.tar.gz 200360 BLAKE2B bbefca0280c0858669c45c8d63e66e77e07871507185ed777e96334eac22fc52ddd89a5dd0216ca12328d7a1b0b71dfca4e5ac75e75aebebdbda649818668e1d SHA512 b43d08612524b52a61179356ce3e67f170a7718349c89aaaf70ddc8e3e6de1bccd5df03f9caf596a48866b31fd8a9680400bbaf73408660e595e112de2b93736
 DIST github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz 11776 BLAKE2B bef19eeb755e2711ca293fa759ff98e39e17ef5679bef7b73592da7d44f1212dbe4812aafdfd63e585337623161074464a42f255873901e26091fd56f100b454 SHA512 a6848eeda7a6066b3df7582f681aa3382dc4e6d3c4579b4a13d8b31af317be56529a8ebf5c396b85490c0cddcfbe08872db8d747fedd212ff035678b9dfa9e0e
 DIST github.com-globalsign-mgo-baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2.tar.gz 409146 BLAKE2B 4fe1d3812f0f695febbb42809cfffbce50a8602ed89b58d1dca53255520b4945f30aee0a97141e28ce554f97edbaea3121020aee66db1a29cecd59c463755bc2 SHA512 7caac9d229c9cdd9a32a2f3f3117790bf67391c2b25c1ff88cd4ad6f5b0157f68affc90f86733919f961b5551e6732eab307309ddcf25f517dc8023ce6c96e0f
+DIST github.com-globalsign-mgo-efe0945164a7e582241f37ae8983c075f8f2e870.tar.gz 416824 BLAKE2B 4b0f151d5ac226c31de9126ff911aab762df0e4915d12deaf243698dc13db45466f7071998921c275e66485ee69ac8b5db86ccfc3c471682e0de73ae6dfd9b13 SHA512 cc38bcbf6944176caadf886d2c4882f727fa9732972ccbc040355cf95ed0f452e047727a0690a57eb98cf10e290bb028218ee1af03ac13ceaea54ee58bbdee62
+DIST github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz 70322 BLAKE2B e4284bbc1825c0e78cf2818091d2d25c581fd5da86d66eb8f91877b8a92f62400962391efb911ff33ffbe3db1de432a892dcc3670f96710fdb7c2cb191309697 SHA512 a5c4cbfc12e932f161c827537ad8366d8c003f40c3959c39bba9b6032e3d381516998a046429ef0980072b717dab0ab1df6b1ef24a43e66e1bf4bda176302b49
 DIST github.com-go-yaml-yaml-86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb.tar.gz 70230 BLAKE2B 0d6d56ae3ab1a46a2b8cb7cd89141825358d33b76d8bdf7a18bd42bea42321c2d294cabc1fcaee3b3761a56654da261f83cfd54db0f734b1471ab29df985197a SHA512 ab1f058e9702238b968e21d03c2d5effb606f6446e2f0a3f6fbd71dcfd90bf1a390bde6d3097f5e9b087e79645138e21a792862cc83d119ce4e0da2510be775c
+DIST github.com-golang-crypto-1a580b3eff7814fc9b40602fd35256c63b50f491.tar.gz 1606221 BLAKE2B ffdb4c6152715f0157c1c4bdea1ff0abf549daa39373cdb30e78c4a9b9e73b238d287964a9a2335c18349821bfb187bf608169c08190d37eb363c8701eaab63c SHA512 ff8fee4616ce22a304b829e2991299214953b5cfdcdfd18e75ba60bf873e54395fa2c255f11e51837b27c576ac959eee766127d2a299e05842881a4103a10617
 DIST github.com-golang-crypto-88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz 1455583 BLAKE2B ceb0dbb22869d4e5a43a8674138f725de7514af12131da26152bfc723d8981356f056547c63b81193da2b0b9d4587a2941b05dcd921d27ed9cb5d9db3abdd971 SHA512 2c81f213f5d934af9b449d0bcb4b6ee2078b4db842933aa84b6dcaf893029f2bba3657fd3cab14749cff8d4cca6ee64dc7478d4c790f314bb12ebb8fed88d179
 DIST github.com-golang-sys-13d03a9a82fba647c21a0ef8fba44a795d0f0835.tar.gz 802725 BLAKE2B f826bcb2230bbeba10b138d3fae0191ee0dda49ade37dc3462adcf16ea890dd87d86aa9793ada59b86ee427da4f2b336fee1a2cda7f079bf50a6f7b70360cc48 SHA512 d4f82bd401b6a805c7d369fac26edb5153f0f9654a6d9fc9809a545c8a3de546329a36f4fe8aa5506bd2d3b4da27dcd56cc2bd5ea18f2c5a033d7fa5f3820251
+DIST github.com-golang-sys-7c87d13f8e835d2fb3a70a2912c811ed0c1d241b.tar.gz 857002 BLAKE2B 53fe56ca4674f48f18f8de03a1eef1f5e57f71a2fe8d2ae2f6e67fa106cf57c4042aafa783b7d3aa8044012a2cd527eea30881beca6c49738758dd961f7f3a3e SHA512 95451c906c1b797de586f4c3a313378a45fba0557fdc54d2373db2234093f7e7966a06757fb35e4ccd466e93260f867ff832b85b6b632f3c2d600c1ff06d21a4
 DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
 DIST github.com-jbrukh-bayesian-bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz 9353 BLAKE2B df1e8457587b5d27f0cbfe5707da54a38c3ca4311586674d9e4bc85ad55dc222e570002a2388fbbbf239e559e4438aa063971665e436e234ffecb7888a7aff3a SHA512 e3ba5ce1e2a8e3b61e70b4c9f31c4215ec8ffb4a558e51f74efcace20b6bcf958f675ffc1125623e79da616aba2518a6e4623596e3a47abf3d841ca9d9833cf3
 DIST github.com-sirupsen-logrus-c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz 28758 BLAKE2B e34b383cbbddcadd99692609c9c20f94182735fc9879c0391947d0bc540df05cae7570230103a75a1e031fe8e30d1a4796eb17c80b4fba4a6d79bb999932205f SHA512 8f4f0bc4f4cd02f26f1ab39857e0e8120feab8ae3bb44b570e5d269b0c716d4028b824b04ad3923dc3e5a82b64c757e462ff74c71875677fd4fd276bd5b40926
 DIST github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz 100895 BLAKE2B a4534b0ce3689db04d2f1fc4bdd982576f62e1f4622b81f305b9651bb455b14d4b4b145cc4da49a52289b2b7f32cd9e1406e950020fc7b3f87bb0fdba98db12f SHA512 b33bc0c32d25d099f44b3c7cf653ebbcdbec00d45aade37d38e9c5e0f15bcff36ea736b13583d5ba88e7728815ffa986c4dc01b082df5ac2bfbd8db2c7f7d333
+DIST github.com-spf13-cobra-ef82de70bb3f60c65fb8eebacbb2d122ef517385.tar.gz 101660 BLAKE2B c55d90b35107df52b9a5e8376f096267a0d96253dcdf01cfad27fa3e67d58e352472dc871ed0cae411f09600d7c2a1f244e03d8d62a1db609368a95f836aa933 SHA512 2897e8e2e837606e42daf0d3319669ed1c3ea03d3c9c07b784bfca38fe0b5fca6ac07e074608036af33f5127bb3f0a2a6606df79437c90363c11fc32185a068d
+DIST github.com-spf13-pflag-583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz 43327 BLAKE2B cc00d2852d895265eb0b60454877da841fe123535009025c761761c61b4d937d6293f3bef765d2a8919d63d8324dcb6addf774837df26fb864cb72d88add2d03 SHA512 061b9895e3936e356f707385ed7d7e5172f94167a1fabc84e9a0a69df4f03e0eaf435a4ac0cb00f5077855987ab1d2c3b051846c0466485a7bc329a547dc3d3a
 DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 39045 BLAKE2B a933e0ae64f3bb344a7dffdf8f7ed73e4fba329a81794442ac3a8fa8904f29958bcc6b0f2af9848bc6c715b27abc5908d5ff16d23ea790899f71d2f5ff0ce6cb SHA512 c05ef1bc05cba471a55a11a2209fe4bdaaba491434a28b7f08d23528f4074b82a656b62972efdd49384dd49bde429d2d2c0e6ba311cae0d23f55b229b768dae8
 DIST github.com-zeebo-bencode-d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz 13253 BLAKE2B 043d6824c2d0aeb69403610dc64b890d77a555483e92d54d0f70f630bc1b1326202118a8d2285335dea0605b582d640962a763eb4fe9cfee257a742a6da2141e SHA512 488aa86cbb20e0c1c0f22d053dd6e793f0d1e6faaa84c3e5da299e3714d493df2284ed74009002dfe8e33d06291d06791f74c257443ee6dc3ba84b871d59fec3
 EBUILD faq-0.0.1.ebuild 1768 BLAKE2B bf175e390eb6cf4d0a125b1623dac6c8513085a82c55559c56710eddec75a139a1d68cbaccb74469acf69bf0af038344dd30e53705b7bd6d32f5ff534de2ff74 SHA512 2bbc7f2b9752397c5861b16bc053d09a46a2bf7a0ebf23f367620eed404d0a19ada0711f50fbb71d742127f260779594a60d07a7aa675459b47f73a55562bba9
+EBUILD faq-0.0.2.ebuild 2025 BLAKE2B 7e1ff6bebac1e5e0d25acdf93fb9d012959e355409bb87aa10a73f2e8450f73a3522dafe0a6623021c539259e4559c78d98d3552d1a716dbf11d4028929665f0 SHA512 f01dfb3c34e8a01dc7b11c7ed17323faaa10c92a797f753ded6286c9b96bd58c3e713405a14f92d68c8717055e4e7be24a4ad8a4ae3231217bd78de445083e27
 MISC metadata.xml 324 BLAKE2B 4e3f348285a9ba513382c20b245bcaf32529fa44a7b9152f3f3ee99e4e730d056ea06a808d0797ff02fe0a1a38a39959ca364bf85dba177d9a6bb70575f92488 SHA512 19ca8fa72afdebb725d33ff7f0faacf4e643c4c13af81980bf96beef3f2d29614d2ea5de4a347a7b83006078ae6d23f92fe58ed25b690699478abb743670a654
diff --git a/app-misc/faq/faq-0.0.2.ebuild b/app-misc/faq/faq-0.0.2.ebuild
new file mode 100644
index 000000000000..279745ad6702
--- /dev/null
+++ b/app-misc/faq/faq-0.0.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/jzelinskie/faq"
+
+EGO_VENDOR=(
+	"github.com/alecthomas/chroma d7b2ed20a4989ab604703f61f86523560f8a6a87"
+	"github.com/Azure/draft fdc29c553a45600ac4f795f3485d4bb9a80c7862"
+	"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+	"github.com/cheekybits/is 68e9c0620927fb5427fda3708222d0edee89eae9"
+	"github.com/clbanning/mxj 32282164326064599d3a83e53adcb9b318d78d90"
+	"github.com/danwakefield/fnmatch cbb64ac3d964b81592e64f957ad53df015803288"
+	"github.com/dlclark/regexp2 7632a260cbaf5e7594fc1544a503456ecd0827f1"
+	"github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
+	"github.com/globalsign/mgo efe0945164a7e582241f37ae8983c075f8f2e870"
+	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+	"github.com/jbrukh/bayesian bf3f261f9a9c61145c60d47665b0518cc32c774f"
+	"github.com/sirupsen/logrus c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
+	"github.com/spf13/cobra ef82de70bb3f60c65fb8eebacbb2d122ef517385"
+	"github.com/spf13/pflag 583c0c0531f06d5278b7d917446061adc344b5cd"
+	"github.com/zeebo/bencode d522839ac797fc43269dae6a04a1f8be475a915d"
+	"golang.org/x/crypto 1a580b3eff7814fc9b40602fd35256c63b50f491 github.com/golang/crypto"
+	"golang.org/x/sys 7c87d13f8e835d2fb3a70a2912c811ed0c1d241b github.com/golang/sys"
+	"gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml"
+)
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Format agnostic jQ"
+HOMEPAGE="https://github.com/jzelinskie/faq"
+SRC_URI="https://github.com/jzelinskie/faq/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-libs/oniguruma"
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go install -v "${EGO_PN}" || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/${PN}
+	pushd src/${EGO_PN} || die
+	dodoc README.md docs/examples.md
+	popd || die
+}
diff --git a/app-misc/pysmssend/Manifest b/app-misc/pysmssend/Manifest
index 9eb3d5355e18..96c8b4492b8a 100644
--- a/app-misc/pysmssend/Manifest
+++ b/app-misc/pysmssend/Manifest
@@ -1,3 +1,3 @@
 DIST pysmssend-1.48.tar.gz 58172 BLAKE2B a1a33178505f3b9571c81ec90b2fc8c786ad988210c2d87f739d4b1c5c7df20bc1cc84e546a97c7a4b4063bbac363db93358c603994f99d216d1b6800c8d1c29 SHA512 d1d08e11bb4a5f450a98e9bf6292ce65edb61e0610e085dd79dcb80fd8ce1d15f7350797a0150eb6ddcc0116c17e3290f2790632eb7f54ab66efdcf662022088
 EBUILD pysmssend-1.48-r2.ebuild 737 BLAKE2B b093e9c364bf6f1771fd6da49f4a680828f8761e81f9db623ebb831b1e14a5b4ad2a82518e35cb6a116b57ae92d5b61b1feffd8a701e9a06572745f97a87941e SHA512 2a3709f00f7804c6b7c0609f1fdaabfd6c15da79d942542743927b355fa21b909fe3071611a2550720840d81e8a43f6ce0c4432ed5b84adcc7472a763018bf51
-MISC metadata.xml 244 BLAKE2B c4578615fd9f129ba63401a677b05631e811fc780e4c1f3e95ad1da14adb53c59705683a04a0ad1e54ec8ae3730b412d77ecd844b664272ff22c27dd00aafe53 SHA512 c0661c87a34d45258dc8236baf4e1fd4fcb3f418f4a6bb13670ae91141c7474ea8d423cb7df3c8f45cc4441e22783e6ceb807a84ccb8a75c574ea079f8a02117
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/pysmssend/metadata.xml b/app-misc/pysmssend/metadata.xml
index 2028cee3c389..6f49eba8f496 100644
--- a/app-misc/pysmssend/metadata.xml
+++ b/app-misc/pysmssend/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index d5318c297931..51ce9824000b 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -1,4 +1,5 @@
 DIST screenfetch-3.8.0.tar.gz 71970 BLAKE2B 783d14bb30f5858f2f2f8ac81c6c8bca2fa4c1e7c9225d9ba13a7ace05c365459e277bea625b680fc3e3fedd0303507a583190d866627cedcb33e042aa8fdca7 SHA512 903f42e3bfcd719c4d6b91d10e5678063e223c2baa58214c7e8dae9ea925852f9e2c07ad90148e02d87ce5f9af7b989e80e93c2f569cd579e6f4f7d5c49c62f2
+EBUILD screenfetch-3.8.0-r1.ebuild 645 BLAKE2B da3565843558442dcfb92af2f56da8dbfddb25d88ea21492dd716377e6de0975b25e5ff25d25014c9342c0ee6abd7a1e479386bae10b5e5f505c1b109aee9efb SHA512 230977a4b296c7536799ebe36812bcbd1d311568cd5e243e96e6fdd6582dab322163dc767c796984e2fe7d16b904f3732d457b0fe59d206fcafc3a6cc3a55a6a
 EBUILD screenfetch-3.8.0.ebuild 693 BLAKE2B ad0cb380e1a3cd16f21e695e178abb984c76d6d696ef36dcd518b683c84ff82ebdbec02c9dd94f28c4b6b77a59f559614b07ef4cdd22a5a13104c9460a14da95 SHA512 99082dbdb51ba4ef62e0acdc41fddc59544644e8bb94dfbabe33bc3cd171e6416d5525c90770fdae8f86792ceb154e0be74373542668675cfff89c2d15074f9f
-EBUILD screenfetch-9999.ebuild 695 BLAKE2B aba8d3df8fcf9c7de4f83eee0fd1823160d1b7099dd22b20a3dd53b187472fb9bbabf0177a39473776fb2c2dc74056057250042188e43ac907aed246c944ecfe SHA512 bac3af4d7023f27284ec87186021d7e55d274675a719ce1785ba10ae6bbf5d52ddc97152f2c6096e6fca4e785c232016ff579ccb9f1eb44704872b7f694dfc24
-MISC metadata.xml 565 BLAKE2B 765d7d26e0e26fa7fc38808d02d8c9f49af990cacb9c22e670a53dd968dea368411beee7c3c4f9df2b877c8337944bf513edfd086f147dff54e6ac50e77df1a4 SHA512 a6032e340f2ebc2eb69673cdf61fd9c6da9a141e59aea3ff60bdb47120b86147ed6b971cc16df936a7391f8ab8fe8258e10444ffe11e79a7118620f883de45fa
+EBUILD screenfetch-9999.ebuild 645 BLAKE2B da3565843558442dcfb92af2f56da8dbfddb25d88ea21492dd716377e6de0975b25e5ff25d25014c9342c0ee6abd7a1e479386bae10b5e5f505c1b109aee9efb SHA512 230977a4b296c7536799ebe36812bcbd1d311568cd5e243e96e6fdd6582dab322163dc767c796984e2fe7d16b904f3732d457b0fe59d206fcafc3a6cc3a55a6a
+MISC metadata.xml 433 BLAKE2B 50f5c928a8db5e71033fd780bd2ea13af87d8d14d83b694ff6765fc65ca3f7313c53de0a22ee5cdc0ed4ad88c754a0ccd750e59e46cfd1456b4ea185162ae1df SHA512 d07492a28cab27bba43976cc18148cde296f7e3a5ec76f06f066812b085c8b1a2b7ba9ed0a5eeea7aa838b052f177a2fde0a99ff5ff5ef9a46c4c0553cf012e0
diff --git a/app-misc/screenfetch/metadata.xml b/app-misc/screenfetch/metadata.xml
index a91c788aff05..d142f85f16c8 100644
--- a/app-misc/screenfetch/metadata.xml
+++ b/app-misc/screenfetch/metadata.xml
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hwoarang@gentoo.org</email>
-    <name>Markos Chandras</name>
-  </maintainer>
-   <maintainer type="person">
-    <email>johu@gentoo.org</email>
-    <name>Johannes Huber</name>
-  </maintainer>
-  <use>
-    <flag name="X">Use the <pkg>media-gfx/scrot</pkg> package to take screenshots</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">KittyKatt/screenFetch</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+	<use>
+		<flag name="X">Use the <pkg>media-gfx/scrot</pkg> package to take screenshots</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">KittyKatt/screenFetch</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild b/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
new file mode 100644
index 000000000000..f2c6bb16d7d5
--- /dev/null
+++ b/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/f/F}"
+
+DESCRIPTION="Bash Screenshot Information Tool"
+HOMEPAGE="https://github.com/KittyKatt/screenFetch"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="${HOMEPAGE}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="curl X"
+
+DEPEND=""
+RDEPEND="
+	curl? ( net-misc/curl )
+	X? (
+		media-gfx/scrot
+		x11-apps/xdpyinfo
+	)"
+
+src_install() {
+	newbin ${PN}-dev ${PN}
+	einstalldocs
+}
diff --git a/app-misc/screenfetch/screenfetch-9999.ebuild b/app-misc/screenfetch/screenfetch-9999.ebuild
index 0c17327b86ac..f2c6bb16d7d5 100644
--- a/app-misc/screenfetch/screenfetch-9999.ebuild
+++ b/app-misc/screenfetch/screenfetch-9999.ebuild
@@ -1,13 +1,22 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="${PN/f/F}"
 
 DESCRIPTION="Bash Screenshot Information Tool"
 HOMEPAGE="https://github.com/KittyKatt/screenFetch"
 
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="${HOMEPAGE}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="curl X"
@@ -20,15 +29,6 @@ RDEPEND="
 		x11-apps/xdpyinfo
 	)"
 
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86 ~x64-macos"
-	SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
 src_install() {
 	newbin ${PN}-dev ${PN}
 	einstalldocs
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
index eb523dd9d2fa..cfa5f2513ff0 100644
--- a/app-misc/skim/Manifest
+++ b/app-misc/skim/Manifest
@@ -2,19 +2,27 @@ DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912
 DIST ansi_term-0.10.2.crate 16642 BLAKE2B 69c001a07e02f48eeea8d63b1a242fc1eeb2ab9cb874e6c0e6cf40efbb6a1d585572330f9b69abb4d8df3012edc6e861854f816571b35aa55ee759fce79f1203 SHA512 ad4572845913cb21fdd9d8c0bffc5fce1571ef62c32fe83fd41262f7955e918400a446077494038299c4c0dfb0bd030d089336b3f169e726a5e15ee5c78ea3b5
 DIST atty-0.2.3.crate 5486 BLAKE2B 5c1b3bc8cd680ae639302d51fd54a10ad2595ed112d7e179d200d81a0c3bce326cde22458c9c757beb6601f00fcb61000f6f1785b7ca6832ca28b9f58472d604 SHA512 9c944334333ca59d28588e164d2a68750eaf889dcc6b28bc49fe9a7990e0b1694d302a685142866362b7b97ef3f36daa410b59d6222e99cf6f096836850794cb
 DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
+DIST byteorder-1.2.3.crate 18805 BLAKE2B 2d5a74233f17778ee20220f9bafed13185b08fee92279a597d2169225bfd48e087031f2f7350ddc0344c002d97bbf992136d4b98416c70e2bde7e0e502a4d67d SHA512 336c9ac26d897042554d4c7c00a5c47cfdfa2a181511a7247b292c342156450c6cac95a2137d6f6a45f59ff1ef351a18dc73fb75e9e0c5b0b3a90d7026d39dc1
+DIST bytes-0.4.8.crate 46023 BLAKE2B e83cf53fda9c1e9338e644d0f8b4c33565b693b8c39b26ae8ad2f82dc74b9337361354f6ab5f1eae9cfe928955443b094f0f0627d6aee80e8529ebcc44f54ec4 SHA512 f56cae4af641757bfce2d444c235e92e01a9d4db66efa96e39c06b49af53c966a3bfa351130f3a5f13b4ea156b8ae9416065f66188361433cfaba475b8f321b5
+DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d
 DIST clap-2.28.0.crate 186934 BLAKE2B 6885cb7a74077b1c72feac97471c08a456f5e826e42b95bb1768027fca127696a457cbb8069e624196e1c77e55608b8ec6b157bfa3e8a661dc0c9b67af903c9c SHA512 737bfa82008082d75ef5f36c5aa505af8e11ff08b7ec824a69f37dcafe1d7ea8e4909a94cf5de218f9bde4cd304e8ec57441b195d936b7db43e8b5881fda0d01
 DIST env_logger-0.4.3.crate 10891 BLAKE2B acbe308cb75ad68f824dd8cbbef13a9bab3234f121952f16af274180ce87bbde6f6327bd98f0d2a4623fa7a4980b554ffecc9280b709df1323de149399537d6d SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246
+DIST gcc-0.3.54.crate 37248 BLAKE2B e1e14c117776c6e194625223b027ff90b9fddc179ff381bb5649b7020dab10bf06a17237a8473ca9e7dff9c713da899314aeb9251e94fd0eacc8bdb94d68c7e0 SHA512 83b5371d33bbc67dd08d46bdaa3636e09a98078f7474912b92c20bcbc027ecdad65b1cae80f427e5508e1bf2de896c8c536375144aecaf0cbcdfdb7368ff97c1
+DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59603f07baa03c0881fe5af85ecde5a172bb0733e7043fb6c43eabc261635b23410658d48add09eef6d807a750d22f SHA512 c85ac434d1b7d41d638e76a142a43d925b96bdddda112b1abeca1bae160d828262a85cd333d72499fe1dc7ae9574d3db226106acb433328c056028eb8c42bfe6
 DIST libc-0.2.34.crate 304756 BLAKE2B 0a2af3e2a92ac6dfc72d72d26ff2df47b0c8656f22b3a52df02cf8eff787ae638ae8b2c56370da0e9f3831cca325d6073c6d08beedd7c75455c2785ccc5081bc SHA512 5f7a108608c2d202f6d59125aec37679f178cd1e34f0b6cc9384c476179aa45a8f10b5934314e2b2243fba4233bf8b1ce91399c8ba73e41c3591c14debc12856
+DIST libc-0.2.42.crate 336080 BLAKE2B 0de0726bfb00ff42d67abf06efa26c1a4f8132b29be2f957b9089da2ef3e4dfddddea49ea23af3449a367d262dc563b70968c6b2b6a1dc81829e6c6a8a1dac63 SHA512 c99a4358805012d7552f416ae68c9651dfd260599bf0cd618b55036acd08ab8eeda8aa18c18b893f074c9613694ef6562e87f032639eb86b86514aa0fd815870
 DIST log-0.3.8.crate 17756 BLAKE2B 1b06efd4625f9192e56629a5c8fd3072d876643ec5d42022e001d8c14139c56b7a2bbbaadeb5218a9ada6cd86aae26819dc4693eadb13ac1dd4ae93ac50554e8 SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7
 DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
+DIST nix-0.10.0.crate 124570 BLAKE2B 2af23108f2e9403cdafbfa3b7b6fea9aab4c9006a6f16145d273833c845c4d3abea762d7f3720d54aefef0cebc4c55675b5a79ca7bf61184846276c543c1499f SHA512 335bb939af0132511798e6c8cd259e82b6c5570a51b2dffab8c7c1c1ef13f473ead04bb5d99ad2aa383ea3529d6ec526a1c5dd0adf501d37406cbf3113b453df
 DIST redox_syscall-0.1.32.crate 13555 BLAKE2B b8170ec049001e6007d736e19b8171cf2d605a987ad42910123478780e667deb7cf72ddfcc3ab5b073d966e13aed5be77e032af65ba3b8a74a8e6964fd08adb9 SHA512 8a19a241b0ffa235e7716e9c01ed7e0a424fc552e766e2ec3c0d41c70f62424fc3d000513d29462d753258c811a973eb0bdac5868b382a4334a7f25bc32553e5
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-0.2.3.crate 193983 BLAKE2B e59478e264afed2ca0f675dd5abc39b0ec5f77609c7720ce6ebdd4cb31f51201024ffb3d13dce3f9ba643f8ab623248790412c63867ac660d8226bbec586280a SHA512 639e8f0e62127fa9ba84a53c2b9e4774ed126eb48dc0f3bbe093d8683987d74e90124f5ba1722af9ad5d8487469320f6dd6e5e76bfaa64e170c788c41162b58e
 DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
 DIST skim-0.3.2.crate 69623 BLAKE2B af7236145d300033fe4d61f639209660c41c67d9ee1848c9a55e928531fa450c9c69c806abf93fd21e8876d5755143f80ca3746053617b8309c7e36f009761c6 SHA512 3f0358bd48169e9a5bdfc9b7ce1269dd1823b8df4035b0d4c81ee1ae0bc7dfcab696efcaa4bfa6a7e0b0f7143dc2752dd5df45dbf10ce199615f509d6c68efef
+DIST skim-0.5.1.tar.gz 77080 BLAKE2B 9fa7e9f8d838cfc0608894177a1ca34da6e056bb2831eaea781b687b24f89bc865a710296191a986762d20169d20c3406562e291974a2d444bd95782c4cda48d SHA512 871d975e31fba4762555525b6ef22caf92a6df6eba9f6f1f2a7271569b6aa0af60352fedc515e6c6e614607546e943699f40acb8f3df819646c562a5171d77bc
 DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
@@ -29,4 +37,5 @@ DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968d
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 EBUILD skim-0.3.2.ebuild 1243 BLAKE2B 12b4b6ace6d683ec02700b576624576aa6d15f5e2992440d80e558b6178684ef1060e16f7f6eaac49afad4df40a9c2d9fb696829c5be7305e2a4f9a8f73a5993 SHA512 ce00f85f43c33db517ead66810485a2626298501ede7f3520aa1a9e0dc0c68233b2def03507917b97b44ab04d1ba0c17e1de3fd2248edf1d0ef40d5d48586e6f
-MISC metadata.xml 470 BLAKE2B 180746e1e2f48f8024dd0cfb490e8ad2f1ccd4b32b7394f081f251b93b27bfc20e0fe440fe8449ffd52547b055d761428d585d9b6dff4f974a071349c56b87eb SHA512 c38d86b5ce12408946b75aa4537589512ea23eb09fc50354afdfdf266592e0318f0647b35d38de53b837c6f7096cd35584f8aa5395b0aa2076f3b82de389819b
+EBUILD skim-0.5.1.ebuild 1451 BLAKE2B ec697e1f1632e95d4ba19ffa17d3a159877d0bd1a5b8eec513f9f8967592a0802a5c00606878d4b45fbb45dcb7f426e16d9ce7858635d8e04d8393b62b995d84 SHA512 847cc1a5baaab324a1f0cabd3c78ddebb8c6fb0ba50793cfd284cdd9c03b301ef186197cab837a6af75800d164c35dbbb1630ec0ffdcc0419ecdccb3ddfe5707
+MISC metadata.xml 582 BLAKE2B cfdc16bbc46445ceb6fa494cd23600d7e73aac9b88d9ed04a639242cecd82ef930372ff9807cd3a595fe07f8dcc0eff20d06bddd7153e624f5bc65823fc27991 SHA512 28756c12e60594e90969979d729a3f05359e724e230dd04492780215d21a727429caefb048a6d3976cfd9c0acb63fca76c5195eb9fd5cdafdce73ec429274315
diff --git a/app-misc/skim/metadata.xml b/app-misc/skim/metadata.xml
index 1ca7d24e80a2..25d81d80b076 100644
--- a/app-misc/skim/metadata.xml
+++ b/app-misc/skim/metadata.xml
@@ -5,11 +5,15 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">lotabout/skim</remote-id>
-	</upstream>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 	<use>
 		<flag name="tmux">Install sk-tmux script to run skim in a tmux pane</flag>
 		<flag name="vim">Install vim plugin for skim</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">lotabout/skim</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/skim/skim-0.5.1.ebuild b/app-misc/skim/skim-0.5.1.ebuild
new file mode 100644
index 000000000000..e22df2b1a748
--- /dev/null
+++ b/app-misc/skim/skim-0.5.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2017-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.6.4
+ansi_term-0.10.2
+atty-0.2.3
+bitflags-1.0.1
+byteorder-1.2.3
+bytes-0.4.8
+cfg-if-0.1.3
+clap-2.28.0
+env_logger-0.4.3
+gcc-0.3.54
+iovec-0.1.2
+kernel32-sys-0.2.2
+lazy_static-0.2.11
+libc-0.2.42
+log-0.3.8
+memchr-2.0.1
+nix-0.10.0
+redox_syscall-0.1.32
+redox_termios-0.1.1
+regex-0.2.3
+regex-syntax-0.4.1
+shlex-0.1.1
+strsim-0.6.0
+termion-1.5.1
+textwrap-0.9.0
+thread_local-0.3.4
+time-0.1.38
+unicode-width-0.1.4
+unreachable-1.0.0
+utf8-ranges-1.0.0
+vec_map-0.8.0
+void-1.0.2
+winapi-0.2.8
+winapi-build-0.1.1
+"
+
+inherit cargo
+
+DESCRIPTION="a command-line fuzzy finder"
+HOMEPAGE="https://github.com/lotabout/skim"
+SRC_URI="https://github.com/lotabout/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tmux vim test"
+
+DEPEND="virtual/rust"
+RDEPEND="
+	tmux? ( app-misc/tmux )
+	vim? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+src_test() {
+	cargo test -v || die "tests failed"
+}
+
+src_install() {
+	cargo_src_install
+	dodoc CHANGELOG.md README.md
+
+	use tmux && dobin bin/sk-tmux
+
+	if use vim; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins plugin/skim.vim
+	fi
+
+	# install bash/zsh completion and keybindings
+	# since provided completions override a lot of commands, install to /usr/share
+	insinto /usr/share/${PN}
+	doins shell/{*.bash,*.zsh}
+}
diff --git a/app-misc/socnetv/Manifest b/app-misc/socnetv/Manifest
index b73659900d1c..d39edcfc739f 100644
--- a/app-misc/socnetv/Manifest
+++ b/app-misc/socnetv/Manifest
@@ -1,4 +1,4 @@
 AUX socnetv-2.2-deps.patch 218 BLAKE2B 8f9900b1f9a6d6e9e4a116d3da75aa743d7a193dce8136582eabfa9c183209d4ead2fa782d7cefa5366eb98f1a5e29ac20c8f0b2350982856c05826130b63fc4 SHA512 30fa3fda847aee54452ebbbaea8ae2439dc99fd5b79bdd41517d12effaf2a8e1355257b00e80dabb40e1502a169a8b46bbb98af8ead5239731d35a75b847db03
 DIST SocNetV-2.2.tar.gz 745086 BLAKE2B 3b520df2bb29f1989f744ec7e424caecd722cf3f903cf494e0fba9c0e5c1def413411768f593a3f8c0eb3cc20d1071d54babbd76eb24aac9f6670b4f2623ceb7 SHA512 12f490fd1f7fc1a6b45f77d23d8825117def0b7720595cd203d171fd88c41d5a0194a70359f55cbe2dab9e545f300156b31bb0680e46d7ab584e070e128e457b
 EBUILD socnetv-2.2.ebuild 820 BLAKE2B 94f3edb120792ed47a24bf70b82ef0505ac1bbace4fd81e1e9598dab12a5e8756bf97b6fd40c5bfed5bac2fe0519d9b6d7f09ab1a8cd280e6ca4b385188b328f SHA512 0a441336e37567f1e1fa1311269067e7601a475c336186b5916dd39d387f1993667247c35abae9e9c673dab53451feb954c692d21fb3848fffa6b4bac4058158
-MISC metadata.xml 871 BLAKE2B ecddd2e7e36a5efa541f554f2ad33ec02570765a02bc00cd7ad8304613a5acf78a783252c6d36bea2edb90334b17ba83709c21cb16cef223cc7cb9bf0570fafa SHA512 d387eeb7d713e4f43f5232f1edba34dc5676c58797838b51301ffed8daf70312117e15c05ce783ba5888cb121b6e8451318c229a998acecedbe6f5fa7aa1120a
+MISC metadata.xml 788 BLAKE2B 6b43e5250ed70aeb8f600e3a8ff344ff547a803619b29294b7290b49cd38e8a96c9e7f4605d667536261028cac19f75f21a9691eabfcd883245c6a8bc5e9b3de SHA512 1054727f278eb6cbd492deac0fee36b79f9b34804956df0c6df0a16a25af3a626aacc0f3476b0cf0d3d8197973cddd4e589be4b70a17f534fbc80fd91bb1b2de
diff --git a/app-misc/socnetv/metadata.xml b/app-misc/socnetv/metadata.xml
index 7831ad505653..d5bd61ba7c6a 100644
--- a/app-misc/socnetv/metadata.xml
+++ b/app-misc/socnetv/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Social Networks Visualizer (SocNetV) is a flexible and user-friendly tool for 
 		the analysis and visualization of Social Networks. It lets you construct networks 
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 418b75d84527..6cee465e682f 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -4,7 +4,7 @@ DIST libstemmer_c-20091122.tgz 129207 BLAKE2B 8ebf49f4d2b7dd5d0e56e5a032f16e807c
 DIST sphinx-2.0.10-release.tar.gz 2016687 BLAKE2B 176a14c2e1ecc859f5499eab2b2ee9cb9047ec6d07b407c0dbd3a405a9ca6198e1480166a245f7f523e3c3555bf8fe7ad7f0733bce5371f1b35ce6894dfafa6c SHA512 d22a0ce261cd6decda2e9e91fc9806699c818bb45a9c9c5e11a0944a698d47b5862c577eb55e7b57dd208db982e7f8bfc7163af37aaedc1c537841aff1409952
 DIST sphinx-2.1.9-release.tar.gz 2443797 BLAKE2B d741d0bc915ece01c3ddcbfacd44f34ef5d772d2bdf07aecb3a704dc0c5ef551e9d3829af200b1c96e41be2a037552c28a83647af78e827d7a9627f1d9d536a8 SHA512 7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56
 DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B 63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
-EBUILD sphinx-2.0.10.ebuild 2620 BLAKE2B 8329b372b512e49efa8a7219385238030d9db3170768734477a0ee4ff97adf8e66687c67865117b67a871a1f160fec2224da4c0b88582162bfbfcd3d275b79d8 SHA512 e72c9596d0de50ca35247ac38ea5c03370e543d5e5faa0ac623ded3a93f7cd3c8f89c400a39c92427948182c4dc3e2a82cf744d766d69982b016a8cf33e70c0e
-EBUILD sphinx-2.1.9.ebuild 2355 BLAKE2B e0e66da428b8b3e1c99de3f2ceb3879ab42433020883bb96afb9b01ac5ef411e871bad56d4cd6ac16f32550c1f4a391f6f3a7b6959d97e83f443ee906df72a35 SHA512 0b6861b2d6625e11fd12b3d2eec4659d1392723877525c152f0723f23192f57e44c4946bc8632c93837821dd32fef0abad77a563dd4eecd5fbda59f1c8d8a6f5
-EBUILD sphinx-2.2.11.ebuild 2379 BLAKE2B 638b663c4a9c517f6bd9614834f8ca5eb4196adab3da818e6e9b498ce7ff0118f344df8dcf2f0cc1c84adb1c5444571d8be98b6e497b278139c3d095b78e6e91 SHA512 658227af2ac8ce1a5e1d0ac852528d2097ff8019470e9a50ea4c9f76a930dfccd83cbb1b7f57567bb8924236092be8b584c15203e7362c51564b1189eb06cd38
+EBUILD sphinx-2.0.10.ebuild 2641 BLAKE2B a081bc6185d715bb9d0555bf84cba6c8aa4c0b492cc2d7154d7cb35dff8fd26266acb1dd90551c19868972b7a3aa55a96faa1947591dab69fc1903b47150e995 SHA512 a842cbc275b4139f09aa0b60ace1a15bf5b2c42c4bddcccbbcb22431b16d2c0d33e3af842e3dc2c189c9d94cb31b8a3f145b3b4bbed85cfa5204d2aeab553db6
+EBUILD sphinx-2.1.9.ebuild 2376 BLAKE2B 996c4d2a42f92a73a74baa7716abd352b2fa446373dbdeff5f936e9eb7db664df2584ffa17e09f315d2f26558e41f0699691545721bed32ed4ab1c976c8e1265 SHA512 79c16793a6c613234adc6f892ecbf939c8431bdb76f685501872328113618beea8d1d5181eb4ab1a53b91b9e00cb1b9bc681d1c9462894078b5f45aa708e6ab0
+EBUILD sphinx-2.2.11.ebuild 2400 BLAKE2B d2339f0893edfd12ba370ffade39d9bf40ee585dac4efcf8858d2bc2e193bff70c2c18a93fa743ac6ff7d980cfad31387837afb46158e494d7d4240366d83de1 SHA512 629d6374605f457f009744a32183ce31086e93faa0ce82d436822c18866927fb5badfd8a7f8a4fc4036970f05ff4abcc6b570abe17b69e2f0d42136d0f481a4c
 MISC metadata.xml 436 BLAKE2B fd5aeae58f468becae46cbc4c5efb4d42507590f85d881427357c220a36db5ebb775e163bfdeab34199dbbffb2fbcc4d1c9aae8a831d3ecfd7b4505e39eb6a89 SHA512 3083764b80745c3f6dd81c1bc9c2f406edcef6a451d49a79f952969db07c7741447df2b82a82a627b5ebe680f3ea36f99128ae701b553895f15b7bed0d8abecd
diff --git a/app-misc/sphinx/sphinx-2.0.10.ebuild b/app-misc/sphinx/sphinx-2.0.10.ebuild
index 8e0c6d4c8562..b33e16db8467 100644
--- a/app-misc/sphinx/sphinx-2.0.10.ebuild
+++ b/app-misc/sphinx/sphinx-2.0.10.ebuild
@@ -1,7 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
+
+WANT_AUTOMAKE=1.15
+
 inherit eutils autotools toolchain-funcs
 
 #MY_P=${P/_/-}
diff --git a/app-misc/sphinx/sphinx-2.1.9.ebuild b/app-misc/sphinx/sphinx-2.1.9.ebuild
index 54eaa42baca2..bf55eea2001f 100644
--- a/app-misc/sphinx/sphinx-2.1.9.ebuild
+++ b/app-misc/sphinx/sphinx-2.1.9.ebuild
@@ -1,7 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
+
+WANT_AUTOMAKE=1.15
+
 inherit eutils autotools toolchain-funcs
 
 #MY_P=${P/_/-}
diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild b/app-misc/sphinx/sphinx-2.2.11.ebuild
index 4284f2a9dabf..7e54f96302db 100644
--- a/app-misc/sphinx/sphinx-2.2.11.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11.ebuild
@@ -1,7 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
+
+WANT_AUTOMAKE=1.15
+
 inherit eutils autotools toolchain-funcs
 
 #MY_P=${P/_/-}
diff --git a/app-misc/utimer/Manifest b/app-misc/utimer/Manifest
index b36dc0526895..21464f189e2c 100644
--- a/app-misc/utimer/Manifest
+++ b/app-misc/utimer/Manifest
@@ -1,3 +1,3 @@
 DIST utimer-0.4.tar.gz 144408 BLAKE2B c23178e8501034c491d5350ef5d6ec4c251dac982f453f0b99cf6b4aeca81132acaa6abd40981ae9f8054f00c27c8f05404d0e2cd806cafc130f0a8d3c23f814 SHA512 f1a375de4b4b5b0f478e208e055badb12a49524137cbd9626238bc5fc35cf3576e7a7c66759dd00a061d12dc7a0ad3ee6974abc8213f5f6f8e22c50eb2901032
 EBUILD utimer-0.4-r1.ebuild 665 BLAKE2B 6e2bfbf7a9d0f1aab60a8d5b69d1ea3727729a8b26c8e36f951da2315c86f890db1d3318f8369d1fd7b270c5911985da1c4acf24769025b83c6ba67701c1f786 SHA512 3a03b5be2a019b9319e16f903da9bafccb920a4d9cf8ad4a7ca9396d79adbba9fee1801c0abfcaf11389c8bb17b9d2e6500bd652c98e15e6c680b4d9529e3a23
-MISC metadata.xml 454 BLAKE2B 466406ecad60f09bb43e8bf07c58b6f04194f5241c29ba16afc59ffb08b03c5db848bf53162df6131a07d0c366d614cc4f069c532174f32fc9bd85248c9a3c26 SHA512 18656dd0b9eccf673087a5b3fd055453e4c28bbb407b19f275a654527e5a8f2d75f5fbf4f44b1575579c5809b2acf0e99a170946d91374c74125390e813c3751
+MISC metadata.xml 349 BLAKE2B 7c7669d3a1a33cea3684b7fe7d3cac9f45cb0c93c71a28314084c1b6a418774003afadfd7b8f204db91509c188fb46d6a43271ffc745d3bb933221cd4bf519c9 SHA512 36bc7a82cebaf4a6915d78a65a3d69f845b139a699bc9a6b1d0137749bd0e210d6973cdecb8d68d50363f60baa5ed14af59b53d1414149c1115261d94910acd4
diff --git a/app-misc/utimer/metadata.xml b/app-misc/utimer/metadata.xml
index e6007f541a76..9be9a54c5d3f 100644
--- a/app-misc/utimer/metadata.xml
+++ b/app-misc/utimer/metadata.xml
@@ -5,10 +5,6 @@
 <email>lavi.kfir@gmail.com</email>
 <name>Kfir Lavi</name>
 </maintainer>
-<maintainer type="person">
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
 <maintainer type="project">
 <email>proxy-maint@gentoo.org</email>
 <name>Proxy Maintainers</name>