gentoo resync : 19.04.2018

19 files changed, 137 insertions, 190 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index adb64919e703..5cc7cd15c4a2 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index 3b78d0334ad0..8f611dd79a76 100644
--- a/sci-libs/amd/Manifest
+++ b/sci-libs/amd/Manifest
@@ -1,3 +1,3 @@
 DIST amd-2.3.1.tar.bz2 339970 BLAKE2B b84b7b690deb6a1fcfdbbec403a3e5267cd4e1cf851312a56bbd48ac92a732f789365e2191f6b74f49173bc6c008ebd5f6b528a99a9abdc6a2777f3a6a7305b8 SHA512 19b8c010e0f7a5a96e60fe52904b2b548fb89dfaf9d6f99184df955a732ec3edef04acff01a82a909e030c3bf78c9eccfe0c329731edb29f4b936507e39d885e
-EBUILD amd-2.3.1.ebuild 754 BLAKE2B ac1c24acfc70c9ecefa35a53f9f1bac2a29386a0734f6251b60f5d26a61112535679fe5f680a16508dc8fd0a26dd2d8653ba8ef641924773f68a3a564df7e2c4 SHA512 79c19cb2b6260d19d7f9378472e645f43d62b1ea3d5a085d8a502c262ee3b29027c3768ae57821633d25921e90a8585f0e5f25ad1f2f9d51f28d15ea07cfc531
+EBUILD amd-2.3.1.ebuild 753 BLAKE2B 1a060d8c9b8775086b62737d218e11961f8bca84f1d50f674b28b52f6dbcbff41e8b1169b5e6d19eaf40810487d90d8f48cffe034d09e1ae024c73a513c975cc SHA512 522ad0a25ffd9e457367d1203a4512c7d67190a6dfd47837e7f83fd5139814554e5d187dd6df4b642be6b9bab72a856c36aee4330a440afa7e4cd2a609f95abd
 MISC metadata.xml 492 BLAKE2B ac6367af33dd797e703e3370d6369db5286b11f862b5387258e9edd860554049c7d9e2bf2186c86e24a7fc29c3f1122f330c0a3cf0420f13085757cff0a388b3 SHA512 1c53658e87337e1e43149c363c901dabfdde52b647891d8026a7ce9ddcd5e36b0121948d169d446e5a78d05c26301bd4f8c7c06665506ebc0999c259b709a6b6
diff --git a/sci-libs/amd/amd-2.3.1.ebuild b/sci-libs/amd/amd-2.3.1.ebuild
index e799ab899a0a..0a269ccff930 100644
--- a/sci-libs/amd/amd-2.3.1.ebuild
+++ b/sci-libs/amd/amd-2.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc fortran static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index 756b149e2612..d84c6884a422 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,9 +1,9 @@
 AUX avogadrolibs-0.7.2-6464.patch 902 BLAKE2B 29a06e0d5e814aee4c1aff30af3642e374d32813e4e9837706ef652f89ffde173ff043fc3589fc08b22592e3ded2c0d8ef9c544e54a561ac658ae43651403633 SHA512 3851a3c5f7c599e439b4faa491ea080264e60bf2a7c4d35e01a10726f901a5797026bf32535107b46ca44335c5723d9ec7f0b6a46e9eebf7ffd9f90c7f2103d3
 AUX avogadrolibs-1.91.0_pre20180406-bundled-genxrdpattern.patch 1644 BLAKE2B 3b25bc2648b323b803b5d0b6e10be2689ef9e4c988d0c55abe172bf4312da8f5f9b527262a2f8e48d0b2391b01a03a976bc36cc22c467ac9a44fb85cc43c7a6d SHA512 515c7029e6f99c5e88a37f43387e656b2873b99e14e8d8e9b1b20bf82604f70be8f669d8b97383e80969b0f80d43439647fdfd17566bbf6fbd32cb75ce2fb4e3
