fix more freetype related breakage

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

4 files changed, 55 insertions, 20 deletions

diff --git a/games-engines/renpy/ChangeLog b/games-engines/renpy/ChangeLog
index 141dc1367657..d8a1c8b43d8e 100644
--- a/games-engines/renpy/ChangeLog
+++ b/games-engines/renpy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/renpy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/ChangeLog,v 1.37 2014/04/28 22:44:50 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/ChangeLog,v 1.38 2014/04/28 23:09:15 hasufell Exp $
+
+  28 Apr 2014; Julian Ospald <hasufell@gentoo.org> renpy-6.15.7.ebuild,
+  +files/renpy-6.15.7-freetype.patch:
+  fix more freetype related breakage
 
   28 Apr 2014; Julian Ospald <hasufell@gentoo.org>
   files/renpy-6.14.1-freetype.patch:
diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest
index 5ef080846cb3..0dfbc81a4f52 100644
--- a/games-engines/renpy/Manifest
+++ b/games-engines/renpy/Manifest
@@ -5,6 +5,7 @@ AUX renpy-6.14.1-av_close_input_stream.patch 291 SHA256 da5d69dadb0c8559f20b2059
 AUX renpy-6.14.1-freetype.patch 620 SHA256 3ba864ebe3226628489bc0edf3b8f52ed0a0b10badd167acd261e4651500d3cb SHA512 cbb1854f3c10f04484a39b3b79f116bb9dda125e4cb3273ed5010ce3ccbb1ee0f54339cbca74ceb682eef44304a1709e6fbfe06b1dc29b32f21257fce284a713 WHIRLPOOL 77cd2d6442b685ab9d4a7cacb68486ed043ac08be6bccb6bb353a39bddd24a20063101ab4fc070c897d1a97b08532eba642ce8172748f8d3f1833aa42b07f854
 AUX renpy-6.14.1-multiple-abi.patch 7950 SHA256 7605357e2fb692acc0032380ebaff4d153d4cae139b8b6298cbcd347f8880838 SHA512 1673cb44bb168745b6eeb770ca4bc88ca0c72ded4e325bedb5fb5ea90147276bfe63bd5607441560e5aa1dbaf93820fe3e77f853716b24f5eaa80ad8ab2e9008 WHIRLPOOL 330aa2c6ed0a5f54f8523fffbc5f503d7497f756c776620d91981be89d90737f16114b331662ce300720039b847d34d3df13dd19c039e7dca851784a962d0722
 AUX renpy-6.14.1-remove-AVFormatParameters.patch 494 SHA256 3e67e752def86a848d6a9e4a7d20c8dd3bf4158a1288065ec1f21278a4c626e2 SHA512 6589c26dfb746aa23196ad0f5a74854ef7d7916fa48298794c9d6a146865cb124c9d1b22c922d57202de87c32487706c45d3a73c90fa9035afae6604a05de75e WHIRLPOOL 6fb36d076c891b2c2e8fa6b2af548de73a575e91037fa9b4cb4f77f74262e714f499a72a93c3d1756aabed80b336dd7bbd27a3b939eb83c76453ef52a41cbe68
+AUX renpy-6.15.7-freetype.patch 958 SHA256 94954935820cc1ecdd89a8f48eb4f3b3bd51d151e8345ba618e20d6c0c149c94 SHA512 890def1f2f2a54d4717e325cf15700e348f7d73e3afc86e6e5e1366c9bf01701b33f7d48ff5311855f74cf7fe5de3285635cb5aa301a213c419566c05d8a6cd9 WHIRLPOOL 2c2a019a50b94ca8dc4e70e17d07ca80f014606f34f6f0506803e524c41b6d4153ac44623fc8a42cbab1e144c99c064453f7533f9ed5132311ed079dad772faa
 AUX renpy-6.15.7-multiple-abi.patch 8641 SHA256 a93776659e1292bdd41a8d4ff38d0720c3d85103326abbab6322e9175f599305 SHA512 626fe08565e226473180e51e54b650f336f71e57c71a99bda3d0e55e2115863169bd39d8d8e706f787275b81345b553c104f21a6d71ebadee017bda13826bda3 WHIRLPOOL 640bae68cc1e5c7ad2781a93e050d4b4fc3e7ec564224a1014787f5f8b0d19ab5202d7924b7e308c0e6e09a3487c707aa372794c0f5b42cd9d45954d93f3beef
 AUX renpy-6.16.5-multiple-abi.patch 8299 SHA256 8bbb5f2dc11be467d1531d7022a02540fe4155e7150ab6a731de65f11a2c0815 SHA512 a20e1623813590de466f2ababb5d49f0eece8b747745e863d3ec13a1ffac1d102181dfeccfadf9662c9932283a4ccef58824e45542083c7b3ea90bbd91f7c56c WHIRLPOOL 3f376f7e51c3b3e5cf1bd79a4810d728577b877862d86c42a9658bbeb3109ace0a97199da6b30e32c582715e6bccaee1e1831218e48e75af752e3283315dd945
 AUX renpy-6.17.3-multiple-abi.patch 8291 SHA256 ec919186d61a78aece7b01d15984edd502a9886fdfd7a163f9fa0e26f28f06bf SHA512 fd39773b85a54ca709f412430654cacdc91caaa561ad2e15bb02b08b971997062fa3c1adad5e2b582a2dc7acc9886b717517e0c10c0bab6a36fd05e52e98edf9 WHIRLPOOL ca460eb3129c0c4f429af4f88cdcf0d6e164f89f2019fba2f9e97a690d5b132565cbbbc03f6365a74e901842715b012cbff03e67c1c17ca01ccfecae9be501e3
