gentoo resync : 04.08.2018

20 files changed, 186 insertions, 34 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index f5cc1fff176f..eebad61b3fde 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/emerge-delta-webrsync/Manifest b/app-portage/emerge-delta-webrsync/Manifest
index 40be2b75fb0c..4f67ceb0c5bd 100644
--- a/app-portage/emerge-delta-webrsync/Manifest
+++ b/app-portage/emerge-delta-webrsync/Manifest
@@ -1,9 +1,9 @@
-DIST emerge-delta-webrsync-3.6.2 16837 BLAKE2B de9a2d014c51c2a765602f98a56c51329d3a9e5c70e6d7a520fe615a2d85789a32f96062d05ecfda1db324d6d1ccc9cd06d116eb16cebd018dc4104c7f71c90e SHA512 734598326dbdd588f5b62e2117ca377ad443161feca73a50dfe5740c20afb59ee9e8cd056bcaa0555f7276172db19d572a9a32023c5a311a6aa309d11f3dde86
-DIST emerge-delta-webrsync-3.7.1 22122 BLAKE2B 3446161266d5a386ac4cc4f686f81b8d717feec771e4416a74fbaee4ebf40f13be5bc9a3ca0f524ecaaff63adfc4905c554454db7d32a3aee7b21962ec8d339e SHA512 57fafb5ee4c083b60fc52f030928a9e6d1d3306f5ac53c88d7277a0421ffb3b64b1934db4367878077b05692b0340113c958116aa503d0e7a1ec3bcd383470a4
 DIST emerge-delta-webrsync-3.7.2 22344 BLAKE2B f0c6054c0bbc32760eb3339ef121a3aafd32b6fecfb1474d46258ab48473ec5392e0e3b92d84f9d02bc061fd91b467020fbe4dbbb69a6f0625ea765cb013c706 SHA512 36b65e0f550b5b0a3a5cf271126bf0d44bd182c06148d72c5ed9e105394a38be5dd0845e2d674df246b4436a10f15033bdc857526f664656f1cdb79dd8b7a18c
 DIST emerge-delta-webrsync-3.7.3 22348 BLAKE2B 7f89d71c2621bb3f2ebacaf1a5cdc66f3783d4704f9bd31adb8d7affd37e696a020712807f15c978025bb31fbdf95d6fc9b005a88cad132112f32b0d97ae99ab SHA512 987dabb5013233a164651564cfbf27ea7bea9057c810c3497b830a3fd58b89317791f1fb6d12f5e3e4aee58954a8aa6abe22eb8a5384b398239d4b28b665b2dd
-EBUILD emerge-delta-webrsync-3.6.2.ebuild 1113 BLAKE2B 8757ee5dbcc212aee3975c9ab9050c06b1fbbc72a9fbd986e6d65b72d739093aa67b918b8a1c1626ba731c7361b2fc5c8148e7cedb1cbcb83ee4240ce5f1a5ec SHA512 18f23ead9aba98412070f5d7a7c06fdf53cf38d0c92a8103a903e8b434d7f977731abd6406e9ea4e1c81aaa3d47803186c360a12743a37635da4b24ff1b254ca
-EBUILD emerge-delta-webrsync-3.7.1.ebuild 1117 BLAKE2B a5718e0358bbfb5b2e6f1e266cbce042979b5a394d39d3f9c7acd934ac6c8bdb0f9148d7f3b555b849cd99fc8cae1d2515613443feab818b0a7839cb0566ace6 SHA512 25e2fcf9089a3a6354503ee783269a85adb08cc934f67c3b34c8901f3b3c807c5200f06320ebfbfe34a49ab8d7ad88ee1cbfb6e2e254d0d9edd185b651a5f43f
+DIST emerge-delta-webrsync-3.7.4 22568 BLAKE2B fc85c4cf7dc1aef83ee591258adf1b2d6c949883f36cb8d1db68abe0d6b43ac7f6ad816aeb92bd3615eb5104adeea015fe7440af12fc60b8d2b8cbe21ade46d1 SHA512 acd443abdfadc15c1f6ee405395839311b5afc63f2fb4fe1842b7f222bcd9455c8c402ba7e624ecf0a43f908a237aa7ea76e14655b5b7f6933677dd20d05619a
+DIST emerge-delta-webrsync-3.7.5 23446 BLAKE2B e4cecea69d4ddc3eff21130b45661bb942cd8f66443b8e55bea1340bab801176ccfcbbe41e762bab4e318e17dae6bfaaa9d98656b276838d782b94ef9c2bf0fc SHA512 dc64754ca3a2b5956b6ad017dbf987de6a45fd227a498c00f677c4c85ad6e3e02cdfb9b22b413ad10d077e509e47b0dd8d6116fc2ca03dd3e9f74e465c4e2527
 EBUILD emerge-delta-webrsync-3.7.2-r1.ebuild 1223 BLAKE2B eb7b371e2584645e623e31fbc395f52dee2754825165032406ccfa3c4b505d826f1cec1d90792391612b75983b2400d09bb58cba66c8b2726e7bd553ac65af33 SHA512 84208b781a603717b8f22f1a111949279aeb44b693fedb7d0e823f9dbd6c8a21037f353f8ea12c2d7694cb484f20af448688a2f75976288ac73afd9213a3c728
 EBUILD emerge-delta-webrsync-3.7.3-r1.ebuild 1152 BLAKE2B 38658bc218767c81baefae62af6f04dba9f609a3ca39242517fe81fed033c07109100c22759e4d0e1c00c3cc290d05abe2d15426be8fae96fcf0e2a720f1e64b SHA512 03e4b5228f1ded39ae9e3047455e3cbf7a13a15f3b6ada9a0d95fc37e9c59461042313f82ccd47b73b2e2d9fed31ecc4a6625dff68e1137fbd8a32748afc59c6
