gentoo resync : 25.08.2020

4 files changed, 207 insertions, 30 deletions

diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 31e2482ed7d2..f50e2382e8b6 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,8 +1,11 @@
 AUX spectrum2-2.0.12-boost-173-compatibility.patch 652 BLAKE2B 496e0fb33f3e88775f91c028e6e89f74c3d7d72b09cd1818712b2da5a54b315fdbf00ab9a7525cca744070061d79f32fe3764f2700d695b37a8b308de08b8f88 SHA512 999e9330c4f0fbd1883df28d7fbe15fd40b1a492e6b925900734df2f493fa4241f2a234a1fd3db2b7dc77ddfef66026ab1a656806c17ae7f1fd8f75f9cdf0199
 AUX spectrum2-2.0.12-gcc-10-compatibility.patch 1731 BLAKE2B 5c0c828ee2bfc51affbb44e06b6a53414c608173be799e92c5ecc76a7411cd6cba5a818b7a4df80b209c64c8c0d543fa10077fe8e45f2014f84b614231b20c58 SHA512 228ccf52a17a88e18e5fe97da1ef39c207142286abc5b018fab08c2f3bc96f13fac89147406a23fbd986b35ad23da9b34239497a830396ae2864708f82925505
+AUX spectrum2-2.0.13-libpqxx-7-compatibility.patch 3455 BLAKE2B d67edbcc8454b4f193684464cfccb418e63c8dbe2ac8ee304bc9a40b9eae5e7764f0b7b48bbe737ae3f6f119100463c65c525b4b272991ae6fb3ed4f10e31fe5 SHA512 a0b407f5611493e690a4f024f53672547dcf240d131e0c2ce5ec217f6270cf370846a69b6869a399c963c3dff735b3dfdac5265e6e8bfc78bbad16d84f555acf
 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.0.12.tar.gz 839711 BLAKE2B 22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7 SHA512 bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36
-EBUILD spectrum2-2.0.12-r2.ebuild 2741 BLAKE2B 9bfe9cc0834e3cdd564017462ebbeb65737c30c1d8f5df9ad35a4d943158457c5de1c4979d1f6df43742478d926166f726edba2f74035e2d9dd883d51637fcee SHA512 b66a5d6ebfc181061b780d75879f53eb944fa4e713bc5848ef8ea12230fdcc434c47ce33a5bce66d3689b6c9fdac1dd81a57d7e6036afb0f8d3ae3aa0922e8a1
+DIST spectrum2-2.0.13.tar.gz 840234 BLAKE2B 45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792 SHA512 8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7
+EBUILD spectrum2-2.0.12-r4.ebuild 2483 BLAKE2B e7d265e538a07d226d98037bec15ea87304e7a7502f054272bea5516c89360bfd31952cc0b93a0acf5e8ee212ec2a0b36b7b1a0ced78f7ee2822d510d50e0e02 SHA512 94270a478627485b7a3e09c3bab6508a4e2de4b056a16db2065c041bd8ed5688acc0e90c4c58bd25e7be212e8b27f623d155776a76044e45dd5f0cb548e8dbfe
+EBUILD spectrum2-2.0.13-r2.ebuild 2378 BLAKE2B 7ce60447d37da501500af92eb1b16cb5a4bebec31666a8b8092d1fe9818f947ff78b406f4d2e7fb5a641cdc178b05cee3446e275d580bf1097b46db1d87816bf SHA512 ef6cc6afaf96fde99693cd79483646764eceb251c3fa69c72c9ae68f40c3ca8693503e51bb73151ae2e7062ecf5403175dcbde7e20ba376d871f71df223137d3
 MISC metadata.xml 1140 BLAKE2B 279808a98359761ce2620d44575f320de77b5b19f795d55c9b3b16f13eec2ab5fd900c00adef81ba87aacd41d9527ca998bcd27fc6a7d3c3c61d668791f501a4 SHA512 8adf9a85df87528db06d13c830dd96bb2aa77a3d22bb5701c23db0951ac67d7b6b29c8ffa5af11a6bd15e84e7a0722ea99f18e7b6f9ca00b5b42dfc36d3a1a7d