@@ -15,28 +16,28 @@ DIST renpy-6.16.5-source.tar.bz2 14455622 SHA256 5ecb00fa84a048ff6e1f1d8a0114373
 DIST renpy-6.17.3-source.tar.bz2 16006051 SHA256 f01a6d8866a5edf34269e7a5639c394d7a09549b9f542c13108a645b65ee079c SHA512 8cb7467e19d22758b36a86453297da4fe7b8f7ec74834121b1355e6b6e1c9b8a45da44188160bc8fd92833761663e37efb2a023a72a685b3e6c157749d9a978c WHIRLPOOL 9a9ae3fe762355535df68e69d270fcaf5c53eb3d8c00a585015422d37ee67f54811b7fa739fd6d4d7f30140c906183cca4a650f0b2dba43d1cc3bcddce2877c3
 DIST renpy-6.17.4-source.tar.bz2 16006541 SHA256 97b2de94c05e2c67c69e2c1bf9c0456bcb767531b0bcf4470c94ab4d488a13d8 SHA512 cc8902444c6f51dae5924fe5595ea730e1e9bca3653cd1b150bd458aeaf64f04b4de0579c40ad69ca9a5ae1f53dd5f95ad2fe36f3b44e72f6cef495d5340209f WHIRLPOOL 370432615a163dc2e2f4dec0423b7f1ff256182b2258817bda29da1a66c516cf3a561826af4ce776d4b2dc9e8d00974906e410d82d7e2b4587f468b039b273c6
 EBUILD renpy-6.14.1-r1.ebuild 2743 SHA256 0a31483b70a4a1cb033f92a849a9944d9a44dbc5371731e8fcc60f8fd6684803 SHA512 c0e2c0ed5ca6f087323bc399bb140781fd33709ac8491e10578fbced38b54cd1a328d87517c1019999d8973731743576a6e31386ab958a9cfdabc748ece4983d WHIRLPOOL ff0f4d9e2ee4493f7ed50dff8ecae0a1f7438dcb4efbbc6ff6af336794ceae21be71aec6d279109a709e4283835ce3fa90889e0f9a673e556af475146913ec02
-EBUILD renpy-6.15.7.ebuild 2639 SHA256 299fcba161e19c477a636a66612aeb5605871d02a35f0d0d19e30e435c3f412a SHA512 47a901f1f04da04a58c41b722fa45a803b6eddeacb0efa665746e2d465d350c6a53417078e7ac084a78406d29e2ed4719c6fa4c559449b66351158a0fd4a36a4 WHIRLPOOL e93669ad5db18acfa35e52b4ba4bdca455e1161838424e3f33308c61cd6533a3bc926890e664cf6d3bea64c2dc2ba0bc8a8730db4a6665fdd60f53486c41e8d7
+EBUILD renpy-6.15.7.ebuild 2679 SHA256 029971c958c52cb48d79623c23ce1de2e22c6c88efed0eac3df13ab89ff119df SHA512 882a2952825e65f83247a9d7cf2b6f34e7e8941f72faa98831e2aad0c4055f3b8387afb8e4e0f902db4d79c5a59653973e48a43f778ca9f1657cb9bdafa415b0 WHIRLPOOL 2203f0db54f28f41363a844fd00149a73358bcc37c8085d0c3bed7adcd9bab2de6e082b1a3970ec284f840ca2f0c5489002fa95bf575f2a76399fd4e4d6a2b4a
 EBUILD renpy-6.16.5.ebuild 2642 SHA256 0720b9ff62e083a6da7b5d806fdba86fcea5f6d3fff8dde92b0a1675d9e236c6 SHA512 411a69604fce4b12d833a8555b3e0b0b5e70bde63f3d1f8dedb5fa31fe27ecff9d66ded68fbcc145094cff11043a1f41d8e8fa3dacc50616ab2315157186281e WHIRLPOOL 6238d267d35bcacdd1aba3b246d03752211ad6cb0e95a17a1b022dfad566303a742574a63baf52bc1e936c73c8fd2610abfe6dc6af2429560de0b5e983874249
 EBUILD renpy-6.17.3.ebuild 2641 SHA256 3b529d149c1c3e82afdf43acd37cdc03351fa83dd6ac37a17c668f9b05e16322 SHA512 391ecdef6686a77a941001da64110fca881290edda23e314d2417e795d24f05d540af80a4cdd187c6cd790f32791a309f28af8179386f118f0d9b048d42e5f54 WHIRLPOOL 5168aed180ec15b66f027af0470644078812c7eb141fdf351e3154306429ca48c3b02203d19780b6a3f6609b4d3a33aa46d0e54d6f6a0d625c5d3a105ba32915
 EBUILD renpy-6.17.4.ebuild 2641 SHA256 ccc5367105a12691bbc0f8f91dba1bf414dc9a3e447f8970e19237d4a0c433ad SHA512 cff5b873d4932209c5a63783327de989d3a62062dbfae7f5d430c37c991b0e36d430010e1116229f6e9d608c1a75cb9051a29c24322fec1cd1e66d2381e6b9cf WHIRLPOOL e933bafb800192a60bf35263fa2045375dc90c8a9c1f9185dcf62e140154b22f191573b199e2b19920fcdd57a9ccefe2217e50a8710d07bfd8dc422be8ecf655
