sci-mathematics/yacas: drop 1.7.0-r1

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

5 files changed, 0 insertions, 418 deletions

diff --git a/sci-mathematics/yacas/Manifest b/sci-mathematics/yacas/Manifest
index 090855f8d1bc..7367e03346fe 100644
--- a/sci-mathematics/yacas/Manifest
+++ b/sci-mathematics/yacas/Manifest
@@ -1,3 +1 @@
-DIST yacas-1.7.0.tar.gz 2610016 BLAKE2B 62400d8aaba192a088bb48e0e12ff79e7e2d24af4825b2d53aeffa7aace011beb728118d56e5a9dd9e7dedba545706bbf77cb9ef27b5075e555fc5cc1983dc5e SHA512 6da7d454b3a74638d743c5e8168b27b9a8a71e2c41fe3f35bcb397fb80e866277ddb5b4e15167e2c0d11dd6033491ca72b560440fe2db6dc34b91b2ad047ca1d
 DIST yacas-1.9.1.tar.gz 38815043 BLAKE2B 09ec83591a9c11220f4e74ea07f1cad679cfef8c7a679c379f9bbc5708a70ccf9eb09a2ec6ca3fee7d76bc86082afcbd03e3d20df2e703dc579d93e94feee3e1 SHA512 1af1d7d490cf2d98fa861c476c7a7051a28535edc815f69a58edd2d96053332a8de7125017f18acbe2bf7b4eaf561cdf4e22d3c3f8e6656aaa3fbc46d0f633ef
