gentoo resync : 28.04.2021

4 files changed, 143 insertions, 40 deletions

diff --git a/www-servers/xsp/Manifest b/www-servers/xsp/Manifest
index 8866dd95ea5b..bc8668a5bdcf 100644
--- a/www-servers/xsp/Manifest
+++ b/www-servers/xsp/Manifest
@@ -3,9 +3,11 @@ AUX 2.2/mod-mono-server.confd 1214 BLAKE2B 874bb6e6fae3430d7a5cc9f6f0c19f6ddba1e
 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 299 BLAKE2B eb9e5ecf89d31bdb0e64675e49c75218234ace565bc1de4e1369ff00c524902d776e8d5dc16b88d4acc3bd7532f576e9643af7359ea6c6f3728d4a3eab162947 SHA512 a315a5e9f59c4d4fd665e7e55977667fc8baf8f232961b939910af5df9e3e869bc50c98ecdc96302155c7b89f94fd3f9b7750ecac1fc430f7b12fe761c7b965b
+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-2014.12.zip 632555 BLAKE2B e9c63a1e7ae26b45a6d4bec7aca48fc5f9712ffeb17087f6685009abb3feed4395015e8506b3c1333b59658f0334cadb66d181b35e4508bc807bb9680e360196 SHA512 a9d298079cfae4bacac1575f04e58c3106f532c1f283cc243a8a6560561c0a6b535320d1d3e925c7383bd1f7510f31f115d8e85506e31623c175d7f3f606ab91
-EBUILD xsp-2014.12-r2014120900.ebuild 2449 BLAKE2B 168f0a4d62fc657cbff4cc017291228739b11481130694b4e44d27aead31d1aa17e4cd0350ca5a1d74aaa88eac718f7eff5e9dd93aa7ad3b3f2f6daeb660639e SHA512 89708c86346edfd313343b6b2ee307d8c255e953e749956eab10ae0f1b301235281c1533c46b56ceff9c7726326cd3605c2a4c28ec969da867a1d64b51269d96
+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.ebuild 2374 BLAKE2B ce4456beb45e060bd2a63bf09e76f0cc5590a8c833fb39e45dc96e0ad8ac75cdd2ff16152f6a5875689b67c78855cf70eed7af4a297b0bf9a92915845522f5c3 SHA512 d6b446f48ce3c324091fcd2a70be54eff6c7653ea110826082da0a3d5850aea86ac8405577f2b0e05885478f701fbd338075bfbb43f1a6feb507d6a997d9c844
+EBUILD xsp-4.7.1.ebuild 2187 BLAKE2B c981767421b5c1969b2c34586760d0a2611eafcf5e0ec85e8ee5654e12d1b47b757ee4c5b09b9c8bace21053d0d9b78652434486a42ecee8ab675a3689fd814e SHA512 6cdf7f14015e9b30035114e67e606d908e10c81a1c5befe00feb21e16f1960a9f7c81de4ca7efe0be52d419397ae13306c389197de77280ad17d86d9fcf19c37
 MISC metadata.xml 576 BLAKE2B d9d4f67729727cfbb29f63bcf35d9c08db1ff97ba736a1df4c3693372cef37a6b26d43d3622703511eb78b85ab9c855a2891835cffa88bc240c38c03396915ee SHA512 5ffda9960f5c537ee5876466dae1df0dea1a120da789c10364a7328314b2dd44168d48d0fbce24ffb6778d93ef26c5284011abc874e194ccaecd56b43578732c
diff --git a/www-servers/xsp/files/aclocal-fix.patch b/www-servers/xsp/files/aclocal-fix.patch
index 49a00050fe8d..3e96f8f42a4c 100644
--- a/www-servers/xsp/files/aclocal-fix.patch
+++ b/www-servers/xsp/files/aclocal-fix.patch
@@ -1,5 +1,5 @@
---- Makefile_old.am	2013-07-30 09:11:50.033962122 +0400
-+++ Makefile.am	2013-07-30 09:12:20.843574793 +0400
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,10 +1,2 @@
  SUBDIRS=build man src test tools scripts packaging lib
  ACLOCAL_AMFLAGS += -I build/m4
diff --git a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild b/www-servers/xsp/xsp-3.8_p2014120900.ebuild
index 682da894b805..e2d9fda01c70 100644
--- a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
+++ b/www-servers/xsp/xsp-3.8_p2014120900.ebuild
@@ -1,65 +1,67 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+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"
-PATCHDIR="${FILESDIR}/2.2/"
-
-inherit base eutils systemd dotnet user autotools autotools-utils
+inherit autotools dotnet systemd user
 
+EGIT_COMMIT="e272a2c006211b6b03be2ef5bbb9e3f8fefd0768"
 DESCRIPTION="XSP is a small web server that can host ASP.NET pages"
 HOMEPAGE="http://www.mono-project.com/ASP.NET"
