commit: 33f958533b95693d8b6e5fa2454eabc6ed0b322b
Author: Heather Cynede <cynede <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 07:46:46 2015 +0000
Commit: Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 07:46:46 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33f95853
dev-dotnet/xsp version bump
Package-Manager: portage-2.2.20.1
dev-dotnet/xsp/Manifest | 1 +
dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd | 6 +-
dev-dotnet/xsp/files/2.2/mod-mono-server.confd | 2 +-
...-mono-server-r1.initd => mod-mono-server.initd} | 14 ++---
dev-dotnet/xsp/files/2.2/xsp.confd | 2 +-
dev-dotnet/xsp/files/2.2/xsp.initd | 4 +-
dev-dotnet/xsp/files/aclocal-fix.patch | 13 +++++
dev-dotnet/xsp/xsp-2014.11.ebuild | 65 ++++++++++++++++++++++
8 files changed, 92 insertions(+), 15 deletions(-)
diff --git a/dev-dotnet/xsp/Manifest b/dev-dotnet/xsp/Manifest
index 01017d5..fdfa037 100644
--- a/dev-dotnet/xsp/Manifest
+++ b/dev-dotnet/xsp/Manifest
@@ -1 +1,2 @@
+DIST 2014.11.tar.gz 308009 SHA256
6378f0167dc09aaf8f48874b4f9ece3d41d375b168f0cb86a1b2cf52ee937376 SHA512
68e127e1d33da6f7fdcbf2586a48b2da32b1931558e637f10ba6b86cd7e6bf4ad67fc47cfa68703eb65964c270616a04da3eb9f2df14974ecdaa7b979f7fc9b6
WHIRLPOOL
143540614e0c7e509257d3391b06af231acd8732c5528134e4cc6c76a7812531e8f8c6b6059993e1dcd5fcc7516ed44accf44e8e1e4e8917f77ee65dde459815
DIST xsp-2.10.2.tar.bz2 284801 SHA256
f4657f724167244d9baedf94e1d5747b8f1f53c339c7a11897154c1eb1289d4e SHA512
9b49e3a712e062b9a272e72609eda3cb8139127bc9780d6374a3567f51f15f38233f92252c2e4c22778b1841de66855dfe6a8cf81c97c6ebbf84f71dda0d43dd
WHIRLPOOL
fce613fedf164f7cd4cf0bae622884a4f7b6747e249d965c4ea23997586371b6a588ad96d66bcc5c6e74f98b76de3f374cd676de164ba1f3a889e4b00b8b6dcc
diff --git a/dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd
b/dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd
index 6fda677..6ce6a60 100644
--- a/dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd
+++ b/dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
+# $Id: mod-mono-server-r1.initd,v 1.1 2012/01/22 12:54:29 pacho Exp $
depend() {
use net
@@ -58,7 +58,7 @@ start() {
return 1
fi
- MONO_SHARED_DIR=/tmp ; export MONO_SHARED_DIR
+ export MONO_SHARED_DIR=/tmp
ebegin "Starting mod-mono-server"
diff --git a/dev-dotnet/xsp/files/2.2/mod-mono-server.confd
b/dev-dotnet/xsp/files/2.2/mod-mono-server.confd
index dbc5c4c..7cefdbe 100644
--- a/dev-dotnet/xsp/files/2.2/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$
+# $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/2.2/mod-mono-server-r1.initd
b/dev-dotnet/xsp/files/2.2/mod-mono-server.initd
similarity index 87%
copy from dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd
copy to dev-dotnet/xsp/files/2.2/mod-mono-server.initd
index 6fda677..49119e5 100644
--- a/dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd
+++ b/dev-dotnet/xsp/files/2.2/mod-mono-server.initd
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
+# $Id: mod-mono-server.initd,v 1.1 2009/01/18 17:44:04 loki_val Exp $
depend() {
use net
@@ -51,14 +51,12 @@ start() {
modmonoserverpath=1.0/mod-mono-server.exe
elif [ ${MonoServerVersion} -eq 2 ]; then
modmonoserverpath=2.0/mod-mono-server2.exe
- elif [ ${MonoServerVersion} -eq 4 ]; then
- modmonoserverpath=4.0/mod-mono-server4.exe
else
- eerror "MonoServerVersion was not properly set. Check your
/etc/conf.d/mod-mono-server"
+ eerror "MonoServerVersion was not properly set. Check your
/etc/conf.d/xsp"
return 1
fi
- MONO_SHARED_DIR=/tmp ; export MONO_SHARED_DIR
+ export MONO_SHARED_DIR=/tmp
ebegin "Starting mod-mono-server"
@@ -66,7 +64,7 @@ start() {
--background \
--make-pidfile \
--pidfile /var/run/aspnet/mod-mono-server.pid \
- --user aspnet \
+ --chuid aspnet \
--exec /usr/bin/mono /usr/lib/mono/${modmonoserverpath} \
-- $MONO_SERVER_OPTS
@@ -76,7 +74,7 @@ start() {
stop() {
ebegin "Stopping mod-mono-server"
- start-stop-daemon --quiet --stop \
+ start-stop-daemon -o --quiet --stop \
--pidfile /var/run/aspnet/mod-mono-server.pid
eend $?
diff --git a/dev-dotnet/xsp/files/2.2/xsp.confd
b/dev-dotnet/xsp/files/2.2/xsp.confd
index 1004e74..45a79a5 100644
--- a/dev-dotnet/xsp/files/2.2/xsp.confd
+++ b/dev-dotnet/xsp/files/2.2/xsp.confd
@@ -1,5 +1,5 @@
# Config file for /etc/init.d/xsp
-# $Id$
+# $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/2.2/xsp.initd
b/dev-dotnet/xsp/files/2.2/xsp.initd
index 5b60958..0432bca 100644
--- a/dev-dotnet/xsp/files/2.2/xsp.initd
+++ b/dev-dotnet/xsp/files/2.2/xsp.initd
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
+# $Id: xsp.initd,v 1.1 2009/01/18 17:44:04 loki_val Exp $
depend() {
need net
diff --git a/dev-dotnet/xsp/files/aclocal-fix.patch
b/dev-dotnet/xsp/files/aclocal-fix.patch
new file mode 100644
index 0000000..49a0005
--- /dev/null
+++ b/dev-dotnet/xsp/files/aclocal-fix.patch
@@ -0,0 +1,13 @@
+--- Makefile_old.am 2013-07-30 09:11:50.033962122 +0400
++++ Makefile.am 2013-07-30 09:12:20.843574793 +0400
+@@ -1,10 +1,2 @@
+ SUBDIRS=build man src test tools scripts packaging lib
+ ACLOCAL_AMFLAGS += -I build/m4
+-
+-if UNITTESTS
+-SUBDIRS += unittests
+-endif
+-
+-if BUILD_DOCS
+-SUBDIRS += docs
+-endif
diff --git a/dev-dotnet/xsp/xsp-2014.11.ebuild
b/dev-dotnet/xsp/xsp-2014.11.ebuild
new file mode 100644
index 0000000..c1b957b
--- /dev/null
+++ b/dev-dotnet/xsp/xsp-2014.11.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PATCHDIR="${FILESDIR}/2.2/"
+
+inherit base eutils dotnet user autotools autotools-utils
+
+DESCRIPTION="XSP is a small web server that can host ASP.NET pages"
+HOMEPAGE="http://www.mono-project.com/ASP.NET";
+SRC_URI="https://github.com/Heather/xsp/archive/2014.11.tar.gz";
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}
+
+src_prepare() {
+ epatch "${FILESDIR}/aclocal-fix.patch"
+
+ if [ -z "$LIBTOOL" ]; then
+ LIBTOOL=`which glibtool 2>/dev/null`
+ if [ ! -x "$LIBTOOL" ]; then
+ LIBTOOL=`which libtool`
+ fi
+ fi
+ eaclocal -I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS
+ if test -z "$NO_LIBTOOLIZE"; then
+ ${LIBTOOL}ize --force --copy
+ fi
+ eautoconf
+}
+
+src_configure() {
+ myeconfargs=("--enable-maintainer-mode")
+ use test && myeconfargs+=("--with_unit_tests")
+ use doc || myeconfargs+=("--disable-docs")
+ eautomake --gnu --add-missing --force --copy #nowarn
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile
+}
+
+pkg_preinst() {
+ enewgroup aspnet
+ enewuser aspnet -1 -1 /tmp aspnet
+}
+
+src_install() {
+ mv_command="cp -ar" autotools-utils_src_install
+ newinitd "${PATCHDIR}"/xsp.initd xsp
+ newinitd "${PATCHDIR}"/mod-mono-server-r1.initd mod-mono-server
+ newconfd "${PATCHDIR}"/xsp.confd xsp
+ newconfd "${PATCHDIR}"/mod-mono-server.confd mod-mono-server
+
+ keepdir /var/run/aspnet
+}
