public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/dotnet:master commit in: www-servers/xsp/
@ 2018-01-23  6:42 Mikhail Pukhlikov
  0 siblings, 0 replies; 6+ messages in thread
From: Mikhail Pukhlikov @ 2018-01-23  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     f2806923a93d3c4b2db3a426bcfa5ceec5397a04
Author:     Mads <mads <AT> ab3 <DOT> no>
AuthorDate: Thu Jan 18 13:24:28 2018 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 13:24:28 2018 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=f2806923

Make ebuild work (changed EAPI version)

 www-servers/xsp/xsp-9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www-servers/xsp/xsp-9999.ebuild b/www-servers/xsp/xsp-9999.ebuild
index 6cf4684..44cad87 100644
--- a/www-servers/xsp/xsp-9999.ebuild
+++ b/www-servers/xsp/xsp-9999.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="6"
+EAPI="5"
 
 USE_DOTNET="net35 net40 net45"
 PATCHDIR="${FILESDIR}/2.2/"
 
-inherit eutils dotnet user git-r3 autotools
+inherit eutils dotnet user git-r3 autotools-utils
 
 DESCRIPTION="XSP is a small web server that can host ASP.NET pages"
 HOMEPAGE="http://www.mono-project.com/ASP.NET"
@@ -23,7 +23,7 @@ RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/aclocal-fix.patch"
+	# epatch "${FILESDIR}/aclocal-fix.patch"
 
 	if [ -z "$LIBTOOL" ]; then
 		LIBTOOL=`which glibtool 2>/dev/null`


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/dotnet:master commit in: www-servers/xsp/
@ 2016-08-24  7:01 Mikhail Pukhlikov
  0 siblings, 0 replies; 6+ messages in thread
From: Mikhail Pukhlikov @ 2016-08-24  7:01 UTC (permalink / raw
  To: gentoo-commits

commit:     acc6b128dd298a9f58d28b9aa21d5a0a33085b37
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Wed Aug 24 06:54:42 2016 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 06:54:42 2016 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=acc6b128

fix of bug introduced during EAPI-6 bump

 ....4_p2016011603-r1.ebuild => xsp-4.4_p2016022603.ebuild} | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/www-servers/xsp/xsp-4.4_p2016011603-r1.ebuild b/www-servers/xsp/xsp-4.4_p2016022603.ebuild
similarity index 93%
rename from www-servers/xsp/xsp-4.4_p2016011603-r1.ebuild
rename to www-servers/xsp/xsp-4.4_p2016022603.ebuild
index c091a52..ecd851e 100644
--- a/www-servers/xsp/xsp-4.4_p2016011603-r1.ebuild
+++ b/www-servers/xsp/xsp-4.4_p2016022603.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="6"
 
-USE_DOTNET="net35 net40 net45"
+USE_DOTNET="net45 net40 net35"
 PATCHDIR="${FILESDIR}/2.2/"
 
 inherit eutils systemd dotnet user autotools
@@ -14,14 +14,13 @@ HOMEPAGE="http://www.mono-project.com/ASP.NET"
 
 EGIT_COMMIT="c98e068f5647fb06ff2fbef7cd5f1b35417362b1"
 SRC_URI="http://github.com/mono/xsp/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${PV}.tar.gz"
-
 RESTRICT="mirror"
 S="${WORKDIR}/xsp-${EGIT_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test developer debug"
+IUSE="+${USE_DOTNET} doc test +developer +debug"
 
 COMMON_DEPEND="dev-db/sqlite:3
 	!dev-dotnet/xsp
