1 |
commit: 4b0cc208da074b6d03babb1a8aaeef873bfbd72d |
2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 2 11:39:47 2020 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 2 12:31:38 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0cc208 |
7 |
|
8 |
net-im/spectrum2: drop old version |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
11 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
12 |
|
13 |
net-im/spectrum2/Manifest | 1 - |
14 |
.../spectrum2-2.0.12-boost-173-compatibility.patch | 21 ---- |
15 |
.../spectrum2-2.0.12-gcc-10-compatibility.patch | 54 ---------- |
16 |
net-im/spectrum2/spectrum2-2.0.12-r4.ebuild | 112 --------------------- |
17 |
4 files changed, 188 deletions(-) |
18 |
|
19 |
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest |
20 |
index 5122ae14a1d..bdab4cc72da 100644 |
21 |
--- a/net-im/spectrum2/Manifest |
22 |
+++ b/net-im/spectrum2/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B 22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7 SHA512 bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36 |
25 |
DIST spectrum2-2.0.13.tar.gz 840234 BLAKE2B 45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792 SHA512 8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7 |
26 |
|
27 |
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch |
28 |
deleted file mode 100644 |
29 |
index b9a8adeee5a..00000000000 |
30 |
--- a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch |
31 |
+++ /dev/null |
32 |
@@ -1,21 +0,0 @@ |
33 |
-From 1a6ede2dbf0f621e3e6864675befcbc32e02c8b6 Mon Sep 17 00:00:00 2001 |
34 |
-From: Conrad Kostecki <kostecki@×××.de> |
35 |
-Date: Thu, 14 May 2020 10:34:43 +0200 |
36 |
-Subject: [PATCH] Fix compilation with boost-1.73 |
37 |
- |
38 |
-Signed-off-by: Conrad Kostecki <conrad@××××××××.com> |
39 |
---- |
40 |
- include/transport/ThreadPool.h | 1 + |
41 |
- 1 file changed, 1 insertion(+) |
42 |
- |
43 |
-diff --git a/include/transport/ThreadPool.h b/include/transport/ThreadPool.h |
44 |
-index 5902f965..ffd07c8e 100644 |
45 |
---- a/include/transport/ThreadPool.h |
46 |
-+++ b/include/transport/ThreadPool.h |
47 |
-@@ -1,5 +1,6 @@ |
48 |
- #pragma once |
49 |
- |
50 |
-+#include <boost/bind.hpp> |
51 |
- #include <boost/thread.hpp> |
52 |
- #include <boost/thread/mutex.hpp> |
53 |
- #include <queue> |
54 |
|
55 |
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch |
56 |
deleted file mode 100644 |
57 |
index ad13208b3e1..00000000000 |
58 |
--- a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch |
59 |
+++ /dev/null |
60 |
@@ -1,54 +0,0 @@ |
61 |
-From 95e6968c0f8c95f6bd817e5081e0b10dea9d4269 Mon Sep 17 00:00:00 2001 |
62 |
-From: Conrad Kostecki <kostecki@×××.de> |
63 |
-Date: Wed, 13 May 2020 14:22:27 +0200 |
64 |
-Subject: [PATCH] Fix dfrotz compilation with GCC >= 10 |
65 |
- |
66 |
-Since GCC enables by default -fno-common, |
67 |
-the compilation of dfrotz due multiple definitions will fail. |
68 |
- |
69 |
-Signed-off-by: Conrad Kostecki <conrad@××××××××.com> |
70 |
---- |
71 |
- backends/frotz/dfrotz/dumb/dumb_init.c | 2 +- |
72 |
- backends/frotz/dfrotz/dumb/dumb_input.c | 2 +- |
73 |
- backends/frotz/dfrotz/dumb/dumb_output.c | 2 +- |
74 |
- 3 files changed, 3 insertions(+), 3 deletions(-) |
75 |
- |
76 |
-diff --git a/backends/frotz/dfrotz/dumb/dumb_init.c b/backends/frotz/dfrotz/dumb/dumb_init.c |
77 |
-index 4b9c6704..35295b74 100644 |
78 |
---- a/backends/frotz/dfrotz/dumb/dumb_init.c |
79 |
-+++ b/backends/frotz/dfrotz/dumb/dumb_init.c |
80 |
-@@ -7,7 +7,7 @@ |
81 |
- |
82 |
- #include "dumb_frotz.h" |
83 |
- |
84 |
--f_setup_t f_setup; |
85 |
-+extern f_setup_t f_setup; |
86 |
- |
87 |
- #define INFORMATION "\ |
88 |
- An interpreter for all Infocom and other Z-Machine games.\n\ |
89 |
-diff --git a/backends/frotz/dfrotz/dumb/dumb_input.c b/backends/frotz/dfrotz/dumb/dumb_input.c |
90 |
-index 4149b2b0..88fc8ae5 100644 |
91 |
---- a/backends/frotz/dfrotz/dumb/dumb_input.c |
92 |
-+++ b/backends/frotz/dfrotz/dumb/dumb_input.c |
93 |
-@@ -5,7 +5,7 @@ |
94 |
- */ |
95 |
- |
96 |
- #include "dumb_frotz.h" |
97 |
--f_setup_t f_setup; |
98 |
-+extern f_setup_t f_setup; |
99 |
- |
100 |
- static char runtime_usage[] = |
101 |
- "DUMB-FROTZ runtime help:\n" |
102 |
-diff --git a/backends/frotz/dfrotz/dumb/dumb_output.c b/backends/frotz/dfrotz/dumb/dumb_output.c |
103 |
-index 9e505167..6dc7db82 100644 |
104 |
---- a/backends/frotz/dfrotz/dumb/dumb_output.c |
105 |
-+++ b/backends/frotz/dfrotz/dumb/dumb_output.c |
106 |
-@@ -7,7 +7,7 @@ |
107 |
- |
108 |
- #include "dumb_frotz.h" |
109 |
- |
110 |
--f_setup_t f_setup; |
111 |
-+extern f_setup_t f_setup; |
112 |
- |
113 |
- static bool show_line_numbers = FALSE; |
114 |
- static bool show_line_types = -1; |
115 |
|
116 |
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild |
117 |
deleted file mode 100644 |
118 |
index 3bbf840a522..00000000000 |
119 |
--- a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild |
120 |
+++ /dev/null |
121 |
@@ -1,112 +0,0 @@ |
122 |
-# Copyright 1999-2020 Gentoo Authors |
123 |
-# Distributed under the terms of the GNU General Public License v2 |
124 |
- |
125 |
-EAPI=7 |
126 |
- |
127 |
-inherit cmake systemd |
128 |
- |
129 |
-DESCRIPTION="An open source instant messaging transport" |
130 |
-HOMEPAGE="https://www.spectrum.im" |
131 |
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz" |
132 |
- |
133 |
-LICENSE="GPL-2+" |
134 |
-SLOT="0" |
135 |
-KEYWORDS="amd64" |
136 |
-IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp" |
137 |
-REQUIRED_USE=" |
138 |
- || ( mysql postgres sqlite ) |
139 |
- test? ( irc ) |
140 |
-" |
141 |
-RESTRICT="!test? ( test )" |
142 |
- |
143 |
-RDEPEND=" |
144 |
- acct-group/spectrum |
145 |
- acct-user/spectrum |
146 |
- dev-libs/boost:=[nls] |
147 |
- dev-libs/expat |
148 |
- dev-libs/libev:= |
149 |
- dev-libs/log4cxx |
150 |
- dev-libs/jsoncpp:= |
151 |
- dev-libs/openssl:0= |
152 |
- dev-libs/popt |
153 |
- dev-libs/protobuf:= |
154 |
- net-dns/libidn:0= |
155 |
- >=net-im/swift-4.0.2-r2:= |
156 |
- net-misc/curl |
157 |
- sys-libs/zlib:= |
158 |
- frotz? ( !games-engines/frotz ) |
159 |
- irc? ( net-im/libcommuni ) |
160 |
- mysql? ( |
161 |
- || ( |
162 |
- dev-db/mariadb-connector-c |
163 |
- dev-db/mysql-connector-c |
164 |
- ) |
165 |
- ) |
166 |
- postgres? ( dev-libs/libpqxx:= ) |
167 |
- purple? ( |
168 |
- dev-libs/glib |
169 |
- net-im/pidgin:= |
170 |
- ) |
171 |
- sms? ( app-mobilephone/smstools ) |
172 |
- sqlite? ( dev-db/sqlite:3 ) |
173 |
- twitter? ( net-misc/curl ) |
174 |
- whatsapp? ( net-im/transwhat )" |
175 |
- |
176 |
-DEPEND=" |
177 |
- ${RDEPEND} |
178 |
- doc? ( app-doc/doxygen ) |
179 |
- test? ( dev-util/cppunit ) |
180 |
-" |
181 |
- |
182 |
-PATCHES=( |
183 |
- "${FILESDIR}/${P}-boost-173-compatibility.patch" |
184 |
- "${FILESDIR}/${P}-gcc-10-compatibility.patch" |
185 |
- "${FILESDIR}/${PN}-2.0.13-libpqxx-7-compatibility.patch" |
186 |
- "${FILESDIR}/${PN}-2.0.13-musl-compatibility.patch" |
187 |
-) |
188 |
- |
189 |
-src_prepare() { |
190 |
- # Respect users LDFLAGS |
191 |
- sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die |
192 |
- |
193 |
- cmake_src_prepare |
194 |
-} |
195 |
- |
196 |
-src_configure() { |
197 |
- local mycmakeargs=( |
198 |
- -DENABLE_DOCS="$(usex doc)" |
199 |
- -DENABLE_FROTZ="$(usex frotz)" |
200 |
- -DENABLE_IRC="$(usex irc)" |
201 |
- -DENABLE_MYSQL="$(usex mysql)" |
202 |
- -DENABLE_PQXX="$(usex postgres)" |
203 |
- -DENABLE_PURPLE="$(usex purple)" |
204 |
- $(usex irc '-DENABLE_QT4=OFF' '') |
205 |
- -DENABLE_SMSTOOLS3="$(usex sms)" |
206 |
- -DENABLE_SQLITE3="$(usex sqlite)" |
207 |
- -DENABLE_TESTS="$(usex test)" |
208 |
- -DENABLE_TWITTER="$(usex twitter)" |
209 |
- -DENABLE_XMPP="$(usex xmpp)" |
210 |
- -DLIB_INSTALL_DIR="$(get_libdir)" |
211 |
- ) |
212 |
- |
213 |
- cmake_src_configure |
214 |
-} |
215 |
- |
216 |
-src_test() { |
217 |
- cd "${BUILD_DIR}/tests/libtransport" || die |
218 |
- ./libtransport_test || die |
219 |
-} |
220 |
- |
221 |
-src_install() { |
222 |
- cmake_src_install |
223 |
- |
224 |
- diropts -o spectrum -g spectrum |
225 |
- keepdir /var/log/spectrum2 /var/lib/spectrum2 |
226 |
- diropts |
227 |
- |
228 |
- newinitd "${FILESDIR}"/spectrum2.initd spectrum2 |
229 |
- systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service |
230 |
- systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf |
231 |
- |
232 |
- einstalldocs |
233 |
-} |