--- /usr/portage/net-nds/openldap/openldap-2.4.24.ebuild	2011-02-26 09:01:20.000000000 -0800
+++ /usr/local/portage/net-nds/openldap/openldap-2.4.24.ebuild	2012-01-13 21:22:11.866302083 -0800
@@ -14,7 +14,7 @@
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 
 IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal"
-IUSE_BACKEND="+berkdb"
+IUSE_BACKEND="+berkdb threads"
 IUSE_OVERLAY="overlays perl"
 IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 syslog selinux"
 IUSE_CONTRIB="smbkrb5passwd kerberos"
@@ -503,6 +503,19 @@
 	fowners ldap:ldap /var/run/openldap
 	fperms 0755 /var/run/openldap
 
+	if use threads ; then
+		einfo "Replacing libldap with libldap_r"
+		cd "${D}/usr"
+		for unsafe_full in lib*/libldap[-.]*so* lib*/libldap.a; do
+			safe=`basename ${unsafe_full} | sed 's/libldap/libldap_r/'`
+			ln -sf ${safe} ${unsafe_full}
+		done
+		for safe_full in lib*/libldap_r.la; do
+			unsafe_full=`echo ${safe_full} | sed 's/libldap_r/libldap/'`
+			sed 's/libldap_r/libldap/' < $safe_full > $unsafe_full
+		done
+	fi
+
 	if ! use minimal; then
 		# use our config
 		rm "${D}"etc/openldap/slapd.conf