1 |
commit: eec7bd73fcaefe878f2a346e17c5c04d79b7c8fd |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 25 15:33:18 2020 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 25 15:33:18 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eec7bd73 |
7 |
|
8 |
app-emulation/docker: magrate to acct-group/docker |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
12 |
|
13 |
app-emulation/docker/docker-19.03.5.ebuild | 8 +++----- |
14 |
1 file changed, 3 insertions(+), 5 deletions(-) |
15 |
|
16 |
diff --git a/app-emulation/docker/docker-19.03.5.ebuild b/app-emulation/docker/docker-19.03.5.ebuild |
17 |
index b38d5ab11ef..28e4d0899f0 100644 |
18 |
--- a/app-emulation/docker/docker-19.03.5.ebuild |
19 |
+++ b/app-emulation/docker/docker-19.03.5.ebuild |
20 |
@@ -18,7 +18,7 @@ else |
21 |
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" |
22 |
inherit golang-vcs-snapshot |
23 |
fi |
24 |
-inherit bash-completion-r1 golang-base linux-info systemd udev user |
25 |
+inherit bash-completion-r1 golang-base linux-info systemd udev |
26 |
|
27 |
DESCRIPTION="The core functions you need to create Docker images and run Docker containers" |
28 |
HOMEPAGE="https://dockerproject.org" |
29 |
@@ -28,6 +28,7 @@ IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccom |
30 |
|
31 |
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies |
32 |
COMMON_DEPEND=" |
33 |
+ acct-group/docker |
34 |
>=dev-db/sqlite-3.7.9:3 |
35 |
device-mapper? ( |
36 |
>=sys-fs/lvm2-2.02.89[thin] |
37 |
@@ -185,9 +186,6 @@ pkg_setup() { |
38 |
fi |
39 |
|
40 |
linux-info_pkg_setup |
41 |
- |
42 |
- # create docker group for the code checking for it in /etc/group |
43 |
- enewgroup docker |
44 |
} |
45 |
|
46 |
src_compile() { |
47 |
@@ -199,7 +197,7 @@ src_compile() { |
48 |
export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" |
49 |
|
50 |
# if we're building from a tarball, we need the GITCOMMIT value |
51 |
- [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT |
52 |
+ [[ ${DOCKER_GITCOMMIT} ]] && export DOCKER_GITCOMMIT |
53 |
|
54 |
# fake golang layout |
55 |
ln -s docker-ce/components/engine ../docker || die |