fix build with >=freetype-2.5.1 wrt #509180

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

4 files changed, 48 insertions, 13 deletions

diff --git a/dev-games/cegui/ChangeLog b/dev-games/cegui/ChangeLog
index 9c3288805194..6cbd517b9ac4 100644
--- a/dev-games/cegui/ChangeLog
+++ b/dev-games/cegui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/cegui
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.63 2013/12/30 22:19:19 hasufell Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.64 2014/05/09 20:12:09 hasufell Exp $
+
+  09 May 2014; Julian Ospald <hasufell@gentoo.org> cegui-0.8.3.ebuild,
+  +files/cegui-0.8.3-freetype.patch:
+  fix build with >=freetype-2.5.1 wrt #509180
 
 *cegui-0.8.3 (30 Dec 2013)
 
diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest
index 9dac79a081b7..b4aafe6c7ce3 100644
--- a/dev-games/cegui/Manifest
+++ b/dev-games/cegui/Manifest
@@ -5,6 +5,7 @@ AUX cegui-0.6.2b-dups.patch 660 SHA256 d3d9a5af79f49df8c5bff41c3d61034640c9e774e
 AUX cegui-0.6.2b-gcc43.patch 241 SHA256 b2a2e715d4a0a6cdb2f0975c9474ce82edd97a34cdb3fe4d5c3ddbde0440db66 SHA512 1f0eed0154d9b4383b3e8e60ba75de6a873ff5aafe320a1cf85efb775997d53416febdd3e15b2626f533fc1d25569f615e32d1b243e539db92ee4e466e4c6ff3 WHIRLPOOL 42f7ae8134f2fe150ab348da0deac887f185f78fa2872f2317a1d243e6a3fbd423f5018b4ca0d27085cf34866ce87c9e1a896493da9836256f2b0bc282591332
 AUX cegui-0.6.2b-gcc46.patch 296 SHA256 a497069fc8bc50b23b62f321025364d4d2988a575ec7aeb429b25b94b5d6bf11 SHA512 64d0620dca217c3175813e037775c7202a4efcfa15e7190cbef93bdb52380e2ca6cf8e475664c659ac0b44feaa2b3ccade14aafccb870d6a5a51009a518e8b41 WHIRLPOOL f4431f4759dee86112c71cf21b5c161f47855c187735e9ba7943d953a1711ba2ffca3cf78acb32242a7d07e65fc69bd25a04d13cfb9252fcffeb5235c1d7b26d
 AUX cegui-0.7.7-irrlicht-1.8.patch 805 SHA256 ac143fd982865c20ea3d8f790097b5facc4505b13254de7d9e70f4ad76c73373 SHA512 b34fb6eb7f6fa61ea7f1af4985a4f85edd88fcc503b4f54b5277c6849124a181549fbb727fd42d18266be84b9483f8f6391c649f7ef889735612e9a0835cf07a WHIRLPOOL 0f1f8dd8ded96cf18778b0e670e8cae14ce43e8402955c3e532d96164e19367e7955286e2fdb74c79183b2bc7a4b201040a0034982786831a7fc7a32c9037275
