Time to let preserve_old_lib go and rely upon FEATURES="preserved-libs" which is enabled by default in the official package manager.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 15 insertions, 19 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 7d53394ff2c9..98d1246bdc5e 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.184 2014/05/27 17:11:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.185 2014/05/27 17:12:55 ssuominen Exp $
+
+  27 May 2014; Samuli Suominen <ssuominen@gentoo.org> libffi-3.1.ebuild:
+  Time to let preserve_old_lib go and rely upon FEATURES="preserved-libs" which
+  is enabled by default in the official package manager.
 
 *libffi-3.1 (27 May 2014)
 
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 65eae16ed8a9..dc242a6fcca2 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -11,17 +11,17 @@ EBUILD libffi-3.0.11.ebuild 2077 SHA256 04ab46856d5363690149b2c26907d7e858eb78c3
 EBUILD libffi-3.0.12.ebuild 2086 SHA256 a67f42560092e5f84a29a634e53d54baca08ca4982d16c1de112fe8d82b5106f SHA512 877729435dfa77b1a67cf1d418318b4050e680be72ccf1ff4c84f9d0df199b01455d656784350e2fee8c631f55c391510201a261103f3fba07a416c6bc6e7c6b WHIRLPOOL 59bfc776c46dc74bddc44b3cc23453a5c765cb6bac1f6b8dc5f7d9bd7bc1f97a8e30110c31efd742669937a76d38c2f2e7bcb6ad92de390cdfb9bd5ad3881a37
 EBUILD libffi-3.0.13-r1.ebuild 2287 SHA256 1dcdf46337f8e607873440179bf0b044d97d3212426141266c98ba944d71d3a9 SHA512 bde4d9f8155bf3997ede4855358004d9adb4423feabac292fc144dd52c159b551dae2cbddd57d640cdbbb1b37e30aa787538accede3087ad460bc61f25942bcf WHIRLPOOL bd249b6b882aa00beb098931fd5fefed9717ee2bfa94c69bc840ce467d32a8a635765d2f6aef71fd35eacc91614b722cb035a24a754c942ed8cad7472165b152
 EBUILD libffi-3.0.13.ebuild 2093 SHA256 07fbb6b6b9cf55f9bc324a21d3bd54fc256e80f54e39def2a13881d6ef76794c SHA512 27f26659ab4b719a3d6ba00df6fb0030c9f26e3725e5b106d6b54102c4d2b77eb1045e6fdf4a8637944575cab7c3a9a5319981f2726442217e1be67df389d31a WHIRLPOOL 7959935c12ca8bd6a20a7574a0168065b32a803c9dde71486cd7ac2da15fefee280f701f27f8290a662b2a7e117d0c9354a1a03665db2217018a19b8dbb5e770
