gentoo resync : 10.02.2020

4 files changed, 4 insertions, 41 deletions

diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index ba964c58a48b..8acd609050d6 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -2,12 +2,10 @@ DIST cmd2-0.7.9.tar.gz 71298 BLAKE2B d1623e2d6a7ac66058b5a43a9688ba850962fa7b565
 DIST cmd2-0.8.9.tar.gz 112543 BLAKE2B b55edd450abcff863a34252b724919ace9f65b62b8175f28a1bb4fb64692a67723339a887dac45e87f37db71773689cfa213038740a4b3d165bf95f9cdad1d0e SHA512 80c80b67f8a1709156450fa476215a5466cca2853102f6012f1d83867a311d86a68d441dcea9895b62add731b3d00a7c3ecefde939b4f2ccd61d058ef9386a84
 DIST cmd2-0.9.22.tar.gz 565214 BLAKE2B e0f950c1bc994bbc3d1ddf2a526a97d61c1aa59c6089574518d2222c385ecf91f53fcc0e6dcaa84460cc4a6647bc5baf37f12c6c9bf16fdb3db14cf15a05bd18 SHA512 1ff5cbea130ef3729c021144ca27a31c0e9cb8b2977eca454a0f528c468180e822fa8d23e7b07846a5109ad38bf12565b613b8295751f94852d9251c4e8d6edf
 DIST cmd2-0.9.23.tar.gz 568514 BLAKE2B 02070a72ec42cd04f3f647eb6344b48a5149e21a8a87be713dec837d48295c6b919f55229fb09d013f1722ee111f8a75958e884c18b2eaa339097ff81554d8c3 SHA512 ea00a17b206d6312b0c2ae6b982f3fe4634f7717286a475438972780a1510b37120f007907f632338eafd093d03cb0e928c705e54a3aa8295f7aced73630a2f2
-DIST cmd2-0.9.24.tar.gz 580456 BLAKE2B 0f4e32c52589d7493db13aafcff1dcc37b45d27120f546baed0e3541398f7ffde1a381b44fb4ba2f822ffaeff0ae52b7ad5cda509370685c480a76e1d677f7ed SHA512 0d9cf8d203914f9a62ff15fb538440a2a506b1751c381cef75054839f04fedaa3c6a43b7da8ed99dd0c3b17b55641e2a1cf90826cc7948d2798dbb45e53b6639
 DIST cmd2-0.9.25.tar.gz 576329 BLAKE2B e3608df62ed47d04b039a71bf876556ac7c6f9dc0355d1593c63ca365fd7baf207a2b4169525911e85c98ffd38c1a603023a9851a2ffc556a99970d57fd393fb SHA512 7361c81ca0dc0276ade2e0de471d86865801b193db8c1fc4064cc8d7311083f95d6e20c67c5540b9e162d37976976d82bc609a0be6524be113fe4b7d3b6d627e
 EBUILD cmd2-0.7.9.ebuild 890 BLAKE2B 487bcb215e12de6e29fcffce6b7d3d6284fb762e5a8f16722c7ab16696415d0ce615f9ce03d34f2e8dfef5b7abf8d5c1d2572055acff8d38be1b69707baaa912 SHA512 7864c9455ee3b068026832e29371d8cb844b7a43e0e826dbe88fc42ff9b12a6a23259705c3e321ce8637e4d0dade5226f678de4564329d8dae416203801900dd
 EBUILD cmd2-0.8.9.ebuild 977 BLAKE2B bbf9af55c9193292961166d278515b5ea0977ca77101e80f7a4d121f0678b512f3e2b67dcde76081b26d736294581a239f5033878c8d6b800d2027659ee53f04 SHA512 b2c39ffe37743f0cead927ca0b120a1ac6cf842fe7235168be60a8fbff030905c02bad38db316ac92a5d30eae018677473a4acae2b2a48fe07dcf10755b898b5
 EBUILD cmd2-0.9.22.ebuild 984 BLAKE2B 0972dd77534ff95c19354c2befd9b278422a5316b937c65faa1f12d268ff209034dce75f655a77975c8c166c9fc049640083cd4e92b543b0ed73904e980506da SHA512 54b39773b49af3479f43932affa8257c9313387309d735223718e2ebaaa3c66acfb30e418d35d042aac0f839e3557f4f497dec2b25b18df4c5a305740cac8165
