Make sure we link against fontconfig since we use it.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 37 insertions, 6 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 94f09a6c2bc5..32254eb3a0f5 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.171 2012/06/07 16:47:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.172 2012/08/03 19:29:23 vapier Exp $
+
+  03 Aug 2012; Mike Frysinger <vapier@gentoo.org> tk-8.5.11-r1.ebuild:
+  Make sure we link against fontconfig since we use it.
 
 *tk-8.5.11-r1 (07 Jun 2012)
 
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 5654c0307623..3e1111b642a3 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX remove-control-v-8.4.9.diff 522 SHA256 f82a147821e6eb4cda3674568450903de864c99d73cae6062b56c391e7290bba SHA512 25089ca52df0fd98878192ac77ab80de52699ac33f1036854d1716b963e62e065d2570b54c943f08259ad4a2b95a794219bbe8b103c8ae3ac8157cf7ace2671a WHIRLPOOL 62a3b98a955309bae7e5e7fa459b753f14f387a4fed0bfe82189a52c311241b7b3a74827f6660d80047021b01202de218164ce9ee10a276d236c8dd59e647c99
 AUX tcl-8.5.9-gentoo-fbsd.patch 475 SHA256 5f7c415260c124f7515b8621535ba277add91b584149283543a92f5f2613dc75 SHA512 4cab5fefca03337a9f74e0df330d055ff9ebb930a3a84ef84aa45399faf9685f4a7c5c9f86b1bc71dd8a13b7ed7b42ac4485081f358f5fd28892e6ff277a2a63 WHIRLPOOL 02454a19ac2c1a25306676306b4c13fb882463c577545b65a3e3aaf93f6b3e0eb5b91c6e2c86fae601c5a7b1dc2bf6ec99be75aa4b335a16008a55427cd27d4d
 AUX tk-8.4-lastevent.patch 1095 SHA256 73bdd40b9e04ad705ac8956ea96967aaee5ac8ee9588a43e5c1bf30d50c0996d SHA512 50b804357484e5fb90ad1d3560db107cde8b2b0ae0363c152276fa941a21c19705ccee0e26265264bcd06c0cafb1ed90f6f5b413ff0851d0658ac03250a8aaf6 WHIRLPOOL 2c5a87016a6e7e7bbcd3ef82a70c00c1a152c70fe4409bf4f7a5c17e8b920adddc7d63deb0ac1662dfa882435db3e222311512a3317023a4c96acb4ebbd0510f
@@ -20,11 +23,28 @@ EBUILD tk-8.4.18-r1.ebuild 3250 SHA256 5b5715bce0583871983cf59b9b0f02cd918c47887
 EBUILD tk-8.4.18.ebuild 3172 SHA256 66950b70f7d997a27ce641af9ecc0d78001b57cf05c6b8d7dc5b396827323b90 SHA512 946ec8525a9521f6edf821709654c7a94bd7d2e458f8ec5c1fc6e11e6ae76a6f1873ab374860667d11fd34427167261d996574d0fff2b5704ee5d02782fa5952 WHIRLPOOL 2b65c9e68f155f1ab04fdf566021799e1ee99cfebc423c19428dbccd91a838ce15f8b4efbff56e2d51c9e2546ff8f92710942dbbfa2d636d6452e4e1e0a4ee0f
 EBUILD tk-8.4.19-r1.ebuild 3262 SHA256 4853aa1c968cc14c369e105bfce4f4c5b3b28fdee97757dbb49681ad65d0390e SHA512 8c53c953f7d22521483ca402e7c7276899a06ad1adad27b792d4fb5b2bfd50eeb64af9146a534b2f7e6a4b39d21e154e3ad4f935ea595ee7b85ec1d0f8bf62c9 WHIRLPOOL 2b64ea76927e718fafc61a370b5df9764029b9909ab28fea10a5d06b572eaff55685eaf9c2c6a5e5668a5b1dfd5f7e52326795d8f80a8704d1a0e2ca7163b263
 EBUILD tk-8.5.10-r1.ebuild 3167 SHA256 31e14de37faeef6d62e295fc01e4692831b2089fbf28671f1b610ba054720e2d SHA512 c6902a54a9f01bfda1d997e4cf085711e2645dec19d470410a72fe77b93a4a2ad2510435a44085507f7c38dfd4be9e68b03dc3883f0140891b7097f21b4d9c9f WHIRLPOOL 8849492330ebea988278ff8a3f057c56b600f40dffba6b8ff464dd4a294dccbd6acbb7a7ceafcd6eb7887c2c2627a283b4016ea786fe07c4bc6dbd0fab99453a
