From 96cc0713998c294a9440f03dfa8c4adc9cb71f92 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 26 Jul 2023 10:30:48 +0100 Subject: gentoo auto-resync : 26:07:2023 - 10:30:48 --- dev-cpp/cppgir/Manifest | 5 +- dev-cpp/cppgir/cppgir-0_p20230625.ebuild | 49 -------------------- dev-cpp/cppgir/cppgir-0_p20230701.ebuild | 46 ++++++++++++++++++ .../files/cppgir-0_p20230625-fix-libcxx-16.patch | 54 ---------------------- 4 files changed, 48 insertions(+), 106 deletions(-) delete mode 100644 dev-cpp/cppgir/cppgir-0_p20230625.ebuild create mode 100644 dev-cpp/cppgir/cppgir-0_p20230701.ebuild delete mode 100644 dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch (limited to 'dev-cpp/cppgir') diff --git a/dev-cpp/cppgir/Manifest b/dev-cpp/cppgir/Manifest index 0acbcbc0aaf3..ddb7005e70e8 100644 --- a/dev-cpp/cppgir/Manifest +++ b/dev-cpp/cppgir/Manifest @@ -1,4 +1,3 @@ -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 +DIST cppgir-0_p20230701.tar.bz2 93266 BLAKE2B 73fe45188c8304da84cc39b838176a9100622f3a2aa6cdb7a8eb4c58bb16fe5a8772c8bdc0d7686a322d86bc1aba3b22c3b1ebfeab98e7d282f7258050249a50 SHA512 90378f73a7c05e8a4fdadddf0add35ffb90fce563eab97ef981d6f9dfbbc4a5d0e83c70a54de9fbbf23d85eb6ce02036e0ffbfafe67384fbc99a997fd8b92f0b +EBUILD cppgir-0_p20230701.ebuild 964 BLAKE2B bd152d60309e27ee527afcd046d176d7915341eb34a45dbe3368fa759b4c52015e7d937d15fd201c9a0aec40e6f28d780ad935085d368d862c51c4d636fc8962 SHA512 b337f724c80f04d46e05cb0f72a5bda4f72c86e621b8cee765a073e944a29c5c955212f1688440dbf3b3ac8bb24a87f3b4c4cd10d374bcb1e8cf011339a4412f MISC metadata.xml 567 BLAKE2B 0684a8a7347f840ff2d683d32ccf4fd37e0c617be78600dde97ad5f1bf5e897b01fbf40474eeaf3bd14a4efd99642dd7e062b05a61fc2a2f15722996b5422673 SHA512 fcd0bfcbaa4a4d684ab29bdc6ef3d251bc17206d548ce15644efa0a5b6cfc7e072c04c6a7e882307e73eb74347e971389fdb01462be28e5bbd9bb8c0ec8934e9 diff --git a/dev-cpp/cppgir/cppgir-0_p20230625.ebuild b/dev-cpp/cppgir/cppgir-0_p20230625.ebuild deleted file mode 100644 index 372c26104fd5..000000000000 --- a/dev-cpp/cppgir/cppgir-0_p20230625.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -DESCRIPTION="GObject-Introspection C++ binding wrapper generator" -HOMEPAGE="https://gitlab.com/mnauw/cppgir" - -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}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~riscv" -IUSE="doc test" -RESTRICT="!test? ( test )" - -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_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/cppgir-0_p20230701.ebuild b/dev-cpp/cppgir/cppgir-0_p20230701.ebuild new file mode 100644 index 000000000000..dccf44596ee6 --- /dev/null +++ b/dev-cpp/cppgir/cppgir-0_p20230701.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +DESCRIPTION="GObject-Introspection C++ binding wrapper generator" +HOMEPAGE="https://gitlab.com/mnauw/cppgir" + +MY_PV="ada922a260479da27c989e39ed47e17a36cc2969" +SRC_URI="https://gitlab.com/mnauw/cppgir/-/archive/${MY_PV}/cppgir-${MY_PV}.tar.bz2 -> ${P}.tar.bz2" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~riscv" +IUSE="doc test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/boost:= + dev-libs/libfmt:= +" +DEPEND="${RDEPEND} + dev-cpp/expected-lite +" +BDEPEND=" + doc? ( app-text/ronn-ng ) + test? ( dev-libs/glib ) +" + +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_p20230625-fix-libcxx-16.patch b/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch deleted file mode 100644 index 6ca80e05594b..000000000000 --- a/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch +++ /dev/null @@ -1,54 +0,0 @@ -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 --namespace fs = std::experimental::filesystem; -+#include -+namespace fs = std::filesystem; - - #include - #include ---- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/genbase.hpp -+++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/genbase.hpp -@@ -6,6 +6,7 @@ - #include "repository.hpp" - - #include -+#include - - struct GeneratorOptions - { ---- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/genns.cpp -+++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/genns.cpp -@@ -5,8 +5,8 @@ - #include - #include - --#include --namespace fs = std::experimental::filesystem; -+#include -+namespace fs = std::filesystem; - - #include - -- cgit v1.2.3