Fixed compilation with >=freetype-2.5.1 (bug #498782)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 45 insertions, 15 deletions

diff --git a/x11-misc/xlockmore/ChangeLog b/x11-misc/xlockmore/ChangeLog
index 25355ea298a0..f8c4cdf701c1 100644
--- a/x11-misc/xlockmore/ChangeLog
+++ b/x11-misc/xlockmore/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xlockmore
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.138 2013/09/02 08:33:12 pinkbyte Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.139 2014/03/11 13:36:51 polynomial-c Exp $
+
+  11 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> xlockmore-5.43.ebuild,
+  +files/xlockmore-5.43-freetype251.patch:
+  Fixed compilation with >=freetype-2.5.1 (bug #498782).
 
   02 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> xlockmore-5.43.ebuild:
   Make PAM and xlockrc support mutually exclusive as defined in configure file,
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 703ae1877d68..22104771d91c 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -3,18 +3,25 @@ Hash: SHA256
 
 AUX xlockmore-5.31-configure.in.patch 725 SHA256 e915682b795d77ed4827df8e9b5f322f8bd19a1fe9ef0c18830c98b746bb4e9f SHA512 5100938109d9f4005a7606619af0ccd02b6ff3ba0789ed675d4a031e5f93966f2dfd7939f8a30df7b730629492f363cf8329d0966bcd0c9d2c127832cb91ed0b WHIRLPOOL e19bc665f196732f68d97218fb869a736d3ad9dcff25aa69bd95f92e8dc6999e046b1b8bfe2b0d61de3389b4a5b8894899e69696635383f7ae11e6e6626282d7
 AUX xlockmore-5.31-ldflags.patch 6398 SHA256 22b18ad9120875ac7c3af4b81d0f863488b33aec36a50a036e2e7688699bd0cf SHA512 2366ebf6f015abbbd871c6e840fb4e839387107cbe20af742c91d387da77fdac9f6005760128e92f739cfe3676247c0b38d746f9fc1e17ac8c803b70b4acafca WHIRLPOOL ab9d693600bb005ae10d152a456143c97d3741b582549475be205b6234b3ac0d53df3c36079443ad4bda6a6d4bb943dd69b8668dd7f356cc2f6fe2eb3ed42c7a
+AUX xlockmore-5.43-freetype251.patch 429 SHA256 40f4df28137548b8626a9216113ce740af21befb77a2a274cc2e3e4edd09fdac SHA512 5793be5869ce4b937d08b494646b881f23ed52885db0024ae2ff34ec985fd95f424b6f483d7ad76bfef5c628c1559b1802e46480cf979e35512c6609452e685a WHIRLPOOL 0242e97ff793c058dd29a06dc783e61eac74022b8cf9ebd2d2291afb88fbdf0e8eabd4a6d65a3658337bb5f38a56b831c328eb848ef3e80cd9b3f018aa181e70
 DIST xlockmore-5.43.tar.bz2 1965448 SHA256 29911f21aaf682aa61f358ca36dadf20091ad919d19b4d55e3f4c8503ab266d0 SHA512 c175bb229b9b95e045cc2cf6f6dd973a9c9a277c37d25f07365b1ec910d26b0ea3b0f335a7823fcf5d3cac09984f9239d9ebf9b6a05c972bcd0070f6b1fa1c0a WHIRLPOOL 5ca0a5a2c4be7fc46f6d28b6f5a9121f3481b9c359ad10096b3814b13eaa21812d37149269a1244b31817e013b9bc37e946df4c4bf4a71a12138eec25720c5c4
-EBUILD xlockmore-5.43.ebuild 2373 SHA256 215c62882c2d0705a1a278a95b058d98ef82de7dc90b27971c35d3cb5361b961 SHA512 65d4507aea9320f2929233e3f9742555bec28eefae9d8ef80e32b54474172fb0a2c2d30ca95bb08401be94fed26bf61b0f3c620d6b01a085f8fdd0e4d3b9b129 WHIRLPOOL 83734de277ea2abcd356776ed9ef17c8e3c821c6bfca26c231efed930fab87269f9be49dd7fbe80ecab1bf913c5a32f4dcea7c9c26bfa5ac48e124743e928b58
-MISC ChangeLog 19519 SHA256 ac64a544e023d39279d717ecc37aef0f345f94aa420a6282ea690a87a45cf6e6 SHA512 da543da2cf319a4975cf964a386a0c5644496f8bec9a6afac278d372ff9b769eb689a9f857a51c6b54183cd6136dc790a642df64e5cc54a83b3bb2af42426a17 WHIRLPOOL 2073f69eb91840a5c50d739e0780f646dbd31cc334fdc4154069f0ee8e687281899811daa1b426adcbcb7cfc9ca5945be48be9d669f3359013a553542fc34dae
+EBUILD xlockmore-5.43.ebuild 2425 SHA256 a103826283d60d05f84a52f90d2322620a4d818de6d88c0693c3d0b528ec4cef SHA512 19b5c4deb504dbd4b70f8062690dba92512dccdf486fa668420835adb7078dc08c6b9d8a4c9b3af0d31112fb066d63c943d884919c4ad26b37d3986432420df5 WHIRLPOOL 7d80e5c8e5446df3aa585d35b10a4340e15395c98759cd946956692cb04b7d87a644164787c902a8e1190948c0a4d98679e38f6a2fd2b764bb73a6c92f879b78
+MISC ChangeLog 19701 SHA256 7dc2fe88bf7a70ebf294eaa75bfaba57fc2e4c5a7292bc901237a83bfc4a55d7 SHA512 73af51880943e7ff9022e0d064503b1549c76ff81f4f23bcb3e8f452f7835b20a37d904a8c5a3a34c9458489d2b373f744252c34e7a010e14f333762ff6d2399 WHIRLPOOL fb5e3d1cfbfacd16cf82935285fe1585c04dd901c6f7f58023bd2659e18eed5e41be020425fc021b517dbbb3a116c2eb1d2b898ebfefa13dfed804e12ad39a36
 MISC metadata.xml 255 SHA256 23193825c01ae6c6d66fd3604398bc108f0d263706c1842600f1ce6718128a4b SHA512 fecfe57a1c21d6d8eafa36f5236708e6031a5ed0f6f08d6306f7414705e3acd1f1cf897d63b895c071192aa3eb8ccfaefa01c0912a467d7034a723d37020b5a6 WHIRLPOOL 70526e97de5d2ed0cff4000ee58fb971f0d92a7113b2cf3b9291f292f9d3b6f4b3f1f56ef294a8f4e656515bd1a17341b6b0ed3cb9974d5f34978800693d6f4d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSJEzsAAoJECo/aRed9267qkQH/icDIem3Fvf5cSZ/2K8vzEBk
-EpgvcwfKA9QzdEbNVOs697BcQQ2j+ZsbpTXuXLbPdcAA1179Jt0LVpk18IFJWaZH
-bFTU7zQjZuCDtV/xzBbA7VOR2tb6Rp+9QYkRwsFuzNpKSzkQiCxNe1kxFviMz4zo
-Vy5m6/l44okL/OfqThH1+waklFJvF8F0v0DpM+IwzF7lEiK2T/EVzr8JJ2HTajnL
-WyiOTt33Lcr0IoGDI55o2weLWVPBooPnuNJ4S/DFTVPfxnihYB99qL/IoZI9QXUO
-xFFgGC156Cm1FEwHGb5DMoHjqlH8ebzI+gazA5mM38yd0OfjKPWY7ky7bl58pJg=
-=8zkH
+iQIcBAEBCAAGBQJTHxF0AAoJEPiazRVxLXTFmjkP/2OeLdSGfpWlbrmERToVvMND
+y9btt7do10dJcDK0bYWQzjc8g4IGg7WaoNF1ZUh/PzUv6E5qyjEze6G98BWFgVkP
+I/pLyTFPtazq6uW+A/7JxW69ZgFvQ6cRcj/iyVbapRsOy5rMkSMJC8vYiog8rbA1
+JAz8O7tGCHS6e297k9pi4fvxAqf2xfhulsrrJSj/UME5wM5vB8MCStSuuGjkaV3a
+Y2XDtiPKSu4wufhUYEOuoinXyEz54ABvJWHjaMhpM7cM/3pZB/pHzJPjHGtL+irX
+x2T3j/XNbNMWp+Zb/eFyVoD+AhNZ2ga5YvbJLOVhUYuVaasmCO0s00QzQ7oUJXuk
+mGAGb686sLGwsgwz0Xqcq7N6vnBAy8hHEe0n+lN2NvfqgC/7lsVGxrrhalPYEIWv
+AVOk7pdIXwQRSie57IDt/vOVq2iwq4QprjvG/UppLokQiCvPslDEyzXYZkZVpYDY
+/xSMCb7EUKbZ/kMWaREsJpHSisGiHPyQxC8sG/mGNmxenAU51HrNVtpdh0URGgTu
+7Ah82BM5Dmk6AmeXZCjJvKifV8Tlz5VhfQr7jnG5ZSuYkifxUYPIurTHSIXD0BvX
+W1Av77/PKvJCsCinJQpLUcy/GDA3nP+TYxaaPzkfI/2B4hrXlvnxq7COM/nKyFaV
+8Fr10soyw+wwx22QCRHO
+=Wcwp
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch b/x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch
new file mode 100644
index 000000000000..2d11bca086b1
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch
@@ -0,0 +1,18 @@
+Kludge to find >=freetyp2.5.1
+
+--- xlockmore-5.43/configure.in
++++ xlockmore-5.43/configure.in
+@@ -1983,6 +1983,13 @@
+     fi
+   done
+ 
++if test -z "$ac_freetype_includes" ; then
++  tt_inc=/usr/include/freetype2
++  if test -r "$tt_inc/freetype.h" ; then
++    no_freetype= ac_freetype_includes=$tt_inc
++  fi
++fi
++
+ # Check for the libraries.
+ # See if we find them without any special options.
+ # Do not add to $LIBS permanently.
diff --git a/x11-misc/xlockmore/xlockmore-5.43.ebuild b/x11-misc/xlockmore/xlockmore-5.43.ebuild
index 8d598541ba01..caedeb83de49 100644
--- a/x11-misc/xlockmore/xlockmore-5.43.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.43.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/x11-misc/xlockmore/xlockmore-5.43.ebuild,v 1.9 2013/09/02 08:33:12 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.43.ebuild,v 1.10 2014/03/11 13:36:51 polynomial-c Exp $
 
 EAPI=4
 inherit autotools eutils flag-o-matic pam
@@ -47,7 +47,8 @@ MAKEOPTS="${MAKEOPTS} -j1"
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-5.31-configure.in.patch \
-		"${FILESDIR}"/${PN}-5.31-ldflags.patch
+		"${FILESDIR}"/${PN}-5.31-ldflags.patch \
+		"${FILESDIR}"/${PN}-5.43-freetype251.patch
 
 	eautoreconf
 }