Revision bump add patch by Julian Ospald <hasufell@gentoo.org> to unbreak find logic for media-libs/freetype-2.5.1, bug #493656.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 69 insertions, 17 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 182be1505535..c0099ab6a608 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.264 2013/11/30 15:13:15 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.265 2013/12/15 00:16:15 johu Exp $
+
+*cmake-2.8.12.1-r2 (14 Dec 2013)
+
+  14 Dec 2013; Johannes Huber <johu@gentoo.org> +cmake-2.8.12.1-r2.ebuild,
+  +files/cmake-2.8.12.1-FindFreetype.patch, -cmake-2.8.12.1-r1.ebuild:
+  Revision bump add patch by Julian Ospald <hasufell@gentoo.org> to unbreak find
+  logic for media-libs/freetype-2.5.1, bug #493656.
 
   30 Nov 2013; Johannes Huber <johu@gentoo.org> cmake-2.8.11.2.ebuild:
   x86 stable wrt bug #488586
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index ec331e469604..d047fafc7639 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -19,6 +19,7 @@ AUX cmake-2.8.11-FindBoost-python.patch 5287 SHA256 95784f74c82fd412d81c850ccea8
 AUX cmake-2.8.11-FindImageMagick.patch 3033 SHA256 721b1eee4fdc8374782276a1de719fb52df794c2ef6a9cd37d66ee99c08dabca SHA512 701e9583a63ee67a79ea6fea164ac5d3d46fed3a72f297b771fd55236ec51de6c3f1161f527b9d662382a3e9e48f3b36b3a9bdf89c20888ccab30dae64697754 WHIRLPOOL 8e16438957c9d51b497f876a4a4776807e651be0947342469e4058e74a1e0be008f8a697a554e87de0931a02072eed07f4a7e1ef1805312146e2d0c0e012d8a8
 AUX cmake-2.8.11-more-no_host_paths.patch 3797 SHA256 09a583d102f491c49d65282a8665ffb960f5801c7addc79e858a002d0c26ef5b SHA512 cb3bde23246c93f27d7cff2f0bb7fd17b0286da201a68a68abefca881cb2395844fe0adfa091f2f7657f44a56f2c5fba794430effe1edf0596c16f2d34c825bc WHIRLPOOL 5d53ba1a375da31cdd50cef63072480d3f0a77e785cbe6ee16b82ff6249e4244ad7ff67c9971533705bc97e396332ae0936bea3c6ef2002b5fc7f3a88d8036e1
 AUX cmake-2.8.11.2-hppa-bootstrap.patch 1367 SHA256 6c73ea01967bfe17ee6703a8d0af9bd0afd6a6d5aba5a0f307df2f6adebcbdd4 SHA512 916302c0aac92d8411bacbb4cfb85630140ad99ff7a380c3ab602766e46f25894f3c4ca72625cdd16e7152f5b7fe31d1bbc38d0366e65333803c954fb96c98c6 WHIRLPOOL d355b079c5de61dc0b2b1567e747c324653eb66ab9800b893584df8de3c6e0379bbf1699d792271e8a386672a4bff07cad9f9d4f1999f596069f71b22e5fa6ad
