gentoo resync : 08.05.2018

7 files changed, 31 insertions, 10 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 815f8177f7d5..7a31ac2a6f0b 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index 2e250e709723..e124a433f9cb 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -4,6 +4,6 @@ DIST elt-patches-20170815.tar.xz 27864 BLAKE2B ca699e3fc3f5903f660fba70aa424603d
 DIST elt-patches-20170826.1.tar.xz 27912 BLAKE2B 886644713651448784e040fbcde6ef11f98f12abffb347f2213b990c1f0ec2df3af6c729c18781235a393e6de907b4da6ec5d140f7fb856466de6e7cefd54b00 SHA512 30a1e8b77d2963b7c56eef3a7a0a576ea6d30f1133c7bf6ad3b5b57cbe3e2de5e8cfbc50a929fea589b42ca02802a7ed16ccf7adb868290a2cc3add5b4fc77d3
 EBUILD elt-patches-20170317.ebuild 702 BLAKE2B ca4ead87686d025391adf43d12006e9fdeef59d6089b4bd2599d28dc14ecad5c3f288482dd34ab1ba0336466bec381dade42028fa5d64128d73e5dc66c8c2b3e SHA512 71ff8eb6a19d1e8e785b753587e426e64baf56ca215e2011b66fe8455fc40e6f6c8df1e3d0b037da1552ca94724fb2f29b14ea674a4e6c9d647ea3b8f16bc9eb
 EBUILD elt-patches-20170422.ebuild 825 BLAKE2B d652e8bea87970f26c4db1e26d525c4cd9700f6069e5e48f89ef2478b005cb0e3a3142a4ce0799b19a202ab4e18b5453b7d61d731095ca89f04f971b16801db7 SHA512 8c1f168c3fc9088d6d3e24be3584c44068562d59ac7e9240ba0dcabc616355efcaa22bde1bc5ba689a12ef22b669731a78236c02b4bb4adc660d31979ba6e06d
-EBUILD elt-patches-20170815.ebuild 830 BLAKE2B 027ce059f45e465dbf134ec1b17babd990166da46126bc363e6bba16527a9d9267960cbff38d38e0b6f09492f83f01d9f91396996c958ce2754c35bb39a0b52e SHA512 34e122c6c76fe755b253703a860b97168bcda892bbe1137faba5e1e06eb7aa80b821d6eee9e2f1c56945ca57031f0acba070c57c0591945cf1205def258ca87f
+EBUILD elt-patches-20170815.ebuild 829 BLAKE2B d29398c793bdd1b2b14e22b5e653d47112e45aaaed9299f4c030e9a48a66417cc01ada1793b44e65d8007d525c0737c1aa7c328015b78354bd0bc6b230d6ead2 SHA512 6a67cd999de7ec8dd4efe89791fe81fa87d0156a7a061a2fc5fe347610deb18a431fff126bfc7262646cb10725d7cd6742abbd7407e4dcd0e1a687ddfe7f361d
 EBUILD elt-patches-20170826.1.ebuild 864 BLAKE2B 28c926ca9e9687616e8ba94527c5c86a33d96b1cf574a006fb6df5cf2c06b41c63a396431753b5fb3d1005a0762087307e3c949480a6d6e2d4049c958a8f3be7 SHA512 b7771ecff9120bd83a032f79ec9378971d97e9dfbc8c226d505a84dae14c823b60630a86f37b5011002f42cf9fa9da8fae9f959551f59020299ad7b0429c52dc
 MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb
diff --git a/app-portage/elt-patches/elt-patches-20170815.ebuild b/app-portage/elt-patches/elt-patches-20170815.ebuild
index 4121e17b55a4..0911da2ad6ad 100644
--- a/app-portage/elt-patches/elt-patches-20170815.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170815.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
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
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>