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 ECC7515A7D9 for ; Tue, 14 Mar 2023 12:24:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 351EFE07FE; Tue, 14 Mar 2023 12:24:48 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 06D35E07FE for ; Tue, 14 Mar 2023 12:24:48 +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 14C7C342C52 for ; Tue, 14 Mar 2023 12:24:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 819448B5 for ; Tue, 14 Mar 2023 12:24:45 +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: <1678796676.8f1cce5259f44d283ce124d0ec04325cd345f94a.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-1.8.2-r1.ebuild X-VCS-Directories: net-irc/znc/ X-VCS-Committer: sbraz X-VCS-Committer-Name: Louis Sautier X-VCS-Revision: 8f1cce5259f44d283ce124d0ec04325cd345f94a X-VCS-Branch: master Date: Tue, 14 Mar 2023 12:24:45 +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: a1df7a8e-91a4-44d3-992c-40bd0cc261b0 X-Archives-Hash: 061fb8dcf4d8f21a0249ba3ad57786b4 commit: 8f1cce5259f44d283ce124d0ec04325cd345f94a Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 14 08:07:30 2023 +0000 Commit: Louis Sautier gentoo org> CommitDate: Tue Mar 14 12:24:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f1cce52 net-irc/znc: drop 1.8.2-r1 Closes: https://bugs.gentoo.org/893508 Signed-off-by: Andreas Sturmlechner gentoo.org> Signed-off-by: Louis Sautier gentoo.org> net-irc/znc/znc-1.8.2-r1.ebuild | 194 ---------------------------------------- 1 file changed, 194 deletions(-) diff --git a/net-irc/znc/znc-1.8.2-r1.ebuild b/net-irc/znc/znc-1.8.2-r1.ebuild deleted file mode 100644 index 1f40b9dfe14d..000000000000 --- a/net-irc/znc/znc-1.8.2-r1.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) - -inherit cmake python-single-r1 readme.gentoo-r1 systemd - -GTEST_VER="1.8.1" -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 ~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="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib" -RESTRICT="!test? ( test )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )" - -# perl is a build-time dependency of modpython -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) - perl? ( - >=dev-lang/swig-3.0.0 - >=dev-lang/perl-5.10 - ) - python? ( - >=dev-lang/swig-3.0.0 - >=dev-lang/perl-5.10 - ) - test? ( - ${PYTHON_DEPS} - dev-qt/qtnetwork:5 - ) -" -DEPEND=" - 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 - # All these are backports - "${FILESDIR}"/${P}-fix-systemd-datadir.patch - "${FILESDIR}"/${P}-add-libera.patch - "${FILESDIR}"/${P}-fix-python-3.10.patch -) - -pkg_setup() { - if use python; 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_IPV6="$(usex ipv6)" - -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-release-${GTEST_VER}/googletest" - export GMOCK_ROOT="${WORKDIR}/googletest-release-${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 -}