* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2019-01-27 14:38 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2019-01-27 14:38 UTC (permalink / raw
To: gentoo-commits
commit: 76cd8cf9dc4a2cebef4406d7edf435c9fb022034
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 14:15:05 2019 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 14:37:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76cd8cf9
net-irc/znc: bump to 1.7.2, EAPI=7, uses ninja instead of make
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/Manifest | 2 +
net-irc/znc/znc-1.7.2.ebuild | 182 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 184 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index cf9e0f5c01a..5c3a7e5e7aa 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,2 +1,4 @@
+DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63 SHA512 ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600
DIST znc-1.7.1.tar.gz 2041669 BLAKE2B 57ead136e28b0fc4a875802ef89ef004213789e68d19ceeab15c6fac6fe51ea51618764c484ea618fc6359d9c15cc7ffcf5529642d730b9217a4f127e92d9ae6 SHA512 907068fb0828091026d440145b70ca76109302f13c18d94f772660192434287f209a06a52da1dd39726b9a38735b3cea9afbd062eb6def4cd428bb73c562a902
+DIST znc-1.7.2.tar.gz 2083306 BLAKE2B 907581df536d9bab15964f6fcecbbf660403c39368b984ab1d2957bd43c4a90ca0694844b41786dab5495a4f4dccd675eaa54189782d47683e013d1faf9cc368 SHA512 fcc67bf676e066db64d62584ff8ecfd63280b3237e88dcbe18ab0b78a9b5f4dc202b589876b6fc14c6092ca5509937bc170a54fba44df2aeb1645cca02afe577
diff --git a/net-irc/znc/znc-1.7.2.ebuild b/net-irc/znc/znc-1.7.2.ebuild
new file mode 100644
index 00000000000..b8d5eb3df8f
--- /dev/null
+++ b/net-irc/znc/znc-1.7.2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+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 ~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"
+
+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
+}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2024-07-03 20:35 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2024-07-03 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 42d343a8b32d1165fbf59eb4c58e85c78fbd4f77
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 3 20:35:00 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 20:35:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d343a8
net-irc/znc: Stabilize 1.9.1 amd64, #935428
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/znc-1.9.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.1.ebuild b/net-irc/znc/znc-1.9.1.ebuild
index 7f7e1fc25004..ce0514db0499 100644
--- a/net-irc/znc/znc-1.9.1.ebuild
+++ b/net-irc/znc/znc-1.9.1.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2024-07-03 20:35 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2024-07-03 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 2dbac9e223ecc064b17fc526a85b91ddc0a21e79
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 3 20:35:03 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 20:35:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dbac9e2
net-irc/znc: Stabilize 1.9.1 x86, #935428
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/znc-1.9.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.1.ebuild b/net-irc/znc/znc-1.9.1.ebuild
index ce0514db0499..2c7040a99a5d 100644
--- a/net-irc/znc/znc-1.9.1.ebuild
+++ b/net-irc/znc/znc-1.9.1.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2024-07-03 20:32 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2024-07-03 20:32 UTC (permalink / raw
To: gentoo-commits
commit: c4349a8500c250ad371e81d761a06dd67a811a9a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 3 20:32:09 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 20:32:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4349a85
net-irc/znc: Stabilize 1.9.1 arm, #935428
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/znc-1.9.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.1.ebuild b/net-irc/znc/znc-1.9.1.ebuild
index 019d97123dde..10f210f61e75 100644
--- a/net-irc/znc/znc-1.9.1.ebuild
+++ b/net-irc/znc/znc-1.9.1.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2024-07-03 20:32 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2024-07-03 20:32 UTC (permalink / raw
To: gentoo-commits
commit: 4aea3ae61aa7298223dec79cdeb3c40ab73eb72a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 3 20:32:10 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 20:32:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aea3ae6
net-irc/znc: Stabilize 1.9.1 arm64, #935428
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/znc-1.9.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.1.ebuild b/net-irc/znc/znc-1.9.1.ebuild
index 10f210f61e75..7f7e1fc25004 100644
--- a/net-irc/znc/znc-1.9.1.ebuild
+++ b/net-irc/znc/znc-1.9.1.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 arm arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2024-07-03 19:31 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2024-07-03 19:31 UTC (permalink / raw
To: gentoo-commits
commit: 45b50f01229e0996103e007f68beed45194e6239
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 3 19:30:17 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 19:30:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45b50f01
net-irc/znc: add 1.9.1
Bug: https://bugs.gentoo.org/935422
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/Manifest | 1 +
net-irc/znc/znc-1.9.1.ebuild | 197 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 198 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 51254b02c536..97a5b8ade9f5 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -2,3 +2,4 @@ DIST gtest-1.14.0.tar.gz 867764 BLAKE2B c457f55ac572b9fb1553eee3df7eeeaf1e7dd2c3
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
DIST znc-1.8.2.tar.gz 2101215 BLAKE2B 7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e SHA512 e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9
DIST znc-1.9.0.tar.gz 2221116 BLAKE2B 00bf472f0c223684c52a8c1a1a4b699346e58718161e6c40e3423591ef49aa13b6a530eb705e6f9e9cd6ce8937b4ee4e89de62d15aca7f2b19e1e8b603351d6e SHA512 22b8bd6fd7332643860f7a99ceaa0f6d0c9dd8ba9edac14b3f3731c9301eeb58e03e3af8d09e939e453aa980ff9f24afbe79e66d1106993f81d8779c97731a17
+DIST znc-1.9.1.tar.gz 2236498 BLAKE2B b811939d13e45f2731f35721776e5f849078e14e785ae852cfc8ff7b1864d4ac6cae5aeba5ae01e529ffd366981f5ac8bb04f2586e60ac82af06d7af71f639db SHA512 939eafbb2f20569d1b15b66e38b7da7a5210f2023e6fc98018566bd757d62d8ef2682d4b4e3b326a933a99cd7d9d65596ff0e2c43a2315c70e27c64f02d526a6
diff --git a/net-irc/znc/znc-1.9.1.ebuild b/net-irc/znc/znc-1.9.1.ebuild
new file mode 100644
index 000000000000..019d97123dde
--- /dev/null
+++ b/net-irc/znc/znc-1.9.1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+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/qtnetwork:5
+ )
+"
+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
+}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2024-05-29 6:26 Jakov Smolić
0 siblings, 0 replies; 113+ messages in thread
From: Jakov Smolić @ 2024-05-29 6:26 UTC (permalink / raw
To: gentoo-commits
commit: 4cf325dddfe2b38af18b43b6656da678fc7d8278
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed May 29 06:25:51 2024 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed May 29 06:25:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cf325dd
net-irc/znc: Stabilize 1.9.0 x86, #933010
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
net-irc/znc/znc-1.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.0.ebuild b/net-irc/znc/znc-1.9.0.ebuild
index 308d253146a5..6774979786e3 100644
--- a/net-irc/znc/znc-1.9.0.ebuild
+++ b/net-irc/znc/znc-1.9.0.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2024-05-29 6:26 Jakov Smolić
0 siblings, 0 replies; 113+ messages in thread
From: Jakov Smolić @ 2024-05-29 6:26 UTC (permalink / raw
To: gentoo-commits
commit: d71e358d6af86733cae1a40f6350f8ff0e8add8f
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed May 29 06:25:48 2024 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed May 29 06:25:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d71e358d
net-irc/znc: Stabilize 1.9.0 amd64, #933010
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
net-irc/znc/znc-1.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.0.ebuild b/net-irc/znc/znc-1.9.0.ebuild
index 11ecac268d53..308d253146a5 100644
--- a/net-irc/znc/znc-1.9.0.ebuild
+++ b/net-irc/znc/znc-1.9.0.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2024-05-28 12:29 Michał Górny
0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2024-05-28 12:29 UTC (permalink / raw
To: gentoo-commits
commit: 1619c00a0cf348b2315d13dbc3164c6eb6e40a7c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 12:29:29 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 28 12:29:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1619c00a
net-irc/znc: Stabilize 1.9.0 arm, #933010
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-irc/znc/znc-1.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.0.ebuild b/net-irc/znc/znc-1.9.0.ebuild
index 6596c63a5cf0..11ecac268d53 100644
--- a/net-irc/znc/znc-1.9.0.ebuild
+++ b/net-irc/znc/znc-1.9.0.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2024-02-28 21:56 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2024-02-28 21:56 UTC (permalink / raw
To: gentoo-commits
commit: 9606041ff4c0abfba49cd9704dd3ce44e3977510
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 21:55:09 2024 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 21:55:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9606041f
net-irc/znc: sync live ebuild with 1.9.0
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/znc-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index 4245192ac954..019d97123dde 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2024-02-28 21:39 Jakov Smolić
0 siblings, 0 replies; 113+ messages in thread
From: Jakov Smolić @ 2024-02-28 21:39 UTC (permalink / raw
To: gentoo-commits
commit: 758918fc0d513f53e8938869ed776795cb0be5e9
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 21:39:19 2024 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 21:39:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=758918fc
net-irc/znc: Keyword 1.9.0 riscv, #925664
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
net-irc/znc/znc-1.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.0.ebuild b/net-irc/znc/znc-1.9.0.ebuild
index b770f0a90768..6596c63a5cf0 100644
--- a/net-irc/znc/znc-1.9.0.ebuild
+++ b/net-irc/znc/znc-1.9.0.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2024-02-28 20:50 Jakov Smolić
0 siblings, 0 replies; 113+ messages in thread
From: Jakov Smolić @ 2024-02-28 20:50 UTC (permalink / raw
To: gentoo-commits
commit: 1d3c30cbfd0b0c08130fef851c73676ed09f6f5e
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 20:49:59 2024 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 20:49:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d3c30cb
net-irc/znc: Keyword 1.9.0 x86, #925664
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
net-irc/znc/znc-1.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.0.ebuild b/net-irc/znc/znc-1.9.0.ebuild
index 8efbbbf65ba6..b770f0a90768 100644
--- a/net-irc/znc/znc-1.9.0.ebuild
+++ b/net-irc/znc/znc-1.9.0.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2024-02-28 2:31 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2024-02-28 2:31 UTC (permalink / raw
To: gentoo-commits
commit: 25abff801025379d25f83a9f52372f92ec913106
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 02:31:26 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 02:31:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25abff80
net-irc/znc: Keyword 1.9.0 arm, #925664
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/znc-1.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.0.ebuild b/net-irc/znc/znc-1.9.0.ebuild
index 0212213515f9..b18fbb94addb 100644
--- a/net-irc/znc/znc-1.9.0.ebuild
+++ b/net-irc/znc/znc-1.9.0.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~ppc64"
+ KEYWORDS="~amd64 ~arm ~ppc64"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2024-02-28 2:31 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2024-02-28 2:31 UTC (permalink / raw
To: gentoo-commits
commit: a5ece6428c57d42363993c9d729737aa9c925212
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 02:31:27 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 02:31:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5ece642
net-irc/znc: Keyword 1.9.0 arm64, #925664
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/znc-1.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.0.ebuild b/net-irc/znc/znc-1.9.0.ebuild
index b18fbb94addb..8efbbbf65ba6 100644
--- a/net-irc/znc/znc-1.9.0.ebuild
+++ b/net-irc/znc/znc-1.9.0.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~ppc64"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2024-02-28 2:31 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2024-02-28 2:31 UTC (permalink / raw
To: gentoo-commits
commit: 1ec3eda4f45f71660df7b0b45041bbbc32ce4ca8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 02:31:24 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 02:31:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ec3eda4
net-irc/znc: Keyword 1.9.0 ppc64, #925664
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/znc-1.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.0.ebuild b/net-irc/znc/znc-1.9.0.ebuild
index 3210a73582c6..0212213515f9 100644
--- a/net-irc/znc/znc-1.9.0.ebuild
+++ b/net-irc/znc/znc-1.9.0.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~ppc64"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2024-02-28 0:20 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2024-02-28 0:20 UTC (permalink / raw
To: gentoo-commits
commit: ab2d9610c0cb3a21ae418c0729b152c9911c732c
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 00:06:17 2024 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> 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 <sbraz <AT> 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
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2023-11-07 20:55 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2023-11-07 20:55 UTC (permalink / raw
To: gentoo-commits
commit: 8a08143250248bf5bb1b6ee20800d910aa5dd92b
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 7 20:53:38 2023 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Tue Nov 7 20:55:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a081432
net-irc/znc: add slot specifier to argon2i dependency
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/znc-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index 1f2334900220..c40af00c86f0 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -57,7 +57,7 @@ BDEPEND="
)
"
DEPEND="
- app-crypt/argon2
+ app-crypt/argon2:=
icu? ( dev-libs/icu:= )
nls? ( dev-libs/boost:=[nls] )
perl? ( >=dev-lang/perl-5.10:= )
^ permalink raw reply related [flat|nested] 113+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2023-11-07 12:43 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2023-11-07 12:43 UTC (permalink / raw
To: gentoo-commits
commit: ddb728b7158dc39af5d63ab1a4d00b803e673e24
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 13:19:42 2023 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Tue Nov 7 12:29:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddb728b7
net-irc/znc: add new dependency on argon2 + enable py312
Argon2 is now used to hash passwords instead of SHA-256.
Also fix dependency on Python: it is also required to run tests because
znc-buildmod is a Python script.
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/znc-9999.ebuild | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index a247a1966b36..1f2334900220 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit cmake python-single-r1 readme.gentoo-r1 systemd
@@ -33,7 +33,11 @@ SLOT="0/${PV}"
IUSE="+icu nls perl python +ssl sasl tcl test +zlib"
RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
+# 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="
@@ -53,6 +57,7 @@ BDEPEND="
)
"
DEPEND="
+ app-crypt/argon2
icu? ( dev-libs/icu:= )
nls? ( dev-libs/boost:=[nls] )
perl? ( >=dev-lang/perl-5.10:= )
@@ -73,7 +78,7 @@ PATCHES=(
)
pkg_setup() {
- if use python; then
+ if use python || use test; then
python-single-r1_pkg_setup
fi
}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2023-03-14 12:24 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2023-03-14 12:24 UTC (permalink / raw
To: gentoo-commits
commit: 8f1cce5259f44d283ce124d0ec04325cd345f94a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 08:07:30 2023 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> 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 <asturm <AT> gentoo.org>
Signed-off-by: Louis Sautier <sbraz <AT> 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
-}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2023-03-13 21:24 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2023-03-13 21:24 UTC (permalink / raw
To: gentoo-commits
commit: a801ca0537b0f288d83fbda00db7a0d601b2686c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 13 21:24:20 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 13 21:24:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a801ca05
net-irc/znc: Stabilize 1.8.2-r2 amd64, #893508
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/znc-1.8.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r2.ebuild b/net-irc/znc/znc-1.8.2-r2.ebuild
index 2a9d9df79d3b..6b6d33d21374 100644
--- a/net-irc/znc/znc-1.8.2-r2.ebuild
+++ b/net-irc/znc/znc-1.8.2-r2.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm arm64 ~ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2023-03-13 20:51 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2023-03-13 20:51 UTC (permalink / raw
To: gentoo-commits
commit: eeca770a4f7d82497c0adedb96529338bcaaf97f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 13 20:50:36 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 13 20:50:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeca770a
net-irc/znc: Stabilize 1.8.2-r2 x86, #893508
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/znc-1.8.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r2.ebuild b/net-irc/znc/znc-1.8.2-r2.ebuild
index 3cfa205dadca..2a9d9df79d3b 100644
--- a/net-irc/znc/znc-1.8.2-r2.ebuild
+++ b/net-irc/znc/znc-1.8.2-r2.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 arm arm64 ~ppc64 ~riscv x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2023-03-13 20:51 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2023-03-13 20:51 UTC (permalink / raw
To: gentoo-commits
commit: 443a95aaa182f5df6a0506a5c278c260721008d2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 13 20:50:34 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 13 20:50:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=443a95aa
net-irc/znc: Stabilize 1.8.2-r2 arm, #893508
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/znc-1.8.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r2.ebuild b/net-irc/znc/znc-1.8.2-r2.ebuild
index 64a4ec13d9ce..3cfa205dadca 100644
--- a/net-irc/znc/znc-1.8.2-r2.ebuild
+++ b/net-irc/znc/znc-1.8.2-r2.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 arm arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2023-03-13 20:35 Arthur Zamarin
0 siblings, 0 replies; 113+ messages in thread
From: Arthur Zamarin @ 2023-03-13 20:35 UTC (permalink / raw
To: gentoo-commits
commit: b37710067c706e429f6d1aee9bc1982d624ded41
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 13 20:35:24 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 13 20:35:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3771006
net-irc/znc: Stabilize 1.8.2-r2 arm64, #893508
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-irc/znc/znc-1.8.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r2.ebuild b/net-irc/znc/znc-1.8.2-r2.ebuild
index 39851050e993..64a4ec13d9ce 100644
--- a/net-irc/znc/znc-1.8.2-r2.ebuild
+++ b/net-irc/znc/znc-1.8.2-r2.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2022-11-05 18:43 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2022-11-05 18:43 UTC (permalink / raw
To: gentoo-commits
commit: ff6a22cae4d6df2b3dd968e183dae735b55521bf
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 5 17:24:17 2022 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sat Nov 5 18:38:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff6a22ca
net-irc/znc: sync live ebuild with 1.8.2-r2
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/znc-9999.ebuild | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index fc85afa7b5a1..39f23a0ebbd1 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
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="+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? (
@@ -98,7 +98,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)"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2022-08-23 18:36 Arthur Zamarin
0 siblings, 0 replies; 113+ messages in thread
From: Arthur Zamarin @ 2022-08-23 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 6a3b1f0b4a9b1a8ddb3075d299a6a3286517455b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 18:36:29 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 18:36:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3b1f0b
net-irc/znc: Keyword 1.8.2-r2 ppc64, #866189
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-irc/znc/znc-1.8.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r2.ebuild b/net-irc/znc/znc-1.8.2-r2.ebuild
index fab250986d5e..b9d4a004fac3 100644
--- a/net-irc/znc/znc-1.8.2-r2.ebuild
+++ b/net-irc/znc/znc-1.8.2-r2.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2022-08-07 16:01 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2022-08-07 16:01 UTC (permalink / raw
To: gentoo-commits
commit: b820f2afc2b1fb551ea4443569ad123c0a1cbec6
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 7 15:55:20 2022 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sun Aug 7 16:00:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b820f2af
net-irc/znc: update EAPI 7 -> 8, add Python 3.11
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/znc-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index 018091f6423e..fc85afa7b5a1 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit cmake python-single-r1 readme.gentoo-r1 systemd
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2022-08-07 16:01 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2022-08-07 16:01 UTC (permalink / raw
To: gentoo-commits
commit: da03374202ee2271360c87bb10e896f8d344c9c3
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 7 15:55:50 2022 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sun Aug 7 16:00:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da033742
net-irc/znc: drop 1.8.2
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/znc-1.8.2.ebuild | 181 -------------------------------------------
1 file changed, 181 deletions(-)
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
deleted file mode 100644
index 8993eb8037d9..000000000000
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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"
- 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 )"
-
-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
-"
-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
-}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2022-06-06 11:02 Jakov Smolić
0 siblings, 0 replies; 113+ messages in thread
From: Jakov Smolić @ 2022-06-06 11:02 UTC (permalink / raw
To: gentoo-commits
commit: 47320e7713f9eef4aea1568ed342b74676acb605
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 11:02:03 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 11:02:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47320e77
net-irc/znc: Stabilize 1.8.2-r1 amd64, #848585
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
net-irc/znc/znc-1.8.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r1.ebuild b/net-irc/znc/znc-1.8.2-r1.ebuild
index a8fd4c2c3330..a3b29fce9948 100644
--- a/net-irc/znc/znc-1.8.2-r1.ebuild
+++ b/net-irc/znc/znc-1.8.2-r1.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm arm64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ~riscv x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2022-06-06 11:02 Jakov Smolić
0 siblings, 0 replies; 113+ messages in thread
From: Jakov Smolić @ 2022-06-06 11:02 UTC (permalink / raw
To: gentoo-commits
commit: 0a69cd7a8868521782e67c8c5ec30ddd6508dd85
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 11:01:54 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 11:01:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a69cd7a
net-irc/znc: Stabilize 1.8.2-r1 x86, #848585
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
net-irc/znc/znc-1.8.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r1.ebuild b/net-irc/znc/znc-1.8.2-r1.ebuild
index d39c9f614a45..a8fd4c2c3330 100644
--- a/net-irc/znc/znc-1.8.2-r1.ebuild
+++ b/net-irc/znc/znc-1.8.2-r1.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm arm64 ~riscv ~x86"
+ KEYWORDS="~amd64 arm arm64 ~riscv x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2022-06-06 9:32 Jakov Smolić
0 siblings, 0 replies; 113+ messages in thread
From: Jakov Smolić @ 2022-06-06 9:32 UTC (permalink / raw
To: gentoo-commits
commit: 626786fb3efd74f5c9c7a1a966c75bc6f6a08477
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 09:32:14 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 09:32:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=626786fb
net-irc/znc: Stabilize 1.8.2-r1 arm, #848585
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
net-irc/znc/znc-1.8.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r1.ebuild b/net-irc/znc/znc-1.8.2-r1.ebuild
index 31c146f6c7a7..d39c9f614a45 100644
--- a/net-irc/znc/znc-1.8.2-r1.ebuild
+++ b/net-irc/znc/znc-1.8.2-r1.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
+ KEYWORDS="~amd64 arm arm64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2022-06-06 6:53 Jakov Smolić
0 siblings, 0 replies; 113+ messages in thread
From: Jakov Smolić @ 2022-06-06 6:53 UTC (permalink / raw
To: gentoo-commits
commit: 5d2186770b02ec89a954b9d0e65d68986e65a90b
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 06:53:13 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 06:53:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d218677
net-irc/znc: Stabilize 1.8.2-r1 arm64, #848585
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
net-irc/znc/znc-1.8.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r1.ebuild b/net-irc/znc/znc-1.8.2-r1.ebuild
index 7bd58f59e5b0..31c146f6c7a7 100644
--- a/net-irc/znc/znc-1.8.2-r1.ebuild
+++ b/net-irc/znc/znc-1.8.2-r1.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2022-04-28 8:43 Yixun Lan
0 siblings, 0 replies; 113+ messages in thread
From: Yixun Lan @ 2022-04-28 8:43 UTC (permalink / raw
To: gentoo-commits
commit: 5e378f84c7ac7eeb88b87ec64f9a6180a4152b4f
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 08:42:47 2022 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 08:42:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e378f84
net-irc/znc: forward keywords to live ebuild
try to keep regular version sync to live one
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
net-irc/znc/znc-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index d00dd9757dd2..018091f6423e 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2022-04-28 8:41 Yixun Lan
0 siblings, 0 replies; 113+ messages in thread
From: Yixun Lan @ 2022-04-28 8:41 UTC (permalink / raw
To: gentoo-commits
commit: 3cfdd526001ae567c9e5371ce39f22e77ced6289
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 08:38:17 2022 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 08:38:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cfdd526
net-irc/znc: Keyword 1.8.2-r1 riscv, #841377
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
net-irc/znc/znc-1.8.2-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-irc/znc/znc-1.8.2-r1.ebuild b/net-irc/znc/znc-1.8.2-r1.ebuild
index 396026d8980b..7bd58f59e5b0 100644
--- a/net-irc/znc/znc-1.8.2-r1.ebuild
+++ b/net-irc/znc/znc-1.8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2021-08-24 19:26 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2021-08-24 19:26 UTC (permalink / raw
To: gentoo-commits
commit: e8f4256f6405c53c49c2b0f3725862505a512d85
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 24 19:21:38 2021 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Tue Aug 24 19:23:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8f4256f
net-irc/znc: sync live ebuild with 1.8.2-r1
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/znc-9999.ebuild | 89 +++++++++++++++++++++++++--------------------
1 file changed, 49 insertions(+), 40 deletions(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index 303be815490..d00dd9757dd 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit cmake python-single-r1 readme.gentoo-r1 systemd
@@ -13,8 +13,7 @@ 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=""
+ EGIT_REPO_URI="https://github.com/znc/znc.git"
else
MY_PV=${PV/_/-}
MY_P=${PN}-${MY_PV}
@@ -36,21 +35,7 @@ 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? ( dev-libs/openssl:0= )
- tcl? ( dev-lang/tcl:0= )
- zlib? ( sys-libs/zlib:0= )
-"
-RDEPEND="
- ${DEPEND}
- acct-user/znc
- acct-group/znc
-"
+# perl is a build-time dependency of modpython
BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )
@@ -67,8 +52,25 @@ BDEPEND="
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 )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch
+)
pkg_setup() {
if use python; then
@@ -86,6 +88,8 @@ src_prepare() {
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
}
@@ -98,6 +102,7 @@ src_configure() {
-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)"
@@ -137,43 +142,47 @@ src_install() {
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
- DISABLE_AUTOFORMATTING=1
+ 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
-
- 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."
+ 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
- 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"
+ 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."
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2021-08-24 19:26 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2021-08-24 19:26 UTC (permalink / raw
To: gentoo-commits
commit: 9c5e461b6a846f4f916a27acfcf22a464848f46e
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 22 22:53:41 2021 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Tue Aug 24 19:23:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c5e461b
net-irc/znc: drop 1.8.1
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/Manifest | 1 -
net-irc/znc/znc-1.8.1.ebuild | 179 -------------------------------------------
2 files changed, 180 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index f9e311890fe..7216d3aa814 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,3 +1,2 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
-DIST znc-1.8.1.tar.gz 2161359 BLAKE2B 5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e SHA512 87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16
DIST znc-1.8.2.tar.gz 2101215 BLAKE2B 7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e SHA512 e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9
diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.8.1.ebuild
deleted file mode 100644
index 4caac33b16d..00000000000
--- a/net-irc/znc/znc-1.8.1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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"
- S=${WORKDIR}/${MY_P}
-fi
-
-HOMEPAGE="https://znc.in"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+ipv6 +icu 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? ( dev-libs/openssl: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
-}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2021-06-01 18:07 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2021-06-01 18:07 UTC (permalink / raw
To: gentoo-commits
commit: 739e8f5fbea2b6f9835621c090f549dcef7ef705
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 1 17:56:23 2021 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Tue Jun 1 18:04:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=739e8f5f
net-irc/znc: fix SLOT for live ebuild
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/znc-1.8.2.ebuild | 6 +++---
net-irc/znc/znc-9999.ebuild | 7 +++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index 915c424ab54..8993eb8037d 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -23,14 +23,14 @@ 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
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 )"
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index a8bc97c74b9..303be815490 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -23,15 +23,14 @@ 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
HOMEPAGE="https://znc.in"
LICENSE="Apache-2.0"
-SLOT="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 )"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2021-04-30 9:54 Mikle Kolyada
0 siblings, 0 replies; 113+ messages in thread
From: Mikle Kolyada @ 2021-04-30 9:54 UTC (permalink / raw
To: gentoo-commits
commit: aaf60c8295a55a3aa59310bf304e4b7c9d69fa7c
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 09:47:11 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 09:54:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaf60c82
net-irc/znc: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
net-irc/znc/znc-1.8.1.ebuild | 9 +++------
net-irc/znc/znc-1.8.2.ebuild | 9 +++------
net-irc/znc/znc-9999.ebuild | 9 +++------
3 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.8.1.ebuild
index a47c2912b00..4caac33b16d 100644
--- a/net-irc/znc/znc-1.8.1.ebuild
+++ b/net-irc/znc/znc-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,7 +29,7 @@ fi
HOMEPAGE="https://znc.in"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+IUSE="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
@@ -40,10 +40,7 @@ DEPEND="
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= )
- )
+ ssl? ( dev-libs/openssl:0= )
tcl? ( dev-lang/tcl:0= )
zlib? ( sys-libs/zlib:0= )
"
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index edd0b05a83d..915c424ab54 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,7 +31,7 @@ fi
HOMEPAGE="https://znc.in"
LICENSE="Apache-2.0"
-IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+IUSE="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
@@ -42,10 +42,7 @@ DEPEND="
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= )
- )
+ ssl? ( dev-libs/openssl:0= )
tcl? ( dev-lang/tcl:0= )
zlib? ( sys-libs/zlib:0= )
"
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index e407d3d52d2..a8bc97c74b9 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -32,7 +32,7 @@ fi
HOMEPAGE="https://znc.in"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+IUSE="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
@@ -43,10 +43,7 @@ DEPEND="
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= )
- )
+ ssl? ( dev-libs/openssl:0= )
tcl? ( dev-lang/tcl:0= )
zlib? ( sys-libs/zlib:0= )
"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-11-12 16:50 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2020-11-12 16:50 UTC (permalink / raw
To: gentoo-commits
commit: 13ff4f209b2f5f8fb76d438996536c6381aa55b0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 16:50:29 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 16:50:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ff4f20
net-irc/znc: Stabilize 1.8.2 amd64, #753395
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/znc-1.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index 2dec015cc75..313155eaeb2 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm arm64 x86"
+ 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}"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-11-12 0:35 Thomas Deutschmann
0 siblings, 0 replies; 113+ messages in thread
From: Thomas Deutschmann @ 2020-11-12 0:35 UTC (permalink / raw
To: gentoo-commits
commit: 2b5ba5439defa103066cabcc382cc001c5d568e4
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 00:34:48 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 00:35:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5ba543
net-irc/znc: x86 stable (bug #753395)
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
net-irc/znc/znc-1.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index 734cd3671b5..2dec015cc75 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm arm64 ~x86"
+ 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}"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-11-08 0:32 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2020-11-08 0:32 UTC (permalink / raw
To: gentoo-commits
commit: ae869c77bd27dba7b17ddcaba33e798c2629b340
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 8 00:27:43 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 8 00:31:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae869c77
net-irc/znc: Stabilize 1.8.2 arm, #753395
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/znc-1.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index dbffa5162f9..734cd3671b5 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm arm64 ~x86"
+ 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}"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-11-08 0:32 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2020-11-08 0:32 UTC (permalink / raw
To: gentoo-commits
commit: 57e0b0cf7cd4152694ac66b65b2767b082db08b7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 8 00:25:35 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 8 00:31:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e0b0cf
net-irc/znc: Stabilize 1.8.2 arm64, #753395
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/znc-1.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index 975978dcf4e..dbffa5162f9 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ 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}"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-09-09 21:31 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2020-09-09 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 5582b02f90dcfeba51ce63a49c97f9551a0f45b7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 9 21:30:23 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 9 21:31:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5582b02f
net-irc/znc: sync live ebuild
Include subslot definition in 9999 to make sure
it is not lost on any future bumps.
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/znc-1.8.2.ebuild | 6 +++---
net-irc/znc/znc-9999.ebuild | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index b70a1b5af26..975978dcf4e 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -23,14 +23,14 @@ 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
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 libressl nls perl python +ssl sasl tcl test +zlib"
RESTRICT="!test? ( test )"
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index fa6a8f89ce8..764c35c45dc 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
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-09-08 0:53 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2020-09-08 0:53 UTC (permalink / raw
To: gentoo-commits
commit: cde8c50c91dcd2467248a87f8e003aa9f9ab452c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 8 00:53:45 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 8 00:53:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cde8c50c
net-irc/znc: add subslot to 1.8.2
Plugins need a rebuild on every new version
of ZNC.
Acked-by: Louis Sautier <sbraz <AT> gentoo.org>
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/znc-1.8.2.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index fa6a8f89ce8..b70a1b5af26 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -28,7 +28,9 @@ fi
HOMEPAGE="https://znc.in"
LICENSE="Apache-2.0"
-SLOT="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 libressl nls perl python +ssl sasl tcl test +zlib"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-09-07 23:44 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2020-09-07 23:44 UTC (permalink / raw
To: gentoo-commits
commit: 0f0c29f2883c43490f245cb1bdf940b1e700d576
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 23:33:16 2020 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 23:42:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f0c29f2
net-irc/znc: remove old
Package-Manager: Portage-3.0.3, Repoman-2.3.23
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/Manifest | 1 -
net-irc/znc/znc-1.7.5.ebuild | 183 -------------------------------------------
2 files changed, 184 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index b951a8b2b30..f9e311890fe 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,4 +1,3 @@
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
DIST znc-1.8.2.tar.gz 2101215 BLAKE2B 7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e SHA512 e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9
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 6f190e2ca05..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-09-07 23:26 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2020-09-07 23:26 UTC (permalink / raw
To: gentoo-commits
commit: 319fe5c5ba288a568737057be5829d6a218bc453
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 23:21:37 2020 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 23:25:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=319fe5c5
net-irc/znc: bump to 1.8.2
Package-Manager: Portage-3.0.3, Repoman-2.3.23
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/Manifest | 1 +
net-irc/znc/znc-1.8.2.ebuild | 182 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 183 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 838db7de2b5..b951a8b2b30 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,3 +1,4 @@
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
+DIST znc-1.8.2.tar.gz 2101215 BLAKE2B 7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e SHA512 e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9
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 00000000000..fa6a8f89ce8
--- /dev/null
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -0,0 +1,182 @@
+# 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"
+ 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 )"
+
+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
+}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-08-22 5:43 Agostino Sarubbo
0 siblings, 0 replies; 113+ messages in thread
From: Agostino Sarubbo @ 2020-08-22 5:43 UTC (permalink / raw
To: gentoo-commits
commit: 528891dfd84d390a786d2892a60d5ff523b1c461
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 05:43:16 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 05:43:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528891df
net-irc/znc: amd64 stable wrt bug #737508
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-irc/znc/znc-1.8.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.8.1.ebuild
index adefc980b98..6d5ad64431a 100644
--- a/net-irc/znc/znc-1.8.1.ebuild
+++ b/net-irc/znc/znc-1.8.1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm arm64 x86"
+ KEYWORDS="amd64 arm arm64 x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-08-18 9:16 Sam James
0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2020-08-18 9:16 UTC (permalink / raw
To: gentoo-commits
commit: 149d8ca02e66439cf2f9bfcb63a943041f4785a1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 08:56:45 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 08:56:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=149d8ca0
net-irc/znc: Stabilize 1.8.1 arm64, #737508
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/znc/znc-1.8.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.8.1.ebuild
index 51650eb0a51..adefc980b98 100644
--- a/net-irc/znc/znc-1.8.1.ebuild
+++ b/net-irc/znc/znc-1.8.1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm ~arm64 x86"
+ KEYWORDS="~amd64 arm arm64 x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-08-17 14:52 Agostino Sarubbo
0 siblings, 0 replies; 113+ messages in thread
From: Agostino Sarubbo @ 2020-08-17 14:52 UTC (permalink / raw
To: gentoo-commits
commit: 4f3951c52fcc2762dd9394d8ccd7cf8feb877073
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 14:52:00 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 14:52:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f3951c5
net-irc/znc: arm stable wrt bug #737508
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-irc/znc/znc-1.8.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.8.1.ebuild
index a224d0da540..51650eb0a51 100644
--- a/net-irc/znc/znc-1.8.1.ebuild
+++ b/net-irc/znc/znc-1.8.1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 x86"
+ KEYWORDS="~amd64 arm ~arm64 x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-08-17 14:07 Agostino Sarubbo
0 siblings, 0 replies; 113+ messages in thread
From: Agostino Sarubbo @ 2020-08-17 14:07 UTC (permalink / raw
To: gentoo-commits
commit: 6eea3a5e4c70eeeedc17a434191a186dbde6f903
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 14:07:32 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 14:07:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eea3a5e
net-irc/znc: x86 stable wrt bug #737508
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-irc/znc/znc-1.8.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.8.1.ebuild
index fa6a8f89ce8..a224d0da540 100644
--- a/net-irc/znc/znc-1.8.1.ebuild
+++ b/net-irc/znc/znc-1.8.1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-06-12 16:33 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2020-06-12 16:33 UTC (permalink / raw
To: gentoo-commits
commit: a1f1f7d5e7c55914427fd840846a350c1ded4d5e
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 12 15:18:17 2020 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 16:33:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1f1f7d5
net-irc/znc: remove old
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/Manifest | 1 -
net-irc/znc/znc-1.7.4.ebuild | 183 -------------------------------------------
2 files changed, 184 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 9ca3d2f47dd..838db7de2b5 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,4 +1,3 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
-DIST znc-1.7.4.tar.gz 2084756 BLAKE2B 3b389a13d7c1c59b8ac485b6996b5a56a03689e8191a65c99692ea849a99ed0a013065a47ea3d213faf883e1d3e595375a665090b4173e97261c3afe21a120e7 SHA512 ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
DIST znc-1.7.5.tar.gz 2170656 BLAKE2B af5548bff1d9c6e740e668f467f52e8540a59bec9363fb4a17c594e1a9638417f75321b074e2aad6380769a594fc134543681928a7a33d00083ba9babc441a69 SHA512 f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825
DIST znc-1.8.1.tar.gz 2161359 BLAKE2B 5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e SHA512 87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16
diff --git a/net-irc/znc/znc-1.7.4.ebuild b/net-irc/znc/znc-1.7.4.ebuild
deleted file mode 100644
index 899adac5a0d..00000000000
--- a/net-irc/znc/znc-1.7.4.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} )
-
-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 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
-}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-06-12 11:07 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2020-06-12 11:07 UTC (permalink / raw
To: gentoo-commits
commit: faa057cf366c979eb2adb89c5c69f87a6db0a3b7
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 15:38:28 2020 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 11:06:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faa057cf
net-irc/znc: sync live ebuild with 1.8.1
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/znc-9999.ebuild | 79 ++++++++++++++++++++++-----------------------
1 file changed, 39 insertions(+), 40 deletions(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index 6820a1521d1..fa6a8f89ce8 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -3,9 +3,9 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
+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"
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
S=${WORKDIR}/${MY_P}
fi
@@ -34,7 +34,7 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
-RDEPEND="
+DEPEND="
icu? ( dev-libs/icu:= )
nls? ( dev-libs/boost:=[nls] )
perl? ( >=dev-lang/perl-5.10:= )
@@ -47,13 +47,26 @@ RDEPEND="
tcl? ( dev-lang/tcl:0= )
zlib? ( sys-libs/zlib:0= )
"
-DEPEND="
- ${RDEPEND}
+RDEPEND="
+ ${DEPEND}
+ acct-user/znc
+ acct-group/znc
+"
+BDEPEND="
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 )
+ 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 )
@@ -62,13 +75,6 @@ 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() {
@@ -81,7 +87,7 @@ src_prepare() {
sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \
test/CMakeLists.txt || die
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -104,36 +110,29 @@ src_configure() {
export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
fi
- cmake-utils_src_configure
+ cmake_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."
+ 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-utils_src_install
+ cmake_src_install
dodoc NOTICE
newinitd "${FILESDIR}"/znc.initd-r2 znc
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-06-12 11:07 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2020-06-12 11:07 UTC (permalink / raw
To: gentoo-commits
commit: bf49a9f25df401c74952ecb2cbd962640f6e217a
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 15:35:46 2020 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 11:06:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf49a9f2
net-irc/znc: bump to 1.8.1, migrate to acct-user, fix deps
Also remove a reference to the non-standard FEATURES variable,
migrate from cmake-utils to cmake, add Python 3.9 support.
Closes: https://bugs.gentoo.org/727894
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/Manifest | 1 +
net-irc/znc/znc-1.8.1.ebuild | 182 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 183 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 37134a38810..9ca3d2f47dd 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,3 +1,4 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
DIST znc-1.7.4.tar.gz 2084756 BLAKE2B 3b389a13d7c1c59b8ac485b6996b5a56a03689e8191a65c99692ea849a99ed0a013065a47ea3d213faf883e1d3e595375a665090b4173e97261c3afe21a120e7 SHA512 ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
DIST znc-1.7.5.tar.gz 2170656 BLAKE2B af5548bff1d9c6e740e668f467f52e8540a59bec9363fb4a17c594e1a9638417f75321b074e2aad6380769a594fc134543681928a7a33d00083ba9babc441a69 SHA512 f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825
+DIST znc-1.8.1.tar.gz 2161359 BLAKE2B 5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e SHA512 87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16
diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.8.1.ebuild
new file mode 100644
index 00000000000..fa6a8f89ce8
--- /dev/null
+++ b/net-irc/znc/znc-1.8.1.ebuild
@@ -0,0 +1,182 @@
+# 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"
+ 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 )"
+
+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
+}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-05-08 17:10 Agostino Sarubbo
0 siblings, 0 replies; 113+ messages in thread
From: Agostino Sarubbo @ 2020-05-08 17:10 UTC (permalink / raw
To: gentoo-commits
commit: 1241792977f2a94cbf36f1e4b371cc6f323c4ba5
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri May 8 17:10:03 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri May 8 17:10:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12417929
net-irc/znc: arm stable wrt bug #720750
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-irc/znc/znc-1.7.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
index 285bcfb0d9a..6f190e2ca05 100644
--- a/net-irc/znc/znc-1.7.5.ebuild
+++ b/net-irc/znc/znc-1.7.5.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="amd64 ~arm ~arm64 x86"
+ KEYWORDS="amd64 arm ~arm64 x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-05-04 14:38 Agostino Sarubbo
0 siblings, 0 replies; 113+ messages in thread
From: Agostino Sarubbo @ 2020-05-04 14:38 UTC (permalink / raw
To: gentoo-commits
commit: 7e8282d8798e59e7be1a5ddf0d93694d71d278c9
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon May 4 14:38:29 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon May 4 14:38:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e8282d8
net-irc/znc: amd64 stable wrt bug #720750
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-irc/znc/znc-1.7.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
index 81ccb82f02c..285bcfb0d9a 100644
--- a/net-irc/znc/znc-1.7.5.ebuild
+++ b/net-irc/znc/znc-1.7.5.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-05-04 6:43 Agostino Sarubbo
0 siblings, 0 replies; 113+ messages in thread
From: Agostino Sarubbo @ 2020-05-04 6:43 UTC (permalink / raw
To: gentoo-commits
commit: e2e16f5604996ea71404be6455daccb7ba632150
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon May 4 06:42:41 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon May 4 06:42:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2e16f56
net-irc/znc: x86 stable wrt bug #720750
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-irc/znc/znc-1.7.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
index dc3919cbef0..81ccb82f02c 100644
--- a/net-irc/znc/znc-1.7.5.ebuild
+++ b/net-irc/znc/znc-1.7.5.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-05-04 6:16 Mart Raudsepp
0 siblings, 0 replies; 113+ messages in thread
From: Mart Raudsepp @ 2020-05-04 6:16 UTC (permalink / raw
To: gentoo-commits
commit: 53a036023a3f49aa370516df48d00978ef207dae
Author: Sam James (sam_c) <sam <AT> cmpct <DOT> info>
AuthorDate: Sun May 3 12:15:07 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon May 4 06:15:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53a03602
net-irc/znc: arm64 keyworded (bug #720752)
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info>
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
net-irc/znc/znc-1.7.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
index 6820a1521d1..dc3919cbef0 100644
--- a/net-irc/znc/znc-1.7.5.ebuild
+++ b/net-irc/znc/znc-1.7.5.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2020-04-23 7:20 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2020-04-23 7:20 UTC (permalink / raw
To: gentoo-commits
commit: 77a966bcf628d2871d4344eda306c6f874e64e65
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 22 22:38:33 2020 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 07:20:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77a966bc
net-irc/znc: add Python 3.8 support
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/znc-1.7.5.ebuild | 2 +-
net-irc/znc/znc-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
index e703db8161d..6820a1521d1 100644
--- a/net-irc/znc/znc-1.7.5.ebuild
+++ b/net-irc/znc/znc-1.7.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index e703db8161d..6820a1521d1 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2019-09-28 22:30 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2019-09-28 22:30 UTC (permalink / raw
To: gentoo-commits
commit: 9021f41fe86b9dbc34a7c77e7e99632d435e6ef5
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 22:25:44 2019 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 22:26:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9021f41f
net-irc/znc: bump to 1.7.5
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/Manifest | 1 +
net-irc/znc/znc-1.7.5.ebuild | 182 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 183 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 4a2dbc1e157..37134a38810 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,2 +1,3 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
DIST znc-1.7.4.tar.gz 2084756 BLAKE2B 3b389a13d7c1c59b8ac485b6996b5a56a03689e8191a65c99692ea849a99ed0a013065a47ea3d213faf883e1d3e595375a665090b4173e97261c3afe21a120e7 SHA512 ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
+DIST znc-1.7.5.tar.gz 2170656 BLAKE2B af5548bff1d9c6e740e668f467f52e8540a59bec9363fb4a17c594e1a9638417f75321b074e2aad6380769a594fc134543681928a7a33d00083ba9babc441a69 SHA512 f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
new file mode 100644
index 00000000000..6d5656de499
--- /dev/null
+++ b/net-irc/znc/znc-1.7.5.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+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 ~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"
+
+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
+}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2019-07-28 23:05 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2019-07-28 23:05 UTC (permalink / raw
To: gentoo-commits
commit: b1df133a9e287eccda10b2d280a6aaeb28ea0c0b
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 23:04:46 2019 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 23:05:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1df133a
net-irc/znc: remove vulnerable version 1.7.3
Bug: https://bugs.gentoo.org/688152
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/Manifest | 1 -
net-irc/znc/znc-1.7.3.ebuild | 182 -------------------------------------------
2 files changed, 183 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index beff2345859..4a2dbc1e157 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,3 +1,2 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
-DIST znc-1.7.3.tar.gz 2084575 BLAKE2B 4d8f76abef8bf2c5f96d9bd04716cd2debae2b2fcd3b8688aa715af6ef09e60c2aac203c5c7b32d2f4d56730f30dbbe9abd5eeec4f07e7580900dcb1cd164530 SHA512 4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8
DIST znc-1.7.4.tar.gz 2084756 BLAKE2B 3b389a13d7c1c59b8ac485b6996b5a56a03689e8191a65c99692ea849a99ed0a013065a47ea3d213faf883e1d3e595375a665090b4173e97261c3afe21a120e7 SHA512 ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
diff --git a/net-irc/znc/znc-1.7.3.ebuild b/net-irc/znc/znc-1.7.3.ebuild
deleted file mode 100644
index 3bd414de002..00000000000
--- a/net-irc/znc/znc-1.7.3.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-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 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"
-
-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
-}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2019-07-28 20:18 Mikle Kolyada
0 siblings, 0 replies; 113+ messages in thread
From: Mikle Kolyada @ 2019-07-28 20:18 UTC (permalink / raw
To: gentoo-commits
commit: 1385a1e9c8abec269c4fa454182a83dc07b663c3
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 20:18:16 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 20:18:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1385a1e9
net-irc/znc: arm stable wrt bug #688152
Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
net-irc/znc/znc-1.7.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.4.ebuild b/net-irc/znc/znc-1.7.4.ebuild
index d6e9044033e..3bd414de002 100644
--- a/net-irc/znc/znc-1.7.4.ebuild
+++ b/net-irc/znc/znc-1.7.4.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="amd64 ~arm x86"
+ KEYWORDS="amd64 arm x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2019-07-26 10:21 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2019-07-26 10:21 UTC (permalink / raw
To: gentoo-commits
commit: c55605245534154be4d88ce7e123d8559f886699
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 16:39:33 2019 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 10:20:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5560524
net-irc/znc: remove slash strip from EAPI=7 ebuilds
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/znc-1.7.3.ebuild | 18 +++++++++---------
net-irc/znc/znc-1.7.4.ebuild | 18 +++++++++---------
net-irc/znc/znc-9999.ebuild | 18 +++++++++---------
3 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/net-irc/znc/znc-1.7.3.ebuild b/net-irc/znc/znc-1.7.3.ebuild
index 60cd7cf8147..3bd414de002 100644
--- a/net-irc/znc/znc-1.7.3.ebuild
+++ b/net-irc/znc/znc-1.7.3.ebuild
@@ -149,19 +149,19 @@ pkg_postinst() {
readme.gentoo_print_elog
fi
- if [[ -d "${EROOT%/}"/etc/znc ]]; then
- ewarn "${EROOT%/}/etc/znc exists on your system."
+ 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 " ${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"
+ 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."
@@ -169,11 +169,11 @@ pkg_config() {
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" ||
+ 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" ||
+ "${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."
diff --git a/net-irc/znc/znc-1.7.4.ebuild b/net-irc/znc/znc-1.7.4.ebuild
index 9e33853571d..d6e9044033e 100644
--- a/net-irc/znc/znc-1.7.4.ebuild
+++ b/net-irc/znc/znc-1.7.4.ebuild
@@ -149,19 +149,19 @@ pkg_postinst() {
readme.gentoo_print_elog
fi
- if [[ -d "${EROOT%/}"/etc/znc ]]; then
- ewarn "${EROOT%/}/etc/znc exists on your system."
+ 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 " ${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"
+ 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."
@@ -169,11 +169,11 @@ pkg_config() {
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" ||
+ 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" ||
+ "${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."
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index e2a032f9ea5..6d5656de499 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -149,19 +149,19 @@ pkg_postinst() {
readme.gentoo_print_elog
fi
- if [[ -d "${EROOT%/}"/etc/znc ]]; then
- ewarn "${EROOT%/}/etc/znc exists on your system."
+ 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 " ${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"
+ 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."
@@ -169,11 +169,11 @@ pkg_config() {
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" ||
+ 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" ||
+ "${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."
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2019-06-25 22:05 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2019-06-25 22:05 UTC (permalink / raw
To: gentoo-commits
commit: 5117fe83797d162c186cd4e04385949eb9a55da8
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 25 21:42:58 2019 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 21:56:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5117fe83
net-irc/znc: bump to 1.7.4
There are no differences compared to rc1 except for the version change:
https://github.com/znc/znc/compare/znc-1.7.4-rc1...znc-1.7.4
Bug: https://bugs.gentoo.org/688152
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/Manifest | 2 +-
net-irc/znc/{znc-1.7.4_rc1.ebuild => znc-1.7.4.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index c04a8449bb7..beff2345859 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,3 +1,3 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
DIST znc-1.7.3.tar.gz 2084575 BLAKE2B 4d8f76abef8bf2c5f96d9bd04716cd2debae2b2fcd3b8688aa715af6ef09e60c2aac203c5c7b32d2f4d56730f30dbbe9abd5eeec4f07e7580900dcb1cd164530 SHA512 4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8
-DIST znc-1.7.4-rc1.tar.gz 2084722 BLAKE2B cdbc9a6713ecb1261275060b07bfdc16f9edd933bd7337f346c4c2bbf450f1810b5c82f382d31000d3b07fef145279adacf2bdd8518541dbe9ba3a9c4ab972f5 SHA512 49e45732db371159ada2678df1e494a0f4ae9c517f111672ab184e3c5ac60e354a63f7039167a7ca0ca09c300c33b9cc3f9dfc35ba3940f5a70efa35c0089911
+DIST znc-1.7.4.tar.gz 2084756 BLAKE2B 3b389a13d7c1c59b8ac485b6996b5a56a03689e8191a65c99692ea849a99ed0a013065a47ea3d213faf883e1d3e595375a665090b4173e97261c3afe21a120e7 SHA512 ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
diff --git a/net-irc/znc/znc-1.7.4_rc1.ebuild b/net-irc/znc/znc-1.7.4.ebuild
similarity index 100%
rename from net-irc/znc/znc-1.7.4_rc1.ebuild
rename to net-irc/znc/znc-1.7.4.ebuild
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2019-06-20 9:27 Mikle Kolyada
0 siblings, 0 replies; 113+ messages in thread
From: Mikle Kolyada @ 2019-06-20 9:27 UTC (permalink / raw
To: gentoo-commits
commit: 6f39db5b27af0065d89fe985783831bbdbea9f76
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 09:26:30 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 09:26:30 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f39db5b
net-irc/znc: amd64 stable wrt bug #688152
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
net-irc/znc/znc-1.7.4_rc1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.4_rc1.ebuild b/net-irc/znc/znc-1.7.4_rc1.ebuild
index 7f06cfb1a01..9e33853571d 100644
--- a/net-irc/znc/znc-1.7.4_rc1.ebuild
+++ b/net-irc/znc/znc-1.7.4_rc1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm x86"
+ KEYWORDS="amd64 ~arm x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2019-06-18 18:24 Thomas Deutschmann
0 siblings, 0 replies; 113+ messages in thread
From: Thomas Deutschmann @ 2019-06-18 18:24 UTC (permalink / raw
To: gentoo-commits
commit: 5b8d411d09bb18e9ddb7c6cc7990d988b43d62ef
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 18 18:22:54 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 18:24:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b8d411d
net-irc/znc: x86 stable (bug #688152)
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
net-irc/znc/znc-1.7.4_rc1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.4_rc1.ebuild b/net-irc/znc/znc-1.7.4_rc1.ebuild
index e2a032f9ea5..7f06cfb1a01 100644
--- a/net-irc/znc/znc-1.7.4_rc1.ebuild
+++ b/net-irc/znc/znc-1.7.4_rc1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2019-06-16 14:03 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2019-06-16 14:03 UTC (permalink / raw
To: gentoo-commits
commit: f70923983bf75ea5175942f34d9825a2193dc846
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 14:01:53 2019 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 14:03:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7092398
net-irc/znc: bump 1.7.4_rc1, fixes authenticated RCE CVE-2019-12816
Bug: https://bugs.gentoo.org/688152
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/Manifest | 1 +
net-irc/znc/znc-1.7.4_rc1.ebuild | 182 +++++++++++++++++++++++++++++++++++++++
2 files changed, 183 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 015aae3862b..c04a8449bb7 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,2 +1,3 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
DIST znc-1.7.3.tar.gz 2084575 BLAKE2B 4d8f76abef8bf2c5f96d9bd04716cd2debae2b2fcd3b8688aa715af6ef09e60c2aac203c5c7b32d2f4d56730f30dbbe9abd5eeec4f07e7580900dcb1cd164530 SHA512 4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8
+DIST znc-1.7.4-rc1.tar.gz 2084722 BLAKE2B cdbc9a6713ecb1261275060b07bfdc16f9edd933bd7337f346c4c2bbf450f1810b5c82f382d31000d3b07fef145279adacf2bdd8518541dbe9ba3a9c4ab972f5 SHA512 49e45732db371159ada2678df1e494a0f4ae9c517f111672ab184e3c5ac60e354a63f7039167a7ca0ca09c300c33b9cc3f9dfc35ba3940f5a70efa35c0089911
diff --git a/net-irc/znc/znc-1.7.4_rc1.ebuild b/net-irc/znc/znc-1.7.4_rc1.ebuild
new file mode 100644
index 00000000000..e2a032f9ea5
--- /dev/null
+++ b/net-irc/znc/znc-1.7.4_rc1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+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 ~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"
+
+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
+}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2019-04-07 22:50 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2019-04-07 22:50 UTC (permalink / raw
To: gentoo-commits
commit: a627297e675af58ff38009ff59fa790275334868
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 7 22:49:32 2019 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sun Apr 7 22:49:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a627297e
net-irc/znc: remove versions vulnerable to CVE-2019-9917
Bug: https://bugs.gentoo.org/681864
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/Manifest | 3 -
net-irc/znc/znc-1.7.1.ebuild | 182 -------------------------------------------
net-irc/znc/znc-1.7.2.ebuild | 182 -------------------------------------------
3 files changed, 367 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index a57a86eff9b..015aae3862b 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,5 +1,2 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
-DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63 SHA512 ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600
-DIST znc-1.7.1.tar.gz 2041669 BLAKE2B 57ead136e28b0fc4a875802ef89ef004213789e68d19ceeab15c6fac6fe51ea51618764c484ea618fc6359d9c15cc7ffcf5529642d730b9217a4f127e92d9ae6 SHA512 907068fb0828091026d440145b70ca76109302f13c18d94f772660192434287f209a06a52da1dd39726b9a38735b3cea9afbd062eb6def4cd428bb73c562a902
-DIST znc-1.7.2.tar.gz 2083306 BLAKE2B 907581df536d9bab15964f6fcecbbf660403c39368b984ab1d2957bd43c4a90ca0694844b41786dab5495a4f4dccd675eaa54189782d47683e013d1faf9cc368 SHA512 fcc67bf676e066db64d62584ff8ecfd63280b3237e88dcbe18ab0b78a9b5f4dc202b589876b6fc14c6092ca5509937bc170a54fba44df2aeb1645cca02afe577
DIST znc-1.7.3.tar.gz 2084575 BLAKE2B 4d8f76abef8bf2c5f96d9bd04716cd2debae2b2fcd3b8688aa715af6ef09e60c2aac203c5c7b32d2f4d56730f30dbbe9abd5eeec4f07e7580900dcb1cd164530 SHA512 4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8
diff --git a/net-irc/znc/znc-1.7.1.ebuild b/net-irc/znc/znc-1.7.1.ebuild
deleted file mode 100644
index 1de5e05761e..00000000000
--- a/net-irc/znc/znc-1.7.1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-
-inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
-
-GTEST_VER="ba96d0b1161f540656efdaed035b3c062b60e006" # 1.8.0 is too old, but newer version not released yet
-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 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"
-
-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-${GTEST_VER}/googletest"
- export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock"
- fi
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cmake-utils_src_make unittest
- if has network-sandbox ${FEATURES}; then
- cmake-utils_src_make install DESTDIR="${T}/inttest"
- 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.7.2.ebuild b/net-irc/znc/znc-1.7.2.ebuild
deleted file mode 100644
index b8d5eb3df8f..00000000000
--- a/net-irc/znc/znc-1.7.2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-
-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 ~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"
-
-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
-}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2019-04-07 21:42 Mikle Kolyada
0 siblings, 0 replies; 113+ messages in thread
From: Mikle Kolyada @ 2019-04-07 21:42 UTC (permalink / raw
To: gentoo-commits
commit: 987ee2cbf2fc574824a62ee8e304be3f47c1ae1a
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 7 21:42:10 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Apr 7 21:42:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=987ee2cb
net-irc/znc: arm stable wrt bug #681864
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"
net-irc/znc/znc-1.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.3.ebuild b/net-irc/znc/znc-1.7.3.ebuild
index 2e12fe36390..995ab53ba14 100644
--- a/net-irc/znc/znc-1.7.3.ebuild
+++ b/net-irc/znc/znc-1.7.3.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="amd64 ~arm x86"
+ KEYWORDS="amd64 arm x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2019-04-02 9:28 Mikle Kolyada
0 siblings, 0 replies; 113+ messages in thread
From: Mikle Kolyada @ 2019-04-02 9:28 UTC (permalink / raw
To: gentoo-commits
commit: 21845b291f7b7ddd046960db9f0907cf3b91d9c2
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 2 09:27:40 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Apr 2 09:27:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21845b29
net-irc/znc: amd64 stable wrt bug #681864
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
net-irc/znc/znc-1.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.3.ebuild b/net-irc/znc/znc-1.7.3.ebuild
index 59a766ba986..2e12fe36390 100644
--- a/net-irc/znc/znc-1.7.3.ebuild
+++ b/net-irc/znc/znc-1.7.3.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm x86"
+ KEYWORDS="amd64 ~arm x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2019-04-01 17:21 Thomas Deutschmann
0 siblings, 0 replies; 113+ messages in thread
From: Thomas Deutschmann @ 2019-04-01 17:21 UTC (permalink / raw
To: gentoo-commits
commit: 35085a2b9d327e7ea81c7669fdcf29ac1f9c51e4
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 1 17:19:45 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Apr 1 17:19:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35085a2b
net-irc/znc: x86 stable (bug #681864)
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
net-irc/znc/znc-1.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.3.ebuild b/net-irc/znc/znc-1.7.3.ebuild
index b8d5eb3df8f..59a766ba986 100644
--- a/net-irc/znc/znc-1.7.3.ebuild
+++ b/net-irc/znc/znc-1.7.3.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2019-03-31 22:57 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2019-03-31 22:57 UTC (permalink / raw
To: gentoo-commits
commit: a9cc051e15e39e75565eb2acf397f8eaad21cb0f
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 22:55:10 2019 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 22:56:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9cc051e
net-irc/znc: bump to 1.7.3, fixes CVE-2019-9917
Bug: https://bugs.gentoo.org/681864
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/Manifest | 1 +
net-irc/znc/znc-1.7.3.ebuild | 182 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 183 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 5c3a7e5e7aa..a57a86eff9b 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -2,3 +2,4 @@ DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac8760
DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63 SHA512 ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600
DIST znc-1.7.1.tar.gz 2041669 BLAKE2B 57ead136e28b0fc4a875802ef89ef004213789e68d19ceeab15c6fac6fe51ea51618764c484ea618fc6359d9c15cc7ffcf5529642d730b9217a4f127e92d9ae6 SHA512 907068fb0828091026d440145b70ca76109302f13c18d94f772660192434287f209a06a52da1dd39726b9a38735b3cea9afbd062eb6def4cd428bb73c562a902
DIST znc-1.7.2.tar.gz 2083306 BLAKE2B 907581df536d9bab15964f6fcecbbf660403c39368b984ab1d2957bd43c4a90ca0694844b41786dab5495a4f4dccd675eaa54189782d47683e013d1faf9cc368 SHA512 fcc67bf676e066db64d62584ff8ecfd63280b3237e88dcbe18ab0b78a9b5f4dc202b589876b6fc14c6092ca5509937bc170a54fba44df2aeb1645cca02afe577
+DIST znc-1.7.3.tar.gz 2084575 BLAKE2B 4d8f76abef8bf2c5f96d9bd04716cd2debae2b2fcd3b8688aa715af6ef09e60c2aac203c5c7b32d2f4d56730f30dbbe9abd5eeec4f07e7580900dcb1cd164530 SHA512 4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8
diff --git a/net-irc/znc/znc-1.7.3.ebuild b/net-irc/znc/znc-1.7.3.ebuild
new file mode 100644
index 00000000000..b8d5eb3df8f
--- /dev/null
+++ b/net-irc/znc/znc-1.7.3.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+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 ~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"
+
+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
+}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2019-01-27 14:38 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2019-01-27 14:38 UTC (permalink / raw
To: gentoo-commits
commit: e9e5b32a38cb45e120f5484d7f7c9f8e5de0740f
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 14:15:45 2019 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 14:37:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e5b32a
net-irc/znc: sync live ebuild with latest release
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
net-irc/znc/znc-9999.ebuild | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index e59849a6e29..b8d5eb3df8f 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
-GTEST_VER="ba96d0b1161f540656efdaed035b3c062b60e006" # 1.8.0 is too old, but newer version not released yet
+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"
@@ -99,8 +99,8 @@ src_configure() {
)
if [[ ${PV} != *9999* ]] && use test; then
- export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest"
- export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock"
+ export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest"
+ export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
fi
cmake-utils_src_configure
@@ -109,7 +109,7 @@ src_configure() {
src_test() {
cmake-utils_src_make unittest
if has network-sandbox ${FEATURES}; then
- cmake-utils_src_make install DESTDIR="${T}/inttest"
+ DESTDIR="${T}/inttest" cmake-utils_src_make install
local filter='-'
if ! use perl; then
filter="${filter}:ZNCTest.Modperl*"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2018-07-19 11:04 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2018-07-19 11:04 UTC (permalink / raw
To: gentoo-commits
commit: cb2784be1a0263fcb9d6773cbbaa289e9a571b0d
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 19 11:03:53 2018 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 11:04:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb2784be
net-irc/znc: add Python 3.7
Package-Manager: Portage-2.3.43, Repoman-2.3.10
net-irc/znc/znc-1.7.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.1.ebuild b/net-irc/znc/znc-1.7.1.ebuild
index 0b449633796..1de5e05761e 100644
--- a/net-irc/znc/znc-1.7.1.ebuild
+++ b/net-irc/znc/znc-1.7.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2018-07-17 22:54 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2018-07-17 22:54 UTC (permalink / raw
To: gentoo-commits
commit: 4b16146c0145d5b8729e9bceb45dc412370c88f9
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 17 22:49:39 2018 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Tue Jul 17 22:53:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b16146c
net-irc/znc: bump to 1.7.1, only the version string changes
See the following link for a comparison of both releases:
https://github.com/znc/znc/compare/znc-1.7.1-rc1...znc-1.7.1
Bug: https://bugs.gentoo.org/661228
Package-Manager: Portage-2.3.43, Repoman-2.3.10
net-irc/znc/Manifest | 2 +-
net-irc/znc/{znc-1.7.1_rc1.ebuild => znc-1.7.1.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 62133c7bbce..cf9e0f5c01a 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,2 +1,2 @@
DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63 SHA512 ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600
-DIST znc-1.7.1-rc1.tar.gz 2041320 BLAKE2B 62669b598d7423cb55fad458fe6172be36904e8599dcde757936883093f24deb6a5ed6a093e3e92854810f02e96372f44139f9807e70e0cf007de90a1373c6a8 SHA512 b4e223c86c75bc97620c52333d90d6458a02777dce9c629f8a095f8134a06992a60978b2fe8bbce29ed1155932f9f37e0a324a498ee16527b0235e4306c34973
+DIST znc-1.7.1.tar.gz 2041669 BLAKE2B 57ead136e28b0fc4a875802ef89ef004213789e68d19ceeab15c6fac6fe51ea51618764c484ea618fc6359d9c15cc7ffcf5529642d730b9217a4f127e92d9ae6 SHA512 907068fb0828091026d440145b70ca76109302f13c18d94f772660192434287f209a06a52da1dd39726b9a38735b3cea9afbd062eb6def4cd428bb73c562a902
diff --git a/net-irc/znc/znc-1.7.1_rc1.ebuild b/net-irc/znc/znc-1.7.1.ebuild
similarity index 100%
rename from net-irc/znc/znc-1.7.1_rc1.ebuild
rename to net-irc/znc/znc-1.7.1.ebuild
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2018-07-16 1:11 Mikle Kolyada
0 siblings, 0 replies; 113+ messages in thread
From: Mikle Kolyada @ 2018-07-16 1:11 UTC (permalink / raw
To: gentoo-commits
commit: 3611b3d6bfa64c3256b2f40f8ba4f2c6001b749a
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 16 01:11:28 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Jul 16 01:11:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3611b3d6
net-irc/znc: arm stable wrt bug #661228
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-irc/znc/znc-1.7.1_rc1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.1_rc1.ebuild b/net-irc/znc/znc-1.7.1_rc1.ebuild
index 1b1dc8571f1..0b449633796 100644
--- a/net-irc/znc/znc-1.7.1_rc1.ebuild
+++ b/net-irc/znc/znc-1.7.1_rc1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="amd64 ~arm x86"
+ KEYWORDS="amd64 arm x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2018-07-15 23:37 Mikle Kolyada
0 siblings, 0 replies; 113+ messages in thread
From: Mikle Kolyada @ 2018-07-15 23:37 UTC (permalink / raw
To: gentoo-commits
commit: 82417f797939226dbb10962d782b9096cef485ae
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 15 23:36:13 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 23:36:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82417f79
net-irc/znc: amd64 stable wrt bug #661228
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-irc/znc/znc-1.7.1_rc1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.1_rc1.ebuild b/net-irc/znc/znc-1.7.1_rc1.ebuild
index 9ed08bcd9d2..1b1dc8571f1 100644
--- a/net-irc/znc/znc-1.7.1_rc1.ebuild
+++ b/net-irc/znc/znc-1.7.1_rc1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm x86"
+ KEYWORDS="amd64 ~arm x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2018-07-15 23:31 Thomas Deutschmann
0 siblings, 0 replies; 113+ messages in thread
From: Thomas Deutschmann @ 2018-07-15 23:31 UTC (permalink / raw
To: gentoo-commits
commit: 701670b187f9ea2c76dda335e0f126c8e17af190
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 15 23:30:35 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 23:30:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=701670b1
net-irc/znc: x86 stable (bug #661228)
Package-Manager: Portage-2.3.42, Repoman-2.3.9
net-irc/znc/znc-1.7.1_rc1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.1_rc1.ebuild b/net-irc/znc/znc-1.7.1_rc1.ebuild
index e59849a6e29..9ed08bcd9d2 100644
--- a/net-irc/znc/znc-1.7.1_rc1.ebuild
+++ b/net-irc/znc/znc-1.7.1_rc1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm x86"
S=${WORKDIR}/${MY_P}
fi
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2018-07-15 22:40 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2018-07-15 22:40 UTC (permalink / raw
To: gentoo-commits
commit: 741a0dc49393d412b0d688bd249a4625b5024b20
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 15 22:13:00 2018 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 22:40:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=741a0dc4
net-irc/znc: sync live ebuild with 1.7.1_rc1
Package-Manager: Portage-2.3.42, Repoman-2.3.9
net-irc/znc/znc-9999.ebuild | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index ec9c6196f37..e59849a6e29 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -16,11 +16,14 @@ if [[ ${PV} == *9999* ]]; then
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/${P}.tar.gz
+ https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
KEYWORDS="~amd64 ~arm ~x86"
+ S=${WORKDIR}/${MY_P}
fi
HOMEPAGE="https://znc.in"
@@ -52,9 +55,7 @@ DEPEND="
test? ( dev-qt/qtnetwork:5 )
"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.0-inttest-dir.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
pkg_setup() {
if use python; then
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2018-07-15 22:40 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2018-07-15 22:40 UTC (permalink / raw
To: gentoo-commits
commit: 1396695a1c97a6f71f07ad2635b2095554dfa03c
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 15 22:17:19 2018 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 22:40:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1396695a
net-irc/znc: remove old
Package-Manager: Portage-2.3.42, Repoman-2.3.9
net-irc/znc/Manifest | 1 -
net-irc/znc/znc-1.6.5.ebuild | 130 -------------------------------------------
2 files changed, 131 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 08205bafd48..741c0f30e99 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,6 +1,5 @@
DIST googletest-release-1.7.0.tar.gz 468653 BLAKE2B 8dfca8b79dcd7b64ce84bad11ee68c549f4fe3dff7638ed1d845af4a7f754ad5df782d2cbebdb9fecfda2499dae6585e07cda7a8c8c454f0b70723d5c9578aa4 SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc
DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63 SHA512 ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600
-DIST znc-1.6.5.tar.gz 1470681 BLAKE2B 9de0b211280489423bc2894d0e76d7276aa42428d07d64516372a9ca6d1616db1f27c0142b54160c61cbee89d65ceadf941d001319254dbff9eb5b016988482e SHA512 d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626
DIST znc-1.6.6.tar.gz 1471612 BLAKE2B 8bd977a95417c4259e9f38759d838f55a146f376dc8bb6230ab6e1b698fb7c9e060cbc237efd4e836961314abab56cc02e7c6bc74e40bad17abaf06e47fbb516 SHA512 cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7
DIST znc-1.7.0.tar.gz 1853666 BLAKE2B 3e519d4005a10a9a5329f22ab6abbd19dfa2c7cecb949c138bc72909eae8883576fc0352e3ac46b852b8c58f038150419720aa48791a1339b004206f3afc20e9 SHA512 718dec65dfa2374c568b2694e4faef1f8cf313ae96d171e2263656e077e0fae5f8037c69a23ae33f4ea314ac6e15480c7dccef73ad3ac9324eb79caca622d54b
DIST znc-1.7.1-rc1.tar.gz 2041320 BLAKE2B 62669b598d7423cb55fad458fe6172be36904e8599dcde757936883093f24deb6a5ed6a093e3e92854810f02e96372f44139f9807e70e0cf007de90a1373c6a8 SHA512 b4e223c86c75bc97620c52333d90d6458a02777dce9c629f8a095f8134a06992a60978b2fe8bbce29ed1155932f9f37e0a324a498ee16527b0235e4306c34973
diff --git a/net-irc/znc/znc-1.6.5.ebuild b/net-irc/znc/znc-1.6.5.ebuild
deleted file mode 100644
index 20fc31e0957..00000000000
--- a/net-irc/znc/znc-1.6.5.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit eutils python-single-r1 readme.gentoo-r1 systemd user
-
-MY_PV=${PV/_/-}
-GTEST_VER="1.7.0"
-GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> googletest-release-${GTEST_VER}.tar.gz"
-DESCRIPTION="An advanced IRC Bouncer"
-
-SRC_URI="
- http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
- test? ( ${GTEST_URL} )
-"
-KEYWORDS="amd64 arm x86"
-
-HOMEPAGE="https://znc.in"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="daemon debug +ipv6 +icu libressl perl python +ssl sasl tcl test +zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- icu? ( dev-libs/icu:= )
- 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 )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.1-systemwideconfig.patch
- "${FILESDIR}"/${PN}-1.6.1-create-pidfile-per-default.patch
-)
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
- if use daemon; then
- 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}
- fi
-}
-
-src_configure() {
- econf \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $(use_enable debug) \
- $(use_enable icu charset) \
- $(use_enable ipv6) \
- $(use_enable perl) \
- $(use_enable python) \
- $(use_enable sasl cyrus) \
- $(use_enable ssl openssl) \
- $(use_enable tcl) \
- $(use_enable zlib) \
- $(use_with test gtest "${WORKDIR}/googletest-release-${GTEST_VER}")
-}
-
-src_install() {
- default
- dodoc NOTICE
- if use daemon; then
- newinitd "${FILESDIR}"/znc.initd-r1 znc
- newconfd "${FILESDIR}"/znc.confd-r1 znc
- fi
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo") || die
- DISABLE_AUTOFORMATTING=1
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- if [[ -d "${EROOT%/}"/etc/znc ]]; then
- ewarn "/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 " /var/lib/znc"
- ewarn "please move /etc/znc to /var/lib/znc"
- ewarn "or adjust /etc/conf.d/znc"
- fi
-}
-
-pkg_config() {
- if use daemon; then
- 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 any key to interactively create a new configuration file"
- einfo "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"
- "${EROOT%/}"/usr/bin/znc --system-wide-config-as ${PN} -c -r -d "${EROOT%/}/var/lib/znc" ||
- die "Config failed"
- echo
- einfo "To start znc, run '/etc/init.d/znc start'"
- einfo "or add znc to a runlevel:"
- einfo " rc-update add znc default"
- fi
- else
- ewarn "To configure znc as a system-wide daemon you have to"
- ewarn "enable the 'daemon' use flag."
- fi
-}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2018-06-18 10:34 Louis Sautier
0 siblings, 0 replies; 113+ messages in thread
From: Louis Sautier @ 2018-06-18 10:34 UTC (permalink / raw
To: gentoo-commits
commit: 7277b7e4768145485130273bfccf7dac2f893da6
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 17 23:33:52 2018 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Mon Jun 18 10:34:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7277b7e4
net-irc/znc: change my email in metadata.xml
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-irc/znc/metadata.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/net-irc/znc/metadata.xml b/net-irc/znc/metadata.xml
index 51954559918..16293e77692 100644
--- a/net-irc/znc/metadata.xml
+++ b/net-irc/znc/metadata.xml
@@ -2,13 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>sautier.louis@gmail.com</email>
+ <email>sbraz@gentoo.org</email>
<name>Louis Sautier</name>
</maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
<use>
<flag name="daemon">Allow znc to run as a system-wide service. Installs an init script and creates a znc user:group.</flag>
<flag name="zlib">Enable mod_deflate-like gzip support for znc's web interface using <pkg>sys-libs/zlib</pkg>.</flag>
^ permalink raw reply related [flat|nested] 113+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2018-05-15 18:03 Michał Górny
0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2018-05-15 18:03 UTC (permalink / raw
To: gentoo-commits
commit: 205a81e50cb7e94e7f8660635c962e2b955c67fe
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sat May 12 00:38:33 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 15 17:46:29 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=205a81e5
net-irc/znc: update HOMEPAGE to use https
Closes: https://github.com/gentoo/gentoo/pull/8355
Package-Manager: Portage-2.3.31, Repoman-2.3.9
net-irc/znc/znc-1.6.5.ebuild | 4 ++--
net-irc/znc/znc-1.6.6.ebuild | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-irc/znc/znc-1.6.5.ebuild b/net-irc/znc/znc-1.6.5.ebuild
index 23d86965db2..20fc31e0957 100644
--- a/net-irc/znc/znc-1.6.5.ebuild
+++ b/net-irc/znc/znc-1.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="
"
KEYWORDS="amd64 arm x86"
-HOMEPAGE="http://znc.in"
+HOMEPAGE="https://znc.in"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="daemon debug +ipv6 +icu libressl perl python +ssl sasl tcl test +zlib"
diff --git a/net-irc/znc/znc-1.6.6.ebuild b/net-irc/znc/znc-1.6.6.ebuild
index 0e053e7e595..76b253fef23 100644
--- a/net-irc/znc/znc-1.6.6.ebuild
+++ b/net-irc/znc/znc-1.6.6.ebuild
@@ -11,7 +11,7 @@ GTEST_VER="1.7.0"
GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> googletest-release-${GTEST_VER}.tar.gz"
DESCRIPTION="An advanced IRC Bouncer"
-HOMEPAGE="http://znc.in"
+HOMEPAGE="https://znc.in"
SRC_URI="
http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
test? ( ${GTEST_URL} )
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2018-05-15 18:03 Michał Górny
0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2018-05-15 18:03 UTC (permalink / raw
To: gentoo-commits
commit: b74dac5c19536d840169a9cf66e3ae46b8fbc095
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sat May 12 00:37:27 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 15 17:46:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74dac5c
net-irc/znc: sync live ebuild with 1.7.0
Package-Manager: Portage-2.3.31, Repoman-2.3.9
net-irc/znc/znc-9999.ebuild | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index de34be1322e..b27016716af 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,13 +17,13 @@ if [[ ${PV} == *9999* ]]; then
SRC_URI=""
else
SRC_URI="
- http://znc.in/releases/archive/${P}.tar.gz
+ https://znc.in/releases/archive/${P}.tar.gz
test? ( ${GTEST_URL} )
"
KEYWORDS="~amd64 ~arm ~x86"
fi
-HOMEPAGE="http://znc.in"
+HOMEPAGE="https://znc.in"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
@@ -45,8 +45,8 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- nls? ( sys-devel/gettext )
virtual/pkgconfig
+ nls? ( sys-devel/gettext )
perl? ( >=dev-lang/swig-3.0.0 )
python? ( >=dev-lang/swig-3.0.0 )
"
@@ -98,9 +98,7 @@ src_configure() {
}
src_test() {
- pushd "${BUILD_DIR}" > /dev/null || die
- ${CMAKE_MAKEFILE_GENERATOR} unittest || die "Unit test failed"
- popd > /dev/null || die
+ cmake-utils_src_make unittest
}
src_install() {
@@ -138,8 +136,7 @@ pkg_config() {
ewarn "to generate a new configuration, remove the folder"
ewarn "and try again."
else
- einfo "Press any key to interactively create a new configuration file"
- einfo "for znc."
+ 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
@@ -149,7 +146,7 @@ pkg_config() {
"${EROOT%/}"/usr/bin/znc -- --makeconf --datadir "${EROOT%/}/var/lib/znc" ||
die "Config failed"
einfo
- einfo "Now you can start znc service using the init system of your choice."
- einfo "Don't forget to enable znc service if you want to use znc on boot."
+ 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
}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2018-03-14 16:57 Michał Górny
0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2018-03-14 16:57 UTC (permalink / raw
To: gentoo-commits
commit: a6cdd7980446f34e9f8f20209d30805190a9a34d
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sun Mar 11 00:54:19 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 14 16:44:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6cdd798
net-irc/znc: remove old
Closes: https://github.com/gentoo/gentoo/pull/7417
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-irc/znc/Manifest | 1 -
net-irc/znc/znc-1.6.3-r1.ebuild | 128 ----------------------------------------
2 files changed, 129 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index d7162d91414..55c3b0b329c 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,4 +1,3 @@
DIST googletest-release-1.7.0.tar.gz 468653 BLAKE2B 8dfca8b79dcd7b64ce84bad11ee68c549f4fe3dff7638ed1d845af4a7f754ad5df782d2cbebdb9fecfda2499dae6585e07cda7a8c8c454f0b70723d5c9578aa4 SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc
-DIST znc-1.6.3.tar.gz 1464200 BLAKE2B 7ea0aeea29133308772df91f5a43748acbfa5998a6865000d5dfe43d88ca82d18338ea0d18746361e0d22eafb4ce1c8533f213db4cc0d0444c3f05124388e562 SHA512 777279b6c973310b4e78a0472bd1e355c2adf3e4fbe9ebedde3dd4706e5c0b208d4330eb2318a8d9e0d7d7146bee0a4a428cbe5a3f230c8f6aa692a477e86e2b
DIST znc-1.6.5.tar.gz 1470681 BLAKE2B 9de0b211280489423bc2894d0e76d7276aa42428d07d64516372a9ca6d1616db1f27c0142b54160c61cbee89d65ceadf941d001319254dbff9eb5b016988482e SHA512 d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626
DIST znc-1.6.6.tar.gz 1471612 BLAKE2B 8bd977a95417c4259e9f38759d838f55a146f376dc8bb6230ab6e1b698fb7c9e060cbc237efd4e836961314abab56cc02e7c6bc74e40bad17abaf06e47fbb516 SHA512 cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7
diff --git a/net-irc/znc/znc-1.6.3-r1.ebuild b/net-irc/znc/znc-1.6.3-r1.ebuild
deleted file mode 100644
index 80dcbf2099d..00000000000
--- a/net-irc/znc/znc-1.6.3-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit eutils python-single-r1 readme.gentoo-r1 systemd user
-
-MY_PV=${PV/_/-}
-GTEST_VER="1.7.0"
-GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> googletest-release-${GTEST_VER}.tar.gz"
-DESCRIPTION="An advanced IRC Bouncer"
-
-SRC_URI="
- http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
- test? ( ${GTEST_URL} )
-"
-KEYWORDS="amd64 arm x86"
-
-HOMEPAGE="http://znc.in"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="daemon debug ipv6 libressl perl python ssl sasl tcl test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- dev-libs/icu:=
- sys-libs/zlib
- 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= )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.1-systemwideconfig.patch
- "${FILESDIR}"/${PN}-1.6.1-create-pidfile-per-default.patch
-)
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
- if use daemon; then
- 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}
- fi
-}
-
-src_configure() {
- econf \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $(use_enable debug) \
- $(use_enable ipv6) \
- $(use_enable perl) \
- $(use_enable python) \
- $(use_enable sasl cyrus) \
- $(use_enable ssl openssl) \
- $(use_enable tcl tcl) \
- $(use_with test gtest "${WORKDIR}/googletest-release-${GTEST_VER}")
-}
-
-src_install() {
- default
- dodoc NOTICE
- if use daemon; then
- newinitd "${FILESDIR}"/znc.initd-r1 znc
- newconfd "${FILESDIR}"/znc.confd-r1 znc
- fi
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo")
- DISABLE_AUTOFORMATTING=1
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- if [[ -d "${EROOT%/}"/etc/znc ]]; then
- ewarn "/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 " /var/lib/znc"
- ewarn "please move /etc/znc to /var/lib/znc"
- ewarn "or adjust /etc/conf.d/znc"
- fi
-}
-
-pkg_config() {
- if use daemon; then
- 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 any key to interactively create a new configuration file"
- einfo "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"
- "${EROOT%/}"/usr/bin/znc --system-wide-config-as ${PN} -c -r -d "${EROOT%/}/var/lib/znc" ||
- die "Config failed"
- echo
- einfo "To start znc, run '/etc/init.d/znc start'"
- einfo "or add znc to a runlevel:"
- einfo " rc-update add znc default"
- fi
- else
- ewarn "To configure znc as a system-wide daemon you have to"
- ewarn "enable the 'daemon' use flag."
- fi
-}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2018-03-14 16:57 Michał Górny
0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2018-03-14 16:57 UTC (permalink / raw
To: gentoo-commits
commit: f51d071276af645756472e42a4b2464a71f8bd98
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sun Mar 11 00:53:38 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 14 16:44:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f51d0712
net-irc/znc: bump to 1.6.6
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-irc/znc/Manifest | 1 +
net-irc/znc/znc-1.6.6.ebuild | 129 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index e8522361c57..d7162d91414 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,3 +1,4 @@
DIST googletest-release-1.7.0.tar.gz 468653 BLAKE2B 8dfca8b79dcd7b64ce84bad11ee68c549f4fe3dff7638ed1d845af4a7f754ad5df782d2cbebdb9fecfda2499dae6585e07cda7a8c8c454f0b70723d5c9578aa4 SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc
DIST znc-1.6.3.tar.gz 1464200 BLAKE2B 7ea0aeea29133308772df91f5a43748acbfa5998a6865000d5dfe43d88ca82d18338ea0d18746361e0d22eafb4ce1c8533f213db4cc0d0444c3f05124388e562 SHA512 777279b6c973310b4e78a0472bd1e355c2adf3e4fbe9ebedde3dd4706e5c0b208d4330eb2318a8d9e0d7d7146bee0a4a428cbe5a3f230c8f6aa692a477e86e2b
DIST znc-1.6.5.tar.gz 1470681 BLAKE2B 9de0b211280489423bc2894d0e76d7276aa42428d07d64516372a9ca6d1616db1f27c0142b54160c61cbee89d65ceadf941d001319254dbff9eb5b016988482e SHA512 d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626
+DIST znc-1.6.6.tar.gz 1471612 BLAKE2B 8bd977a95417c4259e9f38759d838f55a146f376dc8bb6230ab6e1b698fb7c9e060cbc237efd4e836961314abab56cc02e7c6bc74e40bad17abaf06e47fbb516 SHA512 cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7
diff --git a/net-irc/znc/znc-1.6.6.ebuild b/net-irc/znc/znc-1.6.6.ebuild
new file mode 100644
index 00000000000..0e053e7e595
--- /dev/null
+++ b/net-irc/znc/znc-1.6.6.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit eutils python-single-r1 readme.gentoo-r1 systemd user
+
+MY_PV=${PV/_/-}
+GTEST_VER="1.7.0"
+GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> googletest-release-${GTEST_VER}.tar.gz"
+
+DESCRIPTION="An advanced IRC Bouncer"
+HOMEPAGE="http://znc.in"
+SRC_URI="
+ http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
+ test? ( ${GTEST_URL} )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="daemon debug +ipv6 +icu libressl perl python +ssl sasl tcl test +zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ icu? ( dev-libs/icu:= )
+ 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 )
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.1-systemwideconfig.patch
+ "${FILESDIR}"/${PN}-1.6.1-create-pidfile-per-default.patch
+)
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+ if use daemon; then
+ 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}
+ fi
+}
+
+src_configure() {
+ econf \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ $(use_enable debug) \
+ $(use_enable icu charset) \
+ $(use_enable ipv6) \
+ $(use_enable perl) \
+ $(use_enable python) \
+ $(use_enable sasl cyrus) \
+ $(use_enable ssl openssl) \
+ $(use_enable tcl) \
+ $(use_enable zlib) \
+ $(use_with test gtest "${WORKDIR}/googletest-release-${GTEST_VER}")
+}
+
+src_install() {
+ default
+ dodoc NOTICE
+ if use daemon; then
+ newinitd "${FILESDIR}"/znc.initd-r1 znc
+ newconfd "${FILESDIR}"/znc.confd-r1 znc
+ fi
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo") || die
+ DISABLE_AUTOFORMATTING=1
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+ if [[ -d "${EROOT%/}"/etc/znc ]]; then
+ ewarn "/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 " /var/lib/znc"
+ ewarn "please move /etc/znc to /var/lib/znc"
+ ewarn "or adjust /etc/conf.d/znc"
+ fi
+}
+
+pkg_config() {
+ if use daemon; then
+ 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 any key to interactively create a new configuration file"
+ einfo "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"
+ "${EROOT%/}"/usr/bin/znc --system-wide-config-as ${PN} -c -r -d "${EROOT%/}/var/lib/znc" ||
+ die "Config failed"
+ echo
+ einfo "To start znc, run '/etc/init.d/znc start'"
+ einfo "or add znc to a runlevel:"
+ einfo " rc-update add znc default"
+ fi
+ else
+ ewarn "To configure znc as a system-wide daemon you have to"
+ ewarn "enable the 'daemon' use flag."
+ fi
+}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2018-01-10 8:15 Michał Górny
0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2018-01-10 8:15 UTC (permalink / raw
To: gentoo-commits
commit: ef29e6468585fba55d26e9a00c06f8840cc93adf
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Tue Jan 9 21:25:48 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 08:15:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef29e646
net-irc/znc: Remove l10n/linguas variables.
Simply install all available locales instead.
Closes: https://github.com/gentoo/gentoo/pull/6808
net-irc/znc/znc-9999.ebuild | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index bfe3e235cf9..de34be1322e 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -4,9 +4,8 @@
EAPI=6
PYTHON_COMPAT=( python3_{4,5,6} )
-PLOCALES="de ru"
-inherit cmake-utils l10n python-single-r1 readme.gentoo-r1 systemd user
+inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
GTEST_VER="1.8.0"
GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
@@ -66,14 +65,6 @@ pkg_setup() {
}
src_prepare() {
- l10n_find_plocales_changes "${S}/src/po" "${PN}." '.po'
-
- remove_locale() {
- # Some language/module pairs can be missing
- rm -f src/po/${PN}.${1}.po modules/po/*.${1}.po || die
- }
- l10n_for_each_disabled_locale_do remove_locale
-
# Let SWIG rebuild modperl/modpython to make user patching easier.
if [[ ${PV} != *9999* ]]; then
rm modules/modperl/generated.tar.gz || die
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2017-12-17 21:18 Thomas Deutschmann
0 siblings, 0 replies; 113+ messages in thread
From: Thomas Deutschmann @ 2017-12-17 21:18 UTC (permalink / raw
To: gentoo-commits
commit: 6586a706829865fdb0af5da6df7aec4200876174
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sun Dec 17 14:01:05 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 21:18:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6586a706
net-irc/znc: Update 9999 to have zlib slotted, and support python 3.6
Closes: https://github.com/gentoo/gentoo/pull/6569
Signed-off-by: Louis Sautier <sautier.louis <AT> gmail.com>
net-irc/znc/znc-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index 5358cf63d4e..bfe3e235cf9 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
PLOCALES="de ru"
inherit cmake-utils l10n python-single-r1 readme.gentoo-r1 systemd user
@@ -42,7 +42,7 @@ RDEPEND="
libressl? ( dev-libs/libressl:0= )
)
tcl? ( dev-lang/tcl:0= )
- zlib? ( sys-libs/zlib )
+ zlib? ( sys-libs/zlib:0= )
"
DEPEND="
${RDEPEND}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2017-12-17 21:18 Thomas Deutschmann
0 siblings, 0 replies; 113+ messages in thread
From: Thomas Deutschmann @ 2017-12-17 21:18 UTC (permalink / raw
To: gentoo-commits
commit: caf891deeeecff798c85c00933ba731acde6bede
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sun Dec 17 03:04:43 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 21:15:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caf891de
net-irc/znc: Add German locale
Signed-off-by: Louis Sautier <sautier.louis <AT> gmail.com>
net-irc/znc/znc-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index a0794296fcc..5358cf63d4e 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
PYTHON_COMPAT=( python{3_4,3_5} )
-PLOCALES="ru"
+PLOCALES="de ru"
inherit cmake-utils l10n python-single-r1 readme.gentoo-r1 systemd user
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2017-08-18 23:26 Thomas Deutschmann
0 siblings, 0 replies; 113+ messages in thread
From: Thomas Deutschmann @ 2017-08-18 23:26 UTC (permalink / raw
To: gentoo-commits
commit: a5afafdef54403aa09463bffdf775d7f0339abd4
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 18 22:40:06 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 18 23:25:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5afafde
net-irc/znc: x86 stable (bug #625332)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-irc/znc/znc-1.6.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.6.5.ebuild b/net-irc/znc/znc-1.6.5.ebuild
index aa178a8332e..23d86965db2 100644
--- a/net-irc/znc/znc-1.6.5.ebuild
+++ b/net-irc/znc/znc-1.6.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
test? ( ${GTEST_URL} )
"
-KEYWORDS="amd64 arm ~x86"
+KEYWORDS="amd64 arm x86"
HOMEPAGE="http://znc.in"
LICENSE="Apache-2.0"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2017-07-24 17:59 Markus Meier
0 siblings, 0 replies; 113+ messages in thread
From: Markus Meier @ 2017-07-24 17:59 UTC (permalink / raw
To: gentoo-commits
commit: 8482fd7ce024e739973f90caa7b4c40c5766d8e5
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 17:59:04 2017 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 17:59:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8482fd7c
net-irc/znc: arm stable, bug #625332
Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"
net-irc/znc/znc-1.6.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.6.5.ebuild b/net-irc/znc/znc-1.6.5.ebuild
index 627cda0361c..aa178a8332e 100644
--- a/net-irc/znc/znc-1.6.5.ebuild
+++ b/net-irc/znc/znc-1.6.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
test? ( ${GTEST_URL} )
"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 arm ~x86"
HOMEPAGE="http://znc.in"
LICENSE="Apache-2.0"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2017-07-19 18:06 Tobias Klausmann
0 siblings, 0 replies; 113+ messages in thread
From: Tobias Klausmann @ 2017-07-19 18:06 UTC (permalink / raw
To: gentoo-commits
commit: 9792f7661b16dfb74529260cc9b0b61a5d720fe3
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 19 17:30:46 2017 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 18:05:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9792f766
net-irc/znc-1.6.5-r0: amd64 stable
Gentoo-Bug: 625332
net-irc/znc/znc-1.6.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.6.5.ebuild b/net-irc/znc/znc-1.6.5.ebuild
index ae97ab976e8..627cda0361c 100644
--- a/net-irc/znc/znc-1.6.5.ebuild
+++ b/net-irc/znc/znc-1.6.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
test? ( ${GTEST_URL} )
"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
HOMEPAGE="http://znc.in"
LICENSE="Apache-2.0"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2017-07-17 10:19 Aaron Swenson
0 siblings, 0 replies; 113+ messages in thread
From: Aaron Swenson @ 2017-07-17 10:19 UTC (permalink / raw
To: gentoo-commits
commit: 42cbfb83a2398a68684233e9608d3a4de6aed70b
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sun Jul 16 22:55:09 2017 +0000
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 10:19:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42cbfb83
net-irc/znc: remove old
Bug: https://bugs.gentoo.org/show_bug.cgi?id=625328
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/5116
Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org>
net-irc/znc/Manifest | 1 -
net-irc/znc/znc-1.4-r1.ebuild | 167 ------------------------------------------
2 files changed, 168 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index ba0bb07b773..c159bff1ef8 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,4 +1,3 @@
DIST googletest-release-1.7.0.tar.gz 468653 SHA256 f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc WHIRLPOOL e59e6aede05fd882c64586de7d204ed97fd02ec0f53abeb3130dcd18940ecefb59a43592ac5bd14dd28a8825845bd11359f637e28671554852573a4a43f8cd9c
-DIST znc-1.4.tar.gz 1239648 SHA256 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52 SHA512 0c33b05e8232084999812cbaa467dc7d37b80cafc1001b82e89c702b4303d8db9a27b948fe653e7090404eb1c66f5492f02f3524bc39efabade4be8bdb476671 WHIRLPOOL 420e665fa193b3f0284a070e021c4c467e3d40a0812eedeef9b2f65a6626a050b7af8bf15a754ac571d12261705832cfa18a0f7a7817cce96d220028a86230cf
DIST znc-1.6.3.tar.gz 1464200 SHA256 631c46de76fe601a41ef7676bc974958e9a302b72b25fc92b4a603a25d89b827 SHA512 777279b6c973310b4e78a0472bd1e355c2adf3e4fbe9ebedde3dd4706e5c0b208d4330eb2318a8d9e0d7d7146bee0a4a428cbe5a3f230c8f6aa692a477e86e2b WHIRLPOOL 2a41e0ac90038a8cc8f289d4ffc0494d29eda75450f650b8870c076fb809eb9c5829720bb39eb43d38ee4ac7f9bea6000ad90fcdd8c0eea461bf04f88cc17b52
DIST znc-1.6.5.tar.gz 1470681 SHA256 2f0225d49c53a01f8d94feea4619a6fe92857792bb3401a4eb1edd65f0342aca SHA512 d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626 WHIRLPOOL b72585a2f11754bedb667ac078a617195aa718f9864e7e33b962d75387e7bc4c8c6c1465844f27b65a5af2d50cec7006ae325a43eb2ef930fc9c218bbaae60a1
diff --git a/net-irc/znc/znc-1.4-r1.ebuild b/net-irc/znc/znc-1.4-r1.ebuild
deleted file mode 100644
index e99e78596b2..00000000000
--- a/net-irc/znc/znc-1.4-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_4 )
-inherit base python-single-r1 systemd user
-
-MY_PV=${PV/_/-}
-DESCRIPTION="An advanced IRC Bouncer"
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-2
- EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/znc/znc.git"}
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz"
- KEYWORDS="amd64 ~arm x86"
-fi
-
-HOMEPAGE="http://znc.in"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="daemon debug ipv6 perl python ssl sasl tcl"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- perl? ( >=dev-lang/perl-5.10 )
- python? ( ${PYTHON_DEPS} )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- ssl? ( >=dev-libs/openssl-0.9.7d:0 )
- tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="
- virtual/pkgconfig
- perl? (
- >=dev-lang/swig-2.0.12
- )
- python? (
- >=dev-lang/swig-2.0.12
- )
- ${RDEPEND}
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0-systemwideconfig.patch"
-)
-
-CONFDIR="/var/lib/znc"
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
- if use daemon; then
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /dev/null ${PN}
- fi
-}
-
-src_prepare() {
- if [[ ${PV} == *9999* ]]; then
- ./autogen.sh
- fi
-
- base_src_prepare
-}
-
-src_configure() {
- econf \
- --with-systemdsystemunitdir=$(systemd_get_unitdir) \
- $(use_enable debug) \
- $(use_enable ipv6) \
- $(use_enable perl) \
- $(use python && echo "--enable-python=python3") \
- $(use_enable sasl cyrus) \
- $(use_enable ssl openssl) \
- $(use_enable tcl tcl)
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc NOTICE README.md
- if use daemon; then
- newinitd "${FILESDIR}"/znc.initd znc
- newconfd "${FILESDIR}"/znc.confd znc
- fi
-}
-
-pkg_postinst() {
- if use !daemon; then
- elog
- elog "Run 'znc --makeconf' as the user you want to run ZNC as"
- elog "to make a configuration file"
- elog
- else
- elog
- elog "An init-script was installed in /etc/init.d"
- elog "A config file was installed in /etc/conf.d"
- if [[ ! -d "${EROOT}${CONFDIR}" ]]; then
- elog
- elog "Run 'emerge --config znc' to configure ZNC"
- elog "as a system-wide daemon."
- elog
- elog "To generate a new SSL certificate, run:"
- elog " znc --system-wide-config-as znc --makepem -d ${CONFDIR}"
- elog "as root"
- elog
- elog "If migrating from a user-based install"
- elog "you can use your existing config files:"
- elog " mkdir ${CONFDIR}"
- elog " mv /home/\$USER/.znc/* ${CONFDIR}"
- elog " rm -rf /home/\$USER/.znc"
- elog " chown -R znc:znc ${CONFDIR}"
- elog
- elog "If you already have znc set up and want take advantage of the"
- elog "init script but skip of all the above, you can also edit"
- elog " /etc/conf.d/znc"
- elog "and adjust the variables to your current znc user and config"
- elog "location."
- if [[ -d "${EROOT}"/etc/znc ]]; then
- elog
- ewarn "/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 " /var/lib/znc"
- ewarn "please move /etc/znc to /var/lib/znc"
- ewarn "or adjust /etc/conf.d/znc"
- fi
- else
- elog "Existing config detected in ${CONFDIR}"
- elog "You're good to go :)"
- fi
- elog
- fi
-}
-
-pkg_config() {
- if use daemon && ! [[ -d "${EROOT}${CONFDIR}" ]]; then
- einfo "Press ENTER to interactively create a new configuration file for znc."
- einfo "To abort, press Control-C"
- read
- mkdir -p "${EROOT}${CONFDIR}" || die
- chown -R ${PN}:${PN} "${EROOT}${CONFDIR}" ||
- die "Setting permissions failed"
- "${EROOT}"/usr/bin/znc --system-wide-config-as znc -c -r -d "${EROOT}${CONFDIR}" ||
- die "Config failed"
- echo
- einfo "To start znc, run '/etc/init.d/znc start'"
- einfo "or add znc to a runlevel:"
- einfo " rc-update add znc default"
- else
- if use daemon; then
- ewarn "${CONFDIR} 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
- ewarn "To configure znc as a system-wide daemon you have to"
- ewarn "enable the 'daemon' use flag."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2017-04-01 12:12 David Seifert
0 siblings, 0 replies; 113+ messages in thread
From: David Seifert @ 2017-04-01 12:12 UTC (permalink / raw
To: gentoo-commits
commit: ad71ec59040beb293b221a5b4305b60d556e8044
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sun Mar 26 17:55:42 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Apr 1 12:12:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad71ec59
net-irc/znc: remove old
Package-Manager: Portage-2.3.4, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4303
net-irc/znc/Manifest | 1 -
net-irc/znc/znc-1.6.4.ebuild | 130 -------------------------------------------
2 files changed, 131 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index db13f97d818..ba0bb07b773 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,5 +1,4 @@
DIST googletest-release-1.7.0.tar.gz 468653 SHA256 f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc WHIRLPOOL e59e6aede05fd882c64586de7d204ed97fd02ec0f53abeb3130dcd18940ecefb59a43592ac5bd14dd28a8825845bd11359f637e28671554852573a4a43f8cd9c
DIST znc-1.4.tar.gz 1239648 SHA256 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52 SHA512 0c33b05e8232084999812cbaa467dc7d37b80cafc1001b82e89c702b4303d8db9a27b948fe653e7090404eb1c66f5492f02f3524bc39efabade4be8bdb476671 WHIRLPOOL 420e665fa193b3f0284a070e021c4c467e3d40a0812eedeef9b2f65a6626a050b7af8bf15a754ac571d12261705832cfa18a0f7a7817cce96d220028a86230cf
DIST znc-1.6.3.tar.gz 1464200 SHA256 631c46de76fe601a41ef7676bc974958e9a302b72b25fc92b4a603a25d89b827 SHA512 777279b6c973310b4e78a0472bd1e355c2adf3e4fbe9ebedde3dd4706e5c0b208d4330eb2318a8d9e0d7d7146bee0a4a428cbe5a3f230c8f6aa692a477e86e2b WHIRLPOOL 2a41e0ac90038a8cc8f289d4ffc0494d29eda75450f650b8870c076fb809eb9c5829720bb39eb43d38ee4ac7f9bea6000ad90fcdd8c0eea461bf04f88cc17b52
-DIST znc-1.6.4.tar.gz 1468049 SHA256 431097eb17860bfc980f3e68fdd75f98af4bdeecd793c84835c6cb11c3320d1c SHA512 d66069a7db4d85f8f132aed1ee4b0da8a04c61ab0e2df36426eb326e713401e824c9653b7edd0f7b317779b95b56965bc987c7099eb83b4950386462fd96cd8f WHIRLPOOL 42612a47f459f6e4ce5e64d836491366e3f10e50a7d6ee72ef50468e8e4a90a39cd708492b5b77d53ec8d8184164885dd7f3c79635b5d1e297ec8dc7ef313c34
DIST znc-1.6.5.tar.gz 1470681 SHA256 2f0225d49c53a01f8d94feea4619a6fe92857792bb3401a4eb1edd65f0342aca SHA512 d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626 WHIRLPOOL b72585a2f11754bedb667ac078a617195aa718f9864e7e33b962d75387e7bc4c8c6c1465844f27b65a5af2d50cec7006ae325a43eb2ef930fc9c218bbaae60a1
diff --git a/net-irc/znc/znc-1.6.4.ebuild b/net-irc/znc/znc-1.6.4.ebuild
deleted file mode 100644
index 9d864f35109..00000000000
--- a/net-irc/znc/znc-1.6.4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit eutils python-single-r1 readme.gentoo-r1 systemd user
-
-MY_PV=${PV/_/-}
-GTEST_VER="1.7.0"
-GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> googletest-release-${GTEST_VER}.tar.gz"
-DESCRIPTION="An advanced IRC Bouncer"
-
-SRC_URI="
- http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
- test? ( ${GTEST_URL} )
-"
-KEYWORDS="~amd64 ~arm ~x86"
-
-HOMEPAGE="http://znc.in"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="daemon debug +ipv6 +icu libressl perl python +ssl sasl tcl test +zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- icu? ( dev-libs/icu:= )
- 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 )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.1-systemwideconfig.patch
- "${FILESDIR}"/${PN}-1.6.1-create-pidfile-per-default.patch
-)
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
- if use daemon; then
- 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}
- fi
-}
-
-src_configure() {
- econf \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $(use_enable debug) \
- $(use_enable icu charset) \
- $(use_enable ipv6) \
- $(use_enable perl) \
- $(use_enable python) \
- $(use_enable sasl cyrus) \
- $(use_enable ssl openssl) \
- $(use_enable tcl) \
- $(use_enable zlib) \
- $(use_with test gtest "${WORKDIR}/googletest-release-${GTEST_VER}")
-}
-
-src_install() {
- default
- dodoc NOTICE
- if use daemon; then
- newinitd "${FILESDIR}"/znc.initd-r1 znc
- newconfd "${FILESDIR}"/znc.confd-r1 znc
- fi
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo") || die
- DISABLE_AUTOFORMATTING=1
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- if [[ -d "${EROOT%/}"/etc/znc ]]; then
- ewarn "/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 " /var/lib/znc"
- ewarn "please move /etc/znc to /var/lib/znc"
- ewarn "or adjust /etc/conf.d/znc"
- fi
-}
-
-pkg_config() {
- if use daemon; then
- 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 any key to interactively create a new configuration file"
- einfo "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"
- "${EROOT%/}"/usr/bin/znc --system-wide-config-as ${PN} -c -r -d "${EROOT%/}/var/lib/znc" ||
- die "Config failed"
- echo
- einfo "To start znc, run '/etc/init.d/znc start'"
- einfo "or add znc to a runlevel:"
- einfo " rc-update add znc default"
- fi
- else
- ewarn "To configure znc as a system-wide daemon you have to"
- ewarn "enable the 'daemon' use flag."
- fi
-}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2017-04-01 12:12 David Seifert
0 siblings, 0 replies; 113+ messages in thread
From: David Seifert @ 2017-04-01 12:12 UTC (permalink / raw
To: gentoo-commits
commit: 1435e8b19be12bd06f0ef322a884bd70b9c05f6f
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sun Mar 26 17:52:45 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Apr 1 12:12:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1435e8b1
net-irc/znc: bump to 1.6.5, add Python 3.6
Gentoo-Bug: 613286
Package-Manager: Portage-2.3.4, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4303
net-irc/znc/Manifest | 1 +
net-irc/znc/znc-1.6.5.ebuild | 130 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 131 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index b3b62aa6e3e..db13f97d818 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -2,3 +2,4 @@ DIST googletest-release-1.7.0.tar.gz 468653 SHA256 f73a6546fdf9fce9ff93a5015e033
DIST znc-1.4.tar.gz 1239648 SHA256 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52 SHA512 0c33b05e8232084999812cbaa467dc7d37b80cafc1001b82e89c702b4303d8db9a27b948fe653e7090404eb1c66f5492f02f3524bc39efabade4be8bdb476671 WHIRLPOOL 420e665fa193b3f0284a070e021c4c467e3d40a0812eedeef9b2f65a6626a050b7af8bf15a754ac571d12261705832cfa18a0f7a7817cce96d220028a86230cf
DIST znc-1.6.3.tar.gz 1464200 SHA256 631c46de76fe601a41ef7676bc974958e9a302b72b25fc92b4a603a25d89b827 SHA512 777279b6c973310b4e78a0472bd1e355c2adf3e4fbe9ebedde3dd4706e5c0b208d4330eb2318a8d9e0d7d7146bee0a4a428cbe5a3f230c8f6aa692a477e86e2b WHIRLPOOL 2a41e0ac90038a8cc8f289d4ffc0494d29eda75450f650b8870c076fb809eb9c5829720bb39eb43d38ee4ac7f9bea6000ad90fcdd8c0eea461bf04f88cc17b52
DIST znc-1.6.4.tar.gz 1468049 SHA256 431097eb17860bfc980f3e68fdd75f98af4bdeecd793c84835c6cb11c3320d1c SHA512 d66069a7db4d85f8f132aed1ee4b0da8a04c61ab0e2df36426eb326e713401e824c9653b7edd0f7b317779b95b56965bc987c7099eb83b4950386462fd96cd8f WHIRLPOOL 42612a47f459f6e4ce5e64d836491366e3f10e50a7d6ee72ef50468e8e4a90a39cd708492b5b77d53ec8d8184164885dd7f3c79635b5d1e297ec8dc7ef313c34
+DIST znc-1.6.5.tar.gz 1470681 SHA256 2f0225d49c53a01f8d94feea4619a6fe92857792bb3401a4eb1edd65f0342aca SHA512 d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626 WHIRLPOOL b72585a2f11754bedb667ac078a617195aa718f9864e7e33b962d75387e7bc4c8c6c1465844f27b65a5af2d50cec7006ae325a43eb2ef930fc9c218bbaae60a1
diff --git a/net-irc/znc/znc-1.6.5.ebuild b/net-irc/znc/znc-1.6.5.ebuild
new file mode 100644
index 00000000000..ae97ab976e8
--- /dev/null
+++ b/net-irc/znc/znc-1.6.5.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit eutils python-single-r1 readme.gentoo-r1 systemd user
+
+MY_PV=${PV/_/-}
+GTEST_VER="1.7.0"
+GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> googletest-release-${GTEST_VER}.tar.gz"
+DESCRIPTION="An advanced IRC Bouncer"
+
+SRC_URI="
+ http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
+ test? ( ${GTEST_URL} )
+"
+KEYWORDS="~amd64 ~arm ~x86"
+
+HOMEPAGE="http://znc.in"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="daemon debug +ipv6 +icu libressl perl python +ssl sasl tcl test +zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ icu? ( dev-libs/icu:= )
+ 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 )
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.1-systemwideconfig.patch
+ "${FILESDIR}"/${PN}-1.6.1-create-pidfile-per-default.patch
+)
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+ if use daemon; then
+ 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}
+ fi
+}
+
+src_configure() {
+ econf \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ $(use_enable debug) \
+ $(use_enable icu charset) \
+ $(use_enable ipv6) \
+ $(use_enable perl) \
+ $(use_enable python) \
+ $(use_enable sasl cyrus) \
+ $(use_enable ssl openssl) \
+ $(use_enable tcl) \
+ $(use_enable zlib) \
+ $(use_with test gtest "${WORKDIR}/googletest-release-${GTEST_VER}")
+}
+
+src_install() {
+ default
+ dodoc NOTICE
+ if use daemon; then
+ newinitd "${FILESDIR}"/znc.initd-r1 znc
+ newconfd "${FILESDIR}"/znc.confd-r1 znc
+ fi
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo") || die
+ DISABLE_AUTOFORMATTING=1
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+ if [[ -d "${EROOT%/}"/etc/znc ]]; then
+ ewarn "/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 " /var/lib/znc"
+ ewarn "please move /etc/znc to /var/lib/znc"
+ ewarn "or adjust /etc/conf.d/znc"
+ fi
+}
+
+pkg_config() {
+ if use daemon; then
+ 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 any key to interactively create a new configuration file"
+ einfo "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"
+ "${EROOT%/}"/usr/bin/znc --system-wide-config-as ${PN} -c -r -d "${EROOT%/}/var/lib/znc" ||
+ die "Config failed"
+ echo
+ einfo "To start znc, run '/etc/init.d/znc start'"
+ einfo "or add znc to a runlevel:"
+ einfo " rc-update add znc default"
+ fi
+ else
+ ewarn "To configure znc as a system-wide daemon you have to"
+ ewarn "enable the 'daemon' use flag."
+ fi
+}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2017-01-04 15:55 Thomas Deutschmann
0 siblings, 0 replies; 113+ messages in thread
From: Thomas Deutschmann @ 2017-01-04 15:55 UTC (permalink / raw
To: gentoo-commits
commit: 68c6dd181f51fd8f5be1bed47e1e412fe61b927e
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 4 15:54:51 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 15:55:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c6dd18
net-irc/znc: Update live ebuild
Use gtest from source.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-irc/znc/znc-9999.ebuild | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index 642a974..03a69e4 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -9,6 +9,8 @@ PLOCALES="ru"
inherit cmake-utils l10n python-single-r1 readme.gentoo-r1 systemd user
+GTEST_VER="1.8.0"
+GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
DESCRIPTION="An advanced IRC Bouncer"
if [[ ${PV} == *9999* ]]; then
@@ -16,7 +18,10 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
SRC_URI=""
else
- SRC_URI="http://znc.in/releases/archive/${P}.tar.gz"
+ SRC_URI="
+ http://znc.in/releases/archive/${P}.tar.gz
+ test? ( ${GTEST_URL} )
+ "
KEYWORDS="~amd64 ~arm ~x86"
fi
@@ -46,7 +51,6 @@ DEPEND="
virtual/pkgconfig
perl? ( >=dev-lang/swig-3.0.0 )
python? ( >=dev-lang/swig-3.0.0 )
- test? ( dev-cpp/gtest )
"
pkg_setup() {
@@ -95,6 +99,11 @@ src_configure() {
-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
}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-12-26 23:35 Thomas Deutschmann
0 siblings, 0 replies; 113+ messages in thread
From: Thomas Deutschmann @ 2016-12-26 23:35 UTC (permalink / raw
To: gentoo-commits
commit: 66f6d5b7e5f9e7d2e98bcf45dc07e9e6f730ae76
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sat Dec 24 12:01:56 2016 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 23:34:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66f6d5b7
net-irc/znc: Set defaults for several USE-flags to enabled
Closes https://github.com/gentoo/gentoo/pull/3232
net-irc/znc/znc-1.6.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.6.4.ebuild b/net-irc/znc/znc-1.6.4.ebuild
index f8a3449..f7530b7 100644
--- a/net-irc/znc/znc-1.6.4.ebuild
+++ b/net-irc/znc/znc-1.6.4.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~arm ~x86"
HOMEPAGE="http://znc.in"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="daemon debug ipv6 icu libressl perl python ssl sasl tcl test zlib"
+IUSE="daemon debug +ipv6 +icu libressl perl python +ssl sasl tcl test +zlib"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-12-26 23:35 Thomas Deutschmann
0 siblings, 0 replies; 113+ messages in thread
From: Thomas Deutschmann @ 2016-12-26 23:35 UTC (permalink / raw
To: gentoo-commits
commit: 77e81ba5c2acddbef2339fc238ae68639be200f7
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 23:34:41 2016 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 23:35:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77e81ba5
net-irc/znc: Add description for "zlib" USE flag
Package-Manager: Portage-2.3.2, Repoman-2.3.1
net-irc/znc/metadata.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-irc/znc/metadata.xml b/net-irc/znc/metadata.xml
index 944a888..5195455 100644
--- a/net-irc/znc/metadata.xml
+++ b/net-irc/znc/metadata.xml
@@ -11,6 +11,7 @@
</maintainer>
<use>
<flag name="daemon">Allow znc to run as a system-wide service. Installs an init script and creates a znc user:group.</flag>
+ <flag name="zlib">Enable mod_deflate-like gzip support for znc's web interface using <pkg>sys-libs/zlib</pkg>.</flag>
</use>
<upstream>
<remote-id type="github">znc/znc</remote-id>
^ permalink raw reply related [flat|nested] 113+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-12-23 3:17 Sam Jorna
0 siblings, 0 replies; 113+ messages in thread
From: Sam Jorna @ 2016-12-23 3:17 UTC (permalink / raw
To: gentoo-commits
commit: 13f377301f40217529c0f7d42266246eac36c480
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sun Dec 18 09:38:50 2016 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 03:16:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13f37730
net-irc/znc: fix URI to support older releases
net-irc/znc/znc-1.4-r1.ebuild | 2 +-
net-irc/znc/znc-1.6.3-r1.ebuild | 2 +-
net-irc/znc/znc-1.6.4.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-irc/znc/znc-1.4-r1.ebuild b/net-irc/znc/znc-1.4-r1.ebuild
index 6b66981..bde3b79 100644
--- a/net-irc/znc/znc-1.4-r1.ebuild
+++ b/net-irc/znc/znc-1.4-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
SRC_URI=""
KEYWORDS=""
else
- SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz"
+ SRC_URI="http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz"
KEYWORDS="amd64 ~arm x86"
fi
diff --git a/net-irc/znc/znc-1.6.3-r1.ebuild b/net-irc/znc/znc-1.6.3-r1.ebuild
index e4bd9d6..cf860fa 100644
--- a/net-irc/znc/znc-1.6.3-r1.ebuild
+++ b/net-irc/znc/znc-1.6.3-r1.ebuild
@@ -13,7 +13,7 @@ GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar
DESCRIPTION="An advanced IRC Bouncer"
SRC_URI="
- http://znc.in/releases/${PN}-${MY_PV}.tar.gz
+ http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
test? ( ${GTEST_URL} )
"
KEYWORDS="amd64 arm x86"
diff --git a/net-irc/znc/znc-1.6.4.ebuild b/net-irc/znc/znc-1.6.4.ebuild
index 211a14d..d7516ba 100644
--- a/net-irc/znc/znc-1.6.4.ebuild
+++ b/net-irc/znc/znc-1.6.4.ebuild
@@ -13,7 +13,7 @@ GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar
DESCRIPTION="An advanced IRC Bouncer"
SRC_URI="
- http://znc.in/releases/${PN}-${MY_PV}.tar.gz
+ http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
test? ( ${GTEST_URL} )
"
KEYWORDS="~amd64 ~arm ~x86"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-12-23 3:17 Sam Jorna
0 siblings, 0 replies; 113+ messages in thread
From: Sam Jorna @ 2016-12-23 3:17 UTC (permalink / raw
To: gentoo-commits
commit: f79ca92e4ed00c58a880b2932b81469b56b54a3b
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sun Dec 18 09:46:28 2016 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 03:17:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f79ca92e
net-irc/znc: hide zlib and icu behind global USE-flags
Closes: #3156
net-irc/znc/znc-1.6.4.ebuild | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/net-irc/znc/znc-1.6.4.ebuild b/net-irc/znc/znc-1.6.4.ebuild
index d7516ba..f8a3449 100644
--- a/net-irc/znc/znc-1.6.4.ebuild
+++ b/net-irc/znc/znc-1.6.4.ebuild
@@ -21,13 +21,12 @@ KEYWORDS="~amd64 ~arm ~x86"
HOMEPAGE="http://znc.in"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="daemon debug ipv6 libressl perl python ssl sasl tcl test"
+IUSE="daemon debug ipv6 icu libressl perl python ssl sasl tcl test zlib"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
- dev-libs/icu:=
- sys-libs/zlib
+ icu? ( dev-libs/icu:= )
perl? ( >=dev-lang/perl-5.10:= )
python? ( ${PYTHON_DEPS} )
sasl? ( >=dev-libs/cyrus-sasl-2 )
@@ -36,6 +35,7 @@ RDEPEND="
libressl? ( dev-libs/libressl:0= )
)
tcl? ( dev-lang/tcl:0= )
+ zlib? ( sys-libs/zlib )
"
DEPEND="
${RDEPEND}
@@ -67,12 +67,14 @@ src_configure() {
econf \
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
$(use_enable debug) \
+ $(use_enable icu charset) \
$(use_enable ipv6) \
$(use_enable perl) \
$(use_enable python) \
$(use_enable sasl cyrus) \
$(use_enable ssl openssl) \
$(use_enable tcl) \
+ $(use_enable zlib) \
$(use_with test gtest "${WORKDIR}/googletest-release-${GTEST_VER}")
}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-12-11 15:21 Michał Górny
0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2016-12-11 15:21 UTC (permalink / raw
To: gentoo-commits
commit: b257ea766fd53b52639e5d4280daf230ae898b10
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sun Dec 11 14:36:04 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 15:18:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b257ea76
net-irc/znc: bump to 1.6.4
Closes: https://github.com/gentoo/gentoo/pull/3086
Package-Manager: portage-2.3.2
net-irc/znc/Manifest | 1 +
net-irc/znc/znc-1.6.4.ebuild | 129 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 1805de3..b3b62aa 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,3 +1,4 @@
DIST googletest-release-1.7.0.tar.gz 468653 SHA256 f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc WHIRLPOOL e59e6aede05fd882c64586de7d204ed97fd02ec0f53abeb3130dcd18940ecefb59a43592ac5bd14dd28a8825845bd11359f637e28671554852573a4a43f8cd9c
DIST znc-1.4.tar.gz 1239648 SHA256 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52 SHA512 0c33b05e8232084999812cbaa467dc7d37b80cafc1001b82e89c702b4303d8db9a27b948fe653e7090404eb1c66f5492f02f3524bc39efabade4be8bdb476671 WHIRLPOOL 420e665fa193b3f0284a070e021c4c467e3d40a0812eedeef9b2f65a6626a050b7af8bf15a754ac571d12261705832cfa18a0f7a7817cce96d220028a86230cf
DIST znc-1.6.3.tar.gz 1464200 SHA256 631c46de76fe601a41ef7676bc974958e9a302b72b25fc92b4a603a25d89b827 SHA512 777279b6c973310b4e78a0472bd1e355c2adf3e4fbe9ebedde3dd4706e5c0b208d4330eb2318a8d9e0d7d7146bee0a4a428cbe5a3f230c8f6aa692a477e86e2b WHIRLPOOL 2a41e0ac90038a8cc8f289d4ffc0494d29eda75450f650b8870c076fb809eb9c5829720bb39eb43d38ee4ac7f9bea6000ad90fcdd8c0eea461bf04f88cc17b52
+DIST znc-1.6.4.tar.gz 1468049 SHA256 431097eb17860bfc980f3e68fdd75f98af4bdeecd793c84835c6cb11c3320d1c SHA512 d66069a7db4d85f8f132aed1ee4b0da8a04c61ab0e2df36426eb326e713401e824c9653b7edd0f7b317779b95b56965bc987c7099eb83b4950386462fd96cd8f WHIRLPOOL 42612a47f459f6e4ce5e64d836491366e3f10e50a7d6ee72ef50468e8e4a90a39cd708492b5b77d53ec8d8184164885dd7f3c79635b5d1e297ec8dc7ef313c34
diff --git a/net-irc/znc/znc-1.6.4.ebuild b/net-irc/znc/znc-1.6.4.ebuild
new file mode 100644
index 00000000..211a14d
--- /dev/null
+++ b/net-irc/znc/znc-1.6.4.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit eutils python-single-r1 readme.gentoo-r1 systemd user
+
+MY_PV=${PV/_/-}
+GTEST_VER="1.7.0"
+GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> googletest-release-${GTEST_VER}.tar.gz"
+DESCRIPTION="An advanced IRC Bouncer"
+
+SRC_URI="
+ http://znc.in/releases/${PN}-${MY_PV}.tar.gz
+ test? ( ${GTEST_URL} )
+"
+KEYWORDS="~amd64 ~arm ~x86"
+
+HOMEPAGE="http://znc.in"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="daemon debug ipv6 libressl perl python ssl sasl tcl test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ dev-libs/icu:=
+ sys-libs/zlib
+ 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= )
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.1-systemwideconfig.patch
+ "${FILESDIR}"/${PN}-1.6.1-create-pidfile-per-default.patch
+)
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+ if use daemon; then
+ 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}
+ fi
+}
+
+src_configure() {
+ econf \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ $(use_enable debug) \
+ $(use_enable ipv6) \
+ $(use_enable perl) \
+ $(use_enable python) \
+ $(use_enable sasl cyrus) \
+ $(use_enable ssl openssl) \
+ $(use_enable tcl) \
+ $(use_with test gtest "${WORKDIR}/googletest-release-${GTEST_VER}")
+}
+
+src_install() {
+ default
+ dodoc NOTICE
+ if use daemon; then
+ newinitd "${FILESDIR}"/znc.initd-r1 znc
+ newconfd "${FILESDIR}"/znc.confd-r1 znc
+ fi
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo") || die
+ DISABLE_AUTOFORMATTING=1
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+ if [[ -d "${EROOT%/}"/etc/znc ]]; then
+ ewarn "/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 " /var/lib/znc"
+ ewarn "please move /etc/znc to /var/lib/znc"
+ ewarn "or adjust /etc/conf.d/znc"
+ fi
+}
+
+pkg_config() {
+ if use daemon; then
+ 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 any key to interactively create a new configuration file"
+ einfo "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"
+ "${EROOT%/}"/usr/bin/znc --system-wide-config-as ${PN} -c -r -d "${EROOT%/}/var/lib/znc" ||
+ die "Config failed"
+ echo
+ einfo "To start znc, run '/etc/init.d/znc start'"
+ einfo "or add znc to a runlevel:"
+ einfo " rc-update add znc default"
+ fi
+ else
+ ewarn "To configure znc as a system-wide daemon you have to"
+ ewarn "enable the 'daemon' use flag."
+ fi
+}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-12-02 19:08 Michał Górny
0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2016-12-02 19:08 UTC (permalink / raw
To: gentoo-commits
commit: fd676c937ab85d6653e7789df46febc2e3336236
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Thu Dec 1 23:33:24 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 2 19:08:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd676c93
net-irc/znc: fix googlecode URI, minor fixes
- use github URI for googletest, use tar.gz instead of zip
- add missing quotes around systemd_get_systemunitdir
Package-Manager: portage-2.3.2
net-irc/znc/Manifest | 1 +
net-irc/znc/metadata.xml | 1 -
net-irc/znc/znc-1.6.3.ebuild | 19 +++++++++++--------
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index d4ac35e..a51598c 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,3 +1,4 @@
+DIST googletest-release-1.7.0.tar.gz 468653 SHA256 f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc WHIRLPOOL e59e6aede05fd882c64586de7d204ed97fd02ec0f53abeb3130dcd18940ecefb59a43592ac5bd14dd28a8825845bd11359f637e28671554852573a4a43f8cd9c
DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 WHIRLPOOL 0c31a385159551859c1afe76480b3fb1b560d666db9a0afc5cbda92bcd53bf129f85a8f902c6ded0779c2b4c49aacec59ba5a4d5ce316a07bf08174f4fc64049
DIST znc-1.4.tar.gz 1239648 SHA256 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52 SHA512 0c33b05e8232084999812cbaa467dc7d37b80cafc1001b82e89c702b4303d8db9a27b948fe653e7090404eb1c66f5492f02f3524bc39efabade4be8bdb476671 WHIRLPOOL 420e665fa193b3f0284a070e021c4c467e3d40a0812eedeef9b2f65a6626a050b7af8bf15a754ac571d12261705832cfa18a0f7a7817cce96d220028a86230cf
DIST znc-1.6.1.tar.gz 1463397 SHA256 ba49397364f48d6d32ae5242bc1166f21d972f85dd390d6bbe68a63ecbb6c140 SHA512 92c0acca6b585df394cf8d6d295948fc1342ff7b15d081017d2e0ba521129f914fa2b019a82d801f826f1009456294e4f578e978f34677bbfe436e87e2734aba WHIRLPOOL ff4a22742d5e1e8da66325fdc8a2fd88a467674a5f13f6d353b1c3588affd86f2c33c24d48f1b61dfba14311d6f1c13b2939851316cb302ab031073baa05ec17
diff --git a/net-irc/znc/metadata.xml b/net-irc/znc/metadata.xml
index b8a8704..944a888 100644
--- a/net-irc/znc/metadata.xml
+++ b/net-irc/znc/metadata.xml
@@ -4,7 +4,6 @@
<maintainer type="person">
<email>sautier.louis@gmail.com</email>
<name>Louis Sautier</name>
- <description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
diff --git a/net-irc/znc/znc-1.6.3.ebuild b/net-irc/znc/znc-1.6.3.ebuild
index 7f31546..d900f54 100644
--- a/net-irc/znc/znc-1.6.3.ebuild
+++ b/net-irc/znc/znc-1.6.3.ebuild
@@ -9,11 +9,13 @@ inherit eutils python-single-r1 readme.gentoo-r1 systemd user
MY_PV=${PV/_/-}
GTEST_VER="1.7.0"
-GTEST_URL="https://googletest.googlecode.com/files/gtest-${GTEST_VER}.zip"
+GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> googletest-release-${GTEST_VER}.tar.gz"
DESCRIPTION="An advanced IRC Bouncer"
-SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz
- test? ( ${GTEST_URL} )"
+SRC_URI="
+ http://znc.in/releases/${PN}-${MY_PV}.tar.gz
+ test? ( ${GTEST_URL} )
+"
KEYWORDS="amd64 arm x86"
HOMEPAGE="http://znc.in"
@@ -35,7 +37,8 @@ RDEPEND="
)
tcl? ( dev-lang/tcl:0= )
"
-DEPEND="${RDEPEND}
+DEPEND="
+ ${RDEPEND}
virtual/pkgconfig
"
@@ -62,7 +65,7 @@ pkg_setup() {
src_configure() {
econf \
- --with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
$(use_enable debug) \
$(use_enable ipv6) \
$(use_enable perl) \
@@ -70,12 +73,12 @@ src_configure() {
$(use_enable sasl cyrus) \
$(use_enable ssl openssl) \
$(use_enable tcl tcl) \
- $(use_with test gtest "${WORKDIR}/gtest-${GTEST_VER}")
+ $(use_with test gtest "${WORKDIR}/googletest-release-${GTEST_VER}")
}
src_install() {
- emake install DESTDIR="${D%/}"
- dodoc NOTICE README.md
+ default
+ dodoc NOTICE
if use daemon; then
newinitd "${FILESDIR}"/znc.initd-r1 znc
newconfd "${FILESDIR}"/znc.confd-r1 znc
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-12-02 19:08 Michał Górny
0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2016-12-02 19:08 UTC (permalink / raw
To: gentoo-commits
commit: 84aab79875aee149ebe9e7d7e4d5111155998f4b
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Thu Dec 1 23:36:51 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 2 19:08:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84aab798
net-irc/znc: add a sub-slot operator for perl and libressl
Package-Manager: portage-2.3.2
net-irc/znc/{znc-1.6.3.ebuild => znc-1.6.3-r1.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-irc/znc/znc-1.6.3.ebuild b/net-irc/znc/znc-1.6.3-r1.ebuild
similarity index 97%
rename from net-irc/znc/znc-1.6.3.ebuild
rename to net-irc/znc/znc-1.6.3-r1.ebuild
index d900f54..e4bd9d6 100644
--- a/net-irc/znc/znc-1.6.3.ebuild
+++ b/net-irc/znc/znc-1.6.3-r1.ebuild
@@ -28,12 +28,12 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
dev-libs/icu:=
sys-libs/zlib
- perl? ( >=dev-lang/perl-5.10 )
+ 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 )
+ libressl? ( dev-libs/libressl:0= )
)
tcl? ( dev-lang/tcl:0= )
"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-12-02 19:08 Michał Górny
0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2016-12-02 19:08 UTC (permalink / raw
To: gentoo-commits
commit: 40c0c378b6fd8215878eb2b5de43448044bf6b5f
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Fri Dec 2 09:08:40 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 2 19:08:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c0c378
net-irc/znc: remove old
Closes: https://github.com/gentoo/gentoo/pull/2977
Package-Manager: portage-2.3.2
net-irc/znc/Manifest | 2 -
net-irc/znc/znc-1.6.1-r1.ebuild | 190 ----------------------------------------
2 files changed, 192 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index a51598c..1805de3 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,5 +1,3 @@
DIST googletest-release-1.7.0.tar.gz 468653 SHA256 f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc WHIRLPOOL e59e6aede05fd882c64586de7d204ed97fd02ec0f53abeb3130dcd18940ecefb59a43592ac5bd14dd28a8825845bd11359f637e28671554852573a4a43f8cd9c
-DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 WHIRLPOOL 0c31a385159551859c1afe76480b3fb1b560d666db9a0afc5cbda92bcd53bf129f85a8f902c6ded0779c2b4c49aacec59ba5a4d5ce316a07bf08174f4fc64049
DIST znc-1.4.tar.gz 1239648 SHA256 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52 SHA512 0c33b05e8232084999812cbaa467dc7d37b80cafc1001b82e89c702b4303d8db9a27b948fe653e7090404eb1c66f5492f02f3524bc39efabade4be8bdb476671 WHIRLPOOL 420e665fa193b3f0284a070e021c4c467e3d40a0812eedeef9b2f65a6626a050b7af8bf15a754ac571d12261705832cfa18a0f7a7817cce96d220028a86230cf
-DIST znc-1.6.1.tar.gz 1463397 SHA256 ba49397364f48d6d32ae5242bc1166f21d972f85dd390d6bbe68a63ecbb6c140 SHA512 92c0acca6b585df394cf8d6d295948fc1342ff7b15d081017d2e0ba521129f914fa2b019a82d801f826f1009456294e4f578e978f34677bbfe436e87e2734aba WHIRLPOOL ff4a22742d5e1e8da66325fdc8a2fd88a467674a5f13f6d353b1c3588affd86f2c33c24d48f1b61dfba14311d6f1c13b2939851316cb302ab031073baa05ec17
DIST znc-1.6.3.tar.gz 1464200 SHA256 631c46de76fe601a41ef7676bc974958e9a302b72b25fc92b4a603a25d89b827 SHA512 777279b6c973310b4e78a0472bd1e355c2adf3e4fbe9ebedde3dd4706e5c0b208d4330eb2318a8d9e0d7d7146bee0a4a428cbe5a3f230c8f6aa692a477e86e2b WHIRLPOOL 2a41e0ac90038a8cc8f289d4ffc0494d29eda75450f650b8870c076fb809eb9c5829720bb39eb43d38ee4ac7f9bea6000ad90fcdd8c0eea461bf04f88cc17b52
diff --git a/net-irc/znc/znc-1.6.1-r1.ebuild b/net-irc/znc/znc-1.6.1-r1.ebuild
deleted file mode 100644
index f06d784..00000000
--- a/net-irc/znc/znc-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_4 )
-inherit eutils python-single-r1 systemd user
-
-MY_PV=${PV/_/-}
-GTEST_VER="1.7.0"
-GTEST_URL="https://googletest.googlecode.com/files/gtest-${GTEST_VER}.zip"
-DESCRIPTION="An advanced IRC Bouncer"
-
-SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz
- test? ( ${GTEST_URL} )"
-KEYWORDS="~amd64 ~arm ~x86"
-
-HOMEPAGE="http://znc.in"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="daemon debug ipv6 libressl perl python ssl sasl tcl test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- dev-libs/icu
- sys-libs/zlib
- 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 )
- )
- tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- perl? (
- >=dev-lang/swig-2.0.12
- )
- python? (
- >=dev-lang/swig-2.0.12
- )
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.1-systemwideconfig.patch
- "${FILESDIR}"/${PN}-1.6.1-create-pidfile-per-default.patch
- "${FILESDIR}"/${PN}-1.6.1-libressl.patch
-)
-
-ZNC_DATADIR="${ZNC_DATADIR:-"/var/lib/znc"}"
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
- if use daemon; then
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /dev/null ${PN}
- fi
-}
-
-src_unpack() {
- default
-
- if use test; then
- cd "${S}"/test || die "Failed to chdir into '${S}/test'"
- unpack ${GTEST_URL##*/}
- mv gtest-${GTEST_VER} gtest \
- || die "Failed to rename '${S}/test/gtest-${GTEST_VER}' dir"
- fi
-}
-
-src_prepare() {
- epatch ${PATCHES[@]}
-}
-
-src_configure() {
- econf \
- --with-systemdsystemunitdir=$(systemd_get_unitdir) \
- $(use_enable debug) \
- $(use_enable ipv6) \
- $(use_enable perl) \
- $(use python && echo "--enable-python=python3") \
- $(use_enable sasl cyrus) \
- $(use_enable ssl openssl) \
- $(use_enable tcl tcl) \
- $(use_with test gtest "${S}/test/gtest")
-}
-
-src_install() {
- emake install DESTDIR="${D%/}"
- dodoc NOTICE README.md
- if use daemon; then
- newinitd "${FILESDIR}"/znc.initd-r1 znc
- newconfd "${FILESDIR}"/znc.confd-r1 znc
- fi
-}
-
-pkg_postinst() {
- if use !daemon; then
- elog
- elog "Run 'znc --makeconf' as the user you want to run ZNC as"
- elog "to make a configuration file"
- elog
- else
- elog
- elog "An init-script was installed in /etc/init.d"
- elog "A config file was installed in /etc/conf.d"
- if [[ ! -d "${EROOT}${ZNC_DATADIR}" ]]; then
- elog
- elog "Run 'emerge --config znc' under portage"
- elog "or 'cave config znc' under paludis to configure ZNC"
- elog "as a system-wide daemon."
- elog
- elog "To generate a new SSL certificate, run:"
- elog " znc --system-wide-config-as znc --makepem -d ${ZNC_DATADIR}"
- elog "as root"
- elog
- elog "If migrating from a user-based install"
- elog "you can use your existing config files:"
- elog " mkdir ${ZNC_DATADIR}"
- elog " mv /home/\$USER/.znc/* ${ZNC_DATADIR}"
- elog " rm -rf /home/\$USER/.znc"
- elog " chown -R znc:znc ${ZNC_DATADIR}"
- elog
- elog "If you already have znc set up and want take advantage of the"
- elog "init script but skip of all the above, you can also edit"
- elog " /etc/conf.d/znc"
- elog "and adjust the variables to your current znc user and config"
- elog "location."
- elog
- elog "Please make sure that your existing configuration contains"
- elog " PidFile = /run/znc/znc.pid"
- elog "or that PidFile value matches the one in /etc/conf.d/znc"
- if [[ -d "${EROOT}"/etc/znc ]]; then
- elog
- ewarn "/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 " ${ZNC_DATADIR}"
- ewarn "please move /etc/znc to ${ZNC_DATADIR}"
- ewarn "or adjust /etc/conf.d/znc"
- fi
- else
- elog "Existing config detected in ${ZNC_DATADIR}"
- if ! systemd_is_booted; then
- elog
- elog "Please make sure that your existing configuration contains"
- elog " PidFile = /run/znc/znc.pid"
- elog "or that PidFile value matches the one in /etc/conf.d/znc"
- else
- elog "You're good to go :)"
- fi
- fi
- elog
- fi
-}
-
-pkg_config() {
- if use daemon && ! [[ -d "${EROOT}${ZNC_DATADIR}" ]]; then
- einfo "Press ENTER to interactively create a new configuration file for znc."
- einfo "To abort, press Control-C"
- read
- mkdir -p "${EROOT}${ZNC_DATADIR}" || die
- chown -R ${PN}:${PN} "${EROOT}${ZNC_DATADIR}" ||
- die "Setting permissions failed"
- "${EROOT}"/usr/bin/znc --system-wide-config-as znc -c -r -d "${EROOT}${ZNC_DATADIR}" ||
- die "Config failed"
- echo
- einfo "To start znc, run '/etc/init.d/znc start'"
- einfo "or add znc to a runlevel:"
- einfo " rc-update add znc default"
- else
- if use daemon; then
- ewarn "${ZNC_DATADIR} 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
- ewarn "To configure znc as a system-wide daemon you have to"
- ewarn "enable the 'daemon' use flag."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-11-11 11:19 Agostino Sarubbo
0 siblings, 0 replies; 113+ messages in thread
From: Agostino Sarubbo @ 2016-11-11 11:19 UTC (permalink / raw
To: gentoo-commits
commit: 30cdbcf1976f7dea8b649d362bf6697255baa517
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 11:19:34 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 11:19:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30cdbcf1
net-irc/znc: x86 stable wrt bug #592518
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-irc/znc/znc-1.6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.6.3.ebuild b/net-irc/znc/znc-1.6.3.ebuild
index e52e1d5..7f31546 100644
--- a/net-irc/znc/znc-1.6.3.ebuild
+++ b/net-irc/znc/znc-1.6.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="An advanced IRC Bouncer"
SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz
test? ( ${GTEST_URL} )"
-KEYWORDS="amd64 arm ~x86"
+KEYWORDS="amd64 arm x86"
HOMEPAGE="http://znc.in"
LICENSE="Apache-2.0"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-11-11 11:19 Agostino Sarubbo
0 siblings, 0 replies; 113+ messages in thread
From: Agostino Sarubbo @ 2016-11-11 11:19 UTC (permalink / raw
To: gentoo-commits
commit: 2c190d18b3d31f8b16a2d1228c7a8249933b4f3e
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 11:19:08 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 11:19:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c190d18
net-irc/znc: amd64 stable wrt bug #592518
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-irc/znc/znc-1.6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.6.3.ebuild b/net-irc/znc/znc-1.6.3.ebuild
index e0e427e..e52e1d5 100644
--- a/net-irc/znc/znc-1.6.3.ebuild
+++ b/net-irc/znc/znc-1.6.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="An advanced IRC Bouncer"
SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz
test? ( ${GTEST_URL} )"
-KEYWORDS="~amd64 arm ~x86"
+KEYWORDS="amd64 arm ~x86"
HOMEPAGE="http://znc.in"
LICENSE="Apache-2.0"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-11-10 17:44 Markus Meier
0 siblings, 0 replies; 113+ messages in thread
From: Markus Meier @ 2016-11-10 17:44 UTC (permalink / raw
To: gentoo-commits
commit: edb8d895108dbe9f26e7ab388515c1927f88fbf7
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 17:44:33 2016 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 17:44:33 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edb8d895
net-irc/znc: arm stable, bug #592518
Package-Manager: portage-2.3.2
RepoMan-Options: --include-arches="arm"
net-irc/znc/znc-1.6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.6.3.ebuild b/net-irc/znc/znc-1.6.3.ebuild
index 2169aac..e0e427e 100644
--- a/net-irc/znc/znc-1.6.3.ebuild
+++ b/net-irc/znc/znc-1.6.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="An advanced IRC Bouncer"
SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz
test? ( ${GTEST_URL} )"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 arm ~x86"
HOMEPAGE="http://znc.in"
LICENSE="Apache-2.0"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-09-03 17:17 Mike Gilbert
0 siblings, 0 replies; 113+ messages in thread
From: Mike Gilbert @ 2016-09-03 17:17 UTC (permalink / raw
To: gentoo-commits
commit: 38dce45292b00cbbb4101ada64bb5b1c1418c104
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 3 17:16:52 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Sep 3 17:16:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38dce452
net-irc/znc: remove old
Package-Manager: portage-2.3.0_p24
net-irc/znc/Manifest | 1 -
net-irc/znc/znc-1.2-r1.ebuild | 167 ------------------------------------------
net-irc/znc/znc-1.4.ebuild | 167 ------------------------------------------
3 files changed, 335 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index dc1f820..d4ac35e 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,5 +1,4 @@
DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 WHIRLPOOL 0c31a385159551859c1afe76480b3fb1b560d666db9a0afc5cbda92bcd53bf129f85a8f902c6ded0779c2b4c49aacec59ba5a4d5ce316a07bf08174f4fc64049
-DIST znc-1.2.tar.gz 1235150 SHA256 d9a2cd2a484ff23e6fc9cbde8dd8a43efbcd8d288afca7b1268914ca0d18701d SHA512 dff24e56127e5599d64b4c62de967d5d48d8ebf23ca8597d33bf0b3622640512db7a462bfa7c2031cd8307f402bab8efa345f6d1fc813e78eb0dcae581de3cf7 WHIRLPOOL b0810eb66e63be762f74f04eb2289e3634b18d6ecbd36d55f6a6772697e0397637d59b9ea01eaf62ef1cbe5f6e65b06432a254f4ada35194aa06b65c4a2f7994
DIST znc-1.4.tar.gz 1239648 SHA256 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52 SHA512 0c33b05e8232084999812cbaa467dc7d37b80cafc1001b82e89c702b4303d8db9a27b948fe653e7090404eb1c66f5492f02f3524bc39efabade4be8bdb476671 WHIRLPOOL 420e665fa193b3f0284a070e021c4c467e3d40a0812eedeef9b2f65a6626a050b7af8bf15a754ac571d12261705832cfa18a0f7a7817cce96d220028a86230cf
DIST znc-1.6.1.tar.gz 1463397 SHA256 ba49397364f48d6d32ae5242bc1166f21d972f85dd390d6bbe68a63ecbb6c140 SHA512 92c0acca6b585df394cf8d6d295948fc1342ff7b15d081017d2e0ba521129f914fa2b019a82d801f826f1009456294e4f578e978f34677bbfe436e87e2734aba WHIRLPOOL ff4a22742d5e1e8da66325fdc8a2fd88a467674a5f13f6d353b1c3588affd86f2c33c24d48f1b61dfba14311d6f1c13b2939851316cb302ab031073baa05ec17
DIST znc-1.6.3.tar.gz 1464200 SHA256 631c46de76fe601a41ef7676bc974958e9a302b72b25fc92b4a603a25d89b827 SHA512 777279b6c973310b4e78a0472bd1e355c2adf3e4fbe9ebedde3dd4706e5c0b208d4330eb2318a8d9e0d7d7146bee0a4a428cbe5a3f230c8f6aa692a477e86e2b WHIRLPOOL 2a41e0ac90038a8cc8f289d4ffc0494d29eda75450f650b8870c076fb809eb9c5829720bb39eb43d38ee4ac7f9bea6000ad90fcdd8c0eea461bf04f88cc17b52
diff --git a/net-irc/znc/znc-1.2-r1.ebuild b/net-irc/znc/znc-1.2-r1.ebuild
deleted file mode 100644
index 8322a7f..00000000
--- a/net-irc/znc/znc-1.2-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_3 )
-inherit base python-single-r1 user
-
-MY_PV=${PV/_/-}
-DESCRIPTION="An advanced IRC Bouncer"
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-2
- EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/znc/znc.git"}
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz"
- KEYWORDS="amd64 ~arm x86"
-fi
-
-HOMEPAGE="http://znc.in"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="daemon debug ipv6 perl python ssl sasl tcl"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- perl? ( >=dev-lang/perl-5.10 )
- python? ( ${PYTHON_DEPS} )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- ssl? ( >=dev-libs/openssl-0.9.7d:0 )
- tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="
- virtual/pkgconfig
- perl? ( dev-lang/swig )
- python? (
- >=dev-lang/swig-2.0.8
- )
- ${RDEPEND}
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0-systemwideconfig.patch"
- "${FILESDIR}/${P}-webadmin-correctly-handle-channel-names.patch"
-)
-
-CONFDIR="/var/lib/znc"
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
- if use daemon; then
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /dev/null ${PN}
- fi
-}
-
-src_prepare() {
- if [[ ${PV} == *9999* ]]; then
- ./autogen.sh
- fi
-
- base_src_prepare
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable ipv6) \
- $(use_enable perl) \
- $(use python && echo "--enable-python=python3") \
- $(use_enable sasl cyrus) \
- $(use_enable ssl openssl) \
- $(use_enable tcl tcl)
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc NOTICE README.md
- if use daemon; then
- newinitd "${FILESDIR}"/znc.initd znc
- newconfd "${FILESDIR}"/znc.confd znc
- fi
-}
-
-pkg_postinst() {
- if use !daemon; then
- elog
- elog "Run 'znc --makeconf' as the user you want to run ZNC as"
- elog "to make a configuration file"
- elog "If you are using SSL you should also run 'znc --makepem'"
- elog
- else
- elog
- elog "An init-script was installed in /etc/init.d"
- elog "A config file was installed in /etc/conf.d"
- if [[ ! -d "${EROOT}${CONFDIR}" ]]; then
- elog
- elog "Run 'emerge --config znc' to configure ZNC"
- elog "as a system-wide daemon."
- elog
- elog "If you are using SSL you should also run:"
- elog " znc --system-wide-config-as znc --makepem -d ${CONFDIR}"
- elog "as root"
- elog
- elog "If migrating from a user-based install"
- elog "you can use your existing config files:"
- elog " mkdir ${CONFDIR}"
- elog " mv /home/\$USER/.znc/* ${CONFDIR}"
- elog " rm -rf /home/\$USER/.znc"
- elog " chown -R znc:znc ${CONFDIR}"
- elog
- elog "If you already have znc set up and want take advantage of the"
- elog "init script but skip of all the above, you can also edit"
- elog " /etc/conf.d/znc"
- elog "and adjust the variables to your current znc user and config"
- elog "location."
- if [[ -d "${EROOT}"/etc/znc ]]; then
- elog
- ewarn "/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 " /var/lib/znc"
- ewarn "please move /etc/znc to /var/lib/znc"
- ewarn "or adjust /etc/conf.d/znc"
- fi
- else
- elog "Existing config detected in ${CONFDIR}"
- elog "You're good to go :)"
- fi
- elog
- fi
-}
-
-pkg_config() {
- if use daemon && ! [[ -d "${EROOT}${CONFDIR}" ]]; then
- einfo "Press ENTER to interactively create a new configuration file for znc."
- einfo "To abort, press Control-C"
- read
- mkdir -p "${EROOT}${CONFDIR}" || die
- chown -R ${PN}:${PN} "${EROOT}${CONFDIR}" ||
- die "Setting permissions failed"
- "${EROOT}"/usr/bin/znc --system-wide-config-as znc -c -r -d "${EROOT}${CONFDIR}" ||
- die "Config failed"
- echo
- einfo "To start znc, run '/etc/init.d/znc start'"
- einfo "or add znc to a runlevel:"
- einfo " rc-update add znc default"
- else
- if use daemon; then
- ewarn "${CONFDIR} 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
- ewarn "To configure znc as a system-wide daemon you have to"
- ewarn "enable the 'daemon' use flag."
- fi
- fi
-}
diff --git a/net-irc/znc/znc-1.4.ebuild b/net-irc/znc/znc-1.4.ebuild
deleted file mode 100644
index 99ad525..00000000
--- a/net-irc/znc/znc-1.4.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_3 )
-inherit base python-single-r1 user
-
-MY_PV=${PV/_/-}
-DESCRIPTION="An advanced IRC Bouncer"
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-2
- EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/znc/znc.git"}
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-HOMEPAGE="http://znc.in"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="daemon debug ipv6 perl python ssl sasl tcl"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- perl? ( >=dev-lang/perl-5.10 )
- python? ( ${PYTHON_DEPS} )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- ssl? ( >=dev-libs/openssl-0.9.7d:0 )
- tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="
- virtual/pkgconfig
- perl? (
- >=dev-lang/swig-2.0.12
- )
- python? (
- >=dev-lang/swig-2.0.12
- )
- ${RDEPEND}
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0-systemwideconfig.patch"
-)
-
-CONFDIR="/var/lib/znc"
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
- if use daemon; then
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /dev/null ${PN}
- fi
-}
-
-src_prepare() {
- if [[ ${PV} == *9999* ]]; then
- ./autogen.sh
- fi
-
- base_src_prepare
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable ipv6) \
- $(use_enable perl) \
- $(use python && echo "--enable-python=python3") \
- $(use_enable sasl cyrus) \
- $(use_enable ssl openssl) \
- $(use_enable tcl tcl)
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc NOTICE README.md
- if use daemon; then
- newinitd "${FILESDIR}"/znc.initd znc
- newconfd "${FILESDIR}"/znc.confd znc
- fi
-}
-
-pkg_postinst() {
- if use !daemon; then
- elog
- elog "Run 'znc --makeconf' as the user you want to run ZNC as"
- elog "to make a configuration file"
- elog
- else
- elog
- elog "An init-script was installed in /etc/init.d"
- elog "A config file was installed in /etc/conf.d"
- if [[ ! -d "${EROOT}${CONFDIR}" ]]; then
- elog
- elog "Run 'emerge --config znc' to configure ZNC"
- elog "as a system-wide daemon."
- elog
- elog "To generate a new SSL certificate, run:"
- elog " znc --system-wide-config-as znc --makepem -d ${CONFDIR}"
- elog "as root"
- elog
- elog "If migrating from a user-based install"
- elog "you can use your existing config files:"
- elog " mkdir ${CONFDIR}"
- elog " mv /home/\$USER/.znc/* ${CONFDIR}"
- elog " rm -rf /home/\$USER/.znc"
- elog " chown -R znc:znc ${CONFDIR}"
- elog
- elog "If you already have znc set up and want take advantage of the"
- elog "init script but skip of all the above, you can also edit"
- elog " /etc/conf.d/znc"
- elog "and adjust the variables to your current znc user and config"
- elog "location."
- if [[ -d "${EROOT}"/etc/znc ]]; then
- elog
- ewarn "/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 " /var/lib/znc"
- ewarn "please move /etc/znc to /var/lib/znc"
- ewarn "or adjust /etc/conf.d/znc"
- fi
- else
- elog "Existing config detected in ${CONFDIR}"
- elog "You're good to go :)"
- fi
- elog
- fi
-}
-
-pkg_config() {
- if use daemon && ! [[ -d "${EROOT}${CONFDIR}" ]]; then
- einfo "Press ENTER to interactively create a new configuration file for znc."
- einfo "To abort, press Control-C"
- read
- mkdir -p "${EROOT}${CONFDIR}" || die
- chown -R ${PN}:${PN} "${EROOT}${CONFDIR}" ||
- die "Setting permissions failed"
- "${EROOT}"/usr/bin/znc --system-wide-config-as znc -c -r -d "${EROOT}${CONFDIR}" ||
- die "Config failed"
- echo
- einfo "To start znc, run '/etc/init.d/znc start'"
- einfo "or add znc to a runlevel:"
- einfo " rc-update add znc default"
- else
- if use daemon; then
- ewarn "${CONFDIR} 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
- ewarn "To configure znc as a system-wide daemon you have to"
- ewarn "enable the 'daemon' use flag."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-08-07 6:52 Pacho Ramos
0 siblings, 0 replies; 113+ messages in thread
From: Pacho Ramos @ 2016-08-07 6:52 UTC (permalink / raw
To: gentoo-commits
commit: d1cfdbecbe7a796c97afa8472ed564b253514397
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 7 06:44:29 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Aug 7 06:44:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1cfdbec
net-irc/znc: Cleanup per bug #269977
Package-Manager: portage-2.3.0
net-irc/znc/metadata.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/net-irc/znc/metadata.xml b/net-irc/znc/metadata.xml
index a2861e7..b8a8704 100644
--- a/net-irc/znc/metadata.xml
+++ b/net-irc/znc/metadata.xml
@@ -2,10 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>wired@gentoo.org</email>
- <name>Alex Alexander</name>
- </maintainer>
- <maintainer type="person">
<email>sautier.louis@gmail.com</email>
<name>Louis Sautier</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
^ permalink raw reply related [flat|nested] 113+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-03-25 20:46 Andreas Hüttel
0 siblings, 0 replies; 113+ messages in thread
From: Andreas Hüttel @ 2016-03-25 20:46 UTC (permalink / raw
To: gentoo-commits
commit: 1e1db0448b1dbb39c6353a6d399f374d9358f805
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 20:26:07 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 20:26:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1db044
net-irc/znc: Add missing slot op to ICU dependency
Package-Manager: portage-2.2.28
net-irc/znc/znc-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index cfdcfd9..34e7481 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -23,7 +23,7 @@ IUSE="daemon debug ipv6 libressl perl python ssl sasl tcl"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
- dev-libs/icu
+ dev-libs/icu:=
sys-libs/zlib
perl? ( >=dev-lang/perl-5.10 )
python? ( ${PYTHON_DEPS} )
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-03-21 14:17 Ian Delaney
0 siblings, 0 replies; 113+ messages in thread
From: Ian Delaney @ 2016-03-21 14:17 UTC (permalink / raw
To: gentoo-commits
commit: feeff63379a395f1e708ced64fc12541e1d4d6b6
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Mon Mar 21 13:28:20 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 13:54:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feeff633
net-irc/znc: update LICENSE for older ebuilds
Gentoo-Bug: https://bugs.gentoo.org/571366
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1104
net-irc/znc/znc-1.2-r1.ebuild | 4 ++--
net-irc/znc/znc-1.4-r1.ebuild | 4 ++--
net-irc/znc/znc-1.4.ebuild | 4 ++--
net-irc/znc/znc-1.6.1-r1.ebuild | 4 ++--
net-irc/znc/znc-9999.ebuild | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/net-irc/znc/znc-1.2-r1.ebuild b/net-irc/znc/znc-1.2-r1.ebuild
index b8acfc2..8322a7f 100644
--- a/net-irc/znc/znc-1.2-r1.ebuild
+++ b/net-irc/znc/znc-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -21,7 +21,7 @@ else
fi
HOMEPAGE="http://znc.in"
-LICENSE="GPL-2"
+LICENSE="Apache-2.0"
SLOT="0"
IUSE="daemon debug ipv6 perl python ssl sasl tcl"
diff --git a/net-irc/znc/znc-1.4-r1.ebuild b/net-irc/znc/znc-1.4-r1.ebuild
index 4551bd3..9f6deef 100644
--- a/net-irc/znc/znc-1.4-r1.ebuild
+++ b/net-irc/znc/znc-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -21,7 +21,7 @@ else
fi
HOMEPAGE="http://znc.in"
-LICENSE="GPL-2"
+LICENSE="Apache-2.0"
SLOT="0"
IUSE="daemon debug ipv6 perl python ssl sasl tcl"
diff --git a/net-irc/znc/znc-1.4.ebuild b/net-irc/znc/znc-1.4.ebuild
index bcc2710..99ad525 100644
--- a/net-irc/znc/znc-1.4.ebuild
+++ b/net-irc/znc/znc-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -21,7 +21,7 @@ else
fi
HOMEPAGE="http://znc.in"
-LICENSE="GPL-2"
+LICENSE="Apache-2.0"
SLOT="0"
IUSE="daemon debug ipv6 perl python ssl sasl tcl"
diff --git a/net-irc/znc/znc-1.6.1-r1.ebuild b/net-irc/znc/znc-1.6.1-r1.ebuild
index a6f8c03..6f7e05b 100644
--- a/net-irc/znc/znc-1.6.1-r1.ebuild
+++ b/net-irc/znc/znc-1.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,7 @@ SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz
KEYWORDS="~amd64 ~arm ~x86"
HOMEPAGE="http://znc.in"
-LICENSE="GPL-2"
+LICENSE="Apache-2.0"
SLOT="0"
IUSE="daemon debug ipv6 libressl perl python ssl sasl tcl test"
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index 561efde..cfdcfd9 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ SRC_URI=""
KEYWORDS=""
HOMEPAGE="http://znc.in"
-LICENSE="GPL-2"
+LICENSE="Apache-2.0"
SLOT="0"
IUSE="daemon debug ipv6 libressl perl python ssl sasl tcl"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-03-21 13:11 Ian Delaney
0 siblings, 0 replies; 113+ messages in thread
From: Ian Delaney @ 2016-03-21 13:11 UTC (permalink / raw
To: gentoo-commits
commit: b837168389dc2e3be892704b59c2b2cf8e3ade0d
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sat Mar 19 17:19:15 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 13:11:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8371683
net-irc/znc: remove old
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1086
net-irc/znc/znc-1.6.1.ebuild | 186 -------------------------------------------
1 file changed, 186 deletions(-)
diff --git a/net-irc/znc/znc-1.6.1.ebuild b/net-irc/znc/znc-1.6.1.ebuild
deleted file mode 100644
index dc7a99d..0000000
--- a/net-irc/znc/znc-1.6.1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{3_3,3_4} )
-inherit eutils python-single-r1 systemd user
-
-MY_PV=${PV/_/-}
-GTEST_VER="1.7.0"
-GTEST_URL="https://googletest.googlecode.com/files/gtest-${GTEST_VER}.zip"
-DESCRIPTION="An advanced IRC Bouncer"
-
-SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz
- test? ( ${GTEST_URL} )"
-KEYWORDS="~amd64 ~arm ~x86"
-
-HOMEPAGE="http://znc.in"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="daemon debug ipv6 perl python ssl sasl tcl test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- dev-libs/icu
- sys-libs/zlib
- perl? ( >=dev-lang/perl-5.10 )
- python? ( ${PYTHON_DEPS} )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- ssl? ( >=dev-libs/openssl-0.9.7d:0 )
- tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- perl? (
- >=dev-lang/swig-2.0.12
- )
- python? (
- >=dev-lang/swig-2.0.12
- )
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.1-systemwideconfig.patch
- "${FILESDIR}"/${PN}-1.6.1-create-pidfile-per-default.patch
-)
-
-ZNC_DATADIR="${ZNC_DATADIR:-"/var/lib/znc"}"
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
- if use daemon; then
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /dev/null ${PN}
- fi
-}
-
-src_unpack() {
- default
-
- if use test; then
- cd "${S}"/test || die "Failed to chdir into '${S}/test'"
- unpack ${GTEST_URL##*/}
- mv gtest-${GTEST_VER} gtest \
- || die "Failed to rename '${S}/test/gtest-${GTEST_VER}' dir"
- fi
-}
-
-src_prepare() {
- epatch ${PATCHES[@]}
-}
-
-src_configure() {
- econf \
- --with-systemdsystemunitdir=$(systemd_get_unitdir) \
- $(use_enable debug) \
- $(use_enable ipv6) \
- $(use_enable perl) \
- $(use python && echo "--enable-python=python3") \
- $(use_enable sasl cyrus) \
- $(use_enable ssl openssl) \
- $(use_enable tcl tcl) \
- $(use_with test gtest "${S}/test/gtest")
-}
-
-src_install() {
- emake install DESTDIR="${D%/}"
- dodoc NOTICE README.md
- if use daemon; then
- newinitd "${FILESDIR}"/znc.initd-r1 znc
- newconfd "${FILESDIR}"/znc.confd-r1 znc
- fi
-}
-
-pkg_postinst() {
- if use !daemon; then
- elog
- elog "Run 'znc --makeconf' as the user you want to run ZNC as"
- elog "to make a configuration file"
- elog
- else
- elog
- elog "An init-script was installed in /etc/init.d"
- elog "A config file was installed in /etc/conf.d"
- if [[ ! -d "${EROOT}${ZNC_DATADIR}" ]]; then
- elog
- elog "Run 'emerge --config znc' under portage"
- elog "or 'cave config znc' under paludis to configure ZNC"
- elog "as a system-wide daemon."
- elog
- elog "To generate a new SSL certificate, run:"
- elog " znc --system-wide-config-as znc --makepem -d ${ZNC_DATADIR}"
- elog "as root"
- elog
- elog "If migrating from a user-based install"
- elog "you can use your existing config files:"
- elog " mkdir ${ZNC_DATADIR}"
- elog " mv /home/\$USER/.znc/* ${ZNC_DATADIR}"
- elog " rm -rf /home/\$USER/.znc"
- elog " chown -R znc:znc ${ZNC_DATADIR}"
- elog
- elog "If you already have znc set up and want take advantage of the"
- elog "init script but skip of all the above, you can also edit"
- elog " /etc/conf.d/znc"
- elog "and adjust the variables to your current znc user and config"
- elog "location."
- elog
- elog "Please make sure that your existing configuration contains"
- elog " PidFile = /run/znc/znc.pid"
- elog "or that PidFile value matches the one in /etc/conf.d/znc"
- if [[ -d "${EROOT}"/etc/znc ]]; then
- elog
- ewarn "/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 " ${ZNC_DATADIR}"
- ewarn "please move /etc/znc to ${ZNC_DATADIR}"
- ewarn "or adjust /etc/conf.d/znc"
- fi
- else
- elog "Existing config detected in ${ZNC_DATADIR}"
- if ! systemd_is_booted; then
- elog
- elog "Please make sure that your existing configuration contains"
- elog " PidFile = /run/znc/znc.pid"
- elog "or that PidFile value matches the one in /etc/conf.d/znc"
- else
- elog "You're good to go :)"
- fi
- fi
- elog
- fi
-}
-
-pkg_config() {
- if use daemon && ! [[ -d "${EROOT}${ZNC_DATADIR}" ]]; then
- einfo "Press ENTER to interactively create a new configuration file for znc."
- einfo "To abort, press Control-C"
- read
- mkdir -p "${EROOT}${ZNC_DATADIR}" || die
- chown -R ${PN}:${PN} "${EROOT}${ZNC_DATADIR}" ||
- die "Setting permissions failed"
- "${EROOT}"/usr/bin/znc --system-wide-config-as znc -c -r -d "${EROOT}${ZNC_DATADIR}" ||
- die "Config failed"
- echo
- einfo "To start znc, run '/etc/init.d/znc start'"
- einfo "or add znc to a runlevel:"
- einfo " rc-update add znc default"
- else
- if use daemon; then
- ewarn "${ZNC_DATADIR} 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
- ewarn "To configure znc as a system-wide daemon you have to"
- ewarn "enable the 'daemon' use flag."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2016-03-21 13:11 Ian Delaney
0 siblings, 0 replies; 113+ messages in thread
From: Ian Delaney @ 2016-03-21 13:11 UTC (permalink / raw
To: gentoo-commits
commit: 4c0486e78e12d3f71d6845aef2094a0ef4a65997
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sat Mar 19 22:47:51 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 13:11:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0486e7
net-irc/znc: update metadata, add myself as proxied maintainer
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1086
net-irc/znc/metadata.xml | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
diff --git a/net-irc/znc/metadata.xml b/net-irc/znc/metadata.xml
index 26e7668..a2861e7 100644
--- a/net-irc/znc/metadata.xml
+++ b/net-irc/znc/metadata.xml
@@ -1,11 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>wired@gentoo.org</email>
- <name>Alex Alexander</name>
-</maintainer>
-<use>
- <flag name="daemon">Allow znc to run as a system-wide service. Installs an init script and creates a znc user:group.</flag>
-</use>
+ <maintainer type="person">
+ <email>wired@gentoo.org</email>
+ <name>Alex Alexander</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>sautier.louis@gmail.com</email>
+ <name>Louis Sautier</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="daemon">Allow znc to run as a system-wide service. Installs an init script and creates a znc user:group.</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">znc/znc</remote-id>
+ <bugs-to>https://github.com/znc/znc/issues</bugs-to>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 113+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2015-09-15 15:41 Julian Ospald
0 siblings, 0 replies; 113+ messages in thread
From: Julian Ospald @ 2015-09-15 15:41 UTC (permalink / raw
To: gentoo-commits
commit: 01a2b69c07144b9ed57603edd2a72bef08bc49bf
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 14:36:00 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 15:40:16 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01a2b69c
net-irc/znc: cleanup ebuild
* drop use of deprecated base.eclass
* add missing dependencies
* remove code duplication/dead codepaths
* improve formatting
* improve pkg_postinst message
net-irc/znc/znc-1.6.1.ebuild | 40 ++++++++++++++--------------------------
1 file changed, 14 insertions(+), 26 deletions(-)
diff --git a/net-irc/znc/znc-1.6.1.ebuild b/net-irc/znc/znc-1.6.1.ebuild
index 6098cc0..dc7a99d 100644
--- a/net-irc/znc/znc-1.6.1.ebuild
+++ b/net-irc/znc/znc-1.6.1.ebuild
@@ -5,23 +5,16 @@
EAPI=5
PYTHON_COMPAT=( python{3_3,3_4} )
-inherit base python-single-r1 systemd user
+inherit eutils python-single-r1 systemd user
MY_PV=${PV/_/-}
GTEST_VER="1.7.0"
GTEST_URL="https://googletest.googlecode.com/files/gtest-${GTEST_VER}.zip"
DESCRIPTION="An advanced IRC Bouncer"
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://github.com/znc/znc.git"
- SRC_URI="test? ( ${GTEST_URL} )"
- KEYWORDS=""
-else
- SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz
- test? ( ${GTEST_URL} )"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
+SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz
+ test? ( ${GTEST_URL} )"
+KEYWORDS="~amd64 ~arm ~x86"
HOMEPAGE="http://znc.in"
LICENSE="GPL-2"
@@ -31,13 +24,15 @@ IUSE="daemon debug ipv6 perl python ssl sasl tcl test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
+ dev-libs/icu
+ sys-libs/zlib
perl? ( >=dev-lang/perl-5.10 )
python? ( ${PYTHON_DEPS} )
sasl? ( >=dev-libs/cyrus-sasl-2 )
ssl? ( >=dev-libs/openssl-0.9.7d:0 )
tcl? ( dev-lang/tcl:0= )
"
-DEPEND="
+DEPEND="${RDEPEND}
virtual/pkgconfig
perl? (
>=dev-lang/swig-2.0.12
@@ -45,7 +40,6 @@ DEPEND="
python? (
>=dev-lang/swig-2.0.12
)
- ${RDEPEND}
"
S=${WORKDIR}/${PN}-${MY_PV}
@@ -68,25 +62,18 @@ pkg_setup() {
}
src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
- else
- default
- fi
+ default
if use test; then
cd "${S}"/test || die "Failed to chdir into '${S}/test'"
- unpack $(basename ${GTEST_URL})
- mv gtest-${GTEST_VER} gtest || die "Failed to rename '${S}/test/gtest-${GTEST_VER}' dir"
+ unpack ${GTEST_URL##*/}
+ mv gtest-${GTEST_VER} gtest \
+ || die "Failed to rename '${S}/test/gtest-${GTEST_VER}' dir"
fi
}
src_prepare() {
- if [[ ${PV} == *9999* ]]; then
- ./autogen.sh
- fi
-
- base_src_prepare
+ epatch ${PATCHES[@]}
}
src_configure() {
@@ -123,7 +110,8 @@ pkg_postinst() {
elog "A config file was installed in /etc/conf.d"
if [[ ! -d "${EROOT}${ZNC_DATADIR}" ]]; then
elog
- elog "Run 'emerge --config znc' to configure ZNC"
+ elog "Run 'emerge --config znc' under portage"
+ elog "or 'cave config znc' under paludis to configure ZNC"
elog "as a system-wide daemon."
elog
elog "To generate a new SSL certificate, run:"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2015-09-15 15:41 Julian Ospald
0 siblings, 0 replies; 113+ messages in thread
From: Julian Ospald @ 2015-09-15 15:41 UTC (permalink / raw
To: gentoo-commits
commit: e1db5127c88145aacde996fde3db6a2443d23284
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 15:06:39 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 15:40:18 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1db5127
net-irc/znc: update/sync live-ebuild
* drop use of deprecated base.eclass
* add missing dependencies
* remove code duplication/dead codepaths
* improve formatting
* improve pkg_postinst message
* use git-r3 instead of deprecated git-2
* use new init/conf scripts
* try to use proper eautoreconf instead of './autogen.sh'
* rm patch which does not apply
net-irc/znc/znc-9999.ebuild | 40 +++++++++++++++++-----------------------
1 file changed, 17 insertions(+), 23 deletions(-)
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index 57071fa..cff81dc 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -5,20 +5,15 @@
EAPI=5
PYTHON_COMPAT=( python{3_3,3_4} )
-inherit base python-single-r1 user
+inherit autotools eutils python-single-r1 user
MY_PV=${PV/_/-}
DESCRIPTION="An advanced IRC Bouncer"
-if [[ ${PV} == *9999* ]]; then
- inherit git-2
- EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/znc/znc.git"}
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
+inherit git-r3
+EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/znc/znc.git"}
+SRC_URI=""
+KEYWORDS=""
HOMEPAGE="http://znc.in"
LICENSE="GPL-2"
@@ -28,13 +23,15 @@ IUSE="daemon debug ipv6 perl python ssl sasl tcl"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
+ dev-libs/icu
+ sys-libs/zlib
perl? ( >=dev-lang/perl-5.10 )
python? ( ${PYTHON_DEPS} )
sasl? ( >=dev-libs/cyrus-sasl-2 )
ssl? ( >=dev-libs/openssl-0.9.7d:0 )
tcl? ( dev-lang/tcl:0= )
"
-DEPEND="
+DEPEND="${RDEPEND}
virtual/pkgconfig
perl? (
>=dev-lang/swig-2.0.12
@@ -42,15 +39,10 @@ DEPEND="
python? (
>=dev-lang/swig-2.0.12
)
- ${RDEPEND}
"
S=${WORKDIR}/${PN}-${MY_PV}
-PATCHES=(
- "${FILESDIR}/${PN}-1.0-systemwideconfig.patch"
-)
-
CONFDIR="/var/lib/znc"
pkg_setup() {
@@ -64,11 +56,12 @@ pkg_setup() {
}
src_prepare() {
- if [[ ${PV} == *9999* ]]; then
- ./autogen.sh
- fi
+ AT_M4DIR="${S}/m4" \
+ eautoreconf
- base_src_prepare
+ # build system quirk, it does not define AM_INIT_AUTOMAKE, nor
+ # does it have Makefile.am in the root dir, but we need '--add-missing'
+ automake --add-missing
}
src_configure() {
@@ -86,8 +79,8 @@ src_install() {
emake install DESTDIR="${D}"
dodoc NOTICE README.md
if use daemon; then
- newinitd "${FILESDIR}"/znc.initd znc
- newconfd "${FILESDIR}"/znc.confd znc
+ newinitd "${FILESDIR}"/znc.initd-r1 znc
+ newconfd "${FILESDIR}"/znc.confd-r1 znc
fi
}
@@ -103,7 +96,8 @@ pkg_postinst() {
elog "A config file was installed in /etc/conf.d"
if [[ ! -d "${EROOT}${CONFDIR}" ]]; then
elog
- elog "Run 'emerge --config znc' to configure ZNC"
+ elog "Run 'emerge --config znc' under portage"
+ elog "or 'cave config znc' under paludis to configure ZNC"
elog "as a system-wide daemon."
elog
elog "To generate a new SSL certificate, run:"
^ permalink raw reply related [flat|nested] 113+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
@ 2015-08-09 18:03 Mikle Kolyada
0 siblings, 0 replies; 113+ messages in thread
From: Mikle Kolyada @ 2015-08-09 18:03 UTC (permalink / raw
To: gentoo-commits
commit: 11630acd6cf4096bd94b927151d9a061fdf12b35
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 9 18:00:48 2015 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 18:00:48 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11630acd
net-irc/znc: x86 stable wrt bug #522714
Package-Manager: portage-2.2.20
net-irc/znc/znc-1.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.4-r1.ebuild b/net-irc/znc/znc-1.4-r1.ebuild
index ef3446e..4551bd3 100644
--- a/net-irc/znc/znc-1.4-r1.ebuild
+++ b/net-irc/znc/znc-1.4-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
KEYWORDS=""
else
SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz"
- KEYWORDS="amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm x86"
fi
HOMEPAGE="http://znc.in"
^ permalink raw reply related [flat|nested] 113+ messages in thread
end of thread, other threads:[~2024-07-03 20:35 UTC | newest]
Thread overview: 113+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-27 14:38 [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/ Louis Sautier
-- strict thread matches above, loose matches on Subject: below --
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
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox