gentoo resync : 30.09.2018

17 files changed, 941 insertions, 81 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 90d9d205e73b..34cb2a80d54c 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest
index 15bcca38ef2a..6f6b25938556 100644
--- a/sci-libs/ViSP/Manifest
+++ b/sci-libs/ViSP/Manifest
@@ -2,6 +2,6 @@ AUX ViSP-3.0.0-ffmpeg3.patch 4291 BLAKE2B 2948a7e4cad247da78187a15198fbc5e804caa
 AUX ViSP-3.0.1-opencv.patch 403 BLAKE2B 0bc3da5cd6e73cdd47dac7b525f4f3fbe6e683aa79f9185a3e92cecaf36fdc30c018fe93d1e9f7ac69890b7807e16663e21e65025184b950a8f384c1ec2748d8 SHA512 3a6a84ac6ad2bce4fdf7228b4a296589239c2b4b019b3ad8e4654af71b00eca6102444f38c32604013ec62d60d067deb2902ea8cffffff6d97e0762602a013f4
 DIST visp-3.0.1.tar.gz 26029005 BLAKE2B d8881b0dd56b38f5db88e33f13e7dfa29b0a64fa1aebc5160384db2c7124d3a0ab2f0a5b3ba0255cbe209b578a3cdeb4420dc138a063248f945e9a73e041f21d SHA512 558e9acbd7ac5ef2193dca026062b75e0a30a7efbcae7d1e7d392b0855e643ee96ab9f60c19465f6bfa861374e30d9e91faf2f860e0442fa48ea5ea384b4e3fa
 DIST visp-3.1.0.tar.gz 38743434 BLAKE2B 294eaaf95c7ff7a8ade8bdf2146018856b081a9c461aca68eedb6fb096d253e537f41ad9a81687cba7a9e42a34b5a3fe2d1a705917a1c96f47e1e3e708f20cc3 SHA512 b7d56d3286e3610ff0db4f4c3a51f953825578532a9c518f7654142a644f466343660901632487fb513b0f6a6503d3716d56e733830b4d52daf5839bc1cfbdb5
-EBUILD ViSP-3.0.1.ebuild 3015 BLAKE2B 05eb7ce8f21b8d947580cf02ed9687db50803cb44a663c299936f2e1254f573ac354d9ed6d8038179dfa41de1c856f132537a174a818575275ef88faa67a5641 SHA512 c7e88b8d8758d140cf0f80e95ec78bd04308f2983a23504c5f8af82fa0cb4f54b34420d4e1796d2dcbdf319a0b84682188359b43c2a847d426347221b9bd8cf2
-EBUILD ViSP-3.1.0.ebuild 2883 BLAKE2B 36ed6f92bf7fa75338c6aa14ab20e585de6f55949a2e3bbb129fa364140aac058cc07022deb773a17dc3c0e5cf49e2cdf11337fb881a0bf14a385291c22eddad SHA512 d786fcd4ec5c1636f18bcba3d39532a4a59caaef824e0e28ea870dc0fcc972088593465a1dc5f4bde51548c798bf0224c7ced376c1c2b65949d05642c2caeac7
-MISC metadata.xml 1393 BLAKE2B f891f74d6a7a334f7ee024f188c70ee031b391bbbebe4f67ff45efa6fe5def3eff0515a769a312e691e8acfda5e3633daa11ed1c590f43110a0ab1a190f39473 SHA512 c66184a7997d1682047605e6773a341f3f8503b765c36aa6931ac13eda2a78b866cf2db3c8ca68eabca206235b4c4bea534e176bd07cd9f5dcad3d9e67583d5e
+EBUILD ViSP-3.0.1-r1.ebuild 2999 BLAKE2B e5415f5a699aa20037e770f28155be8fef622f30201fa123a6cac27cbd134d1d796e35e971c6c5450ca0154f224dca0f78b78ca7f4f5cecb07c9f3144f8c423b SHA512 ee12ae28a8b83180978bf88b611ad83484ef6061b22252e5d4e0f0109c92b6a8620d3f8e314d41e1aeff700e2d0134c82fbc132db17163f74cc65dd74401a09d
+EBUILD ViSP-3.1.0-r1.ebuild 2864 BLAKE2B 7d9752251c1af6604544b14692352920765653d6022dfebd4eed381243df320d08da3f8539e4cdffdac387e16df4da1e409e5b80f28c086527614810efee3045 SHA512 a1b09523d092e39270210adeb0099b389cc3dc49b2cef86c7a9879bc02315b6c10a7df6d778a6955a3e4bff553ab1cb5751fb4f8b70533d83061bf0677013317
+MISC metadata.xml 1316 BLAKE2B 0ef658cebd419a44479f24feefd44103fca5a6538cd2f4ba82ac3a12f20fbe4d079551b35587d1616969d7908cb347cf94cc33d27a2a5e327e4b369be30dfaf3 SHA512 738ff67d41b80f336be750cc0e534196bd2055dac9e00a183c097bbe94febb686340db1fd683f3c17cf2dacb68d123e84d6730025d9a46153918aa5b316daf9b
diff --git a/sci-libs/ViSP/ViSP-3.0.1.ebuild b/sci-libs/ViSP/ViSP-3.0.1-r1.ebuild
index 35fbfb4321bf..871d521bc384 100644
--- a/sci-libs/ViSP/ViSP-3.0.1.ebuild
+++ b/sci-libs/ViSP/ViSP-3.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SLOT="0/3"
 KEYWORDS="~amd64 ~arm"
 IUSE="
 	+coin demos +dmtx doc examples ffmpeg gsl ieee1394 jpeg lapack motif ogre
-	ois opencv png test tutorials usb v4l X xml +zbar zlib
+	opencv png test tutorials usb v4l X xml +zbar zlib
 	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
 "
 
@@ -27,7 +27,7 @@ RDEPEND="
 	jpeg? ( virtual/jpeg:0 )
 	lapack? ( virtual/lapack )
 	motif? ( media-libs/SoXt )
-	ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] )
+	ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] )
 	opencv? ( media-libs/opencv:= )
 	png? ( media-libs/libpng:0= )
 	usb? ( virtual/libusb:1 )
@@ -38,15 +38,14 @@ RDEPEND="
 	zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )
 	virtual/pkgconfig
+	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )
 	test? ( sci-misc/ViSP-images )
 	v4l? ( virtual/os-headers )"
 RDEPEND="${RDEPEND}
 	demos? ( sci-misc/ViSP-images )"
 REQUIRED_USE="
 	ffmpeg? ( opencv )
-	ois? ( ogre )
 	motif? ( coin )
 "
 
