| 1 |
commit: 8e0fd242591a6596aedb323d7655a69090334b8f |
| 2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 20 17:53:04 2014 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 20 17:53:04 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8e0fd242 |
| 7 |
|
| 8 |
Merge branch 'master' of git://git.overlays.gentoo.org/proj/sci |
| 9 |
|
| 10 |
Conflicts: |
| 11 |
virtual/lapack/ChangeLog |
| 12 |
|
| 13 |
|
| 14 |
app-admin/eselect/ChangeLog | 4 +- |
| 15 |
dev-lang/julia/julia-9999.ebuild | 18 +++++- |
| 16 |
dev-lang/vtune/ChangeLog | 2 +- |
| 17 |
dev-libs/asmjit/ChangeLog | 2 +- |
| 18 |
dev-perl/Bio-BigFile/ChangeLog | 2 +- |
| 19 |
dev-python/opal-client/ChangeLog | 2 +- |
| 20 |
dev-python/pythonocc/ChangeLog | 8 +-- |
| 21 |
profiles/package.use.mask | 3 + |
| 22 |
sci-biology/YASRA/ChangeLog | 2 +- |
| 23 |
sci-biology/clover/ChangeLog | 2 +- |
| 24 |
sci-biology/cutadapt/ChangeLog | 2 +- |
| 25 |
sci-biology/fastx_toolkit/ChangeLog | 5 +- |
| 26 |
.../fastx_toolkit/fastx_toolkit-0.0.13.2.ebuild | 5 +- |
| 27 |
sci-biology/lastz/ChangeLog | 4 +- |
| 28 |
sci-biology/mrfast/ChangeLog | 2 +- |
| 29 |
sci-biology/mrsfast/ChangeLog | 2 +- |
| 30 |
sci-biology/sequin/ChangeLog | 2 +- |
| 31 |
sci-biology/tablet-bin/ChangeLog | 4 +- |
| 32 |
sci-chemistry/avogadro2/ChangeLog | 3 + |
| 33 |
sci-chemistry/avogadro2/avogadro2-0.7.2.ebuild | 7 ++- |
| 34 |
sci-chemistry/chimera-bin/ChangeLog | 4 +- |
| 35 |
sci-chemistry/drawxtl/ChangeLog | 2 +- |
| 36 |
sci-chemistry/mddnmr/ChangeLog | 2 +- |
| 37 |
sci-chemistry/modeller/ChangeLog | 2 +- |
| 38 |
sci-chemistry/nmrpipe/ChangeLog | 10 ++-- |
| 39 |
sci-chemistry/phenix-bin/ChangeLog | 2 +- |
| 40 |
sci-chemistry/polygon/ChangeLog | 2 +- |
| 41 |
sci-chemistry/simpson/ChangeLog | 2 +- |
| 42 |
sci-chemistry/specView/ChangeLog | 2 +- |
| 43 |
sci-chemistry/unio/ChangeLog | 2 +- |
| 44 |
sci-geosciences/pydap/ChangeLog | 2 +- |
| 45 |
sci-geosciences/pydap_handlers_hdf5/ChangeLog | 2 +- |
| 46 |
sci-geosciences/pydap_handlers_netcdf/ChangeLog | 2 +- |
| 47 |
sci-geosciences/pydap_handlers_sql/ChangeLog | 2 +- |
| 48 |
sci-geosciences/pydap_responses_kml/ChangeLog | 2 +- |
| 49 |
sci-geosciences/pydap_responses_matlab/ChangeLog | 2 +- |
| 50 |
sci-geosciences/pydap_responses_netcdf/ChangeLog | 2 +- |
| 51 |
sci-geosciences/pydap_responses_wms/ChangeLog | 2 +- |
| 52 |
sci-libs/libgeodecomp/Manifest | 1 + |
| 53 |
...comp-0.2.0.ebuild => libgeodecomp-0.3.1.ebuild} | 0 |
| 54 |
sci-libs/libxc/ChangeLog | 2 +- |
| 55 |
sci-libs/mkl/ChangeLog | 2 +- |
| 56 |
sci-libs/msms/ChangeLog | 4 +- |
| 57 |
sci-libs/silo/Manifest | 1 + |
| 58 |
sci-libs/silo/files/silo-4.9.1-qtlibs.patch | 66 ++++++++++++++++++++++ |
| 59 |
sci-libs/silo/metadata.xml | 18 ++++++ |
| 60 |
sci-libs/silo/silo-4.9.1.ebuild | 35 ++++++++++++ |
| 61 |
.../gappalib-coq/gappalib-coq-0.18.0.ebuild | 2 +- |
| 62 |
sci-mathematics/mdp/ChangeLog | 2 +- |
| 63 |
sci-misc/nltk/ChangeLog | 2 +- |
| 64 |
skel.ChangeLog | 2 +- |
| 65 |
skel.ebuild | 2 +- |
| 66 |
skel.metadata.xml | 1 - |
| 67 |
sys-cluster/pyslice/ChangeLog | 2 +- |
| 68 |
virtual/blas/ChangeLog | 6 +- |
| 69 |
.../blas/{blas-2.1.ebuild => blas-2.1-r1.ebuild} | 21 +++++-- |
| 70 |
virtual/lapack/ChangeLog | 9 ++- |
| 71 |
.../{lapack-3.4.ebuild => lapack-3.4-r1.ebuild} | 18 +++++- |
| 72 |
virtual/lapack/lapack-3.5.ebuild | 12 +++- |
| 73 |
virtual/lapack/metadata.xml | 4 +- |
| 74 |
60 files changed, 263 insertions(+), 76 deletions(-) |
| 75 |
|
| 76 |
diff --cc virtual/blas/blas-2.1-r1.ebuild |
| 77 |
index ae69926,e9762fe..6eb12ed |
| 78 |
--- a/virtual/blas/blas-2.1-r1.ebuild |
| 79 |
+++ b/virtual/blas/blas-2.1-r1.ebuild |
| 80 |
@@@ -10,9 -12,11 +12,11 @@@ SRC_URI=" |
| 81 |
|
| 82 |
LICENSE="" |
| 83 |
SLOT="0" |
| 84 |
--KEYWORDS="~amd64 ~x86 ~amd64-linux" |
| 85 |
++KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 86 |
IUSE="doc" |
| 87 |
- RDEPEND="|| ( |
| 88 |
+ |
| 89 |
+ RDEPEND=" |
| 90 |
+ || ( |
| 91 |
>=sci-libs/blas-reference-20110417 |
| 92 |
>=dev-cpp/eigen-3.1.2 |
| 93 |
sci-libs/atlas[fortran] |
| 94 |
@@@ -23,3 -27,12 +27,12 @@@ |
| 95 |
) |
| 96 |
doc? ( >=app-doc/blas-docs-3.2 )" |
| 97 |
DEPEND="" |
| 98 |
+ |
| 99 |
+ pkg_pretend() { |
| 100 |
- if [[ -e "${EPREFIX}"/usr/$(get_libdir)/lib${PN}.so ]]; then |
| 101 |
++ if [[ -e "${EROOT%/}"/usr/$(get_libdir)/lib${PN}.so ]]; then |
| 102 |
+ ewarn "You have still the old ${PN} library symlink present" |
| 103 |
+ ewarn "Please delete" |
| 104 |
- ewarn "${EPREFIX}/usr/$(get_libdir)/lib${PN}.so" |
| 105 |
++ ewarn "${EROOT%/}/usr/$(get_libdir)/lib${PN}.so" |
| 106 |
+ ewarn "to avoid problems with new ${PN} structure" |
| 107 |
+ fi |
| 108 |
+ } |
| 109 |
diff --cc virtual/lapack/lapack-3.5.ebuild |
| 110 |
index 226cf97,b662bb4..ea254e5 |
| 111 |
--- a/virtual/lapack/lapack-3.5.ebuild |
| 112 |
+++ b/virtual/lapack/lapack-3.5.ebuild |
| 113 |
@@@ -2,8 -2,10 +2,8 @@@ |
| 114 |
# Distributed under the terms of the GNU General Public License v2 |
| 115 |
# $Header: $ |
| 116 |
|
| 117 |
- EAPI=2 |
| 118 |
+ EAPI=5 |
| 119 |
|
| 120 |
-inherit multilib |
| 121 |
- |
| 122 |
DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 implementation" |
| 123 |
HOMEPAGE="" |
| 124 |
SRC_URI="" |
| 125 |
@@@ -19,3 -22,14 +19,13 @@@ RDEPEND="|| |
| 126 |
) |
| 127 |
doc? ( >=app-doc/lapack-docs-3.3 )" |
| 128 |
DEPEND="" |
| 129 |
+ |
| 130 |
++ |
| 131 |
+ pkg_pretend() { |
| 132 |
- if [[ -e "${EPREFIX}"/usr/$(get_libdir)/lib${PN}.so ]]; then |
| 133 |
++ if [[ -e "${EROOT%/}"/usr/$(get_libdir)/lib${PN}.so ]]; then |
| 134 |
+ ewarn "You have still the old ${PN} library symlink present" |
| 135 |
+ ewarn "Please delete" |
| 136 |
- ewarn "${EPREFIX}/usr/$(get_libdir)/lib${PN}.so" |
| 137 |
++ ewarn "${EROOT%/}/usr/$(get_libdir)/lib${PN}.so" |
| 138 |
+ ewarn "to avoid problems with new ${PN} structure" |
| 139 |
+ fi |
| 140 |
+ } |
Archives