diff options
Diffstat (limited to 'dev-cpp')
29 files changed, 161 insertions, 1055 deletions
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest index a721a1497021..db6b930e0d7f 100644 --- a/dev-cpp/asio/Manifest +++ b/dev-cpp/asio/Manifest @@ -1,4 +1,2 @@ +DIST asio-1-36-0.tar.gz 2858525 BLAKE2B 6b3a85e88509dd0184db7f3448be07e31a614709b16f4bec69e187f8bc450b08ec56dd0018e941d5509c65090e7f31a5ae9fb44220c00d8d7c7ce8cf27e3d960 SHA512 d44b35d9d1900de35aa10bf339c7e16a06e110377fd70fbefba91599d24cff32cc3dc88a4b0bf1e1706f9ac46177982edb5c7f969b72a57123be6550a3b062d8 DIST asio-1-38-0.tar.gz 2890996 BLAKE2B 23df98b87aaff488127901a19373872903a61e0b74bd17e83dbf535da02f1433b89be1d9501a8b95528789036c02bb678f641a08c64cc583f96839b303d90900 SHA512 88a71de9da318ad047effb3f1594617eba6996d443e885757bb301107bc51232e5338bde1a0df84b25bacb794805353ca409a1b641dadeb7fbcffbd6770ba29b -DIST asio-1.30.2.tar.bz2 3196850 BLAKE2B d902fda2338d9717bb8f2f5d43468c5d0b64591814c3ae3134350650f0dd97bf241287347d324b11d0e6993b1b44373df13305d736df09ad3375ce4976f5bb27 SHA512 2d26cdcfcc0c310e82ab502551b51d70fd95ba4628bd306929e78539299974fc14aa6ba27cf256f1df7a56539cb885012ba02a202ae17bf817ee6311308a795a -DIST asio-1.34.2.tar.bz2 3219261 BLAKE2B 91342cc53f0d6e940528ad3b7dcad314bb1ce66fe5a8985d889e2ada20341321463b527d443c6421e1e87f06ff99d2eddf032d32aa799e52b563d9278332ac93 SHA512 cdb7106a7330d66a302f601b45a5e444220f9e8932cb97536c8fd069e31aeb06a9a33cce67ad8154816845e7d24a9247f493c4d00c7359f5c6efaeec9d627a9f -DIST asio-1.36.0.tar.bz2 3217022 BLAKE2B 4ffe810c9d3eab6645594fc857e4c6dc835d7e4304c4f367020bfa0c370490cde2e9e88ae54ce65f665762f615127833aba1c0e2ae05752ad1037900eafe3c98 SHA512 87cfe606a38d3b697a15dacc35e367f556fb9e36b3d80785ddf3b59b6d214417ea7d483586077e7023f732b57a1369e2eb9b0f13be8b3f9f8bfdd59005683510 diff --git a/dev-cpp/asio/asio-1.30.2.ebuild b/dev-cpp/asio/asio-1.30.2.ebuild deleted file mode 100644 index 97f45a7525a6..000000000000 --- a/dev-cpp/asio/asio-1.30.2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Asynchronous Network Library" -HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio" -SRC_URI="https://downloads.sourceforge.net/asio/asio/${P}.tar.bz2" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" -IUSE="doc examples test" -RESTRICT="!test? ( test )" - -DEPEND=" - test? ( - dev-libs/boost - dev-libs/openssl - ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/asio-1.30.1-pkgconfig.patch" -) - -src_prepare() { - default - - eautoreconf - - if ! use test; then - # Don't build nor install any examples or unittests - # since we don't have a script to run them - cat > src/Makefile.in <<-EOF || die - all: - - install: - - clean: - EOF - fi -} - -src_install() { - use doc && local HTML_DOCS=( doc/. ) - default - - if use examples; then - # Get rid of the object files - emake clean - dodoc -r src/examples - docompress -x /usr/share/doc/${PF}/examples - - # Make links to the example .cpp files work - # https://bugs.gentoo.org/828648 - if use doc; then - dosym ../examples /usr/share/doc/${PF}/src/examples - fi - fi -} diff --git a/dev-cpp/asio/asio-1.34.2.ebuild b/dev-cpp/asio/asio-1.34.2.ebuild deleted file mode 100644 index fcb6bebd1e24..000000000000 --- a/dev-cpp/asio/asio-1.34.2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Asynchronous Network Library" -HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio" -SRC_URI="https://downloads.sourceforge.net/asio/asio/${P}.tar.bz2" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" -IUSE="doc examples test" -RESTRICT="!test? ( test )" - -DEPEND=" - test? ( - dev-libs/boost - dev-libs/openssl - ) -" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - - eautoreconf - - if ! use test; then - # Don't build nor install any examples or unittests - # since we don't have a script to run them - cat > src/Makefile.in <<-EOF || die - all: - - install: - - clean: - EOF - fi -} - -src_install() { - use doc && local HTML_DOCS=( doc/. ) - default - - if use examples; then - # Get rid of the object files - emake clean - dodoc -r src/examples - docompress -x /usr/share/doc/${PF}/examples - - # Make links to the example .cpp files work - # https://bugs.gentoo.org/828648 - if use doc; then - dosym ../examples /usr/share/doc/${PF}/src/examples - fi - fi -} diff --git a/dev-cpp/asio/asio-1.36.0.ebuild b/dev-cpp/asio/asio-1.36.0.ebuild index 8718e9e6a5fa..bb88b7a7ce5a 100644 --- a/dev-cpp/asio/asio-1.36.0.ebuild +++ b/dev-cpp/asio/asio-1.36.0.ebuild @@ -1,27 +1,31 @@ -# Copyright 1999-2026 Gentoo Authors +# Copyright 2021-2025 Liguros Authors # Distributed under the terms of the GNU General Public License v2 - EAPI=8 inherit autotools DESCRIPTION="Asynchronous Network Library" -HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio" -SRC_URI="https://downloads.sourceforge.net/asio/asio/${P}.tar.bz2" +HOMEPAGE="http://think-async.com/Asio/ https://github.com/chriskohlhoff/asio" +MY_PV=$(ver_rs 1- "-") +SRC_URI="https://github.com/chriskohlhoff/asio/archive/${PN}-${MY_PV}.tar.gz" LICENSE="Boost-1.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" -IUSE="doc examples test" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc examples ssl test" RESTRICT="!test? ( test )" +# test searches for libssl during ./configure, and REQUIRED_USE is easier than +# patching configure to not search for it with USE=-ssl +REQUIRED_USE="test? ( ssl )" + +RDEPEND="dev-libs/boost:= + ssl? ( + dev-libs/openssl:0= -DEPEND=" - test? ( - dev-libs/boost - dev-libs/openssl - ) -" -BDEPEND="virtual/pkgconfig" + )" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/${PN}-${PN}-${MY_PV}/asio src_prepare() { default @@ -50,11 +54,5 @@ src_install() { emake clean dodoc -r src/examples docompress -x /usr/share/doc/${PF}/examples - - # Make links to the example .cpp files work - # https://bugs.gentoo.org/828648 - if use doc; then - dosym ../examples /usr/share/doc/${PF}/src/examples - fi fi } diff --git a/dev-cpp/asio/asio-1.38.0.ebuild b/dev-cpp/asio/asio-1.38.0.ebuild index c7d20c62dc4e..7e9067a32e57 100644 --- a/dev-cpp/asio/asio-1.38.0.ebuild +++ b/dev-cpp/asio/asio-1.38.0.ebuild @@ -1,32 +1,35 @@ -# Copyright 1999-2026 Gentoo Authors +# Copyright 2021-2026 Liguros Authors # Distributed under the terms of the GNU General Public License v2 - EAPI=8 inherit autotools DESCRIPTION="Asynchronous Network Library" -HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio" -SRC_URI="https://github.com/chriskohlhoff/asio/archive/refs/tags/asio-${PV//./-}.tar.gz" -S="${WORKDIR}/asio-asio-${PV//./-}" +HOMEPAGE="http://think-async.com/Asio/ https://github.com/chriskohlhoff/asio" +MY_PV=$(ver_rs 1- "-") +SRC_URI="https://github.com/chriskohlhoff/asio/archive/${PN}-${MY_PV}.tar.gz" LICENSE="Boost-1.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="examples test" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc examples ssl test" RESTRICT="!test? ( test )" DEPEND=" test? ( dev-libs/boost - dev-libs/openssl + ssl? ( + dev-libs/openssl:0= + + ) ) " BDEPEND="virtual/pkgconfig" +S=${WORKDIR}/${PN}-${PN}-${MY_PV}/ + src_prepare() { default - eautoreconf if ! use test; then @@ -43,6 +46,7 @@ src_prepare() { } src_install() { + use doc && local HTML_DOCS=( doc/. ) default if use examples; then @@ -50,5 +54,11 @@ src_install() { emake clean dodoc -r src/examples docompress -x /usr/share/doc/${PF}/examples + + # Make links to the example .cpp files work + # https://bugs.gentoo.org/828648 + if use doc; then + dosym ../examples /usr/share/doc/${PF}/src/examples + fi fi } diff --git a/dev-cpp/asio/files/asio-1.30.1-pkgconfig.patch b/dev-cpp/asio/files/asio-1.30.1-pkgconfig.patch deleted file mode 100644 index c58b2a9df86d..000000000000 --- a/dev-cpp/asio/files/asio-1.30.1-pkgconfig.patch +++ /dev/null @@ -1,24 +0,0 @@ -Install .pc file to /usr/share instead of /usr/lib because there are no .so files - ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,6 @@ - AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip - --pkgconfig_DATA = asio.pc --pkgconfigdir = $(libdir)/pkgconfig -+noarch_pkgconfig_DATA = asio.pc - - SUBDIRS = include src - ---- a/configure.ac -+++ b/configure.ac -@@ -8,7 +8,7 @@ AM_PROG_CC_C_O - AC_PROG_CXX - AC_LANG(C++) - AC_PROG_RANLIB --PKG_INSTALLDIR -+PKG_NOARCH_INSTALLDIR - - AC_DEFINE(_REENTRANT, [1], [Define this]) - diff --git a/dev-cpp/asio/metadata.xml b/dev-cpp/asio/metadata.xml index 0575427af993..e77b6b0f2382 100644 --- a/dev-cpp/asio/metadata.xml +++ b/dev-cpp/asio/metadata.xml @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> + <maintainer type="project"> + <email>dev@liguros.net</email> + <name>Development</name> + </maintainer> + <maintainer type="person"> <email>alexey+gentoo@asokolov.org</email> <name>Alexey Sokolov</name> </maintainer> - <maintainer type="project" proxied="proxy"> + <maintainer type="project"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest index e0a3b636789a..ed59b96b1066 100644 --- a/dev-cpp/cpp-httplib/Manifest +++ b/dev-cpp/cpp-httplib/Manifest @@ -1,6 +1,2 @@ -DIST cpp-httplib-0.26.0.tar.gz 1305573 BLAKE2B 4fcb11a4d3af71fa5b67f2dac7c0f3e0a5cae6ed2bf527686ca05dd03b4a91042dfdcfb068b5dc7dd58fd31a537a44ae6f38df7c5d87a1973e3ff738a51dd946 SHA512 b364500f76e2ecb0fe21b032d831272e3f1dfeea71af74e325f8fc4ce9dcdb3c941b97a5b422bdeafb9facd058597b90f8bfc284fb9afe3c33fefa15dd5a010b -DIST cpp-httplib-0.27.0.tar.gz 1311061 BLAKE2B b273d9ac6a79d74b47d27b49357f0d9ae61501cecba21b61cd53a74d056b9acdaeba530cdfd02111debaadab15c9076e44727997be32de3947eaf16ecdc846c5 SHA512 884d6be8209d8128af2b11c35d7fc592d8a236a65cdcd9b123a77aa73fbd0dbd03c1cbe17cf4dd92797b06d312c9476d59646b9034d8e559095852b021138acc -DIST cpp-httplib-0.28.0.tar.gz 1312543 BLAKE2B af3d76280bf7299575e04cafd058f7bc223481d5c0316cc8a5d87850de6243174e138be0625e5939ff1c815003ba45c556d14f04b20a26c67bdca313b75e133c SHA512 e7a8877d489c97669a8ee536e1498575be921e558ed947253013fe6b67a49d4569eedd01f543caa70183b92d8ac0e8687d662a70d880954412e387317008a239 -DIST cpp-httplib-0.32.0.tar.gz 1380621 BLAKE2B 501e9f6f4076d2a6b2b1526d9b2d39effdd382d9967d546f157472ac4ec9943d6b35fdb66825a3e000698f6be5b7ead6d5ddd658841f24c6da0e8babc424a89f SHA512 09ab022b36ac6a7faf73863a504c460edb975669edfbf6323a4d42d3e4e38e4b6e63bc95ee39b29871730abf5205f9a3bd1ff9a04fc8ba921f1ecf6c357deef4 -DIST cpp-httplib-0.37.0.tar.gz 1448679 BLAKE2B 393286afc934b9ee2355cea504ff9ddcbecab3b3237c3c35292737a73e20c6f2338157abc8b8922126c3a360eeb43475262bf3f24250751374082cf172412d90 SHA512 5efa8140aadffe105dcf39935b732476e95755f6c7473ada3d0b64df2bc02c557633ae3948a25b45e1cf67e89a3ff6329fb30362e4ac033b9a1d1e453aa2eded -DIST cpp-httplib-0.38.0.tar.gz 1458103 BLAKE2B d94aad7aeef09770473e93c7ef88951a9911f98a2d0d77bc3a0ae9bd0e7868eb92ad57b49d381c1e6b5ea8229e1f3c5a9f28823277c20daa994d17e212176bbd SHA512 d8dfd5a447db4d6eb2a92c498af18cb3bf999ed43ef9a9552a8781f9c23597a3d178d2a15f5fa0afb68f2ec278080e6d4808cef5cfa68a8ed5f0c57b42bdbee7 +DIST cpp-httplib-0.45.0.tar.gz 1868625 BLAKE2B ffb6b9cac9d6505a5eb57d4c902c1d28a0de021a9c67b0ab6a3fb1f3a51c8ca8fac78e5181422ed74a7dcd170d9f66f34d6fff2a98e9179675f6802f97e81a37 SHA512 4cafb05af28720729a71c9fed519361cf6b6ba9fd702dadc2f0b4fffb0a974c489d5ff0e77eb72a8e26efc0ad0b74fbdc16ee30b7a20a221c9f98c9200e639f0 +DIST cpp-httplib-0.46.0.tar.gz 1880471 BLAKE2B 35e7109db9329da53d2416648daf401e1bdbb98b979ae31f211fb83f735e12cf320a996c80d7efe5418a18a54485a7f7ead476a7276c341316ca4c2c2caa54e1 SHA512 159ed94965018f2a371d45a3bfc1961e5fb1549e501ded70a6b4532d7fe99d0579c18b5195aff6e35f96f399b426cea2650ec9fb75ef80d4c9edeccb51f2e6c9 diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.28.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.28.0.ebuild deleted file mode 100644 index 2da8a068abbb..000000000000 --- a/dev-cpp/cpp-httplib/cpp-httplib-0.28.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 2022-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{13..14} ) - -inherit cmake-multilib python-any-r1 toolchain-funcs - -DESCRIPTION="C++ HTTP/HTTPS server and client library" -HOMEPAGE="https://github.com/yhirose/cpp-httplib/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/yhirose/${PN}.git" -else - SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="MIT" -SLOT="0/$(ver_cut 0-2)" # soversion - -IUSE="brotli ssl test zlib zstd" -REQUIRED_USE="test? ( brotli zlib zstd )" -RESTRICT="!test? ( test )" - -RDEPEND=" - brotli? ( - app-arch/brotli:=[${MULTILIB_USEDEP}] - ) - ssl? ( - >=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}] - ) - zlib? ( - virtual/zlib:=[${MULTILIB_USEDEP}] - ) - zstd? ( - app-arch/zstd[${MULTILIB_USEDEP}] - ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig -" - -src_configure() { - local -a mycmakeargs=( - -DHTTPLIB_COMPILE=yes - -DHTTPLIB_SHARED=yes - -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no - -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no - -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no - -DHTTPLIB_USE_ZSTD_IF_AVAILABLE=no - -DHTTPLIB_REQUIRE_BROTLI=$(usex brotli) - -DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl) - -DHTTPLIB_REQUIRE_ZLIB=$(usex zlib) - -DHTTPLIB_REQUIRE_ZSTD=$(usex zstd) - -DPython3_EXECUTABLE="${PYTHON}" - ) - cmake-multilib_src_configure -} - -multilib_src_test() { - cp -p -R --reflink=auto "${S}/test" ./test || die - - local -a failing_tests=( - # Disable all online tests. - "*.*_Online" - - # Fails on musl x86: - ServerTest.GetRangeWithMaxLongLength - ServerTest.GetStreamedWithTooManyRanges - ) - - # Little dance to please the GTEST filter (join array using ":"). - failing_tests_str="${failing_tests[@]}" - failing_tests_filter="${failing_tests_str// /:}" - - # PREFIX is . to avoid calling "brew" and relying on stuff in /opt - GTEST_FILTER="-${failing_tests_filter}" emake -C test \ - CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=. -} diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.32.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.32.0.ebuild deleted file mode 100644 index 49fb3b4535f6..000000000000 --- a/dev-cpp/cpp-httplib/cpp-httplib-0.32.0.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 2022-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{13..14} ) - -inherit cmake-multilib python-any-r1 toolchain-funcs - -DESCRIPTION="C++ HTTP/HTTPS server and client library" -HOMEPAGE="https://github.com/yhirose/cpp-httplib/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/yhirose/${PN}.git" -else - SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="MIT" -SLOT="0/$(ver_cut 0-2)" # soversion - -IUSE="brotli mbedtls ssl test zlib zstd" -REQUIRED_USE="test? ( brotli zlib zstd )" -RESTRICT="!test? ( test )" - -RDEPEND=" - brotli? ( - app-arch/brotli:=[${MULTILIB_USEDEP}] - ) - ssl? ( - mbedtls? ( net-libs/mbedtls:3=[${MULTILIB_USEDEP}] ) - !mbedtls? ( >=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}] ) - ) - zlib? ( - virtual/zlib:=[${MULTILIB_USEDEP}] - ) - zstd? ( - app-arch/zstd[${MULTILIB_USEDEP}] - ) -" -DEPEND=" - ${RDEPEND} - test? ( - dev-cpp/gtest - dev-libs/openssl - net-misc/curl - ) -" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/cpp-httplib-0.32.0-cmake-mbedtls.patch" -) - -src_configure() { - local -a mycmakeargs=( - -DHTTPLIB_COMPILE=yes - -DHTTPLIB_SHARED=yes - -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no - -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no - -DHTTPLIB_USE_MBEDTLS_IF_AVAILABLE=no - -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no - -DHTTPLIB_USE_ZSTD_IF_AVAILABLE=no - -DHTTPLIB_REQUIRE_BROTLI=$(usex brotli) - -DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl $(usex mbedtls no yes)) - -DHTTPLIB_REQUIRE_MBEDTLS=$(usex ssl $(usex mbedtls)) - -DHTTPLIB_REQUIRE_ZLIB=$(usex zlib) - -DHTTPLIB_REQUIRE_ZSTD=$(usex zstd) - -DPython3_EXECUTABLE="${PYTHON}" - ) - cmake-multilib_src_configure -} - -multilib_src_test() { - if [[ ${ABI} == x86 ]]; then - ewarn "Upstream no longer supports 32 bits:" - ewarn https://github.com/yhirose/cpp-httplib/issues/2148 - return - fi - - cp -p -R --reflink=auto "${S}/test" ./test || die - - local -a failing_tests=( - # Disable all online tests. - "*.*_Online" - ) - - # Little dance to please the GTEST filter (join array using ":"). - failing_tests_str="${failing_tests[@]}" - failing_tests_filter="${failing_tests_str// /:}" - - # PREFIX is . to avoid calling "brew" and relying on stuff in /opt - GTEST_FILTER="-${failing_tests_filter}" emake -C test \ - CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=. -} diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.37.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.37.0.ebuild deleted file mode 100644 index b1a767b33e4d..000000000000 --- a/dev-cpp/cpp-httplib/cpp-httplib-0.37.0.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 2022-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{13..14} ) - -inherit cmake-multilib python-any-r1 toolchain-funcs - -DESCRIPTION="C++ HTTP/HTTPS server and client library" -HOMEPAGE="https://github.com/yhirose/cpp-httplib/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/yhirose/${PN}.git" -else - SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="MIT" -SLOT="0/$(ver_cut 0-2)" # soversion - -IUSE="brotli mbedtls ssl test zlib zstd" -REQUIRED_USE="test? ( brotli zlib zstd )" -RESTRICT="!test? ( test )" - -RDEPEND=" - brotli? ( - app-arch/brotli:=[${MULTILIB_USEDEP}] - ) - ssl? ( - mbedtls? ( net-libs/mbedtls:3=[${MULTILIB_USEDEP}] ) - !mbedtls? ( >=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}] ) - ) - zlib? ( - virtual/zlib:=[${MULTILIB_USEDEP}] - ) - zstd? ( - app-arch/zstd[${MULTILIB_USEDEP}] - ) -" -DEPEND=" - ${RDEPEND} - test? ( - dev-cpp/gtest - dev-libs/openssl - net-misc/curl - ) -" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig -" - -src_configure() { - local -a mycmakeargs=( - -DHTTPLIB_COMPILE=yes - -DHTTPLIB_SHARED=yes - -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no - -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no - -DHTTPLIB_USE_MBEDTLS_IF_AVAILABLE=no - -DHTTPLIB_USE_WOLFSSL_IF_AVAILABLE=no - -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no - -DHTTPLIB_USE_ZSTD_IF_AVAILABLE=no - -DHTTPLIB_REQUIRE_BROTLI=$(usex brotli) - -DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl $(usex mbedtls no yes)) - -DHTTPLIB_REQUIRE_MBEDTLS=$(usex ssl $(usex mbedtls)) - -DHTTPLIB_REQUIRE_ZLIB=$(usex zlib) - -DHTTPLIB_REQUIRE_ZSTD=$(usex zstd) - -DPython3_EXECUTABLE="${PYTHON}" - ) - cmake-multilib_src_configure -} - -multilib_src_test() { - if [[ ${ABI} == x86 ]]; then - ewarn "Upstream no longer supports 32 bits:" - ewarn https://github.com/yhirose/cpp-httplib/issues/2148 - return - fi - - cp -p -R --reflink=auto "${S}/test" ./test || die - - local -a failing_tests=( - # Disable all online tests. - "*.*_Online" - ) - - # Little dance to please the GTEST filter (join array using ":"). - failing_tests_str="${failing_tests[@]}" - failing_tests_filter="${failing_tests_str// /:}" - - # PREFIX is . to avoid calling "brew" and relying on stuff in /opt - GTEST_FILTER="-${failing_tests_filter}" emake -C test \ - CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=. -} diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.38.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.38.0.ebuild deleted file mode 100644 index cbf82650708a..000000000000 --- a/dev-cpp/cpp-httplib/cpp-httplib-0.38.0.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 2022-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{13..14} ) - -inherit cmake-multilib python-any-r1 toolchain-funcs - -DESCRIPTION="C++ HTTP/HTTPS server and client library" -HOMEPAGE="https://github.com/yhirose/cpp-httplib/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/yhirose/${PN}.git" -else - SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86" -fi - -LICENSE="MIT" -SLOT="0/$(ver_cut 0-2)" # soversion - -IUSE="brotli mbedtls ssl test zlib zstd" -REQUIRED_USE="test? ( brotli zlib zstd )" -RESTRICT="!test? ( test )" - -RDEPEND=" - brotli? ( - app-arch/brotli:=[${MULTILIB_USEDEP}] - ) - ssl? ( - mbedtls? ( net-libs/mbedtls:3=[${MULTILIB_USEDEP}] ) - !mbedtls? ( >=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}] ) - ) - zlib? ( - virtual/zlib:=[${MULTILIB_USEDEP}] - ) - zstd? ( - app-arch/zstd[${MULTILIB_USEDEP}] - ) -" -DEPEND=" - ${RDEPEND} - test? ( - dev-cpp/gtest - dev-libs/openssl - net-misc/curl - ) -" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig -" - -src_configure() { - local -a mycmakeargs=( - -DHTTPLIB_COMPILE=yes - -DHTTPLIB_SHARED=yes - -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no - -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no - -DHTTPLIB_USE_MBEDTLS_IF_AVAILABLE=no - -DHTTPLIB_USE_WOLFSSL_IF_AVAILABLE=no - -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no - -DHTTPLIB_USE_ZSTD_IF_AVAILABLE=no - -DHTTPLIB_REQUIRE_BROTLI=$(usex brotli) - -DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl $(usex mbedtls no yes)) - -DHTTPLIB_REQUIRE_MBEDTLS=$(usex ssl $(usex mbedtls)) - -DHTTPLIB_REQUIRE_ZLIB=$(usex zlib) - -DHTTPLIB_REQUIRE_ZSTD=$(usex zstd) - -DPython3_EXECUTABLE="${PYTHON}" - ) - cmake-multilib_src_configure -} - -multilib_src_test() { - if [[ $(tc-get-ptr-size) == 4 ]] ; then - ewarn "Upstream no longer supports 32 bits:" - ewarn "https://github.com/yhirose/cpp-httplib/issues/2148" - return - fi - - cp -p -R --reflink=auto "${S}/test" ./test || die - - local -a failing_tests=( - # Disable all online tests. - "*.*_Online" - ) - - # Little dance to please the GTEST filter (join array using ":"). - failing_tests_str="${failing_tests[@]}" - failing_tests_filter="${failing_tests_str// /:}" - - # PREFIX is . to avoid calling "brew" and relying on stuff in /opt - GTEST_FILTER="-${failing_tests_filter}" emake -C test \ - CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=. -} diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.27.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.45.0.ebuild index e43532a47cfe..37f1748ea705 100644 --- a/dev-cpp/cpp-httplib/cpp-httplib-0.27.0.ebuild +++ b/dev-cpp/cpp-httplib/cpp-httplib-0.45.0.ebuild @@ -1,6 +1,5 @@ -# Copyright 2022-2025 Gentoo Authors +# Copyright 2024-2026 Liguros Authors # Distributed under the terms of the GNU General Public License v2 - EAPI=8 PYTHON_COMPAT=( python3_{13..14} ) @@ -10,21 +9,13 @@ inherit cmake-multilib python-any-r1 toolchain-funcs DESCRIPTION="C++ HTTP/HTTPS server and client library" HOMEPAGE="https://github.com/yhirose/cpp-httplib/" -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/yhirose/${PN}.git" -else - SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - +SRC_URI="https://github.com/yhirose/cpp-httplib/archive/v${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" LICENSE="MIT" -SLOT="0/$(ver_cut 0-2)" # soversion +SLOT="0/$(ver_cut 1-2)" # soversion -IUSE="brotli ssl test zlib zstd" +IUSE="brotli ssl test zlib" +REQUIRED_USE="test? ( brotli ssl zlib )" RESTRICT="!test? ( test )" RDEPEND=" @@ -33,12 +24,10 @@ RDEPEND=" ) ssl? ( >=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}] + ) zlib? ( - virtual/zlib:=[${MULTILIB_USEDEP}] - ) - zstd? ( - app-arch/zstd[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] ) " DEPEND=" @@ -46,12 +35,12 @@ DEPEND=" " BDEPEND=" ${PYTHON_DEPS} - virtual/pkgconfig " -PATCHES=( - "${FILESDIR}"/${PV}-fixpidtest.patch -) +src_prepare() { + + cmake_src_prepare +} src_configure() { local -a mycmakeargs=( @@ -60,11 +49,9 @@ src_configure() { -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no - -DHTTPLIB_USE_ZSTD_IF_AVAILABLE=no -DHTTPLIB_REQUIRE_BROTLI=$(usex brotli) -DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl) -DHTTPLIB_REQUIRE_ZLIB=$(usex zlib) - -DHTTPLIB_REQUIRE_ZSTD=$(usex zstd) -DPython3_EXECUTABLE="${PYTHON}" ) cmake-multilib_src_configure @@ -80,13 +67,21 @@ multilib_src_test() { # Fails on musl x86: ServerTest.GetRangeWithMaxLongLength ServerTest.GetStreamedWithTooManyRanges + + # https://github.com/yhirose/cpp-httplib/issues/1798 + # Filed by mgorny's testing, fails on openssl >=3.2: + SSLClientServerTest.ClientCertPresent + SSLClientServerTest.ClientEncryptedCertPresent + SSLClientServerTest.CustomizeServerSSLCtx + SSLClientServerTest.MemoryClientCertPresent + SSLClientServerTest.MemoryClientEncryptedCertPresent + SSLClientServerTest.TrustDirOptional ) # Little dance to please the GTEST filter (join array using ":"). failing_tests_str="${failing_tests[@]}" failing_tests_filter="${failing_tests_str// /:}" - # PREFIX is . to avoid calling "brew" and relying on stuff in /opt GTEST_FILTER="-${failing_tests_filter}" emake -C test \ - CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=. + CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." } diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.26.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.46.0.ebuild index a153bd018b9f..37f1748ea705 100644 --- a/dev-cpp/cpp-httplib/cpp-httplib-0.26.0.ebuild +++ b/dev-cpp/cpp-httplib/cpp-httplib-0.46.0.ebuild @@ -1,6 +1,5 @@ -# Copyright 2022-2025 Gentoo Authors +# Copyright 2024-2026 Liguros Authors # Distributed under the terms of the GNU General Public License v2 - EAPI=8 PYTHON_COMPAT=( python3_{13..14} ) @@ -10,21 +9,13 @@ inherit cmake-multilib python-any-r1 toolchain-funcs DESCRIPTION="C++ HTTP/HTTPS server and client library" HOMEPAGE="https://github.com/yhirose/cpp-httplib/" -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/yhirose/${PN}.git" -else - SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" -fi - +SRC_URI="https://github.com/yhirose/cpp-httplib/archive/v${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" LICENSE="MIT" -SLOT="0/$(ver_cut 0-2)" # soversion +SLOT="0/$(ver_cut 1-2)" # soversion -IUSE="brotli ssl test zlib zstd" +IUSE="brotli ssl test zlib" +REQUIRED_USE="test? ( brotli ssl zlib )" RESTRICT="!test? ( test )" RDEPEND=" @@ -33,12 +24,10 @@ RDEPEND=" ) ssl? ( >=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}] + ) zlib? ( - virtual/zlib:=[${MULTILIB_USEDEP}] - ) - zstd? ( - app-arch/zstd[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] ) " DEPEND=" @@ -46,9 +35,13 @@ DEPEND=" " BDEPEND=" ${PYTHON_DEPS} - virtual/pkgconfig " +src_prepare() { + + cmake_src_prepare +} + src_configure() { local -a mycmakeargs=( -DHTTPLIB_COMPILE=yes @@ -56,11 +49,9 @@ src_configure() { -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no - -DHTTPLIB_USE_ZSTD_IF_AVAILABLE=no -DHTTPLIB_REQUIRE_BROTLI=$(usex brotli) -DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl) -DHTTPLIB_REQUIRE_ZLIB=$(usex zlib) - -DHTTPLIB_REQUIRE_ZSTD=$(usex zstd) -DPython3_EXECUTABLE="${PYTHON}" ) cmake-multilib_src_configure @@ -76,13 +67,21 @@ multilib_src_test() { # Fails on musl x86: ServerTest.GetRangeWithMaxLongLength ServerTest.GetStreamedWithTooManyRanges + + # https://github.com/yhirose/cpp-httplib/issues/1798 + # Filed by mgorny's testing, fails on openssl >=3.2: + SSLClientServerTest.ClientCertPresent + SSLClientServerTest.ClientEncryptedCertPresent + SSLClientServerTest.CustomizeServerSSLCtx + SSLClientServerTest.MemoryClientCertPresent + SSLClientServerTest.MemoryClientEncryptedCertPresent + SSLClientServerTest.TrustDirOptional ) # Little dance to please the GTEST filter (join array using ":"). failing_tests_str="${failing_tests[@]}" failing_tests_filter="${failing_tests_str// /:}" - # PREFIX is . to avoid calling "brew" and relying on stuff in /opt GTEST_FILTER="-${failing_tests_filter}" emake -C test \ - CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=. + CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." } diff --git a/dev-cpp/cpp-httplib/files/0.27.0-fixpidtest.patch b/dev-cpp/cpp-httplib/files/0.27.0-fixpidtest.patch deleted file mode 100644 index 8d6d38b6a42b..000000000000 --- a/dev-cpp/cpp-httplib/files/0.27.0-fixpidtest.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 551f96d4a2a07a56d72a13d4837b31eead884d34 Mon Sep 17 00:00:00 2001 -From: yhirose <yuji.hirose.bug@gmail.com> -Date: Mon, 27 Oct 2025 20:40:12 -0400 -Subject: [PATCH] Remove REMOTE_PORT dependency from UnixSocketTest.PeerPid - ---- - .gitignore | 2 ++ - test/test.cc | 26 +++++++++++++------------- - 2 files changed, 15 insertions(+), 13 deletions(-) - -diff --git a/.gitignore b/.gitignore -index b9acdca78e..21839782df 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -23,6 +23,8 @@ example/one_time_request - !example/one_time_request.* - example/server_and_client - !example/server_and_client.* -+example/accept_header -+!example/accept_header.* - example/*.pem - test/httplib.cc - test/httplib.h -diff --git a/test/test.cc b/test/test.cc -index e5b3639629..c9d6421719 100644 ---- a/test/test.cc -+++ b/test/test.cc -@@ -196,7 +196,7 @@ TEST_F(UnixSocketTest, PeerPid) { - std::string remote_port_val; - svr.Get(pattern_, [&](const httplib::Request &req, httplib::Response &res) { - res.set_content(content_, "text/plain"); -- remote_port_val = req.get_header_value("REMOTE_PORT"); -+ remote_port_val = std::to_string(req.remote_port); - }); - - std::thread t{[&] { -@@ -11236,7 +11236,8 @@ TEST(ForwardedHeadersTest, NoProxiesSetting) { - EXPECT_EQ(StatusCode::OK_200, res->status); - - EXPECT_EQ(observed_xff, "203.0.113.66"); -- EXPECT_TRUE(observed_remote_addr == "::1" || observed_remote_addr == "127.0.0.1"); -+ EXPECT_TRUE(observed_remote_addr == "::1" || -+ observed_remote_addr == "127.0.0.1"); - } - - TEST(ForwardedHeadersTest, NoForwardedHeaders) { -@@ -11269,7 +11270,8 @@ TEST(ForwardedHeadersTest, NoForwardedHeaders) { - EXPECT_EQ(StatusCode::OK_200, res->status); - - EXPECT_EQ(observed_xff, ""); -- EXPECT_TRUE(observed_remote_addr == "::1" || observed_remote_addr == "127.0.0.1"); -+ EXPECT_TRUE(observed_remote_addr == "::1" || -+ observed_remote_addr == "127.0.0.1"); - } - - TEST(ForwardedHeadersTest, SingleTrustedProxy_UsesIPBeforeTrusted) { -@@ -11296,7 +11298,8 @@ TEST(ForwardedHeadersTest, SingleTrustedProxy_UsesIPBeforeTrusted) { - svr.wait_until_ready(); - - Client cli(HOST, PORT); -- auto res = cli.Get("/ip", {{"X-Forwarded-For", "198.51.100.23, 203.0.113.66"}}); -+ auto res = -+ cli.Get("/ip", {{"X-Forwarded-For", "198.51.100.23, 203.0.113.66"}}); - - ASSERT_TRUE(res); - EXPECT_EQ(StatusCode::OK_200, res->status); -@@ -11330,8 +11333,7 @@ TEST(ForwardedHeadersTest, MultipleTrustedProxies_UsesClientIP) { - - Client cli(HOST, PORT); - auto res = cli.Get( -- "/ip", -- {{"X-Forwarded-For", "198.51.100.23, 203.0.113.66, 192.0.2.45"}}); -+ "/ip", {{"X-Forwarded-For", "198.51.100.23, 203.0.113.66, 192.0.2.45"}}); - - ASSERT_TRUE(res); - EXPECT_EQ(StatusCode::OK_200, res->status); -@@ -11364,8 +11366,8 @@ TEST(ForwardedHeadersTest, TrustedProxyNotInHeader_UsesFirstFromXFF) { - svr.wait_until_ready(); - - Client cli(HOST, PORT); -- auto res = cli.Get("/ip", -- {{"X-Forwarded-For", "198.51.100.23, 198.51.100.24"}}); -+ auto res = -+ cli.Get("/ip", {{"X-Forwarded-For", "198.51.100.23, 198.51.100.24"}}); - - ASSERT_TRUE(res); - EXPECT_EQ(StatusCode::OK_200, res->status); -@@ -11399,8 +11401,7 @@ TEST(ForwardedHeadersTest, LastHopTrusted_SelectsImmediateLeftIP) { - - Client cli(HOST, PORT); - auto res = cli.Get( -- "/ip", -- {{"X-Forwarded-For", "198.51.100.23, 203.0.113.66, 192.0.2.45"}}); -+ "/ip", {{"X-Forwarded-For", "198.51.100.23, 203.0.113.66, 192.0.2.45"}}); - - ASSERT_TRUE(res); - EXPECT_EQ(StatusCode::OK_200, res->status); -@@ -11433,9 +11434,8 @@ TEST(ForwardedHeadersTest, HandlesWhitespaceAroundIPs) { - svr.wait_until_ready(); - - Client cli(HOST, PORT); -- auto res = cli.Get( -- "/ip", -- {{"X-Forwarded-For", " 198.51.100.23 , 203.0.113.66 , 192.0.2.45 "}}); -+ auto res = cli.Get("/ip", {{"X-Forwarded-For", -+ " 198.51.100.23 , 203.0.113.66 , 192.0.2.45 "}}); - - ASSERT_TRUE(res); - EXPECT_EQ(StatusCode::OK_200, res->status); diff --git a/dev-cpp/cpp-httplib/files/cmakelists.patch b/dev-cpp/cpp-httplib/files/cmakelists.patch new file mode 100644 index 000000000000..137a80985b1f --- /dev/null +++ b/dev-cpp/cpp-httplib/files/cmakelists.patch @@ -0,0 +1,12 @@ +diff '--color=auto' -urN cpp-httplib-0.16.0.orig/CMakeLists.txt cpp-httplib-0.16.0/CMakeLists.txt +--- cpp-httplib-0.16.0.orig/CMakeLists.txt 2024-07-14 10:15:22.128940645 +0200 ++++ cpp-httplib-0.16.0/CMakeLists.txt 2024-07-14 10:16:10.259937433 +0200 +@@ -81,7 +81,7 @@ + + # Change as needed to set an OpenSSL minimum version. + # This is used in the installed Cmake config file. +-set(_HTTPLIB_OPENSSL_MIN_VER "3.0.0") ++set(_HTTPLIB_OPENSSL_MIN_VER "2.0.0") + + # Lets you disable C++ exception during CMake configure time. + # The value is used in the install CMake config file. diff --git a/dev-cpp/cpp-httplib/files/cpp-httplib-0.32.0-cmake-mbedtls.patch b/dev-cpp/cpp-httplib/files/cpp-httplib-0.32.0-cmake-mbedtls.patch deleted file mode 100644 index e2f50bb64f03..000000000000 --- a/dev-cpp/cpp-httplib/files/cpp-httplib-0.32.0-cmake-mbedtls.patch +++ /dev/null @@ -1,181 +0,0 @@ -https://github.com/yhirose/cpp-httplib/pull/2360 - -From 6f34a08c6e5df97481b926fdbfe650fd6faeb36f Mon Sep 17 00:00:00 2001 -From: Matheus Gabriel Werny <matheusgwdl@protonmail.com> -Date: Wed, 11 Feb 2026 14:18:24 +0100 -Subject: [PATCH 1/2] [CMake] New component MbedTLS - -New component MbedTLS. ---- - CMakeLists.txt | 27 ++++++++++++++++++++++++++- - cmake/httplibConfig.cmake.in | 7 +++++++ - 2 files changed, 33 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45a0e16b98..a11d0c66a9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,11 +2,13 @@ - Build options: - * Standard BUILD_SHARED_LIBS is supported and sets HTTPLIB_SHARED default value. - * HTTPLIB_USE_OPENSSL_IF_AVAILABLE (default on) -+ * HTTPLIB_USE_MBEDTLS_IF_AVAILABLE (default off) - * HTTPLIB_USE_ZLIB_IF_AVAILABLE (default on) - * HTTPLIB_USE_BROTLI_IF_AVAILABLE (default on) - * HTTPLIB_USE_ZSTD_IF_AVAILABLE (default on) - * HTTPLIB_BUILD_MODULES (default off) - * HTTPLIB_REQUIRE_OPENSSL (default off) -+ * HTTPLIB_REQUIRE_MBEDTLS (default off) - * HTTPLIB_REQUIRE_ZLIB (default off) - * HTTPLIB_REQUIRE_BROTLI (default off) - * HTTPLIB_REQUIRE_ZSTD (default off) -@@ -21,7 +23,7 @@ - - ------------------------------------------------------------------------------- - -- After installation with Cmake, a find_package(httplib COMPONENTS OpenSSL ZLIB Brotli zstd) is available. -+ After installation with Cmake, a find_package(httplib COMPONENTS OpenSSL MbedTLS ZLIB Brotli zstd) is available. - This creates a httplib::httplib target (if found and if listed components are supported). - It can be linked like so: - -@@ -48,6 +50,7 @@ - These variables are available after you run find_package(httplib) - * HTTPLIB_HEADER_PATH - this is the full path to the installed header (e.g. /usr/include/httplib.h). - * HTTPLIB_IS_USING_OPENSSL - a bool for if OpenSSL support is enabled. -+ * HTTPLIB_IS_USING_MBEDTLS - a bool for if MbedTLS support is enabled. - * HTTPLIB_IS_USING_ZLIB - a bool for if ZLIB support is enabled. - * HTTPLIB_IS_USING_BROTLI - a bool for if Brotli support is enabled. - * HTTPLIB_IS_USING_ZSTD - a bool for if ZSTD support is enabled. -@@ -95,10 +98,12 @@ set(_HTTPLIB_OPENSSL_MIN_VER "3.0.0") - option(HTTPLIB_NO_EXCEPTIONS "Disable the use of C++ exceptions" OFF) - # Allow for a build to require OpenSSL to pass, instead of just being optional - option(HTTPLIB_REQUIRE_OPENSSL "Requires OpenSSL to be found & linked, or fails build." OFF) -+option(HTTPLIB_REQUIRE_MBEDTLS "Requires MbedTLS to be found & linked, or fails build." OFF) - option(HTTPLIB_REQUIRE_ZLIB "Requires ZLIB to be found & linked, or fails build." OFF) - # Allow for a build to casually enable OpenSSL/ZLIB support, but silently continue if not found. - # Make these options so their automatic use can be specifically disabled (as needed) - option(HTTPLIB_USE_OPENSSL_IF_AVAILABLE "Uses OpenSSL (if available) to enable HTTPS support." ON) -+option(HTTPLIB_USE_MBEDTLS_IF_AVAILABLE "Uses MbedTLS (if available) to enable HTTPS support." OFF) - option(HTTPLIB_USE_ZLIB_IF_AVAILABLE "Uses ZLIB (if available) to enable Zlib compression support." ON) - # Lets you compile the program as a regular library instead of header-only - option(HTTPLIB_COMPILE "If ON, uses a Python script to split the header into a compilable header & source file (requires Python v3)." OFF) -@@ -120,6 +125,15 @@ else() - message(WARNING "HTTPLIB_BUILD_MODULES requires CMake 3.28 or later. Current version is ${CMAKE_VERSION}. Modules support has been disabled.") - endif() - endif() -+ -+if(HTTPLIB_REQUIRE_OPENSSL AND HTTPLIB_REQUIRE_MBEDTLS) -+ message(FATAL_ERROR "HTTPLIB_REQUIRE_OPENSSL and HTTPLIB_REQUIRE_MBEDTLS are mutually exclusive.") -+endif() -+ -+if(HTTPLIB_USE_OPENSSL_IF_AVAILABLE AND HTTPLIB_USE_MBEDTLS_IF_AVAILABLE) -+ message(FATAL_ERROR "HTTPLIB_USE_OPENSSL_IF_AVAILABLE and HTTPLIB_USE_MBEDTLS_IF_AVAILABLE are mutually exclusive.") -+endif() -+ - # Defaults to static library but respects standard BUILD_SHARED_LIBS if set - include(CMakeDependentOption) - cmake_dependent_option(HTTPLIB_SHARED "Build the library as a shared library instead of static. Has no effect if using header-only." -@@ -173,6 +187,15 @@ elseif(HTTPLIB_USE_OPENSSL_IF_AVAILABLE) - endif() - endif() - -+if(HTTPLIB_REQUIRE_MBEDTLS) -+ find_package(MbedTLS REQUIRED) -+ set(HTTPLIB_IS_USING_MBEDTLS TRUE) -+elseif(HTTPLIB_USE_MBEDTLS_IF_AVAILABLE) -+ find_package(MbedTLS QUIET) -+ message(WARNING ${MbedTLS_FOUND}) # TODO -+ set(HTTPLIB_IS_USING_MBEDTLS ${MbedTLS_FOUND}) -+endif() -+ - if(HTTPLIB_REQUIRE_ZLIB) - find_package(ZLIB REQUIRED) - set(HTTPLIB_IS_USING_ZLIB TRUE) -@@ -327,6 +350,7 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC} - $<$<BOOL:${HTTPLIB_IS_USING_ZSTD}>:zstd::libzstd> - $<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::SSL> - $<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::Crypto> -+ $<$<BOOL:${HTTPLIB_IS_USING_MBEDTLS}>:MbedTLS::mbedtls> - ) - - # Set the definitions to enable optional features -@@ -336,6 +360,7 @@ target_compile_definitions(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC} - $<$<BOOL:${HTTPLIB_IS_USING_ZLIB}>:CPPHTTPLIB_ZLIB_SUPPORT> - $<$<BOOL:${HTTPLIB_IS_USING_ZSTD}>:CPPHTTPLIB_ZSTD_SUPPORT> - $<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:CPPHTTPLIB_OPENSSL_SUPPORT> -+ $<$<BOOL:${HTTPLIB_IS_USING_MBEDTLS}>:CPPHTTPLIB_MBEDTLS_SUPPORT> - $<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>,$<BOOL:${HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN}>>:CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN> - $<$<BOOL:${HTTPLIB_USE_NON_BLOCKING_GETADDRINFO}>:CPPHTTPLIB_USE_NON_BLOCKING_GETADDRINFO> - ) -diff --git a/cmake/httplibConfig.cmake.in b/cmake/httplibConfig.cmake.in -index 8ca8b991a2..0790f456d8 100644 ---- a/cmake/httplibConfig.cmake.in -+++ b/cmake/httplibConfig.cmake.in -@@ -4,6 +4,7 @@ - # Setting these here so they're accessible after install. - # Might be useful for some users to check which settings were used. - set(HTTPLIB_IS_USING_OPENSSL @HTTPLIB_IS_USING_OPENSSL@) -+set(HTTPLIB_IS_USING_MBEDTLS @HTTPLIB_IS_USING_MBEDTLS@) - set(HTTPLIB_IS_USING_ZLIB @HTTPLIB_IS_USING_ZLIB@) - set(HTTPLIB_IS_COMPILED @HTTPLIB_COMPILE@) - set(HTTPLIB_IS_USING_BROTLI @HTTPLIB_IS_USING_BROTLI@) -@@ -25,11 +26,17 @@ if(@HTTPLIB_IS_USING_OPENSSL@) - endif() - set(httplib_OpenSSL_FOUND ${OpenSSL_FOUND}) - endif() -+ - if(@HTTPLIB_IS_USING_ZLIB@) - find_dependency(ZLIB) - set(httplib_ZLIB_FOUND ${ZLIB_FOUND}) - endif() - -+if(@HTTPLIB_IS_USING_MBEDTLS@) -+ find_dependency(MbedTLS) -+ set(httplib_MbedTLS_FOUND ${MbedTLS_FOUND}) -+endif() -+ - if(@HTTPLIB_IS_USING_BROTLI@) - # Needed so we can use our own FindBrotli.cmake in this file. - # Note that the FindBrotli.cmake file is installed in the same dir as this file. - -From 8682189e5929abecb5e8e41b43180d931995154a Mon Sep 17 00:00:00 2001 -From: Matheus Gabriel Werny <matheusgwdl@protonmail.com> -Date: Wed, 11 Feb 2026 14:46:36 +0100 -Subject: [PATCH 2/2] Fix case - -Fix case: HTTPLIB_REQUIRE_OPENSSL=OFF; HTTPLIB_REQUIRE_MBEDTLS=ON ---- - CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a11d0c66a9..a2864a6ce1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -126,6 +126,7 @@ else() - endif() - endif() - -+# Incompatibility between OpenSSL and MbedTLS - if(HTTPLIB_REQUIRE_OPENSSL AND HTTPLIB_REQUIRE_MBEDTLS) - message(FATAL_ERROR "HTTPLIB_REQUIRE_OPENSSL and HTTPLIB_REQUIRE_MBEDTLS are mutually exclusive.") - endif() -@@ -134,6 +135,10 @@ if(HTTPLIB_USE_OPENSSL_IF_AVAILABLE AND HTTPLIB_USE_MBEDTLS_IF_AVAILABLE) - message(FATAL_ERROR "HTTPLIB_USE_OPENSSL_IF_AVAILABLE and HTTPLIB_USE_MBEDTLS_IF_AVAILABLE are mutually exclusive.") - endif() - -+if(HTTPLIB_REQUIRE_MBEDTLS) -+ set(HTTPLIB_USE_OPENSSL_IF_AVAILABLE OFF) -+endif() -+ - # Defaults to static library but respects standard BUILD_SHARED_LIBS if set - include(CMakeDependentOption) - cmake_dependent_option(HTTPLIB_SHARED "Build the library as a shared library instead of static. Has no effect if using header-only." -@@ -192,7 +197,6 @@ if(HTTPLIB_REQUIRE_MBEDTLS) - set(HTTPLIB_IS_USING_MBEDTLS TRUE) - elseif(HTTPLIB_USE_MBEDTLS_IF_AVAILABLE) - find_package(MbedTLS QUIET) -- message(WARNING ${MbedTLS_FOUND}) # TODO - set(HTTPLIB_IS_USING_MBEDTLS ${MbedTLS_FOUND}) - endif() - diff --git a/dev-cpp/cpp-httplib/metadata.xml b/dev-cpp/cpp-httplib/metadata.xml index 9b6e0e3f3874..e4bfafd61191 100644 --- a/dev-cpp/cpp-httplib/metadata.xml +++ b/dev-cpp/cpp-httplib/metadata.xml @@ -1,17 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> + <maintainer type="project"> + <email>dev@liguros.net</email> + <name>Development</name> + </maintainer> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> + <maintainer type="person"> <email>alexey+gentoo@asokolov.org</email> <name>Alexey Sokolov</name> </maintainer> - <maintainer type="project" proxied="proxy"> + <maintainer type="project"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <use> - <flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> instead of <pkg>dev-libs/openssl</pkg>.</flag> - </use> <upstream> <bugs-to>https://github.com/yhirose/cpp-httplib/issues</bugs-to> </upstream> diff --git a/dev-cpp/glaze/Manifest b/dev-cpp/glaze/Manifest index 3a6d05329ffd..d130e20dd620 100644 --- a/dev-cpp/glaze/Manifest +++ b/dev-cpp/glaze/Manifest @@ -1,3 +1,2 @@ -DIST glaze-5.2.1.tar.gz 581284 BLAKE2B 87b81b073955c0e97199e3de3083fb2c913438b25a469ac80184fc2c9af04119d015e523ebf53fea36bf91b6a055351362fe8670ac2e881aafd11bd2acc92851 SHA512 b68d3953feab1cb958242eba0457e4cf310cd0de80b7c5c2513722eedea0442199b7df40b414213047958d8aa1a1d0d8705bea77795b80a73c9ee6fb462abc88 -DIST glaze-5.5.4.tar.gz 738708 BLAKE2B 0f56b022532fc76b327f78e5bbcadb841d3ac77fde2df7ae8a6d0e74777db2c3090c6959845f54113933a083c787956876ac3166d0a2ba654eab926ef276df8a SHA512 1bc0503552eea4befd80b989f5eacf4b8ebd853e87c82d2730a23504806583a8153c80e786b118451ae2edc37023802e24cf4b0395ed86f2b34fdb5a2b7b6625 DIST glaze-6.5.1.tar.gz 1180772 BLAKE2B 12eba3267d45ac8d84df1130e7f070c857d9a3ae3de7701d77c4cd4cc87236f0aa7f3bcecd643f31a8d1d78d304ec3e35e800346f2bd882847731de71f3a0c45 SHA512 fb45220afde0b6374f6d864baa7fb649583e304a31914036aa7673adf2a72aa3944926f9a8f3e71fea4ec5f6655afa0a8fdcd42c698d98451b0ac1db7c15aa39 +DIST glaze-7.0.2.tar.gz 1348874 BLAKE2B 5ec57e34de42625cc42bc814e283891194287e10b921728d2f5f5cd5e89f73bdc24cf5c1562920c7eb1adec654c2d00b26e82ff5b6dad5524a09c6db855a5e65 SHA512 bff41d0cbf822e7dee2ca5436b20d3975c4484b6203ebb9c50e8e8e795f9aad8ccb29bb92d29b8c9a9a837cd1dcf1b43543bf9817705e2f836f27f5aed3ace74 diff --git a/dev-cpp/glaze/files/glaze-5.2.1-unbundle-test-deps.patch b/dev-cpp/glaze/files/glaze-5.2.1-unbundle-test-deps.patch deleted file mode 100644 index 8ccf74af061f..000000000000 --- a/dev-cpp/glaze/files/glaze-5.2.1-unbundle-test-deps.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 028b3994..0b105eb2 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -1,17 +1,9 @@ - include(FetchContent) - --FetchContent_Declare( -- ut -- GIT_REPOSITORY https://github.com/openalgz/ut -- GIT_TAG v0.0.5 -- GIT_SHALLOW TRUE --) -+find_package(ut2-glaze REQUIRED) - - message(STATUS "Fetching dependencies...") - set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL TRUE) --set(CMAKE_SKIP_INSTALL_RULES ON CACHE BOOL "" FORCE) --FetchContent_MakeAvailable(ut) --set(CMAKE_SKIP_INSTALL_RULES OFF CACHE BOOL "" FORCE) - set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL FALSE) - message(STATUS "...finished fetching dependencies.") - -@@ -20,7 +12,7 @@ add_code_coverage_all_targets() - - add_library(glz_test_common INTERFACE) - target_compile_features(glz_test_common INTERFACE cxx_std_23) --target_link_libraries(glz_test_common INTERFACE ut::ut glaze::glaze) -+target_link_libraries(glz_test_common INTERFACE ut2-glaze::ut2-glaze glaze::glaze) - if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - target_compile_options(glz_test_common INTERFACE -fno-exceptions -fno-rtti) - if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") -@@ -46,7 +38,7 @@ endif() - - add_library(glz_test_exceptions INTERFACE) - target_compile_features(glz_test_exceptions INTERFACE cxx_std_23) --target_link_libraries(glz_test_exceptions INTERFACE ut::ut glaze::glaze) -+target_link_libraries(glz_test_exceptions INTERFACE ut2-glaze::ut2-glaze glaze::glaze) - if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - target_compile_options(glz_test_exceptions INTERFACE) - target_compile_options(glz_test_exceptions INTERFACE -Wall -Wextra -pedantic) -diff --git a/tests/asio_repe/CMakeLists.txt b/tests/asio_repe/CMakeLists.txt -index 1518b4e5..3cc27f67 100644 ---- a/tests/asio_repe/CMakeLists.txt -+++ b/tests/asio_repe/CMakeLists.txt -@@ -1,14 +1,9 @@ - project(asio_repe) - --FetchContent_Declare( -- asio -- GIT_REPOSITORY https://github.com/chriskohlhoff/asio.git -- GIT_TAG asio-1-32-0 -- GIT_SHALLOW TRUE --) --FetchContent_MakeAvailable(asio) -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(asio GLOBAL IMPORTED_TARGET REQUIRED asio) - - add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) - - target_include_directories(${PROJECT_NAME} PRIVATE include ${asio_SOURCE_DIR}/asio/include) --target_link_libraries(${PROJECT_NAME} PRIVATE glz_test_exceptions) -\ No newline at end of file -+target_link_libraries(${PROJECT_NAME} PRIVATE glz_test_exceptions) diff --git a/dev-cpp/glaze/files/glaze-6.5.1-unbundle-test-deps.patch b/dev-cpp/glaze/files/glaze-6.5.1-unbundle-test-deps.patch index 4e8317e6770f..59f1415e7fed 100644 --- a/dev-cpp/glaze/files/glaze-6.5.1-unbundle-test-deps.patch +++ b/dev-cpp/glaze/files/glaze-6.5.1-unbundle-test-deps.patch @@ -1,3 +1,6 @@ + tests/CMakeLists.txt | 14 +++----------- + 1 file changed, 3 insertions(+), 11 deletions(-) + diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ade41281..63fed1c7 100644 --- a/tests/CMakeLists.txt diff --git a/dev-cpp/glaze/files/glaze-5.5.4-unbundle-test-deps.patch b/dev-cpp/glaze/files/glaze-7.0.2-unbundle-test-deps.patch index fdcf4618d29a..59f1415e7fed 100644 --- a/dev-cpp/glaze/files/glaze-5.5.4-unbundle-test-deps.patch +++ b/dev-cpp/glaze/files/glaze-7.0.2-unbundle-test-deps.patch @@ -1,5 +1,8 @@ + tests/CMakeLists.txt | 14 +++----------- + 1 file changed, 3 insertions(+), 11 deletions(-) + diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index a2988c34..04f4e7e9 100644 +index ade41281..63fed1c7 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,17 +1,9 @@ @@ -8,7 +11,7 @@ index a2988c34..04f4e7e9 100644 -FetchContent_Declare( - ut - GIT_REPOSITORY https://github.com/openalgz/ut -- GIT_TAG v1.0.0 +- GIT_TAG v1.1.0 - GIT_SHALLOW TRUE -) +find_package(ut2-glaze REQUIRED) @@ -21,21 +24,21 @@ index a2988c34..04f4e7e9 100644 set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL FALSE) message(STATUS "...finished fetching dependencies.") -@@ -20,7 +12,7 @@ add_code_coverage_all_targets() +@@ -76,7 +68,7 @@ add_code_coverage_all_targets() add_library(glz_test_common INTERFACE) target_compile_features(glz_test_common INTERFACE cxx_std_23) --target_link_libraries(glz_test_common INTERFACE ut::ut glaze::glaze) -+target_link_libraries(glz_test_common INTERFACE ut2-glaze::ut2-glaze glaze::glaze) +-target_link_libraries(glz_test_common INTERFACE ut::ut glaze::glaze glz_asio) ++target_link_libraries(glz_test_common INTERFACE ut2-glaze::ut2-glaze glaze::glaze glz_asio) if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") target_compile_options(glz_test_common INTERFACE -fno-exceptions -fno-rtti) if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") -@@ -46,7 +38,7 @@ endif() +@@ -102,7 +94,7 @@ endif() add_library(glz_test_exceptions INTERFACE) target_compile_features(glz_test_exceptions INTERFACE cxx_std_23) --target_link_libraries(glz_test_exceptions INTERFACE ut::ut glaze::glaze) -+target_link_libraries(glz_test_exceptions INTERFACE ut2-glaze::ut2-glaze glaze::glaze) +-target_link_libraries(glz_test_exceptions INTERFACE ut::ut glaze::glaze glz_asio) ++target_link_libraries(glz_test_exceptions INTERFACE ut2-glaze::ut2-glaze glaze::glaze glz_asio) if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") target_compile_options(glz_test_exceptions INTERFACE) target_compile_options(glz_test_exceptions INTERFACE -Wall -Wextra -pedantic) diff --git a/dev-cpp/glaze/glaze-5.2.1.ebuild b/dev-cpp/glaze/glaze-5.2.1.ebuild deleted file mode 100644 index 0c21e07e7a82..000000000000 --- a/dev-cpp/glaze/glaze-5.2.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Extremely fast, in memory, JSON and interface library for modern C++" -HOMEPAGE="https://github.com/stephenberry/glaze" -SRC_URI="https://github.com/stephenberry/glaze/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/glaze-${PV}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" -IUSE="examples fuzzing test" -RESTRICT="!test? ( test )" - -DEPEND=" - test? ( - dev-cpp/asio - >=dev-cpp/eigen-3.4:= - dev-cpp/ut2-glaze - ) -" -RDEPEND="${DEPEND}" - -# Unbundle test dependencies otherwise they are fetched from github at build time -PATCHES=( - "${FILESDIR}/${P}-unbundle-test-deps.patch" -) - -src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_INSTALL_RULES=OFF - -Dglaze_DEVELOPER_MODE=ON - -Dglaze_ENABLE_FUZZING=$(usex fuzzing) - -Dglaze_BUILD_EXAMPLES=$(usex examples) - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} diff --git a/dev-cpp/glaze/glaze-6.5.1.ebuild b/dev-cpp/glaze/glaze-6.5.1.ebuild index fad3d3ad432c..bf3255dce0da 100644 --- a/dev-cpp/glaze/glaze-6.5.1.ebuild +++ b/dev-cpp/glaze/glaze-6.5.1.ebuild @@ -20,7 +20,7 @@ RESTRICT="!test? ( test )" DEPEND=" test? ( dev-cpp/asio - >=dev-cpp/eigen-3.4:= + >=dev-cpp/eigen-3.4 dev-cpp/ut2-glaze ) " diff --git a/dev-cpp/glaze/glaze-5.5.4.ebuild b/dev-cpp/glaze/glaze-7.0.2.ebuild index 0c21e07e7a82..bf3255dce0da 100644 --- a/dev-cpp/glaze/glaze-5.5.4.ebuild +++ b/dev-cpp/glaze/glaze-7.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2025 Gentoo Authors +# Copyright 2025-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,14 +13,14 @@ S="${WORKDIR}/glaze-${PV}" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="~amd64" IUSE="examples fuzzing test" RESTRICT="!test? ( test )" DEPEND=" test? ( dev-cpp/asio - >=dev-cpp/eigen-3.4:= + >=dev-cpp/eigen-3.4 dev-cpp/ut2-glaze ) " diff --git a/dev-cpp/glaze/metadata.xml b/dev-cpp/glaze/metadata.xml index 9317cbb74791..4615cb8620fc 100644 --- a/dev-cpp/glaze/metadata.xml +++ b/dev-cpp/glaze/metadata.xml @@ -1,16 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>jared@rgst.io</email> - <name>Jared Allard</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> + <maintainer type="person"> + <email>aruhier@mailbox.org</email> + <name>Anthony Ruhier</name> </maintainer> <longdescription> - Yet another library for C++ for parsing JSON. Uses SIMD as well. In some benchmarks is better than simdjson. + Yet another library for C++ for parsing JSON. Uses SIMD as well. In some benchmarks is better than simdjson. + Added in hyproverlay for gui-wm/hyprland, waiting for https://github.com/gentoo/gentoo/pull/45126. </longdescription> <use> <flag name="fuzzing">Build fuzzers (not install)</flag> diff --git a/dev-cpp/libmcpp/Manifest b/dev-cpp/libmcpp/Manifest index cc1df396280a..44b2e2bb422b 100644 --- a/dev-cpp/libmcpp/Manifest +++ b/dev-cpp/libmcpp/Manifest @@ -1,2 +1,3 @@ +DIST libmcpp-2.7.2.19.tar.gz 124309 BLAKE2B 405390f884091ca2f821c3eb89d34e35ecc384c7c3a2a81ff5d2d4fee77e34659fc82d5ed20fd3646cb7684d93bcd3053f6959d35c0c6396af76e8abb598deb7 SHA512 27f7be060e5c9ee4e87c44c99d2dd22c8b2454cb0776f7daef1b6eade2b016af1481d0b96a428ac4cce2152242b3c51bd2e144da0018989650a96e60c5d82a0f DIST mcpp-2.7.2.tar.gz 1533457 BLAKE2B 4368fd1c667923ab3b60ce79f8421c549a9d9105957ca87b9ba49be513cb1be7f220a3ddbaf306e860014d5211af480d07170d912d3d4a80345d8eab45fd6c00 SHA512 1ca885cb13fdb684de9d0595a9215b52f48a93a69077d82cdcacafe40d9a61fb77b00a3ff2b8890e7bc0a0fcc0c8d70d4093c00c280351cd4459aba67c573235 DIST mcpp_2.7.2-5.debian.tar.xz 7528 BLAKE2B 92f455809cfb49d97ca4e62c7087ebe2ebe0ce835e8f12d6e93b1df2ec1e15472f242637f320be2b6bada85b193545fcf3608e8c9a935805a5f052909d3c6f0b SHA512 08509945048ccc4525ecd61d3f901a4d81fe73c1db84c26b76664d5127970af45662a168b99836b58467afc7202a1a20e0dfe8954a87e4cd1368f2136d7955be diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2.19.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2.19.ebuild new file mode 100644 index 000000000000..041ac7a3cb97 --- /dev/null +++ b/dev-cpp/libmcpp/libmcpp-2.7.2.19.ebuild @@ -0,0 +1,20 @@ +# Copyright 2025 Liguros Authors +# Distributed under the terms of the GNU General Public License v2 +EAPI=8 + +CMAKE_MAKEFILE_GENERATOR="emake" +inherit cmake flag-o-matic + +DESCRIPTION="A portable C++ preprocessor" +HOMEPAGE="https://github.com/zeroc-ice/mcpp" +SRC_URI="https://github.com/zeroc-ice/mcpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/mcpp-${PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~x64-macos" + +src_configure() { + append-cflags -std=gnu17 + cmake_src_configure +} diff --git a/dev-cpp/libmcpp/metadata.xml b/dev-cpp/libmcpp/metadata.xml index 1d4b823db6df..32d8dab437e6 100644 --- a/dev-cpp/libmcpp/metadata.xml +++ b/dev-cpp/libmcpp/metadata.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="project"> + <email>dev@liguros.net</email> + <name>Development</name> + </maintainer> <upstream> <remote-id type="cpe">cpe:/a:mcpp_project:mcpp</remote-id> </upstream> |