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 0F394158020 for ; Sat, 5 Nov 2022 18:43:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BABC9E0769; Sat, 5 Nov 2022 18:43:37 +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 A1FA7E0769 for ; Sat, 5 Nov 2022 18:43:37 +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 51162335D06 for ; Sat, 5 Nov 2022 18:43:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B7B8599 for ; Sat, 5 Nov 2022 18:43:34 +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: <1667673320.9a5aad2bf2e54dab53a598fa151baaa8dd1b1f0c.sbraz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/, net-irc/znc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/znc/files/znc-1.8.2-fix-swig.patch net-irc/znc/znc-1.8.2-r2.ebuild X-VCS-Directories: net-irc/znc/files/ net-irc/znc/ X-VCS-Committer: sbraz X-VCS-Committer-Name: Louis Sautier X-VCS-Revision: 9a5aad2bf2e54dab53a598fa151baaa8dd1b1f0c X-VCS-Branch: master Date: Sat, 5 Nov 2022 18:43:34 +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: c674dcbd-f594-444d-85cf-319299a389a7 X-Archives-Hash: e78ef755b61a37c17ef4f1613e19c66d commit: 9a5aad2bf2e54dab53a598fa151baaa8dd1b1f0c Author: Louis Sautier gentoo org> AuthorDate: Sat Nov 5 17:15:58 2022 +0000 Commit: Louis Sautier gentoo org> CommitDate: Sat Nov 5 18:35:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a5aad2b net-irc/znc: fix build with SWIG 4.1.0 and USE=perl/python Also always enable IPv6 as it doesn't require additional dependencies (pkgcheck warned of "UseFlagWithoutDeps"). Closes: https://bugs.gentoo.org/878587 Signed-off-by: Louis Sautier gentoo.org> net-irc/znc/files/znc-1.8.2-fix-swig.patch | 43 ++++++++++++++++++++++++++++++ net-irc/znc/znc-1.8.2-r2.ebuild | 9 ++++--- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/net-irc/znc/files/znc-1.8.2-fix-swig.patch b/net-irc/znc/files/znc-1.8.2-fix-swig.patch new file mode 100644 index 000000000000..d07d136c5940 --- /dev/null +++ b/net-irc/znc/files/znc-1.8.2-fix-swig.patch @@ -0,0 +1,43 @@ +From fecdd9895894b3afe903021b0843a422eb4d3308 Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov +Date: Sat, 5 Nov 2022 12:54:40 +0000 +Subject: [PATCH] Add support SWIG 4.1.0, drop support for < 4.0.1 + +https://bugs.gentoo.org/878587 +--- + CMakeLists.txt | 2 +- + modules/modperl/CMakeLists.txt | 1 - + modules/modpython/CMakeLists.txt | 1 - + 3 files changed, 1 insertion(+), 3 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -173,7 +173,7 @@ if(WANT_PYTHON AND NOT EXISTS + endif() + endif() + if(search_swig) +- find_package(SWIG 3.0.0) ++ find_package(SWIG 4.0.1) + if(NOT SWIG_FOUND) + message(FATAL_ERROR + "Can't find SWIG, therefore Perl and Python aren't supported. " +--- a/modules/modperl/CMakeLists.txt ++++ b/modules/modperl/CMakeLists.txt +@@ -53,7 +53,6 @@ if(SWIG_FOUND) + "-I${PROJECT_SOURCE_DIR}/include" + "-I${CMAKE_CURRENT_SOURCE_DIR}/.." + "-I${CMAKE_CURRENT_SOURCE_DIR}/include" +- -DZNC_EXPORT_LIB_EXPORT + -outdir "${CMAKE_CURRENT_BINARY_DIR}" + -o "${CMAKE_CURRENT_BINARY_DIR}/modperl_biglib.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/modperl.i" +--- a/modules/modpython/CMakeLists.txt ++++ b/modules/modpython/CMakeLists.txt +@@ -50,7 +50,6 @@ if(SWIG_FOUND) + "-I${PROJECT_BINARY_DIR}/include" + "-I${PROJECT_SOURCE_DIR}/include" + "-I${CMAKE_CURRENT_SOURCE_DIR}/.." +- -DZNC_EXPORT_LIB_EXPORT + -outdir "${CMAKE_CURRENT_BINARY_DIR}" + -o "${CMAKE_CURRENT_BINARY_DIR}/modpython_biglib.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/modpython.i" diff --git a/net-irc/znc/znc-1.8.2-r2.ebuild b/net-irc/znc/znc-1.8.2-r2.ebuild index b9d4a004fac3..885291374ae4 100644 --- a/net-irc/znc/znc-1.8.2-r2.ebuild +++ b/net-irc/znc/znc-1.8.2-r2.ebuild @@ -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="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib" +IUSE="+icu nls perl python +ssl sasl tcl test +zlib" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )" @@ -40,11 +40,11 @@ BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) perl? ( - >=dev-lang/swig-3.0.0 + >=dev-lang/swig-4.0.1 >=dev-lang/perl-5.10 ) python? ( - >=dev-lang/swig-3.0.0 + >=dev-lang/swig-4.0.1 >=dev-lang/perl-5.10 ) test? ( @@ -75,6 +75,7 @@ PATCHES=( "${FILESDIR}"/${P}-add-libera.patch "${FILESDIR}"/${P}-fix-python-3.10.patch "${FILESDIR}"/${P}-fix-odr-violation.patch + "${FILESDIR}"/${P}-fix-swig.patch ) pkg_setup() { @@ -103,7 +104,7 @@ src_configure() { -DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used. -DSYSTEMD_DIR="$(systemd_get_systemunitdir)" -DWANT_ICU="$(usex icu)" - -DWANT_IPV6="$(usex ipv6)" + -DWANT_IPV6=yes -DWANT_I18N="$(usex nls)" -DWANT_PERL="$(usex perl)" -DWANT_PYTHON="$(usex python)"