diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
new file mode 100644
index 0000000..b455929
--- /dev/null
+++ b/dev-python/python-ldap/Manifest
@@ -0,0 +1,4 @@
+AUX python-ldap-2.3.5-gcc44.patch 287 RMD160 24e64b7c6e8b3ccee8e43c8a4fa30dd0dd3ba341 SHA1 6c18161c042ea1beb6b2352c28b2ac4a6805182e SHA256 11f0f4430eea63979d2113ab1df04005112f07d38d27fc314b7d16d216a47d9f
+DIST html-python-ldap-docs-2.0.3.tar.gz 25857 RMD160 2dbbdfd1ac420aea441ca31e785efb33aad1c652 SHA1 a2240e12c3760a32d6f4e4cd72d3b5cd1cd858d6 SHA256 d39a4ae2f72b18e7f17f3c01d6d204b97c7c91521c918c0dd9155705b843ad66
+DIST python-ldap-2.3.8.tar.gz 11688 RMD160 03adf379286e13c1f25645fb19cdfd9b153545ef SHA1 7e016a9a8ccba3535959da8d5526fb9361666094 SHA256 1625507b189d28014618ee27f4c867e254e8075e85b138ce9aafc9fbec000b1f
+EBUILD python-ldap-2.3.8.ebuild 1782 RMD160 c9b9355800bc8fe64c73ce9be98875a889ca4ccb SHA1 d6db920e464dcb0bc8569e5ffc7ec169dc8c23cd SHA256 8e11a29d268b3fc6b44981aa7b02443ce5e3216b07d6f6572747d9024797eba4
diff --git a/dev-python/python-ldap/files/python-ldap-2.3.5-gcc44.patch b/dev-python/python-ldap/files/python-ldap-2.3.5-gcc44.patch
new file mode 100644
index 0000000..6c9c602
--- /dev/null
+++ b/dev-python/python-ldap/files/python-ldap-2.3.5-gcc44.patch
@@ -0,0 +1,11 @@
+--- Modules/errors.c	2009-04-01 15:58:34.000000000 -0400
++++ Modules/errors.c	2009-04-01 15:59:25.000000000 -0400
+@@ -18,7 +18,7 @@
+ 
+ #ifdef LDAP_ASSERTION_FAILED
+ #define LDAP_ERROR_MAX          LDAP_ASSERTION_FAILED
+-#elif
++#else
+ #define LDAP_ERROR_MAX          LDAP_OTHER
+ #endif
+ 
diff --git a/dev-python/python-ldap/python-ldap-2.3.8.ebuild b/dev-python/python-ldap/python-ldap-2.3.8.ebuild
new file mode 100644
index 0000000..d2a92e7
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-2.3.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.3.5.ebuild,v 1.2 2009/05/10 16:15:15 ssuominen Exp $
+
+NEED_PYTHON=2.4
+
+inherit distutils eutils multilib
+
+P_DOC="html-${PN}-docs-2.0.3"
+
+DESCRIPTION="Various LDAP-related Python modules"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? ( mirror://sourceforge/${PN}/${P_DOC}.tar.gz )"
+HOMEPAGE="http://python-ldap.sourceforge.net/"
+SLOT="0"
+LICENSE="PYTHON"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples sasl ssl"
+
+RDEPEND=">=net-nds/openldap-2.3
+	sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${DEPEND}
+	dev-python/setuptools"
+
+# Installs some script-files directly in site-packages
+PYTHON_MODNAME="/"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+
+	# Note: we can't add /usr/lib and /usr/lib/sasl2 to library_dirs due to a bug in py2.4
+	sed -e "s:^library_dirs =.*:library_dirs =:" \
+		-e "s:^include_dirs =.*:include_dirs = /usr/include /usr/include/sasl:" \
+		-e "s:\(extra_compile_args =\).*:\1\nextra_link_args = -Wl,-rpath=/usr/$(get_libdir) -Wl,-rpath=/usr/$(get_libdir)/sasl2:" \
+		-i setup.cfg || die "error fixing setup.cfg"
+
+	local mylibs="ldap"
+	if use sasl ; then
+		use ssl && mylibs="ldap_r"
+		mylibs="${mylibs} sasl2"
+	fi
+	use ssl && mylibs="${mylibs} ssl crypto"
+
+	sed -e "s:^libs = .*:libs = lber resolv ${mylibs}:" \
+		-e "s:^compile.*:compile = 0:" \
+		-e "s:^optimize.*:optimize = 0:" \
+		-i setup.cfg || die "error setting up libs in setup.cfg"
+}
+
+src_install() {
+	distutils_src_install
+	use doc && dohtml -r "${WORKDIR}/${P_DOC/html-/}"/*
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r Demo
+	fi
+}