Restrict Jython ABIs. Sort dependencies. Fix disabling of test_webui with USE=-web...

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

diff --git a/dev-python/ldaptor/ChangeLog b/dev-python/ldaptor/ChangeLog
index c5f799a7625d2282e4badb99d1ecb68ac3ae3104..74eaa06f7f7444a85cdd38eb6c113b1fe5cec82c 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.35 2010/03/13 19:14:42 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ChangeLog,v 1.36 2011/11/11 20:36:37 hwoarang Exp $
+
+  11 Nov 2011; Markos Chandras <hwoarang@gentoo.org> ldaptor-0.0.43.ebuild:
+  Restrict Jython ABIs. Sort dependencies. Fix disabling of test_webui with
+  USE=-web. Don't install tests. Patch by Arfrever.
 
   13 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   ldaptor-0.0.43.ebuild:

diff --git a/dev-python/ldaptor/Manifest b/dev-python/ldaptor/Manifest
index 0933580bab75e21142fc541f2e339a92cdec37ff..a36b33ef4054a1d4c2ba057aa2d181140c53c02e 100644 (file)
--- a/dev-python/ldaptor/Manifest
+++ b/dev-python/ldaptor/Manifest
@@ -1,7 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX ldaptor-0.0.43-usage-exception.patch 473 RMD160 fd5308e078d31c8b1463952c64fc8c7b6a0eecbc SHA1 70809767297e53132ffa5e2784c38f359d3cfaed SHA256 13d07200f908b3428dc4e4095614cf3f6332140d4b9861f04e59b04d1fcdee57
 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 2295 RMD160 da0b52bad32da621da8c93f7d8d3c26c5e914a4c SHA1 c7882aa7d9616740677d03a0c807e00e4874c32b SHA256 ae876819ceadebfb830122f86bccf6b4573bdafa2169919710c9028f9b700848
-MISC ChangeLog 4490 RMD160 abc45eafeaab115c29ce54e5d39da211dd5ae9b5 SHA1 2de183a3c74d24539cb01826f4fe0b418ea41e47 SHA256 f1da7568daef1c0d3f8c16621e4f78792553b4540fe342e79faccebc6b4d9853
+EBUILD ldaptor-0.0.43.ebuild 2482 RMD160 8b6476082f6aea99e0221d68e3928cbe88c295a2 SHA1 90e43e689dbc13e26030afa877a7003ce9988962 SHA256 d433cf0853c0cb934ddd5da8237e982217bd501996b2f93d29e8e295fb77eebe
+MISC ChangeLog 4695 RMD160 62dd6006a6d75e29ae6d965209290c9f5952a177 SHA1 5d7e7600db4541bc2b09b6da12dc7e47fdb4b5e0 SHA256 c8ae5c6cf88db8a2b4d03d54d1264c2ea2383052e3f3aa0005052a79f050519b
 MISC metadata.xml 270 RMD160 7a98f8f507fd60d0ccf93eb274c53a6f11fe3e1e SHA1 5ba78e176fd70696b16ce2eb0262a876e8b5ae1b SHA256 51e81eb0c3b15224e9a0a3e25ed53c2b8bf379ae0e004cf33f4f6391c6161a47
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOvYdYAAoJEPqDWhW0r/LC7ZAP/iFd5Y0Z9wKkwn9bI1ztpmoF
+WGhtMAHMP47Efi+kYMhwp4nJ2576pDLqtTE5vfwofGxxSgdezSh7WlheDg5V40Wm
+iHXrVvk25CZzRjpNR+46mPxO3KPpf6n5H5q7irUN8K6c12qX7YkvJg87Y0F4F8e3
+LYhkrcQtgIlbFTZbWN5FNl+EVKpiCrdylPJVkWgWfmd8YxMqvpykIXizIkvw7KEv
+KWIYRIM3xGi8w/OuPnTpFZWqf+izj2JBx5RWMlzichkiLLprgsI9+q1MwzkbHX3N
+uU996WOXgxqDhQgJ9znFB3c2GiMbtjuqlYacpV5qjd/86AIJeXen1zChit9Tc7rc
+9nN9EYP1aL3yDbRo4X9pEgD7Hxds/NYYpWdtpH/qlBASOw6WwA8fmMQUnFhv3hMt
+o9OauI8K7Y7FVJkDjM/fFUCH6f2LBHz/sIi9saWURzA6IZbIsLJcJUDC5zTshBUo
+4yDqZWfWGvr1Y4TfSAlWCHr3MKDPlwTbY4kMZoKDuZClsJC58wg6GEZJujCt/NBh
+cOzkQ/CTGJ1/ymkMfRSSL2P7rH+VoNJR5DdPpQAXybFU6jXGRVBKNffMl0AyJX7k
+OQYPc97MKlDspBjQYVnQGWcuW0o5aEF3br4pwFBCUss3xqh0bUwzQ5F5/09XfXA7
+tU1TGn9jR8pTPp70lRpk
+=nzkK
+-----END PGP SIGNATURE-----

