commit:     dcc4c231201bf5430b347b9baf6a460a4fbf50e9
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu Feb 25 17:57:21 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 14:26:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcc4c231

net-irc/limnoria: Sync live ebuild (not so many 9's)

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...mnoria-99999999.ebuild => limnoria-9999.ebuild} | 51 ++++++++++------------
 1 file changed, 22 insertions(+), 29 deletions(-)

diff --git a/net-irc/limnoria/limnoria-99999999.ebuild 
b/net-irc/limnoria/limnoria-9999.ebuild
similarity index 76%
rename from net-irc/limnoria/limnoria-99999999.ebuild
rename to net-irc/limnoria/limnoria-9999.ebuild
index 9374199261b..e4accb140ca 100644
--- a/net-irc/limnoria/limnoria-99999999.ebuild
+++ b/net-irc/limnoria/limnoria-9999.ebuild
@@ -1,34 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 )
 
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
 
 MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
 MY_PN="Limnoria"
 MY_P="${MY_PN}-${MY_PV}"
 
-if [[ ${PV} == "99999999" ]]; then
+if [[ ${PV} == *9999 ]]; then
        EGIT_REPO_URI="https://github.com/ProgVal/${MY_PN}.git";
        EGIT_BRANCH="testing"
        inherit git-r3
-       SRC_URI=""
 else
        
SRC_URI="https://github.com/ProgVal/${MY_PN}/archive/master-${MY_PV}.tar.gz -> 
${P}.tar.gz"
-       KEYWORDS="~amd64 ~x86"
        S="${WORKDIR}/${MY_PN}-master-${MY_PV}"
+       KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Python based extensible IRC infobot and channel bot"
-HOMEPAGE="https://supybot.aperio.fr/";
-LICENSE="BSD"
+HOMEPAGE="https://docs.limnoria.net";
+LICENSE="BSD GPL-2+"
 SLOT="0"
-IUSE="crypt ssl"
+IUSE="crypt ssl test"
+RESTRICT=" !test? ( test )"
 
 RDEPEND="
        dev-python/chardet[${PYTHON_USEDEP}]
+       dev-python/cryptography[${PYTHON_USEDEP}]
        dev-python/ecdsa[${PYTHON_USEDEP}]
        dev-python/feedparser[${PYTHON_USEDEP}]
        dev-python/python-dateutil[${PYTHON_USEDEP}]
@@ -38,43 +40,34 @@ RDEPEND="
        crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
        ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
        !net-irc/supybot
-       !net-irc/supybot-plugins
-       "
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-       if [[ ${PV} == "99999999" ]]; then
-               git-r3_src_unpack
-       else
-               unpack ${P}.tar.gz
-       fi
-}
+       !net-irc/supybot-plugins"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
 python_prepare() {
        einfo "Removing the RSS plugin because of clashes between libxml2's 
Python3"
        einfo "bindings and feedparser."
-       rm -rf "plugins/RSS" || die
-}
-
-python_install_all() {
-       distutils-r1_python_install_all
-       doman man/*
+       rm -r "plugins/RSS" || die
 }
 
 python_test() {
-       pushd "${T}" > /dev/null
-       PLUGINS_DIR="${BUILD_DIR}/lib/supybot/plugins"
+       pushd "${T}" > /dev/null || die
+       PLUGINS_DIR="${BUILD_DIR}"/lib/supybot/plugins
        EXCLUDE_PLUGINS=()
        # intermittent failure due to issues loading libsandbox.so from 
LD_PRELOAD
        # runs successfully when running the tests on the installed system
        EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Unix" )
        # Runs despite --no-network (GH #1392)
        EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Aka" )
-       "${PYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
+       "${EPYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" 
\
                --plugins-dir="${PLUGINS_DIR}" --no-network \
                --disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \
                || die "Tests failed under ${EPYTHON}"
-       popd > /dev/null
+       popd > /dev/null || die
+}
+
+python_install_all() {
+       distutils-r1_python_install_all
+       doman man/*
 }
 
 pkg_postinst() {

Reply via email to