--- ./openldap-2.2.28-r2.ebuild.orig	2005-12-03 10:38:58.000000000 +0100
+++ ./openldap-2.2.28-r2.ebuild.orig	2005-12-04 00:22:00.000000000 +0100
@@ -162,21 +162,31 @@ 
 	ln -s shtool install
 	ln -s shtool install.sh
 
-	# bug #105380
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.28-r1-configure.in-rpath.patch
+        export WANT_AUTOMAKE="1.9"
+        export WANT_AUTOCONF="2.5"
 
-	# reconf for db40 fixes.
-	cd ${S}
-	export WANT_AUTOMAKE="1.9"
-	export WANT_AUTOCONF="2.5"
-	einfo "Running libtoolize"
-	libtoolize --copy --force
-	#einfo "Running automake"
-	#automake --add-missing || die "automake failed"
-	einfo "Running aclocal"
-	aclocal || die "aclocal failed"
-	einfo "Running autoconf"
-	autoconf || die "autoconf failed"
+	# make files ready for new autoconf
+        EPATCH_OPTS="-p0 -d ${WORKDIR}/${OLD_P}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf25.patch
+        EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf25.patch
+
+        # reconf compat and current for RPATH solve
+        cd ${WORKDIR}/${OLD_P}
+        einfo "Running libtoolize on ${OLD_P}"
+        libtoolize --copy --force
+        einfo "Running aclocal on ${OLD_P}"
+        aclocal || die "aclocal failed"
+        EPATCH_OPTS="-p0 -d ${WORKDIR}/${OLD_P}" epatch ${FILESDIR}/${PN}-2.1.30-rpath.patch
+        einfo "Running autoconf on ${OLD_P}"
+        autoconf || die "autoconf failed"
+
+        cd ${S}
+        einfo "Running libtoolize on ${P}"
+        libtoolize --copy --force
+        einfo "Running aclocal on ${P}"
+        aclocal || die "aclocal failed"
+        EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-rpath.patch
+        einfo "Running autoconf on ${P}"
+        autoconf || die "autoconf failed"
 }
 
 src_compile() {