+AUX cmake-2.8.12.1-FindFreetype.patch 1404 SHA256 68e4d69aadde939087d257e88273e6fa075b9533dcccc32b0c3ed7d96af6a832 SHA512 f07a6ca20251bd517e4e63ed81a6d67c388de7c53cce6177252a86eb1c68b3fe2ecfdf7493d3f6baba56d58d1b35da181dee7f4a99ae63ac18b0c2398f3d3d76 WHIRLPOOL e7ab5a1987ba1ae0fe8e91ff1535cc870cedc3b4282d4c3721a627cd8fc948a5e2f81214287cf50b35f7b20928526022ed13bc900fd8334244c10c89435267c3
 AUX cmake-2.8.12.1-FindImageMagick.patch 1700 SHA256 042a843bc6204efee071af2cdeb451c5da3da852cba0d522dea1d264ff1014c3 SHA512 4c533e3bf3127eb0696b557fe381bfd88f3ebc70b29a33f04b7bf95fa7c765cb237abe34b6a406b452dd71fbc3d79740d58ae981eedca952f9fae272ea4f5efa WHIRLPOOL 25c5c7c47b2874b32143a9fe14443aa6da8f3abb6c92b0bd94f3848dd7d8114d901a0bc6fbb78547879f5af947f87f070e24cc2deeecd7bb4cc95290a7af7d40
 AUX cmake-2.8.7-FindBLAS.patch 1641 SHA256 be0d7ce6b59171c9e32ce7fe2ab4ae4a351640a7fa07920ae9230047eb0495ac SHA512 91a38e22d183ca4b501b305e6ba5068397b09b02bd39e7bdf27bf4a7771f432acaf099d0840260ce815f4d254d704036d022aaeec5b8c27dea1e4ca78112731b WHIRLPOOL e9734f0671918be36c5c1ec78f5185b21b17ef3a216b2c988d0951652db8c705e587df80f3e2c544c6e5a5080d5fc403a6554724c82055e3448f661df147205a
 AUX cmake-2.8.7-FindBoost-python.patch 5334 SHA256 1f7ab1facbb332cf6a2d6f770ea77eff00cd7137990d3254ee6c1a9ecd22ed68 SHA512 81d6ef46f006a42d1234f7a2aec3e18052ff5f5cca3019b42a5b3be77978babf75265db61eb32b4b28156a320506fbb6f7dc1038c9b01d13ed92cb7d0a25da4e WHIRLPOOL 3f6a52259e85d07e3209b6639fc1ccceda67f80a99f94ebe8a069a67d706e1e6cf16e30c8da0be6eff67793b30c49e006ea9b8d3f7a8cad562f90db5f7eebcdc
@@ -30,23 +31,23 @@ DIST cmake-2.8.11.2.tar.gz 5887016 SHA256 b32acb483afdd14339941c6e4ec25f633d916a
 DIST cmake-2.8.12.1.tar.gz 6068021 SHA256 fa28c12791d64c36ba6b6cb062a4b4bd4223053f6b9ea501b1bdbdf4d5df3a67 SHA512 91b07b33208fa66228b05a940422a99569ab8a0d8132de24b0ab19fc2f7a1f0697701234a5a374fb5884f0b48f693e917c284011f1c9ec9b94e82e06b70d9b7d WHIRLPOOL 674c07f82be6096723a0f772c3cac5224083507b7771ec887c527a0e84c11c9e5d25528b1b60ca20db67d08c01b2fdddebf07f3560f35c19cb057ffba2a65907
 EBUILD cmake-2.8.10.2-r2.ebuild 5062 SHA256 ea6ebc14c28c352ae27758386775d8db2ec411d1f244f932e8ae1c57532413b0 SHA512 8fe2c50a8809f926ce2aa3222500cc354aa646c6a7ec139a2b04465b43ea2c97afe3568e573dfb726126a69747f340be971f1e83734c2fa469ce4d847d389ff9 WHIRLPOOL eb1c197d62354d8e3dcad0a87235b6c8a0b0738213fa313151c643354fe8600f786a177f06a9ef8ad5c0f8508025a150f3f94ba3bc70f5507451ba68eaeb2992
 EBUILD cmake-2.8.11.2.ebuild 5401 SHA256 63decdddce3b3d657610fcc25d158bcdd2279319f5541f1fd1026776dd99905a SHA512 e2a383431be3015aebea0df3e386f0918e746d7ae3925287555715ef0750adad52b981ecf41574c2478ea38fbdb98988c36ae52627a8c3ea0ecf72183579f580 WHIRLPOOL 058a042465dad3c22afe3c741e6bad856e7a92caad21d5dceff1f2ba434ff6e03cdc399953eb9cf7b604cb545848e76172687151c73a60716d1ac458f47b3075