-AUX avogadrolibs-1.91.0_pre20180406-qt-5.11.patch 797 BLAKE2B 80459a969efbcf8ffe257a21359df298eda3bc191d8eddbc239b807b0d3090057bf8cba69caa0fe734821174e0bb98f24d0dc05c99c16c327a157fa588c6b3db SHA512 ef6fde385be85e101039a3ce555ea9d3fb4294fa47153cbf7faae5fd10fdc3601e000d8e83676c5da222dfe1cfedf338376532b055d0f2357f660f6b36665c6c
 AUX avogadrolibs-1.91.0_pre20180406-unbundle-jsoncpp.patch 5377 BLAKE2B 5de00cdcd90d7642ddb82aa8ae0e6685ad17c2a6332a4ef9ba28be66f48a6eabf51d557173a6129b588b9eafb394db74d332fc178b2a323d29777e88e37174a7 SHA512 b4445aa7377370fd1336b7fdf0aa3dfa93b6d538efa70ca383cdcf85d9f54e64a6bd0c2af5e0f5c80ed731d4babd4c2a1f7a4e909fb5cf2a30bf72224737870a
 AUX avogadrolibs-1.91.0_pre20180406-underlinking.patch 549 BLAKE2B e773e8994677a4cc0880013455efbe153ecdf92061599b787e3486638a6a2a0b5ebe731387a6f79357ff8f049c74b2a5efdeec0ed886b89e02f5160268dda4a2 SHA512 05d7ef99d1d5d395962def8896fb0c61ae437aeb0199ea8ce26a6076abba0559973aff5a4a4620f5c7dbe6413c80237490ad6b80f8a7503a8b2d3ae92f81fbf4
-DIST avogadrolibs-1.91.0_pre20180406.tar.gz 857345 BLAKE2B 8e5c6b0a838a2a6b7dc925c1b544ab4d4de8b7769b1fe8d787127a1014b1243da89a2a6f6cfc871181f81a443c3ee63d758369f003afaf591c9373c9d5122ee3 SHA512 1814b2105615aabc1df78b14c581e78fea20a1e4ace8979bb2ad123ab0994d90c3935e37f0cc58b60d3307ffe682599a93d8cadddc22b4ba524caaec1a2c5319
+AUX avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch 3887 BLAKE2B 3803af011ecd8df2cc8cc969623d37237ed398cfd82baaf06d6d59da7dfdda3c8a042ffe2b5e15e9571cb3d74ae0eba4e3d80c9cbd9a6fd53a0035340257a382 SHA512 d49da2a4f215a74f1267de1fe74a19e1f2c4fdd61d583a05c04ca3d8309fd0ed431ac10164a0130fa5a1a2c85f23b5de5445a75dbe0e0e83d7060521454507b1
+DIST avogadrolibs-1.91.0_pre20180415.tar.gz 2541101 BLAKE2B 526d2135af123d31220c8dd87351a35464e3dfd6b8d411d6dc9a6b3e74693090adfa3b61198a6a296eac99e6bbd67623f7aeda6a1752a09e3e3bcaa3df4d5008 SHA512 1cc646368f70523fcf20c6cf598025234162e0c81da64a3b5375c1691a6743f2aceb1f13230937bf9da045e725a23c1c89c8121e07b31ef9e2c7987b1feafccc
 DIST linux64-genXrdPattern 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
-EBUILD avogadrolibs-1.91.0_pre20180406-r1.ebuild 2086 BLAKE2B 5e01df80ef83ec255b6468531ab46efbcd798b786d9b8483bc8faa399262a3df7682b75d8f722c7becac1286cdd2556ef2fb28c6d8cffc2205f611285e5d94e6 SHA512 7490e3e4c909cb1963a869619b7aaa717af3dc59c4ebd50551570af9c7ab50c3f16931b5e52ad7bcf8368f1e8101a7193f86115f7d0c8beb206c3759d972412d
+EBUILD avogadrolibs-1.91.0_pre20180415.ebuild 2199 BLAKE2B 429a805feb4f028418bd9d66dc2a27cf1dc4969fc03812f52b1be2bb6996d96d918bf2eaa8658ce3997d8a794683a0a12fcba0d96c2ed693e4f181160abf317c SHA512 3c93329d1873ad9f06dec643681964b280f3718c17319e0fc9eea9003de87b217665e6acfd2c618b27f3e5746b453ea5428d90ba0ec30699f5785645e54d3b63
 MISC metadata.xml 670 BLAKE2B 39737e6ffacaf9284506e41dfa1154f233a6bf37dd514c0eafe6bdf7bd7129a43d81cf4c3e510759b7888277bb403ad933e21abf0ba4dbedd43fda2aa2b55edd SHA512 781b3e67a291253d83d6c2e11124b07dbae652267de2702a1a2b10680f7db19cf35bda8964b320658d849091bd9ead07eeb5fc682a8817101dd1e7a1e9e20757
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
index 377cfc965c57..0936e94a44ca 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-COMMIT=f414794a168712f72884cdcfba818def5f42e721
+COMMIT=606debb5d7c2c4020478264c609f895584fc5e38
 inherit cmake-utils
 
 DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
