Merge remote-tracking branch 'remotes/Coacher/mpv-verbump-to-0.15.0'

Pull request: https://github.com/gentoo/gentoo/pull/675

4 files changed, 4 insertions, 109 deletions

diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index 998118b0b5f34..463c4fc33f409 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,5 +1,4 @@
-DIST bpython-0.13.1.tar.gz 156558 SHA256 ee208a60a54f902a8c827f4a80fda8a6235790d59cc1fc089943df50936accae SHA512 cb3f1e8d8df5eb9978956b3503ef98b1c39e80704792281be7e560ec0d648aefa6d979ab45a642ec369fc252e7fde399013aa1a4154ceb73465bc3d95bea4b19 WHIRLPOOL a5d00b92507d1970de95f20ee54723774432687b1f11637f3aa75f9e8979e93015034f37253bd947100436f8400cdbe2ba523b6517a7ba265950b3f20dc6f9db
 DIST bpython-0.13.2.tar.gz 158551 SHA256 a1870a78e44ed6ef54aa906c58234cb0d12011f2e9a49dc29bd5d9423abfbde2 SHA512 6bf74c9618bf92fc6ca23c9020b17219c64b16f159773624b67f87875c962857bde2dd4b03da621da7c8d50622739f95a880638c7c536f5f0dbf510c71f5a874 WHIRLPOOL 71da7518100bd73868ab53e1d13cb8831b0f6629713b993729948f38df52262537b8605f9304ff0edeca5e4f4d3435677c61e84b2d6fc54b2d66df74e756318c
-DIST bpython-0.14.1.tar.gz 184850 SHA256 d96224d55ffb99ef9d2565e9b18202080b3659408fcce2594c9ec7bde65d8eb1 SHA512 6583d74cae29244ceefcbb2aaf24e789dafd63f9295e3e848f9e298b958d4a344c606051a9efd7f5a728d3ad1b9e58d011931d14f7e60e7c1fbd8b38a2dd1b09 WHIRLPOOL f52e7660054af1547452d777801a79e028378ed1d2f3fdfd3a36e9e5a9154d8389a5eb37e108abef06eb178340be234dacc2b87567bcc37797d3f519b4ea6644
 DIST bpython-0.14.2.tar.gz 184808 SHA256 d1f03c9b64a67219ef41aec258c95f192ade5fd187d48fe61b15c1f1d707e302 SHA512 aa6fb8a6fe08746c31783308423400bf2482c6401fc03a1cf1e95592b83946b49eb8df29ac274d0711e01e7b2dcad37c00a609b3b600c31774563d0638d67159 WHIRLPOOL fe6847da5bb0b5b72f9230d175dbe0812a010281bf6a022f87196f71426a37d116a3bf9292cdd20fcd465e56d9b7c3d975028d2bb3a07afacc5c87f3b4b3d0f6
 DIST bpython-0.14.tar.gz 184430 SHA256 f7c9fc80fc5a4eb6a345a67815e31957c0c65c1bbdfc68cf99267cdc81a3d35b SHA512 1c43af30902ac01385a4f9d0af1f7531f190dea9ee0d43725d5a23d881874184beca1df9fc8f94f21110d99ca07a851861c56976199e9306515e2b00ca07f1f7 WHIRLPOOL 21dc44b48a0fb31d0c125fc203f90fe7750e81599353a51c215672ed82218fc3b4f544cdb530d6447d099e4eaa5983ad52b8f48e1e83bcf4799dad190af797eb
+DIST bpython-0.15.tar.gz 198852 SHA256 3f4f7a32416371da2ee0774726875ce63d3f9fed8b58e5a9ad1580b33fd3cef7 SHA512 421a4c8cd7885b0cc73c38ca89bfdbe6535fc4f4575c42195b1b6a9ccdb68e8c3491ebefd7439241f322c3e4ae0a37679253ae8f63b41fc2cfc7fc2ab77b8867 WHIRLPOOL e6a83335d7ea2d099098fb3014aa212a14e71786c9d7e323cf0bba7223b98b9b4cffbeb214de53d9e00b03088304d41fedc37334266fa7e44ae4e905132c72c8
diff --git a/dev-python/bpython/bpython-0.13.1.ebuild b/dev-python/bpython/bpython-0.13.1.ebuild
deleted file mode 100644
index 4e37da26f2580..0000000000000
--- a/dev-python/bpython/bpython-0.13.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-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/ https://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 test"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	gtk? ( dev-python/pygobject:2[$(python_gen_usedep python2_7)]
-		dev-python/pygtk[$(python_gen_usedep python2_7)] )
-	dev-python/urwid[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-DOCS=( AUTHORS  CHANGELOG  TODO sample-config sample.theme light.theme )
-
-PATCHES=( "${FILESDIR}"/${PN}-desktop.patch
-		"${FILESDIR}"/${PN}-0.13-test_repl.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
-
-	"${PYTHON}" -m unittest discover || die
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/bpython/bpython-0.14.1.ebuild b/dev-python/bpython/bpython-0.15.ebuild
index 6d90b58490357..4ac804f335a19 100644
--- a/dev-python/bpython/bpython-0.14.1.ebuild
+++ b/dev-python/bpython/bpython-0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,11 +11,8 @@ 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/ https://pypi.python.org/pypi/bpython"
-SRC_URI="
-	http://www.bpython-interpreter.org/releases/${P}.tar.gz
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	"
+HOMEPAGE="http://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.python.org/pypi/bpython"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/bpython/files/bpython-0.13-test_repl.patch b/dev-python/bpython/files/bpython-0.13-test_repl.patch
deleted file mode 100644
index b71cfbea3440e..0000000000000
--- a/dev-python/bpython/files/bpython-0.13-test_repl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bitbucket.org/thomasballinger/bpython-for-clean-patch/commits/94c4664c1303
-# HG changeset patch
-# User Thomas Ballinger <thomasballinger@gmail.com>
-# Date 1404088731 14400
-# Branch 0.13-bugfix
-# Node ID 94c4664c130303b1ae53629d6ebcff04f5d5d7ae
-# Parent  106c49981f5e2db325d543d24c063f9c38013023
-simplest possible fix for test that changes in py3.3
-
-diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
---- a/bpython/test/test_repl.py
-+++ b/bpython/test/test_repl.py
-@@ -1,4 +1,5 @@
- import os
-+import sys
- import unittest
- from itertools import islice
- from mock import Mock
-@@ -280,8 +281,12 @@
- 
-         self.assertTrue(self.repl.complete())
-         self.assertTrue(hasattr(self.repl.completer,'matches'))
--        self.assertEqual(self.repl.completer.matches,
--            ['UnboundLocalError(', '__doc__'])
-+        if sys.version_info[0] == 3 and sys.version_info[1] >= 3:
-+            self.assertEqual(self.repl.completer.matches,
-+                ['ChildProcessError(', 'UnboundLocalError(', '__doc__'])
-+        else:
-+            self.assertEqual(self.repl.completer.matches,
-+                ['UnboundLocalError(', '__doc__'])
- 
-     # 2. Attribute tests
-     def test_simple_attribute_complete(self):
-