-EBUILD cmd2-0.9.23.ebuild 875 BLAKE2B 07901fcb94d8517f5b0e865203f7a447dec469f0014724da7f6714f9523eeec5460bd841829bae7558cbeb3450484809dc6591cba0562d334e864b6a8829a58c SHA512 37f24d5b354b5dbde620c55c4b3430dd26ac380918481ac083c586e0cc5d5a5fc1d632da0e7e27152d54fd28dbcf66dfabae743d736e43f0cb37bdb6bd87d215
-EBUILD cmd2-0.9.24.ebuild 882 BLAKE2B 46429886785033d06affa3036a9c0875dcc97d02e003fa059e3f15e0370d3e08483dac9f43c491dde48b014d68c015af2160346f7599974e877b1f0eb5c89bb1 SHA512 cc0a636ee115f1677c987504411434ff2047aa1db5bc0392fbe308e78f2295743bbdde4f394258b45da5ebda3179f2299f2186148a8699d7f7adabfbe20110b6
-EBUILD cmd2-0.9.25.ebuild 841 BLAKE2B 0b8ff83c19092accd68d8b3bf58ae5c8c2fe3c416e5c4e937efeae72d3e8815d5b22b431fe6e7f0ff71e900987b8ab1695425aea36a19171420e6c1f636524e2 SHA512 cf45b822dada703a4939416bae1cc6de55edbbf96f5372811fddcee13be527c5b858985775be9d6ee395bb55aa3a0c5f20b303095d78611267a0406ff0ca1383
+EBUILD cmd2-0.9.23.ebuild 878 BLAKE2B e812aefe4e7f2fe7f8d125b251a1c5e1e4d0ffdfbf464a2dbcbb55f2a22660b5870d7253c174a244fbf930cbbc4ccf788938d26ad1e1169a194ce399a2ebc9a8 SHA512 17b80dda09d7dfc89c5e824b0f3c9749493f8eef45e7fc2f80337944b7c66771b24b0794e0cfa489d5074287988486c2ad828cf4376eeda7a5e6bea7da6ad95b
+EBUILD cmd2-0.9.25.ebuild 846 BLAKE2B 4970c9d5f97d1fe7606968e2b56a72e5ab136d96d95fefadde8c1196ada644292d711a933ee08a3209e8fc51e8c27168db2ef60bd47c5703cef3fa3f5fe036d5 SHA512 a33251d3adc79d3b584aa08de493684f2c05775b4bec00101e25416eb196aa0982d4156b927c05a775fa0849e8a6363fd1ce87ad802b91f69539073ecd718369
 MISC metadata.xml 496 BLAKE2B eb23ffbf044908e43bf041331d04a6d9f70f608845398e9ab5a49150a2231877bb5daeecc14f3201344575c6ce6c254f60c506b9959d82e6464b124532ad7ec6 SHA512 21d529f12aa96fd0a2b444daa1fc44a93a09c06c190c984f357d9c1cc167379e9f42997aa8ac284b603515bdf38742185646eb9f457ea5898e87834fcf09bdd0
diff --git a/dev-python/cmd2/cmd2-0.9.23.ebuild b/dev-python/cmd2/cmd2-0.9.23.ebuild
index 502253d32c93..0290ae63bfa9 100644
--- a/dev-python/cmd2/cmd2-0.9.23.ebuild
+++ b/dev-python/cmd2/cmd2-0.9.23.ebuild
@@ -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 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/cmd2/cmd2-0.9.24.ebuild b/dev-python/cmd2/cmd2-0.9.24.ebuild
deleted file mode 100644
index 78b85c913b6f..000000000000
--- a/dev-python/cmd2/cmd2-0.9.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-0.9.25.ebuild b/dev-python/cmd2/cmd2-0.9.25.ebuild
index 0a6f24240007..dd0714d43c10 100644
--- a/dev-python/cmd2/cmd2-0.9.25.ebuild
+++ b/dev-python/cmd2/cmd2-0.9.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]