Adding metadata

3 files changed, 99 insertions, 7 deletions

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 <i.meyer@fz-juelich.de>
+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.ebuild b/sci-visualization/gr/gr-0.73.6-r1.ebuild
index e3d3a73e47a8..c727d26ca6b3 100644
--- a/sci-visualization/gr/gr-0.73.6.ebuild
+++ b/sci-visualization/gr/gr-0.73.6-r1.ebuild
@@ -14,8 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="agg cairo ffmpeg postscript tiff truetype"
 
+REQUIRED_USE="cairo? ( truetype )"
+
 DEPEND="
-	dev-qt/qtgui:=
+	dev-qt/qtbase:6=[gui,widgets]
 	media-libs/fontconfig
 	media-libs/glfw
 	media-libs/libjpeg-turbo:=
@@ -37,11 +39,12 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.53.0-musl.patch"
+	"${FILESDIR}/${P}-cmake4.patch" # bug #955792
 )
 
-REQUIRED_USE="cairo? ( truetype )"
-
 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
@@ -72,10 +75,12 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
-	find "${ED}" -name '*.a' -delete
+	find "${ED}" -name '*.a' -delete || die
 
-	echo "GRDIR=/usr/gr" > "${T}/99gr"
-	echo "LDPATH=/usr/gr/$(get_libdir)" >> "${T}/99gr"
+	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