1 |
commit: eaf4188b0ddaf58777e96293aa4c5cf3866f328e |
2 |
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com> |
3 |
AuthorDate: Tue Feb 26 13:05:14 2019 +0000 |
4 |
Commit: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 26 20:28:47 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf4188b |
7 |
|
8 |
net-im/spectrum2: drop old version |
9 |
|
10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
11 |
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com> |
12 |
Signed-off-by: Andrey Utkin <andrey_utkin <AT> gentoo.org> |
13 |
|
14 |
net-im/spectrum2/Manifest | 1 - |
15 |
.../files/spectrum2-2.0.9-use_qt5_libcommuni.patch | 54 --------- |
16 |
net-im/spectrum2/spectrum2-2.0.9.ebuild | 125 --------------------- |
17 |
3 files changed, 180 deletions(-) |
18 |
|
19 |
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest |
20 |
index d19142bc269..3503d086f65 100644 |
21 |
--- a/net-im/spectrum2/Manifest |
22 |
+++ b/net-im/spectrum2/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
DIST spectrum2-2.0.10.tar.gz 844427 BLAKE2B cb57bede4bfe996219ca5d0e62167643eb51fe44fd607400de8c2640f3892af9d089b6d62d7c25485049ef2a37066b3f6de46bfb5a6b7107fef6eb31dcf736f3 SHA512 b74f6f543aaa923a589b8b0b1007dec260af6fb66e5475c0294216713568dd93f4f52f39e6cbe4c6263efb0a479ac4d8095709d758e4faac81fc7d4712fd0b2c |
25 |
-DIST spectrum2-2.0.9.tar.gz 842688 BLAKE2B 32cdb95c161aa97338895fb144200ac94d200aefb58300a8f55b03457b3aae1a0ef4a60311f0e2be8e3f3e331625d04ecd61a9583d07794c4398762e1348b939 SHA512 f111133d3d327619ebbeeaa8c329b09dbdbef9c66ec7bc06eb6eac8c54e144cbf2d81d2751699bf97ae1d1bf0a94581f3971394a7f06b9a4d69f6248f1497982 |
26 |
|
27 |
diff --git a/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch b/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch |
28 |
deleted file mode 100644 |
29 |
index 27e23db4484..00000000000 |
30 |
--- a/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch |
31 |
+++ /dev/null |
32 |
@@ -1,54 +0,0 @@ |
33 |
---- a/CMakeLists.txt 2018-09-17 09:46:40.000000000 +0200 |
34 |
-+++ b/CMakeLists.txt 2018-09-20 20:57:35.000000000 +0200 |
35 |
-@@ -182,8 +182,7 @@ |
36 |
- if(ENABLE_IRC) |
37 |
- find_package(Communi) |
38 |
- |
39 |
-- INCLUDE(FindQt4) |
40 |
-- FIND_PACKAGE(Qt4 COMPONENTS QtCore QtNetwork) |
41 |
-+ FIND_PACKAGE(Qt5 COMPONENTS Core Network) |
42 |
- # ADD_DEFINITIONS(${SWIFTEN_CFLAGS}) |
43 |
- ADD_DEFINITIONS(-DSUPPORT_LEGACY_CAPS) |
44 |
- # ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2) |
45 |
-@@ -321,7 +320,6 @@ |
46 |
- message("IRC plugin : yes") |
47 |
- include_directories(${QT_QTNETWORK_INCLUDE_DIR}) |
48 |
- include_directories(${IRC_INCLUDE_DIR}) |
49 |
-- include(${QT_USE_FILE}) |
50 |
- else() |
51 |
- if(ENABLE_IRC) |
52 |
- message("IRC plugin : no (install libCommuni and libprotobuf-dev)") |
53 |
---- a/backends/libcommuni/CMakeLists.txt 2018-09-17 09:46:40.000000000 +0200 |
54 |
-+++ b/backends/libcommuni/CMakeLists.txt 2018-09-20 20:59:31.000000000 +0200 |
55 |
-@@ -1,14 +1,14 @@ |
56 |
- cmake_minimum_required(VERSION 2.6) |
57 |
- FILE(GLOB SRC *.cpp) |
58 |
- FILE(GLOB HEADERS *.h) |
59 |
--QT4_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) |
60 |
--add_definitions(-DQT_NO_KEYWORDS) |
61 |
-+QT5_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) |
62 |
- ADD_EXECUTABLE(spectrum2_libcommuni_backend ${SRC}) |
63 |
-+include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}) |
64 |
- |
65 |
- if (NOT WIN32) |
66 |
-- target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt4::QtNetwork Qt4::QtCore transport pthread) |
67 |
-+ target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt5::Network Qt5::Core transport pthread) |
68 |
- else () |
69 |
-- target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt4::QtNetwork Qt4::QtCore transport) |
70 |
-+ target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt5::Network Qt5::Core transport) |
71 |
- endif() |
72 |
- INSTALL(TARGETS spectrum2_libcommuni_backend RUNTIME DESTINATION bin) |
73 |
- |
74 |
---- a/cmake_modules/FindCommuni.cmake 2018-09-17 09:46:40.000000000 +0200 |
75 |
-+++ b/cmake_modules/FindCommuni.cmake 2018-09-20 21:00:04.000000000 +0200 |
76 |
-@@ -1,8 +1,7 @@ |
77 |
--find_package(Qt4) |
78 |
--include( ${QT_USE_FILE} ) |
79 |
-+find_package(Qt5Network) |
80 |
- |
81 |
- FIND_LIBRARY(IRC_LIBRARY NAMES IrcCore PATHS ${QT_LIBRARY_DIR}) |
82 |
--FIND_PATH(IRC_INCLUDE_DIR NAMES "IrcCore/ircglobal.h" PATHS ${QT_INCLUDE_DIR} PATH_SUFFIXES Communi) |
83 |
-+FIND_PATH(IRC_INCLUDE_DIR NAMES "IrcCore/ircglobal.h" PATHS ${Qt5Core_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS}"/.." PATH_SUFFIXES Communi) |
84 |
- |
85 |
- # message( STATUS ${IRC_LIBRARY}) |
86 |
- if( IRC_LIBRARY AND IRC_INCLUDE_DIR ) |
87 |
|
88 |
diff --git a/net-im/spectrum2/spectrum2-2.0.9.ebuild b/net-im/spectrum2/spectrum2-2.0.9.ebuild |
89 |
deleted file mode 100644 |
90 |
index 5533572a03c..00000000000 |
91 |
--- a/net-im/spectrum2/spectrum2-2.0.9.ebuild |
92 |
+++ /dev/null |
93 |
@@ -1,125 +0,0 @@ |
94 |
-# Copyright 1999-2018 Gentoo Authors |
95 |
-# Distributed under the terms of the GNU General Public License v2 |
96 |
- |
97 |
-EAPI=6 |
98 |
- |
99 |
-PYTHON_COMPAT=( python2_7 ) |
100 |
- |
101 |
-inherit cmake-utils python-single-r1 systemd user |
102 |
- |
103 |
-DESCRIPTION="An open source instant messaging transport" |
104 |
-HOMEPAGE="https://www.spectrum.im" |
105 |
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz" |
106 |
- |
107 |
-LICENSE="GPL-2+" |
108 |
-SLOT="0" |
109 |
-KEYWORDS="~amd64" |
110 |
-IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp" |
111 |
-REQUIRED_USE="|| ( mysql postgres sqlite )" |
112 |
- |
113 |
-RDEPEND=" |
114 |
- dev-libs/boost:= |
115 |
- dev-libs/expat |
116 |
- dev-libs/libev:= |
117 |
- dev-libs/log4cxx |
118 |
- dev-libs/jsoncpp:= |
119 |
- dev-libs/openssl:0= |
120 |
- dev-libs/popt |
121 |
- dev-libs/protobuf:= |
122 |
- net-dns/libidn:0= |
123 |
- net-im/swift:= |
124 |
- net-misc/curl |
125 |
- sys-libs/zlib:= |
126 |
- frotz? ( !games-engines/frotz ) |
127 |
- irc? ( net-im/libcommuni ) |
128 |
- mysql? ( |
129 |
- || ( |
130 |
- dev-db/mariadb-connector-c |
131 |
- dev-db/mysql-connector-c |
132 |
- ) |
133 |
- ) |
134 |
- postgres? ( dev-libs/libpqxx:= ) |
135 |
- purple? ( |
136 |
- dev-libs/glib |
137 |
- net-im/pidgin:= |
138 |
- ) |
139 |
- sms? ( app-mobilephone/smstools ) |
140 |
- sqlite? ( dev-db/sqlite:3 ) |
141 |
- twitter? ( net-misc/curl ) |
142 |
- whatsapp? ( net-im/transwhat )" |
143 |
- |
144 |
-DEPEND=" |
145 |
- ${PYTHON_DEPS} |
146 |
- ${RDEPEND} |
147 |
- doc? ( app-doc/doxygen ) |
148 |
- test? ( |
149 |
- dev-python/sleekxmpp[${PYTHON_USEDEP}] |
150 |
- dev-util/cppunit |
151 |
- net-irc/ngircd |
152 |
- ) |
153 |
-" |
154 |
- |
155 |
-PATCHES=( |
156 |
- "${FILESDIR}/${P}-remove_debug_cflags.patch" |
157 |
- "${FILESDIR}/${P}-use_qt5_libcommuni.patch" |
158 |
-) |
159 |
- |
160 |
-# Tests are currently restricted, as they do completly fail |
161 |
-RESTRICT="test" |
162 |
- |
163 |
-pkg_setup() { |
164 |
- enewgroup spectrum |
165 |
- enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum |
166 |
- |
167 |
- use test && python-single-r1_pkg_setup |
168 |
-} |
169 |
- |
170 |
-src_prepare() { |
171 |
- # Respect users LDFLAGS |
172 |
- sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die |
173 |
- |
174 |
- # Respect users CFLAGS, when compiling for debug mode |
175 |
- # Since Spectrum2 searches for a qt4 compiled libcommuni, |
176 |
- # it must be patched, to find the qt5 compiled libcommuni, |
177 |
- # See: https://github.com/SpectrumIM/spectrum2/pull/253 |
178 |
- cmake-utils_src_prepare |
179 |
-} |
180 |
- |
181 |
-src_configure() { |
182 |
- use debug && CMAKE_BUILD_TYPE="Debug" |
183 |
- |
184 |
- local mycmakeargs=( |
185 |
- -DENABLE_DOCS="$(usex doc)" |
186 |
- -DENABLE_FROTZ="$(usex frotz)" |
187 |
- -DENABLE_IRC="$(usex irc)" |
188 |
- -DENABLE_MYSQL="$(usex mysql)" |
189 |
- -DENABLE_PQXX="$(usex postgres)" |
190 |
- -DENABLE_PURPLE="$(usex purple)" |
191 |
- -DENABLE_SMSTOOLS3="$(usex sms)" |
192 |
- -DENABLE_SQLITE3="$(usex sqlite)" |
193 |
- -DENABLE_TESTS="$(usex test)" |
194 |
- -DENABLE_TWITTER="$(usex twitter)" |
195 |
- -DENABLE_XMPP="$(usex xmpp)" |
196 |
- -DLIB_INSTALL_DIR="$(get_libdir)" |
197 |
- ) |
198 |
- |
199 |
- cmake-utils_src_configure |
200 |
-} |
201 |
- |
202 |
-src_test() { |
203 |
- cd tests/libtransport && "${EPYTHON}" ../start.py || die |
204 |
-} |
205 |
- |
206 |
-src_install() { |
207 |
- cmake-utils_src_install |
208 |
- |
209 |
- diropts -o spectrum -g spectrum |
210 |
- keepdir /var/log/spectrum2 /var/lib/spectrum2 |
211 |
- diropts |
212 |
- |
213 |
- newinitd "${FILESDIR}"/spectrum2.initd spectrum2 |
214 |
- systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service |
215 |
- systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles spectrum2.conf |
216 |
- |
217 |
- einstalldocs |
218 |
-} |