gentoo resync : 02.08.2019

3 files changed, 129 insertions, 5 deletions

diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 2d285ddd06e3..659cd102b47a 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -2,5 +2,7 @@ AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
 DIST spectrum2-2.0.10.1.tar.gz 844983 BLAKE2B f10a057f35ecb865497e26b6d31d37c895b351d7c93e7c00bf9d58bf855b49ee1ce0acbeab841a442ab2ab702b022675ca4478521ecac2f6d0bdb9d7e00b9060 SHA512 dde84e67b2ade8649a38027c398defd4dc911ed402e913779aca0b29aa801f1c17ef89b1b3abf91c3189e75b32e9162d6e9d52f90ce537091b65fb791a826357
-EBUILD spectrum2-2.0.10.1-r1.ebuild 2528 BLAKE2B 4c9b9a772c35c02c636b36b42a97bb0b5fc7cec9b102caa907aa93dca5d2bb35fbaec0b6387cddbb0304b9ea72ff52e90b78426f5ef53da36268fdeaa0021094 SHA512 410db756dd05a0235de56e71997e83647d0992dad992b550dd36b7cd65db5317bd38cb0ea2963769c714899de9f24bae7263fbd8bcb5d91c7d7d55cf81d9190f
+DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B 22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7 SHA512 bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36
+EBUILD spectrum2-2.0.10.1-r2.ebuild 2626 BLAKE2B c69e93778b43066df16bff8e65ecfec839d68dbca9b2d0999b422b53ec72b1a584acacafb7a5c037cc1b082c4120c9932ecbf4be243b8346bd7ce9522ac33cd5 SHA512 e8ddc34b4340f0b42b2a00f5b2e5a636debd4fedc12c60c8cf58aaf782482a2ec65f565a742b6a039ca90f3c98367142d24beb95dc689377490a08424bad0b8a
+EBUILD spectrum2-2.0.12.ebuild 2634 BLAKE2B 9c49b5ef951090b7abe22771e5a14d7a33ed5f5d880df385f3eb17bfde96863a3e9bc9e199fc0fbd3b18ea5cbf9d9627c36248faf9ba24ebf7f56382a6ff71b0 SHA512 d83ff2d2a76d04af0c3b085cafd02d9ba1499020fcdb90ad363f23c4a9d87b4f9fd16c2dbe57eb6b4c3053709445dc15b73c9410dadfc0eb242ebc119bb79456
 MISC metadata.xml 1259 BLAKE2B e885a8348122a70994d3b04387d64fa88d2e02075554849d427f18b2b39b6ae1eeab543066cd587031f8eae9842f0d727f297d7b6cbe744c8d1424d9fb3640ce SHA512 be2129a4b76017ce3d84aa48589d54ac3863e1d9b7a1aa2a5d98341f962bda3f2e9507497056add0b4f280545ed0c511c8f50eff35d46cf9cadd2c6fba7b5ed6
diff --git a/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild b/net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild
index d528d2460792..be621d22a701 100644
--- a/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python-single-r1 systemd user
+inherit cmake-utils python-any-r1 systemd user
 
 DESCRIPTION="An open source instant messaging transport"
 HOMEPAGE="https://www.spectrum.im"
@@ -49,11 +49,11 @@ RDEPEND="
 	whatsapp? ( net-im/transwhat )"
 
 DEPEND="
-	${PYTHON_DEPS}
 	${RDEPEND}
 	doc? ( app-doc/doxygen )
 	test? (
-		dev-python/sleekxmpp[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/sleekxmpp[${PYTHON_USEDEP}]')
 		dev-util/cppunit
 		net-irc/ngircd
 	)
@@ -62,11 +62,15 @@ DEPEND="
 # Tests are currently restricted, as they do completly fail
 RESTRICT="test"
 
+python_check_deps() {
+	has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	enewgroup spectrum
 	enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum
 
-	use test && python-single-r1_pkg_setup
+	use test && python-any-r1_pkg_setup
 }
 
 src_prepare() {
diff --git a/net-im/spectrum2/spectrum2-2.0.12.ebuild b/net-im/spectrum2/spectrum2-2.0.12.ebuild
new file mode 100644
index 000000000000..91e9038632ef
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.12.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-any-r1 systemd user
+
+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 )"
+
+RDEPEND="
+	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:=
+	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-6.4.5:= )
+	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? (
+		${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"
+
+python_check_deps() {
+	has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	enewgroup spectrum
+	enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum
+
+	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
+}
+
+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)"
+		-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-utils_src_configure
+}
+
+src_test() {
+	cd tests/libtransport && "${EPYTHON}" ../start.py || die
+}
+
+src_install() {
+	cmake-utils_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
+}