gentoo resync : 16.04.2022

4 files changed, 3 insertions, 118 deletions

diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index e527e82b4fd4..d5904aec9127 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,8 +1,6 @@
 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.2.tar.gz 665486 BLAKE2B edd98a296269141bdd104fca9f8e56d63b2f6a8ea9cda855bc17a65f8183be0b295a47453876df981ad5a3acf1df9483ab44c5a6d731ecc51e9ab6d61f005bb0 SHA512 e39caa9bb149c47b4a621f76613bf1f58cad84800851935dcf2722d91e84a5c21ccd50029ebc25c0d34d988dc390ece526ecfb1d3db6054ac8c07f4426be3a83
 DIST spectrum2-2.1.3.tar.gz 666005 BLAKE2B 8356b71506b5489780052eaf404a79f0f760fa3a8d35e80e30730c86b5e4acf21a1ac59fed46e472a1085dc29c6751f2c4e788ad60569bf15b48d198762f2a77 SHA512 b6bf39738998b56c8a90984446740c38547ffdaadaf280d3f4f29cb8a2e168898a7b010eff115394f473fd02c66f30ef383c4a542812d5abd03a87b064b446a8
-EBUILD spectrum2-2.1.2.ebuild 2368 BLAKE2B f0ddcbf331786e39356068c8409affad2ce485762ca5fb77710990bac2cae2821176ded2a2e16ee4cf0107c58d8035a0430948cb531a6905b855469ffdad114a SHA512 0263ff8af189cd78989c10c42185ab59d529dbef303c036b5ebe30dc5de3e8e4ee16430d4de7449011d67eb041178221d4734bb259b8826e90093f708549e6fb
-EBUILD spectrum2-2.1.3.ebuild 2369 BLAKE2B 39f834456b270993134753d9dbf11da6e0cf72a97a484130766ef675cbe2ba3a28003a3435bcc0ad78ec90a641808f80f3f26e8156510c0c7736c03c11215fcd SHA512 ed61a819abedcc117c94fdcc6b4e87d74121e6ba64dc8cce15570250cead861fa9cdae601460b62ae7bcd9a252af64f8ba17ed7243eec553070e52634313ea5c
-MISC metadata.xml 1141 BLAKE2B 8964184caabc03f6c5da13842bc5219b0d563baa5d9a1fc52020d686756953a2321d80ede5c5e9aa8321cad1f9a4ea753847c63230b8fb55c8c52e0b61bded23 SHA512 13c244aba5cf70af7e2555a05ba604e28b042d95f879a9f747702b13da7484d6ca3a941ee16d5ad0db864eceb51b55509d0a0761c9f8f7ab11328d67cbe8886c
+EBUILD spectrum2-2.1.3.ebuild 2368 BLAKE2B f0ddcbf331786e39356068c8409affad2ce485762ca5fb77710990bac2cae2821176ded2a2e16ee4cf0107c58d8035a0430948cb531a6905b855469ffdad114a SHA512 0263ff8af189cd78989c10c42185ab59d529dbef303c036b5ebe30dc5de3e8e4ee16430d4de7449011d67eb041178221d4734bb259b8826e90093f708549e6fb
+MISC metadata.xml 1029 BLAKE2B 3d468f77ca549912df4470c14d31211723488b3f58a03b96cdf01b19c48570ce8b2cb87b6d2d7a223169aa0c737583b80a62a3996d476cc69bdb433df8eb423c SHA512 2a0d001bb4a2f67a27ddd616cff3846c54e0e4f822187f6b0ad55c8439ce51b1b89bee894dac0a301c8c9c31e9febfd0085e3520c8c8bbacf836bd2b42d79941
diff --git a/net-im/spectrum2/metadata.xml b/net-im/spectrum2/metadata.xml
index 233e8e3037c3..6de46eb88c98 100644
--- a/net-im/spectrum2/metadata.xml
+++ b/net-im/spectrum2/metadata.xml
@@ -5,10 +5,6 @@
 		<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
diff --git a/net-im/spectrum2/spectrum2-2.1.2.ebuild b/net-im/spectrum2/spectrum2-2.1.2.ebuild
deleted file mode 100644
index 9578b2864a39..000000000000
--- a/net-im/spectrum2/spectrum2-2.1.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 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
-	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 )
-"
-
-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.1.3.ebuild b/net-im/spectrum2/spectrum2-2.1.3.ebuild
index 546c78a06593..9578b2864a39 100644
--- a/net-im/spectrum2/spectrum2-2.1.3.ebuild
+++ b/net-im/spectrum2/spectrum2-2.1.3.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 )