diff options
author | 2013-10-28 09:07:17 -0700 | |
---|---|---|
committer | 2013-10-28 09:07:17 -0700 | |
commit | bf500609a10b9aa2152512046b9660f58591a8a7 (patch) | |
tree | d3d043d261742af85f44414af1103928ed9fa715 | |
parent | Merge branch 'master' of git://git.overlays.gentoo.org/proj/sci; github.com:g... (diff) | |
parent | sci-chemistry/nmrpipe: Add IBS extract.M macro (diff) | |
download | sci-bf500609a10b9aa2152512046b9660f58591a8a7.tar.gz sci-bf500609a10b9aa2152512046b9660f58591a8a7.tar.bz2 sci-bf500609a10b9aa2152512046b9660f58591a8a7.zip |
Merge branch 'master' of git://git.overlays.gentoo.org/proj/sci; github.com:gentoo-science/sci
30 files changed, 1220 insertions, 10 deletions
diff --git a/dev-java/gluegen/Manifest b/dev-java/gluegen/Manifest index e030957a7..950b35023 100644 --- a/dev-java/gluegen/Manifest +++ b/dev-java/gluegen/Manifest @@ -1,2 +1,3 @@ DIST gluegen-20080421.tar.bz2 1044951 SHA256 15ef8f499afc2256615bf453b318fbc22fbe146293ca4c6ca87c98577bf5a026 SHA512 3bffb55ec8723ac452b38d41f1bc596ee3065b1f791b8c7aec06d8acffdfd83d81553d9090fc273b56fa748b501f3a25f8dc4736bad291bc77f15d211957470d WHIRLPOOL 6171345011955517e84c9b82d187e2fe0c96fc1733ee6427248159fd8456472ea15c9cd223bd784a33478a4cfc568ddcfd73ea0addd13daa1b483b7a8cfe66c1 DIST gluegen-v2.0-rc8.tar.7z 35196696 SHA256 8cae313dfe03d13cdd165aa7d9e698897affae290e7ce7c4a27479fe6522c0dc SHA512 9845246f9776139cd205f197203349eba28150d5018bd086e6f7484df765b4cd122d78fbf836780a10b0d6395c645eb8ec7a256b8f832453c0b20155a11b3a0f WHIRLPOOL 427d6ef990a0702b81a4f62a74dce628594144507392cb8d25b5af5cbeca186faef987c809eeb1faf5d99b8f867213c7786d43f4418f85d04ac68d96595b83b3 +DIST gluegen-v2.0.2.tar.7z 35254028 SHA256 ec2481a819f01073390897748c783b65bc6533cd9ffe236f283049b0c54ccb67 SHA512 6a25bd8936ba454918f90f3da801561093dd2bdf0b6f98008cd20d8e3efa50f6acc48f8feade15393f3851147d8d42422fde3af4463418e4919ee624ae2a1707 WHIRLPOOL cf9dac2180a3f49c04a9a5683edcd2d93bac78f8e482ba65dc253a8fb026c9cdd5db3c52b7d8a526067cf348f19859c34724f5467436ffe9da39a892cf5a5e74 diff --git a/dev-java/gluegen/gluegen-2.0.2.ebuild b/dev-java/gluegen/gluegen-2.0.2.ebuild new file mode 100644 index 000000000..8a4fb7481 --- /dev/null +++ b/dev-java/gluegen/gluegen-2.0.2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +############################################################################### +# WARNING: don't add to main tree without fixing QA issues first! +############################################################################### + +EAPI=5 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 +MY_PV=v"${PV}" +MY_P="${PN}"-"${MY_PV}" + +DESCRIPTION="GlueGen is a tool which automatically generates the Java and JNI +code necessary to call C libraries" +HOMEPAGE="http://jogamp.org/gluegen/www/" +SRC_URI="http://jogamp.org/deployment/archive/rc/${MY_PV}/archive/Sources/${MY_P}.tar.7z" + +LICENSE="BSD" +SLOT="2" +KEYWORDS="~amd64 ~x86" +IUSE="" + +COMMON_DEP=" + dev-java/ant-core:0 + dev-java/antlr:0" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.5" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.5 + app-arch/p7zip + dev-java/ant-antlr:0 + dev-java/ant-contrib:0 + dev-java/ant-nodeps:0 + dev-java/cpptasks:0 + dev-java/junit:4" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + default + unpack ./${MY_P}.tar +} + +java_prepare() { + rm -rf make/lib +} + +JAVA_ANT_REWRITE_CLASSPATH="yes" + +EANT_BUILD_XML="make/build.xml" +EANT_BUILD_TARGET="all" +EANT_DOC_TARGET="" +EANT_GENTOO_CLASSPATH="antlr,ant-core" +EANT_NEEDS_TOOLS="yes" +EANT_ANT_TASKS="ant-antlr ant-contrib ant-nodeps cpptasks" +src_compile() { + # FIXME don't copy around jars + EANT_EXTRA_ARGS+=" -Dantlr.jar=\"$(java-pkg_getjar --build-only antlr antlr.jar)\"" + # FIXME don't build tests just yet + EANT_EXTRA_ARGS+=" -Djunit.jar=\"$(java-pkg_getjar --build-only junit-4 junit.jar)\"" + + java-pkg-2_src_compile +} + +# FIXME src_test + +src_install() { + java-pkg_dojar build/${PN}{,-rt}.jar + java-pkg_doso build/obj/*.so + + use doc && dohtml -r doc/manual + use source && java-pkg_dosrc src/java/* + + # for building jogl + insinto /usr/share/${PN}-${SLOT}/make + doins -r make/* + insinto /usr/share/${PN}-${SLOT}/build + doins build/artifact.properties +} diff --git a/dev-java/jgraphx/Manifest b/dev-java/jgraphx/Manifest index 9e3a58174..45b514027 100644 --- a/dev-java/jgraphx/Manifest +++ b/dev-java/jgraphx/Manifest @@ -1,2 +1,3 @@ DIST jgraphx-1.4.1.0.zip 4052749 SHA256 086cd3de7d2b381a61f5a7d5eea19e80d3f1f1aaff9642d2b9e582d86a312f59 DIST jgraphx-1.8.0.6.zip 4216848 SHA256 237035982616769f0c15b805b4ce12616915498a5995fbdae814b97f434c860d SHA512 07985168625f094a8de9ab0e5c6050dd1a5d537b21eb6c73e468ad21db2758ac78a272dfedf22b94585eff4f77288ad99f8f1b70b18462754f0f3048ad06e40f WHIRLPOOL 403b784bdf934fc4a6aae643badb4380279bd15ea87520d6df0ed3d3ed58b020d3f0f979e9d2a2de338256bbdb5793e1e9d50634c60e83d104ceb88b96fcefba +DIST jgraphx-2.1.0.8.zip 4454226 SHA256 afe3a41eb81a2f4e279e24ef04c6f1b1bd4a49cdabb882f55901dcc63f62e78b SHA512 eab95884c6e6e40a3b01685b220c3ed3a11fbfc008bd8b08c01e96a41eeabca70495485d1c77b79e08f7d5d72026832c8a7c1deacd80c964f4db774bea3498a0 WHIRLPOOL 21f35579d5d81ea3af5eca3ae87c85e87b9ffac7df94405d4bfd7670fcac00d37ea299eee022e77d25df1d50b2f5200e277e5a96228b851312ecc3fe33c6617d diff --git a/dev-java/jgraphx/jgraphx-2.1.0.8.ebuild b/dev-java/jgraphx/jgraphx-2.1.0.8.ebuild new file mode 100644 index 000000000..899c3a96a --- /dev/null +++ b/dev-java/jgraphx/jgraphx-2.1.0.8.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +JAVA_PKG_IUSE="doc source" +inherit java-pkg-2 java-ant-2 versionator + +MY_PV=$(replace_all_version_separators '_') + +DESCRIPTION="Open-source graph component for Java" +SRC_URI="http://www.jgraph.com/downloads/jgraphx/archive/${PN}-${MY_PV}.zip\ + -> ${P}.zip" +HOMEPAGE="http://www.jgraph.com" +IUSE="doc examples source" +DEPEND=">=virtual/jdk-1.5 + app-arch/unzip" +RDEPEND=">=virtual/jre-1.5" +LICENSE="as-is" +SLOT="2.1" +KEYWORDS="~amd64 ~x86" + +S="${WORKDIR}/${PN}" + +src_prepare() { + # don't do javadoc always + sed -i \ + -e 's/depends="doc"/depends="compile"/' \ + build.xml || die "sed failed" + rm -rf doc/api lib/jgraphx.jar || die +} + +EANT_BUILD_TARGET="build" +EANT_DOC_TARGET="doc" + +src_install() { + java-pkg_dojar lib/${PN}.jar + + use doc && java-pkg_dojavadoc docs/api + use source && java-pkg_dosrc src/org + use examples && java-pkg_doexamples examples +} diff --git a/dev-java/jogl/Manifest b/dev-java/jogl/Manifest index d93de6dc3..92903b2c9 100644 --- a/dev-java/jogl/Manifest +++ b/dev-java/jogl/Manifest @@ -1,2 +1,3 @@ DIST jogl-1.1.1-src.zip 3638019 SHA256 dbd34718f15e6f45deb2d96bc328c3d54aa2f3a2160a4593997506c837d859a0 DIST jogl-v2.0-rc8.tar.7z 18148821 SHA256 6d2338514b2e6c7ac61c59e0142d95d6b37434eefafecbbc2a8102f23f4f3e93 SHA512 ce335990dac4c868705f9cd041cab2e97050efcd9b6b0a8fa01e070aa7ee2f27162cb96ebbbd5e9f04a1aa9e7661dde6aa0ba1d02565f38fa76a39deeb48a500 WHIRLPOOL e38c1a7d6727f7dd8765d085ce2388afd7070c0625491038e84d26b8e14bb7fdaa5a89e75f742b5c30500cb02a198c5226d5ee743b1347acd31c6e555d281777 +DIST jogl-v2.0.2.tar.7z 21060733 SHA256 092212827c8b41cb606575ea8e9ba87dd331ce959990bf77d616dced46ef1f17 SHA512 f560a3290f4acbbfb101d3a1c048c6e35a4409792d2ffac7f2548b66e2c94642c8aa931d2c9df154990d7567eb13aa96930d6a71eb80956c33a6a1b1e3bb2480 WHIRLPOOL 679e0c26087dc8214e861f37e3796e51cffba4eabe5e4b4362f3e01b465c5946bd33477901e1559e97540d50f0d14fdb7b2afe1250a9b96b6fee7c032b6a4620 diff --git a/dev-java/jogl/jogl-2.0.2.ebuild b/dev-java/jogl/jogl-2.0.2.ebuild new file mode 100644 index 000000000..bfa2b0e9c --- /dev/null +++ b/dev-java/jogl/jogl-2.0.2.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +############################################################################### +# WARNING: don't add to main tree without fixing QA issues first! +############################################################################### + +EAPI=5 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +MY_PV=v${PV} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="Java(TM) Binding fot the OpenGL(TM) API" +HOMEPAGE="http://jogamp.org/jogl/www/" +SRC_URI="http://jogamp.org/deployment/${MY_PV}/archive/Sources/${MY_P}.tar.7z" + +LICENSE="BSD" +SLOT="2" +KEYWORDS="~amd64" +IUSE="cg" + +COMMON_DEP=" + dev-java/ant-core:0 + dev-java/ant-junit:0 + dev-java/antlr:0 + dev-java/cpptasks:0 + =dev-java/gluegen-${PV}:${SLOT} + dev-java/junit:4 + dev-java/swt:3.7 + x11-libs/libX11 + x11-libs/libXxf86vm + virtual/opengl + cg? ( media-gfx/nvidia-cg-toolkit )" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.5" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.5 + app-arch/p7zip + dev-java/ant-antlr:0 + dev-java/ant-contrib:0 + dev-java/ant-nodeps:0 + dev-java/cpptasks:0" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + default + unpack ./${MY_P}.tar +} + +java_prepare() { + find -name '*.jar' -exec rm -v {} + || die + + # Empty filesets are never out of date! + sed -i -e 's/<outofdate>/<outofdate force="true">/' make/build*xml || die +} + +JAVA_PKG_BSFIX_NAME+=" build-jogl.xml build-nativewindow.xml build-newt.xml build-test.xml" +JAVA_ANT_REWRITE_CLASSPATH="yes" + +EANT_BUILD_XML="make/build.xml" +EANT_BUILD_TARGET="all" +EANT_DOC_TARGET="" # FIXME there are a couple javadoc targets, pick one +EANT_GENTOO_CLASSPATH="ant-core,antlr,swt-3.7,ant-junit" +EANT_NEEDS_TOOLS="yes" +EANT_ANT_TASKS="ant-antlr ant-contrib ant-junit ant-nodeps cpptasks" + +src_compile() { + EANT_EXTRA_ARGS+=" -Dcommon.gluegen.build.done=true" + EANT_EXTRA_ARGS+=" -Dgluegen.root=/usr/share/gluegen-${SLOT}/" + EANT_EXTRA_ARGS+=" -Dgluegen.jar=$(java-pkg_getjar gluegen-${SLOT} gluegen.jar)" + EANT_EXTRA_ARGS+=" -Dgluegen-rt.jar=$(java-pkg_getjar gluegen-${SLOT} gluegen-rt.jar)" + + # FIXME don't build tests just yet + EANT_EXTRA_ARGS+=" -Djunit.jar=$(java-pkg_getjar --build-only junit-4 junit.jar)" + + use cg && EANT_EXTRA_ARGS+=" -Djogl.cg=1 -Dx11.cg.lib=/usr/lib" + + java-pkg-2_src_compile +} + +EANT_TEST_TARGET="junit.run" +# FIXME src_test + +src_install() { + # There are many more + java-pkg_dojar build/jar/*.jar + java-pkg_doso build/lib/*.so + + if use doc; then + #java-pkg_dojavadoc javadoc_public + dodoc -r doc + fi + use source && java-pkg_dosrc src/jogl/classes/* +} diff --git a/licenses/CeCILL-2.1 b/licenses/CeCILL-2.1 new file mode 100644 index 000000000..b705f37a2 --- /dev/null +++ b/licenses/CeCILL-2.1 @@ -0,0 +1,519 @@ + + CeCILL FREE SOFTWARE LICENSE AGREEMENT + +Version 2.1 dated 2013-06-21 + + + Notice + +This Agreement is a Free Software license agreement that is the result +of discussions between its authors in order to ensure compliance with +the two main principles guiding its drafting: + + * firstly, compliance with the principles governing the distribution + of Free Software: access to source code, broad rights granted to users, + * secondly, the election of a governing law, French law, with which it + is conformant, both as regards the law of torts and intellectual + property law, and the protection that it offers to both authors and + holders of the economic rights over software. + +The authors of the CeCILL (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre]) +license are: + +Commissariat l'nergie atomique et aux nergies alternatives - CEA, a +public scientific, technical and industrial research establishment, +having its principal place of business at 25 rue Leblanc, immeuble Le +Ponant D, 75015 Paris, France. + +Centre National de la Recherche Scientifique - CNRS, a public scientific +and technological establishment, having its principal place of business +at 3 rue Michel-Ange, 75794 Paris cedex 16, France. + +Institut National de Recherche en Informatique et en Automatique - +Inria, a public scientific and technological establishment, having its +principal place of business at Domaine de Voluceau, Rocquencourt, BP +105, 78153 Le Chesnay cedex, France. + + + Preamble + +The purpose of this Free Software license agreement is to grant users +the right to modify and redistribute the software governed by this +license within the framework of an open source distribution model. + +The exercising of this right is conditional upon certain obligations for +users so as to preserve this status for all subsequent redistributions. + +In consideration of access to the source code and the rights to copy, +modify and redistribute granted by the license, users are provided only +with a limited warranty and the software's author, the holder of the +economic rights, and the successive licensors only have limited liability. + +In this respect, the risks associated with loading, using, modifying +and/or developing or reproducing the software by the user are brought to +the user's attention, given its Free Software status, which may make it +complicated to use, with the result that its use is reserved for +developers and experienced professionals having in-depth computer +knowledge. Users are therefore encouraged to load and test the +suitability of the software as regards their requirements in conditions +enabling the security of their systems and/or data to be ensured and, +more generally, to use and operate it in the same conditions of +security. This Agreement may be freely reproduced and published, +provided it is not altered, and that no provisions are either added or +removed herefrom. + +This Agreement may apply to any or all software for which the holder of +the economic rights decides to submit the use thereof to its provisions. + +Frequently asked questions can be found on the official website of the +CeCILL licenses family (http://www.cecill.info/index.en.html) for any +necessary clarification. + + + Article 1 - DEFINITIONS + +For the purpose of this Agreement, when the following expressions +commence with a capital letter, they shall have the following meaning: + +Agreement: means this license agreement, and its possible subsequent +versions and annexes. + +Software: means the software in its Object Code and/or Source Code form +and, where applicable, its documentation, "as is" when the Licensee +accepts the Agreement. + +Initial Software: means the Software in its Source Code and possibly its +Object Code form and, where applicable, its documentation, "as is" when +it is first distributed under the terms and conditions of the Agreement. + +Modified Software: means the Software modified by at least one +Contribution. + +Source Code: means all the Software's instructions and program lines to +which access is required so as to modify the Software. + +Object Code: means the binary files originating from the compilation of +the Source Code. + +Holder: means the holder(s) of the economic rights over the Initial +Software. + +Licensee: means the Software user(s) having accepted the Agreement. + +Contributor: means a Licensee having made at least one Contribution. + +Licensor: means the Holder, or any other individual or legal entity, who +distributes the Software under the Agreement. + +Contribution: means any or all modifications, corrections, translations, +adaptations and/or new functions integrated into the Software by any or +all Contributors, as well as any or all Internal Modules. + +Module: means a set of sources files including their documentation that +enables supplementary functions or services in addition to those offered +by the Software. + +External Module: means any or all Modules, not derived from the +Software, so that this Module and the Software run in separate address +spaces, with one calling the other when they are run. + +Internal Module: means any or all Module, connected to the Software so +that they both execute in the same address space. + +GNU GPL: means the GNU General Public License version 2 or any +subsequent version, as published by the Free Software Foundation Inc. + +GNU Affero GPL: means the GNU Affero General Public License version 3 or +any subsequent version, as published by the Free Software Foundation Inc. + +EUPL: means the European Union Public License version 1.1 or any +subsequent version, as published by the European Commission. + +Parties: mean both the Licensee and the Licensor. + +These expressions may be used both in singular and plural form. + + + Article 2 - PURPOSE + +The purpose of the Agreement is the grant by the Licensor to the +Licensee of a non-exclusive, transferable and worldwide license for the +Software as set forth in Article 5 <#scope> hereinafter for the whole +term of the protection granted by the rights over said Software. + + + Article 3 - ACCEPTANCE + +3.1 The Licensee shall be deemed as having accepted the terms and +conditions of this Agreement upon the occurrence of the first of the +following events: + + * (i) loading the Software by any or all means, notably, by + downloading from a remote server, or by loading from a physical medium; + * (ii) the first time the Licensee exercises any of the rights granted + hereunder. + +3.2 One copy of the Agreement, containing a notice relating to the +characteristics of the Software, to the limited warranty, and to the +fact that its use is restricted to experienced users has been provided +to the Licensee prior to its acceptance as set forth in Article 3.1 +<#accepting> hereinabove, and the Licensee hereby acknowledges that it +has read and understood it. + + + Article 4 - EFFECTIVE DATE AND TERM + + + 4.1 EFFECTIVE DATE + +The Agreement shall become effective on the date when it is accepted by +the Licensee as set forth in Article 3.1 <#accepting>. + + + 4.2 TERM + +The Agreement shall remain in force for the entire legal term of +protection of the economic rights over the Software. + + + Article 5 - SCOPE OF RIGHTS GRANTED + +The Licensor hereby grants to the Licensee, who accepts, the following +rights over the Software for any or all use, and for the term of the +Agreement, on the basis of the terms and conditions set forth hereinafter. + +Besides, if the Licensor owns or comes to own one or more patents +protecting all or part of the functions of the Software or of its +components, the Licensor undertakes not to enforce the rights granted by +these patents against successive Licensees using, exploiting or +modifying the Software. If these patents are transferred, the Licensor +undertakes to have the transferees subscribe to the obligations set +forth in this paragraph. + + + 5.1 RIGHT OF USE + +The Licensee is authorized to use the Software, without any limitation +as to its fields of application, with it being hereinafter specified +that this comprises: + + 1. permanent or temporary reproduction of all or part of the Software + by any or all means and in any or all form. + + 2. loading, displaying, running, or storing the Software on any or all + medium. + + 3. entitlement to observe, study or test its operation so as to + determine the ideas and principles behind any or all constituent + elements of said Software. This shall apply when the Licensee + carries out any or all loading, displaying, running, transmission or + storage operation as regards the Software, that it is entitled to + carry out hereunder. + + + 5.2 ENTITLEMENT TO MAKE CONTRIBUTIONS + +The right to make Contributions includes the right to translate, adapt, +arrange, or make any or all modifications to the Software, and the right +to reproduce the resulting software. + +The Licensee is authorized to make any or all Contributions to the +Software provided that it includes an explicit notice that it is the +author of said Contribution and indicates the date of the creation thereof. + + + 5.3 RIGHT OF DISTRIBUTION + +In particular, the right of distribution includes the right to publish, +transmit and communicate the Software to the general public on any or +all medium, and by any or all means, and the right to market, either in +consideration of a fee, or free of charge, one or more copies of the +Software by any means. + +The Licensee is further authorized to distribute copies of the modified +or unmodified Software to third parties according to the terms and +conditions set forth hereinafter. + + + 5.3.1 DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION + +The Licensee is authorized to distribute true copies of the Software in +Source Code or Object Code form, provided that said distribution +complies with all the provisions of the Agreement and is accompanied by: + + 1. a copy of the Agreement, + + 2. a notice relating to the limitation of both the Licensor's warranty + and liability as set forth in Articles 8 and 9, + +and that, in the event that only the Object Code of the Software is +redistributed, the Licensee allows effective access to the full Source +Code of the Software for a period of at least three years from the +distribution of the Software, it being understood that the additional +acquisition cost of the Source Code shall not exceed the cost of the +data transfer. + + + 5.3.2 DISTRIBUTION OF MODIFIED SOFTWARE + +When the Licensee makes a Contribution to the Software, the terms and +conditions for the distribution of the resulting Modified Software +become subject to all the provisions of this Agreement. + +The Licensee is authorized to distribute the Modified Software, in +source code or object code form, provided that said distribution +complies with all the provisions of the Agreement and is accompanied by: + + 1. a copy of the Agreement, + + 2. a notice relating to the limitation of both the Licensor's warranty + and liability as set forth in Articles 8 and 9, + +and, in the event that only the object code of the Modified Software is +redistributed, + + 3. a note stating the conditions of effective access to the full source + code of the Modified Software for a period of at least three years + from the distribution of the Modified Software, it being understood + that the additional acquisition cost of the source code shall not + exceed the cost of the data transfer. + + + 5.3.3 DISTRIBUTION OF EXTERNAL MODULES + +When the Licensee has developed an External Module, the terms and +conditions of this Agreement do not apply to said External Module, that +may be distributed under a separate license agreement. + + + 5.3.4 COMPATIBILITY WITH OTHER LICENSES + +The Licensee can include a code that is subject to the provisions of one +of the versions of the GNU GPL, GNU Affero GPL and/or EUPL in the +Modified or unmodified Software, and distribute that entire code under +the terms of the same version of the GNU GPL, GNU Affero GPL and/or EUPL. + +The Licensee can include the Modified or unmodified Software in a code +that is subject to the provisions of one of the versions of the GNU GPL, +GNU Affero GPL and/or EUPL and distribute that entire code under the +terms of the same version of the GNU GPL, GNU Affero GPL and/or EUPL. + + + Article 6 - INTELLECTUAL PROPERTY + + + 6.1 OVER THE INITIAL SOFTWARE + +The Holder owns the economic rights over the Initial Software. Any or +all use of the Initial Software is subject to compliance with the terms +and conditions under which the Holder has elected to distribute its work +and no one shall be entitled to modify the terms and conditions for the +distribution of said Initial Software. + +The Holder undertakes that the Initial Software will remain ruled at +least by this Agreement, for the duration set forth in Article 4.2 <#term>. + + + 6.2 OVER THE CONTRIBUTIONS + +The Licensee who develops a Contribution is the owner of the +intellectual property rights over this Contribution as defined by +applicable law. + + + 6.3 OVER THE EXTERNAL MODULES + +The Licensee who develops an External Module is the owner of the +intellectual property rights over this External Module as defined by +applicable law and is free to choose the type of agreement that shall +govern its distribution. + + + 6.4 JOINT PROVISIONS + +The Licensee expressly undertakes: + + 1. not to remove, or modify, in any manner, the intellectual property + notices attached to the Software; + + 2. to reproduce said notices, in an identical manner, in the copies of + the Software modified or not. + +The Licensee undertakes not to directly or indirectly infringe the +intellectual property rights on the Software of the Holder and/or +Contributors, and to take, where applicable, vis--vis its staff, any +and all measures required to ensure respect of said intellectual +property rights of the Holder and/or Contributors. + + + Article 7 - RELATED SERVICES + +7.1 Under no circumstances shall the Agreement oblige the Licensor to +provide technical assistance or maintenance services for the Software. + +However, the Licensor is entitled to offer this type of services. The +terms and conditions of such technical assistance, and/or such +maintenance, shall be set forth in a separate instrument. Only the +Licensor offering said maintenance and/or technical assistance services +shall incur liability therefor. + +7.2 Similarly, any Licensor is entitled to offer to its licensees, under +its sole responsibility, a warranty, that shall only be binding upon +itself, for the redistribution of the Software and/or the Modified +Software, under terms and conditions that it is free to decide. Said +warranty, and the financial terms and conditions of its application, +shall be subject of a separate instrument executed between the Licensor +and the Licensee. + + + Article 8 - LIABILITY + +8.1 Subject to the provisions of Article 8.2, the Licensee shall be +entitled to claim compensation for any direct loss it may have suffered +from the Software as a result of a fault on the part of the relevant +Licensor, subject to providing evidence thereof. + +8.2 The Licensor's liability is limited to the commitments made under +this Agreement and shall not be incurred as a result of in particular: +(i) loss due the Licensee's total or partial failure to fulfill its +obligations, (ii) direct or consequential loss that is suffered by the +Licensee due to the use or performance of the Software, and (iii) more +generally, any consequential loss. In particular the Parties expressly +agree that any or all pecuniary or business loss (i.e. loss of data, +loss of profits, operating loss, loss of customers or orders, +opportunity cost, any disturbance to business activities) or any or all +legal proceedings instituted against the Licensee by a third party, +shall constitute consequential loss and shall not provide entitlement to +any or all compensation from the Licensor. + + + Article 9 - WARRANTY + +9.1 The Licensee acknowledges that the scientific and technical +state-of-the-art when the Software was distributed did not enable all +possible uses to be tested and verified, nor for the presence of +possible defects to be detected. In this respect, the Licensee's +attention has been drawn to the risks associated with loading, using, +modifying and/or developing and reproducing the Software which are +reserved for experienced users. + +The Licensee shall be responsible for verifying, by any or all means, +the suitability of the product for its requirements, its good working +order, and for ensuring that it shall not cause damage to either persons +or properties. + +9.2 The Licensor hereby represents, in good faith, that it is entitled +to grant all the rights over the Software (including in particular the +rights set forth in Article 5 <#scope>). + +9.3 The Licensee acknowledges that the Software is supplied "as is" by +the Licensor without any other express or tacit warranty, other than +that provided for in Article 9.2 <#good-faith> and, in particular, +without any warranty as to its commercial value, its secured, safe, +innovative or relevant nature. + +Specifically, the Licensor does not warrant that the Software is free +from any error, that it will operate without interruption, that it will +be compatible with the Licensee's own equipment and software +configuration, nor that it will meet the Licensee's requirements. + +9.4 The Licensor does not either expressly or tacitly warrant that the +Software does not infringe any third party intellectual property right +relating to a patent, software or any other property right. Therefore, +the Licensor disclaims any and all liability towards the Licensee +arising out of any or all proceedings for infringement that may be +instituted in respect of the use, modification and redistribution of the +Software. Nevertheless, should such proceedings be instituted against +the Licensee, the Licensor shall provide it with technical and legal +expertise for its defense. Such technical and legal expertise shall be +decided on a case-by-case basis between the relevant Licensor and the +Licensee pursuant to a memorandum of understanding. The Licensor +disclaims any and all liability as regards the Licensee's use of the +name of the Software. No warranty is given as regards the existence of +prior rights over the name of the Software or as regards the existence +of a trademark. + + + Article 10 - TERMINATION + +10.1 In the event of a breach by the Licensee of its obligations +hereunder, the Licensor may automatically terminate this Agreement +thirty (30) days after notice has been sent to the Licensee and has +remained ineffective. + +10.2 A Licensee whose Agreement is terminated shall no longer be +authorized to use, modify or distribute the Software. However, any +licenses that it may have granted prior to termination of the Agreement +shall remain valid subject to their having been granted in compliance +with the terms and conditions hereof. + + + Article 11 - MISCELLANEOUS + + + 11.1 EXCUSABLE EVENTS + +Neither Party shall be liable for any or all delay, or failure to +perform the Agreement, that may be attributable to an event of force +majeure, an act of God or an outside cause, such as defective +functioning or interruptions of the electricity or telecommunications +networks, network paralysis following a virus attack, intervention by +government authorities, natural disasters, water damage, earthquakes, +fire, explosions, strikes and labor unrest, war, etc. + +11.2 Any failure by either Party, on one or more occasions, to invoke +one or more of the provisions hereof, shall under no circumstances be +interpreted as being a waiver by the interested Party of its right to +invoke said provision(s) subsequently. + +11.3 The Agreement cancels and replaces any or all previous agreements, +whether written or oral, between the Parties and having the same +purpose, and constitutes the entirety of the agreement between said +Parties concerning said purpose. No supplement or modification to the +terms and conditions hereof shall be effective as between the Parties +unless it is made in writing and signed by their duly authorized +representatives. + +11.4 In the event that one or more of the provisions hereof were to +conflict with a current or future applicable act or legislative text, +said act or legislative text shall prevail, and the Parties shall make +the necessary amendments so as to comply with said act or legislative +text. All other provisions shall remain effective. Similarly, invalidity +of a provision of the Agreement, for any reason whatsoever, shall not +cause the Agreement as a whole to be invalid. + + + 11.5 LANGUAGE + +The Agreement is drafted in both French and English and both versions +are deemed authentic. + + + Article 12 - NEW VERSIONS OF THE AGREEMENT + +12.1 Any person is authorized to duplicate and distribute copies of this +Agreement. + +12.2 So as to ensure coherence, the wording of this Agreement is +protected and may only be modified by the authors of the License, who +reserve the right to periodically publish updates or new versions of the +Agreement, each with a separate number. These subsequent versions may +address new issues encountered by Free Software. + +12.3 Any Software distributed under a given version of the Agreement may +only be subsequently distributed under the same version of the Agreement +or a subsequent version, subject to the provisions of Article 5.3.4 +<#compatibility>. + + + Article 13 - GOVERNING LAW AND JURISDICTION + +13.1 The Agreement is governed by French law. The Parties agree to +endeavor to seek an amicable solution to any disagreements or disputes +that may arise during the performance of the Agreement. + +13.2 Failing an amicable solution within two (2) months as from their +occurrence, and unless emergency proceedings are necessary, the +disagreements or disputes shall be referred to the Paris Courts having +jurisdiction, by the more diligent Party. + diff --git a/profiles/package.mask b/profiles/package.mask index cc9f64d08..306ba64a0 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -69,6 +69,13 @@ >=sci-chemistry/coot-9999 >=sci-chemistry/pymol-9999 +# Guillaume Horel <guillaume.horel@gmail.com> (25 Oct 2013) +# mask new version of scilab until release +>=sci-mathematics/scilab-5.5.0 +>=dev-java/jgraphx-2.1 +>=dev-java/jogl-2.0.2 + + # Honza Macháček <Hloupy.Honza@centrum.cz> (17 June 2013) # bigdft moved from sci-libs to sci-physics # sci-physics/abinit now uses sci-libs/bigdft-abi instead @@ -128,10 +135,17 @@ sci-visualization/vtkPOFFReader # work in progress =sci-chemistry/almost-1.0.3-r1 -# Nicolas Bock <nicolasbock@gmail.com> (17 Sep 2003) +# Nicolas Bock <nicolasbock@gmail.com> (17 Sep 2013) # The versioning scheme of freeon changed from a date based version to a more # standard form. Now the latest release is considered a downgrade by portage. # Masking the date based releases to get users to upgrade. =sci-chemistry/freeon-2012.05.03 =sci-chemistry/freeon-2013.09.12 =sci-chemistry/freeon-2013.09.16 + +# Nicolas Bock <nicolasbock@gmail.com> (24 Oct 2013) +# Masking older version before removal. +=sci-chemistry/freeon-1.0 +=sci-chemistry/freeon-1.0.1 +=sci-chemistry/freeon-1.0.2 +=sci-chemistry/freeon-1.0.3 diff --git a/sci-chemistry/freeon/ChangeLog b/sci-chemistry/freeon/ChangeLog index ca3a5406c..7d342b098 100644 --- a/sci-chemistry/freeon/ChangeLog +++ b/sci-chemistry/freeon/ChangeLog @@ -2,6 +2,15 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 25 Oct 2013; Nicolas Bock <nicolasbock@gmail.com> freeon-1.0.7.ebuild: + sci-chemistry/freeon-1.0.7: Cleaned up IUSE (the default behavior changed in + this version. + +*freeon-1.0.7 (24 Oct 2013) + + 24 Oct 2013; Nicolas Bock <nicolasbock@gmail.com> +freeon-1.0.7.ebuild: + sci-chemistry/freeon-1.0.7: Version bump. + *freeon-1.0.6 (03 Oct 2013) 03 Oct 2013; Nicolas Bock <nicolasbock@gmail.com> +freeon-1.0.6.ebuild: diff --git a/sci-chemistry/freeon/Manifest b/sci-chemistry/freeon/Manifest index 7c8975b6a..64105956b 100644 --- a/sci-chemistry/freeon/Manifest +++ b/sci-chemistry/freeon/Manifest @@ -4,4 +4,5 @@ DIST freeon-1.0.3.tar.bz2 6094060 SHA256 d17cf00e8b861a3c8d12d562d436fdf4cbf5e75 DIST freeon-1.0.4.tar.bz2 6080627 SHA256 26c7194b371a706450fdd9294d7a91308ab323a899b973481019458000e00520 SHA512 bfdfeb15851795432468debd1ab8cd102d167a1ee62c4bc8fa7aa302375422ce91b2515fc3c7fc3d6f1d56f45560d27158f87fd3c51a28107ce0742ef74436b5 WHIRLPOOL ba996b104951bf45705ef5a343c88a596ccdcb244ae064a5ee671922d426c9e79434b830f4e60c2985834cf13e4e2a89bf5559b31df3391a6ef44db18c855260 DIST freeon-1.0.5.tar.bz2 6076364 SHA256 8c46f401ea83698d83d5fa8860037bf1bfc94f6844e12242ea14c1b730d1f960 SHA512 65905e3da4e17babab3235a535cef4282eca4b54beb6fcf2f6e6e71a7380c63efb953aefae00abf9fdf7dcd5164c314f36cf40a035483fbb0c7ae23dfa8e7139 WHIRLPOOL a5d8ff2c78d049b074d6c91cf57317f2fbbcc8dc7ddef5c7f2812c59368b24e4da51f197dff7af4ea3855f1a340b1cb18bde51a0ed6f3188998462bd59baa453 DIST freeon-1.0.6.tar.bz2 6076220 SHA256 573149f68deb2d6a4f745fc83d54be2f4ec25b23dc9735b2c3932ac4501e9f18 SHA512 3150b0fc2764348c2a40dfa5085dc645b5f512b1a53b998cf8f34f31c2c5d76155bdb96ab16b261678c529f4597ea8f29412b77343c25c6b3b1cdc2106a7ae01 WHIRLPOOL c1b9d0e0f47ba34b07626775f44524afc8d569979ff874a6e5c3cec51bc2b3295aa5e8c4481166d87e383cd64adbcfa85722a3efb4212e610be6b77713e47913 +DIST freeon-1.0.7.tar.bz2 6124455 SHA256 556b8e98618932bdc1d1a6f405354486e1da22221fd2513c1539a722533b20d4 SHA512 8b76364ccb0d677585b71a5f5f2c0bd95f573c2d9234fa2334031838816aa0b7f6776a2848d76e7363429a357f4340e8693698225cc15930158221eee0173011 WHIRLPOOL ddd235a2c30b86dec34da144cf0a2763b72e5f34787080b9f4bc75456cc0f5ffa28bbe6ae812a4a662e733fe514210bbe1d657f8f175a479c34a0e3a32440e04 DIST freeon-1.0.tar.bz2 6053346 SHA256 4cd7618402cea91eba90377546001e975b81b7e5ff533c36f650f9e2b5c1363c SHA512 4161f020beb5e55ed1d352c8c309c1ae6237d982a858cef61c1343f379d0142890fa45eb5de8cb8a93591cfec74485ed50b51d663038e4496febb9673a6bf646 WHIRLPOOL 6da7320e730359e4599a8312037b2e276e68835d0b05aedd913f1dbcb529dfb22c38cb76f0fd8c5eb96060a6c3bfe0b8bd70d5388a21fbcafab2f09b42b79d1c diff --git a/sci-chemistry/freeon/freeon-1.0.7.ebuild b/sci-chemistry/freeon/freeon-1.0.7.ebuild new file mode 100644 index 000000000..3f0980a23 --- /dev/null +++ b/sci-chemistry/freeon/freeon-1.0.7.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2013 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/nmrpipe/ChangeLog b/sci-chemistry/nmrpipe/ChangeLog index 5ad1beec3..0e6666223 100644 --- a/sci-chemistry/nmrpipe/ChangeLog +++ b/sci-chemistry/nmrpipe/ChangeLog @@ -2,6 +2,16 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 28 Oct 2013; Justin Lecher <jlec@gentoo.org> + -nmrpipe-8.1.2013.218.23.09.ebuild, +nmrpipe-8.1.2013.218.23.09-r1.ebuild, + +files/extract.M: + Add IBS extract.M macro + + 25 Oct 2013; Justin Lecher <jlec@gentoo.org> + -nmrpipe-8.1.2013.218.23.09.ebuild, +nmrpipe-8.1.2013.218.23.09-r1.ebuild, + +files/extract.M: + Add IBS extract.M macro + 12 Aug 2013; Justin Lecher <jlec@gentoo.org> -nmrpipe-7.9.2013.021.23.09-r3.ebuild, +nmrpipe-8.1.2013.218.23.09.ebuild, -files/nmrpipe-7.9.2013.021.23.09-lib.patch, diff --git a/sci-chemistry/nmrpipe/files/extract.M b/sci-chemistry/nmrpipe/files/extract.M new file mode 100644 index 000000000..544d2fee3 --- /dev/null +++ b/sci-chemistry/nmrpipe/files/extract.M @@ -0,0 +1,37 @@ +if (sliceCode == CODE_ARGS) + { + ArrayNum = argVal( "an" ); /* Array size of arrayed parameter */ + SpecNum = argVal( "sn" ); /* Spectrum number to be extracted */ + printf(" Spectrum %3.0f out of %4.0f\n",SpecNum,ArrayNum); + }; + +if (sliceCode == CODE_INIT) + { + (void) setParm( fdata, NDSIZE, integer( specnum/ArrayNum ), CUR_YDIM ); + }; + +if (sliceCode >1) + { + exit( 0 ); + }; + +if (sliceCode < 0) + { + exit( 0 ); + }; + + +float fid[2*size*specnum]; +float Single[4*size]; + +(void) dReadB(inUnit,fid, 2*wordLen*size*specnum ); /* load the whole FID data in the array "fid" */ + +offset = 4*size*(SpecNum-1); + +for( i = 0; i < specnum*size*2; i = i+4*ArrayNum*size) +{ + (void) vvCopyOff( Single, fid, 4*size, 0, offset ); /* load in the buffer array "Single" two complex spectra + (phase=1,phase=2) from the "fid" array starting from offset*/ + (void) dWrite( outUnit,Single,wordLen*4*size); /* write "Single in the output */ + offset += 4*ArrayNum*size; +} diff --git a/sci-chemistry/nmrpipe/nmrpipe-8.1.2013.218.23.09.ebuild b/sci-chemistry/nmrpipe/nmrpipe-8.1.2013.218.23.09-r1.ebuild index 1a81a38f0..cd253d5d3 100644 --- a/sci-chemistry/nmrpipe/nmrpipe-8.1.2013.218.23.09.ebuild +++ b/sci-chemistry/nmrpipe/nmrpipe-8.1.2013.218.23.09-r1.ebuild @@ -208,4 +208,7 @@ src_install() { exeinto ${NMRBASE}/nmrbin.linux9 doexe "${T}"/nmrWish + + insinto ${NMRBASE}/nmrtxt + doins "${FILESDIR}"/extract.M } diff --git a/sci-libs/libsufr/ChangeLog b/sci-libs/libsufr/ChangeLog index 1bf764b39..bf9407adb 100644 --- a/sci-libs/libsufr/ChangeLog +++ b/sci-libs/libsufr/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*libsufr-0.5.4 (27 Oct 2013) + + 27 Oct 2013; AstroFloyd <AstroFloyd@gmail.com> -libsufr-0.3.3.ebuild, + +libsufr-0.5.4.ebuild: + Version bump + *libsufr-0.4.1 (13 Jan 2013) 13 Jan 2013; AstroFloyd <AstroFloyd@gmail.com> +libsufr-0.4.1.ebuild: diff --git a/sci-libs/libsufr/Manifest b/sci-libs/libsufr/Manifest index 37459ec8c..01910bbba 100644 --- a/sci-libs/libsufr/Manifest +++ b/sci-libs/libsufr/Manifest @@ -1,2 +1,3 @@ -DIST libsufr-0.3.3.tar.gz 45360 SHA256 c2c76c9461cd913dc62e3e6dc3420aca5a03b620ccfbb7f8e58375fcbc1bfbf5 SHA512 27ceefaf345532c3579b80420038ff3c12e2dda0111fe95a4623283084ff52b6e19571e4fbd38cf1b2e495037443df54d9c280f85b4eabeafec454201b621178 WHIRLPOOL 1f6258e8c9339c6a07a9a3a4612a348f7f5a68ef230eeb1d3645f288103a8ea7e65b6f3af7d9c18d965960c8338e3822ff753ba1d55b8f37feb31c257ed3deaf DIST libsufr-0.4.1.tar.gz 52219 SHA256 8826f7bc2f3db8c6fea37896211bbbf933ba8cc3f06465ce42266a9193891ec1 SHA512 d51bcc26957bb8c11845d16d1ace3753eb9a8e42367ddc5c4d35dc3208f03c016e7a46700d462a8705a9ba4ef821bc240852b2fad95605f2abd3dd59d06f08cc WHIRLPOOL 8886b3983516a431cd1d14dbe884a67d1592b1f5f3c2d8255cac5ad716ba42d0b0d8cc144353ffd8b6c180c0c40fddf60f9218b7da65c1ebdedd368f1f3ee9bb +DIST libsufr-0.5.2.tar.gz 56965 SHA256 b4ff25038b7ec0378c2db83150547603a06be23ef3173f66e76fbff5a62f1f6c SHA512 ddb559243c56dbe165a65a26d2278f3b70ebd740eb3516e712d64ce59bde42f7cabc7daacd4caa742bcdfd402c51f8e07f41daf3dba352787887b0698f71f138 WHIRLPOOL 17298acdc964708537f57188d9fc7bc887ec12a2857a1b4f4b2ca47f232b87f6a1f50603dbc86bd6a7d938eb8e8ef02f26d1750eb18fd444062161eadc22630f +DIST libsufr-0.5.4.tar.gz 59469 SHA256 d7c98a0cf2ce184751fba9cde4583811a3593f5ae34a8d32715ed8e32971f14b SHA512 3711af7db10398e8dcb92982d4fedcc866fa5257f8a3b108ad1a5caef174fa4c0c9ed0b4e3e3b620d0e0d5f4cdaa56691c9657e57980c27a7aef00e45fcdd773 WHIRLPOOL 9f93a84653855fe7b52807bc0c482bfb6e9aeb82f4c8e4343a5f313b93ea279e6e3f23227a59821e37f140fc37cd581d7472b79389fa096f020bf334ca23210f diff --git a/sci-libs/libsufr/libsufr-0.4.1.ebuild b/sci-libs/libsufr/libsufr-0.4.1.ebuild index 75098c1b5..57249892a 100644 --- a/sci-libs/libsufr/libsufr-0.4.1.ebuild +++ b/sci-libs/libsufr/libsufr-0.4.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 inherit cmake-utils fortran-2 diff --git a/sci-libs/libsufr/libsufr-0.5.2.ebuild b/sci-libs/libsufr/libsufr-0.5.2.ebuild index 75098c1b5..57249892a 100644 --- a/sci-libs/libsufr/libsufr-0.5.2.ebuild +++ b/sci-libs/libsufr/libsufr-0.5.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 inherit cmake-utils fortran-2 diff --git a/sci-libs/libsufr/libsufr-0.3.3.ebuild b/sci-libs/libsufr/libsufr-0.5.4.ebuild index 2f988824e..57249892a 100644 --- a/sci-libs/libsufr/libsufr-0.3.3.ebuild +++ b/sci-libs/libsufr/libsufr-0.5.4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 inherit cmake-utils fortran-2 @@ -25,4 +25,4 @@ src_configure() { cmake-utils_src_configure } -DOCS="CHANGELOG README" +DOCS="CHANGELOG README VERSION" diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest index 95f51be8a..8c62252ba 100644 --- a/sci-mathematics/scilab/Manifest +++ b/sci-mathematics/scilab/Manifest @@ -1,2 +1,3 @@ DIST scilab-5.3.3-src.tar.gz 47253497 SHA256 e6edd7d241f2a09bd2dadaaafff5c152509db240220933b87305875302401335 SHA512 334ff05239efa2c9c378a86521a979aa5578f5a79324dc4f16805a995c673d5bd9656567de127939bf30409e2ba6f5904b75508046adfcfa4a5d6390f53d8ffa WHIRLPOOL 635666dbc52280fd797f01402c42429acd3e55c1bcdd9a2af584e349838e1bb935cef97f0f9f061d7b1c44f6078a0d84fb44f2c4cb17fcf9d3ba59e79c45493e DIST scilab-5.4.1-src.tar.gz 66112086 SHA256 f63db4de7daeb68409644b2c32888af4f0bb0ca7ede9c3857f4ccb6289ea861c SHA512 819d433f52ebce8d6cbd71d46b7313963d5c7d2de7b946ac1d0b05e2863e168bee8453dc2974f33e09c34c0130c831f17358b38ecb7387dc7c38a64b6da96978 WHIRLPOOL 1f9ad2caa8426659eedb3e17f7cc02e309e4d610393aef74d9c14c68bf8ec7c0a6398d38dabb7d7eecb9db04f6b824eddc48cf5fbdc6fbd92c9b14cba95ad801 +DIST scilab-5.5.0-beta-1-src.tar.gz 68636818 SHA256 71b4b5c8b6fba1af1f66702ca68fb8a17c9d36134cee84fcab8d92d16a85d934 SHA512 bd71d6390fc455a6e797578d356a1179449d2a217d86a29ef7f3da1e709dd02f61b90092638a1873fe6f80647f2a883e6af549946e602e628bb930c443139714 WHIRLPOOL 00b6b0eb23a8040563a1730633ab632cef5724dfe95cc8c3deb14bb541b1365689d1bd221246e79de1bd0404a38d50aee18837b2b3678800e64a5fd4dfd2ab87 diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-always-use-dynamic-stack.patch b/sci-mathematics/scilab/files/scilab-5.5.0-always-use-dynamic-stack.patch new file mode 100644 index 000000000..309e45c06 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.5.0-always-use-dynamic-stack.patch @@ -0,0 +1,33 @@ +See https://bugzilla.redhat.com/show_bug.cgi?id=964307 +and http://bugzilla.scilab.org/show_bug.cgi?id=12625 +--- configure.ac.orig 2013-10-24 23:55:14.530698970 -0400 ++++ configure.ac 2013-10-25 00:03:25.597684590 -0400 +@@ -698,15 +698,10 @@ + SCILIBS_CXXFLAGS='' + SCILIBS_FFLAGS='' + +-if test $IS_64_BITS_CPU = true -o "$MACOSX" = "1"; then +- if test $f90compatible = false; then +- AC_MSG_ERROR([64 bits support needs a fortran 90 compiler (try --with-gfortran).]) +- fi + AC_DEFINE([USE_DYNAMIC_STACK], [], [If we are building a 64 bits version]) +-fi + + AM_CONDITIONAL(IS_64_BITS_CPU, test $IS_64_BITS_CPU = true) +-AM_CONDITIONAL(USE_DYNAMIC_STACK, test $IS_64_BITS_CPU = true -o "$MACOSX" = "1") ++AM_CONDITIONAL(USE_DYNAMIC_STACK, true) + + ################ + ## SSE +@@ -1958,11 +1953,7 @@ + AC_CONFIG_COMMANDS_POST([chmod +x $SCI_SRCDIR_FULL/modules/scicos_blocks/src/scripts/GenBlocks.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/scicompile.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/compilerDetection.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/configure]) + + # Generate stack.h +-if test "$IS_64_BITS_CPU" = true -o "$MACOSX" = "1"; then + stack_h_cpp_flags=-DUSE_DYNAMIC_STACK +-else +- stack_h_cpp_flags= +-fi + + AC_CONFIG_COMMANDS([modules/core/includes/stack.h], + [if ! $CPP $stack_h_cpp_flags - < $srcdir/modules/core/includes/stack.h.in |\ diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-disable-static-systemlib.patch b/sci-mathematics/scilab/files/scilab-5.5.0-disable-static-systemlib.patch new file mode 100644 index 000000000..ce5b03293 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.5.0-disable-static-systemlib.patch @@ -0,0 +1,20 @@ +X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=blobdiff_plain;f=scilab%2Fm4%2Fcompiler.m4;h=150a283c5ba4f30a997dceb7fd4cb529283b3d54;hp=dbd0180faee5f4f491205e8bd97e7fc6082930d7;hb=3147468d32d010c01036ecfe4a86b2d9c6c12bf0;hpb=a9218e259ed573228e1aa6732c6ff7ea3c21fae4 + +diff --git a/scilab/m4/compiler.m4 b/scilab/m4/compiler.m4 +index dbd0180..150a283 100644 +--- a/scilab/m4/compiler.m4 ++++ b/scilab/m4/compiler.m4 +@@ -38,6 +38,13 @@ saved_LDFLAGS="$LDFLAGS" + compiler_manage_static_libs=no + USE_STATIC_SYSTEM_LIB=yes + ++ ++if test "x$enable_static_system_lib" == "xno"; then ++# The user ask for an explicit disable. ++ USE_STATIC_SYSTEM_LIB=no ++fi ++ ++ + LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc" + AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) + AC_LANG_PUSH(C++) diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.0-fix-random-runtime-failure.patch new file mode 100644 index 000000000..92ac45339 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.5.0-fix-random-runtime-failure.patch @@ -0,0 +1,12 @@ +diff -urN scilab-orig/modules/api_scilab/src/cpp/api_double.cpp scilab/modules/api_scilab/src/cpp/api_double.cpp +--- scilab-orig/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:26:31.342617365 -0400 ++++ scilab/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:27:34.838621420 -0400 +@@ -497,7 +497,7 @@ + /*--------------------------------------------------------------------------*/ + int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal) + { +- return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL); ++ return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, 0); + } + /*--------------------------------------------------------------------------*/ + int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg) diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch new file mode 100644 index 000000000..118df3b1a --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch @@ -0,0 +1,12 @@ +diff -urN scilab-orig/m4/java.m4 scilab/m4/java.m4 +--- scilab-orig/m4/java.m4 2012-07-07 18:39:39.036716695 -0400 ++++ scilab/m4/java.m4 2012-07-07 18:40:54.479721514 -0400 +@@ -846,7 +846,7 @@ + for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do + + # TODO check the behaviour when spaces +- jars_resolved=`ls $jar 2>/dev/null` ++ jars_resolved=$(realpath $(ls $jar 2>/dev/null) 2>/dev/null) + for jar_resolved in $jars_resolved; do # If several jars matches + if test -e "$jar_resolved"; then + export ac_java_classpath="$jar_resolved:$ac_java_classpath" diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.0-gluegen.patch new file mode 100644 index 000000000..64717a75a --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.5.0-gluegen.patch @@ -0,0 +1,12 @@ +diff -urN scilab-orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java +--- scilab-orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java 2012-07-09 23:14:03.261245376 -0400 ++++ scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java 2012-07-09 23:17:38.226239081 -0400 +@@ -73,7 +73,7 @@ + + static { + try { +- System.loadLibrary("gluegen2-rt"); ++ System.loadLibrary("gluegen-rt"); + } catch (Exception e) { + System.err.println(e); + } diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.0-java-heap.patch new file mode 100644 index 000000000..990f967f4 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.5.0-java-heap.patch @@ -0,0 +1,13 @@ +--- etc/jvm_options.xml.orig 2013-07-08 22:46:24.092981137 -0400 ++++ etc/jvm_options.xml 2013-07-08 22:50:23.788974118 -0400 +@@ -21,8 +21,8 @@ + <option value="-Djava.util.logging.config.file=$SCILAB/etc/logging.properties"/> + <!-- ENABLE Just In Time java compiler --> + <option value="-Djava.compiler=JIT"/> +- <!-- Set Java Heap space to 256mb --> +- <option value="-Xmx256m"/> ++ <!-- Set Java Heap space to 512mb --> ++ <option value="-Xmx512m"/> + + <!-- Set Java space for direct buffer allocation --> + <!-- diff --git a/sci-mathematics/scilab/scilab-5.5.0.ebuild b/sci-mathematics/scilab/scilab-5.5.0.ebuild new file mode 100644 index 000000000..15b592ea7 --- /dev/null +++ b/sci-mathematics/scilab/scilab-5.5.0.ebuild @@ -0,0 +1,250 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +JAVA_PKG_OPT_USE="gui" +VIRTUALX_REQUIRED="manual" + +inherit eutils autotools bash-completion-r1 check-reqs fdo-mime flag-o-matic \ + fortran-2 java-pkg-opt-2 toolchain-funcs virtualx + +MY_PV="${PV}-beta-1" +MY_P="$PN"-"$MY_PV" + +# Things that don't work: +# - tests +# - can't build without docs (-doc) + +DESCRIPTION="Scientific software package for numerical computations" +HOMEPAGE="http://www.scilab.org/" +SRC_URI="http://www.scilab.org/download/${MY_PV}/${MY_P}-src.tar.gz" + +LICENSE="CeCILL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="bash-completion debug +doc fftw +gui +matio nls openmp + static-libs test tk +umfpack +xcos" +REQUIRED_USE="xcos? ( gui ) doc? ( gui )" + +# ALL_LINGUAS variable defined in configure.ac +LINGUAS="fr_FR zh_CN zh_TW ca_ES es_ES pt_BR" +for l in ${LINGUAS}; do + IUSE="${IUSE} linguas_${l}" +done +LINGUASLONG="de_DE ja_JP it_IT uk_UA pl_PL ru_RU" +for l in ${LINGUASLONG}; do + IUSE="${IUSE} linguas_${l%_*}" +done + +CDEPEND="dev-libs/libpcre + dev-libs/libxml2:2 + sci-libs/hdf5 + >=sci-libs/arpack-3 + sys-devel/gettext + sys-libs/ncurses + sys-libs/readline + virtual/lapack + fftw? ( sci-libs/fftw:3.0 ) + gui? ( + dev-java/avalon-framework:4.2 + dev-java/batik:1.7 + dev-java/commons-io:1 + >=dev-java/flexdock-1.2.3:0 + dev-java/fop:0 + dev-java/gluegen:2 + dev-java/javahelp:0 + dev-java/jeuclid-core:0 + dev-java/jgoodies-looks:2.0 + dev-java/jgraphx:2.1 + dev-java/jlatexmath:1 + dev-java/jogl:2 + >=dev-java/jrosetta-1.0.4:0 + dev-java/skinlf:0 + dev-java/xmlgraphics-commons:1.5 + virtual/opengl + doc? ( dev-java/saxon:9 ) + xcos? ( dev-java/commons-logging:0 ) ) + matio? ( <sci-libs/matio-1.5 ) + tk? ( dev-lang/tk ) + umfpack? ( sci-libs/umfpack )" + +RDEPEND="${CDEPEND} + gui? ( >=virtual/jre-1.5 )" + +DEPEND="${CDEPEND} + virtual/pkgconfig + debug? ( dev-util/lcov ) + gui? ( + >=virtual/jdk-1.5 + doc? ( app-text/docbook-xsl-stylesheets + dev-java/xml-commons-external:1.4 + dev-java/jlatexmath-fop:1 ) + xcos? ( dev-lang/ocaml ) ) + test? ( + dev-java/junit:4 + gui? ( ${VIRTUALX_DEPEND} ) )" + +DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" ) + +S="${WORKDIR}"/"${MY_P}" + +pkg_pretend() { + use doc && CHECKREQS_MEMORY="512M" check-reqs_pkg_pretend +} + +pkg_setup() { + if use openmp; then + if [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then + ewarn "You are using a gcc without OpenMP capabilities" + die "Need an OpenMP capable compiler" + fi + FORTRAN_NEED_OPENMP=1 + fi + FORTRAN_STANDARD="77 90" + fortran-2_pkg_setup + java-pkg-opt-2_pkg_setup + + ALL_LINGUAS="en_US" + for l in ${LINGUAS}; do + use linguas_${l} && ALL_LINGUAS="${ALL_LINGUAS} ${l}" + done + for l in ${LINGUASLONG}; do + use linguas_${l%_*} && ALL_LINGUAS="${ALL_LINGUAS} ${l}" + done + export ALL_LINGUAS ALL_LINGUAS_DOC=$ALL_LINGUAS +} + +src_prepare() { + epatch \ + "${FILESDIR}/${P}-followlinks.patch" \ + "${FILESDIR}/${P}-gluegen.patch" \ + "${FILESDIR}/${P}-fix-random-runtime-failure.patch" \ + "${FILESDIR}/${P}-disable-static-systemlib.patch" \ + "${FILESDIR}/${P}-always-use-dynamic-stack.patch" + + append-ldflags $(no-as-needed) + + # increases java heap to 512M when building docs (sync with cheqreqs above) + use doc && epatch "${FILESDIR}/${P}-java-heap.patch" + + # use the LINGUAS variable that we set + sed -i -e "/^ALL_LINGUAS=/d" -e "/^ALL_LINGUAS_DOC=/d" -i configure.ac ||die + + # make sure the DOCBOOK_ROOT variable is set + sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die + + #add specific gentoo java directories + if use gui; then + sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2|" \ + -e "s|/usr/lib64/jogl2|/usr/lib64/jogl-2|" configure.ac || die + sed -i -e "s|/usr/lib/gluegen2|/usr/lib/gluegen-2|" \ + -e "s|/usr/lib64/gluegen2|/usr/lib64/gluegen-2|" \ + -e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \ + configure.ac || die + + sed -i -e "s/jogl2/jogl-2/" -e "s/gluegen2/gluegen-2/" \ + etc/librarypath.xml || die + fi + + mkdir jar || die + pushd jar + java-pkg_jar-from jgraphx-2.1,jlatexmath-1,flexdock,skinlf + java-pkg_jar-from jgoodies-looks-2.0,jrosetta,scirenderer-1 + java-pkg_jar-from avalon-framework-4.2,jeuclid-core + java-pkg_jar-from xmlgraphics-commons-1.5,commons-io-1 + java-pkg_jar-from jogl-2 jogl-all.jar jogl2.jar + java-pkg_jar-from gluegen-2 gluegen-rt.jar gluegen2-rt.jar + java-pkg_jar-from batik-1.7 batik-all.jar + java-pkg_jar-from fop fop.jar + java-pkg_jar-from javahelp jhall.jar + if use xcos; then + java-pkg_jar-from commons-logging + fi + if use doc; then + java-pkg_jar-from saxon-9 saxon.jar saxon9he.jar + java-pkg_jar-from jlatexmath-fop-1 + java-pkg_jar-from xml-commons-external-1.4 xml-apis-ext.jar + fi + if use test; then + java-pkg_jar-from junit-4 junit.jar junit4.jar + fi + popd + + java-pkg-opt-2_src_prepare + eautoconf +} + +src_configure() { + if use gui; then + export JAVA_HOME="$(java-config -O)" + else + unset JAVAC + fi + + export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)" + export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" + export F77_LDFLAGS="${LDFLAGS}" + # gentoo bug #302621 + has_version sci-libs/hdf5[mpi] && \ + export CXX=mpicxx CC=mpicc + + econf \ + --enable-relocatable \ + --disable-rpath \ + --with-docbook="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" \ + --disable-static-system-lib \ + $(use_enable debug) \ + $(use_enable debug code-coverage) \ + $(use_enable debug debug-C) \ + $(use_enable debug debug-CXX) \ + $(use_enable debug debug-fortran) \ + $(use_enable debug debug-java) \ + $(use_enable debug debug-linker) \ + $(use_enable doc build-help) \ + $(use_enable nls) \ + $(use_enable nls build-localization) \ + $(use_enable static-libs static) \ + $(use_enable test compilation-tests) \ + $(use_with fftw) \ + $(use_with gui) \ + $(use_with gui javasci) \ + $(use_with matio) \ + $(use_with openmp) \ + $(use_with tk) \ + $(use_with umfpack) \ + $(use_with xcos) \ + $(use_with xcos modelica) +} + +src_compile() { + emake + use doc && emake doc +} + +src_test() { + if use gui; then + Xemake check + else + emake check + fi +} + +src_install() { + default + prune_libtool_files --all + rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die + use bash-completion && dobashcomp "${FILESDIR}"/${PN}.bash_completion + echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \ + > 50-"${PN}" + insinto /etc/revdep-rebuild && doins "50-${PN}" +} + +pkg_postinst() { + fdo-mime_mime_database_update +} + +pkg_postrm() { + fdo-mime_mime_database_update +} diff --git a/sci-misc/simx/ChangeLog b/sci-misc/simx/ChangeLog index a2b652ec2..2a2f105ee 100644 --- a/sci-misc/simx/ChangeLog +++ b/sci-misc/simx/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 24 Oct 2013; Christoph Junghans <ottxor@gentoo.org> simx-0.1.ebuild, + simx-9999.ebuild: + fixed python deps + *simx-0.1 (22 Oct 2013) 22 Oct 2013; Christoph Junghans <ottxor@gentoo.org> diff --git a/sci-misc/simx/simx-0.1.ebuild b/sci-misc/simx/simx-0.1.ebuild index 6e7586af2..27d418805 100644 --- a/sci-misc/simx/simx-0.1.ebuild +++ b/sci-misc/simx/simx-0.1.ebuild @@ -25,8 +25,8 @@ LICENSE="LGPL-2.1" IUSE="" RDEPEND=" virtual/mpi - dev-libs/boost[python] - dev-python/greenlet" + dev-libs/boost[python,${PYTHON_USEDEP}] + dev-python/greenlet[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-util/cmake" diff --git a/sci-misc/simx/simx-9999.ebuild b/sci-misc/simx/simx-9999.ebuild index ad6411a83..d0e26d019 100644 --- a/sci-misc/simx/simx-9999.ebuild +++ b/sci-misc/simx/simx-9999.ebuild @@ -25,8 +25,8 @@ LICENSE="LGPL-2.1" IUSE="" RDEPEND=" virtual/mpi - dev-libs/boost[python] - dev-python/greenlet" + dev-libs/boost[python,${PYTHON_USEDEP}] + dev-python/greenlet[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-util/cmake" |