gentoo auto-resync : 08:12:2023 - 05:11:04

4 files changed, 13 insertions, 63 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index fbf5bcc5d40e..e23e34144552 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest
index 2d535b12259a..2297842b797b 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,7 +1,6 @@
 AUX cpp-httplib-0.14.1-fix-version.patch 439 BLAKE2B e3cad102ce27184e66751dd698bfa38fe32546d179dcf437efe40f73ee96d10c04e5f04bd30246289bbba7bc09a54ebf0e2975185b7820f091dc01bb917f1053 SHA512 3c4e84191126df0b0ea427ddfdf8caa0f7a7ee3fb87c3b754ddeea5f0c0df43f8d9f50d5b76052c9deffe9c4a51b258590d85706106a18e4611c580d08654a45
-DIST cpp-httplib-0.14.0.tar.gz 1147334 BLAKE2B 9d24cefcb2b181abe887d77686eafd938ec59b54cd56ff046e61773974f106c7b91ea94dc208369095c0b5392a48a462386c2c42ade252e18224014b2f7a5e9c SHA512 fac8fd1730e7f828053c61924d3ff9b660ad3cb385aa7a506c50c1ed1ca9820fb07691e28e03effcc60e391ecb78727108f1fdbe8b428917ab494738bed86d78
 DIST cpp-httplib-0.14.1.tar.gz 1148935 BLAKE2B e083fba3281e5b35031e1fda60efe75971d4edf746e52fa4608afbc3af3f7f9532ca59d041692277e963653c77a4878d5bbcb8045aba76d350185ca276a25a64 SHA512 6e995502e0cfd9953044207fabce29a3d6de49e79464b6bf89e1a9e667dc66fe1972c38d6428ad8e8fb96236e85b2d9ac60cbb58b4de03e8f837a9122151a706
-EBUILD cpp-httplib-0.14.0.ebuild 1449 BLAKE2B 75d9bf8ac128306b1d419c8fcf56ad2a18d8f74812f2f367003163f8ce75eeb323dde47bc9bca6a245dc70c61c13ab79fa87feb5c1dfefb54d9f7e62a7663220 SHA512 5e26022390ac35cae8c42f8cb7210ab9c7db788fe348b737bb4914371ab74fccd92ca80544d9885979a110e0f853c12d766995587aead8f3ebd3b288b72a5295
+DIST cpp-httplib-0.14.2.tar.gz 1149003 BLAKE2B 9b203a0e584b64d564a87b1b9bea49cd374241f871524ace1aacc02aacf63ab131fc7eaee60708b9ff5713838ef464d98f560792af36952b47d99a019515d213 SHA512 b4f315e174f8efb7884b64b45c500c8259c28379a6079c26747f754db7e1f16a118b1e6f83925b6740a1b5b3516158c1202737dc6385bcefe9c69f4cca57d07e
 EBUILD cpp-httplib-0.14.1-r1.ebuild 1500 BLAKE2B 75d13b5387349abbae25a2b9444bbffa5cb44307a61c6f980d3b1b4dc7225fbece56bfb93e8c60c749f022ca9985ba66af25024c39163d02b8e7e1ee62607ff8 SHA512 d69a64cf199496e55d17cf630a00ab38fe0ddf0835a6d6291e78ef749ab387b2af064b3eb2170c93e15753694bd071d53c0699dc971fabeb0fae132fa0831f29
-EBUILD cpp-httplib-0.14.1.ebuild 1450 BLAKE2B 0b2d6def998825a1c2a0ae562839a63a518e2578eefe2bfdb50f17081f3d1df743880dba9dff830044497b10bfc6b7d407e97aec962079a11c757960defd452c SHA512 5c31abb335a6527d4a038c419372968e23cf3bf518f8be2ca2c1b386b4d03edc43380208ce519988912a988edcb3cd94f7890793740288de3ebe4ee52cc9a10f
+EBUILD cpp-httplib-0.14.2.ebuild 1464 BLAKE2B d68884feec79e537a2afe4de5c8b8f884d4364c0be8d780b837e124fca7cdb9872206624ced73be7222a0bb986732a191d747bf1681cbc480fceda1cdb5ca3ec SHA512 cf0b1d74209ab21c2e6770a765395295616e75e0d2dd4caba07fc5c6bfb9092ec9c18e703c4dd8160bce78f26a12060896963d68c2a6e06358df71a8d96d7d85
 MISC metadata.xml 658 BLAKE2B d97bce6286ac52413eb4c57a63290685efbc41c72482cbc9b0aeadca193e9e9a315a9912b0cd692cd7f3d213b8a784d07dc8981d5df1d750b4324f1fba995302 SHA512 1c9f1aba4dbe32f4e8f78ecad2a2c677b7f662eff4b1e9e6e4389bed969ddd7c878324c1635d66a22e53c56dc5b05cd401d4c384a5c4a0314c3932109f4d6b70
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.14.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.14.0.ebuild
deleted file mode 100644
index a79c390594f2..000000000000
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.14.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-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="amd64 ~loong ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"  # soversion
-
-IUSE="brotli ssl test zlib"
-REQUIRED_USE="test? ( brotli ssl zlib )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-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
-
-	GTEST_FILTER='-*.*_Online' emake -C test "CXX=$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I."
-}
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.14.1.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.14.2.ebuild
index f1023f88c232..d547c58852e6 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.14.1.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.14.2.ebuild
@@ -10,12 +10,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
+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="~amd64 ~loong ~x86"
 fi
 
@@ -31,8 +33,12 @@ RDEPEND="
 	ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
 "
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+"
 
 src_configure() {
 	local -a mycmakeargs=(
@@ -52,5 +58,6 @@ src_configure() {
 multilib_src_test() {
 	cp -p -R --reflink=auto "${S}/test" ./test || die
 
-	GTEST_FILTER='-*.*_Online' emake -C test "CXX=$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I."
+	GTEST_FILTER='-*.*_Online' emake -C test \
+		CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I."
 }