7 files changed, 65 insertions, 18 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 788b4b0843ab..811794cc3d6a 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.253 2014/01/15 22:48:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.254 2014/01/24 03:39:51 vapier Exp $
+
+  24 Jan 2014; Mike Frysinger <vapier@gentoo.org> apache-2.2.24.ebuild,
+  apache-2.2.25.ebuild, apache-2.2.26.ebuild, apache-2.4.6-r1.ebuild,
+  apache-2.4.6-r2.ebuild, apache-2.4.7.ebuild:
+  Disable dumb cross-compiling size check.
 
   15 Jan 2014; Robin H. Johnson <robbat2@gentoo.org> apache-2.4.7.ebuild:
   proxy_scgi should behind IfDefine PROXY as well, otherwise you get undefined
diff --git a/www-servers/apache/apache-2.2.24.ebuild b/www-servers/apache/apache-2.2.24.ebuild
index 4a4f4ebc6dc4..f159df3420b2 100644
--- a/www-servers/apache/apache-2.2.24.ebuild
+++ b/www-servers/apache/apache-2.2.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.24.ebuild,v 1.13 2013/04/11 09:24:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.24.ebuild,v 1.14 2014/01/24 03:39:51 vapier Exp $
 
 EAPI="2"
 
@@ -83,7 +83,7 @@ MODULE_CRITICAL="
 	mime
 "
 
-inherit apache-2
+inherit apache-2 toolchain-funcs
 
 DESCRIPTION="The Apache Web Server."
 HOMEPAGE="http://httpd.apache.org/"
@@ -110,3 +110,10 @@ src_prepare() {
 	sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script"
 	cp "${FILESDIR}"/2.2.22-envvars-std.in "${S}"/support/envvars-std.in || die "Failed to apply LD_PRELOAD fix"
 }
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	apache-2_src_configure
+}
diff --git a/www-servers/apache/apache-2.2.25.ebuild b/www-servers/apache/apache-2.2.25.ebuild
index 477af0d52d21..eb74a9898147 100644
--- a/www-servers/apache/apache-2.2.25.ebuild
+++ b/www-servers/apache/apache-2.2.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild,v 1.11 2013/11/07 14:56:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild,v 1.12 2014/01/24 03:39:51 vapier Exp $
 
 EAPI="2"
 
@@ -83,7 +83,7 @@ MODULE_CRITICAL="
 	mime
 "
 
-inherit apache-2 systemd
+inherit apache-2 systemd toolchain-funcs
 
 DESCRIPTION="The Apache Web Server."
 HOMEPAGE="http://httpd.apache.org/"
@@ -113,6 +113,13 @@ src_prepare() {
 	cp "${FILESDIR}"/2.2.22-envvars-std.in "${S}"/support/envvars-std.in || die "Failed to apply LD_PRELOAD fix"
 }
 
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	apache-2_src_configure
+}
+
 src_install() {
 	apache-2_src_install
 
diff --git a/www-servers/apache/apache-2.2.26.ebuild b/www-servers/apache/apache-2.2.26.ebuild
index 76ca10a79158..561965e40f90 100644
--- a/www-servers/apache/apache-2.2.26.ebuild
+++ b/www-servers/apache/apache-2.2.26.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.26.ebuild,v 1.1 2013/11/20 17:50:40 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.26.ebuild,v 1.2 2014/01/24 03:39:51 vapier Exp $
 
 EAPI=5
 
@@ -83,7 +83,7 @@ MODULE_CRITICAL="
 	mime
 "
 
-inherit apache-2 systemd
+inherit apache-2 systemd toolchain-funcs
 
 DESCRIPTION="The Apache Web Server."
 HOMEPAGE="http://httpd.apache.org/"
@@ -113,6 +113,13 @@ src_prepare() {
 	cp "${FILESDIR}"/2.2.22-envvars-std.in "${S}"/support/envvars-std.in || die "Failed to apply LD_PRELOAD fix"
 }
 
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	apache-2_src_configure
+}
+
 src_install() {
 	apache-2_src_install
 
diff --git a/www-servers/apache/apache-2.4.6-r1.ebuild b/www-servers/apache/apache-2.4.6-r1.ebuild
index e501afef0799..8d8688c04587 100644
--- a/www-servers/apache/apache-2.4.6-r1.ebuild
+++ b/www-servers/apache/apache-2.4.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r1.ebuild,v 1.3 2013/11/07 14:56:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r1.ebuild,v 1.4 2014/01/24 03:39:51 vapier Exp $
 
 EAPI="2"
 
@@ -113,7 +113,7 @@ MODULE_CRITICAL="
 use ssl && MODULE_CRITICAL+=" socache_shmcb"
 use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
 
-inherit eutils apache-2 systemd
+inherit eutils apache-2 systemd toolchain-funcs
 
 DESCRIPTION="The Apache Web Server."
 HOMEPAGE="http://httpd.apache.org/"
@@ -150,6 +150,13 @@ src_prepare() {
 	popd &>/dev/null || die
 }
 
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	apache-2_src_configure
+}
+
 src_install() {
 	apache-2_src_install
 	for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
diff --git a/www-servers/apache/apache-2.4.6-r2.ebuild b/www-servers/apache/apache-2.4.6-r2.ebuild
index e8f5b4ffd348..91a58f318a24 100644
--- a/www-servers/apache/apache-2.4.6-r2.ebuild
+++ b/www-servers/apache/apache-2.4.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild,v 1.2 2013/11/07 14:56:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild,v 1.3 2014/01/24 03:39:51 vapier Exp $
 
 EAPI="2"
 
@@ -113,7 +113,7 @@ MODULE_CRITICAL="
 use ssl && MODULE_CRITICAL+=" socache_shmcb"
 use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
 
-inherit eutils apache-2 systemd
+inherit eutils apache-2 systemd toolchain-funcs
 
 DESCRIPTION="The Apache Web Server."
 HOMEPAGE="http://httpd.apache.org/"
@@ -150,6 +150,13 @@ src_prepare() {
 	popd &>/dev/null || die
 }
 
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	apache-2_src_configure
+}
+
 src_install() {
 	apache-2_src_install
 	for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
diff --git a/www-servers/apache/apache-2.4.7.ebuild b/www-servers/apache/apache-2.4.7.ebuild
index 00e4826d526e..8f4f09d33db6 100644
--- a/www-servers/apache/apache-2.4.7.ebuild
+++ b/www-servers/apache/apache-2.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild,v 1.3 2014/01/15 22:48:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild,v 1.4 2014/01/24 03:39:51 vapier Exp $
 
 EAPI=5
 
@@ -114,7 +114,7 @@ MODULE_CRITICAL="
 use ssl && MODULE_CRITICAL+=" socache_shmcb"
 use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
 
-inherit eutils apache-2 systemd
+inherit eutils apache-2 systemd toolchain-funcs
 
 DESCRIPTION="The Apache Web Server."
 HOMEPAGE="http://httpd.apache.org/"
@@ -150,6 +150,13 @@ src_prepare() {
 	popd &>/dev/null || die
 }
 
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	apache-2_src_configure
+}
+
 src_install() {
 	apache-2_src_install
 	for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do