gentoo auto-resync : 19:09:2024 - 12:11:50

3 files changed, 7 insertions, 106 deletions

diff --git a/www-servers/xsp/Manifest b/www-servers/xsp/Manifest
index 10e6ed191398..d7292f6742a0 100644
--- a/www-servers/xsp/Manifest
+++ b/www-servers/xsp/Manifest
@@ -1,13 +1,11 @@
 AUX 2.2/mod-mono-server-r1.initd 2002 BLAKE2B 7dc59b1e4b1a356fd015deed2c86512586ca96396ee143e5c1f1cb3fc821281ba003b476933f07ec1b5142101324062e3088460d6ab358972a237ae42bee9ac3 SHA512 570daa64eb7ade8281f2d874cb7ac24afb52f385360a8a49a9a43141f4c9ea18b87cc897e4daf4c53d2a1b8c0cf45f3e0a06f2908f63cf80c17b26cce5e4df14
 AUX 2.2/mod-mono-server.confd 1214 BLAKE2B 874bb6e6fae3430d7a5cc9f6f0c19f6ddba1e2118cf7e116a54cf2d4d54d479918ddfd412602e9c14f94c43180e0ac0faaed38dc3b2aca005872ee6ff32a0a4a SHA512 1dfffca9e07e9bc0af779be37683beafe40e436d51f80c0b5d5ea0f00e5726b85a9f1265c660799ff76a6ec0261fc0749bb3f94cd5d158b606a55e5d98cc54ce
-AUX 2.2/mod-mono-server.initd 1906 BLAKE2B 2e21f2c41786ffaaff8903fd0b971b59c2d58014cbeee5dc6eaaf9fb789ee14c98226af73fe24677622cd55bfcc6782fbf961eb073cf49e4f4d0372c32b8572d SHA512 15922bb445f97f084295185a1211692197dda58e8d794fb6c20e44801db4a802547253814d70608a10540bb340e7ac71294c8be58689f7700b9c9faa424b0eb5
 AUX 2.2/xsp.confd 306 BLAKE2B 185ed6b9c9d5404d83b0c6c9973e28f8c0ab5804533c6c587ff602811f4f6c77a6a647062aed380b0dc047fb7bb4bbac0b95ce6398e70f15b94aefbe84772a8c SHA512 4c82a22b3da305e7b73dde941e30058e7a717c032980ebfd4a99c5be3fd84aec77fd3d6f3787d165503790e07bfde4193c72ed4d2bfb3c08033b964ac933ec9a
 AUX 2.2/xsp.initd 796 BLAKE2B f87d56d984486b2d33d145a5d164061d074136adaf5f2687d976fa21361d0cf86365bbfae597fe51467e004f24cd4a41a19481a387d4afe4dc4170e37965f555 SHA512 d28fbce8838c6796362ec7bedcedfedee5e60524758b16ff6a24952ff20acfea658b824f070ffc59b9df381895a0e0346177a7aa1129de59f67543102c581f44
 AUX aclocal-fix.patch 227 BLAKE2B 1fc1f76db1df3c09edaa7ffe6f8f9a0355d34797c82118be6af472cf87acaa8a242e9143655c152135f48735addd4d2fbc73f155feda512610af4d9445400f73 SHA512 2ec9bba4bebd4d0b9ee86127972018d26f133e922af0c8f77f32cceaa6a057fa806f9e845b2984bdf02ebf11ea0cd737c9d31c972de032e376adbb49a5a70020
 AUX systemd/mono-xsp4.service 340 BLAKE2B 96674d1c6cdfffcfa0a2530ea58c99b4cea8e7c4d3cc1ee8a9b694919b045cb5ead55a715fdfc125fe8c8cd2e4277bf8620e3a4e06471697ba7799acdc7abcac SHA512 d4df0cad0ca0c72cf282ecf377409d255375402910a7f762f9d395a407e63eb3c314932cfee69ec733cb9f1cb7cf88af7125fc2723335efc049cc6ebce2756b4
 AUX systemd/mono.webapp 315 BLAKE2B 159a9c27bba5956dad1b7a2ec1587bd35782d1cb236b9c957c1906b52faeceb4d333e91872b9505e73153a4d16bc1ed6aa76b3b296c1641cb0dc04fc4f56744f SHA512 e7b33fa0f36b27854c8a215cacab25760b5ff91f12415dbd9406e1f92cb0faf035bcfb14b8e0b37c22ff73f0a9c31a1cf9ac213c9167e5f8618a943440e0384d
-DIST xsp-3.8_p2014120900.tar.gz 307722 BLAKE2B a6c7723e41490022ea969961f93fa3cb5b5eb583edd6ad1ef40dc38adc29cc9c0de16b7da5e98074b0848cdb7cce1e4c5e0298dc6f7f71d6a5c5e542a662005e SHA512 bf7a8cbeda330be98eb6fb1942ca9d6d8107ceabfb47db36d4b9b1f9d99afb329bad7737a4c9bfbf3ac205e9499dd58b2aa1cf7dfd83e41ee50b3820b05d4596
 DIST xsp-4.7.1.tar.gz 307143 BLAKE2B f8a3a09d644d567728e6462df553ff52fdbd17e974dc25aeebd011e7b6c22ef76be69cc49acfd1cdd9edbd30728ce6b7ef5f33ecda50653db219863b17442b36 SHA512 f106b073bc17ae8fafcffdf2f0db7284f36b62b648fd79321a0de7f5ed15085a9116deccf464e72b3e6f5daf8d65d0a6a3d55c1b275546a4762fa3236bd58e2b
