From b24bd25253fe093f722ab576d29fdc41d04cb1ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Aug 2019 19:14:55 +0100 Subject: gentoo resync : 02.08.2019 --- sci-mathematics/yacas/Manifest | 5 +- .../yacas/files/yacas-1.7.0-desktop.patch | 26 +++++ .../yacas-1.7.0-use-bundled-not-external.patch | 112 +++++++++++++++++++++ sci-mathematics/yacas/yacas-1.7.0-r1.ebuild | 58 +++++++++++ sci-mathematics/yacas/yacas-1.7.0.ebuild | 53 ---------- 5 files changed, 200 insertions(+), 54 deletions(-) create mode 100644 sci-mathematics/yacas/files/yacas-1.7.0-desktop.patch create mode 100644 sci-mathematics/yacas/files/yacas-1.7.0-use-bundled-not-external.patch create mode 100644 sci-mathematics/yacas/yacas-1.7.0-r1.ebuild delete mode 100644 sci-mathematics/yacas/yacas-1.7.0.ebuild (limited to 'sci-mathematics/yacas') diff --git a/sci-mathematics/yacas/Manifest b/sci-mathematics/yacas/Manifest index 16ebd0696f42..46f1c9f094e7 100644 --- a/sci-mathematics/yacas/Manifest +++ b/sci-mathematics/yacas/Manifest @@ -1,4 +1,7 @@ +AUX yacas-1.7.0-desktop.patch 716 BLAKE2B da20f28d890f0b436ca796779bd78baf1e4bfc5d6d3db4732a16178b4a68bbdace9d0122bdeba6c79bac369b7742d5d3504623bbccf988ecd96a2d2ab1997d39 SHA512 62723fbd948108b0b1d21b9a18a96a5d381ceaa9f8564f6391e9de1a6beabff46e75b60737b56c0541970f216f3e5f0f6ace3fd8e5ecb1a7e3f68cc744527248 AUX yacas-1.7.0-gnuinstalldirs.patch 13706 BLAKE2B 67c024ecb5111ae0188140143c7d5a82119aac1aa653901dd787eb9a698828c46277aee2e15820e7902e8eb972b1011ab4a3250afb075734fd911257cecb70dd SHA512 5fdf24b613cccee2802f3047b80058d18fe707f82d94282d95d70c8f748a6f6ea75cf7760baf4b24ef29294038b2bc88c1975ee4516a5d953251f15f1f1f17f3 +AUX yacas-1.7.0-use-bundled-not-external.patch 7485 BLAKE2B 9f4653465fa7dcb21a915c67e138053296a8a0c446b198f1ab394c34223be3526b247a2de90a46bbc481d5cdeaac43711f979edada93fded89144ca21c4f34d8 SHA512 58e58aeae8a9b89ba7df18d3a9ed9168f4654d5501d3cc42ced9079c87b3177e7d57e9109729d57eb0441d9de40a5212573671bfd739916366957a3be659d3ba DIST yacas-1.7.0.tar.gz 2610016 BLAKE2B 62400d8aaba192a088bb48e0e12ff79e7e2d24af4825b2d53aeffa7aace011beb728118d56e5a9dd9e7dedba545706bbf77cb9ef27b5075e555fc5cc1983dc5e SHA512 6da7d454b3a74638d743c5e8168b27b9a8a71e2c41fe3f35bcb397fb80e866277ddb5b4e15167e2c0d11dd6033491ca72b560440fe2db6dc34b91b2ad047ca1d -EBUILD yacas-1.7.0.ebuild 1173 BLAKE2B 3e10f5485c9e3f4f13665c631b5ab4bd44f393032c02732fe11929afba007f2bc091781750970a463d48e7ad7725136666164cc7bc07ac1cf3764f242ace5f90 SHA512 161961ea7962aece553b93413660bc3e770d73942538a27aadd7faff24914e85177ebb4f7c54ceaced7955b6d600e39d162e0042b516afc107a76f527dbc0bb1 +DIST yacas-bundled-1.7.0.tar.xz 4940180 BLAKE2B e191f3806df0c15149df053c47b1f11a5113ee3b55cbc9a78bfaec058fb5d783e4157687bf4ee9a953bcd23a4e3e49a59e6743e4471e31209a9e24e03ddc8ff5 SHA512 a9c519d0721df69ec81998a3ec17043b59230f5b0650fc2fd6555eccb5503460f387433c019ae15bbd0fd3ff11e697d6da56a3d08aac5fadf4ff023ca5d8691c +EBUILD yacas-1.7.0-r1.ebuild 1389 BLAKE2B e46299ac3e3e7b79547173888dde4446846bb65298543d59b17eb32acdd81f9ef6fb68f2c63cac7faa60148ede3e559e89205b64bc8736a078a1d41e2f014116 SHA512 d3ac339c516b4ed4d09d88da840c73104236b07694285cec742cc7a322d87a866b164536e6c80b30217c98046b852ee6d2f84e3256638166f2735c8c635ecfd1 MISC metadata.xml 945 BLAKE2B 63739d4c7d0e8fc17f107f94585355ff2e2cd6e68718008e0c0af862b5d66cd1518e036a2ee1357584e849cf510b9cbfeca6d04c1a97fa3d42ddcdae36fb19d4 SHA512 926b90c3c18ecc5401b56ea8b09914b785575c78dbef8cdc928240e4a54c42146feabfcf9ea3eb91c131c2af6dc6471f08ce57994d0ff6fcfbf027432d70c999 diff --git a/sci-mathematics/yacas/files/yacas-1.7.0-desktop.patch b/sci-mathematics/yacas/files/yacas-1.7.0-desktop.patch new file mode 100644 index 000000000000..b1ad58468e63 --- /dev/null +++ b/sci-mathematics/yacas/files/yacas-1.7.0-desktop.patch @@ -0,0 +1,26 @@ +From ab5ba061c9beecb00064cb5698f1196d38cf0b6d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 24 Jul 2019 10:07:44 +0200 +Subject: [PATCH] Fix desktop icon name + +Signed-off-by: Andreas Sturmlechner +--- + 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-use-bundled-not-external.patch b/sci-mathematics/yacas/files/yacas-1.7.0-use-bundled-not-external.patch new file mode 100644 index 000000000000..f66a62987e45 --- /dev/null +++ b/sci-mathematics/yacas/files/yacas-1.7.0-use-bundled-not-external.patch @@ -0,0 +1,112 @@ +From deda267cd182e48c8af657c0d26dbeeb04879d6f Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +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 +--- + 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 new file mode 100644 index 000000000000..fdba42ce0213 --- /dev/null +++ b/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils 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" + +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-utils_src_configure +} diff --git a/sci-mathematics/yacas/yacas-1.7.0.ebuild b/sci-mathematics/yacas/yacas-1.7.0.ebuild deleted file mode 100644 index 4e3f18521f97..000000000000 --- a/sci-mathematics/yacas/yacas-1.7.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -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" - -LICENSE="GPL-2" -SLOT="0/1" -KEYWORDS="~amd64 ~x86" -IUSE="gui +jupyter static-libs 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" ) - -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-utils_src_configure -} -- cgit v1.2.3