app-emulation/cloud-init: remove unused patch(es)

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/26264
Signed-off-by: Sam James <sam@gentoo.org>

8 files changed, 0 insertions, 391 deletions

diff --git a/app-emulation/cloud-init/files/18.4-add-support-for-package_upgrade.patch b/app-emulation/cloud-init/files/18.4-add-support-for-package_upgrade.patch
deleted file mode 100644
index 9c542cfc0777..000000000000
--- a/app-emulation/cloud-init/files/18.4-add-support-for-package_upgrade.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7868b97507d0dd7d7721ad5c4539e22c67635f92 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 14 Nov 2018 15:58:30 +0100
-Subject: [PATCH 5/5] gentoo: add support for package_upgrade
-
----
- cloudinit/distros/gentoo.py | 25 ++++++++++++++-----------
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
-index 7b838e82..22ad2cf3 100644
---- a/cloudinit/distros/gentoo.py
-+++ b/cloudinit/distros/gentoo.py
-@@ -189,23 +189,26 @@ class Distro(distros.Distro):
-         distros.set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))
- 
-     def package_command(self, command, args=None, pkgs=None):
--        if pkgs is None:
--            pkgs = []
--
-         cmd = ['emerge']
-         # Redirect output
-         cmd.append("--quiet")
- 
--        if args and isinstance(args, str):
--            cmd.append(args)
--        elif args and isinstance(args, list):
--            cmd.extend(args)
-+        if command == "upgrade":
-+            cmd.extend(["--update", "world"])
-+        else:
-+            if pkgs is None:
-+                pkgs = []
-+
-+            if args and isinstance(args, str):
-+                cmd.append(args)
-+            elif args and isinstance(args, list):
-+                cmd.extend(args)
- 
--        if command:
--            cmd.append(command)
-+            if command:
-+                cmd.append(command)
- 
--        pkglist = util.expand_package_list('%s-%s', pkgs)
--        cmd.extend(pkglist)
-+            pkglist = util.expand_package_list('%s-%s', pkgs)
-+            cmd.extend(pkglist)
- 
-         # Allow the output of this to flow outwards (ie not be captured)
-         util.subp(cmd, capture=False)
--- 
-2.19.1
-
diff --git a/app-emulation/cloud-init/files/18.4-fix-filename-for-storing-locale.patch b/app-emulation/cloud-init/files/18.4-fix-filename-for-storing-locale.patch
deleted file mode 100644
index a5bbf6034ac5..000000000000
--- a/app-emulation/cloud-init/files/18.4-fix-filename-for-storing-locale.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3756cdea3e844b9611de321a8075df80e7dbf74d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 14 Nov 2018 15:28:22 +0100
-Subject: [PATCH 3/5] gentoo: fix filename for storing locale
-
-There must have been a misunderstanding as locale.gen is meant to
-contain locales to be generated if no argument is passed to locale-gen.
-
-When using openrc, Gentoo stores system locale in /etc/env.d/02locale
-which is generally manipulated through eselect.
----
- cloudinit/distros/gentoo.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
-index 98ac41ca..50bb61fb 100644
---- a/cloudinit/distros/gentoo.py
-+++ b/cloudinit/distros/gentoo.py
-@@ -20,7 +20,7 @@ LOG = logging.getLogger(__name__)
- 
- 
- class Distro(distros.Distro):
--    locale_conf_fn = '/etc/locale.gen'
-+    locale_conf_fn = '/etc/env.d/02locale'
-     network_conf_fn = '/etc/conf.d/net'
-     resolve_conf_fn = '/etc/resolv.conf'
-     hostname_conf_fn = '/etc/conf.d/hostname'
--- 
-2.19.1
-
diff --git a/app-emulation/cloud-init/files/18.4-fix-update_package_sources-function.patch b/app-emulation/cloud-init/files/18.4-fix-update_package_sources-function.patch
deleted file mode 100644
index d90258d1bc48..000000000000
--- a/app-emulation/cloud-init/files/18.4-fix-update_package_sources-function.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b15c4c4b24c894b3c8d444466110c881c35525e2 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 14 Nov 2018 15:35:37 +0100
-Subject: [PATCH 4/5] gentoo: fix update_package_sources function
-
-Method is meant to update packages repository, not to update the system.
----
- cloudinit/distros/gentoo.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
-index 50bb61fb..7b838e82 100644
---- a/cloudinit/distros/gentoo.py
-+++ b/cloudinit/distros/gentoo.py
-@@ -212,7 +212,7 @@ class Distro(distros.Distro):
- 
-     def update_package_sources(self):
-         self._runner.run("update-sources", self.package_command,
--                         ["-u", "world"], freq=PER_INSTANCE)
-+                         ["--sync"], freq=PER_INSTANCE)
- 
- 
- def convert_resolv_conf(settings):
--- 
-2.19.1
-
diff --git a/app-emulation/cloud-init/files/22.1-add-support-for-package_upgrade.patch b/app-emulation/cloud-init/files/22.1-add-support-for-package_upgrade.patch
deleted file mode 100644
index 124b4225d830..000000000000
--- a/app-emulation/cloud-init/files/22.1-add-support-for-package_upgrade.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7868b97507d0dd7d7721ad5c4539e22c67635f92 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 14 Nov 2018 15:58:30 +0100
-Subject: [PATCH 5/5] gentoo: add support for package_upgrade
-
----
-diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
-index 4eb76da8..702cda8a 100644
---- a/cloudinit/distros/gentoo.py
-+++ b/cloudinit/distros/gentoo.py
-@@ -218,23 +218,26 @@ class Distro(distros.Distro):
-         distros.set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))
- 
-     def package_command(self, command, args=None, pkgs=None):
--        if pkgs is None:
--            pkgs = []
--
-         cmd = list("emerge")
-         # Redirect output
-         cmd.append("--quiet")
- 
--        if args and isinstance(args, str):
--            cmd.append(args)
--        elif args and isinstance(args, list):
--            cmd.extend(args)
-+        if command == "upgrade":
-+            cmd.extend(["--update", "world"])
-+        else:
-+            if pkgs is None:
-+                pkgs = []
-+
-+            if args and isinstance(args, str):
-+                cmd.append(args)
-+            elif args and isinstance(args, list):
-+                cmd.extend(args)
- 
--        if command:
--            cmd.append(command)
-+            if command:
-+                cmd.append(command)
- 
--        pkglist = util.expand_package_list("%s-%s", pkgs)
--        cmd.extend(pkglist)
-+            pkglist = util.expand_package_list("%s-%s", pkgs)
-+            cmd.extend(pkglist)
- 
-         # Allow the output of this to flow outwards (ie not be captured)
-         subp.subp(cmd, capture=False)
diff --git a/app-emulation/cloud-init/files/22.1-fix-update_package_sources-function.patch b/app-emulation/cloud-init/files/22.1-fix-update_package_sources-function.patch
deleted file mode 100644
index 7a1b938e4e60..000000000000
--- a/app-emulation/cloud-init/files/22.1-fix-update_package_sources-function.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From b15c4c4b24c894b3c8d444466110c881c35525e2 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org> 
-Date: Wed, 14 Nov 2018 15:35:37 +0100 
-Subject: [PATCH 4/5] gentoo: fix update_package_sources function
-
-Method is meant to update packages repository, not to update the system.
----
-
-diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
-index 702cda8a..37217fe4 100644
---- a/cloudinit/distros/gentoo.py
-+++ b/cloudinit/distros/gentoo.py
-@@ -246,7 +246,7 @@ class Distro(distros.Distro):
-         self._runner.run(
-             "update-sources",
-             self.package_command,
--            ["-u", "world"],
-+            ["--sync"],
-             freq=PER_INSTANCE,
-         )
- 
diff --git a/app-emulation/cloud-init/files/cloud-init-18.4-fix-packages-module.patch b/app-emulation/cloud-init/files/cloud-init-18.4-fix-packages-module.patch
deleted file mode 100644
index 4a42cbb7d9e1..000000000000
--- a/app-emulation/cloud-init/files/cloud-init-18.4-fix-packages-module.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e894c6f57b88305cdf6e4e2b1543475b2e02f436 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 23 Oct 2018 18:59:58 +0200
-Subject: [PATCH 1/2] Fix Gentoo package installation command
-
----
- cloudinit/distros/gentoo.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
-index dc57717d..98ac41ca 100644
---- a/cloudinit/distros/gentoo.py
-+++ b/cloudinit/distros/gentoo.py
-@@ -192,7 +192,7 @@ class Distro(distros.Distro):
-         if pkgs is None:
-             pkgs = []
- 
--        cmd = list('emerge')
-+        cmd = ['emerge']
-         # Redirect output
-         cmd.append("--quiet")
- 
--- 
-2.19.0
-
diff --git a/app-emulation/cloud-init/files/cloud-init-20.4-gentoo-support-upstream-templates.patch b/app-emulation/cloud-init/files/cloud-init-20.4-gentoo-support-upstream-templates.patch
deleted file mode 100644
index ec6063d0c68a..000000000000
--- a/app-emulation/cloud-init/files/cloud-init-20.4-gentoo-support-upstream-templates.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 823454f1ea140ec47f5f9c5c3c5ad62eb458eb8a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 24 Oct 2018 10:52:46 +0200
-Subject: [PATCH 2/5] Add support for gentoo in cloud.cfg and templates
-
----
- config/cloud.cfg.tmpl       |  8 ++++++--
- templates/hosts.gentoo.tmpl | 24 ++++++++++++++++++++++++
- tools/render-cloudcfg       |  2 +-
- 3 files changed, 31 insertions(+), 3 deletions(-)
- create mode 100644 templates/hosts.gentoo.tmpl
-
-diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
-index 1fef133a..3f5a41a2 100644
---- a/config/cloud.cfg.tmpl	2020-12-27 18:35:39.107000000 +0000
-+++ b/config/cloud.cfg.tmpl	2020-12-27 18:38:23.982000000 +0000
-@@ -154,7 +154,7 @@ cloud_final_modules:
- system_info:
-    # This will affect which distro class gets used
- {% if variant in ["alpine", "amazon", "arch", "centos", "debian",
--                  "fedora", "freebsd", "netbsd", "openbsd", "rhel",
-+                  "fedora", "freebsd", "gentoo", "netbsd", "openbsd", "rhel",
-                   "suse", "ubuntu"] %}
-    distro: {{ variant }}
- {% else %}
-@@ -206,7 +206,7 @@ system_info:
-          primary: http://ports.ubuntu.com/ubuntu-ports
-          security: http://ports.ubuntu.com/ubuntu-ports
-    ssh_svcname: ssh
--{% elif variant in ["alpine", "amazon", "arch", "centos", "fedora",
-+{% elif variant in ["alpine", "amazon", "arch", "centos", "fedora", "gentoo",
-                     "rhel", "suse"] %}
-    # Default user name + that default users groups (if added/used)
-    default_user:
-@@ -221,6 +221,10 @@ system_info:
- {% endif %}
- {% if variant == "suse" %}
-      groups: [cdrom, users]
-+{% elif variant == "gentoo" %}
-+     groups: [users, wheel]
-+     primary_group: users
-+     no_user_group: true
- {% elif variant == "alpine" %}
-      groups: [adm, sudo]
- {% elif variant == "arch" %}
-diff --git a/templates/hosts.gentoo.tmpl b/templates/hosts.gentoo.tmpl
-new file mode 100644
-index 00000000..cd045fa6
---- /dev/null
-+++ b/templates/hosts.gentoo.tmpl
-@@ -0,0 +1,24 @@
-+## template:jinja
-+{#
-+This file /etc/cloud/templates/hosts.gentoo.tmpl is only utilized
-+if enabled in cloud-config.  Specifically, in order to enable it
-+you need to add the following to config:
-+  manage_etc_hosts: True
-+-#}
-+# Your system has configured 'manage_etc_hosts' as True.
-+# As a result, if you wish for changes to this file to persist
-+# then you will need to either
-+# a.) make changes to the master file in /etc/cloud/templates/hosts.gentoo.tmpl
-+# b.) change or remove the value of 'manage_etc_hosts' in
-+#     /etc/cloud/cloud.cfg or cloud-config from user-data
-+# 
-+# The following lines are desirable for IPv4 capable hosts
-+127.0.0.1 {{fqdn}} {{hostname}}
-+127.0.0.1 localhost.localdomain localhost
-+127.0.0.1 localhost4.localdomain4 localhost4
-+
-+# The following lines are desirable for IPv6 capable hosts
-+::1 {{fqdn}} {{hostname}}
-+::1 localhost.localdomain localhost
-+::1 localhost6.localdomain6 localhost6
-+
-diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg
-index 8b7cb875..d109044e 100755
---- a/tools/render-cloudcfg     2020-12-27 18:44:22.032049636 +0000
-+++ a/tools/render-cloudcfg     2020-12-27 18:44:41.632619051 +0000
-@@ -5,7 +5,7 @@ import os
- import sys
- 
- VARIANTS = ["alpine", "amazon", "arch", "centos", "debian", "fedora",
--            "freebsd", "netbsd", "openbsd", "rhel", "suse", "ubuntu",
-+            "freebsd", "gentoo", "netbsd", "openbsd", "rhel", "suse", "ubuntu",
-             "unknown"]
diff --git a/app-emulation/cloud-init/files/cloud-init-21.2-gentoo-support-upstream-templates.patch b/app-emulation/cloud-init/files/cloud-init-21.2-gentoo-support-upstream-templates.patch
deleted file mode 100644
index fb4eed77fcbc..000000000000
--- a/app-emulation/cloud-init/files/cloud-init-21.2-gentoo-support-upstream-templates.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 823454f1ea140ec47f5f9c5c3c5ad62eb458eb8a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 24 Oct 2018 10:52:46 +0200
-Subject: [PATCH 2/5] Add support for gentoo in cloud.cfg and templates
-
----
- config/cloud.cfg.tmpl       |  8 ++++++--
- templates/hosts.gentoo.tmpl | 24 ++++++++++++++++++++++++
- tools/render-cloudcfg       |  2 +-
- 3 files changed, 31 insertions(+), 3 deletions(-)
- create mode 100644 templates/hosts.gentoo.tmpl
-
-diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
-index 1fef133a..3f5a41a2 100644
---- a/config/cloud.cfg.tmpl
-+++ b/config/cloud.cfg.tmpl
-@@ -134,7 +134,7 @@ cloud_final_modules:
- # (not accessible to handlers/transforms)
- system_info:
-    # This will affect which distro class gets used
--{% if variant in ["alpine", "amazon", "arch", "centos", "debian",
--                  "fedora", "freebsd", "netbsd", "openbsd", "rhel",
--                  "suse", "ubuntu"] %}
-+{% if variant in ["alpine", "amazon", "arch", "centos", "debian",
-+                  "fedora", "freebsd", "gentoo", "netbsd",
-+                  "openbsd", "rhel", "suse", "ubuntu"] %}
-    distro: {{ variant }}
- {% else %}
-    # Unknown/fallback distro.
-@@ -172,7 +172,7 @@ system_info:
-          primary: http://ports.ubuntu.com/ubuntu-ports
-          security: http://ports.ubuntu.com/ubuntu-ports
-    ssh_svcname: ssh
--{% elif variant in ["alpine", "amazon", "arch", "centos", "fedora",
--                    "rhel", "suse"] %}
-+{% elif variant in ["alpine", "amazon", "arch", "centos", "fedora",
-+                    "gentoo", "rhel", "suse"] %}
-    # Default user name + that default users groups (if added/used)
-    default_user:
-      name: {{ variant }}
-@@ -180,6 +180,10 @@ system_info:
- {% endif %}
- {% if variant == "suse" %}
-      groups: [cdrom, users]
-+{% elif variant == "gentoo" %}
-+     groups: [users, wheel]
-+     primary_group: users
-+     no_user_group: true
- {% elif variant == "arch" %}
-      groups: [wheel, users]
- {% else %}
-diff --git a/templates/hosts.gentoo.tmpl b/templates/hosts.gentoo.tmpl
-new file mode 100644
-index 00000000..cd045fa6
---- /dev/null
-+++ b/templates/hosts.gentoo.tmpl
-@@ -0,0 +1,24 @@
-+## template:jinja
-+{#
-+This file /etc/cloud/templates/hosts.gentoo.tmpl is only utilized
-+if enabled in cloud-config.  Specifically, in order to enable it
-+you need to add the following to config:
-+  manage_etc_hosts: True
-+-#}
-+# Your system has configured 'manage_etc_hosts' as True.
-+# As a result, if you wish for changes to this file to persist
-+# then you will need to either
-+# a.) make changes to the master file in /etc/cloud/templates/hosts.gentoo.tmpl
-+# b.) change or remove the value of 'manage_etc_hosts' in
-+#     /etc/cloud/cloud.cfg or cloud-config from user-data
-+# 
-+# The following lines are desirable for IPv4 capable hosts
-+127.0.0.1 {{fqdn}} {{hostname}}
-+127.0.0.1 localhost.localdomain localhost
-+127.0.0.1 localhost4.localdomain4 localhost4
-+
-+# The following lines are desirable for IPv6 capable hosts
-+::1 {{fqdn}} {{hostname}}
-+::1 localhost.localdomain localhost
-+::1 localhost6.localdomain6 localhost6
-+
-diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg
-index 8b7cb875..d109044e 100755
---- a/tools/render-cloudcfg
-+++ b/tools/render-cloudcfg
-@@ -4,7 +4,7 @@ import argparse
- import os
- import sys
- 
--VARIANTS = ["alpine", "amazon", "arch", "centos", "debian", "fedora",
--            "freebsd", "netbsd", "openbsd", "rhel", "suse", "ubuntu",
--            "unknown"]
-+VARIANTS = ["alpine", "amazon", "arch", "centos", "debian", "fedora",
-+            "freebsd", "gentoo", "netbsd", "openbsd", "rhel", "suse",
-+            "ubuntu", "unknown"]
- 
- if "avoid-pep8-E402-import-not-top-of-file":
-     _tdir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
--- 
-2.19.1
-