gentoo resync : 26.11.2017

3 files changed, 171 insertions, 7 deletions

diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index d363147cc97a..471c94cb264f 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,10 +1,11 @@
-AUX pygit2-0.25.1-cffi-1.10.patch 2309 SHA256 4d02d1d9e637428247af14bc1b3cd75596244bc339b960d7c9bbffccab12bc98 SHA512 adcd46ccf81d01afe5d959e50f0acaae392fc2422a7e0582a9d065d860c2d0d9245505ce5c156136921f48c126a3741bb65be5a021b53116ccf5f0f1451c00f3 WHIRLPOOL 7743b9d9db2be31cd4f7d60be3c0024780e1c284f8c34397419a77f1475ee1a2881b48a916bba8e20cd2a49620ecc9a6044d808e71a62567f225aa084aa5b305
+AUX pygit2-0.25.1-cffi-1.10.patch 2309 BLAKE2B 99584632af0f26ef92ada55fc0f8b3fb31c7bbd6a1c74211c991db8ec7f792b5d74c551a5e0d457512ed156a5536ab2b25f8b21994706ebf7c7af3234b3faa95 SHA512 adcd46ccf81d01afe5d959e50f0acaae392fc2422a7e0582a9d065d860c2d0d9245505ce5c156136921f48c126a3741bb65be5a021b53116ccf5f0f1451c00f3
+AUX pygit2-0.26.1-internet-tests.patch 5484 BLAKE2B 6b2d9462add5dea62e33da13aa0de137d1004b17b820796e78154944883e43a941527f344a1ea57469029228e5b9be3585fce76eea95e773cb46cab770f69c06 SHA512 2fa9fd5cbc726bba25b4163fb446c97161194e62b7711989cd676a5ad0b641174923bae5d8a72758262736b54ad3e217f295b39f60e6cf052945379fc3822184
 DIST pygit2-0.25.0.tar.gz 472116 SHA256 de0ed85fd840dfeb32bcaa94c643307551dc0d967c3714e49087e7edc0cdc571 SHA512 44f94869718111acbd4ad41bc4c37ac66557e979241dd5a7bb080cf091fec3fc3d5aa53a8a84eb37b2e6f89518b2ac69d058e1970b7cf98c35b8375807fd8f86 WHIRLPOOL 71d8eb87ef9cd2a1d77ecc1258d5d02f2d0075144fc81556e8a2c0b599202cf17b06c548767b956748feaa13d3ece0d3a664cfe95ab93004e345890805c58175
 DIST pygit2-0.25.1.tar.gz 456580 SHA256 e8696033052fa0221114ee7f632d38777cc29e58230cd6a05de5725cd31b4a6a SHA512 19908c874d5c2469609a54893f37367480d27ff03583c38b474ebb125dc9db95dc60776a120bb05662938d6eb62d4bcef24f684688e97e3453ccc27e015736cd WHIRLPOOL 648aabcecde66fd5b1d3cf840c51693c237e75f9da7bb793e4e9c18537cb12e4b35d5dced17389bb24440a4c72f37175e1a0a5e44a9c69811c54cf60d11f7d3f
 DIST pygit2-0.26.0.tar.gz 457263 SHA256 a7f06d61f25ab644c39e0e9bd4846a6cc4af81ae27f889473e6f0e9511226cb1 SHA512 e8626712a3b75aced14997dda0155f5c7be9a7e0e43aeb2c767c848fcbe711780137f663cc9ad5268cd85e2c61fd40be6853573f68b457cd5d46d6c32a644076 WHIRLPOOL 909d3d4f06c04107309b53653f5395f76de61195269ba753b7658725a27235ede94df48b74b547a2bafef7e20f8916c01f6d7d7f2e434965621364d51f4e32fa
