gentoo resync : 25.08.2020

4 files changed, 70 insertions, 3 deletions

diff --git a/dev-python/configobj/Manifest b/dev-python/configobj/Manifest
index c32acf9a779d..88c2af7d398d 100644
--- a/dev-python/configobj/Manifest
+++ b/dev-python/configobj/Manifest
@@ -1,3 +1,6 @@
+AUX configobj-5.0.6-fix-py2-tests.patch 1494 BLAKE2B 5c52aca50d606c0fa3fef6d2fb184b3d21bb45ca39c4cb5893aa67b06e46954110b4a2109fb1592931a1947b56b12a80a575baa54ca7dfbeb1981bb1c610137f SHA512 ff87d2b54a47cddb9dd77d43a3028805f98c76e7a0c9529d40fa2d936c8b23ede24931f2066665d0b6ba30db6f62ac4871605c6b89c4842eb93847eb2d6e1e8c
+DIST configobj-5.0.6.gh.tar.gz 143664 BLAKE2B b554d0aec903aecb55387a0164cd6f8d442e9fc1ab231ce7f7123e7a5041e07a86f5f7bf70492ca93fcdc1bd3caa5b855c427f060842e3b4a7524afbcc417a76 SHA512 326eb86e362f281ebf07abcb1cf7616abb270c482eafe842371cda8708245ca5e8262f1644b7164664ecc10e9004ed061c9de18cd233a657d4697dbc3ba3c59d
 DIST configobj-5.0.6.tar.gz 33248 BLAKE2B b58a22fdf247f1c3022108e24abb4de55620ce75f6aeb5f269f008a5668e07b8c1d0c49e4059d7f4c4c361d269ead39c3784377635c7718f92c2381e69c56cb5 SHA512 f253fdd0bc3fcd37f56c9ceb28f5c8c739b0861e099b07a3929645907c97b2261f0529850a95c1a42507846f72d88a0992fcd1e1d6fa8654dc713d120f769963
-EBUILD configobj-5.0.6.ebuild 965 BLAKE2B 3377a2464816f7f02c2d4eac9247dcf5d19d129682abf7ca4f4d810032b2e383fb65c0bf723e6429926df7e951c7e1e7d27e833097f68ca6d96aef49155f6c7f SHA512 8c6a8b3527360f77bc1d1039e4f497aa928f60059914c27a9f317f24f910738d49cf8c3b0ad15e412b0074e55c8ec90e954b2c43b0abba70c2ce578e8e7fae52
+EBUILD configobj-5.0.6-r1.ebuild 761 BLAKE2B 9b767d0b102973b7e2d5238932fd00eadef572878fb55bb88ca8facdbe6bac65d07aa4512726b278ab4289a106d75be47250d398243743e0ba7f6f8b9700e6e7 SHA512 469b470bfbd4a2230801a4bbf36c8f3943cba03aa14327be4deaf73d44cc3d104425a7edf9c8260e694d2605b58d316e99e85e20ceed3d5780a187b2c28d3e87
+EBUILD configobj-5.0.6.ebuild 981 BLAKE2B d6fd8c2cb300a411006b6ec0d5cb654b191d2ae0cc6076a177c748ba03f66533baf3e617524c3388d3235aa36c2fc3443dbcacbc1dfae9dfbd771b2d19abf941 SHA512 1911989a71c0235b0389acb6d2c354c2f75569c10cc99325d84f1d03ffa72292d9e099a7af11a9a59d4d9c51f92e38ffd36d7d778c7484a8f8d31c1c09cee305
 MISC metadata.xml 663 BLAKE2B e4c20390482c920c99164449489636bc0ce8305f38a96673898743a79bade7b6c09d6c9cb0fa5f7df84dd3791e7b78ac0e685e2c32dadfde1c44ad48f427a655 SHA512 c8c5d8bd7b5efd97310af1bc9dc172f3623f01b45b44c20ca33f92ad0d09845bcab10e6afd704df1188a747660ee4e7f519a55dc40ca5945c189611740e9c480
diff --git a/dev-python/configobj/configobj-5.0.6-r1.ebuild b/dev-python/configobj/configobj-5.0.6-r1.ebuild
new file mode 100644
index 000000000000..0326ad38559d
--- /dev/null
+++ b/dev-python/configobj/configobj-5.0.6-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Simple config file reader and writer"
+HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html https://pypi.org/project/configobj/"
+SRC_URI="https://github.com/DiffSK/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${P}-fix-py2-tests.patch" )
+
+distutils_enable_tests pytest
diff --git a/dev-python/configobj/configobj-5.0.6.ebuild b/dev-python/configobj/configobj-5.0.6.ebuild
index ef9974e7a717..41c7ea7f06d3 100644
--- a/dev-python/configobj/configobj-5.0.6.ebuild
+++ b/dev-python/configobj/configobj-5.0.6.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch b/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch
new file mode 100644
index 000000000000..49576b4f43e7
--- /dev/null
+++ b/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch
@@ -0,0 +1,40 @@
+diff --git a/tests/test_validate.py b/tests/test_validate.py
+index bffb0dc..c7d57d3 100644
+--- a/tests/test_validate.py
++++ b/tests/test_validate.py
+@@ -2,7 +2,7 @@
+ 
+ from configobj import ConfigObj
+ import pytest
+-from validate import Validator, VdtValueTooSmallError
++from validate import Validator, VdtValueTooSmallError, dottedQuadToNum
+ 
+ 
+ class TestBasic(object):
+@@ -161,3 +161,26 @@ class TestBasic(object):
+                     'test3': 3,
+                     'test4': 6.0
+         }}}
++
++
++class TestDottedQuadToNum(object):
++
++    def test_stripped(self):
++        assert dottedQuadToNum('192.0.2.0') == 3221225984
++        assert dottedQuadToNum('192.0.2.1 ') == 3221225985
++        assert dottedQuadToNum(' 192.0.2.2') == 3221225986
++        assert dottedQuadToNum('\t\t192.0.2.3\n') == 3221225987
++        with pytest.raises(ValueError) as excinfo:
++            dottedQuadToNum('192. 0. 2. 4')
++        assert str(excinfo.value) == 'Not a good dotted-quad IP: 192. 0. 2. 4'
++
++    def test_boundaries(self):
++        assert dottedQuadToNum('0.0.0.0') == 0
++        assert dottedQuadToNum('255.255.255.255') == 4294967295
++        with pytest.raises(ValueError) as excinfo:
++            dottedQuadToNum('255.255.255.256')
++        assert str(excinfo.value) == (
++            'Not a good dotted-quad IP: 255.255.255.256')
++        with pytest.raises(ValueError) as excinfo:
++            dottedQuadToNum('-1')
++        assert str(excinfo.value) == 'Not a good dotted-quad IP: -1'