7 files changed, 148 insertions, 3 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 621748671398..f31d6598780c 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 76cf4441b1f2..a1eb121a8fc0 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -3,8 +3,9 @@ AUX graphite2-1.3.14-fix-nodefaultlibs-deux.patch 4840 BLAKE2B fc543571ccc0c14c2
 AUX graphite2-1.3.14-fix-nodefaultlibs.patch 1029 BLAKE2B ba35d7c4a6200626035bac940749740cdda89b5c8cf3c37428578214de8ba647331b454ab75d92a4d333d702a39e335c716010299a2ca2dd07a678d8d08eea93 SHA512 5ddcec369ea8bc8e7ea935d3cecc936a148cf275314008b6993574f18c77a3bf7689fd551ac119f82b15ddf365b23ad168726facd5ba78bd611b196b2cf614a2
 AUX graphite2-1.3.14-gcc15.patch 1003 BLAKE2B 222e0fe472dc4df12ef8f0a94d50ca5c5d1a0176febfc878734ab950cf8baa0db1c681b274c8f80acb9dcf123088d82f31947f3e254c58da77266962855e37f5 SHA512 b085ca7109a47a027f93878d359d51ec9f6ac8bef99f4cb1c08e11606a7379c2501560597b66692bd82d36d532758cf76d7149fa71d55e5787366724b23cecd4
 AUX graphite2-1.3.14-no-libtool-file.patch 2336 BLAKE2B a349e721264de1477aee5aa3e62d264b26c4665383fbe564de7b3a0420b77fcf8ce90a65a650fc9e2144969a2f00abe7ff7c9ebe6f53c7b2fdc3271fbd55f6ce SHA512 3553e237808bf981cf35e9fa8de7b77fa1ce87c72733c806df8e523ea624a0e5e2ad87a0b4cfb9330e7cace0fb016c2c729085de2d21e959790955fd370f378e
+AUX graphite2-1.3.14_p20210810-cmake4.patch 3375 BLAKE2B 4a51665e6b6363538db0a13be5bbe8cca2ee70369f5f2c8cbc27a819cda1defcabad42c3d1f603e56b300741e7a40636889e3ecb406de274bb60b30e19292d16 SHA512 e1bed60530d5057481e2416d5c96c4169efaf29af86ea0a264638eff1a436e89a437dd87321f478d2535b097dd7812b1bf7e426f7a5e0254a9de8cd9d38aec7a
 AUX graphite2-1.3.5-fix-gcc-linking.patch 580 BLAKE2B 7ab4d1848e0b0fdbd682fc81747a426c9bee7e2d0f72991dc963c955ba910035c6246d88f7eaded9c4a742a10470fd304ab2dd3fb1750795b8b9791ccfc0cfb8 SHA512 1e01c764f72204f30c916dcdc4f5bc7a4757d73275bb2007bf0c1f2e9898f138aa6c0581addc587e125cf6cbf9d5db725cb3d8a69875978a14ab316d2d561467
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
 DIST graphite2-1.3.14_p20210810.tar.gz 6656693 BLAKE2B 63a7d96b58f2779d8a4a353e1a986212b884fdf780fedcb83b22dcef2f7678d44c88c14ece2d09dc745df505a4a3825ce61d7c84bd05fd4e98c23d6e86e9326d SHA512 be54c1386578970cf65c1860336a113268181753c1e2a139e37ceeafcfa76e3162086879c54094d70cd0d36ad5852a95390aaa69572d875921e9481f1ae508ff
-EBUILD graphite2-1.3.14_p20210810-r3.ebuild 3179 BLAKE2B 92af9cc8cf303957550bc17cac802863850e0fcd06cf2ce5e152cc00b856510fe81b03aa571c17ffa3586adc15a8bec14325982028306751bc3a079ae6d04b23 SHA512 8d50928ee83306f7b6d9e3ce6fe68ed6feb58998d9ea7f98853ddc72fc94077b09abc8638c5441553dcc70735de25081052657dd0cf0bd0e59faa297a1a1b2d3
+EBUILD graphite2-1.3.14_p20210810-r3.ebuild 3240 BLAKE2B 7c8a7c33e41eb01bd43de25d0230a887c6841fe0dd7e3423b1afc9b04598d51c9ae76310874d0ac382ff9258227eafed43dad56a586b96d18ba93042aeb4e2c1 SHA512 4f9f3341ad3f83ed27993f6313de902aad0f2187f9ee99adbb1f08d31ed4e7d0d464ae13e14d23d10ec7080afa092b9fddb17c9cd972f459dba9411f94782cfc
 MISC metadata.xml 393 BLAKE2B 27dcc3bcbc5a0ec32bb751ec3bb8788c2c85d5d7743f0243749a88ace9b5a3faaa10adc84731dbec3e37208efef41e3d4124de57005345927e848a7cbca6b098 SHA512 1086491557aff2d6f3552829550db85332c809d20ec1e3517bfa311fdfb2a5386cc4b624481b4fd7db7e48ab39bb5d76e048461352b74cdecf89d904ef52590b
