From 2808be9288546424bc5e88a39631a6835e6bd388 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 25 Mar 2024 01:00:59 +0000 Subject: gentoo auto-resync : 25:03:2024 - 01:00:59 --- sci-libs/Manifest.gz | Bin 45153 -> 45146 bytes sci-libs/gmsh/Manifest | 4 - sci-libs/gmsh/gmsh-4.10.3-r1.ebuild | 117 -------- sci-libs/gmsh/gmsh-4.9.5-r3.ebuild | 81 ------ sci-libs/mathgl/Manifest | 3 - sci-libs/mathgl/mathgl-2.4.4-r1.ebuild | 159 ----------- sci-libs/metis/Manifest | 5 - sci-libs/metis/files/metis-5.1.0-multilib.patch | 20 -- .../metis/files/metis-5.1.0-remove-GKlib-O3.patch | 11 - .../metis/files/metis-5.1.0-shared-GKlib.patch | 21 -- sci-libs/metis/metis-5.1.0-r5.ebuild | 79 ------ sci-libs/plplot/Manifest | 8 - .../files/plplot-5.15.0-QPainterPath-include.patch | 10 - .../files/plplot-5.15.0-configure-clang16.patch | 18 -- sci-libs/plplot/files/plplot-5.15.0-ieee.patch | 19 -- .../plplot/files/plplot-5.15.0-multiarch.patch | 56 ---- .../plplot/files/plplot-5.15.0-ocaml-rpath.patch | 166 ----------- sci-libs/plplot/files/plplot-5.15.0-ocaml.patch | 43 --- sci-libs/plplot/files/plplot-5.9.6-python.patch | 13 - sci-libs/plplot/plplot-5.15.0-r105.ebuild | 302 --------------------- 20 files changed, 1135 deletions(-) delete mode 100644 sci-libs/gmsh/gmsh-4.10.3-r1.ebuild delete mode 100644 sci-libs/gmsh/gmsh-4.9.5-r3.ebuild delete mode 100644 sci-libs/mathgl/mathgl-2.4.4-r1.ebuild delete mode 100644 sci-libs/metis/files/metis-5.1.0-multilib.patch delete mode 100644 sci-libs/metis/files/metis-5.1.0-remove-GKlib-O3.patch delete mode 100644 sci-libs/metis/files/metis-5.1.0-shared-GKlib.patch delete mode 100644 sci-libs/metis/metis-5.1.0-r5.ebuild delete mode 100644 sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch delete mode 100644 sci-libs/plplot/files/plplot-5.15.0-configure-clang16.patch delete mode 100644 sci-libs/plplot/files/plplot-5.15.0-ieee.patch delete mode 100644 sci-libs/plplot/files/plplot-5.15.0-multiarch.patch delete mode 100644 sci-libs/plplot/files/plplot-5.15.0-ocaml-rpath.patch delete mode 100644 sci-libs/plplot/files/plplot-5.15.0-ocaml.patch delete mode 100644 sci-libs/plplot/files/plplot-5.9.6-python.patch delete mode 100644 sci-libs/plplot/plplot-5.15.0-r105.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index 9a481c841a90..6f3c539b8b3b 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest index 80baa00df4eb..9b85755491eb 100644 --- a/sci-libs/gmsh/Manifest +++ b/sci-libs/gmsh/Manifest @@ -1,10 +1,6 @@ AUX gmsh-4.11.1-metis-5-2.patch 827 BLAKE2B c7a5660ef3b163ae05fc3453ff76ac2ab7e2a4a438baae99075152912e12568f2b116739f7042809692654b4adf2d515dfdd63a70944437e0a5a2edf7cfdee5f SHA512 6f1223eab6ee123cc3b3b058796c4f07084f25026937ca8711dc4040728f711294a4d1187a2047e3ef6ea29ce9bf7a264a3eb8d1596a96061be4d0767ff3f343 AUX gmsh-4.11.1_gcc13_fix_cstdint_include.patch 925 BLAKE2B 538287bb96f17b2e526b17c2e478732e82bde56a5cb1c74b9c55c7dff9cc63d1fe8ec345c4a06cef2370b76a9445271049df01bf4491f76b99f4a1c9f11e6c6c SHA512 22b08fd2937a416ce71aadda9570d2f9afeed5df6fadebc1504c84b61bf8da8b1015ad6ced0450da09a4b4026eca0cb0c34ddc0626a18652f0cb4a2c6553d9fa AUX gmsh-4.9.5-opencascade.patch 1136 BLAKE2B 3613e9a19c76c107eec2090a0a12474d94ac1d548cf6b5137644e3a7834c12a9a8c6dc63d217b8473c385b2ea5bd1ea3d9699e61cbc897bf7cdd121ba00bdff2 SHA512 3774335121ae1d7b4a2369b36e1dab84e9b08eb6336ad1ed6893e0b2260402cb750e202f0244d61c8772d809dd31d95adfb19d8deee5255185c968838e495cd5 -DIST gmsh-4.10.3-source.tgz 14994941 BLAKE2B b9229f81fc8daabdb3b3db3acd50a0a0e602fec1423bc67a0033a02217c908910eeb1f9bd1cbc57fe2d24b566f256b969fe92e9e9ceefe4cd5af34dd07cf1a9e SHA512 863c5a7fe13095afad37b4450855b2079d034222b5a595fc25b2b0d840d8ef63ceafbbf56ea642b3c3e9277faabe08a2cc19a7a3126a8e12e9d4117243244653 DIST gmsh-4.11.1-source.tgz 17985611 BLAKE2B 087664cfbfec758eaa3740a65920ccf673dbcc97a1ef8010222da64b8c586334ed1a77904e94061bdf34e714aae34311ee4f6fb38740473046f99ad6c1e0984c SHA512 8f2a71d6db80dd6bacde6dc1ccd120c7f83609dd69a84a910455a21a43b7392cd7e0e7b4d37aaa6a1b1cbfdb816646cd4828d2ac6d784edba072167280432e4c -DIST gmsh-4.9.5-source.tgz 14921704 BLAKE2B e805bd786154bf6ce8bebb2d2c38204a88d06a251c45fbe6dd37641a15e02291993c244f26a01faad2a6445a4852274e5481d4236b7a3d9b7ee65fc863f1b880 SHA512 4da61bdf03fb9466af80ac790e83c8888bab755c78d860d601474d7ebca220ac51cba620db310165021412dbecc1cf187ccdff47b8a78e0579339bb72cfa6484 -EBUILD gmsh-4.10.3-r1.ebuild 2712 BLAKE2B 6a494b4a9f7dda8b722666dc0ea1d85f070cbae22c0eb5ef598ce4f0771df7c91bcc3e87463f9caf59a59500cc4975507e21f13a1abad8938831069b4cb4bfa9 SHA512 028603a4d81b96ce6366441fdbc1f958d49b7dacfdad4a02f26febcee0f08810d0e33684bfa353b01fc890b10f24dd991f59670cf0309bd8950770a3d2b8d498 EBUILD gmsh-4.11.1-r1.ebuild 3105 BLAKE2B b0cf9466bf77b8f37d6168d35e7deac9ff25bbfddf60de6323a01e8ba8738a35c1548f98fb018fd73b2469ed946ee38c18a67a0872c5b746ede3f5ec95f05c78 SHA512 0e26c29dd213a88809da95575bd4b924c31d4c7d9963149db42b3bfa6c8deed9e39083a8299507ed7d437d02abade33423243ebf068a461ea73b4f320b4afe42 -EBUILD gmsh-4.9.5-r3.ebuild 1986 BLAKE2B 0a1c36092ffc0dad040456a245e878f1ddbfd6c3e9da395e74f23cf8b82df9b44c2deaa3c3f81cae7d5f3120a13deec7a4a5a451158c1c2823dd4ae295a77996 SHA512 8aef2e98af50d2b5bc6c8af08ec7addb8a333f3e590e7ebc794d9cb761eef4b18932bab327744d48e6414d2888996f119fa9d015027259adb9e0d7625a7a96ff MISC metadata.xml 1271 BLAKE2B 7ea0644b5ffb89478ba859f0bbd33fa5fcc8ebb57e64f2ca6ccba8123e23b4a7a44626d5fb1bd416d99071557652b247e90cc05b11d50bdded732f41f2acc524 SHA512 013798cf979fcb7fb954490970abdfc6ebbe23e8263a22cf8791af21f593aa46b7348e7673fa7fa318ce3cb8436c2d58435911984b40be3dafda40253ebcc71c diff --git a/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild b/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild deleted file mode 100644 index 83ebb5ce37b9..000000000000 --- a/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake fortran-2 python-any-r1 toolchain-funcs - -DESCRIPTION="Three-dimensional finite element mesh generator" -HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh" -SRC_URI="https://gmsh.info/src/${P}-source.tgz" -S="${WORKDIR}/${P}-source" - -LICENSE=" - GPL-2+ free-noncomm - alglib? ( MIT ) - gmm? ( LGPL-2.1+ ) - metis? ( Apache-2.0 ) - netgen? ( LGPL-2.1+ ) - voro? ( BSD ) -" -SLOT="0" -KEYWORDS="~amd64 ~x86" -## cgns is not compiling ATM, maybe fix cgns lib first -IUSE="+alglib +blas cgns eigen examples +gmm jpeg med metis mpi mumps netgen opencascade petsc pdf png python shared slepc X voro zlib" - -REQUIRED_USE=" - ^^ ( blas eigen ) - mumps? ( blas ) - slepc? ( petsc ) - " - -RDEPEND=" - virtual/fortran - X? ( x11-libs/fltk:1[xft] ) - alglib? ( sci-libs/alglib ) - blas? ( - virtual/blas - virtual/lapack - sci-libs/fftw:3.0 - ) - cgns? ( - sci-libs/cgnslib - sci-libs/hdf5[mpi=] - ) - eigen? ( dev-cpp/eigen ) - gmm? ( sci-mathematics/gmm ) - jpeg? ( media-libs/libjpeg-turbo ) - med? ( - sci-libs/med[mpi=] - sci-libs/hdf5[mpi=] - ) - metis? ( lang/install.m || die - # fix desktop file - sed -i -e 's/.png//' udav/udav.desktop || die - # prevent sandbox violation - sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die - sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - use wxwidgets && setup-wxwidgets unicode - - local mycmakeargs=() - if use hdf; then - mycmakeargs+=( - -DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include" - ) - fi - mycmakeargs+=( - # No clue about this option: - # option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'") - -DMathGL_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" - -Denable-all-docs=$(usex doc) - -Denable-fltk=$(usex fltk) - -Denable-gif=$(usex gif) - -Denable-glut=$(usex glut) - -Denable-gsl=$(usex gsl) - -Denable-hdf4=$(usex hdf) - -Denable-hdf5=$(usex hdf5) - -Denable-jpeg=$(usex jpeg) - -Denable-mpi=$(usex mpi) - -Denable-octave=$(usex octave) - -Denable-opengl=$(usex opengl) - -Denable-openmp=$(usex openmp) - -Denable-pdf=$(usex pdf) - -Denable-png=$(usex png) - -Denable-qt4=OFF - -Denable-qt5=$(usex qt5) - -Denable-qt5asqt=$(usex qt5) - -Denable-pthread=$(usex threads) - -Denable-pthr-widget=$(usex threads) - -Denable-python=OFF - -Denable-wx=$(usex wxwidgets) - -Denable-zlib=$(usex zlib) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - dodoc README* *.txt AUTHORS - if ! use static-libs; then - rm "${ED}"/usr/$(get_libdir)/*.a || die - fi - if use qt5 ; then - local lang - insinto /usr/share/udav - for lang in ${LANGS} ; do - use l10n_${lang} && doins udav/udav_${lang}.qm - done - fi - if use octave ; then - insinto /usr/share/${PN}/octave - doins "${CMAKE_BUILD_DIR}"/lang/${PN}.tar.gz - fi -} - -pkg_postinst() { - if use octave; then - octave <<-EOF - pkg install ${EROOT}/usr/share/${PN}/octave/${PN}.tar.gz - EOF - fi -} - -pkg_prerm() { - if use octave; then - octave <<-EOF - pkg uninstall ${PN} - EOF - fi -} diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest index 0f14ec5b2c19..8a4b4aa9edfa 100644 --- a/sci-libs/metis/Manifest +++ b/sci-libs/metis/Manifest @@ -1,11 +1,6 @@ -AUX metis-5.1.0-multilib.patch 579 BLAKE2B 3e9edf7809a43026bfc7a320b1ff37f2e00a04dbdbcb8c3acb62016d8c41b4e68301ab3053fa1fb0fcb2a6bf3b48818175fdbf4b4fe2a23c0b4cb814d512f092 SHA512 5aa179b6de17ac24eb25ddc9377b5adea7b794405ba332de23096daac9231ab5c603268a24ad9219b3a9c598b9cdad33082f31a2cdc957b784d09d92e50f4941 -AUX metis-5.1.0-remove-GKlib-O3.patch 267 BLAKE2B ef39556238377c12a311685ca96188f8b4c3db1398b55941d273592ff40cad49d3ec5c7606177edacad25af4684d9ae65dacaa9a7ca9ad957d326b874b87f3cf SHA512 8b4f4eb0753063e64533e0101b9e78bf2a711e6b2d080607ab06025ad681788225abe7555db28edee00a98ba41badc41341bb3cec2bd654fc738d63d78867968 -AUX metis-5.1.0-shared-GKlib.patch 590 BLAKE2B 63a10fd00f21cff949660c598fa4519432559965c72f31c35d2a726dbbdfb9d2591c99e92c9520c2021e8ce0c485aa9834445e9f5dfe388f93106e49eee562af SHA512 3157e364f56661c7bc896016b2cda83658f2b00fe7c936e732e80e366ccf6421a1ab6f95d5a74fdb790f4ec8789d048aab9d68b0ccf1eb03f94621f78adb1a3a AUX metis-5.2.1-add-gklib-as-required.patch 413 BLAKE2B 6949eaa302236c3a6a94d7c0e5062781114998e5aab6c0d970c6d72b45ab1fe4e2ec7e2ac44469ba9a1910511095f05455a52d255ea05928fda7bf981034e982 SHA512 e27a54e5a6135c8b338cfc7ae93934db41f61a60ea1075e5c2b42f699b4749027023f56127889848f708b3699b3f6404c7db89da166ef13da5aa3338c6274dbb AUX metis-5.2.1-multilib.patch 603 BLAKE2B aa988f804f6dfdba9ccff7a8b6929c2551273d7c8d1303feef5a7310632a4af78380f3e9d0024fb9fa0cdbb7952db7c09919ab54e323d5282a7b844e3708bfad SHA512 d89a7ba0cba8df805fd6a97f8fa8df354e9af441133d2417ec9a16afaa3666937712fefd2e83dcfb0e93a6a9f17d1123cc84501b3d21e45e93169915a9d1d7bb AUX metis-5.2.1-respect-user-flags.patch 1258 BLAKE2B aadf0612d276228bc0fc116534a523337f0e6330195ab5b66dc0954ee8ceb98e3c9e5f849dbd234fa6b1a5d8ca0f284b1099711bbc8bd53f8be41ee347f362e9 SHA512 c7b6f6e7db0c0a2bccdfa9fef8addcab67f79fd05609375defe432ac05d54a8d4da50b4ee35d873dd04d05e2d251cfcc7a6b1e0fbbdb8d39af2385833d86a778 -DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25 DIST metis-5.2.1.tar.gz 4838377 BLAKE2B 7f2bb3b4dce71cd05e25d042095c311f814d5d197b1a6ae19994b6bcbb7d948d3a96210cbce5633f39d7bb8ad7cc3f8f4977c6465ec8591934aac00ea9637c94 SHA512 69127b7a777f9ba14cf399a7122000af9d6094a5f44be600a28384cfc0495c024fb0c6eab37c4473a5763ec1077cd9f30d9bcbb3c952462f6c9ead31c6b9e790 -EBUILD metis-5.1.0-r5.ebuild 1829 BLAKE2B 34c689ef43ee52bb0c13d654daf6f44d436c4edf845f6b02d57f21e200dbee5444a4ba788c41a9b937703b9f8532f70d4b56fc9ed9c0cede37825695c51f0a5e SHA512 aad2f154fc7ef7ebe6f0061b7c74c422ec588a6a7df5cdd5ce207930c211a27bfc533e2083130642110a3164b41097bd8a0aa32d8a130b6e5b6f3f28a756cc9f EBUILD metis-5.2.1-r2.ebuild 2215 BLAKE2B 085f884a768fbc18516a051c722e6c341bd089bbfd2375fcf8601df5fac0f89dd11adfac204b0153c9a5eb9d4a2bf175e567d4d6cc0a95f2106c7fca96c4630c SHA512 1d7a64240c92574024277ba2d93cb8ca8874f48ecd23a6c9ee0e00beb76888209e7fbb77e5d41ea7bf6e200c14569f839c4348ab669342a9ceff51ad1ddd52e0 MISC metadata.xml 947 BLAKE2B 9687c616dd1c8684be3fc1022671560ac5ff752514cbced0a3bb1bfc70348ecdb72c4913e65720a70f03609a1277c5a697e5985fb0cb8032d60e5c24f9b16674 SHA512 efa12e77a7af2803d0626eefc85aaaa5b2594fdfc748c8ad870590f65ae40ec7e557fa923707f327b8bb04036b57a67a036fed52ff9159af1fe65c062165408f diff --git a/sci-libs/metis/files/metis-5.1.0-multilib.patch b/sci-libs/metis/files/metis-5.1.0-multilib.patch deleted file mode 100644 index 9e72c5b1b2d3..000000000000 --- a/sci-libs/metis/files/metis-5.1.0-multilib.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/libmetis/CMakeLists.txt -+++ b/libmetis/CMakeLists.txt -@@ -4,13 +4,14 @@ - file(GLOB metis_sources *.c) - # Build libmetis. - add_library(metis ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources}) -+set_target_properties(metis PROPERTIES SOVERSION 0) - if(UNIX) - target_link_libraries(metis m) - endif() - - if(METIS_INSTALL) - install(TARGETS metis -- LIBRARY DESTINATION lib -- RUNTIME DESTINATION lib -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ RUNTIME DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) - endif() diff --git a/sci-libs/metis/files/metis-5.1.0-remove-GKlib-O3.patch b/sci-libs/metis/files/metis-5.1.0-remove-GKlib-O3.patch deleted file mode 100644 index 507395867fcc..000000000000 --- a/sci-libs/metis/files/metis-5.1.0-remove-GKlib-O3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/GKlib/GKlibSystem.cmake -+++ b/GKlib/GKlibSystem.cmake -@@ -20,7 +20,7 @@ - elseif(MINGW) - set(GKlib_COPTS "-DUSE_GKREGEX") - else() -- set(GKlib_COPTS "-O3") -+ set(GKlib_COPTS "") - set(GKlib_COPTIONS "-DLINUX -D_FILE_OFFSET_BITS=64") - endif(MSVC) - if(CYGWIN) diff --git a/sci-libs/metis/files/metis-5.1.0-shared-GKlib.patch b/sci-libs/metis/files/metis-5.1.0-shared-GKlib.patch deleted file mode 100644 index 483820164638..000000000000 --- a/sci-libs/metis/files/metis-5.1.0-shared-GKlib.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/GKlib/CMakeLists.txt -+++ b/GKlib/CMakeLists.txt -@@ -7,7 +7,7 @@ - include(GKlibSystem.cmake) - - include_directories(".") --add_library(GKlib STATIC ${GKlib_sources}) -+add_library(GKlib SHARED ${GKlib_sources}) - if(UNIX) - target_link_libraries(GKlib m) - endif(UNIX) -@@ -16,6 +16,6 @@ - add_subdirectory("test") - - install(TARGETS GKlib -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib) --install(FILES ${GKlib_includes} DESTINATION include) -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} -+ LIBRARY DESTINATION lib${LIB_SUFFIX}) -+install(FILES ${GKlib_includes} DESTINATION include/metis) diff --git a/sci-libs/metis/metis-5.1.0-r5.ebuild b/sci-libs/metis/metis-5.1.0-r5.ebuild deleted file mode 100644 index 71b30fa92596..000000000000 --- a/sci-libs/metis/metis-5.1.0-r5.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="A package for unstructured serial graph partitioning" -HOMEPAGE="http://glaros.dtc.umn.edu/gkhome/metis/metis/overview" -SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc double-precision examples int64 openmp" - -RDEPEND="!> "${T}"/metis.pc <<- EOF || die - prefix=${EPREFIX}/usr - exec_prefix=\${prefix} - libdir=\${exec_prefix}/$(get_libdir) - includedir=\${prefix}/include - - Name: METIS - Description: Software for partioning unstructured graphes and meshes - Version: ${PV} - Cflags: -I\${includedir}/metis - Libs: -L\${libdir} -lmetis - EOF - insinto /usr/$(get_libdir)/pkgconfig - doins "${T}"/metis.pc -} diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest index f463621d1d03..92af40eb9f10 100644 --- a/sci-libs/plplot/Manifest +++ b/sci-libs/plplot/Manifest @@ -1,13 +1,5 @@ AUX plplot-5.12.0-safe-string.patch 791 BLAKE2B 8a3b37dd236d3086fe0780dd0e10d670884f706b4e6164980d8197de1a3f49fc0ef2ee15cd9f499c50b14a454bf62a6d6aee1512522ab5a3fe16c8fb93fc042f SHA512 c531a57ef2203c01f5d44f0bd1edc5101c740986987e454019fe42f4905dbd9b5f13ad93e91e3c73c95c320e9128ac4696021e258dc523fc9f5559348eda9129 -AUX plplot-5.15.0-QPainterPath-include.patch 190 BLAKE2B 097e21f0a5a8c5d941f95f089529762d080fb18880f607b00e8c0a33ebb37ef2efa1be025274a2d7ad1cca5590f060560c7679424cb5f2c572de919f9a168ea8 SHA512 52d656294fe75ebf28102575e191a4e43f0cba0b1d39826bb3eabd3044d83c00dd1a774d3df3de4eea6fba7af8138842352f76218cb9fdceb444be487c9f14f6 -AUX plplot-5.15.0-configure-clang16.patch 512 BLAKE2B 44dc699eaec802f143c0659736b9f87d7430b3a13f672549c6b55da62c4b3eb117efdc6132386589bcb2c889a4c3544ec92479db5aff764e61284b327047f4d4 SHA512 5fdec8150d3ee50ab086b0c49ef0ae754fe0c2129444b1bc435b7f3b64c04195b83bceb3ae8cedc92d1231c50f1322cd035a6f5c516e5386b0dd486808b5bf3a -AUX plplot-5.15.0-ieee.patch 1243 BLAKE2B 291274ae674f3471fdf081619c2b8e14caec490b391413e52bc8b424f596757297b48b9af09647196adc3069f81750652d05d8da5582092ad13e92d56af05c01 SHA512 e242ff53ac490f17b898cf8184446a342bd9ca36f6245f4142cefe275aa2f5865e13428cdbc8663e80a56d7f0c438492b3529dd7c3dd0400d380d99928c58318 -AUX plplot-5.15.0-multiarch.patch 2544 BLAKE2B 288fc0f26f1f30cdbb786642ca5a59d8ba29958ffa690f87622748d4fa47ba098bce6671988e55f59526113dba08370ef15b0bc516552a9dee6918f430444dd5 SHA512 f98ea4f09cfaff7b1b2ad78940a10c5368ad29f402daca34a9a1ee2eeb3b275137576db884f1304ddc4c48ca83c032b9b2b10132a850839fba9c176bb27255a7 -AUX plplot-5.15.0-ocaml-rpath.patch 9583 BLAKE2B b475580f9e4da0ab660dc2d0dfbdbbfbd277787a12421cf24c31453952257111c06e790a7f728f9b97ef16a8c4ea5a5e856e852f54cd81445a1f5b2aadb9df9d SHA512 5262e9922829ee3ec223b60b794de728e15104ba176f1a1e2fe4ba14929b08943cc5f00d166441c0e8ed5dfb09902044e3c62d944efdcf4bc3be604a56cb424a -AUX plplot-5.15.0-ocaml.patch 3424 BLAKE2B ba1c9f758c319a76b0a457a287ee6934ee39300401e2d9a364c70446e12af679ce55c22eda0bf7aa7cb621fd4c76f56268afa649ba935a716495049f41706187 SHA512 1387625d1e784fb92ab3279a342c08d8f85fc055e0c69ce1af9656492102072c7a1d5a6498f8758dc3fd35e0543e80b65cd315641886f9baff60f7740583a0e3 -AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4 DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8 DIST plplot_5.15.0+dfsg2-6.debian.tar.xz 73416 BLAKE2B 2f0a9be0aea6d77b2c538f53a509636a6edca59eb930b7885da7ba915a0324d3cbe0e4b0ffe33a2a552ec7b8b679931e9eaa3e4810372b05ac3c0901ea9c6ee9 SHA512 0d64352eb08cb5bb003e8eac11c73533f6ecd08ad542cce002474d20ba4a899fd54b77f96b5e53656b551180fa693da820e7c40b18d6d43e20ea2c7377c36c69 -EBUILD plplot-5.15.0-r105.ebuild 7535 BLAKE2B b0edfbf93beb9e50a827c59b0d2d3895e36ebe7b927d8fc5e54ca5f49357efeee97cd564878b517247f6395e67df9fc28bfa0723cd7919bcfd897e619f8b57e3 SHA512 911e290f1c98ffe99a41ee5465401f48b9eb88db4d8ca25950d781f3143003dbc457124c77b1f73a5ea8f6e6216c4bb956bba154909fa49ec6ec65dff9028023 EBUILD plplot-5.15.0_p6.ebuild 7383 BLAKE2B feca625173950da8db5553a31d46d49fdfb6105722fc032da0c306ed57b342e816ae655965921459398b473a511db8051aa9dcd66fd9cf83c09b0def334bfe98 SHA512 eabd7464afd56f13bc621f73acf4409c1a954ac3f3f21723bde0975321abce033aa395b2d3f8142e99a1dde24a12918c4280ff08d2fd9f62e1750431a7c497db MISC metadata.xml 1421 BLAKE2B a15479caf11e0f90cb45613ee48ca2d4270a18b57b8f409d4687cee5c55f660fca46a8a2a36c3c1c4a5d02a4c964b1d8db6ea4112039af8bcda808e50b4bf1f1 SHA512 fc99a3225ce54af9945e8fec3cd96f9c75cdc74b8ad4d5362bd5b1529b3872eddd06a190ea9f1cafa727d28e3e2086a27ecd5db89afd993d844ba8f299f2f317 diff --git a/sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch b/sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch deleted file mode 100644 index 3c6b85b1714e..000000000000 --- a/sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/include/qt.h -+++ b/include/qt.h -@@ -67,6 +67,7 @@ - #include - #include - #include -+#include - - #include "plDevs.h" - #include "plplotP.h" diff --git a/sci-libs/plplot/files/plplot-5.15.0-configure-clang16.patch b/sci-libs/plplot/files/plplot-5.15.0-configure-clang16.patch deleted file mode 100644 index 1f72da24ffb0..000000000000 --- a/sci-libs/plplot/files/plplot-5.15.0-configure-clang16.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://bugs.gentoo.org/898258 -https://sourceforge.net/p/plplot/patches/37/ - -Avoid implicitly declaring exit. Future compilers will not support -implicit function declarations, so this cmake probe will always fail. - ---- a/cmake/modules/TestForHighBitCharacters.c -+++ b/cmake/modules/TestForHighBitCharacters.c -@@ -17,6 +17,6 @@ int - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) -- exit(1); -- exit (0); -+ return 1; -+ return 0; - } - diff --git a/sci-libs/plplot/files/plplot-5.15.0-ieee.patch b/sci-libs/plplot/files/plplot-5.15.0-ieee.patch deleted file mode 100644 index 065f59a52dfd..000000000000 --- a/sci-libs/plplot/files/plplot-5.15.0-ieee.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/cmake/modules/csiro.cmake.ieee plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/cmake/modules/csiro.cmake ---- plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/cmake/modules/csiro.cmake.ieee 2018-09-19 20:31:11.333168883 -0600 -+++ plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/cmake/modules/csiro.cmake 2018-09-19 20:31:56.323728783 -0600 -@@ -27,15 +27,6 @@ option(WITH_CSA "Enable use of the csa l - # expanded to a lot more cases as we gain platform experience. - set(NAN_CFLAGS ${CMAKE_C_FLAGS}) - if(PL_HAVE_QHULL OR WITH_CSA) -- if(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86" AND NOT CMAKE_C_COMPILER MATCHES "gcc") -- set(NAN_CFLAGS "${NAN_CFLAGS} -mieee-fp") -- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*") -- if(CMAKE_C_COMPILER MATCHES "gcc") -- set(NAN_CFLAGS "${NAN_CFLAGS} -mieee") -- else(CMAKE_C_COMPILER MATCHES "gcc") -- set(NAN_CFLAGS "${NAN_CFLAGS} -ieee") -- endif(CMAKE_C_COMPILER MATCHES "gcc") -- endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86" AND NOT CMAKE_C_COMPILER MATCHES "gcc") - if(NOT DEFINED NaNAwareCCompiler) - message(STATUS "Check for NaN awareness in C compiler") - try_run(RUN_RESULT COMPILE_RESULT diff --git a/sci-libs/plplot/files/plplot-5.15.0-multiarch.patch b/sci-libs/plplot/files/plplot-5.15.0-multiarch.patch deleted file mode 100644 index 4fc5b0b43d9e..000000000000 --- a/sci-libs/plplot/files/plplot-5.15.0-multiarch.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -up plplot-5.15.0/examples/c/Makefile.examples.in.multiarch plplot-5.15.0/examples/c/Makefile.examples.in ---- plplot-5.15.0/examples/c/Makefile.examples.in.multiarch 2019-09-17 21:47:24.535984257 -0600 -+++ plplot-5.15.0/examples/c/Makefile.examples.in 2019-09-17 21:50:37.029009186 -0600 -@@ -23,9 +23,6 @@ SHELL = @SH_EXECUTABLE@ - CC = @CC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --install_tree_c_RPATHCMD = @install_tree_c_RPATHCMD@ -- - @extXdrawable_true@extXdrawable_EXECUTABLES_list = \ - @extXdrawable_true@ extXdrawable_demo$(EXEEXT) - -diff -up plplot-5.15.0/examples/c++/Makefile.examples.in.multiarch plplot-5.15.0/examples/c++/Makefile.examples.in ---- plplot-5.15.0/examples/c++/Makefile.examples.in.multiarch 2019-09-17 21:47:24.536984262 -0600 -+++ plplot-5.15.0/examples/c++/Makefile.examples.in 2019-09-17 21:50:18.672911449 -0600 -@@ -23,15 +23,10 @@ SHELL = @SH_EXECUTABLE@ - CXX = @CXX@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --install_tree_cxx_RPATHCMD = @install_tree_cxx_RPATHCMD@ -- --@wxwidgets_true@install_tree_wxwidgets_RPATHCMD = @install_tree_wxwidgets_RPATHCMD@ - @wxwidgets_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \ - @wxwidgets_true@ @wxdemo_name@$(EXEEXT) - - @qt_gui_true@QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@ --@qt_gui_true@install_tree_qt_RPATHCMD = @install_tree_qt_RPATHCMD@ - @qt_gui_true@qt_gui_EXECUTABLES_list = \ - @qt_gui_true@ qt_example$(EXEEXT) - -diff -up plplot-5.15.0/examples/fortran/Makefile.examples.in.multiarch plplot-5.15.0/examples/fortran/Makefile.examples.in ---- plplot-5.15.0/examples/fortran/Makefile.examples.in.multiarch 2019-09-17 21:47:24.537984268 -0600 -+++ plplot-5.15.0/examples/fortran/Makefile.examples.in 2019-09-17 21:48:01.062178741 -0600 -@@ -24,7 +24,6 @@ SHELL = @SH_EXECUTABLE@ - Fortran = @FC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ - install_tree_fortran_RPATHCMD = @install_tree_fortran_RPATHCMD@ - - EXECUTABLES_list = \ -diff -up plplot-5.15.0/examples/tk/Makefile.examples.in.multiarch plplot-5.15.0/examples/tk/Makefile.examples.in ---- plplot-5.15.0/examples/tk/Makefile.examples.in.multiarch 2019-09-17 21:47:24.538984273 -0600 -+++ plplot-5.15.0/examples/tk/Makefile.examples.in 2019-09-17 21:50:00.816816375 -0600 -@@ -24,9 +24,6 @@ SHELL = @SH_EXECUTABLE@ - CC = @CC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --install_tree_tk_RPATHCMD = @install_tree_tk_RPATHCMD@ -- - EXECUTABLES_list = xtk01$(EXEEXT) - # Second and fourth examples depend on itk. - @itk_true@itk_EXECUTABLES_list = xtk02$(EXEEXT) xtk04$(EXEEXT) diff --git a/sci-libs/plplot/files/plplot-5.15.0-ocaml-rpath.patch b/sci-libs/plplot/files/plplot-5.15.0-ocaml-rpath.patch deleted file mode 100644 index f3fe04d84a7c..000000000000 --- a/sci-libs/plplot/files/plplot-5.15.0-ocaml-rpath.patch +++ /dev/null @@ -1,166 +0,0 @@ -commit 6b215267e7baeae83906bec8dab72a549aeda6c8 -Author: Alan W. Irwin -Date: Mon Sep 23 17:39:31 2019 -0700 - - Build system: Fix ocaml examples core build for -DUSE_RPATH=OFF case - - Thanks to Orion Poplawski for reporting this issue which is that the - *core build_tree* rpath manipulations for the ocaml examples were - being (incorrectly) skipped for the -DUSE_RPATH=OFF case. The fix for - this issue required non-trivial CMake logic changes so was extensively - tested (see below). - - Tested by: Alan W. Irwin on Linux - (Debian Buster = Stable) with the following steps: - - # Choose these prefixes to assure that the source, build, and install - # trees have blanks in their pathnames (to test those cases during - # this comprehensive test) - COMPREHENSIVE_TEST_PREFIX="/home/software/plplot/HEAD/comprehensive_test_disposeable blank" - SOURCE_PREFIX="/home/software/plplot/HEAD/plplot blank .git" - - # Set CMAKE_PREFIX_PATH to access local versions of lua and libLASi to - # avoid important bugs in the Debian Testing versions of those - # packages. Also access a local version of libqhull to test that - # additional rpath possibility. - - # Put a local build of CMake-3.15.20190829-g3ec986c first on the PATH to thoroughly - # test our build system for a locally built CMake version that includes an - # essential fix so that D language support works properly for the ldc2 and dmd compilers. - - # For this particular test use the gdc D compiler if D enabled (which it was not, see below). - - # Use the -DUSE_INCRTCL_VERSION_4=ON option to help CMake find Tcl/Tk - # components. (This step will not be necessary as soon as the PLplot - # build system is modified to make Tcl/Tk/Itcl/Itk/Iwidgets finding - # more robust.) - - # Use -DSWIG_EXECUTABLE=/home/software/swig/install/bin/swig to test - # swig-4.0.0 that I built for myself. - - # To save time, constrain the test to just the ocaml binding and svg device. - - # To save a lot of babysitting of this test, constrain the test by dropping - # the interactive component. - - time (nice -19 env CMAKE_PREFIX_PATH=/home/software/lua/install-5.3.5:/home/software/lasi_svn/install:/home/software/qhull/install PATH=/home/software/cmake/install-3ec986ce8e/bin:"$PATH" DC=gdc "$SOURCE_PREFIX"/scripts/comprehensive_test.sh --prefix "$COMPREHENSIVE_TEST_PREFIX" --cmake_added_options "-DUSE_INCRTCL_VERSION_4=ON -DSWIG_EXECUTABLE=/home/software/swig/install/bin/swig -DDEFAULT_NO_BINDINGS=ON -DENABLE_ocaml=ON -DDEFAULT_NO_DEVICES=ON -DPLD_svg=ON " --build_command "make -j18" --ctest_command "ctest -j18" --do_test_interactive no) - - The time result on my Ryzen 7 1700 system with 16 hardware threads was - - real 4m12.625s - user 4m22.128s - sys 0m58.076s - - The above test was repeated with the following changes: - - # Specify LD_LIBRARY_PATH to workaround the lack of special rpath - # support for external local versions of software - - # Use the -DUSE_RPATH=OFF cmake option to drop all install-tree - # rpath support (and to ignore any special rpath support for - # external local versions of software). - - # Further constrain the test to be performed just for the core build tree - # since -DUSE_RPATH=OFF will obviously give bad results for the install - # tree for this non-standard installation location. - - time (nice -19 env CMAKE_PREFIX_PATH=/home/software/lua/install-5.3.5:/home/software/lasi_svn/install:/home/software/qhull/install PATH=/home/software/cmake/install-3ec986ce8e/bin:"$PATH" DC=gdc LD_LIBRARY_PATH=/home/software/lasi_svn/install/lib:/home/software/qhull/install/lib "$SOURCE_PREFIX"/scripts/comprehensive_test.sh --prefix "$COMPREHENSIVE_TEST_PREFIX" --cmake_added_options "-DUSE_INCRTCL_VERSION_4=ON -DSWIG_EXECUTABLE=/home/software/swig/install/bin/swig -DDEFAULT_NO_BINDINGS=ON -DENABLE_ocaml=ON -DDEFAULT_NO_DEVICES=ON -DPLD_svg=ON -DUSE_RPATH=OFF" --build_command "make -j18" --ctest_command "ctest -j18" --do_test_interactive no --do_test_install_tree no --do_test_traditional_install_tree no) - - The time result on my Ryzen 7 1700 system with 16 hardware threads was - - real 1m57.888s - user 1m42.156s - sys 0m26.478s - - Both these comprehensive tests (one which tests that the default - -DUSE_RPATH=ON still works for the ocaml case and one similar to - Orion's test case which tests that -DUSER_RPATH=OFF works for the - ocaml case in the core build tree) ran without issues (e.g., there - were no hangs or other obvious errors) and was followed up by the - evaluation procedure documented in doc/wiki_source/Testing_PLplot. - Those evaluations showed no configure, build, or obvious run-time - errors (i.e., no non-zero return codes for any of the steps in these - comprehensive tests), and the difference test results (done with the - default svg device) were perfect as well. - -diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt -index 93cb01b..5bcbceb 100644 ---- a/examples/CMakeLists.txt -+++ b/examples/CMakeLists.txt -@@ -343,27 +343,24 @@ if(CORE_BUILD) - # Extra layer of -Wl indirection required for the nagfor compiler - string(REPLACE "-Wl," "-Wl,-Wl,," install_tree_fortran_RPATHCMD ${install_tree_fortran_RPATHCMD}) - endif(install_tree_fortran_RPATHCMD AND CMAKE_Fortran_COMPILER MATCHES "nagfor") -+ endif(USE_RPATH AND NOT WIN32_OR_CYGWIN) -+ -+ # ocaml is a special case not handled by the above logic for other languages -+ # because the (unofficial) CMake language support is -+ # implemented with low-level add_custom commands/targets so that rpath -+ # must be specified for 3 cases (the traditional build of the installed -+ # examples, and the CMake-based build of the build-tree and install-tree examples). -+ # Furthermore, the rpath syntax is different for ocaml. -+ if(ENABLE_ocaml) -+ set(language ocaml) - -- # ocaml is a special case because the (unofficial) CMake language support is -- # implemented with low-level add_custom commands/targets so that rpath -- # must be specified for 3 cases (the traditional build of the installed -- # examples, and the CMake-based build of the build-tree and install-tree examples). -- # Furthermore, the rpath syntax is different for ocaml. -- if(ENABLE_ocaml) -- set(language ocaml) -+ if(USE_RPATH AND NOT WIN32_OR_CYGWIN) - # Each of the installed examples that are built depend on a library installed in ${LIB_DIR}. - set(install_tree_${language}_RPATH ${LIB_DIR}) -- # The ocaml examples depend on the plplot library -+ # The ocaml examples depend on the plplot library so use INSTALL_RPATH -+ # property of that library target. - set(tll_arguments PLPLOT::plplot) - process_rpath(install_tree_${language}_RPATH "${tll_arguments}") -- -- # Special case of the ocaml build-tree examples. -- # Must be done before ${install_tree_${language}_RPATH gets transformed -- # from official CMake list to colon-separated form. -- set(build_tree_${language}_RPATH ${install_tree_${language}_RPATH}) -- list(REMOVE_ITEM build_tree_${language}_RPATH ${LIB_DIR}) -- list(APPEND build_tree_${language}_RPATH ${CMAKE_BINARY_DIR}/src) -- - # Transform from semicolon- to colon-separated list. (Quotes - # for last argument required to process whole argument as string - # containing semicolons rather than as the concatanated elements -@@ -372,19 +369,30 @@ if(CORE_BUILD) - # install- and build-tree versions of CMake-based build of ocaml - # examples - string(REGEX REPLACE ";" ":" install_tree_${language}_RPATH "${install_tree_${language}_RPATH}") -- string(REGEX REPLACE ";" ":" build_tree_${language}_RPATH "${build_tree_${language}_RPATH}") - string(REPLACE " " "\\ " install_tree_${language}_RPATH_ESCAPED "${install_tree_${language}_RPATH}") -- string(REPLACE " " "\\ " build_tree_${language}_RPATH_ESCAPED "${build_tree_${language}_RPATH}") -- - # install_tree_ocaml_RPATHCMD needed in configured traditional - # Makefile for the ocaml subdirectory. - # Ocaml compiler requires -ccopt in front of every -Wl option: - set(install_tree_${language}_RPATHCMD "-ccopt -Wl,-rpath -ccopt -Wl,\"${install_tree_${language}_RPATH_ESCAPED}\"") -+ endif(USE_RPATH AND NOT WIN32_OR_CYGWIN) - -- endif(ENABLE_ocaml) -+ # Special case of the ocaml build-tree examples. -+ # Follow above process_rpath logic but with some changes -+ # appropriate for the core build of the ocaml examples. -+ set(build_tree_${language}_RPATH ${CMAKE_BINARY_DIR}/src) -+ set(tll_arguments PLPLOT::plplot) -+ process_rpath(build_tree_${language}_RPATH "${tll_arguments}") - -+ # Get rid of any mention of ${LIB_DIR} for the core build version -+ # of the examples. -+ # Must be done before ${build_tree_${language}_RPATH gets transformed -+ # from official CMake list to colon-separated form. -+ list(REMOVE_ITEM build_tree_${language}_RPATH ${LIB_DIR}) - -- endif(USE_RPATH AND NOT WIN32_OR_CYGWIN) -+ string(REGEX REPLACE ";" ":" build_tree_${language}_RPATH "${build_tree_${language}_RPATH}") -+ string(REPLACE " " "\\ " build_tree_${language}_RPATH_ESCAPED "${build_tree_${language}_RPATH}") -+ -+ endif(ENABLE_ocaml) - - # Install Chloe.pgm in installed examples directory so that all implementations - # of example 20 in the various examples subdirectories can conveniently diff --git a/sci-libs/plplot/files/plplot-5.15.0-ocaml.patch b/sci-libs/plplot/files/plplot-5.15.0-ocaml.patch deleted file mode 100644 index 6f0827f334e5..000000000000 --- a/sci-libs/plplot/files/plplot-5.15.0-ocaml.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/CMakeLists.txt.ocaml plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/CMakeLists.txt ---- plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/CMakeLists.txt.ocaml 2018-09-19 17:38:53.000000000 -0600 -+++ plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/CMakeLists.txt 2018-09-19 20:32:29.884146436 -0600 -@@ -326,11 +326,11 @@ if(ENABLE_ocaml) - ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo - ) - -- # ocamlc -a -custom builds a *.cma library from *.cmo -+ # ocamlc -a builds a *.cma library from *.cmo - add_custom_command( - OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma -- COMMAND ${OCAMLC} -a -custom -o plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${ocaml_LIBRARIES_FLAGS} -+ COMMAND ${OCAMLC} -a -o plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${ocaml_LIBRARIES_FLAGS} - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo - ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -@@ -341,7 +341,7 @@ if(ENABLE_ocaml) - add_custom_command( - OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/installed_plplot.cma -- COMMAND ${OCAMLC} -a -custom -o installed_plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${installed_ocaml_LIBRARIES_FLAGS} -+ COMMAND ${OCAMLC} -a -o installed_plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${installed_ocaml_LIBRARIES_FLAGS} - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo - ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -diff -up plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/plcairo/CMakeLists.txt.ocaml plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/plcairo/CMakeLists.txt ---- plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/plcairo/CMakeLists.txt.ocaml 2018-09-19 20:32:29.884146436 -0600 -+++ plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/plcairo/CMakeLists.txt 2018-09-19 20:33:18.389750080 -0600 -@@ -91,11 +91,11 @@ if(ENABLE_ocaml AND OCAML_HAS_CAIRO) - ${CMAKE_CURRENT_BINARY_DIR}/plcairo.ml - ) - -- # ocamlc -a -custom builds a *.cma library from *.cmo -+ # ocamlc -a builds a *.cma library from *.cmo - add_custom_command( - OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -- COMMAND ${OCAMLC} -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -l${WRITEABLE_TARGET}plplot -dllpath ${CMAKE_BINARY_DIR}/src -+ COMMAND ${OCAMLC} -a -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -l${WRITEABLE_TARGET}plplot -dllpath ${CMAKE_BINARY_DIR}/src - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} diff --git a/sci-libs/plplot/files/plplot-5.9.6-python.patch b/sci-libs/plplot/files/plplot-5.9.6-python.patch deleted file mode 100644 index d62ece2ec416..000000000000 --- a/sci-libs/plplot/files/plplot-5.9.6-python.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/examples/python/CMakeLists.txt b/examples/python/CMakeLists.txt -index 7599164..8457490 100644 ---- a/examples/python/CMakeLists.txt -+++ b/examples/python/CMakeLists.txt -@@ -214,7 +214,7 @@ if(CORE_BUILD) - @ONLY - ) - -- set(python_location1 ${PYTHON_INSTDIR}) -+ set(python_location1) - set(python_location2) - set(python_location3) - set(python_location4) diff --git a/sci-libs/plplot/plplot-5.15.0-r105.ebuild b/sci-libs/plplot/plplot-5.15.0-r105.ebuild deleted file mode 100644 index f6506f7c5103..000000000000 --- a/sci-libs/plplot/plplot-5.15.0-r105.ebuild +++ /dev/null @@ -1,302 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER=3.0-gtk3 -FORTRAN_NEEDED=fortran -LUA_COMPAT=( lua5-1 ) -PYTHON_COMPAT=( python3_{9..11} ) -# fails with ninja, due to USE=java missing swig output dependencies -CMAKE_MAKEFILE_GENERATOR=emake - -inherit cmake flag-o-matic fortran-2 java-pkg-opt-2 lua-single python-single-r1 virtualx wxwidgets - -DESCRIPTION="Multi-language scientific plotting library" -HOMEPAGE="https://plplot.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0/14" # SONAME of libplplot.so -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf - png python qhull qt5 shapefile svg tcl test threads tk truetype wxwidgets X" -REQUIRED_USE=" - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( dynamic ) - test? ( latex ) - tk? ( tcl ) -" - -RESTRICT=" - !test? ( test ) - octave? ( test ) -" - -RDEPEND=" - cairo? ( x11-libs/cairo:0=[svg(+)?,X] ) - gd? ( media-libs/gd:2=[jpeg?,png?] ) - java? ( >=virtual/jre-1.8:* ) - latex? ( - app-text/ghostscript-gpl - virtual/latex-base - ) - lua? ( ${LUA_DEPS} ) - ocaml? ( - dev-lang/ocaml:= - dev-ml/camlidl:= - ) - octave? ( sci-mathematics/octave:0= ) - pdf? ( media-libs/libharu:0= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] ) - ') - ) - qhull? ( media-libs/qhull:0= ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtprintsupport:5 - ) - shapefile? ( sci-libs/shapelib:0= ) - tcl? ( - dev-lang/tcl:0= - dev-tcltk/itcl:0= - tk? ( - dev-lang/tk:0= - dev-tcltk/itk - ) - ) - truetype? ( - media-fonts/freefont - media-libs/lasi:0= - gd? ( media-libs/gd:2=[truetype] ) - ) - wxwidgets? ( - x11-libs/wxGTK:${WX_GTK_VER}=[X] - x11-libs/agg:0=[truetype?] - ) - X? ( - x11-libs/libX11:0= - x11-libs/libXau:0= - x11-libs/libXdmcp:0= - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - java? ( - >=virtual/jdk-1.8:* - dev-lang/swig - ) - lua? ( dev-lang/swig ) - ocaml? ( dev-ml/findlib ) - octave? ( >=dev-lang/swig-3.0.12 ) - python? ( dev-lang/swig ) - test? ( - media-fonts/font-misc-misc - media-fonts/font-cursor-misc - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-5.9.6-python.patch - - # Fedora patches - "${FILESDIR}"/${PN}-5.15.0-ocaml-rpath.patch - "${FILESDIR}"/${PN}-5.15.0-ieee.patch - "${FILESDIR}"/${PN}-5.15.0-multiarch.patch - "${FILESDIR}"/${PN}-5.15.0-ocaml.patch - "${FILESDIR}"/${PN}-5.12.0-safe-string.patch - "${FILESDIR}"/${PN}-5.15.0-QPainterPath-include.patch - "${FILESDIR}"/${PN}-5.15.0-configure-clang16.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup - use lua && lua-single_pkg_setup - use java && java-pkg-opt-2_pkg_setup - use fortran && fortran-2_pkg_setup -} - -src_prepare() { - use wxwidgets && setup-wxwidgets - cmake_src_prepare - - # avoid installing license - sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die - - # prexify hard-coded /usr/include in cmake modules - sed -i \ - -e "s:/usr/include:${EPREFIX}/usr/include:g" \ - -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ - -e "s:/usr/share:${EPREFIX}/usr/share:g" \ - cmake/modules/*.cmake || die - - # change default install directories for doc and examples - local f - while IFS="" read -d $'\0' -r f; do - sed -i -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' "${f}" || die - done < <(find "${S}" -name CMakeLists.txt -print0) - - sed -i \ - -e 's:${VERSION}::g' \ - -e "s:doc/\${PACKAGE}:doc/${PF}:" \ - cmake/modules/instdirs.cmake || die - - java-utils-2_src_prepare -} - -src_configure() { - # - don't build doc, it pulls in a whole stack of horrible dependencies - # - Bindings: - # * Ada is a mess in Gentoo, don't use - # * D has been removed from Gentoo, don't use - # * Qt4 has been disabled, as it is deprecated and unsupported upstream - # - DPLD_* drivers need to use ON/OFF instead of the usex defaults yes/no, as - # the testsuite performs a string comparison to determine which tests to run - - # Octave bindings now require C++11 support, #609980 - append-cxxflags -std=c++11 - - local mycmakeargs=( - # The build system does not honour CMAKE_INSTALL_LIBDIR as a - # relative dir, which is against the spirit of GNUInstallDirs, #610066 - -DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir) - - ## Features - -DBUILD_DOC=OFF - -DBUILD_DOX_DOC=OFF - -DUSE_RPATH=OFF - -DPREBUILT_DOC=$(usex doc) - -DHAVE_SHAPELIB=$(usex shapefile) - -DWITH_FREETYPE=$(usex truetype) - -DPL_HAVE_PTHREAD=$(usex threads) - -DPL_HAVE_QHULL=$(usex qhull) - -DPLPLOT_USE_QT5=$(usex qt5) - - ## Tests - -DBUILD_TEST=$(usex test) - - ## Bindings - -DENABLE_ada=OFF - -DENABLE_d=OFF - -DENABLE_ocaml=$(usex ocaml) - -DENABLE_pyqt4=OFF - -DENABLE_cxx=$(usex cxx) - -DENABLE_DYNDRIVERS=$(usex dynamic) - -DENABLE_fortran=$(usex fortran) - -DENABLE_java=$(usex java) - -DENABLE_lua=$(usex lua) - -DENABLE_octave=$(usex octave) - -DENABLE_python=$(usex python) - -DENABLE_qt=$(usex qt5) - -DENABLE_tcl=$(usex tcl) - -DENABLE_itcl=$(usex tcl) - -DENABLE_tk=$(usex tk) - -DENABLE_itk=$(usex tk) - -DENABLE_wxwidgets=$(usex wxwidgets) - - ## Drivers - -DPLD_cgm=OFF - -DPLD_gif=OFF - -DPLD_jpeg=OFF - -DPLD_plmeta=OFF - -DPLD_png=OFF - -DPLD_pstex=OFF - -DPLD_wxpng=OFF - -DPLD_mem=ON - -DPLD_null=ON - -DPLD_wingcc=ON - # Cairo - $(usex cairo "" "-DDEFAULT_NO_CAIRO_DEVICES=ON") - -DPLD_epscairo=$(usex cairo ON OFF) - -DPLD_extcairo=$(usex cairo ON OFF) - -DPLD_memcairo=$(usex cairo ON OFF) - -DPLD_pdfcairo=$(usex cairo ON OFF) - -DPLD_pngcairo=$(usex cairo ON OFF) - -DPLD_pscairo=$(usex cairo ON OFF) - -DPLD_svgcairo=$(usex cairo ON OFF) - -DPLD_xcairo=$(usex cairo ON OFF) - # LaTeX - -DPLD_ps=$(usex latex ON OFF) - # PDF - -DPLD_pdf=$(usex pdf ON OFF) - # Qt - -DPLD_aqt=$(usex qt5 ON OFF) - -DPLD_bmpqt=$(usex qt5 ON OFF) - -DPLD_epsqt=$(usex qt5 ON OFF) - -DPLD_extqt=$(usex qt5 ON OFF) - -DPLD_jpgqt=$(usex qt5 ON OFF) - -DPLD_memqt=$(usex qt5 ON OFF) - -DPLD_pdfqt=$(usex qt5 ON OFF) - -DPLD_pngqt=$(usex qt5 ON OFF) - -DPLD_ppmqt=$(usex qt5 ON OFF) - -DPLD_qtwidget=$(usex qt5 ON OFF) - -DPLD_svgqt=$(usex qt5 ON OFF) - -DPLD_tiffqt=$(usex qt5 ON OFF) - # SVG - -DPLD_svg=$(usex svg ON OFF) - # Tk - -DPLD_ntk=$(usex tk ON OFF) - -DPLD_tk=$(usex tk ON OFF) - -DPLD_tkwin=$(usex tk ON OFF) - # Truetype - -DPLD_psttf=$(usex truetype ON OFF) - # Wx - -DPLD_wxwidgets=$(usex wxwidgets ON OFF) - # X - -DPLD_xfig=$(usex X ON OFF) - -DPLD_xwin=$(usex X ON OFF) - ) - - use truetype && mycmakeargs+=( - -DPL_FREETYPE_FONT_PATH="${EPREFIX}"/usr/share/fonts/freefont - ) - use shapefile && mycmakeargs+=( - -DSHAPELIB_INCLUDE_DIR="${EPREFIX}"/usr/include/libshp - ) - use lua && mycmakeargs+=( - -DREQUIRED_LUA_VERSION=$(lua_get_version) - ) - use ocaml && mycmakeargs+=( - -DOCAML_INSTALL_DIR="$(ocamlc -where)" - ) - use python && mycmakeargs+=( - -DENABLE_pyqt5=$(usex qt5) - ) - - cmake_src_configure - - # clean up bloated pkg-config files (help linking properly on prefix) - sed -i \ - -e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \ - -e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \ - -e "s:${LDFLAGS}::g" \ - "${BUILD_DIR}"/pkgcfg/*pc || die -} - -src_test() { - virtx cmake_src_test -} - -src_install() { - cmake_src_install - - if use examples; then - docompress -x /usr/share/doc/${PF}/examples - else - rm -r "${ED}"/usr/share/doc/${PF}/examples || die - fi - - use python && python_optimize - - if use java; then - java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar - java-pkg_regso "${EPREFIX}"/usr/$(get_libdir)/jni/libplplotjavac_wrap.so - fi -} -- cgit v1.2.3