From 2e0fe0ea29315336eebdbcd88c0d03ed85569bfd Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Wed, 4 Dec 2024 18:50:47 +0000 Subject: Adding metadata --- dev-cpp/cpp-httplib/Manifest | 2 +- dev-cpp/cpp-httplib/cpp-httplib-0.18.1.ebuild | 90 --------------------------- dev-cpp/cpp-httplib/cpp-httplib-0.18.3.ebuild | 90 +++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 91 deletions(-) delete mode 100644 dev-cpp/cpp-httplib/cpp-httplib-0.18.1.ebuild create mode 100644 dev-cpp/cpp-httplib/cpp-httplib-0.18.3.ebuild (limited to 'dev-cpp/cpp-httplib') diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest index f8e26577c84b..4f618e94f7b0 100644 --- a/dev-cpp/cpp-httplib/Manifest +++ b/dev-cpp/cpp-httplib/Manifest @@ -1,2 +1,2 @@ -DIST cpp-httplib-0.18.1.tar.gz 1323636 BLAKE2B 8335c9a4d69d7e9b2e7e3c4036b49627536c8d6cffa7a5ae2c3dff693c5458f7fa2f89f3da2c130325069225d3204ec579900d5c5266dff7a9c732c134b39907 SHA512 6dd1054d0171594bf871a918b5540cc67981a48f7dbb82e9029a4877afc6d8c36e2f69411f5eec7b052bf0245554d01f33ef2180f42a15f6b8dd86ebb2427a41 DIST cpp-httplib-0.18.2.tar.gz 1324224 BLAKE2B 24d1ce5527f5429fdef91fee3d0e1d3ae8ede1db2955fbe85e856b2a6055a8a86d399147533912dfdbef992f4aac2a71812102af6c422cce65ac959cd4d8f303 SHA512 d8e3bdc35d5e07a0d2295a5fdeb0d145f3188759ece23e93747f6b8b0fc50573633a37f739d58030a0f3e43606c500eb6191e0be5ce17a66b754bd34eb3ca40c +DIST cpp-httplib-0.18.3.tar.gz 1324253 BLAKE2B 995ae8cd63013ec03e86f56e089b4f1374a8913eaf02d8fc07997b986dc8f65b1bda710ed686b6cc111e6203d15bbcb9db08cd810d2167c1658bfa99dc9b61b2 SHA512 d9eb70dfd8ebde658852d1a8cf9f96419ca11cad889b54672aa4812c0b5db0c3f1fddf63f536aec19fc4a849f41ed22461581a18f0733d3f906e45dd096bafd8 diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.18.1.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.18.1.ebuild deleted file mode 100644 index e38fbec824d6..000000000000 --- a/dev-cpp/cpp-httplib/cpp-httplib-0.18.1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 2024 Liguros Authors -# Distributed under the terms of the GNU General Public License v2 -EAPI=8 - -PYTHON_COMPAT=( python3_{9,10,11,12,13} ) - -inherit cmake-multilib python-any-r1 toolchain-funcs - -DESCRIPTION="C++ HTTP/HTTPS server and client library" -HOMEPAGE="https://github.com/yhirose/cpp-httplib/" - -SRC_URI="https://github.com/yhirose/${PN}/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 1-2)" # soversion - -IUSE="brotli libressl ssl test zlib" -REQUIRED_USE="test? ( brotli ssl zlib )" -RESTRICT="!test? ( test )" - -RDEPEND=" - brotli? ( - app-arch/brotli:=[${MULTILIB_USEDEP}] - ) - ssl? ( - !libressl? ( >=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) - ) - zlib? ( - sys-libs/zlib[${MULTILIB_USEDEP}] - ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - ${PYTHON_DEPS} -" - -src_prepare() { - if use libressl; then - eapply -p1 $FILESDIR/cmakelists.patch - fi - - cmake_src_prepare -} - -src_configure() { - local -a mycmakeargs=( - -DHTTPLIB_COMPILE=yes - -DBUILD_SHARED_LIBS=yes - -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no - -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no - -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no - -DHTTPLIB_REQUIRE_BROTLI=$(usex brotli) - -DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl) - -DHTTPLIB_REQUIRE_ZLIB=$(usex zlib) - -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 - - # 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// /:}" - - GTEST_FILTER="-${failing_tests_filter}" emake -C test \ - CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." -} diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.18.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.18.3.ebuild new file mode 100644 index 000000000000..e38fbec824d6 --- /dev/null +++ b/dev-cpp/cpp-httplib/cpp-httplib-0.18.3.ebuild @@ -0,0 +1,90 @@ +# Copyright 2024 Liguros Authors +# Distributed under the terms of the GNU General Public License v2 +EAPI=8 + +PYTHON_COMPAT=( python3_{9,10,11,12,13} ) + +inherit cmake-multilib python-any-r1 toolchain-funcs + +DESCRIPTION="C++ HTTP/HTTPS server and client library" +HOMEPAGE="https://github.com/yhirose/cpp-httplib/" + +SRC_URI="https://github.com/yhirose/${PN}/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 1-2)" # soversion + +IUSE="brotli libressl ssl test zlib" +REQUIRED_USE="test? ( brotli ssl zlib )" +RESTRICT="!test? ( test )" + +RDEPEND=" + brotli? ( + app-arch/brotli:=[${MULTILIB_USEDEP}] + ) + ssl? ( + !libressl? ( >=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) + ) + zlib? ( + sys-libs/zlib[${MULTILIB_USEDEP}] + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + ${PYTHON_DEPS} +" + +src_prepare() { + if use libressl; then + eapply -p1 $FILESDIR/cmakelists.patch + fi + + cmake_src_prepare +} + +src_configure() { + local -a mycmakeargs=( + -DHTTPLIB_COMPILE=yes + -DBUILD_SHARED_LIBS=yes + -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no + -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no + -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no + -DHTTPLIB_REQUIRE_BROTLI=$(usex brotli) + -DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl) + -DHTTPLIB_REQUIRE_ZLIB=$(usex zlib) + -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 + + # 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// /:}" + + GTEST_FILTER="-${failing_tests_filter}" emake -C test \ + CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." +} -- cgit v1.3.1