Use system ar and ranlib - bug #438156

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

4 files changed, 35 insertions, 7 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 7693ef108ed4..3c0d947f43eb 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.388 2012/10/12 19:04:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.389 2012/10/12 19:31:58 eras Exp $
+
+  12 Oct 2012; Eray Aslan <eraya@gentoo.org> postfix-2.10_pre20121007.ebuild,
+  postfix-2.9.4.ebuild:
+  Use system ar and ranlib - bug #438156
 
   12 Oct 2012; Agostino Sarubbo <ago@gentoo.org> postfix-2.9.4.ebuild:
   Stable for amd64, wrt bug #437602
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 035084ef7969..e029e8df2f4a 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX postfix-2.9.3-freebsd9.patch 787 SHA256 f5e16d7a85d2c4617a392b6e33ae8a34baa21b8685a1bb3e553b06adffcc45d0 SHA512 6a8f3a2b1166f6b43a3d007c66be7060107fc853842c00c3b1298e85246e0e87ef66a195c9adf01440c35c97e2dd590e8340a13d9c015ed3a8c1831ba5ac03c3 WHIRLPOOL dc6197fa5c4058b554f61732c15ca963d4b082d252c6d17ee86c17cbb1898ed8447e0bf398e980d3f2093a00fddf649c548ac3adb788add61813a8f95aded263
 AUX postfix.rc6.2.5 1424 SHA256 f5ab48b469db3f62a5e5ccc15e5cfa6e0ace97d2c2bc66af334d105b0dfa7d31 SHA512 91ff2ee83deddac805304662222e5f9131af05ebe63d2727005cba930afd92f7ef56af5aa862b0135262e46c5475183b7e74dad372fdba60ee050c084102a7b2 WHIRLPOOL 514bec9147974728ecd5d93dbffc8d38f3230ff4b948793fb1e7bbbd887a35e7411017454c04e2fa32a6e7cdddcf9ad4212c3200fba42be43a33cb75756bc113
 AUX postfix.rc6.2.6 1996 SHA256 2beed4cf54d6634620bd44ce6337912a7dfaeada1fd03c04f37f777628a5c9bf SHA512 7abe4b260731f80c40d88bf42139c5aab34137ad14119f9c9595bf5a00a3ca2441952e9975341abb52c2776c398c2013964d3551acc8cc673ce9f296873a4150 WHIRLPOOL 32607526679003eec86e7c9ddcdb2ca85946b8be05171c2508c92cfd353e89b6ad79d925973512e0449ad5c47a975cbc74749842aea7f061b29a849e1b72714e
@@ -20,7 +23,7 @@ DIST postfix-vda-v10-2.8.5.patch 56777 SHA256 0106e0bfdea8bb3888e8f33e7cb4b1530d
 DIST postfix-vda-v10-2.8.8.patch 56777 SHA256 40e32a1c159fe3d12836f81e4871e4a628a87623b80402e90f7465eb39f89a86
 DIST postfix-vda-v10-2.8.9.patch 56777 SHA256 e671f7349173349d66f1b091359761ed5a5d517f8a58c86a42ff461997d2cd7e
 DIST postfix-vda-v11-2.9.1.patch 55009 SHA256 611283a932577944bcdde36e5fe1a80ca750a0a66eb5f3490666e2adafd2bf84 SHA512 ce34b533c2f50cf714d8bd51791c3e30ba91f49861e3c1dcfb08d21d2d38be970b3e3040c7e224142d085c7b11b6b14bfa230844e21daa2eb0bf59641dcc29b9 WHIRLPOOL 0668cafec5678d09504220e31ce60344fc0cb46cfec449db2aade89ee09c598484012c5ef0536a0dfea24df51c6bc86d1a9e491f136312afdab90725e5efe86e
