gentoo resync : 08.05.2018

4 files changed, 28 insertions, 7 deletions

diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index d92abb36c5b9..a6a4eb4e68c6 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -3,6 +3,6 @@ DIST gemato-12.2.tar.gz 66897 BLAKE2B 85ca439620afdb2045e571ed7a11f3eb8ce85e41c0
 DIST gemato-13.0.tar.gz 66899 BLAKE2B e75a16d6a26f010801df072154897a485e9aee6434cf60962d59d11fda70b790284a734d9137ccc7910b0a95278d922640aece45e42ca497d1118e01992c2a15 SHA512 0ca17f1df8606e09a88411d75d144094bd13e440b04721175c8d9a3ea92fc616b34de0c80c817898ee94a1d82e37e4de50319634a351a52bccaec9653ad2f166
 EBUILD gemato-12.1.ebuild 1204 BLAKE2B 43ab26028ab2b159a63be2acbfa921fd6ea8f18380e06e7fd7c5541e4f70370a1119d74302c62da8c9b7c5b29e5d5828c68ab57770f944cb5a0ff43a437c5e0c SHA512 ae9298c1935fbab27542999e01271aa77dd5a8fbbd43eafddc02bb8ff45a3bc3fc3bca242e4eb543ec12c886bc246ac8b04804d8fa0e45c38e5a3f0dec902d28
 EBUILD gemato-12.2.ebuild 1204 BLAKE2B 43ab26028ab2b159a63be2acbfa921fd6ea8f18380e06e7fd7c5541e4f70370a1119d74302c62da8c9b7c5b29e5d5828c68ab57770f944cb5a0ff43a437c5e0c SHA512 ae9298c1935fbab27542999e01271aa77dd5a8fbbd43eafddc02bb8ff45a3bc3fc3bca242e4eb543ec12c886bc246ac8b04804d8fa0e45c38e5a3f0dec902d28
-EBUILD gemato-13.0.ebuild 1200 BLAKE2B 8318acb78da2fec69cc20c9ca916233cf63d1d49fe52a18dd64f60ac294c2f3298bd1865012dc2e4dfb4af84713fa400e05f0be4f4feabbc6a2b4e9fe9ea085a SHA512 c78331858746033ac00e04d8cb1b8f0c92dcaae0ce55d7016e6ef98a9511f56ce6d033769e80210a74f829802d3b9a9f0333b2d4c17420fe2792143cfb159116
-EBUILD gemato-9999.ebuild 1133 BLAKE2B 960eac21ef1b8a455d91fda988c2e7cff6ba13fdb802cb6c33ad78a9aa6b9a7443205aa68f425859a3d33ae58a92ff7baf15b30af4f42ccf8d579e78cf77c0c8 SHA512 562fa2610547711fc31915cc8e447dc1226afe3498353e341b547c8f6099d648092a1bb60d9b036ac069081ca533e6d761c945a47c14a03f0ab176cbaab84ee1
-MISC metadata.xml 670 BLAKE2B 8495c32b74bb84f14d4fdd19fefd5c852534547fff65656f76290f019ddb2412453da59195bf67bd596acdd4f24b9f4fbb1d357375fd9ab1d83466e8479f53c4 SHA512 fc2549228500c0829f6e53e011cf46bee9bd3e5b234ceb73e3ef9c4ca3b3755ec3dbdbd86ff9c16ae65bf40329c47e9d6c4b7d78c810e609a50ad508c2776851
+EBUILD gemato-13.0.ebuild 1343 BLAKE2B aa6641800ed862c340f5a4e081bbffb310554d4924cfba495aff1350aefb0772ffc455bc3fb207761d962aef09f5a9ed0be5d3c416dc4a0b02a8acd36ad61af3 SHA512 1ca3511dfa8c8011d3c70cf378304b6cbda61dc48239854f90fd708daf9f2534bf8b234abb3fb2975240da98faad5e1eaa9a47329c760bd16f31bf44bf3c34e0
+EBUILD gemato-9999.ebuild 1277 BLAKE2B 7692c790e14133a50d7b5af9579e9640c65be8f2ce3b78e76386a261c26300e7182e3e4ade649bc911b6ead75be599738e2ec1d47863ea42e0047f992e99aa6c SHA512 a29e0ba904df9874658366f5aa31c6114a6ba322767527b3d56e0db57f55466c5320bf8be4a5462942b3317f4c8810fda1f6e8e84212678def9c8c1d0710ea05
+MISC metadata.xml 814 BLAKE2B 1e6845b23a861560cb0972f787a14f7ade2b471d98ff28f2ae3153e99011d98f2751d720d312a6006554117e3241e5ea8557211073f8d03bbfb751c23565c390 SHA512 d2367bd897e76939768a3cf8f173723e773ec5d12b7144793a69843a3a18aec50bcdb593956cce6644d45f27c263ebf1893ac375e5d4ee3d894dcb0bd4aa6d9e
diff --git a/app-portage/gemato/gemato-13.0.ebuild b/app-portage/gemato/gemato-13.0.ebuild
index 8da41cdee06c..9ef8f4d1d57b 100644
--- a/app-portage/gemato/gemato-13.0.ebuild
+++ b/app-portage/gemato/gemato-13.0.ebuild
@@ -14,8 +14,8 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 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="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 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}) )
@@ -32,3 +32,12 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 python_test() {
 	esetup.py test
 }
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use tools; then
+		insinto /usr/share/gemato
+		doins utils/*.{bash,py}
+	fi
+}
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index 6dcd6cb0edfd..605958de2ad2 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ EGIT_REPO_URI="https://github.com/mgorny/gemato.git"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+blake2 bzip2 +gpg lzma sha3 test"
+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}) )
@@ -33,3 +33,12 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 python_test() {
 	esetup.py test
 }
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use tools; then
+		insinto /usr/share/gemato
+		doins utils/*.{bash,py}
+	fi
+}
diff --git a/app-portage/gemato/metadata.xml b/app-portage/gemato/metadata.xml
index 23ea67a25989..fecff7a1fcd3 100644
--- a/app-portage/gemato/metadata.xml
+++ b/app-portage/gemato/metadata.xml
@@ -12,6 +12,9 @@
 			signature verification support</flag>
 		<flag name='sha3'>Install dependencies needed for SHA3 hash
 			functions</flag>
+		<flag name='tools'>Install additional utilities (benchmarks,
+			hash testing tools, fast Manifest generators)
+			to /usr/share/gemato.</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://github.com/mgorny/gemato/issues/</bugs-to>