Bump to 2.2, bug 254929

(Portage version: 2.2_rc22/cvs/Linux 2.6.28 x86_64)

5 files changed, 33 insertions, 215 deletions

diff --git a/www-apache/mod_mono/ChangeLog b/www-apache/mod_mono/ChangeLog
index c6d3f236c1e9..91ea56c10789 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.46 2008/12/08 22:32:52 loki_val Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.47 2009/01/18 17:46:53 loki_val Exp $
+
+*mod_mono-2.2 (18 Jan 2009)
+
+  18 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+  -files/1.2.5/70_mod_mono.conf, +files/2.2/70_mod_mono.conf,
+  -mod_mono-1.2.5.ebuild, -mod_mono-1.2.6.ebuild, -mod_mono-1.9.ebuild,
+  +mod_mono-2.2.ebuild:
+  Bump to 2.2, bug 254929.
 
 *mod_mono-2.0 (08 Dec 2008)
 
diff --git a/www-apache/mod_mono/files/1.2.5/70_mod_mono.conf b/www-apache/mod_mono/files/1.2.5/70_mod_mono.conf
deleted file mode 100644
index eff05b13d1fc..000000000000
--- a/www-apache/mod_mono/files/1.2.5/70_mod_mono.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-# For more information on the Mono* directives, see the man page for
-# mod_mono(8)
-
-<IfDefine MONO>
-	# Set this to False if you manage your ASP.Net server manually through
-	# /etc/init.d/mod-mono-server
-	MonoRunXSP True
-
-	# Set this to Enabled if you want to enable AutoHosting.
-	# See http://www.mono-project.com/AutoConfiguration for more info.
-	# Note that if you want your automatically hosted applications
-	# handled by ASP.NET 2.0 engine you have to enable the aspnet2 USE flag.
-	MonoAutoApplication Enabled
-
-	<IfModule !mod_mono.c>
-		LoadModule mono_module modules/mod_mono.so
-	</IfModule>
-
-	<IfModule mod_mime.c>
-		AddType application/x-asp-net .aspx
-		AddType application/x-asp-net .asmx
-		AddType application/x-asp-net .ashx
-		AddType application/x-asp-net .asax
-		AddType application/x-asp-net .ascx
-		AddType application/x-asp-net .soap
-		AddType application/x-asp-net .rem
-		AddType application/x-asp-net .axd
-		AddType application/x-asp-net .cs
-		AddType application/x-asp-net .config
-		AddType application/x-asp-net .Config
-		AddType application/x-asp-net .dll
-			
-		DirectoryIndex index.aspx
-		DirectoryIndex Default.aspx
-		DirectoryIndex default.aspx
-	</IfModule>
-
-### Please also add "-D MONO_DEMO" in order to activate out-of-the-box mono demo
-###
-
-	# Note that the test application runs on a separate mod-mono-server
-	# instance named "testinst". Athought this is not mandatory, it shows how to
-	# distribute workload between multiple mod-mono-servers. For more info see:
-	# http://www.mono-project.com/Mod_mono
-
-	<IfDefine MONO_DEMO>
-		<IfModule mod_alias.c>
-			Alias /mono "/usr/lib/xsp/test"
-		</IfModule>
-
-		# You might want to specify the version of mod-mono-server
-		# instance that will handle your application. The default
-		# value depends on whether the aspnet2 USE flag was set
-		# during compilation
-		#MonoServerPath testinst /usr/lib/mono/1.0/mod-mono-server.exe
-		#MonoServerPath testinst /usr/lib/mono/2.0/mod-mono-server2.exe
-		
-		AddMonoApplications testinst "/mono:/usr/lib/xsp/test"
-
-		<Directory /usr/lib/xsp/test>
-			SetHandler mono
-			MonoSetServerAlias testinst
-
-			<IfModule mod_access.c>
-				Order allow,deny
-				Allow from all
-			</IfModule>
-			<IfModule mod_dir.c>
-				# Sample ASP.NET 1.1/2.0 applications can be accessed
-				# via index2.aspx.
-				DirectoryIndex index.aspx
-				#DirectoryIndex index2.aspx
-			</IfModule>
-		</Directory>
-	</IfDefine>
-### MONO_DEMO end.
-
-</IfDefine>
diff --git a/www-apache/mod_mono/mod_mono-1.2.6.ebuild b/www-apache/mod_mono/mod_mono-1.2.6.ebuild
deleted file mode 100644
index 70a0a42b3831..000000000000
--- a/www-apache/mod_mono/mod_mono-1.2.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-1.2.6.ebuild,v 1.1 2007/12/14 20:14:46 jurek Exp $
-
-inherit apache-module eutils
-
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DESCRIPTION="Apache module for Mono."
-HOMEPAGE="http://www.go-mono.com/"
-SRC_URI="http://go-mono.com/sources/${PN}/${P}.tar.bz2"
-LICENSE="Apache-1.1"
-SLOT="0"
-IUSE="aspnet2 debug"
-
-DEPEND=">=dev-dotnet/xsp-${PV}"
-RDEPEND="${DEPEND}"
-
-APACHE2_MOD_FILE="${S}/src/.libs/${PN}.so"
-APACHE2_MOD_CONF="${PV}/70_${PN}"
-APACHE2_MOD_DEFINE="MONO"
-
-DOCFILES="AUTHORS ChangeLog COPYING INSTALL NEWS README"
-
-need_apache
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use aspnet2 && epatch "${FILESDIR}/mono_auto_application_aspnet2.patch"
-}
-
-src_compile() {
-	econf \
-		$(use_enable debug) \
-		--disable-dependency-tracking \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	mv -f "src/.libs/${PN}.so.0.0.0" "src/.libs/${PN}.so"
-	apache-module_src_install
-	doman man/mod_mono.8
-}
-
-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."
-}
diff --git a/www-apache/mod_mono/mod_mono-1.9.ebuild b/www-apache/mod_mono/mod_mono-1.9.ebuild
deleted file mode 100644
index 7b99b2772b96..000000000000
--- a/www-apache/mod_mono/mod_mono-1.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-1.9.ebuild,v 1.1 2008/05/31 12:44:12 jurek Exp $
-
-inherit apache-module eutils
-
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DESCRIPTION="Apache module for Mono."
-HOMEPAGE="http://www.go-mono.com/"
-SRC_URI="http://go-mono.com/sources/${PN}/${P}.tar.bz2"
-LICENSE="Apache-1.1"
-SLOT="0"
-IUSE="aspnet2 debug"
-
-DEPEND=">=dev-dotnet/xsp-${PV}"
-RDEPEND="${DEPEND}"
-
-APACHE2_MOD_FILE="${S}/src/.libs/${PN}.so"
-APACHE2_MOD_CONF="${PV}/70_${PN}"
-APACHE2_MOD_DEFINE="MONO"
-
-DOCFILES="AUTHORS ChangeLog COPYING INSTALL NEWS README"
-
-need_apache
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use aspnet2 && epatch "${FILESDIR}/mono_auto_application_aspnet2.patch"
-}
-
-src_compile() {
-	econf \
-		$(use_enable debug) \
-		--disable-dependency-tracking \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	mv -f "src/.libs/${PN}.so.0.0.0" "src/.libs/${PN}.so"
-	apache-module_src_install
-	doman man/mod_mono.8
-}
-
-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."
-}
diff --git a/www-apache/mod_mono/mod_mono-1.2.5.ebuild b/www-apache/mod_mono/mod_mono-2.2.ebuild
index 3bb2f8c1e6e2..139f51076f5b 100644
--- a/www-apache/mod_mono/mod_mono-1.2.5.ebuild
+++ b/www-apache/mod_mono/mod_mono-2.2.ebuild
@@ -1,48 +1,50 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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-1.2.5.ebuild,v 1.2 2007/09/21 20:55:57 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-2.2.ebuild,v 1.1 2009/01/18 17:46:53 loki_val Exp $
 
