commit: 65f48f32482766b4c7db9c87ea061b57ea827ffb Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sun Oct 9 08:57:52 2016 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sun Oct 9 09:04:03 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f48f32
dev-lang/mono: drop old Package-Manager: portage-2.3.1 dev-lang/mono/Manifest | 3 - .../files/add_missing_vb_portable_targets.patch | 20 ---- .../files/add_missing_vb_portable_targets.patch | 20 ---- ...tExtensions-issue-2710-another-resolution.patch | 48 -------- .../files/fix-for-GitExtensions-issue-2710.patch | 28 ----- dev-lang/mono/files/files/fix-for-bug36724.patch | 13 --- .../mono/files/files/mono-3.2.1-mdoc-fix.patch | 12 -- ...mono-4.0.2.5-fix-decimal-ms-on-big-endian.patch | 22 ---- ...ix-mono-dis-makefile-am-when-without-sgen.patch | 15 --- .../files/mono-4.0.2.5-fix-ppc-atomic-add-i4.patch | 79 ------------- dev-lang/mono/files/files/systemweb3.patch | 22 ---- ...tExtensions-issue-2710-another-resolution.patch | 48 -------- .../files/fix-for-GitExtensions-issue-2710.patch | 28 ----- dev-lang/mono/files/fix-for-bug36724.patch | 13 --- dev-lang/mono/files/mono-3.2.1-mdoc-fix.patch | 12 -- .../files/mono-3.2.8-disable-missing-test.patch | 7 -- ...mono-4.0.2.5-fix-decimal-ms-on-big-endian.patch | 22 ---- ...ix-mono-dis-makefile-am-when-without-sgen.patch | 15 --- .../files/mono-4.0.2.5-fix-ppc-atomic-add-i4.patch | 79 ------------- dev-lang/mono/files/systemweb3.patch | 22 ---- dev-lang/mono/mono-3.12.1.ebuild | 128 --------------------- dev-lang/mono/mono-4.0.5.1.ebuild | 118 ------------------- dev-lang/mono/mono-4.4.0.148.ebuild | 120 ------------------- 23 files changed, 894 deletions(-) diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest index b28eb79..3b5f7cf 100644 --- a/dev-lang/mono/Manifest +++ b/dev-lang/mono/Manifest @@ -1,6 +1,3 @@ DIST mono-2.10.9.tar.bz2 34038017 SHA256 541038cd4edd4a1c485638d49697d45015ef7483bcb21bb6165e4d7eb770c9a5 SHA512 426881873e7f9aaf01e1306bed7b3ac220082ca40dce91fa4f4f331944e8d91453b3cdcc4918882ab039ed694ae8819eeb787edf6a2ad42cc661614076725c01 WHIRLPOOL 93f54fbbf032fb60467fd4317630588d349c3dfb50158bad478bd3e2650fd3e8f12d45be372873b57626d4ac48f798646c3650590bbf731dc2f005ee618b8548 -DIST mono-3.12.1.tar.bz2 73487974 SHA256 5d8cf153af2948c06bc9fbf5088f6834868e4db8e5f41c7cff76da173732b60d SHA512 7ff87d95c347186347dc7a9ffb767112717de2b808f8f1b612c56c9eb70fdcc0c8f586989be44444509a2768e71854d8195567196c992cc2c5b184ecbe5ac190 WHIRLPOOL fe3a6cdb8bf4602ad1d1e43099b2a552005c315a232a7d2bddf0081a68e882228712af5301f18d3a890f454041c4a34d6f0926aaba34401ecfa702eecd9415c8 -DIST mono-4.0.5.1.tar.bz2 96533206 SHA256 c2f42944dded3196c6449f90e79990f1951070a361a0dcc2350fc56e945bc229 SHA512 c0783f7b2e344ca00ea354d2723821636a2594345f7e1fd93bf84e9ba1b5501848d4f49b1538279aac9f6f333d296394322e08a9749fe2208340104aa594cd09 WHIRLPOOL ae9b0758c019003fc9ecdbd051974d547c59c24a4505e71c1fc7db8095bc98cdb486405e2ba1794bfb34ecc6bebeb8b5165a97ba8f596897887eb7f2da806b89 -DIST mono-4.4.0.148.tar.bz2 84897767 SHA256 38ad527608c26b2637472602d91d6af203dc4202be915e583fdc9e3a9252a5f3 SHA512 c1e0a7d589cc181fcfe36006879362ad0f5fca0d903fef723f7c4ed68dbd1eb2a7526b2e44c23f2b4c7b1cbcadeae6c7b004aab0643f09dc32640776892c3a22 WHIRLPOOL 9ada86d6026c0a139929a41b11e8849b7545f44be93ffa9c316a2877927d1883419bfb7f3aeb3b1dc593d6f9c0fe6e154e7e30285e70d25c75990c31ec704c85 DIST mono-4.4.1.0.tar.bz2 85897587 SHA256 165e7686b5cbb1ab671b4cb2069207999c3d70044002190b6ec84bb1fdf62b4a SHA512 d9b6c57c2d9327ea551083b81a2e6cc222ded9a04862056b0dfded1c5df56efbfc4960097df034595012231fe50d172174ab7b3e3f2d8c4c6953ab2106b1cb6a WHIRLPOOL 99f16622c6d1902a7efff41d55d114ed214979c1d902a5dcbc257c180a1e68ed519beb5383db2358096e3f8425483983565c8f438552de36ffabe4bfad3f5fbd DIST mono-4.6.1.3.tar.bz2 83229465 SHA256 a5d4cec3d4676fcd7bcbc59b5ab12dc9a2481abbd10017a2ed737098a6b2e891 SHA512 b059fb00adbddf676d137c53a22cabdb86cedb829a25c1ed2d5b78bbd4bc38a0d3ec2cbc56cec91578e2e74478770cac147ac2b740531751585d6ed0bbc50e3b WHIRLPOOL ed080322b83549679c9b6fe8bac501df7390690508c32b97be47c1b0e3e020ba117aaad08250255409b0266b7270860acdf969d2342add1a918b38a635da1046 diff --git a/dev-lang/mono/files/add_missing_vb_portable_targets.patch b/dev-lang/mono/files/add_missing_vb_portable_targets.patch deleted file mode 100644 index ece90a5..00000000 --- a/dev-lang/mono/files/add_missing_vb_portable_targets.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets 2015-05-15 15:55:12.074775985 +0100 -@@ -0,0 +1,5 @@ -+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> -+ <Import Project="..\Microsoft.Portable.Core.props" /> -+ <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> -+ <Import Project="..\Microsoft.Portable.Core.targets" /> -+</Project> -Index: mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets 2015-05-15 15:55:19.194775876 +0100 -@@ -0,0 +1,5 @@ -+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> -+ <Import Project="..\Microsoft.Portable.Core.props" /> -+ <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> -+ <Import Project="..\Microsoft.Portable.Core.targets" /> -+</Project> 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 deleted file mode 100644 index ece90a5..00000000 --- a/dev-lang/mono/files/files/add_missing_vb_portable_targets.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets 2015-05-15 15:55:12.074775985 +0100 -@@ -0,0 +1,5 @@ -+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> -+ <Import Project="..\Microsoft.Portable.Core.props" /> -+ <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> -+ <Import Project="..\Microsoft.Portable.Core.targets" /> -+</Project> -Index: mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets 2015-05-15 15:55:19.194775876 +0100 -@@ -0,0 +1,5 @@ -+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> -+ <Import Project="..\Microsoft.Portable.Core.props" /> -+ <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> -+ <Import Project="..\Microsoft.Portable.Core.targets" /> -+</Project> 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 deleted file mode 100644 index b306b69..00000000 --- a/dev-lang/mono/files/files/fix-for-GitExtensions-issue-2710-another-resolution.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs -index 4b69010..1bb6195 100644 ---- a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs -+++ b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs -@@ -578,6 +578,34 @@ namespace System.Configuration - private ExeConfigurationFileMap exeMapPrev = null; - private SettingsPropertyValueCollection values = null; - -+ /// <remarks> -+ /// Hack to remove the XmlDeclaration that the XmlSerializer adds. -+ /// <br /> -+ /// see <a href="https://github.com/mono/mono/pull/2273";>Issue 2273</a> for details -+ /// </remarks> -+ private string StripXmlHeader(string serializedValue) -+ { -+ if (serializedValue == null) -+ { -+ return string.Empty; -+ } -+ -+ XmlDocument doc = new XmlDocument(); -+ XmlElement valueXml = doc.CreateElement("value"); -+ valueXml.InnerXml = serializedValue; -+ -+ foreach (XmlNode child in valueXml.ChildNodes) { -+ if (child.NodeType == XmlNodeType.XmlDeclaration) { -+ valueXml.RemoveChild(child); -+ break; -+ } -+ } -+ -+ // InnerXml will give you well-formed XML that you could save as a separate document, and -+ // InnerText will immediately give you a pure-text representation of this inner XML. -+ return valueXml.InnerXml; -+ } -+ - private void SaveProperties (ExeConfigurationFileMap exeMap, SettingsPropertyValueCollection collection, ConfigurationUserLevel level, SettingsContext context, bool checkUserLevel) - { - Configuration config = ConfigurationManager.OpenMappedExeConfiguration (exeMap, level); -@@ -623,7 +651,7 @@ namespace System.Configuration - element.Value.ValueXml = new XmlDocument ().CreateElement ("value"); - switch (value.Property.SerializeAs) { - case SettingsSerializeAs.Xml: -- element.Value.ValueXml.InnerXml = (value.SerializedValue as string) ?? string.Empty; -+ element.Value.ValueXml.InnerXml = StripXmlHeader(value.SerializedValue as string); - break; - case SettingsSerializeAs.String: - element.Value.ValueXml.InnerText = value.SerializedValue as string; 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 deleted file mode 100644 index 3d60923..00000000 --- a/dev-lang/mono/files/files/fix-for-GitExtensions-issue-2710.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/mcs/class/System/System.Configuration/SettingsPropertyValue.cs b/mcs/class/System/System.Configuration/SettingsPropertyValue.cs -index 9bf62c0..9f026461 100644 ---- a/mcs/class/System/System.Configuration/SettingsPropertyValue.cs -+++ b/mcs/class/System/System.Configuration/SettingsPropertyValue.cs -@@ -118,11 +118,18 @@ namespace System.Configuration - #if (XML_DEP) - case SettingsSerializeAs.Xml: - if (propertyValue != null) { -- XmlSerializer serializer = new XmlSerializer (propertyValue.GetType ()); -- StringWriter w = new StringWriter(CultureInfo.InvariantCulture); -- -- serializer.Serialize (w, propertyValue); -- serializedValue = w.ToString(); -+ using (StringWriter w = new StringWriter(CultureInfo.InvariantCulture)) -+ { -+ var xmlSettings = new XmlWriterSettings(); -+ xmlSettings.OmitXmlDeclaration = true; -+ using (var writer = XmlWriter.Create(w, xmlSettings)) -+ { -+ XmlSerializer serializer = new XmlSerializer(propertyValue.GetType ()); -+ var emptyNamespaces = new XmlSerializerNamespaces(new[] { XmlQualifiedName.Empty }); -+ serializer.Serialize(writer, propertyValue, emptyNamespaces); -+ } // writer.Flush happens here -+ serializedValue = w.ToString(); -+ } - } - else - serializedValue = null; diff --git a/dev-lang/mono/files/files/fix-for-bug36724.patch b/dev-lang/mono/files/files/fix-for-bug36724.patch deleted file mode 100644 index 187b4ba..00000000 --- a/dev-lang/mono/files/files/fix-for-bug36724.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/mcs/class/System.Web/System.Web.Util/UrlUtils.cs b/mcs/class/System.Web/System.Web.Util/UrlUtils.cs -index 4f07e83..e229a91 100644 ---- a/mcs/class/System.Web/System.Web.Util/UrlUtils.cs -+++ b/mcs/class/System.Web/System.Web.Util/UrlUtils.cs -@@ -54,7 +54,7 @@ namespace System.Web.Util { - if (path.StartsWith (appvpath)) - path = path.Substring (appvpath.Length); - -- if (path [0] == '/') -+ if (path.StartsWith("/")) - path = path.Length > 1 ? path.Substring (1) : ""; - - return Canonic (appvpath + "(" + id + ")/" + path); 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 deleted file mode 100644 index b8fcea9..00000000 --- a/dev-lang/mono/files/files/mono-3.2.1-mdoc-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 ---- mono-3.2.1.orig/mcs/tools/mdoc/Resources/monodoc-ecma.xsd 2013-08-26 09:33:59.410610438 +0200 -+++ mono-3.2.1/mcs/tools/mdoc/Resources/monodoc-ecma.xsd 2013-08-26 09:34:54.057804438 +0200 -@@ -351,7 +351,7 @@ - <xs:element name="format"> - <xs:complexType> - <xs:sequence> -- <xs:any minOccurs="0" processContents="lax" /> -+ <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" /> - </xs:sequence> - <xs:attribute ref="type" /> - </xs:complexType> 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 deleted file mode 100644 index c6349fe..00000000 --- a/dev-lang/mono/files/files/mono-4.0.2.5-fix-decimal-ms-on-big-endian.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up mono/metadata/decimal-ms.c.than -mono/metadata/decimal-ms.c ---- mono/metadata/decimal-ms.c.than 2015-07-06 08:21:27.524461795 --0400 -+++ mono/metadata/decimal-ms.c 2015-07-06 08:30:26.954461795 --0400 -@@ -55,8 +55,13 @@ static const uint32_t ten_to_ten_div_4 = - #define DECIMAL_LO32(dec) ((dec).v.v.Lo32) - #define DECIMAL_MID32(dec) ((dec).v.v.Mid32) - #define DECIMAL_HI32(dec) ((dec).Hi32) --#define DECIMAL_LO64_GET(dec) ((dec).v.Lo64) --#define DECIMAL_LO64_SET(dec,value) {(dec).v.Lo64 = value; } -+#if G_BYTE_ORDER != G_LITTLE_ENDIAN -+# define DECIMAL_LO64_GET(dec) (((uint64_t)((dec).v.v.Mid32) << 32) | (dec).v.v.Lo32) -+# define DECIMAL_LO64_SET(dec,value) {(dec).v.v.Lo32 = (value); (dec).v.v.Mid32 = ((value) >> 32); } -+#else -+# define DECIMAL_LO64_GET(dec) ((dec).v.Lo64) -+# define DECIMAL_LO64_SET(dec,value) {(dec).v.Lo64 = value; } -+#endif - - #define DECIMAL_SETZERO(dec) {DECIMAL_LO32(dec) = 0; DECIMAL_MID32(dec) = 0; DECIMAL_HI32(dec) = 0; DECIMAL_SIGNSCALE(dec) = 0;} - #define COPYDEC(dest, src) {DECIMAL_SIGNSCALE(dest) = DECIMAL_SIGNSCALE(src); DECIMAL_HI32(dest) = DECIMAL_HI32(src); \ 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 deleted file mode 100644 index bbf4c6f..00000000 --- a/dev-lang/mono/files/files/mono-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch +++ /dev/null @@ -1,15 +0,0 @@ -=================================================================== -RCS file: mono/dis/RCS/Makefile.am,v -retrieving revision 1.1 -diff -up -r1.1 mono/dis/Makefile.am ---- mono/dis/Makefile.am 2015/05/08 15:00:22 1.1 -+++ mono/dis/Makefile.am 2015/07/14 11:20:29 -@@ -7,7 +7,7 @@ endif - if SUPPORT_SGEN - metadata_lib=$(top_builddir)/mono/metadata/libmonoruntimesgen-static.la - else --metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.a -+metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.la - gc_lib=$(LIBGC_STATIC_LIBS) - endif - 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 deleted file mode 100644 index fd5de72..00000000 --- a/dev-lang/mono/files/files/mono-4.0.2.5-fix-ppc-atomic-add-i4.patch +++ /dev/null @@ -1,79 +0,0 @@ -From f967c79926900343f399c75624deedaba460e544 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <ale...@xamarin.com> -Date: Mon, 3 Aug 2015 17:32:07 +0200 -Subject: [PATCH 1/2] [ppc] Instruction length of atomic_add_i4 is 28. - ---- - mono/mini/cpu-ppc.md | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mono/mini/cpu-ppc.md b/mono/mini/cpu-ppc.md -index ba2ec60..e6baf91 100644 ---- a/mono/mini/cpu-ppc.md -+++ b/mono/mini/cpu-ppc.md -@@ -314,5 +314,5 @@ vcall2_membase: src1:b len:16 clob:c - - jump_table: dest:i len:8 - --atomic_add_i4: src1:b src2:i dest:i len:20 -+atomic_add_i4: src1:b src2:i dest:i len:28 - atomic_cas_i4: src1:b src2:i src3:i dest:i len:38 - -From 8f379f0c8f98493180b508b9e68b9aa76c0c5bdf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <ale...@xamarin.com> -Date: Mon, 3 Aug 2015 17:32:31 +0200 -Subject: [PATCH 2/2] [ppc] Fix atomic_add_i4 support for 32-bit PPC. - ---- - mono/mini/mini-ppc.c | 31 ++++++++++++++++--------------- - 1 file changed, 16 insertions(+), 15 deletions(-) - -diff --git a/mono/mini/mini-ppc.c b/mono/mini/mini-ppc.c -index 758a63f..06528bd 100644 ---- a/mono/mini/mini-ppc.c -+++ b/mono/mini/mini-ppc.c -@@ -4420,6 +4420,22 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb) - else - ppc_mr (code, ins->dreg, ins->sreg1); - break; -+#else -+ case OP_ICONV_TO_R4: -+ case OP_ICONV_TO_R8: { -+ if (cpu_hw_caps & PPC_ISA_64) { -+ ppc_srawi(code, ppc_r0, ins->sreg1, 31); -+ ppc_stw (code, ppc_r0, -8, ppc_r1); -+ ppc_stw (code, ins->sreg1, -4, ppc_r1); -+ ppc_lfd (code, ins->dreg, -8, ppc_r1); -+ ppc_fcfid (code, ins->dreg, ins->dreg); -+ if (ins->opcode == OP_ICONV_TO_R4) -+ ppc_frsp (code, ins->dreg, ins->dreg); -+ } -+ break; -+ } -+#endif -+ - case OP_ATOMIC_ADD_I4: - CASE_PPC64 (OP_ATOMIC_ADD_I8) { - int location = ins->inst_basereg; -@@ -4453,21 +4469,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb) - ppc_mr (code, ins->dreg, ppc_r0); - break; - } --#else -- case OP_ICONV_TO_R4: -- case OP_ICONV_TO_R8: { -- if (cpu_hw_caps & PPC_ISA_64) { -- ppc_srawi(code, ppc_r0, ins->sreg1, 31); -- ppc_stw (code, ppc_r0, -8, ppc_r1); -- ppc_stw (code, ins->sreg1, -4, ppc_r1); -- ppc_lfd (code, ins->dreg, -8, ppc_r1); -- ppc_fcfid (code, ins->dreg, ins->dreg); -- if (ins->opcode == OP_ICONV_TO_R4) -- ppc_frsp (code, ins->dreg, ins->dreg); -- } -- break; -- } --#endif - case OP_ATOMIC_CAS_I4: - CASE_PPC64 (OP_ATOMIC_CAS_I8) { - int location = ins->sreg1; diff --git a/dev-lang/mono/files/files/systemweb3.patch b/dev-lang/mono/files/files/systemweb3.patch deleted file mode 100644 index 5ccb63a..00000000 --- a/dev-lang/mono/files/files/systemweb3.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs 2015-05-08 18:00:15.000000000 +0300 -+++ b/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs 2015-07-20 14:13:09.215784924 +0300 -@@ -41,5 +41,19 @@ - { - public abstract RouteData GetRouteData (HttpContextBase httpContext); - public abstract VirtualPathData GetVirtualPath (RequestContext requestContext, RouteValueDictionary values); -+ -+ // Default needs to be true to avoid breaking change -+ private bool _routeExistingFiles = true; -+ public bool RouteExistingFiles -+ { -+ get -+ { -+ return _routeExistingFiles; -+ } -+ set -+ { -+ _routeExistingFiles = value; -+ } -+ } - } - } 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 deleted file mode 100644 index b306b69..00000000 --- a/dev-lang/mono/files/fix-for-GitExtensions-issue-2710-another-resolution.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs -index 4b69010..1bb6195 100644 ---- a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs -+++ b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs -@@ -578,6 +578,34 @@ namespace System.Configuration - private ExeConfigurationFileMap exeMapPrev = null; - private SettingsPropertyValueCollection values = null; - -+ /// <remarks> -+ /// Hack to remove the XmlDeclaration that the XmlSerializer adds. -+ /// <br /> -+ /// see <a href="https://github.com/mono/mono/pull/2273";>Issue 2273</a> for details -+ /// </remarks> -+ private string StripXmlHeader(string serializedValue) -+ { -+ if (serializedValue == null) -+ { -+ return string.Empty; -+ } -+ -+ XmlDocument doc = new XmlDocument(); -+ XmlElement valueXml = doc.CreateElement("value"); -+ valueXml.InnerXml = serializedValue; -+ -+ foreach (XmlNode child in valueXml.ChildNodes) { -+ if (child.NodeType == XmlNodeType.XmlDeclaration) { -+ valueXml.RemoveChild(child); -+ break; -+ } -+ } -+ -+ // InnerXml will give you well-formed XML that you could save as a separate document, and -+ // InnerText will immediately give you a pure-text representation of this inner XML. -+ return valueXml.InnerXml; -+ } -+ - private void SaveProperties (ExeConfigurationFileMap exeMap, SettingsPropertyValueCollection collection, ConfigurationUserLevel level, SettingsContext context, bool checkUserLevel) - { - Configuration config = ConfigurationManager.OpenMappedExeConfiguration (exeMap, level); -@@ -623,7 +651,7 @@ namespace System.Configuration - element.Value.ValueXml = new XmlDocument ().CreateElement ("value"); - switch (value.Property.SerializeAs) { - case SettingsSerializeAs.Xml: -- element.Value.ValueXml.InnerXml = (value.SerializedValue as string) ?? string.Empty; -+ element.Value.ValueXml.InnerXml = StripXmlHeader(value.SerializedValue as string); - break; - case SettingsSerializeAs.String: - element.Value.ValueXml.InnerText = value.SerializedValue as string; diff --git a/dev-lang/mono/files/fix-for-GitExtensions-issue-2710.patch b/dev-lang/mono/files/fix-for-GitExtensions-issue-2710.patch deleted file mode 100644 index 3d60923..00000000 --- a/dev-lang/mono/files/fix-for-GitExtensions-issue-2710.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/mcs/class/System/System.Configuration/SettingsPropertyValue.cs b/mcs/class/System/System.Configuration/SettingsPropertyValue.cs -index 9bf62c0..9f026461 100644 ---- a/mcs/class/System/System.Configuration/SettingsPropertyValue.cs -+++ b/mcs/class/System/System.Configuration/SettingsPropertyValue.cs -@@ -118,11 +118,18 @@ namespace System.Configuration - #if (XML_DEP) - case SettingsSerializeAs.Xml: - if (propertyValue != null) { -- XmlSerializer serializer = new XmlSerializer (propertyValue.GetType ()); -- StringWriter w = new StringWriter(CultureInfo.InvariantCulture); -- -- serializer.Serialize (w, propertyValue); -- serializedValue = w.ToString(); -+ using (StringWriter w = new StringWriter(CultureInfo.InvariantCulture)) -+ { -+ var xmlSettings = new XmlWriterSettings(); -+ xmlSettings.OmitXmlDeclaration = true; -+ using (var writer = XmlWriter.Create(w, xmlSettings)) -+ { -+ XmlSerializer serializer = new XmlSerializer(propertyValue.GetType ()); -+ var emptyNamespaces = new XmlSerializerNamespaces(new[] { XmlQualifiedName.Empty }); -+ serializer.Serialize(writer, propertyValue, emptyNamespaces); -+ } // writer.Flush happens here -+ serializedValue = w.ToString(); -+ } - } - else - serializedValue = null; diff --git a/dev-lang/mono/files/fix-for-bug36724.patch b/dev-lang/mono/files/fix-for-bug36724.patch deleted file mode 100644 index 187b4ba..00000000 --- a/dev-lang/mono/files/fix-for-bug36724.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/mcs/class/System.Web/System.Web.Util/UrlUtils.cs b/mcs/class/System.Web/System.Web.Util/UrlUtils.cs -index 4f07e83..e229a91 100644 ---- a/mcs/class/System.Web/System.Web.Util/UrlUtils.cs -+++ b/mcs/class/System.Web/System.Web.Util/UrlUtils.cs -@@ -54,7 +54,7 @@ namespace System.Web.Util { - if (path.StartsWith (appvpath)) - path = path.Substring (appvpath.Length); - -- if (path [0] == '/') -+ if (path.StartsWith("/")) - path = path.Length > 1 ? path.Substring (1) : ""; - - return Canonic (appvpath + "(" + id + ")/" + path); 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 deleted file mode 100644 index b8fcea9..00000000 --- a/dev-lang/mono/files/mono-3.2.1-mdoc-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 ---- mono-3.2.1.orig/mcs/tools/mdoc/Resources/monodoc-ecma.xsd 2013-08-26 09:33:59.410610438 +0200 -+++ mono-3.2.1/mcs/tools/mdoc/Resources/monodoc-ecma.xsd 2013-08-26 09:34:54.057804438 +0200 -@@ -351,7 +351,7 @@ - <xs:element name="format"> - <xs:complexType> - <xs:sequence> -- <xs:any minOccurs="0" processContents="lax" /> -+ <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" /> - </xs:sequence> - <xs:attribute ref="type" /> - </xs:complexType> 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 deleted file mode 100644 index 79c2674..00000000 --- a/dev-lang/mono/files/mono-3.2.8-disable-missing-test.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/mcs/tests/Makefile -+++ b/mcs/tests/Makefile -@@ -96,4 +96,3 @@ - setup: - $(CSCOMPILE) -t:library dlls/test-679-2/test-679-lib-2.cs - $(CSCOMPILE) -t:library dlls/test-679-1/test-679-lib.cs -r:dlls/test-679-2/test-679-lib-2.dll -- $(ILASM) -dll dlls/test-883.il 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 deleted file mode 100644 index c6349fe..00000000 --- a/dev-lang/mono/files/mono-4.0.2.5-fix-decimal-ms-on-big-endian.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up mono/metadata/decimal-ms.c.than -mono/metadata/decimal-ms.c ---- mono/metadata/decimal-ms.c.than 2015-07-06 08:21:27.524461795 --0400 -+++ mono/metadata/decimal-ms.c 2015-07-06 08:30:26.954461795 --0400 -@@ -55,8 +55,13 @@ static const uint32_t ten_to_ten_div_4 = - #define DECIMAL_LO32(dec) ((dec).v.v.Lo32) - #define DECIMAL_MID32(dec) ((dec).v.v.Mid32) - #define DECIMAL_HI32(dec) ((dec).Hi32) --#define DECIMAL_LO64_GET(dec) ((dec).v.Lo64) --#define DECIMAL_LO64_SET(dec,value) {(dec).v.Lo64 = value; } -+#if G_BYTE_ORDER != G_LITTLE_ENDIAN -+# define DECIMAL_LO64_GET(dec) (((uint64_t)((dec).v.v.Mid32) << 32) | (dec).v.v.Lo32) -+# define DECIMAL_LO64_SET(dec,value) {(dec).v.v.Lo32 = (value); (dec).v.v.Mid32 = ((value) >> 32); } -+#else -+# define DECIMAL_LO64_GET(dec) ((dec).v.Lo64) -+# define DECIMAL_LO64_SET(dec,value) {(dec).v.Lo64 = value; } -+#endif - - #define DECIMAL_SETZERO(dec) {DECIMAL_LO32(dec) = 0; DECIMAL_MID32(dec) = 0; DECIMAL_HI32(dec) = 0; DECIMAL_SIGNSCALE(dec) = 0;} - #define COPYDEC(dest, src) {DECIMAL_SIGNSCALE(dest) = DECIMAL_SIGNSCALE(src); DECIMAL_HI32(dest) = DECIMAL_HI32(src); \ 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 deleted file mode 100644 index bbf4c6f..00000000 --- a/dev-lang/mono/files/mono-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch +++ /dev/null @@ -1,15 +0,0 @@ -=================================================================== -RCS file: mono/dis/RCS/Makefile.am,v -retrieving revision 1.1 -diff -up -r1.1 mono/dis/Makefile.am ---- mono/dis/Makefile.am 2015/05/08 15:00:22 1.1 -+++ mono/dis/Makefile.am 2015/07/14 11:20:29 -@@ -7,7 +7,7 @@ endif - if SUPPORT_SGEN - metadata_lib=$(top_builddir)/mono/metadata/libmonoruntimesgen-static.la - else --metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.a -+metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.la - gc_lib=$(LIBGC_STATIC_LIBS) - endif - 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 deleted file mode 100644 index fd5de72..00000000 --- a/dev-lang/mono/files/mono-4.0.2.5-fix-ppc-atomic-add-i4.patch +++ /dev/null @@ -1,79 +0,0 @@ -From f967c79926900343f399c75624deedaba460e544 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <ale...@xamarin.com> -Date: Mon, 3 Aug 2015 17:32:07 +0200 -Subject: [PATCH 1/2] [ppc] Instruction length of atomic_add_i4 is 28. - ---- - mono/mini/cpu-ppc.md | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mono/mini/cpu-ppc.md b/mono/mini/cpu-ppc.md -index ba2ec60..e6baf91 100644 ---- a/mono/mini/cpu-ppc.md -+++ b/mono/mini/cpu-ppc.md -@@ -314,5 +314,5 @@ vcall2_membase: src1:b len:16 clob:c - - jump_table: dest:i len:8 - --atomic_add_i4: src1:b src2:i dest:i len:20 -+atomic_add_i4: src1:b src2:i dest:i len:28 - atomic_cas_i4: src1:b src2:i src3:i dest:i len:38 - -From 8f379f0c8f98493180b508b9e68b9aa76c0c5bdf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <ale...@xamarin.com> -Date: Mon, 3 Aug 2015 17:32:31 +0200 -Subject: [PATCH 2/2] [ppc] Fix atomic_add_i4 support for 32-bit PPC. - ---- - mono/mini/mini-ppc.c | 31 ++++++++++++++++--------------- - 1 file changed, 16 insertions(+), 15 deletions(-) - -diff --git a/mono/mini/mini-ppc.c b/mono/mini/mini-ppc.c -index 758a63f..06528bd 100644 ---- a/mono/mini/mini-ppc.c -+++ b/mono/mini/mini-ppc.c -@@ -4420,6 +4420,22 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb) - else - ppc_mr (code, ins->dreg, ins->sreg1); - break; -+#else -+ case OP_ICONV_TO_R4: -+ case OP_ICONV_TO_R8: { -+ if (cpu_hw_caps & PPC_ISA_64) { -+ ppc_srawi(code, ppc_r0, ins->sreg1, 31); -+ ppc_stw (code, ppc_r0, -8, ppc_r1); -+ ppc_stw (code, ins->sreg1, -4, ppc_r1); -+ ppc_lfd (code, ins->dreg, -8, ppc_r1); -+ ppc_fcfid (code, ins->dreg, ins->dreg); -+ if (ins->opcode == OP_ICONV_TO_R4) -+ ppc_frsp (code, ins->dreg, ins->dreg); -+ } -+ break; -+ } -+#endif -+ - case OP_ATOMIC_ADD_I4: - CASE_PPC64 (OP_ATOMIC_ADD_I8) { - int location = ins->inst_basereg; -@@ -4453,21 +4469,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb) - ppc_mr (code, ins->dreg, ppc_r0); - break; - } --#else -- case OP_ICONV_TO_R4: -- case OP_ICONV_TO_R8: { -- if (cpu_hw_caps & PPC_ISA_64) { -- ppc_srawi(code, ppc_r0, ins->sreg1, 31); -- ppc_stw (code, ppc_r0, -8, ppc_r1); -- ppc_stw (code, ins->sreg1, -4, ppc_r1); -- ppc_lfd (code, ins->dreg, -8, ppc_r1); -- ppc_fcfid (code, ins->dreg, ins->dreg); -- if (ins->opcode == OP_ICONV_TO_R4) -- ppc_frsp (code, ins->dreg, ins->dreg); -- } -- break; -- } --#endif - case OP_ATOMIC_CAS_I4: - CASE_PPC64 (OP_ATOMIC_CAS_I8) { - int location = ins->sreg1; diff --git a/dev-lang/mono/files/systemweb3.patch b/dev-lang/mono/files/systemweb3.patch deleted file mode 100644 index 5ccb63a..00000000 --- a/dev-lang/mono/files/systemweb3.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs 2015-05-08 18:00:15.000000000 +0300 -+++ b/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs 2015-07-20 14:13:09.215784924 +0300 -@@ -41,5 +41,19 @@ - { - public abstract RouteData GetRouteData (HttpContextBase httpContext); - public abstract VirtualPathData GetVirtualPath (RequestContext requestContext, RouteValueDictionary values); -+ -+ // Default needs to be true to avoid breaking change -+ private bool _routeExistingFiles = true; -+ public bool RouteExistingFiles -+ { -+ get -+ { -+ return _routeExistingFiles; -+ } -+ set -+ { -+ _routeExistingFiles = value; -+ } -+ } - } - } diff --git a/dev-lang/mono/mono-3.12.1.ebuild b/dev-lang/mono/mono-3.12.1.ebuild deleted file mode 100644 index 9560282..00000000 --- a/dev-lang/mono/mono-3.12.1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -AUTOTOOLS_PRUNE_LIBTOOL_FILES="all" - -inherit eutils linux-info mono-env flag-o-matic pax-utils autotools-utils - -DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter" -HOMEPAGE="http://www.mono-project.com/Main_Page"; -SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"; - -LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL" -SLOT="0" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux" - -IUSE="nls minimal pax_kernel xen doc debug" - -COMMONDEPEND=" - !minimal? ( >=dev-dotnet/libgdiplus-2.10 ) - ia64? ( sys-libs/libunwind ) - nls? ( sys-devel/gettext ) -" -RDEPEND="${COMMONDEPEND} - || ( www-client/links www-client/lynx ) -" -DEPEND="${COMMONDEPEND} - sys-devel/bc - virtual/yacc - pax_kernel? ( sys-apps/elfix ) -" - -pkg_pretend() { - # If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling. - # See https://bugs.gentoo.org/261869 for more info." - CONFIG_CHECK="SYSVIPC" - use kernel_linux && check_extra_config -} - -pkg_setup() { - linux-info_pkg_setup - mono-env_pkg_setup -} - -src_prepare() { - # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't - # get killed in the build proces when MPROTECT is enable. #286280 - # RANDMMAP kill the build proces to #347365 - # use paxmark.sh to get PT/XT logic #532244 - if use pax_kernel ; then - ewarn "We are disabling MPROTECT on the mono binary." - - # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9 - sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in" - fi - - # mono build system can fail otherwise - strip-flags - - # Remove this at your own peril. Mono will barf in unexpected ways. - append-flags -fno-strict-aliasing - - autotools-utils_src_prepare -} - -src_configure() { - # NOTE: We need the static libs for now so mono-debugger works. - # See https://bugs.gentoo.org/show_bug.cgi?id=256264 for details - # - # --without-moonlight since www-plugins/moonlight is not the only one - # using mono: https://bugzilla.novell.com/show_bug.cgi?id=641005#c3 - # - # --with-profile4 needs to be always enabled since it's used by default - # and, otherwise, problems like bug #340641 appear. - # - # sgen fails on ppc, bug #359515 - local myeconfargs=( - --enable-system-aot=yes - --enable-static - --disable-quiet-build - --without-moonlight - --with-libgdiplus=$(usex minimal no installed) - $(use_with xen xen_opt) - --without-ikvm-native - --with-jit - --disable-dtrace - --with-profile4 - --with-sgen=$(usex ppc no yes) - $(use_with doc mcs-docs) - $(use_enable debug) - $(use_enable nls) - ) - - autotools-utils_src_configure - - # FIX for uncompilable 3.4.0 sources - FF="${WORKDIR}/mono-3.4.0/mcs/tools/xbuild/targets/Microsoft.Portable.Common.targets" - rm -f $FF - touch $FF - echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>' >> $FF - echo ' <Import Project="..\\Microsoft.Portable.Core.props" />' >> $FF - echo ' <Import Project="..\\Microsoft.Portable.Core.targets" />' >> $FF - echo '</Project>' >> $FF -} - -src_compile() { - nonfatal autotools-utils_src_compile || { - eqawarn "maintainer of this ebuild has no idea why it fails. If you happen to know how to fix it - please let me know" - autotools-utils_src_compile - } -} - -src_test() { - cd mcs/tests || die - emake check -} - -src_install() { - autotools-utils_src_install - - # Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora - # mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html - # for reference. - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die -} diff --git a/dev-lang/mono/mono-4.0.5.1.ebuild b/dev-lang/mono/mono-4.0.5.1.ebuild deleted file mode 100644 index 2675538..00000000 --- a/dev-lang/mono/mono-4.0.5.1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -AUTOTOOLS_PRUNE_LIBTOOL_FILES="all" -AUTOTOOLS_AUTORECONF=1 - -inherit eutils linux-info mono-env flag-o-matic pax-utils autotools-utils versionator - -DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter" -HOMEPAGE="http://www.mono-project.com/Main_Page"; -SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"; - -LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL" -SLOT="0" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux" - -IUSE="nls minimal pax_kernel xen doc" - -COMMONDEPEND=" - !minimal? ( >=dev-dotnet/libgdiplus-2.10 ) - ia64? ( sys-libs/libunwind ) - nls? ( sys-devel/gettext ) -" -RDEPEND="${COMMONDEPEND} - || ( www-client/links www-client/lynx ) -" -DEPEND="${COMMONDEPEND} - sys-devel/bc - virtual/yacc - pax_kernel? ( sys-apps/elfix ) - !dev-lang/mono-basic -" - -MAKEOPTS="${MAKEOPTS} -j1" #nowarn -S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)" - -pkg_pretend() { - # If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling. - # See https://bugs.gentoo.org/261869 for more info." - CONFIG_CHECK="SYSVIPC" - use kernel_linux && check_extra_config -} - -pkg_setup() { - linux-info_pkg_setup - mono-env_pkg_setup -} - -src_prepare() { - # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't - # get killed in the build proces when MPROTECT is enable. #286280 - # RANDMMAP kill the build proces to #347365 - # use paxmark.sh to get PT/XT logic #532244 - if use pax_kernel ; then - ewarn "We are disabling MPROTECT on the mono binary." - - # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9 - sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in" - fi - - # mono build system can fail otherwise - strip-flags - - # Fix VB targets - # http://osdir.com/ml/general/2015-05/msg20808.html - epatch "${FILESDIR}/add_missing_vb_portable_targets.patch" - - # Fix build on big-endian machines - # https://bugzilla.xamarin.com/show_bug.cgi?id=31779 - epatch "${FILESDIR}/${PN}-4.0.2.5-fix-decimal-ms-on-big-endian.patch" - - # Fix build when sgen disabled - # https://bugzilla.xamarin.com/show_bug.cgi?id=32015 - epatch "${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch" - - # Fix atomic_add_i4 support for 32-bit ppc - # https://github.com/mono/mono/compare/f967c79926900343f399c75624deedaba460e544^...8f379f0c8f98493180b508b9e68b9aa76c0c5bdf - epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch" - - autotools-utils_src_prepare - - epatch "${FILESDIR}/systemweb3.patch" -} - -src_configure() { - local myeconfargs=( - --disable-silent-rules - $(use_with xen xen_opt) - --without-ikvm-native - --disable-dtrace - $(use_with doc mcs-docs) - $(use_enable nls) - ) - - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile -} - -src_test() { - cd mcs/tests || die - emake check -} - -src_install() { - autotools-utils_src_install - - # Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora - # mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html - # for reference. - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die -} diff --git a/dev-lang/mono/mono-4.4.0.148.ebuild b/dev-lang/mono/mono-4.4.0.148.ebuild deleted file mode 100644 index be546cf..00000000 --- a/dev-lang/mono/mono-4.4.0.148.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -AUTOTOOLS_PRUNE_LIBTOOL_FILES="all" -AUTOTOOLS_AUTORECONF=1 - -inherit eutils linux-info mono-env flag-o-matic pax-utils versionator - -DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter" -HOMEPAGE="http://www.mono-project.com/Main_Page"; -SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"; - -LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL" -SLOT="0" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux" - -IUSE="nls minimal pax_kernel xen doc" - -COMMONDEPEND=" - !minimal? ( >=dev-dotnet/libgdiplus-2.10 ) - ia64? ( sys-libs/libunwind ) - nls? ( sys-devel/gettext ) -" -RDEPEND="${COMMONDEPEND} - || ( www-client/links www-client/lynx ) -" -DEPEND="${COMMONDEPEND} - sys-devel/bc - virtual/yacc - pax_kernel? ( sys-apps/elfix ) - !dev-lang/mono-basic -" - -MAKEOPTS="${MAKEOPTS} -j1" #nowarn -S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)" - -pkg_pretend() { - # https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686 - # If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling. - # See http://bugs.gentoo.org/261869 for more info." - CONFIG_CHECK="SYSVIPC" - use kernel_linux && check_extra_config -} - -pkg_setup() { - linux-info_pkg_setup - mono-env_pkg_setup -} - -src_prepare() { - # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't - # get killed in the build proces when MPROTECT is enable. #286280 - # RANDMMAP kill the build proces to #347365 - # use paxmark.sh to get PT/XT logic #532244 - if use pax_kernel ; then - ewarn "We are disabling MPROTECT on the mono binary." - - # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9 - sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in" - fi - - # mono build system can fail otherwise - strip-flags - - # Fix VB targets - # http://osdir.com/ml/general/2015-05/msg20808.html - #eapply "${FILESDIR}/add_missing_vb_portable_targets.patch" - - # Fix build when sgen disabled - # https://bugzilla.xamarin.com/show_bug.cgi?id=32015 - #eapply "${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch" - - # TODO: update patch - # Fix atomic_add_i4 support for 32-bit ppc - # https://github.com/mono/mono/compare/f967c79926900343f399c75624deedaba460e544^...8f379f0c8f98493180b508b9e68b9aa76c0c5bdf - #epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch" - - # TODO: update patch - #epatch "${FILESDIR}/systemweb3.patch" - #epatch "${FILESDIR}/fix-for-GitExtensions-issue-2710-another-resolution.patch" - #epatch "${FILESDIR}/fix-for-bug36724.patch" - - default_src_prepare - #eapply_user -} - -src_configure() { - local myeconfargs=( - --disable-silent-rules - $(use_with xen xen_opt) - --without-ikvm-native - --disable-dtrace - $(use_with doc mcs-docs) - $(use_enable nls) - ) - - default_src_configure -} - -src_compile() { - default_src_compile -} - -src_test() { - cd mcs/tests || die - emake check -} - -src_install() { - default_src_install - - # Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora - # mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html - # for reference. - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die -}
