gentoo auto-resync : 14:03:2023 - 00:16:42

3 files changed, 82 insertions, 38 deletions

diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index e539e1d3da2c..aa56825182e3 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,7 +1,9 @@
 DIST nghttp2-1.48.0-pthread.patch 24917 BLAKE2B 22013d89685be603094aa82f69da8741d4c0d76aea8a01de1322c19cef053964fdf0bec937650382f85607ac74466d4d052e6d40217101bc1e40326ad0ddc003 SHA512 bdebc50f13584826d6693aae201db9be63fcadcb8a68af188e94f008e005a2fd6aa6b91b31de2f07f84b93d981a003c8752c5fb4d47502f768bd94e21635627f
 DIST nghttp2-1.51.0-pthread.patch 24623 BLAKE2B 55c63b4851788e4e18df1f7881fc370bf901c2df2249243e18e2a49f2142454438b41ecd941ed888ca065cdb037bd52624231a97a06eae4f97ebbc24cd890a46 SHA512 eaa85373f977bd4383d11d6077d69c80cf254ec49f4686a0140765a84806f6691f435fd5d558d4642cbf4a364f274c16b50d3f63c4e9507b6dc3b1317498e15a
 DIST nghttp2-1.51.0.tar.xz 4115988 BLAKE2B ca3c5fb439b60f67ce5447c957397c16c7659432d3a3b25076b88142318675eb2af9f039a86ce88df8af3bd0167d98f14cdeb8dad2d01eda1378015acefa354e SHA512 0212680e57a15f9afca3b5226429edebd2fe8a52117480007d4472cd0c1bd3aa4d9f21269c637a11efd0f2146a3ee16c3c07ab35d9fb3d4566235d3a14268eeb
+DIST nghttp2-1.52.0.tar.xz 1491732 BLAKE2B a77ff3e1f901768daf7e681cad06bf3b9ea44876dba76e06c2aaec8637196f27ee7213e3ef52da53b995f68a2a617f64947b4392f57140310bdc5a1d994ad1b2 SHA512 3af1ce13270f7afc8652bd3de71200d9632204617fe04d2be7156d60eeb1a5cc415573677791a399ae03577e8e3256939b1b05d27dbd98dee504d09ec5325d56
 EBUILD nghttp2-1.51.0-r1.ebuild 2150 BLAKE2B 076167b45f176b7c0db308192c1c98131021b30a8436c3bb848dbfc1e05e71c50bc69ae3fee51e68ec6d882af1e5e137acb65ef8fecd6a5f639cc0103e917c55 SHA512 1b94f01cf8799b5e436674a78072b65d404851916bf7dfed950eef01beb3f11b69a8ba5f2e6df33cd138b878ae5f462a2f4b846380667ed4928949321d0e368c
 EBUILD nghttp2-1.51.0.ebuild 2015 BLAKE2B cff57078e68a5d049333b4540c0fea0b16d458841fa1150babb8ac255b687fce89f10f0b48c71c38ada478722e8ea24072e79b874f866b19dc26dec997cac744 SHA512 0a3f42a8200d6c6dd7e78ba4a5e848f399c88d70f989e40dd9016b44929f725a22dd7cdfb316ec516b842609308d06dfa1c57f1f3cdd396e7bab4957539eace3
-EBUILD nghttp2-9999.ebuild 1818 BLAKE2B 08da5d29e40949edf03d901ddc142f3e3fa24b508a1088ddb03fc29dd1455909e879c043490616832e9af0fb06fbaec981a9350c59b8393bf26e148048dd60b4 SHA512 2436b09f1d3bf790aa791a5f2641ad965cedf16726db9299c119b2c51ad16a64be87473eb8dfde35b3da6a18e2e8eb00bc0261002515e2d9338460d58f8c5766
+EBUILD nghttp2-1.52.0.ebuild 1767 BLAKE2B b17520fb134240b02d19d251d0037482b0843260b3147cfb4926a1d1b2d229df7be9c268cb86de8ec8968463f65e3631e21f4c20507652a38166db4cf6a4aa06 SHA512 0d729104bfdac2c5318bb1c56cffdb5bc4b11fb4b182b48d1eb387f7911319e5fe83aeb261dc94db703873fa04725669f5a28de26654cf87af031d99cae9adf4
+EBUILD nghttp2-9999.ebuild 1561 BLAKE2B 27708d60e868d822b9c151e45a20542aa1f55b3e316e7645b3f0483537b83649a76f0da6f07306144c26d1f0ad42f9bef261c43646865f447ff175ff8fab6f96 SHA512 9cebfdac18b7411f91b6257c47372043e408bc73e79aecea2aca3464f20e9990af3eb04feab7ebcf927b16200190df29a596f3eba22937b9ba41ea4b85bc3299
 MISC metadata.xml 553 BLAKE2B 694d0da32dab7f6eebd3b83a12b490b62d262de96e2bbb5c5822befbac792bc560cfe21c194d83d1afabf725967e0508c65057c8382904353abb0219d5ff3338 SHA512 4bce2e01c0b64eee279fc8a425393acf63e859a8b63346ddb2c5486d913bc58d0485d4c7fd6663bec88b070f21b6c9bbfd28e5775dbcbee02248e631610becd0
