commit: 748c333b1f45abc1c8d12f606d0f374377d81346 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Mar 28 02:05:18 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Mar 28 03:00:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=748c333b
www-servers/xsp: port to EAPI 7, drop autotools-utils.eclass * Port to EAPI 7 * Drop autotools-utils.eclass * Use normal makefiles to build for now Closes: https://bugs.gentoo.org/642942 Signed-off-by: Sam James <sam <AT> gentoo.org> www-servers/xsp/files/aclocal-fix.patch | 4 +- www-servers/xsp/xsp-2014.12-r2014120900.ebuild | 66 ++++++++++++++------------ 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/www-servers/xsp/files/aclocal-fix.patch b/www-servers/xsp/files/aclocal-fix.patch index 49a00050fe8..3e96f8f42a4 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-2014.12-r2014120900.ebuild index 682da894b80..a803dddf5dc 100644 --- a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild +++ b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild @@ -1,17 +1,16 @@ -# 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 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" S="${WORKDIR}/xsp-${EGIT_COMMIT}" @@ -24,42 +23,45 @@ RESTRICT="!test? ( test )" RDEPEND="dev-db/sqlite:3" DEPEND="${RDEPEND}" +METAFILETOBUILD=xsp.sln + +PATCHES=( + "${FILESDIR}/aclocal-fix.patch" +) + 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,8 @@ pkg_preinst() { } src_install() { - mv_command="cp -ar" autotools-utils_src_install + default + newinitd "${PATCHDIR}"/xsp.initd xsp newinitd "${PATCHDIR}"/mod-mono-server-r1.initd mod-mono-server newconfd "${PATCHDIR}"/xsp.confd xsp @@ -78,6 +81,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
