8 files changed, 89 insertions, 4 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a7c3aaf0c021..036d9d084467 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index b5d4e5de445f..f885567c23ab 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -2,8 +2,8 @@ DIST libgit2-1.7.2.tar.gz 7548186 BLAKE2B c27870124c7e63a37794014a802a6fce46c577
 DIST libgit2-1.8.1.tar.gz 7608949 BLAKE2B 14558400d092dd963becfd3d4966a8d0799811be15fea8c5bc1e91be24f14bb81d33d82b2fb8dd8895e167f634a5d532d62a4609167bcb1d93143275207bbf6d SHA512 7429fbdc46ae44fd359e9260cbe33d9ce9276db810c096f12c43e5d302d01011463cdfd98d604e59780187e020e216e839823a77479dc12f952a37628516af78
 DIST libgit2-1.8.4.tar.gz 7610171 BLAKE2B 5a6fd422bba7f65b220b0c98bb851f79ec7d6173c3f34ebbdcfe12398e1a138af346da592bedfc52c99b39c8c28ef52d6e9244ec653b8b2f01732f2b1b4e35d2 SHA512 f1409d97c8cf072ea24f3d923fdc9468d21f171f72005c13c5358f520fdccb5f3950d1c7c16cea48a8a08df6a57280da46fe60c9b6aa8a8aae2ab1363c41d246
 DIST libgit2-1.9.0.tar.gz 7660744 BLAKE2B c81beab379bd78a66d28a48600527979a6c51d33f946df1f996f52ac274cadc88f7afb8c90683f584300941a214bc69389412fb6c9be3b48d22c708b41ca0e1d SHA512 38547ace676b933a3146c2a00405fc6815063a7af923b9f2c09c536ec717be77d19c513b383939054913ce617d7917c100a5cbd3378d101fcdb5eacd1d14f687
-EBUILD libgit2-1.7.2.ebuild 1649 BLAKE2B 0eae55b662f2f6bf26d51032e67da956b43aa32411ed9ef6fda13bff21f259218625df41482fb52057382280e8f70e4ef93b225db00319b27f0d825ad96cde1d SHA512 8badba9710a974eada587d36a16939e0027bcb6d05435ae1d5fa4336c0955e0c721e39ac0bc40b5e798237535f1446c1c13f272f81ec5b973696a3a3f85efd2a
+EBUILD libgit2-1.7.2.ebuild 1786 BLAKE2B 236aa3c9d8a34066fc8243bd6cb4511f6dc77fc97e81c79626b7ac26a476460bcc281832041c5193ff8e6027ebd0e7171cc1ea8164d14c4cfe00a46f0104c533 SHA512 10cd6e738e39b4b0d338292cd3b792e71117f2afdea39290c48aab4f6e707bfca89a4c700d45feef7f39a1897cb86faeab0f839c42934b52db30f498b754d93f
 EBUILD libgit2-1.8.1.ebuild 1575 BLAKE2B ee289fb92268a9fa7267626df4651552cbb8d0487610aa292cbba5de8afcb54a16f6b68ff4ea2a8c4dc070fea29691359d54fc45e5243bc5c24f1584ddaff420 SHA512 dc7fe7e6dd8844acc2846f4adf55642949fe62c2c7897239a4764ad2284c60bdb14a10c1d87ab1aff615e064755297aa61b1e18ba9c6014a7a784353fd2c8f71
