[net-im/spectrum2] sync with tree

net-im/spectrum2/spectrum2-9999.ebuild

@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-any-r1 systemd
+inherit cmake systemd
 
 if [[ ${PV} = "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/SpectrumIM/${PN}.git"
@@ -24,6 +22,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-group/spectrum
@@ -61,30 +60,14 @@ 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"
-
-python_check_deps() {
-	has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	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
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -104,15 +87,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