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 DC0F51381F3 for ; Wed, 16 Oct 2013 04:50:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6043E09F1; Wed, 16 Oct 2013 04:49:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 049C1E09F2 for ; Wed, 16 Oct 2013 04:49:53 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C79BF33EFD9 for ; Wed, 16 Oct 2013 04:49:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 77BD2E5467 for ; Wed, 16 Oct 2013 04:49:50 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1381898920.732e2157c56af64b7d5c06ce08e5056aebfd577a.nicolasbock@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-nobyte-compile.patch sci-physics/root/files/root-9999-cling.patch sci-physics/root/root-5.34.10-r1.ebuild sci-physics/root/root-5.34.10-r2.ebuild sci-physics/root/root-5.34.10.ebuild sci-physics/root/root-9999.ebuild X-VCS-Directories: sci-physics/root/files/ sci-physics/root/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: 732e2157c56af64b7d5c06ce08e5056aebfd577a X-VCS-Branch: master Date: Wed, 16 Oct 2013 04:49:50 +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: 51ee3dc8-f051-406e-b87d-56137a2667d6 X-Archives-Hash: d1d9ec015a7e6dc85248cd8968ca6053 commit: 732e2157c56af64b7d5c06ce08e5056aebfd577a Author: Andrew Savchenko gmail com> AuthorDate: Tue Oct 15 14:16:32 2013 +0000 Commit: Nicolas Bock gmail com> CommitDate: Wed Oct 16 04:48:40 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=732e2157 sci-physics/root: cleanup --- sci-physics/root/ChangeLog | 5 + .../root/files/root-5.32.00-nobyte-compile.patch | 137 -------- sci-physics/root/files/root-9999-cling.patch | 13 - sci-physics/root/root-5.34.10-r1.ebuild | 390 --------------------- sci-physics/root/root-5.34.10-r2.ebuild | 2 +- sci-physics/root/root-5.34.10.ebuild | 387 -------------------- sci-physics/root/root-9999.ebuild | 215 +++++++----- 7 files changed, 127 insertions(+), 1022 deletions(-) diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index 9b280ee..0f5a8e8 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2013 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 $ + 15 Oct 2013; Andrew Savchenko -root-5.34.10.ebuild, + -root-5.34.10-r1.ebuild, root-5.34.10-r2.ebuild, root-9999.ebuild, + -files/root-5.32.00-nobyte-compile.patch, -files/root-9999-cling.patch: + Remove old versions and unused patches. WIP on live ebuild. + *root-5.34.10-r2 (07 Oct 2013) 07 Oct 2013; Andrew Savchenko +root-5.34.10-r2.ebuild, diff --git a/sci-physics/root/files/root-5.32.00-nobyte-compile.patch b/sci-physics/root/files/root-5.32.00-nobyte-compile.patch deleted file mode 100644 index 179e579..0000000 --- a/sci-physics/root/files/root-5.32.00-nobyte-compile.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -Naur root.as-needed/Makefile root/Makefile ---- root.as-needed/Makefile 2011-07-10 10:42:49.758191296 +0400 -+++ root/Makefile 2011-07-10 10:43:21.493339703 +0400 -@@ -1167,10 +1167,7 @@ - if test "x$(RFLX_GRFLXPY)" != "x"; then \ - rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \ - fi; \ -- if test "x$(RFLX_GRFLXPYC)" != "x"; then \ -- rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \ -- fi; \ -- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \ -+ if test "x$(RFLX_GRFLXPY)" != "x"; then \ - dir=$(RFLX_GRFLXDD:lib/=); \ - 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-9999-cling.patch b/sci-physics/root/files/root-9999-cling.patch deleted file mode 100644 index 9c240dd..0000000 --- a/sci-physics/root/files/root-9999-cling.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- root/core/utils/Module.mk.orig 2012-07-22 11:18:33.000000000 +0400 -+++ root/core/utils/Module.mk 2012-07-22 11:20:02.633436297 +0400 -@@ -95,6 +95,10 @@ - $(MAKEDIR) - cp $< $@ - -+$(UTILSDIRS)/%_tmp.cxx: $(UTILSDIRS)/%.cxx -+ $(MAKEDIR) -+ cp $< $@ -+ - $(call stripsrc,$(UTILSDIRS)/rootcint_tmp.o): $(call stripsrc,$(UTILSDIRS)/rootcint_tmp.cxx) - - $(call stripsrc,$(UTILSDIRS)/RStl_tmp.o): $(call stripsrc,$(UTILSDIRS)/RStl_tmp.cxx) diff --git a/sci-physics/root/root-5.34.10-r1.ebuild b/sci-physics/root/root-5.34.10-r1.ebuild deleted file mode 100644 index 833cd85..0000000 --- a/sci-physics/root/root-5.34.10-r1.ebuild +++ /dev/null @@ -1,390 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $ - -EAPI=5 - -if [[ ${PV} == "9999" ]] ; then - _GIT=git-2 - 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_{6,7} ) -inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_GIT} versionator - -ROOFIT_DOC_PV=2.91-33 -TMVA_DOC_PV=4.03 -PATCH_PV=5.28.00b -PATCH_PV2=5.32.00 -PATCH_PV3=5.34.05 - -DESCRIPTION="C++ data analysis framework and interpreter from CERN" -HOMEPAGE="http://root.cern.ch/" -SRC_URI="${SRC_URI} - doc? ( - math? ( - ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf - http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) - metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf ) - !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf ) - htmldoc? ( - http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png - http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png - http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )" - -SLOT="0" -LICENSE="LGPL-2.1" -IUSE="+X afs avahi c++0x doc emacs examples fits fftw graphviz htmldoc - kerberos ldap +math +metric mpi mysql odbc +opengl openmp oracle postgres - prefix pythia6 pythia8 python qt4 +reflex ruby sqlite ssl xinetd xml xrootd" - -REQUIRED_USE=" - !X? ( !opengl !qt4 ) - htmldoc? ( doc ) - mpi? ( math !openmp ) - openmp? ( math !mpi ) - python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND=" - app-arch/xz-utils - >=dev-lang/cfortran-4.4-r2 - dev-libs/libpcre - media-fonts/dejavu - media-libs/freetype - media-libs/giflib - media-libs/libpng:0 - media-libs/tiff:0 - sys-libs/zlib - virtual/jpeg - virtual/shadow - X? ( - media-libs/ftgl - media-libs/glew - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - || ( - >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] - >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] - ) - opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) - 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 - ) - afs? ( net-fs/openafs ) - avahi? ( net-dns/avahi ) - emacs? ( virtual/emacs ) - fits? ( sci-libs/cfitsio ) - fftw? ( sci-libs/fftw:3.0 ) - graphviz? ( media-gfx/graphviz ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) ) - mysql? ( virtual/mysql ) - odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql-base ) - pythia6? ( sci-physics/pythia:6 ) - pythia8? ( sci-physics/pythia:8 ) - python? ( ${PYTHON_DEPS} ) - ruby? ( - dev-lang/ruby - dev-ruby/rubygems ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl ) - xml? ( dev-libs/libxml2 ) - xrootd? ( >=net-libs/xrootd-3.2.0 )" - -DEPEND="${CDEPEND} - virtual/pkgconfig" - -RDEPEND="${CDEPEND} - reflex? ( dev-cpp/gccxml ) - xinetd? ( sys-apps/xinetd )" - -PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )" - -S="${WORKDIR}/${PN}" - -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=/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-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 - if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \ - ! version_is_at_least "4.7" "$(gcc-version)"; then - eerror "You are using a g++ without C++0x capabilities" - die "Need an C++0x capable compiler" - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \ - "${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}-dotfont.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 -f || 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 - # libungif is called libgif, - # 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:ungif:gif: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" - - # QTDIR only used for qt3 in gentoo, and configure looks for it. - unset QTDIR - - # Make html docs self-consistent for offline work (based on Fedora spec) - if use htmldoc; then - epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch - # make images local - sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \ - -i etc/html/ROOT.css || die "htmldoc sed failed" - sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \ - -i etc/html/ROOT.css || die "htmldoc sed failed" - sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \ - -i etc/html/header.html || die "htmldoc sed failed" - - cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html || - die "htmldoc preparation failed" - fi -} - -src_configure() { - local myconfflags="" - use postgres && myconfflags+=" --with-pgsql-incdir=$(pg_config --includedir)" - # the configure script is not the standard autotools - # cling is disabled because in requires live llvm and clang - ./configure \ - --prefix="${EPREFIX}"/usr \ - --etcdir="${EPREFIX}"/etc/root \ - --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \ - --testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \ - --with-cc=$(tc-getCC) \ - --with-cxx=$(tc-getCXX) \ - --with-f77=$(tc-getFC) \ - --with-ld=$(tc-getCXX) \ - --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 \ - $(use_enable X x11) \ - $(use_enable X asimage) \ - $(use_enable X xft) \ - $(use_enable afs) \ - $(use_enable avahi bonjour) \ - $(use_enable c++0x c++11) \ - $(use_enable fits fitsio) \ - $(use_enable fftw fftw3) \ - $(use_enable graphviz gviz) \ - $(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) \ - $(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 sqlite) \ - $(use_enable ssl) \ - $(use_enable xml) \ - $(use_enable xrootd) \ - ${myconfflags} \ - ${EXTRA_ECONF} \ - || die "configure failed" -} - -src_compile() { - emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib" - if use emacs; then - elisp-compile build/misc/*.el || die "elisp-compile failed" - fi -} - -doc_install() { - cd "${S}" - if use doc; then - einfo "Installing user's guides" - use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \ - dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf - use math && dodoc \ - "${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \ - "${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf - fi - - if use examples; then - # these should really be taken care of by the root make install - insinto /usr/share/doc/${PF}/examples/tutorials/tmva - doins -r tmva/test - else - rm -r "${ED}"/usr/share/doc/${PF}/examples || die - fi -} - -daemon_install() { - cd "${S}" - 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 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 -} - -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 /usr/$(get_libdir)/root - fi - use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root - doenvd 99root - - # The build system installs Emacs support unconditionally and in the wrong - # directory. Remove it and call elisp-install in case of USE=emacs. - rm -r "${ED}"/usr/share/emacs - if use emacs; then - elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed" - fi - - doc_install - daemon_install - desktop_install - - # Cleanup of files either already distributed or unused on Gentoo - rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die - rm "${ED}"usr/share/root/fonts/LICENSE || die - pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null - rm posix/mktypes dll_stl/setup \ - G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die - rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die - rm "${ED}"/etc/root/proof/*.sample || die - rm -r "${ED}"/etc/root/daemons || die - popd > /dev/null - # these should be in PATH - mv "${ED}"etc/root/proof/utils/pq2/pq2* \ - "${ED}"usr/bin/ || die -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/sci-physics/root/root-5.34.10-r2.ebuild b/sci-physics/root/root-5.34.10-r2.ebuild index fa064f8..8d18cef 100644 --- a/sci-physics/root/root-5.34.10-r2.ebuild +++ b/sci-physics/root/root-5.34.10-r2.ebuild @@ -15,7 +15,7 @@ else fi PYTHON_COMPAT=( python2_{6,7} ) -inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_GIT} versionator +inherit elisp-common eutils fdo-mime fortran-2 ${_GIT} multilib python-single-r1 toolchain-funcs user versionator ROOFIT_DOC_PV=2.91-33 TMVA_DOC_PV=4.03 diff --git a/sci-physics/root/root-5.34.10.ebuild b/sci-physics/root/root-5.34.10.ebuild deleted file mode 100644 index 041300d..0000000 --- a/sci-physics/root/root-5.34.10.ebuild +++ /dev/null @@ -1,387 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $ - -EAPI=5 - -if [[ ${PV} == "9999" ]] ; then - _GIT=git-2 - 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_{6,7} ) -inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_GIT} versionator - -ROOFIT_DOC_PV=2.91-33 -TMVA_DOC_PV=4.03 -PATCH_PV=5.28.00b -PATCH_PV2=5.32.00 -PATCH_PV3=5.34.05 - -DESCRIPTION="C++ data analysis framework and interpreter from CERN" -HOMEPAGE="http://root.cern.ch/" -SRC_URI="${SRC_URI} - doc? ( - math? ( - ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf - http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) - metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf ) - !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf ) - htmldoc? ( - http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png - http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png - http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )" - -SLOT="0" -LICENSE="LGPL-2.1" -IUSE="+X afs avahi -c++0x doc emacs examples fits fftw graphviz htmldoc - kerberos ldap +math +metric mpi mysql odbc +opengl openmp oracle postgres - prefix pythia6 pythia8 python qt4 +reflex ruby sqlite ssl xinetd xml xrootd" - -REQUIRED_USE=" - !X? ( !opengl !qt4 ) - htmldoc? ( doc ) - mpi? ( math !openmp ) - openmp? ( math !mpi ) - python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND=" - app-arch/xz-utils - >=dev-lang/cfortran-4.4-r2 - dev-libs/libpcre - media-fonts/dejavu - media-libs/freetype - media-libs/giflib - media-libs/libpng:0 - media-libs/tiff:0 - sys-libs/zlib - virtual/jpeg - virtual/shadow - X? ( - media-libs/ftgl - media-libs/glew - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - || ( - >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] - >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] - ) - opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) - 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 - ) - afs? ( net-fs/openafs ) - avahi? ( net-dns/avahi ) - emacs? ( virtual/emacs ) - fits? ( sci-libs/cfitsio ) - fftw? ( sci-libs/fftw:3.0 ) - graphviz? ( media-gfx/graphviz ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) ) - mysql? ( virtual/mysql ) - odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql-base ) - pythia6? ( sci-physics/pythia:6 ) - pythia8? ( sci-physics/pythia:8 ) - python? ( ${PYTHON_DEPS} ) - ruby? ( - dev-lang/ruby - dev-ruby/rubygems ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl ) - xml? ( dev-libs/libxml2 ) - xrootd? ( >=net-libs/xrootd-3.2.0 )" - -DEPEND="${CDEPEND} - virtual/pkgconfig" - -RDEPEND="${CDEPEND} - reflex? ( dev-cpp/gccxml ) - xinetd? ( sys-apps/xinetd )" - -PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )" - -S="${WORKDIR}/${PN}" - -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 "AliEn, castor, Chirp, dCache, gfal, gLite, Globus," - 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=/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-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 - if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \ - ! version_is_at_least "4.7" "$(gcc-version)"; then - eerror "You are using a g++ without C++0x capabilities" - die "Need an C++0x capable compiler" - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \ - "${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}-dotfont.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 -f || 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 - # libungif is called libgif, - # 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:ungif:gif: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" - - # QTDIR only used for qt3 in gentoo, and configure looks for it. - unset QTDIR - - # Make html docs self-consistent for offline work (based on Fedora spec) - if use htmldoc; then - epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch - # make images local - sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \ - -i etc/html/ROOT.css || die "htmldoc sed failed" - sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \ - -i etc/html/ROOT.css || die "htmldoc sed failed" - sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \ - -i etc/html/header.html || die "htmldoc sed failed" - - cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html || - die "htmldoc preparation failed" - fi -} - -src_configure() { - local myconfflags="" - use postgres && myconfflags+=" --with-pgsql-incdir=$(pg_config --includedir)" - # the configure script is not the standard autotools - ./configure \ - --prefix="${EPREFIX}"/usr \ - --etcdir="${EPREFIX}"/etc/root \ - --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \ - --testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \ - --with-cc=$(tc-getCC) \ - --with-cxx=$(tc-getCXX) \ - --with-f77=$(tc-getFC) \ - --with-ld=$(tc-getCXX) \ - --with-afs-shared=yes \ - --with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \ - --disable-builtin-afterimage \ - --disable-builtin-freetype \ - --disable-builtin-ftgl \ - --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 \ - $(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 graphviz gviz) \ - $(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) \ - $(use_enable odbc) \ - $(use_enable opengl) \ - $(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 sqlite) \ - $(use_enable ssl) \ - $(use_enable xml) \ - $(use_enable xrootd) \ - ${myconfflags} \ - ${EXTRA_ECONF} \ - || die "configure failed" -} - -src_compile() { - emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib" - if use emacs; then - elisp-compile build/misc/*.el || die "elisp-compile failed" - fi -} - -doc_install() { - cd "${S}" - if use doc; then - einfo "Installing user's guides" - use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \ - dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf - use math && dodoc \ - "${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \ - "${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf - fi - - if use examples; then - # these should really be taken care of by the root make install - insinto /usr/share/doc/${PF}/examples/tutorials/tmva - doins -r tmva/test - else - rm -r "${ED}"/usr/share/doc/${PF}/examples || die - fi -} - -daemon_install() { - cd "${S}" - 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 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 -} - -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 /usr/$(get_libdir)/root - fi - use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root - doenvd 99root - - # The build system installs Emacs support unconditionally and in the wrong - # directory. Remove it and call elisp-install in case of USE=emacs. - rm -r "${ED}"/usr/share/emacs - if use emacs; then - elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed" - fi - - doc_install - daemon_install - desktop_install - - # Cleanup of files either already distributed or unused on Gentoo - rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die - rm "${ED}"usr/share/root/fonts/LICENSE || die - pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null - rm posix/mktypes dll_stl/setup \ - G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die - rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die - rm "${ED}"/etc/root/proof/*.sample || die - rm -r "${ED}"/etc/root/daemons || die - popd > /dev/null - # these should be in PATH - mv "${ED}"etc/root/proof/utils/pq2/pq2* \ - "${ED}"usr/bin/ || die -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index 0543c90..4c6ffdb 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -1,14 +1,12 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $ -EAPI=4 - -PYTHON_DEPEND="python? 2" +EAPI=5 if [[ ${PV} == "9999" ]] ; then - _SVN=subversion - ESVN_REPO_URI="http://root.cern.ch/svn/root/trunk" + _GIT=git-2 + EGIT_REPO_URI="http://root.cern.ch/git/root.git" SRC_URI="" KEYWORDS="" else @@ -16,30 +14,43 @@ else KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" fi -inherit elisp-common eutils fdo-mime fortran-2 multilib python ${_SVN} toolchain-funcs user versionator +PYTHON_COMPAT=( python2_{6,7} ) +inherit elisp-common eutils fdo-mime fortran-2 ${_GIT} multilib python-single-r1 toolchain-funcs user versionator ROOFIT_DOC_PV=2.91-33 TMVA_DOC_PV=4.03 PATCH_PV=5.28.00b PATCH_PV2=5.32.00 +PATCH_PV3=5.34.05 +PATCH_PVLIVE=9999 DESCRIPTION="C++ data analysis framework and interpreter from CERN" HOMEPAGE="http://root.cern.ch/" SRC_URI="${SRC_URI} - doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf + !minimal? ( doc? ( math? ( ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) + metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf ) + !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf ) htmldoc? ( http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png - http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )" + http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) + ) )" SLOT="0" LICENSE="LGPL-2.1" -IUSE="+X afs avahi -c++0x doc emacs examples fits fftw geocad graphviz htmldoc - kerberos ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix - pythia6 pythia8 python qt4 +reflex ruby ssl xinetd xml xrootd" +IUSE="+X afs avahi c++0x doc emacs examples fits fftw geocad graphviz htmldoc + kerberos ldap +math +metric minimal mpi mysql odbc +opengl openmp oracle postgres + prefix pythia6 pythia8 python qt4 ruby sqlite ssl xinetd xml xrootd" + +REQUIRED_USE=" + !X? ( !opengl !qt4 ) + htmldoc? ( doc ) + mpi? ( math !openmp ) + openmp? ( math !mpi ) + python? ( ${PYTHON_REQUIRED_USE} )" CDEPEND=" app-arch/xz-utils @@ -59,66 +70,65 @@ CDEPEND=" x11-libs/libX11 x11-libs/libXext x11-libs/libXpm - || ( - >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] - >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] + !minimal? ( + || ( + >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] + >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] + ) + opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) + 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 ) - opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) - 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 - ) - afs? ( net-fs/openafs ) - avahi? ( net-dns/avahi ) - emacs? ( virtual/emacs ) - fits? ( sci-libs/cfitsio ) - fftw? ( sci-libs/fftw:3.0 ) - geocad? ( sci-libs/opencascade ) - graphviz? ( media-gfx/graphviz ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - llvm? ( >=sys-devel/clang-9999 =sys-devel/llvm-9999 ) - math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) ) - mysql? ( virtual/mysql ) - odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql-base ) - pythia6? ( sci-physics/pythia:6 ) - pythia8? ( sci-physics/pythia:8 ) - ruby? ( - dev-lang/ruby - dev-ruby/rubygems ) - ssl? ( dev-libs/openssl ) - xml? ( dev-libs/libxml2 ) - xrootd? ( >=net-libs/xrootd-3.2.0 )" + ) + !minimal? ( + afs? ( net-fs/openafs ) + avahi? ( net-dns/avahi ) + emacs? ( virtual/emacs ) + fits? ( sci-libs/cfitsio ) + fftw? ( sci-libs/fftw:3.0 ) + geocad? ( sci-libs/opencascade ) + graphviz? ( media-gfx/graphviz ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap ) + math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) ) + mysql? ( virtual/mysql ) + odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) + oracle? ( dev-db/oracle-instantclient-basic ) + postgres? ( dev-db/postgresql-base ) + pythia6? ( sci-physics/pythia:6 ) + pythia8? ( sci-physics/pythia:8 ) + python? ( ${PYTHON_DEPS} ) + ruby? ( + dev-lang/ruby + dev-ruby/rubygems ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( dev-libs/openssl ) + xml? ( dev-libs/libxml2 ) + xrootd? ( >=net-libs/xrootd-3.2.0 ) + )" DEPEND="${CDEPEND} virtual/pkgconfig" RDEPEND="${CDEPEND} - reflex? ( dev-cpp/gccxml ) xinetd? ( sys-apps/xinetd )" PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )" -REQUIRED_USE=" - !X? ( !opengl !qt4 ) - mpi? ( math !openmp ) - openmp? ( math !mpi )" - S="${WORKDIR}/${PN}" pkg_setup() { fortran-2_pkg_setup - python_pkg_setup echo elog "There are extra options on packages not yet in Gentoo:" - elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus," + 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: " @@ -126,7 +136,9 @@ pkg_setup() { echo enewgroup rootd enewuser rootd -1 -1 /var/spool/rootd rootd + use minimal && return + use python && python-single-r1_pkg_setup if use math; then if use openmp; then if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then @@ -149,25 +161,24 @@ pkg_setup() { src_prepare() { epatch \ "${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \ + "${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \ "${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \ "${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}-9999-dotfont.patch \ - "${FILESDIR}"/${PN}-9999-cling.patch + "${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch # make sure we use system libs and headers rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die - rm -rf graf2d/asimage/src/libAfterImage || die - rm -rf graf3d/ftgl/{inc,src} || die - rm -rf graf2d/freetype/src || die - rm -rf graf3d/glew/{inc,src} || die - rm -rf core/pcre/src || die - rm -rf math/unuran/src/unuran-*.tar.gz || 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 -f || die - rm -rf core/lzma/src/*.tar.gz || 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 @@ -191,8 +202,8 @@ src_prepare() { unset QTDIR # Make html docs self-consistent for offline work (based on Fedora spec) - if use htmldoc; then - epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch + if use htmldoc && ! use minimal; then + epatch "${FILESDIR}"/${PN}-${PATCH_PVLIVE}-htmldoc.patch # make images local sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \ -i etc/html/ROOT.css || die "htmldoc sed failed" @@ -208,7 +219,7 @@ src_prepare() { src_configure() { # the configure script is not the standard autotools - ./configure \ + local mycommonconf=" --prefix="${EPREFIX}"/usr \ --etcdir="${EPREFIX}"/etc/root \ --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \ @@ -219,12 +230,22 @@ src_configure() { --with-cxx=$(tc-getCXX) \ --with-f77=$(tc-getFC) \ --with-ld=$(tc-getCXX) \ + --nohowto + " + if use minimal; then + ./configure \ + ${mycommonconf} \ + $(usex X --gminimal --minimal) \ + || die "configure failed" + return + fi + ./configure \ + ${mycommonconf} \ --with-afs-shared=yes \ - --with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \ --with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \ --disable-builtin-afterimage \ - --disable-builtin-freetype \ --disable-builtin-ftgl \ + --disable-builtin-freetype \ --disable-builtin-glew \ --disable-builtin-pcre \ --disable-builtin-zlib \ @@ -243,12 +264,13 @@ src_configure() { $(use_enable X xft) \ $(use_enable afs) \ $(use_enable avahi bonjour) \ + $(use_enable c++0x c++11) \ $(use_enable fits fitsio) \ $(use_enable fftw fftw3) \ + $(use_enable geocad) \ $(use_enable graphviz gviz) \ $(use_enable kerberos krb5) \ $(use_enable ldap) \ - $(use_enable llvm cling) \ $(use_enable math gsl-shared) \ $(use_enable math genvector) \ $(use_enable math mathmore) \ @@ -256,19 +278,21 @@ src_configure() { $(use_enable math roofit) \ $(use_enable math tmva) \ $(use_enable math unuran) \ + $(use_enable math vc) \ $(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 reflex cintex) \ - $(use_enable reflex) \ $(use_enable ruby) \ + $(use_enable sqlite) \ $(use_enable ssl) \ $(use_enable xml) \ $(use_enable xrootd) \ @@ -278,27 +302,28 @@ src_configure() { src_compile() { emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib" - if use emacs; then + if use emacs && ! use minimal; then elisp-compile build/misc/*.el || die "elisp-compile failed" fi } doc_install() { cd "${S}" - if use doc; then + if use doc && ! use minimal; then einfo "Installing user's guides" - dodoc "${DISTDIR}"/ROOTUsersGuide.pdf + use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \ + dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf use math && dodoc \ "${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \ "${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf fi - if use examples; then + if use examples && ! use minimal; then # these should really be taken care of by the root make install insinto /usr/share/doc/${PF}/examples/tutorials/tmva doins -r tmva/test else - rm -rf "${ED}"/usr/share/doc/${PF}/examples || die + rm -r "${ED}"/usr/share/doc/${PF}/examples || die fi } @@ -322,10 +347,9 @@ daemon_install() { desktop_install() { cd "${S}" - sed -e 's,@prefix@,/usr,' \ - build/package/debian/root-system-bin.desktop.in > root.desktop - domenu root.desktop - doicon "${S}"/build/package/debian/root-system-bin.png + 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 @@ -338,15 +362,20 @@ src_install() { emake DESTDIR="${D}" install echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root - use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root - use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root - use ruby && echo "RUBYLIB=${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 /usr/$(get_libdir)/root + fi + use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root + fi doenvd 99root # The build system installs Emacs support unconditionally and in the wrong # directory. Remove it and call elisp-install in case of USE=emacs. - rm -rf "${ED}"/usr/share/emacs - if use emacs; then + rm -r "${ED}"/usr/share/emacs + if use emacs && ! use minimal; then elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed" fi @@ -358,11 +387,11 @@ src_install() { rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die rm "${ED}"usr/share/root/fonts/LICENSE || die pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null - rm -f posix/mktypes dll_stl/setup \ + rm posix/mktypes dll_stl/setup \ G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die - rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die - rm -f "${ED}"/etc/root/proof/*.sample || die - rm -rf "${ED}"/etc/root/daemons || die + rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die + rm "${ED}"/etc/root/proof/*.sample || die + rm -r "${ED}"/etc/root/daemons || die popd > /dev/null # these should be in PATH mv "${ED}"etc/root/proof/utils/pq2/pq2* \ @@ -371,10 +400,8 @@ src_install() { pkg_postinst() { fdo-mime_desktop_database_update - use python && python_mod_optimize /usr/$(get_libdir)/root } pkg_postrm() { fdo-mime_desktop_database_update - use python && python_mod_cleanup /usr/$(get_libdir)/root }