-EBUILD libgit2-1.8.4.ebuild 1565 BLAKE2B e6fdc32a9e7db73980bea242bd7ed73cd581a96fd60794fc387423302200d2b3481e9c7ab4a64a6ca4c6559eb8353fb91fa4d06734c03da9dd50cbe7444b127b SHA512 6f44eb7651b86561d2a669506ef4e5a281cbe3c5a0f2f5a56ea39971e3ffc95b248b52cd6714a8dbbd5a4e3bc10058233b8dd6f5a78c7d1dd6af4bbb460479a8
-EBUILD libgit2-1.9.0.ebuild 1571 BLAKE2B 4d23069ab3d4265a9cc0bf22decfdf0aa9063ac50ba8488372a46efcce54ab7923b1e58b6e7dee76d2ba3892ccbfc1f166cf973a9abf8168f628d29ea880a6db SHA512 0bd7afc17a9e06ed5d0796a7aef1d400aa42ab4e2942180ebf4634ab46b2abbe69b2530ae52d18f390aede0a28dc337e3ac8ba9439cd4a19961797d9d58c5cf8
+EBUILD libgit2-1.8.4.ebuild 1702 BLAKE2B 917ccbdb96094f1fe6391336d5868171bf40eb242e3fccdb3e27aa69afebd5f795357cbc51b225eb4919ea22f5c6109314ea1fd80621cf65d1dc96f55ff3fa12 SHA512 f8d75a9854b4d6ee1a04aa1cecb0cd6316407e5f4759e7f8f42ef72b87b8d537dba69d33796384cef2c68c5501fef13b53bb064d7663f8641e14df41302f33e2
+EBUILD libgit2-1.9.0.ebuild 1708 BLAKE2B 3d11fd843c915c10cb061ae1f272459542572e65f4ee89ce68202c91c9c87b17254e5cc5721a2ac6ec4280f5ee1eaab1b9694e4e7be9e82e0f257105c8ebb42f SHA512 1ffa7bf0016fc20f63f329a2eec31b9db5464839dcd0d454454d798cad46d61a3a318c733aa605915e4baa847166a3b5f966fc6dd8f27d4040103bf7b86970d1
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.7.2.ebuild b/dev-libs/libgit2/libgit2-1.7.2.ebuild
index e6996dbfbafa..ae566db5ba70 100644
--- a/dev-libs/libgit2/libgit2-1.7.2.ebuild
+++ b/dev-libs/libgit2/libgit2-1.7.2.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
@@ -36,6 +36,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	cmake_src_prepare
+
+	# https://bugs.gentoo.org/948941
+	sed -i -e 's:-Werror::' tests/headertest/CMakeLists.txt || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTS=$(usex test)
diff --git a/dev-libs/libgit2/libgit2-1.8.4.ebuild b/dev-libs/libgit2/libgit2-1.8.4.ebuild
index 3a6f70228408..12157518741c 100644
--- a/dev-libs/libgit2/libgit2-1.8.4.ebuild
+++ b/dev-libs/libgit2/libgit2-1.8.4.ebuild
@@ -36,6 +36,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	cmake_src_prepare
+
+	# https://bugs.gentoo.org/948941
+	sed -i -e 's:-Werror::' tests/headertest/CMakeLists.txt || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTS=$(usex test)
diff --git a/dev-libs/libgit2/libgit2-1.9.0.ebuild b/dev-libs/libgit2/libgit2-1.9.0.ebuild
index 1f458761528f..f28cf27e10de 100644
--- a/dev-libs/libgit2/libgit2-1.9.0.ebuild
+++ b/dev-libs/libgit2/libgit2-1.9.0.ebuild
@@ -36,6 +36,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	cmake_src_prepare
+
+	# https://bugs.gentoo.org/948941
+	sed -i -e 's:-Werror::' tests/headertest/CMakeLists.txt || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTS=$(usex test)
diff --git a/dev-libs/qcustomplot/Manifest b/dev-libs/qcustomplot/Manifest
index 06ae96f1bffb..b43a8ac9d019 100644
--- a/dev-libs/qcustomplot/Manifest
+++ b/dev-libs/qcustomplot/Manifest
@@ -1,4 +1,6 @@
+AUX qcustomplot-2.1.1-qmake.patch 692 BLAKE2B 41fa50283a80fb1bcbc4823b69f8a9a1da7a5ad89259f2801e93f39ebb5634fc4d1f21c2db0221eca6104fddff90a886318fb95885e197123623a443580c49ab SHA512 18923cd8324da27dc07391a2fd33f066dda0a6c2a118b3a2fb9d40a6b61e8657c60359fcd95fa2866ba05939158def75578310db3bb67768ed71a8beb1790b58
 DIST qcustomplot-sharedlib-2.1.1.tar.gz 2315 BLAKE2B 5ded041a46a35dece817749479cba83da260407e387a339c5fba57a37897118b20cd50f362e78ea4a35c9babc5f6c73c235a671a17b5b0423b00e472c0a8eb60 SHA512 c661e4a835066fee92b254fbd7b825dbd5c58973189ff2099a01308cb81fe6bf3bac1456f5da91f01c6265f8f548f61b57e237d00a9b5c2c94acf1a024baa18e
 DIST qcustomplot-source-2.1.1.tar.gz 372955 BLAKE2B 985ce5fbfe2888ac2346a8c694e832f8d9e3d20ae1c2f93af8757f6a7c803e24ae429c11240aeaf9e79625d8eb0e8a835dca023b73eac4ca1338d21434bd3c67 SHA512 1feb4f45ef90d7709edb26c9964f0ec85ef4aa30f0a7e9fcd803fae586875e8d6744dbcfe08b21f461816ca426c8a6612f8e9c7ef9d3f5a7150c3de8fa5ee57d
