add py3 support, upgrade deps, IUSE doc & doc build, test phase, remove IUSE urwid and set urwid as hard dep

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 82 insertions, 66 deletions

diff --git a/dev-python/bpython/ChangeLog b/dev-python/bpython/ChangeLog
index b3bf3f5f8fe5..948063d8b76f 100644
--- a/dev-python/bpython/ChangeLog
+++ b/dev-python/bpython/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/bpython
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bpython/ChangeLog,v 1.37 2013/04/10 17:18:00 floppym Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bpython/ChangeLog,v 1.38 2014/06/05 08:35:31 idella4 Exp $
+
+*bpython-0.13 (05 Jun 2014)
+
+  05 Jun 2014; Ian Delaney <idella4@gentoo.org> +bpython-0.13.ebuild,
+  -bpython-0.11.ebuild:
+  add py3 support, upgrade deps, IUSE doc & doc build, test phase, remove IUSE
+  urwid and set urwid as hard dep
 
   10 Apr 2013; Mike Gilbert <floppym@gentoo.org> bpython-0.12.ebuild:
   Restrict python2.5 due to syntax error in autocomplete.py.
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index 58f138da33de..038c4e9ae46e 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -2,16 +2,16 @@
 Hash: SHA256
 
 AUX bpython-desktop.patch 374 SHA256 ce2a6de9b55f40a5dd0cf8177d405af740f58272a4b3cdd5c1ce70164e3ab991 SHA512 41e6e74bc1edb4631d4926588aa361234560b95d63d07c4d7005ea1577a6d324f49ae9dcd0ede2ecaec9532a3e48075040c53deeeaf9e1a97ab7749fedecc0bb WHIRLPOOL 66e8e114cd4ae9fd94f474deb29a380497103049876049f7fe64c9a1aea95307828ebb8732fd82980d0021954e83f1c66793f1c19a23b3023af285539c7657ea
-DIST bpython-0.11.tar.gz 86569 SHA256 60cf39712564f0a2516f7b0acf86f3c0392e67a79914eeed189400ffaaaeb309 SHA512 fc798422bd8220220302f08d919c854b832ebb9174e1467dc416e29bd47d69d58f910b827be67ac6c7516ed9b8d02f7706e6e2ecd790e9ccc6bc4d4cc5e8cbf7 WHIRLPOOL f8ca4fa4ad19527e476953ef20d3f4bd159cfde5d355bb2e3f28f5f9d5c8e46e552790a8d665126be9bfe34cbb331f27c2e1c034e59722ec61836d7604bcadf5
 DIST bpython-0.12.tar.gz 130968 SHA256 74a9074c5d5448e09ea9efe6b5305a4f580617d73c38f21eab5fe983312a8ec6 SHA512 001deb068dbc31e592b1c9c524cfbb5061cc9f1abb30d7597472920032285d20632f4ca75a10d4444be947413f9d2d65f476b64a66717956bca7d52b6b7ce948 WHIRLPOOL 15c7b6821af6893a88f91bc25b624af99423324a29bfc97eae5861a83e722cb1e3da478ef1838bb650e836e2b3e51dc90a5cca130bd95e64c3e0d8799af082b2