diff --git a/net-libs/nghttp2/nghttp2-1.52.0.ebuild b/net-libs/nghttp2/nghttp2-1.52.0.ebuild
new file mode 100644
index 000000000000..eff7b0dad997
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.52.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/1.14" # 1.<SONAME>
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml"
+
+RESTRICT="!test? ( test )"
+
+SSL_DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	hpack-tools? ( >=dev-libs/jansson-2.5:= )
+	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	systemd? ( >=sys-apps/systemd-209 )
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_FAILMALLOC=OFF
+		-DENABLE_WERROR=OFF
+		-DENABLE_THREADS=ON
+		-DENABLE_DEBUG=$(usex debug)
+		-DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools)
+		$(cmake_use_find_package hpack-tools Jansson)
+		-DWITH_JEMALLOC=$(multilib_native_usex jemalloc)
+		-DENABLE_STATIC_LIB=$(usex static-libs)
+		$(cmake_use_find_package systemd Systemd)
+		$(cmake_use_find_package test CUnit)
+		-DENABLE_APP=$(multilib_native_usex utils)
+		-DWITH_LIBXML2=$(multilib_native_usex xml)
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	eninja check
+}
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index b24cbd6c83f0..fee50b41adf2 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -1,20 +1,18 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# TODO: Add python support.
-
 EAPI=8
 
-inherit autotools git-r3 multilib-minimal
+inherit cmake-multilib git-r3
 
 DESCRIPTION="HTTP/2 C Library"
 HOMEPAGE="https://nghttp2.org/"
 EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
 
 LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
+SLOT="0/1.14" # 1.<SONAME>
 KEYWORDS=""
-IUSE="cxx debug hpack-tools jemalloc static-libs systemd test utils xml"
+IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml"
 
 RESTRICT="!test? ( test )"
 
@@ -22,10 +20,6 @@ SSL_DEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
 "
 RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP}]
-	)
 	hpack-tools? ( >=dev-libs/jansson-2.5:= )
 	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
 	utils? (
@@ -34,41 +28,31 @@ RDEPEND="
 		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
 		net-dns/c-ares:=[${MULTILIB_USEDEP}]
 	)
-	systemd? ( sys-apps/systemd )
+	systemd? ( >=sys-apps/systemd-209 )
 	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
 BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-python-bindings
-		--disable-werror
-		--enable-threads
-		--without-cython
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(multilib_native_use_with hpack-tools jansson)
-		$(multilib_native_use_with jemalloc)
-		$(use_enable static-libs static)
-		$(multilib_native_use_with systemd)
-		$(use_with test cunit)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with xml libxml2)
+	local mycmakeargs=(
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_FAILMALLOC=OFF
+		-DENABLE_WERROR=OFF
+		-DENABLE_THREADS=ON
+		-DENABLE_DEBUG=$(usex debug)
+		-DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools)
+		$(cmake_use_find_package hpack-tools Jansson)
+		-DWITH_JEMALLOC=$(multilib_native_usex jemalloc)
+		-DENABLE_STATIC_LIB=$(usex static-libs)
+		$(cmake_use_find_package systemd Systemd)
+		$(cmake_use_find_package test CUnit)
+		-DENABLE_APP=$(multilib_native_usex utils)
+		-DWITH_LIBXML2=$(multilib_native_usex xml)
 	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	cmake_src_configure
 }
 
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}"/usr -type f -name '*.la' -delete || die
-	fi
+multilib_src_test() {
+	eninja check
 }