+EBUILD emerge-delta-webrsync-3.7.4.ebuild 1152 BLAKE2B feb8e81fb9b46d76d8ce5c760c83e072cb5dd65e84b93dc89a23af5ff5e0196ddb0dff4a354bb3942dd22b26f8c6a7b3884147299b7938d254d028dbe31630e6 SHA512 1ac9c635ca5cabd50466aaefba4d5aae423938576da4c3e444f81475ee550f7f27fa8dcddecc41702f097077d48a3db1514bf1b2e1f7104a5c5782fb90ceb091
+EBUILD emerge-delta-webrsync-3.7.5.ebuild 1152 BLAKE2B 970369c7768b17e3dc33d9f61be1e87da68e4966d56fbf36884589d0fc6fb5288b2e4ce2a4a6ceff17d3f04583950a62d516130501849ee58ebc24aa79b91dce SHA512 9a31575f7aa99e06526dbc07192c08e9694d5446c913e2e6cabdee44d4e95c67b9a69e69a9786217eb3faf80782584d57d165bd449fb9d85d6f298bb380bc3ab
 MISC metadata.xml 294 BLAKE2B a26f2f113f9a9b66edbc88a0ab73a5da655fd240a97668cf1884e9192c4425cc478ab3f187ae1ba12b351c3de5b79d37b771e139cc51909d683decdc945454f5 SHA512 c4cdfd8350418cd0c231874c709d1fdf2c8132309dcd621682ebb77abd77ed57ce0d484a387b75f4762e58193150ca744e51b560d9b5a8cf631b4faef1465555
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.1.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.4.ebuild
index 52849edb7524..baf599e66509 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.1.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=5
 DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/index.xml"