diff --git a/media-gfx/graphite2/files/graphite2-1.3.14_p20210810-cmake4.patch b/media-gfx/graphite2/files/graphite2-1.3.14_p20210810-cmake4.patch
new file mode 100644
index 000000000000..45cd95d6b4a6
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.3.14_p20210810-cmake4.patch
@@ -0,0 +1,93 @@
+From 915ed5f042f2edecce7e0d014a6b0e99efeb9ca5 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <mail@heiko-becker.de>
+Date: Thu, 20 Feb 2025 22:37:44 +0100
+Subject: [PATCH] CMake: Raised required version to 3.5
+
+CMake >= 4.0.0-rc1 removed compatibility with versions < 3.5 and errors
+out with such versions passed to cmake_minimum_required(). 3.5.0 has
+been released 9 years ago, so I'd assume it's available almost everywhere.
+
+Furthermore at least 3.1 was already required, because that's the
+version, which introduced CXX_STANDARD{,_REQUIRED}.
+
+Also remove the FATAL_ERROR part, which has been ignored since 2.6. and
+CMP0012 is now implicitly assumed to be NEW already.
+---
+ CMakeLists.txt                    | 3 +--
+ gr2fonttest/CMakeLists.txt        | 2 +-
+ src/CMakeLists.txt                | 3 +--
+ tests/bittwiddling/CMakeLists.txt | 2 +-
+ tests/json/CMakeLists.txt         | 2 +-
+ tests/sparsetest/CMakeLists.txt   | 2 +-
+ tests/utftest/CMakeLists.txt      | 2 +-
+ 7 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4870971d..a2e88fa6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,5 +4,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
+-cmake_policy(SET CMP0012 NEW)
++cmake_minimum_required(VERSION 3.5.0)
+ include(TestBigEndian)
+ find_package(PythonInterp 3.6)
+ project(graphite2)
+diff --git a/gr2fonttest/CMakeLists.txt b/gr2fonttest/CMakeLists.txt
+--- a/gr2fonttest/CMakeLists.txt
++++ b/gr2fonttest/CMakeLists.txt
+@@ -4,4 +4,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.5.0)
+ 
+ project(gr2fonttest)
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -2,8 +2,7 @@
+ #    internet at http://www.fsf.org/licenses/lgpl.html.
+ 
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.5.0)
+ project(graphite2_core)
+-cmake_policy(SET CMP0012 NEW)
+ INCLUDE(CheckCXXSourceCompiles)
+ 
+ set(GRAPHITE_API_CURRENT 3)
+diff --git a/tests/bittwiddling/CMakeLists.txt b/tests/bittwiddling/CMakeLists.txt
+--- a/tests/bittwiddling/CMakeLists.txt
++++ b/tests/bittwiddling/CMakeLists.txt
+@@ -4,4 +4,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.5.0)
+ project(bits)
+ include(Graphite)
+ include_directories(${graphite2_core_SOURCE_DIR})
+diff --git a/tests/json/CMakeLists.txt b/tests/json/CMakeLists.txt
+--- a/tests/json/CMakeLists.txt
++++ b/tests/json/CMakeLists.txt
+@@ -4,4 +4,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.5.0)
+ project(jsontest)
+ include(Graphite)
+ include_directories(${graphite2_core_SOURCE_DIR})
+diff --git a/tests/sparsetest/CMakeLists.txt b/tests/sparsetest/CMakeLists.txt
+--- a/tests/sparsetest/CMakeLists.txt
++++ b/tests/sparsetest/CMakeLists.txt
+@@ -4,4 +4,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.5.0)
+ project(sparsetest)
+ include(Graphite)
+ include_directories(${graphite2_core_SOURCE_DIR})
+diff --git a/tests/utftest/CMakeLists.txt b/tests/utftest/CMakeLists.txt
+--- a/tests/utftest/CMakeLists.txt
++++ b/tests/utftest/CMakeLists.txt
+@@ -4,4 +4,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.5.0)
+ project(utftest)
+ include(Graphite)
+ include_directories(${graphite2_core_SOURCE_DIR})
diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild
index 2bcb0888cd67..2338c037f3d0 100644
--- a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.14-fix-nodefaultlibs.patch"
 	"${FILESDIR}/${PN}-1.3.5-fix-gcc-linking.patch"
 	"${FILESDIR}/${PN}-1.3.14-gcc15.patch"