@@ -69,7 +68,7 @@ src_configure() {
 		"-DUSE_PNG=$(usex png ON OFF)"
 		"-DUSE_LIBUSB_1=$(usex usb ON OFF)"
 		"-DUSE_OGRE=$(usex ogre ON OFF)"
-		"-DUSE_OIS=$(usex ois ON OFF)"
+		"-DUSE_OIS=$(usex ogre ON OFF)"
 		"-DUSE_OPENCV=$(usex opencv ON OFF)"
 		"-DUSE_SOQT=OFF"
 		"-DUSE_SOXT=$(usex motif ON OFF)"
diff --git a/sci-libs/ViSP/ViSP-3.1.0.ebuild b/sci-libs/ViSP/ViSP-3.1.0-r1.ebuild
index 354edc0a62bd..86886b818ec3 100644
--- a/sci-libs/ViSP/ViSP-3.1.0.ebuild
+++ b/sci-libs/ViSP/ViSP-3.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0/3.1"
 KEYWORDS="~amd64 ~arm"
 IUSE="
 	+coin demos +dmtx doc examples gsl ieee1394 jpeg lapack motif ogre
-	ois opencv png test tutorials usb v4l X xml +zbar zlib
+	opencv png test tutorials usb v4l X xml +zbar zlib
 	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
 "
 
@@ -26,7 +26,7 @@ RDEPEND="
 	jpeg? ( virtual/jpeg:0 )
 	lapack? ( virtual/lapack )
 	motif? ( media-libs/SoXt )
-	ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] )
+	ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] )
 	opencv? ( media-libs/opencv:= )
 	png? ( media-libs/libpng:0= )
 	usb? ( virtual/libusb:1 )
@@ -37,16 +37,13 @@ RDEPEND="
 	zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )
 	virtual/pkgconfig
+	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )
 	test? ( sci-misc/ViSP-images )
 	v4l? ( virtual/os-headers )"
 RDEPEND="${RDEPEND}
 	demos? ( sci-misc/ViSP-images )"
-REQUIRED_USE="
-	ois? ( ogre )
-	motif? ( coin )
-"
+REQUIRED_USE="motif? ( coin )"
 
 S="${WORKDIR}/visp-${PV}"
 PATCHES=( "${FILESDIR}/${PN}-3.0.1-opencv.patch" )
