Replace hacks with proper calls to multilib_for_best_abi.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

3 files changed, 37 insertions, 34 deletions

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index d2f82b95a180..5a1f7fdb6e48 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/freetype
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.365 2013/03/12 21:32:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.366 2013/03/18 19:52:14 mgorny Exp $
+
+  18 Mar 2013; Michał Górny <mgorny@gentoo.org> freetype-2.4.11-r2.ebuild:
+  Replace hacks with proper calls to multilib_for_best_abi.
 
 *freetype-2.4.11-r2 (12 Mar 2013)
 
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index e9c302e258b0..85a82bf450b8 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -25,27 +25,27 @@ DIST freetype-doc-2.4.9.tar.bz2 106690 SHA256 138ec5c5081c2c0d1d4624e83bf3797a27
 DIST ft2demos-2.4.11.tar.bz2 164608 SHA256 49cc6c45542cc39cca0d9135b865fab428b1f9805b46c22fd848528f51c76075 SHA512 35c907ce5cd8a5e7381a259d734d2c56641c8fd08ef3ba4fe6a87ae9daf2ce4dd68cfeb3e6459cbed043832157db7918e3a66ac5102b4d48be0bbf39942f57ed WHIRLPOOL 9e85b6b9db845aeb3ead65975fc81e058f25cfdb637a3958b727449ed738f738022729c30be6ea0da72129f5f298b66c28d806ee56eb2b25e0d1abb130d35476
 DIST ft2demos-2.4.9.tar.bz2 163748 SHA256 7a67ac6dff11078464c5b9dc68fa2f62c8f05067e0fd15645f5cb7efb05413f9 SHA512 2633a5a847137fb32ed9ab3d61a201d3492896c0e945552382f1b23f169b51dbcb31e06c092a12160ec15db5bd7ec7a9239bf831875c1d9b9ad58a77dfa027c0 WHIRLPOOL b4b51981f91676bd939a471b9ebc2a9591416c78ed1cd894b0df03c1d5325bb80eeb0ab3d82ed3ecead15d85e80dc3b9f763842355b32ce2cc3a4556ba905b05
 EBUILD freetype-1.4_pre20080316-r2.ebuild 3854 SHA256 e3a3348226db846e90adf4b398fad65b575defdfb11308a7f90ca7fa51f0148f SHA512 ed64b41ae24e4265a08f02e50d78a3e61a43f5f0fe26226b546025956582a1bbb8de72ec5980b063f66f2f605e08deafa41bab31eeae9400cc10909b06c2fa2e WHIRLPOOL be6e0b903a1019250963fe3a62e6850df7cdf0ee7497297ce3be334591d770f1d53ec55b03fa7f7be00cfa9fa6fa9a1a7df9af6edce6044f2802963119873d3e
-EBUILD freetype-2.4.11-r2.ebuild 4606 SHA256 96c7cdd644398d2b70f275b09e3969c66e4ac5534eeaf118d0dcb237131fdabb SHA512 35105937956ff1f690a03f30256c1ad0df693a22f48f05ca51374a4b0f385a1975df895ff86b022511e485db700949527ba52f939234f1fcfc2fd180b79c3c6a WHIRLPOOL 1075fa239d166453c68d0d4fe6c2ca985caf315bc14153ecf834e543a5f58afc514aa12b6246979bd73e349612648aa5bb3fba3840b6359504d4baef6ebaf6a6
+EBUILD freetype-2.4.11-r2.ebuild 4598 SHA256 e97d05b7cc6c4d06c5300df444e99e88fef67a31c320b2233eabe0b13278fb77 SHA512 576351c02e97ddac959294f48d28a818002b999fec1289aeb853520bb331fefd3ca37039f4a3860cf826a775f1271e827cc971ffba72ccc2f9ad9122af1dc846 WHIRLPOOL 26c2587c9404dd9574b9cddd518e6b2039ae123943eda958187e9845a6b5df433ba9ef82df9a7f0a4c6df0c428ea8f2e3c08d5c0b304fc081e70564a0ea84ddc
 EBUILD freetype-2.4.11.ebuild 4140 SHA256 a2bc44fa667b0aedd0d5f9c51bc6c7e82b2d8a6f829af316f3f9af8a183771a1 SHA512 a371bffcb407f6dce30af19c7fbe4c42184ff7f3a210e77e650284dc6bf421fa3091c278d7d2acf2e810c4236e7599cda771247555085d552bc576fb964e6589 WHIRLPOOL 972d0c6fef662a7ee658699919efbc96c26c67133f5836ce49dc3c2a86592a0f81c0da1d972b34d5e905db3d1eecfe1939621dbb219605c70e418cc272880799
 EBUILD freetype-2.4.9-r1.ebuild 4090 SHA256 acc8d99ed4a440c4c6e1b8b2ed9041841a3f843a608ff95a185a9f7121a87265 SHA512 05c0a5e632b49dfe7b5183e3c1cdfea7fc0a0e885fbb8d0e1c704060d35311b32af6d0de5aaeedb1e71b3e97a200c31546120e22fa414c14f7d1b54ef8ed7f83 WHIRLPOOL f257e0aff41e32ac769989ec2c087ecec0ce0602adaca058e99c6466a0aba98b8a985003b7ee81086237129cf2853e76b4ebee8a4bfc97b80596715a376a662c