diff --git a/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch
new file mode 100644
index 000000000000..48a1f0a333a0
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch
@@ -0,0 +1,79 @@
+diff --git a/cmake_modules/Findpqxx.cmake b/cmake_modules/Findpqxx.cmake
+index 9c53550..691ec0e 100644
+--- a/cmake_modules/Findpqxx.cmake
++++ b/cmake_modules/Findpqxx.cmake
+@@ -1,16 +1,33 @@
+-FIND_PATH(PQXX_INCLUDE_DIR pqxx/pqxx PATHS)
+-MARK_AS_ADVANCED(PQXX_INCLUDE_DIR)
++if (NOT WIN32)
++	find_package(PkgConfig)
++	if (PKG_CONFIG_FOUND)
++		pkg_check_modules(PQXX libpqxx)
++		if (PQXX_FOUND)
++			if (PQXX_VERSION STRGREATER "7")
++				message(STATUS "libpqxx version ${PQXX_VERSION}, requesting c++17")
++				set (CMAKE_CXX_STANDARD 17)
++			endif()
++		endif()
++	endif()
++else()
+ 
+-FIND_LIBRARY(PQXX_LIBRARY pqxx )
+-MARK_AS_ADVANCED(PQXX_LIBRARY)
++	FIND_PATH(PQXX_INCLUDE_DIR pqxx/pqxx PATHS)
++	MARK_AS_ADVANCED(PQXX_INCLUDE_DIR)
+ 
+-FIND_LIBRARY(PQ_LIBRARY pq )
+-MARK_AS_ADVANCED(PQ_LIBRARY)
++	FIND_LIBRARY(PQXX_LIBRARIES pqxx )
++	MARK_AS_ADVANCED(PQXX_LIBRARIES)
+ 
+-if(PQXX_LIBRARY AND PQ_LIBRARY AND PQXX_INCLUDE_DIR)
+-	set( PQXX_FOUND 1 )
+-	message( STATUS "Found pqxx: ${PQXX_LIBRARY}, ${PQ_LIBRARY}, ${PQXX_INCLUDE_DIR}")
+-else()
+-	message(STATUS "Could NOT find pqxx and pq library")
+-endif()
++	FIND_LIBRARY(PQ_LIBRARY pq )
++	MARK_AS_ADVANCED(PQ_LIBRARY)
+ 
++	if(PQXX_LIBRARY AND PQ_LIBRARY AND PQXX_INCLUDE_DIR)
++		set( PQXX_FOUND 1 )
++		message( STATUS "Found pqxx: ${PQXX_LIBRARIES}, ${PQ_LIBRARY}, ${PQXX_INCLUDE_DIR}")
++		if (PQXX_VERSION STRGREATER "7")
++			message(STATUS "libpqxx version ${PQXX_VERSION}, requesting c++17")
++			set (CMAKE_CXX_STANDARD 17)
++		endif()
++	else()
++		message(STATUS "Could NOT find pqxx and pq library")
++	endif()
++endif()
+diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt
+index 8892241..2b5a0f9 100644
+--- a/libtransport/CMakeLists.txt
++++ b/libtransport/CMakeLists.txt
+@@ -48,9 +48,9 @@ find_package(CURL)
+ 
+ if(WIN32)
+ 	include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
+-	target_link_libraries(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY} psapi.lib bcrypt.lib)
++	target_link_libraries(transport transport-plugin ${PQXX_LIBRARIES} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY} psapi.lib bcrypt.lib)
+ else()
+-	target_link_libraries(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY})
++	target_link_libraries(transport transport-plugin ${PQXX_LIBRARIES} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY})
+ endif()
+ 
+ set_target_properties(transport PROPERTIES
+diff --git a/libtransport/NetworkPluginServer.cpp b/libtransport/NetworkPluginServer.cpp
+index 31cce95..f5305aa 100644
+--- a/libtransport/NetworkPluginServer.cpp
++++ b/libtransport/NetworkPluginServer.cpp
+@@ -1904,7 +1904,7 @@ NetworkPluginServer::wrapIncomingMedia(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swif
+     //Doesn't handle: unquoted src, escaped "'>s, quotes in quotes ("quote: 'text' end quote")
+     static boost::regex image_expr("<img\\s+[^>]*src\\s*=\\s*[\"']([^\"']+)[\"'][^>]*>");
+ 
+-    bool matchCount = 0;
++    int matchCount = 0;
+     std::string firstUrl;
+ 
+     std::string::const_iterator xhtml_pos = xhtml.begin();
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
index 52118de297e5..4f12c3c285e9 100644
--- a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-any-r1 systemd
+inherit cmake systemd
 
 DESCRIPTION="An open source instant messaging transport"
 HOMEPAGE="https://www.spectrum.im"
@@ -15,7 +13,11 @@ 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 )"
+REQUIRED_USE="
+	|| ( mysql postgres sqlite )
+	test? ( irc )
+"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-group/spectrum
@@ -29,7 +31,7 @@ RDEPEND="
 	dev-libs/popt
 	dev-libs/protobuf:=
 	net-dns/libidn:0=
-	net-im/swift:=
+	>=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:=
@@ -53,35 +55,20 @@ 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
-	)
+	test? (	dev-util/cppunit )
 "
 
-# Tests are currently restricted, as they do completly fail
-RESTRICT="test"
-
-PATCHES="
+PATCHES=(
 	"${FILESDIR}/${P}-boost-173-compatibility.patch"
 	"${FILESDIR}/${P}-gcc-10-compatibility.patch"
-"
-
-python_check_deps() {
-	has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
+	"${FILESDIR}/${PN}-2.0.13-libpqxx-7-compatibility.patch"
+)
 
 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() {
@@ -101,15 +88,16 @@ src_configure() {
 		-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
diff --git a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
new file mode 100644
index 000000000000..1c7985cbc6c4
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
@@ -0,0 +1,107 @@
+# 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}-libpqxx-7-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
+}