6 files changed, 121 insertions, 4 deletions
diff --git a/dev-python/htmlgen/Manifest b/dev-python/htmlgen/Manifest
index dbf5225..c9d8cd4 100644
--- a/dev-python/htmlgen/Manifest
+++ b/dev-python/htmlgen/Manifest
@@ -1,2 +1,2 @@
 DIST HTMLgen.tgz 316415 RMD160 bb32b2822f7ce8e49eb42853aff330429df073de SHA1 a34b9c1f9cf5536a548c66522213ac9fee1b43cd SHA256 f3b39b4b07b5dd318780ad0e9b8b3c524a54138537697dd7966223f314d2177d
-EBUILD htmlgen-2.2.2.ebuild 1516 RMD160 23d34cfafc916ee6af4c6be9eb8284e9cf15362f SHA1 72b91ee06e87b3cec2fd03358ebd3fa6095bf718 SHA256 7af044810e8b84ebd19fe274eda45b6dff286095d7d2112f9c48a2738bb0e064
+EBUILD htmlgen-2.2.2.ebuild 1516 RMD160 be11b4994918a74d31b2ad0e8ac1d9de4a261c83 SHA1 02e9255b1f7dce57099d27ac4816173937f02ad2 SHA256 74676d11d3b94db70fb9f22f393cecee6d9bdffef2eeeca23358feb06859756a
diff --git a/dev-python/htmlgen/htmlgen-2.2.2.ebuild b/dev-python/htmlgen/htmlgen-2.2.2.ebuild
index d14e4c9..b6d9879 100644
--- a/dev-python/htmlgen/htmlgen-2.2.2.ebuild
+++ b/dev-python/htmlgen/htmlgen-2.2.2.ebuild
@@ -33,7 +33,7 @@ src_install() {
 
 	touch __init__.py
 
-	insinto $(get_python_sitedir)/htmlgen
+	insinto $(python_get_sitedir)/htmlgen
 	doins $files __init__.py || die "doins failed"
 
 	if use doc; then
@@ -46,12 +46,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize $(get_python_sitedir)/htmlgen
+	python_mod_optimize $(python_get_sitedir)/htmlgen
 
 	ewarn "htmlgen now resides in its own subdirectory"
 	ewarn "so you need to do \"from htmlgen import HTMLgen\" instead of \"import HTMLgen\""
 }
 
 pkg_postrm () {
-	python_mod_cleanup $(get_python_sitedir)/htmlgen
+	python_mod_cleanup $(python_get_sitedir)/htmlgen
 }