-EBUILD cmake-2.8.12.1-r1.ebuild 5465 SHA256 0c263049c329949851d9ee513cd41c61c3b4f5a27780b77e5ec0a9deb64e89f9 SHA512 49e2b25fcde0b87657e6408415c1d43b76a8003cbac14ea618d8e5388ceeaa76b766b3ea65e6997798d035a88b660034ebe5405253018db8e1a9217ee99dda93 WHIRLPOOL 1d09bd458be620a3c0b57ec8cca50ace41abe8def3484bdd8dda582fb331e32c224e468349fb67e3d59b613c0653840f1f7daaffd27c036c03002020678db2c1
-MISC ChangeLog 42444 SHA256 657e60797de709d4f7c782612e58aede35115ced92f53419f84da1a9b6c43198 SHA512 6ab8151674244c36626d4d5b3483c27e8d6f5b338adfbb8f3b029b5cc82d0c97c4c4d407e469f52ed8b27897abdd80f4339f5250ded186fa8163be175964d7be WHIRLPOOL 8ab7bf0b12cc49421cb189fc61e685dd295d1a8550632d78e079b835b09b441f91f467f90f2e1b61a8def65cd5b124701e03e9cbabe43b822bac9ae7eb68ec94
+EBUILD cmake-2.8.12.1-r2.ebuild 5514 SHA256 bcc98aa6be5c9fa6a1bdc418b921fd4fc453081387652cff8bc3fbfaae0a19c6 SHA512 534df48dc905f1f14a9dd5072a3be55cd93c944538b06bdcc2fbf2fab9af676b774aa05d0d04db0ebee34d7e76dca01a87b3e1129f7e4aaa91c5cb80044ebf1e WHIRLPOOL 7aeb64f4053f4e49a4bb3cd05b1f7ac959edb4b1bf3737b90e48014c68586f638e97189d0f6df6f11a06f9ad348cd9d6b32c8512a28865d259b5f1705f338457
+MISC ChangeLog 42758 SHA256 ae653b90d67b0e7b9bea0ae20ead41702c8a565cd2cc3768419c738bdfa5c1b3 SHA512 8057f03c165f87a3ba09210bd1146bd812644913f2e6986726c5510646332a43f813b5d625ff39a7c2cedb0370c4f75f375370c3f1fa68c18d61fd1c313108d4 WHIRLPOOL 8e4821da8db1a142d3ce488581beeee775b43c4a7c60c059ca1424860a7d4be54cd56caaf5113fa14b045a7ff65894d0ff588bf48ec16f9702a2bb7b09acb713
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSmgCSAAoJEGVpnaTzz9K9xRkQAMMiJLylcSGz+dHtjUc7CEnf
-bk10IvJPh0BGle3ot0SS0fZ8qqfPi8MqHCM2ESu1W/LKA9voajVhBbfDCw8qaFX2
-1Ak7JGSR/MeQZTpti073/tP3W1p4y5ym1E679L2zaf6b0HGbi/w+H4GsKg/e8ObU
-IDgePwvigsmLx8WzoYeX3/e9WYThlX+0VJU5ycU1Cl56YNJ020J6EDg5bIXdgJfx
-/3ancnwU8LwN551n/1JdlwOm8Lq8Hko/flbRuVcuNepsTJGLXzXIO8u4gGP8NxP1
-6YvyhY/gO0bhxdGcUgGznhnvj7kke0nSihTVQjvD3+sivjy3CQm6Xc7zybm7GZEX
-Cyzg33PlX6zymtsNWsewy/7jCQXODX/PQdy0vHWohusVHE9pNYaH3t3FhWjFfGpt
-kuew8bP8Y8ZFOqS9I6BjSnonQde0U8UZ5Wt37cEUP+OQSmW+kaiE+qGVbZTlAVyc
-ZwpnrjhUdlpnXHrIxnpz+Oz1Ec263+4+lMqN92cTMxJnQOYSpQwp5+XkCRBNbUhu
-/WBZTSU48jNyz1kqvnhpqlC/TLXcGweRK/qJ+KsXaGUegZ3490c5Vrku3CsLOibs
-EdoxAd0Mzb2Fdjl46F+/EeBziYGki//UW/a+KSWcHY9SAmffWmt+66jHj/M/SX1/
-mHUE185InnR7NuuAzR90
-=HY7r
+iQIcBAEBCAAGBQJSrOa6AAoJEGVpnaTzz9K9caUP/0ERjxq6O93zHMlxamya/uKv
+5A/MrxQfAoTE04RWq+M71+xVwAP95EpTHOpAx86ZqLwMrEFyeeGI+frmUx7o8mps
+qf9z9Oyds4ymFhT61GSADFI9iKt/C7ciFHwedZ3IPLo5ObkQL4WIvE/ETa06yW2G
+3616sxu38uiaDU9VtHE9VXRd0LrejxpK+Ojq5N8If3qGUYJP6pCpbWk2pRbn8b1s
+GYA7cSBGYNfmEqsbicYGJAoiJxna7kcX5T9n9WlC/PeD1kpXytw5IWAmPyBPXsp0
+At6vDBgshL17mdmj1lMTYSVLsy5G2gprkFolpWxAH4OHKGWObcq52oUvt8i9XiEq
+DlCdE7Dl+y3WtWCtU25LKcom2dBpylhAflN9WjtLDCua68ZW/2V7rdAEeVWBhZ+b
+tAEMzlB1Uo7kvWKoEmmVmuh39iJLg9BelouT5WIhKxh7cUDbcbqI4g69Gv5Xpa2t
+tuU62NlA3svn3ApNVhf4A+YcCGIXSPTtYIeIRHfZny9klt7L+jxNEtueVT0yaDM/
+BaEhNjSF0DFtjsmwc2Rs+O+CA/DiM5aAqqs5i0Woer3CgVZiL5KC3OFb0Dm1czxX
++qBucpmNaWwds0TvyIJwOzGTSxitomNpRhUomZSsfD/r0GBlyTulGhVyAEpp1qnl
+m1WC/fO/XIqbNvGpjvKe
+=r6Ih
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.12.1-r1.ebuild b/dev-util/cmake/cmake-2.8.12.1-r2.ebuild
index 4339e91d4370..973c300bb15f 100644
--- a/dev-util/cmake/cmake-2.8.12.1-r1.ebuild
+++ b/dev-util/cmake/cmake-2.8.12.1-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/dev-util/cmake/cmake-2.8.12.1-r1.ebuild,v 1.1 2013/11/13 18:26:34 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.1-r2.ebuild,v 1.1 2013/12/15 00:16:15 johu Exp $
 
 EAPI=5
 