-EBUILD tk-8.5.11-r1.ebuild 3614 SHA256 19684dced2315e23546580742f5293278f0f08913e94736ca82485cfe7d5ad61 SHA512 55458839045b3d7a540237e8286bc9bcb6e19b248891b959d325c6424181483ba3253a77c69c14c0652f51916c455b40ce2348d77c9ab0dea85c1a43250c13fb WHIRLPOOL f0a7c28b1c406298cd3665df91d0435ab9c158e5ad5243b5726e810d69ba4edf7cb0f97accafa83af3b2073c9eeb0dce88a66967b47c890c8f29117161094cce
+EBUILD tk-8.5.11-r1.ebuild 3865 SHA256 44b48e6ace1c0f25f10927ae1b04c07c9f61d3707c9a59e4cadee7576b12acc0 SHA512 38b5c36b811c8227b291ce1f58d242efb750eaae992f96c30726562a3b0118d611784e157edfc5da460c67d8143e84e3b886e22e51d2cb9310e5766b9df4efed WHIRLPOOL 0cd9f4bf2230d7809b375676e2e4dd2e9b9867440a7cfae226a28ffa2964fb4cd113b2cf6f248c28b7c6b7be2866e5cdc1bca1707c784d588ab03693d8d4fb43
 EBUILD tk-8.5.11.ebuild 3329 SHA256 01ce675de75f03f0bbcde5c01944aea9e545943d653de30a31577701b1c5aa87 SHA512 040d4638e7a29e2345d978dc1fdc986ceac5ec1e7b198c38f09de15933195ffbbe0140d913f5b0f60bbe704c0ad5f353ee96323a40e8b848acafe0fce599ad33 WHIRLPOOL 73cd58ce6aaad2dc7c88aa3c521a4ac0b7165390fd705af8da8d0d737d4838f2f7b338d1af70cf592344876ad438ca33f14d6a1f4abe78d5e3c778fd8b23c3e8
 EBUILD tk-8.5.7-r1.ebuild 2880 SHA256 efd70fe2b92b24ce91ccc8b03e99f20dc830f8ebe7bf4a2bbd6836de8eb24e15 SHA512 169434b1b6f7033404060519f453ca369315f0282541109108dd2fc8a3e02dbb3d3077a71ca62ef1ef93fa618bb7b2a025e9a46a46b1f2a5b4645e9ac5c1a5de WHIRLPOOL 446b1ad9e860d4d5f66dc13bfbbc82d581e015daec4eff54327ecaf04fb4ba27a452f7202d6e90261f4401959d3991a251ff6dc5df4ec3203402566a5e1bd883
 EBUILD tk-8.5.7.ebuild 2776 SHA256 8201c25e9a294908c000bd4e897f7a9e61d28b0df2b0fbc39e50e5ccec8d647b SHA512 253b9369b728f2bca68c5181643e27c19040503a02d6fc65fa0b56669a54dde31f70df213ed6f45acb1804970fb4d37da0bc8186d9deaa24d8f2f641cb06a96a WHIRLPOOL 0de470197b5f68087e3a78b6d793b37a4458f199bd6bb9d258c7b5e8af50011e44ed7bcd6fa24520fdc1989f83bc8055f8999ffab5d856b5890be4239f2724b7
 EBUILD tk-8.5.8-r1.ebuild 3226 SHA256 9885d6d414455e63bc284f13884091ba4b88a822efd61a18da8bb47cad971fc1 SHA512 066e7baa6c07aa800df788b17029cf284f4ca6e6bdd5a62a3ccc2bd3684e15a34992f8e4c2ea4e8e1ee4256c45c7376cc6fa4f0a55d012517e3ba3c65bb2fc8e WHIRLPOOL 97c376bd1adaf2f6ce690dcf4e0aeef94b6a58fd957e2ec30259c6d37100840cccf2d84ad098bcaa87d1be4e6351f64432d300d5847c6df008c0a3ab36615e6b
 EBUILD tk-8.5.9-r1.ebuild 3225 SHA256 dba430898da54a61ad6fa7dacb6b747db57c35cd8eff225a173951b43402ccfd SHA512 dfa842b8e08276655e8859fade0d896f6504e10f5c9c06d99fb6e538a343d7f465cf608eb20966f6f3f6a1fe80b0706f5f0b70de7bc66b91eb350af3dc034917 WHIRLPOOL 4714c90bf56dd8d032966a4114cb3f5126f568961963ae3cfca8e61c352417d22c10573c46bc4730442d48f4dc57c706cf1ab6afd268f357b92d5fd755f098cb
