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

Package-Manager: portage-2.2.0_alpha1_p7/cvs/Linux x86_64

4 files changed, 81 insertions, 2 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/Manifest b/dev-python/pyserial/Manifest
index 4dcdccf066e7..3520c15feaab 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,6 +1,8 @@
+AUX pyserial-2.5-python-3.patch 1216 RMD160 aeb9f8083bb652da9d1cc1ca2ee8e1e740461f42 SHA1 6f7ec4164967bf6bd8ad4e7a18331cbf67a865a4 SHA256 106195813396b9dcd86ebcddac8c68e6cc07c93783c685b87c06d8249f15bd63
 DIST pyserial-2.5-rc2.tar.gz 104666 RMD160 7e1713bea57fce0c959b442badb71b354709d04c SHA1 811823f352d3cf075238bd0cccadfa14d9b88e28 SHA256 e18a54cd8c917c695fc7aabfa44aa951f4e639a1fdd75f2d09845eb990838725
 DIST pyserial-2.5.tar.gz 106278 RMD160 026c5937d5fba67a72445b5c193a337aa3776505 SHA1 fd991f9cf9bb02dfb3bd2cb48b582c2216f90031 SHA256 eddd22280e0dac0888c6cddd8906ebd902fa42467fee151c43ecde4196bbf511
+EBUILD pyserial-2.5-r1.ebuild 793 RMD160 06b79923eb4e6105659c2fb6cb4e5123ed0da47f SHA1 b3aec79f152e37b0289c14ecd0136b38ea7ca12f SHA256 ea0f3c69673e16d8436fc5eb14520b6cca832b66034614b1a5a331e3795157b6
 EBUILD pyserial-2.5.ebuild 692 RMD160 b50ab7a10a2dcde3c8931d62a6e6cafed116e340 SHA1 104f4ca33c190073f0c26166ca231033d2772b2c SHA256 4fdc52aba7193f171afd3dbf43bd940bed6ff9d998a99cf209fb56e0b1d94d22
 EBUILD pyserial-2.5_rc2.ebuild 758 RMD160 ffa69824b24160bae0cc895d6c34c9198266e0c1 SHA1 a511bfa224f1d04ef38c3d4af90f1f412de180d6 SHA256 a6ded5b6edfed0914d9a3f2e956dd79929b49ad583a054b61b4a15a6e4f27b3e
-MISC ChangeLog 6115 RMD160 040e4c0f619801a2a15f21924b0589388c62217f SHA1 0c840d06c8c3ba58b2b4fff2f7a7012c9cd423f1 SHA256 af9a60848fdbc3ddd66d76b5d0bba1c780992fa27f5dfddce0f4a2dfcf331d21
+MISC ChangeLog 6336 RMD160 c7e39a7f282fc8803ad9846b3a8b54003a6372a6 SHA1 71f97979d77564acba9722e75ac7a3aea68a3b98 SHA256 fb351216c30acd7ff4496bfd22eed65c2880448302c15dd40e5d49033eb4500c
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
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"
+}