7 files changed, 78 insertions, 11 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index b4ed8ec8e74a..09f3d20a33a3 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 7482bade1de9..e0b22000299b 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,6 +1,6 @@
 DIST gemato-10.3.tar.gz 63279 BLAKE2B 317c98c3989399e3a87cd5452edc509da86b17ecb41d295feca4071141d3ff1ba95a86544d64c786726f2148a899c1597020dde3513a913b1bc1811e2117337e SHA512 dd2b47238ac0707984358bd763ce0dfb23d8b09561939d22aae2e60386de388af9c5e67faa89a6ab9da4f0b334ee8486eeda66e5eb83bd2a26241b8a2b88128d
 DIST gemato-9.3.tar.gz 60601 BLAKE2B d85bf5910736da2ca887567799dee1823e9be6af9b17a8f9deb84ee24bb725c3550aafffa51b15484acb7d37ddbd5996aa4175a8f307b6e3a593f8b5497822be SHA512 7f81409b3b9bd65d295cd760af5cabfc7daf257740f00015f07cd7a0cffd02a40f219b59378179b58bf53b321fb543b308457d3a8b7adcb02981562282f1f46f
-EBUILD gemato-10.3.ebuild 1134 BLAKE2B 6c43213eeea7d1ce522f5967a6e38281c352dad3f48b538261c710db2631d6dc6b82709d975baacfdc249f1edc045449d589441b2e9590bf195da42261800b32 SHA512 1e942c78153ba11ca054915ecbb7002420fb797ebf3bde1436c40cb1ad150733460d5a718de60d12cc4cee79d734a3aeb22bee5c6a922b0b0f7889f97ee6108a
+EBUILD gemato-10.3.ebuild 1139 BLAKE2B e74fa7352803646e06c9d56b2f4e89d4b46c80e231766a81598a9d1e040eb7fa5cc958b277da59f4d5fe054022aa4766e723f804adbca0c9432366dd5ac392ca SHA512 43c7438d47e599aeb7a601658fe26f458ef46a28b377d9d1d23c73029d22c5150bbb6e6d2daed2a8029b6533d7ccc9d41aeea0714c1094b0f840571dbd6f6f68
 EBUILD gemato-9.3.ebuild 1370 BLAKE2B 0fc7416830c23b65f8fbe9e2d766fd2e52f551654cd6dd583fec60dea70f7045f2d5e859cb9fb021b62deda75d9af6a4485abf862c1ac04e06617736d759b3de SHA512 efc1627f4874ecb324c047cf31cebf04db7e14c09652a0ece6c89311fa9416693c1fa52c2f23053b31b76ba927591d0e4f3f6f1d67ac69dd1616230091fb10d1
-EBUILD gemato-9999.ebuild 1137 BLAKE2B 4652a23b73a32348fc1469f6033c5e7ddf292a98ac40c1c2ca65d4dc24a86ad878094154cbc2145bf621e2eed3abbacfe0e09ff990bf5273b7f4bdc25f230fb7 SHA512 448a7f2f9dbff6712cc72992dbc3334beec525ca6a6566ee891f9eafad8ffa786c426577be456cbdc56ef4899e5f6b6379e74eb38260373b1130e0fae4d6b227
+EBUILD gemato-9999.ebuild 1105 BLAKE2B 8f0361a2810f76363ade84c5ad57ec71b221ec0856d5411a977dc87b4b04fa8aa7e8d5c1cb25936df09cdf12d42d00cf5bbbdf54f0b81adbd3b6f9c8b6a25962 SHA512 bd28ad788f01cab6e2afcf05a8bed7cabf1da733e1ae0d945fa0b5c8733455b82baf46a0de3580f1cf232c999cd6be60dce0ecfadd3925ab19b78ced604db153
 MISC metadata.xml 785 BLAKE2B ad8381a17cee4fee5099ca5e4312b703eae026436ec8082f272954ec0850547844923e108c02d9041beb6bfcd33bf18c846344d797f56a61170fd6b4445557c2 SHA512 86ffb0a9b39e261b35430d1055deebe8c66eb2c285211274feb793bf003296389a3bbb38ccd33d350a8bf56fcd241edcf9576305fc3aaf68cab68401ad983b83
diff --git a/app-portage/gemato/gemato-10.3.ebuild b/app-portage/gemato/gemato-10.3.ebuild
index 80473b478f61..bd3b3a3c842a 100644
--- a/app-portage/gemato/gemato-10.3.ebuild
+++ b/app-portage/gemato/gemato-10.3.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-# pyblake2 & pysha3 are broken with pypy*
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+# pyblake2 & pysha3 are broken with pypy3
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Stand-alone Manifest generation & verification tool"
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index 573302e781eb..d3694b93c22a 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=6
 
