gentoo resync : 14.04.2018

7 files changed, 38 insertions, 53 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 0bfb94c0f896..26eb0192faec 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/epkg/Manifest b/app-portage/epkg/Manifest
index 739d977b0d6e..211cda71a2aa 100644
--- a/app-portage/epkg/Manifest
+++ b/app-portage/epkg/Manifest
@@ -1,7 +1,3 @@
-DIST epkg-0.2.tar.gz 702 BLAKE2B 3c05accabaad3ade6ed3a7191cb02a00e36def59fe92a7067bbf76a31d719c271658afb371410fe1fe0189e20c261cbf407a4fedc437ff0ade48d6ee697e9827 SHA512 bbb3579be7138dcaee177b31deea406c3775e9f9ca01b79704a0b13279a5ebc1eaa1f9bbf47067370332c58102acdbc0fab718923c34e4cfcb062ffff773b165
-DIST epkg-0.3.tar.gz 2926 BLAKE2B c467f15581de5a95623f569de58b327ab1c2ef0f50091ce54fca974a4c59b78b01f5e6e474d8a0f944406ed690f127241325250e5338e2b1e208e59b9919d78b SHA512 2b815305c00b50a7a7e433345dd722591a1106edbf9b79715e70296489f4203fc1585a9abff826413d89ce8dde2680a78c375659fd1767e8c13e6fe1b48d4c40
 DIST epkg-0.4.tar.gz 3696 BLAKE2B c0532ac424159bf9bd66c3afb549f6aacb8dfc47ec25e2bfa0b789aabc0a203d29c51f810e3d27de058c3374caae41e13b22fef0239fcec6ef491cddcf9770ac SHA512 2b9ef0e2d0ec123a1e333403371d0d4d750bc5247a05771dc2f694d225ea5db2702dbc9a126cec1d0ddca38dffa837dd66acaa046ac94d00a28890f3e3cd7879
-EBUILD epkg-0.2.ebuild 502 BLAKE2B 130bfe43d7f18f4740d1d2a252eaead17a48869ac687c203f019b0f9a2d67429985f323d29f743b6ed017873e6f7c2cc0c688d06114e37c204ab6b86ccf5b2bb SHA512 f96f319506ffcf75a5b6b6030dc0481b81849f9e39c8b8cd874c4a0c0a86949c0702228e79fe301bff6d24c7c668552b817f6d6556bc097bd2b76142051c3152
-EBUILD epkg-0.3.ebuild 518 BLAKE2B 6999ef2feed2fc86a34b1ccb27f6a54cc29dfb436aafa391c1f8d257b999a2fd4fd6e2d3ce6ce002384c7363928a89f6593a6e7a42558c80ce07e98816924a55 SHA512 20d2c8b87b3ddf47049c265a49f4f7447d60d3fe158991865f3504834c23da9fa10596dace07a71b64710850dd472fd64ab89ca4acdad8268c66202edab2ca41
-EBUILD epkg-0.4-r1.ebuild 550 BLAKE2B 7e0f4c5e255aefd0ff091cee4767826272c379baded11964feecfa4191aaf1b583f2729c05c0dcb9c790bdc95478aa2187317a6bea4902bbc017a2ee450075d8 SHA512 bf2537db47f548ab2dd66552902beedecd99592faed3e5344dad9f6177c299772827a05b753af5d477de614f8592441992b2e1829dcc0c84aba97123ca6b8ee7
+EBUILD epkg-0.4-r1.ebuild 549 BLAKE2B c22f37227d3c288abafd6b733179055cc0660e64ea23af9c156e11970beb290be9095d48157a3ec150719f91d348d2afe0246b69e7ae2894fdcb60f2fac01d60 SHA512 0c546e8cb14336ed14e435a7aae6f2fd325369ed660b447bb65b0b0aa5a9116d001133f231e59950c05226f855fb833fa4add626a55eda6da408d5c460e534f9
 MISC metadata.xml 219 BLAKE2B 3aa3a0bafea86569301510afade33d5fc60054738285425c905c398a437a3ad917736cb53c26aac3d76dc6501b474c53d6a9ca118dfdc2115518faedae4d4d6e SHA512 b0549e6cb87ae03afde418a4bc199edd3cc4d0d0d545a2a96713fd8f66adcad0750f52a426856a9572455de41253b63f7559a80c3f3a60fee92cae6c4a63b82f
