Index: rpm-4.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2.ebuild,v
retrieving revision 1.13
diff -u -B -r1.13 rpm-4.2.ebuild
--- rpm-4.2.ebuild	1 Jan 2005 11:56:40 -0000	1.13
+++ rpm-4.2.ebuild	11 May 2005 19:29:18 -0000
@@ -28,6 +28,13 @@
 	unpack ${A}
 	epatch ${FILESDIR}/rpm-4.2-python2.3.diff
 	epatch ${FILESDIR}/rpm-4.2-pic.patch
+
+	# Disable the configue scripts handling of multilib libdirs
+	# since econf already sets --libdir correctly
+	sed -i -e 's:MARK64=64:MARK64=:' \
+		${S}/{,file,popt,beecrypt}/configure  || die "sed failed"
+	sed -i -e 's:$(libdir)/rpm:$(prefix)/lib/rpm:' \
+		${S}/Makefile.in || die "sed failed"
 }
 
 src_compile() {
@@ -58,7 +65,7 @@
 	# There is a /usr/lib/rpm/rpmpopt-4.1 now
 	# the symlink is still created incorrectly. ???
 	rm -f ${D}/usr/lib/rpmpopt
-	rm -f ${D}/usr/lib/libpopt*
+	rm -f ${D}/usr/$(get_libdir)/libpopt*
 	rm -f ${D}/usr/include/popt.h
 	use nls && rm -f  ${D}/usr/share/locale/*/LC_MESSAGES/popt.mo
 	rm -f ${D}/usr/share/man/man3/popt*
@@ -87,7 +94,7 @@
 	fi
 
 	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/site-packages/rpmdb
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/rpmdb
 }
 
 pkg_postrm() {