diff --git a/dev-python/ldaptor/ldaptor-0.0.43.ebuild b/dev-python/ldaptor/ldaptor-0.0.43.ebuild
index 97b109cded53f936175ab6bdc6026c4dd9fac2c3..d15ec66b1fd50a264ff7b741fdbd7170e3b3130b 100644 (file)
--- a/dev-python/ldaptor/ldaptor-0.0.43.ebuild
+++ b/dev-python/ldaptor/ldaptor-0.0.43.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.15 2010/03/13 19:14:42 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ldaptor-0.0.43.ebuild,v 1.16 2011/11/11 20:36:37 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 DISTUTILS_SRC_TEST="trial"
 DISTUTILS_DISABLE_TEST_DEPENDENCY="1"
 
@@ -18,63 +19,68 @@ SRC_URI="mirror://debian/pool/main/l/ldaptor/${PN}_${PV}.orig.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="web doc samba"
+IUSE="doc samba web"
 
-DEPEND=">=dev-python/twisted-2
-       dev-python/twisted-names
+DEPEND="dev-python/pyparsing
+       >=dev-python/twisted-2
        dev-python/twisted-mail
-       dev-python/pyparsing
-       web? (
-               >=dev-python/nevow-0.3
-               dev-python/twisted-web
-               dev-python/webut
-       )
+       dev-python/twisted-names
        doc? (
                dev-python/epydoc
                dev-libs/libxslt
                app-text/docbook-xsl-stylesheets
        )
-       samba? ( dev-python/pycrypto )"
+       samba? ( dev-python/pycrypto )
+       web? (
+               >=dev-python/nevow-0.3
+               dev-python/twisted-web
+               dev-python/webut
+       )"
 RDEPEND="${DEPEND}"
-RESTRICT_PYTHON_ABIS="3.*"
 
 DOCS="README TODO ldaptor.schema"
 
 src_prepare() {
+       distutils_src_prepare
        epatch "${FILESDIR}/${P}-zope_interface.patch"
        epatch "${FILESDIR}/${P}-usage-exception.patch"
+
+       # Delete test with additional dependencies.
+       if ! use web; then
+               rm -f ldaptor/test/test_webui.py
+       fi
 }
 
 src_compile() {
        distutils_src_compile
+
        if use doc; then
                cp "${WORKDIR}/ldaptor-pictures/"*.dia.png doc/
-               cd doc
+               pushd doc > /dev/null
                # skip the slides generation because it doesn't work
                sed -e "/\$(SLIDES:%\.xml=%\/index\.html) /d" -i Makefile
                # replace the docbook.xsl with something that exists
                stylesheet='xsl-stylesheets'
                sed -e "s#stylesheet/xsl/nwalsh#${stylesheet}#" -i Makefile
                emake || die "make failed"
-               cd ..
+               popd > /dev/null
        fi
 }
 
-src_test() {
-       # Delete test with additional dependencies.
-       if ! use web; then
-               rm -f ldaptor/test/test_webui.py
-       fi
-
-       distutils_src_test
-}
-
 src_install() {
        distutils_src_install
 
+       delete_tests() {
+               rm -fr "${ED}$(python_get_sitedir)/ldaptor/test"
+       }
+       python_execute_function -q delete_tests
+
        if ! use web; then
-               rm -f "${D}"usr/bin/ldaptor-webui*
-               rm -fr "${D}"usr/$(get_libdir)/python*/site-packages/ldaptor/apps/webui
+               rm -f "${ED}"usr/bin/ldaptor-webui*
+               delete_webui() {
+                       rm -fr "${ED}$(python_get_sitedir)/ldaptor/apps/webui"
+               }
+               python_execute_function -q delete_webui
        else
                copy_skin-default() {
                        cp ldaptor/apps/webui/skin-default.html "${D}$(python_get_sitedir)/ldaptor/apps/webui"