From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 86043138DC2 for ; Sat, 18 Jul 2015 13:49:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60CEBE08B0; Sat, 18 Jul 2015 13:49:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BDC01E08B0 for ; Sat, 18 Jul 2015 13:49:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E80BA340CB8 for ; Sat, 18 Jul 2015 13:49:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 17981B3 for ; Sat, 18 Jul 2015 13:49:41 +0000 (UTC) From: "Andrew Savchenko" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Savchenko" Message-ID: <1437227350.b8acd551791321d70d92b21eabf4a28a2ed6dd3d.bircoph@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/root/ChangeLog sci-physics/root/files/root-5.32.00-dotfont.patch sci-physics/root/files/root-5.34.05-nobyte-compile.patch sci-physics/root/files/root-5.34.26-ldflags.patch sci-physics/root/metadata.xml sci-physics/root/root-5.34.32.ebuild X-VCS-Directories: sci-physics/root/ sci-physics/root/files/ X-VCS-Committer: bircoph X-VCS-Committer-Name: Andrew Savchenko X-VCS-Revision: b8acd551791321d70d92b21eabf4a28a2ed6dd3d X-VCS-Branch: master Date: Sat, 18 Jul 2015 13:49:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d69ed698-3867-4da1-9b4d-0e8d2cf8d38b X-Archives-Hash: 02ce9dd92d34bc6a6055f7c9edfad989 commit: b8acd551791321d70d92b21eabf4a28a2ed6dd3d Author: Andrew Savchenko gmail com> AuthorDate: Sat Jul 18 13:49:10 2015 +0000 Commit: Andrew Savchenko gentoo org> CommitDate: Sat Jul 18 13:49:10 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b8acd551 sci-physics/root-5.34.32 is moved to the main tree now sci-physics/root/ChangeLog | 4 + sci-physics/root/files/root-5.32.00-dotfont.patch | 58 --- .../root/files/root-5.34.05-nobyte-compile.patch | 137 ------- sci-physics/root/files/root-5.34.26-ldflags.patch | 19 - sci-physics/root/metadata.xml | 7 - sci-physics/root/root-5.34.32.ebuild | 437 --------------------- 6 files changed, 4 insertions(+), 658 deletions(-) diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index 61a91bd..f217c40 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,6 +2,10 @@ # 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 $ + 18 Jul 2015; Andrew Savchenko -root-5.34.32.ebuild, + -files/root-5.32.00-dotfont.patch, -files/root-5.34.05-nobyte-compile.patch, + -files/root-5.34.26-ldflags.patch, metadata.xml: + 18 Jul 2015; Andrew Savchenko root-5.34.32.ebuild: Do not use usex for postgres to avoid pg_config unconditional sourcing. See bug 555246. diff --git a/sci-physics/root/files/root-5.32.00-dotfont.patch b/sci-physics/root/files/root-5.32.00-dotfont.patch deleted file mode 100644 index 85d6dea..0000000 --- a/sci-physics/root/files/root-5.32.00-dotfont.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- root/html/src/TClassDocOutput.cxx.orig 2012-05-25 16:18:10.000000000 +0400 -+++ root/html/src/TClassDocOutput.cxx 2012-05-29 21:36:53.813593012 +0400 -@@ -625,7 +625,7 @@ - << "size=\"8,10\";" << endl - << "ratio=auto;" << endl - << "margin=0;" << endl -- << "node [shape=plaintext,fontsize=40,width=4,height=0.75];" << endl -+ << "node [shape=plaintext,fontsize=40,width=4,height=0.75,fontname=\"DejaVu Serif\"];" << endl - << "\"" << fCurrentClass->GetName() << "\" [shape=ellipse];" << endl; - - std::stringstream ssDep; -@@ -704,7 +704,7 @@ - outdot << ";" << endl; - } else if (writeAndMoreFor) { - outdot << " \"...andmore" << writeAndMoreFor->GetName() -- << "\" [label=\"...and more\",fontname=\"Times-Italic\",fillcolor=lightgrey,style=filled];" << endl; -+ << "\" [label=\"...and more\",fontname=\"DejaVu Serif Italic\",fillcolor=lightgrey,style=filled];" << endl; - } - } - if (!levelExists) break; -@@ -733,7 +733,7 @@ - << "ranksep=0.1;" << endl - << "nodesep=0;" << endl - << "margin=0;" << endl; -- outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << endl; -+ outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10,fontname=\"DejaVu Serif\"];" << endl; - - std::stringstream ssDep; - const int numColumns = 3; -@@ -939,7 +939,7 @@ - << "ranksep=0;" << endl - << "nodesep=0;" << endl - << "size=\"8,10\";" << endl -- << "node [fontsize=20,shape=plaintext];" << endl; -+ << "node [fontsize=20,shape=plaintext,fontname=\"DejaVu Serif\"];" << endl; - - for (std::list::iterator iFile = listFilesToParse.begin(); - iFile != listFilesToParse.end(); ++iFile) { -@@ -999,7 +999,8 @@ - << "ranksep=0.7;" << endl - << "nodesep=0.3;" << endl - << "size=\"8,8\";" << endl -- << "ratio=compress;" << endl; -+ << "ratio=compress;" << endl -+ << "node [fontname=\"DejaVu Serif\"];" << endl; - - TString libs(fCurrentClass->GetSharedLibs()); - outdot << "\"All Libraries\" [URL=\"LibraryDependencies.html\",shape=box,rank=max,fillcolor=lightgray,style=filled];" << endl; -@@ -1109,7 +1110,8 @@ - - dotout << "digraph G {" << endl - << "ratio=auto;" << endl -- << "rankdir=RL;" << endl; -+ << "rankdir=RL;" << endl -+ << "node [fontname=\"DejaVu Serif\"];" << endl; - - // loop on all classes - TClassDocInfo* cdi = 0; diff --git a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch deleted file mode 100644 index ec67a15..0000000 --- a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -Naur root.as-needed/Makefile root/Makefile ---- a/Makefile.orig 2013-02-15 02:27:56.000000000 +0400 -+++ b/Makefile 2013-02-23 02:22:14.556465852 +0400 -@@ -1258,10 +1258,7 @@ - for lib in $(RFLX_GRFLXPY); do \ - rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \ - done; \ -- for lib in $(RFLX_GRFLXPYC); do \ -- rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \ -- done; \ -- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \ -+ if test "x$(RFLX_GRFLXPY)" != "x"; then \ - dir=$(subst lib/,,$(RFLX_GRFLXDD)); \ - while test "x$${dir}" != "x" && \ - test -d $(DESTDIR)$(LIBDIR)/$${dir} && \ -diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk ---- root.as-needed/bindings/pyroot/Module.mk 2011-07-10 10:42:48.991561304 +0400 -+++ root/bindings/pyroot/Module.mk 2011-07-10 10:43:21.493339703 +0400 -@@ -48,8 +48,6 @@ - ROOTPY := $(subst $(MODDIR),$(LPATH),$(ROOTPYS)) - $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@ - endif --ROOTPYC := $(ROOTPY:.py=.pyc) --ROOTPYO := $(ROOTPY:.py=.pyo) - - # used in the main Makefile - ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH)) -@@ -68,10 +66,8 @@ - include/%.h: $(PYROOTDIRI)/%.h - cp $< $@ - --%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' --%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' - --$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \ -+$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) \ - $(ROOTLIBSDEP) $(PYTHONLIBDEP) - @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ - "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \ -@@ -113,7 +109,7 @@ - - distclean-$(MODNAME): clean-$(MODNAME) - @rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \ -- $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \ -+ $(ROOTPY) $(PYROOTMAP) \ - $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64) - - distclean:: distclean-$(MODNAME) -diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules ---- root.as-needed/build/package/debian/rules 2011-07-10 10:42:49.241549346 +0400 -+++ root/build/package/debian/rules 2011-07-10 10:48:06.989670589 +0400 -@@ -691,10 +691,6 @@ - -X$(SYSCONFDIR)/root/system.rootauthrc \ - -X$(SYSCONFDIR)/root/system.rootdaemonrc \ - -X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a \ -- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc \ -- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo \ -- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc \ -- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo \ - -X$(PREFIX)/lib/root/$(SOVERS)/cint7 \ - -X$(PREFIX)/include/root/Minuit2 - # $(foreach i, \ -diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk ---- root.as-needed/cint/cintex/Module.mk 2011-07-10 10:42:49.104889217 +0400 -+++ root/cint/cintex/Module.mk 2011-07-10 10:43:21.496672876 +0400 -@@ -31,10 +31,6 @@ - CINTEXPY := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS)) - $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@ - endif --ifneq ($(BUILDPYTHON),no) --CINTEXPYC := $(CINTEXPY:.py=.pyc) --CINTEXPYO := $(CINTEXPY:.py=.pyo) --endif - - # used in the main Makefile - ALLHDRS += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH)) -@@ -86,8 +82,6 @@ - fi) - cp $< $@ - --%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' --%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' - - $(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \ - $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP) -diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk ---- root.as-needed/cint/reflex/Module.mk 2011-07-10 10:42:49.074890651 +0400 -+++ root/cint/reflex/Module.mk 2011-07-10 10:43:21.496672876 +0400 -@@ -48,9 +48,6 @@ - RFLX_GRFLXS := $(wildcard $(RFLX_GRFLXSD)/*.py) - RFLX_GRFLXPY := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS)) - RFLX_GRFLXPY += $(RFLX_GCCXMLPATHPY) --ifneq ($(BUILDPYTHON),no) --RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY)) --endif - - RFLX_LIBDIR = $(LIBDIR) - -@@ -92,7 +89,7 @@ - - ALLEXECS += $(RFLX_GENMAPX) - --POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) -+POSTBIN += $(RFLX_GRFLXPY) - - ##### local rules ##### - .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \ -@@ -122,8 +119,6 @@ - mkdir -p lib/python/genreflex; fi ) - cp $< $@ - --$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py -- @python -c 'import py_compile; py_compile.compile( "$<" )' - - $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap - -@@ -149,7 +144,7 @@ - $(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \ - -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL) - --all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) -+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY) - - clean-genreflex: - @rm -rf lib/python/genreflex -diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt ---- root.as-needed/cint/reflex/python/CMakeLists.txt 2011-07-10 10:42:49.074890651 +0400 -+++ root/cint/reflex/python/CMakeLists.txt 2011-07-10 10:43:21.496672876 +0400 -@@ -15,7 +15,7 @@ - ##################### sources #################### - - FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py) --SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE) -+SET(GENREFLEX_SCRIPT PARENT_SCOPE) - - ##################### gccxmlpath #################### - diff --git a/sci-physics/root/files/root-5.34.26-ldflags.patch b/sci-physics/root/files/root-5.34.26-ldflags.patch deleted file mode 100644 index b81dbb5..0000000 --- a/sci-physics/root/files/root-5.34.26-ldflags.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 3c8bc686abf57e7e2037c4c191cb63a1a5172b5b -Author: Andrew Savchenko -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 86bcf98..7e1dbd5 100644 --- a/sci-physics/root/metadata.xml +++ b/sci-physics/root/metadata.xml @@ -15,19 +15,12 @@ GUI toolkit, and a complete visualization framework. - Build ROOT using the C++11 standard - Build ROOT using the C++14 standard Support for images and data from FITS files with sci-libs/cfitsio - Enable GDML writer and reader Enable ROOT-CAD interface using sci-libs/opencascade Enable http server support including but not limited to fastcgi support Build all math related libraries plugins, needs sci-libs/gsl - Build memory statistics library, helps to detect memory leaks Build the interface for sci-physics/pythia version 6.x Build the interface for sci-physics/pythia version 8.x - Build the reflection database for the C++ interpreter - Enable shadow authentication in rootd and proofd - Build libTable contrib library Build the interface for net-libs/xrootd diff --git a/sci-physics/root/root-5.34.32.ebuild b/sci-physics/root/root-5.34.32.ebuild deleted file mode 100644 index 4b02cba..0000000 --- a/sci-physics/root/root-5.34.32.ebuild +++ /dev/null @@ -1,437 +0,0 @@ -# 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.28-r1.ebuild,v 1.1 2015/04/12 22:24:42 bircoph Exp $ - -EAPI=5 - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="http://root.cern.ch/git/root.git" -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/" - -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 gdml - graphviz http kerberos ldap +math +memstat mpi mysql odbc - +opengl openmp oracle postgres prefix pythia6 pythia8 - python qt4 +reflex ruby shadow sqlite ssl table +tiff xinetd xml xrootd" - -# TODO: add support for: davix -# TODO: unbundle: vdt - -REQUIRED_USE=" - !X? ( !opengl !qt4 !tiff ) - 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/libpng:0= - sys-libs/zlib:0= - X? ( - media-libs/ftgl:0= - media-libs/glew:0= - x11-libs/libX11:0= - x11-libs/libXext:0= - x11-libs/libXpm:0= - || ( - 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= - ) - 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= =net-libs/xrootd-3.3.5:0= ) -" - -DEPEND="${CDEPEND} - virtual/pkgconfig" - -RDEPEND="${CDEPEND} - reflex? ( dev-cpp/gccxml ) - xinetd? ( sys-apps/xinetd )" - -PDEPEND="doc? ( ~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)-$5 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() { - local ver - case "$(tc-getCXX)" in - *clang++*) - ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')" - ;; - *g++*) - ver="$(gcc-version)" - ;; - *icc*|*icpc*) - ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')" - ;; - *) - ewarn "You are using an unsupported compiler." - ewarn "Please report any issues upstream." - return 0 - ;; - esac - version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}" -} - -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 - - 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.26-ldflags.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://.*/,,' 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 - 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" - --cflags='${CFLAGS}' - --cxxflags='${CXXFLAGS}' - --disable-builtin-afterimage - --disable-builtin-ftgl - --disable-builtin-freetype - --disable-builtin-glew - --disable-builtin-lzma - --disable-builtin-pcre - --disable-builtin-zlib - --disable-cling - --disable-werror - --enable-explicitlink - --enable-shared - --enable-soversion - --fail-on-missing - --nohowto - --with-afs-shared=yes - --with-sys-iconpath="${EPREFIX}/usr/share/pixmaps" - $(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 gdml) - $(use_enable graphviz gviz) - $(use_enable http) - $(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 memstat) - $(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) - $(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 shadow shadowpw) - $(use_enable sqlite) - $(use_enable ssl) - $(use_enable table) - $(use_enable tiff astiff) - $(use_enable xml) - $(use_enable xrootd) - ${EXTRA_ECONF} - ) - - # usex can't be used here, because pg_config may be not - # installed with USE="-postgres" - use postgres && myconf+=( --with-pgsql-incdir=$(pg_config --includedir) ) - - ./configure ${myconf[@]} || die "configure failed" -} - -src_compile() { - emake \ - OPT="${CXXFLAGS}" \ - F77OPT="${FFLAGS}" \ - ROOTSYS="${S}" \ - LD_LIBRARY_PATH="${S}/lib" - use emacs && 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} - - local i - 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 - - 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 - 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 -}