diff --git a/app-portage/epkg/epkg-0.2.ebuild b/app-portage/epkg/epkg-0.2.ebuild
deleted file mode 100644
index 025e37e2f0f3..000000000000
--- a/app-portage/epkg/epkg-0.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A simple portage wrapper which works like other package managers"
-HOMEPAGE="https://github.com/jdhore/epkg"
-SRC_URI="https://github.com/jdhore/${PN}/archive/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${P}"
-DEPEND=""
-RDEPEND="app-portage/eix
-		app-portage/gentoolkit
-		sys-apps/portage"
-
-src_install() {
-	dobin epkg
-}
diff --git a/app-portage/epkg/epkg-0.3.ebuild b/app-portage/epkg/epkg-0.3.ebuild
deleted file mode 100644
index a0cc0d820e4c..000000000000
--- a/app-portage/epkg/epkg-0.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A simple portage wrapper which works like other package managers"
-HOMEPAGE="https://github.com/jdhore/epkg"
-SRC_URI="https://github.com/jdhore/${PN}/archive/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${P}"
-DEPEND=""
-RDEPEND="app-portage/eix
-		app-portage/gentoolkit
-		sys-apps/portage"
-
-src_install() {
-	dobin epkg
-	doman doc/epkg.1
-}
diff --git a/app-portage/epkg/epkg-0.4-r1.ebuild b/app-portage/epkg/epkg-0.4-r1.ebuild
index 49d83dce372b..83026091ae95 100644
--- a/app-portage/epkg/epkg-0.4-r1.ebuild
+++ b/app-portage/epkg/epkg-0.4-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jdhore/${PN}/archive/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S="${WORKDIR}/${PN}-${P}"
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index d137d3952dae..fcab73cd04e9 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,6 +1,8 @@
 DIST gemato-12.1.tar.gz 66807 BLAKE2B 7a6155f337d382bdea7fb4f0bbcb0982e8d4237502dfa7fd8006754bc15e2bfe1f58f133f8cc24ee39eaf947e0770f9ff0672769daa0f03d790ef88958877417 SHA512 7d6287b335121d38859e43ce0818ebb86c51105ed836594f0540fda5ff683a6e58ce09b7dad9cea0667e6379cca6902225b095a3d0922a12cd8c62a36b11386c
 DIST gemato-12.2.tar.gz 66897 BLAKE2B 85ca439620afdb2045e571ed7a11f3eb8ce85e41c0984ad51af3b9d22c0926138eda0c7b02e1d70e200eb8c93cf4003e61f901e0fd5fd28861217b02a1e3ab64 SHA512 10ba7da5de3b90722b0bdcf9d3766a7c83c68d29d23e49744a31b0c8ad80eaa4917dff2fbd9f12ef2fa4fde03244e79f6fe5e9c108db7fb64fd6ea68fa0eb81c
+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 1204 BLAKE2B 43ab26028ab2b159a63be2acbfa921fd6ea8f18380e06e7fd7c5541e4f70370a1119d74302c62da8c9b7c5b29e5d5828c68ab57770f944cb5a0ff43a437c5e0c SHA512 ae9298c1935fbab27542999e01271aa77dd5a8fbbd43eafddc02bb8ff45a3bc3fc3bca242e4eb543ec12c886bc246ac8b04804d8fa0e45c38e5a3f0dec902d28
 EBUILD gemato-9999.ebuild 1133 BLAKE2B 960eac21ef1b8a455d91fda988c2e7cff6ba13fdb802cb6c33ad78a9aa6b9a7443205aa68f425859a3d33ae58a92ff7baf15b30af4f42ccf8d579e78cf77c0c8 SHA512 562fa2610547711fc31915cc8e447dc1226afe3498353e341b547c8f6099d648092a1bb60d9b036ac069081ca533e6d761c945a47c14a03f0ab176cbaab84ee1
 MISC metadata.xml 670 BLAKE2B 8495c32b74bb84f14d4fdd19fefd5c852534547fff65656f76290f019ddb2412453da59195bf67bd596acdd4f24b9f4fbb1d357375fd9ab1d83466e8479f53c4 SHA512 fc2549228500c0829f6e53e011cf46bee9bd3e5b234ceb73e3ef9c4ca3b3755ec3dbdbd86ff9c16ae65bf40329c47e9d6c4b7d78c810e609a50ad508c2776851
diff --git a/app-portage/gemato/gemato-13.0.ebuild b/app-portage/gemato/gemato-13.0.ebuild
new file mode 100644
index 000000000000..41600021c7a3
--- /dev/null
+++ b/app-portage/gemato/gemato-13.0.ebuild
@@ -0,0 +1,34 @@
+# 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} pypy )
+PYTHON_REQ_USE='threads(+)'
+inherit distutils-r1
+
+DESCRIPTION="Stand-alone Manifest generation & verification tool"
+HOMEPAGE="https://github.com/mgorny/gemato"
+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"
+
+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[${PYTHON_USEDEP}]
+	test? ( ${MODULE_RDEPEND} )"
+
+python_test() {
+	esetup.py test
+}