gentoo Easter resync : 12.04.2020

5 files changed, 11 insertions, 84 deletions

diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index 02753d3b676b..611fa821709c 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -1,9 +1,5 @@
-DIST python2-pythondialog-3.3.0.tar.gz 1906527 BLAKE2B 67fbb2dbd2b9c5f5da4c74f5360b5c0753ac39d9472e6ac4d09ef01831a1d95a8fe9ccdfad80487452b2704e0fd237286d755e7f49188e388272c34ddbf47081 SHA512 65ce7f9305e20b0c5e0d4588a241e0f14907ecad64f8a6bb3899a2d6e0245fdd848a8c4fb1da3465f03810a1e408fa97c46d9ec082c4ebba0c04a41293a23ea8
-DIST python2-pythondialog-3.4.0.tar.gz 1487867 BLAKE2B 795af99391e7a3d5e9b0657116dba8fd85819261a9ac590e797d0144577d66261529515cf8421a4724b6eacd0b6c7ae20d030bc7eb22c56ef870294c6f2386d3 SHA512 f4ec3e3eeab9ee00146b4604a8f72c765fcc164a24def0f1a9cbf083123e55dbe371ce6d4790ad4c0b5ee6905a1877f9b8e90ca3443a780fa0965c9bcf4bf629
 DIST python3-pythondialog-3.3.0.tar.bz2 1827891 BLAKE2B ef78832972cc2417ecedc797cb95ea10b1fcca4ff1ab2f7db74a9afaefddeedfee8303f2f4b9ff7230f3d2eea305e359f3854112abaefa2a4adf4c801de7ffe0 SHA512 b651593f077f6679be030182ac5f14a02d8bad86206c2733ba8b655d346809a32ea391de91e35101d400c55d9e8ecefaf6f1ba25fec036246186e13530f43a1f
 DIST python3-pythondialog-3.4.0.tar.bz2 1415324 BLAKE2B 1135df25b988dfaacd45a68dd918409e001719f92436e9e88fcf1a66e9ba70f03fdef1b86ebb80ca6a1c02006353ed3f9df998a5bfaacb9505d6e8a96a37d5d9 SHA512 a810128459133c4e416f4b04b8dd98b2230f046b8762e6b29c4e02e1458fa96029d37137a71cc01aee292106867a6f30026941ed1f727b7e48cbe976d96d7ed4
