[gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/

["Andrew Savchenko" <bircoph@gmail.com>]

commit:     02f7b4d3df6d752586427e33da332b5407284265
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Jan 20 09:01:29 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Jan 20 09:01:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=02f7b4d3

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.

---
 sci-physics/root/ChangeLog                         |   16 +++++++++++++++-
 sci-physics/root/files/root-5.32.00-cfitsio.patch  |   13 +++++++++++++
 ...ile.patch => root-5.32.00-nobyte-compile.patch} |    0
 ...ot-5.32.00-r1.ebuild => root-5.32.00-r2.ebuild} |    8 ++++----
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 5fb2231..be09608 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/files/root-5.32.00-cfitsio.patch b/sci-physics/root/files/root-5.32.00-cfitsio.patch
new file mode 100644
index 0000000..853c3f3
--- /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
similarity index 100%
rename from sci-physics/root/files/root-5.30.00-nobyte-compile.patch
rename to 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
similarity index 98%
rename from sci-physics/root/root-5.32.00-r1.ebuild
rename to sci-physics/root/root-5.32.00-r2.ebuild
index acca805..ff34acb 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