Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
Date: Sat, 03 Sep 2016 17:17:21
Message-Id: 1472923012.38dce45292b00cbbb4101ada64bb5b1c1418c104.floppym@gentoo
1 commit: 38dce45292b00cbbb4101ada64bb5b1c1418c104
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 3 17:16:52 2016 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 3 17:16:52 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38dce452
7
8 net-irc/znc: remove old
9
10 Package-Manager: portage-2.3.0_p24
11
12 net-irc/znc/Manifest | 1 -
13 net-irc/znc/znc-1.2-r1.ebuild | 167 ------------------------------------------
14 net-irc/znc/znc-1.4.ebuild | 167 ------------------------------------------
15 3 files changed, 335 deletions(-)
16
17 diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
18 index dc1f820..d4ac35e 100644
19 --- a/net-irc/znc/Manifest
20 +++ b/net-irc/znc/Manifest
21 @@ -1,5 +1,4 @@
22 DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 WHIRLPOOL 0c31a385159551859c1afe76480b3fb1b560d666db9a0afc5cbda92bcd53bf129f85a8f902c6ded0779c2b4c49aacec59ba5a4d5ce316a07bf08174f4fc64049
23 -DIST znc-1.2.tar.gz 1235150 SHA256 d9a2cd2a484ff23e6fc9cbde8dd8a43efbcd8d288afca7b1268914ca0d18701d SHA512 dff24e56127e5599d64b4c62de967d5d48d8ebf23ca8597d33bf0b3622640512db7a462bfa7c2031cd8307f402bab8efa345f6d1fc813e78eb0dcae581de3cf7 WHIRLPOOL b0810eb66e63be762f74f04eb2289e3634b18d6ecbd36d55f6a6772697e0397637d59b9ea01eaf62ef1cbe5f6e65b06432a254f4ada35194aa06b65c4a2f7994
24 DIST znc-1.4.tar.gz 1239648 SHA256 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52 SHA512 0c33b05e8232084999812cbaa467dc7d37b80cafc1001b82e89c702b4303d8db9a27b948fe653e7090404eb1c66f5492f02f3524bc39efabade4be8bdb476671 WHIRLPOOL 420e665fa193b3f0284a070e021c4c467e3d40a0812eedeef9b2f65a6626a050b7af8bf15a754ac571d12261705832cfa18a0f7a7817cce96d220028a86230cf
25 DIST znc-1.6.1.tar.gz 1463397 SHA256 ba49397364f48d6d32ae5242bc1166f21d972f85dd390d6bbe68a63ecbb6c140 SHA512 92c0acca6b585df394cf8d6d295948fc1342ff7b15d081017d2e0ba521129f914fa2b019a82d801f826f1009456294e4f578e978f34677bbfe436e87e2734aba WHIRLPOOL ff4a22742d5e1e8da66325fdc8a2fd88a467674a5f13f6d353b1c3588affd86f2c33c24d48f1b61dfba14311d6f1c13b2939851316cb302ab031073baa05ec17
26 DIST znc-1.6.3.tar.gz 1464200 SHA256 631c46de76fe601a41ef7676bc974958e9a302b72b25fc92b4a603a25d89b827 SHA512 777279b6c973310b4e78a0472bd1e355c2adf3e4fbe9ebedde3dd4706e5c0b208d4330eb2318a8d9e0d7d7146bee0a4a428cbe5a3f230c8f6aa692a477e86e2b WHIRLPOOL 2a41e0ac90038a8cc8f289d4ffc0494d29eda75450f650b8870c076fb809eb9c5829720bb39eb43d38ee4ac7f9bea6000ad90fcdd8c0eea461bf04f88cc17b52
27
28 diff --git a/net-irc/znc/znc-1.2-r1.ebuild b/net-irc/znc/znc-1.2-r1.ebuild
29 deleted file mode 100644
30 index 8322a7f..00000000
31 --- a/net-irc/znc/znc-1.2-r1.ebuild
32 +++ /dev/null
33 @@ -1,167 +0,0 @@
34 -# Copyright 1999-2016 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -EAPI=5
39 -
40 -PYTHON_COMPAT=( python3_3 )
41 -inherit base python-single-r1 user
42 -
43 -MY_PV=${PV/_/-}
44 -DESCRIPTION="An advanced IRC Bouncer"
45 -
46 -if [[ ${PV} == *9999* ]]; then
47 - inherit git-2
48 - EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/znc/znc.git"}
49 - SRC_URI=""
50 - KEYWORDS=""
51 -else
52 - SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz"
53 - KEYWORDS="amd64 ~arm x86"
54 -fi
55 -
56 -HOMEPAGE="http://znc.in"
57 -LICENSE="Apache-2.0"
58 -SLOT="0"
59 -IUSE="daemon debug ipv6 perl python ssl sasl tcl"
60 -
61 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
62 -
63 -RDEPEND="
64 - perl? ( >=dev-lang/perl-5.10 )
65 - python? ( ${PYTHON_DEPS} )
66 - sasl? ( >=dev-libs/cyrus-sasl-2 )
67 - ssl? ( >=dev-libs/openssl-0.9.7d:0 )
68 - tcl? ( dev-lang/tcl:0= )
69 -"
70 -DEPEND="
71 - virtual/pkgconfig
72 - perl? ( dev-lang/swig )
73 - python? (
74 - >=dev-lang/swig-2.0.8
75 - )
76 - ${RDEPEND}
77 -"
78 -
79 -S=${WORKDIR}/${PN}-${MY_PV}
80 -
81 -PATCHES=(
82 - "${FILESDIR}/${PN}-1.0-systemwideconfig.patch"
83 - "${FILESDIR}/${P}-webadmin-correctly-handle-channel-names.patch"
84 -)
85 -
86 -CONFDIR="/var/lib/znc"
87 -
88 -pkg_setup() {
89 - if use python; then
90 - python-single-r1_pkg_setup
91 - fi
92 - if use daemon; then
93 - enewgroup ${PN}
94 - enewuser ${PN} -1 -1 /dev/null ${PN}
95 - fi
96 -}
97 -
98 -src_prepare() {
99 - if [[ ${PV} == *9999* ]]; then
100 - ./autogen.sh
101 - fi
102 -
103 - base_src_prepare
104 -}
105 -
106 -src_configure() {
107 - econf \
108 - $(use_enable debug) \
109 - $(use_enable ipv6) \
110 - $(use_enable perl) \
111 - $(use python && echo "--enable-python=python3") \
112 - $(use_enable sasl cyrus) \
113 - $(use_enable ssl openssl) \
114 - $(use_enable tcl tcl)
115 -}
116 -
117 -src_install() {
118 - emake install DESTDIR="${D}"
119 - dodoc NOTICE README.md
120 - if use daemon; then
121 - newinitd "${FILESDIR}"/znc.initd znc
122 - newconfd "${FILESDIR}"/znc.confd znc
123 - fi
124 -}
125 -
126 -pkg_postinst() {
127 - if use !daemon; then
128 - elog
129 - elog "Run 'znc --makeconf' as the user you want to run ZNC as"
130 - elog "to make a configuration file"
131 - elog "If you are using SSL you should also run 'znc --makepem'"
132 - elog
133 - else
134 - elog
135 - elog "An init-script was installed in /etc/init.d"
136 - elog "A config file was installed in /etc/conf.d"
137 - if [[ ! -d "${EROOT}${CONFDIR}" ]]; then
138 - elog
139 - elog "Run 'emerge --config znc' to configure ZNC"
140 - elog "as a system-wide daemon."
141 - elog
142 - elog "If you are using SSL you should also run:"
143 - elog " znc --system-wide-config-as znc --makepem -d ${CONFDIR}"
144 - elog "as root"
145 - elog
146 - elog "If migrating from a user-based install"
147 - elog "you can use your existing config files:"
148 - elog " mkdir ${CONFDIR}"
149 - elog " mv /home/\$USER/.znc/* ${CONFDIR}"
150 - elog " rm -rf /home/\$USER/.znc"
151 - elog " chown -R znc:znc ${CONFDIR}"
152 - elog
153 - elog "If you already have znc set up and want take advantage of the"
154 - elog "init script but skip of all the above, you can also edit"
155 - elog " /etc/conf.d/znc"
156 - elog "and adjust the variables to your current znc user and config"
157 - elog "location."
158 - if [[ -d "${EROOT}"/etc/znc ]]; then
159 - elog
160 - ewarn "/etc/znc exists on your system."
161 - ewarn "Due to the nature of the contents of that folder,"
162 - ewarn "we have changed the default configuration to use"
163 - ewarn " /var/lib/znc"
164 - ewarn "please move /etc/znc to /var/lib/znc"
165 - ewarn "or adjust /etc/conf.d/znc"
166 - fi
167 - else
168 - elog "Existing config detected in ${CONFDIR}"
169 - elog "You're good to go :)"
170 - fi
171 - elog
172 - fi
173 -}
174 -
175 -pkg_config() {
176 - if use daemon && ! [[ -d "${EROOT}${CONFDIR}" ]]; then
177 - einfo "Press ENTER to interactively create a new configuration file for znc."
178 - einfo "To abort, press Control-C"
179 - read
180 - mkdir -p "${EROOT}${CONFDIR}" || die
181 - chown -R ${PN}:${PN} "${EROOT}${CONFDIR}" ||
182 - die "Setting permissions failed"
183 - "${EROOT}"/usr/bin/znc --system-wide-config-as znc -c -r -d "${EROOT}${CONFDIR}" ||
184 - die "Config failed"
185 - echo
186 - einfo "To start znc, run '/etc/init.d/znc start'"
187 - einfo "or add znc to a runlevel:"
188 - einfo " rc-update add znc default"
189 - else
190 - if use daemon; then
191 - ewarn "${CONFDIR} already exists, aborting to avoid damaging"
192 - ewarn "any existing configuration. If you are sure you want"
193 - ewarn "to generate a new configuration, remove the folder"
194 - ewarn "and try again."
195 - else
196 - ewarn "To configure znc as a system-wide daemon you have to"
197 - ewarn "enable the 'daemon' use flag."
198 - fi
199 - fi
200 -}
201
202 diff --git a/net-irc/znc/znc-1.4.ebuild b/net-irc/znc/znc-1.4.ebuild
203 deleted file mode 100644
204 index 99ad525..00000000
205 --- a/net-irc/znc/znc-1.4.ebuild
206 +++ /dev/null
207 @@ -1,167 +0,0 @@
208 -# Copyright 1999-2016 Gentoo Foundation
209 -# Distributed under the terms of the GNU General Public License v2
210 -# $Id$
211 -
212 -EAPI=5
213 -
214 -PYTHON_COMPAT=( python3_3 )
215 -inherit base python-single-r1 user
216 -
217 -MY_PV=${PV/_/-}
218 -DESCRIPTION="An advanced IRC Bouncer"
219 -
220 -if [[ ${PV} == *9999* ]]; then
221 - inherit git-2
222 - EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/znc/znc.git"}
223 - SRC_URI=""
224 - KEYWORDS=""
225 -else
226 - SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz"
227 - KEYWORDS="~amd64 ~arm ~x86"
228 -fi
229 -
230 -HOMEPAGE="http://znc.in"
231 -LICENSE="Apache-2.0"
232 -SLOT="0"
233 -IUSE="daemon debug ipv6 perl python ssl sasl tcl"
234 -
235 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
236 -
237 -RDEPEND="
238 - perl? ( >=dev-lang/perl-5.10 )
239 - python? ( ${PYTHON_DEPS} )
240 - sasl? ( >=dev-libs/cyrus-sasl-2 )
241 - ssl? ( >=dev-libs/openssl-0.9.7d:0 )
242 - tcl? ( dev-lang/tcl:0= )
243 -"
244 -DEPEND="
245 - virtual/pkgconfig
246 - perl? (
247 - >=dev-lang/swig-2.0.12
248 - )
249 - python? (
250 - >=dev-lang/swig-2.0.12
251 - )
252 - ${RDEPEND}
253 -"
254 -
255 -S=${WORKDIR}/${PN}-${MY_PV}
256 -
257 -PATCHES=(
258 - "${FILESDIR}/${PN}-1.0-systemwideconfig.patch"
259 -)
260 -
261 -CONFDIR="/var/lib/znc"
262 -
263 -pkg_setup() {
264 - if use python; then
265 - python-single-r1_pkg_setup
266 - fi
267 - if use daemon; then
268 - enewgroup ${PN}
269 - enewuser ${PN} -1 -1 /dev/null ${PN}
270 - fi
271 -}
272 -
273 -src_prepare() {
274 - if [[ ${PV} == *9999* ]]; then
275 - ./autogen.sh
276 - fi
277 -
278 - base_src_prepare
279 -}
280 -
281 -src_configure() {
282 - econf \
283 - $(use_enable debug) \
284 - $(use_enable ipv6) \
285 - $(use_enable perl) \
286 - $(use python && echo "--enable-python=python3") \
287 - $(use_enable sasl cyrus) \
288 - $(use_enable ssl openssl) \
289 - $(use_enable tcl tcl)
290 -}
291 -
292 -src_install() {
293 - emake install DESTDIR="${D}"
294 - dodoc NOTICE README.md
295 - if use daemon; then
296 - newinitd "${FILESDIR}"/znc.initd znc
297 - newconfd "${FILESDIR}"/znc.confd znc
298 - fi
299 -}
300 -
301 -pkg_postinst() {
302 - if use !daemon; then
303 - elog
304 - elog "Run 'znc --makeconf' as the user you want to run ZNC as"
305 - elog "to make a configuration file"
306 - elog
307 - else
308 - elog
309 - elog "An init-script was installed in /etc/init.d"
310 - elog "A config file was installed in /etc/conf.d"
311 - if [[ ! -d "${EROOT}${CONFDIR}" ]]; then
312 - elog
313 - elog "Run 'emerge --config znc' to configure ZNC"
314 - elog "as a system-wide daemon."
315 - elog
316 - elog "To generate a new SSL certificate, run:"
317 - elog " znc --system-wide-config-as znc --makepem -d ${CONFDIR}"
318 - elog "as root"
319 - elog
320 - elog "If migrating from a user-based install"
321 - elog "you can use your existing config files:"
322 - elog " mkdir ${CONFDIR}"
323 - elog " mv /home/\$USER/.znc/* ${CONFDIR}"
324 - elog " rm -rf /home/\$USER/.znc"
325 - elog " chown -R znc:znc ${CONFDIR}"
326 - elog
327 - elog "If you already have znc set up and want take advantage of the"
328 - elog "init script but skip of all the above, you can also edit"
329 - elog " /etc/conf.d/znc"
330 - elog "and adjust the variables to your current znc user and config"
331 - elog "location."
332 - if [[ -d "${EROOT}"/etc/znc ]]; then
333 - elog
334 - ewarn "/etc/znc exists on your system."
335 - ewarn "Due to the nature of the contents of that folder,"
336 - ewarn "we have changed the default configuration to use"
337 - ewarn " /var/lib/znc"
338 - ewarn "please move /etc/znc to /var/lib/znc"
339 - ewarn "or adjust /etc/conf.d/znc"
340 - fi
341 - else
342 - elog "Existing config detected in ${CONFDIR}"
343 - elog "You're good to go :)"
344 - fi
345 - elog
346 - fi
347 -}
348 -
349 -pkg_config() {
350 - if use daemon && ! [[ -d "${EROOT}${CONFDIR}" ]]; then
351 - einfo "Press ENTER to interactively create a new configuration file for znc."
352 - einfo "To abort, press Control-C"
353 - read
354 - mkdir -p "${EROOT}${CONFDIR}" || die
355 - chown -R ${PN}:${PN} "${EROOT}${CONFDIR}" ||
356 - die "Setting permissions failed"
357 - "${EROOT}"/usr/bin/znc --system-wide-config-as znc -c -r -d "${EROOT}${CONFDIR}" ||
358 - die "Config failed"
359 - echo
360 - einfo "To start znc, run '/etc/init.d/znc start'"
361 - einfo "or add znc to a runlevel:"
362 - einfo " rc-update add znc default"
363 - else
364 - if use daemon; then
365 - ewarn "${CONFDIR} already exists, aborting to avoid damaging"
366 - ewarn "any existing configuration. If you are sure you want"
367 - ewarn "to generate a new configuration, remove the folder"
368 - ewarn "and try again."
369 - else
370 - ewarn "To configure znc as a system-wide daemon you have to"
371 - ewarn "enable the 'daemon' use flag."
372 - fi
373 - fi
374 -}