From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5C2D115A7DA for ; Mon, 13 Mar 2023 22:38:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42588E07C7; Mon, 13 Mar 2023 22:38:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E8904E07C7 for ; Mon, 13 Mar 2023 22:38:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D3D0343BA4 for ; Mon, 13 Mar 2023 22:38:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DF388DE for ; Mon, 13 Mar 2023 22:38:15 +0000 (UTC) From: "Bernard Cafarelli" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Bernard Cafarelli" Message-ID: <1678747091.7b6a8a611e16d50a03c4aa7314e06e50c3b33367.voyageur@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nghttp2/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/nghttp2/nghttp2-9999.ebuild X-VCS-Directories: net-libs/nghttp2/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: 7b6a8a611e16d50a03c4aa7314e06e50c3b33367 X-VCS-Branch: master Date: Mon, 13 Mar 2023 22:38:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 198b1e76-a0b0-4428-8c9b-59b5aaa86def X-Archives-Hash: a562a7242457d04cc73553d29d59cef0 commit: 7b6a8a611e16d50a03c4aa7314e06e50c3b33367 Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Mar 13 22:37:22 2023 +0000 Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Mar 13 22:38:11 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b6a8a61 net-libs/nghttp2: sync live ebuild Signed-off-by: Bernard Cafarelli gentoo.org> net-libs/nghttp2/nghttp2-9999.ebuild | 58 +++++++++++++----------------------- 1 file changed, 21 insertions(+), 37 deletions(-) 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" # . SONAMEs +SLOT="0/1.14" # 1. 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 }