From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 36C7E138350 for ; Sat, 25 Jan 2020 15:33:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CBC9E083D; Sat, 25 Jan 2020 15:33:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E8F5DE083D for ; Sat, 25 Jan 2020 15:33:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E677134E27A for ; Sat, 25 Jan 2020 15:33:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7370CED for ; Sat, 25 Jan 2020 15:33:47 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1579966398.eec7bd73fcaefe878f2a346e17c5c04d79b7c8fd.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/docker/docker-19.03.5.ebuild X-VCS-Directories: app-emulation/docker/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: eec7bd73fcaefe878f2a346e17c5c04d79b7c8fd X-VCS-Branch: master Date: Sat, 25 Jan 2020 15:33:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 23718ef9-6181-44e6-ab26-b4bb4771b4fc X-Archives-Hash: 7b7d05815c16be657362ed6c378e9295 commit: eec7bd73fcaefe878f2a346e17c5c04d79b7c8fd Author: Mikle Kolyada gentoo org> AuthorDate: Sat Jan 25 15:33:18 2020 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Sat Jan 25 15:33:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eec7bd73 app-emulation/docker: magrate to acct-group/docker Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mikle Kolyada gentoo.org> app-emulation/docker/docker-19.03.5.ebuild | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app-emulation/docker/docker-19.03.5.ebuild b/app-emulation/docker/docker-19.03.5.ebuild index b38d5ab11ef..28e4d0899f0 100644 --- a/app-emulation/docker/docker-19.03.5.ebuild +++ b/app-emulation/docker/docker-19.03.5.ebuild @@ -18,7 +18,7 @@ else [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" inherit golang-vcs-snapshot fi -inherit bash-completion-r1 golang-base linux-info systemd udev user +inherit bash-completion-r1 golang-base linux-info systemd udev DESCRIPTION="The core functions you need to create Docker images and run Docker containers" HOMEPAGE="https://dockerproject.org" @@ -28,6 +28,7 @@ IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccom # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies COMMON_DEPEND=" + acct-group/docker >=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] @@ -185,9 +186,6 @@ pkg_setup() { fi linux-info_pkg_setup - - # create docker group for the code checking for it in /etc/group - enewgroup docker } src_compile() { @@ -199,7 +197,7 @@ src_compile() { export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" # if we're building from a tarball, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT + [[ ${DOCKER_GITCOMMIT} ]] && export DOCKER_GITCOMMIT # fake golang layout ln -s docker-ce/components/engine ../docker || die