bircoph     15/07/18 13:43:07

  Modified:             root-5.34.28-r1.ebuild ChangeLog
                        root-5.34.26.ebuild
  Added:                root-5.34.32.ebuild
  Log:
  version bump
  
  Signed-off-by: Andrew Savchenko <[email protected]>
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
565953B95372756C)

Revision  Changes    Path
1.5                  sci-physics/root/root-5.34.28-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild?rev=1.5&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild?rev=1.5&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild?r1=1.4&r2=1.5

Index: root-5.34.28-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- root-5.34.28-r1.ebuild      18 Jul 2015 09:40:19 -0000      1.4
+++ root-5.34.28-r1.ebuild      18 Jul 2015 13:43:07 -0000      1.5
@@ -1,6 +1,6 @@
 # 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.4 2015/07/18 09:40:19 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild,v 
1.5 2015/07/18 13:43:07 bircoph Exp $
 
 EAPI=5
 
@@ -19,7 +19,6 @@
 
 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"



1.151                sci-physics/root/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?rev=1.151&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?rev=1.151&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?r1=1.150&r2=1.151

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- ChangeLog   18 Jul 2015 09:40:19 -0000      1.150
+++ ChangeLog   18 Jul 2015 13:43:07 -0000      1.151
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.150 
2015/07/18 09:40:19 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.151 
2015/07/18 13:43:07 bircoph Exp $
+
+*root-5.34.32 (18 Jul 2015)
+
+  18 Jul 2015; Andrew Savchenko <[email protected]> root-5.34.26.ebuild,
+  root-5.34.28-r1.ebuild, +root-5.34.32.ebuild:
+  Version bump. Purge unused DOC_URI.
 
   18 Jul 2015; Andrew Savchenko <[email protected]> root-5.34.26.ebuild,
   root-5.34.28-r1.ebuild:



1.7                  sci-physics/root/root-5.34.26.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.26.ebuild?rev=1.7&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.26.ebuild?rev=1.7&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.26.ebuild?r1=1.6&r2=1.7

Index: root-5.34.26.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.26.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- root-5.34.26.ebuild 18 Jul 2015 09:40:19 -0000      1.6
+++ root-5.34.26.ebuild 18 Jul 2015 13:43:07 -0000      1.7
@@ -1,6 +1,6 @@
 # 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.26.ebuild,v 1.6 
2015/07/18 09:40:19 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.26.ebuild,v 1.7 
2015/07/18 13:43:07 bircoph Exp $
 
 EAPI=5
 
@@ -19,7 +19,6 @@
 
 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"



1.1                  sci-physics/root/root-5.34.32.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.32.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.32.ebuild?rev=1.1&content-type=text/plain

Index: root-5.34.32.ebuild
===================================================================
# 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.32.ebuild,v 1.1 
2015/07/18 13:43:07 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= <sci-physics/pythia-8.2.0:8= )
        python? ( ${PYTHON_DEPS} )
        ruby? (
                dev-lang/ruby:=
                dev-ruby/rubygems:=
        )
        shadow? ( virtual/shadow )
        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? ( ~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
}




Reply via email to