Use multilib_src_install*() instead of direct multilib_foreach_abi().

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

3 files changed, 35 insertions, 27 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index ba9e3e143d49..f79dbc5b8c96 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.191 2014/03/29 20:42:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.192 2014/04/30 17:33:47 mgorny Exp $
+
+  30 Apr 2014; Michał Górny <mgorny@gentoo.org> fontconfig-2.11.1.ebuild:
+  Use multilib_src_install*() instead of direct multilib_foreach_abi().
 
 *fontconfig-2.11.1 (29 Mar 2014)
 
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index b75b470cf46e..3e2dbefbb595 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -25,25 +25,27 @@ DIST fontconfig-2.9.0.tar.gz 1682774 SHA256 ca7e25071cf044bdcdaf7c48845243c115b9
 EBUILD fontconfig-2.10.92.ebuild 4303 SHA256 ed99599373ed5ed92f7475ba43dd8dfe0c10130b0a91d8665ea2fda383717b2c SHA512 a4db178067cc0804a55a435bd907bc7b135af5dd85febd7c29dce70598a751a9654979f75bce044254c05105fb627738173f78666a8a8b6c03b0307d1f4f92f1 WHIRLPOOL c7ca5c2a532dcee0897fe5908a6cbb7d01dabebe3de8bfe906ebcf86dd8f732b6034530f3814c8ae4c0e6ca3051489f57209f4667870e8f38c307d23f5c656dd
 EBUILD fontconfig-2.10.93.ebuild 4709 SHA256 5d6180fef41fe2cfe95218b145942c41f30bd130fb130c56f0829f320db65113 SHA512 3d32cc5127087c1473108b2dc27b6c9aeed4347246a853626fd16c271fc1bddb8e23fdd0ab00b392ffb6d47f49a9762653706d35c29377904c1b278eed85bd79 WHIRLPOOL 8b17b583b7ef1b3df8fe77b01131ef003382e7343bd0a086f674e69f4c02e55f5cfc4b797f33510605e19eb2d3636aef451712f0b264c8534e98330b1a0eb1ab
 EBUILD fontconfig-2.11.0-r1.ebuild 4896 SHA256 324ff1601a367ca83b922361f8a4112d2d43861842ae2df7d8bfd00a50cf8ac7 SHA512 aecc4399c1c8be65480178aec8f058d85625457d3f40c47dc74cecf0303fc863b5b2ab4ec9e45e9351c5b3e5a85679a858433cbfaa74aea2c78d35433075ac42 WHIRLPOOL f2c8cd7b94eb83553a688c4e08831411bd62766833d3fcd311a08fc4d4a3ebfce6c2b3b673ced59b0bdc9ebe75fcc543ba18c4e86567a12053b67a7fede43c02
-EBUILD fontconfig-2.11.1.ebuild 4708 SHA256 f43aa7952787feb1660ad9499132adbe1f182bc9d8c1b5404c79aa0475c72f7d SHA512 216aa4d0e33ede7755657b6dad165f1f1596d0d58df628dba1ce752b5154c66eca7d6e8617d7861ea8b2f12e1ac16940cdced03d6f1f7160dbb5db44af629d76 WHIRLPOOL d9b84da1cdc46459e6f5fc4d6a59a6f2c6f2599537c6f45ae8081f8b61019988cad763e7e81f8ba656d52d89de0fe2c19fa2b593523af44db9dcf72337970de6
+EBUILD fontconfig-2.11.1.ebuild 4716 SHA256 d997a50b6571e9612d6aabfccdb5e29b3b281a8c26ea02020c55598f5300726c SHA512 67a279236d3bc68580a31e6098e21009909538bd476fe4842f2c6a69be3a68c5d437a852be7c2153abbfcdc992d5c17ac83be7021822fc52ae592a2bd18f006a WHIRLPOOL 50bf0e0917d27427c1205b1abd3d71bea21599ee9007b9702f9e82bfe4d11740d1720093aec05e6d3592c00a07e91ff9d2ea217c6bc783317a59d2013d632050
 EBUILD fontconfig-2.8.0-r1.ebuild 3979 SHA256 41cc191c9e0763037801dcc0c8d8c753ce3ec5f236cec906a2e21a6140e5306f SHA512 5f0e19e48f9a7ca5ea863f2dd6c1afdcc2de2433a06da0ce69e5b6fcb769c757ebf2dcfaa500fc6532862af100501d5162678a1f7ce11256a871520350956556 WHIRLPOOL 7aca6d65eba1a31ab29ade2dbe39f6fc85d6542bed47aaadd3bfa38f5708aacf60b357a8f2df61b16da7e654e91a16b345cf17997de775099bad91680d305c92
 EBUILD fontconfig-2.9.0.ebuild 4081 SHA256 6c897b70cec26bf69f8fd6344e62fa5204b4cd46860c1e5ea7cfa961c8b22b14 SHA512 7495d2a674d407d3ba535288b444034a3a7a9465eab1b89807e4f59366f0a8b548d0db973858026e58c4e633e0652ad7ffe9c0f5ba8037e207ede9082e84694b WHIRLPOOL 0d9a1b4d4dbd2c4e6fb790d5dea3e369ec112468843af9ce0c7a5f0dce0af1f411544b13dfeb4dceb4cfe9c1d5507dd304349ba33fc57a8a761ed47bc834ad18
