Fix for prev. commit. Fix style a bit.

(Portage version: 2.2.0_alpha64/cvs/Linux x86_64)

1 files changed, 6 insertions, 6 deletions

diff --git a/dev-libs/libffi/libffi-3.0.11_rc1.ebuild b/dev-libs/libffi/libffi-3.0.11_rc1.ebuild
index 90d0731fe338..5af9e069b519 100644
--- a/dev-libs/libffi/libffi-3.0.11_rc1.ebuild
+++ b/dev-libs/libffi/libffi-3.0.11_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.11_rc1.ebuild,v 1.1 2011/10/13 21:48:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.11_rc1.ebuild,v 1.2 2011/10/13 21:55:32 ssuominen Exp $
 
 EAPI=4
 
@@ -24,11 +24,11 @@ S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
 	# Detect and document broken installation of sys-devel/gcc in the build.log wrt #354903
-	if ! has_version dev-libs/libffi; then
+	if ! has_version ${CATEGORY}/${PN}; then
 		local base="${T}/conftest"
 		echo 'int main() { }' > "${base}.c"
 		$(tc-getCC) -o "${base}" "${base}.c" -lffi >&/dev/null && \
-			ewarn "Found a copy of second libffi in your system. Uninstall it before continuing."
+			ewarn "Found a copy of second ${PN} in your system. Uninstall it before continuing."
 	fi
 }
 
@@ -46,13 +46,13 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc ChangeLog* README
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
+	rm -f "${ED}"usr/lib*/${PN}.la
 }
 
 pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libffi.so.5
+	preserve_old_lib /usr/$(get_libdir)/${PN}$(get_libname 5)
 }
 
 pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libffi.so.5
+	preserve_old_lib_notify /usr/$(get_libdir)/${PN}$(get_libname 5)
 }