+EBUILD qcustomplot-2.1.1-r10.ebuild 894 BLAKE2B d3bc274c52bea4c3b5db3e050979186d4c8cb05f5aaf680b74454a5d5167a0f7cbd350c7c6832a597a1d3f3e5ba75a1dd969def6237a702995f50190f459b5fe SHA512 d195f72e082dc59299ebea17d0d825313e6e2314a5ea0bf44529b32efb47ceec860377f314c85d48bbe9834e2d48e99da4eb34d9a55973cce2ef504706c76317
 EBUILD qcustomplot-2.1.1.ebuild 972 BLAKE2B 8a071aeed6c19955d12128c9b689ddb45c5f844706494b91c3a1c7b804c404d8da1b58948dcb7deaf6f870dad100d8a7267cc6fb4c1a4e8b819bc5203da68a09 SHA512 56f9ff5c8557cc05e9f0b613e75d9762360e98c2a95cbaa3347eb5fa64b02a7f1d85e12995e7a7cf6a91a3a8f850753979a356ef7f869320a9dc3d06625f3425
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/qcustomplot/files/qcustomplot-2.1.1-qmake.patch b/dev-libs/qcustomplot/files/qcustomplot-2.1.1-qmake.patch
new file mode 100644
index 000000000000..09c923d95875
--- /dev/null
+++ b/dev-libs/qcustomplot/files/qcustomplot-2.1.1-qmake.patch
@@ -0,0 +1,24 @@
+From 4c7cf0dfcccf2aa31d6117bb811b7baed84f8f4a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 28 Jan 2025 00:18:46 +0100
+Subject: [PATCH] Fix source paths
+
+---
+ qcustomplot.pro | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/qcustomplot.pro b/qcustomplot.pro
+index a437355..779e8e6 100755
+--- a/qcustomplot.pro
++++ b/qcustomplot.pro
+@@ -31,5 +31,5 @@ CONFIG(debug, debug|release) {
+ QMAKE_TARGET_COMPANY = "www.qcustomplot.com"
+ QMAKE_TARGET_COPYRIGHT = "Copyright (C) by Emanuel Eichhammer"
+ 
+-SOURCES += ../../qcustomplot.cpp
+-HEADERS += ../../qcustomplot.h
++SOURCES += qcustomplot.cpp
++HEADERS += qcustomplot.h
+-- 
+2.48.1
+
diff --git a/dev-libs/qcustomplot/qcustomplot-2.1.1-r10.ebuild b/dev-libs/qcustomplot/qcustomplot-2.1.1-r10.ebuild
new file mode 100644
index 000000000000..81f491b18b88
--- /dev/null
+++ b/dev-libs/qcustomplot/qcustomplot-2.1.1-r10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+DESCRIPTION="Qt C++ widget for plotting and data visualization"
+HOMEPAGE="https://www.qcustomplot.com/"
+SRC_URI="
+	https://www.qcustomplot.com/release/${PV}/QCustomPlot-sharedlib.tar.gz -> ${PN}-sharedlib-${PV}.tar.gz
+	https://www.qcustomplot.com/release/${PV}/QCustomPlot-source.tar.gz -> ${PN}-source-${PV}.tar.gz"
+S=${WORKDIR}/${PN}-source
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-qt/qtbase:6[gui,widgets]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-qmake.patch" )
+
+src_prepare() {
+	cp -a ../${PN}-sharedlib/sharedlib-compilation/sharedlib-compilation.pro ${PN}.pro || die
+	default
+}
+
+src_configure() {
+	eqmake6
+}
+
+src_install() {
+	dolib.so lib${PN}*
+	doheader ${PN}.h
+	dodoc changelog.txt
+}