commit: 2aa5d31db2ac68954f8ec1c5343153542957f736
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 17:54:06 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 17:54:06 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=2aa5d31d
Merge remote-tracking branch 'github/master'
* github/master:
corrected typo
Surf ice (#719)
dev-util/emscripten: Revision bump to 1.37.1 (#721)
use my name instead of online moniker
dev-python/prov/metadata.xml | 2 +-
dev-util/emscripten-fastcomp/Manifest | 10 +--
.../emscripten-fastcomp-1.34.11.ebuild | 40 ------------
.../emscripten-fastcomp-1.35.2.ebuild | 40 ------------
.../emscripten-fastcomp-1.36.4.ebuild | 49 --------------
....7.ebuild => emscripten-fastcomp-1.37.1.ebuild} | 0
.../files/1.36.7/CMakeLists.txt.patch | 10 ---
.../files/1.36.7/Version.cpp.patch | 14 ----
.../files/{1.36.4 => 1.37.1}/CMakeLists.txt.patch | 0
.../files/{1.36.4 => 1.37.1}/Version.cpp.patch | 0
dev-util/emscripten/Manifest | 5 +-
dev-util/emscripten/emscripten-1.34.11.ebuild | 73 ---------------------
dev-util/emscripten/emscripten-1.35.2.ebuild | 73 ---------------------
dev-util/emscripten/emscripten-1.36.4.ebuild | 75 ----------------------
...pten-1.36.7.ebuild => emscripten-1.37.1.ebuild} | 0
dev-util/emscripten/files/1.36.7/emcc.patch | 16 -----
dev-util/emscripten/files/1.36.7/emcmake.patch | 16 -----
.../emscripten/files/{1.36.4 => 1.37.1}/emcc.patch | 0
.../files/{1.36.4 => 1.37.1}/emcmake.patch | 0
sci-biology/psychopy/metadata.xml | 2 +-
.../mricrogl/mricrogl-1.0.20151111.ebuild | 2 +-
.../mricrogl/mricrogl-1.0.20160930.ebuild | 2 +-
sci-visualization/mricrogl/mricrogl-9999.ebuild | 2 +-
sci-visualization/mricron/mricron-9999.ebuild | 2 +-
sci-visualization/surf-ice/metadata.xml | 23 +++++++
sci-visualization/surf-ice/surf-ice-9999.ebuild | 43 +++++++++++++
26 files changed, 75 insertions(+), 424 deletions(-)