gentoo resync : 12.03.2021

4 files changed, 16 insertions, 57 deletions

diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index ec466da895ea..0c2dcd1822ac 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -1,10 +1,8 @@
 AUX conf 721 BLAKE2B 976a2936da5e9eef71d9d08f7f12c51151549c23c27918de28da355e87e4927f84cc63904ab0feb0d10a11326ce6e44cc11531d65f6abe3d1ce213ea2e632e24 SHA512 f931acb2e5060872219709b525d64cae630062eb842e55614d57324ff5e801b4b9a99faf47c706ffe67822b29a7fb680ed59db550470afa9ded80621d4bbe3b8
 AUX confd 213 BLAKE2B 2573f19bdc9022357f2f92ff17d84a1e77078c6c05a46a09b6e57ab7132d1f1078fb5003640f83213f746f94e3ab5b482b01d92feb94684665eb4e796a642841 SHA512 6c04de3ef26fd132269532c7bdca3263e95cebf5078ddd57e8ebff62229fabfb64b8ad4d988dfe99c9611c5d1081b4d3862f09d11c08aa1aabc1d5bc7c987439
 AUX init 611 BLAKE2B f84cd718a1ecfe2ed36fb875bde156e6b1700da5ddd115fb841a5d8cae638369238779647c113e1fea50a36069bdb1528917b31ca93b6d8d72686eedd7315c7a SHA512 3fccc3567428e1493daabc0bae87fb769bf7d8d807775ca7d1d3d7e4fdc982b176b3985f8b3b86a1dcbcab001227c685fdba7e08a8a343a2540ee3913412c721
-DIST automx2-2020.1.tar.bz2 49405 BLAKE2B 2c9b26300e32e613f622e0b3a39b7f408d22e22638d61da3c93f5d448fe3ebb325e9a0004e3351abed2c9e427373c42637e3539831c04cda8e65a4d1bba1773e SHA512 823e569eacedcf49d53f8ed623a75455e715e3d49186179927a0e10d3efe9823c336912789bbf3d7d2f9aba3053b601352c99bda4ffcc9a7b78e412c938cd91f
-DIST automx2-2020.2.tar.bz2 50740 BLAKE2B 394d26a06d23efe18a3c147f89660a9dbdde7edba078fd361f188738fdc28d36122aa8182e965bb8e3d69d4cbcd3cb784bc7722dd382d1fbee36213459b91fa1 SHA512 dce790c754fd089a15d0baf023a9cb2e04ebb42a4558fc91b06c2de2105f3e00f3675a555739ff1bc35166c98f6cecec62c95f18f4144e88ac6024eaa6f39abe
 DIST automx2-2021.0.tar.bz2 50912 BLAKE2B de6fe1ea6dd5223518683220ff1210baa68c30e67f9cd3aac1a965759cb0f72c1119427043579fb805f68457ac4062000cf8066b6fa6d7106f3ee7f777346a57 SHA512 3ca632cc71d64a9d9d434a7109ab0f55e23e3babb6c1734689f89e5a83c9daa6666af9ce09cb5a0c14256bd6e19f6c5339bd3b3398db7b2d70ff3c6114ddb428
-EBUILD automx2-2020.1-r1.ebuild 1051 BLAKE2B 2e2568827ebdeeacb4b498b8957194717a79ea42dfeff122ce147fb9265e5b3e8d1b3f59e48f6d57a18aac46926fa2a7f749694bc052bb530bcb51aac7935119 SHA512 fe8c8bed829328968351bf490542331dfba4438eac36b1788beb5a8cea57bbbec9d94c087ccdd81e5f9abd122448285fb2f75d0fefb2c97fe40eb5e7a517070b
-EBUILD automx2-2020.2.ebuild 1083 BLAKE2B 645fb871bcb0c972282a4bc9162a4a5b1d9790cb38ad6fd3d49aaac84e01ea58974f1c3ca313361dc49575df18cf229c4f4fe8eb80a28ff60ced96f3498cbf0e SHA512 3a60d200e101a70bd2e6c90f4a5083783c1eed24180e0a05a091d1605a0af3aee48ab051202ae5c24f66344713ae3bc80263b0cb4a39b3bd14bbe1e847e0b73e
+DIST automx2-2021.2.tar.gz 155311 BLAKE2B 6ace715e24a27a8e98f09920150bd5d6fef7567fa7c3884825140ea8eebebb1392dcfbfab2b5a464f7967adcf421af5997023a7d33f41036608948b59e58155f SHA512 89113d3a37ee66ae44f98d64480419e6c6b10662560a5319ca0f5522d6195a68f586ec94793c2212d859693a50455a8b43292dd859b912404b5abb2ddfc939b6
 EBUILD automx2-2021.0.ebuild 1082 BLAKE2B 42f2ba0ea10140ce614c0143e25d23f6ad3887aaa69c088c83cc37d2f5018b722992bb4ed58ec8c321f848401c56011c0abf9f72e57bf149322b9d762bf30616 SHA512 bf48dede575b1d0c1514006e3d708e9e25233c086608735e38fbb33d1745825d854df44cdba3dd96aaa71563fb78d27642e0d393381eefef51ea8f06041f7c74
