fix Gentoo ebuild

distribution/gentoo/mail-filter/pyquarantine-milter/pyquarantine-milter-9999.ebuild

@@ -1,9 +1,9 @@
 # Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{11..13} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -31,19 +31,21 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="+lxml systemd"
 
-RDEPEND="
+RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/jsonschema[${PYTHON_USEDEP}]
 	lxml? ( dev-python/lxml[${PYTHON_USEDEP}] )
 	dev-python/netaddr[${PYTHON_USEDEP}]
 	dev-python/peewee[${PYTHON_USEDEP}]
-	>=dev-python/pymilter-1.5[${PYTHON_USEDEP}]"
+	>=dev-python/pymilter-1.0.5[${PYTHON_USEDEP}]"
 
 python_install_all() {
-	distutils-r1_python_install_all
 	use systemd && systemd_dounit pyquarantine/misc/systemd/${PN}.service
 	newinitd pyquarantine/misc/openrc/${PN}.initd ${PN}
 	newconfd pyquarantine/misc/openrc/${PN}.confd ${PN}
+	insinto /etc/pyquarantine
+	doins pyquarantine/misc/pyquarantine.conf.default
+	doins -r pyquarantine/misc/templates
+	distutils-r1_python_install_all
 }
 
 pkg_postinst() {

distribution/pypi/distribute.sh

@@ -14,4 +14,4 @@ select version in $(find . -maxdepth 1 -type f -name "pyquarantine-*.*.*.tar.gz"
   [ -n "${version}" ] && break
   echo -e "\ninvalid choice\n\n${msg}"
 done
-${TWINE} upload "${version}"{.tar.gz,-*.whl}
+${TWINE} upload -u __token__ "${version}"{.tar.gz,-*.whl}

pyquarantine/__init__.py

@@ -27,7 +27,7 @@ __all__ = [
     "lists",
     "QuarantineMilter"]
 
-__version__ = "2.1.0"
+__version__ = "2.1.1"
 
 from pyquarantine import _runtime_patches
 

setup.py

@@ -32,22 +32,6 @@ setup(name = "pyquarantine",
             "pyquarantine=pyquarantine.cli:main",
         ]
     },
-    data_files = [
-        (
-            "/etc/pyquarantine",
-            [
-                "pyquarantine/misc/pyquarantine.conf.default"
-            ]
-        ), (
-            "/etc/pyquarantine/templates",
-            [
-                "pyquarantine/misc/templates/disclaimer_html.template",
-                "pyquarantine/misc/templates/disclaimer_text.template",
-                "pyquarantine/misc/templates/notification.template",
-                "pyquarantine/misc/templates/removed.png"
-            ]
-        )
-    ],
     install_requires = ["pymilter >= 1.5", "jsonschema", "netaddr", "beautifulsoup4[lxml]", "peewee"],
     python_requires = ">=3.10"
 )