gentoo resync : 05.12.2021

3 files changed, 41 insertions, 41 deletions

diff --git a/www-apache/mod_auth_radius/Manifest b/www-apache/mod_auth_radius/Manifest
index 3529bf6dba37..92126fb9e342 100644
--- a/www-apache/mod_auth_radius/Manifest
+++ b/www-apache/mod_auth_radius/Manifest
@@ -1,5 +1,5 @@
 AUX 1.5.8-includes.patch 719 BLAKE2B 2ebf52d30377346e1d7aeb66ee46dec5ef7366748d5d71246cd8215184a08cc8ec32a9879dd468d3d3b02e4c49f31fffc6a1e238d3f8b279b78970274798a303 SHA512 8c9bd0e4a9afd5ab009b956685bc0c94cef1a50dc112f701994804acd8fe821d1c25367c5bede3e95ad190149d1bd482dea90ff8824bb5a2aa20fa9451e81ad2
 AUX 1.5.8-remote_ip-obsolete.patch 1326 BLAKE2B cd788a83eb02e26033c369e8595e6a5e4e4f09d87cb5e32fc81c329c17369cf09b6d2e5368418238a62d9540cb0b5c9fc827799e9f0ca556b3edfe34ea5b3399 SHA512 172b319b90580e08200d787821e28fbd85ffb0dd6fb17566cbad62fd5908be225b7e7b34adc6cb0800f97650de2b0e5bc0cbe7e30f8fdb7ee75674bb7b670db4
-DIST mod_auth_radius-1.5.8.tar 122880 BLAKE2B 54f1b72cc5c7721c6aead2b0a465c2ddca1264c2a6c196dbf4498c53cc114f1b6afa5467aca5164a39401f0257aed91d8fca1fca4b7e0fe7cd4f04d398ad63a4 SHA512 0fcc43a44ea17b33595a850abb03ff6b92e100dfbeffc82caa9516f6eb7914fb463cb62286d624203a2c7035d05a107dda7b68c5cedf7de3b8be95b9266b6988
-EBUILD mod_auth_radius-1.5.8.ebuild 759 BLAKE2B c2296e1782cc5e208116e7d98b595271837a4e315aa0114100bce2015ce31b0365d9ae63e0233674a4c1a6d2a51a70e0fef4cf69ce07c856d6d114e1fffa671a SHA512 f6e5e4536ee91150b85e27f413e8e5f0e37ad28bcb652f5c27688883509798e4dc29575bd1c714549d08c204b73db7e3b87440237786a66367d92798c0ce6fef
+DIST mod_auth_radius-1.6.0.tar.gz 20176 BLAKE2B b004b133a3b8e84533f1e97883436aaec389870c6ca6eb2017bd7f4fac12913c438b9838ff1fce01e5ed26bfeec65f6ac349816ee681f39deea0616c22e2530c SHA512 e128855ab198b35030b798c16538fa33c1698f0f179fccb0d160c2d2cce08f1a7b2ecfaefdc19ae7f21802d38705b7a08414444ac52041b7365a5633e5e66159
+EBUILD mod_auth_radius-1.6.0.ebuild 896 BLAKE2B a53e510c70f452d6fb62b8810dd595724f661caa93c5b64c747105cff9c3116a2254457e084e01536183458c56e8912a4959559202abeb3e777397ac3b935191 SHA512 7a52be61ab97e29012df45a47d3ad64ac9c8416587f43eb094da32f0218edf25902c9a86c04ce1ff9a78fdb0284af98c548282152fb1f097000ffdec9c2c6a60
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/www-apache/mod_auth_radius/mod_auth_radius-1.5.8.ebuild b/www-apache/mod_auth_radius/mod_auth_radius-1.5.8.ebuild
deleted file mode 100644
index 831b59d27d9e..000000000000
--- a/www-apache/mod_auth_radius/mod_auth_radius-1.5.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit apache-module epatch
-
-DESCRIPTION="Radius authentication for Apache"
-HOMEPAGE="http://freeradius.org/mod_auth_radius/"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/${P}.tar"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-APACHE2_MOD_FILE=".libs/mod_auth_radius-2.0.so"
-APACHE2_MOD_DEFINE="AUTH_RADIUS"
-
-APXS2_ARGS="-c ${PN}-2.0.c"
-
-DOCFILES="README"
-
-need_apache2
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-includes.patch"
-	if has_version ">=www-servers/apache-2.4"; then
-		epatch "${FILESDIR}/${PV}-remote_ip-obsolete.patch"
-	fi
-}
-
-src_compile() {
-	apache-module_src_compile
-}
-
-src_install() {
-	apache-module_src_install
-}
diff --git a/www-apache/mod_auth_radius/mod_auth_radius-1.6.0.ebuild b/www-apache/mod_auth_radius/mod_auth_radius-1.6.0.ebuild
new file mode 100644
index 000000000000..c53926ebd7cd
--- /dev/null
+++ b/www-apache/mod_auth_radius/mod_auth_radius-1.6.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit apache-module depend.apache
+
+DESCRIPTION="Radius authentication for Apache"
+HOMEPAGE="https://freeradius.org/sub_projects/ https://github.com/FreeRADIUS/mod_auth_radius/"
+SRC_URI="https://github.com/FreeRADIUS/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+
+APACHE2_MOD_DEFINE="AUTH_RADIUS"
+
+DOCFILES="README.asciidoc"
+
+need_apache2
+
+# Work around Bug #616612
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test ${v} -lt 1.6.0; then
+				ewarn "Please note that upstream has changed the name of this module from"
+				ewarn "    ${PN}-2.0.so"
+				ewarn "to simply"
+				ewarn "    ${PN}.so"
+			fi
+		done
+	fi
+}