diff --git a/net-im/spectrum2/files/spectrum2.tmpfiles b/net-im/spectrum2/files/spectrum2.tmpfiles-r1
similarity index 100%
rename from net-im/spectrum2/files/spectrum2.tmpfiles
rename to net-im/spectrum2/files/spectrum2.tmpfiles-r1
diff --git a/net-im/spectrum2/spectrum2-9999.ebuild b/net-im/spectrum2/spectrum2-9999.ebuild
index 6affad3..2157170 100644
--- a/net-im/spectrum2/spectrum2-9999.ebuild
+++ b/net-im/spectrum2/spectrum2-9999.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
 
 if [[ ${PV} = "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/SpectrumIM/${PN}.git"
@@ -46,7 +46,7 @@ RDEPEND="
 			dev-db/mysql-connector-c
 		)
 	)
-	postgres? ( dev-libs/libpqxx:= )
+	postgres? ( >=dev-libs/libpqxx-6.4.5:= )
 	purple? (
 		dev-libs/glib
 		net-im/pidgin:=
@@ -57,11 +57,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
 	)
@@ -70,11 +70,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() {
@@ -116,7 +120,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/spectrum2.initd spectrum2
 	systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
-	systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles spectrum2.conf
+	systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
 
 	einstalldocs
 }