gentoo resync : 23.12.2017

7 files changed, 39 insertions, 8 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 88b5915f68a8..b8e5ba35d5b7 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index e7f14c24575e..d8c0c3012c8c 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -4,5 +4,5 @@ DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278
 EBUILD acme-0.18.2.ebuild 1095 BLAKE2B 2b9a678884bd1a89c38e09fdc9dbfd850fd737f138b6ed419138e5e6b539762f45b80882e4cea4b036a7ef210fc4385a605c8fb69dcb9b4ac94dbffcb1694d5e SHA512 f6bd1a44d00471327892e61c4966b300339a2188510258bb22ed046b892587158a6290f09ee9a01bea7f55aba2ed1e2f5168cc7bb41da0574ec0854c2a8a19b4
 EBUILD acme-0.19.0.ebuild 1101 BLAKE2B dd7bc65a98f4b8168f2bc341ac699f68ab65a8a911b4a8fb409fe3ae78e8553c168b55a5a304b3d7cf697d34c58b32d751a87d6d04303a39a11e6eadbebd4be0 SHA512 73db02807520cc53e8695f112e3ee75841bd0aaf9ec9935db7b3e812010f0f9947ed805bd8300d602c0757a5a18b1b4bf1665ac92494791915c09790c10953be
 EBUILD acme-0.20.0.ebuild 1160 BLAKE2B 5cab784cc64156e26fb12b662f0d5d209dffce77011436c9ae1de8a891537b7567c07460334754be5e83fbcd1a17b051ec87affcc115e3b04faad73387de5953 SHA512 05ebf726ac5c68b3be47bb9dd90729b17240c010119c3ae017fb0ca478fcbd8ecfe163eb95d83b195923f2666530f9ff8b2ac09d3b60b04e66f7ada181c3a1a9
-EBUILD acme-9999.ebuild 1160 BLAKE2B 5cab784cc64156e26fb12b662f0d5d209dffce77011436c9ae1de8a891537b7567c07460334754be5e83fbcd1a17b051ec87affcc115e3b04faad73387de5953 SHA512 05ebf726ac5c68b3be47bb9dd90729b17240c010119c3ae017fb0ca478fcbd8ecfe163eb95d83b195923f2666530f9ff8b2ac09d3b60b04e66f7ada181c3a1a9
+EBUILD acme-9999.ebuild 1205 BLAKE2B 8c9ee00ff6505c592a3c1ae4ab57e4abf9c6f49b5dd7737cc4a081645edd808f3bf3422a59fbda1597f31176d003e51aa784886ccd8cb5e5862c2823339f51ee SHA512 164272884c2301b9e2a5252ccff8c87678116bb8007527cd064af9147d536a266c5ed8910b711bd242f384298b903f620ad9cf9431c4e26ec65b7e34a8c20767
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index b02dbde82a94..3a1dd1461249 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -25,6 +25,7 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
diff --git a/app-crypt/cfssl/Manifest b/app-crypt/cfssl/Manifest
index 9023e1948fc8..cbbba0e788b5 100644
--- a/app-crypt/cfssl/Manifest
+++ b/app-crypt/cfssl/Manifest
@@ -1,5 +1,5 @@
-DIST cfssl-1.2.0_p20170601.tar.gz 8025105 BLAKE2B cc87451f23e5a495816980d65bd32f270f6982940368afed7d13591dd8c0d56665e666bc555abc4e0b2f5a5cfd997a18b8a6a9f757c9ea6ec62c82448de1b72d SHA512 f89d6b142eb5286b720c9d94534c474b15738c6a856999588392b37ffa753e0f0c9d663debee9cc216be765d8f39a71872401173a56293cdca2f2d1791c3d758
 DIST cfssl-1.2.0_p20170915.tar.gz 8027590 BLAKE2B 5361a9ba7f08d3940aa5e27f65b55359871d85dcf8e4f21b6e59a9f3c9741490b16898e2001133742dfa1294927b0b322ffd5bdf836754851bed0c176bc710da SHA512 247ee892f7785ae11e8b2d38c1fdad0a3bcea9d9e410ce1bc985d15fad65b981c46e317cbb0fe0cacf190dfbbad7b9f8685f6ddd2a24056dd61e621b2cccd232
