Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
Date: Fri, 02 Dec 2016 19:08:18
Message-Id: 1480705689.40c0c378b6fd8215878eb2b5de43448044bf6b5f.mgorny@gentoo
1 commit: 40c0c378b6fd8215878eb2b5de43448044bf6b5f
2 Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
3 AuthorDate: Fri Dec 2 09:08:40 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 2 19:08:09 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c0c378
7
8 net-irc/znc: remove old
9
10 Closes: https://github.com/gentoo/gentoo/pull/2977
11 Package-Manager: portage-2.3.2
12
13 net-irc/znc/Manifest | 2 -
14 net-irc/znc/znc-1.6.1-r1.ebuild | 190 ----------------------------------------
15 2 files changed, 192 deletions(-)
16
17 diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
18 index a51598c..1805de3 100644
19 --- a/net-irc/znc/Manifest
20 +++ b/net-irc/znc/Manifest
21 @@ -1,5 +1,3 @@
22 DIST googletest-release-1.7.0.tar.gz 468653 SHA256 f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc WHIRLPOOL e59e6aede05fd882c64586de7d204ed97fd02ec0f53abeb3130dcd18940ecefb59a43592ac5bd14dd28a8825845bd11359f637e28671554852573a4a43f8cd9c
23 -DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 WHIRLPOOL 0c31a385159551859c1afe76480b3fb1b560d666db9a0afc5cbda92bcd53bf129f85a8f902c6ded0779c2b4c49aacec59ba5a4d5ce316a07bf08174f4fc64049
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.6.1-r1.ebuild b/net-irc/znc/znc-1.6.1-r1.ebuild
29 deleted file mode 100644
30 index f06d784..00000000
31 --- a/net-irc/znc/znc-1.6.1-r1.ebuild
32 +++ /dev/null
33 @@ -1,190 +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_4 )
41 -inherit eutils python-single-r1 systemd user
42 -
43 -MY_PV=${PV/_/-}
44 -GTEST_VER="1.7.0"
45 -GTEST_URL="https://googletest.googlecode.com/files/gtest-${GTEST_VER}.zip"
46 -DESCRIPTION="An advanced IRC Bouncer"
47 -
48 -SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz
49 - test? ( ${GTEST_URL} )"
50 -KEYWORDS="~amd64 ~arm ~x86"
51 -
52 -HOMEPAGE="http://znc.in"
53 -LICENSE="Apache-2.0"
54 -SLOT="0"
55 -IUSE="daemon debug ipv6 libressl perl python ssl sasl tcl test"
56 -
57 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
58 -
59 -RDEPEND="
60 - dev-libs/icu
61 - sys-libs/zlib
62 - perl? ( >=dev-lang/perl-5.10 )
63 - python? ( ${PYTHON_DEPS} )
64 - sasl? ( >=dev-libs/cyrus-sasl-2 )
65 - ssl? (
66 - !libressl? ( dev-libs/openssl:0 )
67 - libressl? ( dev-libs/libressl )
68 - )
69 - tcl? ( dev-lang/tcl:0= )
70 -"
71 -DEPEND="${RDEPEND}
72 - virtual/pkgconfig
73 - perl? (
74 - >=dev-lang/swig-2.0.12
75 - )
76 - python? (
77 - >=dev-lang/swig-2.0.12
78 - )
79 -"
80 -
81 -S=${WORKDIR}/${PN}-${MY_PV}
82 -
83 -PATCHES=(
84 - "${FILESDIR}"/${PN}-1.6.1-systemwideconfig.patch
85 - "${FILESDIR}"/${PN}-1.6.1-create-pidfile-per-default.patch
86 - "${FILESDIR}"/${PN}-1.6.1-libressl.patch
87 -)
88 -
89 -ZNC_DATADIR="${ZNC_DATADIR:-"/var/lib/znc"}"
90 -
91 -pkg_setup() {
92 - if use python; then
93 - python-single-r1_pkg_setup
94 - fi
95 - if use daemon; then
96 - enewgroup ${PN}
97 - enewuser ${PN} -1 -1 /dev/null ${PN}
98 - fi
99 -}
100 -
101 -src_unpack() {
102 - default
103 -
104 - if use test; then
105 - cd "${S}"/test || die "Failed to chdir into '${S}/test'"
106 - unpack ${GTEST_URL##*/}
107 - mv gtest-${GTEST_VER} gtest \
108 - || die "Failed to rename '${S}/test/gtest-${GTEST_VER}' dir"
109 - fi
110 -}
111 -
112 -src_prepare() {
113 - epatch ${PATCHES[@]}
114 -}
115 -
116 -src_configure() {
117 - econf \
118 - --with-systemdsystemunitdir=$(systemd_get_unitdir) \
119 - $(use_enable debug) \
120 - $(use_enable ipv6) \
121 - $(use_enable perl) \
122 - $(use python && echo "--enable-python=python3") \
123 - $(use_enable sasl cyrus) \
124 - $(use_enable ssl openssl) \
125 - $(use_enable tcl tcl) \
126 - $(use_with test gtest "${S}/test/gtest")
127 -}
128 -
129 -src_install() {
130 - emake install DESTDIR="${D%/}"
131 - dodoc NOTICE README.md
132 - if use daemon; then
133 - newinitd "${FILESDIR}"/znc.initd-r1 znc
134 - newconfd "${FILESDIR}"/znc.confd-r1 znc
135 - fi
136 -}
137 -
138 -pkg_postinst() {
139 - if use !daemon; then
140 - elog
141 - elog "Run 'znc --makeconf' as the user you want to run ZNC as"
142 - elog "to make a configuration file"
143 - elog
144 - else
145 - elog
146 - elog "An init-script was installed in /etc/init.d"
147 - elog "A config file was installed in /etc/conf.d"
148 - if [[ ! -d "${EROOT}${ZNC_DATADIR}" ]]; then
149 - elog
150 - elog "Run 'emerge --config znc' under portage"
151 - elog "or 'cave config znc' under paludis to configure ZNC"
152 - elog "as a system-wide daemon."
153 - elog
154 - elog "To generate a new SSL certificate, run:"
155 - elog " znc --system-wide-config-as znc --makepem -d ${ZNC_DATADIR}"
156 - elog "as root"
157 - elog
158 - elog "If migrating from a user-based install"
159 - elog "you can use your existing config files:"
160 - elog " mkdir ${ZNC_DATADIR}"
161 - elog " mv /home/\$USER/.znc/* ${ZNC_DATADIR}"
162 - elog " rm -rf /home/\$USER/.znc"
163 - elog " chown -R znc:znc ${ZNC_DATADIR}"
164 - elog
165 - elog "If you already have znc set up and want take advantage of the"
166 - elog "init script but skip of all the above, you can also edit"
167 - elog " /etc/conf.d/znc"
168 - elog "and adjust the variables to your current znc user and config"
169 - elog "location."
170 - elog
171 - elog "Please make sure that your existing configuration contains"
172 - elog " PidFile = /run/znc/znc.pid"
173 - elog "or that PidFile value matches the one in /etc/conf.d/znc"
174 - if [[ -d "${EROOT}"/etc/znc ]]; then
175 - elog
176 - ewarn "/etc/znc exists on your system."
177 - ewarn "Due to the nature of the contents of that folder,"
178 - ewarn "we have changed the default configuration to use"
179 - ewarn " ${ZNC_DATADIR}"
180 - ewarn "please move /etc/znc to ${ZNC_DATADIR}"
181 - ewarn "or adjust /etc/conf.d/znc"
182 - fi
183 - else
184 - elog "Existing config detected in ${ZNC_DATADIR}"
185 - if ! systemd_is_booted; then
186 - elog
187 - elog "Please make sure that your existing configuration contains"
188 - elog " PidFile = /run/znc/znc.pid"
189 - elog "or that PidFile value matches the one in /etc/conf.d/znc"
190 - else
191 - elog "You're good to go :)"
192 - fi
193 - fi
194 - elog
195 - fi
196 -}
197 -
198 -pkg_config() {
199 - if use daemon && ! [[ -d "${EROOT}${ZNC_DATADIR}" ]]; then
200 - einfo "Press ENTER to interactively create a new configuration file for znc."
201 - einfo "To abort, press Control-C"
202 - read
203 - mkdir -p "${EROOT}${ZNC_DATADIR}" || die
204 - chown -R ${PN}:${PN} "${EROOT}${ZNC_DATADIR}" ||
205 - die "Setting permissions failed"
206 - "${EROOT}"/usr/bin/znc --system-wide-config-as znc -c -r -d "${EROOT}${ZNC_DATADIR}" ||
207 - die "Config failed"
208 - echo
209 - einfo "To start znc, run '/etc/init.d/znc start'"
210 - einfo "or add znc to a runlevel:"
211 - einfo " rc-update add znc default"
212 - else
213 - if use daemon; then
214 - ewarn "${ZNC_DATADIR} already exists, aborting to avoid damaging"
215 - ewarn "any existing configuration. If you are sure you want"
216 - ewarn "to generate a new configuration, remove the folder"
217 - ewarn "and try again."
218 - else
219 - ewarn "To configure znc as a system-wide daemon you have to"
220 - ewarn "enable the 'daemon' use flag."
221 - fi
222 - fi
223 -}