From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1495482-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id D697B15802F
for <garchives@archives.gentoo.org>; Sat, 11 Mar 2023 18:50:45 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 10BB9E07EA;
Sat, 11 Mar 2023 18:50:45 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id ED5DFE07EA
for <gentoo-commits@lists.gentoo.org>; Sat, 11 Mar 2023 18:50:44 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 08004340E37
for <gentoo-commits@lists.gentoo.org>; Sat, 11 Mar 2023 18:50:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5938A73E
for <gentoo-commits@lists.gentoo.org>; Sat, 11 Mar 2023 18:50:42 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1678560628.702dc32d9f049a3836a56aa4f90d1fe77e092819.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/docker/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-containers/docker/docker-23.0.1.ebuild
X-VCS-Directories: app-containers/docker/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 702dc32d9f049a3836a56aa4f90d1fe77e092819
X-VCS-Branch: master
Date: Sat, 11 Mar 2023 18:50:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d5a43d20-ef1d-4fb6-ba29-97eef2b48bcd
X-Archives-Hash: e4431aa3164421986f8749e2df532d22
commit: 702dc32d9f049a3836a56aa4f90d1fe77e092819
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 18:38:10 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 18:50:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=702dc32d
app-containers/docker: fix pkg_postinst referencing removed IUSE=cli
Closes: https://bugs.gentoo.org/900771
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-containers/docker/docker-23.0.1.ebuild | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/app-containers/docker/docker-23.0.1.ebuild b/app-containers/docker/docker-23.0.1.ebuild
index e8c53f5f178b..e52d11e4501a 100644
--- a/app-containers/docker/docker-23.0.1.ebuild
+++ b/app-containers/docker/docker-23.0.1.ebuild
@@ -320,27 +320,6 @@ pkg_postinst() {
elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
elog
fi
-
- 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-containers/docker contains the daemon and"
- ewarn "app-containers/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-containers/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
}
pkg_postrm() {