@@ -70,6 +70,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch
 	"${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
 	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+	"${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
 )
 
 cmake_src_bootstrap() {
diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch
new file mode 100644
index 000000000000..6dc244c239c5
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch
@@ -0,0 +1,43 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Dec  8 13:38:06 UTC 2013
+Subject: fix check for freetype-2.5.1
+
+--- Modules/FindFreetype.cmake
++++ Modules/FindFreetype.cmake
+@@ -64,6 +64,19 @@
+   PATH_SUFFIXES include/freetype2 include
+ )
+ 
++if(NOT FREETYPE_INCLUDE_DIR_freetype2)
++  find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
++    HINTS
++      ENV FREETYPE_DIR
++    PATHS
++      /usr/X11R6
++      /usr/local/X11R6
++      /usr/local/X11
++      /usr/freeware
++    PATH_SUFFIXES include/freetype2 include
++  )
++endif()
++
+ find_library(FREETYPE_LIBRARY
+   NAMES freetype libfreetype freetype219
+   HINTS
+@@ -82,8 +95,14 @@
+ endif()
+ set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
+ 
+-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
+-    file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
++if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
++  set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
++elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
++  set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
++endif()
++
++if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
++    file(STRINGS "${FREETYPE_H}" freetype_version_str
+          REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
+ 
+     unset(FREETYPE_VERSION_STRING)