Bump to 2.2, bug 254929

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

21 files changed, 107 insertions, 571 deletions

diff --git a/dev-dotnet/xsp/ChangeLog b/dev-dotnet/xsp/ChangeLog
index 6e8d9ddea5f3..b683eb3f5e11 100644
--- a/dev-dotnet/xsp/ChangeLog
+++ b/dev-dotnet/xsp/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-dotnet/xsp
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/ChangeLog,v 1.59 2008/11/27 18:45:20 ssuominen Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/ChangeLog,v 1.60 2009/01/18 17:44:04 loki_val Exp $
+
+*xsp-2.2 (18 Jan 2009)
+
+  18 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+  -files/1.2.3/mod-mono-server.initd, -files/1.2.3/xsp.initd,
+  -files/1.9.1/mod-mono-server.confd, -files/1.2.3/mod-mono-server.confd,
+  -files/1.2.3/xsp.confd, -files/1.2.5/mod-mono-server.confd,
+  -files/1.2.5/mod-mono-server.initd, -files/1.2.5/xsp.confd,
+  -files/1.2.5/xsp.initd, -files/1.9.1/mod-mono-server.initd,
+  -files/1.9.1/xsp.confd, -files/1.9.1/xsp.initd,
+  -files/1.9/mod-mono-server.confd, -files/1.9/mod-mono-server.initd,
+  -files/1.9/xsp.confd, -files/1.9/xsp.initd,
+  +files/2.2/configure-fix.patch, +files/2.2/mod-mono-server.confd,
+  +files/2.2/mod-mono-server.initd, +files/2.2/xsp.confd,
+  +files/2.2/xsp.initd, metadata.xml, -xsp-1.9.1.ebuild, +xsp-2.2.ebuild:
+  Bump to 2.2, bug 254929.
 
   27 Nov 2008; <ssuominen@gentoo.org> xsp-1.2.1.ebuild, xsp-1.2.4.ebuild:
   Move dev-util/pkgconfig from RDEPEND to DEPEND wrt #224301.