-inherit apache-module eutils
+EAPI=2
 
-KEYWORDS="~amd64 ~ppc ~x86"
+# DRAGONS: Watch the order of these.
+
+inherit apache-module eutils go-mono mono
+
+KEYWORDS="~x86 ~amd64"
 
 DESCRIPTION="Apache module for Mono."
 HOMEPAGE="http://www.go-mono.com/"
-SRC_URI="http://go-mono.com/sources/${PN}/${P}.tar.bz2"
-LICENSE="Apache-1.1"
+LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="aspnet2 debug"
 
-DEPEND=">=dev-dotnet/xsp-${PV}"
+DEPEND="=dev-dotnet/xsp-${GO_MONO_REL_PV}*"
 RDEPEND="${DEPEND}"
 
-APACHE2_MOD_FILE="${S}/src/.libs/${PN}.so"
-APACHE2_MOD_CONF="${PV}/70_${PN}"
+APACHE2_MOD_CONF="2.2/70_${PN}"
 APACHE2_MOD_DEFINE="MONO"
 
 DOCFILES="AUTHORS ChangeLog COPYING INSTALL NEWS README"
 
-need_apache
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+need_apache2
 
+src_prepare() {
 	use aspnet2 && epatch "${FILESDIR}/mono_auto_application_aspnet2.patch"
 }
 
-src_compile() {
-	econf \
+src_configure() {
+	go-mono_src_configure \
 		$(use_enable debug) \
-		--disable-dependency-tracking \
 		|| die "econf failed"
-	emake || die "emake failed"
 }
 
 src_install() {
-	mv -f "src/.libs/${PN}.so.0.0.0" "src/.libs/${PN}.so"
-	apache-module_src_install
-	doman man/mod_mono.8
+	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
 }
 
 pkg_postinst() {