gentoo resync : 03.03.2021

4 files changed, 49 insertions, 62 deletions

diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest
index e79e55f9abdb..4431e05a3503 100644
--- a/net-irc/limnoria/Manifest
+++ b/net-irc/limnoria/Manifest
@@ -1,4 +1,4 @@
-DIST limnoria-20191123.tar.gz 975077 BLAKE2B b5bc425013a30043c79a5dc53fc346e3b65cafbae154789f43634fc8beb4c7dcfaea34b0c1e22eae28e044eaa2801b0c29ef106fd6e2cc0095e6acbf4c4bf931 SHA512 5822f83a5d7fae0e45e526d9a72c1bbfd2acb7f625cff38e4d6e59222aca4c68204ae03069e991e274b108391cd4feff85783805657554771a7d24789589d14b
-EBUILD limnoria-20191123.ebuild 2365 BLAKE2B 2f9b3a9a592e7f089ef5b9d4a4ec29c916c046cd74d1b4a56234d4d1a2a06a527acac1b5773810dcc623570d21f3929c71ba59c1a05b6ce558fd0868304c4331 SHA512 816dd37456b3bc74bcbcd371039a356bd1aab3e495911511f0629fb259c7297c8b7c853e6d9d71981d02cb555f0e1400f19ba0a4ba27e8585b4075363cd2ecf5
-EBUILD limnoria-99999999.ebuild 2365 BLAKE2B 2f9b3a9a592e7f089ef5b9d4a4ec29c916c046cd74d1b4a56234d4d1a2a06a527acac1b5773810dcc623570d21f3929c71ba59c1a05b6ce558fd0868304c4331 SHA512 816dd37456b3bc74bcbcd371039a356bd1aab3e495911511f0629fb259c7297c8b7c853e6d9d71981d02cb555f0e1400f19ba0a4ba27e8585b4075363cd2ecf5
-MISC metadata.xml 408 BLAKE2B 5328f97d256c4e5dc340d7ce1c6090983c84948326bff34ee0a94c6dd644fb72b5bf348a10e841e520ccf80d1238f159af64e5a3dc1991b9646da17baf3ff0d0 SHA512 6be6681e4b0f8555cd0e769937580068315acae5b1d1c722c354748b8c0a16c0146950b716a1b7b46f0230623580b2576f53c757b13125577698f458f824732e
+DIST limnoria-20200124.tar.gz 1034653 BLAKE2B 895a0820efcd58429e457e0cb8dbcb864e56a3bce9fab9546cf622aabc7711a015432812c4193d2dabe7a85043c623ce427504c1c8e78530499c8db2c589bd8e SHA512 828c4927e2ce00c012d17f8a2b2d629370c34915e7e4f71de6df67259e643448c33a60d9cf742b2d827e21e17326a8fc20be875eac826edf64406eda906567a4
+EBUILD limnoria-20200124.ebuild 2410 BLAKE2B 0063b7338075380d0707970ea907e2a02b1148e98a352e2931ea0012a7de69a3960d1d055c154d28bcb0c6c78e067e03e90dc8c89a2331f2e0f7af2579df1a20 SHA512 36fbd82577f27757a7c1ddaf699d1b50c1fc910ad4a8ab443ca193c30f7a675d39223cbd28b8cfe3975f8eb5c18f87c1075c7c7b271a2855c06698917dbf8767
+EBUILD limnoria-9999.ebuild 2410 BLAKE2B 0063b7338075380d0707970ea907e2a02b1148e98a352e2931ea0012a7de69a3960d1d055c154d28bcb0c6c78e067e03e90dc8c89a2331f2e0f7af2579df1a20 SHA512 36fbd82577f27757a7c1ddaf699d1b50c1fc910ad4a8ab443ca193c30f7a675d39223cbd28b8cfe3975f8eb5c18f87c1075c7c7b271a2855c06698917dbf8767
+MISC metadata.xml 432 BLAKE2B cc531ed9f53977a608eb33275b3d17e587b7e4dccfb62c6bc952a9a568ee0c6d70bd52477a610e1b9725dc0adde664d5b5ad218a119d47a42629c5eb827865b7 SHA512 7e5bd85a3471bb3f970ebe08e4eb5efd748cb434bdbac86d574ba2117a25f05ac7a91f01812a4ee0740ce528dcd576a15006f28f844c60c31265ed512ea444d6
diff --git a/net-irc/limnoria/limnoria-20191123.ebuild b/net-irc/limnoria/limnoria-20200124.ebuild
index 9374199261b8..03b9171f694b 100644
--- a/net-irc/limnoria/limnoria-20191123.ebuild
+++ b/net-irc/limnoria/limnoria-20200124.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 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() {
diff --git a/net-irc/limnoria/limnoria-99999999.ebuild b/net-irc/limnoria/limnoria-9999.ebuild
index 9374199261b8..03b9171f694b 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 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() {
diff --git a/net-irc/limnoria/metadata.xml b/net-irc/limnoria/metadata.xml
index 7d0ba75439c3..05291b97d3d0 100644
--- a/net-irc/limnoria/metadata.xml
+++ b/net-irc/limnoria/metadata.xml
@@ -5,6 +5,7 @@
 		<email>NP-Hardass@gentoo.org</email>
 		<name>NP-Hardass</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name="crypt">Enables user authentication with GPG</flag>
 	</use>