From b1ff6a5fe31857bad5a74c6e412461d820d9eaa7 Mon Sep 17 00:00:00 2001 From: Conrad Kostecki Date: Sun, 21 Jul 2019 10:48:53 +0200 Subject: net-im/spectrum2: use correct python eclass Switching from python-single-r1 eclass to python-any-r1 eclass, since python is only used for tests and not during runtime. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Conrad Kostecki Closes: https://github.com/gentoo/gentoo/pull/12485 Signed-off-by: Andreas Sturmlechner --- net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild | 114 ------------------------- net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild | 118 ++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 114 deletions(-) delete mode 100644 net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild create mode 100644 net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild (limited to 'net-im') diff --git a/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild b/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild deleted file mode 100644 index d528d2460792..000000000000 --- a/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# 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-single-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:= ) - 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=" - ${PYTHON_DEPS} - ${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( - dev-python/sleekxmpp[${PYTHON_USEDEP}] - dev-util/cppunit - net-irc/ngircd - ) -" - -# Tests are currently restricted, as they do completly fail -RESTRICT="test" - -pkg_setup() { - enewgroup spectrum - enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum - - use test && python-single-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 -} diff --git a/net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild b/net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild new file mode 100644 index 000000000000..be621d22a701 --- /dev/null +++ b/net-im/spectrum2/spectrum2-2.0.10.1-r2.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:= ) + 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 +} -- cgit v1.2.3-65-gdbad