gentoo auto-resync : 25:05:2023 - 03:04:17

3 files changed, 2 insertions, 115 deletions

diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index b8e4e10648ec..339286c554bf 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -2,8 +2,6 @@ AUX spectrum2-2.1.3-log4cxx-1.0.0.patch 2375 BLAKE2B e2ef1dafeb4d79a4d8cbc5f545e
 AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354b94749a577b9121352bd56e5d0adbae161da1afc7c451d18b36689844429b46fe39b2e364ffd8c363 SHA512 d780066a00144f3ec20311b462fd29986a486af7ce5ae88e788113397d6cb6ab0800119a5d71077216ee1637ff49cd2307e9265545357b4de50bf907c80feb9c
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
-DIST spectrum2-2.1.3.tar.gz 666005 BLAKE2B 8356b71506b5489780052eaf404a79f0f760fa3a8d35e80e30730c86b5e4acf21a1ac59fed46e472a1085dc29c6751f2c4e788ad60569bf15b48d198762f2a77 SHA512 b6bf39738998b56c8a90984446740c38547ffdaadaf280d3f4f29cb8a2e168898a7b010eff115394f473fd02c66f30ef383c4a542812d5abd03a87b064b446a8
 DIST spectrum2-2.2.0.tar.gz 666281 BLAKE2B aebf7d90a938ee62e5ae13955343a73c2f8a1484151519f59321b09d958cd49bd7b0914a3dc0a364d2469c691a653003bfc51324b69de38e3c59c9c248b3c672 SHA512 52125dd2b528b45cc814d4c62df6c0c431958dc5953af50731e765129e59a5dabdffd7f55d1709fe9854c81d6874d9549e8560f27b1b18a0af812299ef4c37ff
-EBUILD spectrum2-2.1.3-r2.ebuild 2435 BLAKE2B df75fd6357808427ab4bc8aca46bb86772c2e9a83e183f465d71ddc3694c02c77862bc275f51cc26d102e82917523276b04bc1e5a0805c1b69a2dc345712d9ea SHA512 9d3ce70db17aa7e4beaee0fd4e232a6688eaf5e3c08c75691cedd3779fd6982e65cc47335252b8b3d14d31b1d736b2e8ae64b49df7cb4bfc39a89898c9c4b9b0
-EBUILD spectrum2-2.2.0-r1.ebuild 2833 BLAKE2B 6b722f541b507455cc578b5e284b45b7cdd48f6f988c98f186d66568c7f2670a47099ed1ed893d8b052f751726a475caddc763125fa585a271480f396c59261e SHA512 3f38e112d79442705146770c56e288fd925f5e6f004e183c079e5b8233298a76ac6632c4f3ce1b419a13909d5a8bd2b7dc90ac2c21e346ca8a28ba18f559742f
+EBUILD spectrum2-2.2.0-r1.ebuild 2832 BLAKE2B 21894e56e31131ba02b52f3ad0395fcac96c8e35af6c23146ca1c322740ea774a618cd581aaf2d62da306546134b61741ef18bd77cda976a531c6d968bc275c4 SHA512 3fa85d7e6fc572b1d7e260232b551b2b17b7e9c68c7261f3d47888a4620e86ca00b1aa6703b0a72a94753281f885c975061d49bb457ce14282990d04e9956d82
 MISC metadata.xml 1114 BLAKE2B 35d457612fa10fe7e6e2007734c54e491b581e86e0376416b3e2177d6c22b478c7b2bb98cb7bf4d7c80d3ab36f2674c18642f2725cc5c8e230df174bf80d1776 SHA512 13de6689c9838edaccc98b038a86d64dd4bc9639c41b383f8cd0d7e081f6a6bd23c597901165e39867dbed6d957a71f71a9011f6c73050d098ee984fb59f994e
diff --git a/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild b/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild
deleted file mode 100644
index d3bff9c161d8..000000000000
--- a/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd tmpfiles
-
-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-1.0.0:=
-	dev-libs/jsoncpp:=
-	dev-libs/openssl:=
-	dev-libs/popt
-	dev-libs/protobuf:=
-	net-dns/libidn:=
-	>=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}/${PN}-2.1.3-log4cxx-1.0.0.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
-	newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	tmpfiles_process spectrum2.conf
-}
diff --git a/net-im/spectrum2/spectrum2-2.2.0-r1.ebuild b/net-im/spectrum2/spectrum2-2.2.0-r1.ebuild
index 90630c5549c1..1c68b2e65d48 100644
--- a/net-im/spectrum2/spectrum2-2.2.0-r1.ebuild
+++ b/net-im/spectrum2/spectrum2-2.2.0-r1.ebuild
@@ -11,7 +11,7 @@ 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 )