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 51031158041 for ; Wed, 28 Feb 2024 00:21:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28DCA2BC01E; Wed, 28 Feb 2024 00:21:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0AD682BC01E for ; Wed, 28 Feb 2024 00:21:02 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D32BE33DF47 for ; Wed, 28 Feb 2024 00:21:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42B5714E0 for ; Wed, 28 Feb 2024 00:20:59 +0000 (UTC) From: "Louis Sautier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Louis Sautier" Message-ID: <1709079623.ab2d9610c0cb3a21ae418c0729b152c9911c732c.sbraz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/znc/znc-9999.ebuild X-VCS-Directories: net-irc/znc/ X-VCS-Committer: sbraz X-VCS-Committer-Name: Louis Sautier X-VCS-Revision: ab2d9610c0cb3a21ae418c0729b152c9911c732c X-VCS-Branch: master Date: Wed, 28 Feb 2024 00:20:59 +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: 12f79bfa-fde1-4343-a04a-73b9ac7ba2a1 X-Archives-Hash: f9e0423c43f328c01e82f55a3337644e commit: ab2d9610c0cb3a21ae418c0729b152c9911c732c Author: Louis Sautier gentoo org> AuthorDate: Wed Feb 28 00:06:17 2024 +0000 Commit: Louis Sautier gentoo org> CommitDate: Wed Feb 28 00:20:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab2d9610 net-irc/znc: sync live ebuild with 1.9.0 Signed-off-by: Louis Sautier gentoo.org> net-irc/znc/znc-9999.ebuild | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild index 34bfa81f2f20..4245192ac954 100644 --- a/net-irc/znc/znc-9999.ebuild +++ b/net-irc/znc/znc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-single-r1 readme.gentoo-r1 systemd -GTEST_VER="1.8.1" +GTEST_VER="1.14.0" GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz" DESCRIPTION="An advanced IRC Bouncer" @@ -21,7 +21,7 @@ else https://znc.in/releases/archive/${MY_P}.tar.gz test? ( ${GTEST_URL} ) " - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64" S=${WORKDIR}/${MY_P} fi @@ -30,7 +30,7 @@ LICENSE="Apache-2.0" # "If you upgrade your ZNC version, you must recompile all your modules." # - https://wiki.znc.in/Compiling_modules SLOT="0/${PV}" -IUSE="+icu nls perl python +ssl sasl tcl test +zlib" +IUSE="+argon2 +icu nls perl python +ssl sasl tcl test +zlib" RESTRICT="!test? ( test )" # tests run znc-buildmod which is a Python script @@ -57,7 +57,8 @@ BDEPEND=" ) " DEPEND=" - app-crypt/argon2:= + dev-cpp/cctz:= + argon2? ( app-crypt/argon2:= ) icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) @@ -74,7 +75,7 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch + "${FILESDIR}/${PN}-1.7.1-inttest-dir.patch" ) pkg_setup() { @@ -103,6 +104,7 @@ src_configure() { -DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used. -DSYSTEMD_DIR="$(systemd_get_systemunitdir)" -DWANT_ICU="$(usex icu)" + -DWANT_ARGON="$(usex argon2)" -DWANT_IPV6=yes -DWANT_I18N="$(usex nls)" -DWANT_PERL="$(usex perl)" @@ -115,8 +117,8 @@ src_configure() { ) if [[ ${PV} != *9999* ]] && use test; then - export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest" - export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock" + export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest" + export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock" fi cmake_src_configure