Fix miniterm.py with Python 3 (bug #341641).

(Portage version: 2.2.0_alpha1_p7/cvs/Linux x86_64)

3 files changed, 78 insertions, 1 deletions

diff --git a/dev-python/pyserial/ChangeLog b/dev-python/pyserial/ChangeLog
index 6e06a612a029..504feaae0a87 100644
--- a/dev-python/pyserial/ChangeLog
+++ b/dev-python/pyserial/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyserial
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/ChangeLog,v 1.55 2010/10/22 01:38:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/ChangeLog,v 1.56 2010/10/24 09:58:57 arfrever Exp $
+
+*pyserial-2.5-r1 (24 Oct 2010)
+
+  24 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +pyserial-2.5-r1.ebuild, +files/pyserial-2.5-python-3.patch:
+  Fix miniterm.py with Python 3 (bug #341641).
 
   22 Oct 2010; Jeroen Roovers <jer@gentoo.org> pyserial-2.5.ebuild:
   Stable for HPPA (bug #341517).
diff --git a/dev-python/pyserial/files/pyserial-2.5-python-3.patch b/dev-python/pyserial/files/pyserial-2.5-python-3.patch
new file mode 100644
index 000000000000..5ad5c6c80524
--- /dev/null
+++ b/dev-python/pyserial/files/pyserial-2.5-python-3.patch
@@ -0,0 +1,43 @@
+http://pyserial.svn.sourceforge.net/viewvc/pyserial?view=revision&revision=381
+
+--- setup.py
++++ setup.py
+@@ -1,7 +1,13 @@
+-# setup.py for pyserial
++# setup.py for pySerial
+ #
+-# windows installer:
+-#  python setup.py bdist_wininst
++# Windows installer:
++#   "python setup.py bdist_wininst"
++#
++# Direct install (all systems):
++#   "python setup.py install"
++#
++# For Python 3.x use the corresponding Python executable,
++# e.g. "python3 setup.py ..."
+ 
+ import sys
+ 
+@@ -9,10 +15,12 @@
+ 
+ try:
+     from distutils.command.build_py import build_py_2to3 as build_py
++    from distutils.command.build_scripts import build_scripts_2to3 as build_scripts
+ except ImportError:
+     if sys.version_info >= (3, 0):
+         raise ImportError("build_py_2to3 not found in distutils - it is required for Python 3.x")
+     from distutils.command.build_py import build_py
++    from distutils.command.build_scripts import build_scripts
+     suffix = ""
+ else:
+     suffix = "-py3k"
+@@ -60,7 +68,7 @@
+         'Topic :: Terminals :: Serial',
+     ],
+     platforms = 'any',
+-    cmdclass = {'build_py': build_py},
++    cmdclass = {'build_py': build_py, 'build_scripts': build_scripts},
+ 
+     scripts = ['examples/miniterm.py'],
+ )
diff --git a/dev-python/pyserial/pyserial-2.5-r1.ebuild b/dev-python/pyserial/pyserial-2.5-r1.ebuild
new file mode 100644
index 000000000000..4cb6a8b3e4fd
--- /dev/null
+++ b/dev-python/pyserial/pyserial-2.5-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/pyserial-2.5-r1.ebuild,v 1.1 2010/10/24 09:58:57 arfrever Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils
+
+DESCRIPTION="Python Serial Port Extension"
+HOMEPAGE="http://pyserial.sourceforge.net/ http://sourceforge.net/projects/pyserial/ http://pypi.python.org/pypi/pyserial"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DOCS="CHANGES.txt README.txt"
+PYTHON_MODNAME="serial"
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-python-3.patch"
+}