+AUX cegui-0.8.3-freetype.patch 990 SHA256 c9fb93cc134dbf6f82519bfa14272e640995a381753940c2c176eda15c6d2801 SHA512 d70aa6487d8f44194593a41da69c6311e28fe48eefba9ed6f48d09203d566450a340e26300517658cd8873f5e05283b317daf21076d351067be043b0ad8d4a46 WHIRLPOOL 5d75687b6bf40f839419675e054a04c889ac1d67423fc8adfee78d624fe3735078727b59ae770b41da4f2bac076001260257b11bb452b7c6a80671fe5c91d015
 DIST CEGUI-0.6.2-DOCS.tar.gz 18396638 SHA256 f1ea46bd583c486a6c588118573ebde55b06e90b190083e95525820e950ce2c8 SHA512 56ded923f21f18d837d71425e06fe8675a2efa979edde461a9e4e558c213cbb79ff8eeb576211da6ade56526ccdd9644a7a45b3619058615388e3882f96b9fb4 WHIRLPOOL f67c9dba4558c43ec9d14c160f228e974de4364bfe36ebfa9f3fe6bfc290fd5c4f024e954525845cd83645a06d53e6d63776137cbe58c459bcdd0e350d12e9c7
 DIST CEGUI-0.6.2b.tar.gz 2628081 SHA256 eb77741cd9fcc927a876e8116b98691212e973d2264e2071406423f6ca3e305f SHA512 52ed7e7a97024138af957815a396dda74b650e7c53542d2d48c5eb95335bec270abca3685c49b05078f4338079334df6bfbcec75e9b7eb21ee40bdbff5f57b20 WHIRLPOOL 3fde683a82fb0be33565adb28fbcb4b7001be99f1b3bdb2d3af9abecc5dc7681d633f141cc19f9eb1dc264d0fb0b2084ea604202a22a3e2cc415bdb6b9686161
 DIST CEGUI-0.7.7.tar.gz 9176105 SHA256 551e6fe4fffc7586b0ef0434b83ddc2b3889fc8c7eb22d4cca92b1c7ce25059a SHA512 a3adaf1fc8a9adbe7e2eb5939bacbbb6c9b9c5c0299c247e3f562faae1fa5d697634536d2a977925346b49d1060326359fd4739462074b780b6f6649e6f7a4f0 WHIRLPOOL cc394977876137cf0b5b8f75f0ae66eb5a2fcb30e2088b41392f53fdd15a3a4d989ab4784924667f18a12fe569ef3472027e0334e7190cb60fe2d2f596603cf7
@@ -17,17 +18,25 @@ EBUILD cegui-0.6.2b.ebuild 2503 SHA256 be76082e512f27fb71cc449834c7f280bc561cfc8
 EBUILD cegui-0.7.7-r1.ebuild 3686 SHA256 aa6709d0a9ee8dac12260855535f4e6d9e15a9a7ef099f5e3c5339289024b9fd SHA512 fc119cbcfda2dfa6dbab8e4764c4f55ab9a4efc2ccd1c256fff35e7babe07573117f9e835cd15266310b1e577ed8e4420ac581d6da84fbd44bc44c73b5af0c8f WHIRLPOOL be1102c9d0d9dc65204c7475f7eca81d9b76b3e47d4a67b9a0242697189eced3cf34a97f50fb3421e646dd34860e61b8e23c5cfda735c26ebe81faa7dd132717
 EBUILD cegui-0.7.9.ebuild 3643 SHA256 ee9f74feed1bc61efae673f8138f2eea4e4cf60f4ec1e9a78f7f9c0de673e3a1 SHA512 218e6cf8513b6a817bb1c16c812635f9aeb94cfd70b321b7ffbbcb966eb9cea0c61d71ddd610f2836556b7496d42ec3ca30925310359c3d8182f884cd71ddfea WHIRLPOOL 7a1ac8bdd28482b62b3ace7bb954c02164e1204c8b777599c4a0f5680b64f1ed07a15b5b28635975d8e0dbd9b13405cd0d7e8d9d89d56a51fe6d1649045a948e
 EBUILD cegui-0.8.2.ebuild 3280 SHA256 e34c6fa38ec9f05b8f22a4c4838262737f89fd5b13c5eacfb5ec8698da8e71cc SHA512 bc3926c748cb1bf4eb1a530183e9c7094b04c3bca63dde06dded5c1903f1ee95d3b51445f169f4b0ca4fe415c036fae32ef88346c42824dcce6a05bd87b77f50 WHIRLPOOL 493f3d1faa372ff022893f11e280cdd5e8c1a68838220b8c6a742dbc7dd3bd07b30bef89633e8d873ae0fbe1b9c8c7186c0a8964b9da318f785e7bef2a3b5757
