gentoo resync : 15.01.2020

5 files changed, 18 insertions, 28 deletions

diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index a90c1d52bf8a..fb0f164ce8bc 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,9 +1,9 @@
 DIST cmd2-0.7.9.tar.gz 71298 BLAKE2B d1623e2d6a7ac66058b5a43a9688ba850962fa7b5659c3287a9aef9a7deb16338d71a2c07ef15ec72ee5e62aae0ce3cdf2f202d0d423040b734dee059f1d4876 SHA512 39086794ea57cdfdc7388aaa485770f1a76457bf2b2f58cd4703dc0c082f58a8343aa777304e833133040fdab8ef8451d85bc3c19721432514bb380330823abd
 DIST cmd2-0.8.9.tar.gz 112543 BLAKE2B b55edd450abcff863a34252b724919ace9f65b62b8175f28a1bb4fb64692a67723339a887dac45e87f37db71773689cfa213038740a4b3d165bf95f9cdad1d0e SHA512 80c80b67f8a1709156450fa476215a5466cca2853102f6012f1d83867a311d86a68d441dcea9895b62add731b3d00a7c3ecefde939b4f2ccd61d058ef9386a84
-DIST cmd2-0.9.21.tar.gz 563600 BLAKE2B f438dfac5b8bef33e151d3c577bd9d140a5da746a91b445715aa15ff5853346472e62cb361f9ffe742888404606c4731148f3002c7555d70eefc71e44908c06d SHA512 79994739ac311113ace8f7d35c314b34a45cd6893fd9fae3995cd753bc3651f6746f5be65f81bcf1ab7d2810a070602c150af71fba9945331bc3e0f1dea730ad
 DIST cmd2-0.9.22.tar.gz 565214 BLAKE2B e0f950c1bc994bbc3d1ddf2a526a97d61c1aa59c6089574518d2222c385ecf91f53fcc0e6dcaa84460cc4a6647bc5baf37f12c6c9bf16fdb3db14cf15a05bd18 SHA512 1ff5cbea130ef3729c021144ca27a31c0e9cb8b2977eca454a0f528c468180e822fa8d23e7b07846a5109ad38bf12565b613b8295751f94852d9251c4e8d6edf
