Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/mono/, dev-lang/mono/files/files/, dev-lang/mono/files/
Date: Sun, 09 Oct 2016 09:04:39
Message-Id: 1476003843.65f48f32482766b4c7db9c87ea061b57ea827ffb.pacho@gentoo
1 commit: 65f48f32482766b4c7db9c87ea061b57ea827ffb
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 9 08:57:52 2016 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 9 09:04:03 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f48f32
7
8 dev-lang/mono: drop old
9
10 Package-Manager: portage-2.3.1
11
12 dev-lang/mono/Manifest | 3 -
13 .../files/add_missing_vb_portable_targets.patch | 20 ----
14 .../files/add_missing_vb_portable_targets.patch | 20 ----
15 ...tExtensions-issue-2710-another-resolution.patch | 48 --------
16 .../files/fix-for-GitExtensions-issue-2710.patch | 28 -----
17 dev-lang/mono/files/files/fix-for-bug36724.patch | 13 ---
18 .../mono/files/files/mono-3.2.1-mdoc-fix.patch | 12 --
19 ...mono-4.0.2.5-fix-decimal-ms-on-big-endian.patch | 22 ----
20 ...ix-mono-dis-makefile-am-when-without-sgen.patch | 15 ---
21 .../files/mono-4.0.2.5-fix-ppc-atomic-add-i4.patch | 79 -------------
22 dev-lang/mono/files/files/systemweb3.patch | 22 ----
23 ...tExtensions-issue-2710-another-resolution.patch | 48 --------
24 .../files/fix-for-GitExtensions-issue-2710.patch | 28 -----
25 dev-lang/mono/files/fix-for-bug36724.patch | 13 ---
26 dev-lang/mono/files/mono-3.2.1-mdoc-fix.patch | 12 --
27 .../files/mono-3.2.8-disable-missing-test.patch | 7 --
28 ...mono-4.0.2.5-fix-decimal-ms-on-big-endian.patch | 22 ----
29 ...ix-mono-dis-makefile-am-when-without-sgen.patch | 15 ---
30 .../files/mono-4.0.2.5-fix-ppc-atomic-add-i4.patch | 79 -------------
31 dev-lang/mono/files/systemweb3.patch | 22 ----
32 dev-lang/mono/mono-3.12.1.ebuild | 128 ---------------------
33 dev-lang/mono/mono-4.0.5.1.ebuild | 118 -------------------
34 dev-lang/mono/mono-4.4.0.148.ebuild | 120 -------------------
35 23 files changed, 894 deletions(-)
36
37 diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
38 index b28eb79..3b5f7cf 100644
39 --- a/dev-lang/mono/Manifest
40 +++ b/dev-lang/mono/Manifest
41 @@ -1,6 +1,3 @@
42 DIST mono-2.10.9.tar.bz2 34038017 SHA256 541038cd4edd4a1c485638d49697d45015ef7483bcb21bb6165e4d7eb770c9a5 SHA512 426881873e7f9aaf01e1306bed7b3ac220082ca40dce91fa4f4f331944e8d91453b3cdcc4918882ab039ed694ae8819eeb787edf6a2ad42cc661614076725c01 WHIRLPOOL 93f54fbbf032fb60467fd4317630588d349c3dfb50158bad478bd3e2650fd3e8f12d45be372873b57626d4ac48f798646c3650590bbf731dc2f005ee618b8548
43 -DIST mono-3.12.1.tar.bz2 73487974 SHA256 5d8cf153af2948c06bc9fbf5088f6834868e4db8e5f41c7cff76da173732b60d SHA512 7ff87d95c347186347dc7a9ffb767112717de2b808f8f1b612c56c9eb70fdcc0c8f586989be44444509a2768e71854d8195567196c992cc2c5b184ecbe5ac190 WHIRLPOOL fe3a6cdb8bf4602ad1d1e43099b2a552005c315a232a7d2bddf0081a68e882228712af5301f18d3a890f454041c4a34d6f0926aaba34401ecfa702eecd9415c8
44 -DIST mono-4.0.5.1.tar.bz2 96533206 SHA256 c2f42944dded3196c6449f90e79990f1951070a361a0dcc2350fc56e945bc229 SHA512 c0783f7b2e344ca00ea354d2723821636a2594345f7e1fd93bf84e9ba1b5501848d4f49b1538279aac9f6f333d296394322e08a9749fe2208340104aa594cd09 WHIRLPOOL ae9b0758c019003fc9ecdbd051974d547c59c24a4505e71c1fc7db8095bc98cdb486405e2ba1794bfb34ecc6bebeb8b5165a97ba8f596897887eb7f2da806b89
45 -DIST mono-4.4.0.148.tar.bz2 84897767 SHA256 38ad527608c26b2637472602d91d6af203dc4202be915e583fdc9e3a9252a5f3 SHA512 c1e0a7d589cc181fcfe36006879362ad0f5fca0d903fef723f7c4ed68dbd1eb2a7526b2e44c23f2b4c7b1cbcadeae6c7b004aab0643f09dc32640776892c3a22 WHIRLPOOL 9ada86d6026c0a139929a41b11e8849b7545f44be93ffa9c316a2877927d1883419bfb7f3aeb3b1dc593d6f9c0fe6e154e7e30285e70d25c75990c31ec704c85
46 DIST mono-4.4.1.0.tar.bz2 85897587 SHA256 165e7686b5cbb1ab671b4cb2069207999c3d70044002190b6ec84bb1fdf62b4a SHA512 d9b6c57c2d9327ea551083b81a2e6cc222ded9a04862056b0dfded1c5df56efbfc4960097df034595012231fe50d172174ab7b3e3f2d8c4c6953ab2106b1cb6a WHIRLPOOL 99f16622c6d1902a7efff41d55d114ed214979c1d902a5dcbc257c180a1e68ed519beb5383db2358096e3f8425483983565c8f438552de36ffabe4bfad3f5fbd
47 DIST mono-4.6.1.3.tar.bz2 83229465 SHA256 a5d4cec3d4676fcd7bcbc59b5ab12dc9a2481abbd10017a2ed737098a6b2e891 SHA512 b059fb00adbddf676d137c53a22cabdb86cedb829a25c1ed2d5b78bbd4bc38a0d3ec2cbc56cec91578e2e74478770cac147ac2b740531751585d6ed0bbc50e3b WHIRLPOOL ed080322b83549679c9b6fe8bac501df7390690508c32b97be47c1b0e3e020ba117aaad08250255409b0266b7270860acdf969d2342add1a918b38a635da1046
48
49 diff --git a/dev-lang/mono/files/add_missing_vb_portable_targets.patch b/dev-lang/mono/files/add_missing_vb_portable_targets.patch
50 deleted file mode 100644
51 index ece90a5..00000000
52 --- a/dev-lang/mono/files/add_missing_vb_portable_targets.patch
53 +++ /dev/null
54 @@ -1,20 +0,0 @@
55 -Index: mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets
56 -===================================================================
57 ---- /dev/null 1970-01-01 00:00:00.000000000 +0000
58 -+++ mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets 2015-05-15 15:55:12.074775985 +0100
59 -@@ -0,0 +1,5 @@
60 -+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
61 -+ <Import Project="..\Microsoft.Portable.Core.props" />
62 -+ <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
63 -+ <Import Project="..\Microsoft.Portable.Core.targets" />
64 -+</Project>
65 -Index: mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets
66 -===================================================================
67 ---- /dev/null 1970-01-01 00:00:00.000000000 +0000
68 -+++ mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets 2015-05-15 15:55:19.194775876 +0100
69 -@@ -0,0 +1,5 @@
70 -+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
71 -+ <Import Project="..\Microsoft.Portable.Core.props" />
72 -+ <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
73 -+ <Import Project="..\Microsoft.Portable.Core.targets" />
74 -+</Project>
75
76 diff --git a/dev-lang/mono/files/files/add_missing_vb_portable_targets.patch b/dev-lang/mono/files/files/add_missing_vb_portable_targets.patch
77 deleted file mode 100644
78 index ece90a5..00000000
79 --- a/dev-lang/mono/files/files/add_missing_vb_portable_targets.patch
80 +++ /dev/null
81 @@ -1,20 +0,0 @@
82 -Index: mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets
83 -===================================================================
84 ---- /dev/null 1970-01-01 00:00:00.000000000 +0000
85 -+++ mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets 2015-05-15 15:55:12.074775985 +0100
86 -@@ -0,0 +1,5 @@
87 -+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
88 -+ <Import Project="..\Microsoft.Portable.Core.props" />
89 -+ <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
90 -+ <Import Project="..\Microsoft.Portable.Core.targets" />
91 -+</Project>
92 -Index: mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets
93 -===================================================================
94 ---- /dev/null 1970-01-01 00:00:00.000000000 +0000
95 -+++ mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets 2015-05-15 15:55:19.194775876 +0100
96 -@@ -0,0 +1,5 @@
97 -+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
98 -+ <Import Project="..\Microsoft.Portable.Core.props" />
99 -+ <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
100 -+ <Import Project="..\Microsoft.Portable.Core.targets" />
101 -+</Project>
102
103 diff --git a/dev-lang/mono/files/files/fix-for-GitExtensions-issue-2710-another-resolution.patch b/dev-lang/mono/files/files/fix-for-GitExtensions-issue-2710-another-resolution.patch
104 deleted file mode 100644
105 index b306b69..00000000
106 --- a/dev-lang/mono/files/files/fix-for-GitExtensions-issue-2710-another-resolution.patch
107 +++ /dev/null
108 @@ -1,48 +0,0 @@
109 -diff --git a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
110 -index 4b69010..1bb6195 100644
111 ---- a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
112 -+++ b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
113 -@@ -578,6 +578,34 @@ namespace System.Configuration
114 - private ExeConfigurationFileMap exeMapPrev = null;
115 - private SettingsPropertyValueCollection values = null;
116 -
117 -+ /// <remarks>
118 -+ /// Hack to remove the XmlDeclaration that the XmlSerializer adds.
119 -+ /// <br />
120 -+ /// see <a href="https://github.com/mono/mono/pull/2273">Issue 2273</a> for details
121 -+ /// </remarks>
122 -+ private string StripXmlHeader(string serializedValue)
123 -+ {
124 -+ if (serializedValue == null)
125 -+ {
126 -+ return string.Empty;
127 -+ }
128 -+
129 -+ XmlDocument doc = new XmlDocument();
130 -+ XmlElement valueXml = doc.CreateElement("value");
131 -+ valueXml.InnerXml = serializedValue;
132 -+
133 -+ foreach (XmlNode child in valueXml.ChildNodes) {
134 -+ if (child.NodeType == XmlNodeType.XmlDeclaration) {
135 -+ valueXml.RemoveChild(child);
136 -+ break;
137 -+ }
138 -+ }
139 -+
140 -+ // InnerXml will give you well-formed XML that you could save as a separate document, and
141 -+ // InnerText will immediately give you a pure-text representation of this inner XML.
142 -+ return valueXml.InnerXml;
143 -+ }
144 -+
145 - private void SaveProperties (ExeConfigurationFileMap exeMap, SettingsPropertyValueCollection collection, ConfigurationUserLevel level, SettingsContext context, bool checkUserLevel)
146 - {
147 - Configuration config = ConfigurationManager.OpenMappedExeConfiguration (exeMap, level);
148 -@@ -623,7 +651,7 @@ namespace System.Configuration
149 - element.Value.ValueXml = new XmlDocument ().CreateElement ("value");
150 - switch (value.Property.SerializeAs) {
151 - case SettingsSerializeAs.Xml:
152 -- element.Value.ValueXml.InnerXml = (value.SerializedValue as string) ?? string.Empty;
153 -+ element.Value.ValueXml.InnerXml = StripXmlHeader(value.SerializedValue as string);
154 - break;
155 - case SettingsSerializeAs.String:
156 - element.Value.ValueXml.InnerText = value.SerializedValue as string;
157
158 diff --git a/dev-lang/mono/files/files/fix-for-GitExtensions-issue-2710.patch b/dev-lang/mono/files/files/fix-for-GitExtensions-issue-2710.patch
159 deleted file mode 100644
160 index 3d60923..00000000
161 --- a/dev-lang/mono/files/files/fix-for-GitExtensions-issue-2710.patch
162 +++ /dev/null
163 @@ -1,28 +0,0 @@
164 -diff --git a/mcs/class/System/System.Configuration/SettingsPropertyValue.cs b/mcs/class/System/System.Configuration/SettingsPropertyValue.cs
165 -index 9bf62c0..9f026461 100644
166 ---- a/mcs/class/System/System.Configuration/SettingsPropertyValue.cs
167 -+++ b/mcs/class/System/System.Configuration/SettingsPropertyValue.cs
168 -@@ -118,11 +118,18 @@ namespace System.Configuration
169 - #if (XML_DEP)
170 - case SettingsSerializeAs.Xml:
171 - if (propertyValue != null) {
172 -- XmlSerializer serializer = new XmlSerializer (propertyValue.GetType ());
173 -- StringWriter w = new StringWriter(CultureInfo.InvariantCulture);
174 --
175 -- serializer.Serialize (w, propertyValue);
176 -- serializedValue = w.ToString();
177 -+ using (StringWriter w = new StringWriter(CultureInfo.InvariantCulture))
178 -+ {
179 -+ var xmlSettings = new XmlWriterSettings();
180 -+ xmlSettings.OmitXmlDeclaration = true;
181 -+ using (var writer = XmlWriter.Create(w, xmlSettings))
182 -+ {
183 -+ XmlSerializer serializer = new XmlSerializer(propertyValue.GetType ());
184 -+ var emptyNamespaces = new XmlSerializerNamespaces(new[] { XmlQualifiedName.Empty });
185 -+ serializer.Serialize(writer, propertyValue, emptyNamespaces);
186 -+ } // writer.Flush happens here
187 -+ serializedValue = w.ToString();
188 -+ }
189 - }
190 - else
191 - serializedValue = null;
192
193 diff --git a/dev-lang/mono/files/files/fix-for-bug36724.patch b/dev-lang/mono/files/files/fix-for-bug36724.patch
194 deleted file mode 100644
195 index 187b4ba..00000000
196 --- a/dev-lang/mono/files/files/fix-for-bug36724.patch
197 +++ /dev/null
198 @@ -1,13 +0,0 @@
199 -diff --git a/mcs/class/System.Web/System.Web.Util/UrlUtils.cs b/mcs/class/System.Web/System.Web.Util/UrlUtils.cs
200 -index 4f07e83..e229a91 100644
201 ---- a/mcs/class/System.Web/System.Web.Util/UrlUtils.cs
202 -+++ b/mcs/class/System.Web/System.Web.Util/UrlUtils.cs
203 -@@ -54,7 +54,7 @@ namespace System.Web.Util {
204 - if (path.StartsWith (appvpath))
205 - path = path.Substring (appvpath.Length);
206 -
207 -- if (path [0] == '/')
208 -+ if (path.StartsWith("/"))
209 - path = path.Length > 1 ? path.Substring (1) : "";
210 -
211 - return Canonic (appvpath + "(" + id + ")/" + path);
212
213 diff --git a/dev-lang/mono/files/files/mono-3.2.1-mdoc-fix.patch b/dev-lang/mono/files/files/mono-3.2.1-mdoc-fix.patch
214 deleted file mode 100644
215 index b8fcea9..00000000
216 --- a/dev-lang/mono/files/files/mono-3.2.1-mdoc-fix.patch
217 +++ /dev/null
218 @@ -1,12 +0,0 @@
219 -diff -Naur mono-3.2.1.orig/mcs/tools/mdoc/Resources/monodoc-ecma.xsd mono-3.2.1/mcs/tools/mdoc/Resources/monodoc-ecma.xsd
220 ---- mono-3.2.1.orig/mcs/tools/mdoc/Resources/monodoc-ecma.xsd 2013-08-26 09:33:59.410610438 +0200
221 -+++ mono-3.2.1/mcs/tools/mdoc/Resources/monodoc-ecma.xsd 2013-08-26 09:34:54.057804438 +0200
222 -@@ -351,7 +351,7 @@
223 - <xs:element name="format">
224 - <xs:complexType>
225 - <xs:sequence>
226 -- <xs:any minOccurs="0" processContents="lax" />
227 -+ <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" />
228 - </xs:sequence>
229 - <xs:attribute ref="type" />
230 - </xs:complexType>
231
232 diff --git a/dev-lang/mono/files/files/mono-4.0.2.5-fix-decimal-ms-on-big-endian.patch b/dev-lang/mono/files/files/mono-4.0.2.5-fix-decimal-ms-on-big-endian.patch
233 deleted file mode 100644
234 index c6349fe..00000000
235 --- a/dev-lang/mono/files/files/mono-4.0.2.5-fix-decimal-ms-on-big-endian.patch
236 +++ /dev/null
237 @@ -1,22 +0,0 @@
238 -diff -up mono/metadata/decimal-ms.c.than
239 -mono/metadata/decimal-ms.c
240 ---- mono/metadata/decimal-ms.c.than 2015-07-06 08:21:27.524461795
241 --0400
242 -+++ mono/metadata/decimal-ms.c 2015-07-06 08:30:26.954461795
243 --0400
244 -@@ -55,8 +55,13 @@ static const uint32_t ten_to_ten_div_4 =
245 - #define DECIMAL_LO32(dec) ((dec).v.v.Lo32)
246 - #define DECIMAL_MID32(dec) ((dec).v.v.Mid32)
247 - #define DECIMAL_HI32(dec) ((dec).Hi32)
248 --#define DECIMAL_LO64_GET(dec) ((dec).v.Lo64)
249 --#define DECIMAL_LO64_SET(dec,value) {(dec).v.Lo64 = value; }
250 -+#if G_BYTE_ORDER != G_LITTLE_ENDIAN
251 -+# define DECIMAL_LO64_GET(dec) (((uint64_t)((dec).v.v.Mid32) << 32) | (dec).v.v.Lo32)
252 -+# define DECIMAL_LO64_SET(dec,value) {(dec).v.v.Lo32 = (value); (dec).v.v.Mid32 = ((value) >> 32); }
253 -+#else
254 -+# define DECIMAL_LO64_GET(dec) ((dec).v.Lo64)
255 -+# define DECIMAL_LO64_SET(dec,value) {(dec).v.Lo64 = value; }
256 -+#endif
257 -
258 - #define DECIMAL_SETZERO(dec) {DECIMAL_LO32(dec) = 0; DECIMAL_MID32(dec) = 0; DECIMAL_HI32(dec) = 0; DECIMAL_SIGNSCALE(dec) = 0;}
259 - #define COPYDEC(dest, src) {DECIMAL_SIGNSCALE(dest) = DECIMAL_SIGNSCALE(src); DECIMAL_HI32(dest) = DECIMAL_HI32(src); \
260
261 diff --git a/dev-lang/mono/files/files/mono-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch b/dev-lang/mono/files/files/mono-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch
262 deleted file mode 100644
263 index bbf4c6f..00000000
264 --- a/dev-lang/mono/files/files/mono-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch
265 +++ /dev/null
266 @@ -1,15 +0,0 @@
267 -===================================================================
268 -RCS file: mono/dis/RCS/Makefile.am,v
269 -retrieving revision 1.1
270 -diff -up -r1.1 mono/dis/Makefile.am
271 ---- mono/dis/Makefile.am 2015/05/08 15:00:22 1.1
272 -+++ mono/dis/Makefile.am 2015/07/14 11:20:29
273 -@@ -7,7 +7,7 @@ endif
274 - if SUPPORT_SGEN
275 - metadata_lib=$(top_builddir)/mono/metadata/libmonoruntimesgen-static.la
276 - else
277 --metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.a
278 -+metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.la
279 - gc_lib=$(LIBGC_STATIC_LIBS)
280 - endif
281 -
282
283 diff --git a/dev-lang/mono/files/files/mono-4.0.2.5-fix-ppc-atomic-add-i4.patch b/dev-lang/mono/files/files/mono-4.0.2.5-fix-ppc-atomic-add-i4.patch
284 deleted file mode 100644
285 index fd5de72..00000000
286 --- a/dev-lang/mono/files/files/mono-4.0.2.5-fix-ppc-atomic-add-i4.patch
287 +++ /dev/null
288 @@ -1,79 +0,0 @@
289 -From f967c79926900343f399c75624deedaba460e544 Mon Sep 17 00:00:00 2001
290 -From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alexrp@×××××××.com>
291 -Date: Mon, 3 Aug 2015 17:32:07 +0200
292 -Subject: [PATCH 1/2] [ppc] Instruction length of atomic_add_i4 is 28.
293 -
294 ----
295 - mono/mini/cpu-ppc.md | 2 +-
296 - 1 file changed, 1 insertion(+), 1 deletion(-)
297 -
298 -diff --git a/mono/mini/cpu-ppc.md b/mono/mini/cpu-ppc.md
299 -index ba2ec60..e6baf91 100644
300 ---- a/mono/mini/cpu-ppc.md
301 -+++ b/mono/mini/cpu-ppc.md
302 -@@ -314,5 +314,5 @@ vcall2_membase: src1:b len:16 clob:c
303 -
304 - jump_table: dest:i len:8
305 -
306 --atomic_add_i4: src1:b src2:i dest:i len:20
307 -+atomic_add_i4: src1:b src2:i dest:i len:28
308 - atomic_cas_i4: src1:b src2:i src3:i dest:i len:38
309 -
310 -From 8f379f0c8f98493180b508b9e68b9aa76c0c5bdf Mon Sep 17 00:00:00 2001
311 -From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alexrp@×××××××.com>
312 -Date: Mon, 3 Aug 2015 17:32:31 +0200
313 -Subject: [PATCH 2/2] [ppc] Fix atomic_add_i4 support for 32-bit PPC.
314 -
315 ----
316 - mono/mini/mini-ppc.c | 31 ++++++++++++++++---------------
317 - 1 file changed, 16 insertions(+), 15 deletions(-)
318 -
319 -diff --git a/mono/mini/mini-ppc.c b/mono/mini/mini-ppc.c
320 -index 758a63f..06528bd 100644
321 ---- a/mono/mini/mini-ppc.c
322 -+++ b/mono/mini/mini-ppc.c
323 -@@ -4420,6 +4420,22 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
324 - else
325 - ppc_mr (code, ins->dreg, ins->sreg1);
326 - break;
327 -+#else
328 -+ case OP_ICONV_TO_R4:
329 -+ case OP_ICONV_TO_R8: {
330 -+ if (cpu_hw_caps & PPC_ISA_64) {
331 -+ ppc_srawi(code, ppc_r0, ins->sreg1, 31);
332 -+ ppc_stw (code, ppc_r0, -8, ppc_r1);
333 -+ ppc_stw (code, ins->sreg1, -4, ppc_r1);
334 -+ ppc_lfd (code, ins->dreg, -8, ppc_r1);
335 -+ ppc_fcfid (code, ins->dreg, ins->dreg);
336 -+ if (ins->opcode == OP_ICONV_TO_R4)
337 -+ ppc_frsp (code, ins->dreg, ins->dreg);
338 -+ }
339 -+ break;
340 -+ }
341 -+#endif
342 -+
343 - case OP_ATOMIC_ADD_I4:
344 - CASE_PPC64 (OP_ATOMIC_ADD_I8) {
345 - int location = ins->inst_basereg;
346 -@@ -4453,21 +4469,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
347 - ppc_mr (code, ins->dreg, ppc_r0);
348 - break;
349 - }
350 --#else
351 -- case OP_ICONV_TO_R4:
352 -- case OP_ICONV_TO_R8: {
353 -- if (cpu_hw_caps & PPC_ISA_64) {
354 -- ppc_srawi(code, ppc_r0, ins->sreg1, 31);
355 -- ppc_stw (code, ppc_r0, -8, ppc_r1);
356 -- ppc_stw (code, ins->sreg1, -4, ppc_r1);
357 -- ppc_lfd (code, ins->dreg, -8, ppc_r1);
358 -- ppc_fcfid (code, ins->dreg, ins->dreg);
359 -- if (ins->opcode == OP_ICONV_TO_R4)
360 -- ppc_frsp (code, ins->dreg, ins->dreg);
361 -- }
362 -- break;
363 -- }
364 --#endif
365 - case OP_ATOMIC_CAS_I4:
366 - CASE_PPC64 (OP_ATOMIC_CAS_I8) {
367 - int location = ins->sreg1;
368
369 diff --git a/dev-lang/mono/files/files/systemweb3.patch b/dev-lang/mono/files/files/systemweb3.patch
370 deleted file mode 100644
371 index 5ccb63a..00000000
372 --- a/dev-lang/mono/files/files/systemweb3.patch
373 +++ /dev/null
374 @@ -1,22 +0,0 @@
375 ---- a/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs 2015-05-08 18:00:15.000000000 +0300
376 -+++ b/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs 2015-07-20 14:13:09.215784924 +0300
377 -@@ -41,5 +41,19 @@
378 - {
379 - public abstract RouteData GetRouteData (HttpContextBase httpContext);
380 - public abstract VirtualPathData GetVirtualPath (RequestContext requestContext, RouteValueDictionary values);
381 -+
382 -+ // Default needs to be true to avoid breaking change
383 -+ private bool _routeExistingFiles = true;
384 -+ public bool RouteExistingFiles
385 -+ {
386 -+ get
387 -+ {
388 -+ return _routeExistingFiles;
389 -+ }
390 -+ set
391 -+ {
392 -+ _routeExistingFiles = value;
393 -+ }
394 -+ }
395 - }
396 - }
397
398 diff --git a/dev-lang/mono/files/fix-for-GitExtensions-issue-2710-another-resolution.patch b/dev-lang/mono/files/fix-for-GitExtensions-issue-2710-another-resolution.patch
399 deleted file mode 100644
400 index b306b69..00000000
401 --- a/dev-lang/mono/files/fix-for-GitExtensions-issue-2710-another-resolution.patch
402 +++ /dev/null
403 @@ -1,48 +0,0 @@
404 -diff --git a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
405 -index 4b69010..1bb6195 100644
406 ---- a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
407 -+++ b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
408 -@@ -578,6 +578,34 @@ namespace System.Configuration
409 - private ExeConfigurationFileMap exeMapPrev = null;
410 - private SettingsPropertyValueCollection values = null;
411 -
412 -+ /// <remarks>
413 -+ /// Hack to remove the XmlDeclaration that the XmlSerializer adds.
414 -+ /// <br />
415 -+ /// see <a href="https://github.com/mono/mono/pull/2273">Issue 2273</a> for details
416 -+ /// </remarks>
417 -+ private string StripXmlHeader(string serializedValue)
418 -+ {
419 -+ if (serializedValue == null)
420 -+ {
421 -+ return string.Empty;
422 -+ }
423 -+
424 -+ XmlDocument doc = new XmlDocument();
425 -+ XmlElement valueXml = doc.CreateElement("value");
426 -+ valueXml.InnerXml = serializedValue;
427 -+
428 -+ foreach (XmlNode child in valueXml.ChildNodes) {
429 -+ if (child.NodeType == XmlNodeType.XmlDeclaration) {
430 -+ valueXml.RemoveChild(child);
431 -+ break;
432 -+ }
433 -+ }
434 -+
435 -+ // InnerXml will give you well-formed XML that you could save as a separate document, and
436 -+ // InnerText will immediately give you a pure-text representation of this inner XML.
437 -+ return valueXml.InnerXml;
438 -+ }
439 -+
440 - private void SaveProperties (ExeConfigurationFileMap exeMap, SettingsPropertyValueCollection collection, ConfigurationUserLevel level, SettingsContext context, bool checkUserLevel)
441 - {
442 - Configuration config = ConfigurationManager.OpenMappedExeConfiguration (exeMap, level);
443 -@@ -623,7 +651,7 @@ namespace System.Configuration
444 - element.Value.ValueXml = new XmlDocument ().CreateElement ("value");
445 - switch (value.Property.SerializeAs) {
446 - case SettingsSerializeAs.Xml:
447 -- element.Value.ValueXml.InnerXml = (value.SerializedValue as string) ?? string.Empty;
448 -+ element.Value.ValueXml.InnerXml = StripXmlHeader(value.SerializedValue as string);
449 - break;
450 - case SettingsSerializeAs.String:
451 - element.Value.ValueXml.InnerText = value.SerializedValue as string;
452
453 diff --git a/dev-lang/mono/files/fix-for-GitExtensions-issue-2710.patch b/dev-lang/mono/files/fix-for-GitExtensions-issue-2710.patch
454 deleted file mode 100644
455 index 3d60923..00000000
456 --- a/dev-lang/mono/files/fix-for-GitExtensions-issue-2710.patch
457 +++ /dev/null
458 @@ -1,28 +0,0 @@
459 -diff --git a/mcs/class/System/System.Configuration/SettingsPropertyValue.cs b/mcs/class/System/System.Configuration/SettingsPropertyValue.cs
460 -index 9bf62c0..9f026461 100644
461 ---- a/mcs/class/System/System.Configuration/SettingsPropertyValue.cs
462 -+++ b/mcs/class/System/System.Configuration/SettingsPropertyValue.cs
463 -@@ -118,11 +118,18 @@ namespace System.Configuration
464 - #if (XML_DEP)
465 - case SettingsSerializeAs.Xml:
466 - if (propertyValue != null) {
467 -- XmlSerializer serializer = new XmlSerializer (propertyValue.GetType ());
468 -- StringWriter w = new StringWriter(CultureInfo.InvariantCulture);
469 --
470 -- serializer.Serialize (w, propertyValue);
471 -- serializedValue = w.ToString();
472 -+ using (StringWriter w = new StringWriter(CultureInfo.InvariantCulture))
473 -+ {
474 -+ var xmlSettings = new XmlWriterSettings();
475 -+ xmlSettings.OmitXmlDeclaration = true;
476 -+ using (var writer = XmlWriter.Create(w, xmlSettings))
477 -+ {
478 -+ XmlSerializer serializer = new XmlSerializer(propertyValue.GetType ());
479 -+ var emptyNamespaces = new XmlSerializerNamespaces(new[] { XmlQualifiedName.Empty });
480 -+ serializer.Serialize(writer, propertyValue, emptyNamespaces);
481 -+ } // writer.Flush happens here
482 -+ serializedValue = w.ToString();
483 -+ }
484 - }
485 - else
486 - serializedValue = null;
487
488 diff --git a/dev-lang/mono/files/fix-for-bug36724.patch b/dev-lang/mono/files/fix-for-bug36724.patch
489 deleted file mode 100644
490 index 187b4ba..00000000
491 --- a/dev-lang/mono/files/fix-for-bug36724.patch
492 +++ /dev/null
493 @@ -1,13 +0,0 @@
494 -diff --git a/mcs/class/System.Web/System.Web.Util/UrlUtils.cs b/mcs/class/System.Web/System.Web.Util/UrlUtils.cs
495 -index 4f07e83..e229a91 100644
496 ---- a/mcs/class/System.Web/System.Web.Util/UrlUtils.cs
497 -+++ b/mcs/class/System.Web/System.Web.Util/UrlUtils.cs
498 -@@ -54,7 +54,7 @@ namespace System.Web.Util {
499 - if (path.StartsWith (appvpath))
500 - path = path.Substring (appvpath.Length);
501 -
502 -- if (path [0] == '/')
503 -+ if (path.StartsWith("/"))
504 - path = path.Length > 1 ? path.Substring (1) : "";
505 -
506 - return Canonic (appvpath + "(" + id + ")/" + path);
507
508 diff --git a/dev-lang/mono/files/mono-3.2.1-mdoc-fix.patch b/dev-lang/mono/files/mono-3.2.1-mdoc-fix.patch
509 deleted file mode 100644
510 index b8fcea9..00000000
511 --- a/dev-lang/mono/files/mono-3.2.1-mdoc-fix.patch
512 +++ /dev/null
513 @@ -1,12 +0,0 @@
514 -diff -Naur mono-3.2.1.orig/mcs/tools/mdoc/Resources/monodoc-ecma.xsd mono-3.2.1/mcs/tools/mdoc/Resources/monodoc-ecma.xsd
515 ---- mono-3.2.1.orig/mcs/tools/mdoc/Resources/monodoc-ecma.xsd 2013-08-26 09:33:59.410610438 +0200
516 -+++ mono-3.2.1/mcs/tools/mdoc/Resources/monodoc-ecma.xsd 2013-08-26 09:34:54.057804438 +0200
517 -@@ -351,7 +351,7 @@
518 - <xs:element name="format">
519 - <xs:complexType>
520 - <xs:sequence>
521 -- <xs:any minOccurs="0" processContents="lax" />
522 -+ <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" />
523 - </xs:sequence>
524 - <xs:attribute ref="type" />
525 - </xs:complexType>
526
527 diff --git a/dev-lang/mono/files/mono-3.2.8-disable-missing-test.patch b/dev-lang/mono/files/mono-3.2.8-disable-missing-test.patch
528 deleted file mode 100644
529 index 79c2674..00000000
530 --- a/dev-lang/mono/files/mono-3.2.8-disable-missing-test.patch
531 +++ /dev/null
532 @@ -1,7 +0,0 @@
533 ---- a/mcs/tests/Makefile
534 -+++ b/mcs/tests/Makefile
535 -@@ -96,4 +96,3 @@
536 - setup:
537 - $(CSCOMPILE) -t:library dlls/test-679-2/test-679-lib-2.cs
538 - $(CSCOMPILE) -t:library dlls/test-679-1/test-679-lib.cs -r:dlls/test-679-2/test-679-lib-2.dll
539 -- $(ILASM) -dll dlls/test-883.il
540
541 diff --git a/dev-lang/mono/files/mono-4.0.2.5-fix-decimal-ms-on-big-endian.patch b/dev-lang/mono/files/mono-4.0.2.5-fix-decimal-ms-on-big-endian.patch
542 deleted file mode 100644
543 index c6349fe..00000000
544 --- a/dev-lang/mono/files/mono-4.0.2.5-fix-decimal-ms-on-big-endian.patch
545 +++ /dev/null
546 @@ -1,22 +0,0 @@
547 -diff -up mono/metadata/decimal-ms.c.than
548 -mono/metadata/decimal-ms.c
549 ---- mono/metadata/decimal-ms.c.than 2015-07-06 08:21:27.524461795
550 --0400
551 -+++ mono/metadata/decimal-ms.c 2015-07-06 08:30:26.954461795
552 --0400
553 -@@ -55,8 +55,13 @@ static const uint32_t ten_to_ten_div_4 =
554 - #define DECIMAL_LO32(dec) ((dec).v.v.Lo32)
555 - #define DECIMAL_MID32(dec) ((dec).v.v.Mid32)
556 - #define DECIMAL_HI32(dec) ((dec).Hi32)
557 --#define DECIMAL_LO64_GET(dec) ((dec).v.Lo64)
558 --#define DECIMAL_LO64_SET(dec,value) {(dec).v.Lo64 = value; }
559 -+#if G_BYTE_ORDER != G_LITTLE_ENDIAN
560 -+# define DECIMAL_LO64_GET(dec) (((uint64_t)((dec).v.v.Mid32) << 32) | (dec).v.v.Lo32)
561 -+# define DECIMAL_LO64_SET(dec,value) {(dec).v.v.Lo32 = (value); (dec).v.v.Mid32 = ((value) >> 32); }
562 -+#else
563 -+# define DECIMAL_LO64_GET(dec) ((dec).v.Lo64)
564 -+# define DECIMAL_LO64_SET(dec,value) {(dec).v.Lo64 = value; }
565 -+#endif
566 -
567 - #define DECIMAL_SETZERO(dec) {DECIMAL_LO32(dec) = 0; DECIMAL_MID32(dec) = 0; DECIMAL_HI32(dec) = 0; DECIMAL_SIGNSCALE(dec) = 0;}
568 - #define COPYDEC(dest, src) {DECIMAL_SIGNSCALE(dest) = DECIMAL_SIGNSCALE(src); DECIMAL_HI32(dest) = DECIMAL_HI32(src); \
569
570 diff --git a/dev-lang/mono/files/mono-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch b/dev-lang/mono/files/mono-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch
571 deleted file mode 100644
572 index bbf4c6f..00000000
573 --- a/dev-lang/mono/files/mono-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch
574 +++ /dev/null
575 @@ -1,15 +0,0 @@
576 -===================================================================
577 -RCS file: mono/dis/RCS/Makefile.am,v
578 -retrieving revision 1.1
579 -diff -up -r1.1 mono/dis/Makefile.am
580 ---- mono/dis/Makefile.am 2015/05/08 15:00:22 1.1
581 -+++ mono/dis/Makefile.am 2015/07/14 11:20:29
582 -@@ -7,7 +7,7 @@ endif
583 - if SUPPORT_SGEN
584 - metadata_lib=$(top_builddir)/mono/metadata/libmonoruntimesgen-static.la
585 - else
586 --metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.a
587 -+metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.la
588 - gc_lib=$(LIBGC_STATIC_LIBS)
589 - endif
590 -
591
592 diff --git a/dev-lang/mono/files/mono-4.0.2.5-fix-ppc-atomic-add-i4.patch b/dev-lang/mono/files/mono-4.0.2.5-fix-ppc-atomic-add-i4.patch
593 deleted file mode 100644
594 index fd5de72..00000000
595 --- a/dev-lang/mono/files/mono-4.0.2.5-fix-ppc-atomic-add-i4.patch
596 +++ /dev/null
597 @@ -1,79 +0,0 @@
598 -From f967c79926900343f399c75624deedaba460e544 Mon Sep 17 00:00:00 2001
599 -From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alexrp@×××××××.com>
600 -Date: Mon, 3 Aug 2015 17:32:07 +0200
601 -Subject: [PATCH 1/2] [ppc] Instruction length of atomic_add_i4 is 28.
602 -
603 ----
604 - mono/mini/cpu-ppc.md | 2 +-
605 - 1 file changed, 1 insertion(+), 1 deletion(-)
606 -
607 -diff --git a/mono/mini/cpu-ppc.md b/mono/mini/cpu-ppc.md
608 -index ba2ec60..e6baf91 100644
609 ---- a/mono/mini/cpu-ppc.md
610 -+++ b/mono/mini/cpu-ppc.md
611 -@@ -314,5 +314,5 @@ vcall2_membase: src1:b len:16 clob:c
612 -
613 - jump_table: dest:i len:8
614 -
615 --atomic_add_i4: src1:b src2:i dest:i len:20
616 -+atomic_add_i4: src1:b src2:i dest:i len:28
617 - atomic_cas_i4: src1:b src2:i src3:i dest:i len:38
618 -
619 -From 8f379f0c8f98493180b508b9e68b9aa76c0c5bdf Mon Sep 17 00:00:00 2001
620 -From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alexrp@×××××××.com>
621 -Date: Mon, 3 Aug 2015 17:32:31 +0200
622 -Subject: [PATCH 2/2] [ppc] Fix atomic_add_i4 support for 32-bit PPC.
623 -
624 ----
625 - mono/mini/mini-ppc.c | 31 ++++++++++++++++---------------
626 - 1 file changed, 16 insertions(+), 15 deletions(-)
627 -
628 -diff --git a/mono/mini/mini-ppc.c b/mono/mini/mini-ppc.c
629 -index 758a63f..06528bd 100644
630 ---- a/mono/mini/mini-ppc.c
631 -+++ b/mono/mini/mini-ppc.c
632 -@@ -4420,6 +4420,22 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
633 - else
634 - ppc_mr (code, ins->dreg, ins->sreg1);
635 - break;
636 -+#else
637 -+ case OP_ICONV_TO_R4:
638 -+ case OP_ICONV_TO_R8: {
639 -+ if (cpu_hw_caps & PPC_ISA_64) {
640 -+ ppc_srawi(code, ppc_r0, ins->sreg1, 31);
641 -+ ppc_stw (code, ppc_r0, -8, ppc_r1);
642 -+ ppc_stw (code, ins->sreg1, -4, ppc_r1);
643 -+ ppc_lfd (code, ins->dreg, -8, ppc_r1);
644 -+ ppc_fcfid (code, ins->dreg, ins->dreg);
645 -+ if (ins->opcode == OP_ICONV_TO_R4)
646 -+ ppc_frsp (code, ins->dreg, ins->dreg);
647 -+ }
648 -+ break;
649 -+ }
650 -+#endif
651 -+
652 - case OP_ATOMIC_ADD_I4:
653 - CASE_PPC64 (OP_ATOMIC_ADD_I8) {
654 - int location = ins->inst_basereg;
655 -@@ -4453,21 +4469,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
656 - ppc_mr (code, ins->dreg, ppc_r0);
657 - break;
658 - }
659 --#else
660 -- case OP_ICONV_TO_R4:
661 -- case OP_ICONV_TO_R8: {
662 -- if (cpu_hw_caps & PPC_ISA_64) {
663 -- ppc_srawi(code, ppc_r0, ins->sreg1, 31);
664 -- ppc_stw (code, ppc_r0, -8, ppc_r1);
665 -- ppc_stw (code, ins->sreg1, -4, ppc_r1);
666 -- ppc_lfd (code, ins->dreg, -8, ppc_r1);
667 -- ppc_fcfid (code, ins->dreg, ins->dreg);
668 -- if (ins->opcode == OP_ICONV_TO_R4)
669 -- ppc_frsp (code, ins->dreg, ins->dreg);
670 -- }
671 -- break;
672 -- }
673 --#endif
674 - case OP_ATOMIC_CAS_I4:
675 - CASE_PPC64 (OP_ATOMIC_CAS_I8) {
676 - int location = ins->sreg1;
677
678 diff --git a/dev-lang/mono/files/systemweb3.patch b/dev-lang/mono/files/systemweb3.patch
679 deleted file mode 100644
680 index 5ccb63a..00000000
681 --- a/dev-lang/mono/files/systemweb3.patch
682 +++ /dev/null
683 @@ -1,22 +0,0 @@
684 ---- a/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs 2015-05-08 18:00:15.000000000 +0300
685 -+++ b/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs 2015-07-20 14:13:09.215784924 +0300
686 -@@ -41,5 +41,19 @@
687 - {
688 - public abstract RouteData GetRouteData (HttpContextBase httpContext);
689 - public abstract VirtualPathData GetVirtualPath (RequestContext requestContext, RouteValueDictionary values);
690 -+
691 -+ // Default needs to be true to avoid breaking change
692 -+ private bool _routeExistingFiles = true;
693 -+ public bool RouteExistingFiles
694 -+ {
695 -+ get
696 -+ {
697 -+ return _routeExistingFiles;
698 -+ }
699 -+ set
700 -+ {
701 -+ _routeExistingFiles = value;
702 -+ }
703 -+ }
704 - }
705 - }
706
707 diff --git a/dev-lang/mono/mono-3.12.1.ebuild b/dev-lang/mono/mono-3.12.1.ebuild
708 deleted file mode 100644
709 index 9560282..00000000
710 --- a/dev-lang/mono/mono-3.12.1.ebuild
711 +++ /dev/null
712 @@ -1,128 +0,0 @@
713 -# Copyright 1999-2015 Gentoo Foundation
714 -# Distributed under the terms of the GNU General Public License v2
715 -# $Id$
716 -
717 -EAPI="5"
718 -AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
719 -
720 -inherit eutils linux-info mono-env flag-o-matic pax-utils autotools-utils
721 -
722 -DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
723 -HOMEPAGE="http://www.mono-project.com/Main_Page"
724 -SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
725 -
726 -LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
727 -SLOT="0"
728 -
729 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
730 -
731 -IUSE="nls minimal pax_kernel xen doc debug"
732 -
733 -COMMONDEPEND="
734 - !minimal? ( >=dev-dotnet/libgdiplus-2.10 )
735 - ia64? ( sys-libs/libunwind )
736 - nls? ( sys-devel/gettext )
737 -"
738 -RDEPEND="${COMMONDEPEND}
739 - || ( www-client/links www-client/lynx )
740 -"
741 -DEPEND="${COMMONDEPEND}
742 - sys-devel/bc
743 - virtual/yacc
744 - pax_kernel? ( sys-apps/elfix )
745 -"
746 -
747 -pkg_pretend() {
748 - # If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling.
749 - # See https://bugs.gentoo.org/261869 for more info."
750 - CONFIG_CHECK="SYSVIPC"
751 - use kernel_linux && check_extra_config
752 -}
753 -
754 -pkg_setup() {
755 - linux-info_pkg_setup
756 - mono-env_pkg_setup
757 -}
758 -
759 -src_prepare() {
760 - # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
761 - # get killed in the build proces when MPROTECT is enable. #286280
762 - # RANDMMAP kill the build proces to #347365
763 - # use paxmark.sh to get PT/XT logic #532244
764 - if use pax_kernel ; then
765 - ewarn "We are disabling MPROTECT on the mono binary."
766 -
767 - # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
768 - sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
769 - fi
770 -
771 - # mono build system can fail otherwise
772 - strip-flags
773 -
774 - # Remove this at your own peril. Mono will barf in unexpected ways.
775 - append-flags -fno-strict-aliasing
776 -
777 - autotools-utils_src_prepare
778 -}
779 -
780 -src_configure() {
781 - # NOTE: We need the static libs for now so mono-debugger works.
782 - # See https://bugs.gentoo.org/show_bug.cgi?id=256264 for details
783 - #
784 - # --without-moonlight since www-plugins/moonlight is not the only one
785 - # using mono: https://bugzilla.novell.com/show_bug.cgi?id=641005#c3
786 - #
787 - # --with-profile4 needs to be always enabled since it's used by default
788 - # and, otherwise, problems like bug #340641 appear.
789 - #
790 - # sgen fails on ppc, bug #359515
791 - local myeconfargs=(
792 - --enable-system-aot=yes
793 - --enable-static
794 - --disable-quiet-build
795 - --without-moonlight
796 - --with-libgdiplus=$(usex minimal no installed)
797 - $(use_with xen xen_opt)
798 - --without-ikvm-native
799 - --with-jit
800 - --disable-dtrace
801 - --with-profile4
802 - --with-sgen=$(usex ppc no yes)
803 - $(use_with doc mcs-docs)
804 - $(use_enable debug)
805 - $(use_enable nls)
806 - )
807 -
808 - autotools-utils_src_configure
809 -
810 - # FIX for uncompilable 3.4.0 sources
811 - FF="${WORKDIR}/mono-3.4.0/mcs/tools/xbuild/targets/Microsoft.Portable.Common.targets"
812 - rm -f $FF
813 - touch $FF
814 - echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' >> $FF
815 - echo ' <Import Project="..\\Microsoft.Portable.Core.props" />' >> $FF
816 - echo ' <Import Project="..\\Microsoft.Portable.Core.targets" />' >> $FF
817 - echo '</Project>' >> $FF
818 -}
819 -
820 -src_compile() {
821 - nonfatal autotools-utils_src_compile || {
822 - eqawarn "maintainer of this ebuild has no idea why it fails. If you happen to know how to fix it - please let me know"
823 - autotools-utils_src_compile
824 - }
825 -}
826 -
827 -src_test() {
828 - cd mcs/tests || die
829 - emake check
830 -}
831 -
832 -src_install() {
833 - autotools-utils_src_install
834 -
835 - # Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
836 - # mono.spec and http://www.mail-archive.com/mono-devel-list@××××××××××××.com/msg24870.html
837 - # for reference.
838 - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
839 - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
840 -}
841
842 diff --git a/dev-lang/mono/mono-4.0.5.1.ebuild b/dev-lang/mono/mono-4.0.5.1.ebuild
843 deleted file mode 100644
844 index 2675538..00000000
845 --- a/dev-lang/mono/mono-4.0.5.1.ebuild
846 +++ /dev/null
847 @@ -1,118 +0,0 @@
848 -# Copyright 1999-2015 Gentoo Foundation
849 -# Distributed under the terms of the GNU General Public License v2
850 -# $Id$
851 -
852 -EAPI=5
853 -AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
854 -AUTOTOOLS_AUTORECONF=1
855 -
856 -inherit eutils linux-info mono-env flag-o-matic pax-utils autotools-utils versionator
857 -
858 -DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
859 -HOMEPAGE="http://www.mono-project.com/Main_Page"
860 -SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
861 -
862 -LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
863 -SLOT="0"
864 -
865 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
866 -
867 -IUSE="nls minimal pax_kernel xen doc"
868 -
869 -COMMONDEPEND="
870 - !minimal? ( >=dev-dotnet/libgdiplus-2.10 )
871 - ia64? ( sys-libs/libunwind )
872 - nls? ( sys-devel/gettext )
873 -"
874 -RDEPEND="${COMMONDEPEND}
875 - || ( www-client/links www-client/lynx )
876 -"
877 -DEPEND="${COMMONDEPEND}
878 - sys-devel/bc
879 - virtual/yacc
880 - pax_kernel? ( sys-apps/elfix )
881 - !dev-lang/mono-basic
882 -"
883 -
884 -MAKEOPTS="${MAKEOPTS} -j1" #nowarn
885 -S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
886 -
887 -pkg_pretend() {
888 - # If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling.
889 - # See https://bugs.gentoo.org/261869 for more info."
890 - CONFIG_CHECK="SYSVIPC"
891 - use kernel_linux && check_extra_config
892 -}
893 -
894 -pkg_setup() {
895 - linux-info_pkg_setup
896 - mono-env_pkg_setup
897 -}
898 -
899 -src_prepare() {
900 - # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
901 - # get killed in the build proces when MPROTECT is enable. #286280
902 - # RANDMMAP kill the build proces to #347365
903 - # use paxmark.sh to get PT/XT logic #532244
904 - if use pax_kernel ; then
905 - ewarn "We are disabling MPROTECT on the mono binary."
906 -
907 - # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
908 - sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
909 - fi
910 -
911 - # mono build system can fail otherwise
912 - strip-flags
913 -
914 - # Fix VB targets
915 - # http://osdir.com/ml/general/2015-05/msg20808.html
916 - epatch "${FILESDIR}/add_missing_vb_portable_targets.patch"
917 -
918 - # Fix build on big-endian machines
919 - # https://bugzilla.xamarin.com/show_bug.cgi?id=31779
920 - epatch "${FILESDIR}/${PN}-4.0.2.5-fix-decimal-ms-on-big-endian.patch"
921 -
922 - # Fix build when sgen disabled
923 - # https://bugzilla.xamarin.com/show_bug.cgi?id=32015
924 - epatch "${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch"
925 -
926 - # Fix atomic_add_i4 support for 32-bit ppc
927 - # https://github.com/mono/mono/compare/f967c79926900343f399c75624deedaba460e544^...8f379f0c8f98493180b508b9e68b9aa76c0c5bdf
928 - epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch"
929 -
930 - autotools-utils_src_prepare
931 -
932 - epatch "${FILESDIR}/systemweb3.patch"
933 -}
934 -
935 -src_configure() {
936 - local myeconfargs=(
937 - --disable-silent-rules
938 - $(use_with xen xen_opt)
939 - --without-ikvm-native
940 - --disable-dtrace
941 - $(use_with doc mcs-docs)
942 - $(use_enable nls)
943 - )
944 -
945 - autotools-utils_src_configure
946 -}
947 -
948 -src_compile() {
949 - autotools-utils_src_compile
950 -}
951 -
952 -src_test() {
953 - cd mcs/tests || die
954 - emake check
955 -}
956 -
957 -src_install() {
958 - autotools-utils_src_install
959 -
960 - # Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
961 - # mono.spec and http://www.mail-archive.com/mono-devel-list@××××××××××××.com/msg24870.html
962 - # for reference.
963 - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
964 - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
965 -}
966
967 diff --git a/dev-lang/mono/mono-4.4.0.148.ebuild b/dev-lang/mono/mono-4.4.0.148.ebuild
968 deleted file mode 100644
969 index be546cf..00000000
970 --- a/dev-lang/mono/mono-4.4.0.148.ebuild
971 +++ /dev/null
972 @@ -1,120 +0,0 @@
973 -# Copyright 1999-2016 Gentoo Foundation
974 -# Distributed under the terms of the GNU General Public License v2
975 -# $Id$
976 -
977 -EAPI=6
978 -AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
979 -AUTOTOOLS_AUTORECONF=1
980 -
981 -inherit eutils linux-info mono-env flag-o-matic pax-utils versionator
982 -
983 -DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
984 -HOMEPAGE="http://www.mono-project.com/Main_Page"
985 -SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
986 -
987 -LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
988 -SLOT="0"
989 -
990 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
991 -
992 -IUSE="nls minimal pax_kernel xen doc"
993 -
994 -COMMONDEPEND="
995 - !minimal? ( >=dev-dotnet/libgdiplus-2.10 )
996 - ia64? ( sys-libs/libunwind )
997 - nls? ( sys-devel/gettext )
998 -"
999 -RDEPEND="${COMMONDEPEND}
1000 - || ( www-client/links www-client/lynx )
1001 -"
1002 -DEPEND="${COMMONDEPEND}
1003 - sys-devel/bc
1004 - virtual/yacc
1005 - pax_kernel? ( sys-apps/elfix )
1006 - !dev-lang/mono-basic
1007 -"
1008 -
1009 -MAKEOPTS="${MAKEOPTS} -j1" #nowarn
1010 -S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
1011 -
1012 -pkg_pretend() {
1013 - # https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686
1014 - # If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling.
1015 - # See http://bugs.gentoo.org/261869 for more info."
1016 - CONFIG_CHECK="SYSVIPC"
1017 - use kernel_linux && check_extra_config
1018 -}
1019 -
1020 -pkg_setup() {
1021 - linux-info_pkg_setup
1022 - mono-env_pkg_setup
1023 -}
1024 -
1025 -src_prepare() {
1026 - # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
1027 - # get killed in the build proces when MPROTECT is enable. #286280
1028 - # RANDMMAP kill the build proces to #347365
1029 - # use paxmark.sh to get PT/XT logic #532244
1030 - if use pax_kernel ; then
1031 - ewarn "We are disabling MPROTECT on the mono binary."
1032 -
1033 - # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
1034 - sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
1035 - fi
1036 -
1037 - # mono build system can fail otherwise
1038 - strip-flags
1039 -
1040 - # Fix VB targets
1041 - # http://osdir.com/ml/general/2015-05/msg20808.html
1042 - #eapply "${FILESDIR}/add_missing_vb_portable_targets.patch"
1043 -
1044 - # Fix build when sgen disabled
1045 - # https://bugzilla.xamarin.com/show_bug.cgi?id=32015
1046 - #eapply "${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch"
1047 -
1048 - # TODO: update patch
1049 - # Fix atomic_add_i4 support for 32-bit ppc
1050 - # https://github.com/mono/mono/compare/f967c79926900343f399c75624deedaba460e544^...8f379f0c8f98493180b508b9e68b9aa76c0c5bdf
1051 - #epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch"
1052 -
1053 - # TODO: update patch
1054 - #epatch "${FILESDIR}/systemweb3.patch"
1055 - #epatch "${FILESDIR}/fix-for-GitExtensions-issue-2710-another-resolution.patch"
1056 - #epatch "${FILESDIR}/fix-for-bug36724.patch"
1057 -
1058 - default_src_prepare
1059 - #eapply_user
1060 -}
1061 -
1062 -src_configure() {
1063 - local myeconfargs=(
1064 - --disable-silent-rules
1065 - $(use_with xen xen_opt)
1066 - --without-ikvm-native
1067 - --disable-dtrace
1068 - $(use_with doc mcs-docs)
1069 - $(use_enable nls)
1070 - )
1071 -
1072 - default_src_configure
1073 -}
1074 -
1075 -src_compile() {
1076 - default_src_compile
1077 -}
1078 -
1079 -src_test() {
1080 - cd mcs/tests || die
1081 - emake check
1082 -}
1083 -
1084 -src_install() {
1085 - default_src_install
1086 -
1087 - # Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
1088 - # mono.spec and http://www.mail-archive.com/mono-devel-list@××××××××××××.com/msg24870.html
1089 - # for reference.
1090 - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
1091 - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
1092 -}