diff --git a/dev-python/ldaptor/Manifest b/dev-python/ldaptor/Manifest
new file mode 100644
index 0000000..99f9c4a
--- /dev/null
+++ b/dev-python/ldaptor/Manifest
@@ -0,0 +1,5 @@
+AUX ldaptor-0.0.42-trial-2.1-compat.patch 794 RMD160 68f9c8e6dd4dc0dfe128dac5729b2559afad350e SHA1 e689754d180fd059a672200e2ae7b385d456f66f SHA256 e4111a713185f617dc586ac502c7c14a2e264c47051932e200dffc2757561903
+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
+EBUILD ldaptor-0.0.42.ebuild 2032 RMD160 a4a07b792142dfac606bdb2ce5d8d5a9c1aa6e95 SHA1 814bd8b91d8716db667da35530713c4bbe637931 SHA256 725fec3c3ef37113e41ff77246fa5ffe0d8adb0b01061aa1f7ce8eb6da55ec4b
+MISC ldaptor-0.0.42.ebuild.diff 540 RMD160 4bfe12a7d407085450210d778b6c1c3cf173150f SHA1 5c87821b42a8dbaf171bd1ec8db9d318aa5917ed SHA256 64906c89411a3e0c9fac01e46985b5f8a59557228f94b0cb24b8286adf096b11
diff --git a/dev-python/ldaptor/files/ldaptor-0.0.42-trial-2.1-compat.patch b/dev-python/ldaptor/files/ldaptor-0.0.42-trial-2.1-compat.patch
new file mode 100644
index 0000000..97594ad
--- /dev/null
+++ b/dev-python/ldaptor/files/ldaptor-0.0.42-trial-2.1-compat.patch
@@ -0,0 +1,17 @@
+diff -ur ldaptor-0.0.42-orig/ldaptor/test/test_ldiftree.py ldaptor-0.0.42/ldaptor/test/test_ldiftree.py
+--- ldaptor-0.0.42-orig/ldaptor/test/test_ldiftree.py	2005-11-28 13:04:49.000000000 +0100
++++ ldaptor-0.0.42/ldaptor/test/test_ldiftree.py	2005-11-28 13:14:08.000000000 +0100
+@@ -23,11 +23,11 @@
+     def setUpClass(self):
+         self.__listdir = os.listdir
+         os.listdir = self.randomListdir
+-        super(RandomizeListdirMixin, self).setUpClass()
++        # super(RandomizeListdirMixin, self).setUpClass()
+ 
+     def tearDownClass(self):
+         os.listdir = self.__listdir
+-        super(RandomizeListdirMixin, self).tearDownClass()
++        # super(RandomizeListdirMixin, self).tearDownClass()
+ 
+ class Dir2LDIF(RandomizeListdirMixin, unittest.TestCase):
+     def setUp(self):
diff --git a/dev-python/ldaptor/ldaptor-0.0.42.ebuild b/dev-python/ldaptor/ldaptor-0.0.42.ebuild
new file mode 100644
index 0000000..6c248a9
--- /dev/null
+++ b/dev-python/ldaptor/ldaptor-0.0.42.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ldaptor-0.0.42.ebuild,v 1.5 2006/02/13 23:02:32 marienz Exp $
+
+inherit distutils eutils
+
+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}.tar.gz
+	doc? ( mirror://gentoo/${P}-dia-pictures.tar.gz )"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~ia64 ~sparc ~x86"
+IUSE="web doc samba"
+
+DEPEND=">=dev-python/twisted-2
+	dev-python/twisted-names
+	dev-python/twisted-mail
+	dev-python/pyparsing
+	web? (
+		>=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}-trial-2.1-compat.patch"
+	cp "${WORKDIR}/ldaptor-pictures/"*.dia.png doc/
+}
+
+src_compile() {
+	distutils_src_compile
+	if use doc; then
+		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=$(portageq best_version / app-text/docbook-xsl-stylesheets)
+		stylesheet=${stylesheet#app-text/docbook-}
+		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"
+	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
+	trial ${trialopts} ldaptor || die "test failed"
+}
diff --git a/dev-python/ldaptor/ldaptor-0.0.42.ebuild.diff b/dev-python/ldaptor/ldaptor-0.0.42.ebuild.diff
new file mode 100644
index 0000000..d60f41c
--- /dev/null
+++ b/dev-python/ldaptor/ldaptor-0.0.42.ebuild.diff
@@ -0,0 +1,15 @@
+--- /usr/portage/dev-python/ldaptor/ldaptor-0.0.42.ebuild	2006-02-14 00:05:38.000000000 +0100
++++ ldaptor-0.0.42.ebuild	2008-08-02 00:34:31.000000000 +0200
+@@ -56,11 +56,9 @@
+ src_install() {
+ 	distutils_src_install
+ 
+-	python_version
+-
+ 	if ! use web; then
+ 		rm ${D}/usr/bin/ldaptor-webui || die "couldn't rm ldaptor-webui"
+-		rm -rf ${D}/usr/lib/python${PYVER}/site-packages/ldaptor/apps/webui || die "couldn't prune webui"
++		rm -rf ${D}$(python_get_sitedir)/ldaptor/apps/webui || die "couldn't prune webui"
+ 	fi
+ 
+ 	# install examples