sci-mathematics/gsl-shell: Use pkg-config to detect gsl, libagg, freetype (#459474) and fox

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

4 files changed, 53 insertions, 10 deletions

diff --git a/sci-mathematics/gsl-shell/ChangeLog b/sci-mathematics/gsl-shell/ChangeLog
index 1c0ec79e1838..d3799adc95e8 100644
--- a/sci-mathematics/gsl-shell/ChangeLog
+++ b/sci-mathematics/gsl-shell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/gsl-shell
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/ChangeLog,v 1.9 2013/02/27 15:07:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/ChangeLog,v 1.10 2013/03/01 12:18:24 jlec Exp $
+
+  01 Mar 2013; Justin Lecher <jlec@gentoo.org> gsl-shell-2.2.0.ebuild,
+  +files/gsl-shell-2.2.0-pkg-config.patch:
+  Use pkg-config to detect gsl, libagg, freetype (#459474) and fox
 
   27 Feb 2013; Justin Lecher <jlec@gentoo.org> gsl-shell-2.2.0.ebuild:
   Add missing dep on virtual/pkgconfig
diff --git a/sci-mathematics/gsl-shell/Manifest b/sci-mathematics/gsl-shell/Manifest
index 60fee4f08d39..9f1fff654513 100644
--- a/sci-mathematics/gsl-shell/Manifest
+++ b/sci-mathematics/gsl-shell/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gsl-shell-2.2.0-pkg-config.patch 1030 SHA256 c621924b171cc03acd8e451a145624289cfc90ce1eff16c24eda2d46f00d1d8b SHA512 94fc8e8ea69ed5a6ec492958dbe32fccc6b668a7864c972e98d86909f2425b589388fe91f397fae441ad2f70b27148ae911d7dc7210be223284597bdbe562ea3 WHIRLPOOL 96291354b79bd92a0a7bdee8fed4f3ed54399735a3781a7993ef8a50365c0430b9389494eb39be9e421a3e7cd7ba38c54b67fea985eb1ed19ad619ff0587f939
 AUX gsl-shell-font.patch 643 SHA256 41fcdae34ad50d9af430314520458833943dc7e218ec707e14f115b190208321 SHA512 feeb151ff96c02b523f284acbaf214480b92cac42af497f6210726ff2a3b837c6792733ad5c2ac4be58fea68c18c5d10bf7db711336e32c9998c1456bfa3cbff WHIRLPOOL e7816c93202c0c60a18598630174c4af7200a64cfc4ec9944b3ea8c3a3a5452faf00431b2e20f83e840c063f82c1a0ee65a7de554fafa9a21446a4c5da651ae2
 AUX gsl-shell-nogui.patch 809 SHA256 6243647228918d4cdde4e1360ca0b7a7b4577b35044043db5d48a84333aea15d SHA512 b43d8009fef20ef847e098d4279b415ab26643970157b4fd49be1e255e1e8f59862159c2cb6054726d988c2d8b3bd6935673a509c803f486388a333040cde409 WHIRLPOOL ca0c1822b51fc7d0c78c6249790af8ae0018618055fa4ef1e8e775d3dd685aa26258c0120a79903dd40ef721a35f60b09beefe0ef31c626aa9738e376214ef21
 AUX gsl-shell-strip.patch 361 SHA256 b055fda96fa65658ff73143c5ab2242fabf2ff90e9a01da57758cf073f48de86 SHA512 ecb78c52f34d678ecec5ca5f6ee9c85cf954866347501aaf2fd31133357d8085bbbaf3d6118ae2cd20e8375927ae9c1958732bfab09bf308bde7fc3255fa35bf WHIRLPOOL 56ceab90c029426a1697a77c37049b275996d8ebbbf13d5f7e5a20d2dd8c5167ba3a034ff6071b3dab741ef1286d1692b84e3e99b5cd223af98fd74712f08f0d
 AUX gsl-shell-usr.patch 250 SHA256 e0199baa0018dc68f1eef3d51d6fcd8f501725ee9f368446a1312608e6dbed28 SHA512 e10df17a16969ad700e7f16c8fcf694e9c5f2d346e6db7ad5d616122c5160d9ea3d894354aef4214e48233a17e101b20b51c939fdbcb29b25169a4c6c07bc0c3 WHIRLPOOL f586cb39b7e585a0949a61dffe36274285f64f22d428439c1c281e942d9a8cd3dee660a79891d4615402a90e7ddc7b113a36ded05f917ca8cf1e634f42f7b1ae
 DIST gsl-shell-2.2.0.tar.gz 3138063 SHA256 e05bcc78ea3c70d209b12a3db5c86b5ed23e50617d68cb0081046382973b2d33 SHA512 1394cbafecd55ddf5c8c992273f1fa400825b21202cd53ac548a99e34a9183ba4a5dcb2ef10ef9a7930f78ed4e6343b8d2a5d34c38a8e7766300b5bf73596d89 WHIRLPOOL 9bbfa55c988611fa0c771fc6c49473e139eff936f4f22b4b419c409e8450c733a57f2d9bbbc799f754654ff5cf5b303ab263bb502ef712ad439564c6e3b28fef
-EBUILD gsl-shell-2.2.0.ebuild 1535 SHA256 14393c3333d832c9dd43392874c82d9a6128da2759789a6bc9fedf04fef29a9d SHA512 8942cd3bb3549049453117d267087eccd1deac3bc176e8fe63e79529024b73d5fa2cf36bf685221e5df295f2df8152f966e574e0d27f1dd52b34ff3c0aac8e4d WHIRLPOOL b8310dbd4ee297a464b3410e965367d7b651b6fd7149475f0066a60f1212b07d47f30d324e61c96ad3d03e50bd2597d92f9bfdf2e7eeaa9ec8d7cbc28c983951
-MISC ChangeLog 1607 SHA256 cff04b28f7ea1d209f017caad5999db6ba08bb259a86ef90c0b17ba94fd040b7 SHA512 c72efdd1257d4ce953e1120171b71283ef36f9c283fd2b63d4470173c013d8e68904446939a8d67b3db4a89703df33002bfd3d10669fff82b07adcd3daf71269 WHIRLPOOL 47d0f451da86e2397192fb60bbb3259ca392f841a48d65b20fa54d345b62a3e999915e7b3a9db4c1c505971ad9486830b84d95a74f46b8730e9828fa995dcdaf
+EBUILD gsl-shell-2.2.0.ebuild 1665 SHA256 315571a877f14046fa864e2868da9ff56396e7bf4fc27b68fc3204058b78d80d SHA512 128a1c86ef5d9c3cbe14653224cf6a76882fb42d14a12e74b7b0f70f02023527d9ba73e63cdf877c46bdd83f57027a5a71ac0d30ff44d0ea5a61b8a64023be82 WHIRLPOOL 70cbf412cee5886e74b12a778c9d946c1dac7b2c2f5901aa8faa176c45b4852e443ae66f902bb390a290f6873dae0b27e464b72101a5a948b4b3bfd20473d734
+MISC ChangeLog 1790 SHA256 a0331cab6d6ad2ef422637bdd9fe5a2cc9034c80c77f5435226ea97368a95e27 SHA512 3e90ae832328a8ec0a7abd6fce35c5949871477cd608a6ab1d878e90465906ecca23614c7322f90f3da64d3b6e8800288c70a06b2d1cb31cf24dbb9341c5384b WHIRLPOOL 72c5048be1bc0bbc21af3d5e685a19fd58ddee357536c03878734004e062745ca616b4c686bec58122edf0f24c2043e96dd4fa9b31129719b9250208014b1d29
 MISC metadata.xml 843 SHA256 8da5a873eb45a57fcb31ba1a0717a44627434c2a11af7a41eab44b548bc16c2a SHA512 9df6ac40ed3acf090e28c559420c5e85164efe85cc6ca7ec97cd6f7ef736583e48a2fa3fbe41ab4f1f740fdd125ffab3c10c148e796a8d51a51757d4c45c1608 WHIRLPOOL 84c5127f25f5b27afb1c6c3891a54b41b68b2df8ff6639741d7ccf8460372445065152700a3570331d078250504ec5a759332e0abb03c7c9d020deb5e3d28c51
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEuIS0ACgkQgAnW8HDreRYlAgCfZVo7TrJrFoZs4uDe/YprjIMR
-QXMAoI8YHg/Vae7C0lYFXJmNpYw06u0m
-=8Yfv
+iEYEAREIAAYFAlEwnJIACgkQgAnW8HDreRbH9QCfWn0LAXf4nkF4MHWmFluxpEY/
+blcAnRgt1xSR4s6KlVWAJ0yKKWDGcaQa
+=oFfY
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-2.2.0-pkg-config.patch b/sci-mathematics/gsl-shell/files/gsl-shell-2.2.0-pkg-config.patch
new file mode 100644
index 000000000000..8bb28635df2b
--- /dev/null
+++ b/sci-mathematics/gsl-shell/files/gsl-shell-2.2.0-pkg-config.patch
@@ -0,0 +1,33 @@
+ makepackages | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/makepackages b/makepackages
+index afeef79..a724e82 100644
+--- a/makepackages
++++ b/makepackages
+@@ -52,17 +52,17 @@ else
+   PTHREADS_LIBS = -lpthread
+ 
+ else
+-  AGG_INCLUDES = -I/usr/include/agg2
+-  AGG_LIBS = -lagg -lX11
++  AGG_INCLUDES = $(shell $(PKG_CONFIG) --cflags libagg)
++  AGG_LIBS = $(shell $(PKG_CONFIG) --libs libagg) -lX11
+ 
+-  GSL_INCLUDES =
+-  GSL_LIBS = -lgsl -lblas
++  GSL_INCLUDES = $(shell $(PKG_CONFIG) --cflags gsl)
++  GSL_LIBS = $(shell $(PKG_CONFIG) --libs gsl)
+ 
+-  FOX_INCLUDES := $(shell pkg-config fox --cflags)
+-  FOX_LIBS = $(shell pkg-config fox --libs)
++  FOX_INCLUDES := $(shell $(PKG_CONFIG) fox --cflags)
++  FOX_LIBS = $(shell $(PKG_CONFIG) fox --libs)
+ 
+-  FREETYPE_INCLUDES = -I/usr/include/freetype2
+-  FREETYPE_LIBS = -lfreetype
++  FREETYPE_INCLUDES = $(shell $(PKG_CONFIG) --cflags freetype2)
++  FREETYPE_LIBS = $(shell $(PKG_CONFIG) --libs freetype2)
+ 
+   PTHREADS_LIBS = -lpthread
+   endif
diff --git a/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild b/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild
index 368831376059..95c19af3c3c2 100644
--- a/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild
+++ b/sci-mathematics/gsl-shell/gsl-shell-2.2.0.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/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild,v 1.4 2013/02/27 15:07:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild,v 1.5 2013/03/01 12:18:24 jlec Exp $
 
 EAPI=4
 
@@ -30,7 +30,12 @@ DEPEND="${DEPEND}
 S="${WORKDIR}"/${PN}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-font.patch "${FILESDIR}"/${PN}-strip.patch "${FILESDIR}"/${PN}-usr.patch
+	tc-export PKG_CONFIG
+	epatch \
+		"${FILESDIR}"/${PN}-font.patch \
+		"${FILESDIR}"/${PN}-strip.patch \
+		"${FILESDIR}"/${PN}-usr.patch \
+		"${FILESDIR}"/${P}-pkg-config.patch
 	use fox || epatch "${FILESDIR}"/${PN}-nogui.patch
 }
 
@@ -40,10 +45,10 @@ src_compile() {
 	if use fox; then
 		local FOX_INCLUDES=`WANT_FOX=1.6 fox-config --cflags`
 		local FOX_LIBS=`WANT_FOX=1.6 fox-config --libs`
-		emake -j1 CFLAGS="${CFLAGS}" GSL_LIBS="-lgsl ${BLAS}" \
+		emake -j1 CFLAGS="${CFLAGS}" GSL_LIBS="$($(tc-getPKG_CONFIG) --libs gsl) ${BLAS}" \
 			FOX_INCLUDES="${FOX_INCLUDES}" FOX_LIBS="${FOX_LIBS}"
 	else
-		emake -j1 CFLAGS="${CFLAGS}" GSL_LIBS="-lgsl ${BLAS}"
+		emake -j1 CFLAGS="${CFLAGS}" GSL_LIBS="$($(tc-getPKG_CONFIG) --libs gsl) ${BLAS}"
 	fi
 
 	if use doc; then