Disable tooldir related hack that breaks --libdir usage #462814 by Thomas Sachau.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

5 files changed, 29 insertions, 15 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 4899e4080b53..4b297f0cf5a6 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.165 2013/03/20 17:16:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.166 2013/03/28 23:48:12 vapier Exp $
+
+  28 Mar 2013; Mike Frysinger <vapier@gentoo.org> libffi-3.0.11.ebuild,
+  libffi-3.0.12.ebuild, libffi-3.0.13.ebuild:
+  Disable tooldir related hack that breaks --libdir usage #462814 by Thomas
+  Sachau.
 
 *libffi-3.0.13 (20 Mar 2013)
 
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 6441c3b52965..9b430a58b150 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -5,19 +5,25 @@ AUX libffi-3.0.11-x86-pic-check.patch 3716 SHA256 247edfe37709f7a0d193169a31a0a8
 DIST libffi-3.0.11.tar.gz 794220 SHA256 70bfb01356360089aa97d3e71e3edf05d195599fd822e922e50d46a0055a6283 SHA512 0049388d16207078a3d6dce97c877f1d9647aa9d908a9372a3f67ca064b70d8c8b23ee458be4a15a6344a5d39ea3e6292be728dfbcc73e1efc0b1db03be874f3 WHIRLPOOL c5ee01a6415b2715a4542d0997e3a7f42cbc97e476589d4e093fcff44315cc83f78a02dc04929c96831309966ac196e6ceb134c8b14cfc02313e139a98e6c11a
 DIST libffi-3.0.12.tar.gz 844641 SHA256 2ea0db90c2bbcc907c3aefc3f76e9dfc3b35c7a0fb75a4319f5248e0172c1e9e SHA512 9ebd5f274aaf007a5f888d3eb3a1652f61f7ff46ea23283a94888b229bcc959fd22904a7101989cd238dfbb10c335129cfa3a947c650dad72522f7fcd0d9c79c WHIRLPOOL d1d2247b3727b4f75006db3bcd4b01dbde2817ea774dadbee30bd8cb4578d01176be089ed6e4bf373587f824fef06ae7fbd1d24f775da7d8f91bb9e753d2580b
 DIST libffi-3.0.13.tar.gz 845747 SHA256 1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c SHA512 fc47f5d25197c631754efe05a349edb556d072807ecef19b41f17c1a8f39c95221be64926fbd05b1f8439181df1ddff8fc01462ce3a26005b75159ddc27e6f6a WHIRLPOOL d5b14d48a7b35f7349ec938d0deac62db7022ac4d611ab13bc7a6a2766a47e210fc1663fc8c6d7ee48d421c06b66f558010829ac2c215620c76d0bf7650e1308
