[gentoo-commits] gentoo-x86 commit in www-apache/mod_mono: ChangeLog mod_mono-2.4.ebuild mod_mono-2.2-r1.ebuild mod_mono-2.2.ebuild

[Peter Alfredsen (loki_val)]

loki_val    09/05/03 12:32:49

  Modified:             ChangeLog mod_mono-2.4.ebuild
  Added:                mod_mono-2.2-r1.ebuild
  Removed:              mod_mono-2.2.ebuild
  Log:
  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)

Revision  Changes    Path
1.52                 www-apache/mod_mono/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_mono/ChangeLog?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_mono/ChangeLog?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_mono/ChangeLog?r1=1.51&r2=1.52

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ChangeLog	17 Apr 2009 15:47:40 -0000	1.51
+++ ChangeLog	3 May 2009 12:32:49 -0000	1.52
@@ -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@g.o>
+  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@g.o> mod_mono-2.2.ebuild:
   Marking mod_mono-2.2 ~ppc for bug 255410



1.2                  www-apache/mod_mono/mod_mono-2.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_mono/mod_mono-2.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_mono/mod_mono-2.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_mono/mod_mono-2.4.ebuild?r1=1.1&r2=1.2

Index: mod_mono-2.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-2.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_mono-2.4.ebuild	30 Mar 2009 22:07:12 -0000	1.1
+++ mod_mono-2.4.ebuild	3 May 2009 12:32:49 -0000	1.2
@@ -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 @@
 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() {



1.1                  www-apache/mod_mono/mod_mono-2.2-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_mono/mod_mono-2.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_mono/mod_mono-2.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: mod_mono-2.2-r1.ebuild
===================================================================
# 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-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 multilib eutils go-mono mono

KEYWORDS="~x86 ~amd64 ~ppc"

DESCRIPTION="Apache module for Mono."
HOMEPAGE="http://www.go-mono.com/"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="aspnet2 debug"

DEPEND="=dev-dotnet/xsp-${GO_MONO_REL_PV}*"
RDEPEND="${DEPEND}"

APACHE2_MOD_CONF="2.2/70_${PN}"
APACHE2_MOD_DEFINE="MONO"

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"
	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() {
	apache-module_pkg_postinst

	elog "To enable mod_mono, add \"-D MONO\" to your Apache's"
	elog "conf.d configuration file. Additionally, to view sample"
	elog "ASP.NET applications, add \"-D MONO_DEMO\" too."
	elog ""
	elog "If you want mod_mono to handle AutoHosting requests using"
	elog "ASP.NET 2.0 engine, enable the aspnet2 USE flag."
}