Import from the science overlay

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 48 insertions, 5 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index f5e6618ba873..9b31f36254ca 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,7 +1,28 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.95 2012/03/13 17:02:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  29 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/root-5.32.00-chklib64.patch, root-5.32.01-r2.ebuild:
+  Import from the science overlay
+
+  23 Mar 2012; Andrew Savchenko <bircoph@gmail.com> root-5.26.00g.ebuild,
+  root-5.28.00h.ebuild, root-5.32.01-r2.ebuild, root-9999.ebuild:
+  Switch to virtual/shadow.
+
+  22 Mar 2012; Andrew Savchenko <bircoph@gmail.com> root-5.32.01-r2.ebuild,
+  root-9999.ebuild:
+  Apply chklib64 fix to the live ebuild as well.
+  Remove deprecated ncurses support and editline option: they are
+  deprecated and do nothing actually.
+
+  21 Mar 2012; Andrew Savchenko <bircoph@gmail.com>
+  +files/root-5.32.00-chklib64.patch, root-5.32.01-r2.ebuild:
+  Fix library architecture check (32/64 bit) for libraries having .so
+  file installed as an ld script instead of normal binary file.
+  See bug 406817 for details.
+  Thanks to Jean-Francois Ostiguy and Jauhien Piatlicki for their
+  major work on this bug.
 
   13 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> +root-5.26.00g.ebuild,
   +files/root-5.26.00g-explicit-functions.patch, -root-5.28.00d.ebuild,
diff --git a/sci-physics/root/files/root-5.32.00-chklib64.patch b/sci-physics/root/files/root-5.32.00-chklib64.patch
new file mode 100644
index 000000000000..a5c052cdd3e1
--- /dev/null
+++ b/sci-physics/root/files/root-5.32.00-chklib64.patch
@@ -0,0 +1,23 @@
+--- configure.orig	2012-02-29 19:46:41.000000000 +0400
++++ configure	2012-03-22 03:28:43.458968696 +0400
+@@ -441,14 +441,13 @@
+         fi
+     else
+         if file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
+-            check_link $chklib64
+-            ret=$link_result
+-        else
+-            logmsg " file $filearg $chklib64 | grep '64-bit'"
+-            if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
+-                ret=1
+-            fi
++            # get real binary .so name from .so ld script
++            chklib64=$(gawk '($1 == "GROUP") { print $3 }' $chklib64)
+         fi
++        logmsg " file $filearg $chklib64 | grep '64-bit'"
++        if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
++            ret=1
++            fi
+     fi
+     logmsg " result: $ret"
+     if test $ret -eq 1 ; then
diff --git a/sci-physics/root/root-5.32.01-r2.ebuild b/sci-physics/root/root-5.32.01-r2.ebuild
index 16dd9fe6193b..c8d52f5681cf 100644
--- a/sci-physics/root/root-5.32.01-r2.ebuild
+++ b/sci-physics/root/root-5.32.01-r2.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/sci-physics/root/root-5.32.01-r2.ebuild,v 1.1 2012/03/13 17:02:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.01-r2.ebuild,v 1.2 2012/03/29 18:21:49 bicatali Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2"
@@ -24,7 +24,7 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	+math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
+	+math mpi mysql odbc +opengl openmp oracle postgres prefix
 	pythia6	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
 CDEPEND="
@@ -66,7 +66,6 @@ CDEPEND="
 	ldap? ( net-nds/openldap )
 	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
 	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	postgres? ( dev-db/postgresql-base )
@@ -128,6 +127,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch
 
 	# make sure we use system libs and headers
@@ -201,7 +201,6 @@ src_configure() {
 		$(use_enable avahi bonjour) \
 		$(use_enable clarens) \
 		$(use_enable clarens peac) \
-		$(use_enable ncurses editline) \
 		$(use_enable fits fitsio) \
 		$(use_enable fftw fftw3) \
 		$(use_enable graphviz gviz) \