[gentoo-dev] [PATCH] depend.apache.eclass - fix for EAPI6

[gentoo-dev] [PATCH] depend.apache.eclass - fix for EAPI6

[Ian Stakenvicius]

[-- Attachment #1.1.1: Type: text/plain, Size: 651 bytes --]

Hey all -- depend.apache.eclass currently calls get_libdir() in global
scope due to _init_apache2 being called by need_apache*() functions.
This patch drops _init_apache2 from these need_apache*() functions on
all EAPIS other than 0-5, and calls it during depend.apache_pkg_setup().

FYI, there are nine packages which would need to be adjusted if this
change were to not be EAPI6 specific, and none of the adjustments
would need revbumps or stabilizations:

app-text/refbase
dev-perl/Apache-Test
media-sound/mserv
sci-geosciences/mapserver
www-apps/Apache-Gallery
www-apps/lxr
www-apps/redmine
www-apps/rt
www-misc/zoneminder




[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.2: depend.apache.eclass-eapi6-fix.patch --]
[-- Type: text/x-diff; name="depend.apache.eclass-eapi6-fix.patch", Size: 1053 bytes --]

diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 22a8216..d0b30eb 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -162,6 +162,8 @@ depend.apache_pkg_setup() {
 		else
 			_init_no_apache
 		fi
+	else
+		_init_apache2
 	fi
 }
 
@@ -226,7 +228,9 @@ need_apache2() {
 
 	DEPEND="${DEPEND} ${APACHE2_DEPEND}"
 	RDEPEND="${RDEPEND} ${APACHE2_DEPEND}"
-	_init_apache2
+	case "${EAPI:-0}" in
+	0|1|2|3|4|5) _init_apache2 ;;
+	esac
 }
 
 # @FUNCTION: need_apache2_2
@@ -237,7 +241,9 @@ need_apache2_2() {
 
 	DEPEND="${DEPEND} ${APACHE2_2_DEPEND}"
 	RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}"
-	_init_apache2
+	case "${EAPI:-0}" in
+	0|1|2|3|4|5) _init_apache2 ;;
+	esac
 }
 
 # @FUNCTION: need_apache2_4
@@ -248,7 +254,9 @@ need_apache2_4() {
 
         DEPEND="${DEPEND} ${APACHE2_4_DEPEND}"
         RDEPEND="${RDEPEND} ${APACHE2_4_DEPEND}"
-        _init_apache2
+	case "${EAPI:-0}" in
+	0|1|2|3|4|5) _init_apache2 ;;
+	esac
 }
 
 # @FUNCTION: has_apache

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 213 bytes --]

Re: [gentoo-dev] [PATCH] depend.apache.eclass - fix for EAPI6

[Michael Orlitzky]

On 07/14/2016 04:24 PM, Ian Stakenvicius wrote:
> Hey all -- depend.apache.eclass currently calls get_libdir() in global
> scope due to _init_apache2 being called by need_apache*() functions.
> This patch drops _init_apache2 from these need_apache*() functions on
> all EAPIS other than 0-5, and calls it during depend.apache_pkg_setup().

Now would also be a good time to think about whether or not you really
need an eclass to add =www-servers/apache-2.2* to (R)DEPEND.

Re: [gentoo-dev] [PATCH] depend.apache.eclass - fix for EAPI6

[Ian Stakenvicius]

[-- Attachment #1.1: Type: text/plain, Size: 727 bytes --]

On 14/07/16 04:44 PM, Michael Orlitzky wrote:
> On 07/14/2016 04:24 PM, Ian Stakenvicius wrote:
>> Hey all -- depend.apache.eclass currently calls get_libdir() in global
>> scope due to _init_apache2 being called by need_apache*() functions.
>> This patch drops _init_apache2 from these need_apache*() functions on
>> all EAPIS other than 0-5, and calls it during depend.apache_pkg_setup().
> 
> Now would also be a good time to think about whether or not you really
> need an eclass to add =www-servers/apache-2.2* to (R)DEPEND.
> 

Sort of -- Now would be a good time to make sure this patch is OK to
commit; once that's in place, THEN its a good time to consider
deprecation of the eclass alltogether.





[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 213 bytes --]