Fix raising of exceptions for compatibility with Python 2.6.

(Portage version: HEAD/cvs/Linux x86_64)

3 files changed, 83 insertions, 1 deletions

diff --git a/dev-python/happydoc/ChangeLog b/dev-python/happydoc/ChangeLog
index 0da986b83441..cc47196f631a 100644
--- a/dev-python/happydoc/ChangeLog
+++ b/dev-python/happydoc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/happydoc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/happydoc/ChangeLog,v 1.24 2010/07/28 21:50:19 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/happydoc/ChangeLog,v 1.25 2010/07/28 22:14:39 arfrever Exp $
+
+*happydoc-3.1-r1 (28 Jul 2010)
+
+  28 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -happydoc-3.1.ebuild, +happydoc-3.1-r1.ebuild,
+  +files/happydoc-3.1-python-2.6.patch:
+  Fix raising of exceptions for compatibility with Python 2.6.
 
   28 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   happydoc-3.1.ebuild:
diff --git a/dev-python/happydoc/files/happydoc-3.1-python-2.6.patch b/dev-python/happydoc/files/happydoc-3.1-python-2.6.patch
new file mode 100644
index 000000000000..4cced8e25833
--- /dev/null
+++ b/dev-python/happydoc/files/happydoc-3.1-python-2.6.patch
@@ -0,0 +1,28 @@
+--- happydoclib/CommandLineApp.py
++++ happydoclib/CommandLineApp.py
+@@ -102,10 +102,21 @@
+     #
+     # Exception names
+     #
+-    ReservedOptionName = 'Reserved option name'
+-    HelpRequested='Help requested'
+-    InvalidOptionValue='Invalid value for option'
+-    InvalidArgument='Invalid argument to program'
++    class ReservedOptionName(ValueError):
++        'Reserved option name'
++        pass
++
++    class HelpRequested(ValueError):
++        'Help requested'
++        pass
++
++    class InvalidOptionValue(ValueError):
++        'Invalid value for option'
++        pass
++
++    class InvalidArgument(ValueError):
++        'Invalid argument to program'
++        pass
+ 
+     #
+     # Globally useful configuration stuff.
diff --git a/dev-python/happydoc/happydoc-3.1-r1.ebuild b/dev-python/happydoc/happydoc-3.1-r1.ebuild
new file mode 100644
index 000000000000..d2763c2d1d72
--- /dev/null
+++ b/dev-python/happydoc/happydoc-3.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/happydoc/happydoc-3.1-r1.ebuild,v 1.1 2010/07/28 22:14:39 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils versionator
+
+MY_PN="HappyDoc"
+MY_PV=$(replace_all_version_separators "_" ${PV})
+MY_V=$(get_major_version ${PV})
+
+DESCRIPTION="Tool for extracting documentation from Python source code"
+HOMEPAGE="http://happydoc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}_r${MY_PV}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND=""
+
+# Tests need extra data not present in the release tarball.
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_PN}${MY_V}-r${MY_PV}"
+
+PYTHON_MODNAME="happydoclib"
+
+src_prepare() {
+	distutils_src_prepare
+	cp "${FILESDIR}/${P}-setup.py" setup.py || die "Copying of setup.py failed"
+	epatch "${FILESDIR}/${P}-python-2.6.patch"
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dohtml -r "srcdocs/${MY_PN}${MY_V}-r${MY_PV}"/* || die "Installation of documentation failed"
+	fi
+}