summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Koltsov <maksbotan@gentoo.org>2011-11-06 08:49:29 +0000
committerMaxim Koltsov <maksbotan@gentoo.org>2011-11-06 08:49:29 +0000
commit15a4865e049a54144b783db27e46e308e1d51809 (patch)
tree6030422eda1ea812756ab47d0675c390c474baae /dev-python/ipaddr
parent[bump] dev-perl/perl-ldap-0.430.0 (diff)
downloadhistorical-15a4865e049a54144b783db27e46e308e1d51809.tar.gz
historical-15a4865e049a54144b783db27e46e308e1d51809.tar.bz2
historical-15a4865e049a54144b783db27e46e308e1d51809.zip
Fix various errors in ebuild, thanks to Arfrever.
Package-Manager: portage-2.1.10.32/cvs/Linux x86_64
Diffstat (limited to 'dev-python/ipaddr')
-rw-r--r--dev-python/ipaddr/ChangeLog5
-rw-r--r--dev-python/ipaddr/Manifest4
-rw-r--r--dev-python/ipaddr/ipaddr-2.1.9.ebuild37
3 files changed, 34 insertions, 12 deletions
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/Manifest b/dev-python/ipaddr/Manifest
index 0cfd6c40b7a2..7e97e677bb3e 100644
--- a/dev-python/ipaddr/Manifest
+++ b/dev-python/ipaddr/Manifest
@@ -1,4 +1,4 @@
DIST ipaddr-2.1.9.tar.gz 28092 RMD160 c9133da2a57fe06564dc5b10c56add676ab920f3 SHA1 3f6c49e1629ea663e60777b8134888ae038c03be SHA256 a0193fb61f59ff4c5d030eb2e24ef5550438693e5f388d526d473cac1859fc99
-EBUILD ipaddr-2.1.9.ebuild 584 RMD160 4febc29215ae891e4e777ca54b2556b153cd07ad SHA1 3fca77857d4d74793ffe8b06bb22327f111a5dc0 SHA256 72e78d6766727bf66e6bb0af132726e83a7b7ae0c179577e9ecda55de08f2b8b
-MISC ChangeLog 396 RMD160 acaaef2977512e603d74c0e1492cc5f1066a38b2 SHA1 eef2ba62cdd18ba6b6aabef1f24a1a7e4575c7df SHA256 9fd3f02c9485fe0ec6e84efac01e139fecdf01f7d31eb192922c80b6c55d0fff
+EBUILD ipaddr-2.1.9.ebuild 1005 RMD160 a94c7ae0e1a1c52d706c665095e254637d665b54 SHA1 54d9494ff6dae59aac8a1f35f81070f2a8da59e5 SHA256 d12d7f8291c5fd33e4bfb50eee33171effd0df0344b38f1ecdd73ab0ae990f46
+MISC ChangeLog 522 RMD160 82f0b836498304207891173ec8960f6f99ad3379 SHA1 d5285a30764e5e695d026aaf96dc3337589ac23d SHA256 fc8d2d4660a5b4f1434d7de14b451c7d96a4928317d0f04539795fc74bb50589
MISC metadata.xml 327 RMD160 4d929f82166d31d5710f17e78f8c66f8fecef407 SHA1 cde31cdfff5ff2543719f2d83cf074261e06910a SHA256 ad8f529f9a202f44af4371b094874e9cd0857e8325396676a189b91e5dd544fc
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
+}