From: "Louis Sautier" <sbraz@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
Date: Thu, 03 Jul 2025 21:21:19 +0000 (UTC) [thread overview]
Message-ID: <1751577403.0bc30d162683cdb10949fe717f4dc85f1f1153dc.sbraz@gentoo> (raw)
commit: 0bc30d162683cdb10949fe717f4dc85f1f1153dc
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 2 19:39:11 2025 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Thu Jul 3 21:16:43 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bc30d16
net-irc/znc: add 1.10.1, enable Py3.14
Since 1.10.0, tests use Qt 6, not Qt 5.
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/Manifest | 1 +
net-irc/znc/znc-1.10.1.ebuild | 197 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 198 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 9653e1afdc3f..c99a82ef7f60 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,2 +1,3 @@
DIST gtest-1.14.0.tar.gz 867764 BLAKE2B c457f55ac572b9fb1553eee3df7eeeaf1e7dd2c3d747dd5e90dd279038fa5c71bb7b7d9ba1cf7e6143898b2a1d24d100584bd2a48ded41a426870c4825eec1b2 SHA512 765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c
+DIST znc-1.10.1.tar.gz 2310976 BLAKE2B c2a01930d965b9e21de724a23dc1a7670009a142c395afab3dedae8ed9c67c47f997e67c4294a2f2bb6438df1aac70024d9b96968e09de9933ab9a80f9cbfcb1 SHA512 f125eef5a9f8bfcd278951971638fe8a937261001bfd8f6438fc51fda666b97c00780c5c6f1a921b3db79cb7656bc9675eb3881b18b22b7738e0976ebcca7cb3
DIST znc-1.9.1.tar.gz 2236498 BLAKE2B b811939d13e45f2731f35721776e5f849078e14e785ae852cfc8ff7b1864d4ac6cae5aeba5ae01e529ffd366981f5ac8bb04f2586e60ac82af06d7af71f639db SHA512 939eafbb2f20569d1b15b66e38b7da7a5210f2023e6fc98018566bd757d62d8ef2682d4b4e3b326a933a99cd7d9d65596ff0e2c43a2315c70e27c64f02d526a6
diff --git a/net-irc/znc/znc-1.10.1.ebuild b/net-irc/znc/znc-1.10.1.ebuild
new file mode 100644
index 000000000000..6dd4fccfc5ee
--- /dev/null
+++ b/net-irc/znc/znc-1.10.1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+
+inherit cmake python-single-r1 readme.gentoo-r1 systemd
+
+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"
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/znc/znc.git"
+else
+ MY_PV=${PV/_/-}
+ MY_P=${PN}-${MY_PV}
+ SRC_URI="
+ https://znc.in/releases/archive/${MY_P}.tar.gz
+ test? ( ${GTEST_URL} )
+ "
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ S=${WORKDIR}/${MY_P}
+fi
+
+HOMEPAGE="https://znc.in"
+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="+argon2 +icu nls perl python +ssl sasl tcl test +zlib"
+RESTRICT="!test? ( test )"
+
+# tests run znc-buildmod which is a Python script
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} icu )
+ test? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# perl is a build-time dependency of modpython
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ perl? (
+ >=dev-lang/swig-4.0.1
+ >=dev-lang/perl-5.10
+ )
+ python? (
+ >=dev-lang/swig-4.0.1
+ >=dev-lang/perl-5.10
+ )
+ test? (
+ ${PYTHON_DEPS}
+ dev-qt/qtbase:6[network]
+ )
+"
+DEPEND="
+ dev-cpp/cctz:=
+ argon2? ( app-crypt/argon2:= )
+ icu? ( dev-libs/icu:= )
+ nls? ( dev-libs/boost:=[nls] )
+ perl? ( >=dev-lang/perl-5.10:= )
+ python? ( ${PYTHON_DEPS} )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ ssl? ( dev-libs/openssl:0= )
+ tcl? ( dev-lang/tcl:0= )
+ zlib? ( sys-libs/zlib:0= )
+"
+RDEPEND="
+ ${DEPEND}
+ acct-user/znc
+ acct-group/znc
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.7.1-inttest-dir.patch"
+)
+
+pkg_setup() {
+ if use python || use test; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ # Let SWIG rebuild modperl/modpython to make user patching easier.
+ if [[ ${PV} != *9999* ]]; then
+ rm modules/modperl/generated.tar.gz || die
+ rm modules/modpython/generated.tar.gz || die
+ fi
+
+ sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \
+ test/CMakeLists.txt || die
+
+ sed -i "s|--datadir=|&${EPREFIX}|" znc.service.in || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -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)"
+ -DWANT_PYTHON="$(usex python)"
+ -DWANT_PYTHON_VERSION="${EPYTHON#python}"
+ -DWANT_CYRUS="$(usex sasl)"
+ -DWANT_OPENSSL="$(usex ssl)"
+ -DWANT_TCL="$(usex tcl)"
+ -DWANT_ZLIB="$(usex zlib)"
+ )
+
+ if [[ ${PV} != *9999* ]] && use test; then
+ export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest"
+ export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock"
+ fi
+
+ cmake_src_configure
+}
+
+src_test() {
+ cmake_build unittest
+ DESTDIR="${T}/inttest" cmake_build install
+ local filter='-'
+ if ! use perl; then
+ filter="${filter}:ZNCTest.Modperl*"
+ fi
+ if ! use python; then
+ filter="${filter}:ZNCTest.Modpython*"
+ fi
+ # CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod
+ # invocations from inside the test
+ GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \
+ CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \
+ CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \
+ cmake_build inttest
+}
+
+src_install() {
+ cmake_src_install
+
+ dodoc NOTICE
+ newinitd "${FILESDIR}"/znc.initd-r2 znc
+ newconfd "${FILESDIR}"/znc.confd-r1 znc
+
+ local DOC_CONTENTS
+ # "local" has its own return value which is not what we want to catch
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die
+ local DISABLE_AUTOFORMATTING=1
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ if [[ -d "${EROOT}/var/lib/znc/.znc/" ]]; then
+ eerror "${EROOT}/var/lib/znc/.znc/ exists, please move your data to ${EROOT}/var/lib/znc/"
+ eerror ""
+ eerror "The systemd unit has changed and now expects data to be located"
+ eerror "at the root of ${EROOT}/var/lib/znc instead of its '.znc' subfolder."
+ eerror "The recommended procedure to move the data is the following:"
+ eerror "1. stop the service: systemctl stop znc.service"
+ eerror "2. move the data: cp -a '${EROOT}/var/lib/znc/.znc/.' '${EROOT}/var/lib/znc/'"
+ eerror "3. fix the config file: sed -i 's|${EROOT}/var/lib/znc/.znc|${EROOT}/var/lib/znc|g' '${EROOT}/var/lib/znc/configs/znc.conf'"
+ eerror "4. restart znc: systemctl start znc.service"
+ eerror "5. once everything works, remove the old data directory: rm -r '${EROOT}/var/lib/znc/.znc/'"
+ eerror "See https://bugs.gentoo.org/743856 for details."
+ fi
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ readme.gentoo_print_elog
+ fi
+}
+
+pkg_config() {
+ if [[ -d "${EROOT}/var/lib/znc/configs" ]]; then
+ ewarn "${EROOT}/var/lib/znc/configs/ already exists,"
+ ewarn "aborting to avoid damaging any existing configuration."
+ ewarn "If you are sure you want to generate a new configuration,"
+ ewarn "remove the folder and try again."
+ else
+ einfo "Press enter to interactively create a new configuration file for znc."
+ einfo "To abort, press Control-C"
+ read
+ su ${PN} -p -s /bin/sh -c 'ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \
+ "${EROOT}"/usr/bin/znc --makeconf \
+ --datadir "${EROOT}/var/lib/znc"' || die "Config failed"
+ einfo
+ einfo "You can now start the znc service using the init system of your choice."
+ einfo "Don't forget to enable it if you want to use znc at boot."
+ fi
+}
next reply other threads:[~2025-07-03 21:21 UTC|newest]
Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-03 21:21 Louis Sautier [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-03 21:21 [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/ Louis Sautier
2025-05-01 16:56 Louis Sautier
2024-07-03 20:35 Sam James
2024-07-03 20:35 Sam James
2024-07-03 20:32 Sam James
2024-07-03 20:32 Sam James
2024-07-03 19:31 Sam James
2024-05-29 6:26 Jakov Smolić
2024-05-29 6:26 Jakov Smolić
2024-05-28 12:29 Michał Górny
2024-02-28 21:56 Louis Sautier
2024-02-28 21:39 Jakov Smolić
2024-02-28 20:50 Jakov Smolić
2024-02-28 2:31 Sam James
2024-02-28 2:31 Sam James
2024-02-28 2:31 Sam James
2024-02-28 0:20 Louis Sautier
2023-11-07 20:55 Louis Sautier
2023-11-07 12:43 Louis Sautier
2023-03-14 12:24 Louis Sautier
2023-03-13 21:24 Sam James
2023-03-13 20:51 Sam James
2023-03-13 20:51 Sam James
2023-03-13 20:35 Arthur Zamarin
2022-11-05 18:43 Louis Sautier
2022-08-23 18:36 Arthur Zamarin
2022-08-07 16:01 Louis Sautier
2022-08-07 16:01 Louis Sautier
2022-06-06 11:02 Jakov Smolić
2022-06-06 11:02 Jakov Smolić
2022-06-06 9:32 Jakov Smolić
2022-06-06 6:53 Jakov Smolić
2022-04-28 8:43 Yixun Lan
2022-04-28 8:41 Yixun Lan
2021-08-24 19:26 Louis Sautier
2021-08-24 19:26 Louis Sautier
2021-06-01 18:07 Louis Sautier
2021-04-30 9:54 Mikle Kolyada
2020-11-12 16:50 Sam James
2020-11-12 0:35 Thomas Deutschmann
2020-11-08 0:32 Sam James
2020-11-08 0:32 Sam James
2020-09-09 21:31 Sam James
2020-09-08 0:53 Sam James
2020-09-07 23:44 Louis Sautier
2020-09-07 23:26 Louis Sautier
2020-08-22 5:43 Agostino Sarubbo
2020-08-18 9:16 Sam James
2020-08-17 14:52 Agostino Sarubbo
2020-08-17 14:07 Agostino Sarubbo
2020-06-12 16:33 Louis Sautier
2020-06-12 11:07 Louis Sautier
2020-06-12 11:07 Louis Sautier
2020-05-08 17:10 Agostino Sarubbo
2020-05-04 14:38 Agostino Sarubbo
2020-05-04 6:43 Agostino Sarubbo
2020-05-04 6:16 Mart Raudsepp
2020-04-23 7:20 Louis Sautier
2019-09-28 22:30 Louis Sautier
2019-07-28 23:05 Louis Sautier
2019-07-28 20:18 Mikle Kolyada
2019-07-26 10:21 Louis Sautier
2019-06-25 22:05 Louis Sautier
2019-06-20 9:27 Mikle Kolyada
2019-06-18 18:24 Thomas Deutschmann
2019-06-16 14:03 Louis Sautier
2019-04-07 22:50 Louis Sautier
2019-04-07 21:42 Mikle Kolyada
2019-04-02 9:28 Mikle Kolyada
2019-04-01 17:21 Thomas Deutschmann
2019-03-31 22:57 Louis Sautier
2019-01-27 14:38 Louis Sautier
2019-01-27 14:38 Louis Sautier
2018-07-19 11:04 Louis Sautier
2018-07-17 22:54 Louis Sautier
2018-07-16 1:11 Mikle Kolyada
2018-07-15 23:37 Mikle Kolyada
2018-07-15 23:31 Thomas Deutschmann
2018-07-15 22:40 Louis Sautier
2018-07-15 22:40 Louis Sautier
2018-06-18 10:34 Louis Sautier
2018-05-15 18:03 Michał Górny
2018-05-15 18:03 Michał Górny
2018-03-14 16:57 Michał Górny
2018-03-14 16:57 Michał Górny
2018-01-10 8:15 Michał Górny
2017-12-17 21:18 Thomas Deutschmann
2017-12-17 21:18 Thomas Deutschmann
2017-08-18 23:26 Thomas Deutschmann
2017-07-24 17:59 Markus Meier
2017-07-19 18:06 Tobias Klausmann
2017-07-17 10:19 Aaron Swenson
2017-04-01 12:12 David Seifert
2017-04-01 12:12 David Seifert
2017-01-04 15:55 Thomas Deutschmann
2016-12-26 23:35 Thomas Deutschmann
2016-12-26 23:35 Thomas Deutschmann
2016-12-23 3:17 Sam Jorna
2016-12-23 3:17 Sam Jorna
2016-12-11 15:21 Michał Górny
2016-12-02 19:08 Michał Górny
2016-12-02 19:08 Michał Górny
2016-12-02 19:08 Michał Górny
2016-11-11 11:19 Agostino Sarubbo
2016-11-11 11:19 Agostino Sarubbo
2016-11-10 17:44 Markus Meier
2016-09-03 17:17 Mike Gilbert
2016-08-07 6:52 Pacho Ramos
2016-03-25 20:46 Andreas Hüttel
2016-03-21 14:17 Ian Delaney
2016-03-21 13:11 Ian Delaney
2016-03-21 13:11 Ian Delaney
2015-09-15 15:41 Julian Ospald
2015-09-15 15:41 Julian Ospald
2015-08-09 18:03 Mikle Kolyada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1751577403.0bc30d162683cdb10949fe717f4dc85f1f1153dc.sbraz@gentoo \
--to=sbraz@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox