[gentoo-commits] repo/gentoo:master commit in: www-servers/xsp/

["Sam James" <sam@gentoo.org>]

commit:     402a3b36a5f58622b18e6a8fa827dde2d2669e14
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 28 04:14:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 28 04:21:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=402a3b36

www-servers/xsp: tidy variable declarations

Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-servers/xsp/xsp-3.8_p2014120900.ebuild | 13 ++++++++-----
 www-servers/xsp/xsp-4.7.1.ebuild           | 12 ++++++------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/www-servers/xsp/xsp-3.8_p2014120900.ebuild b/www-servers/xsp/xsp-3.8_p2014120900.ebuild
index 33c34864ddf..803e6c8bd9c 100644
--- a/www-servers/xsp/xsp-3.8_p2014120900.ebuild
+++ b/www-servers/xsp/xsp-3.8_p2014120900.ebuild
@@ -3,9 +3,9 @@
 
 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 autotools dotnet systemd user
 
 EGIT_COMMIT="e272a2c006211b6b03be2ef5bbb9e3f8fefd0768"
@@ -17,19 +17,20 @@ S="${WORKDIR}/xsp-${EGIT_COMMIT}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test developer"
+IUSE="developer doc test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="app-arch/unzip"
 RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}"
 
-METAFILETOBUILD=xsp.sln
-
 PATCHES=(
 	"${FILESDIR}/aclocal-fix.patch"
 )
 
+
+METAFILETOBUILD=xsp.sln
+
 src_prepare() {
 	default
 
@@ -74,6 +75,8 @@ pkg_preinst() {
 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

diff --git a/www-servers/xsp/xsp-4.7.1.ebuild b/www-servers/xsp/xsp-4.7.1.ebuild
index 8bbb25acfcf..e5cd0168007 100644
--- a/www-servers/xsp/xsp-4.7.1.ebuild
+++ b/www-servers/xsp/xsp-4.7.1.ebuild
@@ -4,8 +4,6 @@
 EAPI=7
 
 USE_DOTNET="net35 net40 net45"
-PATCHDIR="${FILESDIR}/2.2/"
-
 inherit autotools dotnet systemd user
 
 DESCRIPTION="XSP is a small web server that can host ASP.NET pages"
@@ -15,18 +13,18 @@ SRC_URI="https://github.com/mono/xsp/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.
 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}"
 
-METAFILETOBUILD=xsp.sln
-
 PATCHES=(
 	"${FILESDIR}/aclocal-fix.patch"
 )
 
+METAFILETOBUILD=xsp.sln
+
 src_prepare() {
 	default
 
@@ -69,7 +67,9 @@ pkg_preinst() {
 }
 
 src_install() {
-	mv_command="cp -ar" default
+	default
+
+	local PATCHDIR="${FILESDIR}/2.2/"
 
 	newinitd "${PATCHDIR}"/xsp.initd xsp
 	newinitd "${PATCHDIR}"/mod-mono-server-r1.initd mod-mono-server