From: Jeroen Roovers <jer@gentoo.org>
Date: Sun, 4 Jan 2015 10:26:19 +0000 (+0000)
Subject: Use fltk-config instead of hard-coding includes/libs (bug #534410 by Toralf Förster).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5b6b92cdd11e8ccd67790271792776947baea98e;p=gentoo.git

Use fltk-config instead of hard-coding includes/libs (bug #534410 by Toralf Förster).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
---

diff --git a/media-sound/giada/ChangeLog b/media-sound/giada/ChangeLog
index b47111c434d5..ff0849981461 100644
--- a/media-sound/giada/ChangeLog
+++ b/media-sound/giada/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/giada
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/giada/ChangeLog,v 1.14 2013/06/05 08:57:57 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/giada/ChangeLog,v 1.15 2015/01/04 10:26:18 jer Exp $
+
+  04 Jan 2015; Jeroen Roovers <jer@gentoo.org> giada-0.7.0.ebuild:
+  Use fltk-config instead of hard-coding includes/libs (bug #534410 by Toralf
+  Förster).
 
 *giada-0.7.0 (05 Jun 2013)
 
diff --git a/media-sound/giada/Manifest b/media-sound/giada/Manifest
index 7e5b40764bbc..c4a00d1c884b 100644
--- a/media-sound/giada/Manifest
+++ b/media-sound/giada/Manifest
@@ -12,17 +12,13 @@ EBUILD giada-0.6.1.ebuild 1122 SHA256 98907b54dd2962e19794c22bedcb01e591e8210e3b
 EBUILD giada-0.6.2.ebuild 1122 SHA256 efa7cbc014c883a3236c1bf878fa6b0fb194ed799d3b6eacfd1ccddd02624ad2 SHA512 10da042ddbf82b0517b36c806081676228e70ec72d7bc29801dcb97f34e89720b91f47562844f29165d533a0c7aeeb050b4d1f4af513b41e1e4137c51204ff4b WHIRLPOOL cca3e31162c5c7a9ef84b6ca051fb342cd399432a960801c113f8bad16f2cc8472a8e90cfb41dd28e80a51bcbb726441bdf234f480fe8afeb3f453dcfcf16e1d
 EBUILD giada-0.6.3.ebuild 1122 SHA256 fa3c837a865cd5bdcfe26b5122a010b1ef438beb9888fd1bfd07824d0105238b SHA512 4838798104a4c19e84783872d7a98ba38b5d9b0594a36e769f950b2be45f6c7909b2c11dd742425e6cf607bce8da3a5cbb20c095fe435ee02fe26b5564f6a95b WHIRLPOOL 2ec3e5041eff5e90b4c67e3e5b80b0d26acfc1e2259982759969c787d957809643a1c071b896d5fffc094669272d071359d38cb8fab58e5ff61a15d65a042288
 EBUILD giada-0.6.4.ebuild 1131 SHA256 431f7ef9e3985fed38fac9ba8dfb729c98d403c69e1aa156df4c70dbe4aa27ae SHA512 dbcc96132867eccb7e12766ee5d4f5ea80c4f6736695f04b1e5ac6fac974cf5e322eb9172fd84a975caed5b6f1b0a536b066452017fc6591e34d4e7391c4bcd5 WHIRLPOOL 3664b7c5c1cbd36045b31cba78fa1210627bff7eb27ed187f424f8ad99d76e1f72d194888c7c817b71f6f06178fe2bcaadf06ac26810be9cf66807a819553906
-EBUILD giada-0.7.0.ebuild 1131 SHA256 46cb8213429428df3e855c8ebf798afa2e23715235775e192e5842357b03404b SHA512 cc1a27c90d42d746b343fc682f3dfc2d378bc8b2c0c45cccf38f6f8fb1565f6fec7bb22bb6baf68518c73135b94d9c6142de05438d1251870ccc9faa6c7f3f88 WHIRLPOOL 7e4b9ffac0fd20c30a8f966ca3c5d447111b953a43e701698c27d13c6921ee2298a1f9159aeae270dfd413df37636c223a5697603b23b23a9087f5439eb2c6bf
-MISC ChangeLog 2007 SHA256 b968282d5f79a85ab8bc8ad40bfa066ef93063b7a6dd0ef7a4c27f1b59979477 SHA512 25e0b249c5418b0142e8723cde1b40b85c80c23c431385fcea3e52e0c374970b92932b2601823856ab8d4b79f68e34b00e80beab7f660cf8e28c6b639d539367 WHIRLPOOL e8658a62498c670e8bad57d54d3957f6df7110c894deafafcf6f3e830961eae6802d3c08ce4a5abfd7539a667a2489e7654ab6f7b3ef49c2a8583468a9a62546
+EBUILD giada-0.7.0.ebuild 1124 SHA256 02fd80ce5b29bde80a89d82d1661e6a507f15cdc1ffe637fd645660f4a323e1e SHA512 831741c32e83f9a2a5d3db69a4bd433d4fa85b9ed22f32a1cf8baf4e7df6ea4b6bbc0302a013310d0bc013a427c693b5b095ab75335cd4b8c777d0b5a7f69eea WHIRLPOOL a34b9c7940a4384b31e1671e4d5ee2c95e2ac63bcb3bfd54242d7d01789feaa4ef10821d0d95a48b4690cc339ea6e4b2e141902293fddfbe0399db8c276dc22d
+MISC ChangeLog 2160 SHA256 7c7b2681f2bbcd4e953070c1a7f185cee19adaf1f0eafa40127b5e2cc283e2ae SHA512 ab86af3a9cd634b311d92c868331c955b86b0823d5e26549ec6fae1ff2d7abb5e054ae2ae3505cce66090b0d393fb95b6d71eb58298435dd0fcf2a70d96cc6a6 WHIRLPOOL c430dbc499c237de23e02ca2d639917f53bb0bb732ced87195325816df733c6e5506ccc7bfc9438791ae95408a129e3fcc979b37bb2f8562ee448db32b109381
 MISC metadata.xml 161 SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e SHA512 e9f8695c64d7b6aa86b9b6186490d50b5a75d593ac1c86b9698265c6345899c64fa712acdde3bdbfb2464139e44623efdae29b67b73c1c85bcbedfbd10e874fd WHIRLPOOL c01ec8b583f907a3a62da7d5bf74d09809244709021f437dc3f0064b2d52baa3dd4386369b46a9fd74020146017cf6117ad04b147e8538b1a2c7202e1b4a2dd5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJRrv2ZAAoJEEqz6FtPBkyjoDwIAIbyQ2zHZnySTPQKUiCA6tyd
-7H7rckzkIXnKr43R4v3kBshEyA9UXeQA54uGccusmN4GQ40CFioLD8MoqiuBSn+C
-OKzkkFc2AGIApJZM7gog0FSAwnifUXJag/EvFp4kM137LvtjQgLLFPkluhA9Ti9T
-0CXpbHvK43kL3he7vEkfjvV33/eDJyRwtVRenB2GguHYwajyanRSnf7hl0vvtFRu
-krudphB1Vx14sJc+KSJ8Qs4VRTndY8NWHw1yQSgUzPKzfZCQXTiEuaE9tLCrtE7W
-/CqlkQFXatYYjoQuRkDijgXJucjqB0zfXjKCDXsd0wwhhu4mzDqjQpT/fJQJyLk=
-=MVVk
+iEYEAREIAAYFAlSpFUsACgkQVWmRsqeSphNVUwCbBs31xUDHQ2CIrhOKvpygQnh+
+lssAnRu3M8fZdFs54z6wrWVmdoyrlkUJ
+=lMeM
 -----END PGP SIGNATURE-----
diff --git a/media-sound/giada/giada-0.7.0.ebuild b/media-sound/giada/giada-0.7.0.ebuild
index 5045e142d4ed..6ca530a75231 100644
--- a/media-sound/giada/giada-0.7.0.ebuild
+++ b/media-sound/giada/giada-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/giada/giada-0.7.0.ebuild,v 1.1 2013/06/05 08:57:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/giada/giada-0.7.0.ebuild,v 1.2 2015/01/04 10:26:18 jer Exp $
 
 EAPI=5
 
@@ -32,8 +32,8 @@ src_prepare() {
 }
 
 src_configure() {
-	append-cppflags -I/usr/include/fltk-1
-	append-ldflags -L/usr/$(get_libdir)/fltk-1
+	append-cppflags $(fltk-config --cflags)
+	append-ldflags $(fltk-config --ldflags)
 
 	econf \
 		--target=linux \