commit: 521d91a20708bd163766ca4e9aa1aa686ed91b52 Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com> AuthorDate: Mon Feb 23 17:42:02 2015 +0000 Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> CommitDate: Mon Feb 23 17:42:02 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=521d91a2
sci-physics/root: version bump --- sci-physics/root/ChangeLog | 7 + .../root/files/root-5.34.26-prop-flags.patch | 19 + sci-physics/root/metadata.xml | 4 +- sci-physics/root/root-5.34.26.ebuild | 453 +++++++++++++++++++++ 4 files changed, 482 insertions(+), 1 deletion(-) diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index 4ef278c..6bf87cf 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2015 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-5.34.26 (23 Feb 2015) + + 23 Feb 2015; Andrew Savchenko <[email protected]> +root-5.34.26.ebuild, + +files/root-5.34.26-prop-flags.patch, metadata.xml: + Version bump. Add http support. Add c++14 support. Rework compilers + handling. + 01 Jan 2015; Andrew Savchenko <[email protected]> root-5.34.18-r2.ebuild, root-6.00.01-r1.ebuild, root-6.00.02.ebuild, root-9999.ebuild: Rename virtual/postgresql to dev-db/postgresql diff --git a/sci-physics/root/files/root-5.34.26-prop-flags.patch b/sci-physics/root/files/root-5.34.26-prop-flags.patch new file mode 100644 index 0000000..b81dbb5 --- /dev/null +++ b/sci-physics/root/files/root-5.34.26-prop-flags.patch @@ -0,0 +1,19 @@ +commit 3c8bc686abf57e7e2037c4c191cb63a1a5172b5b +Author: Andrew Savchenko <[email protected]> +Date: Sun Feb 22 03:45:21 2015 +0300 + + root-5.32.00-prop-flags.patch -> root-5.34.26-prop-flags.patch + +diff --git a/config/Makefile.in b/config/Makefile.in +index 89674e7..91d25b9 100644 +--- a/config/Makefile.in ++++ b/config/Makefile.in +@@ -29,7 +29,7 @@ EXTRA_CFLAGS := -Iinclude @cflags@ + USERCONF_CFLAGS:= @usercflags@ + EXTRA_CXXFLAGS := -Iinclude @cflags@ + USERCONF_CXXFLAGS:= @usercxxflags@ +-EXTRA_LDFLAGS := @ldflags@ ++EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS) + WERROR := @werror@ + WINRTDEBUG := @winrtdebug@ + diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml index 26e546c..25b00d5 100644 --- a/sci-physics/root/metadata.xml +++ b/sci-physics/root/metadata.xml @@ -15,7 +15,9 @@ GUI toolkit, and a complete visualization framework. </longdescription> <use> - <flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>>=4.7.0</flag> + <flag name="c++0x"> Build ROOT using the C++11 standard</flag> + <flag name="c++11"> Build ROOT using the C++11 standard</flag> + <flag name="c++14"> Build ROOT using the C++14 standard</flag> <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag> <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag> <flag name="http">Enable http server support including but not limited to fastcgi support</flag> diff --git a/sci-physics/root/root-5.34.26.ebuild b/sci-physics/root/root-5.34.26.ebuild new file mode 100644 index 0000000..6eeb274 --- /dev/null +++ b/sci-physics/root/root-5.34.26.ebuild @@ -0,0 +1,453 @@ +# Copyright 1999-2015 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"; + SRC_URI="" + KEYWORDS="" +else + SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"; + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +fi + +PYTHON_COMPAT=( python2_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 MSttfEULA LGPL-3 libpng UoI-NCSA" +IUSE="+X afs avahi c++11 c++14 doc emacs examples fits fftw + graphviz http kerberos ldap +math minimal mpi mysql odbc + +opengl openmp oracle postgres prefix pythia6 pythia8 + python qt4 +reflex ruby sqlite ssl xinetd xml xrootd" + +# TODO: add support for: davix +# TODO: unbundle: vdt + +REQUIRED_USE=" + !X? ( !minimal? ( !opengl !qt4 ) ) + mpi? ( math !openmp ) + openmp? ( math !mpi ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +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-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? ( + || ( + media-libs/libafterimage:0=[gif,jpeg,png,tiff] + >=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff] + ) + 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= ) + 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:= ) + pythia6? ( sci-physics/pythia:6= ) + pythia8? ( >=sci-physics/pythia-8.1.80:8= ) + python? ( ${PYTHON_DEPS} ) + ruby? ( + dev-lang/ruby:= + dev-ruby/rubygems:= + ) + sqlite? ( dev-db/sqlite:3= ) + ssl? ( dev-libs/openssl:0= ) + xml? ( dev-libs/libxml2:2= ) + xrootd? ( >=net-libs/xrootd-3.3.5:0= ) + )" + +DEPEND="${CDEPEND} + virtual/pkgconfig" + +RDEPEND="${CDEPEND} + reflex? ( dev-cpp/gccxml ) + xinetd? ( sys-apps/xinetd )" + +PDEPEND="doc? ( !minimal? ( ~app-doc/root-docs-${PV}[http=,math=] ) )" + +S="${WORKDIR}/${PN}" + +# install stuff in ${P} and not ${PF} for easier tracking in root-docs +DOC_DIR="/usr/share/doc/${P}" + +die_compiler() { + eerror "You are using a $(tc-getCXX) without C++$1 capabilities" + die "Need one of the following C++$1 capable compilers:\n"\ + " >=sys-devel/gcc[cxx]-$2\n"\ + " >=sys-devel/clang-$3\n"\ + " >=dev-lang/icc-$4" +} + +# check compiler to satisfy minimal versions +# $1 - std version +# $2 - g++ +# $3 - clang++ +# $4 - icc/icpc +check_compiler() { + case "$(tc-getCXX)" in + *clang++*) + version_is_at_least "$3" "$(has_version sys-devel/clang)" || die_compiler "$1" "$2" "$3" "$4" + ;; + *g++*) + version_is_at_least "$2" "$(gcc-version)" || die_compiler "$1" "$2" "$3" "$4" + ;; + *icc*|*icpc*) + version_is_at_least "$4" "$(has_version dev-lang/icc)" || die_compiler "$1" "$2" "$3" "$4" + ;; + *) + ewarn "You are using an unsupported compiler." + ewarn "Please report any issues upstream." + ;; + esac +} + +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-getCXX)" != *clang++* ]] && ! 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 + + use c++11 && check_compiler "11" "4.8" "3.3" "13" + use c++14 && check_compiler "14" "4.9" "3.4" "15" +} + +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.32.00-dotfont.patch \ + "${FILESDIR}"/${PN}-5.34.05-nobyte-compile.patch \ + "${FILESDIR}"/${PN}-5.34.13-unuran.patch \ + "${FILESDIR}"/${PN}-5.34.13-desktop.patch \ + "${FILESDIR}"/${PN}-5.34.26-prop-flags.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" + + # fix reflex path (bug #497280) + sed -i -e 's|${ROOTSYS}/lib|@libdir@|' config/genreflex.in || die + + # QTDIR only used for qt3 in gentoo, and configure looks for it. + unset QTDIR +} + +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 + local 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) + --cflags='${CFLAGS}' + --cxxflags='${CXXFLAGS}' + ) + else + myconf+=( + --with-afs-shared=yes + --with-sys-iconpath="${EPREFIX}/usr/share/pixmaps" + --disable-builtin-afterimage + --disable-builtin-ftgl + --disable-builtin-freetype + --disable-builtin-glew + --disable-builtin-pcre + --disable-builtin-zlib + --disable-builtin-lzma + --disable-cling + --enable-astiff + --enable-explicitlink + --enable-gdml + --enable-memstat + --enable-shadowpw + --enable-shared + --enable-soversion + --enable-table + --fail-on-missing + --cflags='${CFLAGS}' + --cxxflags='${CXXFLAGS}' + $(use_enable X x11) + $(use_enable X asimage) + $(use_enable X xft) + $(use_enable afs) + $(use_enable avahi bonjour) + $(use_enable c++11 cxx11) + $(use_enable c++14 cxx14) + $(use_enable fits fitsio) + $(use_enable fftw fftw3) + $(use_enable graphviz gviz) + $(use_enable http) + $(use_enable kerberos krb5) + $(use_enable ldap) + $(use_enable math gsl-shared) + $(use_enable math genvector) + $(use_enable math mathmore) + $(use_enable math minuit2) + $(use_enable math roofit) + $(use_enable math tmva) + $(use_enable math unuran) + $(use_enable mysql) + $(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/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 reflex cintex) + $(use_enable reflex) + $(use_enable ruby) + $(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,COPYING.CINT} || die + use examples || rm -r ${DOC_DIR#/}/examples || die + cd usr/$(get_libdir)/root/cint/cint + rm lib/posix/mktypes lib/dll_stl/setup lib/G__* || die + rm lib/dll_stl/G__* lib/dll_stl/rootcint_* lib/posix/exten.o || die + rm include/makehpib || die + popd > /dev/null +} + +src_install() { + emake DESTDIR="${D}" install + + 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" + use reflex && python_optimize "${D}/usr/$(get_libdir)/root/python/genreflex/" + fi + use ruby && \ + echo "RUBYLIB=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root + 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 + + # do not copress files used by ROOT's CLI (.credit, .demo, .license) + docompress -x "${DOC_DIR}"/{CREDITS,examples/tutorials} + # needed for .license command to work + dosym "${ED}"usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE" +} + +pkg_postinst() { + fdo-mime_desktop_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update +}
