gentoo resync : 31.01.2018

3 files changed, 48 insertions, 16 deletions

diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index ef0bb943b0cd..b8398b74017c 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -2,8 +2,10 @@ DIST python2-pythondialog-3.3.0.tar.gz 1906527 BLAKE2B 67fbb2dbd2b9c5f5da4c74f53
 DIST python2-pythondialog-3.4.0.tar.gz 1487867 BLAKE2B 795af99391e7a3d5e9b0657116dba8fd85819261a9ac590e797d0144577d66261529515cf8421a4724b6eacd0b6c7ae20d030bc7eb22c56ef870294c6f2386d3 SHA512 f4ec3e3eeab9ee00146b4604a8f72c765fcc164a24def0f1a9cbf083123e55dbe371ce6d4790ad4c0b5ee6905a1877f9b8e90ca3443a780fa0965c9bcf4bf629
 DIST python3-pythondialog-3.2.2.tar.bz2 1412368 BLAKE2B 2c20347a09720c15c696795826e9d24034a0f85b16936ff145511d50830e116436b30868bcd53fbe425929709f7bede0a422257ba8231a9f2846d3f15b3a7709 SHA512 58b84c0dd7b71ec9d1e60c4802cfc8e6cc72f79b8b6accd387553c685a92367d242746065bac6cb1c9d501ac291d9307cb2bb6b26694e9f24a3c5d6637a5bb8e
 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.2.2.ebuild 887 BLAKE2B c4f781b01a4ab36b9dcca8f908c7227d481f25eb9cbe344874e9c605f30c879450a3c2e9153c04607f6730ffa9003bb8f9e76a61ca898721b1ac303ca721c342 SHA512 e08875187db07029da90bf2fdeadd4cfe2e351a290c2bb5ebcbc790340c9181951bc6e1a27329b039e714508370b67448c100639723ba55d1359e15c6f89a2d0
 EBUILD pythondialog-3.3.0-r200.ebuild 972 BLAKE2B 06e244c9a8e6ca2e73cc8e9ad1d1651cfa2d69c19896ab99342bc8bdd81acd2b41b4deef957dc35f1a994e351be750f1aa3eeb0be8adbaf3a5ede7efa13d146d SHA512 65068ffed61eb8415fbac853cc0dcac3ac414eee181188dc3b65525a72c745f69459c013023d1437b497a8475374e6ded8443f59095a2ef03dbaacf2279cfe04
 EBUILD pythondialog-3.3.0.ebuild 893 BLAKE2B ee783b2698e86dc24e504069dc15aa91bf64e53ef90c20298faef43c3c42d607a66f241c80e00cf1aa2f21ec515dcddecad536688e231cca7c7805ec04266882 SHA512 1087dbcc93a4a2b40ccc70a7774574ce143fea57c897fe81ed3a9083be62b8f5147a10c68c68dd0ad0689d9611b6bb665fe8e970f02b2cc7c15a34d883516d80
-EBUILD pythondialog-3.4.0.ebuild 1108 BLAKE2B d7f768cb5b2e3fd78479196cd724797f71ec6e06d53f3f0f65d071e9a4ff5716f06dfecc1c7db42a9c2b71daa4294f2cfbbb680c3997ceae92fce63b19647032 SHA512 a225ad37f1b5529deb4f7f1186ebb325694b9dd18b6e782fd90c487728cb38d11bdcceca28f8e9863db471a3e307221ea78a1919a6c813447ba1298357981fae
+EBUILD pythondialog-3.4.0-r200.ebuild 963 BLAKE2B a8fb39ed1fe3959c6eab17431c82cf9df78ff1284d5764da68c0440929caf46ddac9f67eabf5072ac5e48ffb1e5b8b18abf9b42cae0fbf642e0e65f0f0ea87e5 SHA512 9ac28a2e725a86d15c25d874ec22032a5c7ffe7c62e035ae04b2d8a5a3837988d446ace9e682938dfac0dac0634b60168a3b0300305ca2bf228cb631eb4e2947
+EBUILD pythondialog-3.4.0.ebuild 888 BLAKE2B 254b7f799cbce18f52d5cb9600bc38c2ed48e7f62be29e4075918b47da7be3e3373f1262b4fcda27920b000750ee325fbc4e10e204ff6a6519b13ebaf62ddfb7 SHA512 e84d057d3eeb80f36383aded70a734cd240a26a373b61c3e28ba63be6758ecf2709f28dedbb00db9e6a35ab51856f8803c90c64e241266d3cebbe2ea356eb089
 MISC metadata.xml 380 BLAKE2B 184ae9fd2e4ea5b2591d87ad0f5ff4219bf853ed0a71ce7e027bcd9b53ae80c2141fb0674d8fdeb3527c368d75b8a8c84c2ff4bd6e136ad672d97277dda3eb13 SHA512 d806bf2a24b109013cc0dcebbb9bf17a21f0db4fab5a66ac16315c985178de28d0659647d4535123279b2b4ad36f7ee9a9ecf40d2cbb9bb06fbe054a5cfe21c3
diff --git a/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild b/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild
new file mode 100644
index 000000000000..78974d96017e
--- /dev/null
+++ b/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
+HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.python.org/pypi/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 35c80c28d2df..8a5f44a07b90 100644
--- a/dev-python/pythondialog/pythondialog-3.4.0.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.4.0.ebuild
@@ -1,32 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python3_{4,5,6} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
-HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.python.org/pypi/python2-pythondialog"
-SRC_URI="mirror://pypi/${PN:0:1}/python2-${PN}/python2-${P}.tar.gz"
+HOMEPAGE="http://pythondialog.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pythondialog//${PV}/python3-${P}.tar.bz2"
 
 LICENSE="LGPL-2"
-SLOT="python-2"
+SLOT="0"
 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() {
-	if python_is_python3; then
-		2to3 -w --no-diffs setup.py || die "could not convert to Python 3"
-	fi
-}
-
 python_prepare_all() {
 	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
 	distutils-r1_python_prepare_all
@@ -37,7 +29,7 @@ python_compile_all() {
 }
 
 python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
+	use examples && dodoc -r examples
 	use doc && local HTML_DOCS=( doc/_build/html/. )
 
 	distutils-r1_python_install_all