-EBUILD pygit2-0.25.0.ebuild 641 SHA256 31d7fc94488e9481bc9fba9b487358744eac40a0455596105a2a993755b157ef SHA512 d884ca94c0b032f1df2de58c91099a16df92239582a2b672dc95a4c3797956c56dd82c36661347129acd4e5be6f57e3c845d2cae34a40d28a4a5d11e8ec0747f WHIRLPOOL 557ae9bc91ae029bb007075f47794aff96087a738e8678192762312a426fcda94340b1ae9cfc6dd138466817fba6140085a1a02792b2192bf7f54ca9faf53343
-EBUILD pygit2-0.25.1.ebuild 699 SHA256 6cbdc00f861e05993f9bae9cb0ce15d5af9322a0551572f8958acd341237bc6f SHA512 5f55fd77acb4ddbf3fdb8d7d56dba9e3882dfe30a271cb5f0bb1a8dc89ee65172fd66ab0f46c543c8722af020be751055c37589e6d9b91f1cefb6d22b4e0f72c WHIRLPOOL 6067e9f5a04b8eaa21a7b7670d8ceaba25af871ca2985d978ff01c59b5cb4f70a22785c16277cee290557a3a9e9e19b61dae2cdf10d72a7aae251bee5b32955f
-EBUILD pygit2-0.26.0.ebuild 619 SHA256 38a0ca9a337993f6873fc9cbe5128d33383460f6ac9be482cdd78a5c056f8587 SHA512 cc8117191d84109951f47045fd4c92183fccf91f73a1abbe3880b71f4d0967874118a2a36ecf4cbf2faa2fb84cf82b5629ca48f185e2e0daf446d7af367995b0 WHIRLPOOL f36233d3c9e860ee7e7db1784c3a3ebc7c3654c0e985aba1a356dab05e13941c557614a98ed15e246ca8ef5ff863ff86131328b3dcb57c21baab3320d03fdaf6
-MISC ChangeLog 3901 SHA256 de7c24d8c956c4378ab2ebd8a064219afec02264b18d667d523a63bbb98b357b SHA512 9506bcbab332e1d4c375dd53425962d609c743bbaf4e6d477e0b50c3f4d405d4c29eb0ec56caa40f12a7a91edb54682f6b518671aff2d90236e4568d0a569a20 WHIRLPOOL 9f4815df943c0af5be22b4889b92b332d9bb86733ad233c89d75a4ccc0fb2ed1a67a10443645184efe1687f94f05ddcbede5e152b4a57801d7c051f76de964e4
-MISC ChangeLog-2015 5270 SHA256 1e405b614fbefad70c3313b3b5aa11fe25b641d551db98d1919540b178d2ad8f SHA512 e05c29cf035e4c77bb7695d29320748841ac741764d3f2249bceb265bc8bd19e4bce5b99e53f2849b107c4baff1651a5a8eb4768e0f2b487698f49677f781de5 WHIRLPOOL 91d562488119ae69758ee46b8d04c623d63c429b178cb94e1ba997203aa715c13c0528b6160177a07d9dc32132cef7d15b050f4caefb2762b02a8a1548629914
-MISC metadata.xml 489 SHA256 59152049942b20526f8d447835d13884d211bbcd90da4c13fab6fbb348c1f498 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e WHIRLPOOL c972dfb9f803a2ce552f06af598216ff0973a46e03a882c9f66812d4a36d84ec0194c99893a84b6f919d98e3993d30cf21f638dea28f5a147336bf576a5abdb5
+DIST pygit2-0.26.1.tar.gz 458526 BLAKE2B 703093a5a292e92c90987785065f3a1590addc09d72311f75b22caf6fe1a17be8fb16cf777189835204cb7dc4d2066e841d3d4327e2cc040c312e22a4c75a8ee SHA512 23585bc0f41458442889b5434347cbc11d6c729898864262426f84e5b9239164bb58c6e910d2381b25f1b8be271674c1a6960630a504c40accdd30e487d27a7d
+EBUILD pygit2-0.25.0.ebuild 641 BLAKE2B 89b8b90fc1beb8001d578f13f001c1dff74be602564e821f821249e0cc0fdcdf1c88c3f37800da50408ef474bb8d9797eadb53f875d096d02106154a1e6ffa3e SHA512 d884ca94c0b032f1df2de58c91099a16df92239582a2b672dc95a4c3797956c56dd82c36661347129acd4e5be6f57e3c845d2cae34a40d28a4a5d11e8ec0747f
+EBUILD pygit2-0.25.1.ebuild 699 BLAKE2B 88dd65d7ad660682316bf3d85aa83e8c9c6d091e24cb28888a194cb77afe9713fd921363f9e8f263cf2de558cdeb5a40ca6f1152c2e82dc24030fa5a7710bf03 SHA512 5f55fd77acb4ddbf3fdb8d7d56dba9e3882dfe30a271cb5f0bb1a8dc89ee65172fd66ab0f46c543c8722af020be751055c37589e6d9b91f1cefb6d22b4e0f72c
+EBUILD pygit2-0.26.0.ebuild 619 BLAKE2B b52887ede77873c0b2cf686fd462ade5b36d811a9a3fbf43e0b5ebf7ab819322ba863b6d329cb30fd182ba367a75364932eabe9c83a22d730a72e4c1ee2ed0cc SHA512 cc8117191d84109951f47045fd4c92183fccf91f73a1abbe3880b71f4d0967874118a2a36ecf4cbf2faa2fb84cf82b5629ca48f185e2e0daf446d7af367995b0
+EBUILD pygit2-0.26.1.ebuild 694 BLAKE2B 48a8f3a97d7cbab3a2e97fb8868e5f7d98763482a9dd80252f75ee83c11996c7331da7ad56f71327852804055f40b08ba679a1377b1e0d471bdef6ab589ebeed SHA512 df7a9b2c20d352c626562c38e966065c4d33550def9806ab2abb73ed5ba4112bb3b6b9a8a87ef5e712a19ca4082d7e31253db6ebcc1d31ee2d17943bfe4f4928
+MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/files/pygit2-0.26.1-internet-tests.patch b/dev-python/pygit2/files/pygit2-0.26.1-internet-tests.patch
new file mode 100644
index 000000000000..6b96eb40f3b1
--- /dev/null
+++ b/dev-python/pygit2/files/pygit2-0.26.1-internet-tests.patch
@@ -0,0 +1,133 @@
+From 24a929d003f1b6b4899f41cb227293e8c4b62eb7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 21 Nov 2017 17:53:48 +0100
+Subject: [PATCH] Disable tests requiring network access
+
+---
+ test/test_credentials.py | 3 +++
+ test/test_repository.py  | 1 +
+ test/test_submodule.py   | 4 ++++
+ 3 files changed, 8 insertions(+)
+
+diff --git a/test/test_credentials.py b/test/test_credentials.py
+index 7921a41..e60383a 100644
+--- a/test/test_credentials.py
++++ b/test/test_credentials.py
+@@ -70,39 +70,42 @@ class CredentialCreateTest(utils.NoRepoTestCase):
+         username = "git"
+  
+         cred = KeypairFromAgent(username)
+         self.assertEqual((username, None, None, None), cred.credential_tuple)
+ 
+ 
+ class CredentialCallback(utils.RepoTestCase):
++    @unittest.skip('requires Internet access')
+     def test_callback(self):
+         class MyCallbacks(pygit2.RemoteCallbacks):
+             @staticmethod
+             def credentials(url, username, allowed):
+                 self.assertTrue(allowed & GIT_CREDTYPE_USERPASS_PLAINTEXT)
+                 raise Exception("I don't know the password")
+ 
+         url = "https://github.com/github/github"
+         remote = self.repo.create_remote("github", url)
+ 
+         self.assertRaises(Exception, lambda: remote.fetch(callbacks=MyCallbacks()))
+ 
++    @unittest.skip('requires Internet access')
+     def test_bad_cred_type(self):
+         class MyCallbacks(pygit2.RemoteCallbacks):
+             @staticmethod
+             def credentials(url, username, allowed):
+                 self.assertTrue(allowed & GIT_CREDTYPE_USERPASS_PLAINTEXT)
+                 return Keypair("git", "foo.pub", "foo", "sekkrit")
+ 
+         url = "https://github.com/github/github"
+         remote = self.repo.create_remote("github", url)
+         self.assertRaises(TypeError, lambda: remote.fetch(callbacks=MyCallbacks()))
+ 
+ class CallableCredentialTest(utils.RepoTestCase):
+ 
++    @unittest.skip('requires Internet access')
+     def test_user_pass(self):
+         credentials = UserPass("libgit2", "libgit2")
+         callbacks = pygit2.RemoteCallbacks(credentials=credentials)
+ 
+         url = "https://bitbucket.org/libgit2/testgitrepository.git"
+         remote = self.repo.create_remote("bb", url)
+         remote.fetch(callbacks=callbacks)
+diff --git a/test/test_repository.py b/test/test_repository.py
+index 941851b..33f0571 100644
+--- a/test/test_repository.py
++++ b/test/test_repository.py
+@@ -569,14 +569,15 @@ class CloneRepositoryTest(utils.NoRepoTestCase):
+             return repo.remotes.create("custom_remote", url)
+ 
+         repo = clone_repository(url, repo_path, repository=create_repository, remote=create_remote)
+         self.assertFalse(repo.is_empty)
+         self.assertTrue('refs/remotes/custom_remote/master' in repo.listall_references())
+         self.assertIsNotNone(repo.remotes["custom_remote"])
+ 
++    @unittest.skip('requires Internet access')
+     def test_clone_with_credentials(self):
+         repo = clone_repository(
+             "https://bitbucket.org/libgit2/testgitrepository.git",
+             self._temp_dir, callbacks=pygit2.RemoteCallbacks(credentials=pygit2.UserPass("libgit2", "libgit2")))
+ 
+         self.assertFalse(repo.is_empty)
+ 
+diff --git a/test/test_submodule.py b/test/test_submodule.py
+index f123b8b..df44e16 100644
+--- a/test/test_submodule.py
++++ b/test/test_submodule.py
+@@ -49,14 +49,15 @@ class SubmoduleTest(utils.SubmoduleRepoTestCase):
+         self.assertIsNotNone(s)
+ 
+     def test_listall_submodules(self):
+         submodules = self.repo.listall_submodules()
+         self.assertEqual(len(submodules), 1)
+         self.assertEqual(submodules[0], SUBM_PATH)
+ 
++    @unittest.skip('requires Internet access')
+     def test_submodule_open(self):
+         s = self.repo.lookup_submodule(SUBM_PATH)
+         self.repo.init_submodules()
+         self.repo.update_submodules()
+         r = s.open()
+         self.assertIsNotNone(r)
+         self.assertEqual(str(r.head.target), SUBM_HEAD_SHA)
+@@ -69,28 +70,31 @@ class SubmoduleTest(utils.SubmoduleRepoTestCase):
+         s = self.repo.lookup_submodule(SUBM_PATH)
+         self.assertEqual(SUBM_PATH, s.path)
+ 
+     def test_url(self):
+         s = self.repo.lookup_submodule(SUBM_PATH)
+         self.assertEqual(SUBM_URL, s.url)
+ 
++    @unittest.skip('requires Internet access')
+     def test_init_and_update(self):
+         subrepo_file_path = os.path.join(self.repo_path, 'submodule', 'setup.py')
+         self.assertFalse(os.path.exists(subrepo_file_path))
+         self.repo.init_submodules()
+         self.repo.update_submodules()
+         self.assertTrue(os.path.exists(subrepo_file_path))
+ 
++    @unittest.skip('requires Internet access')
+     def test_specified_update(self):
+         subrepo_file_path = os.path.join(self.repo_path, 'submodule', 'setup.py')
+         self.assertFalse(os.path.exists(subrepo_file_path))
+         self.repo.init_submodules(submodules=['submodule'])
+         self.repo.update_submodules(submodules=['submodule'])
+         self.assertTrue(os.path.exists(subrepo_file_path))
+ 
++    @unittest.skip('requires Internet access')
+     def test_oneshot_update(self):
+         subrepo_file_path = os.path.join(self.repo_path, 'submodule', 'setup.py')
+         self.assertFalse(os.path.exists(subrepo_file_path))
+         self.repo.update_submodules(init=True)
+         self.assertTrue(os.path.exists(subrepo_file_path))
+ 
+ if __name__ == '__main__':
+-- 
+2.15.0
+
diff --git a/dev-python/pygit2/pygit2-0.26.1.ebuild b/dev-python/pygit2/pygit2-0.26.1.ebuild
new file mode 100644
index 000000000000..d121e89b7219
--- /dev/null
+++ b/dev-python/pygit2/pygit2-0.26.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 eapi7-ver
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.python.org/pypi/pygit2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-libs/libgit2-$(ver_cut 1-2)*
+	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/pygit2-0.26.1-internet-tests.patch
+)
+
+python_test() {
+	esetup.py test --args='-v'
+}