Set SUPPORT_PYTHON_ABIS.

Package-Manager: portage-15825-svn/cvs/Linux x86_64

diff --git a/dev-python/ldaptor/ChangeLog b/dev-python/ldaptor/ChangeLog
index b2993673489bccec11afb471174d83cbee8c18b8..c5f799a7625d2282e4badb99d1ecb68ac3ae3104 100644 (file)
--- a/dev-python/ldaptor/ChangeLog
+++ b/dev-python/ldaptor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/ldaptor
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ChangeLog,v 1.34 2010/02/07 21:07:10 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ChangeLog,v 1.35 2010/03/13 19:14:42 arfrever Exp $
+
+  13 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  ldaptor-0.0.43.ebuild:
+  Set SUPPORT_PYTHON_ABIS.
 
   07 Feb 2010; Peter Volkov <pva@gentoo.org> ldaptor-0.0.43.ebuild:
   Add inherit eutils: epatch is defined there.

diff --git a/dev-python/ldaptor/Manifest b/dev-python/ldaptor/Manifest
index 130ff02a1b77d7b694cd28ee65debc4c4ab156c0..0933580bab75e21142fc541f2e339a92cdec37ff 100644 (file)
--- a/dev-python/ldaptor/Manifest
+++ b/dev-python/ldaptor/Manifest
@@ -2,6 +2,6 @@ AUX ldaptor-0.0.43-usage-exception.patch 473 RMD160 fd5308e078d31c8b1463952c64fc
 AUX ldaptor-0.0.43-zope_interface.patch 2626 RMD160 a306b8f65b8e8bb30aa3016ee45a3cdbd06d786d SHA1 49ff6889f9ee2a1ffec3cadba119c2db9d761682 SHA256 bcbc0eb57e3901ecf612f86f0bbc5670bf58c113ab0830db26b043516fd8ebda
 DIST ldaptor-0.0.42-dia-pictures.tar.gz 74408 RMD160 5940aea2fa95174bf8c997213de21e8264b38cfd SHA1 1d187242f337e04056316e395f99873c0497dfe6 SHA256 17b60874e9b5d6d6bf50f6a72a1a6b5b253d469df50b1bbcdd9100147329ef60
 DIST ldaptor_0.0.43.orig.tar.gz 222978 RMD160 d93f1f6ba02a7e43fd22e93aa7510e584b35d435 SHA1 ac80cd2820d849269f78cc42794800a868cbd997 SHA256 e3d301090e4fa265c9a01fd416801de4a0ac2274bfeb16b9d0114e99bd3f01bc
-EBUILD ldaptor-0.0.43.ebuild 2207 RMD160 800ad27150acd01524cca2b1191312955b9ae32c SHA1 b8bcaf1295c8e258c96a4f1c8a6301242a3c9847 SHA256 88244f6556fcc1b2f95e54f8d199d1513c8d69d92628b94aeca70f4e34c7e436
-MISC ChangeLog 4359 RMD160 deaa8d16a98193a2b7b89f5c9d0b5a010baf45e7 SHA1 d74fc0e27ef5bfe0a1b9f764a3139c170f92adb6 SHA256 61f1d2deb233ac0002210147398ea005757c74a59f625b1482d5e0eac2e2a554
+EBUILD ldaptor-0.0.43.ebuild 2295 RMD160 da0b52bad32da621da8c93f7d8d3c26c5e914a4c SHA1 c7882aa7d9616740677d03a0c807e00e4874c32b SHA256 ae876819ceadebfb830122f86bccf6b4573bdafa2169919710c9028f9b700848
+MISC ChangeLog 4490 RMD160 abc45eafeaab115c29ce54e5d39da211dd5ae9b5 SHA1 2de183a3c74d24539cb01826f4fe0b418ea41e47 SHA256 f1da7568daef1c0d3f8c16621e4f78792553b4540fe342e79faccebc6b4d9853
 MISC metadata.xml 270 RMD160 7a98f8f507fd60d0ccf93eb274c53a6f11fe3e1e SHA1 5ba78e176fd70696b16ce2eb0262a876e8b5ae1b SHA256 51e81eb0c3b15224e9a0a3e25ed53c2b8bf379ae0e004cf33f4f6391c6161a47

diff --git a/dev-python/ldaptor/ldaptor-0.0.43.ebuild b/dev-python/ldaptor/ldaptor-0.0.43.ebuild
index a87102558d449acd837f8d511c47a5d498eefdd7..97b109cded53f936175ab6bdc6026c4dd9fac2c3 100644 (file)
--- a/dev-python/ldaptor/ldaptor-0.0.43.ebuild
+++ b/dev-python/ldaptor/ldaptor-0.0.43.ebuild
@@ -1,8 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ldaptor-0.0.43.ebuild,v 1.14 2010/02/07 21:07:10 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ldaptor-0.0.43.ebuild,v 1.15 2010/03/13 19:14:42 arfrever Exp $
 
-inherit eutils distutils
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_SRC_TEST="trial"
+DISTUTILS_DISABLE_TEST_DEPENDENCY="1"
+
+inherit distutils eutils
 
 DESCRIPTION="set of LDAP utilities for use from the command line"
 HOMEPAGE="http://www.inoi.fi/open/trac/ldaptor"
@@ -19,9 +25,9 @@ DEPEND=">=dev-python/twisted-2
        dev-python/twisted-mail
        dev-python/pyparsing
        web? (
-               dev-python/webut
                >=dev-python/nevow-0.3
                dev-python/twisted-web
+               dev-python/webut
        )
        doc? (
                dev-python/epydoc
@@ -30,12 +36,11 @@ DEPEND=">=dev-python/twisted-2
        )
        samba? ( dev-python/pycrypto )"
 RDEPEND="${DEPEND}"
+RESTRICT_PYTHON_ABIS="3.*"
 
 DOCS="README TODO ldaptor.schema"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+src_prepare() {
        epatch "${FILESDIR}/${P}-zope_interface.patch"
        epatch "${FILESDIR}/${P}-usage-exception.patch"
 }
@@ -60,21 +65,24 @@ src_test() {
        if ! use web; then
                rm -f ldaptor/test/test_webui.py
        fi
-       PYTHONPATH=. trial ldaptor || die "test failed"
+
+       distutils_src_test
 }
 
 src_install() {
        distutils_src_install
 
        if ! use web; then
-               rm "${D}"/usr/bin/ldaptor-webui || die "couldn't rm ldaptor-webui"
-               rm -rf "${D}"/$(python_get_sitedir)/ldaptor/apps/webui || die "couldn't prune webui"
+               rm -f "${D}"usr/bin/ldaptor-webui*
+               rm -fr "${D}"usr/$(get_libdir)/python*/site-packages/ldaptor/apps/webui
        else
-               cp ldaptor/apps/webui/skin-default.html "${D}"/$(python_get_sitedir)/ldaptor/apps/webui \
-                       || die "couldn't copy default skin"
+               copy_skin-default() {
+                       cp ldaptor/apps/webui/skin-default.html "${D}$(python_get_sitedir)/ldaptor/apps/webui"
+               }
+               python_execute_function -q copy_skin-default
        fi
 
-       # install examples
+       # Install examples.
        if use doc; then
                insinto /usr/share/doc/${PF}
                doins -r doc/api doc/ldap-intro doc/examples