gentoo auto-resync : 22:04:2024 - 12:05:36

5 files changed, 86 insertions, 0 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index ce4666bd2b9f..7b395e624bdc 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/simpleini/Manifest b/dev-cpp/simpleini/Manifest
index d7aa2250f31a..3d4ea72e7bf8 100644
--- a/dev-cpp/simpleini/Manifest
+++ b/dev-cpp/simpleini/Manifest
@@ -1,4 +1,7 @@
 AUX simpleini-4.20-pkgconfig-var.patch 378 BLAKE2B d22f5e06b4f58211fa7481f1bd99925fd3617afba560937581f1b3e95c561a764b13ed04dc3e2bc164ff741c68da1ab7ab0cfab8f2f009f91cebbdbc10d9f3bc SHA512 414904be7071405d67a2fdd0151c15e86e457316ec182b68574282d43542c33670af53f375bd8dd1d302f6f752d8bdccbb012b4e95ee1cbfc66fddd037047325
+AUX simpleini-4.22-disable-tests.patch 514 BLAKE2B 4598b5ad979a61981d90ac08408adacde1b020d3b5323e092f87b51792289a7f9bb54d41f3e25c747758fbf00119cb3b4d2685916721376b2cb3a233790c2fff SHA512 056a896ca26a49ebd1f635c73e598553513aca01046908a969e3d302b3481b62dab48cc4596b3e7477bd5e8462f6aafb27559055a150862f835f847f97987dfa
+AUX simpleini-4.22-include-dir.patch 1125 BLAKE2B 5771bcf0ed46e4319c8067f9992511fd091d3f5248bc88349fa276d09c055abd576daafe6315ea7dcae71759a03d599e2cfa85e6c58b58e764d539b38602d1ac SHA512 cd47252943d9bc3ed06601c54afe1a38c9f8913e92193783a1f73ae3a0f8b2286bc77e075df7f3e96d6ae957eb0b956ce9865208a9246409bab25e053a8ba171
 DIST simpleini-4.22.tar.gz 65923 BLAKE2B 22c63d089aa30b9a15644b485b4f8238e4bf5c8bffad887eff2fa738f10d5506e960dda505dc858d72795a16ed6ba20850c90796a9ec18ef3117a6330baa2a48 SHA512 6c198636816a0018adbf7f735d402c64245c6fcd540b7360d4388d46f007f3a520686cdaec4705cb8cb31401b2cb4797a80b42ea5d08a6a5807c0848386f7ca1
+EBUILD simpleini-4.22-r1.ebuild 700 BLAKE2B 2979a1c03f31863367d5f371d5dd75ffdfceb3d1970e019655c65a4405b5bb835387319b2007ba7998006ab9c644cc3c9242eb47cfd55ca459b0524b54038bc9 SHA512 ce97b0330f598b340363bc6eb790795d679e4fc28973acccc3ec4a756b267fa595b50cf7e7dbd378246cf507b2cb2f2528e13f92906d6e628b4d1796284d7c26
 EBUILD simpleini-4.22.ebuild 849 BLAKE2B 72e0da6011f4bf792587e328c43cc8576519cf94ecdfb8aa8c256c3fe09c08b5a30042b067a9e746003d8a8f31b297eb7f977202714f132f5c21ed22793fb767 SHA512 fbccfe0a1ec10db00bb261d08a25b174e570cb07e51d0c07049b4194991fda866bd683a56783e0b65fad440669a561d1f6a6c8aee6f144768da26ecc3773f4dc
 MISC metadata.xml 337 BLAKE2B fa98273f3b1289d766527689796a928b6ac1bb7d325aba1fe5ddd52683004bf083c272491976cf5751116c643926188af906dc3bbcb8e857ba3c12cc8b0567cd SHA512 cf72312d53f82f169c7bd3f78b9d29224e50c760f0bb0afe69d522969eadb8535c1085369daf11c6bfaa23310cba1bc0053ee997c3aa27103e457209a60be0af
diff --git a/dev-cpp/simpleini/files/simpleini-4.22-disable-tests.patch b/dev-cpp/simpleini/files/simpleini-4.22-disable-tests.patch
new file mode 100644
index 000000000000..39347e75f769
--- /dev/null
+++ b/dev-cpp/simpleini/files/simpleini-4.22-disable-tests.patch
@@ -0,0 +1,16 @@
+https://github.com/brofield/simpleini/pull/75
+https://github.com/brofield/simpleini/commit/f7862c3dd7ad35becc2741f268e3402e89a37666
+From: Alexandre Bouvier <contact@amb.tf>
+Date: Tue, 2 Jan 2024 10:54:44 +0100
+Subject: [PATCH 2/2] cmake: really disable tests (#75)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -72,5 +72,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE
+ 
+ if(IS_TOPLEVEL_PROJECT)
+ 	include(CTest)
+-	add_subdirectory(tests)
++	if(BUILD_TESTING)
++		add_subdirectory(tests)
++	endif()
+ endif()
diff --git a/dev-cpp/simpleini/files/simpleini-4.22-include-dir.patch b/dev-cpp/simpleini/files/simpleini-4.22-include-dir.patch
new file mode 100644
index 000000000000..7370ae04b8b2
--- /dev/null
+++ b/dev-cpp/simpleini/files/simpleini-4.22-include-dir.patch
@@ -0,0 +1,35 @@
+https://github.com/brofield/simpleini/pull/74
+https://github.com/brofield/simpleini/commit/aeacf861a8ad8add5f4974792a88ffea393e41db
+From: Alexandre Bouvier <contact@amb.tf>
+Date: Tue, 2 Jan 2024 08:42:03 +0100
+Subject: [PATCH 1/2] cmake: fix namespace and include dir (#74)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,7 +48,7 @@ configure_package_config_file(${PROJECT_NAME}Config.cmake.in
+ )
+ 
+ install(FILES SimpleIni.h
+-	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
++	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ )
+ 
+ install(TARGETS ${PROJECT_NAME}
+@@ -62,12 +62,15 @@ install(FILES
+ )
+ install(EXPORT ${PROJECT_NAME}Targets
+ 	DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}
+-	NAMESPACE EXPORT_NAMESPACE
++	NAMESPACE ${EXPORT_NAMESPACE}
+ )
+ 
+-target_include_directories(${PROJECT_NAME} INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
++target_include_directories(${PROJECT_NAME} INTERFACE
++	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
++	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
++)
+ 
+ if(IS_TOPLEVEL_PROJECT)
+-	enable_testing()
++	include(CTest)
+ 	add_subdirectory(tests)
+ endif()
diff --git a/dev-cpp/simpleini/simpleini-4.22-r1.ebuild b/dev-cpp/simpleini/simpleini-4.22-r1.ebuild
new file mode 100644
index 000000000000..e584cfbdc410
--- /dev/null
+++ b/dev-cpp/simpleini/simpleini-4.22-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C++ library providing a simple API to read and write INI-style files"
+HOMEPAGE="https://github.com/brofield/simpleini/"
+SRC_URI="https://github.com/brofield/simpleini/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-include-dir.patch
+	"${FILESDIR}"/${P}-disable-tests.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DSIMPLEINI_USE_SYSTEM_GTEST=yes
+	)
+
+	cmake_src_configure
+}