diff --git a/dev-dotnet/xsp/files/1.2.3/mod-mono-server.confd b/dev-dotnet/xsp/files/1.2.3/mod-mono-server.confd
deleted file mode 100644
index 63b00fae54c0..000000000000
--- a/dev-dotnet/xsp/files/1.2.3/mod-mono-server.confd
+++ /dev/null
@@ -1,34 +0,0 @@
-# Config file for /etc/init.d/mod-mono-server
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/files/1.2.3/mod-mono-server.confd,v 1.1 2007/02/13 19:44:39 jurek Exp $
-
-# Configuration directives for mod-mono-server.exe. For more information on
-# these variables, see the man page for xsp(1).
-
-# This is the document root; trailing slash is not necessary
-#MonoServerRootDir="/usr/lib/xsp/test"
-
-# Directory to search for files with an `.webapp' extension.
-#MonoApplicationsConfigDir="/usr/lib/xsp/test"
-
-# Comma separated list of directories (in the form virtual:real) for all
-# applications managed by the server. For example:
-#   /app1:/var/www/localhost/htdocs/app1,/app2:/var/www/localhost/htdocs/app2
-MonoApplications="/mono:/usr/lib/xsp/test"
-
-# The communication channel used between mod-mono-server and mod_mono.
-#   unix - A unix socket
-#   tcp  - A TCP connection
-MonoServerChannel="unix"
-
-# When the comm. channel is "unix", the local filename used by the socket.
-UnixSocketFileName="/tmp/mod_mono_server"
-
-# When the comm. channel is "tcp", IP address for the server to listen on.
-#MonoServerAddress=127.0.0.1
-
-# When the comm. channel is "tcp", port for the server to listen on.
-#MonoServerPort=8080
-
-# If you want to host .NET 2.0 applications you have to set this to 2.
-# Otherwise, leave it unchaged
-MonoServerVersion=1
diff --git a/dev-dotnet/xsp/files/1.2.3/mod-mono-server.initd b/dev-dotnet/xsp/files/1.2.3/mod-mono-server.initd
deleted file mode 100644
index 24c1ecad35bd..000000000000
--- a/dev-dotnet/xsp/files/1.2.3/mod-mono-server.initd
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/files/1.2.3/mod-mono-server.initd,v 1.1 2007/02/13 19:44:39 jurek Exp $
-
-depend() {
-	use net
-	after dotnet
-}
-
-start() {
-	[ -z "$MonoServerRootDir" ] && \
-	MonoServerRootDir="/usr/lib/xsp/test"
-	[ -z "$MonoApplications" ] && \
-	MonoApplications="/mono:/usr/lib/xsp/test,/:."
-	[ -z "$UnixSocketFileName" ] && \
-	UnixSocketFileName="/tmp/mod_mono_server"
-	[ -z "$MonoServerAddress" ] && \
-	MonoServerAddress=127.0.0.1
-	[ -z "$MonoServerPort" ] && \
-	MonoServerPort=8080
-	[ -z "$MonoServerVersion" ] && \
-	MonoServerVersion=1
-
-	MONO_SERVER_OPTS="--root ${MonoServerRootDir} \
---applications ${MonoApplications} --nonstop"
-
-	[ -n "$MonoApplicationsConfigDir" ] && \
-	MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
---appconfigdir ${MonoApplicationsConfigDir}"
-
-	case "$MonoServerChannel" in
-	"tcp" )
-		MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
---address ${MonoServerAddress} --port ${MonoServerPort}"
-		;;
-	
-	"unix" )
-		[ -f "$UnixSocketFileName" ] && rm -f $UnixSocketFileName
-		MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
---filename ${UnixSocketFileName}"
-		;;
-
-	* )
-		eerror "Please set a valid value for MonoServerChannel"
-		return 1
-		;;
-	esac
-
-	if [ ${MonoServerVersion} -eq 1 ]; then
-		modmonoserverpath=1.0/mod-mono-server.exe
-	elif [ ${MonoServerVersion} -eq 2 ]; then
-		modmonoserverpath=2.0/mod-mono-server2.exe
-	else
-		eerror "MonoServerVersion was not properly set. Check your /etc/conf.d/xsp"
-		return 1
-	fi
-
-	export MONO_SHARED_DIR=/tmp
-
-	ebegin "Starting mod-mono-server"
-
-	start-stop-daemon --quiet --start \
-		--background \
-		--make-pidfile \
-		--pidfile /var/run/aspnet/mod-mono-server.pid \
-		--chuid aspnet \
-		--exec /usr/bin/mono /usr/lib/mono/${modmonoserverpath} \
-		-- $MONO_SERVER_OPTS
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping mod-mono-server"
-
-	start-stop-daemon -o --quiet --stop \
-		--pidfile /var/run/aspnet/mod-mono-server.pid
-
-	eend $?
-}
diff --git a/dev-dotnet/xsp/files/1.2.3/xsp.confd b/dev-dotnet/xsp/files/1.2.3/xsp.confd
deleted file mode 100644
index 53fa2f45149b..000000000000
--- a/dev-dotnet/xsp/files/1.2.3/xsp.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# Config file for /etc/init.d/xsp
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/files/1.2.3/xsp.confd,v 1.1 2007/02/13 19:44:39 jurek Exp $
-
-# This is the document root; trailing slash is not necessary
-MonoServerRoot=/usr/lib/xsp/test
-
-# Port for the server to run on
-MonoServerPort=8000
-
-# If you want to host .NET 2.0 applications you have to set this to 2.
-# Otherwise, leave it unchanged
-MonoServerVersion=1
diff --git a/dev-dotnet/xsp/files/1.2.3/xsp.initd b/dev-dotnet/xsp/files/1.2.3/xsp.initd
deleted file mode 100644
index 8dc3ae06ac2c..000000000000
--- a/dev-dotnet/xsp/files/1.2.3/xsp.initd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/files/1.2.3/xsp.initd,v 1.1 2007/02/13 19:44:39 jurek Exp $
-
-depend() {
-	need net
-	after dotnet
-}
-
-start() {
-	ebegin "Starting xsp"
-
-	if [ ${MonoServerVersion} -eq 1 ]; then
-		xsppath=1.0/xsp.exe
-	elif [ ${MonoServerVersion} -eq 2 ]; then
-		xsppath=2.0/xsp2.exe
-	else
-		eerror "MonoServerVersion was not properly set. Check your config file"
-		return 1
-	fi
-
-	start-stop-daemon --quiet --start \
-		--background \
-		--make-pidfile \
-		--pidfile /var/run/aspnet/xsp.pid \
-		--chuid aspnet \
-		--exec /usr/bin/mono /usr/lib/mono/${xsppath} -- --root ${MonoServerRoot} --port ${MonoServerPort} --nonstop
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping xsp"
-	start-stop-daemon -o --quiet --stop \
-		--pidfile /var/run/aspnet/xsp.pid
-	eend $?
-}
-
diff --git a/dev-dotnet/xsp/files/1.2.5/mod-mono-server.confd b/dev-dotnet/xsp/files/1.2.5/mod-mono-server.confd
deleted file mode 100644
index 1b2f8ff0db13..000000000000
--- a/dev-dotnet/xsp/files/1.2.5/mod-mono-server.confd
+++ /dev/null
@@ -1,34 +0,0 @@
-# Config file for /etc/init.d/mod-mono-server
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/files/1.2.5/mod-mono-server.confd,v 1.1 2007/09/10 19:36:20 jurek Exp $
-
-# Configuration directives for mod-mono-server.exe. For more information on
-# these variables, see the man page for xsp(1).
-
-# This is the document root; trailing slash is not necessary
-#MonoServerRootDir="/usr/lib/xsp/test"
-
-# Directory to search for files with an `.webapp' extension.
-#MonoApplicationsConfigDir="/usr/lib/xsp/test"
-
-# Comma separated list of directories (in the form virtual:real) for all
-# applications managed by the server. For example:
-#   /app1:/var/www/localhost/htdocs/app1,/app2:/var/www/localhost/htdocs/app2
-MonoApplications="/mono:/usr/lib/xsp/test"
-
-# The communication channel used between mod-mono-server and mod_mono.
-#   unix - A unix socket
-#   tcp  - A TCP connection
-MonoServerChannel="unix"
-
-# When the comm. channel is "unix", the local filename used by the socket.
-UnixSocketFileName="/tmp/mod_mono_server"
-
-# When the comm. channel is "tcp", IP address for the server to listen on.
-#MonoServerAddress=127.0.0.1
-
-# When the comm. channel is "tcp", port for the server to listen on.
-#MonoServerPort=8080
-
-# If you want to host .NET 2.0 applications you have to set this to 2.
-# Otherwise, leave it unchaged
-MonoServerVersion=1
diff --git a/dev-dotnet/xsp/files/1.2.5/mod-mono-server.initd b/dev-dotnet/xsp/files/1.2.5/mod-mono-server.initd
deleted file mode 100644
index 2a3747b08d2a..000000000000
--- a/dev-dotnet/xsp/files/1.2.5/mod-mono-server.initd
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/files/1.2.5/mod-mono-server.initd,v 1.1 2007/09/10 19:36:20 jurek Exp $
-
-depend() {
-	use net
-	after dotnet
-}
-
-start() {
-	[ -z "$MonoServerRootDir" ] && \
-	MonoServerRootDir="/usr/lib/xsp/test"
-	[ -z "$MonoApplications" ] && \
-	MonoApplications="/mono:/usr/lib/xsp/test,/:."
-	[ -z "$UnixSocketFileName" ] && \
-	UnixSocketFileName="/tmp/mod_mono_server"
-	[ -z "$MonoServerAddress" ] && \
-	MonoServerAddress=127.0.0.1
-	[ -z "$MonoServerPort" ] && \
-	MonoServerPort=8080
-	[ -z "$MonoServerVersion" ] && \
-	MonoServerVersion=1
-
-	MONO_SERVER_OPTS="--root ${MonoServerRootDir} \
---applications ${MonoApplications} --nonstop"
-
-	[ -n "$MonoApplicationsConfigDir" ] && \
-	MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
---appconfigdir ${MonoApplicationsConfigDir}"
-
-	case "$MonoServerChannel" in
-	"tcp" )
-		MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
---address ${MonoServerAddress} --port ${MonoServerPort}"
-		;;
-	
-	"unix" )
-		[ -f "$UnixSocketFileName" ] && rm -f $UnixSocketFileName
-		MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
---filename ${UnixSocketFileName}"
-		;;
-
-	* )
-		eerror "Please set a valid value for MonoServerChannel"
-		return 1
-		;;
-	esac
-
-	if [ ${MonoServerVersion} -eq 1 ]; then
-		modmonoserverpath=1.0/mod-mono-server.exe
-	elif [ ${MonoServerVersion} -eq 2 ]; then
-		modmonoserverpath=2.0/mod-mono-server2.exe
-	else
-		eerror "MonoServerVersion was not properly set. Check your /etc/conf.d/xsp"
-		return 1
-	fi
-
-	export MONO_SHARED_DIR=/tmp
-
-	ebegin "Starting mod-mono-server"
-
-	start-stop-daemon --quiet --start \
-		--background \
-		--make-pidfile \
-		--pidfile /var/run/aspnet/mod-mono-server.pid \
-		--chuid aspnet \
-		--exec /usr/bin/mono /usr/lib/mono/${modmonoserverpath} \
-		-- $MONO_SERVER_OPTS
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping mod-mono-server"
-
-	start-stop-daemon -o --quiet --stop \
-		--pidfile /var/run/aspnet/mod-mono-server.pid
-
-	eend $?
-}
diff --git a/dev-dotnet/xsp/files/1.2.5/xsp.confd b/dev-dotnet/xsp/files/1.2.5/xsp.confd
deleted file mode 100644
index d2d6bed4e4a4..000000000000
--- a/dev-dotnet/xsp/files/1.2.5/xsp.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# Config file for /etc/init.d/xsp
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/files/1.2.5/xsp.confd,v 1.1 2007/09/10 19:36:20 jurek Exp $
-
-# This is the document root; trailing slash is not necessary
-MonoServerRoot=/usr/lib/xsp/test
-
-# Port for the server to run on
-MonoServerPort=8000
-
-# If you want to host .NET 2.0 applications you have to set this to 2.
-# Otherwise, leave it unchanged
-MonoServerVersion=1
diff --git a/dev-dotnet/xsp/files/1.2.5/xsp.initd b/dev-dotnet/xsp/files/1.2.5/xsp.initd
deleted file mode 100644
index 22a42e943a1e..000000000000
--- a/dev-dotnet/xsp/files/1.2.5/xsp.initd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/files/1.2.5/xsp.initd,v 1.1 2007/09/10 19:36:20 jurek Exp $
-
-depend() {
-	need net
-	after dotnet
-}
-
-start() {
-	ebegin "Starting xsp"
-
-	if [ ${MonoServerVersion} -eq 1 ]; then
-		xsppath=1.0/xsp.exe
-	elif [ ${MonoServerVersion} -eq 2 ]; then
-		xsppath=2.0/xsp2.exe
-	else
-		eerror "MonoServerVersion was not properly set. Check your config file"
-		return 1
-	fi
-
-	start-stop-daemon --quiet --start \
-		--background \
-		--make-pidfile \
-		--pidfile /var/run/aspnet/xsp.pid \
-		--chuid aspnet \
-		--exec /usr/bin/mono /usr/lib/mono/${xsppath} -- --root ${MonoServerRoot} --port ${MonoServerPort} --nonstop
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping xsp"
-	start-stop-daemon -o --quiet --stop \
-		--pidfile /var/run/aspnet/xsp.pid
-	eend $?
-}
-
diff --git a/dev-dotnet/xsp/files/1.9.1/xsp.initd b/dev-dotnet/xsp/files/1.9.1/xsp.initd
deleted file mode 100644
index 7e56e6b66ede..000000000000
--- a/dev-dotnet/xsp/files/1.9.1/xsp.initd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id: xsp.initd,v 1.1 2008/05/31 12:39:49 jurek Exp $
-
-depend() {
-	need net
-	after dotnet
-}
-
-start() {
-	ebegin "Starting xsp"
-
-	if [ ${MonoServerVersion} -eq 1 ]; then
-		xsppath=1.0/xsp.exe
-	elif [ ${MonoServerVersion} -eq 2 ]; then
-		xsppath=2.0/xsp2.exe
-	else
-		eerror "MonoServerVersion was not properly set. Check your config file"
-		return 1
-	fi
-
-	start-stop-daemon --quiet --start \
-		--background \
-		--make-pidfile \
-		--pidfile /var/run/aspnet/xsp.pid \
-		--chuid aspnet \
-		--exec /usr/bin/mono /usr/lib/mono/${xsppath} -- --root ${MonoServerRoot} --port ${MonoServerPort} --nonstop
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping xsp"
-	start-stop-daemon -o --quiet --stop \
-		--pidfile /var/run/aspnet/xsp.pid
-	eend $?
-}
-
diff --git a/dev-dotnet/xsp/files/1.9/mod-mono-server.confd b/dev-dotnet/xsp/files/1.9/mod-mono-server.confd
deleted file mode 100644
index 99f71c5d23a6..000000000000
--- a/dev-dotnet/xsp/files/1.9/mod-mono-server.confd
+++ /dev/null
@@ -1,34 +0,0 @@
-# Config file for /etc/init.d/mod-mono-server
-# $Id: mod-mono-server.confd,v 1.1 2008/05/31 12:39:49 jurek Exp $
-
-# Configuration directives for mod-mono-server.exe. For more information on
-# these variables, see the man page for xsp(1).
-
-# This is the document root; trailing slash is not necessary
-#MonoServerRootDir="/usr/lib/xsp/test"
-
-# Directory to search for files with an `.webapp' extension.
-#MonoApplicationsConfigDir="/usr/lib/xsp/test"
-
-# Comma separated list of directories (in the form virtual:real) for all
-# applications managed by the server. For example:
-#   /app1:/var/www/localhost/htdocs/app1,/app2:/var/www/localhost/htdocs/app2
-MonoApplications="/mono:/usr/lib/xsp/test"
-
-# The communication channel used between mod-mono-server and mod_mono.
-#   unix - A unix socket
-#   tcp  - A TCP connection
-MonoServerChannel="unix"
-
-# When the comm. channel is "unix", the local filename used by the socket.
-UnixSocketFileName="/tmp/mod_mono_server"
-
-# When the comm. channel is "tcp", IP address for the server to listen on.
-#MonoServerAddress=127.0.0.1
-
-# When the comm. channel is "tcp", port for the server to listen on.
-#MonoServerPort=8080
-
-# If you want to host .NET 2.0 applications you have to set this to 2.
-# Otherwise, leave it unchaged
-MonoServerVersion=1
diff --git a/dev-dotnet/xsp/files/1.9/mod-mono-server.initd b/dev-dotnet/xsp/files/1.9/mod-mono-server.initd
deleted file mode 100644
index 31aaddb19866..000000000000
--- a/dev-dotnet/xsp/files/1.9/mod-mono-server.initd
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id: mod-mono-server.initd,v 1.1 2008/05/31 12:39:49 jurek Exp $
-
-depend() {
-	use net
-	after dotnet
-}
-
-start() {
-	[ -z "$MonoServerRootDir" ] && \
-	MonoServerRootDir="/usr/lib/xsp/test"
-	[ -z "$MonoApplications" ] && \
-	MonoApplications="/mono:/usr/lib/xsp/test,/:."
-	[ -z "$UnixSocketFileName" ] && \
-	UnixSocketFileName="/tmp/mod_mono_server"
-	[ -z "$MonoServerAddress" ] && \
-	MonoServerAddress=127.0.0.1
-	[ -z "$MonoServerPort" ] && \
-	MonoServerPort=8080
-	[ -z "$MonoServerVersion" ] && \
-	MonoServerVersion=1
-
-	MONO_SERVER_OPTS="--root ${MonoServerRootDir} \
---applications ${MonoApplications} --nonstop"
-
-	[ -n "$MonoApplicationsConfigDir" ] && \
-	MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
---appconfigdir ${MonoApplicationsConfigDir}"
-
-	case "$MonoServerChannel" in
-	"tcp" )
-		MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
---address ${MonoServerAddress} --port ${MonoServerPort}"
-		;;
-	
-	"unix" )
-		[ -f "$UnixSocketFileName" ] && rm -f $UnixSocketFileName
-		MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
---filename ${UnixSocketFileName}"
-		;;
-
-	* )
-		eerror "Please set a valid value for MonoServerChannel"
-		return 1
-		;;
-	esac
-
-	if [ ${MonoServerVersion} -eq 1 ]; then
-		modmonoserverpath=1.0/mod-mono-server.exe
-	elif [ ${MonoServerVersion} -eq 2 ]; then
-		modmonoserverpath=2.0/mod-mono-server2.exe
-	else
-		eerror "MonoServerVersion was not properly set. Check your /etc/conf.d/xsp"
-		return 1
-	fi
-
-	export MONO_SHARED_DIR=/tmp
-
-	ebegin "Starting mod-mono-server"
-
-	start-stop-daemon --quiet --start \
-		--background \
-		--make-pidfile \
-		--pidfile /var/run/aspnet/mod-mono-server.pid \
-		--chuid aspnet \
-		--exec /usr/bin/mono /usr/lib/mono/${modmonoserverpath} \
-		-- $MONO_SERVER_OPTS
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping mod-mono-server"
-
-	start-stop-daemon -o --quiet --stop \
-		--pidfile /var/run/aspnet/mod-mono-server.pid
-
-	eend $?
-}
diff --git a/dev-dotnet/xsp/files/1.9/xsp.confd b/dev-dotnet/xsp/files/1.9/xsp.confd
deleted file mode 100644
index 15ade86b61de..000000000000
--- a/dev-dotnet/xsp/files/1.9/xsp.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# Config file for /etc/init.d/xsp
-# $Id: xsp.confd,v 1.1 2008/05/31 12:39:49 jurek Exp $
-
-# This is the document root; trailing slash is not necessary
-MonoServerRoot=/usr/lib/xsp/test
-
-# Port for the server to run on
-MonoServerPort=8000
-
-# If you want to host .NET 2.0 applications you have to set this to 2.
-# Otherwise, leave it unchanged
-MonoServerVersion=1
diff --git a/dev-dotnet/xsp/files/2.2/configure-fix.patch b/dev-dotnet/xsp/files/2.2/configure-fix.patch
new file mode 100644
index 000000000000..46be173ddeea
--- /dev/null
+++ b/dev-dotnet/xsp/files/2.2/configure-fix.patch
@@ -0,0 +1,30 @@
+diff -NrU5 xsp-2.2.orig/configure.in xsp-2.2/configure.in
+--- xsp-2.2.orig/configure.in	2009-01-18 00:13:11.000000000 +0100
++++ xsp-2.2/configure.in	2009-01-18 00:14:53.000000000 +0100
+@@ -15,24 +15,22 @@
+ #
+ # --enable-tracing
+ #
+ AC_MSG_CHECKING([if tracing is requested])
+ AC_ARG_ENABLE([tracing],
+- AC_HELP_STRING([--enable-tracing],[enable producing XSP tracing messages]),
+- [enable_tracing=$withval],
+- [enable_tracing=no])
++ [AC_HELP_STRING([--enable-tracing],[enable producing XSP tracing messages])] )
+ 
+ if test "x$enable_tracing" != "xno" ; then
+    	AC_MSG_RESULT([yes])
+ 	WEBTRACING="-define:WEBTRACE -define:TRACE"
+ else
+ 	AC_MSG_RESULT([no])
+ 	WEBTRACING=""
+ fi
+ 
+ AC_ARG_WITH([runtime],
+- AC_HELP_STRING([--with-runtime],[use the specified runtime when xsp is installed]),
++ [AC_HELP_STRING([--with-runtime],[use the specified runtime when xsp is installed])],
+  [RUNTIME=$withval])
+ 
+ AC_PATH_PROG(CSC, csc, no)
+ AC_PATH_PROG(MCS, mcs, no)
+ AC_PATH_PROG(GMCS, gmcs, no)
diff --git a/dev-dotnet/xsp/files/1.9.1/mod-mono-server.confd b/dev-dotnet/xsp/files/2.2/mod-mono-server.confd
index 99f71c5d23a6..7cefdbea49b4 100644
--- a/dev-dotnet/xsp/files/1.9.1/mod-mono-server.confd
+++ b/dev-dotnet/xsp/files/2.2/mod-mono-server.confd
@@ -1,5 +1,5 @@
 # Config file for /etc/init.d/mod-mono-server
