gentoo resync : 02.08.2019

10 files changed, 16 insertions, 728 deletions

diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 22e4ccc853f0..e1de506801e1 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,20 +1,10 @@
-AUX sundials-2.7.0-underlinking-libdir.patch 19659 BLAKE2B 9dab5796e7f64528df06a435433719bbd34f6f9868ab6d88ec59e32777c4513c995bebe3f4e32b91cfb000328c6ae307a1c29cd34acd21cd9485668c3783b991 SHA512 95bc36d359b672b725391d75540304fac6b2610960f67a636cf5656e30904a2ed309a75175f4d20b9199d70d45fa817e53e86433ff18dfcf28ef76840b9d0dba
-AUX sundials-3.1.2-fix-license-install-path.patch 388 BLAKE2B f4d1e6eacc87c0978b3311bb24876db5ff77d0e0c2e6a369746a7320c0279ec4c46cf359fa81677c0eda63d28e37f5d283dea9809ff0c5126e4386addabab63e SHA512 9a675e33d93a8c1c6500d6297e362abdf4d81d56575175eb05c8b51a9d1f993406cd8fcb80a5d7be68d9578db11233f0857ae74bba2df96a7a95691fde51222d
 AUX sundials-3.2.1-fix-license-install-path.patch 335 BLAKE2B ac9a2c33fabf13cb55876f39836006b1b145395311800bd052f5e0784b7926fab4ffd4abf2bb0047d69fbd5feccdec026bf7f7c115fb4f130c8419c6e8986dcb SHA512 7ac45a8932a273330fcf6fecb355cbbcf83038240fd06db6e20eb54a51a137266d033c7fe513f73b72e252509b0105d4de48fffedb4adff2ce8e5187e26b7ac3
-AUX sundials-4.0.2-fix-license-install-path.patch 320 BLAKE2B 59274a4354f1a9bf6424e0eba19fdd8e01ec97f505c0439d4aff409c842d8052520938abe35652012ddd040625c77c0fd62a00f706a42c06ba7ec7dcafa58050 SHA512 714ff9c373991ebec9917ff68244af11ddd152f46c6286d45b8bcbfa08f7ca85e3de6f2f77733a44f845024dcd8c21f7acad705950ecead914ddab16167fe2dc
-AUX sundials-4.1.0-fix-license-install-path.patch 320 BLAKE2B 954793b037653c8cadd5a35a0cdec7c90a1c2cb5a0b584f974d2aa0888a605b502e684949b17431a2278dc28f3bb77b654b8a38574dca385234692b8577dc15b SHA512 5945e9a21748368b8004a4f768409c1b6de2da0d61198ecdc7cfcc0cff8a5b6c1536fcb5558fc8dbe79dd01107cf2d629d0823e57583f652f2d82c3182437476
-DIST sundials-2.7.0.tar.gz 12258093 BLAKE2B 331fcf255f2bb8bcc798818b05db114feda7aacb6585177a836f17a9b58477f504099b4a33c7d71cab6e70eeb6fe47a76d101c08aa6219ee6fbac630524d5928 SHA512 c86c167538065a4109b36ae7c8f60f3d92184133cfa661b5acfccee052c38f40be865412a1746bb57907b61602c212c0f15e1e30ef29e8a49db6d46a75a28e69
-DIST sundials-3.0.0.tar.gz 12996039 BLAKE2B 0557190f6f7550bd4d7d3df10f727c6f235ff4917f2cfd35ca77785037edc43236a82383664f6fe1579bb5b07a148875b82b22f5a9e4f5f2a0607838e8a3b286 SHA512 3c86c7f27e64c2e6732546b0b1e87ea092502e361cae09b3b7eb29795c978edf494e17be13b78541dc91cc0709d928006bd0fc62ea968f2b621efa51856cdd60
-DIST sundials-3.1.0.tar.gz 13033516 BLAKE2B 41294c1022ab09db6fbfa0d41c169d2ead3483693653a9c0cc26fdffec61918fed5e93241f64f9bfdc6ff22812fb846f3ea8deecd82c28d179dded85ec2c69ba SHA512 288427e00f58c512583cc14d81385e82b0fdeaa4e9adca588a108ad0752341b7be62c9fa2740924ec733e3e0d5794f305dc582fc72e244e675e5ea00ac0d08ca
-DIST sundials-3.1.2.tar.gz 18212893 BLAKE2B cee897f59920d6530553e4005b043fe615bf86ed6cc4ecb829afc25ea46c1a37cefd5a05584bd763af29689980d7bb03442ad22c4b83dd3af2406e786540652a SHA512 b65989998b440b2b5c5d000f4b86d8bcbf03215fcee4e348cd4b8ff935ea3471a3593ab8bd0e7d5f8ba519b5a1285cc93d41ec622d0b51592d7593c7579af082
+AUX sundials-4.0.2-fix-license-install-path.patch 479 BLAKE2B d77b43b2d30978dce198f51917286b208cc1baccb4230a2eaf9f1e656a23e1b1980bf7c86a4a4bd16a5210b16083aec4e05b316af5a42f6a64631a843d79f7f9 SHA512 99baa802dd367159a82c57997421aad938b52babf3c2444957f46fe9affcd57e9524a6ef0fecdf3ef973e95a032f3dec37487794e397e45db515db01af2893dd
+AUX sundials-4.1.0-fix-license-install-path.patch 479 BLAKE2B c87cf483663f970aba2352e6831fcce7ead9ec7ce3c9a8e451e47481b0c663d698df98ffc62bbc9b6e6117188fcf1272a491b9df1a77d4acadf0625dbcdf2d26 SHA512 a8fa64f8d16e09b86b08910b395f17f2bfdcd82667b789a85bef87591ecdb9b0f01630f9dd65e7892f36261d3ef42ce12c95e980be29669dd74cc6469bd4ea87
 DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
 DIST sundials-4.0.2.tar.gz 17183377 BLAKE2B e322a978186f41d84a936faa55962ef6794bf99d6c6a108bfa2bd5615f27f32f7ab6ca4989802fa052d3132b53dca3069b7e4ec9941f95efb92de7bf0792dd88 SHA512 6d0a6fc49c695e70593da71892f0906585dee9c94899bb6b8c9a56c85f345809565166a62544647fdac411d22e37276b9b1bb78ba9be46eaeb28dcd3f6162ef5
 DIST sundials-4.1.0.tar.gz 17221960 BLAKE2B 598c7adc9e37fcfb1f44a3235f58af489ad907d053cb67ee0d3b076076621958374eb847e48318ddf7ced85a7601c5330ac640c7abe8723aaee7d650e3298b8d SHA512 1922dca3f0b8869098670aede802e48abec39607c96304e4efd9b03d195b16920175846fce10641aeebc48c216bda73c8691139dce57ffa7731a6bc8194b81b0
-EBUILD sundials-2.7.0.ebuild 2065 BLAKE2B 54faae8f12f0594f7fb97a5bcaadfad2851872d9371e151bd64b5b350ee46d3bcbee8b203770f1ca538d7a7bcdb55dd23db5d457ac5ec52da078e3bdb2e011f3 SHA512 38671b242ca205636353097386b2f185cdcc9448aef1c7fe3d8f1977f4877274202708a6c89ddfc7bf8cc17e4609a5d107456364150f7a8fb67c3a3a62c67742
-EBUILD sundials-3.0.0.ebuild 2253 BLAKE2B e546ea8f864ac81002528ab329f820d9ad10ecc57625a5110f4b97152901b5b3da8191d44299f85ac95b7e9a1c036c5de8c7a3ef5c46647611a48f8fd9f995e3 SHA512 1e4e9db8640c3d29a8001c088de40f8feba6ce3bda6d76d20d462ea1d7f84213bc644c8499ec99a8125618d180202de010003f819c98b21833c3b4538f976100
-EBUILD sundials-3.1.0.ebuild 2227 BLAKE2B 88fbb7206514de8b715e641585507f5cd662676ddadd0bfbad91539e770823456e5412a7e9620f425c8651a226cfa53bbb6bc3f8c56b523454863916de521a25 SHA512 22db26dd50955f3fe6debbe7fcaba20e54bfed4427f64d5b8ebc337f3f6ba240434c18381dc9abdf336ea30dfc011a346fc8d7cd7f0d88da638ba7a6f45ed50c
-EBUILD sundials-3.1.2.ebuild 2277 BLAKE2B 70f0f03abd27d68479491239dec51534472e77e8da5e83ccf9684612eb0993bbb7eb8a227dd34088c1a988b0287ba421ac767517040d7d4fe9a6e298e2791cc8 SHA512 d39a91985d42808f6514d755e5d94e0650e90e11193afa8b39b677015f914fcc8d5ca2d4460027feb4333da18ff928b6a0308f37bc36ac6fefc63f011de4456f
 EBUILD sundials-3.2.1.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
 EBUILD sundials-4.0.2.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
 EBUILD sundials-4.1.0.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
-MISC metadata.xml 1063 BLAKE2B 9fcc89ceb3553bf23a0f1074eaca3a76707ddcd7cdbce253c6710e2db8422fff558a0e761fe93eb00bf385bd6f30fcb53decc5323c425c609f419be92855799a SHA512 d81c64ac7241460ebc7bcd61f1b398ef55a1e9b5a5a9bb0ede400bfe06889d2db781c43853bf33069510f2461140ab8b7a47a4553cdafca64c1ed7bd0f16d742
+MISC metadata.xml 1059 BLAKE2B 48ccadfac9b7ea4203334ffdadaa76ab3164273835c727e76085db3a5afc179404eb21c74aad77ceb368397377afb0efa27d798c849eab2ffc35153cd4fe7588 SHA512 47da8b9edc993c480a045642ad2746ff6180e54e1ad368823fd81b0d217e72c31394d7575cb4c2d5e5cfea065dffb01751bc8b1088f0f1a6feaaea15c2c7fb8f
diff --git a/sci-libs/sundials/files/sundials-2.7.0-underlinking-libdir.patch b/sci-libs/sundials/files/sundials-2.7.0-underlinking-libdir.patch
deleted file mode 100644
index db47ac3b350d..000000000000
--- a/sci-libs/sundials/files/sundials-2.7.0-underlinking-libdir.patch
+++ /dev/null
@@ -1,395 +0,0 @@
-diff -Nur sundials-2.7.0.orig/src/arkode/CMakeLists.txt sundials-2.7.0/src/arkode/CMakeLists.txt
---- sundials-2.7.0.orig/src/arkode/CMakeLists.txt	2016-09-26 22:16:52.000000000 +0000
-+++ sundials-2.7.0/src/arkode/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -127,7 +127,7 @@
-     PROPERTIES OUTPUT_NAME sundials_arkode CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the ARKODE library
--  INSTALL(TARGETS sundials_arkode_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_arkode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -146,8 +146,10 @@
-   SET_TARGET_PROPERTIES(sundials_arkode_shared
-     PROPERTIES VERSION ${arkodelib_VERSION} SOVERSION ${arkodelib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_arkode_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+
-   # Install the ARKODE library
--  INSTALL(TARGETS sundials_arkode_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_arkode_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/arkode/fcmix/CMakeLists.txt sundials-2.7.0/src/arkode/fcmix/CMakeLists.txt
---- sundials-2.7.0.orig/src/arkode/fcmix/CMakeLists.txt	2016-09-26 22:16:52.000000000 +0000
-+++ sundials-2.7.0/src/arkode/fcmix/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -70,7 +70,7 @@
-   PROPERTIES OUTPUT_NAME sundials_farkode CLEAN_DIRECT_OUTPUT 1)
- 
- # Install the FARKODE library
--INSTALL(TARGETS sundials_farkode_static DESTINATION lib)
-+INSTALL(TARGETS sundials_farkode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- #
- MESSAGE(STATUS "Added ARKODE FCMIX module")
-diff -Nur sundials-2.7.0.orig/src/cvode/CMakeLists.txt sundials-2.7.0/src/cvode/CMakeLists.txt
---- sundials-2.7.0.orig/src/cvode/CMakeLists.txt	2016-09-26 22:17:07.000000000 +0000
-+++ sundials-2.7.0/src/cvode/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -134,7 +134,7 @@
-     PROPERTIES OUTPUT_NAME sundials_cvode CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the CVODE library
--  INSTALL(TARGETS sundials_cvode_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_cvode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -153,8 +153,10 @@
-   SET_TARGET_PROPERTIES(sundials_cvode_shared
-     PROPERTIES VERSION ${cvodelib_VERSION} SOVERSION ${cvodelib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_cvode_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+
-   # Install the CVODE library
--  INSTALL(TARGETS sundials_cvode_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_cvode_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/cvode/fcmix/CMakeLists.txt sundials-2.7.0/src/cvode/fcmix/CMakeLists.txt
---- sundials-2.7.0.orig/src/cvode/fcmix/CMakeLists.txt	2016-09-26 22:17:07.000000000 +0000
-+++ sundials-2.7.0/src/cvode/fcmix/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -57,7 +57,7 @@
-   PROPERTIES OUTPUT_NAME sundials_fcvode CLEAN_DIRECT_OUTPUT 1)
- 
- # Install the FCVODE library
--INSTALL(TARGETS sundials_fcvode_static DESTINATION lib)
-+INSTALL(TARGETS sundials_fcvode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- #
- MESSAGE(STATUS "Added CVODE FCMIX module")
-diff -Nur sundials-2.7.0.orig/src/cvodes/CMakeLists.txt sundials-2.7.0/src/cvodes/CMakeLists.txt
---- sundials-2.7.0.orig/src/cvodes/CMakeLists.txt	2016-09-26 22:17:15.000000000 +0000
-+++ sundials-2.7.0/src/cvodes/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -121,7 +121,7 @@
-     PROPERTIES OUTPUT_NAME sundials_cvodes CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the CVODES library
--  INSTALL(TARGETS sundials_cvodes_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_cvodes_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -140,8 +140,9 @@
-   SET_TARGET_PROPERTIES(sundials_cvodes_shared
-     PROPERTIES VERSION ${cvodeslib_VERSION} SOVERSION ${cvodeslib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_cvodes_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-   # Install the CVODES library
--  INSTALL(TARGETS sundials_cvodes_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_cvodes_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/ida/CMakeLists.txt sundials-2.7.0/src/ida/CMakeLists.txt
---- sundials-2.7.0.orig/src/ida/CMakeLists.txt	2016-09-26 22:17:26.000000000 +0000
-+++ sundials-2.7.0/src/ida/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -124,7 +124,7 @@
-     PROPERTIES OUTPUT_NAME sundials_ida CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the IDA library
--  INSTALL(TARGETS sundials_ida_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_ida_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -143,8 +143,10 @@
-   SET_TARGET_PROPERTIES(sundials_ida_shared
-     PROPERTIES VERSION ${idalib_VERSION} SOVERSION ${idalib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_ida_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+  
-   # Install the IDA library
--  INSTALL(TARGETS sundials_ida_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_ida_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/ida/fcmix/CMakeLists.txt sundials-2.7.0/src/ida/fcmix/CMakeLists.txt
---- sundials-2.7.0.orig/src/ida/fcmix/CMakeLists.txt	2016-09-26 22:17:26.000000000 +0000
-+++ sundials-2.7.0/src/ida/fcmix/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -56,6 +56,6 @@
-   PROPERTIES OUTPUT_NAME sundials_fida CLEAN_DIRECT_OUTPUT 1)
- 
- # Install the FIDA library
--INSTALL(TARGETS sundials_fida_static DESTINATION lib)
-+INSTALL(TARGETS sundials_fida_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- #
- MESSAGE(STATUS "Added IDA FCMIX module")
-diff -Nur sundials-2.7.0.orig/src/idas/CMakeLists.txt sundials-2.7.0/src/idas/CMakeLists.txt
---- sundials-2.7.0.orig/src/idas/CMakeLists.txt	2016-09-26 22:17:32.000000000 +0000
-+++ sundials-2.7.0/src/idas/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -126,7 +126,7 @@
-     PROPERTIES OUTPUT_NAME sundials_idas CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the IDA library
--  INSTALL(TARGETS sundials_idas_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_idas_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -145,8 +145,10 @@
-   SET_TARGET_PROPERTIES(sundials_idas_shared
-     PROPERTIES VERSION ${idaslib_VERSION} SOVERSION ${idaslib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_idas_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+  
-   # Install the IDAS library
--  INSTALL(TARGETS sundials_idas_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_idas_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/kinsol/CMakeLists.txt sundials-2.7.0/src/kinsol/CMakeLists.txt
---- sundials-2.7.0.orig/src/kinsol/CMakeLists.txt	2016-09-26 22:17:39.000000000 +0000
-+++ sundials-2.7.0/src/kinsol/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -134,7 +134,7 @@
-     PROPERTIES OUTPUT_NAME sundials_kinsol CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the KINSOL library
--  INSTALL(TARGETS sundials_kinsol_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_kinsol_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -153,8 +153,10 @@
-   SET_TARGET_PROPERTIES(sundials_kinsol_shared
-     PROPERTIES VERSION ${kinsollib_VERSION} SOVERSION ${kinsollib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_kinsol_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+  
-   # Install the KINSOL library
--  INSTALL(TARGETS sundials_kinsol_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_kinsol_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/kinsol/fcmix/CMakeLists.txt sundials-2.7.0/src/kinsol/fcmix/CMakeLists.txt
---- sundials-2.7.0.orig/src/kinsol/fcmix/CMakeLists.txt	2016-09-26 22:17:39.000000000 +0000
-+++ sundials-2.7.0/src/kinsol/fcmix/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -54,7 +54,7 @@
-   PROPERTIES OUTPUT_NAME sundials_fkinsol CLEAN_DIRECT_OUTPUT 1)
- 
- # Install the FKINSOL library
--INSTALL(TARGETS sundials_fkinsol_static DESTINATION lib)
-+INSTALL(TARGETS sundials_fkinsol_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- #
- MESSAGE(STATUS "Added KINSOL FCMIX module")
-diff -Nur sundials-2.7.0.orig/src/nvec_openmp/CMakeLists.txt sundials-2.7.0/src/nvec_openmp/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_openmp/CMakeLists.txt	2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_openmp/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -51,7 +51,7 @@
-   ADD_LIBRARY(sundials_nvecopenmp_static STATIC ${nvecopenmp_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecopenmp_static
-     PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecopenmp_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecopenmp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -65,7 +65,8 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecopenmp_shared
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecopenmp_shared DESTINATION lib)
-+  TARGET_LINK_LIBRARIES(sundials_nvecopenmp_shared -lm)
-+  INSTALL(TARGETS sundials_nvecopenmp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECOPENMP header files
-@@ -78,7 +79,7 @@
-     ADD_LIBRARY(sundials_fnvecopenmp_static STATIC ${fnvecopenmp_SOURCES})
-     SET_TARGET_PROPERTIES(sundials_fnvecopenmp_static
-       PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
--    INSTALL(TARGETS sundials_fnvecopenmp_static DESTINATION lib)
-+    INSTALL(TARGETS sundials_fnvecopenmp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_STATIC_LIBS)
-   IF(BUILD_SHARED_LIBS)
-     ADD_LIBRARY(sundials_fnvecopenmp_shared ${fnvecopenmp_SOURCES})
-@@ -86,7 +87,8 @@
-       PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
-     SET_TARGET_PROPERTIES(sundials_fnvecopenmp_shared 
-       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--    INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION lib)
-+    TARGET_LINK_LIBRARIES(sundials_fnvecopenmp_shared -lm)
-+    INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND F77_FOUND)
- 
-diff -Nur sundials-2.7.0.orig/src/nvec_par/CMakeLists.txt sundials-2.7.0/src/nvec_par/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_par/CMakeLists.txt	2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_par/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -52,7 +52,7 @@
-   ADD_LIBRARY(sundials_nvecparallel_static STATIC ${nvecparallel_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecparallel_static
-     PROPERTIES OUTPUT_NAME sundials_nvecparallel CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecparallel_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecparallel_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -66,7 +66,8 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecparallel CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecparallel_shared 
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecparallel_shared DESTINATION lib)
-+  TARGET_LINK_LIBRARIES(sundials_nvecparallel_shared -lm)
-+  INSTALL(TARGETS sundials_nvecparallel_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECPARALLEL header files
-@@ -79,7 +80,7 @@
-     ADD_LIBRARY(sundials_fnvecparallel_static STATIC ${fnvecparallel_SOURCES})
-     SET_TARGET_PROPERTIES(sundials_fnvecparallel_static
-       PROPERTIES OUTPUT_NAME sundials_fnvecparallel CLEAN_DIRECT_OUTPUT 1)
--    INSTALL(TARGETS sundials_fnvecparallel_static DESTINATION lib)
-+    INSTALL(TARGETS sundials_fnvecparallel_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_STATIC_LIBS)
-   IF(BUILD_SHARED_LIBS)
-     ADD_LIBRARY(sundials_fnvecparallel_shared SHARED ${fnvecparallel_SOURCES})
-@@ -87,7 +88,7 @@
-       PROPERTIES OUTPUT_NAME sundials_fnvecparallel CLEAN_DIRECT_OUTPUT 1)
-     SET_TARGET_PROPERTIES(sundials_fnvecparallel_shared
-       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--    INSTALL(TARGETS sundials_fnvecparallel_shared DESTINATION lib)
-+    INSTALL(TARGETS sundials_fnvecparallel_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND MPIF_FOUND)
- #
-diff -Nur sundials-2.7.0.orig/src/nvec_parhyp/CMakeLists.txt sundials-2.7.0/src/nvec_parhyp/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_parhyp/CMakeLists.txt	2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_parhyp/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -53,7 +53,7 @@
-   ADD_LIBRARY(sundials_nvecparhyp_static STATIC ${nvecparhyp_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecparhyp_static
-     PROPERTIES OUTPUT_NAME sundials_nvecparhyp CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecparhyp_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecparhyp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -67,7 +67,7 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecparhyp CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecparhyp_shared 
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecparhyp_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecparhyp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECPARHYP header files
-diff -Nur sundials-2.7.0.orig/src/nvec_petsc/CMakeLists.txt sundials-2.7.0/src/nvec_petsc/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_petsc/CMakeLists.txt	2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_petsc/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -53,7 +53,7 @@
-   ADD_LIBRARY(sundials_nvecpetsc_static STATIC ${nvecpetsc_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecpetsc_static
-     PROPERTIES OUTPUT_NAME sundials_nvecpetsc CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecpetsc_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecpetsc_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -67,7 +67,7 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecpetsc CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecpetsc_shared 
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecpetsc_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecpetsc_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECPARHYP header files
-diff -Nur sundials-2.7.0.orig/src/nvec_pthreads/CMakeLists.txt sundials-2.7.0/src/nvec_pthreads/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_pthreads/CMakeLists.txt	2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_pthreads/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -44,7 +44,7 @@
-   ADD_LIBRARY(sundials_nvecpthreads_static STATIC ${nvecpthreads_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecpthreads_static
-     PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecpthreads_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecpthreads_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -58,7 +58,8 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecpthreads_shared
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION lib)
-+  TARGET_LINK_LIBRARIES(sundials_nvecpthreads_shared -lm -lpthread)
-+  INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECPTHREADS header files
-@@ -71,7 +72,7 @@
-     ADD_LIBRARY(sundials_fnvecpthreads_static STATIC ${fnvecpthreads_SOURCES})
-     SET_TARGET_PROPERTIES(sundials_fnvecpthreads_static
-       PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
--    INSTALL(TARGETS sundials_fnvecpthreads_static DESTINATION lib)
-+    INSTALL(TARGETS sundials_fnvecpthreads_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_STATIC_LIBS)
-   IF(BUILD_SHARED_LIBS)
-     ADD_LIBRARY(sundials_fnvecpthreads_shared ${fnvecpthreads_SOURCES})
-@@ -79,7 +80,8 @@
-       PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
-     SET_TARGET_PROPERTIES(sundials_fnvecpthreads_shared 
-       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--    INSTALL(TARGETS sundials_fnvecpthreads_shared DESTINATION lib)
-+    TARGET_LINK_LIBRARIES(sundials_fnvecpthreads_shared -lm -lpthread)
-+    INSTALL(TARGETS sundials_fnvecpthreads_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND F77_FOUND)
- 
-diff -Nur sundials-2.7.0.orig/src/nvec_ser/CMakeLists.txt sundials-2.7.0/src/nvec_ser/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_ser/CMakeLists.txt	2016-09-26 22:16:49.000000000 +0000
-+++ sundials-2.7.0/src/nvec_ser/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -44,7 +44,7 @@
-   ADD_LIBRARY(sundials_nvecserial_static STATIC ${nvecserial_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecserial_static
-     PROPERTIES OUTPUT_NAME sundials_nvecserial CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecserial_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecserial_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -58,7 +58,8 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecserial CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecserial_shared
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecserial_shared DESTINATION lib)
-+  TARGET_LINK_LIBRARIES(sundials_nvecserial_shared -lm)
-+  INSTALL(TARGETS sundials_nvecserial_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECSERIAL header files
-@@ -71,7 +72,7 @@
-     ADD_LIBRARY(sundials_fnvecserial_static STATIC ${fnvecserial_SOURCES})
-     SET_TARGET_PROPERTIES(sundials_fnvecserial_static
-       PROPERTIES OUTPUT_NAME sundials_fnvecserial CLEAN_DIRECT_OUTPUT 1)
--    INSTALL(TARGETS sundials_fnvecserial_static DESTINATION lib)
-+    INSTALL(TARGETS sundials_fnvecserial_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_STATIC_LIBS)
-   IF(BUILD_SHARED_LIBS)
-     ADD_LIBRARY(sundials_fnvecserial_shared ${fnvecserial_SOURCES})
-@@ -79,7 +80,8 @@
-       PROPERTIES OUTPUT_NAME sundials_fnvecserial CLEAN_DIRECT_OUTPUT 1)
-     SET_TARGET_PROPERTIES(sundials_fnvecserial_shared 
-       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--    INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION lib)
-+    TARGET_LINK_LIBRARIES(sundials_fnvecserial_shared -lm)
-+    INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND F77_FOUND)
- 
diff --git a/sci-libs/sundials/files/sundials-3.1.2-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-3.1.2-fix-license-install-path.patch
deleted file mode 100644
index 188e29999fca..000000000000
--- a/sci-libs/sundials/files/sundials-3.1.2-fix-license-install-path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ru sundials-3.1.2.orig/CMakeLists.txt sundials-3.1.2/CMakeLists.txt
---- sundials-3.1.2.orig/CMakeLists.txt	2018-07-31 17:25:19.000000000 -0000
-+++ sundials-3.1.2/CMakeLists.txt	2019-04-17 12:18:58.894563957 -0000
-@@ -1629,4 +1629,4 @@
- # install license file
- INSTALL(
-   FILES ${PROJECT_SOURCE_DIR}/LICENSE
--  DESTINATION include/sundials)
-+  DESTINATION share/doc/sundials-3.1.2)
diff --git a/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch
index 97cc6f715c4e..fbcf53c410cf 100644
--- a/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch
+++ b/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch
@@ -1,7 +1,12 @@
 diff -Nur old/CMakeLists.txt new/CMakeLists.txt
 --- old/CMakeLists.txt	2019-01-23 01:05:44.000000000 +0300
 +++ new/CMakeLists.txt	2019-06-23 00:35:57.000000000 +0300
-@@ -1214,6 +1214,6 @@
+@@ -1210,10 +1210,10 @@
+ # install license and notice files
+ INSTALL(
+   FILES ${PROJECT_SOURCE_DIR}/LICENSE
+-  DESTINATION include/sundials
++  DESTINATION share/doc/sundials-4.0.2
    )
  INSTALL(
    FILES ${PROJECT_SOURCE_DIR}/NOTICE
diff --git a/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch
index 72b5f5915c87..6eb75ce59cff 100644
--- a/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch
+++ b/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch
@@ -1,7 +1,12 @@
 diff -Nur old/CMakeLists.txt new/CMakeLists.txt
 --- old/CMakeLists.txt	2019-02-12 21:50:51.000000000 +0300
 +++ new/CMakeLists.txt	2019-06-23 00:39:23.000000000 +0300
-@@ -1172,6 +1172,6 @@
+@@ -1168,10 +1168,10 @@
+ # install license and notice files
+ INSTALL(
+   FILES ${PROJECT_SOURCE_DIR}/LICENSE
+-  DESTINATION include/sundials
++  DESTINATION share/doc/sundials-4.1.0
    )
  INSTALL(
    FILES ${PROJECT_SOURCE_DIR}/NOTICE
diff --git a/sci-libs/sundials/metadata.xml b/sci-libs/sundials/metadata.xml
index b4735cc5086b..a817ac12febc 100644
--- a/sci-libs/sundials/metadata.xml
+++ b/sci-libs/sundials/metadata.xml
@@ -17,6 +17,6 @@
   <use>
     <flag name="hypre">Build with <pkg>sci-libs/hypre</pkg> conditioners</flag>
     <flag name="sparse">Enable support for <pkg>sci-libs/klu</pkg> sparse solver</flag>
-    <flag name="superlumt">Build with <pkg>sci-libs/superlu_mt</pkg></flag>    
+    <flag name="superlumt">Build with <pkg>sci-libs/superlu_mt</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/sci-libs/sundials/sundials-2.7.0.ebuild b/sci-libs/sundials/sundials-2.7.0.ebuild
deleted file mode 100644
index 3b5df344e82c..000000000000
--- a/sci-libs/sundials/sundials-2.7.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2 versionator
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(get_major_version)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-underlinking-libdir.patch )
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DHYPRE_LIBRARY="HYPRE"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="superlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-	cd src
-	for r in */README; do
-		newdoc ${r} README-${r%/*}
-	done
-}
diff --git a/sci-libs/sundials/sundials-3.0.0.ebuild b/sci-libs/sundials/sundials-3.0.0.ebuild
deleted file mode 100644
index 5be731414779..000000000000
--- a/sci-libs/sundials/sundials-3.0.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2 versionator
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(get_major_version)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( )
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DHYPRE_LIBRARY="HYPRE"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="superlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-	cd src
-	for r in */README; do
-		newdoc ${r} README-${r%/*}
-	done
-
-	# Use a sledgehammer, patching the buildsystem is too annoyoing (the
-	# CMake build systems consists of 2000 "lib" DESTINATIONS...)
-	if [[ lib != $(get_libdir) ]]; then
-		mv "${ED%/}"/usr/lib "${ED%/}"/usr/$(get_libdir) || die
-	fi
-}
diff --git a/sci-libs/sundials/sundials-3.1.0.ebuild b/sci-libs/sundials/sundials-3.1.0.ebuild
deleted file mode 100644
index 6285504725e0..000000000000
--- a/sci-libs/sundials/sundials-3.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2 versionator
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(get_major_version)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( )
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="superlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-	cd src
-	for r in */README; do
-		newdoc ${r} README-${r%/*}
-	done
-
-	# Use a sledgehammer, patching the buildsystem is too annoyoing (the
-	# CMake build systems consists of 2000 "lib" DESTINATIONS...)
-	if [[ lib != $(get_libdir) ]]; then
-		mv "${ED%/}"/usr/lib "${ED%/}"/usr/$(get_libdir) || die
-	fi
-}
diff --git a/sci-libs/sundials/sundials-3.1.2.ebuild b/sci-libs/sundials/sundials-3.1.2.ebuild
deleted file mode 100644
index e5ad2325ff83..000000000000
--- a/sci-libs/sundials/sundials-3.1.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2 versionator
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(get_major_version)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="superlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-	cd src
-	for r in */README; do
-		newdoc ${r} README-${r%/*}
-	done
-
-	# Use a sledgehammer, patching the buildsystem is too annoyoing (the
-	# CMake build systems consists of 2000 "lib" DESTINATIONS...)
-	if [[ lib != $(get_libdir) ]]; then
-		mv "${ED%/}"/usr/lib "${ED%/}"/usr/$(get_libdir) || die
-	fi
-}