-EBUILD cegui-0.8.3.ebuild 3280 SHA256 5094459d61371a0663e87c2a4f9687f8aa56cc35fdce214b0b4460c616f14143 SHA512 594de17646813b5b931ccbb4b2cecf6cf099ae65f91a35ad18f4e311c464e4f1ae2424bd293e63180bb596845867523a6749d50d840ad51480d0db019a447b59 WHIRLPOOL 220c949889959b5cfee86b4c5c0e0531c610ca492465469415594146ffc8aa10abc3b8bf8f7aea13aaef831e010cd71630f80bd0c36fc082ac4b4b601b12283c
-MISC ChangeLog 8277 SHA256 9cbeecc9889b8fa08b768a27492c14e9a8c6268fc5dd7bed8683f2c32486d6c1 SHA512 1d2d9bc6c51344edd2a1aaa8da03d6bb660f85648353b77121b4d949ce54299555f639afce7e80cd40651aa0837676ef901d5898e9db80e08e40e81de8edc0bf WHIRLPOOL bb7baf4bb545271f75aba6970b995b31850fa8df656daab18700df7d5660e2d5435d28ea5a2ba6d139efe66e1f222318c2f5fb9dc3bdc05c4dbc62d099ebb86c
+EBUILD cegui-0.8.3.ebuild 3327 SHA256 2e34ac14c88ab5b00134c3ef75313199f81a75e940cbc16ae4d844f8376e42bd SHA512 8c01f7401ad364b0094bfffce525cd9a35b13657456be1540558c305aa87416c19ca9200c7ec859fde0efc81c0f7735af5430cd76cd16c8406a7e0253420d5a8 WHIRLPOOL 8dbe4b24ba873e1f9d04a7e93dc80cf96de519c5d98d3ca23721d204ef64dba99f81e2089cb2be699574803e2d2afc32f131d614f0fadcdf0acc73022009b29f
+MISC ChangeLog 8432 SHA256 db3889ced816b82ff410394fcbf5d24347e574adda86dc98210be0402a4e65cc SHA512 f6f40805b0f942cac08404b722d5d4d16a4931fd8abe8e32123f3ca46b0b041ed2dd2c96b28556fbd514ddcb7388554984a0f8c1b527388c84219b0d2acc1ffc WHIRLPOOL 8c0f2be7dd2339dbdcaf47378572c898426c433a8d27a747f0e8eec1e0d60aad926fd17d63918b2d7bc0d99858894643b2852bf8dae6793ccde0ff8d7fa461f3
 MISC metadata.xml 645 SHA256 f0ad62945612367ab25186d0531233e2510dec267a20e46d63ce22bf20ca5a8f SHA512 af96da24139b535da6a2d6f3d969701bc9dfbac78920fac9bd7d0c2160d2883c3ca4b578efe7b0753d8ce9a8d86eceab8a6adff07d4ab73dda7626bcc3d172fa WHIRLPOOL e45aeeaf70f0fc9dcc5bc37d25a544fce769a5502c1f0cf6dece48e2293a89d2a3804903b63738bf5929c38cd3ba692a3ff6952ddc55ba5fd83af896c00b4a1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSwfFsAAoJEFpvPKfnPDWzT7UH/R/6pobHqBhO+kk7ii+RtLwL