-EBUILD xsp-3.8_p2014120900-r1.ebuild 2248 BLAKE2B db2f3e6e8a0901d485f3273de43089efcaee56ba3b53e2a62645a6a8550b6e546b5e6e1e59a6e2bc238d7cbb60339a00cd3df794ec8600f9079b8cdb6b8fe9b3 SHA512 97ea17d17ec5fd5d85d93f421562bcce19d191599a486241d7abd8d7ef6b085a709d14822b1b4d5cba276d385b90fa0745c37675db44a4dbc1fc847ec5da925c
 EBUILD xsp-4.7.1-r1.ebuild 2061 BLAKE2B f921c8dc2fd3f88dbec462a9ba3d4d59a88904bdfdf49c2908b6c9593802cb54cfce6f18d6461e1887a3d57810d3a7942651ea986ec6b59d1bfd60d03ef06f72 SHA512 4c26b8df50a007c822a8350287c4f3863daf0b057c43e2a1d9a1d97c0e787a0ed82b00149053c4eef55760a8e605c7761d56075e4be53e6bfcb2f5f35f62e5fc
+EBUILD xsp-4.7.1-r2.ebuild 1800 BLAKE2B f3bd4bad326f1341faddf43afffdfd10dc417f16c57fb5fa05392007179271a488245912c268dae91a924fcca8775f514dca5d76c2e3b54cc12f32f78b8bc32a SHA512 772972ca52ff99e8a0e2e82454025977b34656139fbfeff8eebc90a590326265846cf16706f9355df032b6c7a911f1e0bd00427c810d5d450c19e1c50b993a1f
 MISC metadata.xml 489 BLAKE2B ca2b5fae7e5a66229675cffa57d826d95e68662da79d8ec73607295e4bbd8d659c6e672cc77074a9da8835a77c9af74ceed8f3b8466a8067756cb76e0c6a7fbd SHA512 8bd47d77cc8d6f1a22c2e84315509714c1c29dbbbdb89d2b9ed795f8775614eaaf59a2c061570dafb3476776bfb2d4756196ab79a170377ffd6844e6fe7e48ed
diff --git a/www-servers/xsp/files/2.2/mod-mono-server.initd b/www-servers/xsp/files/2.2/mod-mono-server.initd
deleted file mode 100644
index fb1c44935e09..000000000000
--- a/www-servers/xsp/files/2.2/mod-mono-server.initd
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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/www-servers/xsp/xsp-3.8_p2014120900-r1.ebuild b/www-servers/xsp/xsp-4.7.1-r2.ebuild
index 5a2a1649d828..8a89773c5328 100644
--- a/www-servers/xsp/xsp-3.8_p2014120900-r1.ebuild
+++ b/www-servers/xsp/xsp-4.7.1-r2.ebuild
@@ -3,21 +3,17 @@
 
 EAPI=7
 
-# TODO: We can probably yank the USE_DOTNET/dotnet.eclass stuff
-# but let's be conservative for now
 USE_DOTNET="net35 net40 net45"
 inherit autotools dotnet systemd
 
-EGIT_COMMIT="e272a2c006211b6b03be2ef5bbb9e3f8fefd0768"
 DESCRIPTION="XSP is a small web server that can host ASP.NET pages"
-HOMEPAGE="https://www.mono-project.com/ASP.NET"
-SRC_URI="https://github.com/mono/xsp/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/xsp-${EGIT_COMMIT}"
+HOMEPAGE="https://www.mono-project.com/ASP.NET/"
+SRC_URI="https://github.com/mono/xsp/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="developer doc test"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 DEPEND="dev-db/sqlite:3"
@@ -47,25 +43,14 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		"--enable-maintainer-mode"
+		--enable-maintainer-mode
+		$(use_with test unit-tests)
+		$(use_enable doc docs)
 	)
 
-	use test && myeconfargs+=( "--with_unit_tests" )
-	use doc || myeconfargs+=( "--disable-docs" )
-
 	econf "${myeconfargs[@]}"
 }
 
-#src_compile() {
-#	exbuild xsp.sln
-
-#	if use developer ; then
-#		exbuild /p:DebugSymbols=True ${METAFILETOBUILD}
-#	else
-#		exbuild /p:DebugSymbols=False ${METAFILETOBUILD}
-#	fi
-#}
-
 src_install() {
 	default
 
@@ -90,6 +75,4 @@ src_install() {
 	#
 	# insinto /usr/lib/systemd/system
 	systemd_dounit "${FILESDIR}"/systemd/mono-xsp4.service
-
-	keepdir /var/run/aspnet
 }