--- openldap-2.3.24.ebuild.orig	2006-06-02 10:43:09.000000000 -0700
+++ openldap-2.3.24.ebuild	2006-06-02 10:47:47.000000000 -0700
@@ -279,12 +279,12 @@
 	# openldap/contrib
 	tc-export CC
 	if ! use minimal ; then
-		# dsaschema
-			einfo "Building contributed dsaschema"
-			cd ${S}/contrib/slapd-modules/dsaschema
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-Wall -o libdsaschema-plugin.so dsaschema.c || \
-			die "failed to compile dsaschema module"
+		# dsaschema. this is a new module.
+			#einfo "Building contributed dsaschema"
+			#cd ${S}/contrib/slapd-modules/dsaschema
+			#${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+			#-Wall -o libdsaschema-plugin.so dsaschema.c || \
+			#die "failed to compile dsaschema module"
 		# kerberos passwd
 		if use kerberos ; then
 			einfo "Building contributed pw-kerberos"
@@ -299,30 +299,30 @@
 			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
 			-o pw-netscape.so netscape.c || \
 			die "failed to compile netscape password module"
-		# smbk5pwd overlay
+		# smbk5pwd overlay. this is a new module
 		# Note: this modules builds, but may not work with
 		#   Gentoo's MIT-Kerberos.  It was designed for Heimdal
 		#   Kerberos. 
-			einfo "Building contributed smbk5pwd"
-			local mydef
-			local mykrb5inc
-			use samba && mydef="-DDO_SAMBA"
-			if use kerberos; then
-				mydef="${mydef} -DDO_KRB5"
-				if [ -d /usr/include/heimdal ]; then
-					mykrb5inc="-I/usr/include/heimdal/"
-				fi
-			fi
-			cd ${S}/contrib/slapd-modules/smbk5pwd && \
-			libexecdir="/usr/$(get_libdir)/openldap" \
-			DEFS="${mydef}" KRB5_INC="${mykrb5inc}" emake || \
-			die "failed to compile smbk5pwd module"
-		# addrdnvalues
-			einfo "Building contributed addrdnvalues"
-			cd ${S}/contrib/slapi-plugins/addrdnvalues/ && \
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-o libaddrdnvalues-plugin.so addrdnvalues.c || \
-			die "failed to compile addrdnvalues plugin"
+			#einfo "Building contributed smbk5pwd"
+			#local mydef
+			#local mykrb5inc
+			#use samba && mydef="-DDO_SAMBA"
+			#if use kerberos; then
+			#	mydef="${mydef} -DDO_KRB5"
+			#	if [ -d /usr/include/heimdal ]; then
+			#		mykrb5inc="-I/usr/include/heimdal/"
+			#	fi
+			#fi
+			#cd ${S}/contrib/slapd-modules/smbk5pwd && \
+			#libexecdir="/usr/$(get_libdir)/openldap" \
+			#DEFS="${mydef}" KRB5_INC="${mykrb5inc}" emake || \
+			#die "failed to compile smbk5pwd module"
+		# addrdnvalues. this is a new module
+			#einfo "Building contributed addrdnvalues"
+			#cd ${S}/contrib/slapi-plugins/addrdnvalues/ && \
+			#${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+			#-o libaddrdnvalues-plugin.so addrdnvalues.c || \
+			#die "failed to compile addrdnvalues plugin"
 	fi
 }
 
@@ -384,14 +384,15 @@
 		newins ${FILESDIR}/2.0/slapd.conf slapd
 		# install contributed modules
 		docinto /
-		if [ -e ${S}/contrib/slapd-modules/dsaschema/libdsaschema-plugin.so ];
-		then
-			cd ${S}/contrib/slapd-modules/dsaschema/
-			newdoc README README.contrib.dsaschema
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe libdsaschema-plugin.so || \
-			die "failed to install dsaschema module"
-		fi
+		# dsaschema. new stuff.
+		#if [ -e ${S}/contrib/slapd-modules/dsaschema/libdsaschema-plugin.so ];
+		#then
+		#	cd ${S}/contrib/slapd-modules/dsaschema/
+		#	newdoc README README.contrib.dsaschema
+		#	exeinto /usr/$(get_libdir)/openldap/openldap
+		#	doexe libdsaschema-plugin.so || \
+		#	die "failed to install dsaschema module"
+		#fi
 		if [ -e ${S}/contrib/slapd-modules/passwd/pw-kerberos.so ]; then
 			cd ${S}/contrib/slapd-modules/passwd/
 			newdoc README README.contrib.passwd
@@ -406,28 +407,30 @@
 			doexe ${S}/contrib/slapd-modules/passwd/pw-netscape.so || \
 			die "failed to install Netscape MTA-MD5 passwd module"
 		fi
-		if [ -e ${S}/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so ]; then
-			cd ${S}/contrib/slapd-modules/smbk5pwd
-			newdoc README.contrib.smbk5pwd
-			libexecdir="/usr/$(get_libdir)/openldap" \
-			DESTDIR="${D}" make install-mod || \
-			die "failed to install smbk5pwd overlay module"
-		fi
+		# smbk5pwd. new stuff.
+		#if [ -e ${S}/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so ]; then
+		#	cd ${S}/contrib/slapd-modules/smbk5pwd
+		#	newdoc README.contrib.smbk5pwd
+		#	libexecdir="/usr/$(get_libdir)/openldap" \
+		#	DESTDIR="${D}" make install-mod || \
+		#	die "failed to install smbk5pwd overlay module"
+		#fi
 		if [ -e ${S}/contrib/slapd-tools/statslog ]; then
 			cd ${S}/contrib/slapd-tools
 			exeinto /usr/bin
 			newexe statslog ldapstatslog || \
 			die "failed to install ldapstatslog script"
 		fi
-		if [ -e
-			${S}/contrib/slapi-plugins/addrdnvalues/libaddrdnvalues-plugin.so ];
-		then
-			cd ${S}/contrib/slapi-plugins/addrdnvalues
-			newdoc README README.contrib.addrdnvalues
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe libaddrdnvalues-plugin.so || \
-			die "failed to install addrdnvalues plugin"
-		fi
+		# addrdnvalues. new stuff
+		#if [ -e
+		#	${S}/contrib/slapi-plugins/addrdnvalues/libaddrdnvalues-plugin.so ];
+		#then
+		#	cd ${S}/contrib/slapi-plugins/addrdnvalues
+		#	newdoc README README.contrib.addrdnvalues
+		#	exeinto /usr/$(get_libdir)/openldap/openldap
+		#	doexe libaddrdnvalues-plugin.so || \
+		#	die "failed to install addrdnvalues plugin"
+		#fi
 
 	fi