-
-EGIT_COMMIT="e272a2c006211b6b03be2ef5bbb9e3f8fefd0768"
-SRC_URI="https://github.com/mono/xsp/archive/${EGIT_COMMIT}.zip -> ${P}.zip"
+SRC_URI="https://github.com/mono/xsp/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/xsp-${EGIT_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test developer"
+IUSE="developer doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/aclocal-fix.patch"
+)
+
+METAFILETOBUILD=xsp.sln
+
 src_prepare() {
-	epatch "${FILESDIR}/aclocal-fix.patch"
+	default
 
-	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
+	eaclocal -I build/m4/shamrock -I build/m4/shave ${ACLOCAL_FLAGS}
+	if test -z "${NO_LIBTOOLIZE}" ; then
+		_elibtoolize --force --copy
 	fi
+
 	eautoconf
+	eautomake --gnu --add-missing --force --copy
 }
 
 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
-	./configure || die
-}
+	local myeconfargs=(
+		"--enable-maintainer-mode"
+	)
 
-METAFILETOBUILD=xsp.sln
+	use test && myeconfargs+=( "--with_unit_tests" )
+	use doc || myeconfargs+=( "--disable-docs" )
 
-src_compile() {
-	exbuild xsp.sln
-	if use developer; then
-		exbuild /p:DebugSymbols=True ${METAFILETOBUILD}
-	else
-		exbuild /p:DebugSymbols=False ${METAFILETOBUILD}
-	fi
+	econf "${myeconfargs[@]}"
 }
 
+#src_compile() {
+#	exbuild xsp.sln
+
+#	if use developer ; then
+#		exbuild /p:DebugSymbols=True ${METAFILETOBUILD}
+#	else
+#		exbuild /p:DebugSymbols=False ${METAFILETOBUILD}
+#	fi
+#}
+
 pkg_preinst() {
 	enewgroup aspnet
 	enewuser aspnet -1 -1 /tmp aspnet
@@ -69,7 +71,10 @@ pkg_preinst() {
 }
 
 src_install() {
-	mv_command="cp -ar" autotools-utils_src_install
+	default
+
+	local PATCHDIR="${FILESDIR}/2.2/"
+
 	newinitd "${PATCHDIR}"/xsp.initd xsp
 	newinitd "${PATCHDIR}"/mod-mono-server-r1.initd mod-mono-server
 	newconfd "${PATCHDIR}"/xsp.confd xsp
@@ -78,6 +83,7 @@ src_install() {
 	insinto /etc/xsp4
 	doins "${FILESDIR}"/systemd/mono.webapp
 	insinto /etc/xsp4/conf.d
+
 	# mono-xsp4.service was original name from
 	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770458;filename=mono-xsp4.service;att=1;msg=5
 	# I think that using the same commands as in debian
diff --git a/www-servers/xsp/xsp-4.7.1.ebuild b/www-servers/xsp/xsp-4.7.1.ebuild
new file mode 100644
index 000000000000..e5cd0168007c
--- /dev/null
+++ b/www-servers/xsp/xsp-4.7.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_DOTNET="net35 net40 net45"
+inherit autotools dotnet systemd user
+
+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/mono/xsp/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="developer doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/aclocal-fix.patch"
+)
+
+METAFILETOBUILD=xsp.sln
+
+src_prepare() {
+	default
+
+	eaclocal -I build/m4/shamrock -I build/m4/shave ${ACLOCAL_FLAGS}
+	if test -z "${NO_LIBTOOLIZE}" ; then
+		_elibtoolize --force --copy
+	fi
+
+	eautoconf
+	eautomake --gnu --add-missing --force --copy
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--enable-maintainer-mode"
+	)
+
+	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
+#}
+
+pkg_preinst() {
+	enewgroup aspnet
+	enewuser aspnet -1 -1 /tmp aspnet
+
+	# enewuser www-data
+	# www-data - is from debian, i think it's the same as aspnet here
+}
+
+src_install() {
+	default
+
+	local PATCHDIR="${FILESDIR}/2.2/"
+
+	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
+
+	insinto /etc/xsp4
+	doins "${FILESDIR}"/systemd/mono.webapp
+	insinto /etc/xsp4/conf.d
+
+	# mono-xsp4.service was original name from
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770458;filename=mono-xsp4.service;att=1;msg=5
+	# I think that using the same commands as in debian
+	#     systemctl start mono-xsp4.service
+	#     systemctl start mono-xsp4
+	# is better than to have shorter command
+	#     systemctl start xsp
+	#
+	# insinto /usr/lib/systemd/system
+	systemd_dounit "${FILESDIR}"/systemd/mono-xsp4.service
+
+	keepdir /var/run/aspnet
+}