-EBUILD bpython-0.11.ebuild 1504 SHA256 4522ca77367ab6a2f31a2a384cbaf8bf9bfe901f513edb55a500bc6ba5dd403c SHA512 54a069338289541512f71f033d2152f61f11d07182495b49d6e89e25ed2ba5edc6db3ec594f8ae77ebf8b0a23c4beb76a4d499afbbc05d19bc902d3cc7525613 WHIRLPOOL dab344d54bb70a83598d7e89ac5df8bc6b7dd0ad6430baa94b9aa1caf0e49d61b0fc73e5ad0dfd3d0b934343b986f03de7be72b964b2673d9fdd905c584a2b0c
+DIST bpython-0.13.tar.gz 153843 SHA256 151cadfa376341c04728c9f1cf54c28528ffa2f9f7e420bcdf517169eb55260a SHA512 72eaa6a5fc9275381e64a96d7bdc72faff5b1bfbe598ee3a7afbd0a149d94084e4d70329b479d8581a3b110cc8031276be0a3bf64a92a4cdf1cde4b8dd606268 WHIRLPOOL 82b920100084443a57d400b8791155cfe01978c62ee5556379e1fd563c2094adeb24473da0eb282ae0b20666d9ca7760a8fa97bb4d4b94f1be646f22a24ccb3b
 EBUILD bpython-0.12.ebuild 1513 SHA256 decdc8795bdf2313787d31cd13602a1719375cd36f18ec016cf6a8bb058898a8 SHA512 db8481456253fc22839babb8923443b827563d62cfe3efa6592824ddc48f93d08c264dfafcae4a4788ad3a262943841f004b345f210c0f6845b0719d9a520dd9 WHIRLPOOL 34d509997e37c894a87ab88f6c98027bcea2c2130f6a7623c006a1100df8804de90ded673629f16e8fd12fe03c0955c7d2306c32097cbeb4e87f0392a5a3f7a3
-MISC ChangeLog 5176 SHA256 d24bb868460541380479e8436721ac7049b418429961cdb63f7ea5edc22b301c SHA512 fa2639ee14e5c9ad98a97ff76f476d86de1a72ea571b6edfbcfe5eda8490ad2d79298c5c8b99fb3cc6907e0dee48f39fc004b71aa071ff07af6d6816699c8c78 WHIRLPOOL 55435f8f568367f6ca9ff9149dbc92f376ac6dd63657998bc601f0e2c62508a7f1d3b2e6c1dcf2d32b23cbb9fbd4fb9abaf5e4ec22657dfffa709d20374f5b35
+EBUILD bpython-0.13.ebuild 2035 SHA256 891f0655bdfd43f113bf84729068eb14187046dbb15b5aef2d5a6bb58c88909e SHA512 31c52eab75e9ebc91e22889a5e828f100f88951952c8f342501ed07acbe97e635cbfcb1b78bb8b91029f45b812bfa23d318bb388bdb8a3c6105e664c834d732a WHIRLPOOL 525bc98b2fd2da3a7910ea1d1505fcd12139b3dfcfa02f37704c588e11210af98b73e9f0c32cad252e58bc39bfc62b773d604f69f03e42bc6ec61bd9e1f33d9c
+MISC ChangeLog 5413 SHA256 9f2c83f851da0319d022aa6680d9c66bf435c38ddb23be01dbe2f3a557dba353 SHA512 65bb9cf7018edd27189b6b644ba135c7a172fd8a13aae415c93a1bccab7bf31b17102d2c720be40556894969ead6885024c8a3d8bb767b9ee3462b959817d1f5 WHIRLPOOL 6776a54e786bde4535b4524d2a7e1f6ec97e7384c7ec15b46aabc19f784d0256542196e62edc07977e943bac43cf7c456136c6746ecabc90afba111c1e4cba45
 MISC metadata.xml 449 SHA256 4b992d5cc49195e1023670ae41e3a9092a655e92aa80fe718aa4a8af6b9d76ec SHA512 618449ef58c211c7142b783c07ac5bb7b480c854314a1190e8969f3836129e83bbb2e664b84c7a1aea688466527d01f3e77cf278f299118e5c2977866ace8cfe WHIRLPOOL 15f384f63a48ffdfa1caea0388e225eedbb0b81e821e83e4aea07d69be62ff1bc1905182e673f7f7606a13856f57b8c35bf0f081169eeff5ecfa082b30987d18
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlFlnskACgkQC77qH+pIQ6TWrgEAvQ5VC2ngUnbA1scXF0ScE3DZ
-iqKXTgcLjKP0CspBW14BAK4An+S1DOd1Ae0qa/KpoX5KPxqEvx/qGQz1vY4+A5eP
-=xP9/
+iEYEAREIAAYFAlOQKfYACgkQso7CE7gHKw2MdgCgw677Bs8ZNq/1TWCkQ2Vk7Jd3
+PBMAnRTuh4sSJcHKfxLnuUVxkvGMNViV
+=2e5n
 -----END PGP SIGNATURE-----