-EBUILD libffi-3.0.11.ebuild 2010 SHA256 9818b9286de122d5da2e2343d23e9f8b7002b95e6db351c33e1d1edebf187f66 SHA512 78a20cf49422822849cd883eef15c9bf941c86a910bb151ac19a05e5dde86e0419f50c1c930c2980cac765be6517183f8dde91627b3b9243980460107ee0b5d0 WHIRLPOOL c2d25acf6311b58a06a81d1f1ba9634ed2361185600af19561d319dcab4a88fe891b9828815f8aecb718fab6582f732b2bf3b7f5cff66e9fb60f4488aab4593f
-EBUILD libffi-3.0.12.ebuild 2019 SHA256 8a0b3d898337252ae3fab816de51d3036a53de6b3a124df1f4852165ae2d8a02 SHA512 f4aace0721f42b7edef5e0da09d7c86435016a2321d067ca40b0b4fdd03ebf1bf1cd526e37b4b22bcf5c135d7a2ccb2e2457205677e2615f5832772e84767d19 WHIRLPOOL bb410f194e897d93509ff3d5d50e92a1236047b745f3b4d6f116706bbbe6746ca2dc16e9dcca05698554f5663b6204b5f549739375206bfa953949cc8d410bc6
-EBUILD libffi-3.0.13.ebuild 1969 SHA256 f58b3d6989e57b7636092b5f24e302d1d8d9bd1ebb17df737711d8b9f7b5b545 SHA512 ab9c692dfa30849455d32f5b0e987b7abffc7f0521d1c5b6403c72039f6833bd1e1db9fb54d4b16301212d1bc57a4d7c4444ec3a559a8a9f5925a0f7080f3a33 WHIRLPOOL 70547346b2a332b145d94394931ffd80ed85282334462c904d0b78313683ff13a8721975c6ec947a04ff8b7ff715970a33514e3ee47effd646d1b6d830852dbd
-MISC ChangeLog 22231 SHA256 4be33919125709d2d23da1c06a9e0ff213be83d135917e5ae63b89ac8537d077 SHA512 b3ca8c9123dbedf0524bbc1afe90fef474e86880f517cc6d36c8af597418579763a0fbefe87ba2b456b06898108e768363a1ae8fdcdc315e39bf0647bb6537b5 WHIRLPOOL de500b09a43a18f77880979d84fdf38ac4a84f21e7628f02c75a9a70f585b834d2268c07419d94727755b0c6cf1bd3375243a5a5d2a7e5427db8538fef50e4c5
+EBUILD libffi-3.0.11.ebuild 2077 SHA256 565af7f1d62cba0a40c56d2180f70ab2373d2729ba1ff29b9800fc26d13f95f5 SHA512 99b841085e12f72f822808b6cc9f10c3d466e188d019a6ebd975c74091cc72a4d075c1e8ee9480d20a54a9db01289fed5fae0f0283761ad2f0c2fc67be7b4813 WHIRLPOOL e2ad88ccce87f83976180c65e5ee564fcf1ce6824393d889751d733768a404eae72dfe6676e960cd1a08d5c5abc69493ad4aa52bf6f214438ab486a5eb19823b
+EBUILD libffi-3.0.12.ebuild 2086 SHA256 dccbca112750c875d512550c5cd563258e4227b0e605337cc3e39376ea7c9cae SHA512 54fd387ebe59d80d1eca707f44d3027377d980a7fbe29c17649755acbcf981684ace657e0aff23b9e0c9b84fece22eef17f686a3ebd6b7d0797db9b98ec9c15d WHIRLPOOL dd92f31a7ae9e9c5c0a8a51c38816ce5d83cc3f46e6c3401d3f9dfa6cba1c9c8662a3a812ba7629d72d187cad81848aa236fe2a02835a5075109e2dde8062917
+EBUILD libffi-3.0.13.ebuild 2034 SHA256 5accb0dc670814ce726025db1698783c3eab33b220cc99fae8c7cb3bf2cd1e80 SHA512 d4b9711d298f73b1632416d274592370e08a9cf8197497977cf0cbcff3a9d1278579091a50ef1a6dd509475290da4d1a00b5847ddb064f7a5428d460b91a0b4e WHIRLPOOL 1a9a74f3512cccbaada03a6db5229b7b6803c28330855fbd2741c4d45e0f380194ddda2d9e7e8e27f5e2365b5b1d9a9f1e3f1de16de7b76a19ec03757a3e5ccb
+MISC ChangeLog 22433 SHA256 97a8e2532d23132d5098f4b7172a2711705d6da9212a8dc29b6e6097ecb27733 SHA512 e7832e7e7d2e731122612185de2af586c46720470a55b5de5678bdd4e1c2c8cc532733fde35a2337f78a029e5f4d9be54f3be3bc82cff04108361a05c2b0702b WHIRLPOOL 908d9dc5d24c063bec2452a690774fafec91c641f28d48e27ecc2f736ae5ed75ecb22dcc02b22c5a10a6cbaa1be87466de4878f11a136dfc56c6bfc23e1180b3
 MISC metadata.xml 1768 SHA256 1bb92578368c006819d0cd5e1a94d32cffca87ddef8d571c29b483bedddc9b6e SHA512 2291c051ce2cb5c31989af68a705c0f8ce8d6ff23f2a66f839463a56a20454a6af276c5afc75687919e14fa614862356618e44c88415ff9884725e6e6db161bc WHIRLPOOL 7da7a437bf11dfcd5b5a8fbb067463ceb588fe83c1db0d15253293a955999d5dc65754918c73840a9a5020f86d1b6f1c9f8d127f4e1519594bc0678742727d45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRSe7GAAoJEEdUh39IaPFN160IAIbkNTs6mEm+USdFeV9C+IP8
