1 |
commit: 9c4251f66f747ef671f52eec8bf6463109f4bc46 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 31 10:26:54 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 31 10:29:52 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4251f6 |
7 |
|
8 |
net-irc/quassel-irssi: Remove last-rited pkg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/719728 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
net-irc/quassel-irssi/Manifest | 1 - |
14 |
...rssi-0_p20170107-fix_build_with_irssi_1.0.patch | 38 ------------- |
15 |
.../quassel-irssi-0_p20170107-tls-ssl-rename.patch | 20 ------- |
16 |
net-irc/quassel-irssi/metadata.xml | 13 ----- |
17 |
.../quassel-irssi-0_p20170107-r1.ebuild | 63 ---------------------- |
18 |
profiles/package.mask | 7 --- |
19 |
6 files changed, 142 deletions(-) |
20 |
|
21 |
diff --git a/net-irc/quassel-irssi/Manifest b/net-irc/quassel-irssi/Manifest |
22 |
deleted file mode 100644 |
23 |
index 9b28a3223c4..00000000000 |
24 |
--- a/net-irc/quassel-irssi/Manifest |
25 |
+++ /dev/null |
26 |
@@ -1 +0,0 @@ |
27 |
-DIST quassel-irssi-0_p20170107-r1.zip 42745 BLAKE2B 5f15930aa1c3c5f96cf3f36c519465c271c7e0a0884f4bd5b09cbcbb10fb862864b37893231d9c0f903c38fc018bda3530ddc420ec7f8f39228a5860939a1962 SHA512 1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814 |
28 |
|
29 |
diff --git a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch |
30 |
deleted file mode 100644 |
31 |
index ddd96ff3331..00000000000 |
32 |
--- a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch |
33 |
+++ /dev/null |
34 |
@@ -1,38 +0,0 @@ |
35 |
-From 35555999f810f49b49ca2a6ec13d4f5b03503007 Mon Sep 17 00:00:00 2001 |
36 |
-From: Pierre-Hugues Husson <husson@××××××.com> |
37 |
-Date: Wed, 11 Jan 2017 10:24:08 +0100 |
38 |
-Subject: [PATCH] Fix build for irssi 1.0.0 |
39 |
- |
40 |
---- |
41 |
- core/quassel-net.c | 10 +++++++--- |
42 |
- 1 file changed, 7 insertions(+), 3 deletions(-) |
43 |
- |
44 |
-diff --git a/core/quassel-net.c b/core/quassel-net.c |
45 |
-index 8a6eb55..9ab4829 100644 |
46 |
---- a/core/quassel-net.c |
47 |
-+++ b/core/quassel-net.c |
48 |
-@@ -117,6 +117,10 @@ static const char *get_nick_flags(SERVER_REC *server) { |
49 |
- return ""; |
50 |
- } |
51 |
- |
52 |
-+// IRSSI_ABI_VERSION was introduced in 0.8.18 |
53 |
-+#if !defined(IRSSI_ABI_VERSION) || IRSSI_ABI_VERSION < 6 |
54 |
-+# define use_tls use_ssl |
55 |
-+#endif |
56 |
- static SERVER_REC* quassel_server_init_connect(SERVER_CONNECT_REC* conn) { |
57 |
- Quassel_SERVER_CONNECT_REC *r = (Quassel_SERVER_CONNECT_REC*) conn; |
58 |
- |
59 |
-@@ -132,10 +136,10 @@ static SERVER_REC* quassel_server_init_connect(SERVER_CONNECT_REC* conn) { |
60 |
- ret->got = 0; |
61 |
- server_connect_ref(SERVER_CONNECT(conn)); |
62 |
- |
63 |
-- if(conn->use_ssl) { |
64 |
-+ if(conn->use_tls) |
65 |
- ret->ssl = 1; |
66 |
-- } |
67 |
-- ret->connrec->use_ssl = 0; |
68 |
-+ |
69 |
-+ ret->connrec->use_tls = 0; |
70 |
- |
71 |
- ret->channels_join = quassel_irssi_channels_join; |
72 |
- ret->send_message = quassel_irssi_send_message; |
73 |
|
74 |
diff --git a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch |
75 |
deleted file mode 100644 |
76 |
index b38154ea055..00000000000 |
77 |
--- a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch |
78 |
+++ /dev/null |
79 |
@@ -1,20 +0,0 @@ |
80 |
-diff -rupN quassel-irssi-7b034e3a8084d08e87869a96795ab59aa4901c74/core/irssi/network-openssl.c quassel-irssi-patched/core/irssi/network-openssl.c |
81 |
---- quassel-irssi-7b034e3a8084d08e87869a96795ab59aa4901c74/core/irssi/network-openssl.c 2017-01-19 14:07:24.000000000 -0500 |
82 |
-+++ quassel-irssi-patched/core/irssi/network-openssl.c 2017-01-20 16:07:01.599114339 -0500 |
83 |
-@@ -437,11 +437,11 @@ GIOChannel *irssi_ssl_get_iochannel(GIOC |
84 |
- SSL *ssl; |
85 |
- SSL_CTX *ctx = NULL; |
86 |
- |
87 |
-- const char *mycert = server->connrec->ssl_cert; |
88 |
-- const char *mypkey = server->connrec->ssl_pkey; |
89 |
-- const char *cafile = server->connrec->ssl_cafile; |
90 |
-- const char *capath = server->connrec->ssl_capath; |
91 |
-- gboolean verify = server->connrec->ssl_verify; |
92 |
-+ const char *mycert = server->connrec->tls_cert; |
93 |
-+ const char *mypkey = server->connrec->tls_pkey; |
94 |
-+ const char *cafile = server->connrec->tls_cafile; |
95 |
-+ const char *capath = server->connrec->tls_capath; |
96 |
-+ gboolean verify = server->connrec->tls_verify; |
97 |
- |
98 |
- g_return_val_if_fail(handle != NULL, NULL); |
99 |
- |
100 |
|
101 |
diff --git a/net-irc/quassel-irssi/metadata.xml b/net-irc/quassel-irssi/metadata.xml |
102 |
deleted file mode 100644 |
103 |
index fe6b0fafc99..00000000000 |
104 |
--- a/net-irc/quassel-irssi/metadata.xml |
105 |
+++ /dev/null |
106 |
@@ -1,13 +0,0 @@ |
107 |
-<?xml version="1.0" encoding="UTF-8"?> |
108 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
109 |
-<pkgmetadata> |
110 |
- <!-- maintainer-needed --> |
111 |
- <upstream> |
112 |
- <remote-id type="github">phhusson/quassel-irssi</remote-id> |
113 |
- <bugs-to>https://github.com/phhusson/quassel-irssi/issues</bugs-to> |
114 |
- </upstream> |
115 |
- <longdescription lang="en"> |
116 |
- A plugin for the Irssi IRC client to allow connecting to a Quassel core |
117 |
- hosted either locally or remotely. |
118 |
- </longdescription> |
119 |
-</pkgmetadata> |
120 |
|
121 |
diff --git a/net-irc/quassel-irssi/quassel-irssi-0_p20170107-r1.ebuild b/net-irc/quassel-irssi/quassel-irssi-0_p20170107-r1.ebuild |
122 |
deleted file mode 100644 |
123 |
index 97d9cc73ba2..00000000000 |
124 |
--- a/net-irc/quassel-irssi/quassel-irssi-0_p20170107-r1.ebuild |
125 |
+++ /dev/null |
126 |
@@ -1,63 +0,0 @@ |
127 |
-# Copyright 1999-2017 Gentoo Foundation |
128 |
-# Distributed under the terms of the GNU General Public License v2 |
129 |
- |
130 |
-EAPI=6 |
131 |
- |
132 |
-inherit toolchain-funcs |
133 |
- |
134 |
-# https://github.com/phhusson/quassel-irssi/pull/10 if accepted will |
135 |
-# allow QuasselC to be installed as a separate package. |
136 |
- |
137 |
-# Commit Date: Sat, 7 Jan 2017 14:50:15 +0000 |
138 |
-COMMIT="f23e97a6188129cfae4c52f7e1a75940185454f4" |
139 |
- |
140 |
-DESCRIPTION="Irssi module to connect to Quassel cores." |
141 |
-HOMEPAGE="https://github.com/phhusson/quassel-irssi/" |
142 |
-SRC_URI="https://github.com/phhusson/${PN}/archive/${COMMIT}.zip -> ${PF}.zip" |
143 |
- |
144 |
-LICENSE="GPL-3" |
145 |
-SLOT="0" |
146 |
-KEYWORDS="~amd64 ~x86" |
147 |
- |
148 |
-# fails to build with irssi-1.0 |
149 |
-RDEPEND=">=net-irc/irssi-1.0.0" |
150 |
-DEPEND="${RDEPEND} |
151 |
- net-libs/quasselc" |
152 |
- |
153 |
-S="${WORKDIR}/${PN}-${COMMIT}" |
154 |
- |
155 |
-# Patches for building against irssi-1.0, obtained from: |
156 |
-# http://pkgs.fedoraproject.org/cgit/rpms/quassel-irssi.git/plain/35555999f810f49b49ca2a6ec13d4f5b03503007.patch |
157 |
-# http://pkgs.fedoraproject.org/cgit/rpms/quassel-irssi.git/plain/quassel-irssi-tls-ssl-rename.patch |
158 |
-PATCHES=( |
159 |
- "${FILESDIR}/${P}-fix_build_with_irssi_1.0.patch" |
160 |
- "${FILESDIR}/${P}-tls-ssl-rename.patch" |
161 |
-) |
162 |
- |
163 |
-src_prepare() { |
164 |
- default |
165 |
- |
166 |
- sed -e "s:pkg-config:$(tc-getPKG_CONFIG):" \ |
167 |
- -e 's:^CFLAGS=.*:CFLAGS+=$(IRSSI_CFLAGS) $(QUASSELC_FLAGS):' \ |
168 |
- -i "${S}/core/Makefile" || die |
169 |
- |
170 |
- sed -e 's:gcc -shared:$(CC) -shared:' -i "${S}/core/Makefile" || die |
171 |
- |
172 |
- tc-export CC |
173 |
- export SYSTEM_QUASSELC=1 |
174 |
-} |
175 |
- |
176 |
-src_compile() { |
177 |
- emake IRSSI_LIB="${ROOT}usr/$(get_libdir)/irssi" -C core |
178 |
-} |
179 |
- |
180 |
-src_install() { |
181 |
- emake DESTDIR="${D}" LIBDIR="${ROOT}usr/$(get_libdir)" -C core install |
182 |
- default |
183 |
-} |
184 |
- |
185 |
-pkg_postinst() { |
186 |
- elog "Note that this requires additional configuration of your irssi client. See" |
187 |
- elog " ${ROOT}usr/share/doc/${P}/README.md.bz2'" |
188 |
- elog "for instructions." |
189 |
-} |
190 |
|
191 |
diff --git a/profiles/package.mask b/profiles/package.mask |
192 |
index f0c955a429a..a2b5f46f5d3 100644 |
193 |
--- a/profiles/package.mask |
194 |
+++ b/profiles/package.mask |
195 |
@@ -232,13 +232,6 @@ sys-cluster/openais |
196 |
# Remove after 2020-06-28 |
197 |
net-libs/quasselc |
198 |
|
199 |
-# Jonas Stein <jstein@g.o> (2020-04-28) |
200 |
-# Upstream stopped development. Package should depend on |
201 |
-# <net-irc/quassel-0.13 which is no longer in the tree. |
202 |
-# Bug #719728 |
203 |
-# Remove after 2020-05-28 |
204 |
-net-irc/quassel-irssi |
205 |
- |
206 |
# Michał Górny <mgorny@g.o> (2020-04-26) |
207 |
# Unmaintained. Stuck on Python 3.6. No revdeps. |
208 |
# Removal in 30 days. Bug #719604. |