-SRC_URI="https://raw.githubusercontent.com/gentoo/portage/4ab31da4f09c7d0cb323b16b5b4b607d652ffc48/misc/emerge-delta-webrsync -> ${P}"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=52d5d444ffb144911ca9b6e70b383405a8bd8af6 -> ${P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
@@ -13,7 +13,10 @@ IUSE=""
 DEPEND=""
 RDEPEND="
 	app-shells/bash
-	>=sys-apps/portage-2.1.10
+	|| (
+		>=sys-apps/portage-2.1.10
+		sys-apps/portage-mgorny
+	)
 	>=dev-util/diffball-0.6.5"
 
 S=${WORKDIR}
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.2.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild
index 1819bd0a5b5e..aa4a0ca9e919 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.2.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=5
 DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/index.xml"
-SRC_URI="https://raw.githubusercontent.com/gentoo/portage/228a860476d7543608b469c569ec1d4e70aa7f59/misc/emerge-delta-webrsync -> ${P}"
-
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=b8c070708bbc6d0db544d4b04b530d6d03d39bb5 -> ${P}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
 RDEPEND="
 	app-shells/bash
-	>=sys-apps/portage-2.1.10
+	|| (
+		>=sys-apps/portage-2.1.10
+		sys-apps/portage-mgorny
+	)
 	>=dev-util/diffball-0.6.5"
 
 S=${WORKDIR}
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index adfda2b2e571..f872132df440 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,8 +1,9 @@
-DIST gemato-12.2.tar.gz 66897 BLAKE2B 85ca439620afdb2045e571ed7a11f3eb8ce85e41c0984ad51af3b9d22c0926138eda0c7b02e1d70e200eb8c93cf4003e61f901e0fd5fd28861217b02a1e3ab64 SHA512 10ba7da5de3b90722b0bdcf9d3766a7c83c68d29d23e49744a31b0c8ad80eaa4917dff2fbd9f12ef2fa4fde03244e79f6fe5e9c108db7fb64fd6ea68fa0eb81c
 DIST gemato-13.0.tar.gz 66899 BLAKE2B e75a16d6a26f010801df072154897a485e9aee6434cf60962d59d11fda70b790284a734d9137ccc7910b0a95278d922640aece45e42ca497d1118e01992c2a15 SHA512 0ca17f1df8606e09a88411d75d144094bd13e440b04721175c8d9a3ea92fc616b34de0c80c817898ee94a1d82e37e4de50319634a351a52bccaec9653ad2f166
-DIST gemato-13.1.tar.gz 66699 BLAKE2B f779efc2ad00c2bb6ad7eb2bbab8f6fbc8b8bc026b593bfc830844ba50a6d5ff260ca0b73190b1739268b2181461fbd4c4c45adf244b23b8ade7803d90c6773f SHA512 2cda08cee937cfdf4ff46d60b44d49e4de7af5c57bfc12ba5394e967fcdae6e4cb9ceaf131b379a2c90e92b14d8b1ec375362415fc81e16efcb3279a0ff1e46a
-EBUILD gemato-12.2.ebuild 1209 BLAKE2B bdf78ce5cddb0d78e20048fbbef5eb9011900e00b7b9d91e21eb86d0b81fb315f7fbc4831b17759dacfc5e168957a6d6d07b49a5e50a77160dee02063544bd36 SHA512 321077315648ca61ef1ff4083c8ea0d651cf919e1008a2a0f74f94d9032e255b513b2e0bb68577c2fa0f5c5dad441a9cc67853538d99823412576c59afbad5c8
+DIST gemato-14.0-multiprocessing.tar.gz 71359 BLAKE2B b8c6fbcf8a83c8e85db4045ad23296944b94623d132a6c5f15b8388662fd092cb589600fda1d11c9645541106dc735dceaeed87d642b1fadf0f352f4a9b3f108 SHA512 2f1a1cbd837ab316bf544f713470f570286a313e002a4dcc075e464e77a3b10ba86410f805aad3d5702f3deedda48f8270f1274a67d76086b4ad5cd597426c5e
+DIST gemato-14.0.tar.gz 70754 BLAKE2B e66d63a20e144e809555b2eeff6a24f899e1f488c95a14b2250c6eb45c39a6e6b0e614afe30a64f5a353720ab38371ba3e4bf9948052dae3e06f9f82ac3d04a2 SHA512 0494b8fab720b4e5ad2b190fab128baf997073137b933bc113dddc8c5f2c54f53d09bc640b01565e9757b41197d039c8487cb2b78de77313722d19baf008b51f
 EBUILD gemato-13.0-r1.ebuild 1348 BLAKE2B 51a605d710a59a6d4ae044aa2cb9921dacdccc89d3be16f43b9f2d52569990d7f43f71ec5c88950d368ab10c1afc318dc4ed14531909ef740c018cce7fd1740c SHA512 617a34511750626d0323ec1924e73508465d5d8da42db882f6135fb62101f6fb5c83eae4f163a33caa1c755f08a3c8e3a0716dba385596adafd1daa8cbe38577
-EBUILD gemato-13.1.ebuild 1363 BLAKE2B 3317fc9836c948377a652130f6628151240a0db9df937bbc478f72763c31d4d3c8cf006e76e6ef91c764cf1463557749f997f5bcba4e9b48561988a9d9d73fef SHA512 33ad8a3917f90ba214132ba5ab35c56dac6a17b53d442ad2646de9cfb2458d437d4c154fd9f066613fb25eb5a94b2ff6ab1bda272b37cbad2b4952e7bfbadc4e
+EBUILD gemato-14.0.ebuild 1363 BLAKE2B 3317fc9836c948377a652130f6628151240a0db9df937bbc478f72763c31d4d3c8cf006e76e6ef91c764cf1463557749f997f5bcba4e9b48561988a9d9d73fef SHA512 33ad8a3917f90ba214132ba5ab35c56dac6a17b53d442ad2646de9cfb2458d437d4c154fd9f066613fb25eb5a94b2ff6ab1bda272b37cbad2b4952e7bfbadc4e
+EBUILD gemato-14.0m.ebuild 1640 BLAKE2B e2e71f13997755fe1f4588cbcc551d851f09249009a9cc67b418cc96931c552b734d2cddfe2390c664c1555ed978067ab24945a83c47a628f81a46e9efb8ac61 SHA512 191730041d653dcfe0ded09b3380c6d5441eb2ccc3e3854e78461cb8f2271db20560a00e1b91a791131188ce508a57fc8477b068643a3e15f6fe1bcf9aa34502
 EBUILD gemato-9999.ebuild 1286 BLAKE2B 402b7ce64483e1225768e61a1d69ac59641158d42932ed86e08655c4d473664adc7e3ffbd7dc6e9349be54e8563d004deea07a0b1ad0b32b79573ae7770e86c7 SHA512 18b749bd0745a502dce6f0fd802800a36d13fe2c75d150975924eeb8da37e48aa05ef94008c2e4ca129e536c3ddcbb03030e456a6654807ab5732bf038b51dcc
+EBUILD gemato-9999m.ebuild 1481 BLAKE2B 29e278a127ee7c6a3a8b0095d8891b2c4c7499acedb3ee6bc87778b1060d7b707bbb69710c9d7cf3d83a02d5ddf57a32b6fcfc2878fba756f1387203156c7ce5 SHA512 750b63ad3781aa318d9ee7224b26686b687a9fce2769b92a927142dfa7076d19bdea892495dad7d168bff2c571ed50d02f6efff3ed78749d8f89e5f1e256ae39
 MISC metadata.xml 814 BLAKE2B 1e6845b23a861560cb0972f787a14f7ade2b471d98ff28f2ae3153e99011d98f2751d720d312a6006554117e3241e5ea8557211073f8d03bbfb751c23565c390 SHA512 d2367bd897e76939768a3cf8f173723e773ec5d12b7144793a69843a3a18aec50bcdb593956cce6644d45f27c263ebf1893ac375e5d4ee3d894dcb0bd4aa6d9e
diff --git a/app-portage/gemato/gemato-13.1.ebuild b/app-portage/gemato/gemato-14.0.ebuild
index cd8960201957..cd8960201957 100644
--- a/app-portage/gemato/gemato-13.1.ebuild
+++ b/app-portage/gemato/gemato-14.0.ebuild
diff --git a/app-portage/gemato/gemato-14.0m.ebuild b/app-portage/gemato/gemato-14.0m.ebuild
new file mode 100644
index 000000000000..6fcdac1cf18a
--- /dev/null
+++ b/app-portage/gemato/gemato-14.0m.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# pyblake2 & pysha3 are broken with pypy3
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+PYTHON_REQ_USE='threads(+)'
+inherit distutils-r1
+
+MY_PV=${PV%m}+multiprocessing
+MY_P=${PN}-${MY_PV/+/-}
+
+DESCRIPTION="Stand-alone Manifest generation & verification tool"
+HOMEPAGE="https://github.com/mgorny/gemato"
+SRC_URI="https://github.com/mgorny/gemato/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
+IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
+
+MODULE_RDEPEND="
+	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
+	gpg? ( app-crypt/gnupg )
+	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
+	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
+
+RDEPEND="${MODULE_RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
+	test? ( ${MODULE_RDEPEND} )"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use tools; then
+		exeinto /usr/share/gemato
+		doexe utils/*.{bash,py}
+	fi
+}
+
+pkg_postinst() {
+	elog "The multiprocessing support in gemato may cause the process to hang."
+	elog "Please see https://bugs.gentoo.org/647964 for more details."
+}
diff --git a/app-portage/gemato/gemato-12.2.ebuild b/app-portage/gemato/gemato-9999m.ebuild
index 180af2c047e2..57616701daf2 100644
--- a/app-portage/gemato/gemato-12.2.ebuild
+++ b/app-portage/gemato/gemato-9999m.ebuild
@@ -4,18 +4,20 @@
 EAPI=6
 
 # pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Stand-alone Manifest generation & verification tool"
 HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/mgorny/gemato.git"
+EGIT_BRANCH="multiprocessing"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
-IUSE="+blake2 bzip2 +gpg lzma sha3 test"
+KEYWORDS=""
+IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
 
 MODULE_RDEPEND="
 	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
@@ -32,3 +34,17 @@ DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
 python_test() {
 	esetup.py test
 }
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use tools; then
+		exeinto /usr/share/gemato
+		doexe utils/*.{bash,py}
+	fi
+}
+
+pkg_postinst() {
+	elog "The multiprocessing support in gemato may cause the process to hang."
+	elog "Please see https://bugs.gentoo.org/647964 for more details."
+}
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index cedfbd94fdc1..db1b947458f9 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -5,6 +5,6 @@ DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c5
 EBUILD gentoolkit-0.3.3.ebuild 2187 BLAKE2B 21cfa614cef616b3f6326cde3fb52d1cf0a21a0b1e1201d27ac358c3fda79d08cfa4857ecfcf0b5f70c3d152855cab59f131a14d1e6327299d74b23f3085819e SHA512 76d206fb0c32e075cd4fef87ff8c4497f1f566b8ee5de07bbc5608f32c42777308619d13fb179081726920a59480010e9b53c4bf178f4e335017bcbe0cd35885
 EBUILD gentoolkit-0.4.0.ebuild 2164 BLAKE2B 7a4d91380523e5355a68e4320907375e49b69acd3f48a549a46576277da776c5be47113828f757affe0439b6803a2a0ebef7c7f6a7c4438f1800584e4439d321 SHA512 aa0fe594f28562a24ee73cb2eae52f1797758ec4c80d0db24f52de3f81aac7a64de5f59b6b273ce4f84d88a88b058f0f880b5498fc118e4b2f4572c459b99fca
 EBUILD gentoolkit-0.4.1.ebuild 2180 BLAKE2B f141489aaf43bf65d686166a4fc66f1acb58c16d4eab35566d323077ad8730b413f11beed94af79f03f30b1daf7bf6954d2b0ef791504c7f47c3c90e222e506c SHA512 92016e7cab3aa9c2a2fcdc42d9958f47a1bb41da5c88664128aeb0c9a86fa00ff79c99cb100be03f056df23a506e2e52b6b4068b828885ee08173a4ef4404726
-EBUILD gentoolkit-0.4.2-r1.ebuild 2206 BLAKE2B 7bf64e1730af382efcd97bcc36fe182c166ed706f773f0470bc2dff4f73eaffa39a5ab932ec78421dd4c3ce45bc8669ea8bc4fbb6d27938dad43654353f7b517 SHA512 32e06caad05b2b9c257e162478380f578bb94b1653f992b21bdf63a0ed0ec9630d48ff58a59902e7336a93aaa2f3449a049537fc39a40d84373898dfedf067e8
+EBUILD gentoolkit-0.4.2-r1.ebuild 2212 BLAKE2B d91339dd6d7597224d43e82d402f91ed77b0e63b9cec8fc7591ed410c7296a6fa6b788fd76f33bf7146b5870badd31741f59e0c31a91d3d256629e4d4b3a7a1e SHA512 99b9a3f959145bdcc73490232d8a01aed2c6d0bd5d2ef6ae8f99efa536492208e660dc6da90d5f95eb110436197ff8cc6ffcaec8c8d7c42c205b392aeb20c2ab
 EBUILD gentoolkit-9999.ebuild 2038 BLAKE2B b73ca2d3af0a6d7adf65e489cceb6bd4ff29c61e2e657dd28c0ab17e3050cc1031d0db237ff9467dc80f3c463ad0c1f3efdd9ec5d13f35ca0983a435c61329d0 SHA512 d0110f470a871858b3ffad3617714db71b1b015c72fc9f3c39921f3c4b6ab80192c1b060f2de3fdc673a8a8ccca7b5be92a43fb52b5dfe664d832ae093bec7f2
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
index 4d29aa18c6b4..8d1838ed8c35 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy)
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
diff --git a/app-portage/gverify/Manifest b/app-portage/gverify/Manifest
new file mode 100644
index 000000000000..6b09f1e2ceca
--- /dev/null
+++ b/app-portage/gverify/Manifest
@@ -0,0 +1,3 @@
+DIST gverify-1.tar.gz 4558 BLAKE2B 193fb63dd3816b4577314199e4f8606a20f60d883f22f36636f1dba4c3fe4a701e89fd352b33ee3ce5bfb10b39e351f971aa55c8cd6eef493fc492e2c4c5d17e SHA512 f666306973bf173683edd845499ea1b244ffc9254ed0d816660022f871e7cec480d452fd962db5417b23d3101496b80a49caece29cbddf3058e2a21ec945a268
+EBUILD gverify-1.ebuild 625 BLAKE2B a37a88fc21a5a5882f323e8d6d52c6166baa6ea7e232e6c98af155b3730393272b34f49a8a2debaa50a3529ae2320f82d87105f7f2232e5460eb79e77e84e69a SHA512 86358f642922dafdbae848c075da6bbd6294f22e174e83b36d6b8f33bd8b42685b31e08b7d3f1953d2a33ab2666679ffd361d6570ca1604f48bd7363de68c9ec
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/gverify/gverify-1.ebuild b/app-portage/gverify/gverify-1.ebuild
new file mode 100644
index 000000000000..3564e46d3051
--- /dev/null
+++ b/app-portage/gverify/gverify-1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit python-single-r1
+
+DESCRIPTION="gentoo.git signature verification tool"
+HOMEPAGE="https://github.com/mgorny/gverify"
+SRC_URI="https://github.com/mgorny/gverify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	app-crypt/gnupg
+	dev-vcs/git"
+DEPEND="${PYTHON_DEPS}"
+
+src_compile() {
+	emake PREFIX="${EPREFIX}"/usr
+}
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX=/usr
+	dodoc README
+}
diff --git a/app-portage/gverify/metadata.xml b/app-portage/gverify/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-portage/gverify/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 94c57d824e8f..d705ff5d32cb 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -2,10 +2,10 @@ AUX post_sync 190 BLAKE2B ad1a8705af98cc7d0122173e6edb821eb7be6f024fda5eb145d713
 AUX q-reinitialize 68 BLAKE2B f1c2cd5009f30018dfc2d508a627253c08fc6e74859d072b917a0518850b879ecd0318df7a86c8597d28cf4410312f757aaf5cf8780899180a5e2a9a906b1ac2 SHA512 d322fc0e3fd82583e9cfc6ffa95636134e4491e63fc1a1f34dcda58a1749c3ebcda97caee47bea4f44fb056c35c97e30819dd22e5c2ed8c936e0863466ebf6ae
 DIST portage-utils-0.62.tar.xz 527216 BLAKE2B ac8331b74998ddb86db55a937992447bccf60611cc259ceb5fe79918c1a43b6dc4633e4ad64462e2df5c39e8d8aa193bd57ab24dcd714e088357eb3cb177e972 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1
 DIST portage-utils-0.64.tar.xz 533124 BLAKE2B c3e0ecdc2d82af197dabb8434677d4c3bfbbee01c482c496d89d2f7be988ef894e0b3c7cb64337216144644a48ee3213fc1683ae6d75091e471189a4550b8c71 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7
-DIST portage-utils-0.71.tar.xz 555156 BLAKE2B 504973b242f54824ae1f4b135dc1e1021ed0ca6a59d04ef39161255dbebdb7f8870455954ba02987c04c50f6963e7f6c460c4440b2c5ce456b9c489296979e48 SHA512 b9bf4156a1060fec56f9b6348d2d8e83b507a8bff2c507e07bc1c84075082b184d270ca0f89e0f4abf738ce9e8cb8b1f45a211d2dc52cadbdb0ee5d658bf678f
 DIST portage-utils-0.72.tar.xz 1585068 BLAKE2B 33aae0b59cd6f6b7a5503f0282d009c6516f00d14228461359e5124fa104b2ce89019ae5113bac2ed2c975c891d9d5371632ad3dd66572bd6e3ce890895e9ba7 SHA512 9248a1f0d7103f5a26cc01bb8abc5890a0b02b746e06312cd25f0223faa0b59ba7cc0708f272ce327c956086f9a4fcc994bf30b948131da0e63164bba35cf1f2
+DIST portage-utils-0.73.tar.xz 1585564 BLAKE2B b743f459770ebceaa86cc47b0a9d0172ee495bbe2930cd57c2909d3ac2d7c1672447e84240245e1b98922004f4f34418d75b39c7e1550a34a07b964b7ecbcc8d SHA512 d35af62e3b6551c5224a3afb89ebf2e08cf42de266389c3423782c19fcfe8934433a4554ea5ed629de495a66371f0220c479fa84f24d68655211b8538e18d105
 EBUILD portage-utils-0.62.ebuild 2014 BLAKE2B 58941548aecefed7c7a4bee3ec9e60de24ede0380c4a6cb4e3184ff457fb07c946e792d3e60e2a16bef4897b287fd19f9315fdaea4012bc19220379763418812 SHA512 3fc3be2e3e29821cd26cb7d8a9e7e6a026e17c839308039ef2011700677e3f05e2322e367e737e822ccbf1621221f7ff8ca929c6f60817dfdd295981745cda1d
 EBUILD portage-utils-0.64.ebuild 1307 BLAKE2B 19f158c23ac15aa0a9138d8f93d3c1bb6bd48ad9b89031f7e5faa4f643a026e87534857d8463db4aeda445566a1434092b0dbbf97ce96cea51d254f57b0c7549 SHA512 b5ec8a9d06cd50db047d5b758a328c7dbb31690de8f1b7368358bb700bca94f6b22bd32fa79a9f52d76f4a62182cd0cb148fa02418277f398e362b44e50ba7f1
-EBUILD portage-utils-0.71.ebuild 1092 BLAKE2B dc0f835b1e8e2065b6068fd011f2e6a953f046d366f46053dd534a3621379c68707b4612cbce46f74923a5535b280388c4cd3cc4b691826c08bb87d7c6b00ee6 SHA512 1b4a097f7408ebb6634d4b232ad3dc407b444c4dbb73b8d3b1c6b904cabddf0c3c53b4c51cd008355e7586f248fe663beff3a853dbfb847e29c7ab82c16ed390
 EBUILD portage-utils-0.72.ebuild 1092 BLAKE2B 1cadc306a2c0e0b5da2f767b4fbf1c1698d5d6ab33acf9408497a1f8e3bc6bb142c39a31336c99ac915102b10d50c047de6fa7ec0256bc3bfbd4c7a18af4a606 SHA512 94cfbbe0de0be8db8fefed2bb64778f754c7672f58b8f307b8a1fcbde1ab7f60224b626e915641a0166c9bc4de9b9f7c4dccbaf8170f78157af5e9084fc16253
+EBUILD portage-utils-0.73.ebuild 1092 BLAKE2B 1cadc306a2c0e0b5da2f767b4fbf1c1698d5d6ab33acf9408497a1f8e3bc6bb142c39a31336c99ac915102b10d50c047de6fa7ec0256bc3bfbd4c7a18af4a606 SHA512 94cfbbe0de0be8db8fefed2bb64778f754c7672f58b8f307b8a1fcbde1ab7f60224b626e915641a0166c9bc4de9b9f7c4dccbaf8170f78157af5e9084fc16253
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/portage-utils/portage-utils-0.71.ebuild b/app-portage/portage-utils/portage-utils-0.73.ebuild
index 300ced4574a3..a8b0d9ea2d64 100644
--- a/app-portage/portage-utils/portage-utils-0.71.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.73.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit toolchain-funcs
 
-DESCRIPTION="small and fast portage helper tools written in C"
+DESCRIPTION="Small and fast Portage helper tools written in C"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
 SRC_URI="mirror://gentoo/${P}.tar.xz
 	https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 8f71a248a782..dfc78f655c28 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -5,6 +5,6 @@ DIST portpeek-2.1.26.tar.gz 13004 BLAKE2B 1de44e9cc3f097154c5374c2619367d20bba62
 EBUILD portpeek-2.1.21.ebuild 692 BLAKE2B 30e2e87dfe6088945b51c93d67a69798503266774b094517cd29d8a408f7bfb27716dad8026a01b10e88e15ff1e91b5ecc14034b87d24346f3e8dd8122f525fa SHA512 02c5df14a945e8703ae9f99ee7d61083dd6b125ff5bc7d12c9f09cb0c8006335696de9113a8d490ce6460bd59d5b91f71af50119efb943e62b5d6ad196149045
 EBUILD portpeek-2.1.24.ebuild 694 BLAKE2B 78f2e828f1f25bf4a430a050faaa9795a3328e35839bb57090c397a16966317a19f6e38df261f20ee5bad64e28b97efa574cd2147df993a69ec7190652337675 SHA512 2de0c56eade803cfde62c396d3347a4a3242ad36c10d5dcd4895d3c7fe2b20c62fb9c8272e6558c6b7a64b25301575a9416a5e1dc788002825f3f9a8c3c5ce6b
 EBUILD portpeek-2.1.25.ebuild 694 BLAKE2B 7ce31d63bec751641bf74868e04df23064b72f7ffae9ba11a30b89b64e7c28588fbf39669407aa55732c9dac196044cf398f65f42134e44318367ba6a712a8ff SHA512 464d37757a6f770369b445fab9588e948590e7929d5528255ccece45941e79cbecbe6bf88c8d4dcdd9f31d7065393a183e49e64ebde501c8b84340be6a5b886a
-EBUILD portpeek-2.1.26-r1.ebuild 756 BLAKE2B 0237f012275b1de58b1cb9c7497a1e115550bbcacb2ad63c4313363863d0a4a903c3cb4e265fa94fecc6ec9cb48efe3bb8a65f0eb0586b7a5dfd22fe6763a54b SHA512 fba92d9cf82681e4bfcf5b8707657ed02c9726e1b98b6a9f7f403f03c0c8a14b7b2578b195ba0a4c9466e04a616a21de7215a18417f0c0008ee66ead92f58b4c
-EBUILD portpeek-2.1.26.ebuild 712 BLAKE2B c6a539332fa2d7d90723bce8721e004557ef1b9d77d1bfe814d57ce015073a3122cc167c1c1fef9884c719698648ddb3a108fddd4f13d5faeadaca4c356911ab SHA512 a054bbaaa443406ee70ecb8473d36113b14057e8622d066eb22517c08015e3a214756bba8c4e4bc6d2361a703477f4fb3da8dace7ed4677b6a36e1df876aae14
+EBUILD portpeek-2.1.26-r1.ebuild 760 BLAKE2B 45bd0d4a777b5292470c21fce5017589299f47d942484a6ea97845500552441b0327634a346cfea528026713011150f79353dee190cacccaf51a1dd655461f92 SHA512 51de071c4ebbf5439c0aaaf73a0e147be438291a32065e12373acd43e52c220696748f32a5b11986c98e522a1287df66cf41ed25f40c81320be0df18087075a9
+EBUILD portpeek-2.1.26.ebuild 716 BLAKE2B 8786aa84b88d7ee02c6147070683cfd373f24c4a89d911d9ae947e17844a96db62a258dc80ec8534ab5ae08e0582c4f4b70cce84aa830fc2e4f403b042d01985 SHA512 533afba3d15de73b3a9dcb01037ecef85934cb135e339b9d1e6a3ebac9ecc6d4998e116c75278ee389ec802f47b578411950637a4a87d3f651861082ab732cef
 MISC metadata.xml 222 BLAKE2B 5192d31072923545c8f760f9c3b3274f610b7a94a53cf55bc85c5c20a953b227b7cdb64cb5f5921b8b2822ec6563479b5d4883ec2b569a066d8ab569713fa8be SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9
diff --git a/app-portage/portpeek/portpeek-2.1.26-r1.ebuild b/app-portage/portpeek/portpeek-2.1.26-r1.ebuild
index 801252517706..cacbd8405782 100644
--- a/app-portage/portpeek/portpeek-2.1.26-r1.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.26-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit python-r1
 
diff --git a/app-portage/portpeek/portpeek-2.1.26.ebuild b/app-portage/portpeek/portpeek-2.1.26.ebuild
index 06eb5a6cda32..5eb5cc173be5 100644
--- a/app-portage/portpeek/portpeek-2.1.26.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.26.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit python-r1
 
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index 75ea6ecd08ba..30625cf7714d 100644
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -1,4 +1,6 @@
 DIST smart-live-rebuild-1.3.5.tar.bz2 16004 BLAKE2B fa1fcb13c739ef15b343de3460b029a311a4c08be3ec44ff5c0c89fef4d07fde7fa5558444b25ce234d64b03465b4a401593600f3fec5cbbfba76bdc76fcca34 SHA512 46933334c8c46a056c837e60a5d8aed30a35b1ddd20d7c0f03e813f6cac11cc2dc9469674b1e9c23d94c9ebc474e5eacc7aa0e8f82492554a7f49b438ed740d2
+DIST smart-live-rebuild-1.3.6.tar.gz 17194 BLAKE2B a1c4f07e66ce3328ae70f88d086c33875bed68aea645a180e68fbd997051c6d398c1133d8e9c72378741fe41c519e941e76dc25d9c3f9c61c36531fe6fbe8e79 SHA512 f9fe57269654d69c3b21d0b6e378dfa3d2c00e67dae44278b2b81d631e4645346ecaeb5c9f43b77d39312b97edee247ba8b05303be903d6a3573bc226159c40f
 EBUILD smart-live-rebuild-1.3.5.ebuild 832 BLAKE2B 6e2cdd282bb221449a6ad6b3b245e8c11afd52f34bf0a92a5e2029c03fb848bac6bc1989dd86fe103568fa3491c425786606272f473e89d2118ab4e31024e9bb SHA512 b64f511562e14cc338c5a3a1275b21874d7a4b8b16ff1b7d678327cd1d2f5677daec4377b23763b8a1b3401aac5c7f8319950133ad066ee76464f905585c3a28
+EBUILD smart-live-rebuild-1.3.6.ebuild 834 BLAKE2B 51475f3b8bed594ec4cda14e0ccbc212047bbe926b5e76c699075da1be182746f8e50fa04c113bd45d760a773743c95f73624e266b996490d764d3df1bde2249 SHA512 607ce34040450a962ce31a971496d689da6c1e066337c318de8ccd4e8878a5970c5ca6e74781df0706db94028ad5616e024bede53c87572c917ccb7742837d1b
 EBUILD smart-live-rebuild-9999.ebuild 740 BLAKE2B 6fee19f8e59b7da874e9edafbbb794285c11a7338e531062d30deb73dd51f1e2e8287ed1887fb4146e54665b083b419fac14214c0d5104d934c2fdf1aa2c56f9 SHA512 87bef6aa7cb90ab260b8eab9dcaae46b2d2a3ec92c2117fbb53535e3841b8f903a706bc972cf5db7196459878330ad5caefe8bfc6b13ad57b57d2e29595e257a
 MISC metadata.xml 769 BLAKE2B 5aaad83253d55d1096c19aeb6a980e31456ca20a1ecfdb45e93dfd2f72cff7cce61124bf546932266d24d0c9fd0493ae4c61089ab291028360834c2f6d237e5a SHA512 d11c942868f0166c646922088dfecf3047f8ca017b85965382bec8fc794e11d6ffdea27a9156a41faec10a79a13836b13d8b9213a44e57672e1355fbd6bfd0da
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
new file mode 100644
index 000000000000..9e516f44532a
--- /dev/null
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Check live packages for updates and emerge them as necessary"
+HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
+SRC_URI="https://github.com/mgorny/smart-live-rebuild/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
+
+# Tests need to be fixed
+RESTRICT=test
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/portage
+	newins smart-live-rebuild.conf{.example,}
+	insinto /usr/share/portage/config/sets
+	newins sets.conf.example smart-live-rebuild.conf
+}