gentoo auto-resync : 21:07:2023 - 10:04:00

6 files changed, 70 insertions, 104 deletions

diff --git a/dev-cpp/cppgir/Manifest b/dev-cpp/cppgir/Manifest
index 9540734d9dc9..0acbcbc0aaf3 100644
--- a/dev-cpp/cppgir/Manifest
+++ b/dev-cpp/cppgir/Manifest
@@ -1,6 +1,4 @@
-AUX cppgir-0_p20230606-fix-install-paths.patch 568 BLAKE2B 28a112093185d321ca7f3da3ff03ca4c61bb8bdce5a52d3264a6eb6c262bccfc5ced9f99def9c67815e175ffdb9f85ba2a31b87fb10b59ca001db457fd48d795 SHA512 8cc170277575230598553efa0a7bc99ad7fe4ae67d2ca78601c477ebdb8acc9adba50491a222e1a9dd66395bfce98f64a0c8bfe5238af1586289ee1ea11b8a31
-AUX cppgir-0_p20230606-prevent-automagic.patch 1428 BLAKE2B 0ecde5f934ad3b5f015ad83b2b995faecfdf5944e9fb30d935817d2ec4357db3ac4dda334d2b407cda5e8a8ce2ee4f59535f8c5c61f12a21fb4ce155a754af61 SHA512 97d52877a14753a1e6ab4b8aceb70e04ba44207cf16cfcbd44235190087677201189b5bd5528db912628dd62c909a7fba5933611014dcd3bf159ea0facf83f24
-AUX cppgir-0_p20230606-system-expected-lite.patch 1397 BLAKE2B 2c6996525fcaba5718aa5959f43838bbc9a3429057722fd6b0c74723c02c1b2e74c0026db9f0334768288d406465f86b75dd9049c912e3567ae6cb53766b8739 SHA512 92b3fb8041f1283c3d8a000c914597b56871f0f69c73738baa9fd2588e55d925f6284646701adc0ca2c1ed9b126615fd34280e4e36f7cbddc7ac3228f7432b54
-DIST cppgir-0_p20230606.tar.bz2 92576 BLAKE2B 47d43405eee8cebb782a3021e8398ce61ced23094424ced9f1bfaf390bfd83b7fa6e6fe5e0689886857cef3c992f9318de99d9e38362c2777a409cf597b55f7a SHA512 832c99379b0203db9b2cfefa530fc8f68411da5b0f121a37ab1b60dfa39e929a0d95971c4161a744dc5b3ddbb92848f1bbce9b265f9d4d5724084c08ab8fd4f4
-EBUILD cppgir-0_p20230606.ebuild 935 BLAKE2B 940ae68d52a0a96b30b6186eb9ced518b759a9d9ef1ced40903d6dd3c5844671669a8081ae949fa7e184f5532a40438a7f501a42d62823d22b1f3987dec30ef3 SHA512 4588557cb31969e1c81fbbcae65c7e44702e648906a4de5c8d52bfa2eae82dd5ae1b42c074dd1abb04627d3bc223110acfe2322ad4de1a7a35c63f7839312140
+AUX cppgir-0_p20230625-fix-libcxx-16.patch 1943 BLAKE2B 5fbb16f325508ddac66b07754eac33032eae18aaa79b8a1813e4cd92477ab47808031a322a8c983a7bdec2a513846574e960c9d4e9ade3dbbf8726c8eccbd8e5 SHA512 50ae0d4b096d3b35bf00db2431a64e7a86b50d148fc5d7090312db88755de8710285a9a11377d6adbb437c1f0a1fba52f78b1421a794231ef132ac3281251917
+DIST cppgir-0_p20230625.tar.bz2 93259 BLAKE2B 7593ed17391d40ba69c2915a6f3750ac5a0596977a1ddf61aad2db40e61b967ec8b4a9f6f11b22a2f15660344358b2f4cfd2f46aa50d565163b0508ac411d974 SHA512 9167650ff6d22b2da7c824c91b864a104950ed44156c4fdd222abef3261b7ae9639dbafaca4ad3c175da7707bbf221ef166778c4227bb395149b804e74d91693
+EBUILD cppgir-0_p20230625.ebuild 1030 BLAKE2B c0857d6742d80577212bf358b2f177e24b5a2d0a55206d5a21782a618e00f0fdb4aad78d95e46e994a6b29826538decb3967f5dfedbb7556a304faeccde1e4af SHA512 f59ee1d9a6b698de05f7c13bb56d899cd6c39dbc149849d888541c85d90447979a92b73a625331a887d887e9f204d5873acc3cc3679539ebc535e09887debcaa
 MISC metadata.xml 567 BLAKE2B 0684a8a7347f840ff2d683d32ccf4fd37e0c617be78600dde97ad5f1bf5e897b01fbf40474eeaf3bd14a4efd99642dd7e062b05a61fc2a2f15722996b5422673 SHA512 fcd0bfcbaa4a4d684ab29bdc6ef3d251bc17206d548ce15644efa0a5b6cfc7e072c04c6a7e882307e73eb74347e971389fdb01462be28e5bbd9bb8c0ec8934e9
