commit:     a631e2d8eefc23ac22f09841e37b2dc0e9bbe9a8
Author:     Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Tue Sep  8 16:18:12 2015 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Tue Sep  8 16:18:12 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a631e2d8

Merge branch 'master' of git+ssh://git.gentoo.org/proj/sci

 dev-python/nbconvert/ChangeLog                     | 14 +++++++++
 .../files/nbconvert-4.0.0-docs-Makefile.patch      | 16 ++++++++++
 ...vert-4.0.0.ebuild => nbconvert-4.0.0-r1.ebuild} |  0
 dev-python/nbconvert/nbconvert-9999.ebuild         | 12 ++++++--
 dev-python/notebook/ChangeLog                      |  9 ++++++
 ...ok-4.0.4-r1.ebuild => notebook-4.0.4-r2.ebuild} |  0
 dev-python/notebook/notebook-9999.ebuild           |  2 ++
 dev-python/qtconsole/ChangeLog                     |  6 ++++
 ...sole-4.0.1.ebuild => qtconsole-4.0.1-r1.ebuild} |  0
 dev-python/qtconsole/qtconsole-9999.ebuild         |  5 +++-
 dev-python/testpath/ChangeLog                      |  3 ++
 dev-python/testpath/testpath-9999.ebuild           | 34 ++++++++++++++++++++++
 dev-python/traitlets/ChangeLog                     |  3 ++
 dev-python/traitlets/traitlets-9999.ebuild         | 10 +++++--
 sci-biology/beagle/ChangeLog                       |  6 ++++
 sci-biology/beagle/beagle-4.0.ebuild               |  5 ++--
 sci-biology/tophat/metadata.xml                    |  3 --
 sci-biology/tophat/tophat-2.0.12.ebuild            |  2 --
 sci-biology/tophat/tophat-2.0.13.ebuild            |  2 --
 sci-biology/tophat/tophat-2.0.14.ebuild            |  2 --
 sci-libs/clblas/ChangeLog                          |  8 +++++
 sci-libs/clblas/clblas-2.4-r1.ebuild               |  6 ++--
 sci-libs/clblas/clblas-9999.ebuild                 |  6 ----
 ...s.patch => clblas-2.4-samples_CMakeLists.patch} |  0
 ...ch => clblas-2.4-scripts_perf_CMakeLists.patch} |  0
 sci-libs/clfft/ChangeLog                           | 18 ++++++++++++
 sci-libs/clfft/Manifest                            |  1 +
 sci-libs/clfft/clfft-0.9999.ebuild                 |  2 --
 sci-libs/clfft/clfft-2.4-r1.ebuild                 |  6 ++--
 .../{clfft-2.4-r1.ebuild => clfft-2.6.1.ebuild}    |  7 ++---
 sci-libs/clfft/clfft-9999.ebuild                   |  2 +-
 ...sts.patch => clfft-2.4-client_CMakeLists.patch} |  0
 ...tch => clfft-2.4-scripts_perf_CMakeLists.patch} |  0
 ...l-cmake-configuration-to-lib-cmake-clFFT.patch} |  0
 ...-Install-examples-to-share-clFFT-examples.patch | 15 ++++++++++
 ...-Install-examples-to-share-clFFT-examples.patch | 29 ++++++++++++++++++
 sci-libs/pydicom/ChangeLog                         |  3 ++
 sci-libs/pydicom/Manifest                          |  5 ----
 sci-libs/pydicom/pydicom-0.9.9.ebuild              |  2 +-
 39 files changed, 201 insertions(+), 43 deletions(-)

Reply via email to