From 8f96d5969dc1e618687357a0d8d86a8d6eb7326a Mon Sep 17 00:00:00 2001
From: Yoann Potinet <yoann.potinet@gmail.com>
Date: Mon, 4 Jul 2022 16:24:55 -0400
Subject: [PATCH] (#11517) Bump acl/2.0.5

---
 recipes/nfrechette-acl/all/conandata.yml             |  3 +++
 recipes/nfrechette-acl/all/conanfile.py              | 10 ++++++----
 recipes/nfrechette-acl/all/test_package/conanfile.py |  5 +++--
 recipes/nfrechette-acl/config.yml                    |  2 ++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/recipes/nfrechette-acl/all/conandata.yml b/recipes/nfrechette-acl/all/conandata.yml
index 35eb5dfac8..3609495bd0 100644
--- a/recipes/nfrechette-acl/all/conandata.yml
+++ b/recipes/nfrechette-acl/all/conandata.yml
@@ -14,3 +14,6 @@ sources:
   "2.0.3":
     url: "https://github.com/nfrechette/acl/archive/v2.0.3.tar.gz"
     sha256: "2cc0a6fd8f74ba7fee9177f6b7794bfdc22a27f5b00aa684ba52d60f0f8b3460"
+  "2.0.5":
+    url: "https://github.com/nfrechette/acl/archive/v2.0.5.tar.gz"
+    sha256: "edd255a3ffcdb102b960922069d1ec9ae5fed561bca3bb6ee73224562f76fa36"
diff --git a/recipes/nfrechette-acl/all/conanfile.py b/recipes/nfrechette-acl/all/conanfile.py
index 19a6288764..23d68bbd56 100644
--- a/recipes/nfrechette-acl/all/conanfile.py
+++ b/recipes/nfrechette-acl/all/conanfile.py
@@ -1,5 +1,7 @@
 import os
-from conans import ConanFile, tools
+from conan import ConanFile
+from conan.tools.files import rename, get
+from conans import tools
 from conans.errors import ConanInvalidConfiguration
 
 
@@ -18,7 +20,7 @@ class AclConan(ConanFile):
         return "source_subfolder"
 
     def requirements(self):
-        self.requires("rtm/2.1.3")
+        self.requires("rtm/2.1.4")
 
     def configure(self):
         minimal_cpp_standard = "11"
@@ -30,9 +32,9 @@ class AclConan(ConanFile):
                                                                                       self.settings.compiler.version))
 
     def source(self):
-        tools.get(**self.conan_data["sources"][self.version])
+        get(self, **self.conan_data["sources"][self.version])
         extracted_dir = "acl-" + self.version
-        os.rename(extracted_dir, self._source_subfolder)
+        rename(self, extracted_dir, self._source_subfolder)
 
     def package(self):
         self.copy("LICENSE", dst="licenses", src=self._source_subfolder)
diff --git a/recipes/nfrechette-acl/all/test_package/conanfile.py b/recipes/nfrechette-acl/all/test_package/conanfile.py
index a59a26a52c..efea435279 100644
--- a/recipes/nfrechette-acl/all/test_package/conanfile.py
+++ b/recipes/nfrechette-acl/all/test_package/conanfile.py
@@ -1,5 +1,6 @@
 import os
-from conans import ConanFile, CMake, tools
+from conan import ConanFile
+from conans import CMake, tools
 
 
 class TestPackageConan(ConanFile):
@@ -12,6 +13,6 @@ class TestPackageConan(ConanFile):
         cmake.build()
 
     def test(self):
-        if not tools.cross_building(self.settings):
+        if not tools.cross_building(self):
             bin_path = os.path.join("bin", "test_package")
             self.run(bin_path, run_environment=True)
diff --git a/recipes/nfrechette-acl/config.yml b/recipes/nfrechette-acl/config.yml
index c09766d53e..c854ce704e 100644
--- a/recipes/nfrechette-acl/config.yml
+++ b/recipes/nfrechette-acl/config.yml
@@ -9,3 +9,5 @@ versions:
     folder: "all"
   "2.0.3":
     folder: "all"
+  "2.0.5":
+    folder: "all"