Gentoo Archives: gentoo-commits

From: Aaron Swenson <titanofold@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
Date: Mon, 17 Jul 2017 10:19:18
Message-Id: 1500286743.42cbfb83a2398a68684233e9608d3a4de6aed70b.titanofold@gentoo
1 commit: 42cbfb83a2398a68684233e9608d3a4de6aed70b
2 Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
3 AuthorDate: Sun Jul 16 22:55:09 2017 +0000
4 Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 17 10:19:03 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42cbfb83
7
8 net-irc/znc: remove old
9
10 Bug: https://bugs.gentoo.org/show_bug.cgi?id=625328
11 Package-Manager: Portage-2.3.6, Repoman-2.3.2
12 Closes: https://github.com/gentoo/gentoo/pull/5116
13
14 Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org>
15
16 net-irc/znc/Manifest | 1 -
17 net-irc/znc/znc-1.4-r1.ebuild | 167 ------------------------------------------
18 2 files changed, 168 deletions(-)
19
20 diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
21 index ba0bb07b773..c159bff1ef8 100644
22 --- a/net-irc/znc/Manifest
23 +++ b/net-irc/znc/Manifest
24 @@ -1,4 +1,3 @@
25 DIST googletest-release-1.7.0.tar.gz 468653 SHA256 f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc WHIRLPOOL e59e6aede05fd882c64586de7d204ed97fd02ec0f53abeb3130dcd18940ecefb59a43592ac5bd14dd28a8825845bd11359f637e28671554852573a4a43f8cd9c
26 -DIST znc-1.4.tar.gz 1239648 SHA256 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52 SHA512 0c33b05e8232084999812cbaa467dc7d37b80cafc1001b82e89c702b4303d8db9a27b948fe653e7090404eb1c66f5492f02f3524bc39efabade4be8bdb476671 WHIRLPOOL 420e665fa193b3f0284a070e021c4c467e3d40a0812eedeef9b2f65a6626a050b7af8bf15a754ac571d12261705832cfa18a0f7a7817cce96d220028a86230cf
27 DIST znc-1.6.3.tar.gz 1464200 SHA256 631c46de76fe601a41ef7676bc974958e9a302b72b25fc92b4a603a25d89b827 SHA512 777279b6c973310b4e78a0472bd1e355c2adf3e4fbe9ebedde3dd4706e5c0b208d4330eb2318a8d9e0d7d7146bee0a4a428cbe5a3f230c8f6aa692a477e86e2b WHIRLPOOL 2a41e0ac90038a8cc8f289d4ffc0494d29eda75450f650b8870c076fb809eb9c5829720bb39eb43d38ee4ac7f9bea6000ad90fcdd8c0eea461bf04f88cc17b52
28 DIST znc-1.6.5.tar.gz 1470681 SHA256 2f0225d49c53a01f8d94feea4619a6fe92857792bb3401a4eb1edd65f0342aca SHA512 d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626 WHIRLPOOL b72585a2f11754bedb667ac078a617195aa718f9864e7e33b962d75387e7bc4c8c6c1465844f27b65a5af2d50cec7006ae325a43eb2ef930fc9c218bbaae60a1
29
30 diff --git a/net-irc/znc/znc-1.4-r1.ebuild b/net-irc/znc/znc-1.4-r1.ebuild
31 deleted file mode 100644
32 index e99e78596b2..00000000000
33 --- a/net-irc/znc/znc-1.4-r1.ebuild
34 +++ /dev/null
35 @@ -1,167 +0,0 @@
36 -# Copyright 1999-2016 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=5
40 -
41 -PYTHON_COMPAT=( python3_4 )
42 -inherit base python-single-r1 systemd user
43 -
44 -MY_PV=${PV/_/-}
45 -DESCRIPTION="An advanced IRC Bouncer"
46 -
47 -if [[ ${PV} == *9999* ]]; then
48 - inherit git-2
49 - EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/znc/znc.git"}
50 - SRC_URI=""
51 - KEYWORDS=""
52 -else
53 - SRC_URI="http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz"
54 - KEYWORDS="amd64 ~arm x86"
55 -fi
56 -
57 -HOMEPAGE="http://znc.in"
58 -LICENSE="Apache-2.0"
59 -SLOT="0"
60 -IUSE="daemon debug ipv6 perl python ssl sasl tcl"
61 -
62 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
63 -
64 -RDEPEND="
65 - perl? ( >=dev-lang/perl-5.10 )
66 - python? ( ${PYTHON_DEPS} )
67 - sasl? ( >=dev-libs/cyrus-sasl-2 )
68 - ssl? ( >=dev-libs/openssl-0.9.7d:0 )
69 - tcl? ( dev-lang/tcl:0= )
70 -"
71 -DEPEND="
72 - virtual/pkgconfig
73 - perl? (
74 - >=dev-lang/swig-2.0.12
75 - )
76 - python? (
77 - >=dev-lang/swig-2.0.12
78 - )
79 - ${RDEPEND}
80 -"
81 -
82 -S=${WORKDIR}/${PN}-${MY_PV}
83 -
84 -PATCHES=(
85 - "${FILESDIR}/${PN}-1.0-systemwideconfig.patch"
86 -)
87 -
88 -CONFDIR="/var/lib/znc"
89 -
90 -pkg_setup() {
91 - if use python; then
92 - python-single-r1_pkg_setup
93 - fi
94 - if use daemon; then
95 - enewgroup ${PN}
96 - enewuser ${PN} -1 -1 /dev/null ${PN}
97 - fi
98 -}
99 -
100 -src_prepare() {
101 - if [[ ${PV} == *9999* ]]; then
102 - ./autogen.sh
103 - fi
104 -
105 - base_src_prepare
106 -}
107 -
108 -src_configure() {
109 - econf \
110 - --with-systemdsystemunitdir=$(systemd_get_unitdir) \
111 - $(use_enable debug) \
112 - $(use_enable ipv6) \
113 - $(use_enable perl) \
114 - $(use python && echo "--enable-python=python3") \
115 - $(use_enable sasl cyrus) \
116 - $(use_enable ssl openssl) \
117 - $(use_enable tcl tcl)
118 -}
119 -
120 -src_install() {
121 - emake install DESTDIR="${D}"
122 - dodoc NOTICE README.md
123 - if use daemon; then
124 - newinitd "${FILESDIR}"/znc.initd znc
125 - newconfd "${FILESDIR}"/znc.confd znc
126 - fi
127 -}
128 -
129 -pkg_postinst() {
130 - if use !daemon; then
131 - elog
132 - elog "Run 'znc --makeconf' as the user you want to run ZNC as"
133 - elog "to make a configuration file"
134 - elog
135 - else
136 - elog
137 - elog "An init-script was installed in /etc/init.d"
138 - elog "A config file was installed in /etc/conf.d"
139 - if [[ ! -d "${EROOT}${CONFDIR}" ]]; then
140 - elog
141 - elog "Run 'emerge --config znc' to configure ZNC"
142 - elog "as a system-wide daemon."
143 - elog
144 - elog "To generate a new SSL certificate, run:"
145 - elog " znc --system-wide-config-as znc --makepem -d ${CONFDIR}"
146 - elog "as root"
147 - elog
148 - elog "If migrating from a user-based install"
149 - elog "you can use your existing config files:"
150 - elog " mkdir ${CONFDIR}"
151 - elog " mv /home/\$USER/.znc/* ${CONFDIR}"
152 - elog " rm -rf /home/\$USER/.znc"
153 - elog " chown -R znc:znc ${CONFDIR}"
154 - elog
155 - elog "If you already have znc set up and want take advantage of the"
156 - elog "init script but skip of all the above, you can also edit"
157 - elog " /etc/conf.d/znc"
158 - elog "and adjust the variables to your current znc user and config"
159 - elog "location."
160 - if [[ -d "${EROOT}"/etc/znc ]]; then
161 - elog
162 - ewarn "/etc/znc exists on your system."
163 - ewarn "Due to the nature of the contents of that folder,"
164 - ewarn "we have changed the default configuration to use"
165 - ewarn " /var/lib/znc"
166 - ewarn "please move /etc/znc to /var/lib/znc"
167 - ewarn "or adjust /etc/conf.d/znc"
168 - fi
169 - else
170 - elog "Existing config detected in ${CONFDIR}"
171 - elog "You're good to go :)"
172 - fi
173 - elog
174 - fi
175 -}
176 -
177 -pkg_config() {
178 - if use daemon && ! [[ -d "${EROOT}${CONFDIR}" ]]; then
179 - einfo "Press ENTER to interactively create a new configuration file for znc."
180 - einfo "To abort, press Control-C"
181 - read
182 - mkdir -p "${EROOT}${CONFDIR}" || die
183 - chown -R ${PN}:${PN} "${EROOT}${CONFDIR}" ||
184 - die "Setting permissions failed"
185 - "${EROOT}"/usr/bin/znc --system-wide-config-as znc -c -r -d "${EROOT}${CONFDIR}" ||
186 - die "Config failed"
187 - echo
188 - einfo "To start znc, run '/etc/init.d/znc start'"
189 - einfo "or add znc to a runlevel:"
190 - einfo " rc-update add znc default"
191 - else
192 - if use daemon; then
193 - ewarn "${CONFDIR} already exists, aborting to avoid damaging"
194 - ewarn "any existing configuration. If you are sure you want"
195 - ewarn "to generate a new configuration, remove the folder"
196 - ewarn "and try again."
197 - else
198 - ewarn "To configure znc as a system-wide daemon you have to"
199 - ewarn "enable the 'daemon' use flag."
200 - fi
201 - fi
202 -}