Fix compilation on Solaris

Package-Manager: portage-2.2.7-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

4 files changed, 41 insertions, 20 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index b29d654609cb..567d4cdeecf6 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.187 2013/10/21 04:13:31 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.188 2013/12/01 19:19:39 grobian Exp $
+
+  01 Dec 2013; Fabian Groffen <grobian@gentoo.org>
+  +files/fontconfig-2.11.0-solaris.patch, fontconfig-2.11.0.ebuild:
+  Fix compilation on Solaris
 
 *fontconfig-2.11.0 (21 Oct 2013)
 
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 91fa657578d2..160935777dc3 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -10,6 +10,7 @@ AUX fontconfig-2.10.92-ft-face.patch 3694 SHA256 387b94433c273c9ab2e26a55cbb1c99
 AUX fontconfig-2.10.92-ft-face2.patch 4571 SHA256 4f1dd509f0834b55fd9c8ac21a2dde3fb4b2d0af62f8f7e85aeacf4ab3b039e9 SHA512 1f36a230c2d11c53ec2e5f6326455a535357bf726f0f8e149c57f08e992454f2995709c3a5fa1a73a0928e5db758f3837993eab000ed5e33b7a15f1235938da3 WHIRLPOOL 96e70867faa3332d3f18327d97ab04af5f7f0eab142c1f1c27893707e6a789ec43eb2669680537e31aaa169b2f0067a4dfac1b7303ddbedf86f6027747655d78
 AUX fontconfig-2.10.92-native-fonts.patch 2223 SHA256 d0d17ddbb5a20ef259eb33757904e076291a817312e94deb6d8f7b7cd064a3ce SHA512 1d7051c9f86c3b03264ee3472796eeeb6a118fcefd95736530fbbbf5a11be8cb588d7cce8a35b5b2c465e828198775b9d2048e6999d83b76271dfe3b1db075fb WHIRLPOOL 89544e1b85fdc6f11fec9fed31d8264970b48be15e984d10bee2df3dad99cad08a07c81cb54cc2637e0a466857b8a07256bc1fd998ed944be5153521dab3fc6b
 AUX fontconfig-2.10.92-use-glob.patch 3711 SHA256 1a099e418cbea3947a60d933dd8799062ec8398916186f76eecdbbbfd0aa7eb6 SHA512 26cd86e3d63138d6161766a4e8c8593c4e76037d0bd20617fc4ccef6c21549a54532e947e1360e70a079a54306d8cf42c4fbe46c56de6e134ceae5dfe6be4465 WHIRLPOOL 62b123d9334c793bc0d56d0b1600d4bf8efd0b8b5449b8801b2158edf559bbd99b9848ef16305434b593ac128ff672f24e01e4d94fb40b1fecea299421140622
+AUX fontconfig-2.11.0-solaris.patch 581 SHA256 de1f5d0ddec0600e2abc7620bd396130d7f572ba9da075f1040612c881104a12 SHA512 f685a99cb180a2986a71a0c0714af159c0422cd19d1692b3a091c57dfa6382b619648284830a14a071e81387d5ca7aed5aefd021567a66ad1df42cb500fe5be1 WHIRLPOOL f4ae07e24216dab23a8fedb4d75a767536daa4a9728a7790a918d62c91636875048eb88f18069c5bf6771d533d59bdf8b2cb86a822980c938998961efa60f7df
 AUX fontconfig-2.3.2-docbook.patch 506 SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5 SHA512 8c5bc39c6d5c3b0457c626c678c0a7c94c5e5a4f041b5b2a42df04701750961e24950135d2e6df4d4e1c64a7f28e50a2533ab154d7226cf0a63db0853149f64f WHIRLPOOL 84de35d8f5755a10eb170b2f54afc5b89f4c1757b10f053adc9b5e96aebcd5bbfc47d16963f01a2b3bc0f791a736439b3317f823221794f9fc93e5c57162734f
 AUX fontconfig-2.7.1-latin-reorder.patch 1701 SHA256 cd27212a9e8a3045106fd427f2e5079ea348789c8760e7af443c2745479c8f82 SHA512 8fc514649e40ecd0c52e4fef9479e0945baa3aaa396335650bf827a983f6d9187b0f66ab97bf5b11b14917518b2e955b0a1bca126a336feafbebf754ff646d5d WHIRLPOOL e6e90c38c7ce04e297c48f5b9859c5e9230a59e9722dacde5ddd434cca8fbd33fab55f704df540eea3f3efd6ee05884987e6ce5da544d2b41f869e47ce3d259d
 AUX fontconfig-2.8.0-urw-aliases.patch 509 SHA256 4a1e122dd3b140765163ca72eba8c2c52daa9e9459ddbcb6a2eba9a5bebe76d4 SHA512 774c57a28e10eb666c18e69dd7cf59fe1110fe13bbbade185dbd21be4917d4d7fb632be56805b2739ea9b47ee96560c8dd1d3d1916fed56ac32a16757a911f7e WHIRLPOOL 11d7056d1830a7e48aea00a22bb81397c9025f59817fd476dc26083e7ac2603aefd2ace261dfd04df78b6caa8d9c07f66027f37438b4677a7efe28b3cff260b6
