Gentoo Archives: gentoo-commits

From: Louis Sautier <sbraz@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
Date: Mon, 07 Sep 2020 23:44:58
Message-Id: 1599522154.0f0c29f2883c43490f245cb1bdf940b1e700d576.sbraz@gentoo
1 commit: 0f0c29f2883c43490f245cb1bdf940b1e700d576
2 Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 7 23:33:16 2020 +0000
4 Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 7 23:42:34 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f0c29f2
7
8 net-irc/znc: remove old
9
10 Package-Manager: Portage-3.0.3, Repoman-2.3.23
11 Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
12
13 net-irc/znc/Manifest | 1 -
14 net-irc/znc/znc-1.7.5.ebuild | 183 -------------------------------------------
15 2 files changed, 184 deletions(-)
16
17 diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
18 index b951a8b2b30..f9e311890fe 100644
19 --- a/net-irc/znc/Manifest
20 +++ b/net-irc/znc/Manifest
21 @@ -1,4 +1,3 @@
22 DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
23 -DIST znc-1.7.5.tar.gz 2170656 BLAKE2B af5548bff1d9c6e740e668f467f52e8540a59bec9363fb4a17c594e1a9638417f75321b074e2aad6380769a594fc134543681928a7a33d00083ba9babc441a69 SHA512 f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825
24 DIST znc-1.8.1.tar.gz 2161359 BLAKE2B 5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e SHA512 87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16
25 DIST znc-1.8.2.tar.gz 2101215 BLAKE2B 7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e SHA512 e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9
26
27 diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
28 deleted file mode 100644
29 index 6f190e2ca05..00000000000
30 --- a/net-irc/znc/znc-1.7.5.ebuild
31 +++ /dev/null
32 @@ -1,183 +0,0 @@
33 -# Copyright 1999-2020 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -PYTHON_COMPAT=( python3_{6,7,8} )
39 -
40 -inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
41 -
42 -GTEST_VER="1.8.1"
43 -GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
44 -DESCRIPTION="An advanced IRC Bouncer"
45 -
46 -if [[ ${PV} == *9999* ]]; then
47 - inherit git-r3
48 - EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
49 - SRC_URI=""
50 -else
51 - MY_PV=${PV/_/-}
52 - MY_P=${PN}-${MY_PV}
53 - SRC_URI="
54 - https://znc.in/releases/archive/${MY_P}.tar.gz
55 - test? ( ${GTEST_URL} )
56 - "
57 - KEYWORDS="amd64 arm ~arm64 x86"
58 - S=${WORKDIR}/${MY_P}
59 -fi
60 -
61 -HOMEPAGE="https://znc.in"
62 -LICENSE="Apache-2.0"
63 -SLOT="0"
64 -IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
65 -RESTRICT="!test? ( test )"
66 -
67 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
68 -
69 -RDEPEND="
70 - icu? ( dev-libs/icu:= )
71 - nls? ( dev-libs/boost:=[nls] )
72 - perl? ( >=dev-lang/perl-5.10:= )
73 - python? ( ${PYTHON_DEPS} )
74 - sasl? ( >=dev-libs/cyrus-sasl-2 )
75 - ssl? (
76 - !libressl? ( dev-libs/openssl:0= )
77 - libressl? ( dev-libs/libressl:0= )
78 - )
79 - tcl? ( dev-lang/tcl:0= )
80 - zlib? ( sys-libs/zlib:0= )
81 -"
82 -DEPEND="
83 - ${RDEPEND}
84 - virtual/pkgconfig
85 - nls? ( sys-devel/gettext )
86 - perl? ( >=dev-lang/swig-3.0.0 )
87 - python? ( >=dev-lang/swig-3.0.0 )
88 - test? ( dev-qt/qtnetwork:5 )
89 -"
90 -
91 -PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
92 -
93 -pkg_setup() {
94 - if use python; then
95 - python-single-r1_pkg_setup
96 - fi
97 -
98 - enewgroup ${PN}
99 - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
100 - # The home directory was previously set to /dev/null
101 - # This caused a bug with the systemd unit
102 - # https://bugs.gentoo.org/521916
103 - esethome ${PN} /var/lib/${PN}
104 -}
105 -
106 -src_prepare() {
107 - # Let SWIG rebuild modperl/modpython to make user patching easier.
108 - if [[ ${PV} != *9999* ]]; then
109 - rm modules/modperl/generated.tar.gz || die
110 - rm modules/modpython/generated.tar.gz || die
111 - fi
112 -
113 - sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \
114 - test/CMakeLists.txt || die
115 -
116 - cmake-utils_src_prepare
117 -}
118 -
119 -src_configure() {
120 - local mycmakeargs=(
121 - -DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used.
122 - -DSYSTEMD_DIR="$(systemd_get_systemunitdir)"
123 - -DWANT_ICU="$(usex icu)"
124 - -DWANT_IPV6="$(usex ipv6)"
125 - -DWANT_I18N="$(usex nls)"
126 - -DWANT_PERL="$(usex perl)"
127 - -DWANT_PYTHON="$(usex python)"
128 - -DWANT_CYRUS="$(usex sasl)"
129 - -DWANT_OPENSSL="$(usex ssl)"
130 - -DWANT_TCL="$(usex tcl)"
131 - -DWANT_ZLIB="$(usex zlib)"
132 - )
133 -
134 - if [[ ${PV} != *9999* ]] && use test; then
135 - export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest"
136 - export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
137 - fi
138 -
139 - cmake-utils_src_configure
140 -}
141 -
142 -src_test() {
143 - cmake-utils_src_make unittest
144 - if has network-sandbox ${FEATURES}; then
145 - DESTDIR="${T}/inttest" cmake-utils_src_make install
146 - local filter='-'
147 - if ! use perl; then
148 - filter="${filter}:ZNCTest.Modperl*"
149 - fi
150 - if ! use python; then
151 - filter="${filter}:ZNCTest.Modpython*"
152 - fi
153 - # CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod
154 - # invocations from inside the test
155 - GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \
156 - CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \
157 - CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \
158 - cmake-utils_src_make inttest
159 - else
160 - # TODO: don't require sandbox after
161 - # https://github.com/znc/znc/pull/1363 is implemented
162 - ewarn "FEATURES=-network-sandbox; skipping integration tests which"
163 - ewarn "temporary open local ports."
164 - fi
165 -}
166 -
167 -src_install() {
168 - cmake-utils_src_install
169 -
170 - dodoc NOTICE
171 - newinitd "${FILESDIR}"/znc.initd-r2 znc
172 - newconfd "${FILESDIR}"/znc.confd-r1 znc
173 -
174 - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die
175 - DISABLE_AUTOFORMATTING=1
176 - readme.gentoo_create_doc
177 -}
178 -
179 -pkg_postinst() {
180 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
181 - # This is a new installation
182 - readme.gentoo_print_elog
183 - fi
184 -
185 - if [[ -d "${EROOT}"/etc/znc ]]; then
186 - ewarn "${EROOT}/etc/znc exists on your system."
187 - ewarn "Due to the nature of the contents of that folder,"
188 - ewarn "we have changed the default configuration to use"
189 - ewarn " ${EROOT}/var/lib/znc"
190 - ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc"
191 - ewarn "or adjust your service configuration."
192 - fi
193 -}
194 -
195 -pkg_config() {
196 - if [[ -e "${EROOT}/var/lib/znc" ]]; then
197 - ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid damaging"
198 - ewarn "any existing configuration. If you are sure you want"
199 - ewarn "to generate a new configuration, remove the folder"
200 - ewarn "and try again."
201 - else
202 - einfo "Press enter to interactively create a new configuration file for znc."
203 - einfo "To abort, press Control-C"
204 - read
205 - mkdir -p "${EROOT}/var/lib/znc" || die
206 - chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" ||
207 - die "Setting permissions failed"
208 - start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \
209 - "${EROOT}"/usr/bin/znc -- --makeconf --datadir "${EROOT}/var/lib/znc" ||
210 - die "Config failed"
211 - einfo
212 - einfo "You can now start the znc service using the init system of your choice."
213 - einfo "Don't forget to enable it if you want to use znc at boot."
214 - fi
215 -}