-DIST yacas-bundled-1.7.0.tar.xz 4940180 BLAKE2B e191f3806df0c15149df053c47b1f11a5113ee3b55cbc9a78bfaec058fb5d783e4157687bf4ee9a953bcd23a4e3e49a59e6743e4471e31209a9e24e03ddc8ff5 SHA512 a9c519d0721df69ec81998a3ec17043b59230f5b0650fc2fd6555eccb5503460f387433c019ae15bbd0fd3ff11e697d6da56a3d08aac5fadf4ff023ca5d8691c
diff --git a/sci-mathematics/yacas/files/yacas-1.7.0-desktop.patch b/sci-mathematics/yacas/files/yacas-1.7.0-desktop.patch
deleted file mode 100644
index b1ad58468e63..000000000000
--- a/sci-mathematics/yacas/files/yacas-1.7.0-desktop.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ab5ba061c9beecb00064cb5698f1196d38cf0b6d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 24 Jul 2019 10:07:44 +0200
-Subject: [PATCH] Fix desktop icon name
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- cyacas/yacas-gui/yacas-gui.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cyacas/yacas-gui/yacas-gui.desktop b/cyacas/yacas-gui/yacas-gui.desktop
-index b7d44574..ab509a2c 100644
---- a/cyacas/yacas-gui/yacas-gui.desktop
-+++ b/cyacas/yacas-gui/yacas-gui.desktop
-@@ -2,7 +2,7 @@
- Name=yacas-gui
- Comment=Yacas GUI
- Exec=yacas-gui
--Icon=yacas_gui
-+Icon=yacas-gui
- Terminal=false
- Type=Application
- Categories=Science;Math
--- 
-2.22.0
-
diff --git a/sci-mathematics/yacas/files/yacas-1.7.0-gnuinstalldirs.patch b/sci-mathematics/yacas/files/yacas-1.7.0-gnuinstalldirs.patch
deleted file mode 100644
index 88e61dccbc53..000000000000
--- a/sci-mathematics/yacas/files/yacas-1.7.0-gnuinstalldirs.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From f1665438b617e312d96fbe771603424cbebeee4e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 16 Jul 2019 23:25:12 +0200
-Subject: [PATCH] Use GNUInstallDirs
-
----
- CMakeLists.txt                            |  5 +--
- cyacas/libyacas/CMakeLists.txt            |  8 +++--
- cyacas/libyacas_mp/CMakeLists.txt         |  8 +++--
- cyacas/yacas-gui/CMakeLists.txt           |  4 +--
- cyacas/yacas-gui/resources/CMakeLists.txt | 40 +++++++++++------------
- cyacas/yacas-kernel/CMakeLists.txt        |  2 +-
- cyacas/yacas/CMakeLists.txt               |  2 +-
- docs/CMakeLists.txt                       |  2 +-
- tests/CMakeLists.txt                      |  4 +--
- 9 files changed, 40 insertions(+), 35 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9982f519..596cec3c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,12 +30,13 @@ if (ENABLE_JYACAS)
-     set (LANGUAGES ${LANGUAGES} Java)
- endif ()
- 
--project (YACAS VERSION 1.7.0 LANGUAGES ${LANGUAGES})
-+project (yacas VERSION 1.7.0 LANGUAGES ${LANGUAGES})
- 
- set (CMAKE_CXX_STANDARD 17)
- set (CMAKE_CXX_STANDARD_REQUIRED ON)
- set (CMAKE_CXX_EXTENSIONS OFF)
- 
-+include (GNUInstallDirs)
- include (CTest)
- 
- set (YACAS_SCRIPTS
-@@ -251,7 +252,7 @@ set (YACAS_SCRIPTS
-     scripts/yacasinit.ys)
- 
- if (ENABLE_CYACAS)
--    install (DIRECTORY scripts/ DESTINATION share/yacas/scripts COMPONENT app)
-+    install (DIRECTORY scripts/ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/scripts COMPONENT app)
- endif ()
- 
- if (ENABLE_DOCS)
-diff --git a/cyacas/libyacas/CMakeLists.txt b/cyacas/libyacas/CMakeLists.txt
-index 14841f60..6839bb0a 100644
---- a/cyacas/libyacas/CMakeLists.txt
-+++ b/cyacas/libyacas/CMakeLists.txt
-@@ -94,9 +94,11 @@ set_target_properties (libyacas PROPERTIES OUTPUT_NAME "yacas")
- target_include_directories (libyacas PUBLIC include "${CMAKE_CURRENT_BINARY_DIR}/config")
- target_link_libraries (libyacas libyacas_mp)
- 
--install (TARGETS libyacas LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin COMPONENT app)
--install (DIRECTORY include/ DESTINATION include COMPONENT dev)
--install (FILES "${CMAKE_CURRENT_BINARY_DIR}/config/yacas/yacas_version.h" DESTINATION include/yacas COMPONENT dev)
-+install (TARGETS libyacas LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+                          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+                          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT app)
-+install (DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT dev)
-+install (FILES "${CMAKE_CURRENT_BINARY_DIR}/config/yacas/yacas_version.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/yacas COMPONENT dev)
- 
- # if (APPLE)
- #   add_library (libyacas_framework SHARED ${SOURCES} ${HEADERS})
-diff --git a/cyacas/libyacas_mp/CMakeLists.txt b/cyacas/libyacas_mp/CMakeLists.txt
-index 06a3fc9d..3ebabfe6 100644
---- a/cyacas/libyacas_mp/CMakeLists.txt
-+++ b/cyacas/libyacas_mp/CMakeLists.txt
-@@ -29,8 +29,10 @@ add_library (libyacas_mp ${SOURCES} ${HEADERS})
- set_target_properties (libyacas_mp PROPERTIES OUTPUT_NAME "yacas_mp")
- target_include_directories (libyacas_mp PUBLIC include)
- 
--install (TARGETS libyacas_mp LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin COMPONENT app)
--install (DIRECTORY include/ DESTINATION include COMPONENT dev)
-+install (TARGETS libyacas_mp LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+                             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+                             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT app)
-+install (DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT dev)
- 
- # if (APPLE)
- #   add_library (libyacas_mp_framework SHARED ${SOURCES} ${HEADERS})
-@@ -48,4 +50,4 @@ endif ()
- 
- if (ENABLE_CYACAS_UNIT_TESTS)
-     add_subdirectory (test)
--endif ()
-\ No newline at end of file
-+endif ()
-diff --git a/cyacas/yacas-gui/CMakeLists.txt b/cyacas/yacas-gui/CMakeLists.txt
-index 981de305..ed5550b7 100644
---- a/cyacas/yacas-gui/CMakeLists.txt
-+++ b/cyacas/yacas-gui/CMakeLists.txt
-@@ -121,11 +121,11 @@ add_subdirectory (resources)
- if (APPLE)
-     install (TARGETS yacas-gui BUNDLE DESTINATION ${CMAKE_INSTALL_BUNDLE_PREFIX})
- else ()
--    install (TARGETS yacas-gui DESTINATION bin)
-+    install (TARGETS yacas-gui DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif ()
- 
- if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
--    install (PROGRAMS yacas-gui.desktop PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ DESTINATION share/applications)
-+    install (PROGRAMS yacas-gui.desktop PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
- endif ()
- 
- if (WIN32)
-diff --git a/cyacas/yacas-gui/resources/CMakeLists.txt b/cyacas/yacas-gui/resources/CMakeLists.txt
-index dbdedcfa..a7d8d305 100644
---- a/cyacas/yacas-gui/resources/CMakeLists.txt
-+++ b/cyacas/yacas-gui/resources/CMakeLists.txt
-@@ -42,24 +42,24 @@ ExternalProject_Add (yacas-gui_delanuay
-     BUILD_COMMAND ""
-     INSTALL_COMMAND "")
- 
--install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_delanuay/delaunay.js DESTINATION share/yacas/resources/plot3d)
-+install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_delanuay/delaunay.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/plot3d)
- 
- if (NOT APPLE)
--    install (FILES plot3d/plot3d.js DESTINATION share/yacas/resources/plot3d)
--    install (DIRECTORY jquery DESTINATION share/yacas/resources)
--    install (DIRECTORY webchannel DESTINATION share/yacas/resources)
--    install (DIRECTORY mathbar DESTINATION share/yacas/resources)
--    install (DIRECTORY yacas_gui DESTINATION share/yacas/resources)
--    install (FILES yacas_gui.html DESTINATION share/yacas/resources)
--    install (DIRECTORY pixmaps DESTINATION share)
--    install (DIRECTORY icons DESTINATION share)
-+    install (FILES plot3d/plot3d.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/plot3d)
-+    install (DIRECTORY jquery DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources)
-+    install (DIRECTORY webchannel DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources)
-+    install (DIRECTORY mathbar DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources)
-+    install (DIRECTORY yacas_gui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources)
-+    install (FILES yacas_gui.html DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources)
-+    install (DIRECTORY pixmaps DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
-+    install (DIRECTORY icons DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
- 
--    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/lib DESTINATION share/yacas/resources/codemirror)
--    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/mode/yacas DESTINATION share/yacas/resources/codemirror/mode)
--    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/addon/edit DESTINATION share/yacas/resources/codemirror/addon)
--    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/addon/hint DESTINATION share/yacas/resources/codemirror/addon)
-+    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/lib DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror)
-+    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/mode/yacas DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/mode)
-+    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/addon/edit DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/addon)
-+    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/addon/hint DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/addon)
- 
--    install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_flot/jquery.flot.js ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_flot/jquery.flot.resize.js DESTINATION share/yacas/resources/flot)
-+    install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_flot/jquery.flot.js ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_flot/jquery.flot.resize.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/flot)
- 
-     install (FILES
-             ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/build/three.min.js
-@@ -68,12 +68,12 @@ if (NOT APPLE)
-             ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/renderers/CanvasRenderer.js
-             ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/renderers/Projector.js
-             ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/utils/SceneUtils.js
--            DESTINATION share/yacas/resources/three)
-+            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/three)
- 
--    install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_vis/dist/vis.min.css ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_vis/dist/vis.min.js DESTINATION share/yacas/resources/vis)
-+    install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_vis/dist/vis.min.css ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_vis/dist/vis.min.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/vis)
- 
--    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/otf DESTINATION share/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web)
--    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/woff DESTINATION share/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web)
--    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/TeX/otf DESTINATION share/yacas/resources/mathjax/fonts/HTML-CSS/TeX)
--    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/unpacked DESTINATION share/yacas/resources/mathjax)
-+    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/otf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web)
-+    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/woff DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web)
-+    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/TeX/otf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/TeX)
-+    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/unpacked DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax)
- endif ()
-diff --git a/cyacas/yacas-kernel/CMakeLists.txt b/cyacas/yacas-kernel/CMakeLists.txt
-index ae2c7298..1e6c4cf1 100644
---- a/cyacas/yacas-kernel/CMakeLists.txt
-+++ b/cyacas/yacas-kernel/CMakeLists.txt
-@@ -33,4 +33,4 @@ include_directories (include)
- add_executable (yacas-kernel src/main.cpp src/yacas_kernel.cpp src/yacas_engine.cpp src/hmac_sha256.cpp)
- target_link_libraries (yacas-kernel libyacas ${ZMQPP_LIBRARY} ${ZEROMQ_LIBRARY} ${JSONCPP_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ${Boost_LIBRARIES} pthread)
- 
--install (TARGETS yacas-kernel DESTINATION bin)
-\ No newline at end of file
-+install (TARGETS yacas-kernel DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/cyacas/yacas/CMakeLists.txt b/cyacas/yacas/CMakeLists.txt
-index 3bdc3563..5e97c0af 100644
---- a/cyacas/yacas/CMakeLists.txt
-+++ b/cyacas/yacas/CMakeLists.txt
-@@ -36,4 +36,4 @@ if (WIN32)
-   target_link_libraries (yacas wsock32 ws2_32 shlwapi)
- endif()
- 
--install (TARGETS yacas RUNTIME DESTINATION bin COMPONENT app)
-+install (TARGETS yacas RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT app)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 869cd57c..f69d9740 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -38,6 +38,6 @@ add_custom_target(yacas_docs ALL
-     COMMENT "Building HTML documentation with Sphinx")
- 
- install (DIRECTORY "${SPHINX_SINGLEHTML_DIR}"
--         DESTINATION share/yacas/documentation
-+         DESTINATION ${CMAKE_INSTALL_DOCDIR}
-          COMPONENT doc
-          PATTERN ".buildinfo" EXCLUDE)
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 55ba67ef..9bb9c0e2 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -55,8 +55,8 @@ set (YACAS_TESTS
-   transforms.yts)
- 
- 
--install (FILES ${YACAS_TESTS} DESTINATION share/yacas/tests COMPONENT app)
--install (PROGRAMS ${TEST_YACAS_CMD} DESTINATION share/yacas/tests COMPONENT app)
-+install (FILES ${YACAS_TESTS} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/tests COMPONENT app)
-+install (PROGRAMS ${TEST_YACAS_CMD} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/tests COMPONENT app)
- 
- if (ENABLE_CYACAS_CONSOLE)
-     foreach (_test ${YACAS_TESTS})
--- 
-2.22.0
-
diff --git a/sci-mathematics/yacas/files/yacas-1.7.0-use-bundled-not-external.patch b/sci-mathematics/yacas/files/yacas-1.7.0-use-bundled-not-external.patch
deleted file mode 100644
index f66a62987e45..000000000000
--- a/sci-mathematics/yacas/files/yacas-1.7.0-use-bundled-not-external.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From deda267cd182e48c8af657c0d26dbeeb04879d6f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 24 Jul 2019 09:58:58 +0200
-Subject: [PATCH] Install bundled files from repacked tarball, disable external
- downloads
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- cyacas/yacas-gui/resources/CMakeLists.txt | 77 +++++------------------
- 1 file changed, 17 insertions(+), 60 deletions(-)
-
-diff --git a/cyacas/yacas-gui/resources/CMakeLists.txt b/cyacas/yacas-gui/resources/CMakeLists.txt
-index ca3bf32..bae7076 100644
---- a/cyacas/yacas-gui/resources/CMakeLists.txt
-+++ b/cyacas/yacas-gui/resources/CMakeLists.txt
-@@ -1,49 +1,6 @@
- include (ExternalProject)
- 
--ExternalProject_Add (yacas-gui_codemirror
--    PREFIX external_packages
--    URL https://github.com/codemirror/CodeMirror/archive/5.35.0.zip
--    CONFIGURE_COMMAND npm install --no-progress
--    BUILD_IN_SOURCE 1
--    BUILD_COMMAND npm run-script build
--    INSTALL_COMMAND "")
--
--ExternalProject_Add (yacas-gui_flot
--    PREFIX external_packages
--    URL https://github.com/flot/flot/archive/v0.8.3.zip
--    CONFIGURE_COMMAND ""
--    BUILD_COMMAND ""
--    INSTALL_COMMAND "")
--
--ExternalProject_Add (yacas-gui_three
--    PREFIX external_packages
--    URL https://github.com/mrdoob/three.js/archive/r90.zip
--    CONFIGURE_COMMAND ""
--    BUILD_COMMAND ""
--    INSTALL_COMMAND "")
--
--ExternalProject_Add (yacas-gui_vis
--    PREFIX external_packages
--    URL https://github.com/almende/vis/archive/v4.21.0.zip
--    CONFIGURE_COMMAND ""
--    BUILD_COMMAND ""
--    INSTALL_COMMAND "")
--
--ExternalProject_Add (yacas-gui_mathjax
--    PREFIX external_packages
--    URL https://github.com/mathjax/MathJax/archive/2.7.3.zip
--    CONFIGURE_COMMAND ""
--    BUILD_COMMAND ""
--    INSTALL_COMMAND "")
--
--ExternalProject_Add (yacas-gui_delanuay
--    PREFIX external_packages
--    URL https://github.com/ironwallaby/delaunay/archive/1.0.1.zip
--    CONFIGURE_COMMAND ""
--    BUILD_COMMAND ""
--    INSTALL_COMMAND "")
--
--install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_delanuay/delaunay.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/plot3d)
-+install (FILES yacas-gui_delanuay/delaunay.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/plot3d)
- 
- if (NOT APPLE)
-     install (FILES plot3d/plot3d.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/plot3d)
-@@ -55,26 +12,26 @@ if (NOT APPLE)
-     install (DIRECTORY pixmaps DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
-     install (DIRECTORY icons DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
- 
--    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/lib DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror)
--    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/mode/yacas DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/mode)
--    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/addon/edit DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/addon)
--    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/addon/hint DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/addon)
-+    install (DIRECTORY yacas-gui_codemirror/lib DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror)
-+    install (DIRECTORY yacas-gui_codemirror/mode/yacas DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/mode)
-+    install (DIRECTORY yacas-gui_codemirror/addon/edit DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/addon)
-+    install (DIRECTORY yacas-gui_codemirror/addon/hint DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/addon)
- 
--    install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_flot/jquery.flot.js ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_flot/jquery.flot.resize.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/flot)
-+    install (FILES yacas-gui_flot/jquery.flot.js yacas-gui_flot/jquery.flot.resize.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/flot)
- 
-     install (FILES
--            ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/build/three.min.js
--            ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/Detector.js
--            ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/controls/TrackballControls.js
--            ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/renderers/CanvasRenderer.js
--            ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/renderers/Projector.js
--            ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/utils/SceneUtils.js
-+            yacas-gui_three/build/three.min.js
-+            yacas-gui_three/examples/js/Detector.js
-+            yacas-gui_three/examples/js/controls/TrackballControls.js
-+            yacas-gui_three/examples/js/renderers/CanvasRenderer.js
-+            yacas-gui_three/examples/js/renderers/Projector.js
-+            yacas-gui_three/examples/js/utils/SceneUtils.js
-             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/three)
- 
--    install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_vis/dist/vis.min.css ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_vis/dist/vis.min.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/vis)
-+    install (FILES yacas-gui_vis/dist/vis.min.css yacas-gui_vis/dist/vis.min.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/vis)
- 
--    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/otf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web)
--    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/woff DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web)
--    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/TeX/otf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/TeX)
--    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/unpacked DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax)
-+    install (DIRECTORY yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/otf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web)
-+    install (DIRECTORY yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/woff DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web)
-+    install (DIRECTORY yacas-gui_mathjax/fonts/HTML-CSS/TeX/otf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/TeX)
-+    install (DIRECTORY yacas-gui_mathjax/unpacked DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax)
- endif ()
--- 
-2.22.0
-
diff --git a/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild b/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild
deleted file mode 100644
index 5848e44b18fd..000000000000
--- a/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop
-
-DESCRIPTION="General purpose computer algebra system"
-HOMEPAGE="http://www.yacas.org/"
-SRC_URI="https://codeload.github.com/grzegorzmazur/${PN}/tar.gz/v${PV} -> ${P}.tar.gz
-gui? ( https://dev.gentoo.org/~asturm/distfiles/${PN}-bundled-${PV}.tar.xz )"
-
-LICENSE="GPL-2 gui? ( MIT Apache-2.0 OFL-1.1 )"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="gui +jupyter static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	gui? (
-		dev-qt/qtcore:5[icu]
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwebengine:5[widgets]
-		dev-qt/qtwidgets:5
-	)
-	jupyter? (
-		dev-libs/boost:=
-		dev-libs/jsoncpp:=
-		dev-libs/openssl:0=
-		dev-python/jupyter
-		net-libs/zeromq
-		>=net-libs/zmqpp-4.1.2
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gnuinstalldirs.patch"
-	"${FILESDIR}/${P}-desktop.patch"
-	"${FILESDIR}/${P}-use-bundled-not-external.patch" # bug 690534
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CYACAS_BENCHMARKS=OFF
-		-DENABLE_DOCS=OFF # requires sphinxcontrib-bibtex
-		-DENABLE_JYACAS=OFF # requires manual install
-		-DENABLE_CYACAS_GUI=$(usex gui)
-		-DENABLE_CYACAS_KERNEL=$(usex jupyter)
-		-DENABLE_CYACAS_UNIT_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}