-EBUILD cfssl-1.2.0_p20170601.ebuild 853 BLAKE2B 9f2244e352c0f02a3cc40bb6e3e455892be6b3d30a8ebf824e66345847e2fcbd953dca466058600d5d8f2ec0969d9c66ce72bc3f4352a23063a40629403aa4d7 SHA512 629df8b18734def976f92fd14002edc98d1633cbcf7ad1884f5cdee0c80d30f14879bb1e8689ab05db31a19dffd8d7fd682b72065ae3666cef4efa339ccd69da
+DIST cfssl-1.2.0_p20171207.tar.gz 8028127 BLAKE2B 35bb2b6fa08345dd6042742891cc0ad87ffac3cd24e8f16551e7e4e36b7f11caf4baafee961666ed95cf14e77cf4e24e11f7d8d85503abfc42a8fe3fbc2fe758 SHA512 d94f27bcc5f59fb2882f6db802baff9706461f1a823706810f7ab5911fcdd3abc9150060df0aa756478774cf3b5e06aec0b11cefce32ff3c6ff85948b8624356
 EBUILD cfssl-1.2.0_p20170915.ebuild 815 BLAKE2B a6614c4a40fe991765dd68152636ff25755e9b0563f9ac09e62470423b4c7cac507702218fe28c91dc6f7e5c142e30536220c88b21a92423146c210bea8488c0 SHA512 8501dc18bb7796834fd17dec4387c33b3c94dcc9f3a24d55d990c8cab994c64db0831474d7ddac2030c39a3649953d998f0f32b506b86aab4cc06804da2a38d7
+EBUILD cfssl-1.2.0_p20171207.ebuild 815 BLAKE2B e6c8bacf23c21205030b323817b741ddac611935205e33d6eca62643325e1bb7b7969f9629461d80a35f9c72a2326d89db9166d31115d3c559c06301cacfddfa SHA512 068ed8bb974107a1f921207e9e4a136adc0fc6375f12932c1398465796387a8bbc58c9dcfa2fffb19ca161616d2a1cbcaa1a07fc8bf609c40176d46e08112f51
 MISC metadata.xml 326 BLAKE2B 519dd19dc05c50ee2b35580a1ca47b6be4438fcd5737775b098f2bf7cebd7ec3ff88a3d5c9c27a256cedaaddac4b6eeb20f1dfb442d651a7ec31453c309c7c52 SHA512 11be8680812e220202583bd324d756909056b58b9fdc74c769bd1beacc97292c9dc0d7a396bc6018c77d050081654726dfc659b43efc957175d2e2fc57039ffa
diff --git a/app-crypt/cfssl/cfssl-1.2.0_p20170601.ebuild b/app-crypt/cfssl/cfssl-1.2.0_p20171207.ebuild
index 7b35026cf94e..265e24503661 100644
--- a/app-crypt/cfssl/cfssl-1.2.0_p20170601.ebuild
+++ b/app-crypt/cfssl/cfssl-1.2.0_p20171207.ebuild
@@ -4,15 +4,14 @@
 EAPI=6
 
 EGO_PN="github.com/cloudflare/${PN}"
-EGIT_COMMIT="9c06c53d4dfb9c0272c983a26ea10a6a2da12392"
+EGIT_COMMIT="d2393674072314fda47d2c7c16cb7fd4cdc16821"
 inherit golang-build golang-vcs-snapshot
 
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
 DESCRIPTION="Cloudflare's PKI and TLS toolkit"
 HOMEPAGE="https://github.com/cloudflare/cfssl"
-SRC_URI="${ARCHIVE_URI}"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="hardened"
@@ -22,9 +21,8 @@ RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
 RESTRICT="test"
 
 src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
 	pushd src || die
-		GOPATH="${S}" go install github.com/cloudflare/cfssl/cmd/... || die
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${S}" go install github.com/cloudflare/cfssl/cmd/... || die
 	popd || die
 }
 
