commit: dc98ca586342fa3be88441fb8f3116fe5916305f Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com> AuthorDate: Mon Jul 20 08:56:53 2015 +0000 Commit: Heather Cynede <cynede <AT> gentoo <DOT> org> CommitDate: Mon Jul 20 08:56:53 2015 +0000 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=dc98ca58
removing patch dev-lang/mono/files/systemweb.patch | 108 ----------------------------------- dev-lang/mono/files/systemweb2.patch | 65 --------------------- dev-lang/mono/mono-9999.ebuild | 1 - 3 files changed, 174 deletions(-) diff --git a/dev-lang/mono/files/systemweb.patch b/dev-lang/mono/files/systemweb.patch deleted file mode 100644 index b591ceb..0000000 --- a/dev-lang/mono/files/systemweb.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 65bd3eea445ee926e85050c848027bb341a1b2dc Mon Sep 17 00:00:00 2001 -From: Chris F Carroll <[email protected]> -Date: Mon, 20 Jan 2014 21:39:12 +0000 -Subject: [PATCH] Added missing properties for net 4.5: - System.Web.RouteCollection.AppendTrailingSlash and .LowercaseUrl, and - RouteBase.RouteExistingFiles - ---- - .../System.Web.Routing/RouteBase.cs | 3 +++ - .../System.Web.Routing/RouteCollection.cs | 4 ++++ - .../Test/System.Web.Routing/RouteCollectionTest.cs | 22 +++++++++++++++++++++- - .../Test/System.Web.Routing/RouteTest.cs | 12 ++++++++++++ - 4 files changed, 40 insertions(+), 1 deletion(-) - -diff --git a/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs b/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs -index 077f987..eadc047 100644 ---- a/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs -+++ b/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs -@@ -41,6 +41,9 @@ namespace System.Web.Routing - [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)] - public abstract class RouteBase - { -+#if NET_4_5 -+ public bool RouteExistingFiles { get; set; } -+#endif - public abstract RouteData GetRouteData (HttpContextBase httpContext); - public abstract VirtualPathData GetVirtualPath (RequestContext requestContext, RouteValueDictionary values); - } -diff --git a/mcs/class/System.Web.Routing/System.Web.Routing/RouteCollection.cs b/mcs/class/System.Web.Routing/System.Web.Routing/RouteCollection.cs -index 7993e44..4a2f1cf 100644 ---- a/mcs/class/System.Web.Routing/System.Web.Routing/RouteCollection.cs -+++ b/mcs/class/System.Web.Routing/System.Web.Routing/RouteCollection.cs -@@ -95,6 +95,10 @@ namespace System.Web.Routing - } - - public bool RouteExistingFiles { get; set; } -+#if NET_4_5 -+ public bool AppendTrailingSlash { get; set; } -+ public bool LowercaseUrls { get; set; } -+#endif - - public void Add (string name, RouteBase item) - { -diff --git a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteCollectionTest.cs b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteCollectionTest.cs -index 18b52ea..cd1a12f 100644 ---- a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteCollectionTest.cs -+++ b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteCollectionTest.cs -@@ -595,7 +595,6 @@ namespace MonoTests.System.Web.Routing - } - - [Test] -- [Ignore ("looks like RouteExistingFiles ( = false) does not affect... so this test needs more investigation")] - public void GetVirtualPathToExistingFile () - { - var c = new RouteCollection (); -@@ -926,6 +925,27 @@ namespace MonoTests.System.Web.Routing - Assert.AreEqual (typeof (PageRouteHandler), rd.RouteHandler.GetType (), "#A4-3"); - Assert.IsFalse (((PageRouteHandler) rd.RouteHandler).CheckPhysicalUrlAccess, "#A4-4"); - } -+ -+#if NET_4_5 -+ [Test] -+ public void AppendTrailingSlash () -+ { -+ var c = new RouteCollection (); -+ c.AppendTrailingSlash = true; -+ Assert.IsTrue (c.AppendTrailingSlash); -+ c.AppendTrailingSlash = false; -+ Assert.IsFalse (c.AppendTrailingSlash); -+ } -+ [Test] -+ public void LowercaseUrls () -+ { -+ var c = new RouteCollection (); -+ c.LowercaseUrls = true; -+ Assert.IsTrue (c.LowercaseUrls); -+ c.LowercaseUrls = false; -+ Assert.IsFalse (c.LowercaseUrls); -+ } -+#endif - #endif - } - } -diff --git a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteTest.cs b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteTest.cs -index e431177..f7a5988 100644 ---- a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteTest.cs -+++ b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteTest.cs -@@ -1775,5 +1775,17 @@ namespace MonoTests.System.Web.Routing - "#6" - ); - } -+ -+#if NET_4_5 -+ [Test] -+ public void RouteExistingFiles () -+ { -+ var route = new Route ("foo", null); -+ route.RouteExistingFiles = true; -+ Assert.IsTrue (route.RouteExistingFiles); -+ route.RouteExistingFiles = false; -+ Assert.IsFalse (route.RouteExistingFiles); -+ } -+#endif - } - } --- -2.0.5 - diff --git a/dev-lang/mono/files/systemweb2.patch b/dev-lang/mono/files/systemweb2.patch deleted file mode 100644 index 188162f..0000000 --- a/dev-lang/mono/files/systemweb2.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 65bd3eea445ee926e85050c848027bb341a1b2dc Mon Sep 17 00:00:00 2001 -From: Chris F Carroll <[email protected]> -Date: Mon, 20 Jan 2014 21:39:12 +0000 -Subject: [PATCH] Added missing properties for net 4.5: - System.Web.RouteCollection.AppendTrailingSlash and .LowercaseUrl, and - RouteBase.RouteExistingFiles - ---- - .../System.Web.Routing/RouteBase.cs | 3 +++ - .../System.Web.Routing/RouteCollection.cs | 4 ++++ - .../Test/System.Web.Routing/RouteCollectionTest.cs | 22 +++++++++++++++++++++- - .../Test/System.Web.Routing/RouteTest.cs | 12 ++++++++++++ - 4 files changed, 40 insertions(+), 1 deletion(-) - -diff --git a/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs b/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs -index 077f987..eadc047 100644 ---- a/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs -+++ b/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs -@@ -41,6 +41,9 @@ namespace System.Web.Routing - [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)] - public abstract class RouteBase - { -+#if NET_4_5 -+ public bool RouteExistingFiles { get; set; } -+#endif - public abstract RouteData GetRouteData (HttpContextBase httpContext); - public abstract VirtualPathData GetVirtualPath (RequestContext requestContext, RouteValueDictionary values); - } -diff --git a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteCollectionTest.cs b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteCollectionTest.cs -index 18b52ea..cd1a12f 100644 ---- a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteCollectionTest.cs -+++ b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteCollectionTest.cs -@@ -595,7 +595,6 @@ namespace MonoTests.System.Web.Routing - } - - [Test] -- [Ignore ("looks like RouteExistingFiles ( = false) does not affect... so this test needs more investigation")] - public void GetVirtualPathToExistingFile () - { - var c = new RouteCollection (); -diff --git a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteTest.cs b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteTest.cs -index e431177..f7a5988 100644 ---- a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteTest.cs -+++ b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteTest.cs -@@ -1775,5 +1775,17 @@ namespace MonoTests.System.Web.Routing - "#6" - ); - } -+ -+#if NET_4_5 -+ [Test] -+ public void RouteExistingFiles () -+ { -+ var route = new Route ("foo", null); -+ route.RouteExistingFiles = true; -+ Assert.IsTrue (route.RouteExistingFiles); -+ route.RouteExistingFiles = false; -+ Assert.IsFalse (route.RouteExistingFiles); -+ } -+#endif - } - } --- -2.0.5 - diff --git a/dev-lang/mono/mono-9999.ebuild b/dev-lang/mono/mono-9999.ebuild index 998979c..cc6d99c 100644 --- a/dev-lang/mono/mono-9999.ebuild +++ b/dev-lang/mono/mono-9999.ebuild @@ -44,7 +44,6 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}/systemweb2.patch" cat "${S}/mono/mini/Makefile.am.in" > "${S}/mono/mini/Makefile.am" || die eautoreconf