-# backports.lzma is broken with pypy
 # pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Stand-alone Manifest generation & verification tool"
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 292cff57c38e..89b07d0b3033 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,8 +1,10 @@
 DIST gentoolkit-0.3.3.tar.gz 3197037 BLAKE2B c2a45971f1f25e3008422b63b59042ca0f2b170b98e10fc4e449ee6be76c0422469cd8bce1b744830404d5a26ba87ded47aab679069965eea266719249475923 SHA512 ad142c2c66e7f7a2e4184c8f95e394ee783cd57808e6254e9f5df0f3f60ad842042f773716ca0fd6d7545bb8a2d11c1c167a4ec471eb3238c8ee3a519f70a691
 DIST gentoolkit-0.4.0.tar.gz 3215377 BLAKE2B 404f81e2f5bce5da4df122156bc76d225497456ad8ec78a50c41e1183390f8e452a6ce8a3473b5371a6712ce1599be33034c5eed64a1852d116c745bc5a775f4 SHA512 6cf693c588d4a2f5bd06fff4e78ef98007e613348048ec993c5430e168baef6c1da01e1843903f3e87ca8e47dd1ffb207acccbc5c0e881fa3093a7880fec9a56
 DIST gentoolkit-0.4.1.tar.gz 3214527 BLAKE2B 1c6be826a099ba4d18ac8fa0bb38808cbf30ee1d93d26c26965d7fa332e6a87f8eee475126f56d68e2a1c0ff04f258f79f5684551b2fe5947d8ac6f6ff3e7079 SHA512 52b665e19dd8b871f4238d05d40a071d69ef114f36b589c29f46686b1439997e72f58896bb4f330ab256af6000a9559426c78cae08640e54b74db343b3b22945
+DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c51e2f74020e0fa2f1f4441c203c03a1269c8c55e1461c5780ebfb8234d364837073d582a52a99f2d40c92e6b77a7f0 SHA512 3a9eac2fd214bcfe39380193cb2118edcd759dbf3eb165e7240525ce1047aa984f1d1f1d3a15324218d9be1f0a1ec960ae08a63191392f1bb3422277a52697ff
 EBUILD gentoolkit-0.3.3.ebuild 2190 BLAKE2B 14e659c8159365d4d1317952cff7241f5629571b7264018b082dd4aee393a4414b3d97b101f26a252a3dfd8f372e2711c9857033e5e0c68f675cf33996104b0b SHA512 6f95f1af8e2ae139ef6058b3798f75e331890bc05efb8abb4cc3c0e4014176424a424e9663f748f3cbae510186d8a7dce1b9d11e0813aa5e65ac9e4ee6d3aaa8
 EBUILD gentoolkit-0.4.0.ebuild 2164 BLAKE2B 7a4d91380523e5355a68e4320907375e49b69acd3f48a549a46576277da776c5be47113828f757affe0439b6803a2a0ebef7c7f6a7c4438f1800584e4439d321 SHA512 aa0fe594f28562a24ee73cb2eae52f1797758ec4c80d0db24f52de3f81aac7a64de5f59b6b273ce4f84d88a88b058f0f880b5498fc118e4b2f4572c459b99fca
 EBUILD gentoolkit-0.4.1.ebuild 2180 BLAKE2B f141489aaf43bf65d686166a4fc66f1acb58c16d4eab35566d323077ad8730b413f11beed94af79f03f30b1daf7bf6954d2b0ef791504c7f47c3c90e222e506c SHA512 92016e7cab3aa9c2a2fcdc42d9958f47a1bb41da5c88664128aeb0c9a86fa00ff79c99cb100be03f056df23a506e2e52b6b4068b828885ee08173a4ef4404726
-EBUILD gentoolkit-9999.ebuild 1972 BLAKE2B a22ab8f06008be221f0ccd273011143744f18b2dc864b96050c1af06c2bcafb7022d8596cc4140235afd111766aca5b72e7f9beb63205ab093b9306978fb143a SHA512 3c4443aa492625e7636854c651a1c70fb7059dd22e0168765bf27fb89dcb473f9c18dbc479a278067eda756021bca20e482e941a2b4ffcdd48f987cd800ba2c2
+EBUILD gentoolkit-0.4.2.ebuild 2163 BLAKE2B 169a94d11af69764cd5d85748dd9c54cb3dd2dfdd98c6d0d8b99299533ea2e919ca0f56239b64b99845277d1e3102937e82e7fe9323694d60028624bb4bd2aa4 SHA512 41f136f4341c8713ada6e918924bf5fa7874e94a0a5669a257aa1e6b4aa48d353e0b1f2364d2c6c5aef305e780e8c4dbff2049453504c3e2767088b3c75db0ab
+EBUILD gentoolkit-9999.ebuild 1982 BLAKE2B 0888c0f52854fd7cae18fa46252691f0599c2854f34e03caf286f21f25bf43a51f89956734f78836c120b85110bbdb5ede5546ae449686a3953130ddcb49c864 SHA512 b77aeb8574d8b5cd687ba57108d1630b9e31f7eda573bbcfa1929c42866a972fc248ba125c21bc10eab2eb7435d3cd7f6aa242700126d6fcecd90d1b8b9f082d
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.2.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.2.ebuild
new file mode 100644
index 000000000000..df5293c2d9f3
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.4.2.ebuild
@@ -0,0 +1,66 @@
+# 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} pypy)
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!app-portage/gentoolkit-dev
+	sys-apps/gawk
+	sys-apps/gentoo-functions"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	# Create cache directory for revdep-rebuild
+	mkdir -p -m 0755 "${EROOT%/}"/var/cache
+	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
+
+	einfo "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
+	einfo "part of the gentoolkit package."
+	einfo "The gentoolkit-dev package is now deprecated in favor of a single"
+	einfo "gentoolkit package.   The remaining tools from gentoolkit-dev"
+	einfo "are now obsolete/unused with the git based tree."
+
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		elog "    app-admin/eclean-kernel"
+		elog "    app-portage/diffmask"
+		elog "    app-portage/flaggie"
+		elog "    app-portage/install-mask"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index db87f0f2dcb0..7583a0910da3 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-PYTHON_COMPAT=(python{2_7,3_4,3_5} pypy)
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy)
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1 git-r3
 
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoolkit.git"
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git"
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"