gentoo resync : 06.01.2018

3 files changed, 0 insertions, 88 deletions

diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index bd8e8189b6df..cb8ab9d9e836 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,6 +1,3 @@
-AUX pygit2-0.25.1-cffi-1.10.patch 2309 BLAKE2B 99584632af0f26ef92ada55fc0f8b3fb31c7bbd6a1c74211c991db8ec7f792b5d74c551a5e0d457512ed156a5536ab2b25f8b21994706ebf7c7af3234b3faa95 SHA512 adcd46ccf81d01afe5d959e50f0acaae392fc2422a7e0582a9d065d860c2d0d9245505ce5c156136921f48c126a3741bb65be5a021b53116ccf5f0f1451c00f3
-DIST pygit2-0.25.1.tar.gz 456580 BLAKE2B b7a9ce90076f2475df41f2e5ee8cbf7cb2ca68553076ae05cb2e8bdd68067f7373e33dfb03cadf90b7f410b5d5989b902b545fddbb1e3a9f17eb17d50692e982 SHA512 19908c874d5c2469609a54893f37367480d27ff03583c38b474ebb125dc9db95dc60776a120bb05662938d6eb62d4bcef24f684688e97e3453ccc27e015736cd
 DIST pygit2-0.26.3.tar.gz 462080 BLAKE2B b3c4b9b8a6aeba22a70a8d2ef1393dace3a065a3625ee3574058e333bca4ba1d60223939f412eecf5ae9d93a81fb81c4a536af46aa047c2c82a48bd81afe4cf9 SHA512 6f727686221d4e8c348f836b7ad278b48a4b971a121b9953c2cf7163bf093936d838aaf83e9edb8628757624ab27e8345a2fb29eb1a79a30e06c0ab0a77e4cc6
-EBUILD pygit2-0.25.1.ebuild 699 BLAKE2B 88dd65d7ad660682316bf3d85aa83e8c9c6d091e24cb28888a194cb77afe9713fd921363f9e8f263cf2de558cdeb5a40ca6f1152c2e82dc24030fa5a7710bf03 SHA512 5f55fd77acb4ddbf3fdb8d7d56dba9e3882dfe30a271cb5f0bb1a8dc89ee65172fd66ab0f46c543c8722af020be751055c37589e6d9b91f1cefb6d22b4e0f72c
 EBUILD pygit2-0.26.3.ebuild 631 BLAKE2B 0f4903e3613c3ce410c919c17c0a7686996c408e29519a505fa38825bfdbfcbf777c8c419288441801ca6a5123d9c5e9e185ff9fa7945ce58144afded00b5dcb SHA512 b07ec6e01ef855ade0bff6848224e278cd30a991f9c15bba5e9ae2476791a5f941cdd5d51294d412ea1186cc2748fe2a13a3233e01ff54cda88fc5c72ec2d927
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/files/pygit2-0.25.1-cffi-1.10.patch b/dev-python/pygit2/files/pygit2-0.25.1-cffi-1.10.patch
deleted file mode 100644
index c071f9e5dd6b..000000000000
--- a/dev-python/pygit2/files/pygit2-0.25.1-cffi-1.10.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From b88dc868423af2f760f649960112efd0e37e5335 Mon Sep 17 00:00:00 2001
-From: Lukas Fleischer <lfleischer@lfos.de>
-Date: Sat, 6 May 2017 21:39:33 +0200
-Subject: [PATCH] Fix parameter passing of describe patterns
-
-When ffi.new() is used to build a new pointer object, the returned
-pointer object has ownership on the allocated memory. When it is
-garbage-collected, then the memory is freed. Thus, we need to make sure
-the original object survives its use, otherwise the casted pointer will
-point to garbage.
-
-This fixes one test which was failing with the latest CFFI version, see
-issue #694. Thus, this commit also reverts 803b1cb (cffi 1.10 not yet
-supported, 2017-03-22) where the latest CFFI version was marked as
-unsupported.
-
-Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>
----
- .travis.yml          | 2 +-
- pygit2/repository.py | 6 +++++-
- setup.py             | 4 ++--
- 3 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/pygit2/repository.py b/pygit2/repository.py
-index 9377aa2..472f4ff 100644
---- a/pygit2/repository.py
-+++ b/pygit2/repository.py
-@@ -692,7 +692,11 @@ def describe(self, committish=None, max_candidates_tags=None,
-         if describe_strategy is not None:
-             options.describe_strategy = describe_strategy
-         if pattern:
--            options.pattern = ffi.new('char[]', to_bytes(pattern))
-+            # The returned pointer object has ownership on the allocated
-+            # memory. Make sure it is kept alive until git_describe_commit() or
-+            # git_describe_workdir() are called below.
-+            pattern_char = ffi.new('char[]', to_bytes(pattern))
-+            options.pattern = pattern_char
-         if only_follow_first_parent is not None:
-             options.only_follow_first_parent = only_follow_first_parent
-         if show_commit_oid_as_fallback is not None:
-diff --git a/setup.py b/setup.py
-index f4a9f8c..18d3eb0 100644
---- a/setup.py
-+++ b/setup.py
-@@ -203,8 +203,8 @@ def run(self):
-       long_description=long_description,
-       packages=['pygit2'],
-       package_data={'pygit2': ['decl.h']},
--      setup_requires=['cffi<1.10'],
--      install_requires=['cffi<1.10', 'six'],
-+      setup_requires=['cffi'],
-+      install_requires=['cffi', 'six'],
-       zip_safe=False,
-       cmdclass=cmdclass,
-       **extra_args)
diff --git a/dev-python/pygit2/pygit2-0.25.1.ebuild b/dev-python/pygit2/pygit2-0.25.1.ebuild
deleted file mode 100644
index 35a8f52ddc96..000000000000
--- a/dev-python/pygit2/pygit2-0.25.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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 versionator
-
-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-$(get_version_component_range 1-2)*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/pygit2-0.25.1-cffi-1.10.patch
-)
-
-python_test() {
-	esetup.py test
-}