From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- net-irc/znc/Manifest | 6 +- net-irc/znc/znc-1.7.5.ebuild | 183 ------------------------------------------ net-irc/znc/znc-1.8.2.ebuild | 184 +++++++++++++++++++++++++++++++++++++++++++ net-irc/znc/znc-9999.ebuild | 3 + 4 files changed, 190 insertions(+), 186 deletions(-) delete mode 100644 net-irc/znc/znc-1.7.5.ebuild create mode 100644 net-irc/znc/znc-1.8.2.ebuild (limited to 'net-irc/znc') diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest index 13877ce28daa..90d3bfc50941 100644 --- a/net-irc/znc/Manifest +++ b/net-irc/znc/Manifest @@ -3,9 +3,9 @@ AUX znc-1.7.1-inttest-dir.patch 2205 BLAKE2B f322f6884170c71ba537897d38c5ca27879 AUX znc.confd-r1 720 BLAKE2B 4857a8bcd36ed1008a558ac7b067d6fad53b5d39c0df9130ca28d4ac3db3924a3a1200682c19c7e6f7869f22338b492f73bf6ccbc2b723d117c9eebc10a89838 SHA512 3ab102f64ea0572350c8595fd3739874da591c43a3dbc3a740c72c53bd7418fded721d478d1fb92de0c0d18131313ba6679e842a135dfe239ea3f42821d8e468 AUX znc.initd-r2 952 BLAKE2B 81346bf0a1581543683eb5c125b29474c0bc01b8aee11c036a134c5a01042059564f2982aaec65715ac0a2c87b64fcd9746464148a81daeee549f4228d6ff55f SHA512 c3d676796aaa485dcaebee0fba58a8f86560cd192e0e2ccf06f58346c1368f58aa5be1c1e5160f8105e3dc5c684d3d1f82eff6a4d7b87c07f11450b72288727f DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 -DIST znc-1.7.5.tar.gz 2170656 BLAKE2B af5548bff1d9c6e740e668f467f52e8540a59bec9363fb4a17c594e1a9638417f75321b074e2aad6380769a594fc134543681928a7a33d00083ba9babc441a69 SHA512 f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825 DIST znc-1.8.1.tar.gz 2161359 BLAKE2B 5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e SHA512 87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16 -EBUILD znc-1.7.5.ebuild 5143 BLAKE2B 5007171b6bc56fd4ef00e28d8f386b052be58a82518261f30a8d45b08415c149c44fd51dd69c93574610b4bb5e34c6e6b09559c34059812eab48497d5ced61ad SHA512 6eb198b56afe1f8783eb345cefc6adbb4cdc885f1e5eb863ad81186399ceca51dc88e7df15a9df2d8df9b655dccb5d508948cdab2d1b704d13a748788cd688f3 +DIST znc-1.8.2.tar.gz 2101215 BLAKE2B 7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e SHA512 e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9 EBUILD znc-1.8.1.ebuild 4711 BLAKE2B 8b8182c6627e7aa58d56b5575d1e8e615adc5beff9639b04e5cea2821b20bea48f3449adffab0deed76b073ff3cf97b4d9f10abe1577a50d969c57beef9b6e86 SHA512 6acb23f885ebcdcd38fee1f8df5e43a4cb66b32f9c644c2848c75c0f84e10b017ea0acf7a8f49d9e78a810dbe1cf4f73d7696df9caeb79ae83cef71d59c9fe1a -EBUILD znc-9999.ebuild 4715 BLAKE2B 571f20a718346d7d22a8ae8f01b536faf5ab2479541f231eee3461b13db1d0b10bf9c1d5b92ed10ad8c2430e9a2c2ce1597cb4d4300a25ab976549ca058bce4e SHA512 9e0099d64e848c9d9c7ab03246811ea5dbefb98f614b70c50eb39399465a3a1693ee2792512b5f5e5925b8547380a7571b484ce068a826ba6b6b4ea47f3ecfd9 +EBUILD znc-1.8.2.ebuild 4839 BLAKE2B 247882a7d030319ec78132621619a5a25158c0acb3a7762b935ee215c2fd42670fa59d1fe64ab8fa824f9967c1ae92b695cf1c234ff7444696b15b5163b4fa5c SHA512 5c97f2b6c1dbaa34865a27ba6117d11b2e49113d2764b4006dc1e8a2a4bfe7e4c3de384b193434fa4e9e6366854f1c0c4c877f44506d3cd11c16ba42abcce8fe +EBUILD znc-9999.ebuild 4848 BLAKE2B 2227d552a5e2dde5096765721782ae24b89ecd7cf8632c8b0bb4c97779df5efe1ec94f197d443f5a4bbdaef8b70d97e39783ab89f80b0c427d7b2464b87d7ebd SHA512 0e8818db7492c151377bdefbf64cc47b3f36458ddf12bd89fa7f51225f4447991467c1b0d44eb3fece2a3ccae5fee48a9f2e9be5cf56711e21053f1461b11513 MISC metadata.xml 507 BLAKE2B c8926f6668f57c84f5715156a424b18f7cb01f0ea9ac6a499550f731a00c7de035ec270f89297bda07ac3115292deffdcd0f3a339484c9de5d8bd7170be00de6 SHA512 d69af8535c2e409e6b6e65bfd279d74bd89ce01e911e0d21b4079bd13328e47f3b959ef82531b833c702955225e01db6915f4fb3f94d048a05ce2107b61bf1a6 diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild deleted file mode 100644 index 6f190e2ca05f..000000000000 --- a/net-irc/znc/znc-1.7.5.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user - -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=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"} - SRC_URI="" -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 x86" - S=${WORKDIR}/${MY_P} -fi - -HOMEPAGE="https://znc.in" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib" -RESTRICT="!test? ( test )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )" - -RDEPEND=" - 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? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tcl? ( dev-lang/tcl:0= ) - zlib? ( sys-libs/zlib:0= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - perl? ( >=dev-lang/swig-3.0.0 ) - python? ( >=dev-lang/swig-3.0.0 ) - test? ( dev-qt/qtnetwork:5 ) -" - -PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch ) - -pkg_setup() { - if use python; then - python-single-r1_pkg_setup - fi - - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} - # The home directory was previously set to /dev/null - # This caused a bug with the systemd unit - # https://bugs.gentoo.org/521916 - esethome ${PN} /var/lib/${PN} -} - -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 - - cmake-utils_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_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-utils_src_configure -} - -src_test() { - cmake-utils_src_make unittest - if has network-sandbox ${FEATURES}; then - DESTDIR="${T}/inttest" cmake-utils_src_make 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-utils_src_make inttest - else - # TODO: don't require sandbox after - # https://github.com/znc/znc/pull/1363 is implemented - ewarn "FEATURES=-network-sandbox; skipping integration tests which" - ewarn "temporary open local ports." - fi -} - -src_install() { - cmake-utils_src_install - - dodoc NOTICE - newinitd "${FILESDIR}"/znc.initd-r2 znc - newconfd "${FILESDIR}"/znc.confd-r1 znc - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die - DISABLE_AUTOFORMATTING=1 - readme.gentoo_create_doc -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - readme.gentoo_print_elog - fi - - if [[ -d "${EROOT}"/etc/znc ]]; then - ewarn "${EROOT}/etc/znc exists on your system." - ewarn "Due to the nature of the contents of that folder," - ewarn "we have changed the default configuration to use" - ewarn " ${EROOT}/var/lib/znc" - ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc" - ewarn "or adjust your service configuration." - fi -} - -pkg_config() { - if [[ -e "${EROOT}/var/lib/znc" ]]; then - ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid damaging" - ewarn "any existing configuration. If you are sure you want" - ewarn "to generate a new configuration, remove the folder" - ewarn "and try again." - else - einfo "Press enter to interactively create a new configuration file for znc." - einfo "To abort, press Control-C" - read - mkdir -p "${EROOT}/var/lib/znc" || die - chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" || - die "Setting permissions failed" - start-stop-daemon --start --user ${PN}:${PN} --env 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 -} diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild new file mode 100644 index 000000000000..975978dcf4e3 --- /dev/null +++ b/net-irc/znc/znc-1.8.2.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +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=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"} + SRC_URI="" +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 ~x86" + # "If you upgrade your ZNC version you must recompile all your modules." + # - https://wiki.znc.in/Compiling_modules + SLOT="0/${PV}" + S=${WORKDIR}/${MY_P} +fi + +HOMEPAGE="https://znc.in" +LICENSE="Apache-2.0" +IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib" +RESTRICT="!test? ( test )" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )" + +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? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + tcl? ( dev-lang/tcl:0= ) + zlib? ( sys-libs/zlib:0= ) +" +RDEPEND=" + ${DEPEND} + acct-user/znc + acct-group/znc +" +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 + ) +" + +PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.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 + + 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_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 + + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die + DISABLE_AUTOFORMATTING=1 + readme.gentoo_create_doc +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + readme.gentoo_print_elog + fi + + if [[ -d "${EROOT}"/etc/znc ]]; then + ewarn "${EROOT}/etc/znc exists on your system." + ewarn "Due to the nature of the contents of that folder," + ewarn "we have changed the default configuration to use" + ewarn " ${EROOT}/var/lib/znc" + ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc" + ewarn "or adjust your service configuration." + fi +} + +pkg_config() { + if [[ -e "${EROOT}/var/lib/znc" ]]; then + ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid damaging" + ewarn "any existing configuration. If you are sure you want" + ewarn "to generate a new configuration, remove the folder" + ewarn "and try again." + else + einfo "Press enter to interactively create a new configuration file for znc." + einfo "To abort, press Control-C" + read + mkdir -p "${EROOT}/var/lib/znc" || die + chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" || + die "Setting permissions failed" + start-stop-daemon --start --user ${PN}:${PN} --env 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 +} diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild index fa6a8f89ce81..764c35c45dcc 100644 --- a/net-irc/znc/znc-9999.ebuild +++ b/net-irc/znc/znc-9999.ebuild @@ -23,6 +23,9 @@ else test? ( ${GTEST_URL} ) " KEYWORDS="~amd64 ~arm ~arm64 ~x86" + # "If you upgrade your ZNC version you must recompile all your modules." + # - https://wiki.znc.in/Compiling_modules + SLOT="0/${PV}" S=${WORKDIR}/${MY_P} fi -- cgit v1.2.3