-MISC ChangeLog 6372 SHA256 28e96aa1f4d6f5afc141b7bf8b7421f7dbc6be9835172e20c50cc363ae99f643 SHA512 1d0d1c7c41164865f032556da185c1bf1126d05bbfc2b4c2fa14fc0bdd6c2e501e5a986f99634f7cc0720ba12c12fb94f788201155c7619a159832770adcfdfc WHIRLPOOL 580d970f51edaad1cbc6bb184a77f6b0e0140f6b6670d3f0fecf5c77310a2198b389e596a1d2b878e1bb769fb6822c6f423f9c263dbf2e3bd6d0862d1450cdb6
+MISC ChangeLog 6520 SHA256 8785fbc43e98bdd1956516775570120debff7843fe0ffc189efcd855256f94e4 SHA512 c560d9266d1012a8a24160fed1aa792083baf59f2f2ec915e517920ff4025408d47ea70f7e03b2f25d1d6345691455edd8ffd0d4f9ab2642b3e9654f3aeb6e1f WHIRLPOOL e05e5544ebe0236f67cca3c03fc1d46e34bb7f93f798dedc51f52ebacac818cafa6466a53adffe69d9a9cb7fde8a0c9fd74267189b2b4c993500a630dbc59e9d
 MISC metadata.xml 1320 SHA256 87e82c53eca026840f61ba025e6bc8fce59f30c42c12e0560acccf25b00229c8 SHA512 13c3728b2c8f65d8795163aa95bcfc3e7a7875e1a360c283f7ceeb29bda2ef7060323f31b34dd885820294e836fa255c1433d250b7828081b1b14074e2e1e786 WHIRLPOOL 0697e087d393802545ac1163aa96a387f90adf99975f57013f5f73553a61906f3ec87460584d4e66ea3c7864b0195222e190997618cd4babe20f0fd81327bfcb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTXtnlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTXt+eXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg5CIQAIh824HKub4s24MMz8UKoZPR