-EBUILD postfix-2.10_pre20121007.ebuild 9531 SHA256 5b96ce71567682e517ceb28482b3f33191625772cd77ecce49563ee8d2e9670e SHA512 5f2967a957b16be57f989e7372757cae0e29f20bdad6aa0fba244117ee8c3a4ebf400c47265db25d863ee388734891e77b1bb870985a87b33208217d83eda3c1 WHIRLPOOL 75e8a42935682a2e5c327309eed794a9ea292c6e804e4598d099b233dda98e11f235ffb8d2f43798abdd5cb2212db6732f64c3db0433092dcd057dc867631d1d
+EBUILD postfix-2.10_pre20121007.ebuild 9649 SHA256 0e4b99c6ff10cb39a3782a2870a20a32f6b926e54a248f7bd09301307e62f980 SHA512 30e5e8285ccff8115fe354f3fafecc96ecea3f5671cd3a57d9cc4b0679a8e32df8fcb6c475e50efe156393e26f71fdb6827e6e8e8d93d9b6de4301af8cd5793f WHIRLPOOL 7ba038cbf5b3df35953728fc09c8667780be423a4b4d11600ce4a58adec96f4252c8d56f758f71dbf715beea9f0a9547d92c961d73d8a97b8efcfc0f382ae93f
 EBUILD postfix-2.8.10.ebuild 8434 SHA256 e05909a4806ae0b20bfdb194a330c000d408fa059dae489349020f069463c40c SHA512 28c8ef14a225c1a437c65c778b77516e2ac99c1e18d903fd11ba2c0b373d7218554299c0a6808eaf60817d20d1e2afb0714a67b71ba1b470b6ada10ba5ff3846 WHIRLPOOL 55b057230deeacc2dd679661eb02f1015802de675c994839037e5a6bc88f9aac792274fb7f68da460901e299716bf2598a435c9e6c672cb6dc0e6e2f56613fc1
 EBUILD postfix-2.8.11.ebuild 8434 SHA256 d1a8e20e5ede8934a7b94a1d9406dbadefad93a2fcb60eb66148abc7e305bb88 SHA512 257a9522ebdc1ba4c80e565a6315be69c175ab48846da894f8842db2fbfe2340779277490aa57df4219105e31bfa3e1c093ffa240184e958fb1d31b0f0b644eb WHIRLPOOL 03fe8933b41049848db898165d1e2e0773f7580d95e82330a9d62850257039a668cb42bc2bac79299046b17a303775777820c6b27c0569ca90f6c1f38f17d42e
 EBUILD postfix-2.8.12.ebuild 8431 SHA256 c9d9c2b0d69bbb8a6082c4563db5e55da7520dfb377f8b16ce1edd67112dc9e8 SHA512 1a47f9aac55fd913eaf8bd443768b7b5c4bcb30cdee31ce1643a1821c33f700b1fb574e0f4632b6061d7d52099b04ea3b9db4e4262433cde225d06f6e5c5cb4b WHIRLPOOL d1f7ab5837f4d88ea6a3d6db58ae7522f0010059815424216817f425f5d120bf622328d5df157d49b68cdc8f97fbf436ef33cf96792d21905a96908319d20b55
@@ -32,6 +35,23 @@ EBUILD postfix-2.9.1-r2.ebuild 9492 SHA256 ef3529a2cb63b6829b0a13e9957253846776e
 EBUILD postfix-2.9.1.ebuild 9489 SHA256 7d0c9790014cfd6ace3dc6b87bca78863ead558818a8108d118bfbf843637fc8 SHA512 f4ea7dd594d1d50b3490f9e5d140cd5b36203c26fade7ef4e722394c03b6d78ca863b6b0ca3bc15ba02df5043e86ef38d1e2362ed96786d37d1fa1fd1423959a WHIRLPOOL e3b807cd305a823077ea2395b5ec8cb4a831f04f257444b13a6ac45f6741d186e31ef9d29b714f84f233f3713877b384f2b7ce8237e6925cef544e101e737ef1
 EBUILD postfix-2.9.2.ebuild 9489 SHA256 b20f15c69ad89efa200be8cbcea4e5c51d0c7988678830e5d58bb1db4f025dfa SHA512 edeae123189963ebde183a44030dd3b75c932a1e18305a7b69f06f9196a87267fa55a9bfcf2fa18e156f1ceb504a9d98e9eb0682cf1af52e1a595d83b8734b2b WHIRLPOOL 8e4c07c4795d0c03b938d711fe00eb0431a5b12c91d98aea0c6607752292e1398bb1a4f3200b75edf80bcc9bcec20ce3a5ac170c4621a17eb32fb50b062a0508
 EBUILD postfix-2.9.3.ebuild 9523 SHA256 c2aca9dc9afd5c09225418e544e6cc6dace67109a8cb50b5bc85a204cc06c747 SHA512 ac24d687b41ec34158792568fadd175d34e25e293002117e01799a0fc7a163598efc4a6cc5803b4ba0c5643229c28acaee0ad021f2113e60b9886dd801d33241 WHIRLPOOL 3ed7e1c92430a61f15e1b23b0b418534d70d86ac6487ec0e918a8e2511ac65edde91c1ce5544a0df689f09b02687caa4bdf7a5adda26a6d0e2239d4d520775ce