diff --git a/app-crypt/stoken/Manifest b/app-crypt/stoken/Manifest
index 0be5818734e7..c1fe66687645 100644
--- a/app-crypt/stoken/Manifest
+++ b/app-crypt/stoken/Manifest
@@ -1,5 +1,7 @@
 DIST stoken-0.90.tar.gz 116642 BLAKE2B 33cde44212585eb994db62de0527fb7d06add3f247ac09e53ee3809de4150b09a99bdda1eb4bd1d7ac449a8f94c8dbdd468af955b82caeb1beb8331338788049 SHA512 7c75a04ea6542a13d639bbb74523443e030559dcf65d181d07fc64277442500a8a18daf2351248a552e42daf815fe5d0079b5b559402522d45ac10ed7762c818
 DIST stoken-0.91.tar.gz 116846 BLAKE2B 914324f7151ff9aaae336cf44624f7d8fd70bfc0514a9c20defd47e17e8acceda2aa020a2fadfe3bdd9caa6650adb7859a5422eb9acc27df9834140f4bd5aa86 SHA512 7d34c3ec3022aabd909fcb89fabd03003fdc4d635a064401407ce78068c0965012b9b61b53ce2d6e018973fe2e23a7e4d35913fca564e0af65fd0f0fb7fb30b4
+DIST stoken-0.92.tar.gz 117212 BLAKE2B 8d236a73b0626ab91d145d01fa07c28ba8c54a3053aaba32b64b4dacc39dc8265d5740630ec2495d678c975b1bfa480a79a5ec1115accf39170229b444673f48 SHA512 b41262320c24e487ece884fc431d835c787f057947a92e3d57ed2047bc02b576b072e8a69f4b58b47ab1f913b5ae8c3ee8108d3b55c1477f15848420b668fea3
 EBUILD stoken-0.90.ebuild 586 BLAKE2B 4c724ce372f811039ee5080dffc948a62a177fbdfb1d77c9a8c750db851d9830dc74250dd162b98bc40e84bbcdb9eae51d9ce21d4dd99cf3312d74bac334dbeb SHA512 b7b7738206f880024f284311432f8c5bc3afebc33350b3265523d2e07afb06c684ec96cd8b48db596f80074a6d1e23c0c223ea5b03a99564e8cdc27bced687e2
 EBUILD stoken-0.91.ebuild 590 BLAKE2B c8586dee67cbe94f3e77c5e227f645f2a00f1224cc5cae98a4e2e00336efb5276b7ab2a1393993899ff207c6292d7e7949e36cf659e16eabf34f41fe2d91f986 SHA512 fd091526f53d70e40fa927d7b6fc0f78594d728240a9083ee6b0ca57d63d03b113306b4681a6113b7731d643a0593bb06a55b376bf2d1c72119916d29c9dd036
+EBUILD stoken-0.92.ebuild 639 BLAKE2B e0d194cd411a29a0c8877877bd572a4ea3ea1dcbc32ee8c65314b5ebdc4d2bb750e572042489ea2cb715bacafc5b9d09eccba941fb5e3e1c4e0b672ee44bc1c7 SHA512 134dbfbd4590ac8643b481b4efaea22a0aa8d0ef6c38b4a25d13b21bf8f3cebce692de29f9b5b0fa1445bb59f6fdb1d1bbfccb6321f83a2df208229bd486f8af
 MISC metadata.xml 620 BLAKE2B 2655c4310ae4cc76e7609e4646879d81ef6ee26b9dff67b922822c89de19416c96bd63762920633ff4e018c8431fbb45f8dc93971f2fb8afbe1dd66c8ea2e318 SHA512 bda231308c073a40db47dfaca96c6af8bf194d5ef4727e8c8c99ad1492150f79a9978daeb3ffe503db03501a0a6c6c465d036bec7ad58398319f8d01d27f7931
diff --git a/app-crypt/stoken/stoken-0.92.ebuild b/app-crypt/stoken/stoken-0.92.ebuild
new file mode 100644
index 000000000000..6a8f901f3580
--- /dev/null
+++ b/app-crypt/stoken/stoken-0.92.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="Software Token for Linux/UNIX"
+HOMEPAGE="https://github.com/cernekee/stoken"
+SRC_URI="https://github.com/cernekee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gtk"
+
+#	|| ( dev-libs/nettle dev-libs/libtomcrypt )    libtomcrypt is not packaged
+RDEPEND="
+	dev-libs/nettle
+	gtk? ( >=x11-libs/gtk+-3.12:3 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	eautoreconf
+	eapply_user
+}
+
+src_configure() {
+	econf $(use_with gtk)
+}