@@ -39,17 +39,17 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-cpp/eigen:3
-	dev-qt/qtopengl:5
+	qt5? ( dev-qt/linguist-tools:5 )
 	test? ( dev-cpp/gtest )"
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.7.2-6464.patch
-	"${FILESDIR}/"${P}-underlinking.patch
-	"${FILESDIR}/"${P}-unbundle-jsoncpp.patch
-	"${FILESDIR}/"${P}-bundled-genxrdpattern.patch
-	"${FILESDIR}/"${P}-qt-5.11.patch
+	"${FILESDIR}/"${PN}-1.91.0_pre20180406-underlinking.patch
+	"${FILESDIR}/"${PN}-1.91.0_pre20180406-unbundle-jsoncpp.patch
+	"${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch
+	"${FILESDIR}/"${P}-qt-5.11b3.patch
 )
 
 src_unpack() {
@@ -70,6 +70,7 @@ src_configure() {
 		-DUSE_LIBARCHIVE=$(usex archive)
 		-DBUILD_DOCUMENTATION=$(usex doc)
 		-DUSE_HDF5=$(usex hdf5)
+		-DENABLE_TRANSLATIONS=$(usex qt5)
 		-DUSE_OPENGL=$(usex qt5)
 		-DUSE_QT=$(usex qt5)
 		-DBUILD_STATIC_PLUGINS=$(usex static-plugins)
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch
deleted file mode 100644
index 437b1e755af8..000000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5d70cd5ec5ac8460ff5d3d6b0b47b9c60e1f3ca2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 10 Apr 2018 21:59:32 +0200
-Subject: [PATCH] Fix build with Qt-5.11
-
----
- avogadro/qtplugins/gamessinput/gamessinput.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/avogadro/qtplugins/gamessinput/gamessinput.cpp b/avogadro/qtplugins/gamessinput/gamessinput.cpp
-index 779d2d4..0b2e106 100644
---- a/avogadro/qtplugins/gamessinput/gamessinput.cpp
-+++ b/avogadro/qtplugins/gamessinput/gamessinput.cpp
-@@ -24,9 +24,9 @@
- 
- #include <molequeue/client/jobobject.h>
- 
--#include <QtCore/QDebug>
--
--#include <QtWidgets/QMessageBox>
-+#include <QAction>
-+#include <QDebug>
-+#include <QMessageBox>
- 
- namespace Avogadro {
- namespace Core {
--- 
-2.17.0
-
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch
new file mode 100644
index 000000000000..11816e438c28
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch
@@ -0,0 +1,93 @@
+From 03dd55beb878b5e15d891535a3c8b7ffa6133c92 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 17 Apr 2018 11:31:22 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+---
+ avogadro/molequeue/CMakeLists.txt | 3 +--
+ avogadro/qtgui/CMakeLists.txt     | 3 +--
+ avogadro/qtopengl/CMakeLists.txt  | 3 +--
+ avogadro/vtk/CMakeLists.txt       | 3 +--
+ tests/qtgui/CMakeLists.txt        | 3 +--
+ tests/qtopengl/CMakeLists.txt     | 2 --
+ 6 files changed, 5 insertions(+), 12 deletions(-)
+
+diff --git a/avogadro/molequeue/CMakeLists.txt b/avogadro/molequeue/CMakeLists.txt
+index 43a9195..37431cd 100644
+--- a/avogadro/molequeue/CMakeLists.txt
++++ b/avogadro/molequeue/CMakeLists.txt
+@@ -41,6 +41,5 @@ qt5_wrap_ui(UI_SOURCES ${UIS})
+ list(APPEND SOURCES ${UI_SOURCES})
+ 
+ avogadro_add_library(AvogadroMoleQueue ${HEADERS} ${SOURCES})
+-qt5_use_modules(AvogadroMoleQueue Widgets Network)
+ set_target_properties(AvogadroMoleQueue PROPERTIES AUTOMOC TRUE)
+-target_link_libraries(AvogadroMoleQueue AvogadroQtGui MoleQueueClient)
++target_link_libraries(AvogadroMoleQueue AvogadroQtGui MoleQueueClient Qt5::Widgets Qt5::Network)
+diff --git a/avogadro/qtgui/CMakeLists.txt b/avogadro/qtgui/CMakeLists.txt
+index e6cf8d3..3365261 100644
+--- a/avogadro/qtgui/CMakeLists.txt
++++ b/avogadro/qtgui/CMakeLists.txt
+@@ -99,5 +99,4 @@ qt5_add_resources(RC_SOURCES ${RCS})
+ list(APPEND SOURCES ${RC_SOURCES})
+ 
+ avogadro_add_library(AvogadroQtGui ${HEADERS} ${SOURCES})
+-qt5_use_modules(AvogadroQtGui Widgets)
+-target_link_libraries(AvogadroQtGui AvogadroIO)
++target_link_libraries(AvogadroQtGui AvogadroIO Qt5::Widgets)
+diff --git a/avogadro/qtopengl/CMakeLists.txt b/avogadro/qtopengl/CMakeLists.txt
+index 354638c..28a473e 100644
+--- a/avogadro/qtopengl/CMakeLists.txt
++++ b/avogadro/qtopengl/CMakeLists.txt
+@@ -16,5 +16,4 @@ set(SOURCES
+ )
+ 
+ avogadro_add_library(AvogadroQtOpenGL ${HEADERS} ${SOURCES})
+-qt5_use_modules(AvogadroQtOpenGL Widgets)
+-target_link_libraries(AvogadroQtOpenGL AvogadroRendering AvogadroQtGui)
++target_link_libraries(AvogadroQtOpenGL AvogadroRendering AvogadroQtGui Qt5::Widgets)
+diff --git a/avogadro/vtk/CMakeLists.txt b/avogadro/vtk/CMakeLists.txt
+index abac5a1..498529c 100644
+--- a/avogadro/vtk/CMakeLists.txt
++++ b/avogadro/vtk/CMakeLists.txt
+@@ -30,8 +30,7 @@ set(SOURCES
+ )
+ 
+ avogadro_add_library(AvogadroVtk ${HEADERS} ${SOURCES})
+-qt5_use_modules(AvogadroVtk Widgets)
+ set_target_properties(AvogadroVtk PROPERTIES AUTOMOC TRUE)
+ target_link_libraries(AvogadroVtk AvogadroRendering AvogadroQtGui
+   vtkRenderingOpenGL2 vtkGUISupportQt vtkRenderingVolumeOpenGL2
+-  vtkRenderingFreeType vtkInteractionStyle)
++  vtkRenderingFreeType vtkInteractionStyle Qt5::Widgets)
+diff --git a/tests/qtgui/CMakeLists.txt b/tests/qtgui/CMakeLists.txt
+index 1cfd51a..da08078 100644
+--- a/tests/qtgui/CMakeLists.txt
++++ b/tests/qtgui/CMakeLists.txt
+@@ -49,9 +49,8 @@ endforeach()
+ 
+ # Add a single executable for all of our tests.
+ add_executable(AvogadroQtGuiTests ${testSrcs})
+-qt5_use_modules(AvogadroQtGuiTests Widgets Test)
+ target_link_libraries(AvogadroQtGuiTests AvogadroQtGui AvogadroMoleQueue
+-  MoleQueueClient ${GTEST_BOTH_LIBRARIES} ${EXTRA_LINK_LIB})
++  MoleQueueClient ${GTEST_BOTH_LIBRARIES} ${EXTRA_LINK_LIB} Qt5::Widgets Qt5::Test)
+ 
+ # Now add all of the tests, using the gtest_filter argument so that only those
+ # cases are run in each test invocation.
+diff --git a/tests/qtopengl/CMakeLists.txt b/tests/qtopengl/CMakeLists.txt
+index 370f28f..60fc5ae 100644
+--- a/tests/qtopengl/CMakeLists.txt
++++ b/tests/qtopengl/CMakeLists.txt
+@@ -44,8 +44,6 @@ create_test_sourcelist(testDriver qtopengltests.cpp ${testSrcs})
+ 
+ add_executable(AvogadroQtOpenGLTests ${testDriver})
+ 
+-qt5_use_modules(AvogadroQtOpenGLTests OpenGL)
+-
+ target_link_libraries(AvogadroQtOpenGLTests
+   AvogadroQtOpenGL
+   vtkImagingCore
+-- 
+2.17.0
+
diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest
index 6125aa6b2629..b1ca9de478f2 100644
--- a/sci-libs/colamd/Manifest
+++ b/sci-libs/colamd/Manifest
@@ -1,3 +1,3 @@
 DIST colamd-2.8.0.tar.bz2 304819 BLAKE2B a2c4b67ad8d20b0cb136f579a367bf53b0e692596550b9e22908628f4d0bce00e2ddeb9aa0dfe6d1f204e79332be99c97366df2ba555ab881d4ba01c42a721e6 SHA512 36b2e50e01ad44f04f084ebcdcfb7d9d1d1712c6f53c8bce9f46ce39edc418aa64b8e67489fb06cb95d86658fd9f9bad89217a5f9f4777181f0f0e9b58c04aee
-EBUILD colamd-2.8.0.ebuild 579 BLAKE2B 792bcb058862970238f7c76c4b9e727e968314ccbe310bc90d2d912b23efca44e184a53f19f12648b58a6cbc3237c4cb55163aabce4ffc6988f973bbe23ae37e SHA512 c9772321b902395c6a0367a6003c363c95b1073e19b32ed1d4d7263430738c44d5aac4db36b15fae0007f0c956912f6815037e2ce090d37799a820277beb72b6
+EBUILD colamd-2.8.0.ebuild 578 BLAKE2B fabef242802b0f673d6cf80fae76eab1409c518a129a26251ca302ed6b1f1f7b5cb484f6da75719c88a93137471cfbf9dd71a559eea41e93816db4eacd60a7c6 SHA512 db23ca1688b50525288cc28556d444e3706a15cbf3cc24093a10867e46983636bd5c438355e424d83f83ea4432641baca039540846b047752b4768648b7f9106
 MISC metadata.xml 827 BLAKE2B d1b92027b2b820c67cb091e71c22c5ebcfe8e560968b8cf76f5cb61b6c26a71b66f4801343a531fbc8941b5b678bff44e2ab3aa6bec49db9b0264ea2273ac816 SHA512 367258fb10bcde8e5136c541ef1e134c4e882b296c45300c8d70945222c0730572b1dc116b80057c3a9d6a64c175fb86915847522000740d9a39e6fcd8eb5004
diff --git a/sci-libs/colamd/colamd-2.8.0.ebuild b/sci-libs/colamd/colamd-2.8.0.ebuild
index ffe0436398d7..6bafb95e19d9 100644
--- a/sci-libs/colamd/colamd-2.8.0.ebuild
+++ b/sci-libs/colamd/colamd-2.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/libghemical/Manifest b/sci-libs/libghemical/Manifest
index 4d931da563fd..2ba9bd3fe840 100644
--- a/sci-libs/libghemical/Manifest
+++ b/sci-libs/libghemical/Manifest
@@ -1,4 +1,4 @@
 AUX libghemical-2.98-gl.patch 402 BLAKE2B 6b2bf88b489bb99d2c851025c57941788eaecef9abcb623c4ac66c1090d862ad4623223e0ea99706d4079c1caf6591092e16b3d244275e2cb57f8c8f5731feec SHA512 bf0fee685f2f10f467d92f86db3dea47879651335c6966757e69bf7bac1f9a6ee18bd22c9a61f01ca1babc5c7e14cfc3caba382af764fd1a418ee70e32e2b1a6
 DIST libghemical-3.0.0.tar.gz 787947 BLAKE2B ea0bf4c8f257df3d22d5efdede83cea1ad2239692e98c87cdb44c7da3352956d5bc21c2c92f6ab8759cf6b8cad2d6041cb49d4532234ba8ff2d323db583c7d48 SHA512 71531e7bd72a7fa063dd35536a346f15e3c0fd0284112fa2f304580204b93552bd0c9a426cee22044b5dd1662e34e5d191d20af938e474561fe55f2394e7519e
-EBUILD libghemical-3.0.0.ebuild 800 BLAKE2B 1c00f6b66879309854f444df1d54da654e63083d63778fa50255a40c5ace8a6e077a43fb5c122e4c19de9048a46e9ca95200e108d4864159a22f961aa444cbe0 SHA512 bd1cce3e5dd4f9b4c0e3225e5406da281426381a6e6924a8e6044d4735e1e200d2b4bae48dd14aef3688f53d5e4ffbf58898ac255ca81e46fa3a8c5c86272844
+EBUILD libghemical-3.0.0.ebuild 802 BLAKE2B 45cd825b442247105150a05a85a523372e0ed6d3525251d01115bc6c95b45282592939d06bcb57da7ef044f8d766dcc6ddf3990dcba3413d83381228b05a55d9 SHA512 c5e55d1ea0ddcbc7a896191850835e42c763f6dfc671d806fb80b80449f2d8900a5822e933a54e0e4099d46bf91bc4628db7dbefe51cd04a46ddc5bd29689420
 MISC metadata.xml 883 BLAKE2B 109edcd12ddc871c3cd31b8df7b0867f8d7bdad9b1945aa8025c170c479154c748c227e8e9393a09d21425b73642013581d49127a0cf1776653259917bef2ca8 SHA512 d42e03007ffe7714d44a4729c05096a840f9940ec6a82535967b19279b3c95d78b2373507786c8b6b4a702ceaa4ff0732481e56be64cfc916aeca7375ffc35b0
diff --git a/sci-libs/libghemical/libghemical-3.0.0.ebuild b/sci-libs/libghemical/libghemical-3.0.0.ebuild
index 6a3c64969ac5..de7e0299a0dc 100644
--- a/sci-libs/libghemical/libghemical-3.0.0.ebuild
+++ b/sci-libs/libghemical/libghemical-3.0.0.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
@@ -11,7 +11,7 @@ SRC_URI="http://www.bioinformatics.org/ghemical/download/current/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="mopac7 mpqc static-libs"
 
 RDEPEND="
@@ -22,7 +22,7 @@ RDEPEND="
 		virtual/lapack
 	)"
 DEPEND="${RDEPEND}
-		virtual/pkgconfig"
+	virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.98-gl.patch )
 
diff --git a/sci-libs/libnova/Manifest b/sci-libs/libnova/Manifest
index bcd9bb58abf9..0ec75fae22d3 100644
--- a/sci-libs/libnova/Manifest
+++ b/sci-libs/libnova/Manifest
@@ -1,8 +1,3 @@
-AUX libnova-0.12.1-configure.patch 331 BLAKE2B 5940e0d20aa6830d53f01e133e088d68a6b5cd10ac41f7b5b61ffbdcf3fe159c16f878a9e7d64844734eb218365c4bace2c2f947b217624573d54583d9a3060d SHA512 fda0ca74341894b544dcf4261bb2abb438dc26c7021c575e45bda0d8215a612a4b3f5456e0f115fd52cbe11c7f79a5cf0f2322bb5f85bd978fffa5c377858f02
-DIST libnova-0.12.3.tar.gz 1505676 BLAKE2B 96ece7030bcbfa831c6daa3ef02a1a9d100bd5145d881a9596e0a42ba1917dde007e79da95a433870957c526d0be65f8cb480b5633b0e9a5115a731688e79aea SHA512 e39c55c339dc2d7c899ffb7d0a898a5c2d6ebca5cf3a788db21d84f230a7379bfc0dd4736ed7ae66d8a449d1be9d68b8a4382ae55af4aa638bb734402c43bc72
-DIST libnova-0.14.0.tar.gz 1547373 BLAKE2B 75078d77868419e3cc6d6a7b5c513ebbf32062e4c08c54d5fa80d6e0f4d44eff8118b5d3df4b32d5e14e2f1b9eb989b154391a98eb79dcc83b2cf5f22bad67e6 SHA512 373d32e4f380563f895483d9054cf19bbfc69e32089f75dc91f84daf28610eba94f5615b0eb7004b25b9c702450d594463606b349b93dc9cde46d0d860029da7
 DIST libnova-0.15.0.tar.gz 1533794 BLAKE2B e87ffd3b8a895ca7ac9913ad3aacff526718442546df5687f2156718f721665ffff27e69af4bcb65bac5df1fda89fc6fc8fe9876a4b74392986771cf157dc48c SHA512 77ab0ccbfe462c03a21e88656cb4d6389994ea1da0ee8da997f19a83d24ad8fd9e505e70e1580b75332e826e5b7859b5f2af4417f65eb811440493ba586f2574
-EBUILD libnova-0.12.3.ebuild 1127 BLAKE2B 6203f62ea6219ab024501af2f5e641f922b129076f1d60fc8e6a62fc1d679ff27c4b635f644bcfa24669a088aa03a10aa2174cec0315155363646ddd014fbf36 SHA512 d6490764d1558afb0fc4eec5d473e198924e6f983d4439931475f9348427b742fb30a12d9d2a082902a28b042e416acf52c8ec711323f76df42d63e505446a35
-EBUILD libnova-0.14.0.ebuild 823 BLAKE2B a96161abf24de6ef882ed02d0103140b6272cbe31de519f071ffd0e753f4ebacbd4adcfeb7cadcd86014ae70e0242b5baeec127ff74fd1e821e28e02476e18af SHA512 b8867669b87e048a909ed22f1d0d1bc017bc99645e8e5cbfcca3601e78d9385d8c73f929ee7b983d84dbe684a3ee1d8e0b0d147f85428153ad807968c4278ff5
-EBUILD libnova-0.15.0.ebuild 883 BLAKE2B f8f05303c582298a9fb7c0d9862c3c85e10ff7a2797d1c81b14831b1e14074627a35a924dbd793f3a7921e2f75d4f4537ed4ca70a963f9a94bec1e73cb89fd45 SHA512 7eacc54f8b2dd3ef3b25e76b7a8650578ff56748636d73c7e13e25ca9a1fa587a1aff9b86d452a06d8cef52b323e591b027b9c6d589e512ef768ff188910f154
+EBUILD libnova-0.15.0.ebuild 979 BLAKE2B e93a6fcd3da8c34a69cea40881ea26340928c5a7c125c46eabcb50634f82aca8bf71fcf46b462ec7d6de3a9ce0baaa3583dc8b5515295c8610ac70ec5df20ed8 SHA512 683649b71c8decd8ed1341fcbda4785bf8285cd54d895703ce9206066c088983e4ee802ec26c545eff14a77ec13b706152c7cda076094bc9fad02dca42d86db3
 MISC metadata.xml 637 BLAKE2B dff43562550feffed3b305c3aa5473a1ea4256c10f1db163b8e7af9f751611525d0720d18eff17a64dd3cd0de1a441a912b79e86e43e307d50b439cb95ccc480 SHA512 f94be1667b076464ade40edbc7fdc3e73ee743c518e862df1277914826e91d9adc075d1a756e6a48a309bc32da384dfc17d5973f1e2b9e116d48cda697c5ece8
diff --git a/sci-libs/libnova/files/libnova-0.12.1-configure.patch b/sci-libs/libnova/files/libnova-0.12.1-configure.patch
deleted file mode 100644
index b87b27d75dc9..000000000000
--- a/sci-libs/libnova/files/libnova-0.12.1-configure.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.in.orig	2007-11-25 19:24:54.503391146 +0000
-+++ configure.in	2007-11-25 19:26:16.736077320 +0000
-@@ -54,7 +54,6 @@
- AC_STRUCT_TM
- 
- LIBS="$LIBS -lm"
--CFLAGS=-Wall
- 
- # Checks for header files.
- AC_HEADER_STDC
-@@ -74,5 +73,6 @@
- src/libnova/Makefile
- lntest/Makefile
- doc/Makefile
-+doc/doxyfile
- examples/Makefile
- ])
diff --git a/sci-libs/libnova/libnova-0.12.3.ebuild b/sci-libs/libnova/libnova-0.12.3.ebuild
deleted file mode 100644
index f531c830dbd5..000000000000
--- a/sci-libs/libnova/libnova-0.12.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils autotools flag-o-matic
-
-DESCRIPTION="Celestial Mechanics and Astronomical Calculation Library"
-HOMEPAGE="http://libnova.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE="doc examples"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.12.1-configure.patch
-	# 0.12.3 does not pass test with > -02
-	replace-flags -O? -O1
-	eautoreconf
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		cd doc
-		emake doc || die "emake in doc failed"
-	fi
-}
-
-src_test() {
-	emake check || die "emake check failed"
-	"${S}"/lntest/lntest || die "lntest failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die
-	if use doc; then
-		dohtml doc/html/* || die "dohtml failed"
-	fi
-	if use examples; then
-		make clean
-		rm -f examples/Makefile*
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die
-	fi
-}
diff --git a/sci-libs/libnova/libnova-0.14.0.ebuild b/sci-libs/libnova/libnova-0.14.0.ebuild
deleted file mode 100644
index 23a5867f38e0..000000000000
--- a/sci-libs/libnova/libnova-0.14.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Celestial Mechanics and Astronomical Calculation Library"
-HOMEPAGE="http://libnova.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~bicatali/${P}.tar.gz"
-# bad tar ball on sf, rebuild it from svn
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="doc examples static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_compile() {
-	emake
-	use doc && emake doc
-}
-
-src_install() {
-	default
-	use doc && dohtml doc/html/*
-	if use examples; then
-		make clean
-		rm -f examples/Makefile*
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/libnova/libnova-0.15.0.ebuild b/sci-libs/libnova/libnova-0.15.0.ebuild
index 5f190893d757..a0f7d8f6be46 100644
--- a/sci-libs/libnova/libnova-0.15.0.ebuild
+++ b/sci-libs/libnova/libnova-0.15.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="Celestial Mechanics and Astronomical Calculation Library"
 HOMEPAGE="http://libnova.sourceforge.net/"
@@ -12,29 +11,40 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND=""
 
 src_prepare() {
+	default
 	sed -i -e '/CFLAGS=-Wall/d' configure.in || die
-	autotools-utils_src_prepare
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
 }
 
 src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile -C doc doc
+	default
+	use doc && emake -C doc doc
 }
 
 src_install() {
-	autotools-utils_src_install
-	use doc && dohtml doc/html/*
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+
 	if use examples; then
-		make clean
-		rm examples/Makefile*
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+		emake clean
+		rm examples/Makefile* || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
 	fi
 }
diff --git a/sci-libs/suitesparseconfig/Manifest b/sci-libs/suitesparseconfig/Manifest
index 99e5debf36de..8eaec5b3f9ee 100644
--- a/sci-libs/suitesparseconfig/Manifest
+++ b/sci-libs/suitesparseconfig/Manifest
@@ -1,4 +1,3 @@
 DIST suitesparseconfig-4.2.1.tar.bz2 256308 BLAKE2B 74993d9a43117e9b71e21856c7b27d4aa6627c64a4235d7d37efa282a0a8e54fa8c6d6aea1cd447902ab8b18bfff1aa1e0d67a6b86d86c2feaf6a9f716ac2f0f SHA512 2363f8adb962d1f932b4390ac54e7203b5eec6005f9275dc155a4b178fd5259ddd42dc34c663a4c82546452c0f1e05619522567a69be1a58efc5d032b6d7a61d
-EBUILD suitesparseconfig-4.2.1-r1.ebuild 718 BLAKE2B 7b9d36db255c81a2eaa5e28e9e9426dc2a046427befcf66e48e9fcdd276ef1bdffa902301807b1bddb149ca169c5439b3cd4f1f151f423661e5d6d5276691ad4 SHA512 121e42d729d160a915d90e3cc05fdc33649137a35707db53b51e0ae81b8e097511a0eab62619e21a6e2a44e8a2786ed38a640b874ebd6231d80da99de12c91e6
-EBUILD suitesparseconfig-4.2.1.ebuild 506 BLAKE2B 5daf3bd70315230bc4dc322fd2c09a45689101857fee931f1d33e7b5de746351c3b134a516643acbfd9fbf47fa574e735d67ac58471b13d167bab56b8a87acb4 SHA512 fe09daebdfd04923666e391fba1517f44ae03db430056a93dc181c5bd2c3653e1bb56fdc3f682af0e6aedc627bc00bac06df2e5e30a6d75c7b2d7d095abd6233
+EBUILD suitesparseconfig-4.2.1-r1.ebuild 717 BLAKE2B 5f2f259053ed326cdbc3d81c595b478bd03c7b9572a18f7955d028ce644882afa069b2bea323e1412a99366efbbd662c5ae16af80fa0abe8a405b753ac6a2b0a SHA512 bbdffc49a61da602baae039a67d6807ca527cad7ff786b5cada1a999fc6dd7f4f2a4cd4cb8da1e82de135d1efb328859efca90ff6bdb7453046cb398caf6e873
 MISC metadata.xml 476 BLAKE2B f583e4dc6801797ee1572a38f1e4aaaac0811a709ce56a28d8e1f4f13f60f62a702b034809edc488d0b91920f8c5d40d48226213837d92a3e496cf65a6061c04 SHA512 fbbcd2de1d7b23e4eb45d8102fe76aa4251b83ce2b1fd7ef9cb599c7716ff662b8182060ce7b350ed3541b39483cf72c7c9ac810db1fe739f82406606412acb8
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
index a128d96ea42d..04632e4581ef 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 multilib_src_configure() {
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1.ebuild
deleted file mode 100644
index b17c23092e2c..000000000000
--- a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Common configurations for all packages in suitesparse"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/SuiteSparse_config"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"