Fix /usr/local-installed apxs overriding system apxs. Add linkage to libapr for good measure. Spell out the entire path to mod_mono.so.

(Portage version: 2.2_rc28/cvs/Linux x86_64)

4 files changed, 41 insertions, 19 deletions

diff --git a/www-apache/mod_mono/ChangeLog b/www-apache/mod_mono/ChangeLog
index c2411eff15d8..68b37e5e7d6b 100644
--- a/www-apache/mod_mono/ChangeLog
+++ b/www-apache/mod_mono/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apache/mod_mono
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.51 2009/04/17 15:47:40 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.52 2009/05/03 12:32:49 loki_val Exp $
+
+*mod_mono-2.2-r1 (03 May 2009)
+
+  03 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  files/2.2/70_mod_mono.conf, -mod_mono-2.2.ebuild, +mod_mono-2.2-r1.ebuild,
+  mod_mono-2.4.ebuild:
+  Fix /usr/local-installed apxs overriding system apxs. Add linkage to
+  libapr for good measure. Spell out the entire path to mod_mono.so.
 
   17 Apr 2009; Brent Baude <ranger@gentoo.org> mod_mono-2.2.ebuild:
   Marking mod_mono-2.2 ~ppc for bug 255410
diff --git a/www-apache/mod_mono/files/2.2/70_mod_mono.conf b/www-apache/mod_mono/files/2.2/70_mod_mono.conf
index 80341eba0a7b..f944039923e9 100644
--- a/www-apache/mod_mono/files/2.2/70_mod_mono.conf
+++ b/www-apache/mod_mono/files/2.2/70_mod_mono.conf
@@ -13,7 +13,7 @@
 	MonoAutoApplication Enabled
 
 	<IfModule !mod_mono.c>
-		LoadModule mono_module modules/mod_mono.so
+		LoadModule mono_module /usr/@LIBDIR@/apache2/modules/mod_mono.so
 	</IfModule>
 
 	<IfModule mod_mime.c>
diff --git a/www-apache/mod_mono/mod_mono-2.2.ebuild b/www-apache/mod_mono/mod_mono-2.2-r1.ebuild
index 51d6d0f74976..8ed783e8e187 100644
--- a/www-apache/mod_mono/mod_mono-2.2.ebuild
+++ b/www-apache/mod_mono/mod_mono-2.2-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-2.2.ebuild,v 1.2 2009/04/17 15:47:40 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-2.2-r1.ebuild,v 1.1 2009/05/03 12:32:49 loki_val Exp $
 
 EAPI=2
 
 # DRAGONS: Watch the order of these.
 
-inherit apache-module eutils go-mono mono
+inherit apache-module multilib eutils go-mono mono
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~x86 ~amd64 ~ppc"
 
 DESCRIPTION="Apache module for Mono."
 HOMEPAGE="http://www.go-mono.com/"
@@ -27,24 +27,31 @@ DOCFILES="AUTHORS ChangeLog COPYING INSTALL NEWS README"
 need_apache2
 
 src_prepare() {
+	sed -e "s:@LIBDIR@:$(get_libdir):" "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
+		> "${WORKDIR}/${APACHE2_MOD_CONF##*/}.conf" || die
+	go-mono_src_prepare
 	use aspnet2 && epatch "${FILESDIR}/mono_auto_application_aspnet2.patch"
 }
 
 src_configure() {
+	export LIBS="$(pkg-config --libs apr-1)"
 	go-mono_src_configure \
 		$(use_enable debug) \
+		--with-apxs="${APXS}" \
+		--with-apr-config="/usr/bin/apr-1-config" \
+		--with-apu-config="/usr/bin/apu-1-config" \
 		|| die "econf failed"
 }
+src_compile() {
+	go-mono_src_compile
+}
 
 src_install() {
 	go-mono_src_install
 	find "${D}" -name 'mod_mono.conf' -delete || die "failed to remove mod_mono.conf"
-	if [[ -n "${APACHE2_MOD_CONF}" ]] ; then
-		insinto "${APACHE_MODULES_CONFDIR}"
-		set -- ${APACHE2_MOD_CONF}
-		newins "${FILESDIR}/${1}.conf" "$(basename ${2:-$1}).conf" \
-			|| die "internal ebuild error: '${FILESDIR}/${1}.conf' not found"
-	fi
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${WORKDIR}/${APACHE2_MOD_CONF##*/}.conf" "${APACHE2_MOD_CONF##*/}.conf" \
+		|| die "internal ebuild error: '${FILESDIR}/${APACHE2_MOD_CONF}.conf' not found"
 }
 
 pkg_postinst() {
diff --git a/www-apache/mod_mono/mod_mono-2.4.ebuild b/www-apache/mod_mono/mod_mono-2.4.ebuild
index b6a53bb1577c..bee1934a56c5 100644
--- a/www-apache/mod_mono/mod_mono-2.4.ebuild
+++ b/www-apache/mod_mono/mod_mono-2.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-2.4.ebuild,v 1.1 2009/03/30 22:07:12 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-2.4.ebuild,v 1.2 2009/05/03 12:32:49 loki_val Exp $
 
 EAPI=2
 
 # DRAGONS: Watch the order of these.
 
-inherit apache-module eutils go-mono mono
+inherit apache-module multilib eutils go-mono mono
 
 KEYWORDS="~x86 ~amd64"
 
@@ -27,24 +27,31 @@ DOCFILES="AUTHORS ChangeLog COPYING INSTALL NEWS README"
 need_apache2
 
 src_prepare() {
+	sed -e "s:@LIBDIR@:$(get_libdir):" "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
+		> "${WORKDIR}/${APACHE2_MOD_CONF##*/}.conf" || die
+	go-mono_src_prepare
 	use aspnet2 && epatch "${FILESDIR}/mono_auto_application_aspnet2.patch"
 }
 
 src_configure() {
+	export LIBS="$(pkg-config --libs apr-1)"
 	go-mono_src_configure \
 		$(use_enable debug) \
+		--with-apxs="${APXS}" \
+		--with-apr-config="/usr/bin/apr-1-config" \
+		--with-apu-config="/usr/bin/apu-1-config" \
 		|| die "econf failed"
 }
+src_compile() {
+	go-mono_src_compile
+}
 
 src_install() {
 	go-mono_src_install
 	find "${D}" -name 'mod_mono.conf' -delete || die "failed to remove mod_mono.conf"
-	if [[ -n "${APACHE2_MOD_CONF}" ]] ; then
-		insinto "${APACHE_MODULES_CONFDIR}"
-		set -- ${APACHE2_MOD_CONF}
-		newins "${FILESDIR}/${1}.conf" "$(basename ${2:-$1}).conf" \
-			|| die "internal ebuild error: '${FILESDIR}/${1}.conf' not found"
-	fi
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${WORKDIR}/${APACHE2_MOD_CONF##*/}.conf" "${APACHE2_MOD_CONF##*/}.conf" \
+		|| die "internal ebuild error: '${FILESDIR}/${APACHE2_MOD_CONF}.conf' not found"
 }
 
 pkg_postinst() {