-EBUILD cmd2-0.7.9.ebuild 899 BLAKE2B a475b51f4ecc87d0df39bb21550aab47331d2355310a05d051fd089e5a8262e7e34c301fcadb9559fc850e8f7fef452f4d187c51dcaa0d1a3e09dfb8d55edd3c SHA512 937f70ff38800622db1c2b50e159d53f5ac1628a6f0e16a3ab205f5d1aa4b6f74702b206b4be2bae9d1d0afb5a88db481749a52ef5f777f12dd414cb3304fc3a
-EBUILD cmd2-0.8.9.ebuild 979 BLAKE2B 92cfdb67bd7c9619239b8d3b742ec9e004b5c628caa8790859a19ba707d6a2263b63dc84f7e0c5afbf7ebc1a336673507c3de76113e54332c87da1d3661c87a7 SHA512 5c48cf31cc0bf761822c8b78e99a605753023b4b82b8fa634e322c1dae0973c969866ca3f00312b5236aaff59082969165e397ac584d2079118dd57dab2f05ef
-EBUILD cmd2-0.9.21.ebuild 1057 BLAKE2B 58d5ab45d1a8ac6f05195c19c9db1c91c5d2bf75784f6ccba5af9014b889e71417e3695abe63c9dd881a4c842b7248ecdfbfc649f55b150bac2e6a87f2f42d6d SHA512 0d3489368f84e25fec9b63cce78502aaf9d6c35bcc6d864613e730267d1710bd4d4d74251947fdca45e7fd63baf9cb69762f7f607d12aa94e670f2a44f865cb9
-EBUILD cmd2-0.9.22.ebuild 1057 BLAKE2B 58d5ab45d1a8ac6f05195c19c9db1c91c5d2bf75784f6ccba5af9014b889e71417e3695abe63c9dd881a4c842b7248ecdfbfc649f55b150bac2e6a87f2f42d6d SHA512 0d3489368f84e25fec9b63cce78502aaf9d6c35bcc6d864613e730267d1710bd4d4d74251947fdca45e7fd63baf9cb69762f7f607d12aa94e670f2a44f865cb9
+DIST cmd2-0.9.23.tar.gz 568514 BLAKE2B 02070a72ec42cd04f3f647eb6344b48a5149e21a8a87be713dec837d48295c6b919f55229fb09d013f1722ee111f8a75958e884c18b2eaa339097ff81554d8c3 SHA512 ea00a17b206d6312b0c2ae6b982f3fe4634f7717286a475438972780a1510b37120f007907f632338eafd093d03cb0e928c705e54a3aa8295f7aced73630a2f2
+EBUILD cmd2-0.7.9.ebuild 890 BLAKE2B 487bcb215e12de6e29fcffce6b7d3d6284fb762e5a8f16722c7ab16696415d0ce615f9ce03d34f2e8dfef5b7abf8d5c1d2572055acff8d38be1b69707baaa912 SHA512 7864c9455ee3b068026832e29371d8cb844b7a43e0e826dbe88fc42ff9b12a6a23259705c3e321ce8637e4d0dade5226f678de4564329d8dae416203801900dd
+EBUILD cmd2-0.8.9.ebuild 970 BLAKE2B a784b56d861c9e799a75ea4bf5626fac0a846249eb4de2b90b0f14b25d4435d6a4ccb8e98cf64b799aae1b53ea86079eb63ac470cef3e17277655bf2bd35ecde SHA512 fb5f2668cc8c607b8b49f66c9f1f9216a346e53d3184b383b173fe7d0fe71feecf149ee8196998ca9af40a82d93050028f987b5086a1462a0fa3e03aa50d16fb
+EBUILD cmd2-0.9.22.ebuild 980 BLAKE2B 98e6cd484b1e109cda69249627a4c17b3656e84b2be47ac7a16e7227a108a71c4d914f2bf88eea445463edbaf15e82c39b98790521d8afcf4537e57135187a6c SHA512 d9afceb31e3b128b34a39623c58728ec3d49b365df04c3984102d927a06c6fd0f7c21a94647d657df45c9090dfb9819b74ad275c84891d9b9a7ac5a6b2e196ae
+EBUILD cmd2-0.9.23.ebuild 875 BLAKE2B 07901fcb94d8517f5b0e865203f7a447dec469f0014724da7f6714f9523eeec5460bd841829bae7558cbeb3450484809dc6591cba0562d334e864b6a8829a58c SHA512 37f24d5b354b5dbde620c55c4b3430dd26ac380918481ac083c586e0cc5d5a5fc1d632da0e7e27152d54fd28dbcf66dfabae743d736e43f0cb37bdb6bd87d215
 MISC metadata.xml 665 BLAKE2B 796824fde35499ef70bd730f7e6c6ae4b239ea278f77188215ae0fc6e062598d943b0ae42ab5b378e8777c7c6a2162b330971bc00572e6dd43c663a3da677aab SHA512 64183ffbb33f229d4295e6fb34d98603d38da0241c6d1593704da866c17e04c9fe7f9500a1256b6e83c919eae019f71da93fdec7f09db99e073dbd809144b735
diff --git a/dev-python/cmd2/cmd2-0.7.9.ebuild b/dev-python/cmd2/cmd2-0.7.9.ebuild
index b48eabab9269..dfda6cf7aa37 100644
--- a/dev-python/cmd2/cmd2-0.7.9.ebuild
+++ b/dev-python/cmd2/cmd2-0.7.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cmd2/cmd2-0.8.9.ebuild b/dev-python/cmd2/cmd2-0.8.9.ebuild
index 7444fcf4634c..bb951d314309 100644
--- a/dev-python/cmd2/cmd2-0.8.9.ebuild
+++ b/dev-python/cmd2/cmd2-0.8.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cmd2/cmd2-0.9.22.ebuild b/dev-python/cmd2/cmd2-0.9.22.ebuild
index 715f6032dc28..347d10c90d72 100644
--- a/dev-python/cmd2/cmd2-0.9.22.ebuild
+++ b/dev-python/cmd2/cmd2-0.9.22.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 virtualx
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -28,7 +28,6 @@ DEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python3_5)
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/cmd2/cmd2-0.9.21.ebuild b/dev-python/cmd2/cmd2-0.9.23.ebuild
index 715f6032dc28..502253d32c93 100644
--- a/dev-python/cmd2/cmd2-0.9.21.ebuild
+++ b/dev-python/cmd2/cmd2-0.9.23.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 virtualx
 
@@ -13,8 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
@@ -23,22 +21,15 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/wcwidth[${PYTHON_USEDEP}]
 "
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python3_5)
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
 "
 
-python_test() {
-	# test rely on very specific text wrapping...
-	local -x COLUMNS=80
-	pytest -vv || die
-}
+distutils_enable_tests pytest
 
 src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
 	virtx distutils-r1_src_test
 }