From bcdf59240318a0040b0ca6829e3b0db2004cd690 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Fri, 28 Nov 2025 07:15:04 +0000 Subject: Adding metadata --- sci-visualization/gnuplot/gnuplot-6.0.3.ebuild | 2 +- sci-visualization/gr/files/gr-0.73.6-cmake4.patch | 87 ++++++++++++++++++++++ sci-visualization/gr/gr-0.73.6-r1.ebuild | 90 +++++++++++++++++++++++ sci-visualization/gr/gr-0.73.6.ebuild | 85 --------------------- 4 files changed, 178 insertions(+), 86 deletions(-) create mode 100644 sci-visualization/gr/files/gr-0.73.6-cmake4.patch create mode 100644 sci-visualization/gr/gr-0.73.6-r1.ebuild delete mode 100644 sci-visualization/gr/gr-0.73.6.ebuild (limited to 'sci-visualization') diff --git a/sci-visualization/gnuplot/gnuplot-6.0.3.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.3.ebuild index 01eb76cc5654..0651d523c4b1 100644 --- a/sci-visualization/gnuplot/gnuplot-6.0.3.ebuild +++ b/sci-visualization/gnuplot/gnuplot-6.0.3.ebuild @@ -20,7 +20,7 @@ if [[ -z ${PV%%*9999} ]]; then else MY_P="${P/_/.}" SRC_URI="https://downloads.sourceforge.net/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" diff --git a/sci-visualization/gr/files/gr-0.73.6-cmake4.patch b/sci-visualization/gr/files/gr-0.73.6-cmake4.patch new file mode 100644 index 000000000000..e9d887953057 --- /dev/null +++ b/sci-visualization/gr/files/gr-0.73.6-cmake4.patch @@ -0,0 +1,87 @@ +From 75bbc7f8d9c2dad10581a421409642d7a6b1192b Mon Sep 17 00:00:00 2001 +From: Ingo Meyer +Date: Tue, 1 Apr 2025 08:55:27 +0200 +Subject: [PATCH] [CMake] Add support for CMake 4 + +CMake 4 does not support any CMake versions before 3.5, so adjust +`CMakeLists.txt` to not require older versions. The main CMakeLists now +also specifies to use new CMake policies up to version 4. +--- + CMakeLists.txt | 5 +---- + examples/qt4_ex/CMakeLists.txt | 2 +- + examples/qt5_ex/CMakeLists.txt | 2 +- + examples/qt6_ex/CMakeLists.txt | 2 +- + lib/grm/test/internal_api/grm/CMakeLists.txt | 2 +- + lib/grm/test/public_api/grm/CMakeLists.txt | 2 +- + 6 files changed, 6 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c73ef0c5..59fa57107 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.5...4.0 FATAL_ERROR) + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") + include(GetVersionFromGit) +@@ -13,9 +13,6 @@ project( + include(GNUInstallDirs) + include(CheckCXXCompilerFlag) + +-# Honor `C_VISIBILITY_PRESET hidden` and `CXX_VISIBILITY_PRESET hidden` in static libraries +-cmake_policy(SET CMP0063 NEW) +- + check_cxx_compiler_flag("-Werror=implicit" ERROR_IMPLICIT_SUPPORTED) + if(ERROR_IMPLICIT_SUPPORTED) + set(COMPILER_OPTION_ERROR_IMPLICIT +diff --git a/examples/qt4_ex/CMakeLists.txt b/examples/qt4_ex/CMakeLists.txt +index 7cc31a943..084e763c4 100644 +--- a/examples/qt4_ex/CMakeLists.txt ++++ b/examples/qt4_ex/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1...3.19) ++cmake_minimum_required(VERSION 3.5...4.0 FATAL_ERROR) + + project(gr_qt4_example LANGUAGES CXX) + +diff --git a/examples/qt5_ex/CMakeLists.txt b/examples/qt5_ex/CMakeLists.txt +index 40f7a1842..cbea22930 100644 +--- a/examples/qt5_ex/CMakeLists.txt ++++ b/examples/qt5_ex/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1...3.19) ++cmake_minimum_required(VERSION 3.5...4.0 FATAL_ERROR) + + project(gr_qt5_example LANGUAGES CXX) + +diff --git a/examples/qt6_ex/CMakeLists.txt b/examples/qt6_ex/CMakeLists.txt +index a652c747c..5c71b160c 100644 +--- a/examples/qt6_ex/CMakeLists.txt ++++ b/examples/qt6_ex/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.16 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.16...4.0 FATAL_ERROR) + + project(gr_qt6_example LANGUAGES CXX) + +diff --git a/lib/grm/test/internal_api/grm/CMakeLists.txt b/lib/grm/test/internal_api/grm/CMakeLists.txt +index 55f4d4675..c1100882a 100644 +--- a/lib/grm/test/internal_api/grm/CMakeLists.txt ++++ b/lib/grm/test/internal_api/grm/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1...3.16) ++cmake_minimum_required(VERSION 3.5...4.0 FATAL_ERROR) + + project( + grm_test_internal_api +diff --git a/lib/grm/test/public_api/grm/CMakeLists.txt b/lib/grm/test/public_api/grm/CMakeLists.txt +index e9b721c80..a86c2d054 100644 +--- a/lib/grm/test/public_api/grm/CMakeLists.txt ++++ b/lib/grm/test/public_api/grm/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1...3.16) ++cmake_minimum_required(VERSION 3.5...4.0 FATAL_ERROR) + + project( + grm_test_public_api diff --git a/sci-visualization/gr/gr-0.73.6-r1.ebuild b/sci-visualization/gr/gr-0.73.6-r1.ebuild new file mode 100644 index 000000000000..c727d26ca6b3 --- /dev/null +++ b/sci-visualization/gr/gr-0.73.6-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 2019-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Universal framework for cross-platform visualization applications" +HOMEPAGE="https://gr-framework.org/" +SRC_URI="https://github.com/sciapp/gr/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="agg cairo ffmpeg postscript tiff truetype" + +REQUIRED_USE="cairo? ( truetype )" + +DEPEND=" + dev-qt/qtbase:6=[gui,widgets] + media-libs/fontconfig + media-libs/glfw + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/qhull:= + net-libs/zeromq + virtual/zlib:= + virtual/opengl + x11-libs/libX11 + x11-libs/libXt + agg? ( x11-libs/agg ) + cairo? ( x11-libs/cairo ) + ffmpeg? ( media-video/ffmpeg:= ) + postscript? ( app-text/ghostscript-gpl ) + tiff? ( media-libs/tiff:= ) + truetype? ( media-libs/freetype ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-0.53.0-musl.patch" + "${FILESDIR}/${P}-cmake4.patch" # bug #955792 +) + +src_configure() { + local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt{4,5}=ON ) # bug 966256 + + if use agg ; then + mycmakeargs+=( -DAGG_LIBRARY=/usr/$(get_libdir)/libagg.so -DAGG_INCLUDE_DIR=/usr/include/agg2 ) + else + mycmakeargs+=( -DAGG_LIBRARY= ) + fi + + use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= ) + use postscript || mycmakeargs+=( -DGS_LIBRARY= ) + use ffmpeg || mycmakeargs+=( -DFFMPEG_INCLUDE_DIR= ) + use truetype || mycmakeargs+=( -DFREETYPE_LIBRARY= ) + use tiff || mycmakeargs+=( -DTIFF_LIBRARY= ) + + # todo: X11 automagic + + mycmakeargs+=( -DCMAKE_INSTALL_PREFIX=/usr/gr ) + mycmakeargs+=( -DCMAKE_INSTALL_LIBDIR=lib ) + # + # I need to have a serious conversation with upstream. + # * The main consumer of this package is dev-lang/julia. + # * If I patch gr to install in standard locations, julia does + # not find it anymore. + # * I can't patch julia, since the corresponding scripts are + # downloaded at runtime from its package registry ... + # * See bug 882619 in addition. + + cmake_src_configure +} + +src_install() { + cmake_src_install + find "${ED}" -name '*.a' -delete || die + + cat >> "${T}"/99gr <<- _EOF_ || die + GRDIR=/usr/gr + LDPATH=/usr/gr/$(get_libdir) + _EOF_ + doenvd "${T}/99gr" + + [[ -f "${ED}/usr/gr/bin/gksqt" ]] && dosym ../gr/bin/gksqt /usr/bin/gksqt + + elog "${P} relies on the environment variable GRDIR. If you want to use it in a running shell," + elog "e.g. with dev-lang/julia, then run \"source /etc/profile\" first." +} diff --git a/sci-visualization/gr/gr-0.73.6.ebuild b/sci-visualization/gr/gr-0.73.6.ebuild deleted file mode 100644 index e3d3a73e47a8..000000000000 --- a/sci-visualization/gr/gr-0.73.6.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 2019-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Universal framework for cross-platform visualization applications" -HOMEPAGE="https://gr-framework.org/" -SRC_URI="https://github.com/sciapp/gr/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="agg cairo ffmpeg postscript tiff truetype" - -DEPEND=" - dev-qt/qtgui:= - media-libs/fontconfig - media-libs/glfw - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/qhull:= - net-libs/zeromq - virtual/zlib:= - virtual/opengl - x11-libs/libX11 - x11-libs/libXt - agg? ( x11-libs/agg ) - cairo? ( x11-libs/cairo ) - ffmpeg? ( media-video/ffmpeg:= ) - postscript? ( app-text/ghostscript-gpl ) - tiff? ( media-libs/tiff:= ) - truetype? ( media-libs/freetype ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-0.53.0-musl.patch" -) - -REQUIRED_USE="cairo? ( truetype )" - -src_configure() { - if use agg ; then - mycmakeargs+=( -DAGG_LIBRARY=/usr/$(get_libdir)/libagg.so -DAGG_INCLUDE_DIR=/usr/include/agg2 ) - else - mycmakeargs+=( -DAGG_LIBRARY= ) - fi - - use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= ) - use postscript || mycmakeargs+=( -DGS_LIBRARY= ) - use ffmpeg || mycmakeargs+=( -DFFMPEG_INCLUDE_DIR= ) - use truetype || mycmakeargs+=( -DFREETYPE_LIBRARY= ) - use tiff || mycmakeargs+=( -DTIFF_LIBRARY= ) - - # todo: X11 automagic - - mycmakeargs+=( -DCMAKE_INSTALL_PREFIX=/usr/gr ) - mycmakeargs+=( -DCMAKE_INSTALL_LIBDIR=lib ) - # - # I need to have a serious conversation with upstream. - # * The main consumer of this package is dev-lang/julia. - # * If I patch gr to install in standard locations, julia does - # not find it anymore. - # * I can't patch julia, since the corresponding scripts are - # downloaded at runtime from its package registry ... - # * See bug 882619 in addition. - - cmake_src_configure -} - -src_install() { - cmake_src_install - find "${ED}" -name '*.a' -delete - - echo "GRDIR=/usr/gr" > "${T}/99gr" - echo "LDPATH=/usr/gr/$(get_libdir)" >> "${T}/99gr" - doenvd "${T}/99gr" - - [[ -f "${ED}/usr/gr/bin/gksqt" ]] && dosym ../gr/bin/gksqt /usr/bin/gksqt - - elog "${P} relies on the environment variable GRDIR. If you want to use it in a running shell," - elog "e.g. with dev-lang/julia, then run \"source /etc/profile\" first." -} -- cgit v1.3.1