gentoo resync : 15.05.2018

5 files changed, 2 insertions, 58 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 279738e9da06..5448e7381f6b 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 7d8c752f6078..f672e875681e 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,4 +1,3 @@
-AUX 0.22.0-fix-client.patch 2178 BLAKE2B 5befa9f229c118fdd19758b7f3da05570ed685fdc7ceb733a15a0a64e6865ecd51f2dc792db402ca1c8dbd5f8ee586ba9bbf620c4c94b2b2b0545c8c3abc23ee SHA512 5fde6c834b96116a8c4c94d95d5e75ccde7b8345108862730834cfa265f6a58f4ed39a57de0961b9ca4904810313771c43a9a90809e3faa5d1c95105f34c6ea9
 DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
diff --git a/app-crypt/acme/files/0.22.0-fix-client.patch b/app-crypt/acme/files/0.22.0-fix-client.patch
deleted file mode 100644
index 589781b0a8d5..000000000000
--- a/app-crypt/acme/files/0.22.0-fix-client.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 0131c649d057a513a6bdc0b4b6eac7ea0bd9a9e8 Mon Sep 17 00:00:00 2001
-From: Brad Warren <bmw@users.noreply.github.com>
-Date: Fri, 16 Mar 2018 18:44:23 -0700
-Subject: [PATCH] Fix acme.client.Client.__init__ (#5747) (#5748)
-
-* fixes #5738
-
-* add test to prevent regressions
-
-(cherry picked from commit ba6bdb50998bd55aeef7972a5c839560e02142f3)
----
- acme/acme/client.py      |  5 +++--
- acme/acme/client_test.py | 10 ++++++++++
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git acme/acme/client.py acme/acme/client.py
-index 9e2478afe4..19615b087b 100644
---- acme/acme/client.py
-+++ acme/acme/client.py
-@@ -259,11 +259,12 @@ def __init__(self, directory, key, alg=jose.RS256, verify_ssl=True,
-         """
-         # pylint: disable=too-many-arguments
-         self.key = key
--        self.net = ClientNetwork(key, alg=alg, verify_ssl=verify_ssl) if net is None else net
-+        if net is None:
-+            net = ClientNetwork(key, alg=alg, verify_ssl=verify_ssl)
- 
-         if isinstance(directory, six.string_types):
-             directory = messages.Directory.from_json(
--                self.net.get(directory).json())
-+                net.get(directory).json())
-         super(Client, self).__init__(directory=directory,
-             net=net, acme_version=1)
- 
-diff --git acme/acme/client_test.py acme/acme/client_test.py
-index 00b9e19dd0..be08c2919f 100644
---- acme/acme/client_test.py
-+++ acme/acme/client_test.py
-@@ -299,6 +299,16 @@ def test_init_downloads_directory(self):
-             directory=uri, key=KEY, alg=jose.RS256, net=self.net)
-         self.net.get.assert_called_once_with(uri)
- 
-+    @mock.patch('acme.client.ClientNetwork')
-+    def test_init_without_net(self, mock_net):
-+        mock_net.return_value = mock.sentinel.net
-+        alg = jose.RS256
-+        from acme.client import Client
-+        self.client = Client(
-+            directory=self.directory, key=KEY, alg=alg)
-+        mock_net.called_once_with(KEY, alg=alg, verify_ssl=True)
-+        self.assertEqual(self.client.net, mock.sentinel.net)
-+
-     def test_register(self):
-         # "Instance of 'Field' has no to_json/update member" bug:
-         # pylint: disable=no-member
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index ec1b769bc55b..438c6e49ec34 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,5 +1,5 @@
 DIST libsecret-0.18.5.tar.xz 508556 BLAKE2B e3410dd113dfa1f4ebb78a47f90e23455eb8f82466d4607aa469c04adc84aa3181bfdb7dcb4ff459fd2aa49c315ffd52fd2d3a4929694909fe65af637b65482b SHA512 4ee297b556d3b555b6ca9f5eb5cc87425b782491d0550a75873aac0f7019b123f437f0731c85bb058fc65b50a589d54d0697657a50bef4ac2952e9e40a916b5c
 DIST libsecret-0.18.6.tar.xz 487836 BLAKE2B d38a41743142d33e634d77bbf55ccab044def9658b3f50bd3f8cec9be6372ad1a56dcc4de58126cba1246c16da2863c003bf14ea6c8a90d8667658cf492f4b9a SHA512 4997519762f1470cfc0a4b3a791362d030af3c9b6ce6f58f8f8073b3a8adeea9b8caacedc884163997081dc39f395f9172330dbb41fed45d6c43ac5809de48e3
 EBUILD libsecret-0.18.5.ebuild 1587 BLAKE2B 5bc76ca976d6fb5747df1fc877a66789b2260322b40e4a0c01e125d35423f813d84964f0cd7e8ce24eca3a009d3071660037a5c40de1364f343bcb06272761fb SHA512 2b8a057d68fae082f3485e20f1e2c868842d23d2ea49b4e42f3e67d2a684581e517b6d9b4d9daa0a25799f560ce276feff6cdec064082ce38f3d364f7c32ec74
-EBUILD libsecret-0.18.6.ebuild 2025 BLAKE2B 21d8773f4ef6476725ce488f49164a388b603d46ef49cc8f3cc8fa8fee996b04e65f64872ac02a3f504054b404423a6e9614c26136007e467699187a2ba4b21e SHA512 db594d7c814af61b367d9179c79933b86d49d7a31cf80644eb417c01a365a7f4ede33efc978d9a0bfc7a910902399972d7df1f47fc074a3b2087efcbfbb0ed70
+EBUILD libsecret-0.18.6.ebuild 2024 BLAKE2B e897dc5c03427a02a5520366cf2ec5a41d95396e218b5d793cc806400924bfb99a614737ba9450d444c89549d3293a4a3504eafc3467fb77c3261e28112f1cda SHA512 c648fb7da4cdd789f01c18d8289a4b79888a326c352b3242606788038fd51054cae03f4e03e39a8cded1f87beb64d9792abf1a72dcae1153ffbebad722741163
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.6.ebuild b/app-crypt/libsecret/libsecret-0.18.6.ebuild
index c4782b99e0e3..3574cf376218 100644
--- a/app-crypt/libsecret/libsecret-0.18.6.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.6.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+crypt +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2