-+1UK2iMLMMXQtTxWNH7r4LNd8jgaQb0nn8IAEB0G14IGdQ+nRX3T/7fOCyMz7iyH
-i2PLFobrd+bAT5gaqlz8W5Plee1y3tjEx7VUwrb320RBYh09CTVcZXcxInMamFe5
-kudb4nFc7vVVLrbWANw8/Qd+ADli8+tm3sJ/Sfnx2LLaGTMW6BUMMsJ0lg9MB5b5
-MquzwdDVHxZY2I8zU+VSRDFnXVYYCXESnWCLnBnbEEI2/WjXKCcTnGfXG8BcDxBo
-qzb0gper6w4WWmsk1a3nAqfw3rvrn56eFPKzIH3cLgGehbpSS5xK4NxG4aq7608=
-=Xe9D
+iQIcBAEBCAAGBQJRVNfdAAoJELEHsLL7fEFWAuEQAID1Q/8yZ4Ns7UU2xZxUvNmK
+T8XFIonP0m8DwR2DmrmFUHNQeVlDefEZP/C+Btt8QKpnFojmRkhB379j4pz27/rH
+BW+nI7/434JBcoZ1XoJYEeXetRGYu3VZ6qOY1egpzNeiWHiGGbbpZa8SNQGTPPbs
+2wfXvucpdY/g6CT4O+Bl/4bFg+Mc5V/VxxYnDUtXvct7/faPE2k49iv0mjYGyrSX
+rN9Hi+EA5PfhvWj9Wi2V/XBtQ6ks+Mt+EOI5Krf3J5dYPZRVSpBbyeJapm5vMCMe
+TkIvDSSgOoXV+Nb/6BgjnzHbrwo58bjXeM0NXG5CTNjSRGsg00JF9tp5a+ZTztSS
+O11PhUI4vpImnajn9+7gOel9dJY8AcNEKw5QoIIypPDm7xkV6WvNE/T7PM93f9X/
+ByFTnjkPIZt8QqscKfutOCNn2pDlN2650gr1OTsXfD8gTh4dDJRduWcqTq9PgR28
+uJQFPoOB95ZytkDuU8II/lVx036WjU0CbEGc4BWNH1Ai5TzPaI4Lp6v1KBHdz23U
+kavol53Wf1UA7OKGsAiUFWVQbS7JU9+lNYJFwJFHy4oSxtPuIn8aecNN9IfqTG8T
+gDNN3Rl7mB8lnW6wEFeK82hSwkciC8XVzaJ0pA7DqUeiJhnzIz1bYERRCRr3NLb3
+KlqsWWb9SWvjJUkixwMW
+=Vsfv
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libffi/libffi-3.0.11.ebuild b/dev-libs/libffi/libffi-3.0.11.ebuild
index 654e6eaa12d9..fac3be527b28 100644
--- a/dev-libs/libffi/libffi-3.0.11.ebuild
+++ b/dev-libs/libffi/libffi-3.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.ebuild,v 1.19 2013/01/27 19:57:08 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.11.ebuild,v 1.20 2013/03/28 23:48:12 vapier Exp $
 
 EAPI=4
 
@@ -40,6 +40,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-x86-pic-check.patch #417179
+	sed -i 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814
 	epatch_user
 	elibtoolize
 }
diff --git a/dev-libs/libffi/libffi-3.0.12.ebuild b/dev-libs/libffi/libffi-3.0.12.ebuild
index 1c1e77bb5a9a..234b9adeac71 100644
--- a/dev-libs/libffi/libffi-3.0.12.ebuild
+++ b/dev-libs/libffi/libffi-3.0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.12.ebuild,v 1.2 2013/02/17 20:12:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.12.ebuild,v 1.3 2013/03/28 23:48:12 vapier Exp $
 
 EAPI=5
 
@@ -39,6 +39,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	sed -i 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814
 	epatch_user
 	elibtoolize
 }
diff --git a/dev-libs/libffi/libffi-3.0.13.ebuild b/dev-libs/libffi/libffi-3.0.13.ebuild
index 5fd9abb33c78..dd4533e7309e 100644
--- a/dev-libs/libffi/libffi-3.0.13.ebuild
+++ b/dev-libs/libffi/libffi-3.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.13.ebuild,v 1.1 2013/03/20 17:16:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.13.ebuild,v 1.2 2013/03/28 23:48:12 vapier Exp $
 
 EAPI=5
 inherit eutils libtool multilib toolchain-funcs
@@ -33,6 +33,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	sed -i 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814
 	epatch_user
 	elibtoolize
 }