Conditionally apply 2.4 compatibility patch to avoid build failures against 2.2; with thanks to Agostino "ago" Sarubbo for implementation suggestion.

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

3 files changed, 19 insertions, 13 deletions

diff --git a/www-apache/mod_auth_radius/ChangeLog b/www-apache/mod_auth_radius/ChangeLog
index 816153e71963..d430212419d7 100644
--- a/www-apache/mod_auth_radius/ChangeLog
+++ b/www-apache/mod_auth_radius/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_auth_radius
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_radius/ChangeLog,v 1.1 2013/05/08 13:52:15 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_radius/ChangeLog,v 1.2 2013/05/13 13:31:43 chainsaw Exp $
+
+  13 May 2013; Tony Vroon <chainsaw@gentoo.org> mod_auth_radius-1.5.8.ebuild:
+  Conditionally apply 2.4 compatibility patch to avoid build failures against
+  2.2; with thanks to Agostino "ago" Sarubbo for implementation suggestion.
 
 *mod_auth_radius-1.5.8 (08 May 2013)
 
diff --git a/www-apache/mod_auth_radius/Manifest b/www-apache/mod_auth_radius/Manifest
index 11f25c720f13..efe4949c05fd 100644
--- a/www-apache/mod_auth_radius/Manifest
+++ b/www-apache/mod_auth_radius/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 AUX 1.5.8-includes.patch 719 SHA256 a6e6cd0791f0095986effcbaf4f8f1b1ca2a66f3c26076dd941f7fc5eba4744a SHA512 8c9bd0e4a9afd5ab009b956685bc0c94cef1a50dc112f701994804acd8fe821d1c25367c5bede3e95ad190149d1bd482dea90ff8824bb5a2aa20fa9451e81ad2 WHIRLPOOL d326d79d1bf5ec7222b37c1aa25d8d5afba8944cd478ba29e92e8ac3a49fe6e9e4c51e956f2610cb1706460c6269a06d820c427fed374e1d3a55715e6b237a46
 AUX 1.5.8-remote_ip-obsolete.patch 1326 SHA256 b80cf4f9c9c7f5062b7396c106b6b2f5c8962faa30b3f3ead3f39da7b4bac588 SHA512 172b319b90580e08200d787821e28fbd85ffb0dd6fb17566cbad62fd5908be225b7e7b34adc6cb0800f97650de2b0e5bc0cbe7e30f8fdb7ee75674bb7b670db4 WHIRLPOOL 738876f2c52c71d03304be321689a204925df5206711217d6b30840388902e40af48fcced94ca76e5bc924e187a1e59eeb65ed62a75c9859c7a01f7d36d306ef
 DIST mod_auth_radius-1.5.8.tar 122880 SHA256 6a16cb64c8e3da5ccef5db007d3ab3fa53274bdb37c5f6b1821a12de42aa6d93 SHA512 0fcc43a44ea17b33595a850abb03ff6b92e100dfbeffc82caa9516f6eb7914fb463cb62286d624203a2c7035d05a107dda7b68c5cedf7de3b8be95b9266b6988 WHIRLPOOL 15ffe4db98758e0ef41390f46e97f686ed678b9358347de3b3257ba8d0fac9623935563040a0138c8c81179deb8dca0f998f90441c8b538d45e14548fbc97403