@@ -66,7 +63,7 @@ src_configure() {
 		"-DUSE_PNG=$(usex png ON OFF)"
 		"-DUSE_LIBUSB_1=$(usex usb ON OFF)"
 		"-DUSE_OGRE=$(usex ogre ON OFF)"
-		"-DUSE_OIS=$(usex ois ON OFF)"
+		"-DUSE_OIS=$(usex ogre ON OFF)"
 		"-DUSE_OPENCV=$(usex opencv ON OFF)"
 		"-DUSE_SOQT=OFF"
 		"-DUSE_SOXT=$(usex motif ON OFF)"
diff --git a/sci-libs/ViSP/metadata.xml b/sci-libs/ViSP/metadata.xml
index 772241db04d7..95a2f3243339 100644
--- a/sci-libs/ViSP/metadata.xml
+++ b/sci-libs/ViSP/metadata.xml
@@ -10,7 +10,6 @@
 		<flag name="dmtx">Enables barcode data matrix support.</flag>
 		<flag name="demos">Installs demo programs.</flag>
 		<flag name="ogre">Enables <pkg>dev-games/ogre</pkg> support.</flag>
-		<flag name="ois">Enables <pkg>dev-games/ois</pkg> support via ogre.</flag>
 		<flag name="opencv">Enables <pkg>media-libs/opencv</pkg> support.</flag>
 		<flag name="tutorials">Installs tutorials.</flag>
 		<flag name="zbar">Enables barcodes reading.</flag>
diff --git a/sci-libs/keras-applications/Manifest b/sci-libs/keras-applications/Manifest
index b730166b4af8..7d374be54fa7 100644
--- a/sci-libs/keras-applications/Manifest
+++ b/sci-libs/keras-applications/Manifest
@@ -1,3 +1,5 @@
 DIST keras-applications-1.0.4.tar.gz 285031 BLAKE2B 7208752b45f825949eb2718e4e276f7c3e4a523b2668975d6834084c42cdc2dc3efb57fd0ef24401bc0dd35453f4798422f6afd9583249237cd35941939c25f4 SHA512 10a793a60b7084ea641035618e178d5b1261da5826292db25134f9886b191bd152dfa8fa686a6270fa56a7fc1831bda07e77d12597972b186a9354f857feb1d0
+DIST keras-applications-1.0.5.tar.gz 26556 BLAKE2B 263a5917ca6aa58f47fee09849ba149cdf6742b3278ce2f2dd7ace5f1a445a9eb53f218f906ec9c1384a4e7bbe87d40e3ef0fcc22261e64805042822b14a0684 SHA512 6ac0312b8eb6781c93cb3ffad09b8b631831855f35247f939b6fccfe9ababb85e3b0e5a59f9f30f5265d96290bf4f61e1046dbcc8333f914065c566040012ddc
 EBUILD keras-applications-1.0.4.ebuild 554 BLAKE2B 8492cef67af05dc39a0ed36f0afdedb568983de1c6225417ee143ed73017cc76e38307ac7e95aaeebed6494d1a8b2ccbbfe9eb1b5a86d66cb5597d9650debd43 SHA512 b0ab5268039f213cf46c88198f2153acdacf672e42e6d51bb85c6115d7ceca39fe78472a71af2a2e93b6ef176a44b0d9000fd8ef693fa967158432a98d5151a9
+EBUILD keras-applications-1.0.5.ebuild 683 BLAKE2B ad47e5ec1d26eb1a03ac233ce886967bf793b0948d4cc16f82263516fc418eab7915f076c86759a9845cf7de22f3efc6e293cb6fef013b0df797b9aebf863194 SHA512 259fce92b4ba451556a34a40fa1dc2265979d24cb30cb889729a2e5d94df92a123a05c946b1483d963c02847b3a5af9b6ad52e3195beb6ed9990c866c6f1584b
 MISC metadata.xml 621 BLAKE2B 4f375ddfcfed6172df186350f7bd3dbfbcacea34f555b14719af43f58b140d73e378cd0a5efd8438ed2a0006f3552febc684b4fce85aeb88fb2c9bf819c06c4b SHA512 9dbb366d483843279cc7532b56a877313a7c39de25c93c313a2957092f9766ce5715a83dd87ef116d1733a7cc399319025ce1eb0e7ad174e2b7441360a9f5560
diff --git a/sci-libs/keras-applications/keras-applications-1.0.5.ebuild b/sci-libs/keras-applications/keras-applications-1.0.5.ebuild
new file mode 100644
index 000000000000..065753c60c54
--- /dev/null
+++ b/sci-libs/keras-applications/keras-applications-1.0.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Keras deep learning library reference implementations of deep learning models"
+HOMEPAGE="https://keras.io/applications/"
+SRC_URI="https://files.pythonhosted.org/packages/60/27/a25dfc6e49a6ab3de2d5f23fdb851f18d45ea9867a0955906a5c488ebbe2/Keras_Applications-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}/Keras_Applications-${PV}/"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest
index 2aede3829617..f6a4a4ce2b05 100644
--- a/sci-libs/keras-preprocessing/Manifest
+++ b/sci-libs/keras-preprocessing/Manifest
@@ -1,3 +1,5 @@
 DIST keras-preprocessing-1.0.2.tar.gz 34762 BLAKE2B 3b4766aa48d6e6cfd50817af97c8f2faf9ae7e78007f7dddcbf1f4ded072657a5b94ac4b563d090dd8a8437a249b64fea61a1cd5f680767f14611fa6fe92dd3a SHA512 d5a558c3d9741c298ea3737bfb04788bd2cbecefe14aa53e0f6ccde891ad9304ec673a888dc53a2f954c0b718ce31d9d35095d3f21e15d73248acfc8105457d9
+DIST keras-preprocessing-1.0.3.tar.gz 36360 BLAKE2B 4a5d8e8d1211434b212a509acd563ef38f043ffc2f856019205e5e9b6806303c824bdfd19009a38a19ca961a9ece7719dcecf41f494b19da11084d5fa733e807 SHA512 98501a96eeca29d13a50f418b8d7417911cba50f0a3097b9576684a78c60441b93296ac3fb544f951f40990f5c8b7c0a15e9da3ac336119b0234caec8d182f4c
 EBUILD keras-preprocessing-1.0.2.ebuild 602 BLAKE2B 2e9a1d1fe5af86239dd6c28ad262506b1e6d52ca853daa89130ac536ae37de0b83954cbf3cfddf4a1e25e20c945aee9d3a28f1d5ea192eead788960294cd6410 SHA512 eab972f49c8c94d4c2a14b2f643e9ebc164657fc637605ee683eabb7eefa414245b65859dd01b60387c9b1b638bc4038bbafeb1bf2cdf643b88695bdf7f7cce1
+EBUILD keras-preprocessing-1.0.3.ebuild 608 BLAKE2B 735d172d2c0b217f69cb9a8aca03f2cb6af43d6be3172bcf15e5e9aeac3deeea31622b231b30442473852b17a25f574b48c56205b1952775d1278be5acdb6ed9 SHA512 2b54605d8c1542153c0f936c250f78162b8d33dc5868a4e028d5855f7b159f0dc3c1075f9cae428943a5ef163789edc120ed0050fb9a5a30babd2376093c6379
 MISC metadata.xml 585 BLAKE2B a2f92ac4e2b9af055313a13de9bcbaee7ab7ca2efa4790c82027aece4b629bfa7a73c5ed0286b0f24f1853330057527009afe6ab1722f19d9c504a9d0737e827 SHA512 371cc3f5897bd28c62642a8857a22e775e24aa917bc0e58bb4de4e0a2a6580174ba35cfda2e8dd83599e2180fdfb3f11a953e7076c6d87073e1465b145b115e9
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.3.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.3.ebuild
new file mode 100644
index 000000000000..fb4aa8c7c7c9
--- /dev/null
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Easy data preprocessing and data augmentation for deep learning models"
+HOMEPAGE="https://keras.io/"
+SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index b6a5cdbc852c..a232aee93c2b 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -23,10 +23,16 @@ DIST nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz 47849 BLAKE2B f
 DIST oourafft-20061228.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd0200371c153ddf54ef6c7c4ec523ee6560547e2d5ef9f3200037c0635bf41c18991ac35f271b1e600d0dbd65d1a9a7 SHA512 f1ceac00cb7b9eb8f625eee7f1f5eea8af363343589a344226628d68baf668c176e6c23b7f904c4e682330352eaa0cd5d00731340d208e94c9657b8f85ae2240
 DIST protobuf-3.6.0.tar.gz 4483224 BLAKE2B b6716d33c14ab98a05676a3369b4762179df88ed3e8c34b93075c12edc10213bf1c427a59a8840bc64b53365264021b8075a02a44478c998062cf04da95c0075 SHA512 46df0187e5c9e7d213930d916f6c89e7a41eca1aaac228d8f56e3f784598a9f323d7cc2d3cf20668ceb776d3237c4eccf685ef8d7808f09107fa8e441f9899f4
 DIST tensorflow-1.10.0.tar.gz 24490786 BLAKE2B 2ecec19b2b2ebb2e292ec07fee458017aa3fcc4c1445e6c9419ea9bd37990a58607c8f3134c785be0e3ae098c332a734fb85717b2ecd781551a0c8f20ffca8f2 SHA512 a25257ad7e561c2040ba9dda699acb24b757e6d79c60324cab20d8d8a428fef79a06a3627a95a59e2c8408a094666b9aa6d8af1c5419fa8c238e1f5e10e9ec33
+DIST tensorflow-1.11.0.tar.gz 25024790 BLAKE2B 74129fb1e6db0317fd45266dae7aa4fab811e1ebf0d093f3153684fa4465f4319cbf8fd50c6667f9c4ddbce5c100ee00151ec2873eca93ef7d5ebbc04ab6b965 SHA512 26e9542c43e11a663cbc5cf42859ae7b6dc0e92cfa88775fd4d1badba7f08c59b60c05010fd9f3ec501313be5c042f39b17323bb4753babf365ba2a48af836c2
 DIST tensorflow-1.11.0_rc0.tar.gz 25032294 BLAKE2B 7a99630445eb51db39c9a0b948dc04b63d48a55cf56e96f431a597695bfc9f36701b42ba9de3bcbb4134661f583fec2f2068a396a559b422806b973b149e62f0 SHA512 1f537188338d09fb63705d8d1eb9e6f6e89274ded5d16f165f63ff97d6e1f534d7e9dc412fb38e00d834f8ff5ec5f00a6fa5ab464ba0ab47b501916cb8828d7f
+DIST tensorflow-1.11.0_rc2.tar.gz 25032827 BLAKE2B 66235ac6c07f9855143a669716c5937badf225e4c7e656b1d0f205f00d387a197cf72bb887b28856e7a162d27b5886508d39a7004de0c204769edb8c5a94367b SHA512 6221ae7bf4f4406993428b02a5e98af846d9e5b222c2f155a89d5c7609a0dbdd6df4c93d9729a3cb57a0682c422be4fe144f47738deb11498590f35cbb273441
 DIST tensorflow-patches-1.10.0.tar.bz2 4032 BLAKE2B 8588deec74179d8044af631de8e651491cc713553ee15ece9dff5052bd95b10924bdbe4301453f00d0f2fccd5d595d496b48fe45b0259837653b2de9e1898ab9 SHA512 1f57995ca9b3278735636cc42c88dc45558fa6a1d656108293f8df3fd9961d75f5e979bf0a9909136134e1cdaab41a34f83e605b48b23dddf17a6b1be684117b
+DIST tensorflow-patches-1.11.0.tar.bz2 11013 BLAKE2B 929cb9fee5e6b63f00341351908d3050c676670d9cc2c1241bd2e3c86601704a7495ab598b992718f0b51fc369e33e7c646bc5db3ba3b86b18326b1c2d2974a8 SHA512 76a94c9444e1d984afaf080222d430032636204d05a5e3ff5530012dfa1eba78619dd2a2942343ccc2f7fc489eb8c6f51fddd0b84cb2c2db645b2b914cc61f80
 DIST tensorflow-patches-1.11.0_rc0.tar.bz2 10103 BLAKE2B 66c9e8838f25be13851be3265af880a22355d0e8eb2cc297fff2118df1d6070bbbb216631e522f704a0d41d4029742f073a76acb01bbf150d827e69c9f6f5fc5 SHA512 05c3e7c1dfe50716b8043d7b1febf7a4f3e641c65b9c778a2fe0486ac0e9c091d50dba1c8e3c2b9417758ce8181688bb47ec0eb7804f8aa50726d52cfd202a8b
+DIST tensorflow-patches-1.11.0_rc2.tar.bz2 11013 BLAKE2B 929cb9fee5e6b63f00341351908d3050c676670d9cc2c1241bd2e3c86601704a7495ab598b992718f0b51fc369e33e7c646bc5db3ba3b86b18326b1c2d2974a8 SHA512 76a94c9444e1d984afaf080222d430032636204d05a5e3ff5530012dfa1eba78619dd2a2942343ccc2f7fc489eb8c6f51fddd0b84cb2c2db645b2b914cc61f80
 DIST tensorflow-python-license.txt 45132 BLAKE2B 1f572a06eeb4a58a5563b87a2db381a6e9eb0195cf1d006bda0d3da158e62a1e67e889a7d3d0da83d8609c0d048887bcbbd0d7056fd8e4f56b654047f36936fa SHA512 1b8c2f9733fcf27d560879418c366b5c3e44420d42adb3b857ee741793ddc75ad18324b016909457e5311f2143593392ce4404d12962f076e62f6036afbb521e
 EBUILD tensorflow-1.10.0.ebuild 13829 BLAKE2B dd99f463536047e6b5acaa9aa6341d367b91d1a864f9b641bfab2b4522e73c669bc80641ad8feb5134926ac70eb8b3dee1e8551508ba25ae0c93fe59f713aba4 SHA512 29cf0984492d506aebfcab35e6c889e497c8771a8cf5974abf2b5752b2ea4d082491149f76beb3cc66eda7dd1d173322bab478df5fffe02494eac58a6154541f
+EBUILD tensorflow-1.11.0.ebuild 13608 BLAKE2B ad8462cc4bc779dadde6093912940b368ba1e4abcf3996c4b570aa599d4970a5fe709d53152b4a6d35326610ae09e128fd6b674fc1176677ba60c9d3849f896d SHA512 696fd969e06a4f2390ad420d6e713a5f7b025034630593b7f8644509622fda1d766af1737ae5174dcccdff80592b5a0ae6d9f5a3ea94383c4e947688b26e8daa
 EBUILD tensorflow-1.11.0_rc0.ebuild 13572 BLAKE2B 04226216d85717f0ca85fc5a81b9cd6634f506277693eac3061aa5d64277f4a666913255c8e8bc774b3841980448b481e3a40ec78c8438204f04e979b840de9e SHA512 143d675bc78aa5599e54ae9525340e9f32930e630dcc3400025e2e4c795225193631d17526683ea72cd18882e756d0a2792b12c6398bb6bc26e212cf8fb8fdbb
+EBUILD tensorflow-1.11.0_rc2.ebuild 13567 BLAKE2B d34755dcf4fe510d5cfa342efdca27b0e4915667ffe6249db051afd42f97ee437974230982b4d238e5be1cdb034d7a19f48d3f76d9fe9ed469a79a6091a849fd SHA512 575bd55db18b89340383dcef35ad3a7ef5391e715e7482c8e34973b6bfdfa5de186b7d731f3f7d84460f6e74bcf7b9bab2f9ba3e8ffdae500c59390277da80b2
 MISC metadata.xml 720 BLAKE2B f8069d999e401f2110a64b002912462d9a6f30674dd42efcd4d5f9d16641e320ba078c539f562d9257c5be1028d58963d060672c9df0f4615519bc02baa0bcd2 SHA512 5f5813e3a398381254e86c96c718ecfd3b0503029f10adc6601476ab3f5f80033cbfd5292280c94d4ca1cda7774b66bc13796e62d1d3d3181b7c72dcb6420b47
diff --git a/sci-libs/tensorflow/tensorflow-1.11.0.ebuild b/sci-libs/tensorflow/tensorflow-1.11.0.ebuild
new file mode 100644
index 000000000000..77e659bc02ab
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-1.11.0.ebuild
@@ -0,0 +1,436 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit check-reqs cuda distutils-r1 multiprocessing toolchain-funcs
+
+DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda jemalloc mpi +python +system-libs"
+CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
+for i in $CPU_USE_FLAGS_X86; do
+	IUSE+=" cpu_flags_x86_$i"
+done
+
+# distfiles that bazel uses for the workspace, will be copied to basel-distdir
+bazel_external_uris="
+	http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
+	https://bitbucket.org/eigen/eigen/get/fd6845384b86.tar.gz -> eigen-fd6845384b86.tar.gz
+	https://github.com/abseil/abseil-cpp/archive/f0f15c2778b0e4959244dd25e63f445a455870f5.tar.gz -> abseil-cpp-f0f15c2778b0e4959244dd25e63f445a455870f5.tar.gz
+	https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz
+	https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip
+	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
+	https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip
+	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
+	cuda? (
+		https://github.com/nvidia/nccl/archive/03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz -> nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz
+		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
+	)
+	python? (
+		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz
+		https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt
+		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
+		!system-libs? (
+			https://github.com/abseil/abseil-py/archive/pypi-v0.2.2.tar.gz -> abseil-py-0.2.2.tar.gz
+			https://github.com/googleapis/googleapis/archive/f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip -> googleapis-f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip
+			https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/f875700a023bdd706333cde45aee8758b272c357.tar.gz -> google-cloud-cpp-f875700a023bdd706333cde45aee8758b272c357.tar.gz
+			https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz
+			https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz
+		)
+	)
+	!system-libs? (
+		https://github.com/google/protobuf/archive/v3.6.0.tar.gz -> protobuf-3.6.0.tar.gz
+	)"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
+		${bazel_external_uris}"
+
+RDEPEND="
+	app-arch/snappy
+	dev-db/lmdb
+	dev-db/sqlite
+	>=dev-libs/jsoncpp-1.8.4
+	dev-libs/libpcre
+	dev-libs/nsync
+	>=dev-libs/protobuf-3.6.0
+	>=dev-libs/re2-0.2018.04.01
+	media-libs/giflib
+	media-libs/libjpeg-turbo
+	media-libs/libpng:0
+	>=net-libs/grpc-1.13.0
+	net-misc/curl
+	sys-libs/zlib
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-8.0[profiler]
+		>=dev-libs/cudnn-6.0
+	)
+	jemalloc? ( >=dev-libs/jemalloc-4.4.0 )
+	mpi? ( virtual/mpi )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/flatbuffers-1.8.0
+		dev-python/absl-py[${PYTHON_USEDEP}]
+		dev-python/astor[${PYTHON_USEDEP}]
+		dev-python/gast[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+		>=net-libs/grpc-1.13.0[python,${PYTHON_USEDEP}]
+		>=sci-libs/keras-applications-1.0.5[${PYTHON_USEDEP}]
+		>=sci-libs/keras-preprocessing-1.0.3[${PYTHON_USEDEP}]
+		>=sci-visualization/tensorboard-${PV}[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+		system-libs? (
+			net-libs/google-cloud-cpp
+		)
+	)
+	system-libs? (
+		dev-libs/openssl:0
+	)"
+DEPEND="${RDEPEND}
+	dev-python/mock"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.6.0
+	>=dev-util/bazel-0.16.0
+	dev-java/java-config
+	dev-python/mock
+	dev-lang/swig
+	dev-python/cython
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-8.0[profiler]
+	)
+	!python? ( dev-lang/python )
+	python? (
+		>=net-libs/grpc-1.13.0[tools]
+	)"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="5G"
+
+bazel-get-cpu-flags() {
+	local i f=()
+	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
+	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
+		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
+	done
+	use cpu_flags_x86_fma3 && f+=( -mfma )
+	echo "${f[*]}"
+}
+
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CFLAGS} $(bazel-get-cpu-flags); do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+	done
+	for i in ${CXXFLAGS} $(bazel-get-cpu-flags); do
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
+setup_bazelrc() {
+	if [[ -f "${T}/bazelrc" ]]; then
+		return
+	fi
+
+	# F: fopen_wr
+	# P: /proc/self/setgroups
+	# Even with standalone enabled, the Bazel sandbox binary is run for feature test:
+	# https://github.com/bazelbuild/bazel/blob/7b091c1397a82258e26ab5336df6c8dae1d97384/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java#L61
+	# https://github.com/bazelbuild/bazel/blob/76555482873ffcf1d32fb40106f89231b37f850a/src/main/tools/linux-sandbox-pid1.cc#L113
+	addpredict /proc
+
+	mkdir -p "${T}/bazel-cache" || die
+	mkdir -p "${T}/bazel-distdir" || die
+
+	cat > "${T}/bazelrc" <<-EOF || die
+	startup --batch
+
+	# dont strip HOME, portage sets a temp per-package dir
+	build --action_env HOME
+
+	# make bazel respect MAKEOPTS
+	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
+	build --compilation_mode=opt --host_compilation_mode=opt
+
+	# Use standalone strategy to deactivate the bazel sandbox, since it
+	# conflicts with FEATURES=sandbox.
+	build --spawn_strategy=standalone --genrule_strategy=standalone
+	test --spawn_strategy=standalone --genrule_strategy=standalone
+
+	build --strip=never
+	build --verbose_failures --noshow_loading_progress
+	test --verbose_test_summary --verbose_failures --noshow_loading_progress
+
+	# make bazel only fetch distfiles from the cache
+	fetch --repository_cache="${T}/bazel-cache/" --distdir="${T}/bazel-distdir/"
+	build --repository_cache="${T}/bazel-cache/" --distdir="${T}/bazel-distdir/"
+
+	build --define=PREFIX=${EPREFIX%/}/usr
+	build --define=LIBDIR=\$(PREFIX)/$(get_libdir)
+
+	EOF
+
+	tc-is-cross-compiler || \
+		echo "build --nodistinct_host_configuration" >> "${T}/bazelrc" || die
+}
+
+ebazel() {
+	# Use different build folders for each multibuild variant.
+	local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
+	local output_base="${WORKDIR}/bazel-base${base_suffix}"
+	mkdir -p "${output_base}" || die
+
+	einfo Running: bazel --output_base="${output_base}" "$@"
+	bazel --output_base="${output_base}" $@ || die
+}
+
+load_distfiles() {
+	# Populate the bazel distdir to fetch from since it cannot use the network
+	# Bazel looks in distdir but will only look for the original filename, not
+	# the possibly renamed one that portage downloaded. If the line has -> we
+	# need to rename it back, otherwise a simple copy is fine.
+
+	local src dst uri rename
+
+	while read uri rename dst; do
+		src="${uri##*/}"
+		[[ -z $src ]] && continue
+		if [[ "$rename" != "->" ]]; then
+			dst="${src}"
+		fi
+
+		[[ ${A} =~ ${dst} ]] || continue
+
+		if [[ "$dst" == "$src" ]]; then
+			einfo "Copying $dst to bazel distdir ..."
+		else
+			einfo "Copying $dst to bazel distdir $src ..."
+		fi
+		dst="$(readlink -f "${DISTDIR}/${dst}")"
+		ln -s "${dst}" "${T}/bazel-distdir/${src}" || die
+	done <<< "$(sed -re 's/!?[A-Za-z]+\?\s+\(\s*//g; s/\s+\)//g' <<< "${bazel_external_uris}")"
+}
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack "${P}.tar.gz"
+	unpack tensorflow-patches-${PVR}.tar.bz2
+}
+
+src_prepare() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	setup_bazelrc
+	load_distfiles
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+	use python && python_copy_sources
+
+	use cuda && cuda_add_sandbox
+}
+
+src_configure() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_configure() {
+		export CC_OPT_FLAGS=" "
+		export TF_NEED_JEMALLOC=$(usex jemalloc 1 0)
+		export TF_NEED_GCP=0
+		export TF_NEED_HDFS=0
+		export TF_NEED_S3=0
+		export TF_NEED_AWS=0
+		export TF_NEED_KAFKA=0
+		export TF_ENABLE_XLA=0
+		export TF_NEED_GDR=0
+		export TF_NEED_VERBS=0
+		export TF_NEED_NGRAPH=0
+		export TF_NEED_OPENCL_SYCL=0
+		export TF_NEED_OPENCL=0
+		export TF_NEED_COMPUTECPP=0
+		export TF_NEED_MKL=0
+		export TF_NEED_MPI=$(usex mpi 1 0)
+		export TF_SET_ANDROID_WORKSPACE=0
+
+		if use python; then
+			python_export PYTHON_SITEDIR
+			export PYTHON_BIN_PATH="${PYTHON}"
+			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
+		else
+			export PYTHON_BIN_PATH="$(which python)"
+			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
+		fi
+
+		export TF_NEED_CUDA=$(usex cuda 1 0)
+		export TF_DOWNLOAD_CLANG=0
+		export TF_CUDA_CLANG=0
+		export TF_NEED_TENSORRT=0
+		if use cuda; then
+			export CUDA_TOOLKIT_PATH="${EPREFIX%/}/opt/cuda"
+			export CUDNN_INSTALL_PATH="${EPREFIX%/}/opt/cuda"
+			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
+			export TF_NCCL_VERSION="1"
+			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
+			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
+			einfo "Setting CUDA version: $TF_CUDA_VERSION"
+			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+		fi
+
+		local SYSLIBS=(
+			astor_archive
+			com_googlesource_code_re2
+			curl
+			cython
+			flatbuffers
+			gif_archive
+			grpc
+			jemalloc
+			jpeg
+			jsoncpp_git
+			lmdb
+			nasm
+			nsync
+			org_sqlite
+			pcre
+			png_archive
+			six_archive
+			snappy
+			swig
+			termcolor_archive
+			zlib_archive
+		)
+		if use system-libs; then
+			SYSLIBS+=(
+				absl_py
+				astor_archive
+				boringssl
+				com_github_googleapis_googleapis
+				com_github_googlecloudplatform_google_cloud_cpp
+				com_google_protobuf
+				com_google_protobuf_cc
+				protobuf_archive
+				gast_archive
+			)
+		fi
+
+		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
+
+		# Only one bazelrc is read, import our one before configure sets its options
+		echo "import ${T}/bazelrc" >> ./.bazelrc
+
+		# This is not autoconf
+		./configure || die
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_configure
+	else
+		do_configure
+	fi
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	if use python; then
+		python_setup
+		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
+		cd "${S}-${MULTIBUILD_VARIANT}" || die
+	fi
+
+	# fail early if anything is missing
+	ebazel build --nobuild \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so \
+		//tensorflow:libtensorflow_cc.so \
+		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
+
+	ebazel build \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so
+	ebazel build //tensorflow:libtensorflow_cc.so
+
+	do_compile() {
+		ebazel build //tensorflow/tools/pip_package:build_pip_package
+	}
+	use python && python_foreach_impl run_in_build_dir do_compile
+}
+
+src_install() {
+	local i j
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_install() {
+		einfo "Installing ${EPYTHON} files"
+		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
+		cd "${srcdir}" || die
+		esetup.py install
+
+		# libtensorflow_framework.so is in /usr/lib already
+		python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
+		rm -f "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
+		python_optimize
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir do_install
+
+		# Symlink to python-exec scripts
+		for i in "${ED}"/usr/lib/python-exec/*/*; do
+			n="${i##*/}"
+			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
+		done
+
+		python_setup
+		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
+		cd "${S}-${MULTIBUILD_VARIANT}" || die
+	fi
+
+	einfo "Installing headers"
+	ebazel build //tensorflow:install_headers
+	insinto /usr/include/${PN}/
+	doins -r bazel-genfiles/tensorflow/include/*
+
+	einfo "Installing libs"
+	# Generate pkg-config file
+	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	dolib.so bazel-bin/tensorflow/lib${PN}_framework.so
+	dolib.so bazel-bin/tensorflow/lib${PN}.so
+	dolib.so bazel-bin/tensorflow/lib${PN}_cc.so
+
+	einstalldocs
+}
diff --git a/sci-libs/tensorflow/tensorflow-1.11.0_rc2.ebuild b/sci-libs/tensorflow/tensorflow-1.11.0_rc2.ebuild
new file mode 100644
index 000000000000..2d82b286c6e6
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-1.11.0_rc2.ebuild
@@ -0,0 +1,435 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 python3_6 )
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit check-reqs cuda distutils-r1 multiprocessing toolchain-funcs
+
+DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda jemalloc mpi +python +system-libs"
+CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
+for i in $CPU_USE_FLAGS_X86; do
+	IUSE+=" cpu_flags_x86_$i"
+done
+
+# distfiles that bazel uses for the workspace, will be copied to basel-distdir
+bazel_external_uris="
+	http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
+	https://bitbucket.org/eigen/eigen/get/fd6845384b86.tar.gz -> eigen-fd6845384b86.tar.gz
+	https://github.com/abseil/abseil-cpp/archive/f0f15c2778b0e4959244dd25e63f445a455870f5.tar.gz -> abseil-cpp-f0f15c2778b0e4959244dd25e63f445a455870f5.tar.gz
+	https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz
+	https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip
+	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
+	https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip
+	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
+	cuda? (
+		https://github.com/nvidia/nccl/archive/03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz -> nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz
+		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
+	)
+	python? (
+		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz
+		https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt
+		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
+		!system-libs? (
+			https://github.com/abseil/abseil-py/archive/pypi-v0.2.2.tar.gz -> abseil-py-0.2.2.tar.gz
+			https://github.com/googleapis/googleapis/archive/f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip -> googleapis-f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip
+			https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/f875700a023bdd706333cde45aee8758b272c357.tar.gz -> google-cloud-cpp-f875700a023bdd706333cde45aee8758b272c357.tar.gz
+			https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz
+			https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz
+		)
+	)
+	!system-libs? (
+		https://github.com/google/protobuf/archive/v3.6.0.tar.gz -> protobuf-3.6.0.tar.gz
+	)"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
+		${bazel_external_uris}"
+
+RDEPEND="
+	app-arch/snappy
+	dev-db/lmdb
+	dev-db/sqlite
+	>=dev-libs/jsoncpp-1.8.4
+	dev-libs/libpcre
+	dev-libs/nsync
+	>=dev-libs/protobuf-3.6.0
+	>=dev-libs/re2-0.2018.04.01
+	media-libs/giflib
+	media-libs/libjpeg-turbo
+	media-libs/libpng:0
+	>=net-libs/grpc-1.13.0
+	net-misc/curl
+	sys-libs/zlib
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-8.0[profiler]
+		>=dev-libs/cudnn-6.0
+	)
+	jemalloc? ( >=dev-libs/jemalloc-4.4.0 )
+	mpi? ( virtual/mpi )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/flatbuffers-1.8.0
+		dev-python/absl-py[${PYTHON_USEDEP}]
+		dev-python/astor[${PYTHON_USEDEP}]
+		dev-python/gast[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+		>=net-libs/grpc-1.13.0[python,${PYTHON_USEDEP}]
+		sci-libs/keras-applications[${PYTHON_USEDEP}]
+		sci-libs/keras-preprocessing[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+		system-libs? (
+			net-libs/google-cloud-cpp
+		)
+	)
+	system-libs? (
+		dev-libs/openssl:0
+	)"
+DEPEND="${RDEPEND}
+	dev-python/mock"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.6.0
+	>=dev-util/bazel-0.16.0
+	dev-java/java-config
+	dev-python/mock
+	dev-lang/swig
+	dev-python/cython
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-8.0[profiler]
+	)
+	!python? ( dev-lang/python )
+	python? (
+		>=net-libs/grpc-1.13.0[tools]
+	)"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="5G"
+
+bazel-get-cpu-flags() {
+	local i f=()
+	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
+	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
+		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
+	done
+	use cpu_flags_x86_fma3 && f+=( -mfma )
+	echo "${f[*]}"
+}
+
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CFLAGS} $(bazel-get-cpu-flags); do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+	done
+	for i in ${CXXFLAGS} $(bazel-get-cpu-flags); do
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
+setup_bazelrc() {
+	if [[ -f "${T}/bazelrc" ]]; then
+		return
+	fi
+
+	# F: fopen_wr
+	# P: /proc/self/setgroups
+	# Even with standalone enabled, the Bazel sandbox binary is run for feature test:
+	# https://github.com/bazelbuild/bazel/blob/7b091c1397a82258e26ab5336df6c8dae1d97384/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java#L61
+	# https://github.com/bazelbuild/bazel/blob/76555482873ffcf1d32fb40106f89231b37f850a/src/main/tools/linux-sandbox-pid1.cc#L113
+	addpredict /proc
+
+	mkdir -p "${T}/bazel-cache" || die
+	mkdir -p "${T}/bazel-distdir" || die
+
+	cat > "${T}/bazelrc" <<-EOF || die
+	startup --batch
+
+	# dont strip HOME, portage sets a temp per-package dir
+	build --action_env HOME
+
+	# make bazel respect MAKEOPTS
+	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
+	build --compilation_mode=opt --host_compilation_mode=opt
+
+	# Use standalone strategy to deactivate the bazel sandbox, since it
+	# conflicts with FEATURES=sandbox.
+	build --spawn_strategy=standalone --genrule_strategy=standalone
+	test --spawn_strategy=standalone --genrule_strategy=standalone
+
+	build --strip=never
+	build --verbose_failures --noshow_loading_progress
+	test --verbose_test_summary --verbose_failures --noshow_loading_progress
+
+	# make bazel only fetch distfiles from the cache
+	fetch --repository_cache="${T}/bazel-cache/" --distdir="${T}/bazel-distdir/"
+	build --repository_cache="${T}/bazel-cache/" --distdir="${T}/bazel-distdir/"
+
+	build --define=PREFIX=${EPREFIX%/}/usr
+	build --define=LIBDIR=\$(PREFIX)/$(get_libdir)
+
+	EOF
+
+	tc-is-cross-compiler || \
+		echo "build --nodistinct_host_configuration" >> "${T}/bazelrc" || die
+}
+
+ebazel() {
+	# Use different build folders for each multibuild variant.
+	local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
+	local output_base="${WORKDIR}/bazel-base${base_suffix}"
+	mkdir -p "${output_base}" || die
+
+	einfo Running: bazel --output_base="${output_base}" "$@"
+	bazel --output_base="${output_base}" $@ || die
+}
+
+load_distfiles() {
+	# Populate the bazel distdir to fetch from since it cannot use the network
+	# Bazel looks in distdir but will only look for the original filename, not
+	# the possibly renamed one that portage downloaded. If the line has -> we
+	# need to rename it back, otherwise a simple copy is fine.
+
+	local src dst uri rename
+
+	while read uri rename dst; do
+		src="${uri##*/}"
+		[[ -z $src ]] && continue
+		if [[ "$rename" != "->" ]]; then
+			dst="${src}"
+		fi
+
+		[[ ${A} =~ ${dst} ]] || continue
+
+		if [[ "$dst" == "$src" ]]; then
+			einfo "Copying $dst to bazel distdir ..."
+		else
+			einfo "Copying $dst to bazel distdir $src ..."
+		fi
+		dst="$(readlink -f "${DISTDIR}/${dst}")"
+		ln -s "${dst}" "${T}/bazel-distdir/${src}" || die
+	done <<< "$(sed -re 's/!?[A-Za-z]+\?\s+\(\s*//g; s/\s+\)//g' <<< "${bazel_external_uris}")"
+}
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack "${P}.tar.gz"
+	unpack tensorflow-patches-${PVR}.tar.bz2
+}
+
+src_prepare() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	setup_bazelrc
+	load_distfiles
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+	use python && python_copy_sources
+
+	use cuda && cuda_add_sandbox
+}
+
+src_configure() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_configure() {
+		export CC_OPT_FLAGS=" "
+		export TF_NEED_JEMALLOC=$(usex jemalloc 1 0)
+		export TF_NEED_GCP=0
+		export TF_NEED_HDFS=0
+		export TF_NEED_S3=0
+		export TF_NEED_AWS=0
+		export TF_NEED_KAFKA=0
+		export TF_ENABLE_XLA=0
+		export TF_NEED_GDR=0
+		export TF_NEED_VERBS=0
+		export TF_NEED_NGRAPH=0
+		export TF_NEED_OPENCL_SYCL=0
+		export TF_NEED_OPENCL=0
+		export TF_NEED_COMPUTECPP=0
+		export TF_NEED_MKL=0
+		export TF_NEED_MPI=$(usex mpi 1 0)
+		export TF_SET_ANDROID_WORKSPACE=0
+
+		if use python; then
+			python_export PYTHON_SITEDIR
+			export PYTHON_BIN_PATH="${PYTHON}"
+			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
+		else
+			export PYTHON_BIN_PATH="$(which python)"
+			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
+		fi
+
+		export TF_NEED_CUDA=$(usex cuda 1 0)
+		export TF_DOWNLOAD_CLANG=0
+		export TF_CUDA_CLANG=0
+		export TF_NEED_TENSORRT=0
+		if use cuda; then
+			export CUDA_TOOLKIT_PATH="${EPREFIX%/}/opt/cuda"
+			export CUDNN_INSTALL_PATH="${EPREFIX%/}/opt/cuda"
+			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
+			export TF_NCCL_VERSION="1"
+			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
+			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
+			einfo "Setting CUDA version: $TF_CUDA_VERSION"
+			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+		fi
+
+		local SYSLIBS=(
+			astor_archive
+			com_googlesource_code_re2
+			curl
+			cython
+			flatbuffers
+			gif_archive
+			grpc
+			jemalloc
+			jpeg
+			jsoncpp_git
+			lmdb
+			nasm
+			nsync
+			org_sqlite
+			pcre
+			png_archive
+			six_archive
+			snappy
+			swig
+			termcolor_archive
+			zlib_archive
+		)
+		if use system-libs; then
+			SYSLIBS+=(
+				absl_py
+				astor_archive
+				boringssl
+				com_github_googleapis_googleapis
+				com_github_googlecloudplatform_google_cloud_cpp
+				com_google_protobuf
+				com_google_protobuf_cc
+				protobuf_archive
+				gast_archive
+			)
+		fi
+
+		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
+
+		# Only one bazelrc is read, import our one before configure sets its options
+		echo "import ${T}/bazelrc" >> ./.bazelrc
+
+		# This is not autoconf
+		./configure || die
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_configure
+	else
+		do_configure
+	fi
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	if use python; then
+		python_setup
+		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
+		cd "${S}-${MULTIBUILD_VARIANT}" || die
+	fi
+
+	# fail early if anything is missing
+	ebazel build --nobuild \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so \
+		//tensorflow:libtensorflow_cc.so \
+		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
+
+	ebazel build \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so
+	ebazel build //tensorflow:libtensorflow_cc.so
+
+	do_compile() {
+		ebazel build //tensorflow/tools/pip_package:build_pip_package
+	}
+	use python && python_foreach_impl run_in_build_dir do_compile
+}
+
+src_install() {
+	local i j
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_install() {
+		einfo "Installing ${EPYTHON} files"
+		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
+		cd "${srcdir}" || die
+		esetup.py install
+
+		# libtensorflow_framework.so is in /usr/lib already
+		python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
+		rm -f "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" "${D}/${PYTHON_SCRIPTDIR}/tensorboard" || die
+		python_optimize
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir do_install
+
+		# Symlink to python-exec scripts
+		for i in "${ED}"/usr/lib/python-exec/*/*; do
+			n="${i##*/}"
+			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
+		done
+
+		python_setup
+		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
+		cd "${S}-${MULTIBUILD_VARIANT}" || die
+	fi
+
+	einfo "Installing headers"
+	ebazel build //tensorflow:install_headers
+	insinto /usr/include/${PN}/
+	doins -r bazel-genfiles/tensorflow/include/*
+
+	einfo "Installing libs"
+	# Generate pkg-config file
+	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	dolib.so bazel-bin/tensorflow/lib${PN}_framework.so
+	dolib.so bazel-bin/tensorflow/lib${PN}.so
+	dolib.so bazel-bin/tensorflow/lib${PN}_cc.so
+
+	einstalldocs
+}
diff --git a/sci-libs/votca-moo/Manifest b/sci-libs/votca-moo/Manifest
deleted file mode 100644
index dfd8e916ce9f..000000000000
--- a/sci-libs/votca-moo/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD votca-moo-9999.ebuild 786 BLAKE2B f7262e13d0629770db41a8ba9f3607a9ae71b95fe630304c8d999134db363f77899b220789ce345a845bc35dc2b8eb0be7898cd0a40d9663d884b2179e217fac SHA512 0501489fbb54a8f0255f1807331bdbf7e3c9204fff3f86a106f11de6a6da2414eeb54f454bea0d3380056399b82d348f015905bd7f001bd094fa64cfde39a5e4
-MISC metadata.xml 453 BLAKE2B 025bc4b4f989741fc506f96b76a9867a4321b8e2048170635b9e56cc9df19e221a5a63e64b76d3c29db56bc74f40289829fdca930b26b2c71bf67ec72d349d23 SHA512 722f67b77da520a0f536dd16a9904abcd33db73d28f0538507cce8dbc2eed38298021428105ab647d792393d2c01d54dd12fe31bfc0a2356abe99da169cb923b
diff --git a/sci-libs/votca-moo/metadata.xml b/sci-libs/votca-moo/metadata.xml
deleted file mode 100644
index 25ad85ea7535..000000000000
--- a/sci-libs/votca-moo/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci-chemistry@gentoo.org</email>
-		<name>Gentoo Chemistry Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">votca/moo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-libs/votca-moo/votca-moo-9999.ebuild b/sci-libs/votca-moo/votca-moo-9999.ebuild
deleted file mode 100644
index 01f3524290df..000000000000
--- a/sci-libs/votca-moo/votca-moo-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils multilib
-
-if [ "${PV}" != "9999" ]; then
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-	S="${WORKDIR}/${P#votca-}"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Votca Molecular orbital library"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	=sci-libs/votca-tools-${PV}[sqlite]
-	dev-db/sqlite:3"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( NOTICE README )
-
-src_configure() {
-	mycmakeargs=(
-		-DLIB=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index b8184a3c48c9..7195c4778151 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -2,5 +2,5 @@ DIST votca-tools-1.4.1.tar.gz 103152 BLAKE2B 73dc726ea899ceb65d0406f3795f1df79a6
 DIST votca-tools-1.4.tar.gz 103102 BLAKE2B a398d20b628148ec753ee1e59353e272dbda93848be11ecccaf2153385ebcac62c7b819c4ef0b9b1a7cfc7dfd85136d042726cc996af79a4dad64375f5aa9f6c SHA512 7c4bf2e2ba8cf795f03879138787db3875f48db56b88394c98b18cef0ae90e636d8aafff42eb62a408df06a91583e37e59b33440e83de9f4338295e9ccfc9be5
 EBUILD votca-tools-1.4.1.ebuild 1211 BLAKE2B d49fc0a98bfaf61cee9b1c38f058687591b81319788b578e91db513f76d452fec9e2116e503b22539f84bc0e567434d144b6ad22d3c62bd819b0fa817a7ccdea SHA512 920a37e44b7ad3d1e655843b22646d87f376bb93cbb99f7241ff538183b1d4df7aeb6ede66f04fee423bd112c651185d837423024fd1cdfde7350018b83ebde7
 EBUILD votca-tools-1.4.ebuild 1182 BLAKE2B 2077617efbf04198cf2a0f53bbf07f87897a8420ec6ad9e1774c821e7e3789421a253b79e9f09e85abfdf1523ebba02400233199cee5d7966a03b97db4477155 SHA512 48eb152df0bc0ad1481179977c0a8b6947180d9978961024a57674414326eb370182c02f5fda3a902a03a14fe3f0e60f666787eb16729412426ee83f1a074613
-EBUILD votca-tools-9999.ebuild 1175 BLAKE2B 9bf966f68d850c88d6d5e800367436973b2f3ea12d3b7560d368e541d769e6dd9553e9a11e7c5ccf6bdb187f409b271d098e51ce3904df4b98672829ef2da2cc SHA512 c7ff0252fda8b21d7f1f00a4cf01bf6065a880ac4af1d7986cc042ca26de6c439702e3704e81c2276cd4672f277644076394575f8ed76ae5c4af07407aba3617
+EBUILD votca-tools-9999.ebuild 1143 BLAKE2B a7f5a4d405c10a5703faceb6ea0af34e37a4408c2fade70fa3216eef30663f051abdeffd41a1a0bbafe5be2ce3fc574fc7341072c36bd13bb3774efcc48e107e SHA512 57a33ae65d303d56d8065cc65c658084fc8a4148517fb235932174e824809fa1b0ecfad4097eb77dac79ae4dcca7f39e6c449375010e3dd549c939d8af93a998
 MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d
diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index 1902116de670..470ee69553d5 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,13 +22,13 @@ HOMEPAGE="http://www.votca.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc +fftw +gsl sqlite"
+IUSE="doc +fftw sqlite"
 
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/expat
+	>=dev-cpp/eigen-3.3
 	fftw? ( sci-libs/fftw:3.0 )
-	gsl? ( sci-libs/gsl )
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
@@ -40,7 +40,6 @@ DOCS=( NOTICE )
 
 src_configure() {
 	mycmakeargs=(
-		-DWITH_GSL=$(usex gsl)
 		-DWITH_FFTW=$(usex fftw)
 		-DWITH_SQLITE3=$(usex sqlite)
 		-DWITH_RC_FILES=OFF