-EBUILD libffi-3.1.ebuild 2240 SHA256 537aea540074acc5234a5b89842dcaf86fee15cfa4789d9066fde882f8f6d7b4 SHA512 6cffac3c0155637a42116aeb98357f9151f37937a7e93c2e529b642eacb28e00ac2e338aabbd3ded059e7b7292a400a4a19e65249b91636d9e6e5a334a580f60 WHIRLPOOL 6b2831bd28a8e20b9bda38bb4f0215b6bb9eba63f43533388f6e4ec85dcd5a7fd0066b790e42d86c21106c987ac57ac963f12cf46bb3ece3ddaabf6a29229c6f
-MISC ChangeLog 24719 SHA256 eff6bd21fba989cde19fd7162dde00745d8545edf2e1f72f954839aaff16c218 SHA512 9b722df8aba5ae8526e56b5e2e11e79fa1058451019649211dca326b2b3c7f8c084e08521594c7cf7032ac209108ac1f360b2121552a27ac294ed30add3afa8d WHIRLPOOL 024edfae7c00a0896a04f7e30687d8c3b40086d2523e168bb6bae99869edbca6a4139f78440f5ad187eceab1012ce2c637f9c2a1fff9ca834a0828f0fe21412b
+EBUILD libffi-3.1.ebuild 2076 SHA256 1aea0b48ab15e2308d6be2aa0b6b8a6a91eaef18ddc389d340fbc7917a82bbe0 SHA512 411f34b01dd006726b5f4a16d0f0760729f6f5f533231986576f6672e6fe1bac4aceaafbca1d04a9bc2b67d3bedd677d9add36aded87237874fb884b2fed7d7d WHIRLPOOL e651a392293fa88b6685fd33fe83f679666cc2cf544f9541588c3b4408d870d5f22172d977af7ac5ad08c24008770ed0500d2b8a5375325ee33397b5d61191cc
+MISC ChangeLog 24930 SHA256 c767cc681953489a7909c08a48c3b3381f2bd8523119abe7c2cba63cf0119957 SHA512 5bb02f80269a7b86d6cf07f717a0829f3e46dc816c5cf84e215037c4681de3873ea7d44b6507569bd4dba8c9334af52f476fd1cf631ac95dc36d73d9f8f9a0eb WHIRLPOOL 1fa0b0c54a35720e45fe0f2197fb59972c132378cb836942245d7f84fa9dddce71177867bfea3049ea19c0e3bb6af76bf113a33dedf55c73166210ed30f194fe
 MISC metadata.xml 1768 SHA256 1bb92578368c006819d0cd5e1a94d32cffca87ddef8d571c29b483bedddc9b6e SHA512 2291c051ce2cb5c31989af68a705c0f8ce8d6ff23f2a66f839463a56a20454a6af276c5afc75687919e14fa614862356618e44c88415ff9884725e6e6db161bc WHIRLPOOL 7da7a437bf11dfcd5b5a8fbb067463ceb588fe83c1db0d15253293a955999d5dc65754918c73840a9a5020f86d1b6f1c9f8d127f4e1519594bc0678742727d45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJThMbNAAoJEEdUh39IaPFNH8oIAIitpDEP3OmN9UotLBuH8Wj2
-afjyZs9BxoThE+lcjbcT6Y3pjxGGvEFFGD1PD7sws9FC45HqxpguX3lpl/8yYVoT
-kHT0hgiue4/lwytAZg7wpMLlHQSDl3L/3oOO1FLY6fqTfRJSfE4/13TgnOux1Jd7
-NkCrtPXVoZ1NCOI+sT9y39ucRuwdGQ+c+XzDkQ8KRbmm7BHyzwL5QTinT60KrKI4
-raCVS92uad1XRGyAXiNgKM905S8WQXIda95qLeO+CtIq94Y2DAQHXlSaRk/EUdHK
-KtRnZs83HcWNPoX/Z+W5l2659NJqBSdLxe5MmRA9pBChDBbVjw9jB7JF+OY9F+0=
-=5fmx
+iQEcBAEBCAAGBQJThMcxAAoJEEdUh39IaPFNnfgIAJS/cS+kN2BQnhwHqd/dWkxk
+dUpuvjwMI3Orp4eSCfaFo28EUaL3Xz188eYll8yQBFB9VVbfodcnuNcuz1Q1LSzD
+5qFUAsWXJPZK0q6pCfrf/vf1HvCyIrVd2ktUR6TVp412uxXrVil60H0WQObnusQ1
+OKL1c5S079r9LqbgFPY1mfAcz12pIRR7PVzWaojehKV20bqpG1jawLhL+CRFF4gc
+d6ImCh2IY1bD88ZY9abvX2Lln+1ZdaZpFwSh1QFJsHOYF0AASL65k7CQzgrEahUl
+ZRvy8X6gD3nou278t+rsm970wSzebrcdNcEFPTnjwQlCVjI9UPyKBIki/LkB/Zs=
+=J9GK
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libffi/libffi-3.1.ebuild b/dev-libs/libffi/libffi-3.1.ebuild
index a00182d401fa..28f18f2c2219 100644
--- a/dev-libs/libffi/libffi-3.1.ebuild
+++ b/dev-libs/libffi/libffi-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.1.ebuild,v 1.1 2014/05/27 17:11:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.1.ebuild,v 1.2 2014/05/27 17:12:55 ssuominen Exp $
 
 EAPI=5
 inherit eutils libtool multilib multilib-minimal toolchain-funcs
@@ -54,11 +54,3 @@ multilib_src_install_all() {
 	prune_libtool_files
 	einstalldocs
 }
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/${PN}$(get_libname 5)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/${PN}$(get_libname 5)
-}