1 |
commit: 1f5d03e869e69651d60f86939b74edefc24b7d29 |
2 |
Author: Manuel Friedli <manuel <AT> fritteli <DOT> ch> |
3 |
AuthorDate: Thu May 20 22:31:03 2021 +0000 |
4 |
Commit: Gergely Nagy <ngg <AT> ngg <DOT> hu> |
5 |
CommitDate: Wed May 26 06:37:28 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/dotnet.git/commit/?id=1f5d03e8 |
7 |
|
8 |
Get rid of autotools-utils. |
9 |
|
10 |
Signed-off-by: Gergely Nagy <ngg <AT> ngg.hu> |
11 |
Closes: https://github.com/gentoo/dotnet/pull/499 |
12 |
Closes: https://github.com/gentoo/dotnet/pull/495 |
13 |
Fixes: https://github.com/gentoo/dotnet/issues/494 |
14 |
Fixes: https://github.com/gentoo/dotnet/issues/492 |
15 |
|
16 |
dev-dotnet/mono-addins/mono-addins-1.0-r1.ebuild | 3 +-- |
17 |
dev-dotnet/mono-addins/mono-addins-1.3.3.ebuild | 3 +-- |
18 |
dev-lang/mono/mono-9999.ebuild | 12 ++++++------ |
19 |
www-servers/xsp/xsp-9999.ebuild | 14 ++++---------- |
20 |
4 files changed, 12 insertions(+), 20 deletions(-) |
21 |
|
22 |
diff --git a/dev-dotnet/mono-addins/mono-addins-1.0-r1.ebuild b/dev-dotnet/mono-addins/mono-addins-1.0-r1.ebuild |
23 |
index 491782f..75563d3 100644 |
24 |
--- a/dev-dotnet/mono-addins/mono-addins-1.0-r1.ebuild |
25 |
+++ b/dev-dotnet/mono-addins/mono-addins-1.0-r1.ebuild |
26 |
@@ -3,7 +3,7 @@ |
27 |
|
28 |
EAPI=5 |
29 |
|
30 |
-inherit eutils dotnet multilib autotools-utils |
31 |
+inherit eutils dotnet multilib autotools |
32 |
|
33 |
DESCRIPTION="A generic framework for creating extensible applications" |
34 |
HOMEPAGE="https://www.mono-project.com/Mono.Addins" |
35 |
@@ -26,7 +26,6 @@ src_prepare() { |
36 |
epatch "${FILESDIR}/gmcs.patch" |
37 |
|
38 |
eautoreconf |
39 |
- autotools-utils_src_prepare |
40 |
## with dev-dotnet/gtk-sharp-2.99.1 |
41 |
## it gives |
42 |
## checking for GTK_SHARP_20... no |
43 |
|
44 |
diff --git a/dev-dotnet/mono-addins/mono-addins-1.3.3.ebuild b/dev-dotnet/mono-addins/mono-addins-1.3.3.ebuild |
45 |
index 6a9ffcb..54db041 100644 |
46 |
--- a/dev-dotnet/mono-addins/mono-addins-1.3.3.ebuild |
47 |
+++ b/dev-dotnet/mono-addins/mono-addins-1.3.3.ebuild |
48 |
@@ -3,7 +3,7 @@ |
49 |
|
50 |
EAPI=5 |
51 |
|
52 |
-inherit eutils dotnet multilib autotools-utils |
53 |
+inherit eutils dotnet multilib autotools |
54 |
|
55 |
DESCRIPTION="A generic framework for creating extensible applications" |
56 |
HOMEPAGE="https://www.mono-project.com/Mono.Addins" |
57 |
@@ -24,7 +24,6 @@ S="${WORKDIR}/${PN}-${P}" |
58 |
|
59 |
src_prepare() { |
60 |
eautoreconf |
61 |
- autotools-utils_src_prepare |
62 |
## with dev-dotnet/gtk-sharp-2.99.1 |
63 |
## it gives |
64 |
## checking for GTK_SHARP_20... no |
65 |
|
66 |
diff --git a/dev-lang/mono/mono-9999.ebuild b/dev-lang/mono/mono-9999.ebuild |
67 |
index 84ad6a4..88b61f6 100644 |
68 |
--- a/dev-lang/mono/mono-9999.ebuild |
69 |
+++ b/dev-lang/mono/mono-9999.ebuild |
70 |
@@ -4,12 +4,12 @@ |
71 |
EAPI="5" |
72 |
AUTOTOOLS_PRUNE_LIBTOOL_FILES="all" |
73 |
|
74 |
-inherit linux-info mono-env flag-o-matic pax-utils autotools-utils git-r3 |
75 |
+inherit linux-info mono-env flag-o-matic pax-utils autotools git-r3 |
76 |
|
77 |
DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter" |
78 |
HOMEPAGE="https://www.mono-project.com/Main_Page" |
79 |
|
80 |
-EGIT_REPO_URI="git://github.com/mono/${PN}.git" |
81 |
+EGIT_REPO_URI="https://github.com/mono/${PN}.git" |
82 |
|
83 |
LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL" |
84 |
SLOT="0" |
85 |
@@ -59,8 +59,8 @@ src_prepare() { |
86 |
|
87 |
# Remove this at your own peril. Mono will barf in unexpected ways. |
88 |
append-flags -fno-strict-aliasing |
89 |
- |
90 |
- autotools-utils_src_prepare |
91 |
+ eautoconf |
92 |
+ eautomake |
93 |
} |
94 |
|
95 |
src_configure() { |
96 |
@@ -89,7 +89,7 @@ src_configure() { |
97 |
$(use_with doc mcs-docs) |
98 |
) |
99 |
|
100 |
- autotools-utils_src_configure |
101 |
+ econf ${myeconfargs} |
102 |
} |
103 |
|
104 |
src_make() { |
105 |
@@ -103,7 +103,7 @@ src_test() { |
106 |
} |
107 |
|
108 |
src_install() { |
109 |
- autotools-utils_src_install |
110 |
+ emake DESTDIR="${D}" install |
111 |
|
112 |
# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora |
113 |
# mono.spec and https://www.mail-archive.com/mono-devel-list@××××××××××××.com/msg24870.html |
114 |
|
115 |
diff --git a/www-servers/xsp/xsp-9999.ebuild b/www-servers/xsp/xsp-9999.ebuild |
116 |
index 030ab44..83c04f2 100644 |
117 |
--- a/www-servers/xsp/xsp-9999.ebuild |
118 |
+++ b/www-servers/xsp/xsp-9999.ebuild |
119 |
@@ -1,12 +1,12 @@ |
120 |
# Copyright 1999-2019 Gentoo Authors |
121 |
# Distributed under the terms of the GNU General Public License v2 |
122 |
|
123 |
-EAPI="5" |
124 |
+EAPI="6" |
125 |
|
126 |
USE_DOTNET="net35 net40 net45" |
127 |
PATCHDIR="${FILESDIR}/2.2/" |
128 |
|
129 |
-inherit eutils dotnet user git-r3 autotools-utils |
130 |
+inherit eutils dotnet user git-r3 autotools |
131 |
|
132 |
DESCRIPTION="XSP is a small web server that can host ASP.NET pages" |
133 |
HOMEPAGE="https://www.mono-project.com/ASP.NET" |
134 |
@@ -36,18 +36,11 @@ src_prepare() { |
135 |
fi |
136 |
eapply_user |
137 |
eautoconf |
138 |
-} |
139 |
|
140 |
-src_configure() { |
141 |
myeconfargs=("--enable-maintainer-mode") |
142 |
use test && myeconfargs+=("--with_unit_tests") |
143 |
use doc || myeconfargs+=("--disable-docs") |
144 |
eautomake --gnu --add-missing --force --copy #nowarn |
145 |
- autotools-utils_src_configure |
146 |
-} |
147 |
- |
148 |
-src_compile() { |
149 |
- autotools-utils_src_compile |
150 |
} |
151 |
|
152 |
pkg_preinst() { |
153 |
@@ -56,7 +49,8 @@ pkg_preinst() { |
154 |
} |
155 |
|
156 |
src_install() { |
157 |
- mv_command="cp -ar" autotools-utils_src_install |
158 |
+ emake DESTDIR="${D}" install |
159 |
+ |
160 |
newinitd "${PATCHDIR}"/xsp.initd xsp |
161 |
newinitd "${PATCHDIR}"/mod-mono-server-r1.initd mod-mono-server |
162 |
newconfd "${PATCHDIR}"/xsp.confd xsp |