gentoo resync : 22.01.2021

3 files changed, 33 insertions, 20 deletions

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 95b682695660..4ea40dee9633 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,7 +1,7 @@
 DIST docker-19.03.13.tar.gz 18242693 BLAKE2B c19afed62694274298b42fc9af3b36c4cc6429b40f7e5447a996b87636a0d2e916476875652e20abd7aeab4e5e0e1cf887a04dcade1de03ded549fc36d911ac4 SHA512 5f34a14ef0b36a309d4a08926ac482ca82d24cdd873aa359c5ba7c65473cbb2e987fe615c38c1bc1c50135284da78a7eb98a8a0106d7d073aeda0cd8f1c31873
 DIST docker-19.03.14.tar.gz 18278132 BLAKE2B 5e32cb482fdc40531aa4ba79dd447093859f568b3d8b5c3ed584c78d5709fabf2a1e05e82af2686cd87462e1abd899bd3f0a746f97937b7d16950f5e94264dff SHA512 5e48185a7787d5637fc11f43f6af604d56a5fa4367fd5a558bb3a5ef3c0d767f1c7f83ecef369453696b68eed81e49520453f267fbe8c2b840b3f62d35f25c28
-DIST docker-20.10.1.tar.gz 11042081 BLAKE2B 98fec753f0695983d197993291a4fd0f3c94e3e3bfe548977df6659c9458109fa35edc9cf2cdd94e2277250672b9a265b50b35bd52228665f7dddf6875a24604 SHA512 5e32a46dab5b527839594e48b715495a77aa9c9e0c7e427eb227409c20c3af0d95a731080048ee20b7c68288bd77e32458bf30c658406d8585ccf8d33e7b79e3
+DIST docker-20.10.2.tar.gz 11045195 BLAKE2B 182ceabbabfa091eaae8ecf12a50dfbe296722072ee24cdde48c3ed2ad40f47d6f939830a00e1dbe7d5dfb1fa25ccda7efe25ce3e4f9a7bbf6ad85dac109168c SHA512 b514e98e3f71874fcf5374eeaaabc2c879691b48937dbc962be3577d834f571353d4f946aebfa69f1a62b1388c9220bfdff09b62bf62c134bd41f494e8506f56
 EBUILD docker-19.03.13-r2.ebuild 9217 BLAKE2B c75a45738a89c1205a6515e3c9796cdffa63776cc54ba6f345579ecaae9642dbb8c8246af1b78b0cd14002a25a1bb8ff8238a4eca874bdfd30ea23bf1c5ff5c1 SHA512 65f016b40849652aea58353a6a3045c0aaac8793891db727ab597a97e885a27ba8380413b108ce090afa66474fa3502b74c8278722bcae454fc98b4a3c226bf4
 EBUILD docker-19.03.14.ebuild 9216 BLAKE2B 01bb9dde2f897bc65e4eabefc07be637118e19d512e4a0c46e8ba6d5aec6b5b2aba8f1e702eda11a4641f08acc3c91661348b89561b3d2f11e7e59bf6991ec3e SHA512 cf68f486054ed21d6a690f364e84db2e8b8efab22d8eb1a8de0e381d1011c221f0ab664be5e22973d82cc1a98fac29135cc3baa0171362b7152e80da1d5a186b
-EBUILD docker-20.10.1.ebuild 7808 BLAKE2B 64673a8dfedba6ff4fc00d55a72fa106a8a8b642b8670c4ccf06187604249d19cb664f0e5aa5d103225234c7bd630a434f537659111835d14f6fd4ddf018fa1f SHA512 acc221da87ea52a944478c2a38bc2288e3a5cab19ae42fb29cdd122767b412107fb572bf8d1992d345cef70d0e030e47e20dd4d9a710d4f8e9ca05b8c8e1281e
-MISC metadata.xml 1476 BLAKE2B 8bd9a290bc8b1bfda9044d4e013a78b2622ea43832788dcad1b8d58cdcbc6717c8758c9df92729c0b6346e5d17385ab74e4f7d5b38880640b76bc8c2a7ee1549 SHA512 e747b4c18573d720d74fa0c4c5e87260753f3dcca2b4564395b1b10f232a765b8e2deb95c266822d10b4000c89318f2694285e9e23edb95629a2dd4d89a77f90
+EBUILD docker-20.10.2.ebuild 8102 BLAKE2B 5d5c0141716c1f08797d10b61bd0c80be27fdd7ccac70d7b02035e91afe105c6b3bf637cf86c35844f371637002559a977c4b819009329f7dbe68e0802385f45 SHA512 1b2b889559e70b5be6cee3a49149293ad30d0e2a67f01b0be27dcf75190a5f2cdf8fe489a81df0c0febd6f76b051ada8c73a3745f34ea2bf6a9fdbe4c02734b1
+MISC metadata.xml 1730 BLAKE2B 119ca97015c54afc8ea75d64e41d550afbcad5a3a6951f059d005e9a5086b467b26b348f6d29a7af4ff86016ecd8978fd20c9cacad41eb85a18756fc395d8a1b SHA512 c204ff1a267cbf386fa35d08b6a3ed91dae745d6bcadcad6e4cb085a510c53c37bda488ec077cfb9cbe57f2387e52a0fd00c153b7ef8d88225dd3c7d4b26f7e3
diff --git a/app-emulation/docker/docker-20.10.1.ebuild b/app-emulation/docker/docker-20.10.2.ebuild
index f7fa1a56f93d..0330740f9dcc 100644
--- a/app-emulation/docker/docker-20.10.1.ebuild
+++ b/app-emulation/docker/docker-20.10.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-EGO_PN="github.com/docker/docker"
+EGO_PN=github.com/docker/docker
 GIT_COMMIT=f0014860c1
 inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux"
+IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp"
 
 DEPEND="
 	acct-group/docker
@@ -37,9 +37,10 @@ RDEPEND="
 	>=dev-vcs/git-1.7
 	>=app-arch/xz-utils-4.9
 	dev-libs/libltdl
-	~app-emulation/containerd-1.4.3[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?]
-	~app-emulation/runc-1.0.0_rc92[apparmor?,seccomp?,selinux(-)?]
-	~app-emulation/docker-proxy-0.8.0_p20201211
+	~app-emulation/containerd-1.4.3[apparmor?,btrfs?,device-mapper?,seccomp?]
+	~app-emulation/runc-1.0.0_rc92[apparmor?,seccomp?]
+	~app-emulation/docker-proxy-0.8.0_p20201215
+	cli? ( app-emulation/docker-cli )
 	container-init? ( >=sys-process/tini-0.19.0[static] )
 "
 
@@ -195,7 +196,7 @@ src_compile() {
 		fi
 	done
 
-	for tag in apparmor seccomp selinux; do
+	for tag in apparmor seccomp; do
 		if use $tag; then
 			DOCKER_BUILDTAGS+=" $tag"
 		fi
@@ -235,14 +236,6 @@ src_install() {
 	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
 }
 
-splitting_docker_cli() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		ver_test ${v} -lt 20.10.1 && return 0
-	done
-	return 1
-}
-
 pkg_postinst() {
 	udev_reload
 
@@ -277,10 +270,24 @@ pkg_postinst() {
 		elog
 	fi
 
-	if splitting_docker_cli; then
-		ewarn "Starting with docker 20.10.1, docker has been split into"
+	if use cli; then
+		ewarn "Starting with docker 20.10.2, docker has been split into"
 		ewarn "two packages upstream, so Gentoo has followed suit."
+		ewarn
 		ewarn "app-emulation/docker contains the daemon and"
 		ewarn "app-emulation/docker-cli contains the docker command."
+		ewarn
+		ewarn "docker currently installs docker-cli using the cli use flag."
+		ewarn
+		ewarn "This use flag is temporary, so you need to take the"
+		ewarn "following actions:"
+		ewarn
+		ewarn "First, disable the cli use flag for app-emulation/docker"
+		ewarn
+		ewarn "Then, if you need docker-cli and docker on the same machine,"
+		ewarn "run the following command:"
+		ewarn
+		ewarn "# emerge --noreplace docker-cli"
+		ewarn
 	fi
 }
diff --git a/app-emulation/docker/metadata.xml b/app-emulation/docker/metadata.xml
index fdd881c3fea6..1ec7d353074c 100644
--- a/app-emulation/docker/metadata.xml
+++ b/app-emulation/docker/metadata.xml
@@ -28,6 +28,12 @@
 			Enables dependencies for the "btrfs" graph driver, including
 			necessary kernel flags.
 		</flag>
+			<flag name="cli">
+				This is a temporary use flag which pulls in
+				app-emulation/docker-cli, the docker command line client.
+				This flag is here to assist in the transition to split packages
+				and will be removed in a future release.
+		</flag>
 		<flag name="container-init">
 			Makes the a staticly-linked init system tini available inside a
 			container.