Fix global-scope call to xml-config. Fixes bug 123965

Package-Manager: portage-2.1_pre4-r1

diff --git a/www-apache/mod_proxy_html/ChangeLog b/www-apache/mod_proxy_html/ChangeLog
index cea331ca378c82f7b4e8e6cb6d2183f53da05501..c2f92b73a769205af6a6e40e94fcc90443acd2bd 100644 (file)
--- a/www-apache/mod_proxy_html/ChangeLog
+++ b/www-apache/mod_proxy_html/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_proxy_html
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/ChangeLog,v 1.5 2005/12/12 10:05:30 ticho Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/ChangeLog,v 1.6 2006/02/27 17:46:19 vericgar Exp $
+
+  27 Feb 2006; Michael Stewart <vericgar@gentoo.org>
+  mod_proxy_html-2.4.3.ebuild, mod_proxy_html-2.5.1.ebuild:
+  Fix global-scope call to xml-config. Fixes bug 123965
 
   12 Dec 2005; Andrej Kacian <ticho@gentoo.org> mod_proxy_html-2.4.3.ebuild:
   Stable on x86, bug #106465.

diff --git a/www-apache/mod_proxy_html/mod_proxy_html-2.4.3.ebuild b/www-apache/mod_proxy_html/mod_proxy_html-2.4.3.ebuild
index 2835e2a7d266dfe53b8f8291034db89cf1e28085..851774d1c5648fa49ae4a869727be7a3d80670b9 100644 (file)
--- a/www-apache/mod_proxy_html/mod_proxy_html-2.4.3.ebuild
+++ b/www-apache/mod_proxy_html/mod_proxy_html-2.4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/mod_proxy_html-2.4.3.ebuild,v 1.3 2005/12/12 10:05:30 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/mod_proxy_html-2.4.3.ebuild,v 1.4 2006/02/27 17:46:19 vericgar Exp $
 
 inherit eutils apache-module
 
@@ -17,7 +17,6 @@ DEPEND="dev-libs/libxml2"
 
 S=${WORKDIR}
 
-APXS2_ARGS="`xml2-config --cflags` -c ${PN}.c"
 APACHE2_MOD_CONF="27_${PN}"
 APACHE2_MOD_DEFINE="PROXY_HTML"
 
@@ -26,3 +25,9 @@ need_apache2
 src_unpack() {
        cp ${DISTDIR}/${P}.c ${PN}.c || die
 }
+
+src_compile() {
+       APXS2_ARGS="`xml2-config --cflags` -c ${PN}.c"
+       apache2_src_compile
+}
+

diff --git a/www-apache/mod_proxy_html/mod_proxy_html-2.5.1.ebuild b/www-apache/mod_proxy_html/mod_proxy_html-2.5.1.ebuild
index 1594fd795340e595d74e19fe5fac3f58d611ef25..776a9a2096e81c53949e1870eed29d1dc04ccedb 100644 (file)
--- a/www-apache/mod_proxy_html/mod_proxy_html-2.5.1.ebuild
+++ b/www-apache/mod_proxy_html/mod_proxy_html-2.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/mod_proxy_html-2.5.1.ebuild,v 1.1 2005/10/26 00:35:28 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/mod_proxy_html-2.5.1.ebuild,v 1.2 2006/02/27 17:46:19 vericgar Exp $
 
 inherit eutils apache-module
 
@@ -19,7 +19,6 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}"
 
-APXS2_ARGS="$(xml2-config --cflags) -c ${PN}.c"
 APACHE2_MOD_CONF="27_${PN}"
 APACHE2_MOD_DEFINE="PROXY_HTML"
 
@@ -28,3 +27,8 @@ need_apache2
 src_unpack() {
        bzip2 -dc "${DISTDIR}/${P}.c.bz2" > "${PN}.c" || die
 }
+
+src_compile() {
+       APXS2_ARGS="$(xml2-config --cflags) -c ${PN}.c"
+       apache2_src_compile
+}