Index: djbfft-0.76.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/djbfft/djbfft-0.76.ebuild,v
retrieving revision 1.7
diff -u -r1.7 djbfft-0.76.ebuild
--- djbfft-0.76.ebuild	6 Jul 2006 20:17:50 -0000	1.7
+++ djbfft-0.76.ebuild	17 Dec 2006 16:04:27 -0000
@@ -26,8 +26,13 @@
 	ALLOWED_FLAGS="-fstack-protector -march -mcpu -pipe -mpreferred-stack-boundary -ffast-math"
 	strip-flags
 
-	MY_CFLAGS="$CFLAGS -O1 -fomit-frame-pointer"
-	use x86 && MY_CFLAGS="$MY_CFLAGS -malign-double"
+	append-flags -O1 -fomit-frame-pointer
+	use x86 && append-flags -malign-double
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc3.patch"
+	epatch "${FILESDIR}/${P}-shared.patch"
+	sed -i -e "s:\"lib\":\"$(get_libdir)\":" hier.c
 
 	if use static ; then
 		LIBPERMS="0644"
@@ -35,31 +40,26 @@
 	else
 		LIBPERMS="0755"
 		LIBDJBFFT="libdjbfft.so.${MY_PV}"
+		sed -i "s/-shared/& -Wl,-soname,libdjbfft.so.${PV:0:1}/" Makefile || die
+		append-flags -fPIC -DPIC
 	fi
 
-	unpack "${A}"
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc3.patch"
-	epatch "${FILESDIR}/${P}-shared.patch"
-	if use static ; then
-		echo "$(tc-getCC) $MY_CFLAGS" > "conf-cc"
-	else
-		echo "$(tc-getCC) $MY_CFLAGS -fPIC -DPIC" > "conf-cc"
-	fi
+	echo "$(tc-getCC) $CFLAGS" > "conf-cc"
 	echo "$(tc-getCC) $LDFLAGS" > "conf-ld"
 	echo "${MY_D}" > "conf-home"
 	einfo "conf-cc: $(<conf-cc)"
 }
 
 src_compile() {
+	use static || ln -s "${LIBDJBFFT}" "libdjbfft.so.${PV:0:1}"
 	emake LIBDJBFFT="$LIBDJBFFT" LIBPERMS="$LIBPERMS" || die
 }
 
 src_install() {
 	make LIBDJBFFT="$LIBDJBFFT" setup check || die
 	if ! use static ; then
-		ln -snf "${LIBDJBFFT}" "${MY_D}/lib/libdjbfft.so"
-		ln -snf "${LIBDJBFFT}" "${MY_D}/lib/libdjbfft.so.${MY_PV%%.*}"
+		ln -snf "${LIBDJBFFT}" "${MY_D}/$(get_libdir)/libdjbfft.so"
+		ln -snf "${LIBDJBFFT}" "${MY_D}/$(get_libdir)/libdjbfft.so.${MY_PV%%.*}"
 	fi
 	dodoc CHANGES README TODO VERSION
 }