diff options
author | Conrad Kostecki <conrad@kostecki.com> | 2019-02-26 14:05:14 +0100 |
---|---|---|
committer | Andrey Utkin <andrey_utkin@gentoo.org> | 2019-02-26 20:28:47 +0000 |
commit | eaf4188b0ddaf58777e96293aa4c5cf3866f328e (patch) | |
tree | acd706ed2cbb028d71143a3892fab8cbb279b947 /net-im/spectrum2 | |
parent | net-im/spectrum2: boost must be with nls (diff) | |
download | gentoo-eaf4188b0ddaf58777e96293aa4c5cf3866f328e.tar.gz gentoo-eaf4188b0ddaf58777e96293aa4c5cf3866f328e.tar.bz2 gentoo-eaf4188b0ddaf58777e96293aa4c5cf3866f328e.zip |
net-im/spectrum2: drop old version
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
Signed-off-by: Andrey Utkin <andrey_utkin@gentoo.org>
Diffstat (limited to 'net-im/spectrum2')
-rw-r--r-- | net-im/spectrum2/Manifest | 1 | ||||
-rw-r--r-- | net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch | 54 | ||||
-rw-r--r-- | net-im/spectrum2/spectrum2-2.0.9.ebuild | 125 |
3 files changed, 0 insertions, 180 deletions
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest index d19142bc269d..3503d086f653 100644 --- a/net-im/spectrum2/Manifest +++ b/net-im/spectrum2/Manifest @@ -1,2 +1 @@ DIST spectrum2-2.0.10.tar.gz 844427 BLAKE2B cb57bede4bfe996219ca5d0e62167643eb51fe44fd607400de8c2640f3892af9d089b6d62d7c25485049ef2a37066b3f6de46bfb5a6b7107fef6eb31dcf736f3 SHA512 b74f6f543aaa923a589b8b0b1007dec260af6fb66e5475c0294216713568dd93f4f52f39e6cbe4c6263efb0a479ac4d8095709d758e4faac81fc7d4712fd0b2c -DIST spectrum2-2.0.9.tar.gz 842688 BLAKE2B 32cdb95c161aa97338895fb144200ac94d200aefb58300a8f55b03457b3aae1a0ef4a60311f0e2be8e3f3e331625d04ecd61a9583d07794c4398762e1348b939 SHA512 f111133d3d327619ebbeeaa8c329b09dbdbef9c66ec7bc06eb6eac8c54e144cbf2d81d2751699bf97ae1d1bf0a94581f3971394a7f06b9a4d69f6248f1497982 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 deleted file mode 100644 index 27e23db44848..000000000000 --- a/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/CMakeLists.txt 2018-09-17 09:46:40.000000000 +0200 -+++ b/CMakeLists.txt 2018-09-20 20:57:35.000000000 +0200 -@@ -182,8 +182,7 @@ - if(ENABLE_IRC) - find_package(Communi) - -- INCLUDE(FindQt4) -- FIND_PACKAGE(Qt4 COMPONENTS QtCore QtNetwork) -+ FIND_PACKAGE(Qt5 COMPONENTS Core Network) - # ADD_DEFINITIONS(${SWIFTEN_CFLAGS}) - ADD_DEFINITIONS(-DSUPPORT_LEGACY_CAPS) - # ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2) -@@ -321,7 +320,6 @@ - message("IRC plugin : yes") - include_directories(${QT_QTNETWORK_INCLUDE_DIR}) - include_directories(${IRC_INCLUDE_DIR}) -- include(${QT_USE_FILE}) - else() - if(ENABLE_IRC) - message("IRC plugin : no (install libCommuni and libprotobuf-dev)") ---- a/backends/libcommuni/CMakeLists.txt 2018-09-17 09:46:40.000000000 +0200 -+++ b/backends/libcommuni/CMakeLists.txt 2018-09-20 20:59:31.000000000 +0200 -@@ -1,14 +1,14 @@ - cmake_minimum_required(VERSION 2.6) - FILE(GLOB SRC *.cpp) - FILE(GLOB HEADERS *.h) --QT4_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) --add_definitions(-DQT_NO_KEYWORDS) -+QT5_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - ADD_EXECUTABLE(spectrum2_libcommuni_backend ${SRC}) -+include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}) - - if (NOT WIN32) -- target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt4::QtNetwork Qt4::QtCore transport pthread) -+ target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt5::Network Qt5::Core transport pthread) - else () -- target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt4::QtNetwork Qt4::QtCore transport) -+ target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt5::Network Qt5::Core transport) - endif() - INSTALL(TARGETS spectrum2_libcommuni_backend RUNTIME DESTINATION bin) - ---- a/cmake_modules/FindCommuni.cmake 2018-09-17 09:46:40.000000000 +0200 -+++ b/cmake_modules/FindCommuni.cmake 2018-09-20 21:00:04.000000000 +0200 -@@ -1,8 +1,7 @@ --find_package(Qt4) --include( ${QT_USE_FILE} ) -+find_package(Qt5Network) - - FIND_LIBRARY(IRC_LIBRARY NAMES IrcCore PATHS ${QT_LIBRARY_DIR}) --FIND_PATH(IRC_INCLUDE_DIR NAMES "IrcCore/ircglobal.h" PATHS ${QT_INCLUDE_DIR} PATH_SUFFIXES Communi) -+FIND_PATH(IRC_INCLUDE_DIR NAMES "IrcCore/ircglobal.h" PATHS ${Qt5Core_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS}"/.." PATH_SUFFIXES Communi) - - # message( STATUS ${IRC_LIBRARY}) - if( IRC_LIBRARY AND IRC_INCLUDE_DIR ) diff --git a/net-im/spectrum2/spectrum2-2.0.9.ebuild b/net-im/spectrum2/spectrum2-2.0.9.ebuild deleted file mode 100644 index 5533572a03cf..000000000000 --- a/net-im/spectrum2/spectrum2-2.0.9.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils python-single-r1 systemd user - -DESCRIPTION="An open source instant messaging transport" -HOMEPAGE="https://www.spectrum.im" -SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp" -REQUIRED_USE="|| ( mysql postgres sqlite )" - -RDEPEND=" - dev-libs/boost:= - dev-libs/expat - dev-libs/libev:= - dev-libs/log4cxx - dev-libs/jsoncpp:= - dev-libs/openssl:0= - dev-libs/popt - dev-libs/protobuf:= - net-dns/libidn:0= - net-im/swift:= - net-misc/curl - sys-libs/zlib:= - frotz? ( !games-engines/frotz ) - irc? ( net-im/libcommuni ) - mysql? ( - || ( - dev-db/mariadb-connector-c - dev-db/mysql-connector-c - ) - ) - postgres? ( dev-libs/libpqxx:= ) - purple? ( - dev-libs/glib - net-im/pidgin:= - ) - sms? ( app-mobilephone/smstools ) - sqlite? ( dev-db/sqlite:3 ) - twitter? ( net-misc/curl ) - whatsapp? ( net-im/transwhat )" - -DEPEND=" - ${PYTHON_DEPS} - ${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( - dev-python/sleekxmpp[${PYTHON_USEDEP}] - dev-util/cppunit - net-irc/ngircd - ) -" - -PATCHES=( - "${FILESDIR}/${P}-remove_debug_cflags.patch" - "${FILESDIR}/${P}-use_qt5_libcommuni.patch" -) - -# Tests are currently restricted, as they do completly fail -RESTRICT="test" - -pkg_setup() { - enewgroup spectrum - enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum - - use test && python-single-r1_pkg_setup -} - -src_prepare() { - # Respect users LDFLAGS - sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die - - # Respect users CFLAGS, when compiling for debug mode - # Since Spectrum2 searches for a qt4 compiled libcommuni, - # it must be patched, to find the qt5 compiled libcommuni, - # See: https://github.com/SpectrumIM/spectrum2/pull/253 - cmake-utils_src_prepare -} - -src_configure() { - use debug && CMAKE_BUILD_TYPE="Debug" - - local mycmakeargs=( - -DENABLE_DOCS="$(usex doc)" - -DENABLE_FROTZ="$(usex frotz)" - -DENABLE_IRC="$(usex irc)" - -DENABLE_MYSQL="$(usex mysql)" - -DENABLE_PQXX="$(usex postgres)" - -DENABLE_PURPLE="$(usex purple)" - -DENABLE_SMSTOOLS3="$(usex sms)" - -DENABLE_SQLITE3="$(usex sqlite)" - -DENABLE_TESTS="$(usex test)" - -DENABLE_TWITTER="$(usex twitter)" - -DENABLE_XMPP="$(usex xmpp)" - -DLIB_INSTALL_DIR="$(get_libdir)" - ) - - cmake-utils_src_configure -} - -src_test() { - cd tests/libtransport && "${EPYTHON}" ../start.py || die -} - -src_install() { - cmake-utils_src_install - - diropts -o spectrum -g spectrum - keepdir /var/log/spectrum2 /var/lib/spectrum2 - diropts - - newinitd "${FILESDIR}"/spectrum2.initd spectrum2 - systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service - systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles spectrum2.conf - - einstalldocs -} |