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

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

5 files changed, 45 insertions, 23 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/Manifest b/www-apache/mod_mono/Manifest
index 0c23069d6e2f..e1e95d8ca478 100644
--- a/www-apache/mod_mono/Manifest
+++ b/www-apache/mod_mono/Manifest
@@ -2,7 +2,7 @@ AUX 1.2.1/70_mod_mono.conf 2431 RMD160 77fb57f7a3318c1c3f073b61406a44541c08de04
 AUX 1.2.4/70_mod_mono.conf 2431 RMD160 77fb57f7a3318c1c3f073b61406a44541c08de04 SHA1 1408c8ab42cb11ee16f3989c1d04485568c9536e SHA256 a3d2ae2316592fcc9b697b6ab297402b5344ee40d25c11a10375e3be84344f74
 AUX 1.2.6/70_mod_mono.conf 2435 RMD160 4319ce42e7bd1e85b9ac0f015c69d9e9a2423610 SHA1 7fa26f1be41499b680125fee13bb92541ebf7a19 SHA256 d38e0cc6f05e205f2548863fe303b05820f69d2cdcee522ed163204bdde18fba
 AUX 1.9/70_mod_mono.conf 2435 RMD160 4319ce42e7bd1e85b9ac0f015c69d9e9a2423610 SHA1 7fa26f1be41499b680125fee13bb92541ebf7a19 SHA256 d38e0cc6f05e205f2548863fe303b05820f69d2cdcee522ed163204bdde18fba
-AUX 2.2/70_mod_mono.conf 2867 RMD160 74ea030e1ad235602348fd8ab133cb780197949f SHA1 36eb66e462a9ff387d0b8665685614f0ff46f335 SHA256 272df4e82a310b44ab29526a01531f0ab07256a7c7ff7c47703cd7e578d017f5
+AUX 2.2/70_mod_mono.conf 2889 RMD160 043de9191ac08efd75998d4a57ead84fa2c528cd SHA1 2d6d2dcc5e1e7aadfa1452cdd34afd66d879d751 SHA256 1ab3424a4d9365e21ef55e5bda0af3efedb2bfb71b039b022eb54f6dacadb0f1
 AUX mono_auto_application_aspnet2.patch 426 RMD160 0a42409e521d0b64c3dcfe363a55030093d435b0 SHA1 6fe254ce56665cdf71bcfc2947a364eea940860d SHA256 166e09aae2ce8a44dbdb7793b6d02eaf610b76050f4cb7bec341ee6fcbf86393
 DIST mod_mono-1.2.1.tar.gz 335399 RMD160 2d19954cc0f3e349d9f025d277519395f243e8db SHA1 902f1904123816fd94304f92450fccc83509167a SHA256 078554a25ff0cf4b6196702b1b75ee341dd969a4a3ae34bb2f889f1b7542f646
 DIST mod_mono-1.2.4.tar.bz2 252763 RMD160 9508440272b53dbea2a086aad60fda563e00eb31 SHA1 c579227e020aaa6e244562f1f1e198343b54a1f3 SHA256 9c77a263680fa5bd00ebbb222d607a2a19121b501d86bfd7e259a402c8cdea4f
@@ -14,7 +14,7 @@ EBUILD mod_mono-1.2.1.ebuild 1428 RMD160 b9d05f675515303f22ea9c3270c7839cfa3beb9
 EBUILD mod_mono-1.2.4.ebuild 1429 RMD160 87172715f2cc908ebb6be34e9c745a850b39b75d SHA1 de4b8c875e489c7a702a85960ec873b8c214712e SHA256 035eb562655d636b88632ae89663a1d8291f8a292dd59055df805ff0c80ca502
 EBUILD mod_mono-1.2.6-r1.ebuild 1433 RMD160 14295dc44cea5aa711951d5fcecac418fe5f3db0 SHA1 81718e5c516734613577336f5973113071c3466c SHA256 0ca6fee9b4e801814783da4b2964c33f67a2ab8cfe5849ef3c5324c11e696122
 EBUILD mod_mono-2.0.ebuild 1439 RMD160 5f61a62f877233da67209c05ff23cacbba02f415 SHA1 d75cddf89681822df399576f038666b85ed730dc SHA256 2cdb32f2e9609837518a2ba5916bcf88b95bb7c78464a1912a897336138e0112
-EBUILD mod_mono-2.2.ebuild 1576 RMD160 1e2510e1f8daf8b96de7b2a00d016f0de2a07c57 SHA1 7715d6624dbe6e74ee477508fbfa1ed8f0a2ab9d SHA256 4ae8c01fb4a7fb4b28d98725c2540c7cbe9732db9302dcc559f5ad7127ccf2af
-EBUILD mod_mono-2.4.ebuild 1573 RMD160 4b2ed250100c6f711da4e7afcb5df6a871f661cc SHA1 d44bd865f844f2952725b39dab6011cd8ad06317 SHA256 27f96fbe9ab55d1003e04ca6718cc1fbf9eb4a9ed6a39965a993000a36c88647
-MISC ChangeLog 10120 RMD160 3bf2bd71d2f5d36128104066d44c2b04e1e3d77d SHA1 94f706d4955e208ff61510efd04056e3a0d738e1 SHA256 409f65b14684aa712d23334d44db912435fb0dbf09e5376e391232991e8f12b6
+EBUILD mod_mono-2.2-r1.ebuild 1898 RMD160 d07704fd6e79893539ed5b9a4d1ac3c1067c05cf SHA1 21756227ad1ce05d3630271c622b961909cde6dc SHA256 05dd31d4c606768e64113c4476dc617860e098d2be595cf58bc4de261258fd9f
+EBUILD mod_mono-2.4.ebuild 1890 RMD160 fb7d9f67fbf166ae13ab9b433e16a98f58fe9bda SHA1 97f2c3dd7d261741b2997b4d820165a886105d0d SHA256 d4d9bbda981358e20a1c4fa1339366d76aa8cf376b50acdb4afde8796f420523
+MISC ChangeLog 10448 RMD160 0ef8b6c036e17998d761dedba2b57843c59df4c3 SHA1 630c72e466216180f7d37bb0283d2a42748afe70 SHA256 d16a74956806bd0c50f9a6a9800f7aee836290c44538c37fa893fc8ea022b003
 MISC metadata.xml 636 RMD160 467d975ed94c4ee63b7efed6bc150218da18f2f2 SHA1 3d777853d126987468af2aed231be4ab99b57a4f SHA256 be234bbb8b48e2b0335462ef8183b6e9756ace4e3ea08c96419b400727f934e9
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() {