diff options
author | 2015-06-17 02:31:45 +0300 | |
---|---|---|
committer | 2015-06-17 02:31:45 +0300 | |
commit | fe50d2a782f3d44551fcbe34b9f91015916fc097 (patch) | |
tree | ef955ab2a94cf5d4ed0eabc0eb490d70060cdfb3 /sci-physics | |
parent | sci-biology/aghermann: new upstream version (diff) | |
parent | Merge remote-tracking branch 'github/master' (diff) | |
download | sci-fe50d2a782f3d44551fcbe34b9f91015916fc097.tar.gz sci-fe50d2a782f3d44551fcbe34b9f91015916fc097.tar.bz2 sci-fe50d2a782f3d44551fcbe34b9f91015916fc097.zip |
Merge branch 'master' of github.com:gentoo-science/sci
Diffstat (limited to 'sci-physics')
48 files changed, 970 insertions, 2167 deletions
diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog index a2b5e94b6..3b70d8d3d 100644 --- a/sci-physics/abinit/ChangeLog +++ b/sci-physics/abinit/ChangeLog @@ -1,7 +1,15 @@ # ChangeLog for sci-physics/abinit -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*abinit-7.10.4 (22 Apr 2015) + + 22 Apr 2015; Honza Macháček <Hloupy.Honza@centrum.cz> + +abinit-7.10.4.ebuild, +files/7.10.4-libabinit_options.patch, + +files/7.10.4-syntax.patch: + Version bump to sci-physics/abinit-7.10.4, dependency for USE=bigdft changed + in the new version from sci-libs/bigdft-abi to <sci-physics/bigdft-1.7.5 + *abinit-7.6.4-r1 (10 Dec 2014) *abinit-7.4.2-r1 (10 Dec 2014) diff --git a/sci-physics/abinit/Manifest b/sci-physics/abinit/Manifest index 00f95861e..86578760b 100644 --- a/sci-physics/abinit/Manifest +++ b/sci-physics/abinit/Manifest @@ -1,2 +1,3 @@ +DIST abinit-7.10.4.tar.gz 69930222 SHA256 ebd0a3abd01db4374beda092d1f16c9e00d327712b1ed389bb32e1c80f37c6ef SHA512 32e98a721c56731d9f45f24359c3dd967fdf2f9f3d9fd0328e82a037a25abb789a2b483174a1347d965b71799118d6c26911beee9d0ec833324d36116e8e5b4a WHIRLPOOL 6d292940ee5168563d2ad4114141d272cc84956209d35c49ebd9e0508a3080206fd6e096a49cd63bebd0b9ffab85efac9a3e3d6946e949f3cb306eb597dbc310 DIST abinit-7.4.2.tar.gz 69150549 SHA256 26fcc60e18071b7579843f43cbe44e79db50466dbaae8b862ad96a8986733f63 SHA512 55132cfbfb26bf22ae486ada7e721188bd436a48299da3a386928776f6d0652d8a19a5e5b70261b84afc6cb6b058fe711171fa09aff637bdb2da11e8df032543 WHIRLPOOL add34b50d2c6843064254a3caffbfa4d9fef644ae98513a1b7681ffb8f2c0f4d31b5b995920a97fa656d82a38aeec313f98e1f91c06166ea83ed6ba87192292d DIST abinit-7.6.4.tar.gz 71821245 SHA256 1fa532ca156d2fad1bf3af86edfc8b6695917c8cbcf25084c7bf9b1749812ff7 SHA512 b86dcc26d8e38a8d0f1b4a470dc0bc2bd5363f25dbc1bd954e83ffe8694ce23b85ddf3d411c4b3121d833f65c4d55899cf02054b27e060d2465407a6c110602a WHIRLPOOL b1580f3e8c99148632f0cacd566a3e958c0e7a9b14ec7b1bb20c930a5131491401938d29ab41944411ae82676753bdf0f2294a137aaa267226cc2ac3db43c2fd diff --git a/sci-physics/abinit/abinit-7.10.4.ebuild b/sci-physics/abinit/abinit-7.10.4.ebuild new file mode 100644 index 000000000..40d7fadd0 --- /dev/null +++ b/sci-physics/abinit/abinit-7.10.4.ebuild @@ -0,0 +1,390 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_5,2_6,2_7} ) + +inherit autotools-utils eutils flag-o-matic fortran-2 multilib python-single-r1 toolchain-funcs + +DESCRIPTION="Find total energy, charge density and electronic structure using density functional theory" +HOMEPAGE="http://www.abinit.org/" +SRC_URI="http://ftp.abinit.org/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="atompaw bigdft cuda cuda-double -debug +etsf_io +fftw fftw-mpi +fftw-threads +fox gsl +hdf5 levmar -libabinit libxc -lotf mpi +netcdf openmp python scalapack scripts -test +threads wannier" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +#" scalapack? ( !bigdft )" + +RDEPEND="virtual/blas + virtual/lapack + ${PYTHON_DEPS} + dev-python/numpy + atompaw? ( >=sci-physics/atompaw-4.0.0.10[libxc?] ) + bigdft? ( >=sci-physics/bigdft-1.7.0.93[scalapack?] + <sci-physics/bigdft-1.7.5 ) + cuda? ( dev-util/nvidia-cuda-sdk ) + etsf_io? ( >=sci-libs/etsf_io-1.0.4 ) + fftw? ( + sci-libs/fftw:3.0 + fftw-threads? ( + openmp? ( sci-libs/fftw:3.0[openmp] ) + !openmp? ( sci-libs/fftw:3.0[threads] ) + ) + fftw-mpi? ( + sci-libs/fftw:3.0[mpi] + openmp? ( sci-libs/fftw:3.0[openmp] ) + !openmp? ( sci-libs/fftw:3.0[threads] ) + ) + ) + fox? ( >=sci-libs/fox-4.1.2-r2[sax] ) + gsl? ( sci-libs/gsl ) + hdf5? ( sci-libs/hdf5[fortran] ) + levmar? ( sci-libs/levmar ) + libxc? ( >=sci-libs/libxc-2.0.3[fortran] + <sci-libs/libxc-2.2 ) + netcdf? ( + sci-libs/netcdf[hdf5?] + || ( + sci-libs/netcdf[fortran] + sci-libs/netcdf-fortran + ) + ) + mpi? ( virtual/mpi ) + scalapack? ( virtual/scalapack ) + scripts? ( dev-python/PyQt4 ) + wannier? ( >=sci-libs/wannier90-1.2-r1 )" +DEPEND="${RDEPEND} + virtual/pkgconfig + dev-perl/Text-Markdown" + +S=${WORKDIR}/${P%[a-z]} + +DOCS=( AUTHORS ChangeLog COPYING INSTALL KNOWN_PROBLEMS NEWS PACKAGING + README README.ChangeLog README.GPU README.xlf RELNOTES THANKS ) + +FORTRAN_STANDARD=90 + +pkg_setup() { + # Doesn't compile with gcc-4.0, only >=4.1 + if [[ $(tc-getFC) == *gfortran ]]; then + if [[ $(gcc-major-version) -eq 4 ]] \ + && [[ $(gcc-minor-version) -lt 1 ]]; then + die "Requires gcc-4.1 or newer" + fi + fi + + # fortran-2.eclass does not handle mpi wrappers + if use mpi; then + export FC="mpif90" + export F77="mpif77" + export CC="mpicc" + export CXX="mpic++" + else + tc-export FC F77 CC CXX + fi + + # Preprocesor macross can make some lines really long + append-fflags -ffree-line-length-none + + # This should be correct: + # It is gcc-centric because toolchain-funcs.eclass is gcc-centric. + # Should a bug be filed against toolchain-funcs.eclass? + # if use openmp; then + # tc-has-openmp || \ + # die "Please select an openmp capable compiler like gcc[openmp]" + # fi + # + # This is completely wrong: + # If other compilers than Gnu Compiler Collection can be used by portage, + # their support of OpenMP should be properly tested. This code limits the test + # to gcc, and blindly supposes that other compilers do support OpenMP. + # if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then + # die "Please select an openmp capable compiler like gcc[openmp]" + # fi + # + # Luckily Abinit is a fortran package. + # fortran-2.eclass has its own test for OpenMP support, + # more general than toolchain-funcs.eclass + # The test itself proceeds inside fortran-2_pkg_setup + if use openmp; then FORTRAN_NEED_OPENMP=1; fi + + fortran-2_pkg_setup + + if use openmp; then + # based on _fortran-has-openmp() of fortran-2.eclass + local code=ebuild-openmp-flags + local ret + local openmp + + pushd "${T}" + cat <<- EOF > "${code}.c" + # include <omp.h> + main () { + int nthreads; + nthreads=omp_get_num_threads(); + } + EOF + + for openmp in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp; do + ${CC} ${openmp} "${code}.c" -o "${code}.o" &>> "${T}"/_c_compile_test.log + ret=$? + (( ${ret} )) || break + done + + rm -f "${code}.*" + popd + + if (( ${ret} )); then + die "Please switch to an openmp compatible C compiler" + else + export CC="${CC} ${openmp}" + export CXX="${CXX} ${openmp}" + fi + + pushd "${T}" + cat <<- EOF > "${code}.f" + 1 call omp_get_num_threads + 2 end + EOF + + for openmp in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp; do + ${FC} ${openmp} "${code}.f" -o "${code}.o" &>> "${T}"/_f_compile_test.log + ret=$? + (( ${ret} )) || break + done + + rm -f "${code}.*" + popd + + if (( ${ret} )); then + die "Please switch to an openmp compatible fortran compiler." + else + export FC="${FC} ${openmp}" + export F77="${F77} ${openmp}" + fi + fi + + # Sort out some USE options + if use fftw-threads && ! use fftw; then + ewarn "fftw-threads set but fftw not used, ignored." + fi + if use fftw-mpi; then + if ! use fftw; then + ewarn "fftw-mpi set but fftw not used, ignored." + elif ! use mpi; then + ewarn "fftw-mpi set but mpi not used, ignored." + elif ! use fftw-threads; then + ewarn "fftw-mpi set but fftw-threads not. Will use a threaded fftw nevertheless, required with MPI." + fi + fi + if use cuda-double && ! use cuda; then + ewarn "cuda-double set but cuda not used, ignored" + fi + + python-single-r1_pkg_setup + +} + +src_prepare() { + epatch \ + "${FILESDIR}"/6.2.2-change-default-directories.patch \ + "${FILESDIR}"/6.12.1-autoconf.patch \ + "${FILESDIR}"/6.12.1-xmalloc.patch \ + "${FILESDIR}"/7.10.4-libabinit_options.patch \ + "${FILESDIR}"/7.4.2-levmar_diag_scaling.patch \ + "${FILESDIR}"/7.4.2-cuda_link_stdc++.patch \ + "${FILESDIR}"/7.6.4-cuda_header.patch \ + "${FILESDIR}"/7.10.4-syntax.patch + eautoreconf + sed -e"s/\(grep '\^-\)\(\[LloW\]\)'/\1\\\(\2\\\|pthread\\\)'/g" -i configure || ewarn "sed on configure failed" + python_fix_shebang "${S}" +} + +src_configure() { + local modules="$(FoX-config --sax --fcflags)" + local FoX_libs="$(FoX-config --sax --libs)" + + local trio_flavor="" + use etsf_io && trio_flavor="${trio_flavor}+etsf_io" + use fox && trio_flavor="${trio_flavor}+fox" + use netcdf && trio_flavor="${trio_flavor}+netcdf" + test "no${trio_flavor}" = "no" && trio_flavor="none" + + local netcdff_libs="-lnetcdff" + use hdf5 && netcdff_libs="${netcdff_libs} -lhdf5_fortran" + +# local linalg_flavor="atlas" + local linalg_flavor="custom" + local mylapack="lapack" + use scalapack && mylapack="scalapack" && linalg_flavor="${linalg_flavor}+scalapack" + + local dft_flavor="" + use atompaw && dft_flavor="${dft_flavor}+atompaw" + use bigdft && dft_flavor="${dft_flavor}+bigdft" + use libxc && dft_flavor="${dft_flavor}+libxc" + use wannier && dft_flavor="${dft_flavor}+wannier90" + test "no${dft_flavor}" = "no" && dft_flavor="none" + + local fft_flavor="fftw3" + local fft_libs="" + # The fftw threads support is protected by black magick. + # Anybody removes it, dies. + # New USE flag "fftw-threads" was added to control usage + # of the threaded fftw variant. Since fftw-3.3 has expanded + # the paralel options by MPI and OpenMP support, analogical + # USE flags should be added to select them in future; + # unusable with previous FFTW versions, they are postponed + # for now. + if use mpi && use fftw-mpi; then + fft_flavor="fftw3-mpi" + fft_libs+="$($(tc-getPKG_CONFIG) --libs fftw3_mpi)" + fft_libs+="$($(tc-getPKG_CONFIG) --libs fftw3f_mpi)" + if use openmp; then + fft_libs+="$($(tc-getPKG_CONFIG) --libs fftw3_omp)" + fft_libs+="$($(tc-getPKG_CONFIG) --libs fftw3f_omp)" + else + fft_libs+="$($(tc-getPKG_CONFIG) --libs fftw3_threads)" + fft_libs+="$($(tc-getPKG_CONFIG) --libs fftw3f_threads)" + fi + elif use fftw-threads; then + fft_flavor="fftw3-threads" + if use openmp; then + fft_libs+="$($(tc-getPKG_CONFIG) --libs fftw3_omp)" + fft_libs+="$($(tc-getPKG_CONFIG) --libs fftw3f_omp)" + else + fft_libs+="$($(tc-getPKG_CONFIG) --libs fftw3_threads)" + fft_libs+="$($(tc-getPKG_CONFIG) --libs fftw3f_threads)" + fi + else + fft_libs+="$($(tc-getPKG_CONFIG) --libs fftw3)" + fft_libs+="$($(tc-getPKG_CONFIG) --libs fftw3f)" + fi + + local gpu_flavor="none" + if use cuda; then + gpu_flavor="cuda-single" + if use cuda-double; then + gpu_flavor="cuda-double" + fi + fi + + local myeconfargs=( + --enable-clib + --enable-exports + $(use_enable debug debug enhanced) + $(use_enable mpi) + $(use_enable mpi mpi-io) + $(use_enable openmp) + $(use_enable lotf) + $(use_enable cuda gpu) + "$(use cuda && echo "--with-gpu-flavor=${gpu_flavor}")" + "$(use cuda && echo "--with-gpu-prefix=/opt/cuda/")" + "$(use gsl && echo "--with-math-flavor=gsl")" + "$(use gsl && echo "--with-math-incs=$($(tc-getPKG_CONFIG) --cflags gsl)")" + "$(use gsl && echo "--with-math-libs=$($(tc-getPKG_CONFIG) --libs gsl)")" + "$(use levmar && echo "--with-algo-flavor=levmar")" + "$(use levmar && echo "--with-algo-libs=-llevmar")" + --with-linalg-flavor="${linalg_flavor}" + --with-linalg-libs="$($(tc-getPKG_CONFIG) --libs "${mylapack}")" + --with-trio-flavor="${trio_flavor}" + "$(use netcdf && echo "--with-netcdf-incs=-I/usr/include")" + "$(use netcdf && echo "--with-netcdf-libs=$($(tc-getPKG_CONFIG) --libs netcdf) ${netcdff_libs}")" + "$(use fox && echo "--with-fox-incs=${modules}")" + "$(use fox && echo "--with-fox-libs=${FoX_libs}")" + "$(use etsf_io && echo "--with-etsf-io-incs=${modules}")" + "$(use etsf_io && echo "--with-etsf-io-libs=-letsf_io -letsf_io_utils -letsf_io_low_level")" + --with-dft-flavor="${dft_flavor}" + "$(use atompaw && echo "--with-atompaw-incs=${modules}")" + "$(use atompaw && echo "--with-atompaw-libs=-latompaw")" + "$(use bigdft && echo "--with-bigdft-incs=${modules}")" + "$(use bigdft && echo "--with-bigdft-libs=$($(tc-getPKG_CONFIG) --libs bigdft)")" + "$(use libxc && echo "--with-libxc-incs=${modules}")" + "$(use libxc && echo "--with-libxc-libs=$($(tc-getPKG_CONFIG) --libs libxc)")" + "$(use wannier && echo "--with-wannier90-bins=/usr/bin")" + "$(use wannier && echo "--with-wannier90-incs=${modules}")" + "$(use wannier && echo "--with-wannier90-libs=-lwannier $($(tc-getPKG_CONFIG) --libs blas lapack)")" + "$(use fftw && echo "--with-fft-flavor=${fft_flavor}")" + "$(use fftw && echo "--with-fft-incs=-I/usr/include")" + "$(use fftw && echo "--with-fft-libs=${fft_libs}")" + --with-timer-flavor="abinit" + LD="$(tc-getLD)" + FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} ${modules} -I/usr/include" + ) + + MARKDOWN=Markdown.pl autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile + + # Apparently libabinit.a is not built by default + # Used by BigDFT. Should probably be built separately, + # as a package of its own: BigDFT used by Abinit. + # Does libabinit.a depend on BigDFT, if used? + # Can Abinit use external libabinit.a? + use libabinit && autotools-utils_src_compile libabinit.a + + sed -i -e's/libatlas/lapack/' "${AUTOTOOLS_BUILD_DIR}"/config.pc || ewarn "sed on config.pc failed" +} + +src_test() { + einfo "The complete tests take quite a while, easily several hours or even days." + # autotools-utils_src_test expanded and modified + _check_build_dir + pushd "${BUILD_DIR}" > /dev/null || die + + einfo "Running the internal tests." + emake tests_in || ewarn 'The internal tests failed.' + + einfo "Running the thorough tests. Be patient, please." + "${S}"/tests/runtests.py || ewarn "The package has not passed the thorough tests." + + popd > /dev/null || die +} + +src_install() { + #autotools-utils_src_install() expanded + _check_build_dir + pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null + emake DESTDIR="${D}" install || die "make install failed" + + use libabinit && dolib libabinit.a + + if use test; then + for dc in results.tar.gz results.txt suite_report.html; do + test -e Test_suite/"${dc}" && dodoc Test_suite/"${dc}" || ewarn "Copying tests results ${dc} failed" + done + fi + + popd > /dev/null + + # XXX: support installing them from builddir as well!!! + if [[ ${DOCS} ]]; then + dodoc "${DOCS[@]}" || die "dodoc failed" + else + local f + # same list as in PMS + for f in README* ChangeLog AUTHORS NEWS TODO CHANGES \ + THANKS BUGS FAQ CREDITS CHANGELOG; do + if [[ -s ${f} ]]; then + dodoc "${f}" || ewarn "(default) dodoc ${f} failed" + fi + done + fi + if [[ ${HTML_DOCS} ]]; then + dohtml -r "${HTML_DOCS[@]}" || ewarn "dohtml failed" + fi + + if use scripts; then + insinto /usr/share/"${P}" + doins -r scripts + fi + + # Remove libtool files and unnecessary static libs + prune_libtool_files +} diff --git a/sci-physics/abinit/abinit-7.6.4-r1.ebuild b/sci-physics/abinit/abinit-7.6.4-r1.ebuild index 50a03fa89..f2309441c 100644 --- a/sci-physics/abinit/abinit-7.6.4-r1.ebuild +++ b/sci-physics/abinit/abinit-7.6.4-r1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_5,2_6,2_7} ) +PYTHON_COMPAT=( python2_7 ) inherit autotools-utils eutils flag-o-matic fortran-2 multilib python-single-r1 toolchain-funcs diff --git a/sci-physics/abinit/files/7.10.4-libabinit_options.patch b/sci-physics/abinit/files/7.10.4-libabinit_options.patch new file mode 100644 index 000000000..09c61419a --- /dev/null +++ b/sci-physics/abinit/files/7.10.4-libabinit_options.patch @@ -0,0 +1,82 @@ +diff -Naurp abinit-7.10.4.orig/Makefile.am abinit-7.10.4/Makefile.am +--- abinit-7.10.4.orig/Makefile.am 2015-03-12 06:28:38.000000000 +0100 ++++ abinit-7.10.4/Makefile.am 2015-04-07 12:14:39.816276230 +0200 +@@ -2878,7 +2878,9 @@ libabinit.a: + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/11_qespresso_ext/lib11_qespresso_ext.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/12_hide_mpi/lib12_hide_mpi.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/14_hidewrite/lib14_hidewrite.a ++if DO_BUILD_15_GPU_TOOLBOX + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/15_gpu_toolbox/lib15_gpu_toolbox.a ++endif + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/16_hideleave/lib16_hideleave.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/18_timing/lib18_timing.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/21_psiesta_noabirule/lib21_psiesta_noabirule.a +@@ -2898,7 +2900,9 @@ libabinit.a: + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/49_gw_toolbox_oop/lib49_gw_toolbox_oop.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/51_manage_mpi/lib51_manage_mpi.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/52_fft_mpi_noabirule/lib52_fft_mpi_noabirule.a ++if DO_BUILD_52_MANAGE_CUDA + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/52_manage_cuda/lib52_manage_cuda.a ++endif + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/53_ffts/lib53_ffts.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/53_spacepar/lib53_spacepar.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/54_abiutil/lib54_abiutil.a +@@ -2917,15 +2921,19 @@ libabinit.a: + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/62_wvl_wfs/lib62_wvl_wfs.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/63_bader/lib63_bader.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/64_atompaw/lib64_atompaw.a ++if DO_BUILD_65_LOTF_BASE + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/65_lotf_base/lib65_lotf_base.a ++endif + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/65_nonlocal/lib65_nonlocal.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/65_psp/lib65_psp.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/66_fock/lib66_fock.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/66_paw/lib66_paw.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/66_wfs/lib66_wfs.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/67_common/lib67_common.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/68_dmft/lib68_dmft.a ++if DO_BUILD_68_LOTF + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/68_lotf/lib68_lotf.a ++endif + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/68_recursion/lib68_recursion.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/68_rsprc/lib68_rsprc.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/69_wfdesc/lib69_wfdesc.a +diff -Naurp abinit-7.10.4.orig/Makefile.in abinit-7.10.4/Makefile.in +--- abinit-7.10.4.orig/Makefile.in 2015-03-12 06:28:51.000000000 +0100 ++++ abinit-7.10.4/Makefile.in 2015-04-07 12:14:39.816276230 +0200 +@@ -3803,7 +3803,7 @@ libabinit.a: + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/11_qespresso_ext/lib11_qespresso_ext.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/12_hide_mpi/lib12_hide_mpi.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/14_hidewrite/lib14_hidewrite.a +- cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/15_gpu_toolbox/lib15_gpu_toolbox.a ++@DO_BUILD_15_GPU_TOOLBOX_TRUE@ cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/15_gpu_toolbox/lib15_gpu_toolbox.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/16_hideleave/lib16_hideleave.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/18_timing/lib18_timing.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/21_psiesta_noabirule/lib21_psiesta_noabirule.a +@@ -3823,7 +3823,7 @@ libabinit.a: + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/49_gw_toolbox_oop/lib49_gw_toolbox_oop.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/51_manage_mpi/lib51_manage_mpi.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/52_fft_mpi_noabirule/lib52_fft_mpi_noabirule.a +- cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/52_manage_cuda/lib52_manage_cuda.a ++@DO_BUILD_52_MANAGE_CUDA_TRUE@ cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/52_manage_cuda/lib52_manage_cuda.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/53_ffts/lib53_ffts.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/53_spacepar/lib53_spacepar.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/54_abiutil/lib54_abiutil.a +@@ -3842,15 +3842,15 @@ libabinit.a: + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/62_wvl_wfs/lib62_wvl_wfs.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/63_bader/lib63_bader.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/64_atompaw/lib64_atompaw.a +- cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/65_lotf_base/lib65_lotf_base.a ++@DO_BUILD_65_LOTF_BASE_TRUE@ cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/65_lotf_base/lib65_lotf_base.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/65_nonlocal/lib65_nonlocal.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/65_psp/lib65_psp.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/66_fock/lib66_fock.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/66_paw/lib66_paw.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/66_wfs/lib66_wfs.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/67_common/lib67_common.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/68_dmft/lib68_dmft.a +- cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/68_lotf/lib68_lotf.a ++@DO_BUILD_68_LOTF_TRUE@ cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/68_lotf/lib68_lotf.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/68_recursion/lib68_recursion.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/68_rsprc/lib68_rsprc.a + cd $(libabinit_tmpdir) && $(AR) xv $(abs_top_builddir)/src/69_wfdesc/lib69_wfdesc.a diff --git a/sci-physics/abinit/files/7.10.4-syntax.patch b/sci-physics/abinit/files/7.10.4-syntax.patch new file mode 100644 index 000000000..bfb915e71 --- /dev/null +++ b/sci-physics/abinit/files/7.10.4-syntax.patch @@ -0,0 +1,12 @@ +diff -Naurp abinit-7.10.4.orig/src/98_main/mrgscr.F90 abinit-7.10.4/src/98_main/mrgscr.F90 +--- abinit-7.10.4.orig/src/98_main/mrgscr.F90 2015-03-12 06:24:36.000000000 +0100 ++++ abinit-7.10.4/src/98_main/mrgscr.F90 2015-04-07 13:00:01.166355853 +0200 +@@ -2312,7 +2312,7 @@ program mrgscr + + !!OMP *** OPENMP SECTION *** Added by MS + !$OMP PARALLEL SHARED(Hscr_file,epsm1,nfreqre,epsm1_pole, & +-!$OMP is_scr,npoles,std_out,iqibz,one) & ++!$OMP is_scr,npoles,std_out,iqibz) & + !$OMP PRIVATE(ig1,ig2,refval,imfval,phase) + !!OMP write(std_out,'(a,i0)') ' Entering openmp loop. Number of threads: ',omp_get_num_threads() + ABI_MALLOC(refval,(Hscr_file(1)%nomega)) diff --git a/sci-physics/bigdft/ChangeLog b/sci-physics/bigdft/ChangeLog index 8e43d46c9..700368c77 100644 --- a/sci-physics/bigdft/ChangeLog +++ b/sci-physics/bigdft/ChangeLog @@ -1,7 +1,20 @@ # ChangeLog for sci-physics/bigdft -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 08 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml: + sci-physics/bigdft: Updating remote-id in metadata.xml + +*bigdft-1.7.6 (22 Apr 2015) +*bigdft-1.7.1 (22 Apr 2015) + + 22 Apr 2015; Honza Macháček <Hloupy.Honza@centrum.cz> +bigdft-1.7.1.ebuild, + -bigdft-1.7.5.ebuild, +bigdft-1.7.6.ebuild, + +files/bigdft-1.7.1-longline.patch, +files/bigdft-1.7.1-pkgconfig.patch, + -files/bigdft-1.7.5-pkgconfig.patch: + Version bump to sci-physics/bigdft-1.7.6, added sci-physics/bigdft-1.7.1 for + the use by sci-physics/abinit-7.10.4 + 16 Sep 2014; Christoph Junghans <ottxor@gentoo.org> bigdft-1.7.5.ebuild: remove blank line diff --git a/sci-physics/bigdft/Manifest b/sci-physics/bigdft/Manifest index 09a312969..776934470 100644 --- a/sci-physics/bigdft/Manifest +++ b/sci-physics/bigdft/Manifest @@ -1 +1,2 @@ -DIST bigdft-1.7.5.tar.xz 10182428 SHA256 7a96ff161ae9c2da576042fe05b7daf2f376c784d0b7420ba8a1bb013df307d5 SHA512 e187b0f6898d5ca08121168496b7993c59abb5f2bceb5873ccc40539f3cca99ec6bb62ce971ad8aa3f9900a02c6ee2299427cf2cdd325c40de7227d2030e5528 WHIRLPOOL 72512db4bc5efa87f0519f6cc0b0703857c1bba0dc8c60db2e9556569ce56bd78d74e08b5a85805a342e8ae05521eec77528e516f4630e479a49501b2527d520 +DIST bigdft-1.7.1.tar.bz2 12028799 SHA256 3f565f66b423a03d048ac2468f941c7fb1ef1fd6c61315fa05ff5b94bb2338c5 SHA512 e26abe7743106764ea6779e29d85da8a7d9272fa3ebd10f668d74c6ef196ff52283e38669fc815ce9409f1ff245ba74d56b2d300a309f5a69baf445317aafd2e WHIRLPOOL 513c1af5b88752b3550a6c52fa22ae044ef4f21b4f65e7443ef23a680e275f5497cb1dc39c58d4a7544b6fe16a2ace38a68cae80115d8d8226a11b8ee2e08baa +DIST bigdft-1.7.6.tar.xz 10399604 SHA256 cdb443380540eb3238c5393413f031dfa3a649c18edf5212433a06e19b03929c SHA512 cdadda8e9105355e48a9f301ac5d8178955fff90593935143db5219de867f1461bfb7c934a9fe0dcbb7af7c77bb0aedfc5f1d078d1eeeeca76c3e868ee8d3919 WHIRLPOOL 779c5fe8beab1dc268de615e50fe7373db56a229ed1838bc42db8e9dff26698da93be69c64dd15f54e6292f762597050d89b13588db5ff2864c7ccaeec9b629b diff --git a/sci-physics/bigdft/bigdft-1.7.5.ebuild b/sci-physics/bigdft/bigdft-1.7.1.ebuild index 48ae402b2..1871396f2 100644 --- a/sci-physics/bigdft/bigdft-1.7.5.ebuild +++ b/sci-physics/bigdft/bigdft-1.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -10,7 +10,7 @@ inherit autotools-utils eutils flag-o-matic fortran-2 python-any-r1 toolchain-fu DESCRIPTION="A DFT electronic structure code using a wavelet basis set" HOMEPAGE="http://bigdft.org/" -SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.xz" +SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" @@ -18,7 +18,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux" IUSE="cuda doc etsf_io glib mpi netcdf openmp opencl scalapack test" RDEPEND=" - >=sci-libs/libxc-1.2.0-r1[fortran] + ( >=sci-libs/libxc-1.2.0-r1[fortran] + <sci-libs/libxc-2.2 ) virtual/blas virtual/fortran virtual/lapack @@ -27,7 +28,7 @@ RDEPEND=" cuda? ( dev-util/nvidia-cuda-sdk ) opencl? ( virtual/opencl ) glib? ( >=dev-libs/glib-2.22 ) - etsf_io? ( >=sci-libs/etsf_io-1.0.3-r2 ) + etsf_io? ( >=sci-libs/etsf_io-1.0.4[pic] ) netcdf? ( || ( sci-libs/netcdf[fortran] sci-libs/netcdf-fortran @@ -91,7 +92,7 @@ pkg_setup() { src_prepare() { epatch \ "${FILESDIR}"/"${P}"-pkgconfig.patch \ - "${FILESDIR}"/"${P}"-dynamic_memory.patch + "${FILESDIR}"/"${P}"-longline.patch eautoreconf } @@ -168,11 +169,4 @@ src_test() { src_install() { autotools-utils_src_install - if use test; then - _check_build_dir - pushd "${BUILD_DIR}" > /dev/null || die - insinto /usr/share/"${P}" - doins -r tests - popd > /dev/null - fi } diff --git a/sci-physics/bigdft/bigdft-1.7.6.ebuild b/sci-physics/bigdft/bigdft-1.7.6.ebuild new file mode 100644 index 000000000..85e9187df --- /dev/null +++ b/sci-physics/bigdft/bigdft-1.7.6.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +PYTHON_COMPAT=( python2_5 python2_6 python2_7 ) + +inherit autotools-utils eutils flag-o-matic fortran-2 python-any-r1 toolchain-funcs + +DESCRIPTION="A DFT electronic structure code using a wavelet basis set" +HOMEPAGE="http://bigdft.org/" +SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux" +IUSE="cuda doc etsf_io glib mpi netcdf openmp opencl scalapack test" + +RDEPEND=" + ( >=sci-libs/libxc-2.0[fortran] + <sci-libs/libxc-2.2 ) + virtual/blas + virtual/fortran + virtual/lapack + dev-libs/libyaml + mpi? ( virtual/mpi ) + cuda? ( dev-util/nvidia-cuda-sdk ) + opencl? ( virtual/opencl ) + glib? ( >=dev-libs/glib-2.22 ) + etsf_io? ( >=sci-libs/etsf_io-1.0.4[pic] ) + netcdf? ( || ( + sci-libs/netcdf[fortran] + sci-libs/netcdf-fortran + ) + ) + scalapack? ( virtual/scalapack )" +DEPEND="${RDEPEND} + virtual/pkgconfig + >=sys-devel/autoconf-2.59 + doc? ( virtual/latex-base ) + ${PYTHON_DEPS} + dev-python/pyyaml[libyaml] + dev-util/gdbus-codegen + app-arch/tar + app-arch/gzip" + +DOCS=( README INSTALL ChangeLog AUTHORS NEWS ) + +FORTRAN_STANDARD=90 + +pkg_setup() { + # fortran-2.eclass does not handle mpi wrappers + if use mpi; then + export FC="mpif90" + export F77="mpif77" + export CC="mpicc" + export CXX="mpic++" + else + tc-export FC F77 CC CXX + fi + + use openmp && FORTRAN_NEED_OPENMP=1 + + fortran-2_pkg_setup + + if use openmp; then + # based on _fortran-has-openmp() of fortran-2.eclass + local openmp="" + local fcode=ebuild-openmp-flags.f + local _fc=$(tc-getFC) + + pushd "${T}" + cat <<- EOF > "${fcode}" + 1 call omp_get_num_threads + 2 end + EOF + + for openmp in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp; do + "${_fc}" "${openmp}" "${fcode}" -o "${fcode}.x" && break + done + + rm -f "${fcode}.*" + popd + + append-flags "${openmp}" + fi + + python-any-r1_pkg_setup +} + +src_prepare() { + epatch \ + "${FILESDIR}"/"${PN}"-1.7.1-pkgconfig.patch \ + "${FILESDIR}"/"${PN}"-1.7.5-dynamic_memory.patch + + eautoreconf +} + +src_configure() { + local modules="${EPREFIX}/usr/include" + local netcdff_libs="-lnetcdff" + filter-flags '-m*' '-O*' "-pipe" + local nvcflags="${CFLAGS}" + _filter-var nvcflags '-m*' '-O*' "-pipe" "-W*" + use cuda && filter-ldflags '-m*' '-O*' "-pipe" "-W*" + local mylapack="lapack" + use scalapack && mylapack="scalapack" + local myeconfargs=( + $(use_enable mpi) + --enable-optimised-convolution + --enable-pseudo + --enable-libbigdft + --enable-binaries + --disable-bindings + --disable-minima-hopping + --disable-internal-libyaml + --enable-internal-libabinit + --with-moduledir="${modules}" + --with-ext-linalg="$($(tc-getPKG_CONFIG) --libs-only-l "${mylapack}")" + --with-ext-linalg-path="$($(tc-getPKG_CONFIG) --libs-only-L "${mylapack}")" + --with-libxc="yes" + --disable-internal-libxc + $(use_enable cuda cuda-gpu) + $(use_with cuda cuda-path /opt/cuda) + $(use_with cuda nvcc-flags "${nvcflags}") + $(use_enable opencl) + $(use_with etsf_io etsf-io) + "$(use etsf_io && echo "--with-netcdf-libs=$($(tc-getPKG_CONFIG) --libs netcdf) ${netcdff_libs}")" + $(use_with glib gobject) + $(use_with scalapack) + $(use_with scalapack scalapack-path "${EPREFIX}/usr/$(get_libdir)") + $(use_with scalapack blacs) + $(use_with scalapack blacs-path "${EPREFIX}/usr/$(get_libdir)") + PKG_CONFIG="$(tc-getPKG_CONFIG)" + FCFLAGS="${FCFLAGS} -I${modules}" + LD="$(tc-getLD)" + CPP="$(tc-getCPP)" + ) + autotools-utils_src_configure +} + +src_compile() { + #autotools-utils_src_compile() expanded + _check_build_dir + pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null + emake -j1 + sed -i -e's%\$(top_builddir)/[^ ]*/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc + popd > /dev/null + + #autotools-utils_src_compile + if use doc; then + VARTEXFONTS="${T}/fonts" + autotools-utils_src_compile doc + fi +} + +src_test() { + if use test; then + #autotools-utils_src_test() expanded + _check_build_dir + pushd "${BUILD_DIR}" > /dev/null || die + # Run default src_test as defined in ebuild.sh + cd tests + emake -j1 check + popd > /dev/null + fi +} + +src_install() { + autotools-utils_src_install +} diff --git a/sci-physics/bigdft/files/bigdft-1.7.1-longline.patch b/sci-physics/bigdft/files/bigdft-1.7.1-longline.patch new file mode 100644 index 000000000..29dadb545 --- /dev/null +++ b/sci-physics/bigdft/files/bigdft-1.7.1-longline.patch @@ -0,0 +1,14 @@ +diff -Naurp bigdft-1.7.1.orig/libABINIT/src/16_hideleave/m_errors.F90 bigdft-1.7.1/libABINIT/src/16_hideleave/m_errors.F90 +--- bigdft-1.7.1.orig/libABINIT/src/16_hideleave/m_errors.F90 2013-12-11 09:31:00.000000000 +0000 ++++ bigdft-1.7.1/libABINIT/src/16_hideleave/m_errors.F90 2015-04-21 08:35:18.781370070 +0000 +@@ -777,7 +777,9 @@ subroutine sentinel(level,mode_paral,fun + else if (level==2) then + msg = ' '//TRIM(my_funcname)//' : exit '//ch10 + else +- call die('Wrong level',__FILE__,__LINE__) ++ call die('Wrong level',& ++& __FILE__,& ++& __LINE__) + end if + + call wrtout(std_out,msg,my_mode) diff --git a/sci-physics/bigdft/files/bigdft-1.7.5-pkgconfig.patch b/sci-physics/bigdft/files/bigdft-1.7.1-pkgconfig.patch index fdf5937c8..d1832d280 100644 --- a/sci-physics/bigdft/files/bigdft-1.7.5-pkgconfig.patch +++ b/sci-physics/bigdft/files/bigdft-1.7.1-pkgconfig.patch @@ -6,5 +6,5 @@ diff -Naurp bigdft-1.7.1.orig/bigdft.pc.in bigdft-1.7.1/bigdft.pc.in Requires: Version: @VERSION@ -Libs: -L${libdir} @LIBS_DEPENDENCIES@ @FCLIBS@ -+Libs: -L${libdir} @LIBS_SHORT_DEPS@ @FCLIBS@ ++Libs: -L${libdir} -lbigdft-1 @LIBS_SHORT_DEPS@ @FCLIBS@ Cflags: -I${includedir} diff --git a/sci-physics/bigdft/metadata.xml b/sci-physics/bigdft/metadata.xml index 855d625ca..88bc4b9af 100644 --- a/sci-physics/bigdft/metadata.xml +++ b/sci-physics/bigdft/metadata.xml @@ -27,4 +27,7 @@ BigDFT is a DFT massively parallel electronic structure code (GPL license) using Use ScaLAPACK, a subset of LAPACK routines redesigned for heterogenous computing </flag> </use> + <upstream> + <remote-id type="launchpad">bigdft</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-physics/clip/ChangeLog b/sci-physics/clip/ChangeLog new file mode 100644 index 000000000..0876cda74 --- /dev/null +++ b/sci-physics/clip/ChangeLog @@ -0,0 +1,6 @@ +# ChangeLog for sci-physics/clip +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 08 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml: + sci-physics/clip: Updating remote-id in metadata.xml diff --git a/sci-physics/clip/metadata.xml b/sci-physics/clip/metadata.xml index 8a9f75597..fab4f8637 100644 --- a/sci-physics/clip/metadata.xml +++ b/sci-physics/clip/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <longdescription> @@ -6,4 +6,7 @@ Clip can simulate Laue patterns for arbitrary settings of crystal and detection plane. Moreover it allows to determine the crystal orientation from spots and zones marked on a Laue photograph. </longdescription> + <upstream> + <remote-id type="sourceforge">clip4</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-physics/elk/ChangeLog b/sci-physics/elk/ChangeLog index 9f01d7650..a1e52cc3a 100644 --- a/sci-physics/elk/ChangeLog +++ b/sci-physics/elk/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for sci-physics/elk -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 08 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml: + sci-physics/elk: Updating remote-id in metadata.xml + *elk-2.1.25 (23 Jul 2013) 23 Jul 2013; Honza Macháček <Hloupy.Honza@centrum.cz> +elk-2.1.25.ebuild, @@ -43,4 +46,3 @@ failed tests miserably, even with a lot of segfaults. Using its internal lapack with USE=-lapack, it looks well. Tested OK with USE="-lapack libxc mpi openmp". - diff --git a/sci-physics/elk/metadata.xml b/sci-physics/elk/metadata.xml index a7ed67ff3..ecc6af8e1 100644 --- a/sci-physics/elk/metadata.xml +++ b/sci-physics/elk/metadata.xml @@ -20,4 +20,7 @@ Elk is an all-electron full-potential linearised augmented-plane wave (FP-LAPW) Install python scripts. </flag> </use> + <upstream> + <remote-id type="sourceforge">elk</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-physics/espresso++/ChangeLog b/sci-physics/espresso++/ChangeLog index dd0c03d0f..7a589edd3 100644 --- a/sci-physics/espresso++/ChangeLog +++ b/sci-physics/espresso++/ChangeLog @@ -1,7 +1,16 @@ # ChangeLog for sci-physics/espresso++ -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml: + sci-physics/espresso++: Add github to remote-id in metadata.xml + + 20 Mar 2015; Christoph Junghans <ottxor@gentoo.org> espresso++-9999.ebuild: + added test feature + + 01 Mar 2015; Christoph Junghans <ottxor@gentoo.org> espresso++-9999.ebuild: + move live version to git + 13 Nov 2014; Christoph Junghans <ottxor@gentoo.org> espresso++-9999.ebuild: sync with gx86 diff --git a/sci-physics/espresso++/espresso++-9999.ebuild b/sci-physics/espresso++/espresso++-9999.ebuild index d21c13398..c1d7f2d53 100644 --- a/sci-physics/espresso++/espresso++-9999.ebuild +++ b/sci-physics/espresso++/espresso++-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -12,20 +12,20 @@ inherit cmake-utils python-single-r1 DESCRIPTION="extensible, flexible, fast and parallel simulation software for soft matter research" HOMEPAGE="https://www.espresso-pp.de" +MY_PN="${PN//+/p}" if [[ ${PV} = 9999 ]]; then - EHG_REPO_URI="https://bitbucket.org/${PN//+/p}/${PN//+/p}" - inherit mercurial + EGIT_REPO_URI="git://github.com/${MY_PN}/${MY_PN}.git http://github.com/${MY_PN}/${MY_PN}.git" + inherit git-r3 KEYWORDS= else - inherit vcs-snapshot #SRC_URI="https://espressopp.mpip-mainz.mpg.de/Download/${PN//+/p}-${PV}.tgz" - SRC_URI="https://bitbucket.org/${PN//+/p}/${PN//+/p}/get/v${PV}.tar.bz2 -> ${P}.tar.bz2" + SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos" fi LICENSE="GPL-3" SLOT="0" -IUSE="" +IUSE="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/sci-physics/espresso++/metadata.xml b/sci-physics/espresso++/metadata.xml index a556ddb82..25acc4649 100644 --- a/sci-physics/espresso++/metadata.xml +++ b/sci-physics/espresso++/metadata.xml @@ -6,4 +6,7 @@ <email>ottxor@gentoo.org</email> <name>Christoph Junghans</name> </maintainer> + <upstream> + <remote-id type="github">espressopp/espressopp</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog index 39f0e5a6f..23a6056ee 100644 --- a/sci-physics/espresso/ChangeLog +++ b/sci-physics/espresso/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for sci-physics/espresso -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Mar 2015; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild: + update git location + 26 Dec 2014; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild: fixed homepage and deps diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild index 149a662f0..337e575c0 100644 --- a/sci-physics/espresso/espresso-9999.ebuild +++ b/sci-physics/espresso/espresso-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.3.0.ebuild,v 1.1 2014/08/11 21:33:08 ottxor Exp $ +# $Header: $ EAPI=5 @@ -12,7 +12,7 @@ DESCRIPTION="Extensible Simulation Package for Research on Soft matter" HOMEPAGE="http://espressomd.org" if [[ ${PV} = 9999 ]]; then - EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git" + EGIT_REPO_URI="git://github.com/espressomd/espresso.git https://github.com/espressomd/espresso.git" EGIT_BRANCH="master" AUTOTOOLS_AUTORECONF=1 inherit git-r3 diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog deleted file mode 100644 index 457ebb007..000000000 --- a/sci-physics/geant/ChangeLog +++ /dev/null @@ -1,353 +0,0 @@ -# ChangeLog for sci-physics/geant -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.68 2012/12/14 16:51:50 bicatali Exp $ - -*geant-3.21.14-r4 (18 Jan 2013) - - 18 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> - +geant-3.21.14-r4.ebuild, +metadata.xml: - Introducing virtual/geant:3. Updating debian patch. Ebuild clean. Keyword - amd64-linux, x86-linux - -*geant-4.9.5_p02 (14 Dec 2012) -*geant-4.9.6 (14 Dec 2012) - - 14 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> +geant-4.9.5_p02.ebuild, - +geant-4.9.6.ebuild, -geant-4.9.2_p02.ebuild, -geant-4.9.5-r1.ebuild, - -geant-4.9.5_p01.ebuild, metadata.xml: - Version bumps. Tests are not in tar ball anymore. Might have to re-apply patch - for data environment variables - - 24 Oct 2012; Ulrich Müller <ulm@gentoo.org> geant-3.21.14-r2.ebuild, - geant-3.21.14-r3.ebuild, geant-4.9.2_p02.ebuild, geant-4.9.5-r1.ebuild, - geant-4.9.5_p01.ebuild: - Update dependency after package move from x11-libs/openmotif to - x11-libs/motif. - - 16 Oct 2012; Justin Lecher <jlec@gentoo.org> geant-3.21.14-r2.ebuild, - geant-3.21.14-r3.ebuild, geant-4.9.2_p02.ebuild, geant-4.9.4_p03.ebuild, - geant-4.9.5-r1.ebuild, geant-4.9.5_p01.ebuild: - Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the - updated fortran-2.eclass - - 04 Jul 2012; Jeff Horelick <jdhore@gentoo.org> geant-4.9.4_p03.ebuild: - marked x86 per bug 420295 - - 16 Jun 2012; Agostino Sarubbo <ago@gentoo.org> geant-4.9.4_p03.ebuild: - Stable for amd64, wrt bug #420295 - - 20 May 2012; Benda Xu <heroxbd@gentoo.org> geant-4.9.5-r1.ebuild, - geant-4.9.5_p01.ebuild: - I have massed up the keywords and Changelog with blind rsync with my overlay. - This is just a fix. - - 20 May 2012; Benda Xu <heroxbd@gentoo.org> +geant-4.9.5-r1.ebuild, - +files/geant-4.9.5_p01-scripts-only-dataenv.patch, - files/geant-4.9.5-scripts-only-dataenv.patch: - add back geant-4.9.5-r1.ebuild because geant-python cannot function correctly - with 4.9.5_p01, upstream http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1317 - -*geant-4.9.5_p01 (19 May 2012) - - 19 May 2012; Benda Xu <heroxbd@gentoo.org> +geant-4.9.5_p01.ebuild, - -geant-4.9.5-r1.ebuild, files/geant-4.9.4-zlib.patch, - files/geant-4.9.5-scripts-only-dataenv.patch: - version bump to 4.9.5_p01 - - 19 May 2012; Benda Xu <heroxbd@gentoo.org> geant-4.9.5-r1.ebuild: - delete the wrong sed phrase. - - 18 May 2012; Benda Xu <heroxbd@gentoo.org> - +files/geant-4.9.5-scripts-only-dataenv.patch, geant-4.9.5-r1.ebuild: - keyword amd64-linux and x86-linux; handle data dir via envd; fix clhep linking - - 16 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> -geant-4.9.5.ebuild, - geant-4.9.5-r1.ebuild: - Fix for openinventor to use SGI OpenInventor in portage instead of SoXt, bug - #408187 - -*geant-4.9.5-r1 (13 Mar 2012) - - 13 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> - files/geant-4.9.4-zlib.patch, +geant-4.9.5-r1.ebuild: - Fixed more zlib issues. The geant3 flag is now only for unit conversion (if - geant3 is needed, geant:3 has to be installed from user). The data is now - fetched (building needs network) to ease maintenance and set up the proper - env variables in the geant4*sh scripts. Removed a use dawn duplicate. Thanks - Marek Szuba for his suggestions (bug #407517 and bug #359673). Added a - message for backward compatibility (bug #360285) - -*geant-4.9.5 (18 Dec 2011) -*geant-4.9.4_p03 (18 Dec 2011) - - 18 Dec 2011; Sébastien Fabbro <bicatali@gentoo.org> - -geant-4.9.3_p02-r1.ebuild, -geant-4.9.4_p01.ebuild, +geant-4.9.4_p03.ebuild, - +files/geant-4.9.4-trajectory.patch, files/geant-4.9.4-zlib.patch, - +geant-4.9.5.ebuild: - Version bumps. Re-introduced some older flags and fixed linking of - zlib. Added patch for source trajectory example (bug #365171), thanks Matthias Nagl. - - 02 Aug 2011; Matt Turner <mattst88@gentoo.org> geant-4.9.2_p02.ebuild, - geant-4.9.3_p02-r1.ebuild: - Renamed x11-libs/Xaw3d to x11-libs/libXaw3d. - -*geant-3.21.14-r3 (21 Jul 2011) - - 21 Jul 2011; Sébastien Fabbro <bicatali@gentoo.org> - +geant-3.21.14-r3.ebuild: - New debian patch set. Switch to EAPI4 - - 28 Jun 2011; Justin Lecher <jlec@gentoo.org> geant-3.21.14-r2.ebuild, - geant-4.9.2_p02.ebuild, geant-4.9.3_p02-r1.ebuild, geant-4.9.4_p01.ebuild, - metadata.xml: - Fix sed on *FLAGS from : to |, EAPI bump - - 21 Jun 2011; Justin Lecher <jlec@gentoo.org> geant-3.21.14-r2.ebuild, - geant-4.9.2_p02.ebuild, geant-4.9.3_p02-r1.ebuild, geant-4.9.4_p01.ebuild: - Add dependency on virtual/fortran - - 21 Jun 2011; Justin Lecher <jlec@gentoo.org> geant-3.21.14-r2.ebuild, - geant-4.9.2_p02.ebuild, geant-4.9.3_p02-r1.ebuild, geant-4.9.4_p01.ebuild: - Added fortran-2.eclass support - - 07 Jun 2011; Jeroen Roovers <jer@gentoo.org> geant-3.21.14-r2.ebuild, - geant-4.9.2_p02.ebuild, geant-4.9.3_p02-r1.ebuild, geant-4.9.4_p01.ebuild: - Drop HPPA keywording. - - 22 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> geant-4.9.4_p01.ebuild: - Proper CMake optional use bug #359437 thanks Rafal Lalik - -*geant-4.9.4_p01 (18 Mar 2011) - - 18 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> -geant-4.9.4.ebuild, - +geant-4.9.4_p01.ebuild: - Version bump. Unm Unmasking. - - 13 Feb 2011; Raúl Porcel <armin76@gentoo.org> geant-3.21.14-r2.ebuild, - geant-4.9.2_p02.ebuild, geant-4.9.3_p02-r1.ebuild, geant-4.9.4.ebuild: - Drop sparc keywords - - 07 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> geant-4.9.4.ebuild: - Fixed a forgotten flag, thanks Rafal Lalik bug #353740 - -*geant-4.9.4 (22 Jan 2011) - - 22 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org> - geant-4.9.3_p02-r1.ebuild, files/geant-4.9.3-zlib.patch, +geant-4.9.4.ebuild, - +files/geant-4.9.4-datadir.patch, +files/geant-4.9.4-libdir.patch, - +files/geant-4.9.4-no-benchmarks.patch, +files/geant-4.9.4-no-examples.patch, - +files/geant-4.9.4-zlib.patch, metadata.xml: - Version bump, switched to cmake. Fixed Qt drivers bug #263450, bug #347279. - Removed G4WORKDIR bug #345855. - -*geant-4.9.3_p02-r1 (07 Nov 2010) - - 07 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> - -geant-4.9.3_p01.ebuild, -geant-4.9.3_p02.ebuild, - +geant-4.9.3_p02-r1.ebuild, +files/geant-4.9.3-respect_flags.patch: - Fix building with --as-needed wrt bug 344119, respect CXX. Drop old. - - 10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> geant-3.21.14-r2.ebuild, - geant-4.9.2_p02.ebuild, geant-4.9.3_p01.ebuild, geant-4.9.3_p02.ebuild: - Fix openmotif dependency. - -*geant-4.9.3_p02 (29 Sep 2010) - - 29 Sep 2010; Sébastien Fabbro <bicatali@gentoo.org> - +geant-4.9.3_p02.ebuild: - Version bump - - 12 Aug 2010; Sébastien Fabbro <bicatali@gentoo.org> - geant-4.9.2_p02.ebuild, -geant-4.9.3.ebuild, geant-4.9.3_p01.ebuild: - Change clhep dependency, clhep-2.1 api incompatible - -*geant-4.9.3_p01 (27 Apr 2010) - - 27 Apr 2010; Sébastien Fabbro <bicatali@gentoo.org> - +geant-4.9.3_p01.ebuild: - Version bump. Switched static flag to static-libs - -*geant-4.9.3 (08 Jan 2010) - - 08 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org> - -geant-4.9.2-r2.ebuild, +geant-4.9.3.ebuild, - +files/geant-4.9.3-zlib.patch: - Version bump, thanks Ben Bannier - - 26 Dec 2009; Raúl Porcel <armin76@gentoo.org> geant-4.9.2_p02.ebuild: - sparc stable wrt #294442 - - 10 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org> - geant-4.9.2_p02.ebuild: - Propagate compiler correctly, bug #296043 - - 07 Dec 2009; Jeroen Roovers <jer@gentoo.org> geant-3.21.14-r2.ebuild, - geant-4.9.2_p02.ebuild: - Stable for HPPA (bug #294442). - - 04 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org> - geant-3.21.14-r2.ebuild: - Re-changing to old style patching at least until patch-2.6 is not buggy - and masked - - 26 Nov 2009; Markus Meier <maekke@gentoo.org> geant-4.9.2_p02.ebuild: - amd64 stable, bug #294442 - - 26 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org> - geant-3.21.14-r2.ebuild: - Fixing patch application with more recent versions - - 26 Nov 2009; Christian Faulhammer <fauli@gentoo.org> - geant-4.9.2_p02.ebuild: - stable x86, bug 294442 - - 06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> geant-4.9.2-r2.ebuild, - geant-4.9.2_p02.ebuild: - Removed alternative dependency on Qt metapackage - -*geant-4.9.2_p02 (23 Sep 2009) - - 23 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> - -geant-4.9.1_p03.ebuild, -geant-4.9.2_p01.ebuild, +geant-4.9.2_p02.ebuild, - metadata.xml: - Version bump. Added aida USE flag, fixed Qt and GDML build options, - hopefully fixing examples compiling (bug #260102), thanks Matej and - Giovanni Fattori for their input - - 05 May 2009; Christian Faulhammer <fauli@gentoo.org> - geant-3.21.14-r2.ebuild, geant-4.9.2-r2.ebuild: - stable x86, bug 245875 - - 17 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org> geant-3.21.14-r2: - Fixed some latex font generation and made ebuild consistent with other - cernlib ebuilds - - 23 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org> - geant-4.9.2-r2.ebuild: - Added building of opengl qt4 driver, thanks merkel@kph.uni-mainz.de (bug - #263450) for noticing - - 22 Mar 2009; Jeremy Olexa <darkside@gentoo.org> geant-4.9.2-r2.ebuild: - amd64 stable, bug 245875 - - 22 Mar 2009; Jeremy Olexa <darkside@gentoo.org> geant-3.21.14-r2.ebuild: - amd64 stable, bug 245875 - -*geant-4.9.2_p01 (18 Mar 2009) - - 18 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org> - geant-3.21.14-r2.ebuild, +geant-4.9.2_p01.ebuild: - Version bump (bug fixes only) - - 05 Mar 2009; Ferris McCormick <fmccor@gentoo.org> geant-4.9.2-r2.ebuild: - Sparc stable, although early. See Bug #245875 --- needed for gcc-4.3 (Bug - #245160). - - 05 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org> - geant-4.9.2-r2.ebuild: - Fixed linking qt4 libraries, added G4WORKDIR to make it work on paludis - and a bit of ebuild cleaning - - 03 Mar 2009; Ferris McCormick <fmccor@gentoo.org> geant-3.21.14-r2.ebuild: - Sparc stable, part of Bug #245875. - -*geant-4.9.2-r2 (27 Feb 2009) - - 27 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org> -geant-4.9.2.ebuild, - -geant-4.9.2-r1.ebuild, +geant-4.9.2-r2.ebuild: - Adding fixes from Benjamin Bannier to include linking when building - examples, and a syntax error caught by Matej Batic, see bug #260102 - -*geant-4.9.2-r1 (19 Jan 2009) - - 19 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> - +files/geant-4.9.2-zlib.patch, +geant-4.9.2-r1.ebuild: - Added a patch to avoid linking to G4zlib, closing bug #255017, thanks to - Benjamin Bannier for the hint - -*geant-4.9.2 (10 Jan 2009) - - 10 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> +geant-4.9.2.ebuild: - Version bump. Switched to EAPI=2, added qt4 support, updated data files, - updated minimum dependencies, and now propagate LDFLAGS. Closing bug #253769. - - 24 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org> - -geant-4.9.1_p02.ebuild, geant-4.9.1_p03.ebuild: - Removed bundled zlib, closing bug #248423 - -*geant-4.9.1_p03 (23 Sep 2008) - - 23 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org> - +geant-4.9.1_p03.ebuild: - Version bump. Closing bug #238132. - - 06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml: - Add USE flag description to metadata wrt GLEP 56. - - 17 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> - geant-4.9.1_p02.ebuild: - Fixed the make global step to not remove previous built granula libaries, - see bug #231314, thanks Benjamin Bannier. - - 15 Jul 2008; Ferris McCormick <fmccor@gentoo.org> geant-4.9.1_p02.ebuild: - Add ~sparc for testing and for sci-physics/root --- Bug #230716 which see - for comments. - - 15 Jul 2008; Ferris McCormick <fmccor@gentoo.org> geant-3.21.14-r2.ebuild: - Add ~sparc for testing, dependency required for Bug #230716. - - 15 Jul 2008; Jeroen Roovers <jer@gentoo.org> geant-4.9.1_p02.ebuild: - Marked ~hppa (bug #230716). - - 14 Jul 2008; Jeroen Roovers <jer@gentoo.org> geant-3.21.14-r2.ebuild: - Marked ~hppa (bug #230716). - - 10 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> - geant-4.9.1_p02.ebuild: - Fix some global libraries issues, see bug #231314, thanks Benjamin Bannier - for his patch. - - 06 Jul 2008; Jeroen Roovers <jer@gentoo.org> geant-3.21.14-r1.ebuild: - Fix duplicate KEYWORDS definition. - - 06 Jul 2008; Jeroen Roovers <jer@gentoo.org> geant-3.21.14-r2.ebuild: - Fix duplicate KEYWORDS definition. - - 29 Jun 2008; Torsten Veller <tove@gentoo.org> geant-3.21.14-r1.ebuild, - geant-3.21.14-r2.ebuild: - Add missing die: || "..." -> || die "..." - - 27 Jun 2008; Ulrich Mueller <ulm@gentoo.org> geant-3.21.14-r1.ebuild, - geant-3.21.14-r2.ebuild, geant-4.9.1_p02.ebuild: - Change dependency from virtual/motif to x11-libs/openmotif, bug 224749. - -*geant-4.9.1_p02 (06 Jun 2008) -*geant-3.21.14-r2 (06 Jun 2008) - - 06 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml, - -geant-3.21.14.ebuild, +geant-3.21.14-r2.ebuild, +geant-4.9.1_p02.ebuild: - Added major version bump for geant-4, slotted. Thanks much to Benjamin - Bennier for his work (bug #212221). Now geant-3 is also slotted, and got a - revision bump - -*geant-4.9.1_p02 (06 Jun 2008) -*geant-3.21.14-r2 (06 Jun 2008) - - 06 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml, - -geant-3.21.14.ebuild, +geant-3.21.14-r2.ebuild, +geant-4.9.1_p02.ebuild: - Added major version bump for geant-4, slotted. Thanks much to Benjamin - Bennier for his work (bug #212221). Now geant-3 is also slotted, and got a - revision bump - -*geant-3.21.14-r1 (11 Mar 2008) - - 11 Mar 2008; Sébastien Fabbro <bicatali@gentoo.org> - +geant-3.21.14-r1.ebuild: - New series of patches from Debian, more compatible with gfortran and better - tests. Much ebuild cleaning. - -*geant-3.21.14 (24 Aug 2007) - - 24 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml, - +geant-3.21.14.ebuild: - Initial import. diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest deleted file mode 100644 index 04c8801c9..000000000 --- a/sci-physics/geant/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST geant321_3.21.14.dfsg-10.diff.gz 46221 SHA256 a148234b0b09c74e7cd2afe3348adfdcce84d7db41fcf483f09fb52443949df2 SHA512 c0b1da38c966e8bff356726afba344cff953e902fff7e728bd5fce9472d7562701fceae482b8d6cba81bc78ccf5027229aee0379e1b59787c957b88b94ce8cb4 WHIRLPOOL ea1ae564f36ffb93ea8c57125ca21f55d640bc7ca03aa4457bfcecebe93500a66e3e63b43d1b28583d40319f52f0093149a1e868717ea1c855ebae12cf0d638d -DIST geant321_3.21.14.dfsg.orig.tar.gz 10922928 SHA256 186fe98a08ad1de39f68698a09a46e7c2f14c37b22f8f990257b0bd66215c5b4 SHA512 733a77e529ecfe17c35d1e0bf44cf9062dbd9f2e3880e12cbfabf7372e6c60ea9690df010574094b44aef6fe306dfd85dfd4f42641b8f03efda3938a50313734 WHIRLPOOL fc2b230e1bf2ae1157cf9c92f474ff72fc1f3158e5db5a8f1a7d4f7c983fae9b886dc1aeb148019cb961bc602abc629d75a1aa728d66b10887daa45de040def6 diff --git a/sci-physics/geant/geant-3.21.14-r4.ebuild b/sci-physics/geant/geant-3.21.14-r4.ebuild deleted file mode 100644 index 6e6bcf9c3..000000000 --- a/sci-physics/geant/geant-3.21.14-r4.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit eutils fortran-2 alternatives-2 - -DEB_PN=geant321 -DEB_PV=${PV}.dfsg -DEB_PR=10 -DEB_P=${DEB_PN}_${DEB_PV} - -DESCRIPTION="CERN's detector description and simulation Tool" -HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/geant/" -SRC_URI=" - mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz - mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.diff.gz" - -SLOT="3" -LICENSE="GPL-2 LGPL-2 BSD" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - x11-libs/motif:0 - dev-lang/cfortran - sci-physics/cernlib - sci-physics/paw - !sci-physics/geant-vmc:3" -DEPEND="${RDEPEND} - virtual/latex-base - x11-misc/imake - x11-misc/makedepend" - -S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig" - -src_prepare() { - cd "${WORKDIR}" - sed -i -e 's:/tmp/dp.*/cern:cern:g' ${DEB_P}-${DEB_PR}.diff || die - epatch ${DEB_P}-${DEB_PR}.diff - cd "${S}" - cp debian/add-ons/Makefile . || die - export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck" - sed -i \ - -e "s:/usr/local:${EROOT}/usr:g" \ - Makefile || die "sed'ing the Makefile failed" - einfo "Applying Debian patches" - emake -j1 patch - - # since we depend on cfortran, do not use the one from cernlib - rm src/include/cfortran/cfortran.h || die -} - -src_compile() { - # create local LaTeX cache directory - VARTEXFONTS="${T}"/fonts - emake -j1 cernlib-indep cernlib-arch -} - -src_test_() { - LD_LIBRARY_PATH="${S}"/shlib emake -j1 cernlib-test -} - -src_install() { - default - cd debian - dodoc changelog README.* deadpool.txt NEWS copyright - newdoc add-ons/README README.add-ons -} diff --git a/sci-physics/geant/metadata.xml b/sci-physics/geant/metadata.xml deleted file mode 100644 index c32b134f3..000000000 --- a/sci-physics/geant/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>sci-physics</herd> -<longdescription lang="en"> - Geant simulates the passage of subatomic particles through matter, for - instance, particle detectors. Geant 3 simulations are performed by - linking Fortran code supplied by the user with the Geant libraries, - then running the resulting executable. This package includes gxint, - the script used to perform this linking step. - Geant 4 is a complete rewrite in C++ with addition of other modern - features and detectors. -</longdescription> -</pkgmetadata> diff --git a/sci-physics/hoomd-blue/ChangeLog b/sci-physics/hoomd-blue/ChangeLog new file mode 100644 index 000000000..20102faf7 --- /dev/null +++ b/sci-physics/hoomd-blue/ChangeLog @@ -0,0 +1,18 @@ +# ChangeLog for sci-physics/hoomd-blue +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 09 Mar 2015; Christoph Junghans <ottxor@gentoo.org> hoomd-blue-9999.ebuild: + switched to ninja + + 06 Mar 2015; Christoph Junghans <ottxor@gentoo.org> hoomd-blue-9999.ebuild: + update live ebuild + + 01 Mar 2015; Christoph Junghans <ottxor@gentoo.org> hoomd-blue-9999.ebuild: + fixed license + +*hoomd-blue-9999 (26 Feb 2015) + + 26 Feb 2015; Christoph Junghans <ottxor@gentoo.org> +hoomd-blue-9999.ebuild, + +metadata.xml: + initial commit diff --git a/sci-physics/hoomd-blue/hoomd-blue-9999.ebuild b/sci-physics/hoomd-blue/hoomd-blue-9999.ebuild new file mode 100644 index 000000000..43f51f7ce --- /dev/null +++ b/sci-physics/hoomd-blue/hoomd-blue-9999.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +CMAKE_MAKEFILE_GENERATOR="ninja" + +inherit cmake-utils cuda python-single-r1 + +DESCRIPTION="a general-purpose particle simulation toolkit" +HOMEPAGE="http://codeblue.umich.edu/hoomd-blue/" + +if [[ ${PV} = 9999 ]]; then + EGIT_REPO_URI="https://bitbucket.org/glotzer/${PN}.git" + inherit git-r3 + KEYWORDS= +else + inherit vcs-snapshot + SRC_URI="https://bitbucket.org/glotzer/${PN}/get/v${PV}.tar.bz2 -> ${P}.tar.bz2" + KEYWORDS="~amd64" +fi + +LICENSE="hoomd-blue" +SLOT="0" +IUSE="cuda doc test mpi +zlib" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + mpi? ( virtual/mpi ) + cuda? ( dev-util/nvidia-cuda-sdk ) + zlib? ( sys-libs/zlib ) + dev-libs/boost:=[threads,python,mpi,${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +src_prepare() { + use cuda && cuda_src_prepare + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_enable mpi MPI) + $(cmake-utils_use_enable doc DOXYGEN) + $(cmake-utils_use_enable cuda CUDA) + $(cmake-utils_use_enable zlib ZLIB) + $(cmake-utils_use_build test BUILD_TESTING) + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_SITEDIR=$(python_get_sitedir) + ) + cmake-utils_src_configure +} + +src_install() { + use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/hoomd-*doc* ) + cmake-utils_src_install +} diff --git a/sci-physics/hoomd-blue/metadata.xml b/sci-physics/hoomd-blue/metadata.xml new file mode 100644 index 000000000..8dd7ec69a --- /dev/null +++ b/sci-physics/hoomd-blue/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>sci-chemistry</herd> + <maintainer> + <email>ottxor@gentoo.org</email> + <name>Christoph Junghans</name> + </maintainer> + <use> + <flag name="cuda">Enable cuda non-bonded kernels</flag> + </use> +</pkgmetadata> diff --git a/sci-physics/looptools/ChangeLog b/sci-physics/looptools/ChangeLog index 6e5903308..407587aa5 100644 --- a/sci-physics/looptools/ChangeLog +++ b/sci-physics/looptools/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for sci-physics/looptools -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*looptools-2.12 (07 Jun 2015) + + 07 Jun 2015; Jauhien Piatlicki <jauhien@gentoo.org> +looptools-2.12.ebuild: + version bump + *looptools-2.11 (31 Aug 2014) *looptools-2.10 (31 Aug 2014) *looptools-2.9 (31 Aug 2014) diff --git a/sci-physics/looptools/Manifest b/sci-physics/looptools/Manifest index 3c4607565..f4810e3a2 100644 --- a/sci-physics/looptools/Manifest +++ b/sci-physics/looptools/Manifest @@ -1,4 +1,5 @@ DIST LoopTools-2.10.tar.gz 550654 SHA256 141ab2153006ca3f1cc01e66e1552c02bf8164b9216304ff1829370b7b5c77bb SHA512 1fc9ef5a9ced8ea08ddc5f494338fb27b55bacdd23a968ca4379e5ca63f8d74ea947fb0bb98a80dfd6dddc0db1e80d2d454433abdcfeac323b51c27432046954 WHIRLPOOL b118d3f5f13b6e23920f7680b4b1a0b1d2c4079ac78c0763e73d30e9750d14ae57cd00f889e5b7392bc2ef53f88122be4d7f52de96f999676aa4e1e603353eae DIST LoopTools-2.11.tar.gz 546351 SHA256 efe14e774fcd66bdd46bbeb8065138793e3c1f5c73594c84c116edbab74c842d SHA512 fbe6c43b857561d0e7f35acdea32c34f2430c2faf23172790ad4426c469e39cd0df413d2c3cdc080ce9c4dcfb95773b7dc70b13738341c9d0438f4445cdbf6ab WHIRLPOOL 74b30ebe59998f2217b7e5cfb6e90671193159e5e3adfb2c26fee9c6f7b4021932ea8158e191f2e538e2e6d037fc86382659a697f638dc22ea3d068dfb92340c +DIST LoopTools-2.12.tar.gz 545153 SHA256 df04d944de15ec73665edaf76f655d1db797cbc02b54baa7664ac761ecfa2f70 SHA512 70726493bd138fb80b85a46955fbe28b7f1432d9b67a100fe3ff74c2fa22232a07e461a6742745b0ead81793bb64b81cc4265d09b91fa048e7bdd32cf6956b27 WHIRLPOOL af3abaf31a4a868e0f65bdb0b21405c413c470063e4c8130e31b2a9e05a4f0e65e9999323e3cdf0b4277e48e84d767288852e984d486468abab3aaa664f66879 DIST LoopTools-2.8.tar.gz 546810 SHA256 2395518d0eac9b0883a2c249b9a5ba80df443929c520c45e60f5a4284166eb42 SHA512 32211669fd092d2d5bb38e26a6471a95df0647d9e7ea0cc4e99ff4fd7c3e3fee107f6432ed9075e3102224f0041fac6f7075b1f0a91f7744ec3890b4b36d276e WHIRLPOOL c8dff8030d7ea1bfc6b65bef3370c5acfec69fa73f223a63b7424163b81a3bdf788eb3ffecd07e9bf61a31a63138b1fd126b6442a298c8fad1f4b04b69663a47 DIST LoopTools-2.9.tar.gz 548404 SHA256 e3cdc10fdbc9fe68e56402d34c6d3abd1ec6d727db8914b0cec0119273f7aa4d SHA512 3a46c94a5ff72079c930d7ec2076b0f5278e897130383fdd656173218840f04e03ebb9fdef362af36a207a71a87c038fec6e008a231ef259120073760aa05534 WHIRLPOOL 50591b6aa4e7e624282ad2102c78060cd421c6f5b7abd293bb18b2ca6844857bdcdbafab8e33c86ff4bd464f1245ba0cd13978800ac4786411a658ffd947cc38 diff --git a/sci-physics/looptools/looptools-2.12.ebuild b/sci-physics/looptools/looptools-2.12.ebuild new file mode 100644 index 000000000..66a959c4a --- /dev/null +++ b/sci-physics/looptools/looptools-2.12.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit eutils fortran-2 multilib + +MYP=LoopTools-${PV} + +DESCRIPTION="Tools for evaluation of scalar and tensor one-loop integrals" +HOMEPAGE="http://www.feynarts.de/looptools" +SRC_URI="http://www.feynarts.de/looptools/${MYP}.tar.gz" + +LICENSE="LGPL-3" + +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc static-libs" + +DEPEND="virtual/fortran" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MYP}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.10-makefile.patch + export VER="${PV}" + # necessary fix for prefix + sed -i "s/lib\$(LIBDIRSUFFIX)/$(get_libdir)/" makefile.in || die +} + +src_install() { + default + # another one of these package building archive with pic + # no: ooptools is not a typo + use static-libs || rm "${ED}"/usr/$(get_libdir)/libooptools.a + use doc && dodoc manual/*.pdf +} diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index 4ef278cf6..14a233ad0 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,6 +2,71 @@ # 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 $ + 12 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> -root-6.02.05-r2.ebuild, + -files/root-6.00.01-prop-flags.patch, -files/root-6.02.05-dictpch.patch, + -files/root-6.02.05-xrootd4.patch: + root-6.02.05-r2 is in the portage tree now + + 12 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> root-6.02.05-r2.ebuild: + Fix "pg_config: command not found" QA warning if postgres is not + installed. + +*root-6.02.05-r2 (12 Apr 2015) + + 12 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> -root-6.02.05-r1.ebuild, + +root-6.02.05-r2.ebuild, +files/root-6.02.05-dictpch.patch: + Regenerate PCH headers for Gentoo include files layout and remove + extra $PORTAGE_TMPDIR from /etc (github issue #238). + +*root-6.02.05-r1 (11 Apr 2015) + + 11 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> -root-6.02.05.ebuild, + +root-6.02.05-r1.ebuild: + Fix clang buildtime vs runtime mismatch. + + 11 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> root-6.02.05.ebuild: + Drop minimal USE flag, as it is useless with current ROOT and + recently added USE flags. + +*root-6.02.05 (08 Apr 2015) + + 08 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> -root-6.00.02.ebuild, + +root-6.02.05.ebuild, -files/root-6.00.01-tutorials-path.patch, + -files/root-6.00.02-tm_zone.patch, +files/root-6.02.05-xrootd4.patch, + metadata.xml: + Version bump for testing and evaluation, add new flags. + Remove old. + + 03 Mar 2015; Andrew Savchenko <bircoph@gentoo.org> -root-5.34.26.ebuild, + -files/root-5.32.00-dotfont.patch, -files/root-5.34.05-nobyte-compile.patch, + metadata.xml: + 5.34.26 is moved to the portage tree + + 02 Mar 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml: + Indentation fixes (in order to conform to portage version) + + 02 Mar 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.26.ebuild, + files/root-5.32.00-chklib64.patch, -files/root-5.34.26-prop-flags.patch: + Add configurable LDFLAGS the same way as upstream did for + configurable CFLAGS/CXXFLAGS. Optimize configure variables. + + 24 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.26.ebuild: + Remove full path from local images, otherwise html header + background is missing. + + 23 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> -root-5.34.18-r2.ebuild, + -root-6.00.01-r1.ebuild, -files/root-5.32.00-prop-flags.patch, + -files/root-5.34.18-tutorials-path.patch, -files/root-6.00.01-cling.patch, + metadata.xml: + Remove old versions and unused patches. + +*root-5.34.26 (23 Feb 2015) + + 23 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> +root-5.34.26.ebuild, + +files/root-5.34.26-prop-flags.patch, metadata.xml: + Version bump. Add http support. Add c++14 support. Rework compilers + handling. + 01 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.18-r2.ebuild, root-6.00.01-r1.ebuild, root-6.00.02.ebuild, root-9999.ebuild: Rename virtual/postgresql to dev-db/postgresql diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest deleted file mode 100644 index 9b2800970..000000000 --- a/sci-physics/root/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST root_v5.34.18.source.tar.gz 74218396 SHA256 9196dce7d76b31e5bcabd985bd31bc4d9b7c8c4d0c7ce84f730efa4ef82a3567 SHA512 7c659d1a92e6ad1b901956cf0a04aacc391c936eb2881528d105f61373128e5fd4caad6e76988050a8a8bc69a8ba0b53055974b4c618800345127ae2e6dd7a14 WHIRLPOOL 15221bbdabd5abd50dc87e3cc8fa3de24c5888e3ac0a75535983c8ec0718433c84c2400da59d27f3b83b687c7c5f5d60bf769c8a1eefce45dd7d39cbc002a6b7 -DIST root_v6.00.01.source.tar.gz 97783289 SHA256 245c75fd6b53b84cae6251f950e259311439da678b2cdebb9578d51561a6b61f SHA512 e5f56750a0637aa884ea2d9d2ebf7b677cd1fac1819042948ba3530a25366cb7d853dba6fa7127764e3ae7cec23f89ed60d8913c0ff10ce2664bcc87df1620cf WHIRLPOOL 92f34c13ee0161d556b54b1bdd971774b2637c5cd57916ee75f0572a30713df820df3bb07f276d16ca31d11fda7e762de673c943b8bffda9db501d2ee8848654 -DIST root_v6.00.02.source.tar.gz 97811067 SHA256 db92818781f842c33b8b583f1f9be02b51cedbf5f2943df986cbbd0c0006a06f SHA512 bd72eb43d2a4ace27738ba2dc509f6d81ec3555e59454426d28c2c5522b4b19d2678ed515b84efaf953146c1f50c65e304532456d76076d03598bda67c69e8a5 WHIRLPOOL 12b87e9b1612ea3625f7ea0970b733887051b5173b728b5f13a032eb103eeda22de8a4c18417e02a92fe02f29b9acd9114fa1420fac42bea31bde07c7a0ce697 diff --git a/sci-physics/root/files/root-5.32.00-chklib64.patch b/sci-physics/root/files/root-5.32.00-chklib64.patch index a5c052cdd..979220f02 100644 --- a/sci-physics/root/files/root-5.32.00-chklib64.patch +++ b/sci-physics/root/files/root-5.32.00-chklib64.patch @@ -1,3 +1,4 @@ +bug fix for #406817 --- configure.orig 2012-02-29 19:46:41.000000000 +0400 +++ configure 2012-03-22 03:28:43.458968696 +0400 @@ -441,14 +441,13 @@ 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 85d6dea76..000000000 --- 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<std::string>::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.32.00-prop-flags.patch b/sci-physics/root/files/root-5.32.00-prop-flags.patch deleted file mode 100644 index 7dfeb1cc3..000000000 --- a/sci-physics/root/files/root-5.32.00-prop-flags.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- root/config/Makefile.in.orig 2013-01-21 22:04:43.011452938 +0400 -+++ root/config/Makefile.in 2013-01-21 22:04:18.027352209 +0400 -@@ -25,9 +25,9 @@ - USECONFIG := @useconfig@ - MKLIBOPTIONS := @mkliboption@ - --EXTRA_CFLAGS := -Iinclude @cflags@ --EXTRA_CXXFLAGS := -Iinclude @cflags@ --EXTRA_LDFLAGS := @ldflags@ -+EXTRA_CFLAGS := -Iinclude @cflags@ $(CFLAGS) -+EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS) -+EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS) - WINRTDEBUG := @winrtdebug@ - - GLBPATCHFLAGS := @glbpatchcflags@ 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 ec67a1588..000000000 --- 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.18-tutorials-path.patch b/sci-physics/root/files/root-5.34.18-tutorials-path.patch deleted file mode 100644 index 8bf88594d..000000000 --- a/sci-physics/root/files/root-5.34.18-tutorials-path.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/config/RConfigure.in b/config/RConfigure.in -index 5950401..e4fbfbf 100644 ---- a/config/RConfigure.in -+++ b/config/RConfigure.in -@@ -11,6 +11,7 @@ - #define ROOTDATADIR "@datadir@" - #define ROOTDOCDIR "@docdir@" - #define ROOTMACRODIR "@macrodir@" -+#define ROOTTUTDIR "@tutdir@" - #define ROOTSRCDIR "@srcdir@" - #define ROOTICONPATH "@iconpath@" - #define EXTRAICONPATH "@extraiconpath@" -diff --git a/configure b/configure -index 131df92..2c8ea95 100755 ---- a/configure -+++ b/configure -@@ -7537,6 +7537,7 @@ sed \ - -e "s|@prefix@|$prefix|" \ - -e "s|@srcdir@|$srcdir|" \ - -e "s|@ttffontdir@|$fontdir|" \ -+ -e "s|@tutdir@|$tutdir|" \ - -e "s|@setresuid@|$setresuid|" \ - -e "s|@hasmathmore@|$hasmathmore|" \ - -e "s|@haspthread@|$haspthread|" \ -diff --git a/core/base/src/TApplication.cxx b/core/base/src/TApplication.cxx -index 95fb1e5..3830955 100644 ---- a/core/base/src/TApplication.cxx -+++ b/core/base/src/TApplication.cxx -@@ -794,6 +794,22 @@ Long_t TApplication::ProcessRemote(const char *line, Int_t *) - return 1; - } - -+namespace { -+ static int PrintFile(const char* filename) { -+ TString sFileName(filename); -+ gSystem->ExpandPathName(sFileName); -+ if (gSystem->AccessPathName(sFileName)) { -+ Error("ProcessLine()", "Cannot find file %s", filename); -+ return 1; -+ } -+ std::ifstream instr(sFileName); -+ TString content; -+ content.ReadFile(instr); -+ Printf("%s", content.Data()); -+ return 0; -+ } -+} -+ - //______________________________________________________________________________ - Long_t TApplication::ProcessLine(const char *line, Bool_t sync, Int_t *err) - { -@@ -827,11 +843,41 @@ Long_t TApplication::ProcessLine(const char *line, Bool_t sync, Int_t *err) - return 0; - } - -- if (!strncmp(line, "?", 1)) { -+ if (!strncmp(line, "?", 1) || !strncmp(line, ".help", 5)) { - Help(line); - return 1; - } - -+ if (!strncmp(line, ".demo", 5)) { -+ if (gROOT->IsBatch()) { -+ Error("ProcessLine", "Cannot show demos in batch mode!"); -+ return 1; -+ } -+#ifdef ROOTTUTDIR -+ ProcessLine(".x " ROOTTUTDIR "/demos.C"); -+#else -+ ProcessLine(".x $(ROOTSYS)/tutorials/demos.C"); -+#endif -+ return 0; -+ } -+ -+ if (!strncmp(line, ".license", 8)) { -+#ifdef ROOTDOCDIR -+ return PrintFile(ROOTDOCDIR "/LICENSE"); -+#else -+ return PrintFile("$(ROOTSYS)/LICENSE"); -+#endif -+ } -+ -+ if (!strncmp(line, ".credits", 8)) { -+#ifdef ROOTDOCDIR -+ return PrintFile(ROOTDOCDIR "/CREDITS"); -+#else -+ return PrintFile("$(ROOTSYS)/README/CREDITS"); -+#endif -+ -+ } -+ - if (!strncmp(line, ".pwd", 4)) { - if (gDirectory) - Printf("Current directory: %s", gDirectory->GetPath()); diff --git a/sci-physics/root/files/root-6.00.01-cling.patch b/sci-physics/root/files/root-6.00.01-cling.patch deleted file mode 100644 index 146e89fde..000000000 --- a/sci-physics/root/files/root-6.00.01-cling.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit eea9517c17bd86beda895a5a8b3ffe59af18596f -Author: Axel Naumann <Axel.Naumann@cern.ch> -Date: Tue Jul 1 17:45:20 2014 +0200 - - From Pere: go via TSystem to use prefix if defined (ROOT-6410). - -diff --git a/core/meta/src/TCling.cxx b/core/meta/src/TCling.cxx -index baec571..4976d4e 100644 ---- a/core/meta/src/TCling.cxx -+++ b/core/meta/src/TCling.cxx -@@ -4703,7 +4703,7 @@ void* TCling::LazyFunctionCreatorAutoload(const std::string& mangled_name) { - TString lib; - Ssiz_t posLib = 0; - while (libs.Tokenize(lib, posLib)) { -- if (Load(lib, kFALSE /*system*/) < 0) { -+ if (gSystem->Load(lib, "", kFALSE /*system*/) < 0) { - // The library load failed, all done. - //fprintf(stderr, "load failed: %s\n", errmsg.c_str()); - return 0; diff --git a/sci-physics/root/files/root-6.00.01-prop-flags.patch b/sci-physics/root/files/root-6.00.01-prop-flags.patch deleted file mode 100644 index 3a1002478..000000000 --- a/sci-physics/root/files/root-6.00.01-prop-flags.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/config/Makefile.in b/config/Makefile.in -index dd89044..4fc7de3 100644 ---- a/config/Makefile.in -+++ b/config/Makefile.in -@@ -64,9 +64,9 @@ HOST := @host@ - USECONFIG := @useconfig@ - MKLIBOPTIONS := @mkliboption@ - --EXTRA_CFLAGS := -Iinclude @cflags@ --EXTRA_CXXFLAGS := -Iinclude @cflags@ --EXTRA_LDFLAGS := @ldflags@ -+EXTRA_CFLAGS := -Iinclude @cflags@ $(CFLAGS) -+EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS) -+EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS) - WERROR := @werror@ - WINRTDEBUG := @winrtdebug@ - CTORSINITARRAY := @ctorsinitarray@ diff --git a/sci-physics/root/files/root-6.00.01-tutorials-path.patch b/sci-physics/root/files/root-6.00.01-tutorials-path.patch deleted file mode 100644 index cb6861554..000000000 --- a/sci-physics/root/files/root-6.00.01-tutorials-path.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/config/RConfigure.in b/config/RConfigure.in -index 5950401..e4fbfbf 100644 ---- a/config/RConfigure.in -+++ b/config/RConfigure.in -@@ -11,6 +11,7 @@ - #define ROOTDATADIR "@datadir@" - #define ROOTDOCDIR "@docdir@" - #define ROOTMACRODIR "@macrodir@" -+#define ROOTTUTDIR "@tutdir@" - #define ROOTSRCDIR "@srcdir@" - #define ROOTICONPATH "@iconpath@" - #define EXTRAICONPATH "@extraiconpath@" -diff --git a/configure b/configure -index 131df92..2c8ea95 100755 ---- a/configure -+++ b/configure -@@ -7537,6 +7537,7 @@ sed \ - -e "s|@prefix@|$prefix|" \ - -e "s|@srcdir@|$srcdir|" \ - -e "s|@ttffontdir@|$fontdir|" \ -+ -e "s|@tutdir@|$tutdir|" \ - -e "s|@setresuid@|$setresuid|" \ - -e "s|@hasmathmore@|$hasmathmore|" \ - -e "s|@haspthread@|$haspthread|" \ -diff --git a/core/base/src/TApplication.cxx b/core/base/src/TApplication.cxx -index 1c1809a..7d7ed37 100644 ---- a/core/base/src/TApplication.cxx -+++ b/core/base/src/TApplication.cxx -@@ -866,8 +866,8 @@ Long_t TApplication::ProcessLine(const char *line, Bool_t sync, Int_t *err) - Error("ProcessLine", "Cannot show demos in batch mode!"); - return 1; - } --#ifdef ROOTDOCDIR -- ProcessLine(".x " ROOTDOCDIR "/tutorials/demos.C"); -+#ifdef ROOTTUTDIR -+ ProcessLine(".x " ROOTTUTDIR "/demos.C"); - #else - ProcessLine(".x $(ROOTSYS)/tutorials/demos.C"); - #endif diff --git a/sci-physics/root/files/root-6.00.02-tm_zone.patch b/sci-physics/root/files/root-6.00.02-tm_zone.patch deleted file mode 100644 index cdd1b13e4..000000000 --- a/sci-physics/root/files/root-6.00.02-tm_zone.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 08b08412bafc24fa635b0fdb832097a3aa2fa1d2 Mon Sep 17 00:00:00 2001 -From: Pere Mato <pere.mato@cern.ch> -Date: Sun, 21 Sep 2014 19:27:30 +0200 -Subject: [PATCH] Fix for ROOT-6728 - Compilation error in TTimeStamp - ---- - core/base/src/TTimeStamp.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/base/src/TTimeStamp.cxx b/core/base/src/TTimeStamp.cxx -index 8709220..f0ff12d 100644 ---- a/core/base/src/TTimeStamp.cxx -+++ b/core/base/src/TTimeStamp.cxx -@@ -813,7 +813,7 @@ void TTimeStamp::DumpTMStruct(const tm_t &tmstruct) - tmstruct.tm_isdst); - #if (defined(linux) && !defined(R__WINGCC)) || defined(R__MACOSX) - printf(",\n tm_gmtoff %6ld, tm_zone \"%s\"", --#if defined(__USE_BSD) || defined(R__MACOSX) -+#if defined(__USE_BSD) || defined(R__MACOSX) || defined(__USE_MISC) - tmstruct.tm_gmtoff, tmstruct.tm_zone); - #else - tmstruct.__tm_gmtoff, tmstruct.__tm_zone); diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml index 26e546cf2..7e1dbd5bc 100644 --- a/sci-physics/root/metadata.xml +++ b/sci-physics/root/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> - <herd>sci-physics</herd> - <longdescription lang="en"> +<maintainer> + <email>bircoph@gentoo.org</email> + <name>Andrew Savchenko</name> +</maintainer> +<herd>sci-physics</herd> +<longdescription lang="en"> 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 @@ -14,15 +14,13 @@ statistics, serialization, optimization, linear algebra, graphics, GUI toolkit, and a complete visualization framework. </longdescription> - <use> - <flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>>=4.7.0</flag> - <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag> - <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag> - <flag name="http">Enable http server support including but not limited to fastcgi support</flag> - <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag> - <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag> - <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag> - <flag name="reflex">Build the reflection database for the C++ interpreter</flag> - <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag> - </use> +<use> + <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag> + <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag> + <flag name="http">Enable http server support including but not limited to fastcgi support</flag> + <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag> + <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag> + <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag> + <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag> +</use> </pkgmetadata> diff --git a/sci-physics/root/root-5.34.18-r2.ebuild b/sci-physics/root/root-5.34.18-r2.ebuild deleted file mode 100644 index 7108ae3bc..000000000 --- a/sci-physics/root/root-5.34.18-r2.ebuild +++ /dev/null @@ -1,389 +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.18-r1.ebuild,v 1.3 2014/03/27 18:51:54 bicatali Exp $ - -EAPI=5 - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="http://root.cern.ch/git/root.git" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi - -PYTHON_COMPAT=( python2_{6,7} ) - -inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \ - toolchain-funcs user versionator - -DESCRIPTION="C++ data analysis framework and interpreter from CERN" -HOMEPAGE="http://root.cern.ch/" -DOC_URI="ftp://root.cern.ch/${PN}/doc" - -SLOT="0/$(get_version_component_range 1-3 ${PV})" -LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" -IUSE="+X afs avahi c++0x doc emacs examples fits fftw graphviz - kerberos ldap +math minimal mpi mysql odbc +opengl openmp - oracle postgres prefix pythia6 pythia8 python qt4 +reflex - ruby sqlite ssl xinetd xml xrootd" - -REQUIRED_USE=" - !X? ( !opengl !qt4 ) - mpi? ( math !openmp ) - openmp? ( math !mpi ) - python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND=" - app-arch/xz-utils:0= - >=dev-lang/cfortran-4.4-r2 - dev-libs/libpcre:3= - media-fonts/dejavu - media-libs/freetype:2= - media-libs/giflib:0= - media-libs/libpng:0= - media-libs/tiff:0= - sys-libs/zlib:0= - virtual/jpeg:0 - virtual/shadow - X? ( - media-libs/ftgl:0= - media-libs/glew:0= - x11-libs/libX11:0= - x11-libs/libXext:0= - x11-libs/libXpm:0= - !minimal? ( - || ( - media-libs/libafterimage:0=[gif,jpeg,png,tiff] - >=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff] - ) - opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= ) - qt4? ( - dev-qt/qtgui:4= - dev-qt/qtopengl:4= - dev-qt/qt3support:4= - dev-qt/qtsvg:4= - dev-qt/qtwebkit:4= - dev-qt/qtxmlpatterns:4= - ) - x11-libs/libXft:0= - ) - ) - !minimal? ( - afs? ( net-fs/openafs ) - avahi? ( net-dns/avahi:0= ) - emacs? ( virtual/emacs ) - fits? ( sci-libs/cfitsio:0= ) - fftw? ( sci-libs/fftw:3.0= ) - graphviz? ( media-gfx/graphviz:0= ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap:0= ) - math? ( - sci-libs/gsl:0= - sci-mathematics/unuran:0= - mpi? ( virtual/mpi ) - ) - mysql? ( virtual/mysql ) - odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) ) - oracle? ( dev-db/oracle-instantclient-basic:0= ) - postgres? ( dev-db/postgresql:= ) - pythia6? ( sci-physics/pythia:6= ) - pythia8? ( >=sci-physics/pythia-8.1.80:8= ) - python? ( ${PYTHON_DEPS} ) - ruby? ( - dev-lang/ruby - dev-ruby/rubygems - ) - sqlite? ( dev-db/sqlite:3= ) - ssl? ( dev-libs/openssl:0= ) - xml? ( dev-libs/libxml2:2= ) - xrootd? ( >=net-libs/xrootd-3.3.5:0= ) - )" - -DEPEND="${CDEPEND} - virtual/pkgconfig" - -RDEPEND="${CDEPEND} - reflex? ( dev-cpp/gccxml ) - xinetd? ( sys-apps/xinetd )" - -PDEPEND="doc? ( ~app-doc/root-docs-${PV}[math=] )" - -S="${WORKDIR}/${PN}" - -# install stuff in ${P} and not ${PF} for easier tracking in root-docs -DOC_DIR="/usr/share/doc/${P}" - -pkg_setup() { - fortran-2_pkg_setup - use python && python-single-r1_pkg_setup - echo - elog "There are extra options on packages not yet in Gentoo:" - elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite," - elog "HDFS, Monalisa, MaxDB/SapDB, SRP." - elog "You can use the env variable EXTRA_ECONF variable for this." - elog "For example, for SRP, you would set: " - elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\"" - echo - - enewgroup rootd - enewuser rootd -1 -1 /var/spool/rootd rootd - - use minimal && return - - if use math; then - if use openmp; then - if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-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}-5.28.00b-glibc212.patch \ - "${FILESDIR}"/${PN}-5.32.00-prop-flags.patch \ - "${FILESDIR}"/${PN}-5.32.00-afs.patch \ - "${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \ - "${FILESDIR}"/${PN}-5.32.00-chklib64.patch \ - "${FILESDIR}"/${PN}-5.32.00-dotfont.patch \ - "${FILESDIR}"/${PN}-5.34.05-nobyte-compile.patch \ - "${FILESDIR}"/${PN}-5.34.13-unuran.patch \ - "${FILESDIR}"/${PN}-5.34.13-desktop.patch \ - "${FILESDIR}"/${PN}-5.34.18-tutorials-path.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" - - # 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() { - - # the configure script is not the standard autotools - local myconf=( - --prefix="${EPREFIX}/usr" - --etcdir="${EPREFIX}/etc/root" - --libdir="${EPREFIX}/usr/$(get_libdir)/${PN}" - --docdir="${EPREFIX}${DOC_DIR}" - --tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials" - --testdir="${EPREFIX}${DOC_DIR}/examples/tests" - --with-cc="$(tc-getCC)" - --with-cxx="$(tc-getCXX)" - --with-f77="$(tc-getFC)" - --with-ld="$(tc-getCXX)" - --nohowto - ) - - if use minimal; then - myconf+=( $(usex X --gminimal --minimal) ) - else - myconf+=( - --with-afs-shared=yes - --with-sys-iconpath="${EPREFIX}/usr/share/pixmaps" - --disable-builtin-afterimage - --disable-builtin-ftgl - --disable-builtin-freetype - --disable-builtin-glew - --disable-builtin-pcre - --disable-builtin-zlib - --disable-builtin-lzma - --disable-cling - --enable-astiff - --enable-explicitlink - --enable-gdml - --enable-memstat - --enable-shadowpw - --enable-shared - --enable-soversion - --enable-table - --fail-on-missing - $(use_enable X x11) - $(use_enable X asimage) - $(use_enable X xft) - $(use_enable afs) - $(use_enable avahi bonjour) - $(use_enable c++0x cxx11) - $(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) - $(usex mysql \ - "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "") - $(use_enable odbc) - $(use_enable opengl) - $(use_enable oracle) - $(use_enable postgres pgsql) - $(usex postgres \ - "--with-pgsql-incdir=$(pg_config --includedir)" "") - $(use_enable prefix rpath) - $(use_enable pythia6) - $(use_enable pythia8) - $(use_enable python) - $(use_enable qt4 qt) - $(use_enable qt4 qtgsi) - $(use_enable reflex cintex) - $(use_enable reflex) - $(use_enable ruby) - $(use_enable sqlite) - $(use_enable ssl) - $(use_enable xml) - $(use_enable xrootd) - ${EXTRA_ECONF} - ) - fi - - ./configure ${myconf[@]} || die "configure failed" -} - -src_compile() { - emake \ - OPT="${CXXFLAGS}" \ - F77OPT="${FFLAGS}" \ - ROOTSYS="${S}" \ - LD_LIBRARY_PATH="${S}/lib" - use emacs && ! use minimal && elisp-compile build/misc/*.el -} - -daemon_install() { - local daemons="rootd proofd" - dodir /var/spool/rootd - fowners rootd:rootd /var/spool/rootd - dodir /var/spool/rootd/{pub,tmp} - fperms 1777 /var/spool/rootd/{pub,tmp} - - for i in ${daemons}; do - newinitd "${FILESDIR}"/${i}.initd ${i} - newconfd "${FILESDIR}"/${i}.confd ${i} - done - if use xinetd; then - insinto /etc/xinetd - doins "${S}"/etc/daemons/{rootd,proofd}.xinetd - fi -} - -desktop_install() { - cd "${S}" - echo "Icon=root-system-bin" >> etc/root.desktop - domenu etc/root.desktop - doicon build/package/debian/root-system-bin.png - - insinto /usr/share/icons/hicolor/48x48/mimetypes - doins build/package/debian/application-x-root.png - - insinto /usr/share/icons/hicolor/48x48/apps - doicon build/package/debian/root-system-bin.xpm -} - -cleanup_install() { - # Cleanup of files either already distributed or unused on Gentoo - pushd "${ED}" > /dev/null - rm usr/share/root/fonts/LICENSE || die - rm etc/root/proof/*.sample || die - rm -r etc/root/daemons || die - # these should be in PATH - mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die - rm ${DOC_DIR#/}/{INSTALL,LICENSE,COPYING.CINT} || die - use examples || rm -r ${DOC_DIR#/}/examples || die - cd usr/$(get_libdir)/root/cint/cint - rm lib/posix/mktypes lib/dll_stl/setup lib/G__* || die - rm lib/dll_stl/G__* lib/dll_stl/rootcint_* lib/posix/exten.o || die - rm include/makehpib || die - popd > /dev/null -} - -src_install() { - emake DESTDIR="${D}" install - - echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root - - if ! use minimal; then - use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root - if use python; then - echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root - python_optimize "${D}/usr/$(get_libdir)/root" - fi - use ruby && \ - echo "RUBYLIB=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root - use emacs && elisp-install ${PN} build/misc/*.{el,elc} - if use examples; then - # these should really be taken care of by the root make install - insinto ${DOC_DIR}/examples/tutorials/tmva - doins -r tmva/test - fi - fi - doenvd 99root - - # The build system installs Emacs support unconditionally in the wrong - # directory. Remove it and call elisp-install in case of USE=emacs. - rm -r "${ED}"/usr/share/emacs || die - - daemon_install - desktop_install - cleanup_install - - # do not copress files used by ROOT's CLI (.credit, .demo, .license) - docompress -x "${DOC_DIR}"/{CREDITS,LICENSE,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 -} diff --git a/sci-physics/root/root-6.00.01-r1.ebuild b/sci-physics/root/root-6.00.01-r1.ebuild deleted file mode 100644 index fae938eff..000000000 --- a/sci-physics/root/root-6.00.01-r1.ebuild +++ /dev/null @@ -1,442 +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.18-r1.ebuild,v 1.3 2014/03/27 18:51:54 bicatali Exp $ - -EAPI=5 - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="http://root.cern.ch/git/root.git" - KEYWORDS="" -else - SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${PN}" -fi - -PYTHON_COMPAT=( python2_{6,7} ) - -inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \ - toolchain-funcs user versionator - -DESCRIPTION="C++ data analysis framework and interpreter from CERN" -HOMEPAGE="http://root.cern.ch/" -DOC_URI="ftp://root.cern.ch/${PN}/doc" - -SLOT="0/$(get_version_component_range 1-3 ${PV})" -LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" -IUSE="+X afs avahi doc emacs examples fits fftw geocad graphviz - http kerberos ldap +math minimal mpi mysql odbc +opengl openmp - oracle postgres prefix pythia6 pythia8 python qt4 sqlite ssl - xinetd xml xrootd" - -# TODO: add support for: davix -# TODO: ROOT-6 supports x32 ABI, but half of its dependencies doesn't -# TODO: unbundle: cling, vdt - -REQUIRED_USE=" - mpi? ( math !openmp ) - opengl? ( X ) - openmp? ( math !mpi ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt4? ( X ) -" - -CDEPEND=" - app-arch/xz-utils:0= - >=dev-lang/cfortran-4.4-r2 - dev-libs/libpcre:3= - media-fonts/dejavu - media-libs/freetype:2= - media-libs/giflib:0= - media-libs/libpng:0= - media-libs/tiff:0= - >=sys-devel/clang-3.4 - sys-libs/zlib:0= - virtual/jpeg:0 - virtual/shadow - X? ( - media-libs/ftgl:0= - media-libs/glew:0= - x11-libs/libX11:0= - x11-libs/libXext:0= - x11-libs/libXpm:0= - !minimal? ( - opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= ) - qt4? ( - dev-qt/qtgui:4= - dev-qt/qtopengl:4= - dev-qt/qt3support:4= - dev-qt/qtsvg:4= - dev-qt/qtwebkit:4= - dev-qt/qtxmlpatterns:4= - ) - x11-libs/libXft:0= - ) - ) - !minimal? ( - afs? ( net-fs/openafs ) - avahi? ( net-dns/avahi:0= ) - emacs? ( virtual/emacs ) - fits? ( sci-libs/cfitsio:0= ) - fftw? ( sci-libs/fftw:3.0= ) - geocad? ( sci-libs/opencascade:= ) - graphviz? ( media-gfx/graphviz:0= ) - http? ( dev-libs/fcgi:0= ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap:0= ) - math? ( - sci-libs/gsl:0= - sci-mathematics/unuran:0= - mpi? ( virtual/mpi ) - ) - mysql? ( virtual/mysql ) - odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) ) - oracle? ( dev-db/oracle-instantclient-basic:0= ) - postgres? ( dev-db/postgresql:= ) - pythia6? ( sci-physics/pythia:6= ) - pythia8? ( >=sci-physics/pythia-8.1.80:8= ) - python? ( ${PYTHON_DEPS} ) - sqlite? ( dev-db/sqlite:3= ) - ssl? ( dev-libs/openssl:0= ) - xml? ( dev-libs/libxml2:2= ) - xrootd? ( >=net-libs/xrootd-3.3.5:0= ) - )" - -# TODO: ruby is not yet ported to ROOT-6, reenable when (if?) ready -# ruby? ( -# dev-lang/ruby -# dev-ruby/rubygems -# ) -# -# TODO: root-6.00.01 crashes with system libafterimage -# || ( -# media-libs/libafterimage:0=[gif,jpeg,png,tiff] -# >=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff] -# ) -# --disable-builtin-afterimage - -DEPEND="${CDEPEND} - virtual/pkgconfig" - -RDEPEND="${CDEPEND} - xinetd? ( sys-apps/xinetd )" - -PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )" - -# install stuff in ${P} and not ${PF} for easier tracking in root-docs -DOC_DIR="/usr/share/doc/${P}" - -die_compiler() { - die "Need one of the following C++11 capable compilers:" - die " >=sys-devel/gcc[cxx]-4.8" - die " >=sys-devel/clang-3.4" - die " >=dev-lang/icc-13" -} - -pkg_setup() { - fortran-2_pkg_setup - use python && python-single-r1_pkg_setup - echo - elog "There are extra options on packages not yet in Gentoo:" - elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite," - elog "HDFS, Monalisa, MaxDB/SapDB, SRP." - elog "You can use the env variable EXTRA_ECONF variable for this." - elog "For example, for SRP, you would set: " - elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\"" - echo - - enewgroup rootd - enewuser rootd -1 -1 /var/spool/rootd rootd - - use minimal && return - - if use math; then - if use openmp; then - if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-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 - - # check for supported compilers - case $(tc-getCXX) in - *g++*) - if ! version_is_at_least "4.8" "$(gcc-version)"; then - eerror "You are using a g++ without C++11 capabilities" - die_compiler - fi - ;; - *clang++*) - # >=clang-3.4 is already in DEPEND - ;; - *icc*|*icpc*) - if ! version_is_at_least "13" "$(has_version dev-lang/icc)"; then - eerror "You are using an icc without C++11 capabilities" - die_compiler - fi - ;; - *) - ewarn "You are using an unsupported compiler." - ewarn "Please report any issues upstream." - ;; - esac -} - -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.34.13-unuran.patch \ - "${FILESDIR}"/${PN}-5.34.13-desktop.patch \ - "${FILESDIR}"/${PN}-6.00.01-dotfont.patch \ - "${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \ - "${FILESDIR}"/${PN}-6.00.01-prop-flags.patch \ - "${FILESDIR}"/${PN}-6.00.01-llvm.patch \ - "${FILESDIR}"/${PN}-6.00.01-geocad.patch \ - "${FILESDIR}"/${PN}-6.00.01-cling.patch \ - "${FILESDIR}"/${PN}-6.00.01-tutorials-path.patch - - # make sure we use system libs and headers - rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die - #rm -r graf2d/asimage/src/libAfterImage || die - rm -r graf3d/ftgl/{inc,src} || die - rm -r graf2d/freetype/src || die - rm -r graf3d/glew/{inc,src} || die - rm -r core/pcre/src || die - rm -r math/unuran/src/unuran-*.tar.gz || die - LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | \ - xargs -0 rm || die - rm -r core/lzma/src/*.tar.gz || die - rm graf3d/gl/{inc,src}/gl2ps.* || die - sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \ - graf3d/gl/Module.mk || die - - # In Gentoo, libPythia6 is called libpythia6 - # iodbc is in /usr/include/iodbc - # pg_config.h is checked instead of libpq-fe.h - sed -i \ - -e 's:libPythia6:libpythia6:g' \ - -e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \ - -e 's:libpq-fe.h:pg_config.h:' \ - configure || die "adjusting configure for Gentoo failed" - - # prefixify the configure script - sed -i \ - -e 's:/usr:${EPREFIX}/usr:g' \ - configure || die "prefixify configure failed" - - # CSS should use local images - sed -i -e 's,http://.*/images/,,' etc/html/ROOT.css || die "html sed failed" -} - -# NB: ROOT uses bundled LLVM, because it is patched and API-incompatible with -# system LLVM. -# NB: As of 6.00.0.1 cmake is not ready as it can't fully replace configure, -# e.g. for afs and geocad. - -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" - --disable-werror - --nohowto - ) - - if use minimal; then - myconf+=( $(usex X --gminimal --minimal) ) - else - myconf+=( - --with-afs-shared=yes - --with-sys-iconpath="${EPREFIX}/usr/share/pixmaps" - --disable-builtin-ftgl - --disable-builtin-freetype - --disable-builtin-glew - --disable-builtin-pcre - --disable-builtin-zlib - --disable-builtin-lzma - --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 geocad) - $(use_enable graphviz gviz) - $(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 mysql) - $(usex mysql \ - "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "") - $(use_enable odbc) - $(use_enable opengl) - $(use_enable oracle) - $(use_enable postgres pgsql) - $(usex postgres \ - "--with-pgsql-incdir=$(pg_config --includedir)" "") - $(use_enable prefix rpath) - $(use_enable pythia6) - $(use_enable pythia8) - $(use_enable python) - $(use_enable qt4 qt) - $(use_enable qt4 qtgsi) - $(use_enable sqlite) - $(use_enable ssl) - $(use_enable xml) - $(use_enable xrootd) - ${EXTRA_ECONF} - ) - fi - - ./configure ${myconf[@]} || die "configure failed" -} - -src_compile() { - emake \ - OPT="${CXXFLAGS}" \ - F77OPT="${FFLAGS}" \ - ROOTSYS="${S}" \ - LD_LIBRARY_PATH="${S}/lib" - use emacs && ! use minimal && elisp-compile build/misc/*.el -} - -daemon_install() { - local daemons="rootd proofd" - dodir /var/spool/rootd - fowners rootd:rootd /var/spool/rootd - dodir /var/spool/rootd/{pub,tmp} - fperms 1777 /var/spool/rootd/{pub,tmp} - - for i in ${daemons}; do - newinitd "${FILESDIR}"/${i}.initd ${i} - newconfd "${FILESDIR}"/${i}.confd ${i} - done - if use xinetd; then - insinto /etc/xinetd - doins "${S}"/etc/daemons/{rootd,proofd}.xinetd - fi -} - -desktop_install() { - cd "${S}" - echo "Icon=root-system-bin" >> etc/root.desktop - domenu etc/root.desktop - doicon build/package/debian/root-system-bin.png - - insinto /usr/share/icons/hicolor/48x48/mimetypes - doins build/package/debian/application-x-root.png - - insinto /usr/share/icons/hicolor/48x48/apps - doicon build/package/debian/root-system-bin.xpm -} - -cleanup_install() { - # Cleanup of files either already distributed or unused on Gentoo - pushd "${ED}" > /dev/null - rm usr/share/root/fonts/LICENSE || die - rm etc/root/proof/*.sample || die - rm -r etc/root/daemons || die - # these should be in PATH - mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die - rm ${DOC_DIR#/}/{INSTALL,LICENSE} || die - use examples || rm -r ${DOC_DIR#/}/examples || die -} - -src_install() { - emake DESTDIR="${D}" install - dodoc README.md - - echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root - - if ! use minimal; then - use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root - if use python; then - echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root - python_optimize "${D}/usr/$(get_libdir)/root" - fi - use emacs && elisp-install ${PN} build/misc/*.{el,elc} - if use examples; then - # these should really be taken care of by the root make install - insinto ${DOC_DIR}/examples/tutorials/tmva - doins -r tmva/test - fi - fi - doenvd 99root - - # The build system installs Emacs support unconditionally in the wrong - # directory. Remove it and call elisp-install in case of USE=emacs. - rm -r "${ED}"/usr/share/emacs || die - - daemon_install - desktop_install - cleanup_install - - # do not copress files used by ROOT's CLI (.credit, .demo, .license) - docompress -x "${DOC_DIR}"/{CREDITS,LICENSE,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 -} diff --git a/sci-physics/root/root-6.00.02.ebuild b/sci-physics/root/root-6.00.02.ebuild deleted file mode 100644 index 271117044..000000000 --- a/sci-physics/root/root-6.00.02.ebuild +++ /dev/null @@ -1,442 +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.18-r1.ebuild,v 1.3 2014/03/27 18:51:54 bicatali Exp $ - -EAPI=5 - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="http://root.cern.ch/git/root.git" - KEYWORDS="" -else - SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${PN}" -fi - -PYTHON_COMPAT=( python2_{6,7} ) - -inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \ - toolchain-funcs user versionator - -DESCRIPTION="C++ data analysis framework and interpreter from CERN" -HOMEPAGE="http://root.cern.ch/" -DOC_URI="ftp://root.cern.ch/${PN}/doc" - -SLOT="0/$(get_version_component_range 1-3 ${PV})" -LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" -IUSE="+X afs avahi doc emacs examples fits fftw geocad graphviz - http kerberos ldap +math minimal mpi mysql odbc +opengl openmp - oracle postgres prefix pythia6 pythia8 python qt4 sqlite ssl - xinetd xml xrootd" - -# TODO: add support for: davix -# TODO: ROOT-6 supports x32 ABI, but half of its dependencies doesn't -# TODO: unbundle: cling, vdt - -REQUIRED_USE=" - mpi? ( math !openmp ) - opengl? ( X ) - openmp? ( math !mpi ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt4? ( X ) -" - -CDEPEND=" - app-arch/xz-utils:0= - >=dev-lang/cfortran-4.4-r2 - dev-libs/libpcre:3= - media-fonts/dejavu - media-libs/freetype:2= - media-libs/giflib:0= - media-libs/libpng:0= - media-libs/tiff:0= - >=sys-devel/clang-3.4 - sys-libs/zlib:0= - virtual/jpeg:0 - virtual/shadow - X? ( - media-libs/ftgl:0= - media-libs/glew:0= - x11-libs/libX11:0= - x11-libs/libXext:0= - x11-libs/libXpm:0= - !minimal? ( - opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= ) - qt4? ( - dev-qt/qtgui:4= - dev-qt/qtopengl:4= - dev-qt/qt3support:4= - dev-qt/qtsvg:4= - dev-qt/qtwebkit:4= - dev-qt/qtxmlpatterns:4= - ) - x11-libs/libXft:0= - ) - ) - !minimal? ( - afs? ( net-fs/openafs ) - avahi? ( net-dns/avahi:0= ) - emacs? ( virtual/emacs ) - fits? ( sci-libs/cfitsio:0= ) - fftw? ( sci-libs/fftw:3.0= ) - geocad? ( sci-libs/opencascade:= ) - graphviz? ( media-gfx/graphviz:0= ) - http? ( dev-libs/fcgi:0= ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap:0= ) - math? ( - sci-libs/gsl:0= - sci-mathematics/unuran:0= - mpi? ( virtual/mpi ) - ) - mysql? ( virtual/mysql ) - odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) ) - oracle? ( dev-db/oracle-instantclient-basic:0= ) - postgres? ( dev-db/postgresql:= ) - pythia6? ( sci-physics/pythia:6= ) - pythia8? ( >=sci-physics/pythia-8.1.80:8= ) - python? ( ${PYTHON_DEPS} ) - sqlite? ( dev-db/sqlite:3= ) - ssl? ( dev-libs/openssl:0= ) - xml? ( dev-libs/libxml2:2= ) - xrootd? ( >=net-libs/xrootd-3.3.5:0= ) - )" - -# TODO: ruby is not yet ported to ROOT-6, reenable when (if?) ready -# ruby? ( -# dev-lang/ruby -# dev-ruby/rubygems -# ) -# -# TODO: root-6.00.01 crashes with system libafterimage -# || ( -# media-libs/libafterimage:0=[gif,jpeg,png,tiff] -# >=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff] -# ) -# --disable-builtin-afterimage - -DEPEND="${CDEPEND} - virtual/pkgconfig" - -RDEPEND="${CDEPEND} - xinetd? ( sys-apps/xinetd )" - -PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )" - -# install stuff in ${P} and not ${PF} for easier tracking in root-docs -DOC_DIR="/usr/share/doc/${P}" - -die_compiler() { - die "Need one of the following C++11 capable compilers:"\ - " >=sys-devel/gcc[cxx]-4.8"\ - " >=sys-devel/clang-3.4"\ - " >=dev-lang/icc-13" -} - -pkg_setup() { - fortran-2_pkg_setup - use python && python-single-r1_pkg_setup - echo - elog "There are extra options on packages not yet in Gentoo:" - elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite," - elog "HDFS, Monalisa, MaxDB/SapDB, SRP." - elog "You can use the env variable EXTRA_ECONF variable for this." - elog "For example, for SRP, you would set: " - elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\"" - echo - - enewgroup rootd - enewuser rootd -1 -1 /var/spool/rootd rootd - - use minimal && return - - if use math; then - if use openmp; then - if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-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 - - # check for supported compilers - case $(tc-getCXX) in - *g++*) - if ! version_is_at_least "4.8" "$(gcc-version)"; then - eerror "You are using a g++ without C++11 capabilities" - die_compiler - fi - ;; - *clang++*) - # >=clang-3.4 is already in DEPEND - ;; - *icc*|*icpc*) - if ! version_is_at_least "13" "$(has_version dev-lang/icc)"; then - eerror "You are using an icc without C++11 capabilities" - die_compiler - fi - ;; - *) - ewarn "You are using an unsupported compiler." - ewarn "Please report any issues upstream." - ;; - esac -} - -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.34.13-unuran.patch \ - "${FILESDIR}"/${PN}-5.34.13-desktop.patch \ - "${FILESDIR}"/${PN}-6.00.01-dotfont.patch \ - "${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \ - "${FILESDIR}"/${PN}-6.00.01-prop-flags.patch \ - "${FILESDIR}"/${PN}-6.00.01-llvm.patch \ - "${FILESDIR}"/${PN}-6.00.01-geocad.patch \ - "${FILESDIR}"/${PN}-6.00.01-tutorials-path.patch \ - "${FILESDIR}"/${PN}-6.00.02-tm_zone.patch - - # make sure we use system libs and headers - rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die - #rm -r graf2d/asimage/src/libAfterImage || die - rm -r graf3d/ftgl/{inc,src} || die - rm -r graf2d/freetype/src || die - rm -r graf3d/glew/{inc,src} || die - rm -r core/pcre/src || die - rm -r math/unuran/src/unuran-*.tar.gz || die - LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | \ - xargs -0 rm || die - rm -r core/lzma/src/*.tar.gz || die - rm graf3d/gl/{inc,src}/gl2ps.* || die - sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \ - graf3d/gl/Module.mk || die - - # In Gentoo, libPythia6 is called libpythia6 - # iodbc is in /usr/include/iodbc - # pg_config.h is checked instead of libpq-fe.h - sed -i \ - -e 's:libPythia6:libpythia6:g' \ - -e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \ - -e 's:libpq-fe.h:pg_config.h:' \ - configure || die "adjusting configure for Gentoo failed" - - # prefixify the configure script - sed -i \ - -e 's:/usr:${EPREFIX}/usr:g' \ - configure || die "prefixify configure failed" - - # CSS should use local images - sed -i -e 's,http://.*/images/,,' etc/html/ROOT.css || die "html sed failed" -} - -# NB: ROOT uses bundled LLVM, because it is patched and API-incompatible with -# system LLVM. -# NB: As of 6.00.0.1 cmake is not ready as it can't fully replace configure, -# e.g. for afs and geocad. - -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" - --disable-werror - --nohowto - ) - - if use minimal; then - myconf+=( $(usex X --gminimal --minimal) ) - else - myconf+=( - --with-afs-shared=yes - --with-sys-iconpath="${EPREFIX}/usr/share/pixmaps" - --disable-builtin-ftgl - --disable-builtin-freetype - --disable-builtin-glew - --disable-builtin-pcre - --disable-builtin-zlib - --disable-builtin-lzma - --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 geocad) - $(use_enable graphviz gviz) - $(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 mysql) - $(usex mysql \ - "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "") - $(use_enable odbc) - $(use_enable opengl) - $(use_enable oracle) - $(use_enable postgres pgsql) - $(usex postgres \ - "--with-pgsql-incdir=$(pg_config --includedir)" "") - $(use_enable prefix rpath) - $(use_enable pythia6) - $(use_enable pythia8) - $(use_enable python) - $(use_enable qt4 qt) - $(use_enable qt4 qtgsi) - $(use_enable sqlite) - $(use_enable ssl) - $(use_enable xml) - $(use_enable xrootd) - ${EXTRA_ECONF} - ) - fi - - ./configure ${myconf[@]} || die "configure failed" -} - -src_compile() { - emake \ - OPT="${CXXFLAGS}" \ - F77OPT="${FFLAGS}" \ - ROOTSYS="${S}" \ - LD_LIBRARY_PATH="${S}/lib" - use emacs && ! use minimal && elisp-compile build/misc/*.el -} - -daemon_install() { - local daemons="rootd proofd" - dodir /var/spool/rootd - fowners rootd:rootd /var/spool/rootd - dodir /var/spool/rootd/{pub,tmp} - fperms 1777 /var/spool/rootd/{pub,tmp} - - for i in ${daemons}; do - newinitd "${FILESDIR}"/${i}.initd ${i} - newconfd "${FILESDIR}"/${i}.confd ${i} - done - if use xinetd; then - insinto /etc/xinetd - doins "${S}"/etc/daemons/{rootd,proofd}.xinetd - fi -} - -desktop_install() { - cd "${S}" - echo "Icon=root-system-bin" >> etc/root.desktop - domenu etc/root.desktop - doicon build/package/debian/root-system-bin.png - - insinto /usr/share/icons/hicolor/48x48/mimetypes - doins build/package/debian/application-x-root.png - - insinto /usr/share/icons/hicolor/48x48/apps - doicon build/package/debian/root-system-bin.xpm -} - -cleanup_install() { - # Cleanup of files either already distributed or unused on Gentoo - pushd "${ED}" > /dev/null - rm usr/share/root/fonts/LICENSE || die - rm etc/root/proof/*.sample || die - rm -r etc/root/daemons || die - # these should be in PATH - mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die - rm ${DOC_DIR#/}/{INSTALL,LICENSE} || die - use examples || rm -r ${DOC_DIR#/}/examples || die -} - -src_install() { - emake DESTDIR="${D}" install - dodoc README.md - - echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root - - if ! use minimal; then - use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root - if use python; then - echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root - python_optimize "${D}/usr/$(get_libdir)/root" - fi - use emacs && elisp-install ${PN} build/misc/*.{el,elc} - if use examples; then - # these should really be taken care of by the root make install - insinto ${DOC_DIR}/examples/tutorials/tmva - doins -r tmva/test - fi - fi - doenvd 99root - - # The build system installs Emacs support unconditionally in the wrong - # directory. Remove it and call elisp-install in case of USE=emacs. - rm -r "${ED}"/usr/share/emacs || die - - daemon_install - desktop_install - cleanup_install - - # do not copress files used by ROOT's CLI (.credit, .demo, .license) - docompress -x "${DOC_DIR}"/{CREDITS,LICENSE,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 -} diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index ac10320ec..bd946b81a 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -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.18-r1.ebuild,v 1.3 2014/03/27 18:51:54 bicatali Exp $ +# $Header: $ EAPI=5 @@ -14,7 +14,7 @@ else S="${WORKDIR}/${PN}" fi -PYTHON_COMPAT=( python2_{6,7} ) +PYTHON_COMPAT=( python2_7 ) inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \ toolchain-funcs user versionator |