-MISC ChangeLog 54562 SHA256 39ceacd68de0130425c7147c6b7d558ada3f0871a6b25cad56486887a4b457c2 SHA512 7c75bd24ccd1639935acbeb753b858bfec3e95a7266d0f045a068c581793ebdbfd1bf792b8b562dbfd8005b3ea488de107f672aec05729c13761c0ae92834ea1 WHIRLPOOL 9ceb4925b05603ec7bc380ad97db4100453b8043fb625f2a2388b6a74c7475003123171b771a5288c7a9f342bb21003640094c6530fac929081c6ee91f4a2fb5
+MISC ChangeLog 54700 SHA256 5b1017821c53080e49edb5f1c4fc6a449cdf6267e1ef43f45b876d265f9fd221 SHA512 fd7bc0dd82fe655e36207315a0b52faf67b14d81fc3763ffdbf0b5becf90b965438e494675d4f2fb4140f7ecc1c543d9c11bae56c18f792222cc3e1dae482dad WHIRLPOOL 24f81403b163966a23c2d40d79d8d251ee0c85a71e5aba854fb9de693513608b4f4b4182f535b9438282f95c91c5fef5a68d7897674bc178bd0e30294a52bc4b
 MISC metadata.xml 755 SHA256 41325a5176c6bd7106a560701e384843fe5e1bd36725311ca3f4b3f886ad6bee SHA512 180d59a66c633c7620da99411e0af3b63184c9732e3584083c5cbd0f63b467dabf6491990a9379a28b45a1f288ddd29800982a97612f7b8fb62dcd45ddca2ebe WHIRLPOOL e3382c8a10d33dd7415db13d6d0b11a65d63450f4b4589af7000d95b51cbdb90a860bc3c6fda41fee93bb93de057a78ee913ece775d81a1d0c7dfedbecd6b3f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRP58zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRR3CkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD9gEQAIYBPOzuwjVIf9UYtloEoKQe