-MISC ChangeLog 30660 SHA256 9c28f9b3657da3fa850847a340c1054f78de7d3c5841bd6384c97dc9c4ba139d SHA512 78e828eddf83f8e4fb4d5e8132dcffdcdef76f1d31ab7648ce5a46ad30cadce4ea6199041d73c6d4e59406ea131e9461f88d12bdd6138cd4cd195a02fded6b55 WHIRLPOOL 131402139264012867e5bd0d4b7850bc0d1ff7b0eefb580ae1cc1251556e0458974b57021a85e45e5a9af7e4156391ae7a8520341edecaca25da7871198478c6
+MISC ChangeLog 30809 SHA256 f39911ad4cf7d2a532147382477e4c78118d73426de5f73acf7136c182fed043 SHA512 e3668e49430a3e52e2e35fd2d579149d4bbd8ba4a8dd9865a76ed1c47e467e07797519616e9780ab4faf483d5ec2bb9d678902afdbc59676c415336084d95b41 WHIRLPOOL 85c88907292a270cb0a2ce171fbfa9abd3623affe7dbc2dc72a07d4009d7b445f5e38d3480148a919bee98a785c04102ba1d5f3704c1af48f466e80077ab6698
 MISC metadata.xml 727 SHA256 90e4744ccb449b368e08690f44e02d4d8812b2a85223fb28943e5cbfd9bc1cbc SHA512 57e7f4ccb02227afe7ff2a9e2ad78a7ad54932d900a82c470bf0a71056357e8393d27c73e7f9f78940d8dc35d83182a14a0ca8feffe4c08a029c158ba343724d WHIRLPOOL fb47925fc948cac4a70befbf369a1cafcc94b00b607e07709692288fca5dd4fadb2e8e2e0b1e495d92ed3746d9fa9d45fd45d6aa4dea403617aa78b13e8b4f89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTNzA6AAoJEPGu1DbS6WIAa3YQAJLz8cBqC0cD6jMmGw9arE9d
