From ba9068ff4d1c9f33fd8dc87ae3adb3586d233ecc Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Sat, 17 Aug 2024 20:40:01 +0000 Subject: Adding metadata --- dev-cpp/cpp-httplib/Manifest | 2 +- dev-cpp/cpp-httplib/cpp-httplib-0.16.1.ebuild | 91 --------------------------- dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild | 91 +++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 92 deletions(-) delete mode 100644 dev-cpp/cpp-httplib/cpp-httplib-0.16.1.ebuild create mode 100644 dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild (limited to 'dev-cpp/cpp-httplib') diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest index 7495b5798973..516bce4ba8c4 100644 --- a/dev-cpp/cpp-httplib/Manifest +++ b/dev-cpp/cpp-httplib/Manifest @@ -1,2 +1,2 @@ -DIST cpp-httplib-0.16.1.tar.gz 1157395 BLAKE2B 5fb5b5508411819be66df1b3365511d76958715eab7da48022388c8de6332c3726aa1d49d81bbe194ccdb3af2206f6dc1d93c0375cd9452d9c90dc405cc47a99 SHA512 ddd9cedb08a892ff550d6188f91f49fe634dbc86c828a83a58068adf6fae950294a95621729e6203d5df8670c2a8c5ea9ca035ef6948067ae5ca300190cb6f0f DIST cpp-httplib-0.16.2.tar.gz 1157538 BLAKE2B 0fdb3946e33f3af0a6b9646d5edf53572d67fb7e2334923c3ef9784aad569672c21e12c6d0f4c1f91ceccb8d9b3e8f14d51b21f4c6cf252da98024cee47cfcbe SHA512 d0a3d5477cb76cbbbc6da53b0abff3b45fd6b77c0d1686b355ce2904593c67c25849d2b1348e49b0b57ece5be91404fe976b06d75d34eb5068b1e130fd7ddbee +DIST cpp-httplib-0.16.3.tar.gz 1157548 BLAKE2B 986a33043ddf86623f70f50244051089cb6b824866ee247de13772263c691fde2b10e9eeef2078265f0a91b5744dafd2940892cff03c1a9cfd4b35df0d446522 SHA512 1a0d40f17b526db74dfa51903f0d15876b20c836a438be8f87ac2b18e535c3fad1822fbad9cf97053705a2cedc8171ab648e2e8c823eeb2e180c347283f3de9a diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.16.1.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.16.1.ebuild deleted file mode 100644 index 7e47d15b3de1..000000000000 --- a/dev-cpp/cpp-httplib/cpp-httplib-0.16.1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 2024 Liguros Authors -# Distributed under the terms of the GNU General Public License v2 -EAPI=8 - -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -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 - eapply -p1 $FILESDIR/${PN}-0.16.1-httplib_h.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.16.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild new file mode 100644 index 000000000000..72bacc361f10 --- /dev/null +++ b/dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild @@ -0,0 +1,91 @@ +# Copyright 2024 Liguros Authors +# Distributed under the terms of the GNU General Public License v2 +EAPI=8 + +PYTHON_COMPAT=( python3_{8,9,10,11,12} ) + +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 + eapply -p1 $FILESDIR/${PN}-0.16.2-httplib_h.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