From: Samuli Suominen <ssuominen@gentoo.org>
Date: Thu, 13 Oct 2011 21:55:32 +0000 (+0000)
Subject: Fix for prev. commit. Fix style a bit.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=069139e2eefab4df9f654ecc3dd9211ebc6d44b3;p=gentoo.git

Fix for prev. commit. Fix style a bit.

Package-Manager: portage-2.2.0_alpha64/cvs/Linux x86_64
---

diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 0f6a29909186..c6e9c191b28f 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -11,18 +11,18 @@ DIST libffi-3.0.10.tar.gz 753346 RMD160 4a53046e966e5d875ecb1017f5ff1950cdf5253c
 DIST libffi-3.0.11-rc1.tar.gz 733823 RMD160 de6742919afcea8b6e81ac08bd4a44699f37e713 SHA1 9d5c5c7b6d551fad776d336a01ab450e63895575 SHA256 cb567a4fa64b8e80e0327df595254f1655bf699409caedce9eaef2879e280eff
 DIST libffi-3.0.9.tar.gz 731719 RMD160 11ff9aeb62f4fbe1fecf09e6f9814a72bfedb37a SHA1 56e41f87780e09d06d279690e53d4ea2c371ea88 SHA256 589d25152318bc780cd8919b14670793f4971d9838dab46ed38c32b3ee92c452
 EBUILD libffi-3.0.10.ebuild 1580 RMD160 bb12cc828ed2bf8200cc850b2a7258fd231941cd SHA1 8bfcd22fe776ebf2e05f966a0b0761a71ddbadd2 SHA256 8485c9c7bb5765e37376a20e0da41cacc602e3bb0c49c82e62f123eb86e665a2
-EBUILD libffi-3.0.11_rc1.ebuild 1710 RMD160 ccfc57a76450bab80dc1229539a55dac7f244954 SHA1 23e75f4b03ea556b5f43be597304d0aa56424ff5 SHA256 3e80a710dac3c1d024eaa5cb9f6b4955887ebf58c99a4dcb6215288fae42f694
+EBUILD libffi-3.0.11_rc1.ebuild 1716 RMD160 624bde719d764910ce80ed3348470807d7a0b3b8 SHA1 3afbe16cb5fd0ac887d45b09a3e826f56bd2113f SHA256 c72bc3a6ed32cbcdc6412d5f8ae252c512b4f54b5d09a64850b48507a818cb8f
 EBUILD libffi-3.0.9-r2.ebuild 1364 RMD160 f12e39e8b5e5b175ce512f294ec0b208b6c0b306 SHA1 3c21198cbd55358684968871a4a37c552db03488 SHA256 85e679eac4e642f56a19a4ab44195f49d345c94cbd955bfd4220e81f72166714
 MISC ChangeLog 17405 RMD160 09ad83f97384d5d29a6bb5dee46a721c565d34f9 SHA1 9aa262cfd9827b773db88af6a6ad2ce2ba6bf4d7 SHA256 c3a0651c541c1d36700fe291fb97fa79435b0df67af29b65de4548dd7210958f
 MISC metadata.xml 1663 RMD160 d2ead0beb5a34033489150623558bbe4e0083516 SHA1 8a54e9af62c01a17431ee8359edbe1d35099d3c3 SHA256 f03f0b55cdf4405ead462ba1c1b8ff2f1b6821c22c3f23d484490f8c875f6073
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOl1ywAAoJEEdUh39IaPFNh94H/2eUzcYUBpuacKBiDs5/zz84
-H3anxSj8ONy2Rr3pyiLV5qeakgN8tB9tf6SihRMSzFeauZR6vj0wBlCcskBPOR57
-c6FiLtIxZYye73VLpnvuZTNc/cREfdBXdWNzLH7SmwEKjfqtCYyQ0LPlrmfkhJZC
-OY1rTVGfqSqg57xNoNcKhUo7hfEKtK1dW8xLyUDOk22WwiAwMYcymz1RDu23PamX
-AyDcrPWFK/fh0f0g14rdrTNpH+SUO1FLs43S3H11WXaQmh7mfUdBz1Fx6do+ka+/
-ayj/25AQzE/0YvxG7eXCIWfIZUtOpDOKvhEN0bgCcfguazZTzjm4z+ub6KjpeTc=
-=E58G
+iQEcBAEBAgAGBQJOl15XAAoJEEdUh39IaPFNIDcIAKRWPEd09AfrQpADMbcn7GYl
+TCCQrBMsXzHFM9WkJjKpVEfXYVtoxeKc/7r9QOi8LNz7E+f6dOGyciBVoK8la1Ej
+iPIoSla72LT3n1nsuk9BCw2Hza3VRczsH0KOJW2WqZg/PVdhv0LGEcVYe9gcdlzq
+WBfLstuVIQkErKDVy2eHBfNHe/iq15/RX3Rl4hidAlN+NuPvFypF3Odxa6ZNZ5TY
+BSZu0sntVR926/FD1Qn8H44G+M5pM0zQUubW/SmzZzksTganfpQJuomD7TDAy0Qu
+AnexmCxHTlNS3laVx0bxMPKoVCBIZeWHiGGLRvJ2TmZmI+oLfN/wfuR7BRvZD2A=
+=nOcL
 -----END PGP SIGNATURE-----
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)
 }