-R+ulvFPsiRSoBKvLW5zpGk89nFzZUcVS/N2+cjUHlFqnAlIpE640YuK7hI9SrZ99
-F1u27p9nLxnWNd2ALZ2QuxqQ9RGRx79fd7O39QT2BNlJbEhyBedZmmZv8M/Y+3By
-sRUxalPTdAXF8xwU/ei1lr1ebX8FKyAm20Jqqtxoz6oFfLWuvby0F+IT8Jd75jZb
-VDR6ucuRY6pxTVXmsGydsG2Uhc28QwpMkJPk7hJq9d6BEmC0iX+f8a9hACtVK9bb
-SfNN0rCBmoGMqEjfGJhJPNhbI6ldO+6FkpJF7REbMOysdC/mj1jffgA875YB5L/c
-Wdc6JKmLxg5v1HevgcVvcRZ145QbMzcNb3lz9cMC+26//3rrZIlqrH4+CvgdPxRB
-kXagIKU4kEnrVPO+9pa93YOhUqegKqUacnIwY8ruFVMjo1DohZ2BrJw+55MtVUph
-rQXDZPvV8KBOYWUu4wfRxOKoyNKsiYQ0+reCd+AJJG70QUZP38sgRNQC3KhVExiL
-lBIDHoyCypFYm78ZUSRB2XbWpuIe4VfM53EvMAfnhDzLdp9q9XBGzuU/Ukny9C1p
-L6h8hpJvP0TsoITJteL8RcwNTMe9VShQYEtryfYe91VJVPMkclDu+EVvLIfE00wR
-aWePzbbw5k0JEsGo5Mv8
-=pxhE
+iQJ8BAEBCABmBQJTYTQCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOXJ8QAIn8MOVmJhgJKb1O8mOBeBxP
+O81ncFNUFnKYc3AILF/Y2Ug8niWsSSMmxQx2MalHmXIYXONynxTjwXgmaQRgtunu
+Lvu+xJVYHFRn8yaOcnOtT2P25F8RXn5xtUDodk0G4m+mGSICxFLXTFUgh3r/+sf6
+7CXA4Igp2LlQ4wQG1RpVJ0McD/iYnPpErlFPssZa9dLVi9HvzrGKCdOqS9zTuAwm
+MsxA4nREMK34SDqJP/vizM4MhnwBWxvZMcrs069Yqz+/M0QPzVWVhD6KAibccOSH
+UpxeeyKbIbeLZTehBreWWMGgMmpVxRZnXRcZmg7ueyYySqpIWX0o/Ro9INPDnUEw
+qUwdR6YOO3UcgorEQD48bloPIcsGL8EgTyPJevFwqnhegNDEpQwHTYG1UuFb0Zt6
+ozYLU/uh8LpTbq+2+5cbi+5zYaEvEJV6Vl42zz3PhyuN0NghiwCVLkht1qM+rk0q
+s6CI4wMFE9bFH9rvrHZ366jyfrmG/6Ju3jbqtJ/ylU+Ars176iouI3v6bGONxKvC
+8Bs/0ARIu1zrXR44ltw9ORE+ad+RrrDiZ42iYSrqPaieBZ7zZZHl7dsagxYGXMuy
+TZ4xvIJIUEkf3afL32aFdsiwtM5Rn5kPoAL5QLTzFIqtcTXSRE9zIcOJ5DYei5W8
+OpJCKnlnKUYan3ToY+I2
+=ZKw0
 -----END PGP SIGNATURE-----
diff --git a/media-libs/fontconfig/fontconfig-2.11.1.ebuild b/media-libs/fontconfig/fontconfig-2.11.1.ebuild
index da70c79c38cd..8617eccce312 100644
--- a/media-libs/fontconfig/fontconfig-2.11.1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.11.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.11.1.ebuild,v 1.1 2014/03/29 20:42:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.11.1.ebuild,v 1.2 2014/04/30 17:33:47 mgorny Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=yes
 
-inherit autotools-multilib readme.gentoo
+inherit eutils readme.gentoo autotools-multilib
 
 DESCRIPTION="A library for configuring and customizing font access"
 HOMEPAGE="http://fontconfig.org/"
@@ -76,19 +76,22 @@ src_configure() {
 	autotools-multilib_src_configure
 }
 
-src_install() {
-	autotools-multilib_src_install
+multilib_src_install() {
+	default
 
 	# XXX: avoid calling this multiple times, bug #459210
-	install_others() {
+	if multilib_is_native_abi; then
 		# stuff installed from build-dir
-		autotools-utils_src_compile \
-			DESTDIR="${D}" -C doc install-man
+		emake -C doc DESTDIR="${D}" install-man
 
 		insinto /etc/fonts
-		doins "${BUILD_DIR}"/fonts.conf
-	}
-	multilib_foreach_abi install_others
+		doins fonts.conf
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
 
 	#fc-lang directory contains language coverage datafiles
 	#which are needed to test the coverage of fonts.
@@ -98,7 +101,7 @@ src_install() {
 	dodoc doc/fontconfig-user.{txt,pdf}
 
 	if [[ -e ${ED}usr/share/doc/fontconfig/ ]];  then
-		mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P}
+		mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
 		rm -rf "${ED}"usr/share/doc/fontconfig
 	fi