1 |
commit: 274b842481cf1ceb5562f3a54680473145bc5e3d |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Tue Aug 24 12:38:39 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 24 12:38:39 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=274b8424 |
7 |
|
8 |
net-im/minbif: Remove last-rited package |
9 |
|
10 |
Closes: https://bugs.gentoo.org/788577 |
11 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
net-im/minbif/Manifest | 1 - |
15 |
net-im/minbif/files/minbif-1.0.5-gcc47.patch | 76 -------------------- |
16 |
.../files/minbif-1.0.5-glib-single-includes.patch | 26 ------- |
17 |
.../minbif-1.0.5-rename-imlib-load-error.patch | 13 ---- |
18 |
net-im/minbif/files/minbif.initd | 23 ------ |
19 |
net-im/minbif/metadata.xml | 5 -- |
20 |
net-im/minbif/minbif-1.0.5-r3.ebuild | 83 ---------------------- |
21 |
profiles/package.mask | 5 -- |
22 |
8 files changed, 232 deletions(-) |
23 |
|
24 |
diff --git a/net-im/minbif/Manifest b/net-im/minbif/Manifest |
25 |
deleted file mode 100644 |
26 |
index f22b7b17b0b..00000000000 |
27 |
--- a/net-im/minbif/Manifest |
28 |
+++ /dev/null |
29 |
@@ -1 +0,0 @@ |
30 |
-DIST minbif-1.0.5.tar.gz 176039 BLAKE2B 195af3dbb45f0c2b6499fd440c4ffc637d7e4e723879282a4914538d562c2833f30ae562098ebc5c47ac694b37f558984e599cb3701d6b1af6256db32ad91152 SHA512 e84c6f38ad35a660f9c319b702ae5743cece167c8e116976a9ca0caf527ad23ea17ea8f518f9bd76536e87283362d2087201a5307128740fc7f05dccabacfbcd |
31 |
|
32 |
diff --git a/net-im/minbif/files/minbif-1.0.5-gcc47.patch b/net-im/minbif/files/minbif-1.0.5-gcc47.patch |
33 |
deleted file mode 100644 |
34 |
index 8566406a318..00000000000 |
35 |
--- a/net-im/minbif/files/minbif-1.0.5-gcc47.patch |
36 |
+++ /dev/null |
37 |
@@ -1,76 +0,0 @@ |
38 |
-commit fe71fd989a4501c77314b2906756f4e9a328ff31 |
39 |
-Author: Romain Bignon <romain@×××××××.me> |
40 |
-Date: Tue May 8 16:46:35 2012 +0200 |
41 |
- |
42 |
- fixes for gcc 4.7 |
43 |
- |
44 |
---- a/src/im/account.cpp |
45 |
-+++ b/src/im/account.cpp |
46 |
-@@ -18,6 +18,7 @@ |
47 |
- |
48 |
- #include <cassert> |
49 |
- #include <cstring> |
50 |
-+#include <unistd.h> |
51 |
- #ifdef HAVE_IMLIB |
52 |
- #include <Imlib2.h> |
53 |
- #endif /* HAVE_IMLIB */ |
54 |
---- a/src/im/request.cpp |
55 |
-+++ b/src/im/request.cpp |
56 |
-@@ -18,6 +18,7 @@ |
57 |
- |
58 |
- #include <errno.h> |
59 |
- #include <string.h> |
60 |
-+#include <unistd.h> |
61 |
- |
62 |
- #include "request.h" |
63 |
- #include "buddy.h" |
64 |
---- a/src/irc/dcc.cpp |
65 |
-+++ b/src/irc/dcc.cpp |
66 |
-@@ -23,6 +23,7 @@ |
67 |
- #include <string.h> |
68 |
- #include <sys/types.h> |
69 |
- #include <netinet/in.h> |
70 |
-+#include <unistd.h> |
71 |
- |
72 |
- #include "dcc.h" |
73 |
- #include "nick.h" |
74 |
---- a/src/irc/irc.cpp |
75 |
-+++ b/src/irc/irc.cpp |
76 |
-@@ -246,7 +246,7 @@ Nick* IRC::getNick(string nickname, bool case_sensitive) const |
77 |
- Buddy* IRC::getNick(const im::Buddy& buddy) const |
78 |
- { |
79 |
- map<string, Nick*>::const_iterator it; |
80 |
-- Buddy* nb; |
81 |
-+ Buddy* nb = NULL; |
82 |
- for(it = users.begin(); |
83 |
- it != users.end() && (!(nb = dynamic_cast<Buddy*>(it->second)) || nb->getBuddy() != buddy); |
84 |
- ++it) |
85 |
-@@ -261,7 +261,7 @@ Buddy* IRC::getNick(const im::Buddy& buddy) const |
86 |
- ConvNick* IRC::getNick(const im::Conversation& conv) const |
87 |
- { |
88 |
- map<string, Nick*>::const_iterator it; |
89 |
-- ConvNick* n; |
90 |
-+ ConvNick* n = NULL; |
91 |
- for(it = users.begin(); |
92 |
- it != users.end() && (!(n = dynamic_cast<ConvNick*>(it->second)) || n->getConversation() != conv); |
93 |
- ++it) |
94 |
---- a/src/server_poll/inetd.cpp |
95 |
-+++ b/src/server_poll/inetd.cpp |
96 |
-@@ -18,6 +18,7 @@ |
97 |
- |
98 |
- #include <cassert> |
99 |
- #include <glib.h> |
100 |
-+#include <unistd.h> |
101 |
- |
102 |
- #include "inetd.h" |
103 |
- #include "irc/irc.h" |
104 |
---- a/src/sockwrap/sockwrap.cpp |
105 |
-+++ b/src/sockwrap/sockwrap.cpp |
106 |
-@@ -22,6 +22,7 @@ |
107 |
- # include "sockwrap_tls.h" |
108 |
- #endif |
109 |
- #include "core/util.h" |
110 |
-+#include <unistd.h> |
111 |
- |
112 |
- namespace sock |
113 |
- { |
114 |
|
115 |
diff --git a/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch b/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch |
116 |
deleted file mode 100644 |
117 |
index 599355eb502..00000000000 |
118 |
--- a/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch |
119 |
+++ /dev/null |
120 |
@@ -1,26 +0,0 @@ |
121 |
-Index: minbif-1.0.5/src/server_poll/daemon_fork.cpp |
122 |
-=================================================================== |
123 |
---- minbif-1.0.5.orig/src/server_poll/daemon_fork.cpp |
124 |
-+++ minbif-1.0.5/src/server_poll/daemon_fork.cpp |
125 |
-@@ -20,7 +20,7 @@ |
126 |
- #include <cassert> |
127 |
- #include <cstring> |
128 |
- #include <cerrno> |
129 |
--#include <glib/gmain.h> |
130 |
-+#include <glib.h> |
131 |
- #include <sys/socket.h> |
132 |
- #include <sys/stat.h> |
133 |
- #include <arpa/inet.h> |
134 |
-Index: minbif-1.0.5/src/server_poll/inetd.cpp |
135 |
-=================================================================== |
136 |
---- minbif-1.0.5.orig/src/server_poll/inetd.cpp |
137 |
-+++ minbif-1.0.5/src/server_poll/inetd.cpp |
138 |
-@@ -17,7 +17,7 @@ |
139 |
- */ |
140 |
- |
141 |
- #include <cassert> |
142 |
--#include <glib/gmain.h> |
143 |
-+#include <glib.h> |
144 |
- |
145 |
- #include "inetd.h" |
146 |
- #include "irc/irc.h" |
147 |
|
148 |
diff --git a/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch b/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch |
149 |
deleted file mode 100644 |
150 |
index e9fa875d247..00000000000 |
151 |
--- a/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch |
152 |
+++ /dev/null |
153 |
@@ -1,13 +0,0 @@ |
154 |
-diff --git a/src/im/account.cpp b/src/im/account.cpp |
155 |
-index f155334..f040fcd 100644 |
156 |
---- a/src/im/account.cpp |
157 |
-+++ b/src/im/account.cpp |
158 |
-@@ -272,7 +272,7 @@ void Account::setBuddyIcon(string filename) |
159 |
- else |
160 |
- { |
161 |
- char** prpl_formats = g_strsplit(prplinfo->icon_spec.format,",",0); |
162 |
-- ImlibLoadError err = IMLIB_LOAD_ERROR_UNKNOWN; |
163 |
-+ Imlib_Load_Error err = IMLIB_LOAD_ERROR_UNKNOWN; |
164 |
- |
165 |
- close(temp_fd); |
166 |
- /* Try to encode in a supported format. */ |
167 |
|
168 |
diff --git a/net-im/minbif/files/minbif.initd b/net-im/minbif/files/minbif.initd |
169 |
deleted file mode 100644 |
170 |
index 06cac415f61..00000000000 |
171 |
--- a/net-im/minbif/files/minbif.initd |
172 |
+++ /dev/null |
173 |
@@ -1,23 +0,0 @@ |
174 |
-#!/sbin/openrc-run |
175 |
-# Copyright 1999-2016 Gentoo Foundation |
176 |
-# Distributed under the terms of the GNU General Public License v2 |
177 |
- |
178 |
-MINBIF_EXEC="/usr/bin/minbif" |
179 |
- |
180 |
-depend() { |
181 |
- need logger net |
182 |
-} |
183 |
- |
184 |
-start() { |
185 |
- ebegin "Starting minbif" |
186 |
- start-stop-daemon --start --startas ${MINBIF_EXEC} \ |
187 |
- -c minbif:minbif --exec ${MINBIF_EXEC} -- \ |
188 |
- /etc/minbif/minbif.conf |
189 |
- eend $? |
190 |
-} |
191 |
- |
192 |
-stop() { |
193 |
- ebegin "Stopping minbif" |
194 |
- start-stop-daemon --stop --exec ${MINBIF_EXEC} |
195 |
- eend $? |
196 |
-} |
197 |
|
198 |
diff --git a/net-im/minbif/metadata.xml b/net-im/minbif/metadata.xml |
199 |
deleted file mode 100644 |
200 |
index 6f49eba8f49..00000000000 |
201 |
--- a/net-im/minbif/metadata.xml |
202 |
+++ /dev/null |
203 |
@@ -1,5 +0,0 @@ |
204 |
-<?xml version="1.0" encoding="UTF-8"?> |
205 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
206 |
-<pkgmetadata> |
207 |
-<!-- maintainer-needed --> |
208 |
-</pkgmetadata> |
209 |
|
210 |
diff --git a/net-im/minbif/minbif-1.0.5-r3.ebuild b/net-im/minbif/minbif-1.0.5-r3.ebuild |
211 |
deleted file mode 100644 |
212 |
index d438c5b97a6..00000000000 |
213 |
--- a/net-im/minbif/minbif-1.0.5-r3.ebuild |
214 |
+++ /dev/null |
215 |
@@ -1,83 +0,0 @@ |
216 |
-# Copyright 1999-2021 Gentoo Authors |
217 |
-# Distributed under the terms of the GNU General Public License v2 |
218 |
- |
219 |
-EAPI=7 |
220 |
- |
221 |
-inherit cmake |
222 |
- |
223 |
-DESCRIPTION="IRC gateway to IM networks" |
224 |
-HOMEPAGE="https://symlink.me/projects/minbif/wiki/" |
225 |
-SRC_URI="https://symlink.me/attachments/download/148/${P}.tar.gz" |
226 |
- |
227 |
-LICENSE="GPL-2" |
228 |
-SLOT="0" |
229 |
-KEYWORDS="amd64 ~arm x86" |
230 |
-IUSE="gnutls +imlib +libcaca pam xinetd" |
231 |
-REQUIRED_USE="libcaca? ( imlib )" |
232 |
- |
233 |
-DEPEND=" |
234 |
- acct-group/minbif |
235 |
- acct-user/minbif |
236 |
- net-im/pidgin |
237 |
- gnutls? ( net-libs/gnutls ) |
238 |
- imlib? ( media-libs/imlib2 ) |
239 |
- libcaca? ( |
240 |
- media-libs/imlib2 |
241 |
- media-libs/libcaca |
242 |
- ) |
243 |
- pam? ( sys-libs/pam ) |
244 |
-" |
245 |
-RDEPEND=" |
246 |
- ${DEPEND} |
247 |
- virtual/logger |
248 |
- xinetd? ( sys-apps/xinetd ) |
249 |
-" |
250 |
- |
251 |
-PATCHES=( |
252 |
- "${FILESDIR}/${PN}-1.0.5-glib-single-includes.patch" |
253 |
- "${FILESDIR}/${PN}-1.0.5-gcc47.patch" |
254 |
- "${FILESDIR}/${PN}-1.0.5-rename-imlib-load-error.patch" |
255 |
-) |
256 |
- |
257 |
-src_prepare() { |
258 |
- cmake_src_prepare |
259 |
- |
260 |
- sed "s/-Werror//g" -i CMakeLists.txt || die |
261 |
- |
262 |
- if use xinetd; then |
263 |
- sed "s/type\s=\s[0-9]/type = 0/" -i minbif.conf || die |
264 |
- fi |
265 |
-} |
266 |
- |
267 |
-src_configure() { |
268 |
- local mycmakeargs=( |
269 |
- -DCONF_PREFIX="${EPREFIX}"/etc/minbif |
270 |
- -DDOC_PREFIX="${EPREFIX}"/usr/share/doc/"${PF}" |
271 |
- -DENABLE_VIDEO=OFF |
272 |
- -DENABLE_TLS=$(usex gnutls) |
273 |
- -DENABLE_IMLIB=$(usex imlib) |
274 |
- -DENABLE_CACA=$(usex libcaca) |
275 |
- -DENABLE_PAM=$(usex pam) |
276 |
- ) |
277 |
- |
278 |
- cmake_src_configure |
279 |
-} |
280 |
- |
281 |
-src_install() { |
282 |
- cmake_src_install |
283 |
- keepdir /var/lib/minbif |
284 |
- fperms 700 /var/lib/minbif |
285 |
- fowners minbif:minbif /var/lib/minbif |
286 |
- |
287 |
- doman man/minbif.8 |
288 |
- |
289 |
- if use xinetd; then |
290 |
- insinto /etc/xinetd.d |
291 |
- newins doc/minbif.xinetd minbif |
292 |
- fi |
293 |
- |
294 |
- newinitd "${FILESDIR}"/minbif.initd minbif |
295 |
- |
296 |
- insinto /usr/share/minbif |
297 |
- doins -r scripts |
298 |
-} |
299 |
|
300 |
diff --git a/profiles/package.mask b/profiles/package.mask |
301 |
index 7ce764f69c1..96b7fac8818 100644 |
302 |
--- a/profiles/package.mask |
303 |
+++ b/profiles/package.mask |
304 |
@@ -296,11 +296,6 @@ media-sound/tapestrea |
305 |
# bug #793020, bug #692976, bug #741600, bug #703948, bug #674334. |
306 |
sci-misc/tango |
307 |
|
308 |
-# Sam James <sam@g.o> (2021-07-26) |
309 |
-# Fails to build with GCC 11. |
310 |
-# Removal on 2021-08-26. bug #788577. |
311 |
-net-im/minbif |
312 |
- |
313 |
# Andrew Ammerlaan <andrewammerlaan@g.o> (2021-07-12) |
314 |
# Version 3.3.0 suffers from ridiculously high CPU usage, this version has |
315 |
# therefore been retracted upstream. |