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

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

commit:     a1c3b313be5be9716a761a762ea3651070ed9e43
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed Jul  2 13:29:12 2014 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed Jul  2 13:29:12 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a1c3b313

sci-physics/root: fix Cling library load

It was broken for prefix builds (that's how ROOT is installed in
Gentoo. See bug https://sft.its.cern.ch/jira/browse/ROOT-6410.

---
 sci-physics/root/ChangeLog                         |   7 +
 sci-physics/root/files/root-6.00.01-cling.patch    |  19 +
 ...{root-6.00.01.ebuild => root-6.00.01-r1.ebuild} |  10 +-
 sci-physics/root/root-9999.ebuild                  | 434 ++++++++++++++++++++-
 4 files changed, 461 insertions(+), 9 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 678d621..98e1940 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+*root-6.00.01-r1 (02 Jul 2014)
+
+  02 Jul 2014; Andrew Savchenko <bircoph@gmail.com> -root-6.00.01.ebuild,
+  +root-6.00.01-r1.ebuild, +files/root-6.00.01-cling.patch:
+  Fix Cling when prefix setup is used (see bug ROOT-6410).
+  Remove warning message because with bug fixed it is meaningless.
+
 *root-6.00.01 (29 Jun 2014)
 
   29 Jun 2014; Andrew Savchenko <bircoph@gmail.com> +root-6.00.01.ebuild,

diff --git a/sci-physics/root/files/root-6.00.01-cling.patch b/sci-physics/root/files/root-6.00.01-cling.patch
new file mode 100644
index 0000000..146e89f
--- /dev/null
+++ b/sci-physics/root/files/root-6.00.01-cling.patch
@@ -0,0 +1,19 @@
+commit eea9517c17bd86beda895a5a8b3ffe59af18596f
+Author: Axel Naumann <Axel.Naumann@cern.ch>
+Date:   Tue Jul 1 17:45:20 2014 +0200
+
+    From Pere: go via TSystem to use prefix if defined (ROOT-6410).
+
+diff --git a/core/meta/src/TCling.cxx b/core/meta/src/TCling.cxx
+index baec571..4976d4e 100644
+--- a/core/meta/src/TCling.cxx
++++ b/core/meta/src/TCling.cxx
+@@ -4703,7 +4703,7 @@ void* TCling::LazyFunctionCreatorAutoload(const std::string& mangled_name) {
+    TString lib;
+    Ssiz_t posLib = 0;
+    while (libs.Tokenize(lib, posLib)) {
+-      if (Load(lib, kFALSE /*system*/) < 0) {
++      if (gSystem->Load(lib, "", kFALSE /*system*/) < 0) {
+          // The library load failed, all done.
+          //fprintf(stderr, "load failed: %s\n", errmsg.c_str());
+          return 0;

diff --git a/sci-physics/root/root-6.00.01.ebuild b/sci-physics/root/root-6.00.01-r1.ebuild
similarity index 96%
rename from sci-physics/root/root-6.00.01.ebuild
rename to sci-physics/root/root-6.00.01-r1.ebuild
index 440bd32..bfb8e40 100644
--- a/sci-physics/root/root-6.00.01.ebuild
+++ b/sci-physics/root/root-6.00.01-r1.ebuild
@@ -200,7 +200,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-6.00.01-prop-flags.patch \
 		"${FILESDIR}"/${PN}-6.00.01-llvm.patch \
-		"${FILESDIR}"/${PN}-6.00.01-geocad.patch
+		"${FILESDIR}"/${PN}-6.00.01-geocad.patch \
+		"${FILESDIR}"/${PN}-6.00.01-cling.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -426,13 +427,6 @@ src_install() {
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
-	if [[ -z ${REPLACING_VERSIONS} ||
-		$(get_major_version ${REPLACING_VERSIONS}) -lt 6 ]]; then
-		ewarn "ROOT-6 uses Cling instead of CINT. Cling follows the C++ standard much more"
-		ewarn "strictly than CINT, in particular in requires headers to be included and"
-		ewarn "libraries to be properly loaded. Please carefully follow a migration guide:"
-		ewarn "http://root.cern.ch/root/htmldoc/notes/release-notes.html#cling-vs-cint"
-	fi
 }
 
 pkg_postrm() {

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
deleted file mode 120000
index b46789a..0000000
--- a/sci-physics/root/root-9999.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-root-6.00.01.ebuild
\ No newline at end of file

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
new file mode 100644
index 0000000..26f1dd1
--- /dev/null
+++ b/sci-physics/root/root-9999.ebuild
@@ -0,0 +1,433 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.18-r1.ebuild,v 1.3 2014/03/27 18:51:54 bicatali Exp $
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="http://root.cern.ch/git/root.git"
+	KEYWORDS=""
+else
+	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}"
+fi
+
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \
+	toolchain-funcs user versionator
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+DOC_URI="ftp://root.cern.ch/${PN}/doc"
+
+SLOT="0/$(get_version_component_range 1-3 ${PV})"
+LICENSE="LGPL-2.1 freedist GPL-2 MSttfEULA LGPL-3 libpng UoI-NCSA"
+IUSE="+X afs avahi doc emacs examples fits fftw geocad graphviz
+	http kerberos ldap +math minimal mpi mysql odbc +opengl openmp
+	oracle postgres	prefix pythia6 pythia8 python qt4 sqlite ssl
+	xinetd xml xrootd"
+
+# TODO: add support for: davix
+# TODO: ROOT-6 supports x32 ABI, but half of its dependencies doesn't
+# TODO: unbundle: cling, vdt
+
+REQUIRED_USE="
+	mpi? ( math !openmp )
+	opengl? ( X )
+	openmp? ( math !mpi )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt4? ( X )
+"
+
+CDEPEND="
+	app-arch/xz-utils:0=
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre:3=
+	media-fonts/dejavu
+	media-libs/freetype:2=
+	media-libs/giflib:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	>=sys-devel/clang-3.4
+	sys-libs/zlib:0=
+	virtual/jpeg:0
+	virtual/shadow
+	X? (
+		media-libs/ftgl:0=
+		media-libs/glew:0=
+		x11-libs/libX11:0=
+		x11-libs/libXext:0=
+		x11-libs/libXpm:0=
+		!minimal? (
+			opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
+			qt4? (
+				dev-qt/qtgui:4=
+				dev-qt/qtopengl:4=
+				dev-qt/qt3support:4=
+				dev-qt/qtsvg:4=
+				dev-qt/qtwebkit:4=
+				dev-qt/qtxmlpatterns:4=
+			)
+			x11-libs/libXft:0=
+		)
+	)
+	!minimal? (
+		afs? ( net-fs/openafs )
+		avahi? ( net-dns/avahi:0= )
+		emacs? ( virtual/emacs )
+		fits? ( sci-libs/cfitsio:0= )
+		fftw? ( sci-libs/fftw:3.0= )
+		geocad? ( sci-libs/opencascade:= )
+		graphviz? ( media-gfx/graphviz:0= )
+		http? ( dev-libs/fcgi:0= )
+		kerberos? ( virtual/krb5 )
+		ldap? ( net-nds/openldap:0= )
+		math? (
+			sci-libs/gsl:0=
+			sci-mathematics/unuran:0=
+			mpi? ( virtual/mpi )
+		)
+		mysql? ( virtual/mysql )
+		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
+		oracle? ( dev-db/oracle-instantclient-basic:0= )
+		postgres? ( dev-db/postgresql-base:= )
+		pythia6? ( sci-physics/pythia:6= )
+		pythia8? ( >=sci-physics/pythia-8.1.80:8= )
+		python? ( ${PYTHON_DEPS} )
+		sqlite? ( dev-db/sqlite:3= )
+		ssl? ( dev-libs/openssl:0= )
+		xml? ( dev-libs/libxml2:2= )
+		xrootd? ( >=net-libs/xrootd-3.3.5:0= )
+	)"
+
+# TODO: ruby is not yet ported to ROOT-6, reenable when (if?) ready
+#		ruby? (
+#			dev-lang/ruby
+#			dev-ruby/rubygems
+#		)
+#
+# TODO: root-6.00.01 crashes with system libafterimage
+#			|| (
+#				media-libs/libafterimage:0=[gif,jpeg,png,tiff]
+#				>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff]
+#			)
+#			--disable-builtin-afterimage
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	xinetd? ( sys-apps/xinetd )"
+
+PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )"
+
+# install stuff in ${P} and not ${PF} for easier tracking in root-docs
+DOC_DIR="/usr/share/doc/${P}"
+
+die_compiler() {
+	die "Need one of the following C++11 capable compilers:"
+	die "    >=sys-devel/gcc[cxx]-4.8"
+	die "    >=sys-devel/clang-3.4"
+	die "    >=dev-lang/icc-13"
+}
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	echo
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
+	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
+	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "For example, for SRP, you would set: "
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
+	echo
+
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	use minimal && return
+
+	if use math; then
+		if use openmp; then
+			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
+				ewarn "You are using a g++ without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+
+	# check for supported compilers
+	case $(tc-getCXX) in
+		*g++*)
+			if ! version_is_at_least "4.8" "$(gcc-version)"; then
+				eerror "You are using a g++ without C++11 capabilities"
+				die_compiler
+			fi
+		;;
+		*clang++*)
+			# >=clang-3.4 is already in DEPEND
+		;;
+		*icc*|*icpc*)
+			if ! version_is_at_least "13" "$(has_version dev-lang/icc)"; then
+				eerror "You are using an icc without C++11 capabilities"
+				die_compiler
+			fi
+		;;
+		*)
+			ewarn "You are using an unsupported compiler."
+			ewarn "Please report any issues upstream."
+		;;
+	esac
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
+		"${FILESDIR}"/${PN}-5.32.00-afs.patch \
+		"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
+		"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
+		"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
+		"${FILESDIR}"/${PN}-5.34.13-desktop.patch \
+		"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
+		"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-6.00.01-prop-flags.patch \
+		"${FILESDIR}"/${PN}-6.00.01-llvm.patch \
+		"${FILESDIR}"/${PN}-6.00.01-geocad.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+	#rm -r graf2d/asimage/src/libAfterImage || die
+	rm -r graf3d/ftgl/{inc,src} || die
+	rm -r graf2d/freetype/src || die
+	rm -r graf3d/glew/{inc,src} || die
+	rm -r core/pcre/src || die
+	rm -r math/unuran/src/unuran-*.tar.gz || die
+	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | \
+		xargs -0 rm || die
+	rm -r core/lzma/src/*.tar.gz || die
+	rm graf3d/gl/{inc,src}/gl2ps.* || die
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \
+		graf3d/gl/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# CSS should use local images
+	sed -i -e 's,http://.*/images/,,' etc/html/ROOT.css || die "html sed failed"
+}
+
+# NB: ROOT uses bundled LLVM, because it is patched and API-incompatible with
+# system LLVM.
+# NB: As of 6.00.0.1 cmake is not ready as it can't fully replace configure,
+# e.g. for afs and geocad.
+
+src_configure() {
+	local -a myconf
+	# Some compilers need special care
+	case $(tc-getCXX) in
+		*clang++*)
+			myconf=(
+				--with-clang
+				--with-f77="$(tc-getFC)"
+			)
+		;;
+		*icc*|*icpc*)
+			# For icc we need to provide architecture manually
+			# and not to tamper with tc-get*
+			use x86 && myconf=( linuxicc )
+			use amd64 && myconf=( linuxx8664icc )
+		;;
+		*)	# gcc goes here too
+			myconf=(
+				--with-cc="$(tc-getCC)"
+				--with-cxx="$(tc-getCXX)"
+				--with-f77="$(tc-getFC)"
+				--with-ld="$(tc-getCXX)"
+			)
+		;;
+	esac
+
+	# the configure script is not the standard autotools
+	myconf+=(
+		--prefix="${EPREFIX}/usr"
+		--etcdir="${EPREFIX}/etc/root"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/${PN}"
+		--docdir="${EPREFIX}${DOC_DIR}"
+		--tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials"
+		--testdir="${EPREFIX}${DOC_DIR}/examples/tests"
+		--disable-werror
+		--nohowto
+	)
+
+	if use minimal; then
+		myconf+=( $(usex X --gminimal --minimal) )
+	else
+		myconf+=(
+			--with-afs-shared=yes
+			--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
+			--disable-builtin-ftgl
+			--disable-builtin-freetype
+			--disable-builtin-glew
+			--disable-builtin-pcre
+			--disable-builtin-zlib
+			--disable-builtin-lzma
+			--enable-astiff
+			--enable-explicitlink
+			--enable-gdml
+			--enable-memstat
+			--enable-shadowpw
+			--enable-shared
+			--enable-soversion
+			--enable-table
+			--fail-on-missing
+			$(use_enable X x11)
+			$(use_enable X asimage)
+			$(use_enable X xft)
+			$(use_enable afs)
+			$(use_enable avahi bonjour)
+			$(use_enable fits fitsio)
+			$(use_enable fftw fftw3)
+			$(use_enable geocad)
+			$(use_enable graphviz gviz)
+			$(use_enable kerberos krb5)
+			$(use_enable ldap)
+			$(use_enable math genvector)
+			$(use_enable math gsl-shared)
+			$(use_enable math mathmore)
+			$(use_enable math minuit2)
+			$(use_enable math roofit)
+			$(use_enable math tmva)
+			$(use_enable math vc)
+			$(use_enable math vdt)
+			$(use_enable math unuran)
+			$(use_enable mysql)
+			$(use_enable odbc)
+			$(use_enable opengl)
+			$(use_enable oracle)
+			$(use_enable postgres pgsql)
+			$(usex postgres \
+				"--with-pgsql-incdir=$(pg_config --includedir)" "")
+			$(use_enable prefix rpath)
+			$(use_enable pythia6)
+			$(use_enable pythia8)
+			$(use_enable python)
+			$(use_enable qt4 qt)
+			$(use_enable qt4 qtgsi)
+			$(use_enable sqlite)
+			$(use_enable ssl)
+			$(use_enable xml)
+			$(use_enable xrootd)
+			${EXTRA_ECONF}
+		)
+	fi
+
+	./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+	emake \
+		OPT="${CXXFLAGS}" \
+		F77OPT="${FFLAGS}" \
+		ROOTSYS="${S}" \
+		LD_LIBRARY_PATH="${S}/lib"
+	use emacs && ! use minimal && elisp-compile build/misc/*.el
+}
+
+daemon_install() {
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	echo "Icon=root-system-bin" >> etc/root.desktop
+	domenu etc/root.desktop
+	doicon build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+cleanup_install() {
+	# Cleanup of files either already distributed or unused on Gentoo
+	pushd "${ED}" > /dev/null
+	rm usr/share/root/fonts/LICENSE || die
+	rm etc/root/proof/*.sample || die
+	rm -r etc/root/daemons || die
+	# these should be in PATH
+	mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
+	rm ${DOC_DIR#/}/{INSTALL,LICENSE} || die
+	use examples || rm -r ${DOC_DIR#/}/examples || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README.md
+
+	echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root
+
+	if ! use minimal; then
+		use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
+		if use python; then
+			echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
+			python_optimize "${D}/usr/$(get_libdir)/root"
+		fi
+		use emacs && elisp-install ${PN} build/misc/*.{el,elc}
+		if use examples; then
+			# these should really be taken care of by the root make install
+			insinto ${DOC_DIR}/examples/tutorials/tmva
+			doins -r tmva/test
+		fi
+	fi
+	doenvd 99root
+
+	# The build system installs Emacs support unconditionally in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -r "${ED}"/usr/share/emacs || die
+
+	daemon_install
+	desktop_install
+	cleanup_install
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}