+	"${FILESDIR}/${P}-cmake4.patch" # bug 951367, PR#92 pending
 )
 
 pkg_setup() {
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 9b1b2b87a7b4..50187c96bc82 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,9 +1,10 @@
+AUX inkscape-1.4-cmake4.patch 1869 BLAKE2B f9491399f9e306b2fbce2ceaf90483e44b08b0cd6279a2b8034c547a4f2c420b07270a7bc0fcb032002418804f03d3e36dfc3e15147beb5cc0a5dc2a6a1f2881 SHA512 852445a4249c05745e88f9e2a2ae6d569123885aaffb567bea53d370a1928edee740f6eea528c4956cc7647752dfa3b101ab32b2162a85f34025a65a4ed9b275
 AUX inkscape-1.4-gcc15.patch 1088 BLAKE2B 56e9e4e14d87d20d7a03e388105ccdaa219fc26146c771c2c6942ca82abee54fb43d0807ce0ddf59cc77ec6e5184db5e628980209f5eda651ac6ee09af96f74e SHA512 b6f18c645c9946a7052c2d93df1475f1d9db626f200754b767f4372c17e056389c93fc129385d1c9ed3f0e329866696adfb8a61f6e4bc4058c23f20324287072
 AUX inkscape-1.4-poppler-24.10-fix-backport.patch 19196 BLAKE2B 02f58958180e2362f1e11a1cbacd72611b37cdaa41abd922df6106ef5485f243ef105286a92727b5731a4d0f607846a3e0a48fa53e3b9542d3667f136fd07f9b SHA512 6283ccd63157bc8ccdcf6127afa72cb50a72a9f09ec2327a5f180f0eb2d212e5600ed0f3d31df845cf6d20c2fe84d01f1edb126f39456a27de36cca616495fb9
 AUX inkscape-1.4-poppler-24.11.0.patch 2860 BLAKE2B e22bdc2ba2b394e3a3b5dcaa47297034b3bf0ef5198ad52d858f473ddb3f07b9b74c6ebc440705c0ca5c143dd5a2712cf70a46d0211a197afd909e177a55799f SHA512 e5a21326bc1191a5c037698a89d3022613a840736f0199954a4685027786126cc65f889241cd813d98807168dd3ddd9156b2cb927d62e29087d2cd51d5fd41f3
 AUX inkscape-1.4-poppler-24.12.0.patch 2049 BLAKE2B 23db3612e7c1527394c23de92a4ae25d5120012bfb3f61ddb2d99c282b49f14bee82f25873a8be3e21eff5da55cccfa694317b73726663f9810dbf2060211097 SHA512 99946d8266f818b26993860a96aba32d23d548970b94fe9fc66aefe3bec088c04fae9bdf2f146600f9588e7b4158ac2660e09697e57d7f5d50669d2d56eb4023
 AUX inkscape-1.4-poppler-25.02.0.patch 7137 BLAKE2B 2b1db205866926d59e211873ea0403738642c204822205002a009c77d51ca3a31e40a725c59c41b0d1cbf82b74c196aa75eacea5996214d8cac40e0f91445b38 SHA512 337a987d86feffd316f3a9a9644be079992912d6e4b55ebb8dd2e97a6bc6c49c48694722a811288259a1c3adeea01ac550263cc2154b2c591839b14a97c7b1f9
 DIST inkscape-1.4.tar.xz 46321868 BLAKE2B 3f21402019995122f043f5ebd8f07e1c9548c507f27c494e4214e090c46acae016c21f950609c95cef2e1b0011693e6629326d733b257402391e2d919bcd0303 SHA512 3b81306b81416597073e7eda2a103112cee63493bcf96fa737bb1edfbd682ebb329e415bbbbfda877aef2a78dc376460040ebc5c0cc2c90c0fe60db5d7d12368
-EBUILD inkscape-1.4-r1.ebuild 5952 BLAKE2B 35e9835016c29e5c88585d2c4950a3bfc8c235cbd231873268d9873889c27cd5e9814e9efd112acb5055db4a55ae04bab32d568d30b05a0c9c997e0536784d5a SHA512 3f1e7413764c77fd937f659f9be17d8c00190e096c946ef40ad55ca8ff53e84fc3bd8b5506d8a2c60c9426f3ff086ee66d3084f9ab6b94cc6338bb372f35c7bd
+EBUILD inkscape-1.4-r1.ebuild 5985 BLAKE2B b8284fc7670730ba6035d4413048b16904f917c228f63a818d4712c93d3ddcc2b02d2c996942ed6e3f58f001d382d6cf17b3cf47521dc694f5ce63b8d57a9095 SHA512 008c7ea22cd0372f5ee58922f468bcbdb72bab756c8f4c0682d6c2b72d6dbd8bc305ff3c4496aaafc0b5b3a7e9716e7708b1804a7d195ed5569478dac431d798
 EBUILD inkscape-9999.ebuild 5683 BLAKE2B 9cb6edc014ae7b2f98a7c919ffd5a71a79168e406f4b6a2eb399e59200f9d0aa13990696c7f63b4910546bb02fd2cbd9a317337dfc184151ad6c625a6b105a47 SHA512 9ed2fcf53d8403a81903ecc62c1be47d36d3f8e62a08e7f1956f50fba72c3f241d542f5bcff0d8f3bf323ed668268643331d89dd7b2d9dc8fc1b09ae57818e09
 MISC metadata.xml 982 BLAKE2B f44f534865614c8dd7bf71e92ce69cff708fc08e3eb701765bf93144b433ec52df52a506b69cc98969909c695015881b60592cccdf27613c6fe82812fc50727b SHA512 2963a9b473f139d06cefd1c3231ef148045c005adb4688850522c183f39ba15a36331b7eae7752e9bf15a26e6370f2af14ec02e59735f1753246c45821c0cdbc
diff --git a/media-gfx/inkscape/files/inkscape-1.4-cmake4.patch b/media-gfx/inkscape/files/inkscape-1.4-cmake4.patch
new file mode 100644
index 000000000000..38e8a4955f2e
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.4-cmake4.patch
@@ -0,0 +1,48 @@
+From e412149bd1da7b30846e87c09813f0b719a61089 Mon Sep 17 00:00:00 2001
+From: Marc Jeanmougin <marc@jeanmougin.fr>
+Date: Mon, 3 Feb 2025 19:40:11 +0100
+Subject: [PATCH] Bump cmake requirements
+
+---
+ CMakeLists.txt                           | 12 ++++--------
+ CMakeScripts/DefineDependsandFlags.cmake |  2 +-
+ 2 files changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3765ed4bd92..79bfa42a842 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,13 +1,9 @@
+ # SPDX-License-Identifier: GPL-2.0-or-later
+-cmake_minimum_required(VERSION 3.1.0)
++cmake_minimum_required(VERSION 3.12.0)
+ 
+-cmake_policy(SET CMP0003 NEW) # don't be prolific with library paths
+-cmake_policy(SET CMP0005 NEW) # proper define quoting
+-cmake_policy(SET CMP0009 NEW) # don't follow symbolic links when using GLOB
+-
+-if(POLICY CMP0075)
+-    cmake_policy(SET CMP0075 NEW) # link check-executable to CMAKE_REQUIRED_LIBRARIES (CMake 3.12.1)
+-endif(POLICY CMP0075)
++if(POLICY CMP0167)
++    cmake_policy(SET CMP0167 NEW) # use FindBoost from boost 1.70+ (cmake 3.30+)
++endif()
+ 
+ message("------------------------------")
+ message("Building Makefile for Inkscape")
+diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
+index bebb49e5e05..744e9787c34 100644
+--- a/CMakeScripts/DefineDependsandFlags.cmake
++++ b/CMakeScripts/DefineDependsandFlags.cmake
+@@ -164,7 +164,7 @@ add_definitions(${Intl_DEFINITIONS})
+ 
+ # Check for system-wide version of 2geom and fallback to internal copy if not found
+ if(NOT WITH_INTERNAL_2GEOM)
+-    pkg_check_modules(2Geom QUIET IMPORTED_TARGET GLOBAL 2geom>=1.4.0)
++    pkg_check_modules(2Geom QUIET IMPORTED_TARGET GLOBAL 2geom>=${INKSCAPE_VERSION_MAJOR}.${INKSCAPE_VERSION_MINOR})
+     if(2Geom_FOUND)
+         add_library(2Geom::2geom ALIAS PkgConfig::2Geom)
+     else()
+-- 
+GitLab
+
diff --git a/media-gfx/inkscape/inkscape-1.4-r1.ebuild b/media-gfx/inkscape/inkscape-1.4-r1.ebuild
index 5991d288758d..636bda3819fc 100644
--- a/media-gfx/inkscape/inkscape-1.4-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.4-r1.ebuild
@@ -118,6 +118,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-poppler-24.11.0.patch # bug 943499
 	"${FILESDIR}"/${P}-poppler-24.12.0.patch # bug 946597
 	"${FILESDIR}"/${P}-poppler-25.02.0.patch # bug 949531
+	"${FILESDIR}"/${P}-cmake4.patch
 )
 
 pkg_pretend() {