-MISC metadata.xml 911 BLAKE2B 721adf43cdb2c39fc76f4f6d0343cb1445104999bdb5c39d401c40bb2d96233c0bafc5c985d9baf8a106ab41cf14f0eeb583546aa8155fe8303098b9b9a044ef SHA512 98544015829928e146f626a0ff212a4dd207828d210aa1202478e42b02a9e19e0ebf381c07ff18bc3b38309d48b057402e0f3ba87b1b600ccfb8639feda7f365
+EBUILD automx2-2021.2.ebuild 1202 BLAKE2B 9c0bfc55e76600f440068b509134b929eeb44a8177b89d88b2e5396efaf1ff21e41705206d0a0c8ba1bf8684c791c8392fef7f680c30d5e161dac4937378c349 SHA512 1dda69009c3d6e64827506316c1f7b5c347502c3aa89f0a37e0d61ee8dfaa074eb0227874286e17023c3128762e18b84bced2e17b4069f9e608726e4db44f0ee
+MISC metadata.xml 916 BLAKE2B 089615c8e6217368ffd85839d31792122f7b65e53ba286b704998258d82cbd43861291fd4b9b94b482173080f1b6d964b9c833935c5340445493404cea25a4aa SHA512 f0d1df0d663056e9389138c3481cfac3c25d924018f171d078f93791fc1fe349c46948224a37fa6b861eaa011abf222f09091dd58763b578d88a45d967eedc23
diff --git a/net-mail/automx2/automx2-2020.1-r1.ebuild b/net-mail/automx2/automx2-2020.1-r1.ebuild
deleted file mode 100644
index 9f1cb15d65fa..000000000000
--- a/net-mail/automx2/automx2-2020.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Email client autoconfiguration service"
-HOMEPAGE="https://automx.org/"
-SRC_URI="https://gitlab.com/automx/automx2/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc"
-
-BDEPEND="acct-user/automx2
-	dev-python/flask-migrate[${PYTHON_USEDEP}]
-	dev-python/ldap3[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}"
-
-python_prepare_all() {
-	sed -i -e "/('scripts'/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	export AUTOMX2_CONF="tests/unittest.conf"
-	${EPYTHON} -m unittest discover tests/ || die
-}
-
-python_install_all() {
-	if use doc; then
-		DOCS="*.adoc doc/*.adoc contrib/*sample.conf"
-		HTML_DOCS="doc/*.html doc/*.svg"
-	fi
-	sed -e "s/@EPYTHON@/${EPYTHON}/" "${FILESDIR}/init" | newinitd - "${PN}"
-	newconfd "${FILESDIR}/confd" "${PN}"
-	insinto /etc
-	newins "${FILESDIR}/conf" "${PN}.conf"
-	distutils-r1_python_install_all
-}
diff --git a/net-mail/automx2/automx2-2020.2.ebuild b/net-mail/automx2/automx2-2021.2.ebuild
index 7f3fa33fa4fd..66b5081f4c4d 100644
--- a/net-mail/automx2/automx2-2020.2.ebuild
+++ b/net-mail/automx2/automx2-2021.2.ebuild
@@ -1,25 +1,30 @@
-# 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,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
 DESCRIPTION="Email client autoconfiguration service"
 HOMEPAGE="https://automx.org/"
-SRC_URI="https://gitlab.com/automx/automx2/-/archive/${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc"
 
-BDEPEND="acct-user/automx2
+BDEPEND="acct-user/automx2"
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/flask-migrate[${PYTHON_USEDEP}]
-	dev-python/ldap3[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}"
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/ldap3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
 
 python_prepare_all() {
 	sed -i -e "/('scripts'/d" setup.py || die
diff --git a/net-mail/automx2/metadata.xml b/net-mail/automx2/metadata.xml
index 6ec5f66d7767..bc7375ae95bc 100644
--- a/net-mail/automx2/metadata.xml
+++ b/net-mail/automx2/metadata.xml
@@ -18,11 +18,11 @@
 		(autoconfig) in one tool.
 	</longdescription>
 	<upstream>
-		<doc>https://gitlab.com/automx/automx2/blob/master/doc/automx2.adoc</doc>
+		<doc>https://github.com/rseichter/automx2/blob/master/doc/automx2.pdf</doc>
 		<maintainer>
 			<email>automx2@seichter.de</email>
 			<name>Ralph Seichter</name>
 		</maintainer>
-		<remote-id type="gitlab">automx/automx2</remote-id>
+		<remote-id type="github">rseichter/automx2</remote-id>
 	</upstream>
 </pkgmetadata>