-EBUILD mod_auth_radius-1.5.8.ebuild 819 SHA256 f18c617b10d071d88608e339b97c5b8c949d42369dabf01bc5eb19a8a6b7be47 SHA512 e4e84c3f26037253e9d96fcf0245388115864e6c854fe5b6b9a2bf18477e19c2cf8658591929c441052f60856058d207d1e5b94d3ace46a8575f80942fbd8ca5 WHIRLPOOL b093b7324837a696b6963da548b37438f38dc82cb8f0b19b3385214fb80a09084518c2bc7b9ee129525de241fd4326a323858df1327481f147a7ba3802222f99
-MISC ChangeLog 627 SHA256 1db553a51fcb521e1712cacc4f01792fb0183869a4a8698c4562b5c56451b681 SHA512 cac09359caa056550de10fab2c9909919886c7ab1ce7370614c17b294d2a849a0a49ba57fc514e43ce7b93626789c14b42748a4de97cf0906439accdd14ff875 WHIRLPOOL 6a426e1aa4acdbfd60459e43cb8aff416b3d6363b0a1a864cc2b3f1d1f6a02ea40950491c8f7bd9649fad538cdd9d65d35e33b722c3b7a27518f5cae0677e28b
+EBUILD mod_auth_radius-1.5.8.ebuild 895 SHA256 926e5c0ff35e5b647b377f0defd8d87bf38404ef81d00432b63df15270e6a113 SHA512 f0387f107c09220b3ede636ac311cdd4c641d9198d9a1555c33abea9563082dad05e67c818a967dfce1e559e000be7c6ca947fc3613670c88261972a04c3dfca WHIRLPOOL d3a9e470e32c32d1c29c2dc45b4c1703da93f61fe5b988e3ed46cdd86cada4c1b463a9ce2df3e170466b838483e4cdcc93644a0bb5dad76713fee2849d40afa9
+MISC ChangeLog 860 SHA256 9d4d0534b8463173e552302fd04ab3ab9219c08a423b5941dce3311b16c4c1f6 SHA512 479eda2bd59fd460add6a054aa95fff1a186f048767350b24b2a4260dd9f2685a658c1d6f0bcfe8938216667fd1499759ba474b14f317cf3dad2e48a1997613d WHIRLPOOL 2997efa2ed84657066b0a172f79b1bf5af7b58168354ffb4b08b5a0f43af265817f02701c632acadde5557cc0428687f9a147d8c5d7d9dae7dc754eb59ce7526
 MISC metadata.xml 237 SHA256 88d9092fd208599a8b524cca9633d9330223e45c34a44e54b2de05edb4738ac7 SHA512 11773ab2b5adaa81f3c8f73413d2f257ea1d1624df689154ee2697412ff14ea8f9851b805c4a474b486abb0a066cfc929f91eb852a208b9536885d467df36af1 WHIRLPOOL 324b778d3103d615af41fd6d1d978beeeeb08f4823a3c81fd453464b4df2ed59b56a481ddd65b4eb740dc75b4dc69133e761199abe6d27333b1fce97d5b5a1be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGKWJAACgkQp5vW4rUFj5oWJgCfUnoeV53zYj4k0M6Pw0VIID4V
-psMAnj9Cml4BpINiRqFjtRSv4H/u0Axb
-=u65i
+iEYEAREIAAYFAlGQ60EACgkQp5vW4rUFj5pN+ACeMKNfLjivskfPKI+6Z+HepYEj
++kAAniT9skltb0CJimJAcG8QZP1WVlwB
+=9Y7i
 -----END PGP SIGNATURE-----
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
index 8783784e4046..a95b054750c1 100644
--- 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
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_radius/mod_auth_radius-1.5.8.ebuild,v 1.1 2013/05/08 13:52:15 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_radius/mod_auth_radius-1.5.8.ebuild,v 1.2 2013/05/13 13:31:43 chainsaw Exp $
 
 EAPI="5"
 
-inherit apache-module base
+inherit apache-module eutils
 
 DESCRIPTION="Radius authentication for Apache."
 HOMEPAGE="http://freeradius.org/mod_auth_radius/"
@@ -20,15 +20,17 @@ APACHE2_MOD_DEFINE="AUTH_RADIUS"
 
 APXS2_ARGS="-c ${PN}-2.0.c"
 
-PATCHES=(
-	"${FILESDIR}/${PV}-includes.patch"
-	"${FILESDIR}/${PV}-remote_ip-obsolete.patch"
-)
-
 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
 }