[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     4b0cc208da074b6d03babb1a8aaeef873bfbd72d
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 11:39:47 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 12:31:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0cc208

net-im/spectrum2: drop old version

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-im/spectrum2/Manifest                          |   1 -
 .../spectrum2-2.0.12-boost-173-compatibility.patch |  21 ----
 .../spectrum2-2.0.12-gcc-10-compatibility.patch    |  54 ----------
 net-im/spectrum2/spectrum2-2.0.12-r4.ebuild        | 112 ---------------------
 4 files changed, 188 deletions(-)

diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 5122ae14a1d..bdab4cc72da 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,2 +1 @@
-DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B 22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7 SHA512 bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36
 DIST spectrum2-2.0.13.tar.gz 840234 BLAKE2B 45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792 SHA512 8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7

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 b9a8adeee5a..00000000000
--- 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 ad13208b3e1..00000000000
--- 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/spectrum2-2.0.12-r4.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
deleted file mode 100644
index 3bbf840a522..00000000000
--- a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-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="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
-REQUIRED_USE="
-	|| ( mysql postgres sqlite )
-	test? ( irc )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-group/spectrum
-	acct-user/spectrum
-	dev-libs/boost:=[nls]
-	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-4.0.2-r2:=
-	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="
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (	dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-boost-173-compatibility.patch"
-	"${FILESDIR}/${P}-gcc-10-compatibility.patch"
-	"${FILESDIR}/${PN}-2.0.13-libpqxx-7-compatibility.patch"
-	"${FILESDIR}/${PN}-2.0.13-musl-compatibility.patch"
-)
-
-src_prepare() {
-	# Respect users LDFLAGS
-	sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	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)"
-		$(usex irc '-DENABLE_QT4=OFF' '')
-		-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_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}/tests/libtransport" || die
-	./libtransport_test || die
-}
-
-src_install() {
-	cmake_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-r1 spectrum2.conf
-
-	einstalldocs
-}