diff --git a/dev-cpp/cppgir/cppgir-0_p20230606.ebuild b/dev-cpp/cppgir/cppgir-0_p20230625.ebuild
index 67237396897c..372c26104fd5 100644
--- a/dev-cpp/cppgir/cppgir-0_p20230606.ebuild
+++ b/dev-cpp/cppgir/cppgir-0_p20230625.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="GObject-Introspection C++ binding wrapper generator"
 HOMEPAGE="https://gitlab.com/mnauw/cppgir"
 
-MY_PV="960fe054ffaab7cf55722fea6094c56a8ee8f18e"
+MY_PV="70b0e3d522cec60316d116dcbd919b797e85685a"
 SRC_URI="https://gitlab.com/mnauw/cppgir/-/archive/${MY_PV}/cppgir-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
 S="${WORKDIR}/${PN}-${MY_PV}"
 
@@ -18,26 +18,32 @@ KEYWORDS="~amd64 ~riscv"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	dev-cpp/expected-lite
+RDEPEND="
 	dev-libs/boost:=
 	dev-libs/libfmt:=
 "
+DEPEND="${RDEPEND}
+	dev-cpp/expected-lite"
 BDEPEND="
 	doc? ( app-text/ronn-ng )
+	test? ( dev-libs/glib )
 "
 
 PATCHES=(
-	"${FILESDIR}/cppgir-0_p20230606-system-expected-lite.patch"
-	"${FILESDIR}/cppgir-0_p20230606-fix-install-paths.patch"
-	"${FILESDIR}/cppgir-0_p20230606-prevent-automagic.patch"
+	"${FILESDIR}/cppgir-0_p20230625-fix-libcxx-16.patch"
 )
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOC=$(usex doc)
 		-DBUILD_TESTING=$(usex test)
+		-DBUILD_EXAMPLES=no
+		-DINTERNAL_EXPECTED=no
 	)
 
+	append-cppflags \
+		-UDEFAULT_GIRPATH \
+		-DDEFAULT_GIRPATH="${EPREFIX}/usr/share:${EPREFIX}/usr/local/share"
+
 	cmake_src_configure
 }
diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230606-fix-install-paths.patch b/dev-cpp/cppgir/files/cppgir-0_p20230606-fix-install-paths.patch
deleted file mode 100644
index c27d1e9f29b0..000000000000
--- a/dev-cpp/cppgir/files/cppgir-0_p20230606-fix-install-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Install cmake targets in correct directory
-
---- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/CMakeLists.txt
-+++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/CMakeLists.txt
-@@ -259,7 +259,7 @@
-     DESTINATION ${GI_IGNORE_FILE_INSTALL_DIR})
- 
- # cmake EXPORTS
--set(CONFIG_PACKAGE_LOCATION lib/cmake/${PROJECT_NAME})
-+set(CONFIG_PACKAGE_LOCATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
- set(CONFIG_VERSION_NAME ${PROJECT_NAME}-config-version.cmake)
- set(CONFIG_TARGETS_NAME ${PROJECT_NAME}-targets.cmake)
- set(CONFIG_NAME ${PROJECT_NAME}-config.cmake)
diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230606-prevent-automagic.patch b/dev-cpp/cppgir/files/cppgir-0_p20230606-prevent-automagic.patch
deleted file mode 100644
index 8bb3ab5c4496..000000000000
--- a/dev-cpp/cppgir/files/cppgir-0_p20230606-prevent-automagic.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Remove checks for libraries that are completely unnecessary
-
---- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/CMakeLists.txt
-+++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/CMakeLists.txt
-@@ -79,15 +79,14 @@
- find_package(expected-lite REQUIRED)
- target_link_libraries(gi PUBLIC expected-lite)
- 
--include(FindPkgConfig)
--pkg_check_modules(GOBJECT gobject-2.0)
--pkg_check_modules(GIO gio-2.0 gio-unix-2.0)
--pkg_check_modules(GST gstreamer-1.0)
--pkg_check_modules(GTK gtk+-3.0)
-+if (BUILD_TESTING)
-+    include(FindPkgConfig REQUIRED)
-+    pkg_check_modules(GOBJECT gobject-2.0 REQUIRED)
-+endif()
- 
- ## TEST ##
- 
--if (BUILD_TESTING AND GOBJECT_FOUND)
-+if (BUILD_TESTING)
-     add_executable(gi-test test/main.cpp
-         test/test_object.c test/test_object.h test/test_boxed.c test/test_boxed.h)
-     target_include_directories(gi-test PRIVATE "gi" "override")
-@@ -113,7 +112,7 @@
- set(EXAMPLE_TARGETS "")
- set(EXAMPLE_NS "")
- 
--if (GOBJECT_FOUND)
-+if (FALSE)
-     add_executable(example-gobject EXCLUDE_FROM_ALL examples/gobject.cpp)
-     target_compile_options(example-gobject PRIVATE ${GOBJECT_CFLAGS})
-     target_link_libraries(example-gobject PRIVATE ${GOBJECT_LDFLAGS})
-@@ -179,7 +178,6 @@
- endif ()
- 
- # optional Qt example
--find_package(Qt5Core 5.9)
- if (Qt5Core_FOUND AND GIO_FOUND)
-     set(CMAKE_INCLUDE_CURRENT_DIR ON)
-     add_executable(example-gio-qt-async EXCLUDE_FROM_ALL examples/gio-qt-async.cpp)
diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230606-system-expected-lite.patch b/dev-cpp/cppgir/files/cppgir-0_p20230606-system-expected-lite.patch
deleted file mode 100644
index 096ed39dc03b..000000000000
--- a/dev-cpp/cppgir/files/cppgir-0_p20230606-system-expected-lite.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Use system-wide copy of expected-lite
-
---- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/CMakeLists.txt
-+++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/CMakeLists.txt
-@@ -76,14 +76,8 @@
-     "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/override>"
- )
- 
--set(EXPECTED_LITE_INCLUDE "expected-lite/include")
--if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${EXPECTED_LITE_INCLUDE}/nonstd/expected.hpp)
--    target_include_directories(gi INTERFACE
--        "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/${EXPECTED_LITE_INCLUDE}>"
--    )
--else ()
--    message (FATAL_ERROR "missing submodule expected-lite")
--endif ()
-+find_package(expected-lite REQUIRED)
-+target_link_libraries(gi INTERFACE nonstd::expected-lite)
- 
- include(FindPkgConfig)
- pkg_check_modules(GOBJECT gobject-2.0)
-@@ -241,8 +235,6 @@
- # headers
- install(DIRECTORY gi override
-     DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME})
--install(DIRECTORY ${EXPECTED_LITE_INCLUDE}/nonstd
--    DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME}/gi)
- 
- # doc
- install(FILES README.md docs/cppgir.md
---- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/cmake/cppgir-config.cmake
-+++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/cmake/cppgir-config.cmake
-@@ -1 +1,4 @@
-+include(CMakeFindDependencyMacro)
-+find_dependency(expected-lite)
-+
- include("${CMAKE_CURRENT_LIST_DIR}/cppgir-targets.cmake")
diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch b/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch
new file mode 100644
index 000000000000..6ca80e05594b
--- /dev/null
+++ b/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch
@@ -0,0 +1,54 @@
+Fix building with libcxx-16
+
+https://bugs.gentoo.org/909316
+https://gitlab.com/mnauw/cppgir/-/issues/41
+
+--- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/CMakeLists.txt
++++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/CMakeLists.txt
+@@ -65,8 +65,8 @@
+     -DDEFAULT_GIRPATH=${GI_DEFAULT_GIRPATH})
+ target_compile_definitions(cppgir PRIVATE
+     -DDEFAULT_IGNORE_FILE=${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE}:${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE_PLATFORM})
+-target_link_libraries(cppgir Boost::program_options stdc++fs ${FORMAT_LIBRARIES})
+-set_property(TARGET cppgir PROPERTY CXX_STANDARD 14)
++target_link_libraries(cppgir Boost::program_options ${FORMAT_LIBRARIES})
++set_property(TARGET cppgir PROPERTY CXX_STANDARD 17)
+ 
+ add_library(gi INTERFACE)
+ target_include_directories(gi INTERFACE
+--- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/cppgir.cpp
++++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/cppgir.cpp
+@@ -3,8 +3,8 @@
+ #include "genns.hpp"
+ #include "repository.hpp"
+ 
+-#include <experimental/filesystem>
+-namespace fs = std::experimental::filesystem;
++#include <filesystem>
++namespace fs = std::filesystem;
+ 
+ #include <boost/algorithm/string/classification.hpp>
+ #include <boost/algorithm/string/split.hpp>
+--- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/genbase.hpp
++++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/genbase.hpp
+@@ -6,6 +6,7 @@
+ #include "repository.hpp"
+ 
+ #include <set>
++#include <map>
+ 
+ struct GeneratorOptions
+ {
+--- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/genns.cpp
++++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/genns.cpp
+@@ -5,8 +5,8 @@
+ #include <boost/algorithm/string/join.hpp>
+ #include <boost/format.hpp>
+ 
+-#include <experimental/filesystem>
+-namespace fs = std::experimental::filesystem;
++#include <filesystem>
++namespace fs = std::filesystem;
+ 
+ #include <boost/property_tree/xml_parser.hpp>
+