diff options
Diffstat (limited to 'net-im/spectrum2')
| -rw-r--r-- | net-im/spectrum2/Manifest | 2 | ||||
| -rw-r--r-- | net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch | 21 | ||||
| -rw-r--r-- | net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch | 54 | ||||
| -rw-r--r-- | net-im/spectrum2/files/spectrum2.initd | 4 | ||||
| -rw-r--r-- | net-im/spectrum2/metadata.xml | 9 | ||||
| -rw-r--r-- | net-im/spectrum2/spectrum2-2.2.1.ebuild (renamed from net-im/spectrum2/spectrum2-2.0.12-r2.ebuild) | 80 |
6 files changed, 46 insertions, 124 deletions
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest index 7c194ddbe6e0..ff04b5209c99 100644 --- a/net-im/spectrum2/Manifest +++ b/net-im/spectrum2/Manifest @@ -1 +1 @@ -DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B 22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7 SHA512 bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36 +DIST spectrum2-2.2.1.tar.gz 666509 BLAKE2B c946cea46d99bd8126ad8270a8a01140d75ff989cf0cc0e2ff19ac830c01df4ad02a296959077f5a56707d509bafe937515f78adf7361a2e261497f5299dfe7d SHA512 c752f043f337157125da800ec5e5ed41b0f0f2bf8ee91c682a228779754557389469eb58610bef7793a0d68a303260f80a38a1519f61b62ba23e9a2222c6f399 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 deleted file mode 100644 index b9a8adeee5a8..000000000000 --- a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 1a6ede2dbf0f621e3e6864675befcbc32e02c8b6 Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <kostecki@his.de> -Date: Thu, 14 May 2020 10:34:43 +0200 -Subject: [PATCH] Fix compilation with boost-1.73 - -Signed-off-by: Conrad Kostecki <conrad@kostecki.com> ---- - include/transport/ThreadPool.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/transport/ThreadPool.h b/include/transport/ThreadPool.h -index 5902f965..ffd07c8e 100644 ---- a/include/transport/ThreadPool.h -+++ b/include/transport/ThreadPool.h -@@ -1,5 +1,6 @@ - #pragma once - -+#include <boost/bind.hpp> - #include <boost/thread.hpp> - #include <boost/thread/mutex.hpp> - #include <queue> 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 deleted file mode 100644 index ad13208b3e13..000000000000 --- a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 95e6968c0f8c95f6bd817e5081e0b10dea9d4269 Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <kostecki@his.de> -Date: Wed, 13 May 2020 14:22:27 +0200 -Subject: [PATCH] Fix dfrotz compilation with GCC >= 10 - -Since GCC enables by default -fno-common, -the compilation of dfrotz due multiple definitions will fail. - -Signed-off-by: Conrad Kostecki <conrad@kostecki.com> ---- - backends/frotz/dfrotz/dumb/dumb_init.c | 2 +- - backends/frotz/dfrotz/dumb/dumb_input.c | 2 +- - backends/frotz/dfrotz/dumb/dumb_output.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/backends/frotz/dfrotz/dumb/dumb_init.c b/backends/frotz/dfrotz/dumb/dumb_init.c -index 4b9c6704..35295b74 100644 ---- a/backends/frotz/dfrotz/dumb/dumb_init.c -+++ b/backends/frotz/dfrotz/dumb/dumb_init.c -@@ -7,7 +7,7 @@ - - #include "dumb_frotz.h" - --f_setup_t f_setup; -+extern f_setup_t f_setup; - - #define INFORMATION "\ - An interpreter for all Infocom and other Z-Machine games.\n\ -diff --git a/backends/frotz/dfrotz/dumb/dumb_input.c b/backends/frotz/dfrotz/dumb/dumb_input.c -index 4149b2b0..88fc8ae5 100644 ---- a/backends/frotz/dfrotz/dumb/dumb_input.c -+++ b/backends/frotz/dfrotz/dumb/dumb_input.c -@@ -5,7 +5,7 @@ - */ - - #include "dumb_frotz.h" --f_setup_t f_setup; -+extern f_setup_t f_setup; - - static char runtime_usage[] = - "DUMB-FROTZ runtime help:\n" -diff --git a/backends/frotz/dfrotz/dumb/dumb_output.c b/backends/frotz/dfrotz/dumb/dumb_output.c -index 9e505167..6dc7db82 100644 ---- a/backends/frotz/dfrotz/dumb/dumb_output.c -+++ b/backends/frotz/dfrotz/dumb/dumb_output.c -@@ -7,7 +7,7 @@ - - #include "dumb_frotz.h" - --f_setup_t f_setup; -+extern f_setup_t f_setup; - - static bool show_line_numbers = FALSE; - static bool show_line_types = -1; diff --git a/net-im/spectrum2/files/spectrum2.initd b/net-im/spectrum2/files/spectrum2.initd index 8a35dbe75bc9..0ab25819804d 100644 --- a/net-im/spectrum2/files/spectrum2.initd +++ b/net-im/spectrum2/files/spectrum2.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command="/usr/bin/spectrum2_manager" @@ -41,7 +41,7 @@ stop() { # Andrey Utkin <andrey_utkin@gentoo.org> (24 Nov 2018) # Conrad Kostecki <conrad@kostecki.com> (24 Nov 2018) # We are aware of many security issues caused by careless chowning, see -# http://michael.orlitzky.com/articles/end_root_chowning_now_(make_etc-init.d_great_again).xhtml +# https://michael.orlitzky.com/articles/end_root_chowning_now_(make_etc-init.d_great_again).xhtml # We believe none of these issues apply. # These pidfiles are not read by any privileged process. # checkpath here chowns only the dir itself and doesn't act recursively. diff --git a/net-im/spectrum2/metadata.xml b/net-im/spectrum2/metadata.xml index 4a71c17c49c2..14c0f5b599ee 100644 --- a/net-im/spectrum2/metadata.xml +++ b/net-im/spectrum2/metadata.xml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>conikost@gentoo.org</email> <name>Conrad Kostecki</name> </maintainer> - <maintainer type="person"> - <email>andrey_utkin@gentoo.org</email> - <name>Andrey Utkin</name> - </maintainer> <longdescription> Spectrum is an open source instant messaging transport. It allows users to chat together even when they are using @@ -23,4 +19,7 @@ <flag name="whatsapp">Enables the WhatsApp backend, based on <pkg>net-im/transwhat</pkg>.</flag> <flag name="twitter">Enables the Twitter backend.</flag> </use> + <upstream> + <remote-id type="github">SpectrumIM/spectrum2</remote-id> + </upstream> </pkgmetadata> diff --git a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild b/net-im/spectrum2/spectrum2-2.2.1.ebuild index e2a557eb7113..659d8085be5d 100644 --- a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild +++ b/net-im/spectrum2/spectrum2-2.2.1.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils python-any-r1 systemd +inherit cmake systemd tmpfiles DESCRIPTION="An open source instant messaging transport" HOMEPAGE="https://www.spectrum.im" @@ -13,9 +11,13 @@ SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.ta LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp" -REQUIRED_USE="|| ( mysql postgres sqlite )" +REQUIRED_USE=" + || ( mysql postgres sqlite ) + test? ( irc ) +" +RESTRICT="!test? ( test )" RDEPEND=" acct-group/spectrum @@ -23,13 +25,13 @@ RDEPEND=" dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= - dev-libs/log4cxx + >=dev-libs/log4cxx-1.0.0:= dev-libs/jsoncpp:= - dev-libs/openssl:0= + dev-libs/openssl:= dev-libs/popt dev-libs/protobuf:= - net-dns/libidn:0= - net-im/swift:= + net-dns/libidn:= + >=net-im/swift-4.0.2-r2:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) @@ -40,7 +42,7 @@ RDEPEND=" dev-db/mysql-connector-c ) ) - postgres? ( >=dev-libs/libpqxx-6.4.5:= ) + postgres? ( dev-libs/libpqxx:= ) purple? ( dev-libs/glib net-im/pidgin:= @@ -52,40 +54,21 @@ RDEPEND=" DEPEND=" ${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/sleekxmpp[${PYTHON_USEDEP}]') - dev-util/cppunit - net-irc/ngircd - ) -" - -# Tests are currently restricted, as they do completly fail -RESTRICT="test" - -PATCHES=" - "${FILESDIR}/${P}-boost-173-compatibility.patch" - "${FILESDIR}/${P}-gcc-10-compatibility.patch" + doc? ( app-text/doxygen ) + test? ( dev-util/cppunit ) " -python_check_deps() { - has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - src_prepare() { # Respect users LDFLAGS sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { local mycmakeargs=( + -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var" + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" -DENABLE_DOCS="$(usex doc)" -DENABLE_FROTZ="$(usex frotz)" -DENABLE_IRC="$(usex irc)" @@ -98,18 +81,18 @@ src_configure() { -DENABLE_TESTS="$(usex test)" -DENABLE_TWITTER="$(usex twitter)" -DENABLE_XMPP="$(usex xmpp)" - -DLIB_INSTALL_DIR="$(get_libdir)" ) - cmake-utils_src_configure + cmake_src_configure } src_test() { - cd tests/libtransport && "${EPYTHON}" ../start.py || die + cd "${BUILD_DIR}/tests/libtransport" || die + ./libtransport_test || die } src_install() { - cmake-utils_src_install + cmake_src_install diropts -o spectrum -g spectrum keepdir /var/log/spectrum2 /var/lib/spectrum2 @@ -117,7 +100,22 @@ src_install() { newinitd "${FILESDIR}"/spectrum2.initd spectrum2 systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service - systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf + newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf einstalldocs } + +pkg_postinst() { + tmpfiles_process spectrum2.conf + + if [[ ${REPLACING_VERSIONS} ]]; then + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt 2.2.0; then + ewarn "Starting with Release 2.2.0, the path for spectrum2" + ewarn "executable helper files has been changed from '/usr/bin'" + ewarn "to '/usr/libexec'. Please update your config files!" + break + fi + done + fi +} |