Version bump. Bug #167164

Package-Manager: portage-2.1.4.4

5 files changed, 185 insertions, 5 deletions

diff --git a/dev-python/ldaptor/ChangeLog b/dev-python/ldaptor/ChangeLog
index 7f5bed8a7000..2e34521c899c 100644
--- a/dev-python/ldaptor/ChangeLog
+++ b/dev-python/ldaptor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/ldaptor
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ChangeLog,v 1.21 2008/08/19 13:05:41 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ChangeLog,v 1.22 2008/08/22 00:01:12 neurogeek Exp $
+
+*ldaptor-0.0.43 (21 Aug 2008)
+
+  21 Aug 2008; Jesus Rivero <neurogeek@gentoo.org>
+  +files/ldaptor-0.0.43-usage-exception.patch,
+  +files/ldaptor-0.0.43-zope_interface.patch, +ldaptor-0.0.43.ebuild:
+  Version bump. Bug #167164
 
   19 Aug 2008; Ali Polatel <hawking@gentoo.org> ldaptor-0.0.42.ebuild:
   Use python_get_sitedir, quoting, keyword ~amd64, set PYTHONPATH=. for
diff --git a/dev-python/ldaptor/Manifest b/dev-python/ldaptor/Manifest
index 675d0e6d92c1..45d3ee704e3c 100644
--- a/dev-python/ldaptor/Manifest
+++ b/dev-python/ldaptor/Manifest
@@ -2,17 +2,21 @@
 Hash: SHA1
 
 AUX ldaptor-0.0.42-trial-2.1-compat.patch 794 RMD160 68f9c8e6dd4dc0dfe128dac5729b2559afad350e SHA1 e689754d180fd059a672200e2ae7b385d456f66f SHA256 e4111a713185f617dc586ac502c7c14a2e264c47051932e200dffc2757561903
+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.42.tar.gz 203500 RMD160 0d52d998333842680978be9792a4079e9a7ac96b SHA1 6254af3de12b58cfab76fc9dcaebf5fdd2438093 SHA256 152b389914108c213c2ff625f3ecfef6056b84472d50dca1486bd9c706cf2cbe
+DIST ldaptor_0.0.43.orig.tar.gz 222978 RMD160 d93f1f6ba02a7e43fd22e93aa7510e584b35d435 SHA1 ac80cd2820d849269f78cc42794800a868cbd997 SHA256 e3d301090e4fa265c9a01fd416801de4a0ac2274bfeb16b9d0114e99bd3f01bc
 DIST ldaptor_0.0.6.tar.gz 63278 RMD160 2bba29f38388f37d62e9625bbcda39c3428be901 SHA1 83b5291e8ccbbd768c55335eb24926dff3a07156 SHA256 a77f15d6a6f50f13943a17c12c879a82752697586e9e90683b47d81b74b97dc4
 EBUILD ldaptor-0.0.42.ebuild 2080 RMD160 3982c3f2aced1c9483f121222227bfa2c946962d SHA1 fa5e112a6e6ed0467abe5a2f0b31c248bcaabf6b SHA256 fadcc71b81a5e29880153304cec43a2506a8ac93e225cdf302c37d03a5650407
+EBUILD ldaptor-0.0.43.ebuild 2156 RMD160 31d1aab611bfdf39742af93af20834512d39a02e SHA1 6cb286ff56e81c0daf34d0e1ded2cdd209db8c2e SHA256 a24f330a9e4528abf69465730f8451200cd9702656fb20d7c3d14656f89a325e
 EBUILD ldaptor-0.0.6.ebuild 1259 RMD160 59a25fc8a0e3f31c23d96095a135f2f7810b6a5b SHA1 e0accde0ee0069042006709c862c4672267b0507 SHA256 a27461ee379b221fd6077786995693637ff3de48a649f77b40bdc827dab01ab3
