Merge remote-tracking branch 'github/master'

* github/master:
  dev-util/emscripten: version bump (#756)
  sci-libs/dealii: do not compile examples (only source gets installed)
  net-misc/cernbox-client: Bump to 2.3.0, (#754)
  sci-libs/cblas-reference: fix for issue #60 (#752)
  Add new gmsh ebuild. (#724)
  sci-mathematics/axel: added new ebuild (#744)
  dev-tex/pythontex: version bump (#736)
  sci-visualization/surf-ice: added stable version (#737)

36 files changed, 719 insertions, 51 deletions

diff --git a/dev-tex/pythontex/Manifest b/dev-tex/pythontex/Manifest
index f169302cd..e73dfec2c 100644
--- a/dev-tex/pythontex/Manifest
+++ b/dev-tex/pythontex/Manifest
@@ -1 +1,2 @@
 DIST pythontex-0.14.tar.gz 9704671 SHA256 d26501386d313cc7a0375e4ea3bec61aed38abb059f09042c8e0e015e980bce4 SHA512 dc37e3ac112ace95d4ac253f51fe08074cf465537fa8e686637dd2342edb397e89a1e9ee1111fd6b93bcf4194b8bbbcb5cbcc5256d4c451809bf96bb28ae3db6 WHIRLPOOL 9a5106446b61f514b3575170abcba0b9cd6eb2c896c6a12174cd4ae1c01e442e7625cde2cab06b2828e3fc07f4fac9edca4388253c49e8952fb4ad7829355366
+DIST pythontex-0.15.tar.gz 1765050 SHA256 5020ca647239368d38e64787cd41b43922677a80338cc7f61ab3786fe20e2fa6 SHA512 cbca1dc9208028bfe1a8ab47f6c145ec2bd0af0ad2c733ef80e1f9ee77199670c8701d30e7634207064dd073e5456bb1d1853ce4e1729f64c44967a52111b0d8 WHIRLPOOL 1e912201d5644dedb8fbe093e85bb056c8f677ffbdcd1888deedcec346b9b8a9791a127ee2f60f825170d3d323586e12c0a8af902edeec0f97a1d96ae0217d80
diff --git a/dev-tex/pythontex/pythontex-0.15.ebuild b/dev-tex/pythontex/pythontex-0.15.ebuild
new file mode 100644
index 000000000..6526b9fc6
--- /dev/null
+++ b/dev-tex/pythontex/pythontex-0.15.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit latex-package python-r1
+
+DESCRIPTION="Fast Access to Python from within LaTeX"
+HOMEPAGE="https://github.com/gpoore/pythontex"
+SRC_URI="https://github.com/gpoore/pythontex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LPPL-1.3 BSD"
+KEYWORDS="~amd64"
+IUSE="highlighting"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-texlive/texlive-latex-2016"
+RDEPEND="${DEPEND}
+	>=dev-texlive/texlive-latex-2016
+	highlighting? ( dev-python/pygments[${PYTHON_USEDEP}] )"
+
+TEXMF=/usr/share/texmf-site
+
+src_compile() {
+	cd ${PN} || die
+	ebegin "Compiling ${PN}"
+	rm ${PN}.sty || die
+	VARTEXFONTS="${T}/fonts" latex ${PN}.ins extra || die
+	eend
+}
+
+src_install() {
+	dodoc ${PN}/README "${S}"/*rst ${PN}_quickstart/*
+
+	cd ${PN} || die
+
+	installation() {
+		if python_is_python3; then
+			python_domodule {de,}${PN}3.py
+		else
+			python_domodule {de,}${PN}2.py
+		fi
+		python_domodule ${PN}_{engines,utils}.py
+		python_doscript {de,}${PN}.py syncpdb.py
+		python_optimize
+	}
+	python_foreach_impl installation
+
+	latex-package_src_doinstall dtx ins sty
+}
diff --git a/dev-util/emscripten-fastcomp/Manifest b/dev-util/emscripten-fastcomp/Manifest
index 2c5eb865b..f2aab4ce2 100644
--- a/dev-util/emscripten-fastcomp/Manifest
+++ b/dev-util/emscripten-fastcomp/Manifest
@@ -1,2 +1,2 @@
-DIST emscripten-fastcomp-1.37.3.tar.gz 26570412 SHA256 035f1e97247e7d7c6d381de3823926c5a10d2491ebc8312cbdf9fe010a4b4f36 SHA512 d1bd8c1358522b95dc2ca992d6f0e2aee6fdc209a8baa58ac7312633a1346dc301b2bda0add9cc3c4b576fce4ff17a6dd54fd93655f731e7395d21288d4f6b54 WHIRLPOOL 2e1ea8e453138cd9ba44f331311ba0f9bd992f3f9b2f106237dbd9518f411abdb53d2e2687e2ad97d9caa9e456bdc78a73e435cc51febed2da814b7ceab2e6ea
-DIST emscripten-fastcomp-clang-1.37.3.tar.gz 14348776 SHA256 78b4434e40d7ca429a3a6e437b7edae774e310a56118b1ae10cd581b27eb6a25 SHA512 75fea6fdcfea1577333a9ab77b3081db79c07e483e78a27d1a6056163050f3f923d5ad88a24e85bef70561f5197c80eaa8b2fec87e4d24810fe7a926ff7d2319 WHIRLPOOL 3d27944faed1a44c439e810bae5513374cdb123f88f946cf9caf580203aa3651be9be9f0ca34da6c7c1914ef166c16f36cbcdbea50801e84a5da08e30e4bbeaa
+DIST emscripten-fastcomp-1.37.4.tar.gz 26567663 SHA256 a982ab7818490b149c5cc21eb454d87af3b7f4f32574d6c8f69360aef9847380 SHA512 6950c1d423400a148ea956626d9e29c6c46f320dc5669aef05803964289bbd0590daea189f50055c7ecdde5410c9f637f861a9749c319f66e1d9bd25eb1f28bd WHIRLPOOL 75d329d7f57c6ae3abe7307247b7b51a1f9d63df9d2af5edf5231c4b553acbfad4168770797c5e8716bf7696199148e9ee7b5f5feae26081146dbef1114ff4d8
+DIST emscripten-fastcomp-clang-1.37.4.tar.gz 14350193 SHA256 be68972c8d99b6c6cc5f38b1379743ba7e59eb0a00c01d30c6ec14df4a4b92a8 SHA512 1644a5e6ae4f878e834842f01fca9a289855944199b44b1732de91462df4a76a4f5ed73ee22f216a14df12de9d83257a95bf0be4338cd0f8b5bb56acf731bd57 WHIRLPOOL f0cacf2d7acbe3b92027c19f79cc658661495bac9cb804b01b0413d16f43c97532756c953a981377c0dc78c663dcc9327a4e4dec6403c2ef6fb2e0ad9da34915
diff --git a/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.37.3.ebuild b/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.37.4.ebuild
index a0b88e6d5..a0b88e6d5 100644
--- a/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.37.3.ebuild
+++ b/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.37.4.ebuild
diff --git a/dev-util/emscripten-fastcomp/files/1.37.3/CMakeLists.txt.patch b/dev-util/emscripten-fastcomp/files/1.37.4/CMakeLists.txt.patch
index d053132a3..d053132a3 100644
--- a/dev-util/emscripten-fastcomp/files/1.37.3/CMakeLists.txt.patch
+++ b/dev-util/emscripten-fastcomp/files/1.37.4/CMakeLists.txt.patch
diff --git a/dev-util/emscripten-fastcomp/files/1.37.3/Version.cpp.patch b/dev-util/emscripten-fastcomp/files/1.37.4/Version.cpp.patch
index 291a1ea6d..291a1ea6d 100644
--- a/dev-util/emscripten-fastcomp/files/1.37.3/Version.cpp.patch
+++ b/dev-util/emscripten-fastcomp/files/1.37.4/Version.cpp.patch
diff --git a/dev-util/emscripten/Manifest b/dev-util/emscripten/Manifest
index 900ba0031..3c0b6a51f 100644
--- a/dev-util/emscripten/Manifest
+++ b/dev-util/emscripten/Manifest
@@ -1 +1 @@
-DIST emscripten-1.37.3.tar.gz 32194871 SHA256 2c5dd2dfe187a7660c650b783207335e8295f14291b95b1109b353e1bd991db1 SHA512 d31712a7490423251a773f19be55661d175a89391458292d7aaafb7f557fa8baad73ba7ed335d5da775a9ba29256329b5a5d5034929b7fae3d4dc83e3432e85c WHIRLPOOL 93080546061dc48409a708559180022c9d94023b804f17c17c33af94e9d135d8f43b8151af0b9709ec75005f26c2921601ecab9e4993c14303f9bd02c7f01ee8
+DIST emscripten-1.37.4.tar.gz 32204386 SHA256 8a2e4341329e4b486f610e77ce9896df7ffead9d09055df3ebd413f78194f1dd SHA512 47ceff4ca8485f8184c83b459e990c811a20b99f9907c00dcd62a230f5c9e97f13310267c8f400226409033142f79b13b33cf5df51d3d0b0d0d147b33b7e253c WHIRLPOOL 0970089215243ac2292afb436330f3cee856482a6574ef0329437d79c4e4f000170c239fc98c99394be33e337ccdc63d86bb110b0b6d13d3ee38c195d97fd488
diff --git a/dev-util/emscripten/emscripten-1.37.3.ebuild b/dev-util/emscripten/emscripten-1.37.4.ebuild
index 51a451856..51a451856 100644
--- a/dev-util/emscripten/emscripten-1.37.3.ebuild
+++ b/dev-util/emscripten/emscripten-1.37.4.ebuild
diff --git a/dev-util/emscripten/files/1.37.3/emcc.patch b/dev-util/emscripten/files/1.37.4/emcc.patch
index 49bf9fd0b..49bf9fd0b 100644
--- a/dev-util/emscripten/files/1.37.3/emcc.patch
+++ b/dev-util/emscripten/files/1.37.4/emcc.patch
diff --git a/dev-util/emscripten/files/1.37.3/emcmake.patch b/dev-util/emscripten/files/1.37.4/emcmake.patch
index 02ce70321..02ce70321 100644
--- a/dev-util/emscripten/files/1.37.3/emcmake.patch
+++ b/dev-util/emscripten/files/1.37.4/emcmake.patch
diff --git a/net-misc/cernbox-client/Manifest b/net-misc/cernbox-client/Manifest
index c98aa1512..140adff1b 100644
--- a/net-misc/cernbox-client/Manifest
+++ b/net-misc/cernbox-client/Manifest
@@ -1,2 +1,3 @@
-DIST cernbox-client-2.1.1-1.1.src.rpm 13110999 SHA256 955f660e95ae5290ab6a9b05af6c6a0012428b574921f8d0a80a349a1ec39ead SHA512 25a53d88d393406ce4076932a1757dc27b2bbbe1a38a2d5f084024352a6467eb2ca650e1f5b86d5551f0277d4e4d9011f967e3651d86ed9b58a7296a8abe0039 WHIRLPOOL a5f416a299e49118a73a591f1ca6b58eb41d64bb84454ba363f27ccfdb4e38e5a1ab29395c9a4b1fbdd36d5d400dfac9567cd11cc8d0fd32bf5145917835187f
+DIST cernbox-client-2.2.4-1.1.src.rpm 14208412 SHA256 1835b660026026a1fd30ef45c2f0d76fbf8efb2970399c24467c9e1611745838 SHA512 24b2a56eb7cc520271ea5f4900f86852cf34ff500b5339b63984b74a40288e30fe785fc9815937637211e7c3d8d7fde7f509f0319d676522641e04ef8192db1e WHIRLPOOL af3c11d30b77d6722c67bb561d1d6e3ab125824d3a25265d25227dfc0ef4f2198d0dfe733b0ca5a3098f59b6da08fbcdb2fac81d02b025ca3215196bf2a4e337
 DIST owncloudclient-2.2.4.tar.xz 12216896 SHA256 f313534f7cdae686beeaa6670d9e3586a627ce78b67cab6e42a448a675d9e7d3 SHA512 5bc5273c90ab63c411e58d1fe13636f6b5977c28470efe53296a71541aaa63af99001cb630adaee99b9b81a8b56fe0f66c337319464ab950dd6eac4cdd53f951 WHIRLPOOL 18aa5076049f9cdfbafa58454937b7fc4c38a5405b6e1375d762d88bbfae92b813cd2ec88a4e4108012137c94908894821575d3f6d2bf694e35d734f2b8fbd37
+DIST owncloudclient-2.3.0.tar.xz 12256428 SHA256 8e692d2eda2d74b233c67dfbd14a7a440508529a1ca73241890e926deb275081 SHA512 a0bb33ad110cfa215e87ef31ff5c4ba1a9df4f80ea48bd267e354fe1d27702d6c5b30ba3cdae5f5c7775da64260bd4f4e5c6dec977694d23addbc9e29348c8b1 WHIRLPOOL 957cde17f2e6eddfe411f49dbe824194d1f643c4a0ce870a5911834fcccb96e6e2684a325dc426c1dd8bba545f6abc301fa030066eab211a1f58bba66b58b7de
diff --git a/net-misc/cernbox-client/cernbox-client-2.2.4.ebuild b/net-misc/cernbox-client/cernbox-client-2.2.4-r1.ebuild
index f3ab1972d..d6687b872 100644
--- a/net-misc/cernbox-client/cernbox-client-2.2.4.ebuild
+++ b/net-misc/cernbox-client/cernbox-client-2.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,65 +10,54 @@ DESCRIPTION="Synchronize files from CERNbox EOS with your computer"
 # Origin is classic owncloud-client, branded for CERN during compilation.
 ORIGIN_P="owncloudclient"
 BRANDED_P="cernbox"
-BRANDED_PV="2.1.1"
+BRANDED_PV="2.2.4"
 BRANDED_REL="1.1"
 
 HOMEPAGE="https://cernbox.cern.ch/"
 SRC_URI="http://download.owncloud.com/desktop/stable/${ORIGIN_P}-${PV}.tar.xz
-	 https://cernbox.cern.ch/cernbox/doc/Linux/repo/CentOS_7/src/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm"
+	https://cernbox.cern.ch/cernbox/doc/Linux/repo/CentOS_7/src/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm"
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus samba +sftp test qt4 +qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )
-	dolphin? ( qt5 )"
-
-RDEPEND=">=dev-db/sqlite-3.4:3
+IUSE="doc dolphin nautilus samba +sftp test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[qt5]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwebkit:5
 	sys-fs/inotify-tools
 	virtual/libiconv
 	dolphin? (
-		>=kde-frameworks/kcoreaddons-5.16:5
-		>=kde-frameworks/kio-5.16:5 )
-	nautilus? ( dev-python/nautilus-python )
-	qt4? (
-		dev-libs/qtkeychain[qt4]
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		dev-qt/qtsql:4
-		dev-qt/qtwebkit:4
-		net-libs/neon[ssl]
-	)
-	qt5? (
-		dev-libs/qtkeychain[qt5]
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		>=dev-qt/qtnetwork-5.4:5
-		dev-qt/qtgui:5
-		dev-qt/qtquickcontrols:5
-		dev-qt/qtsql:5
-		dev-qt/qtwebkit:5[printsupport]
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
 	)
+	nautilus? ( dev-python/nautilus-python )
 	samba? ( >=net-fs/samba-3.5 )
 	sftp? ( >=net-libs/libssh-0.5 )
+"
+RDEPEND="${COMMON_DEPEND}
 	!net-misc/ocsync
-	!net-misc/nextcloud-client"
-DEPEND="${RDEPEND}
+	!net-misc/nextcloud-client
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
 	doc? (
 		dev-python/sphinx
 		dev-texlive/texlive-latexextra
 		virtual/latex-base
 	)
-	dolphin? ( >=kde-frameworks/extra-cmake-modules-5.22.0 )
-	qt5? ( dev-qt/linguist-tools:5 )
+	dolphin? ( kde-frameworks/extra-cmake-modules )
 	test? (
 		dev-util/cmocka
-		qt4? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
-	)"
+		dev-qt/qttest:5
+	)
+"
 
 S=${WORKDIR}/owncloudclient-${PV}
 
@@ -99,7 +88,7 @@ src_configure() {
 		-DWITH_ICONV=ON
 		-DWITH_DOC=$(usex doc)
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DBUILD_WITH_QT4=$(usex qt4)
+		-DBUILD_WITH_QT4=OFF
 		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
 		-DUNIT_TESTING=$(usex test)
diff --git a/net-misc/cernbox-client/cernbox-client-2.3.0.ebuild b/net-misc/cernbox-client/cernbox-client-2.3.0.ebuild
new file mode 100644
index 000000000..6f3ad8c70
--- /dev/null
+++ b/net-misc/cernbox-client/cernbox-client-2.3.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils rpm
+
+DESCRIPTION="Synchronize files from CERNbox EOS with your computer"
+
+# Origin is classic owncloud-client, branded for CERN during compilation.
+ORIGIN_P="owncloudclient"
+BRANDED_P="cernbox"
+BRANDED_PV="2.2.4"
+BRANDED_REL="1.1"
+
+HOMEPAGE="https://cernbox.cern.ch/"
+SRC_URI="http://download.owncloud.com/desktop/stable/${ORIGIN_P}-${PV}.tar.xz
+	https://cernbox.cern.ch/cernbox/doc/Linux/repo/CentOS_7/src/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus samba +sftp test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[qt5]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwebkit:5
+	sys-fs/inotify-tools
+	virtual/libiconv
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	samba? ( >=net-fs/samba-3.5 )
+	sftp? ( >=net-libs/libssh-0.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-misc/ocsync
+	!net-misc/nextcloud-client
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)
+"
+
+S=${WORKDIR}/owncloudclient-${PV}
+
+src_unpack() {
+	rpm_src_unpack ${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm
+	mv ${PN/-}-${BRANDED_PV}/cernbox "${S}" || die "failed to extract branding"
+}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	default
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DWITH_ICONV=ON
+		-DWITH_DOC=$(usex doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DBUILD_WITH_QT4=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
+		-DUNIT_TESTING=$(usex test)
+		-DOEM_THEME_DIR=${PWD}/${BRANDED_P}/mirall
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/sci-libs/cblas-reference/cblas-reference-20161223-r100.ebuild b/sci-libs/cblas-reference/cblas-reference-20161223-r101.ebuild
index 4b39f5657..4b39f5657 100644
--- a/sci-libs/cblas-reference/cblas-reference-20161223-r100.ebuild
+++ b/sci-libs/cblas-reference/cblas-reference-20161223-r101.ebuild
diff --git a/sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch b/sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch
index 70f7cb0ee..40f3aaa02 100644
--- a/sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch
+++ b/sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch
@@ -13,19 +13,24 @@ index 7fd6f1e..e52f3ad 100644
  Name: BLAS
  Description: FORTRAN reference implementation of BLAS Basic Linear Algebra Subprograms
 diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
-index 4a938fe..311aed9 100644
+index 4a938fe..269a254 100644
 --- a/CBLAS/cblas.pc.in
 +++ b/CBLAS/cblas.pc.in
-@@ -1,5 +1,7 @@
+@@ -1,9 +1,12 @@
 -prefix=@prefix@
 -libdir=@libdir@
 +prefix=@CMAKE_INSTALL_PREFIX@
 +exec_prefix=${prefix}
 +libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
++includedir=${prefix}/include/@PROFNAME@
  
  Name: CBLAS
  Description: C Standard Interface to BLAS Basic Linear Algebra Subprograms
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/blas/#_cblas
++Cflags: -I${includedir}
+ Libs: -L${libdir} -lcblas
+ Requires: blas
 diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
 index 028f8da..dc092b1 100644
 --- a/LAPACKE/lapacke.pc.in
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 6523b9621..4053d8a38 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -71,15 +71,16 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DDEAL_II_PACKAGE_VERSION=9999
+		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
 		-DDEAL_II_ALLOW_AUTODETECTION=OFF
 		-DDEAL_II_ALLOW_BUNDLED=OFF
 		-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
-		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
-		-DDEAL_II_LIBRARY_RELDIR="$(get_libdir)"
-		-DDEAL_II_SHARE_RELDIR="share/${PN}"
-		-DDEAL_II_DOCREADME_RELDIR="share/doc/${P}"
+		-DDEAL_II_COMPILE_EXAMPLES=OFF
 		-DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html"
+		-DDEAL_II_DOCREADME_RELDIR="share/doc/${P}"
 		-DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples"
+		-DDEAL_II_LIBRARY_RELDIR="$(get_libdir)"
+		-DDEAL_II_SHARE_RELDIR="share/${PN}"
 		-DDEAL_II_WITH_BZIP2=ON
 		-DDEAL_II_WITH_ZLIB=ON
 		$(cmake-utils_use arpack DEAL_II_WITH_ARPACK)
diff --git a/sci-libs/dtk/Manifest b/sci-libs/dtk/Manifest
new file mode 100644
index 000000000..9a5ed9183
--- /dev/null
+++ b/sci-libs/dtk/Manifest
@@ -0,0 +1 @@
+DIST dtk-2017.02.16.tar.gz 2682955 SHA256 474b495fe0b878e3bb53c4badd58c49e5a625267e52254b7e0c736117751e7cd SHA512 bf338a5ee62ec3cfc67d5848b2c208b5f13ce80616a49c75d6f083fec846b163d63e610497adeac6318816def933a3f7ebe2493f95964853a7640392bb23e88c WHIRLPOOL 78f771fa4a145cdbdcb80213a8b3bfdccbb559fa59d238c26c8106c2fdce431a09f215c887e5708e4e632c94d7a93400bfdc651d4ca3a9864f1a8a383e3ebc85
diff --git a/sci-libs/dtk/dtk-2017.02.16.ebuild b/sci-libs/dtk/dtk-2017.02.16.ebuild
new file mode 100644
index 000000000..6ef40677c
--- /dev/null
+++ b/sci-libs/dtk/dtk-2017.02.16.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Meta-platform for modular scientific platform development"
+HOMEPAGE="https://github.com/d-tk/dtk"
+SRC_URI="https://timeraider4u.github.io/distfiles/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtgui:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qttest:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5"
+DEPEND="${RDEPEND}
+	dev-lang/swig:0"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDTK_BUILD_SUPPORT_COMPOSER=ON
+		-DDTK_BUILD_SUPPORT_CORE=ON
+		-DDTK_BUILD_SUPPORT_CONTAINER=ON
+		-DDTK_BUILD_SUPPORT_DISTRIBUTED=ON
+		-DDTK_BUILD_SUPPORT_GUI=ON
+		-DDTK_BUILD_SUPPORT_MATH=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/dtk/metadata.xml b/sci-libs/dtk/metadata.xml
new file mode 100644
index 000000000..ec9fa9d47
--- /dev/null
+++ b/sci-libs/dtk/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>harald.weiner@jku.at</email>
+		<name>Harald Weiner</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index 500ca62da..e3c6270cd 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1 +1,2 @@
+DIST gmsh-2.16.0-source.tgz 10867812 SHA256 e829eaf32ea02350a385202cc749341f2a3217c464719384b18f653edd028eea SHA512 00b26232dbd8e95826f608f11a9e93eca750db2c70334e3c0c957856dddeeaf68ccba3e727e00f916762eeba54e58558c8795934ebeef3c99844c22cc7dfacf7 WHIRLPOOL d4a84760cd3d74ee725efac7aed6caf3f29618b838d1d11d562eeb7fb61730f5bf160bb64aee211cf504d224d898d75669cdbacbf7a6fd81b7de390a8ea047ed
 DIST gmsh-2.8.5-source.tgz 8665258 SHA256 0ea2fdbcc9ba44c90e03dbc553e7f0ddb2f9044173ac34db123db4fe65af3130 SHA512 2dc132551ce6b3aebb84367c2e1f65448ef68398021a799070413bb2b4616bca2b25b61166ed9977775e8c5c27ba802b4119c240c89b69817336b8a5241171a7 WHIRLPOOL f1538f611938b593a33189ece14fd804fd0c54ffe90677af1244688ad25f088541371b236fac8d375f345124bdaf3f2368529ee4c5d24e6bbe136ec94b5fb285
diff --git a/sci-libs/gmsh/gmsh-2.16.0.ebuild b/sci-libs/gmsh/gmsh-2.16.0.ebuild
new file mode 100644
index 000000000..242b31d03
--- /dev/null
+++ b/sci-libs/gmsh/gmsh-2.16.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils flag-o-matic fortran-2 toolchain-funcs
+
+DESCRIPTION="A three-dimensional finite element mesh generator"
+HOMEPAGE="http://www.geuz.org/gmsh/"
+SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz"
+
+## gmsh comes with its own copies of (at least) metis, netgen and tetgen, therefore inform the user of their special licenses
+LICENSE="GPL-3 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+## cgns is not compiling ATM, maybe fix cgns lib first
+IUSE="blas cgns chaco doc examples jpeg lua med metis mpi netgen opencascade petsc png python taucs tetgen X zlib"
+
+RDEPEND="
+	virtual/fortran
+	X? ( x11-libs/fltk:1 )
+	blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
+	cgns? ( sci-libs/cgnslib )
+	jpeg? ( virtual/jpeg:0 )
+	lua? ( dev-lang/lua:0 )
+	med? ( sci-libs/med )
+	opencascade? ( sci-libs/opencascade:* )
+	png? ( media-libs/libpng:0 )
+	petsc? ( sci-mathematics/petsc )
+	python? ( dev-lang/python:2.7 dev-lang/swig:0 )
+	zlib? ( sys-libs/zlib )
+	mpi? ( virtual/mpi[cxx] )
+	taucs? ( sci-libs/taucs )"
+
+REQUIRED_USE="
+	taucs? ( || ( metis ) )
+	"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/cmake
+	doc? ( virtual/latex-base )"
+
+S=${WORKDIR}/${P}-source
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=( )
+
+	use blas && \
+		mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
+
+	mycmakeargs+=(
+		-DENABLE_BLAS_LAPACK="$(usex blas)"
+		-DENABLE_CGNS="$(usex cgns)"
+		-DENABLE_CHACO="$(usex chaco)"
+		-DENABLE_FLTK="$(usex X)"
+		-DENABLE_GRAPHICS="$(usex X)"
+		-DENABLE_MED="$(usex med)"
+		-DENABLE_METIS="$(usex metis)"
+		-DENABLE_NETGEN="$(usex netgen)"
+		-DENABLE_TAUCS="$(usex taucs)"
+		-DENABLE_TETGEN="$(usex tetgen)"
+		-DENABLE_OCC="$(usex opencascade)"
+		-DENABLE_PETSC="$(usex petsc)"
+		-DENABLE_WRAP_PYTHON="$(usex python)")
+
+	cmake-utils_src_configure mycmakeargs
+}
+
+src_compile() {
+	if use doc ; then
+		cd "${BUILD_DIR}" || die
+		emake pdf
+		cd "${S}" || die
+		dodoc doc/texinfo/gmsh.pdf
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r demos tutorial
+	fi
+}
diff --git a/sci-mathematics/axel-vtkview/Manifest b/sci-mathematics/axel-vtkview/Manifest
new file mode 100644
index 000000000..48448a42a
--- /dev/null
+++ b/sci-mathematics/axel-vtkview/Manifest
@@ -0,0 +1 @@
+DIST axel-vtkview-2017.02.16.tar.gz 180747 SHA256 27dcaaea7ea3600c8de17aaa78ecfa8fcd4e4982d373ecddf341db932885013a SHA512 9c4a6e65af96166d9e7973f5c8c74dabc16f4f4c58211f7a3e9376b1c64c0708ae96af32d1adaed767a0c49adefda916e9dfe90561507bb746b219e8ecf0a81b WHIRLPOOL 79793f0bf68cae1f061f65547c055a14116a372468c15e4bb0499873d016c325ff3e8be9a99c814cebfd651942383bd17d6e466a224a9bb3aa4907293014f8c3
diff --git a/sci-mathematics/axel-vtkview/axel-vtkview-2017.02.16.ebuild b/sci-mathematics/axel-vtkview/axel-vtkview-2017.02.16.ebuild
new file mode 100644
index 000000000..48d2eab66
--- /dev/null
+++ b/sci-mathematics/axel-vtkview/axel-vtkview-2017.02.16.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Vtk plug-in for sci-mathematics/axel"
+HOMEPAGE="http://dtk.inria.fr/axel/"
+SRC_URI="https://timeraider4u.github.io/distfiles/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~sci-libs/dtk-${PV}
+	~sci-mathematics/axel-${PV}
+	>=sci-libs/vtk-6.0.0[qt5,rendering]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}/CMakeLists.txt.patch"
+	"${FILESDIR}/${PV}/axlVtkView-CMakeLists.txt.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DAXL=ON
+		-DAXEL_USED=ON
+		-DDTK_USED=ON
+		-DBUILD_FOR_RELEASE=ON
+		-Daxel-sdk_VERSION_MAJOR=2
+		-Daxel-sdk_VERSION_MINOR=4
+		-Daxel-sdk_VERSION_PATCH=0
+		-DVTK_QT_VERSION:STRING=5
+		-DVTKVIEW_USED=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-mathematics/axel-vtkview/files/2017.02.16/CMakeLists.txt.patch b/sci-mathematics/axel-vtkview/files/2017.02.16/CMakeLists.txt.patch
new file mode 100644
index 000000000..0ce95b0db
--- /dev/null
+++ b/sci-mathematics/axel-vtkview/files/2017.02.16/CMakeLists.txt.patch
@@ -0,0 +1,21 @@
+--- a/CMakeLists.txt	2017-03-01 18:07:06.105852551 +0100
++++ b/CMakeLists.txt	2017-03-01 18:08:32.199894675 +0100
+@@ -202,6 +202,7 @@
+ find_package (Qt5Core REQUIRED)
+ find_package (Qt5Sql REQUIRED)
+ find_package (Qt5WebKitWidgets REQUIRED)
++find_package (Qt5Xml REQUIRED)
+ 
+ set (QT_USE_QTXML 1)
+ set (QT_USE_QTOPENGL 1)
+@@ -319,3 +320,10 @@
+ # Build axl
+ ######################################################################
+ add_subdirectory (axl)
++
++install ( FILES "${CMAKE_BINARY_DIR}/plugins/libaxlVtkView.so"
++          DESTINATION lib/axel-plugins)
++
++install ( DIRECTORY "${PROJECT_SOURCE_DIR}/axl/axlVtkView"
++        DESTINATION include/
++        FILES_MATCHING PATTERN "*.h")
diff --git a/sci-mathematics/axel-vtkview/files/2017.02.16/axlVtkView-CMakeLists.txt.patch b/sci-mathematics/axel-vtkview/files/2017.02.16/axlVtkView-CMakeLists.txt.patch
new file mode 100644
index 000000000..33a789bd3
--- /dev/null
+++ b/sci-mathematics/axel-vtkview/files/2017.02.16/axlVtkView-CMakeLists.txt.patch
@@ -0,0 +1,10 @@
+--- a/axl/axlVtkView/CMakeLists.txt.orig	2016-04-08 15:02:22.921914810 +0200
++++ b/axl/axlVtkView/CMakeLists.txt	2016-04-08 15:03:05.692913022 +0200
+@@ -167,6 +167,7 @@
+ qt5_use_modules(${LIB_NAME} Gui)
+ qt5_use_modules(${LIB_NAME} OpenGL)
+ qt5_use_modules(${LIB_NAME} Widgets)
++qt5_use_modules(${LIB_NAME} Xml)
+ 
+ ## #################################################################
+ ## Target properties
diff --git a/sci-mathematics/axel-vtkview/metadata.xml b/sci-mathematics/axel-vtkview/metadata.xml
new file mode 100644
index 000000000..ec9fa9d47
--- /dev/null
+++ b/sci-mathematics/axel-vtkview/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>harald.weiner@jku.at</email>
+		<name>Harald Weiner</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-mathematics/axel/Manifest b/sci-mathematics/axel/Manifest
new file mode 100644
index 000000000..816216147
--- /dev/null
+++ b/sci-mathematics/axel/Manifest
@@ -0,0 +1 @@
+DIST axel-2017.02.16.tar.gz 727033 SHA256 46dd1f3f4c867dfe3baf22f79ca6d77fb98ef48d3007084a0a68b244288b4e1f SHA512 7bb83608b83a8caa65fa071ce03ab504778fa4c7bed6a17309bc6556a97e941b7b36957b23a02f87654a09cd756770af41cb0aaadede11a60bd87152da77dbba WHIRLPOOL 9f0ad19979d9782d06d21b3df56ec6964e77e07258cfe95a73abdc55042e319551958bd0416768008ba0559c1d7acefadcf073f7e20bcd37177ebaf8cd2e9191
diff --git a/sci-mathematics/axel/axel-2017.02.16.ebuild b/sci-mathematics/axel/axel-2017.02.16.ebuild
new file mode 100644
index 000000000..31499d2c3
--- /dev/null
+++ b/sci-mathematics/axel/axel-2017.02.16.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils user
+
+DESCRIPTION="Algebraic geometric modeling platform"
+HOMEPAGE="http://dtk.inria.fr/axel/"
+SRC_URI="https://timeraider4u.github.io/distfiles/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~sci-libs/dtk-${PV}"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	AXEL_DATA_DIR="/usr/share/axel/data"
+	AXEL_PLUGINS_DIR="/usr/lib/axel-plugins"
+	AXEL_GROUP="dtk-axel"
+	enewgroup "${AXEL_GROUP}"
+}
+
+PATCHES=(
+	"${FILESDIR}/${PV}/CMakeLists.txt.patch"
+	"${FILESDIR}/${PV}/AxelConfig.cmake.in.patch"
+	"${FILESDIR}/${PV}/install-axel-config.h.in.patch"
+	"${FILESDIR}/${PV}/main.cpp.patch"
+)
+
+src_prepare() {
+	cp "${FILESDIR}/${PV}/install-AxelConfig.cmake.in" \
+		"${S}/cmake/install-AxelConfig.cmake.in" || \
+		die "Could not copy '${FILESDIR}/${PV}/install-AxelConfig.cmake.in' to '${S}/cmake/'"
+	# patches are applied by cmake-utils
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAXL=ON
+		-DDTK_USED=ON
+		-DBUILD_FOR_RELEASE=ON
+		-Daxel-sdk_VERSION_MAJOR=2
+		-Daxel-sdk_VERSION_MINOR=4
+		-Daxel-sdk_VERSION_PATCH=0
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	keepdir "${AXEL_DATA_DIR}"
+	keepdir "${AXEL_PLUGINS_DIR}"
+	# allow users to develop plug-ins
+	fowners "root:${AXEL_GROUP}" "${AXEL_PLUGINS_DIR}"
+	fperms g+w "${AXEL_PLUGINS_DIR}"
+}
diff --git a/sci-mathematics/axel/files/2017.02.16/AxelConfig.cmake.in.patch b/sci-mathematics/axel/files/2017.02.16/AxelConfig.cmake.in.patch
new file mode 100644
index 000000000..26156df50
--- /dev/null
+++ b/sci-mathematics/axel/files/2017.02.16/AxelConfig.cmake.in.patch
@@ -0,0 +1,13 @@
+--- a/cmake/AxelConfig.cmake.in.orig	2016-04-09 21:54:56.363950425 +0200
++++ b/cmake/AxelConfig.cmake.in	2016-04-09 22:05:45.816923263 +0200
+@@ -1,7 +1,7 @@
+ 
+-set (@PKG_NAME@_INCLUDE_DIR @PROJECT_SOURCE_DIR@/src @dtk_INCLUDE_DIRS@)
+-set (@PKG_NAME@_LIBRARY_DIR @CMAKE_BINARY_DIR@/lib)
+-set (@PKG_NAME@_PLUGIN_DIR @CMAKE_BINARY_DIR@/plugins)
++set (@PKG_NAME@_INCLUDE_DIR @PROJECT_SOURCE_DIR@/src @dtk_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include/axlCore @CMAKE_INSTALL_PREFIX@/include/axlGui)
++set (@PKG_NAME@_LIBRARY_DIR @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@)
++set (@PKG_NAME@_PLUGIN_DIR @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/axel-plugins)
+ 
+ if (APPLE)
+ set (@PKG_NAME@_PLUGIN_DIR @CMAKE_BINARY_DIR@/bin/axel.app/Contents/PlugIns)
diff --git a/sci-mathematics/axel/files/2017.02.16/CMakeLists.txt.patch b/sci-mathematics/axel/files/2017.02.16/CMakeLists.txt.patch
new file mode 100644
index 000000000..967262670
--- /dev/null
+++ b/sci-mathematics/axel/files/2017.02.16/CMakeLists.txt.patch
@@ -0,0 +1,49 @@
+--- a/CMakeLists.txt	2017-03-01 16:45:56.000000000 +0100
++++ b/CMakeLists.txt	2017-03-01 16:53:47.896067236 +0100
+@@ -32,7 +32,7 @@
+ #set(AXEL_VERSION ${PROJECT_VERSION})
+ 
+ set(AXEL_INSTALL_PREFIX  ${CMAKE_INSTALL_PREFIX})
+-set(AXEL_PLUGIN_DIR  ${CMAKE_BINARY_DIR}/plugins)
++set(AXEL_PLUGIN_DIR  ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/axel-plugins)
+ if (APPLE)
+  set (AXEL_PLUGIN_DIR ${CMAKE_BINARY_DIR}/bin/axel.app/Contents/PlugIns)
+ endif (APPLE)
+@@ -323,18 +323,31 @@
+ ####################################################################
+ if(BUILD_FOR_RELEASE)
+ configure_file ( "${PROJECT_SOURCE_DIR}/cmake/install-AxelConfig.cmake.in"
+-                 "${CMAKE_BINARY_DIR}/for_installer/lib/cmake/AxelConfig.cmake"
++                 "${CMAKE_BINARY_DIR}/lib/cmake/AxelConfig.cmake"
+                   @ONLY IMMEDIATE)
+ 
+-install ( FILES "${CMAKE_BINARY_DIR}/for_installer/lib/cmake/AxelConfig.cmake"
+-          DESTINATION lib/cmake)
++install ( FILES "${CMAKE_BINARY_DIR}/lib/cmake/AxelConfig.cmake"
++          DESTINATION lib/cmake/Axel)
+ 
+ configure_file ( "${PROJECT_SOURCE_DIR}/cmake/install-axel-config.h.in"
+-                 "${CMAKE_BINARY_DIR}/for_installer/include/axel-config.h"
++                 "${CMAKE_BINARY_DIR}/include/axel-config.h"
+                  @ONLY IMMEDIATE)
+ 
+-install ( FILES "${CMAKE_BINARY_DIR}/for_installer/include/axel-config.h"
+-          DESTINATION include)
++install ( FILES "${CMAKE_BINARY_DIR}/include/axel-config.h"
++          DESTINATION include/Axel)
++install ( FILES "${CMAKE_BINARY_DIR}/src/axlCore/axlCoreExport.h"
++          DESTINATION include/axlCore)
++install ( FILES "${CMAKE_BINARY_DIR}/src/axlGui/axlGuiExport.h"
++          DESTINATION include/axlGui)
++
++install(DIRECTORY "${PROJECT_SOURCE_DIR}/src/axlCore"
++        DESTINATION include/
++        FILES_MATCHING PATTERN "*.h"
++)
++install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/axlGui
++        DESTINATION include/
++        FILES_MATCHING PATTERN "*.h"
++)
+ endif(BUILD_FOR_RELEASE)
+ ######################################################################
+ # Update
diff --git a/sci-mathematics/axel/files/2017.02.16/install-AxelConfig.cmake.in b/sci-mathematics/axel/files/2017.02.16/install-AxelConfig.cmake.in
new file mode 100644
index 000000000..8de7aba44
--- /dev/null
+++ b/sci-mathematics/axel/files/2017.02.16/install-AxelConfig.cmake.in
@@ -0,0 +1,67 @@
+## Version: $Id$
+##
+######################################################################
+##
+### Commentary:
+##
+######################################################################
+##
+### Change Log:
+##
+######################################################################
+##
+
+
+## ###################################################################
+## Defines:
+## - Axel_INCLUDE_DIRS
+## ###################################################################
+
+set(Axel_INCLUDE_DIRS
+  "@CMAKE_INSTALL_PREFIX@/include"
+  "@CMAKE_INSTALL_PREFIX@/include/Axel"
+  "@CMAKE_INSTALL_PREFIX@/include/axlCore"
+  "@CMAKE_INSTALL_PREFIX@/include/axlGui")
+
+set(CMAKE_MODULE_PATH
+  ${CMAKE_MODULE_PATH} "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/cmake/Axel/")
+
+set(AXEL_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
+
+set(AXEL_INSTALL_DOCS "@CMAKE_INSTALL_PREFIX@/doc")
+
+set(AXEL_PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/axel-plugins")
+
+#include("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/cmake/Axel/axelDepends.cmake")
+
+find_package(Qt5 REQUIRED COMPONENTS
+  Core
+  Concurrent
+  Network
+  Quick
+  Svg
+  Test
+  Widgets
+  Xml)
+
+find_package(dtk REQUIRED)
+
+## ###################################################################
+## Options
+## ###################################################################
+
+## ###################################################################
+## Always full RPATH
+## ###################################################################
+
+include(GNUInstallDirs)
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+# the RPATH to be used when installing, but only if it's not a system directory
+LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" isSystemDir)
+IF("${isSystemDir}" STREQUAL "-1")
+   SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+ENDIF("${isSystemDir}" STREQUAL "-1")
+
+######################################################################
+### AxelConfig.cmake.in ends here
diff --git a/sci-mathematics/axel/files/2017.02.16/install-axel-config.h.in.patch b/sci-mathematics/axel/files/2017.02.16/install-axel-config.h.in.patch
new file mode 100644
index 000000000..3b0ce511e
--- /dev/null
+++ b/sci-mathematics/axel/files/2017.02.16/install-axel-config.h.in.patch
@@ -0,0 +1,12 @@
+--- a/cmake/install-axel-config.h.in.orig	2016-04-09 02:52:24.299133099 +0200
++++ b/cmake/install-axel-config.h.in	2016-04-09 02:54:46.051127171 +0200
+@@ -12,7 +12,7 @@
+ #define AXEL_SOURCE_DIR "[INSTALLER_TARGET_DIR]"
+ 
+ /* Directory of plugins */
+-#define AXEL_PLUGIN_DIR "[INSTALLER_TARGET_DIR]/@INSTALLER_PLUGIN_SUBDIR@"
++#define AXEL_PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/axel-plugins"
+ 
+ /* Directory of data */
+-#define AXEL_DATA_DIR "[INSTALLER_TARGET_DIR]/data"
++#define AXEL_DATA_DIR "@CMAKE_INSTALL_PREFIX@/share/axel/data"
diff --git a/sci-mathematics/axel/files/2017.02.16/main.cpp.patch b/sci-mathematics/axel/files/2017.02.16/main.cpp.patch
new file mode 100644
index 000000000..d9a490d6f
--- /dev/null
+++ b/sci-mathematics/axel/files/2017.02.16/main.cpp.patch
@@ -0,0 +1,23 @@
+--- axel-2017.02.16/app/axel/main.cpp	2017-03-01 17:35:15.329721658 +0100
++++ axel-2017.02.16/app/axel/main.cpp	2017-03-01 17:41:45.095111231 +0100
+@@ -39,6 +39,7 @@
+ #include <axlRpc/axlServer.h>
+ #endif
+ 
++#include <axel-config.h> // For AXEL_PLUGIN_DIR, AXEL_DATA_DIR
+ 
+ int main(int argc, char **argv)
+ {
+@@ -84,7 +85,11 @@
+ #elif defined(Q_OS_MAC)
+     QString pathPlugins  = QString("%1/../PlugIns/").arg(qApp->applicationDirPath());
+ #else
+-    QString pathPlugins  = QString("%1/../plugins/").arg(qApp->applicationDirPath());
++    #if defined(AXEL_PLUGIN_DIR)
++        QString pathPlugins  = QString(AXEL_PLUGIN_DIR);
++    #else
++        QString pathPlugins  = QString("%1/../plugins/").arg(qApp->applicationDirPath());
++    #endif
+ #endif
+     dtkPluginManager::instance()->setPath(pathPlugins);
+     //Initialized all factories
diff --git a/sci-mathematics/axel/metadata.xml b/sci-mathematics/axel/metadata.xml
new file mode 100644
index 000000000..ec9fa9d47
--- /dev/null
+++ b/sci-mathematics/axel/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>harald.weiner@jku.at</email>
+		<name>Harald Weiner</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-visualization/surf-ice/Manifest b/sci-visualization/surf-ice/Manifest
new file mode 100644
index 000000000..fee27abba
--- /dev/null
+++ b/sci-visualization/surf-ice/Manifest
@@ -0,0 +1 @@
+DIST surf-ice-1.0.20170202.tar.gz 40179987 SHA256 0387f2f0d288fee80b7158d09148fcf5ca7730870c78f2cfa44b7cb826c57e7e SHA512 526828d12a75f103fa04ef6e2bd1a5f75eabd47243797392ac8275e9bfaacd66285272241171745c3d7aa5669dc24eee736d597ad89d066d8cbeb4ad4a0954df WHIRLPOOL 47b6afa34f5a1531f68cbe23954beb997020ff1394b89519897462fd7d5fa8d41ef3d100f7eb4c68e1246b0f73c8a59f8b447a6ab340843d17828c9d40550e56
diff --git a/sci-visualization/surf-ice/surf-ice-1.0.20170202.ebuild b/sci-visualization/surf-ice/surf-ice-1.0.20170202.ebuild
new file mode 100644
index 000000000..75be4debe
--- /dev/null
+++ b/sci-visualization/surf-ice/surf-ice-1.0.20170202.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="A simple medical imaging visualization tool"
+HOMEPAGE="https://github.com/neurolabusc/surf-ice"
+SRC_URI="https://github.com/neurolabusc/surf-ice/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=""
+DEPEND="dev-lang/fpc
+	>=dev-lang/lazarus-1.6.2"
+
+#S="${WORKDIR}/surf-ice-${PV}"
+
+src_compile() {
+	lazbuild -B --lazarusdir="/usr/share/lazarus/" surfice.lpi || die
+}
+
+src_install() {
+	dobin surfice
+
+	insinto /usr/bin/shaders
+	doins shaders/*.txt
+
+	insinto /usr/bin/shadersOld
+	doins shadersOld/*.txt
+
+	doicon -s scalable Surfice.jpg
+	make_desktop_entry surf-ice surf-ice /usr/share/icons/hicolor/scalable/apps/Surfice.jpg
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+pkg_postrm() {
+	gnome2_icon_cache_update
+}