@@ -20,27 +21,15 @@ DIST fontconfig-2.8.0.tar.gz 1548409 SHA256 fa2a1c6eea654d9fce7a4b1220f10c99cdec
 DIST fontconfig-2.9.0.tar.gz 1682774 SHA256 ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a SHA512 1e91132141756c7455b97fb4d7773b8c0812d98d0c0f5f137c728d6f03cb4601a7f2857c246bd63619d47a8d9aeceb475a16dd625bfc085e235e85b04d29014f WHIRLPOOL a3814b4b2a1b86cedde702545defbcfbca7d3d61ecf512f37a09b5c4041ebb317aadcde1553be534e70d30c212729f547b50cbcd3102226fa92a7c75a7e55620
 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.ebuild 4708 SHA256 8f5f91d85048bdbdeb48b48026d7bb68fda2f6ed372497cc603afdb497117d98 SHA512 ba7de9d232df2591e22eb67b279ce145319bf432198ee06477c8860fe8619149e6e6f2f778fef7566521ef2530628b4d325572f4d4d07dd2362f9c1c3abb480f WHIRLPOOL b6b10eb808aa483a8ba78e2065c587c87b3a59a190d9d35082603306a71b660c59f333af0c4a77e3ea3c4f17e859246512447c67f2153a7d53c6818440694047
+EBUILD fontconfig-2.11.0.ebuild 4751 SHA256 54203d5c055176663d220d5560dbc2c563a6142e211c4990ba48efe4f5e07861 SHA512 21ff9a4c4a77bc0e454323551a4d935dc9856ee06f6a798b170dcbcf66c2f928502974455a50aa2dc8b274af906b3b45149dced3068a0e6f61ca8892e212271b WHIRLPOOL 6cb2886d7463a895a0cb2a44e81c830fe1c5a1953f5e9329dd86300137326dfe2a9deb54216d399b4a810c74cb06d0df9c6c7be71f99e97083ed9f8045b6eee0
 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 29790 SHA256 3f8de18b9c657ee5ddd8657f7c637462cc22c57a5914d3f026c2c739cf34965b SHA512 db0eaf413bb565d1af198d08d9f700d41f77ff38c1a1e41cc433ab1b3ef5d4ecd2da636cad0dbb5e6ae76e41db75bbc895b2c5c019b4fe3caca671a94843f624 WHIRLPOOL aad41bfe9d225027e2fecd22f4885bec597e3f6b62bc05bc0fbee4772e4d748efc8f97e3dc85301bb10b7086b7c793fcb78de17dedd404a6fc8f9ca68b578138
+MISC ChangeLog 29940 SHA256 8abd08472b21134a395efe636f57e5114114ae23f2d518febad1b4e4f3dfd60d SHA512 5e95f93c0b05801f67fe50713e92c174fc1e0c891024eb17106db3add1bc45e77f68d86539e479b6ae280ad62f8d7b3afadc0c11aeb2916c5ca83f2459ba00f2 WHIRLPOOL f96d28cd1e476cf45f66a00674c571af5edf1f3af0542fd59bad9e935d16e9cec61cda8956903512f1c67e6ed98b87f5d4f54e7b2190b1f94daaa4fa7c48617a
 MISC metadata.xml 727 SHA256 90e4744ccb449b368e08690f44e02d4d8812b2a85223fb28943e5cbfd9bc1cbc SHA512 57e7f4ccb02227afe7ff2a9e2ad78a7ad54932d900a82c470bf0a71056357e8393d27c73e7f9f78940d8dc35d83182a14a0ca8feffe4c08a029c158ba343724d WHIRLPOOL fb47925fc948cac4a70befbf369a1cafcc94b00b607e07709692288fca5dd4fadb2e8e2e0b1e495d92ed3746d9fa9d45fd45d6aa4dea403617aa78b13e8b4f89
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0.22 (SunOS)
 
-iQJ8BAEBCABmBQJSZKnxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1Dziluy0QQAK+mXZFIGJ56KkJk8oiK9Ij+
-cx+CgS2Zcyqn4E5NkcOZ5DoK5/anldvrFyakTTEU8EkhUvFjaafKPDd7Z/Zu5G+A
-g//TEsjwG+YcQs0F5FqLCJmYnCVeuIQcat9d/lWdgJJeW82bbmDNpev1lvQgvi2M
-uoH0pdG6WcLnxAWhdTUJ9i8Up9IF5cp/UNqwl1DfY+PwRXwk8w3O1rr6n33L12gs
-NpJUytoQUaeRKywuCrkUvFROJ74PgjIQNTGoE9gYp/DnWcLR1E+j2/8VFrUN/lTN
-vhJPMrocYGdCYgeLcLcDigbpRQ++O1SQAfnUl5FWJOg5r8XoR1hqugSPzKcUe5k+
-Uzp1tpngwKEHkRfq5KNO90HEKZEvPJaRa8xpWUbTxYTv0iDFPBcKqjCEKlpdINtu
-sp92F+8QwTn65c83EWVxAfceJx9/xiDlruKBcUl3TIt5EbD6oTns/5Aq7VKCEaDM
-iATZzVMl52eiCr3bxFmm8d8MfbvhiQz0EPU6JV2wKfxTuhUpQsv1MxciFI+wnZ5f
-JN6wxBTtgUzfF0PV2qdEOjTSn12aVylgpWrEMpZbtIAzlclZaiCvcZ2ekRZqVSVa
-LC8Ogz2HLFPn7Xfq3/2//mwD9yqx8QLdcgzQx8zKyGfxXPBAVSDCgQWmH2DETzgw
-llLRvryJ5zyj+VLoxyiB
-=gCng
+iEYEAREIAAYFAlKbi8wACgkQX3X2B8XHTomX+gCdFxSzt9YQkE01sMdgS7h+A/W+
+amwAn15NxE7Jl2Q+/SaWAuY44WSY41VO
+=tGxQ
 -----END PGP SIGNATURE-----
diff --git a/media-libs/fontconfig/files/fontconfig-2.11.0-solaris.patch b/media-libs/fontconfig/files/fontconfig-2.11.0-solaris.patch
new file mode 100644
index 000000000000..c712c6f79286
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.11.0-solaris.patch
@@ -0,0 +1,27 @@
+continuation of 4a741e9a0ab8dbaa0c377fbfed41547645ac79af
+
+--- test/test-migration.c
++++ test/test-migration.c
+@@ -33,6 +33,7 @@
+ {
+     DIR *d = opendir (dir);
+     struct dirent *e;
++    struct stat statb;
+     size_t len = strlen (dir);
+     char *n = NULL;
+     FcBool ret = FcTrue;
+@@ -53,7 +54,13 @@
+ 	strcpy (n, dir);
+ 	n[len] = '/';
+ 	strcpy (&n[len + 1], e->d_name);
+-	if (e->d_type == DT_DIR)
++	if (lstat (n, &statb) < 0)
++	{
++	    fprintf (stderr, "E: %s\n", n);
++	    ret = FcFalse;
++	    break;
++	}
++	if (S_ISDIR(statb.st_mode))
+ 	{
+ 	    if (!unlink_dirs (n))
+ 	    {
diff --git a/media-libs/fontconfig/fontconfig-2.11.0.ebuild b/media-libs/fontconfig/fontconfig-2.11.0.ebuild
index 603fda32c38e..93f79b030461 100644
--- a/media-libs/fontconfig/fontconfig-2.11.0.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.11.0.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/fontconfig/fontconfig-2.11.0.ebuild,v 1.1 2013/10/21 04:13:31 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.11.0.ebuild,v 1.2 2013/12/01 19:19:39 grobian Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=yes
@@ -34,6 +34,7 @@ PDEPEND="!x86-winnt? ( app-admin/eselect-fontconfig )
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch	# 130466
 	"${FILESDIR}"/${PN}-2.10.2-docbook.patch	# 310157
+	"${FILESDIR}"/${PN}-2.11.0-solaris.patch
 )
 
 pkg_setup() {