From 29c0947a7640bbe4b63b6b08b197ecab038e2543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Sat, 12 Jan 2019 04:14:23 +0100 Subject: [PATCH] [net-im/spectrum2] rename to match with tree --- .../files/remove_debug_cflags.patch | 0 .../files/spectrum2.initd | 0 .../files/spectrum2.service | 0 .../files/spectrum2.tmpfiles | 0 .../spectrum2-9999.ebuild} | 21 ++++++++++++------- 5 files changed, 13 insertions(+), 8 deletions(-) rename net-im/{spectrum => spectrum2}/files/remove_debug_cflags.patch (100%) rename net-im/{spectrum => spectrum2}/files/spectrum2.initd (100%) rename net-im/{spectrum => spectrum2}/files/spectrum2.service (100%) rename net-im/{spectrum => spectrum2}/files/spectrum2.tmpfiles (100%) rename net-im/{spectrum/spectrum-9999.ebuild => spectrum2/spectrum2-9999.ebuild} (88%) diff --git a/net-im/spectrum/files/remove_debug_cflags.patch b/net-im/spectrum2/files/remove_debug_cflags.patch similarity index 100% rename from net-im/spectrum/files/remove_debug_cflags.patch rename to net-im/spectrum2/files/remove_debug_cflags.patch diff --git a/net-im/spectrum/files/spectrum2.initd b/net-im/spectrum2/files/spectrum2.initd similarity index 100% rename from net-im/spectrum/files/spectrum2.initd rename to net-im/spectrum2/files/spectrum2.initd diff --git a/net-im/spectrum/files/spectrum2.service b/net-im/spectrum2/files/spectrum2.service similarity index 100% rename from net-im/spectrum/files/spectrum2.service rename to net-im/spectrum2/files/spectrum2.service diff --git a/net-im/spectrum/files/spectrum2.tmpfiles b/net-im/spectrum2/files/spectrum2.tmpfiles similarity index 100% rename from net-im/spectrum/files/spectrum2.tmpfiles rename to net-im/spectrum2/files/spectrum2.tmpfiles diff --git a/net-im/spectrum/spectrum-9999.ebuild b/net-im/spectrum2/spectrum2-9999.ebuild similarity index 88% rename from net-im/spectrum/spectrum-9999.ebuild rename to net-im/spectrum2/spectrum2-9999.ebuild index 334de9c..e7ce569 100644 --- a/net-im/spectrum/spectrum-9999.ebuild +++ b/net-im/spectrum2/spectrum2-9999.ebuild @@ -4,10 +4,11 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) + inherit cmake-utils python-single-r1 systemd user if [[ ${PV} = "9999" ]] ; then - EGIT_REPO_URI="https://github.com/SpectrumIM/${PN}2.git" + EGIT_REPO_URI="https://github.com/SpectrumIM/${PN}.git" inherit git-r3 KEYWORDS="" else @@ -40,15 +41,15 @@ RDEPEND=" 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:= + dev-libs/glib + net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) @@ -60,16 +61,20 @@ DEPEND=" ${RDEPEND} doc? ( app-doc/doxygen ) test? ( - dev-python/sleekxmpp[${PYTHON_USEDEP}] - dev-util/cppunit - net-irc/ngircd + dev-python/sleekxmpp[${PYTHON_USEDEP}] + dev-util/cppunit + net-irc/ngircd ) " + PATCHES=( "${FILESDIR}/remove_debug_cflags.patch" ) +# Tests are currently restricted, as they do completly fail +RESTRICT="test" + pkg_setup() { enewgroup spectrum enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum @@ -107,7 +112,7 @@ src_configure() { } src_test() { - cd tests/libtransport && "${EPYTHON}" ../start.py || die + cd tests/libtransport && "${EPYTHON}" ../start.py || die } src_install() {