From: Patrick McLean <patrick.mclean@sony.com>
Date: Mon, 9 Dec 2019 22:46:17 +0000 (-0800)
Subject: dev-python/pylibmc-1.6.1-r1: Revbump, update patch to fix tests
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=525ee6507f05e96ec5e7db8ef6c547eae7c8d639;p=gentoo.git

dev-python/pylibmc-1.6.1-r1: Revbump, update patch to fix tests

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
---

diff --git a/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures.patch b/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures-r1.patch
similarity index 81%
rename from dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures.patch
rename to dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures-r1.patch
index c19ab468ce8a..0a91fd39266e 100644
--- a/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures.patch
+++ b/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures-r1.patch
@@ -2,16 +2,14 @@ diff --git a/src/_pylibmcmodule.c b/src/_pylibmcmodule.c
 index 5324d1d..70c18cb 100644
 --- a/src/_pylibmcmodule.c
 +++ b/src/_pylibmcmodule.c
-@@ -600,6 +600,13 @@ static PyObject *_PylibMC_parse_memcached_value(PylibMC_Client *self,
+@@ -600,6 +600,11 @@ static PyObject *_PylibMC_parse_memcached_value(PylibMC_Client *self,
      }
  #endif
- 
-+#if PY_MAJOR_VERSION >= 3
+
 +	/* make sure we don't pass a null pointer to _PylibMC_deserialize_native */
 +    if (value == NULL) {
 +        value = "";
 +    }
-+#endif
 +
      if (self->native_deserialization) {
          retval = _PylibMC_deserialize_native(self, NULL, value, size, flags);
diff --git a/dev-python/pylibmc/pylibmc-1.6.1.ebuild b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
similarity index 97%
rename from dev-python/pylibmc/pylibmc-1.6.1.ebuild
rename to dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
index a52234269c7e..374710126548 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
@@ -38,7 +38,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="doc? ( || ( $(python_gen_useflags "${DOCS_PYTHON_COMPAT[@]}") ) )"
 
 PATCHES=(
-	"${FILESDIR}/pylibmc-1.6.1-fix-test-failures.patch"
+	"${FILESDIR}/pylibmc-1.6.1-fix-test-failures-r1.patch"
 )
 
 pkg_setup() {