@@ -48,12 +47,12 @@ src_prepare() {
 }
 
 src_configure() {
+	eautomake --gnu --add-missing --force --copy #nowarn
+
 	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
+	econf ${myeconfargs}
 }
 
 src_compile() {
@@ -69,7 +68,8 @@ pkg_preinst() {
 }
 
 src_install() {
-	mv_command="cp -ar" autotools-utils_src_install
+	emake DESTDIR="${D}" install
+
 	newinitd "${PATCHDIR}"/xsp.initd xsp
 	newinitd "${PATCHDIR}"/mod-mono-server-r1.initd mod-mono-server
 	newconfd "${PATCHDIR}"/xsp.confd xsp


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/dotnet:master commit in: www-servers/xsp/
@ 2016-07-31  8:52 Mikhail Pukhlikov
  0 siblings, 0 replies; 6+ messages in thread
From: Mikhail Pukhlikov @ 2016-07-31  8:52 UTC (permalink / raw
  To: gentoo-commits

commit:     c5157544ed575197c2b21a6053ca528635e0613d
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Sat Jul 30 14:11:36 2016 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 14:11:36 2016 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=c5157544

repoman fixes

 www-servers/xsp/xsp-2014.12-r2014120900.ebuild | 7 ++++---
 www-servers/xsp/xsp-9999.ebuild                | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
index b98cc8f..e365cf4 100644
--- a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
+++ b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 USE_DOTNET="net35 net40 net45"
 PATCHDIR="${FILESDIR}/2.2/"
 
-inherit base eutils systemd dotnet user autotools autotools-utils
+inherit eutils systemd dotnet user autotools
 
 DESCRIPTION="XSP is a small web server that can host ASP.NET pages"
 HOMEPAGE="http://www.mono-project.com/ASP.NET"
@@ -41,6 +41,7 @@ src_prepare() {
 	if test -z "$NO_LIBTOOLIZE"; then
 		${LIBTOOL}ize --force --copy
 	fi
+	eapply_user
 	eautoconf
 }
 

diff --git a/www-servers/xsp/xsp-9999.ebuild b/www-servers/xsp/xsp-9999.ebuild
index eba9744..899b991 100644
--- a/www-servers/xsp/xsp-9999.ebuild
+++ b/www-servers/xsp/xsp-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 USE_DOTNET="net35 net40 net45"
 PATCHDIR="${FILESDIR}/2.2/"
 
-inherit base eutils dotnet user git-2 autotools autotools-utils
+inherit eutils dotnet user git-r3 autotools
 
 DESCRIPTION="XSP is a small web server that can host ASP.NET pages"
 HOMEPAGE="http://www.mono-project.com/ASP.NET"
@@ -35,6 +35,7 @@ src_prepare() {
 	if test -z "$NO_LIBTOOLIZE"; then
 		${LIBTOOL}ize --force --copy
 	fi
+	eapply_user
 	eautoconf
 }
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/dotnet:master commit in: www-servers/xsp/
@ 2015-08-22 16:46 Heather Cynede
  0 siblings, 0 replies; 6+ messages in thread
From: Heather Cynede @ 2015-08-22 16:46 UTC (permalink / raw
  To: gentoo-commits

commit:     4407731ea9e0c25bde95148f7b5d7b98e52edbe9
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Sat Aug 22 13:02:50 2015 +0000
Commit:     Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 13:02:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=4407731e

removed duplication, added block

 www-servers/xsp/xsp-2014.12-r2014120900.ebuild | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
index 2b8a4eb..4f119c7 100644
--- a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
+++ b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
@@ -21,8 +21,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc test developer debug"
 
-RDEPEND="dev-db/sqlite:3"
-DEPEND="${RDEPEND}"
+COMMON_DEPEND="dev-db/sqlite:3
+	!dev-dotnet/xsp
+	"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/aclocal-fix.patch"
@@ -53,11 +57,6 @@ METAFILETOBUILD=xsp.sln
 
 src_compile() {
 	exbuild xsp.sln
-	if use developer; then
-		exbuild /p:DebugSymbols=True ${METAFILETOBUILD}
-	else
-		exbuild /p:DebugSymbols=False ${METAFILETOBUILD}
-	fi
 }
 
 pkg_preinst() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/dotnet:master commit in: www-servers/xsp/
@ 2015-08-22 16:46 Heather Cynede
  0 siblings, 0 replies; 6+ messages in thread
From: Heather Cynede @ 2015-08-22 16:46 UTC (permalink / raw
  To: gentoo-commits

commit:     aa345efdc6513ebc15936df6be9d8ff1690577fc
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Sat Aug 22 13:04:51 2015 +0000
Commit:     Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 13:04:51 2015 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=aa345efd

unnecessary variable removed

 www-servers/xsp/xsp-2014.12-r2014120900.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
index 4f119c7..b98cc8f 100644
--- a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
+++ b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
@@ -53,8 +53,6 @@ src_configure() {
 	./configure || die
 }
 
-METAFILETOBUILD=xsp.sln
-
 src_compile() {
 	exbuild xsp.sln
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/dotnet:master commit in: www-servers/xsp/
@ 2015-08-22 16:19 Heather Cynede
  0 siblings, 0 replies; 6+ messages in thread
From: Heather Cynede @ 2015-08-22 16:19 UTC (permalink / raw
  To: gentoo-commits

commit:     c7bf550033be47fd59f0c9aa8eda561e2a82bc5f
Author:     Heather <Heather <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Aug 21 15:43:01 2015 +0000
Commit:     Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 15:43:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=c7bf5500

Update xsp-2014.12-r2014120900.ebuild

 www-servers/xsp/xsp-2014.12-r2014120900.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
index cb38e33..2b8a4eb 100644
--- a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
+++ b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/xsp-${EGIT_COMMIT}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test developer"
+IUSE="doc test developer debug"
 
 RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-01-23  6:42 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-23  6:42 [gentoo-commits] proj/dotnet:master commit in: www-servers/xsp/ Mikhail Pukhlikov
  -- strict thread matches above, loose matches on Subject: below --
2016-08-24  7:01 Mikhail Pukhlikov
2016-07-31  8:52 Mikhail Pukhlikov
2015-08-22 16:46 Heather Cynede
2015-08-22 16:46 Heather Cynede
2015-08-22 16:19 Heather Cynede

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox