Merge updates from master

19 files changed, 4 insertions, 2 deletions

diff --git a/acct-group/reg/reg-0-r1.ebuild b/acct-group/reg/reg-0-r1.ebuild
index 1b9f92794354..8bc51aa11edc 100644
--- a/acct-group/reg/reg-0-r1.ebuild
+++ b/acct-group/reg/reg-0-r1.ebuild
@@ -5,6 +5,6 @@ EAPI=7
 
 inherit acct-group
 
-DESCRIPTION="A group for app-emulation/reg"
+DESCRIPTION="A group for app-containers/reg"
 
 ACCT_GROUP_ID="503"
diff --git a/acct-user/reg/reg-0-r1.ebuild b/acct-user/reg/reg-0-r1.ebuild
index 52db0f73e1cf..57bb9a6ed18f 100644
--- a/acct-user/reg/reg-0-r1.ebuild
+++ b/acct-user/reg/reg-0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit acct-user
 
-DESCRIPTION="A user for app-emulation/reg"
+DESCRIPTION="A user for app-containers/reg"
 
 ACCT_USER_ID=503
 ACCT_USER_GROUPS=( reg )
diff --git a/app-emulation/flannel/Manifest b/app-containers/flannel/Manifest
index fdfb49c6cbe8..fdfb49c6cbe8 100644
--- a/app-emulation/flannel/Manifest
+++ b/app-containers/flannel/Manifest
diff --git a/app-emulation/flannel/files/flannel-docker.conf b/app-containers/flannel/files/flannel-docker.conf
index 8f5517776b89..8f5517776b89 100644
--- a/app-emulation/flannel/files/flannel-docker.conf
+++ b/app-containers/flannel/files/flannel-docker.conf
diff --git a/app-emulation/flannel/files/flannel.tmpfilesd b/app-containers/flannel/files/flannel.tmpfilesd
index 98e5abd9b20f..98e5abd9b20f 100644
--- a/app-emulation/flannel/files/flannel.tmpfilesd
+++ b/app-containers/flannel/files/flannel.tmpfilesd
diff --git a/app-emulation/flannel/files/flanneld.confd b/app-containers/flannel/files/flanneld.confd
index 18686aa5d223..18686aa5d223 100644
--- a/app-emulation/flannel/files/flanneld.confd
+++ b/app-containers/flannel/files/flanneld.confd
diff --git a/app-emulation/flannel/files/flanneld.initd b/app-containers/flannel/files/flanneld.initd
index d5d966a40d30..d5d966a40d30 100644
--- a/app-emulation/flannel/files/flanneld.initd
+++ b/app-containers/flannel/files/flanneld.initd
diff --git a/app-emulation/flannel/files/flanneld.logrotated b/app-containers/flannel/files/flanneld.logrotated
index 4108e6305578..4108e6305578 100644
--- a/app-emulation/flannel/files/flanneld.logrotated
+++ b/app-containers/flannel/files/flanneld.logrotated
diff --git a/app-emulation/flannel/files/flanneld.service b/app-containers/flannel/files/flanneld.service
index 86e69a49e73f..86e69a49e73f 100644
--- a/app-emulation/flannel/files/flanneld.service
+++ b/app-containers/flannel/files/flanneld.service
diff --git a/app-emulation/flannel/flannel-0.11.0.ebuild b/app-containers/flannel/flannel-0.11.0.ebuild
index 9ddf9cc7bedf..9ddf9cc7bedf 100644
--- a/app-emulation/flannel/flannel-0.11.0.ebuild
+++ b/app-containers/flannel/flannel-0.11.0.ebuild
diff --git a/app-emulation/flannel/flannel-0.14.0.ebuild b/app-containers/flannel/flannel-0.14.0.ebuild
index ec33f31625ba..ec33f31625ba 100644
--- a/app-emulation/flannel/flannel-0.14.0.ebuild
+++ b/app-containers/flannel/flannel-0.14.0.ebuild
diff --git a/app-emulation/flannel/metadata.xml b/app-containers/flannel/metadata.xml
index 4ed5e4e641ed..4ed5e4e641ed 100644
--- a/app-emulation/flannel/metadata.xml
+++ b/app-containers/flannel/metadata.xml
diff --git a/app-emulation/reg/Manifest b/app-containers/reg/Manifest
index aa259755a17d..aa259755a17d 100644
--- a/app-emulation/reg/Manifest
+++ b/app-containers/reg/Manifest
diff --git a/app-emulation/reg/files/reg-0.16.0-config.patch b/app-containers/reg/files/reg-0.16.0-config.patch
index 3ec1bf44d032..3ec1bf44d032 100644
--- a/app-emulation/reg/files/reg-0.16.0-config.patch
+++ b/app-containers/reg/files/reg-0.16.0-config.patch
diff --git a/app-emulation/reg/files/reg.confd b/app-containers/reg/files/reg.confd
index 1bd2475decc4..1bd2475decc4 100644
--- a/app-emulation/reg/files/reg.confd
+++ b/app-containers/reg/files/reg.confd
diff --git a/app-emulation/reg/files/reg.initd b/app-containers/reg/files/reg.initd
index 7759f44f376c..7759f44f376c 100644
--- a/app-emulation/reg/files/reg.initd
+++ b/app-containers/reg/files/reg.initd
diff --git a/app-emulation/reg/metadata.xml b/app-containers/reg/metadata.xml
index 0d1d641a5742..0d1d641a5742 100644
--- a/app-emulation/reg/metadata.xml
+++ b/app-containers/reg/metadata.xml
diff --git a/app-emulation/reg/reg-0.16.1.ebuild b/app-containers/reg/reg-0.16.1.ebuild
index bfd5ac25d064..bfd5ac25d064 100644
--- a/app-emulation/reg/reg-0.16.1.ebuild
+++ b/app-containers/reg/reg-0.16.1.ebuild
diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021
index c1460e49ad43..4a0fa0b629e3 100644
--- a/profiles/updates/4Q-2021
+++ b/profiles/updates/4Q-2021
@@ -61,3 +61,5 @@ move app-emulation/snapd app-containers/snapd
 move app-emulation/umoci app-containers/umoci
 move app-emulation/docker-cli app-containers/docker-cli
 move app-emulation/docker app-containers/docker
+move app-emulation/reg app-containers/reg
+move app-emulation/flannel app-containers/flannel