1 |
commit: 444ca74f9ed8b53b80e335df98065aac879151ec |
2 |
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 15 22:41:33 2018 +0000 |
4 |
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 15 22:41:33 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=444ca74f |
7 |
|
8 |
net-irc/znc: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.42, Repoman-2.3.9 |
11 |
|
12 |
net-irc/znc/Manifest | 1 - |
13 |
net-irc/znc/files/znc-1.7.0-inttest-dir.patch | 55 ------- |
14 |
.../files/znc-1.7.0-inttest-fix-make-warning.patch | 26 --- |
15 |
net-irc/znc/znc-1.7.0.ebuild | 182 --------------------- |
16 |
4 files changed, 264 deletions(-) |
17 |
|
18 |
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest |
19 |
index 741c0f30e99..eedc2aef66e 100644 |
20 |
--- a/net-irc/znc/Manifest |
21 |
+++ b/net-irc/znc/Manifest |
22 |
@@ -1,5 +1,4 @@ |
23 |
DIST googletest-release-1.7.0.tar.gz 468653 BLAKE2B 8dfca8b79dcd7b64ce84bad11ee68c549f4fe3dff7638ed1d845af4a7f754ad5df782d2cbebdb9fecfda2499dae6585e07cda7a8c8c454f0b70723d5c9578aa4 SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc |
24 |
DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63 SHA512 ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600 |
25 |
DIST znc-1.6.6.tar.gz 1471612 BLAKE2B 8bd977a95417c4259e9f38759d838f55a146f376dc8bb6230ab6e1b698fb7c9e060cbc237efd4e836961314abab56cc02e7c6bc74e40bad17abaf06e47fbb516 SHA512 cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7 |
26 |
-DIST znc-1.7.0.tar.gz 1853666 BLAKE2B 3e519d4005a10a9a5329f22ab6abbd19dfa2c7cecb949c138bc72909eae8883576fc0352e3ac46b852b8c58f038150419720aa48791a1339b004206f3afc20e9 SHA512 718dec65dfa2374c568b2694e4faef1f8cf313ae96d171e2263656e077e0fae5f8037c69a23ae33f4ea314ac6e15480c7dccef73ad3ac9324eb79caca622d54b |
27 |
DIST znc-1.7.1-rc1.tar.gz 2041320 BLAKE2B 62669b598d7423cb55fad458fe6172be36904e8599dcde757936883093f24deb6a5ed6a093e3e92854810f02e96372f44139f9807e70e0cf007de90a1373c6a8 SHA512 b4e223c86c75bc97620c52333d90d6458a02777dce9c629f8a095f8134a06992a60978b2fe8bbce29ed1155932f9f37e0a324a498ee16527b0235e4306c34973 |
28 |
|
29 |
diff --git a/net-irc/znc/files/znc-1.7.0-inttest-dir.patch b/net-irc/znc/files/znc-1.7.0-inttest-dir.patch |
30 |
deleted file mode 100644 |
31 |
index 250eccc53fb..00000000000 |
32 |
--- a/net-irc/znc/files/znc-1.7.0-inttest-dir.patch |
33 |
+++ /dev/null |
34 |
@@ -1,55 +0,0 @@ |
35 |
-diff --git a/include/znc/znc.h b/include/znc/znc.h |
36 |
-index ecb2b41a..a791a648 100644 |
37 |
---- a/include/znc/znc.h |
38 |
-+++ b/include/znc/znc.h |
39 |
-@@ -251,6 +251,7 @@ class CZNC : private CCoreTranslationMixin { |
40 |
- void DisableConfigTimer(); |
41 |
- |
42 |
- static void DumpConfig(const CConfig* Config); |
43 |
-+ static CString UnusualRoot(); |
44 |
- |
45 |
- private: |
46 |
- static CString FormatBindError(); |
47 |
-diff --git a/src/Modules.cpp b/src/Modules.cpp |
48 |
-index 5aec7805..6f9c34ae 100644 |
49 |
---- a/src/Modules.cpp |
50 |
-+++ b/src/Modules.cpp |
51 |
-@@ -1899,9 +1899,10 @@ CModules::ModDirList CModules::GetModDirs() { |
52 |
- sDir = CZNC::Get().GetModPath() + "/"; |
53 |
- ret.push(std::make_pair(sDir, sDir)); |
54 |
- |
55 |
-+ CString sUnusualRoot = CZNC::UnusualRoot(); |
56 |
- // <moduledir> and <datadir> (<prefix>/lib/znc) |
57 |
-- ret.push(std::make_pair(_MODDIR_ + CString("/"), |
58 |
-- _DATADIR_ + CString("/modules/"))); |
59 |
-+ ret.push(std::make_pair(sUnusualRoot + _MODDIR_ + CString("/"), |
60 |
-+ sUnusualRoot + _DATADIR_ + CString("/modules/"))); |
61 |
- |
62 |
- return ret; |
63 |
- } |
64 |
-diff --git a/src/WebModules.cpp b/src/WebModules.cpp |
65 |
-index 19ece50a..8ea4d9fa 100644 |
66 |
---- a/src/WebModules.cpp |
67 |
-+++ b/src/WebModules.cpp |
68 |
-@@ -563,7 +563,7 @@ CString CWebSock::GetSkinPath(const CString& sSkinName) { |
69 |
- sRet = CZNC::Get().GetCurPath() + "/webskins/" + sSkinName; |
70 |
- |
71 |
- if (!CFile::IsDir(sRet)) { |
72 |
-- sRet = CString(_SKINDIR_) + "/" + sSkinName; |
73 |
-+ sRet = CZNC::UnusualRoot() + CString(_SKINDIR_) + "/" + sSkinName; |
74 |
- } |
75 |
- } |
76 |
- |
77 |
-diff --git a/src/znc.cpp b/src/znc.cpp |
78 |
-index 4e7216ee..dd901497 100644 |
79 |
---- a/src/znc.cpp |
80 |
-+++ b/src/znc.cpp |
81 |
-@@ -2130,3 +2130,8 @@ void CZNC::DisableConfigTimer() { |
82 |
- m_pConfigTimer = nullptr; |
83 |
- } |
84 |
- } |
85 |
-+ |
86 |
-+CString CZNC::UnusualRoot() { |
87 |
-+ char* szUnusualRoot = getenv("ZNC_UNUSUAL_ROOT"); |
88 |
-+ return szUnusualRoot ? szUnusualRoot : ""; |
89 |
-+} |
90 |
|
91 |
diff --git a/net-irc/znc/files/znc-1.7.0-inttest-fix-make-warning.patch b/net-irc/znc/files/znc-1.7.0-inttest-fix-make-warning.patch |
92 |
deleted file mode 100644 |
93 |
index 0be20e4c08d..00000000000 |
94 |
--- a/net-irc/znc/files/znc-1.7.0-inttest-fix-make-warning.patch |
95 |
+++ /dev/null |
96 |
@@ -1,26 +0,0 @@ |
97 |
-From abee9f9bfc8c9ca9d4616238fdd812c4200b17d5 Mon Sep 17 00:00:00 2001 |
98 |
-From: Alexey Sokolov <alexey+znc@××××××××.org> |
99 |
-Date: Thu, 28 Jun 2018 23:57:29 +0100 |
100 |
-Subject: [PATCH] Fix a warning in integration test / gmake / znc-buildmod |
101 |
- interaction. |
102 |
- |
103 |
-It was requested on https://github.com/gentoo/gentoo/pull/8901 |
104 |
---- |
105 |
- test/CMakeLists.txt | 5 +++++ |
106 |
- 1 file changed, 5 insertions(+) |
107 |
- |
108 |
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt |
109 |
-index b19c22fab..296cb0de7 100644 |
110 |
---- a/test/CMakeLists.txt |
111 |
-+++ b/test/CMakeLists.txt |
112 |
-@@ -85,5 +85,10 @@ externalproject_add(inttest_bin |
113 |
- "-DZNC_BIN_DIR:path=${CMAKE_INSTALL_FULL_BINDIR}" |
114 |
- "-DQt5_HINTS:path=${brew_qt5}") |
115 |
- add_custom_target(inttest COMMAND |
116 |
-+ # Prevent a warning from test of znc-buildmod, when inner make |
117 |
-+ # discovers that there is an outer make and tries to use it: |
118 |
-+ # gmake[4]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. |
119 |
-+ # This option doesn't affect ninja, which doesn't show that warning anyway. |
120 |
-+ ${CMAKE_COMMAND} -E env MAKEFLAGS= |
121 |
- "${CMAKE_CURRENT_BINARY_DIR}/integration/inttest") |
122 |
- add_dependencies(inttest inttest_bin) |
123 |
|
124 |
diff --git a/net-irc/znc/znc-1.7.0.ebuild b/net-irc/znc/znc-1.7.0.ebuild |
125 |
deleted file mode 100644 |
126 |
index 7cd8c886597..00000000000 |
127 |
--- a/net-irc/znc/znc-1.7.0.ebuild |
128 |
+++ /dev/null |
129 |
@@ -1,182 +0,0 @@ |
130 |
-# Copyright 1999-2018 Gentoo Foundation |
131 |
-# Distributed under the terms of the GNU General Public License v2 |
132 |
- |
133 |
-EAPI=6 |
134 |
- |
135 |
-PYTHON_COMPAT=( python3_{4,5,6} ) |
136 |
- |
137 |
-inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user |
138 |
- |
139 |
-GTEST_VER="ba96d0b1161f540656efdaed035b3c062b60e006" # 1.8.0 is too old, but newer version not released yet |
140 |
-GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz" |
141 |
-DESCRIPTION="An advanced IRC Bouncer" |
142 |
- |
143 |
-if [[ ${PV} == *9999* ]]; then |
144 |
- inherit git-r3 |
145 |
- EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"} |
146 |
- SRC_URI="" |
147 |
-else |
148 |
- SRC_URI=" |
149 |
- https://znc.in/releases/archive/${P}.tar.gz |
150 |
- test? ( ${GTEST_URL} ) |
151 |
- " |
152 |
- KEYWORDS="~amd64 ~arm ~x86" |
153 |
-fi |
154 |
- |
155 |
-HOMEPAGE="https://znc.in" |
156 |
-LICENSE="Apache-2.0" |
157 |
-SLOT="0" |
158 |
-IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib" |
159 |
- |
160 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )" |
161 |
- |
162 |
-RDEPEND=" |
163 |
- icu? ( dev-libs/icu:= ) |
164 |
- nls? ( dev-libs/boost:=[nls] ) |
165 |
- perl? ( >=dev-lang/perl-5.10:= ) |
166 |
- python? ( ${PYTHON_DEPS} ) |
167 |
- sasl? ( >=dev-libs/cyrus-sasl-2 ) |
168 |
- ssl? ( |
169 |
- !libressl? ( dev-libs/openssl:0= ) |
170 |
- libressl? ( dev-libs/libressl:0= ) |
171 |
- ) |
172 |
- tcl? ( dev-lang/tcl:0= ) |
173 |
- zlib? ( sys-libs/zlib:0= ) |
174 |
-" |
175 |
-DEPEND=" |
176 |
- ${RDEPEND} |
177 |
- virtual/pkgconfig |
178 |
- nls? ( sys-devel/gettext ) |
179 |
- perl? ( >=dev-lang/swig-3.0.0 ) |
180 |
- python? ( >=dev-lang/swig-3.0.0 ) |
181 |
- test? ( dev-qt/qtnetwork:5 ) |
182 |
-" |
183 |
- |
184 |
-PATCHES=( |
185 |
- "${FILESDIR}"/${PN}-1.7.0-inttest-fix-make-warning.patch |
186 |
- "${FILESDIR}"/${PN}-1.7.0-inttest-dir.patch |
187 |
-) |
188 |
- |
189 |
-pkg_setup() { |
190 |
- if use python; then |
191 |
- python-single-r1_pkg_setup |
192 |
- fi |
193 |
- |
194 |
- enewgroup ${PN} |
195 |
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} |
196 |
- # The home directory was previously set to /dev/null |
197 |
- # This caused a bug with the systemd unit |
198 |
- # https://bugs.gentoo.org/521916 |
199 |
- esethome ${PN} /var/lib/${PN} |
200 |
-} |
201 |
- |
202 |
-src_prepare() { |
203 |
- # Let SWIG rebuild modperl/modpython to make user patching easier. |
204 |
- if [[ ${PV} != *9999* ]]; then |
205 |
- rm modules/modperl/generated.tar.gz || die |
206 |
- rm modules/modpython/generated.tar.gz || die |
207 |
- fi |
208 |
- |
209 |
- sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \ |
210 |
- test/CMakeLists.txt || die |
211 |
- |
212 |
- cmake-utils_src_prepare |
213 |
-} |
214 |
- |
215 |
-src_configure() { |
216 |
- local mycmakeargs=( |
217 |
- -DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used. |
218 |
- -DSYSTEMD_DIR="$(systemd_get_systemunitdir)" |
219 |
- -DWANT_ICU="$(usex icu)" |
220 |
- -DWANT_IPV6="$(usex ipv6)" |
221 |
- -DWANT_I18N="$(usex nls)" |
222 |
- -DWANT_PERL="$(usex perl)" |
223 |
- -DWANT_PYTHON="$(usex python)" |
224 |
- -DWANT_CYRUS="$(usex sasl)" |
225 |
- -DWANT_OPENSSL="$(usex ssl)" |
226 |
- -DWANT_TCL="$(usex tcl)" |
227 |
- -DWANT_ZLIB="$(usex zlib)" |
228 |
- ) |
229 |
- |
230 |
- if [[ ${PV} != *9999* ]] && use test; then |
231 |
- export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest" |
232 |
- export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock" |
233 |
- fi |
234 |
- |
235 |
- cmake-utils_src_configure |
236 |
-} |
237 |
- |
238 |
-src_test() { |
239 |
- cmake-utils_src_make unittest |
240 |
- if has network-sandbox ${FEATURES}; then |
241 |
- cmake-utils_src_make install DESTDIR="${T}/inttest" |
242 |
- local filter='-' |
243 |
- if ! use perl; then |
244 |
- filter="${filter}:ZNCTest.Modperl*" |
245 |
- fi |
246 |
- if ! use python; then |
247 |
- filter="${filter}:ZNCTest.Modpython*" |
248 |
- fi |
249 |
- # CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod |
250 |
- # invocations from inside the test |
251 |
- GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \ |
252 |
- CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \ |
253 |
- CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \ |
254 |
- cmake-utils_src_make inttest |
255 |
- else |
256 |
- # TODO: don't require sandbox after |
257 |
- # https://github.com/znc/znc/pull/1363 is implemented |
258 |
- ewarn "FEATURES=-network-sandbox; skipping integration tests which" |
259 |
- ewarn "temporary open local ports." |
260 |
- fi |
261 |
-} |
262 |
- |
263 |
-src_install() { |
264 |
- cmake-utils_src_install |
265 |
- |
266 |
- dodoc NOTICE |
267 |
- newinitd "${FILESDIR}"/znc.initd-r2 znc |
268 |
- newconfd "${FILESDIR}"/znc.confd-r1 znc |
269 |
- |
270 |
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die |
271 |
- DISABLE_AUTOFORMATTING=1 |
272 |
- readme.gentoo_create_doc |
273 |
-} |
274 |
- |
275 |
-pkg_postinst() { |
276 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
277 |
- # This is a new installation |
278 |
- readme.gentoo_print_elog |
279 |
- fi |
280 |
- |
281 |
- if [[ -d "${EROOT%/}"/etc/znc ]]; then |
282 |
- ewarn "${EROOT%/}/etc/znc exists on your system." |
283 |
- ewarn "Due to the nature of the contents of that folder," |
284 |
- ewarn "we have changed the default configuration to use" |
285 |
- ewarn " ${EROOT%/}/var/lib/znc" |
286 |
- ewarn "please move ${EROOT%/}/etc/znc to ${EROOT%/}/var/lib/znc" |
287 |
- ewarn "or adjust your service configuration." |
288 |
- fi |
289 |
-} |
290 |
- |
291 |
-pkg_config() { |
292 |
- if [[ -e "${EROOT%/}/var/lib/znc" ]]; then |
293 |
- ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging" |
294 |
- ewarn "any existing configuration. If you are sure you want" |
295 |
- ewarn "to generate a new configuration, remove the folder" |
296 |
- ewarn "and try again." |
297 |
- else |
298 |
- einfo "Press enter to interactively create a new configuration file for znc." |
299 |
- einfo "To abort, press Control-C" |
300 |
- read |
301 |
- mkdir -p "${EROOT%/}/var/lib/znc" || die |
302 |
- chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" || |
303 |
- die "Setting permissions failed" |
304 |
- start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \ |
305 |
- "${EROOT%/}"/usr/bin/znc -- --makeconf --datadir "${EROOT%/}/var/lib/znc" || |
306 |
- die "Config failed" |
307 |
- einfo |
308 |
- einfo "You can now start the znc service using the init system of your choice." |
309 |
- einfo "Don't forget to enable it if you want to use znc at boot." |
310 |
- fi |
311 |
-} |