diff --git a/dev-python/bpython/bpython-0.11.ebuild b/dev-python/bpython/bpython-0.11.ebuild
deleted file mode 100644
index b948b9e99037..000000000000
--- a/dev-python/bpython/bpython-0.11.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bpython/bpython-0.11.ebuild,v 1.4 2012/11/20 20:47:49 ago Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 *-jython"
-PYTHON_USE_WITH="ncurses"
-
-inherit distutils eutils
-
-DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="http://www.bpython-interpreter.org/ https://bitbucket.org/bobf/bpython/ http://pypi.python.org/pypi/bpython"
-SRC_URI="http://www.bpython-interpreter.org/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk urwid"
-
-RDEPEND="dev-python/pygments
-	dev-python/setuptools
-	gtk? ( dev-python/pygobject:2 dev-python/pygtk )
-	urwid? ( dev-python/urwid )"
-DEPEND="${RDEPEND}"
-
-DOCS="sample-config sample.theme light.theme"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}"/${PN}-desktop.patch
-}
-
-src_install() {
-	distutils_src_install
-
-	if use gtk; then
-		# pygobject and pygtk currently don't support Python 3.
-		rm -f "${ED}"usr/bin/bpython-gtk-3.*
-	else
-		rm -f "${ED}"usr/bin/bpython-gtk*
-
-		delete_unneeded_modules() {
-			rm -f "${ED}$(python_get_sitedir)/bpython/gtk_.py"
-		}
-		python_execute_function -q delete_unneeded_modules
-	fi
-	if ! use urwid; then
-		rm -f "${ED}"usr/bin/bpython-urwid*
-
-		delete_urwid() {
-			rm -f "${ED}$(python_get_sitedir)/bpython/urwid.py"
-		}
-		python_execute_function -q delete_urwid
-	fi
-}
diff --git a/dev-python/bpython/bpython-0.13.ebuild b/dev-python/bpython/bpython-0.13.ebuild
new file mode 100644
index 000000000000..3c076080d745
--- /dev/null
+++ b/dev-python/bpython/bpython-0.13.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bpython/bpython-0.13.ebuild,v 1.1 2014/06/05 08:35:31 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
+HOMEPAGE="http://www.bpython-interpreter.org/ https://bitbucket.org/bobf/bpython/ http://pypi.python.org/pypi/bpython"
+SRC_URI="http://www.bpython-interpreter.org/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gtk"
+
+RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	gtk? ( dev-python/pygobject:2[$(python_gen_usedep python2_7)]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pygtk[$(python_gen_usedep python2_7)] )
+	dev-python/urwid[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+DOCS=( AUTHORS  CHANGELOG  TODO sample-config sample.theme light.theme )
+
+PATCHES=( "${FILESDIR}"/${PN}-desktop.patch )
+# Req'd for clean build by each impl
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c doc/sphinx/source/ \
+			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use gtk; then
+		rm -f "${D}"usr/bin/bpython-gtk*
+		# delete_unneeded_modules() {
+		rm -f "${D}$(python_get_sitedir)/bpython/gtk_.py"
+	fi
+}
+
+python_test() {
+	pushd build/lib > /dev/null
+	# https://bitbucket.org/bobf/bpython/issue/289/test-failures-in-latest-release-py27-py33
+	sed -e s':test_enter:_&:' -i bpython/test/test_repl.py || die
+	if python_is_python3; then
+		sed -e s':test_fuzzy_global_complete:_&:' \
+			-i bpython/test/test_repl.py || die
+	fi
+	"${PYTHON}" -m unittest discover || die "dud"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
+	distutils-r1_python_install_all
+}