-EBUILD pythondialog-3.3.0-r200.ebuild 961 BLAKE2B 2d684342f5b3ab054680c5d8b47275d60eac52c6f7dc98daf3698be83f0362d97a50e7ecf2fec6e30c665babcf2956a3d519513879ae0b41467f61c7c0060884 SHA512 d6354568e8954d4ba430df9da5c634a6e5ad7918f1fd34bde8b511b9ccc4e44f037b8f29f8fc94e7a574b4f0d1acef37bd88d8600a352e3365caa600c34ecf45
-EBUILD pythondialog-3.3.0.ebuild 885 BLAKE2B f60672dd1d57f1680c85533076c5d81b8323d3933bdbfd31d36ad70f5860a4cf32026ba3193632d02bf006a2b6a79013ba7a50cfccb64cdaa9bce3b5b9b4fed9 SHA512 b5dd1a6549662d7202fb9176a0e53888d7ca5abb764a93b86e4eee893a103b4fbe2122ec504f319e5c1ce5020eb1488cf64c13e327ad839dd9e424bb2598ec48
-EBUILD pythondialog-3.4.0-r200.ebuild 952 BLAKE2B 4146f6224137fe1bad5ec24e15d7719c4f55d7f9cca4b12958382651d69c7f4e958d5f5858f1f56d423e6878973bc68fefdb59e4fcde3b4cb84a62d942d80820 SHA512 bea775822f922e4ed3f6bf0863d67b7f0cd1a6c1c4d6f3de5d409ad7d9a10cbd3cde09dfeb6f571b08d8a362f96a23b990ff80686ad5a24e928591e1747e8dc3
-EBUILD pythondialog-3.4.0.ebuild 879 BLAKE2B 2112737b5b94b3e9ac314d3d5c7462c2a6d8f5d334d67e199a9fd32ec67d9afb42cb71aa14d7c9ebdc41f7dee2aead9fbedd804bd15d1f51648d261e5bd4b05b SHA512 11f89132719bbb5423d4b6915c9068bee0411891777bb652affbfd9d39f660f95ef26584ce5ac8c3d1bb7b521566004b2d7dbbc42216c35ef6d09453f5a7df48
+EBUILD pythondialog-3.3.0.ebuild 932 BLAKE2B 4eb1fcaa43010d888a376392c9154048092f8876ece3b505fdee604ea44a992e38228c676528cf238050ffb770e84cc7a999c9f763770c9141dc86948681de62 SHA512 c587d7b4b3a7a4684524c9b0e2e9f2bf6e56caa2b4caa82c1b9b259cc0888ec33c6510a4eee7d4a2455a8d7b5876cdbe545564b6bfe89136bf4fd7980a400fcd
+EBUILD pythondialog-3.4.0.ebuild 937 BLAKE2B d14852f70eef826c406606d0189cc1244c3a8505619110b6594abcaac241552b5cca666cc26cf261144d71fae731c257b0098cc38ace9a66090b65ec29790b23 SHA512 ddb65c8c90ad30119a903a849878cfe5fe4bef49b065198b4386ec258c8f5e4ffcd5981999665ce363f20ca60541634db2ef18e259bd24db9d0bfc7812204f36
 MISC metadata.xml 380 BLAKE2B 184ae9fd2e4ea5b2591d87ad0f5ff4219bf853ed0a71ce7e027bcd9b53ae80c2141fb0674d8fdeb3527c368d75b8a8c84c2ff4bd6e136ad672d97277dda3eb13 SHA512 d806bf2a24b109013cc0dcebbb9bf17a21f0db4fab5a66ac16315c985178de28d0659647d4535123279b2b4ad36f7ee9a9ecf40d2cbb9bb06fbe054a5cfe21c3
diff --git a/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild b/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
deleted file mode 100644
index ba7858ff7a3c..000000000000
--- a/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
-HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.org/project/python2-pythondialog/"
-SRC_URI="mirror://pypi/${PN:0:1}/python2-${PN}/python2-${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="python-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-util/dialog"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/python2-${P}
-
-python_prepare_all() {
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pythondialog/pythondialog-3.3.0.ebuild b/dev-python/pythondialog/pythondialog-3.3.0.ebuild
index ec5ff06e4cdc..08b42b40f48d 100644
--- a/dev-python/pythondialog/pythondialog-3.3.0.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/pythondialog//${PV}/python3-${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc sparc x86"
 IUSE="doc examples"
 
 RDEPEND="dev-util/dialog"
@@ -28,7 +28,10 @@ python_compile_all() {
 }
 
 python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 	use doc && local HTML_DOCS=( doc/_build/html/. )
 
 	distutils-r1_python_install_all
diff --git a/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild b/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild
deleted file mode 100644
index e14a399c3c39..000000000000
--- a/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
-HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.org/project/python2-pythondialog/"
-SRC_URI="mirror://pypi/${PN:0:1}/python2-${PN}/python2-${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="python-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-util/dialog"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/python2-${P}"
-
-python_prepare_all() {
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pythondialog/pythondialog-3.4.0.ebuild b/dev-python/pythondialog/pythondialog-3.4.0.ebuild
index 3731822493e3..6463cb0c30b8 100644
--- a/dev-python/pythondialog/pythondialog-3.4.0.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.4.0.ebuild
@@ -29,7 +29,10 @@ python_compile_all() {
 }
 
 python_install_all() {
-	use examples && dodoc -r examples
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 	use doc && local HTML_DOCS=( doc/_build/html/. )
 
 	distutils-r1_python_install_all