-Y2sQc8uZmh6H+XfObmUtq6bW5JZ1eXp5dtjFGC4+/GsmZZyAdAijndmywqCcZPT9
-Mz2YOuzMJ8TBJ8vXmCbvRDj+gt3xl0vMNr7o6JFTOuvtqi7CqTsiSkZyGj1Uj71W
-eFUMsVHD2/Gcmmn56SJP7c2lyzNqo1+TxCAVHSC5hTVfTBK6/o2yGAKCpotK6q6u
-acqMdifgok5e/hioShdTHVRMHH96iV0443hraA5+7NNWO00C3Tnr9hGB+8M2fcn8
-SGKgOrFsqYLE7NpAetxQp7ZESn1lUeE/o1MdXl7JvbateF1NOFDXnGOFhZOEY/FA
-oseaiwyIEJt0C8q2RH6nsgvcefxLMhS8nzUsvk1UOwFd5wtY0pdhPOiJhCxujpj6
-87VU16ROGklDaJAWVzfCHXsookueG/XLDYhOZgwZmEPIOmL/+pyjX7JaBY4HS97t
-KuV5amAob+5G/65J0RRWggq9nh5AnbW+a/A9BbHTSxilmv38tfX1y5rbY1yYFAQA
-QoBtUZNGz90c6G9oS+gkGYasTEjLJRGpo9ylhczRvRO27GZdZbMsObpBYD/pFgz+
-Sz2M9w/uU7MXUTQLLqXtdHJr6u52dZuXQH47arsVTJELjjo7+3b44loDKJ3B/WnR
-kjW2o+tlZEwGVmrSyiyx
-=whJS
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgRtwQAKAO1LdqAbGmQWnoati6ruYN
+2hJZXRWseHZsvO+4mo8/RmWs7xkHKKfQw1Zu+YN+Wu6wMO3sHoT+ZvZ1otCaUXO6
+XBtRgihnWWFQyQ9ElrGSQuf6X/2ZHzrnXqFaAL9VgsF6SLWbvhChnLr/UXwOEGFh
+Xc1sETTBiKmWhfgyPYHiKT83ZOkHL2WeD/6OaRuo2FvqOQ+/8RDEkFTFh/FzjkT9
+LA3QVjus4DAexe+YRR/02gYXkLFvkqp1dEzl+Y7pzvQe7fsgxIsAIn66U2SG0jrm
+/0Gh79fe0/wJDqjQVOzEKYMRwd1sH4zLyvCjaZZ1x7iVxiXax2meo04IP5ixHVsi
+cbMgdqD3zalDk+x3lQuczB3QsCcAnR79mutQiEWIHSj2K+96Qz6htjH17nRvOgr4
+UHhjz0/MpgsE9EVE3kQTcitqRRllby9XU9lOHv7mBUvKNX+wjI39NQ+tXnG5ZUJQ
+eSWTkyFDMhpgY6USS74nhV6NBGmUv9cER+f1rsoEXuDv5W7OeODDKycaXjxfJTcE
+0djM9rj/UpSRNJX6xxwiaLOznoyxWvCiyzYz5YNuAhBbTBiR4qvmrOn98rD6nt1I
+kFsVMYWDazCHXdGX20qA3tIzaGboMC1A/bttpwf7312d5jGywFjtxw0xFKfecUgu
+qGL6bjDvNLnyUB6yO7We
+=Q50u
 -----END PGP SIGNATURE-----
diff --git a/games-engines/renpy/files/renpy-6.15.7-freetype.patch b/games-engines/renpy/files/renpy-6.15.7-freetype.patch
new file mode 100644
index 000000000000..7865f0c11a45
--- /dev/null
+++ b/games-engines/renpy/files/renpy-6.15.7-freetype.patch
@@ -0,0 +1,29 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Mon Apr 28 22:31:52 UTC 2014
+Subject: fix build
+
+--- renpy-6.14.1-source/module/setup.py
++++ renpy-6.14.1-source/module/setup.py
+@@ -24,8 +24,9 @@
+ include("zlib.h")
+ include("png.h")
+ include("SDL.h", directory="SDL")
+-include("ft2build.h")
+-include("freetype/freetype.h", directory="freetype2")
++include("ft2build.h") or include("ft2build.h", directory="freetype2")
++include("freetype/freetype.h", directory="freetype2") or include("freetype.h", directory="freetype2")
++include("freetype/ftotval.h", directory="freetype2") or include("ftotval.h", directory="freetype2")
+ include("libavutil/avstring.h")
+ include("libavformat/avformat.h")
+ include("libavcodec/avcodec.h")
+--- renpy-6.15.7-source/module/ttgsubtable.h
++++ renpy-6.15.7-source/module/ttgsubtable.h
+@@ -3,7 +3,7 @@
+ 
+ #include <stdint.h>
+ #include <ft2build.h>
+-#include <freetype/ftotval.h>
++#include FT_OPENTYPE_VALIDATE_H
+ 
+ typedef struct
+ {
diff --git a/games-engines/renpy/renpy-6.15.7.ebuild b/games-engines/renpy/renpy-6.15.7.ebuild
index 86d396970306..39415a009b42 100644
--- a/games-engines/renpy/renpy-6.15.7.ebuild
+++ b/games-engines/renpy/renpy-6.15.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/renpy-6.15.7.ebuild,v 1.4 2013/10/30 19:23:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/renpy-6.15.7.ebuild,v 1.5 2014/04/28 23:09:15 hasufell Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_6 python2_7 )
@@ -42,7 +42,8 @@ pkg_setup() {
 
 python_prepare_all() {
 	# wooosh! this should fix multiple abi
-	epatch "${FILESDIR}"/${P}-multiple-abi.patch
+	epatch "${FILESDIR}"/${P}-multiple-abi.patch \
+		"${FILESDIR}"/${P}-freetype.patch
 
 	einfo "Deleting precompiled python files"
 	find . -name '*.py[co]' -print -delete || die