From 1592545eafaaf0bffe66917b25a59647427fd4d5 Mon Sep 17 00:00:00 2001
From: Maxim Koltsov <maksbotan@gentoo.org>
Date: Sun, 6 Nov 2011 08:49:29 +0000
Subject: Fix various errors in ebuild, thanks to Arfrever.

(Portage version: 2.1.10.32/cvs/Linux x86_64)
---
 dev-python/ipaddr/ChangeLog           |  5 ++++-
 dev-python/ipaddr/ipaddr-2.1.9.ebuild | 37 ++++++++++++++++++++++++++---------
 2 files changed, 32 insertions(+), 10 deletions(-)

(limited to 'dev-python')

diff --git a/dev-python/ipaddr/ChangeLog b/dev-python/ipaddr/ChangeLog
index 0bb6446a325d..2d85460d0ef8 100644
--- a/dev-python/ipaddr/ChangeLog
+++ b/dev-python/ipaddr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/ipaddr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipaddr/ChangeLog,v 1.1 2011/11/04 21:12:51 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipaddr/ChangeLog,v 1.2 2011/11/06 08:49:29 maksbotan Exp $
+
+  06 Nov 2011; Maxim Koltsov <maksbotan@gentoo.org> ipaddr-2.1.9.ebuild:
+  Fix various errors in ebuild, thanks to Arfrever.
 
 *ipaddr-2.1.9 (04 Nov 2011)
 
diff --git a/dev-python/ipaddr/ipaddr-2.1.9.ebuild b/dev-python/ipaddr/ipaddr-2.1.9.ebuild
index 8fd6f689e5ca..344ce5e09a53 100644
--- a/dev-python/ipaddr/ipaddr-2.1.9.ebuild
+++ b/dev-python/ipaddr/ipaddr-2.1.9.ebuild
@@ -1,23 +1,42 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipaddr/ipaddr-2.1.9.ebuild,v 1.1 2011/11/04 21:12:51 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipaddr/ipaddr-2.1.9.ebuild,v 1.2 2011/11/06 08:49:29 maksbotan Exp $
 
-EAPI=3
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.6"
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
 
 inherit distutils
 
 DESCRIPTION="Python IP address manipulation library"
-HOMEPAGE="http://code.google.com/p/ipaddr-py/"
+HOMEPAGE="http://code.google.com/p/ipaddr-py/ http://pypi.python.org/pypi/ipaddr"
 SRC_URI="http://ipaddr-py.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="${DEPEND}"
-DOCS=(PKG-INFO README RELEASENOTES)
+RDEPEND=""
+
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+DOCS="README RELEASENOTES"
+PYTHON_MODNAME="ipaddr.py"
+
+src_prepare() {
+	distutils_src_prepare
+
+	preparation() {
+		if [[ "$(python_get_version -l --major)" == "3" ]]; then
+			2to3-${PYTHON_ABI} -nw --no-diffs ipaddr.py ipaddr_test.py
+		fi
+	}
+	python_execute_function -s preparation
+}
+
+src_test() {
+	testing() {
+		PYTHONPATH="build/lib" "$(PYTHON)" ipaddr_test.py
+	}
+	python_execute_function -s testing
+}
-- 
cgit v1.2.3-65-gdbad