-EBUILD postfix-2.9.4.ebuild 9513 SHA256 a4d69f3b9977ba36304091bf0dce8bdcedeb5425218b6d1e2d68312a0d96fd69 SHA512 084ffdd3542286ef9764bcea357afb88d2743dbecd93727408ca9a0ab18327e8658ba1e15c996baf58f8c07f18c94879273a8717b594422d7ea2351b33dca450 WHIRLPOOL a8274f5fabf4ec8f78046ed8b2eb9fcbdba7ad46aa53e2337300ecd9236679f7a6612fc716087a6149b72ba9ad654161f30cc794f540cd5ceae6b6d1df3ca607
-MISC ChangeLog 86281 SHA256 dd4007ff017b0802ab111ea5f710c11a6139f19350c682cecd0562e00d0a6bff SHA512 1c3be9e74275ccbe6a80761769faf9ad7636bef4f1a5db8347f317d0d3e1a61f73582e0f02f4d46c910404a87ab8883341dd8851d76584448ccaa9b4cf8bab39 WHIRLPOOL 6d97d0e213feb4cb5147d824457d90f39b04847ff1a419bb53de7ab97ed1697dbf4963928fc094f20902fe2ec4958e6eb84185300c2adc435a4d2497b1fec1f7
+EBUILD postfix-2.9.4.ebuild 9635 SHA256 0a6fbfc91bb222c8005f8871025548c1b91b3dcd5929b6429811ccfa16807c5c SHA512 ccc0d1ba0da422e8a6548141f96ec4b3cb4e727030a5ae7badf0cfa9ba556495692ef178fba59ae25c3d60810d16dbebeb91741d238a09a3a13c13a64fe29018 WHIRLPOOL e24647161800e176aea59f447308af4087eb58a3955e72818bd68a6bf62e34d1ad5689ab68792cc4108437185293a0694b15747218fdd22e3ac6910c18642939
+MISC ChangeLog 86426 SHA256 4d625347d4d5442d1079299256e88930e15bd425de7538302943c147295064f1 SHA512 39c2d348660680e0dd02e412e6ef6afe4e492b1874b61809ea5ab0066113938decad241a8cbe594bbf0226f0b769d085215615f3febc32d0f04d81194931819f WHIRLPOOL dafb589e919467e24f685ae47ab165816408e991cb437cc98fa5e1665c76c0ee771468461a57f4478472de377d4fc8513af0b301ed200de52d7b19ebec51ed01
 MISC metadata.xml 610 SHA256 00b7ef524664b20a9df7642573745b1d17b0b51f005ffd150ac6dccba38dee88 SHA512 fd446f288b11070e2d6b5dad3ec259a889508c3c7f4755ea2ceda18500844e065ddc2bbce5f4108b30ebacff76443ea8a23805c21d39c2bf72210f801adcfe06 WHIRLPOOL 815ae4ddbaca96871454d44adbe3bec4a081d857c61b07cd0e382ce0d44503421a4ad156da6009cc91f24855b7c1d8adfe3fbd48c82833f9d82c1afaf798072e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQeHA6AAoJEHfx8XVYajsf1EQP/0OLM0aj8TxiyB+wV43fe1pA
+8KvVaklDdSjCzO1eORq6L8jtLtp1kuhqP9eg6A27PQ8UD1T6vk8pcHqLgTdaiZVt
+0CcKe9CPwFI5ejlSAK6MmftGSqBnAwsNFLMf4gIrSdLXkcUhfxLh/LLq8OsY54TP
+GCabNxLiBn4HiYLKuisJ4ImWPCKZQXcFY4MZw5CTUkVOnmBZElERiM35xlCNbm9i
+SphpYsnUaACNrmWypVj9hsq1UUG4NSMM474MV3blCRxAyKUQTSbgrwCMF7kSkduN
+3YudBsnyVy+/6LnNfoUXek4U/QfAdBw9LuRSNUYIPF/P2ZTkGPF67mPItLuOOe4i
+MgI7Lv7w1X9I0ntW369lWrsSC0M5xEvzB0g528rLcIjhIUsh+eAP14xQIfn4izIt
+4s7pQgtqmj0s8Edb31vGM5pknowY8fpaw6oOGgXu4AojFZU+6CnN4TFhoargMOqA
+oZxjRltYgKMmZFgXFsYPjdRP7xQL0qN+8HhmhOrwp9lQ0TfmMYdoAwPRGU835bdm
+aKym4zNhnIjJxvjr2JRoHaVzeGJP052hyFthj3ZC+/FTMOJCSFfdbC9WtDIuJzMo
+EGldldZUKUMM+P3GlrwMo7iQ/0L9srt86rTl0DcoEC/bVaMUAw6GMNQ5pvhmjBlE
+7R81OO0nwn4xQhpC8Q0y
+=GZxj
+-----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.10_pre20121007.ebuild b/mail-mta/postfix/postfix-2.10_pre20121007.ebuild
index 69a9cdfabb71..9d1a7ca9fef0 100644
--- a/mail-mta/postfix/postfix-2.10_pre20121007.ebuild
+++ b/mail-mta/postfix/postfix-2.10_pre20121007.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20121007.ebuild,v 1.1 2012/10/08 07:05:33 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20121007.ebuild,v 1.2 2012/10/12 19:31:58 eras Exp $
 
 EAPI=4
 inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator
@@ -175,6 +175,8 @@ src_configure() {
 	# Remove annoying C++ comment style warnings - bug #378099
 	append-flags -Wno-comment
 
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
 	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
 }
 
diff --git a/mail-mta/postfix/postfix-2.9.4.ebuild b/mail-mta/postfix/postfix-2.9.4.ebuild
index 232fe79d4b56..cc6d6ba44878 100644
--- a/mail-mta/postfix/postfix-2.9.4.ebuild
+++ b/mail-mta/postfix/postfix-2.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9.4.ebuild,v 1.5 2012/10/12 19:04:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9.4.ebuild,v 1.6 2012/10/12 19:31:58 eras Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
 
 LICENSE="IBM"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
 
 DEPEND=">=dev-libs/libpcre-3.4
@@ -176,6 +176,8 @@ src_configure() {
 	# Remove annoying C++ comment style warnings - bug #378099
 	append-flags -Wno-comment
 
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
 	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
 }