-# $Id: mod-mono-server.confd,v 1.1 2008/05/31 12:39:49 jurek Exp $
+# $Id: mod-mono-server.confd,v 1.1 2009/01/18 17:44:04 loki_val Exp $
 
 # Configuration directives for mod-mono-server.exe. For more information on
 # these variables, see the man page for xsp(1).
diff --git a/dev-dotnet/xsp/files/1.9.1/mod-mono-server.initd b/dev-dotnet/xsp/files/2.2/mod-mono-server.initd
index 31aaddb19866..a15d102fc2ef 100644
--- a/dev-dotnet/xsp/files/1.9.1/mod-mono-server.initd
+++ b/dev-dotnet/xsp/files/2.2/mod-mono-server.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: mod-mono-server.initd,v 1.1 2008/05/31 12:39:49 jurek Exp $
+# $Id: mod-mono-server.initd,v 1.1 2009/01/18 17:44:04 loki_val Exp $
 
 depend() {
 	use net
diff --git a/dev-dotnet/xsp/files/1.9.1/xsp.confd b/dev-dotnet/xsp/files/2.2/xsp.confd
index 15ade86b61de..45a79a52bb63 100644
--- a/dev-dotnet/xsp/files/1.9.1/xsp.confd
+++ b/dev-dotnet/xsp/files/2.2/xsp.confd
@@ -1,5 +1,5 @@
 # Config file for /etc/init.d/xsp
-# $Id: xsp.confd,v 1.1 2008/05/31 12:39:49 jurek Exp $
+# $Id: xsp.confd,v 1.1 2009/01/18 17:44:04 loki_val Exp $
 
 # This is the document root; trailing slash is not necessary
 MonoServerRoot=/usr/lib/xsp/test
diff --git a/dev-dotnet/xsp/files/1.9/xsp.initd b/dev-dotnet/xsp/files/2.2/xsp.initd
index 7e56e6b66ede..f156531570cd 100644
--- a/dev-dotnet/xsp/files/1.9/xsp.initd
+++ b/dev-dotnet/xsp/files/2.2/xsp.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: xsp.initd,v 1.1 2008/05/31 12:39:49 jurek Exp $
+# $Id: xsp.initd,v 1.1 2009/01/18 17:44:04 loki_val Exp $
 
 depend() {
 	need net
diff --git a/dev-dotnet/xsp/metadata.xml b/dev-dotnet/xsp/metadata.xml
index 802161a21ff3..6c29cd8f9f14 100644
--- a/dev-dotnet/xsp/metadata.xml
+++ b/dev-dotnet/xsp/metadata.xml
@@ -6,6 +6,7 @@
 		<email>jurek@gentoo.org</email>
 		<name>Jurek Bartuszek</name>
 	</maintainer>
+	<use> <flag name='debug'>Enable tracing messages (RECOMMENDED)</flag></use>
 	<longdescription lang="en">
 		XSP is a standalone web server written in C# that can be used to run
 		your ASP.NET applications.
diff --git a/dev-dotnet/xsp/xsp-1.9.1.ebuild b/dev-dotnet/xsp/xsp-1.9.1.ebuild
deleted file mode 100644
index 20df2cc86d6c..000000000000
--- a/dev-dotnet/xsp/xsp-1.9.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-1.9.1.ebuild,v 1.1 2008/05/31 12:39:35 jurek Exp $
-
-inherit mono multilib autotools eutils
-
-DESCRIPTION="XSP ASP.NET host"
-HOMEPAGE="http://www.go-mono.com/"
-SRC_URI="http://www.go-mono.com/sources/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE=""
-
-RDEPEND=">=dev-lang/mono-${PV}
-		  =dev-db/sqlite-3*"
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.20"
-
-pkg_preinst() {
-	enewgroup aspnet
-
-	# Give aspnet home dir of /tmp since it must create ~/.wapi
-	enewuser aspnet -1 -1 /tmp aspnet
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s:mkinstalldirs) \$(data:mkinstalldirs) \$(DESTDIR)\$(data:" \
-		   -e "s:gif \$(data:gif \$(DESTDIR)\$(data:" \
-	"${S}"/test/2.0/treeview/Makefile.am
-	eautoreconf
-}
-
-src_compile() {
-	econf || die "./configure failed!"
-	emake -j1 || {
-		echo
-		eerror "If xsp fails to build, try unmerging and re-emerging it."
-		die "make failed"
-	}
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	sed -i -e "s#/usr/lib/#/usr/$(get_libdir)/#" \
-		"${D}"/usr/bin/xsp{,2} \
-		"${D}"/usr/bin/mod-mono-server{,2} \
-		"${D}"/usr/bin/asp-state{,2} \
-		"${D}"/usr/bin/dbsessmgr{,2} \
-	|| die
-
-	newinitd "${FILESDIR}"/${PV}/xsp.initd xsp
-	newinitd "${FILESDIR}"/${PV}/mod-mono-server.initd mod-mono-server
-	newconfd "${FILESDIR}"/${PV}/xsp.confd xsp
-	newconfd "${FILESDIR}"/${PV}/mod-mono-server.confd mod-mono-server
-
-	keepdir /var/run/aspnet
-
-	dodoc README ChangeLog AUTHORS INSTALL NEWS
-}
-
-pkg_postinst() {
-	chown aspnet:aspnet /var/run/aspnet
-}
diff --git a/dev-dotnet/xsp/xsp-2.2.ebuild b/dev-dotnet/xsp/xsp-2.2.ebuild
new file mode 100644
index 000000000000..799d14a91cb8
--- /dev/null
+++ b/dev-dotnet/xsp/xsp-2.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-2.2.ebuild,v 1.1 2009/01/18 17:44:04 loki_val Exp $
+
+EAPI=2
+
+inherit go-mono mono autotools
+
+PATCHDIR="${FILESDIR}/${PV}/"
+
+DESCRIPTION="XSP is a small web server that can host ASP.NET pages"
+HOMEPAGE="http://www.go-mono.com/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="+debug"
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+PATCHES=( "${PATCHDIR}/configure-fix.patch" )
+
+pkg_preinst() {
+	enewgroup aspnet
+	# Give aspnet home dir of /tmp since it must create ~/.wapi
+	enewuser aspnet -1 -1 /tmp aspnet
+}
+
+src_prepare() {
+	go-mono_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug tracing)
+}
+
+src_install() {
+	mv_command="cp -ar" go-mono_src_install
+	newinitd "${FILESDIR}"/${PV}/xsp.initd xsp || die
+	newinitd "${FILESDIR}"/${PV}/mod-mono-server.initd mod-mono-server || die
+	newconfd "${FILESDIR}"/${PV}/xsp.confd xsp || die
+	newconfd "${FILESDIR}"/${PV}/mod-mono-server.confd mod-mono-server || die
+
+	keepdir /var/run/aspnet
+}
+
+pkg_postinst() {
+	chown aspnet:aspnet /var/run/aspnet
+}