-MISC ChangeLog 2793 RMD160 19dadd7370d6f2ce7cda906d49a8aa9760868026 SHA1 d7dfd17b38c78f062c3e2e15aa1f7f000c8b915c SHA256 f34db52808b151a4231e326c7b78ddc5e4e811dfe0f599f5608a7abd76e39f59
+MISC ChangeLog 3023 RMD160 c0c55608ce7e7e1e864890e87624369c565b245b SHA1 6b82e1dd5bd31941e6f9f2f91bfd5269356508d2 SHA256 a29ee7102f7feb9354b8a4f0f11f99500ce9882bd512ec0d04cc33eac98c1b6f
 MISC metadata.xml 270 RMD160 7a98f8f507fd60d0ccf93eb274c53a6f11fe3e1e SHA1 5ba78e176fd70696b16ce2eb0262a876e8b5ae1b SHA256 51e81eb0c3b15224e9a0a3e25ed53c2b8bf379ae0e004cf33f4f6391c6161a47
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiqxS0ACgkQQU4yORhF8iD6RACgjG726cUjzWUGQOQvPWmEzDQz
-4L4AnR5rsVhnOnxPZgvw2jKvGjUWD+/C
-=zZEf
+iEYEARECAAYFAkitwnsACgkQdIssYB9vBoM+YgCePmv4LHAEGaelu+uSKeaixpTP
+HsEAmwVck9S1qMq4hlstyevOo1RrcboU
+=4CLA
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ldaptor/files/ldaptor-0.0.43-usage-exception.patch b/dev-python/ldaptor/files/ldaptor-0.0.43-usage-exception.patch
new file mode 100644
index 000000000000..63e3d8f5459c
--- /dev/null
+++ b/dev-python/ldaptor/files/ldaptor-0.0.43-usage-exception.patch
@@ -0,0 +1,13 @@
+diff -uNtr ldaptor-0.0.43.orig/ldaptor/usage.py ldaptor-0.0.43/ldaptor/usage.py
+--- ldaptor-0.0.43.orig/ldaptor/usage.py	2008-08-20 12:38:44.000000000 -0430
++++ ldaptor-0.0.43/ldaptor/usage.py	2008-08-20 20:02:14.000000000 -0430
+@@ -2,6 +2,9 @@
+ from ldaptor.protocols import pureldap
+ from ldaptor.protocols.ldap import distinguishedname
+ 
++class UsageError(usage.UsageError):
++    pass
++
+ class Options(usage.Options):
+     optParameters = ()
+     def postOptions(self):
diff --git a/dev-python/ldaptor/files/ldaptor-0.0.43-zope_interface.patch b/dev-python/ldaptor/files/ldaptor-0.0.43-zope_interface.patch
new file mode 100644
index 000000000000..b9c8e78d5533
--- /dev/null
+++ b/dev-python/ldaptor/files/ldaptor-0.0.43-zope_interface.patch
@@ -0,0 +1,71 @@
+diff -uNtr ldaptor-0.0.43.orig/ldaptor/apps/webui/iwebui.py ldaptor-0.0.43/ldaptor/apps/webui/iwebui.py
+--- ldaptor-0.0.43.orig/ldaptor/apps/webui/iwebui.py	2008-08-20 12:38:44.000000000 -0430
++++ ldaptor-0.0.43/ldaptor/apps/webui/iwebui.py	2008-08-20 12:44:53.000000000 -0430
+@@ -1,4 +1,4 @@
+-from twisted.python import components
++from zope import interface
+ 
+-class ICurrentDN(components.Interface):
++class ICurrentDN(interface.Interface):
+     """Marker interface for current DN for Ldaptor-webui."""
+diff -uNtr ldaptor-0.0.43.orig/ldaptor/apps/webui/search.py ldaptor-0.0.43/ldaptor/apps/webui/search.py
+--- ldaptor-0.0.43.orig/ldaptor/apps/webui/search.py	2008-08-20 12:38:44.000000000 -0430
++++ ldaptor-0.0.43/ldaptor/apps/webui/search.py	2008-08-20 12:37:42.000000000 -0430
+@@ -1,6 +1,7 @@
+ from zope.interface import implements
+ from twisted.internet import defer
+-from twisted.python import components
++#from twisted.python import components
++from zope import interface
+ from webut.skin import iskin
+ from ldaptor.protocols.ldap import ldapclient, ldapsyntax
+ from ldaptor.protocols.ldap import distinguishedname, ldapconnector
+@@ -17,7 +18,7 @@
+ from nevow import rend, inevow, loaders, url, tags
+ from formless import annotate, webform, iformless, configurable
+ 
+-class IMove(components.Interface):
++class IMove(interface.Interface):
+     """Entries being moved in the tree."""
+     pass
+ 
+diff -uNtr ldaptor-0.0.43.orig/ldaptor/interfaces.py ldaptor-0.0.43/ldaptor/interfaces.py
+--- ldaptor-0.0.43.orig/ldaptor/interfaces.py	2008-08-20 12:38:44.000000000 -0430
++++ ldaptor-0.0.43/ldaptor/interfaces.py	2008-08-20 12:38:19.000000000 -0430
+@@ -1,6 +1,7 @@
+-from twisted.python import components
++#from twisted.python import interface
++from zope import interface
+ 
+-class ILDAPEntry(components.Interface):
++class ILDAPEntry(interface.Interface):
+     """
+ 
+     Pythonic API for LDAP object access and modification.
+@@ -126,7 +127,7 @@
+         incorrect.
+         """
+ 
+-class IEditableLDAPEntry(components.Interface):
++class IEditableLDAPEntry(interface.Interface):
+     """Interface definition for editable LDAP entries."""
+ 
+     def __setitem__(self, key, value):
+@@ -206,7 +207,7 @@
+ 
+         """
+ 
+-class IConnectedLDAPEntry(components.Interface):
++class IConnectedLDAPEntry(interface.Interface):
+     """Interface definition for LDAP entries that are part of a bigger whole."""
+ 
+     def namingContext(self):
+@@ -334,7 +335,7 @@
+ 
+         """
+ 
+-class ILDAPConfig(components.Interface):
++class ILDAPConfig(interface.Interface):
+     """Generic LDAP configuration retrieval."""
+ 
+     def getBaseDN(self):
diff --git a/dev-python/ldaptor/ldaptor-0.0.43.ebuild b/dev-python/ldaptor/ldaptor-0.0.43.ebuild
new file mode 100644
index 000000000000..d4b4b1bd9735
--- /dev/null
+++ b/dev-python/ldaptor/ldaptor-0.0.43.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2008 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.1 2008/08/22 00:01:12 neurogeek Exp $
+
+inherit distutils
+
+DESCRIPTION="set of LDAP utilities for use from the command line"
+HOMEPAGE="http://www.inoi.fi/open/trac/ldaptor"
+SRC_URI="mirror://debian/pool/main/l/ldaptor/${PN}_${PV}.orig.tar.gz
+	doc? ( mirror://gentoo/${PN}-0.0.42-dia-pictures.tar.gz )"
+
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="web doc samba"
+
+DEPEND=">=dev-python/twisted-2
+	dev-python/twisted-names
+	dev-python/twisted-mail
+	dev-python/pyparsing
+	web? (
+		dev-python/webut
+		>=dev-python/nevow-0.3
+		dev-python/twisted-web
+	)
+	doc? (
+		dev-python/epydoc
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	samba? ( dev-python/pycrypto )"
+
+DOCS="README TODO ldaptor.schema"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-zope_interface.patch"
+	epatch "${FILESDIR}/${P}-usage-exception.patch"
+}
+
+src_compile() {
+	distutils_src_compile
+	if use doc; then
+		cp "${WORKDIR}/ldaptor-pictures/"*.dia.png doc/
+		cd doc
+		# 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 ..
+	fi
+}
+
+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"
+	else
+		cp ldaptor/apps/webui/skin-default.html "${D}"/$(python_get_sitedir)/ldaptor/apps/webui \
+			|| die "couldn't copy default skin"
+	fi
+
+	# install examples
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r doc/api doc/ldap-intro doc/examples
+		if use web; then
+			doins -r doc/examples.webui
+		fi
+	fi
+}
+
+src_test() {
+	local trialopts
+	if ! has_version ">=dev-python/twisted-2.1"; then
+		trialopts=-R
+	fi
+	PYTHONPATH=. trial ${trialopts} ldaptor || die "test failed"
+}