-XVvzq3WnsW1NmCmxVbWG21/yJtj3rRGAP+HEQ2UPnMfh9C3v2HE3Sg5TaU9Xbr2Z
-49xWvuoaUOv6kohxHvGPQZAe5e/ABFIi6rrEv2aW+hjS1rKD84XcZa4NLe5BF+XJ
-O4V2LpgLXw2YOguiPQBYxmBXxiOloyTmnlkaoOwrFcv/Rx4svPnIWrBq+F8CaR7V
-3oqQ4kIcw0O0Rcm6IzP11dKeSbt8JCuKkeDeBDfsJHsBGY3vnR6utX6shrk1dORX
-BKup1uI/Rm4FSvv/lx8M2LBBYkV0VyEPcrxWHliv2WWb/1zF0X6AJ2xVNNT5100=
-=CfXv
+iQJ8BAEBCABmBQJTbTadXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgCs8P/0IrpcHxyNqusmBJkNV657Ti
+kJ4+DL22ORSuZ4XK2QuuUCS99eKMxgV2FP5DF4LJ1ZmRewQ6zSRCoI/8eFPK11CI
+UCMgI/8+0HYSdn/KYjgcQViKt+jtcWJJfWWxMXTCPNe6MF25FujkwL9rVIVJt4ur
+GuWOHn0I4QVSjcYl4e65ejDUfNSCqRro+9isUGZsCT4N9iUfMSfFkKqPVT8cyaxm
+hpSXbjKtdw54Vqsu5KF4jP4yp/yKtqPwryUua6uO56vZ/p/Umu4s+4BXbBO42897
+VjogThNSEh10wK1Kis7shGvPGaJsvGM20Mhg4sPtx8dP2v3Au6OGO1N7n4B6C64/
+aTQVnP0+C/Wjbj/vrt8m1f44BqyRSRtma+D05HPXpfS+tqCgZdmIyIEuvMUZ0ODj
+8rsOV8fpJx066DMMCYPy7195MKfVC7PSu95GmoDEyPUoXlrw+mhdF6BfAo6hZ9U1
+IxlVU85d6KFWMCMBlWVvhH+9WordQ8OwxP/i8d2Xd9wbs59Lb1fSztNE/uSi4jTq
+Sx2NpREdGbC6xt8/whq27hLiug+mpv52U3ydGfR5sBdOFV7Y8zC8euL9NPoYcxYo
+pi/5ea2+4vATdBUPqYkQ7Mn+dxnZBxuh3IDeKQv9OawMWXnQiSuN90GCSX2aDGGo
+V62JOH+cxKfYmNu2GT3c
+=EV+W
 -----END PGP SIGNATURE-----
diff --git a/dev-games/cegui/cegui-0.8.3.ebuild b/dev-games/cegui/cegui-0.8.3.ebuild
index 9137553c74e1..8ce374a0dd21 100644
--- a/dev-games/cegui/cegui-0.8.3.ebuild
+++ b/dev-games/cegui/cegui-0.8.3.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/dev-games/cegui/cegui-0.8.3.ebuild,v 1.1 2013/12/30 22:19:19 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.8.3.ebuild,v 1.2 2014/05/09 20:12:09 hasufell Exp $
 
 EAPI=5
 
@@ -56,6 +56,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	opengl? ( media-libs/glm )"
 
+PATCHES=( "${FILESDIR}"/${P}-freetype.patch )
+
 src_configure() {
 	# http://www.cegui.org.uk/mantis/view.php?id=991
 	append-ldflags $(no-as-needed)
diff --git a/dev-games/cegui/files/cegui-0.8.3-freetype.patch b/dev-games/cegui/files/cegui-0.8.3-freetype.patch
new file mode 100644
index 000000000000..4c7cf5f627f5
--- /dev/null
+++ b/dev-games/cegui/files/cegui-0.8.3-freetype.patch
@@ -0,0 +1,20 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri May  9 19:56:34 UTC 2014
+Subject: fix build with >=freetype-2.5.1
+
+--- cegui/cmake/FindFreetype.cmake
++++ cegui/cmake/FindFreetype.cmake
+@@ -3,8 +3,12 @@
+ ################################################################################
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(FREETYPE_H_PATH_ft2build NAMES ft2build.h)
++find_path(FREETYPE_H_PATH_ft2build NAMES ft2build.h PATH_SUFFIXES include/freetype2 include)
+ find_path(FREETYPE_H_PATH_ftconfig NAMES freetype/config/ftconfig.h PATH_SUFFIXES freetype2)
++if(NOT FREETYPE_H_PATH_ftconfig)
++	find_path(FREETYPE_H_PATH_ftconfig NAMES config/ftconfig.h PATH_SUFFIXES include/freetype2 include)
++endif()
++
+ find_library(FREETYPE_LIB NAMES freetype2 freetype libfreetype PATH_SUFFIXES dynamic)
+ find_library(FREETYPE_LIB_DBG NAMES freetype_d libfreetype_d PATH_SUFFIXES dynamic)
+ mark_as_advanced(FREETYPE_H_PATH_ft2build FREETYPE_H_PATH_ftconfig FREETYPE_LIB FREETYPE_LIB_DBG)