-MISC ChangeLog 22782 SHA256 a428bd031bf468ec9647ec3de26da0add11e6b62d59f0ce99d0c70a00f6aecae SHA512 9844b8e19dee4bda2405dd397b70955bdfac265a0e4c98edbc113d2648da88d19fbf4c7e5df80991f49dd6f4b35c0e9ea191c69ec5c7424c078276ea21123633 WHIRLPOOL 82d0c7d0397f51471811fa69196d511faa482e208f73ab72a1ec6d51999edab1680c1ae16066feaa62e3bd2f91a73e70a0e7cb3e5fe724a4a0c35478dc16543f
+MISC ChangeLog 22912 SHA256 4738a541704534fa2580a9615fb52f71bd715c930936eb1d302553cf45a87358 SHA512 a2e692824d68945a4eda1e157f6b59f53f06b3b0f7bc39bcd97d4e726641c603a52f0be7cded3bc4e7a929abeb347bf0da577ef0521b7fdbad630eb6b83a652c WHIRLPOOL 040e44e01ea6c8d8c8a116e4e1a9913636512800f1a78a8f42077dae183806ac5cbce4bb36a53407985dd38aae197fbf468cc3d30a673b68a4e6c9bfee873f67
 MISC metadata.xml 159 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029 SHA512 7072291f336a01c6b6b0da289ab72b58c47062f94a06fed23a4982b776b5711df68662a3d8ff3a6954e2699817bda9780e01920056e29164944ead4d0fe815b6 WHIRLPOOL cb245ca2202ce7a680a703d76cf8dcb11e7627fddcc3c0bd9127855263f0e3d48db44511c2257ae793a0cb1d4a7764ffba5ceb992ff1a351d8f8a7ab96307683
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQHCaeAAoJELEHsLL7fEFWwc4QALOfGPBfJOrnZoa8Pz5ixuP6
+6jOJIpQcu9Vq0IJ6jkRlLQlMfbjshKZ+5md0Hf38BuPZf8k7T2GduUgL/YJkFe6i
+4vEqoPM4qbcZ6Xv0QqkQreOxSA3fInxuQgnKEW+30Ym+QqBIzLDwjIuyBAEb4XpA
+aXYLm/rD9vO/QAH9vGFi/BhR6bCxDV+Jj/9m8u28KOBoPRbIwFU1eH3G0tx+N3T/
+81isLQOi9qANR9d23kmPSSj2coAu/D5HOc7kdD0bspo8p0WkWUYPqxFS8Um3/XGA
+QypUF1zIo48P07zVxnFdcdh5IHbc9KDR4Z8WV/eDR/Tz8i/J8qV311pflB0yF+PY
+gGGhje0VrmCRs6Zfe6pFY6inkokGLjaCRP68wr5syMDC0G9CGriR4IlD2FQ09pQn
+D4vVW1/101CKcNXHcF3rbrYkdi0B/uUsZL3FmsSoL+79KbC7OJvrszvMyqy5GTGJ
+X58hYddhts4KZl0NVcENXxIsR8G7LyMpZcY1C/Mx5p9ukDZdJhl9EEWxcfP5ydOt
+AQXIAl4NJ+X9dK8LhGYymLTsBZZO3dbfdDUEj95e/S/U2RVfXAQdUqWXskMefit8
+kcwiRtLaUb0q0e1n3XCZ0tBpCDNekiwS4SnwVlWTnoH+7EtKYKYya4N+a/QQYJW2
+gj3yPxWAHwqpyYLxzJln
+=cE2L
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/tk/tk-8.5.11-r1.ebuild b/dev-lang/tk/tk-8.5.11-r1.ebuild
index eda09d30913e..a9800107bc6a 100644
--- a/dev-lang/tk/tk-8.5.11-r1.ebuild
+++ b/dev-lang/tk/tk-8.5.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11-r1.ebuild,v 1.1 2012/06/07 16:47:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11-r1.ebuild,v 1.2 2012/08/03 19:29:23 vapier Exp $
 
 EAPI=4
 
@@ -19,10 +19,12 @@ IUSE="debug threads truetype aqua xscreensaver"
 
 RDEPEND="
 	!aqua? (
+		media-libs/fontconfig
 		x11-libs/libX11
 		x11-libs/libXt
 		truetype? ( x11-libs/libXft )
-		xscreensaver? ( x11-libs/libXScrnSaver ) )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+	)
 	~dev-lang/tcl-${PV}"
 DEPEND="${RDEPEND}
 	!aqua? ( x11-proto/xproto )"
@@ -43,7 +45,13 @@ src_prepare() {
 	# copy the tcl patch
 	epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.patch
 
-	sed -i 's/FT_New_Face/XftFontOpen/g' unix/configure.in || die
+	# Make sure we use the right pkg-config, and link against fontconfig
+	# (since the code base uses Fc* functions).
+	sed -i \
+		-e 's/FT_New_Face/XftFontOpen/g' \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		-e 's:xft freetype2:xft freetype2 fontconfig:' \
+		unix/configure.in || die
 
 	cd "${S}"/unix
 	eautoreconf