[net-im/spectrum2] sync with tree

This commit is contained in:
Robert Förster 2019-07-22 01:54:19 +02:00
parent a73dfad91c
commit bb15454db3
2 changed files with 10 additions and 6 deletions

View File

@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python2_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 if [[ ${PV} = "9999" ]] ; then
EGIT_REPO_URI="https://github.com/SpectrumIM/${PN}.git" EGIT_REPO_URI="https://github.com/SpectrumIM/${PN}.git"
@ -46,7 +46,7 @@ RDEPEND="
dev-db/mysql-connector-c dev-db/mysql-connector-c
) )
) )
postgres? ( dev-libs/libpqxx:= ) postgres? ( >=dev-libs/libpqxx-6.4.5:= )
purple? ( purple? (
dev-libs/glib dev-libs/glib
net-im/pidgin:= net-im/pidgin:=
@ -57,11 +57,11 @@ RDEPEND="
whatsapp? ( net-im/transwhat )" whatsapp? ( net-im/transwhat )"
DEPEND=" DEPEND="
${PYTHON_DEPS}
${RDEPEND} ${RDEPEND}
doc? ( app-doc/doxygen ) doc? ( app-doc/doxygen )
test? ( test? (
dev-python/sleekxmpp[${PYTHON_USEDEP}] ${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/sleekxmpp[${PYTHON_USEDEP}]')
dev-util/cppunit dev-util/cppunit
net-irc/ngircd net-irc/ngircd
) )
@ -70,11 +70,15 @@ DEPEND="
# Tests are currently restricted, as they do completly fail # Tests are currently restricted, as they do completly fail
RESTRICT="test" RESTRICT="test"
python_check_deps() {
has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
}
pkg_setup() { pkg_setup() {
enewgroup spectrum enewgroup spectrum
enewuser spectrum -1 -1 /var/lib/spectrum2 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() { src_prepare() {
@ -116,7 +120,7 @@ src_install() {
newinitd "${FILESDIR}"/spectrum2.initd spectrum2 newinitd "${FILESDIR}"/spectrum2.initd spectrum2
systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles spectrum2.conf systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
einstalldocs einstalldocs
} }