diff options
42 files changed, 634 insertions, 417 deletions
diff --git a/dev-python/pywcsgrid2/ChangeLog b/dev-python/pywcsgrid2/ChangeLog index 9f60711b4..976b17138 100644 --- a/dev-python/pywcsgrid2/ChangeLog +++ b/dev-python/pywcsgrid2/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 23 Dec 2014; Joseph Jon Booker <joe@neoturbine.net> pywcsgrid2-9999.ebuild: + dev-python/pywcsgrid2: Update dep and add py3.4 + 05 Feb 2014; Joseph Jon Booker <joe@neoturbine.net> pywcsgrid2-9999.ebuild: dev-python/pywcsgrid2: Mask pywcsgrid2-9999 and remove keywords diff --git a/dev-python/pywcsgrid2/pywcsgrid2-9999.ebuild b/dev-python/pywcsgrid2/pywcsgrid2-9999.ebuild index 43a4978ab..fa26e5ec8 100644 --- a/dev-python/pywcsgrid2/pywcsgrid2-9999.ebuild +++ b/dev-python/pywcsgrid2/pywcsgrid2-9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_2 python3_3 ) +PYTHON_COMPAT=( python2_7 python3_{3,4} ) inherit distutils-r1 git-r3 @@ -21,5 +21,5 @@ RDEPEND=" || ( dev-python/pyfits[${PYTHON_USEDEP}] dev-python/astropy[${PYTHON_USEDEP}] ) dev-python/numpy[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] - virtual/pywcs[${PYTHON_USEDEP}]" + || ( virtual/pywcs[${PYTHON_USEDEP}] dev-python/astropy[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" diff --git a/licenses/atsas b/licenses/atsas new file mode 100644 index 000000000..16d0e700f --- /dev/null +++ b/licenses/atsas @@ -0,0 +1,211 @@ +ACADEMIC SOFTWARE LICENSE AGREEMENT FOR END-USERS AT PUBLIC FUNDED ACADEMIC, +EDUCATION OR RESEARCH INSTITUTIONS FOR THE USE OF ATSAS 2.6 + +By clicking the Acceptance button for the ATSAS 2.6 Software ("Licensed +Software"), you are consenting to be bound by and become a party to this +agreement as the "Licensee". If you do not agree to all of the terms of +this agreement, you must not click the Acceptance button, not install +the product nor use the product, and you do not become a LICENSEE under +this agreement. + +If you are not a member of a public funded Academic and/or Education and/ +or Research Institution you must obtain a commercial license from EMBLEM +(Info@embl-em.de). + +This software license agreement is entered into by and between EMBL Enter- +prise Management GmbH (hereinafter "EMBLEM") located at Boxberg Ring 107, +D-69126 Heidelberg, Germany and the "LICENSEE". + +WHEREAS EMBLEM has the right to license all copyrights and other property +rights in the Licensed Software identified as ATSAS 2.6 and developed by +EMBL (European Molecular Biology Laboratory, Meyerhofstrasse 1, 69117 +Heidelberg, Germany), and EMBLEM desires to license the Software so that +it becomes available for public use and benefit. + +WHEREAS LICENSEE is a public funded Academic and/or Education and/or +Research Institution. + +WHEREAS LICENSEE desires to acquire a free non-exclusive license to use +the Software for internal research purposes only. + +NOW, THEREFORE, in consideration of the mutual promises and covenants +contained herein, the parties agree as follows: + +1. Definitions +"Licensed Software" means the current version 2.6 of the ATSAS computer +package developed by ATSAS team at EMBL-Hamburg, collectively the "Authors", +pursuant to this Agreement. + +Any opinion, findings, conclusions or recommendations expressed in the +ATSAS 2.6 suite are those of the authors and do not necessarily reflect +the views of EMBL and EMBLEM. + +2. License +Subject to the terms and conditions of this Agreement a non-exclusive, +non-transferable License to use and copy the Licensed Software is made +available free of charge for the LICENSEE which is a non-profit educational, +academic and/or research institution. The License is only granted for +personal and internal use in research only at one Site, where a Site +is defined as a set of contiguous buildings in one location. The software +will be used at only one location of LICENSEE. + +This license does not entitle Licensee to receive from EMBLEM copies of +the Licensed software on disks, tapes or CD's, hard-copy documentation, +technical support, telephone assistance, or enhancements or updates to +the Licensed Software. + +The user and any research assistants, co-workers or other workers who may +use the Software agree to not give the source code to third parties or +grant licenses on software, which include the Software, alone or integrated +into other software, to third parties. Modification of the source code +is prohibited without the prior written consent of EMBLEM. + +3. Ownership +Except as expressly licensed in this Agreement, EMBL shall retain title to +the Licensed Software, and any upgrades and modifications created by EMBL. + +4. Consideration +In consideration for the license rights granted by EMBLEM, LICENSEE will +obtain this academic license free of charge. + +5. Copies +LICENSEE shall have the right to make copies of the Licensed Software for +internal use at the Site and for back-up purposes under this Agreement, +but agrees that all such copies shall contain the copyright notices and +all other reasonable and appropriate proprietary markings or confidential +legends that appear on the Licensed Software provided hereunder. + +6. Support +EMBLEM shall have no obligation to offer support services to LICENSEE, and +nothing contained herein shall be interpreted as to require EMBLEM to provide +maintenance, installation services, debugging, consultation or end-user +support of any kind. EMBLEM will provide any available updates for a period +of one year, without additional cost. + +7. Software Protection +LICENSEE acknowledges that the ATSAS Software is proprietary to EMBLEM. +The software code shall be treated as trade secrets and confidential +information of EMBLEM, and LICENSEE agrees to use best efforts to hold +the same in confidence. LICENSEE's obligation for confidentiality shall +not extend to any information which is or becomes generally available +to the public, is already known to or subsequently disclosed by third +parties to LICENSEE and at its free disposal, or is independently +developed by LICENSEE or its affiliates without the use of the confidential +information disclosed by EMBLEM, or is required by law or legal process. + +Except as other wise expressly permitted in this Agreement, LICENSEE may +not (i) modify or create any derivative works of the Licensed Software or +documentation, including customisation, translation or localization; (ii) +decompile, disassemble, reverse engineer, or otherwise attempt to derive +the source code for the Product; (iii) redistribute, encumber, sell, rent, +lease, sublicense, or otherwise transfer rights to the Licensed Software; +(iv) remove or alter any trademark, logo, copyright or other proprietary +notices, legends, symbols or labels in the Product; or (v) publish any +results of benchmark tests run on the Product to a third party without +EMBLEM's prior written consent. + +8. Representations of EMBLEM to LICENSEE +EMBLEM represents to LICENSEE that (i) EMBLEM has the right to grant the +License and to enter into this agreement, (ii) that, to the best of +EMBLEM's knowledge, the Licensed software does not infringe any patent, +copyright or trade secrets of any third party, provided however that such +representation and warranty shall not apply to any addition to, or +modifications or adaptation of, the Licensed Software made by LICENSEE and +(iii) EMBLEM undertakes to use best efforts to cooperate with and assist +LICENSEE, at LICENSEE's expense, in defending itself against any action +based on the alleged infringement of any third party patent, copyright or +trade secret rights resulting from or relating to the use or licensing of +the Licensed Software by LICENSEE. + +9. Indemnity and Disclaimer of Warranties +Except as expressly set forth in this agreement, EMBLEM makes no +representations or warranties, express or implied. + +The product is provided free of charge, and, therefore, on an "as is" basis, +without warranty of any kind, express or implied, including without limitation +the warranties that it is free of defects, virus free, able to operate on an +uninterrupted basis, merchantable, fit for a particular purpose or non-inter- +fering. The entire risk as to the quality and performance of the Licensed +Software is borne by LICENSEE. + +By way of example, but not limitation, EMBLEM makes no representations or +warranties of merchantability or fitness for any particular application or, +except as set forth in paragraph 8, that the use of the Software will not +infringe any patents, copyrights or trademarks or other rights of third +parties. The entire risk as to the quality and performance of the product +is borne by LICENSEE. EMBLEM shall not be liable for any liability or +damages with respect to any claim by LICENSEE or any third party on account +of, or arising from the license or use of the Software. + +Should the Licensed Software prove defective in any respect, LICENSEE and +not LICENSOR or it's affiliates should assume the entire cost of any service +and repair. This disclaimer of warranty constitutes an essential part of +this agreement. No use of the licensed product is authorized hereunder except +under this disclaimer. + +In no event will LICENSOR or its affiliates be liable for any indirect, +special, incidental or consequential damages arising out of the use of +or inability to use the product, including, without limitation, damages +for lost profits, loss of goodwill, work stoppage, computer failure or +malfunction, or any and all other commercial damages or losses, even if +advised of the possibility thereof, and regardless of the legal or +equitable theory (contract, tort or otherwise) upon which the claim +is based. + +10. Promotional Advertising & References +LICENSEE may not use the name "ATSAS" in its promotional advertising, product +literature, and other similar promotional materials to be disseminated to the +public or any portion thereof. LICENSEE agrees not to identify EMBL in any +promotional advertising or other promotional materials to be disseminated to +the public, or any portion thereof without EMBLEM's prior written consent. +LICENSEE agrees that any reference to the software for crystallographic +computations will cite one or more publications as set forth in the manual +and in agreement with common scientific practice. EMBLEM or EMBL shall not +use LICENSEE's name in publicity or advertising involving this Agreement or +otherwise without LICENSEE's prior written consent which may be withheld at +LICENSEE's sole discretion. + + +11. Term +This Agreement and the license rights granted herein shall become effective +as of the date this Agreement is executed by both parties and shall be +perpetual unless terminated in accordance with this Section. + +EMBLEM may terminate this Agreement at any time. + +Either party may terminate this Agreement at any time effective upon the +other party's breach of any agreement, covenant, or representation made +in this Agreement, such breach remaining uncorrected sixty (60) days after +written notice thereof. + +LICENSEE shall have the right, at any time, to terminate this Agreement +without cause by written notice to EMBLEM specifying the date of termination. + +Upon termination, LICENSEE shall destroy all full and partial copies of the +Licensed Software + +12. Governing Law +This Agreement shall be construed in accordance with the laws of Germany. + +13. General +The parties agree that this Agreement is the complete and exclusive agreement +among the parties and supersedes all proposals and prior agreements whether +written or oral, and all other communications among the parties relating to +the subject matter of this Agreement. This Agreement cannot be modified except +in writing and signed by both parties. Failure by either party at any time to +enforce any of the provisions of this Agreement shall not constitute a waiver +by such party of such provision nor in any way affect the validity of this +Agreement. + +The invalidity of singular provisions does not affect the validity of the +entire understanding. The parties are obligated, however, to replace the +invalidprovisions by a regulation which comes closest to the economic +intent of the invalid provision. The same shall apply mutatis mutandis in +case of a gap. + +IN WITNESS WHEREOF, the LICENSEE hereto have caused this Agreement to be +duly executed on the date of the download of the software and by accepting +the license conditions by pressing the Acceptance button. + +I have read this License Agreement and I agree to uphold the terms and +conditions of this license. diff --git a/sci-astronomy/pyAstroStack/ChangeLog b/sci-astronomy/pyAstroStack/ChangeLog deleted file mode 100644 index 9c477bee5..000000000 --- a/sci-astronomy/pyAstroStack/ChangeLog +++ /dev/null @@ -1,21 +0,0 @@ -# ChangeLog for sci-astronomy/pyAstroStack -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 16 Sep 2014; Christoph Junghans <ottxor@gentoo.org> pyAstroStack-0.3.0.ebuild: - clean up - - 16 Apr 2014; Mikko Laine <mikko.laine@gmail.com> pyAstroStack-0.3.0.ebuild: - sci-overlay/sci: more DEPEND fixes about configparser - - 16 Apr 2014; Mikko Laine <mikko.laine@gmail.com> pyAstroStack-0.3.0.ebuild: - sci-overlay/sci: DEPEND fixes about configparser - - 14 Apr 2014; Mikko Laine <mikko.laine@gmail.com> pyAstroStack-0.3.0.ebuild: - sci-overlay/sci: Added few missing PYTHON_DEPENDS - -*pyAstroStack-0.3.0 (11 Apr 2014) - - 11 Apr 2014; Mikko Laine <mikko.laine@gmail.com> +metadata.xml, - +pyAstroStack-0.3.0.ebuild: - sci-overlay/sci: Added an ebuild for pyAstroStack diff --git a/sci-astronomy/pyAstroStack/Manifest b/sci-astronomy/pyAstroStack/Manifest deleted file mode 100644 index 429f07fba..000000000 --- a/sci-astronomy/pyAstroStack/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pyAstroStack-0.3.0.tar.gz 188900 SHA256 88e93609999257eb0df4528189ba952111545a85aea2b93e1d1195e536d49c93 SHA512 ea21e3db2f17ec622e0608d111c23a29753818e89e3e70a5056953514bcae2c59a3aeb43492c7fa1add16610e2d147276783edce3207bf29e33c700e2a055cfb WHIRLPOOL 0a0629eda7a4790ae21189288d41ed20b36171f0609a7c24a3ff3c9bdff88cfa3dfdc5f5252d2f756e1e358fa5eae8c179362a0d0a32152a3b25d953944a87af diff --git a/sci-astronomy/pyAstroStack/metadata.xml b/sci-astronomy/pyAstroStack/metadata.xml deleted file mode 100644 index e5392c544..000000000 --- a/sci-astronomy/pyAstroStack/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>mikko.laine@gmail.com</email> - <name>Mikko Laine</name> - </maintainer> - <longdescription> - An open source stacking software for astronomical images taken with a DSLR - camera. PyAstroStack can calibrate, debayer, register, align and stack photos - taken with modern DSLR's from Canon. It has a command line user interface - inspired by AstroSurf IRIS. - </longdescription> - <use> - <flag name="opencl">Enables OpenCL support and pulls in pyopencl. This makes - some operations much faster but requires specific hardware and drivers.</flag> - </use> -</pkgmetadata> diff --git a/sci-astronomy/pyAstroStack/pyAstroStack-0.3.0.ebuild b/sci-astronomy/pyAstroStack/pyAstroStack-0.3.0.ebuild deleted file mode 100644 index b5e04f340..000000000 --- a/sci-astronomy/pyAstroStack/pyAstroStack-0.3.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_2,3_3} ) - -inherit distutils-r1 - -DESCRIPTION="Stacking software for astronomical images" -HOMEPAGE="https://bitbucket.org/mikko_laine/pyastrostack/" -SRC_URI="http://bitbucket.org/mikko_laine/pyastrostack/downloads/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="opencl" - -DEPEND=">=dev-python/numpy-1.8.0[${PYTHON_USEDEP}] - dev-python/cython[${PYTHON_USEDEP}]" - -RDEPEND=">=dev-python/pillow-2.3.0[${PYTHON_USEDEP}] - dev-python/configparser[$(python_gen_usedep python2_7)] - sci-libs/scikits_image[${PYTHON_USEDEP}] - >media-gfx/imagemagick-6.8.0.0 - sci-astronomy/sextractor - media-gfx/dcraw - media-libs/exiftool - dev-python/astropy[${PYTHON_USEDEP}] - opencl? ( >=dev-python/pyopencl-2013.1[${PYTHON_USEDEP}] )" - -DOCS=( CHANGES.txt README.txt ) diff --git a/sci-biology/atsas/ChangeLog b/sci-biology/atsas/ChangeLog new file mode 100644 index 000000000..deca3a5d1 --- /dev/null +++ b/sci-biology/atsas/ChangeLog @@ -0,0 +1,25 @@ +# ChangeLog for sci-biology/atsas +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 22 Dec 2014; Justin Lecher <jlec@gentoo.org> atsas-2.6.0.ebuild: + Add missing libs to installation + + 22 Dec 2014; Justin Lecher <jlec@gentoo.org> atsas-2.6.0.ebuild: + Add libdir to rpath + + 21 Dec 2014; Justin Lecher <jlec@gentoo.org> atsas-2.6.0.ebuild: + Drop quotes + + 21 Dec 2014; Justin Lecher <jlec@gentoo.org> atsas-2.6.0.ebuild: + Add missing libpath + + 17 Dec 2014; Justin Lecher <jlec@gentoo.org> atsas-2.6.0.ebuild: + Add missing deps + +*atsas-2.6.0 (17 Dec 2014) + + 17 Dec 2014; Justin Lecher <jlec@gentoo.org> +atsas-2.6.0.ebuild, + +metadata.xml: + New addition written by me + diff --git a/sci-biology/atsas/Manifest b/sci-biology/atsas/Manifest new file mode 100644 index 000000000..43187d41b --- /dev/null +++ b/sci-biology/atsas/Manifest @@ -0,0 +1 @@ +DIST ATSAS-2.6.0-1_amd64.tar.gz 186039970 SHA256 f2f1d251d28f43fd42e13bac602b8a416dd9ad16ca56d12e7227174f9e16a2a1 SHA512 b3f83ef1d76e6e0597b1ce611be6a23823302ec0af9e0cf0251e343aacb231ae403128e748c7bc69981dfe398e13366c18fdc67fe6eaf37deb1d7ea7d8e8a25e WHIRLPOOL 85a3b7b023326645fd7dc2994fdd0c9751b3685fcb52a8a5fac36599997759efc8dbd8537a9527b140f533592ecc58cc90e59d31b9e6b7c5befee67c2ea1f0c3 diff --git a/sci-biology/atsas/atsas-2.6.0.ebuild b/sci-biology/atsas/atsas-2.6.0.ebuild new file mode 100644 index 000000000..e9723038f --- /dev/null +++ b/sci-biology/atsas/atsas-2.6.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit python-r1 + +DESCRIPTION="Biological Small Angle Scattering" +HOMEPAGE="http://www.embl-hamburg.de/biosaxs" +#SRC_URI="ATSAS-2.6.0-1.sl5.x86_64.tar.gz" +#SRC_URI="ATSAS-2.6.0-1.el6.x86_64.tar.gz" +SRC_URI="ATSAS-2.6.0-1_amd64.tar.gz" + +SLOT="0" +LICENSE="atsas" +KEYWORDS="~amd64 ~amd64-linux" +IUSE="examples" + +RDEPEND=" + dev-libs/libxml2:2 + dev-qt/qtcore:4 + dev-qt/qtgui:4 + media-libs/tiff:0 + sci-libs/cbflib + x11-libs/qwt:5 +" +DEPEND="dev-util/patchelf" + +RESTRICT="fetch" + +S="${WORKDIR}"/${P^^}-1 + +QA_PREBUILT="opt/.* usr/.*" + +pkg_nofetch() { + elog "Please visit http://www.embl-hamburg.de/biosaxs/atsas-online/download.php" + elog "and download the ${A} for Ubuntu 14.04" + elog "and place it in ${DISTDIR}" +} + +src_install() { + local i + for i in bin/*; do + patchelf \ + --set-rpath "$(gcc-config -L):${EPREFIX}/opt/${PN}/:${EPREFIX}/usr/lib/qt4/" \ + ${i} || die + done + exeinto /opt/bin + doexe bin/* + + insinto /opt/${PN} + doins lib/*/atsas/{libedf.so*,libqtsoap.so*,libqwt*.so*,libsaxs*.so*} + + python_foreach_impl python_domodule lib/*/atsas/python*/dist-packages/* + + rm share/doc/${P}/LICENSE.txt || die + if use examples; then + cp -rf share/doc/${P}/* share/${PN}/ || die + fi + + pushd share/icons/hicolor/ > /dev/null + for i in *; do + doicon -s ${i} -t hicolor ${i}/* + done + popd > /dev/null + + domenu share/applications/* + + rm -rf share/{applications,doc,icons,mime} || die + + insinto /usr + doins -r share +} diff --git a/sci-biology/atsas/metadata.xml b/sci-biology/atsas/metadata.xml new file mode 100644 index 000000000..f17a827e3 --- /dev/null +++ b/sci-biology/atsas/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>sci-biology</herd> +</pkgmetadata> diff --git a/sci-biology/discrover/ChangeLog b/sci-biology/discrover/ChangeLog new file mode 100644 index 000000000..8994dda11 --- /dev/null +++ b/sci-biology/discrover/ChangeLog @@ -0,0 +1,11 @@ +# ChangeLog for sci-biology/discrover +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*discrover-1.3.1 (15 Dec 2014) + + 15 Dec 2014; Jonas Maaskola <jonas@maaskola.de> +discrover-1.3.1.ebuild, + -discrover-1.1.2.ebuild, discrover-9999.ebuild: + sci-biology/discrover: version bump; add to RDEPEND Bump ebuild for new + release. When the USE flag "logo" is used, we also need to depend on texlive- + latexextra for the standalone package. diff --git a/sci-biology/discrover/Manifest b/sci-biology/discrover/Manifest index 9de78dfc6..1c6054220 100644 --- a/sci-biology/discrover/Manifest +++ b/sci-biology/discrover/Manifest @@ -1 +1 @@ -DIST discrover-1.1.2.tar.gz 221737 SHA256 d023b2154a4b5f8878dd4eb389f0e509a0ca453e21a92783ece03215060b42d1 SHA512 dcd6c3f52a9e5fc3f6ea4112a4fca98f22052605d214e514f5ed0fbf31cb416920daa91a686deb6858723d34524c47d33da77f06510ab8ad61580cf23e5c218b WHIRLPOOL 7a835891a04a0ef2510062d3d84583155c50168a672abe0ba2e3517602ba1c480d3764df1005b1f61e7dcbd1c0098cc74679a8c3e430da517d94a18e355d3522 +DIST discrover-1.3.1.tar.gz 224397 SHA256 7badd16a885657bae091c0eea101a59c10b8889c34ba53833e1b673548d150d5 SHA512 a9108c3b5ae03bec3c2cad352efc88d66de5973e51cfe97c8bbfbe52a1a24dad9acbd4aa00fd9d33de31dba6e76031c066b62a36c55048790a2814bbffe1786b WHIRLPOOL ed70b88ee64588368ffe354ac0d33e4ee48d7be427485384e1583732e138bfe2f7338076c67f29103234d5ca70a129f888ac572464e18c9ee813b72a62208637 diff --git a/sci-biology/discrover/discrover-1.1.2.ebuild b/sci-biology/discrover/discrover-1.3.1.ebuild index f1cac2a41..c892c73cf 100644 --- a/sci-biology/discrover/discrover-1.1.2.ebuild +++ b/sci-biology/discrover/discrover-1.3.1.ebuild @@ -20,6 +20,7 @@ RDEPEND=" logo? ( dev-lang/ruby dev-texlive/texlive-latex + dev-texlive/texlive-latexextra dev-tex/pgf dev-tex/xcolor media-gfx/imagemagick diff --git a/sci-biology/discrover/discrover-9999.ebuild b/sci-biology/discrover/discrover-9999.ebuild index 1d0ac53b0..d01dfdce2 100644 --- a/sci-biology/discrover/discrover-9999.ebuild +++ b/sci-biology/discrover/discrover-9999.ebuild @@ -20,6 +20,7 @@ RDEPEND=" logo? ( dev-lang/ruby dev-texlive/texlive-latex + dev-texlive/texlive-latexextra dev-tex/pgf dev-tex/xcolor media-gfx/imagemagick diff --git a/sci-chemistry/freeon/ChangeLog b/sci-chemistry/freeon/ChangeLog index 509aa1acc..5860bfe0a 100644 --- a/sci-chemistry/freeon/ChangeLog +++ b/sci-chemistry/freeon/ChangeLog @@ -2,6 +2,16 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Dec 2014; Nicolas Bock <nicolasbock@gentoo.org> freeon-9999.ebuild: + sci-chemistry/freeon-9999: Add proper prefix flags to configure. + + 19 Dec 2014; Nicolas Bock <nicolasbock@gentoo.org> freeon-9999.ebuild: + sci-chemistry/freeon-9999: Move files. + + 19 Dec 2014; Nicolas Bock <nicolasbock@gentoo.org> -Manifest, + -freeon-1.0.8-r1.ebuild, -freeon-1.0.8.ebuild: + sci-chemistry/freeon: Cleaning up old ebuilds. + 26 Oct 2014; Justin Lecher <jlec@gentoo.org> ChangeLog: Drop obsolete versions diff --git a/sci-chemistry/freeon/Manifest b/sci-chemistry/freeon/Manifest deleted file mode 100644 index fc703c067..000000000 --- a/sci-chemistry/freeon/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST freeon-1.0.8.tar.bz2 5957707 SHA256 ae14c1b640e4dcd9f18d2807f2debf9fc005b7451401e3e5d7b9dc76919f381d SHA512 1227f670a73b4ea39beb26e4136ad535e126ad17d66171c31b3bd403a3886eee150cda865806a2d9dad85646ccb086a6be4f645455eab24603cb064fb725efbd WHIRLPOOL b41a3b1e4bb152309a12ac0c4fec07c932809bb465af4b08cb76f6e0bf089c4d91682e1428c47d1adb449d153a1338cd3d540e860ca22774a299e21da44a16c1 diff --git a/sci-chemistry/freeon/freeon-1.0.8-r1.ebuild b/sci-chemistry/freeon/freeon-1.0.8-r1.ebuild deleted file mode 100644 index 46a7af074..000000000 --- a/sci-chemistry/freeon/freeon-1.0.8-r1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 -FORTRAN_STANDARD=90 -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) - -inherit autotools-utils fortran-2 python-any-r1 - -DESCRIPTION="An experimental suite of programs for linear scaling quantum chemistry." -HOMEPAGE="http://www.freeon.org" -SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${PN}-${PV}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - sci-libs/hdf5 - virtual/blas - virtual/lapack" -DEPEND="${RDEPEND} - ${PYTHON_DEPS}" diff --git a/sci-chemistry/freeon/freeon-1.0.8.ebuild b/sci-chemistry/freeon/freeon-1.0.8.ebuild deleted file mode 100644 index f1cb154d8..000000000 --- a/sci-chemistry/freeon/freeon-1.0.8.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 -FORTRAN_STANDARD=90 - -inherit autotools-utils fortran-2 - -DESCRIPTION="An experimental suite of programs for linear scaling quantum chemistry." -HOMEPAGE="http://www.freeon.org" -SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${PN}-${PV}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - sci-libs/hdf5 - virtual/blas - virtual/lapack" -DEPEND="${RDEPEND}" diff --git a/sci-chemistry/freeon/freeon-9999.ebuild b/sci-chemistry/freeon/freeon-9999.ebuild index c90b8e27f..28e6d1788 100644 --- a/sci-chemistry/freeon/freeon-9999.ebuild +++ b/sci-chemistry/freeon/freeon-9999.ebuild @@ -6,7 +6,7 @@ EAPI=5 AUTOTOOLS_AUTORECONF=1 FORTRAN_STANDARD=90 -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) +PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} ) inherit autotools-utils fortran-2 git-r3 python-any-r1 @@ -16,7 +16,7 @@ SRC_URI="" EGIT_REPO_URI="https://github.com/FreeON/freeon.git" LICENSE="GPL-3" -SLOT="0" +SLOT="live" KEYWORDS="" IUSE="" @@ -35,6 +35,13 @@ src_prepare() { src_configure() { local myeconfargs=( "--enable-git-tag" + "--prefix=/opt/freeon" + "--mandir=/opt/freeon/share/man" + "--infodir=/opt/freeon/share/info" + "--datadir=/opt/freeon/share" + "--sysconfdir=/opt/freeon/etc" + "--libdir=/opt/freeon/lib64" + "--docdir=/opt/freeon/share/doc" ) autotools-utils_src_configure } diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog index fb0201804..da2baae61 100644 --- a/sci-chemistry/gromacs/ChangeLog +++ b/sci-chemistry/gromacs/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 21 Dec 2014; Christoph Junghans <ottxor@gentoo.org> gromacs-5.0.9999.ebuild: + sync with gx86 + 25 Nov 2014; Christoph Junghans <ottxor@gentoo.org> gromacs-4.6.9999.ebuild, gromacs-5.0.9999.ebuild, gromacs-9999.ebuild: fixed a typo preventing AVX2 support (bug #530454) diff --git a/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild b/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild index e869042b9..210ceefcf 100644 --- a/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild @@ -259,9 +259,13 @@ src_install() { for x in "${ED}"usr/bin/gmx-completion{,?*}.bash ; do echo $(<${x}) done > "${T}"/gmx-bashcomp || die - newbashcomp "${T}"/gmx-bashcomp gromacs + newbashcomp "${T}"/gmx-bashcomp gmx + bashcomp_alias gmx mdrun rm "${ED}"usr/bin/gmx-completion{,?*}.bash || die - + if use double-precision && use single-precision; then + bashcomp_alias gmx gmx_d + bashcomp_alias gmx mdrun_d + fi readme.gentoo_create_doc } diff --git a/sci-chemistry/nwchem/ChangeLog b/sci-chemistry/nwchem/ChangeLog index 36188d483..c88a1d315 100644 --- a/sci-chemistry/nwchem/ChangeLog +++ b/sci-chemistry/nwchem/ChangeLog @@ -2,6 +2,15 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*nwchem-6.5_p26243-r3 (17 Dec 2014) + + 17 Dec 2014; Honza Macháček <Hloupy.Honza@centrum.cz> + -nwchem-6.5_p26243-r2.ebuild, +nwchem-6.5_p26243-r3.ebuild: + Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config; + correct dep for pkgconfig to virtual; correct the pkgconfig names of + libraries for the int64 versions; remove mpi USE flag, MPI is mandatory + in the 6.5 version + *nwchem-6.5_p26243-r2 (09 Dec 2014) 09 Dec 2014; Honza Macháček <Hloupy.Honza@centrum.cz> diff --git a/sci-chemistry/nwchem/nwchem-6.5_p26243-r2.ebuild b/sci-chemistry/nwchem/nwchem-6.5_p26243-r3.ebuild index 4fc36c546..77dfb138f 100644 --- a/sci-chemistry/nwchem/nwchem-6.5_p26243-r2.ebuild +++ b/sci-chemistry/nwchem/nwchem-6.5_p26243-r3.ebuild @@ -26,10 +26,9 @@ SRC_URI="http://www.nwchem-sw.org/images/Nwchem-${PV%_p*}.revision${PV#*_p}-src. LICENSE="ECL-2.0" SLOT="0" KEYWORDS="~x86 ~amd64" -IUSE="blas cuda doc examples infiniband int64 lapack mpi mrcc nwchem-tests openmp python scalapack" +IUSE="blas cuda doc examples infiniband int64 lapack mrcc nwchem-tests openmp python scalapack" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) - infiniband? ( mpi ) scalapack? ( !int64 ) lapack? ( blas ) scalapack? ( blas )" @@ -46,8 +45,9 @@ RDEPEND=" ) python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND} + virtual/pkgconfig app-shells/tcsh - mpi? ( virtual/mpi[fortran] ) + virtual/mpi[fortran] infiniband? ( || ( sys-cluster/openmpi[fortran,openmpi_fabrics_ofed] sys-cluster/mvapich2[fortran] @@ -61,14 +61,10 @@ S="${WORKDIR}/${PN}" 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 + export FC="mpif90" + export F77="mpif77" + export CC="mpicc" + export CXX="mpic++" use openmp && FORTRAN_NEED_OPENMP=1 @@ -143,20 +139,18 @@ src_compile() { export NWCHEM_LONG_PATHS=Y export USE_NOIO=TRUE use openmp && export USE_OPENMP=1 - if use mpi ; then - export USE_MPI=y - export USE_MPIF=y - export USE_MPIF4=y - export MPI_LOC="${EPREFIX}"/usr - export MPI_INCLUDE=$MPI_LOC/include - export MPI_LIB=$MPI_LOC/$(get_libdir) - export LIBMPI="$(mpif90 -showme:link)" - if use infiniband; then - export ARMCI_NETWORK=OPENIB - export MSG_COMMS=MPI - else - unset ARMCI_NETWORK - fi + export USE_MPI=y + export USE_MPIF=y + export USE_MPIF4=y + export MPI_LOC="${EPREFIX}"/usr + export MPI_INCLUDE=$MPI_LOC/include + export MPI_LIB=$MPI_LOC/$(get_libdir) + export LIBMPI="$(mpif90 -showme:link)" + if use infiniband; then + export ARMCI_NETWORK=OPENIB + export MSG_COMMS=MPI + else + unset ARMCI_NETWORK fi if [ "$ARCH" = "amd64" ]; then export NWCHEM_TARGET=LINUX64 @@ -186,9 +180,15 @@ src_compile() { export EACCSD="TRUE" # Electron Affinities at the CCSD level export IPCCSD="TRUE" # Ionisation Potentials at the CCSD level unset BLASOPT - use blas && export BLASOPT="$(pkg-config --libs blas)" - use lapack && export BLASOPT+="$(pkg-config --libs lapack)" - use scalapack && export BLASOPT+="$(pkg-config --libs scalapack)" + local blaspkg="blas" + local lapackpkg="lapack" + if use int64; then + blaspkg="blas-int64" + lapackpkg="lapack-int64" + fi + use blas && export BLASOPT="$($(tc-getPKG_CONFIG) --libs ${blaspkg})" + use lapack && export BLASOPT+="$($(tc-getPKG_CONFIG) --libs ${lapackpkg})" + use scalapack && export BLASOPT+="$($(tc-getPKG_CONFIG) --libs scalapack)" if use cuda; then export TCE_CUDA=Y export CUDA_PATH=/opt/cuda diff --git a/sci-libs/dealii/ChangeLog b/sci-libs/dealii/ChangeLog index 9253cf714..40e7c6894 100644 --- a/sci-libs/dealii/ChangeLog +++ b/sci-libs/dealii/ChangeLog @@ -2,6 +2,17 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 24 Dec 2014; Matthias Maier <tamiko@gentoo.org> dealii-9999.ebuild: + fix installation + +*dealii-8.1.0-r2 (24 Dec 2014) +*dealii-8.2.0_rc2 (24 Dec 2014) + + 24 Dec 2014; Matthias Maier <tamiko@gentoo.org> +dealii-8.1.0-r2.ebuild, + +dealii-8.2.0_rc2.ebuild, -dealii-8.1.0-r1.ebuild, dealii-9999.ebuild, + metadata.xml: + version bump; ebuild maintenance; fix SRC_URI + *dealii-8.1.0-r1 (14 Oct 2014) 14 Oct 2014; Matthias Maier <tamiko@gentoo.org> +dealii-8.1.0-r1.ebuild, diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest index 7e8d9e844..8b8f6c2f6 100644 --- a/sci-libs/dealii/Manifest +++ b/sci-libs/dealii/Manifest @@ -1,2 +1,4 @@ -DIST deal.II-8.1.0.tar.gz 13353502 SHA256 d666bbda2a17b41b80221d7029468246f2658051b8c00d9c5907cd6434c4df99 SHA512 9d6e913e7a8c54f386839d031f2931a74e8ac6e7db8693c201a11ec6ca34962626a42a57b727297c9f3d8b9efebddb4f2397c27bbee4212e726ce2714f1c3f70 WHIRLPOOL 8cd7aeb47c28bc473bb24d1632f6074de893b20d995d6077c80b88834693b8f9ad1aee181b7abda55a5567efa6c6d169da4c6061cd939b63351330f7e4b767c5 -DIST deal.offlinedoc-8.1.0.tar.gz 96129401 SHA256 cf40f7f231f47329069bc3046c144d7337efa7277d91af7b45eb5931de379b51 SHA512 0e5ac59727912dbd8cf228f93d8ab071b8f42c9a5c4393ffd44b9e7f4718a7cb50e93ebf19745f3ad6a37fc6f28c5a8906e3493488bc20a9492711b488119080 WHIRLPOOL 7e9c7a08cc81916664f4e093b6e31b2c519e7313badb5526277fb959386b3162fa57d6f1cf3dd8c0744aad46eb8ed54f308656a06e8efd97dd85ef8ea489b343 +DIST dealii-8.1.0-offline_documentation.tar.gz 96865280 SHA256 c39f309ff5296a05dfdc1b8e585ddcfe658794f16bbd9f235bdf7b5e00558b65 SHA512 9ff9ab5bcdbe3b1d127a6580f9b5d39dfc5b3840ff9278496c71b56bd5e2e33a781a0d555f08e46fdf96847510e58960ad2cf144e9d48aea31fc5080961a1e7b WHIRLPOOL e841c440899fc5a933501bfdf6c8694863678382cd223d0941af0649b6452218e53e912c53be9cee4588e0be657dad8cc521ad162189cbfb5a39fbf9f4fe71cf +DIST dealii-8.1.0.tar.gz 13353502 SHA256 d666bbda2a17b41b80221d7029468246f2658051b8c00d9c5907cd6434c4df99 SHA512 9d6e913e7a8c54f386839d031f2931a74e8ac6e7db8693c201a11ec6ca34962626a42a57b727297c9f3d8b9efebddb4f2397c27bbee4212e726ce2714f1c3f70 WHIRLPOOL 8cd7aeb47c28bc473bb24d1632f6074de893b20d995d6077c80b88834693b8f9ad1aee181b7abda55a5567efa6c6d169da4c6061cd939b63351330f7e4b767c5 +DIST dealii-8.2.0_rc2-offline_documentation.tar.gz 100826997 SHA256 fbb159fc18c7e934741c2068d0b5bb59c0a4b0009a0cb86173becede0357cb13 SHA512 3852032c26ffe8d4a2c28870ee4bf12a3f9fc5de784b54c0d0189d2b43eadb2154b76e91144c4b099e60c4100f64ddc78b41b93dc7ec0dc6d1d60231bebf239a WHIRLPOOL d72542fe48e73d643772aa5decfcf6536ac23b52a6f6e01e48c3c52f27012f5c4a3439424b6e15bb42cf3d85c28b7931e33d97f479664a6e5fcc5a77f7342fc3 +DIST dealii-8.2.0_rc2.tar.gz 34914872 SHA256 939a5d6aa1137ab72f0624dc172c0854ed5fd72eb630965bef1899336d47a0f6 SHA512 d955758811a4515f1635865e6195ed831be39c9a3388591207013025a14aef59e48ac87a6afeb3e6f0fbe84491293316b03acdb3b610cddd936a02fc38a1dedb WHIRLPOOL 94c48dee5f46598e3fd00817d0860949d6b43dfec3acd4a83bc743cad4493675dacaeb6f882b4a4c77eba151c5cae21cffcb4d307142b932c2ea2b84150f62eb diff --git a/sci-libs/dealii/dealii-8.1.0-r1.ebuild b/sci-libs/dealii/dealii-8.1.0-r2.ebuild index 548ea8397..faf32b789 100644 --- a/sci-libs/dealii/dealii-8.1.0-r1.ebuild +++ b/sci-libs/dealii/dealii-8.1.0-r2.ebuild @@ -9,29 +9,35 @@ inherit cmake-utils eutils multilib DESCRIPTION="Solving partial differential equations with the finite element method" HOMEPAGE="http://www.dealii.org/" -SRC_URI=" - https://dealii.googlecode.com/files/deal.II-${PV}.tar.gz - doc? ( https://dealii.googlecode.com/files/deal.offlinedoc-${PV}.tar.gz )" -S="${WORKDIR}/deal.II" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://github.com/dealii/dealii.git" + SRC_URI="" + KEYWORDS="" +else + SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz + doc? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz )" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + S="${WORKDIR}/deal.II" +fi LICENSE="LGPL-2.1+" SLOT="0" IUSE=" arpack avx +debug doc +examples hdf5 +lapack mesh_converter metis mpi - mumps netcdf p4est parameter_gui petsc +sparse sse2 static-libs +tbb - trilinos +zlib + mumps netcdf p4est parameter_gui petsc +sparse + sse2 static-libs +tbb trilinos " # TODO: add slepc use flag once slepc is packaged for gentoo-science REQUIRED_USE=" mumps? ( mpi lapack ) p4est? ( mpi ) - trilinos? ( mpi ) -" + trilinos? ( mpi )" -RDEPEND=" - dev-libs/boost +RDEPEND="dev-libs/boost + app-arch/bzip2 + sys-libs/zlib arpack? ( sci-libs/arpack[mpi=] ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) @@ -44,30 +50,17 @@ RDEPEND=" petsc? ( sci-mathematics/petsc[mpi=] ) sparse? ( sci-libs/umfpack ) tbb? ( dev-cpp/tbb ) - trilinos? ( sci-libs/trilinos ) - zlib? ( sys-libs/zlib ) -" + trilinos? ( sci-libs/trilinos )" -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND} virtual/pkgconfig - doc? ( app-doc/doxygen[dot] dev-lang/perl ) -" - -src_prepare() { - epatch "${FILESDIR}"/dealii-8.1.0-p4est1.0-support.patch -} + doc? ( app-doc/doxygen[dot] dev-lang/perl )" src_configure() { - - if use debug; then - CMAKE_BUILD_TYPE="DebugRelease" - else - CMAKE_BUILD_TYPE="Release" - fi + # deal.II needs a custom build type: + local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release) local mycmakeargs=( - ${live_version} -DDEAL_II_ALLOW_AUTODETECTION=OFF -DDEAL_II_ALLOW_BUNDLED=OFF -DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF @@ -78,6 +71,8 @@ src_configure() { -DDEAL_II_DOCREADME_RELDIR=share/doc/${PF}/ -DDEAL_II_EXAMPLES_RELDIR=share/doc/${PF}/examples -DDEAL_II_LIBRARY_RELDIR=$(get_libdir) + -DDEAL_II_WITH_BZIP2=ON + -DDEAL_II_WITH_ZLIB=ON $(cmake-utils_use arpack DEAL_II_WITH_ARPACK) $(cmake-utils_use avx DEAL_II_HAVE_AVX) $(cmake-utils_use doc DEAL_II_COMPONENT_DOCUMENTATION) @@ -98,7 +93,6 @@ src_configure() { $(cmake-utils_use static-libs DEAL_II_PREFER_STATIC_LIBS) $(cmake-utils_use tbb DEAL_II_WITH_THREADS) $(cmake-utils_use trilinos DEAL_II_WITH_TRILINOS) - $(cmake-utils_use zlib DEAL_II_WITH_ZLIB) ) cmake-utils_src_configure } @@ -106,9 +100,10 @@ src_configure() { src_install() { DOCS=( README ) - if use doc; then + if use doc && [[ ${PV} != *9999* ]]; then # copy missing images to the build directory: - cp -r "${WORKDIR}"/doc/doxygen/deal.II/images "${BUILD_DIR}"/doc/doxygen/deal.II || die + cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \ + "${BUILD_DIR}"/doc/doxygen/deal.II || die # replace links: sed -i \ 's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \ @@ -116,6 +111,6 @@ src_install() { fi cmake-utils_src_install - # unpack the installed example sources: + # decompress the installed example sources: use examples && docompress -x /usr/share/doc/${PF}/examples } diff --git a/sci-libs/dealii/dealii-8.2.0_rc2.ebuild b/sci-libs/dealii/dealii-8.2.0_rc2.ebuild new file mode 120000 index 000000000..9860d7b9f --- /dev/null +++ b/sci-libs/dealii/dealii-8.2.0_rc2.ebuild @@ -0,0 +1 @@ +dealii-9999.ebuild
\ No newline at end of file diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild index 30f3b70a8..a4bbdea09 100644 --- a/sci-libs/dealii/dealii-9999.ebuild +++ b/sci-libs/dealii/dealii-9999.ebuild @@ -4,31 +4,44 @@ EAPI=5 -inherit cmake-utils eutils multilib git-r3 +inherit cmake-utils eutils multilib DESCRIPTION="Solving partial differential equations with the finite element method" HOMEPAGE="http://www.dealii.org/" -EGIT_REPO_URI="git://github.com/dealii/dealii.git" -KEYWORDS="" +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://github.com/dealii/dealii.git" + SRC_URI="" + KEYWORDS="" +else + MY_PV="${PV//0_rc/rc}" + MY_P="${PN}-${MY_PV}" + SRC_URI="https://github.com/dealii/dealii/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz + doc? ( + https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}-offline_documentation.tar.gz + -> ${P}-offline_documentation.tar.gz )" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + S="${WORKDIR}/${PN}-${MY_PV}" +fi LICENSE="LGPL-2.1+" SLOT="0" IUSE=" arpack avx c++11 +debug doc +examples hdf5 +lapack mesh_converter metis - mpi mumps muparser netcdf p4est parameter_gui petsc +sparse sse2 - static-libs +tbb trilinos +zlib + mpi mumps muparser opencascade netcdf p4est parameter_gui petsc +sparse + sse2 static-libs +tbb trilinos " # TODO: add slepc use flag once slepc is packaged for gentoo-science REQUIRED_USE=" mumps? ( mpi lapack ) p4est? ( mpi ) - trilinos? ( mpi ) -" + trilinos? ( mpi )" -RDEPEND=" - dev-libs/boost +RDEPEND="dev-libs/boost + app-arch/bzip2 + sys-libs/zlib arpack? ( sci-libs/arpack[mpi=] ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) @@ -37,31 +50,23 @@ RDEPEND=" mumps? ( sci-libs/mumps[mpi] ) muparser? ( dev-cpp/muParser ) netcdf? ( || ( <sci-libs/netcdf-4.2[cxx] sci-libs/netcdf-cxx ) ) + opencascade? ( sci-libs/opencascade ) p4est? ( sci-libs/p4est[mpi] ) parameter_gui? ( dev-qt/qtgui ) petsc? ( sci-mathematics/petsc[mpi=] ) sparse? ( sci-libs/umfpack ) tbb? ( dev-cpp/tbb ) - trilinos? ( sci-libs/trilinos ) - zlib? ( sys-libs/zlib ) -" + trilinos? ( sci-libs/trilinos )" -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND} virtual/pkgconfig - doc? ( app-doc/doxygen[dot] dev-lang/perl ) -" + doc? ( app-doc/doxygen[dot] dev-lang/perl )" src_configure() { - - if use debug; then - CMAKE_BUILD_TYPE="DebugRelease" - else - CMAKE_BUILD_TYPE="Release" - fi + # deal.II needs a custom build type: + local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release) local mycmakeargs=( - -DDEAL_II_PACKAGE_VERSION=99.99 -DDEAL_II_ALLOW_AUTODETECTION=OFF -DDEAL_II_ALLOW_BUNDLED=OFF -DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF @@ -72,6 +77,8 @@ src_configure() { -DDEAL_II_DOCREADME_RELDIR=share/doc/${PF}/ -DDEAL_II_EXAMPLES_RELDIR=share/doc/${PF}/examples -DDEAL_II_LIBRARY_RELDIR=$(get_libdir) + -DDEAL_II_WITH_BZIP2=ON + -DDEAL_II_WITH_ZLIB=ON $(cmake-utils_use arpack DEAL_II_WITH_ARPACK) $(cmake-utils_use avx DEAL_II_HAVE_AVX) $(cmake-utils_use c++11 DEAL_II_WITH_CXX11) @@ -85,6 +92,8 @@ src_configure() { $(cmake-utils_use mumps DEAL_II_WITH_MUMPS) $(cmake-utils_use muparser DEAL_II_WITH_MUPARSER) $(cmake-utils_use netcdf DEAL_II_WITH_NETCDF) + -DOPENCASCADE_DIR="${CASROOT}" + $(cmake-utils_use opencascade DEAL_II_WITH_OPENCASCADE) $(cmake-utils_use p4est DEAL_II_WITH_P4EST) $(cmake-utils_use parameter_gui DEAL_II_COMPONENT_PARAMETER_GUI) $(cmake-utils_use petsc DEAL_II_WITH_PETSC) @@ -94,16 +103,22 @@ src_configure() { $(cmake-utils_use static-libs DEAL_II_PREFER_STATIC_LIBS) $(cmake-utils_use tbb DEAL_II_WITH_THREADS) $(cmake-utils_use trilinos DEAL_II_WITH_TRILINOS) - $(cmake-utils_use zlib DEAL_II_WITH_ZLIB) ) cmake-utils_src_configure } src_install() { - DOCS=( README.md ) - + if use doc && [[ ${PV} != *9999* ]]; then + # copy missing images to the build directory: + cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \ + "${BUILD_DIR}"/doc/doxygen/deal.II || die + # replace links: + sed -i \ + 's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \ + "${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed" + fi cmake-utils_src_install - # unpack the installed example sources: + # decompress the installed example sources: use examples && docompress -x /usr/share/doc/${PF}/examples } diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml index 6f21d087d..ac7226b4a 100644 --- a/sci-libs/dealii/metadata.xml +++ b/sci-libs/dealii/metadata.xml @@ -24,6 +24,7 @@ and extra output. If you want to get meaningful backtraces see <flag name="metis">Add support for metis (<pkg>sci-libs/metis</pkg>)</flag> <flag name="mumps">Add support for mumps (<pkg>sci-libs/mumps</pkg>)</flag> <flag name="muparser">Add support for muparser (<pkg>dev-cpp/muParser</pkg>)</flag> + <flag name="opencascade">Add support for opencascade (<pkg>sci-libs/opencascade</pkg>)</flag> <flag name="p4est">Add support for p4est (<pkg>sci-mathematics/p4est</pkg>)</flag> <flag name="parameter_gui">Build and install the parameter_gui executable</flag> <flag name="petsc">Add support for petsc (<pkg>sci-libs/petsc</pkg>)</flag> diff --git a/sci-libs/mlpack/ChangeLog b/sci-libs/mlpack/ChangeLog index d35039b59..201b2f894 100644 --- a/sci-libs/mlpack/ChangeLog +++ b/sci-libs/mlpack/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Dec 2014; Christoph Junghans <ottxor@gentoo.org> mlpack-1.0.8.ebuild: + fixed deps (bug #532752) + 16 Sep 2014; Christoph Junghans <ottxor@gentoo.org> mlpack-1.0.8.ebuild: fixed deps diff --git a/sci-libs/mlpack/mlpack-1.0.8.ebuild b/sci-libs/mlpack/mlpack-1.0.8.ebuild index 01cc0f566..66c3d8a2f 100644 --- a/sci-libs/mlpack/mlpack-1.0.8.ebuild +++ b/sci-libs/mlpack/mlpack-1.0.8.ebuild @@ -18,7 +18,7 @@ IUSE="debug doc" RDEPEND=" dev-libs/boost dev-libs/libxml2 - sci-libs/armadillo[lapack]" + >=sci-libs/armadillo-3.6.0[lapack]" DEPEND="${DEPEND} app-text/txt2man diff --git a/sci-physics/atompaw/ChangeLog b/sci-physics/atompaw/ChangeLog index 54678f46e..065f53da3 100644 --- a/sci-physics/atompaw/ChangeLog +++ b/sci-physics/atompaw/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for sci-physics/atompaw -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*atompaw-4.0.0.10 (12 Dec 2014) + + 12 Dec 2014; Honza Macháček <Hloupy.Honza@centrum.cz> + +atompaw-4.0.0.10.ebuild, +files/4.0-longplot.patch, metadata.xml: + Version bump to sci-physics/atompaw-4.0.0.10 + *atompaw-3.0.1.9-r1 (17 Jun 2013) 17 Jun 2013; Honza Macháček <Hloupy.Honza@centrum.cz> diff --git a/sci-physics/atompaw/Manifest b/sci-physics/atompaw/Manifest index a36521dcf..e3138e143 100644 --- a/sci-physics/atompaw/Manifest +++ b/sci-physics/atompaw/Manifest @@ -1,3 +1,4 @@ DIST atompaw-3.0.1.9.tar.gz 3809640 SHA256 6acc591ec3f5c5bb4652a40e4d8414619d680e84e370143d4ca36df7d50f0c63 SHA512 0608e289bfd51bfdce618f24c3056b8258ae2273ecc8671f931dd553d8356bd245911f0c2e461a890b4bf3e14f0fa5f3ac2d0c6c60bc19665b56236619ccf1d4 WHIRLPOOL 5a1a37fc1913a5e510d516ea996842e0cc193856298137c05b28e25d5f653b3c9ef34356fe95829164ab20f7d9e5627c3eac273d3be7511a80150d128aa72e0f +DIST atompaw-4.0.0.10.tar.gz 5612750 SHA256 a2c9a28cfacf16f94e1aca1684644b09c8c1d2a6270bad0d4576dfeb475a3011 SHA512 c487fd287091b5080b467284b4145f78e6643a7814c822164f201c7ab383f7e0db7b2aaff3a5e0c26341ec0858eca60b83aa0c6ad75a7e9b6660518458d72475 WHIRLPOOL 340aac53418609e13fcde545fa1baba6faa76000529dbbe45b9ff59fe944cef50e0e725dd34c7f78e35c3e93f9fe73a9c5a6bdf68daa3511ad9ff55baeb26649 DIST atompaw.pdf 334715 SHA256 10a70f0c31e4a0a06e31b2b922b938742daf8635c87b95f5a48609555d9397ed SHA512 287f521a10b144bf8c6f59f21a025a8b1e0f6a23d576abe347be8fd41f8577dec0febd289618384d6e7796f0f68bfb41672c9d6d7bf1658f245cff20463ffff7 WHIRLPOOL ae9280374777fd61751d60b4944f3d21aceb86d3b6f4879ced1c26200e33d8ebb08b99e81cffd562e43643274f83bd6d4263360d399acee7eefad3f36791606a DIST atompawEqns.pdf 198480 SHA256 181af33190b77b630c1fb94882d0cbc5f79281346f93c25ef4d645806f2c1dc6 SHA512 e0b7fcbce906ceda953e000378786d3b679b68a5dd3d1a53b8d41a61e80bfa5a83fa04a6b8945b274ffe351491bffe3bdd801937f1b838f90b21e462fb09b9e9 WHIRLPOOL 9ba9c90df0c368b935fce573a6be30c492819fda4245f10d217bff3576f82b21036aeee837c28e5b694220f2749a6cf7e26b797b2690624dbfbc3bb598cc2bdd diff --git a/sci-physics/atompaw/atompaw-4.0.0.10.ebuild b/sci-physics/atompaw/atompaw-4.0.0.10.ebuild new file mode 100644 index 000000000..216ef3a61 --- /dev/null +++ b/sci-physics/atompaw/atompaw-4.0.0.10.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit autotools-utils eutils fortran-2 multilib toolchain-funcs + +DESCRIPTION="PAW atomic data generator" +HOMEPAGE="http://www.wfu.edu/~natalie/papers/pwpaw/man.html" +SRC_URI=" + http://www.wfu.edu/~natalie/papers/pwpaw/${P}.tar.gz + doc? ( + http://www.wfu.edu/~natalie/papers/pwpaw/atompaw.pdf + http://www.wfu.edu/~natalie/papers/pwpaw/notes/atompaw/atompawEqns.pdf )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc libxc longplot test" + +RDEPEND=" + virtual/blas + virtual/lapack + libxc? ( >=sci-libs/libxc-2.0.1[fortran] )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +DOCS=( README ) + +FORTRAN_STANDARD=90 + +src_unpack() { + unpack ${P}.tar.gz + if use doc; then + cp "${DISTDIR}"/atompaw.pdf "${DISTDIR}"/atompawEqns.pdf "${S}"/doc/ || die + fi +} + +src_prepare() { + use longplot && epatch "${FILESDIR}"/4.0-longplot.patch +} + +src_configure() { + local myeconfargs=( + $(use_enable libxc) + --with-linalg-flavor=atlas + --with-linalg-libs="$($(tc-getPKG_CONFIG) --libs lapack)" + --with-libxc-incs="-I/usr/include $($(tc-getPKG_CONFIG) --cflags libxc)" + --with-libxc-libs="$($(tc-getPKG_CONFIG) --libs libxc)" + FC="$(tc-getFC)" FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}}" + CC="$(tc-getCC)" LDFLAGS="${LDFLAGS:- ${CFLAGS:- -O2}}" + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile -j1 +} + +src_test() { + use test && autotools-utils_src_test +} + +src_install() { + autotools-utils_src_install + + use doc && dodoc doc/atompaw.pdf doc/atompawEqns.pdf +} diff --git a/sci-physics/atompaw/files/4.0-longplot.patch b/sci-physics/atompaw/files/4.0-longplot.patch new file mode 100644 index 000000000..7ae14d102 --- /dev/null +++ b/sci-physics/atompaw/files/4.0-longplot.patch @@ -0,0 +1,42 @@ +diff -Naurp atompaw-4.0.0.10.orig/src/atompaw_report.F90 atompaw-4.0.0.10/src/atompaw_report.F90 +--- atompaw-4.0.0.10.orig/src/atompaw_report.F90 2014-08-21 19:55:18.000000000 +0000 ++++ atompaw-4.0.0.10/src/atompaw_report.F90 2014-10-08 14:45:17.320341463 +0000 +@@ -142,7 +142,7 @@ CONTAINS + OPEN(ifout,file='wfn'//TRIM(flnm),form='formatted')
+ WRITE(ifout,*) '# l=',PAW%l(io),'basis function with energy ',&
+ PAW%eig(io)
+- DO i=1,irc+50
++ DO i=1,n
+ WRITE(ifout,'(1p,5e12.4)') Grid%r(i),PAW%ophi(i,io),&
+ PAW%otphi(i,io),PAW%otp(i,io)
+ ENDDO
+@@ -155,7 +155,7 @@ CONTAINS + OPEN(ifout,file='wfn00'//TRIM(flnm),form='formatted')
+ WRITE(ifout,*) '# l=',PAW%l(io),'basis function with energy ',&
+ PAW%eig(io)
+- DO i=1,irc+50
++ DO i=1,n
+ WRITE(ifout,'(1p,5e12.4)') Grid%r(i),PAW%phi(i,io),&
+ PAW%tphi(i,io),PAW%tp(i,io)
+ ENDDO
+diff -Naurp atompaw-4.0.0.10.orig/src/pseudo.F90 atompaw-4.0.0.10/src/pseudo.F90 +--- atompaw-4.0.0.10.orig/src/pseudo.F90 2014-08-22 12:22:34.000000000 +0000 ++++ atompaw-4.0.0.10/src/pseudo.F90 2014-10-08 14:45:47.528573288 +0000 +@@ -3808,7 +3808,7 @@ CONTAINS + OPEN(ifout,file=TRIM(fdata)//'.wfn'//TRIM(flnm),form='formatted')
+ WRITE(ifout,*) '# l=',PAW%l(io),'basis function with energy ',&
+ & PAW%eig(io)
+- DO i=1,irc+50
++ DO i=1,n
+ WRITE(ifout,'(1p,5e12.4)') Grid%r(i),PAW%ophi(i,io),&
+ & PAW%otphi(i,io),PAW%otp(i,io)
+ ENDDO
+@@ -3821,7 +3821,7 @@ CONTAINS + OPEN(ifout,file=TRIM(fdata)//'.wfn00'//TRIM(flnm),form='formatted')
+ WRITE(ifout,*) '# l=',PAW%l(io),'basis function with energy ',&
+ & PAW%eig(io)
+- DO i=1,irc+50
++ DO i=1,n
+ WRITE(ifout,'(1p,5e12.4)') Grid%r(i),PAW%phi(i,io),&
+ & PAW%tphi(i,io),PAW%tp(i,io)
+ ENDDO
diff --git a/sci-physics/atompaw/metadata.xml b/sci-physics/atompaw/metadata.xml index fb49e3d82..f5a5458c2 100644 --- a/sci-physics/atompaw/metadata.xml +++ b/sci-physics/atompaw/metadata.xml @@ -1,8 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>sci-physics</herd> -<use> - <flag name="libxc">Use libxc for something</flag> -</use> + <herd>sci-physics</herd> + <maintainer> + <email>sci@gentoo.org</email> + </maintainer> + <use> + <flag name="libxc">Enable support for libxc, an exchange-correlation potentials library</flag> + </use> + <use> + <flag name="longplot"> + Patch the sources to plot functions all over the space considered, + not just up to the matching radius plus 50 grid points. May be useless + or even harmful. + </flag> + </use> </pkgmetadata> diff --git a/sys-cluster/hpx/ChangeLog b/sys-cluster/hpx/ChangeLog index 76ead3d26..a5e7b9b76 100644 --- a/sys-cluster/hpx/ChangeLog +++ b/sys-cluster/hpx/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 24 Dec 2014; Christoph Junghans <ottxor@gentoo.org> -Manifest, + -hpx-0.9.7.ebuild, -hpx-0.9.8.ebuild: + remove old + + 24 Dec 2014; Christoph Junghans <ottxor@gentoo.org> hpx-9999.ebuild: + fixed deps (bug #529066) + *hpx-0.9.8 (20 May 2014) 20 May 2014; Christoph Junghans <ottxor@gentoo.org> diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest deleted file mode 100644 index af0dedf44..000000000 --- a/sys-cluster/hpx/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST hpx_0.9.7.7z 2416122 SHA256 95fa108a6ba6cd3a3afc117d508936d1c070cc7e83a592f62815a6a11378882a SHA512 eb258e94facaaba29729ebca63640ab5feda156ee860153848ca1143266b8365bc9cc772eb6d6f56f884af43531efb1b77fa84ca4c6e185882cbf031ac794a7b WHIRLPOOL c5432a608a90a732ed7ec08f980d3d2f7f99a3bd5b83867db26190877120b76f0b46f6fd3e9bbc97bfb9637e6c951c9dd449c0f6c767bb11eca1e0212f488d88 -DIST hpx_0.9.8.7z 2089649 SHA256 9e04685b07e4155e6d3e00c944e5fe91c0c815a2b3bc7bc345eb59d8708bac91 SHA512 1789582ee776173d4aa67b512d2df225c734b98ffe59a8f1eee38b5112ac7c02e0c7c478f72062e5b6a5d5053ce1848729c374093378f63200acf51a208fb3c7 WHIRLPOOL b4b5a8a83aa4d07466ee0570b9fdadd906281e626eed2ce82e3a8e03681de1591a46af2254cbd387eb2d0bfac22c6796537fbbb37764be7dd424b97dd0d433c7 diff --git a/sys-cluster/hpx/hpx-0.9.7.ebuild b/sys-cluster/hpx/hpx-0.9.7.ebuild deleted file mode 100644 index 738ed1679..000000000 --- a/sys-cluster/hpx/hpx-0.9.7.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git" - SRC_URI="" - KEYWORDS="" - S="${WORKDIR}/${PN}" - CMAKE_USE_DIR="${S}" -else - SRC_URI="http://stellar.cct.lsu.edu/files/${PN}_${PV}.7z" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${PN}_${PV}" -fi - -inherit cmake-utils fortran-2 python-single-r1 - -DESCRIPTION="C++ runtime system for parallel and distributed applications" -HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/" - -SLOT="0" -LICENSE="Boost-1.0" -IUSE="doc examples jemalloc papi +perftools tbb test" - -# TODO: some of the forced deps are may be optional -# it would need to work the automagic -RDEPEND=" - >=dev-libs/boost-1.51 - dev-libs/libxml2 - sci-libs/hdf5 - >=sys-apps/hwloc-1.8 - >=sys-libs/libunwind-1 - sys-libs/zlib - jemalloc? ( dev-libs/jemalloc ) - papi? ( dev-libs/papi ) - perftools? ( >=dev-util/google-perftools-1.7.1 ) - tbb? ( dev-cpp/tbb ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-lang/python ) -" -REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )" - -PATCHES=( - "${FILESDIR}"/hpx-0.9.5-install-path.patch - "${FILESDIR}"/hpx-0.9.7-move-boost-include.patch -) - -pkg_setup() { - use test && python-single-r1_pkg_setup -} - -src_configure() { - CMAKE_BUILD_TYPE=Release - local mycmakeargs=( - -DHPX_BUILD_EXAMPLES=OFF - $(cmake-utils_use doc HPX_BUILD_DOCUMENTATION) - $(cmake-utils_use jemalloc HPX_JEMALLOC) - $(cmake-utils_use test BUILD_TESTING) - $(cmake-utils_use perftools HPX_GOOGLE_PERFTOOLS) - $(cmake-utils_use papi HPX_PAPI) - ) - if use perftools; then - mycmakeargs+=( -DHPX_MALLOC=tcmalloc ) - elif use jemalloc; then - mycmakeargs+=( -DHPX_MALLOC=jemalloc ) - elif use tbb; then - mycmakeargs+=( -DHPX_MALLOC=tbbmalloc ) - else - mycmakeargs+=( -DHPX_MALLOC=system ) - fi - cmake-utils_src_configure -} - -src_test() { - # avoid over-suscribing - cmake-utils_src_make -j1 tests -} - -src_install() { - cmake-utils_src_install - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - fi -} diff --git a/sys-cluster/hpx/hpx-0.9.8.ebuild b/sys-cluster/hpx/hpx-0.9.8.ebuild deleted file mode 100644 index ac3aad76f..000000000 --- a/sys-cluster/hpx/hpx-0.9.8.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git" - KEYWORDS="" - S="${WORKDIR}/${PN}" -else - SRC_URI="http://stellar.cct.lsu.edu/files/${PN}_${PV}.7z" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${PN}_${PV}" - PATCHES=( - "${FILESDIR}"/${P}-install-path.patch - "${FILESDIR}"/${P}-multilib.patch - "${FILESDIR}"/${P}-cmake_dir.patch - ) -fi - -inherit cmake-utils fortran-2 multilib python-single-r1 - -DESCRIPTION="C++ runtime system for parallel and distributed applications" -HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/" - -SLOT="0" -LICENSE="Boost-1.0" -IUSE="doc examples jemalloc papi +perftools tbb test" - -# TODO: some of the forced deps are may be optional -# it would need to work the automagic -RDEPEND=" - >=dev-libs/boost-1.51 - dev-libs/libxml2 - sci-libs/hdf5 - >=sys-apps/hwloc-1.8 - >=sys-libs/libunwind-1 - sys-libs/zlib - papi? ( dev-libs/papi ) - perftools? ( >=dev-util/google-perftools-1.7.1 ) - tbb? ( dev-cpp/tbb ) -" -DEPEND="${RDEPEND} - app-arch/p7zip - virtual/pkgconfig - test? ( dev-lang/python ) -" -REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - use test && python-single-r1_pkg_setup -} - -src_configure() { - CMAKE_BUILD_TYPE=Release - local mycmakeargs=( - -DHPX_BUILD_EXAMPLES=OFF - -DLIB=$(get_libdir) - -Dcmake_dir=cmake - $(cmake-utils_use doc HPX_BUILD_DOCUMENTATION) - $(cmake-utils_use jemalloc HPX_JEMALLOC) - $(cmake-utils_use test BUILD_TESTING) - $(cmake-utils_use perftools HPX_GOOGLE_PERFTOOLS) - $(cmake-utils_use papi HPX_PAPI) - ) - if use perftools; then - mycmakeargs+=( -DHPX_MALLOC=tcmalloc ) - elif use jemalloc; then - mycmakeargs+=( -DHPX_MALLOC=jemalloc ) - elif use tbb; then - mycmakeargs+=( -DHPX_MALLOC=tbbmalloc ) - else - mycmakeargs+=( -DHPX_MALLOC=system ) - fi - cmake-utils_src_configure -} - -src_test() { - # avoid over-suscribing - cmake-utils_src_make -j1 tests -} - -src_install() { - cmake-utils_src_install - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - fi -} diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild index 5e56db937..9627b8caf 100644 --- a/sys-cluster/hpx/hpx-9999.ebuild +++ b/sys-cluster/hpx/hpx-9999.ebuild @@ -42,6 +42,7 @@ DEPEND="${RDEPEND} app-arch/p7zip virtual/pkgconfig test? ( dev-lang/python ) + doc? ( >=dev-libs/boost-1.56.0-r1[tools] ) " REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )" |