-mmBom5m6HA8WL5Gb0GkWBCvGMp7l3peN1M4bUzXY9Vgd+wqN3k/zj0FzIZodXrhq
-9SJ57UT2LW8uqgJRAOSxxPzIV0gwxz1re/UH2QbnRtd6105P7TZfqzlREz1yrQIR
-+ahNVkOEe0+kuyaIwwJXu+5QE58b4B6ok1usFbtTWuB8p6XnskH9guoXjjMbl3Qh
-Lq5sMY+UjzNeIyOB/1n9DOtt6PVE9xqLZm2vsb01clgHz4vhWfb6XpXUjJdMhB3W
-4JEPqAqUWofvQ2xnelQ2Zs/w2ocB+jTcq4A6qDZyXD+GveSR33KmjR4Fd294jMMF
-B/riDGMQAZuDaNKsOaw2OF+v+uJ7dsfSW63iu55n1Xe2VoKbl6bkC7KsCsubCdzN
-8rsjfnVSVHQ0Wz9lcY18qA+Ye1oe1dIT0x0/kICedj9DTc6yf22j49JiojAEUoSE
-uc8u2NGnjQ5//0RsLTbihRf2Y5RwJ8dBpjWGpFzafk3hZFzmyeQ/ars/qRbW6T77
-LBVFCL/PFPEmwAj3UeH7dfsP0YpjkIPeYIxsw58tjBIS13A2io+xuw200tZj0oMH
-nC4LCLrxHTNCDsgJhFxPrwDUp38p8bBj+O1vYZokTZB6xYDT5WKg7/ogvwBMjwZh
-83KhUuZlzKT7y4d5FKoO
-=BGtQ
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDY9kP/3637P6QmatjNz8XHsuYpNrU
+BIKIKrTPopEVyJMKRvY+cS9D1rBolfZTt77vMlhH247h2uijNrI6HFzf0h7MI/RR
+uyQGf2R+OBHCOjCMrofoPUD0M4rB89VSaj6xidQb1JWmo9ZCvw9n+Qt106WOS6zo
+cwog2aaWuASz67h9jWZVKmdxyjzNjSUwDDn4e0piBuKBs0VNgbhCvg+OlNX2VfK0
+O/ob4Jud3LzVlToMGY7BD0kXC2FdLDSwBA/93Opj0UMTUMzgJiY2b62N1dOPzx/+
+3xMS2tGgOpQEgr/Wgn5CZ14zfiQs4ytMb547woiWCTR+Cv+p/rbWHiLKZfkDLHtf
+dsEWC2theK/V2xtaXLJgE9E709zecknWgtp50ggu3xQAESfQpfU3Pu7ISuMBjGWF
+z8OLkv6sexM/NFeqqgdpePLQsiLzugSfSW+upNoy8YpUBvBT+WEtzocrspbSy/LG
+9pqgLursEQ6Z+6/jvTFfKZv9Xr9wDjFp2rPw4qRU0iAAw+kwaoe1Ryr6M+6O11W6
+L4QKDUf22AVRm8fw19+CI3kg4etIGwe6kH46ObQzukWHHNkTyCEZ2ZU2cSE9i7du
+kjuh4ws7XJ7kNe7kIdKiHBiewiZBREjQexXQqf4ViKFJcgPX0DJEYM5GkE31yuLH
+sxWz8+EOHkkHVSUQXQ8H
+=bRXW
 -----END PGP SIGNATURE-----
diff --git a/media-libs/freetype/freetype-2.4.11-r2.ebuild b/media-libs/freetype/freetype-2.4.11-r2.ebuild
index 9675dc392f81..6b4bdb8697ef 100644
--- a/media-libs/freetype/freetype-2.4.11-r2.ebuild
+++ b/media-libs/freetype/freetype-2.4.11-r2.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/media-libs/freetype/freetype-2.4.11-r2.ebuild,v 1.1 2013/03/12 21:32:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.11-r2.ebuild,v 1.2 2013/03/18 19:52:13 mgorny Exp $
 
 EAPI=5
 
@@ -83,6 +83,11 @@ src_prepare() {
 		fi
 	fi
 
+	# we need non-/bin/sh to run configure
+	[[ -n ${CONFIG_SHELL} ]] && \
+		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
+			"${S}"/builds/unix/configure
+
 	autotools-utils_src_prepare
 }
 
@@ -90,12 +95,6 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 	type -P gmake &> /dev/null && export GNUMAKE=gmake
 
-	# we need non-/bin/sh to run configure
-	[[ -n ${CONFIG_SHELL} ]] && \
-		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
-			"${S}"/builds/unix/configure
-
-
 	local myeconfargs=(
 		--enable-biarch-config
 		$(use_with bzip2)
@@ -110,9 +109,7 @@ src_compile() {
 	if use utils; then
 		einfo "Building utils"
 		# fix for Prefix, bug #339334
-		# XXX: replace ${ARCH} hack when a proper solution is available
-		BUILD_DIR="${S}-${ARCH}" \
-		autotools-utils_src_compile \
+		multilib_for_best_abi autotools-utils_src_compile \
 			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
 			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
 	fi
@@ -122,13 +119,16 @@ src_install() {
 	autotools-multilib_src_install
 
 	if use utils; then
-		einfo "Installing utils"
-		rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
-		local ft2demo
-		for ft2demo in ../ft2demos-${PV}/bin/*; do
-			"${S%%/}-${ARCH}"/libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
-				"${ED}"/usr/bin || die
-		done
+		install_utils() {
+			einfo "Installing utils"
+			rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
+			local ft2demo
+			for ft2demo in ../ft2demos-${PV}/bin/*; do
+				"${BUILD_DIR}"/libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+					"${ED}"/usr/bin || die
+			done
+		}
+		multilib_for_best_abi install_utils
 	fi
 
 	if use fontforge; then