From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RR061-0003w6-P0 for garchives@archives.gentoo.org; Thu, 17 Nov 2011 11:25:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E59D21C093; Thu, 17 Nov 2011 11:25:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 49A9921C093 for ; Thu, 17 Nov 2011 11:25:24 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A94C31B403D for ; Thu, 17 Nov 2011 11:25:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BA8AD80042 for ; Thu, 17 Nov 2011 11:25:22 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/root/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/root/ChangeLog sci-physics/root/metadata.xml sci-physics/root/root-5.28.00g.ebuild sci-physics/root/root-5.30.03-r1.ebuild X-VCS-Directories: sci-physics/root/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: b9fb81e0ef2fe0acd3f02c2fa8898bd3431fbc51 Date: Thu, 17 Nov 2011 11:25:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 7cc477cc-7d0e-4278-89e5-24c31bb82bae X-Archives-Hash: e80e1a0b16df8fd91d9ea821a3ae7405 commit: b9fb81e0ef2fe0acd3f02c2fa8898bd3431fbc51 Author: Justin Lecher gentoo org> AuthorDate: Wed Nov 16 10:26:56 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Nov 16 10:26:56 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Db9fb81e0 Corrected Slotting of media-libs/libpng and media-libs/tiff (Portage version: 2.2.0_alpha74/git/Linux x86_64, signed Manifest commit = with key 70EB7916) --- sci-physics/root/ChangeLog | 4 + sci-physics/root/metadata.xml | 24 +- sci-physics/root/root-5.28.00g.ebuild | 332 -------------------------= ------ sci-physics/root/root-5.30.03-r1.ebuild | 20 +- 4 files changed, 28 insertions(+), 352 deletions(-) diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index e7c7c6d..fd95c42 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 16 Nov 2011; Justin Lecher -root-5.28.00g.ebuild, + root-5.30.03-r1.ebuild, metadata.xml: + Corrected Slotting of media-libs/libpng and media-libs/tiff + *root-5.30.03-r1 (21 Oct 2011) =20 21 Oct 2011; Andrew Savchenko +root-5.30.03-r1.ebu= ild: diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xm= l index ba73668..222eb19 100644 --- a/sci-physics/root/metadata.xml +++ b/sci-physics/root/metadata.xml @@ -1,8 +1,8 @@ -sci-physics - + sci-physics + ROOT Object Oriented Technologies is an object oriented data analysis framework written in C++ by the CERN. Widely used in high energy physics, but also in other data analysis applications. It @@ -10,22 +10,22 @@ statistics, serialization, optimization, linear algebra, graphics, GUI toolkit, and a complete visualization framework. - - + + Buld the Clarens and PEAC plug-ins, to use in a GRID enabled analysis. - Support for images and data from FITS files with <= pkg>sci-libs/cfitsio - Build the new cling interactive interpreter based = on sys-devel/llvm - Build all math related libraries plugins, needs sci-libs/gsl - + Support for images and data from FITS files with <= pkg>sci-libs/cfitsio + Build the new cling interactive interpreter based = on sys-devel/llvm + Build all math related libraries plugins, needs sci-libs/gsl + Builds the interface to Pythia-6 (sci-physics/pythia) high energy physics generation events library - + Builds the interface to Pythia-8 (sci-physics/pythia) high energy physics generation events library - Builds the reflection database for the C++ inter= pretor - Build the xrootd low latency file server - + Builds the reflection database for the C++ inter= pretor + Build the xrootd low latency file server + diff --git a/sci-physics/root/root-5.28.00g.ebuild b/sci-physics/root/roo= t-5.28.00g.ebuild deleted file mode 100644 index 8990411..0000000 --- a/sci-physics/root/root-5.28.00g.ebuild +++ /dev/null @@ -1,332 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00d.ebuild= ,v 1.3 2011/06/21 14:31:50 jlec Exp $ - -EAPI=3D3 -PYTHON_DEPEND=3D"python? 2" -inherit versionator eutils fortran-2 elisp-common fdo-mime python toolch= ain-funcs flag-o-matic - -#DOC_PV=3D$(get_major_version)_$(get_version_component_range 2) -DOC_PV=3D5_26 -ROOFIT_DOC_PV=3D2.91-33 -TMVA_DOC_PV=3D4.03 -PATCH_PV=3D5.28.00b - -DESCRIPTION=3D"C++ data analysis framework and interpreter from CERN" -HOMEPAGE=3D"http://root.cern.ch/" -SRC_URI=3D"ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz - http://dev.gentoo.org/~bicatali/${PN}-${PATCH_PV}-xrootd-prop-flags.pat= ch.bz2 - doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf - 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 ) )" - -SLOT=3D"0" -LICENSE=3D"LGPL-2.1" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"afs avahi clarens doc emacs examples fits fftw graphviz kerberos= ldap - llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres pythia= 6 - pythia8 python +reflex ruby qt4 ssl xft xml xinetd xrootd" - -CDEPEND=3D">=3Ddev-lang/cfortran-4.4-r2 - dev-libs/libpcre - media-libs/ftgl - media-libs/giflib - media-libs/glew - media-libs/libpng - media-libs/tiff - sys-apps/shadow - virtual/jpeg - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXpm - || ( >=3Dmedia-libs/libafterimage-1.20 >=3Dx11-wm/afterstep-2.2.11 ) - afs? ( net-fs/openafs ) - avahi? ( net-dns/avahi ) - clarens? ( dev-libs/xmlrpc-c ) - emacs? ( virtual/emacs ) - fits? ( sci-libs/cfitsio ) - fftw? ( sci-libs/fftw:3.0 ) - graphviz? ( media-gfx/graphviz ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - llvm? ( sys-devel/llvm ) - math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) ) - mysql? ( virtual/mysql ) - ncurses? ( sys-libs/ncurses ) - odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) - opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql-base ) - pythia6? ( sci-physics/pythia:6 ) - pythia8? ( sci-physics/pythia:8 ) - qt4? ( x11-libs/qt-gui:4 - x11-libs/qt-opengl:4 - x11-libs/qt-qt3support:4 - x11-libs/qt-svg:4 - x11-libs/qt-webkit:4 - x11-libs/qt-xmlpatterns:4 ) - ruby? ( dev-lang/ruby - dev-ruby/rubygems ) - ssl? ( dev-libs/openssl ) - xml? ( dev-libs/libxml2 )" - -DEPEND=3D"${CDEPEND} - dev-util/pkgconfig" - -RDEPEND=3D" - virtual/fortran -${CDEPEND} - reflex? ( dev-cpp/gccxml ) - xinetd? ( sys-apps/xinetd )" - -S=3D"${WORKDIR}/${PN}" - -pkg_setup() { - fortran-2_pkg_setup - elog - 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=3D\"--enable-srp --with-srp-libdir=3D/usr/$(get_libdi= r)\"" - elog - enewgroup rootd - enewuser rootd -1 -1 /var/spool/rootd rootd - - if use math; then - if use openmp && [[ $(tc-getCC)$ =3D=3D *gcc* ]] && ! tc-has-openmp; t= hen - ewarn "You are using gcc and OpenMP is available with gcc >=3D 4.2" - ewarn "If you want to build this package with OpenMP, abort now," - ewarn "and set CC to an OpenMP capable compiler" - elif use openmp; then - export USE_OPENMP=3D1 USE_PARALLEL_MINUIT2=3D1 - elif use mpi; then - export USE_MPI=3D1 USE_PARALLEL_MINUIT2=3D1 - fi - fi -} - -src_prepare() { - epatch \ - "${WORKDIR}"/${PN}-${PATCH_PV}-xrootd-prop-flags.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV}-nobyte-compile.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch - - # make sure we use system libs and headers - rm montecarlo/eg/inc/cfortran.h README/cfortran.doc - rm -rf graf2d/asimage/src/libAfterImage - rm -rf graf3d/ftgl/{inc,src} - rm -rf graf2d/freetype/src - rm -rf graf3d/glew/{inc,src} - rm -rf core/pcre/src - rm -rf math/unuran/src/unuran-*.tar.gz - find core/zip -type f -name "[a-z]*" | xargs rm - rm graf3d/gl/{inc,src}/gl2ps.* - sed -i -e 's/^GLLIBS *:=3D .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module= .mk - - # TODO: unbundle xrootd as a new package - #rm -rf net/xrootd/src - #sed -i \ - # -e 's:-lXrdOuc:-lXrd &:' \ - # -e 's:$(XROOTDDIRL)/lib\(Xrd\w*\).a:-l\1:g' \ - # proof/proofd/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:$ODBCINC:$ODBCINC /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 -} - -src_configure() { - # the configure script is not the standard autotools - ./configure \ - --prefix=3D"${EPREFIX}"/usr \ - --etcdir=3D"${EPREFIX}"/etc/root \ - --libdir=3D"${EPREFIX}"/usr/$(get_libdir)/${PN} \ - --docdir=3D"${EPREFIX}"/usr/share/doc/${PF} \ - --tutdir=3D"${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \ - --testdir=3D"${EPREFIX}"/usr/share/doc/${PF}/examples/tests \ - --with-cc=3D$(tc-getCC) \ - --with-cxx=3D$(tc-getCXX) \ - --with-f77=3D$(tc-getFC) \ - --with-sys-iconpath=3D"${EPREFIX}"/usr/share/pixmaps \ - --disable-builtin-afterimage \ - --disable-builtin-freetype \ - --disable-builtin-ftgl \ - --disable-builtin-glew \ - --disable-builtin-pcre \ - --disable-builtin-zlib \ - --disable-rpath \ - --enable-asimage \ - --enable-astiff \ - --enable-exceptions \ - --enable-explicitlink \ - --enable-gdml \ - --enable-memstat \ - --enable-shadowpw \ - --enable-shared \ - --enable-soversion \ - --enable-table \ - --fail-on-missing \ - --with-afs-shared=3Dyes \ - $(use_enable afs) \ - $(use_enable avahi bonjour) \ - $(use_enable clarens) \ - $(use_enable clarens peac) \ - $(use_enable ncurses editline) \ - $(use_enable fits fitsio) \ - $(use_enable fftw fftw3) \ - $(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) \ - $(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 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 ssl) \ - $(use_enable xft) \ - $(use_enable xml) \ - $(use_enable xrootd) \ - ${EXTRA_ECONF} \ - || die "configure failed" -} - -src_compile() { - emake OPT=3D"${CFLAGS}" F77OPT=3D"${FFLAGS}" || die "emake failed" - 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" - dodoc "${DISTDIR}"/Users_Guide_${DOC_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 -rf "${ED}"/usr/share/doc/${PF}/examples - fi -} - -daemon_install() { - cd "${S}" - local daemons=3D"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} - - use xrootd && daemons=3D"${daemons} xrootd olbd" - 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}" - 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 - - 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=3D"${D}" install || die "emake install failed" - - echo "LDPATH=3D${EPREFIX}/usr/$(get_libdir)/root" > 99root - use pythia8 && echo "PYTHIA8=3D${EPREFIX}/usr" >> 99root - use python && echo "PYTHONPATH=3D${EPREFIX}/usr/$(get_libdir)/root" >> = 99root - use ruby && echo "RUBYLIB=3D${EPREFIX}/usr/$(get_libdir)/root" >> 99roo= t - doenvd 99root || die "doenvd failed" - - # The build system installs Emacs support unconditionally and in the wr= ong - # directory. Remove it and call elisp-install in case of USE=3Demacs. - rm -rf "${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} - rm "${ED}"usr/share/root/fonts/LICENSE - pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null - rm -f posix/mktypes dll_stl/setup \ - G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o - rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib - rm -f "${ED}"/etc/root/proof/*.sample - rm -rf "${ED}"/etc/root/daemons - popd > /dev/null - # these should be in PATH - mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \ - "${ED}"usr/bin -} - -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 -} diff --git a/sci-physics/root/root-5.30.03-r1.ebuild b/sci-physics/root/r= oot-5.30.03-r1.ebuild index f2753e3..d237779 100644 --- a/sci-physics/root/root-5.30.03-r1.ebuild +++ b/sci-physics/root/root-5.30.03-r1.ebuild @@ -28,13 +28,14 @@ IUSE=3D"+X afs avahi clarens doc emacs examples fits = fftw graphviz kerberos ldap llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix pythia6 pythia8 python +reflex ruby qt4 ssl xft xml xinetd xrootd" =20 -CDEPEND=3D"app-arch/xz-utils +CDEPEND=3D" + app-arch/xz-utils >=3Ddev-lang/cfortran-4.4-r2 dev-libs/libpcre media-libs/freetype media-libs/giflib - media-libs/libpng - media-libs/tiff + media-libs/libpng:0 + media-libs/tiff:0 sys-apps/shadow sys-libs/zlib virtual/jpeg @@ -46,13 +47,15 @@ CDEPEND=3D"app-arch/xz-utils x11-libs/libXpm || ( >=3Dmedia-libs/libafterimage-1.20 >=3Dx11-wm/afterstep-2.2.11 ) opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) - qt4? ( x11-libs/qt-gui:4 + qt4? ( + x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-qt3support:4 x11-libs/qt-svg:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 ) - xft? ( x11-libs/libXft ) ) + xft? ( x11-libs/libXft ) + ) afs? ( net-fs/openafs ) avahi? ( net-dns/avahi ) clarens? ( dev-libs/xmlrpc-c ) @@ -71,7 +74,8 @@ CDEPEND=3D"app-arch/xz-utils postgres? ( dev-db/postgresql-base ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) - ruby? ( dev-lang/ruby + ruby? ( + dev-lang/ruby dev-ruby/rubygems ) ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 )" @@ -92,14 +96,14 @@ S=3D"${WORKDIR}/${PN}" pkg_setup() { fortran-2_pkg_setup python_pkg_setup - elog + 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=3D\"--enable-srp --with-srp-libdir=3D/usr/$(get_libdi= r)\"" - elog + echo enewgroup rootd enewuser rootd -1 -1 /var/spool/rootd rootd =20