sci-physics/root: fix cfitsio linking

Link with shared cfitsio library when for static and shared
versions are available. Thanks Marcel Straub for the report and the
patch. See bug 374709 for details.

5 files changed, 36 insertions, 9 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 5fb22314f..be09608bc 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,7 +1,21 @@
 # ChangeLog for sci-physics/root
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-5.32.00-r2 (20 Jan 2012)
+
+  20 Jan 2012; Andrew Savchenko <bircoph@gmail.com>
+  -files/root-5.30.00-nobyte-compile.patch, -root-5.32.00-r1.ebuild,
+  +root-5.32.00-r2.ebuild, +files/root-5.32.00-cfitsio.patch,
+  +files/root-5.32.00-nobyte-compile.patch:
+  Link with dynamic cfistsio library if both static and dynamic
+  versions are present. Thanks Marcel Straub for the report and the
+  patch. See bug 374709 for details.
+
+  Rename root-5.30.00-nobyte-compile.patch ->
+  root-5.32.00-nobyte-compile.patch to simplify patch versioning in
+  the ebuild.
+
   15 Dec 2011; Andrew Savchenko <bircoph@gmail.com> root-5.32.00-r1.ebuild:
   sci-physics/root: update clarens requirements
 
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 9ba975ab4..461a84706 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,4 +1,4 @@
-DIST RooFit_Users_Manual_2.91-33.pdf 1330062 RMD160 650b616018a5493d5fd7da1dc06c6e54eaa419fb SHA1 f176782746542b00ff60320b4a41e1218db3d006 SHA256 101c4e4c41962238fcabf1caa86cafc51241a1800594491b2e62ef8b565a5646
-DIST TMVAUsersGuide-v4.03.pdf 3913533 RMD160 fbd62b90e7ad47ad69ec62d584417463ec13bf9c SHA1 84a63140cc3e01267d2cc7ffa374a7c24fbed37e SHA256 0cdbb4a2d19eb7a86e2911cfa73a905932e862d6c94be10b7662a9355b0241af
-DIST Users_Guide_5_26.pdf 9914765 RMD160 9e67a407d5a4d4f7019ab7b9b29bc696b7974987 SHA1 c2ecb87226e2fa38e6214aaf76dd789663d260dd SHA256 d0887800de7ffe7d6c0957891d44a4b34bf9d0eeb3da7e34b735ef998770bf39
-DIST root_v5.32.00.source.tar.gz 55355548 RMD160 e8b0c9b4e60334fb9f01b4cf70cdaed518c62bae SHA1 b7375d53dd845505196d12a7d66c3b2d8e1b0336 SHA256 9d63e4d7f1bb5454bc7b556abad314496edbd6ee669c6de7ef5d79090ec2d5f9
+DIST RooFit_Users_Manual_2.91-33.pdf 1330062 SHA256 101c4e4c41962238fcabf1caa86cafc51241a1800594491b2e62ef8b565a5646 SHA512 732d7dea3541b51e5f0b9b5b70dae57e1bdbb2504c4222d5e5095ec0f9b67307011c1f31c2c95be419b53dd8426f52f62f6c9370084208176a2ed3d7f25d783b WHIRLPOOL 033897bef4bdb13246a81ea6749f7895e6c4d639752e932130234ad9153bb399a4e5d416237850da27f139d3cccc53d9adb7a077abf20d257ce057157d6c3696
+DIST TMVAUsersGuide-v4.03.pdf 3913533 SHA256 0cdbb4a2d19eb7a86e2911cfa73a905932e862d6c94be10b7662a9355b0241af SHA512 d8bb2ce35ef32c4877059898f56513db0b1057924e21935a3d3a6f114748e167984c43fd2ec7e54197fccff875540543968fea9a8e75bf63f5f13521724a7ddb WHIRLPOOL 0a3e2e61e8e32f3a22757178adf033f9fbb89014aecd4df7f8bd49677d772bb3ad2c0f5526259611879f6bb20df647c01e23f53ade483d7a3e2242f8aee6c6aa
+DIST Users_Guide_5_26.pdf 9914765 SHA256 d0887800de7ffe7d6c0957891d44a4b34bf9d0eeb3da7e34b735ef998770bf39 SHA512 c2d428c9bb301af68626ffdd404acfde792b3c9539f1c85a5c467651074c67da861688c8ab61a0045cb5b947a7173633c64125c3a722360cc649f877bec888be WHIRLPOOL 59d9b07250dddd6d71912d24808711635b3b3845413b0f1f91e98b86843d0d295c097485f6e9258bb591195b4f077cb928686658f45337a9f72c5071ccc0003b
+DIST root_v5.32.00.source.tar.gz 55355548 SHA256 9d63e4d7f1bb5454bc7b556abad314496edbd6ee669c6de7ef5d79090ec2d5f9 SHA512 899ea01dc599b9f362b8820960d05696195340d1361a4f6a167a877404fbae9235b9ff082777aa6c7c7161b329ee3ac771600021ae1481a0d03d5894ad01bc1d WHIRLPOOL 6a9391f011646fb8218dab1e523009e4b6632c8b44cb5e4ef99dfe5810f2d2d2158eaadf3071bb4dfed6598a754b9373d54e43c3d51c0a92716018492bd4a588
diff --git a/sci-physics/root/files/root-5.32.00-cfitsio.patch b/sci-physics/root/files/root-5.32.00-cfitsio.patch
new file mode 100644
index 000000000..853c3f39f
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-cfitsio.patch
@@ -0,0 +1,13 @@
+--- configure.orig	2012-01-19 23:44:44.127607638 +0100
++++ configure	2012-01-20 00:19:20.420652913 +0100
+@@ -3435,9 +3435,7 @@
+     cfitsioinc=$found_hdr
+     cfitsioincdir=$found_dir
+ 
+-    # At this time, libcfitsio.a should always be prefered over .so,
+-    # to avoid forcing users to install cfitsio.
+-    check_library "libcfitsio cfitsio" "no" "$cfitsiolibdir" \
++    check_library "libcfitsio cfitsio" "yes" "$cfitsiolibdir" \
+         $CFITSIO ${CFITSIO:+$CFITSIO/lib} ${CFITSIO:+$CFITSIO/.libs} \
+         ${finkdir:+$finkdir/lib} \
+         /usr/local/lib /usr/lib /opt/cfitsio/lib
diff --git a/sci-physics/root/files/root-5.30.00-nobyte-compile.patch b/sci-physics/root/files/root-5.32.00-nobyte-compile.patch
index 179e5790c..179e5790c 100644
--- a/sci-physics/root/files/root-5.30.00-nobyte-compile.patch
+++ b/sci-physics/root/files/root-5.32.00-nobyte-compile.patch
diff --git a/sci-physics/root/root-5.32.00-r1.ebuild b/sci-physics/root/root-5.32.00-r2.ebuild
index acca805e1..ff34acb75 100644
--- a/sci-physics/root/root-5.32.00-r1.ebuild
+++ b/sci-physics/root/root-5.32.00-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild,v 1.3 2011/06/21 14:31:50 jlec Exp $
 
@@ -11,8 +11,7 @@ DOC_PV=5_26
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
 PATCH_PV=5.28.00b
-PATCH_PV2=5.30.00
-PATCH_PV3=5.32.00
+PATCH_PV2=5.32.00
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
@@ -129,7 +128,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV3}-afs.patch
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc