[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2020-01-25 Thread Mikle Kolyada
commit: eec7bd73fcaefe878f2a346e17c5c04d79b7c8fd
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Jan 25 15:33:18 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jan 25 15:33:18 2020 +
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



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/

2020-01-25 Thread Sebastian Pipping
commit: f409dc9bb683e0d22e553332674b4c8fc55599a3
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sat Jan 25 15:11:39 2020 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sat Jan 25 15:13:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f409dc9b

app-emulation/docker-compose: 1.25.3

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20

 app-emulation/docker-compose/Manifest  |  1 +
 .../docker-compose/docker-compose-1.25.3.ebuild| 73 ++
 2 files changed, 74 insertions(+)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index c5f61faece3..f31bb4ec236 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -3,3 +3,4 @@ DIST docker-compose-1.24.1.tar.gz 307749 BLAKE2B 
7ded0a4b82a7a9beb9de38752f38998
 DIST docker-compose-1.25.0.tar.gz 320048 BLAKE2B 
a0615c9d81f897f551d664799e2a7cd4d72c3e0b70ceb0ff9bfb533a81799d2d524824ead27bff2391c5e98fc34430fb2ba724bba663ece66417ac72181241f0
 SHA512 
38be153a8ba1bf1a4a5c63dc794db3344c93c0819fba0c38feb791067e0aa72142205e4255b5fd31bf2f8159dfa04cde09fdcdabe0511bc0e2865974dff5433d
 DIST docker-compose-1.25.1.tar.gz 321627 BLAKE2B 
9056b0e359ff6cccba16b7ea5fc96de363f242103c48d15e3ed19ed5291878f7a5c81f99b7fd3eff46eaff5b271e883125ab02ff22bf592c4a5dd12792790fdc
 SHA512 
5e58edd3364caecc9b6ec0e92e629e624694e42f96da836378648918dfaa41ddc0c99b107f2d3f11d1dd6ab86a516a7b2da3783b542623440d8c0c6628c05020
 DIST docker-compose-1.25.2.tar.gz 306196 BLAKE2B 
6bf9c1ae14b25f41a7b3893f5ddc5b654743b29eb17c3d1b23e47d004e8e3feaf021b67c2419632faa6b11713ad1bd956b9f756e36fcd8efc7e60404a1de53a7
 SHA512 
ce045c6af233d6d03fd26100bce836444abb3022d6661ac6073cd8c6b8ed1cc0bbef9cbfad73672c8d3b6f3a12ee98e6e60c5f1b90360f778d5fa8d18e00179e
+DIST docker-compose-1.25.3.tar.gz 306220 BLAKE2B 
503a76d51ff36e7a91030f240c8b795383f399472517056e3d586ddb72c31dd02fed51474e7716e4f43f801a10160e271ed695c5defa6a2d3e1be647d9f0d33b
 SHA512 
92c7bb2adf5fd033add0bfe92634c04d0acb69846daabb215eea696d396fbcc13ffa175173544c4e2a3ae0c0ec0ac81526b6cef68cdcfe0eecec6ac894c6f8f2

diff --git a/app-emulation/docker-compose/docker-compose-1.25.3.ebuild 
b/app-emulation/docker-compose/docker-compose-1.25.3.ebuild
new file mode 100644
index 000..fa7ef8bfb51
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.25.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose;
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+   >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
+   >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+   >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+   >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+   dev-python/paramiko[${PYTHON_USEDEP}]
+   >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+   >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+   >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+   >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+   >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep 
'>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
+   $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep 
'>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"
+
+DEPEND="${RDEPEND}
+   test? (
+   =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
+   )"
+
+S="${WORKDIR}/compose-${PV}"
+
+PATCHES=(
+   # Bug #679968 -- https://bugs.gentoo.org/679968
+   # Bug #681002 -- https://bugs.gentoo.org/681002
+   "${FILESDIR}"/${PN}-1.25.2-setup-py.patch
+)
+
+src_prepare() {
+   # Address QA issue "docker-compose.exe: missing alias (symlink) for 
completed command."
+   sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i 
contrib/completion/bash/docker-compose || die
+
+   default
+}
+
+python_test() {
+   distutils_install_for_testing
+   ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+   newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/, app-emulation/docker-compose/files/

2020-01-20 Thread Sebastian Pipping
commit: 50906ed198bd2d5e37dda6b4cb8fb8da0e92406c
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Mon Jan 20 18:59:02 2020 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Mon Jan 20 19:00:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50906ed1

app-emulation/docker-compose: 1.25.2

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20

 app-emulation/docker-compose/Manifest  |  1 +
 .../docker-compose/docker-compose-1.25.2.ebuild| 73 ++
 .../files/docker-compose-1.25.2-setup-py.patch | 71 +
 3 files changed, 145 insertions(+)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index 9e871f331a9..c5f61faece3 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -2,3 +2,4 @@ DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B 
cb2a6f96e14c04d0279b25c075182d8
 DIST docker-compose-1.24.1.tar.gz 307749 BLAKE2B 
7ded0a4b82a7a9beb9de38752f38998ca4ea9421e5ed5630627820ec7e250ad6f03f6788bcbebe8bc0dd4c064d275bb4ca5a6055a95b6a0f72d7ae9038ec7f22
 SHA512 
9b8632ef263b8dfa678e8b99b46e00441f779716a524280ce25f62fcd2605f400723b7790c466338374c34653946dc2c5d7f09593ddd892fee3409c2a2fd1a5f
 DIST docker-compose-1.25.0.tar.gz 320048 BLAKE2B 
a0615c9d81f897f551d664799e2a7cd4d72c3e0b70ceb0ff9bfb533a81799d2d524824ead27bff2391c5e98fc34430fb2ba724bba663ece66417ac72181241f0
 SHA512 
38be153a8ba1bf1a4a5c63dc794db3344c93c0819fba0c38feb791067e0aa72142205e4255b5fd31bf2f8159dfa04cde09fdcdabe0511bc0e2865974dff5433d
 DIST docker-compose-1.25.1.tar.gz 321627 BLAKE2B 
9056b0e359ff6cccba16b7ea5fc96de363f242103c48d15e3ed19ed5291878f7a5c81f99b7fd3eff46eaff5b271e883125ab02ff22bf592c4a5dd12792790fdc
 SHA512 
5e58edd3364caecc9b6ec0e92e629e624694e42f96da836378648918dfaa41ddc0c99b107f2d3f11d1dd6ab86a516a7b2da3783b542623440d8c0c6628c05020
+DIST docker-compose-1.25.2.tar.gz 306196 BLAKE2B 
6bf9c1ae14b25f41a7b3893f5ddc5b654743b29eb17c3d1b23e47d004e8e3feaf021b67c2419632faa6b11713ad1bd956b9f756e36fcd8efc7e60404a1de53a7
 SHA512 
ce045c6af233d6d03fd26100bce836444abb3022d6661ac6073cd8c6b8ed1cc0bbef9cbfad73672c8d3b6f3a12ee98e6e60c5f1b90360f778d5fa8d18e00179e

diff --git a/app-emulation/docker-compose/docker-compose-1.25.2.ebuild 
b/app-emulation/docker-compose/docker-compose-1.25.2.ebuild
new file mode 100644
index 000..7bdd266df6a
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.25.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose;
+SRC_URI="https://github.com/docker/compose/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+   >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
+   >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+   >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+   >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+   dev-python/paramiko[${PYTHON_USEDEP}]
+   >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+   >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+   >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+   >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+   >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep 
'>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
+   $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep 
'>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"
+
+DEPEND="${RDEPEND}
+   test? (
+   =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
+   )"
+
+S="${WORKDIR}/compose-${PV}"
+
+PATCHES=(
+   # Bug #679968 -- https://bugs.gentoo.org/679968
+   # Bug #681002 -- https://bugs.gentoo.org/681002
+   "${FILESDIR}"/${PN}-1.25.2-setup-py.patch
+)
+
+src_prepare() {
+   # Address QA issue "docker-compose.exe: missing alias (symlink) for 
completed command."
+   sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i 
contrib/completion/bash/docker-compose || die
+
+   default
+}
+
+python_test() {
+   distutils_install_for_testing
+   ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2020-01-17 Thread Georgy Yakovlev
commit: 15613d6b37514be8bf95aed701670706ebcacb91
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Jan 17 08:01:03 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Jan 17 08:44:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15613d6b

app-emulation/docker: keyword on ~ppc64

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-emulation/docker/docker-19.03.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker/docker-19.03.5.ebuild 
b/app-emulation/docker/docker-19.03.5.ebuild
index 083a97987cf..b38d5ab11ef 100644
--- a/app-emulation/docker/docker-19.03.5.ebuild
+++ b/app-emulation/docker/docker-19.03.5.ebuild
@@ -14,7 +14,7 @@ else
DOCKER_GITCOMMIT="633a0ea"
MY_PV=${PV/_/-}
SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually 
for each bump!"
inherit golang-vcs-snapshot
 fi



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2020-01-16 Thread Mikle Kolyada
commit: 9753537cfaf24e80397a0236a169ded2ccc19fdf
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Jan 16 19:36:09 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Jan 16 19:36:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9753537c

app-emulation/docker: force cgroupv1 on systemd

Closes: https://bugs.gentoo.org/691844
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-emulation/docker/docker-19.03.5.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/docker/docker-19.03.5.ebuild 
b/app-emulation/docker/docker-19.03.5.ebuild
index b1fb15056e3..083a97987cf 100644
--- a/app-emulation/docker/docker-19.03.5.ebuild
+++ b/app-emulation/docker/docker-19.03.5.ebuild
@@ -51,6 +51,7 @@ DEPEND="
 # 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
 RDEPEND="
${COMMON_DEPEND}
+   !sys-apps/systemd[-cgroup-hybrid(+)]
>=net-firewall/iptables-1.4
sys-process/procps
>=dev-vcs/git-1.7



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2020-01-16 Thread Mikle Kolyada
commit: 5c03d5df23d65fe875608d8bbc34d56c78550da0
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Jan 16 09:18:04 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Jan 16 09:18:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c03d5df

app-emulation/docker: Drop old

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-emulation/docker/Manifest  |   2 -
 app-emulation/docker/docker-18.09.9.ebuild | 308 
 app-emulation/docker/docker-19.03.4.ebuild | 309 -
 3 files changed, 619 deletions(-)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 035a0cc97bb..3ed21218591 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1 @@
-DIST docker-18.09.9.tar.gz 15299640 BLAKE2B 
2a4fa670ddac0136e85300fd137a8ea91651c51c54fa3d52ddc5b1a640a1ee202a34f428fcf9eea286c581f49a2c28b711100e7541773e5bc1f2e37884cae2dc
 SHA512 
d0235ae54e4d8d4d0893f6f35293f36177afabc71d0b3e6a74341260e52dcd9351a924efe8fa299cf9a51efdc68b6b284f6435d7210c44193a673f7fff71ce0b
-DIST docker-19.03.4.tar.gz 16961040 BLAKE2B 
15d88d6f97ff70f6a0220f3d62b2040b4d859414b323b07e54802cb8e8dbb8d074562635bbfd9d00df529d0792fb5767d28548843ec73ad21cf7d7fcb1ac0c6e
 SHA512 
bcf79f82eb8433b8c04ceb2fd90a80101b148dd819f5bbda83d535ff2fad65d08aee2f72ac41c38ce879f3970a087555bb7ab63c5bb071a3c1cd6aa177621cac
 DIST docker-19.03.5.tar.gz 16966994 BLAKE2B 
7326ba17c0eef7bcebb5df1484992a30f696d2f238d149dbaf964004b725badfc1e9c85ed3ba76ac95b566cda9cb7018fe4fa7d282af1d1e36f4765e1445f25b
 SHA512 
1afe41e740ae0e32a8210aac3c4b24ddb1ae00ff19e8ec435de2e61cfc25494d38129fd619bacf964e3e7a96e12dd44a0c57f6e2c36aa7c3bb67a3df0c237648

diff --git a/app-emulation/docker/docker-18.09.9.ebuild 
b/app-emulation/docker/docker-18.09.9.ebuild
deleted file mode 100644
index 966a693d1a4..000
--- a/app-emulation/docker/docker-18.09.9.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = ** ]]; then
-   # Docker cannot be fetched via "go get", thanks to autogenerated code
-   EGIT_REPO_URI="https://${EGO_PN}.git;
-   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-   inherit git-r3
-else
-   DOCKER_GITCOMMIT="039a7df"
-   MY_PV=${PV/_/-}
-   SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64"
-   [ "$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
-
-DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
-HOMEPAGE="https://dockerproject.org;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
seccomp"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-   >=dev-db/sqlite-3.7.9:3
-   device-mapper? (
-   >=sys-fs/lvm2-2.02.89[thin]
-   )
-   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-   apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-   ${CDEPEND}
-
-   dev-go/go-md2man
-
-   btrfs? (
-   >=sys-fs/btrfs-progs-3.16.1
-   )
-"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-   ${CDEPEND}
-   >=net-firewall/iptables-1.4
-   sys-process/procps
-   >=dev-vcs/git-1.7
-   >=app-arch/xz-utils-4.9
-   dev-libs/libltdl
-   ~app-emulation/containerd-1.2.6
-   ~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
-   ~app-emulation/docker-proxy-0.8.0_p20190513
-   container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
-   ~KEYS
-   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
-   ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
-   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
-   ~POSIX_MQUEUE
-
-   ~USER_NS
-   ~SECCOMP
-   ~CGROUP_PIDS
-   ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
-   ~BLK_CGROUP ~BLK_DEV_THROTTLING
-   ~CGROUP_PERF
-   ~CGROUP_HUGETLB
-   ~NET_CLS_CGROUP
-   ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-   ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-   ~VXLAN
-

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2020-01-16 Thread Mikle Kolyada
commit: d75dcab338257a061b3adea2a59aaa885d81387d
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Jan 16 09:09:42 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Jan 16 09:12:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d75dcab3

app-emulation/docker: make NF_NAT_NEEDED optional

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-emulation/docker/docker-19.03.5.ebuild | 16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app-emulation/docker/docker-19.03.5.ebuild 
b/app-emulation/docker/docker-19.03.5.ebuild
index e6fb4da81b0..b1fb15056e3 100644
--- a/app-emulation/docker/docker-19.03.5.ebuild
+++ b/app-emulation/docker/docker-19.03.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ SLOT="0"
 IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
seccomp"
 
 # 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
+COMMON_DEPEND="
>=dev-db/sqlite-3.7.9:3
device-mapper? (
>=sys-fs/lvm2-2.02.89[thin]
@@ -37,7 +37,7 @@ CDEPEND="
 "
 
 DEPEND="
-   ${CDEPEND}
+   ${COMMON_DEPEND}
 
>=dev-lang/go-1.12
dev-go/go-md2man
@@ -50,7 +50,7 @@ DEPEND="
 # 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
 # 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
 RDEPEND="
-   ${CDEPEND}
+   ${COMMON_DEPEND}
>=net-firewall/iptables-1.4
sys-process/procps
>=dev-vcs/git-1.7
@@ -74,7 +74,7 @@ CONFIG_CHECK="
~VETH ~BRIDGE ~BRIDGE_NETFILTER
~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
-   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+   ~IP_NF_NAT ~NF_NAT
~POSIX_MQUEUE
 
~USER_NS
@@ -150,6 +150,12 @@ pkg_setup() {
"
fi
 
+   if kernel_is lt 5 2; then
+   CONFIG_CHECK+="
+   ~NF_NAT_NEEDED
+   "
+   fi
+
if use aufs; then
CONFIG_CHECK+="
~AUFS_FS



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2020-01-15 Thread Mikle Kolyada
commit: 27485d2a804d749ded14dcc41a1caaf18d3c73cb
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Jan 15 10:40:45 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Jan 15 10:40:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27485d2a

app-emulation/docker: drop maintainer (no g-p-m)

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-emulation/docker/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/app-emulation/docker/metadata.xml 
b/app-emulation/docker/metadata.xml
index 1a11d4e6ee8..5f1f8d5ead4 100644
--- a/app-emulation/docker/metadata.xml
+++ b/app-emulation/docker/metadata.xml
@@ -8,10 +8,6 @@
scale, in production, on VMs, bare metal, OpenStack clusters, 
public
clouds and more.

-   
-   admwig...@gmail.com
-   Tianon
-   

willi...@gentoo.org
William Hubbs



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/

2020-01-13 Thread Sebastian Pipping
commit: 251216a77717be5b6682b33227909aed000bd07c
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Mon Jan 13 12:40:37 2020 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Mon Jan 13 12:43:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=251216a7

app-emulation/docker-compose: 1.25.1

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20

 app-emulation/docker-compose/Manifest  |  1 +
 .../docker-compose/docker-compose-1.25.1.ebuild| 71 ++
 2 files changed, 72 insertions(+)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index 088a5454977..9e871f331a9 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,3 +1,4 @@
 DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B 
cb2a6f96e14c04d0279b25c075182d8f09e5a622e4cee2ce74995224e3a8634cc5f22ccc548b7754bbeb11630c1e638386cb1a6df927b3619cb6e7e3595aac6c
 SHA512 
318c6bf9877147de09526b4d49c3fd86012d85626e7a9a15863ca55a60e10fa85b27429605045d0aaa9933bc2e5f23cbb76856276a874e84793b878a3e86
 DIST docker-compose-1.24.1.tar.gz 307749 BLAKE2B 
7ded0a4b82a7a9beb9de38752f38998ca4ea9421e5ed5630627820ec7e250ad6f03f6788bcbebe8bc0dd4c064d275bb4ca5a6055a95b6a0f72d7ae9038ec7f22
 SHA512 
9b8632ef263b8dfa678e8b99b46e00441f779716a524280ce25f62fcd2605f400723b7790c466338374c34653946dc2c5d7f09593ddd892fee3409c2a2fd1a5f
 DIST docker-compose-1.25.0.tar.gz 320048 BLAKE2B 
a0615c9d81f897f551d664799e2a7cd4d72c3e0b70ceb0ff9bfb533a81799d2d524824ead27bff2391c5e98fc34430fb2ba724bba663ece66417ac72181241f0
 SHA512 
38be153a8ba1bf1a4a5c63dc794db3344c93c0819fba0c38feb791067e0aa72142205e4255b5fd31bf2f8159dfa04cde09fdcdabe0511bc0e2865974dff5433d
+DIST docker-compose-1.25.1.tar.gz 321627 BLAKE2B 
9056b0e359ff6cccba16b7ea5fc96de363f242103c48d15e3ed19ed5291878f7a5c81f99b7fd3eff46eaff5b271e883125ab02ff22bf592c4a5dd12792790fdc
 SHA512 
5e58edd3364caecc9b6ec0e92e629e624694e42f96da836378648918dfaa41ddc0c99b107f2d3f11d1dd6ab86a516a7b2da3783b542623440d8c0c6628c05020

diff --git a/app-emulation/docker-compose/docker-compose-1.25.1.ebuild 
b/app-emulation/docker-compose/docker-compose-1.25.1.ebuild
new file mode 100644
index 000..2c7c3fe978b
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.25.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose;
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+   >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
+   >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+   >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+   >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+   dev-python/paramiko[${PYTHON_USEDEP}]
+   >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+   >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+   >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+   >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+   >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep 
'>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
+   $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep 
'>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"
+
+DEPEND="${RDEPEND}
+   test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
+
+S="${WORKDIR}/compose-${PV}"
+
+PATCHES=(
+   # Bug #679968 -- https://bugs.gentoo.org/679968
+   # Bug #681002 -- https://bugs.gentoo.org/681002
+   "${FILESDIR}"/${PN}-1.25.0-setup-py.patch
+)
+
+src_prepare() {
+   # Address QA issue "docker-compose.exe: missing alias (symlink) for 
completed command."
+   sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i 
contrib/completion/bash/docker-compose || die
+
+   default
+}
+
+python_test() {
+   distutils_install_for_testing
+   ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+   newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+   insinto /usr/share/zsh/site-functions
+   doins contrib/completion/zsh/*
+
+   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/, app-emulation/docker-compose/

2019-11-28 Thread Sebastian Pipping
commit: 0dff3c31f19740553c5a8f8675e11853bd398496
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Thu Nov 28 20:53:26 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Thu Nov 28 20:55:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dff3c31

app-emulation/docker-compose: Fix 1.25.0 for py27

Closes: https://bugs.gentoo.org/701394
Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.78, Repoman-2.3.16

 ...se-1.25.0.ebuild => docker-compose-1.25.0-r1.ebuild} |  4 +++-
 .../files/docker-compose-1.25.0-setup-py.patch  | 17 +
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app-emulation/docker-compose/docker-compose-1.25.0.ebuild 
b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild
similarity index 90%
rename from app-emulation/docker-compose/docker-compose-1.25.0.ebuild
rename to app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild
index b90ebe18f8e..a6f8868eab7 100644
--- a/app-emulation/docker-compose/docker-compose-1.25.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild
@@ -30,9 +30,11 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep 
'>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 
'python2_7' )
$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 
'python2_7' )
-   $(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
+   $(python_gen_cond_dep 
'>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"
 
 DEPEND="${RDEPEND}
test? ( 
 Date: Mon, 18 Nov 2019 23:34:51 +0100
 Subject: [PATCH] setup.py: Drop generic upper version boundaries
 
 ---
- setup.py | 36 ++--
- 1 file changed, 18 insertions(+), 18 deletions(-)
+ setup.py | 38 +++---
+ 1 file changed, 19 insertions(+), 19 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 23ae08a..97a8fbe 100644
+index 23ae08a..3f6a46f 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -30,35 +30,35 @@ def find_version(*file_paths):
@@ -52,13 +52,14 @@ index 23ae08a..97a8fbe 100644
 -':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'],
 -':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
 -':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
-+':python_version < "3.2"': ['subprocess32 >= 3.5.4'],
-+':python_version < "3.4"': ['enum34 >= 1.0.4'],
-+':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
- ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0',
+-':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0',
 -'ipaddress >= 1.0.16, < 2'],
 -':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
 -'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
++':python_version < "3.2"': ['subprocess32 >= 3.5.4'],
++':python_version < "3.4"': ['enum34 >= 1.0.4'],
++':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
++':python_version < "3.3"': ['backports.shutil_get_terminal_size >= 1.0.0',
 +'ipaddress >= 1.0.16'],
 +':sys_platform == "win32"': ['colorama >= 0.4'],
 +'socks': ['PySocks >= 1.5.6, != 1.5.7'],



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-proxy/

2019-11-23 Thread Manuel Rüger
commit: e9ffb01777b90275259babab65b3d46f60deecc6
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sat Nov 23 11:16:05 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sat Nov 23 11:16:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9ffb017

app-emulation/docker-proxy: Drop myself as maintainer

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-proxy/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/app-emulation/docker-proxy/metadata.xml 
b/app-emulation/docker-proxy/metadata.xml
index 8b8b32d1ade..f40cbc947f0 100644
--- a/app-emulation/docker-proxy/metadata.xml
+++ b/app-emulation/docker-proxy/metadata.xml
@@ -5,10 +5,6 @@
tia...@dockerproject.org
Tianon

-   
-   mr...@gentoo.org
-   Manuel Rüger
-   

willi...@gentoo.org
William Hubbs



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-proxy/

2019-11-21 Thread Manuel Rüger
commit: 5de942275d7ea6012c80c4ef8fe9560919424b04
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Nov 21 10:39:29 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Nov 21 10:40:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de94227

app-emulation/docker-proxy: Stabilize on amd64

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-proxy/docker-proxy-0.8.0_p20191011.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20191011.ebuild 
b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20191011.ebuild
index dbfc6c6a965..7fb0f4d07d6 100644
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20191011.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20191011.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == * ]]; then
 else
EGIT_COMMIT="3eb39382bfa6a3c42f83674ab080ae13b0e34e5d"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
 fi
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-11-21 Thread Manuel Rüger
commit: 5ddcb267e283e2508556cd974c47450a8aa00af9
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Nov 21 10:39:53 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Nov 21 10:40:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ddcb267

app-emulation/docker: Stabilize on amd64

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/docker-19.03.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker/docker-19.03.5.ebuild 
b/app-emulation/docker/docker-19.03.5.ebuild
index 4c71e2c64d4..16734cab207 100644
--- a/app-emulation/docker/docker-19.03.5.ebuild
+++ b/app-emulation/docker/docker-19.03.5.ebuild
@@ -14,7 +14,7 @@ else
DOCKER_GITCOMMIT="633a0ea"
MY_PV=${PV/_/-}
SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64"
+   KEYWORDS="amd64 ~arm ~arm64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually 
for each bump!"
inherit golang-vcs-snapshot
 fi



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-11-20 Thread Manuel Rüger
commit: d72d43627bc50605c9b940083118bcda07487047
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Nov 20 22:19:58 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Nov 20 22:19:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d72d4362

app-emulation/docker: Remove old

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   2 -
 app-emulation/docker/docker-19.03.2.ebuild | 308 
 app-emulation/docker/docker-19.03.3.ebuild | 309 -
 3 files changed, 619 deletions(-)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 5b3680b9fe3..035a0cc97bb 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,5 +1,3 @@
 DIST docker-18.09.9.tar.gz 15299640 BLAKE2B 
2a4fa670ddac0136e85300fd137a8ea91651c51c54fa3d52ddc5b1a640a1ee202a34f428fcf9eea286c581f49a2c28b711100e7541773e5bc1f2e37884cae2dc
 SHA512 
d0235ae54e4d8d4d0893f6f35293f36177afabc71d0b3e6a74341260e52dcd9351a924efe8fa299cf9a51efdc68b6b284f6435d7210c44193a673f7fff71ce0b
-DIST docker-19.03.2.tar.gz 16657356 BLAKE2B 
3e48ea67f1ef65786c30b4d47b29dbe92d7fb7b043d2c4f15c07cdc929554a07870ce5ade2c1fe26eebea74d28dc71752e9c96e86fe12e0d96608059b5c91f11
 SHA512 
6b594fdbb53dcc0228781375a3884eb370446738c44f7c1e42945c4ccc263e75f53d984bc8ea6a6a498446859e667305bd967299c12956f1cb925d868a4bf2b8
-DIST docker-19.03.3.tar.gz 16960782 BLAKE2B 
8ce23ca22edf7c4435dbaca5a0321de52b108951b935d5ed82439c57409757cd054698934f9dbab0db74d5c9f6a6d04c5ca33e64212dedc0c9bf92d06ddb
 SHA512 
251756ca8b5d8eb962fde447fdab8307ce8013e14dc3b955387af5d8bdfdee16ea170ecb37a59e5900fa5c2e366f0d4080e79c28e5b8ef945cc67cb959d88eef
 DIST docker-19.03.4.tar.gz 16961040 BLAKE2B 
15d88d6f97ff70f6a0220f3d62b2040b4d859414b323b07e54802cb8e8dbb8d074562635bbfd9d00df529d0792fb5767d28548843ec73ad21cf7d7fcb1ac0c6e
 SHA512 
bcf79f82eb8433b8c04ceb2fd90a80101b148dd819f5bbda83d535ff2fad65d08aee2f72ac41c38ce879f3970a087555bb7ab63c5bb071a3c1cd6aa177621cac
 DIST docker-19.03.5.tar.gz 16966994 BLAKE2B 
7326ba17c0eef7bcebb5df1484992a30f696d2f238d149dbaf964004b725badfc1e9c85ed3ba76ac95b566cda9cb7018fe4fa7d282af1d1e36f4765e1445f25b
 SHA512 
1afe41e740ae0e32a8210aac3c4b24ddb1ae00ff19e8ec435de2e61cfc25494d38129fd619bacf964e3e7a96e12dd44a0c57f6e2c36aa7c3bb67a3df0c237648

diff --git a/app-emulation/docker/docker-19.03.2.ebuild 
b/app-emulation/docker/docker-19.03.2.ebuild
deleted file mode 100644
index c501202e523..000
--- a/app-emulation/docker/docker-19.03.2.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = ** ]]; then
-   # Docker cannot be fetched via "go get", thanks to autogenerated code
-   EGIT_REPO_URI="https://${EGO_PN}.git;
-   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-   inherit git-r3
-else
-   DOCKER_GITCOMMIT="6a30dfc"
-   MY_PV=${PV/_/-}
-   SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64"
-   [ "$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
-
-DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
-HOMEPAGE="https://dockerproject.org;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
seccomp"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-   >=dev-db/sqlite-3.7.9:3
-   device-mapper? (
-   >=sys-fs/lvm2-2.02.89[thin]
-   )
-   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-   apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-   ${CDEPEND}
-
-   dev-go/go-md2man
-
-   btrfs? (
-   >=sys-fs/btrfs-progs-3.16.1
-   )
-"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-   ${CDEPEND}
-   >=net-firewall/iptables-1.4
-   sys-process/procps
-   >=dev-vcs/git-1.7
-   >=app-arch/xz-utils-4.9
-   dev-libs/libltdl
-   ~app-emulation/containerd-1.2.6
-   ~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
-   ~app-emulation/docker-proxy-0.8.0_p20190604
-   container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-11-20 Thread Manuel Rüger
commit: e50f8753eaa63d9f21331b5bf828da5943f67805
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Nov 20 16:45:17 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Nov 20 16:51:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50f8753

app-emulation/docker: Version bump to 19.03.5

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 app-emulation/docker/docker-19.03.5.ebuild | 309 +
 2 files changed, 310 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index a5fd02046d1..5b3680b9fe3 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -2,3 +2,4 @@ DIST docker-18.09.9.tar.gz 15299640 BLAKE2B 
2a4fa670ddac0136e85300fd137a8ea91651
 DIST docker-19.03.2.tar.gz 16657356 BLAKE2B 
3e48ea67f1ef65786c30b4d47b29dbe92d7fb7b043d2c4f15c07cdc929554a07870ce5ade2c1fe26eebea74d28dc71752e9c96e86fe12e0d96608059b5c91f11
 SHA512 
6b594fdbb53dcc0228781375a3884eb370446738c44f7c1e42945c4ccc263e75f53d984bc8ea6a6a498446859e667305bd967299c12956f1cb925d868a4bf2b8
 DIST docker-19.03.3.tar.gz 16960782 BLAKE2B 
8ce23ca22edf7c4435dbaca5a0321de52b108951b935d5ed82439c57409757cd054698934f9dbab0db74d5c9f6a6d04c5ca33e64212dedc0c9bf92d06ddb
 SHA512 
251756ca8b5d8eb962fde447fdab8307ce8013e14dc3b955387af5d8bdfdee16ea170ecb37a59e5900fa5c2e366f0d4080e79c28e5b8ef945cc67cb959d88eef
 DIST docker-19.03.4.tar.gz 16961040 BLAKE2B 
15d88d6f97ff70f6a0220f3d62b2040b4d859414b323b07e54802cb8e8dbb8d074562635bbfd9d00df529d0792fb5767d28548843ec73ad21cf7d7fcb1ac0c6e
 SHA512 
bcf79f82eb8433b8c04ceb2fd90a80101b148dd819f5bbda83d535ff2fad65d08aee2f72ac41c38ce879f3970a087555bb7ab63c5bb071a3c1cd6aa177621cac
+DIST docker-19.03.5.tar.gz 16966994 BLAKE2B 
7326ba17c0eef7bcebb5df1484992a30f696d2f238d149dbaf964004b725badfc1e9c85ed3ba76ac95b566cda9cb7018fe4fa7d282af1d1e36f4765e1445f25b
 SHA512 
1afe41e740ae0e32a8210aac3c4b24ddb1ae00ff19e8ec435de2e61cfc25494d38129fd619bacf964e3e7a96e12dd44a0c57f6e2c36aa7c3bb67a3df0c237648

diff --git a/app-emulation/docker/docker-19.03.5.ebuild 
b/app-emulation/docker/docker-19.03.5.ebuild
new file mode 100644
index 000..4c71e2c64d4
--- /dev/null
+++ b/app-emulation/docker/docker-19.03.5.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   DOCKER_GITCOMMIT="633a0ea"
+   MY_PV=${PV/_/-}
+   SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   >=dev-lang/go-1.12
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.2.10
+   ~app-emulation/runc-1.0.0_rc9[apparmor?,seccomp?]
+   ~app-emulation/docker-proxy-0.8.0_p20191011
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
+   ~KEYS
+   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+   ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
+   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+   ~POSIX_MQUEUE
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/, app-emulation/docker-compose/files/

2019-11-18 Thread Sebastian Pipping
commit: e3fa3feb267ade0455c5f36e6faaf0bec54b2a4c
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Mon Nov 18 22:39:56 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Mon Nov 18 22:47:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3fa3feb

app-emulation/docker-compose: 1.25.0

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.78, Repoman-2.3.16

 app-emulation/docker-compose/Manifest  |  1 +
 .../docker-compose/docker-compose-1.25.0.ebuild| 68 +
 .../files/docker-compose-1.25.0-setup-py.patch | 70 ++
 3 files changed, 139 insertions(+)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index 677fb229edc..088a5454977 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,2 +1,3 @@
 DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B 
cb2a6f96e14c04d0279b25c075182d8f09e5a622e4cee2ce74995224e3a8634cc5f22ccc548b7754bbeb11630c1e638386cb1a6df927b3619cb6e7e3595aac6c
 SHA512 
318c6bf9877147de09526b4d49c3fd86012d85626e7a9a15863ca55a60e10fa85b27429605045d0aaa9933bc2e5f23cbb76856276a874e84793b878a3e86
 DIST docker-compose-1.24.1.tar.gz 307749 BLAKE2B 
7ded0a4b82a7a9beb9de38752f38998ca4ea9421e5ed5630627820ec7e250ad6f03f6788bcbebe8bc0dd4c064d275bb4ca5a6055a95b6a0f72d7ae9038ec7f22
 SHA512 
9b8632ef263b8dfa678e8b99b46e00441f779716a524280ce25f62fcd2605f400723b7790c466338374c34653946dc2c5d7f09593ddd892fee3409c2a2fd1a5f
+DIST docker-compose-1.25.0.tar.gz 320048 BLAKE2B 
a0615c9d81f897f551d664799e2a7cd4d72c3e0b70ceb0ff9bfb533a81799d2d524824ead27bff2391c5e98fc34430fb2ba724bba663ece66417ac72181241f0
 SHA512 
38be153a8ba1bf1a4a5c63dc794db3344c93c0819fba0c38feb791067e0aa72142205e4255b5fd31bf2f8159dfa04cde09fdcdabe0511bc0e2865974dff5433d

diff --git a/app-emulation/docker-compose/docker-compose-1.25.0.ebuild 
b/app-emulation/docker-compose/docker-compose-1.25.0.ebuild
new file mode 100644
index 000..bc3f9067249
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.25.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose;
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+   >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
+   >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+   >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+   >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+   dev-python/paramiko[${PYTHON_USEDEP}]
+   >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+   >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+   >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+   >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+   >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
+
+DEPEND="${RDEPEND}
+   test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
+
+S="${WORKDIR}/compose-${PV}"
+
+PATCHES=(
+   # Bug #679968 -- https://bugs.gentoo.org/679968
+   # Bug #681002 -- https://bugs.gentoo.org/681002
+   "${FILESDIR}"/${PN}-1.25.0-setup-py.patch
+)
+
+src_prepare() {
+   # Address QA issue "docker-compose.exe: missing alias (symlink) for 
completed command."
+   sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i 
contrib/completion/bash/docker-compose || die
+
+   default
+}
+
+python_test() {
+   distutils_install_for_testing
+   ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+   newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+   insinto /usr/share/zsh/site-functions
+   doins contrib/completion/zsh/*
+
+   distutils-r1_python_install_all
+}

diff --git 
a/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch 
b/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch
new file mode 100644
index 000..029dc54bb8f
--- /dev/null
+++ b/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch
@@ -0,0 +1,70 @@
+From 8f2924d4146ddb1131e98efbee13a68b5445b7f8 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping 
+Date: Mon, 18 Nov 2019 23:34:51 +0100
+Subject: 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-10-21 Thread Manuel Rüger
commit: d0ff6235e00ba18e164bd7a45c0462ade8d61374
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Oct 21 18:18:30 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Oct 21 18:18:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0ff6235

app-emulation/docker: Version bump to 19.03.4

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 app-emulation/docker/docker-19.03.4.ebuild | 309 +
 2 files changed, 310 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 58ba3448abc..a5fd02046d1 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1,4 @@
 DIST docker-18.09.9.tar.gz 15299640 BLAKE2B 
2a4fa670ddac0136e85300fd137a8ea91651c51c54fa3d52ddc5b1a640a1ee202a34f428fcf9eea286c581f49a2c28b711100e7541773e5bc1f2e37884cae2dc
 SHA512 
d0235ae54e4d8d4d0893f6f35293f36177afabc71d0b3e6a74341260e52dcd9351a924efe8fa299cf9a51efdc68b6b284f6435d7210c44193a673f7fff71ce0b
 DIST docker-19.03.2.tar.gz 16657356 BLAKE2B 
3e48ea67f1ef65786c30b4d47b29dbe92d7fb7b043d2c4f15c07cdc929554a07870ce5ade2c1fe26eebea74d28dc71752e9c96e86fe12e0d96608059b5c91f11
 SHA512 
6b594fdbb53dcc0228781375a3884eb370446738c44f7c1e42945c4ccc263e75f53d984bc8ea6a6a498446859e667305bd967299c12956f1cb925d868a4bf2b8
 DIST docker-19.03.3.tar.gz 16960782 BLAKE2B 
8ce23ca22edf7c4435dbaca5a0321de52b108951b935d5ed82439c57409757cd054698934f9dbab0db74d5c9f6a6d04c5ca33e64212dedc0c9bf92d06ddb
 SHA512 
251756ca8b5d8eb962fde447fdab8307ce8013e14dc3b955387af5d8bdfdee16ea170ecb37a59e5900fa5c2e366f0d4080e79c28e5b8ef945cc67cb959d88eef
+DIST docker-19.03.4.tar.gz 16961040 BLAKE2B 
15d88d6f97ff70f6a0220f3d62b2040b4d859414b323b07e54802cb8e8dbb8d074562635bbfd9d00df529d0792fb5767d28548843ec73ad21cf7d7fcb1ac0c6e
 SHA512 
bcf79f82eb8433b8c04ceb2fd90a80101b148dd819f5bbda83d535ff2fad65d08aee2f72ac41c38ce879f3970a087555bb7ab63c5bb071a3c1cd6aa177621cac

diff --git a/app-emulation/docker/docker-19.03.4.ebuild 
b/app-emulation/docker/docker-19.03.4.ebuild
new file mode 100644
index 000..8d52724b145
--- /dev/null
+++ b/app-emulation/docker/docker-19.03.4.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   DOCKER_GITCOMMIT="9013bf5"
+   MY_PV=${PV/_/-}
+   SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   >=dev-lang/go-1.12
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.2.10
+   ~app-emulation/runc-1.0.0_rc9[apparmor?,seccomp?]
+   ~app-emulation/docker-proxy-0.8.0_p20191011
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
+   ~KEYS
+   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+   ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
+   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+   ~POSIX_MQUEUE
+
+   ~USER_NS
+   ~SECCOMP
+   ~CGROUP_PIDS
+   ~MEMCG_SWAP 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-proxy/

2019-10-21 Thread Manuel Rüger
commit: 63bee18334e5b0bdda8e04739131e63c984b5cfe
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Oct 21 18:17:49 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Oct 21 18:17:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63bee183

app-emulation/docker-proxy: Version bump for docker 19.03.4

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-proxy/Manifest|  1 +
 .../docker-proxy-0.8.0_p20191011.ebuild| 34 ++
 2 files changed, 35 insertions(+)

diff --git a/app-emulation/docker-proxy/Manifest 
b/app-emulation/docker-proxy/Manifest
index 8622733d583..40b22745d58 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -1,3 +1,4 @@
 DIST docker-proxy-0.8.0_p20190513.tar.gz 2705298 BLAKE2B 
ff897b18b8265b3d718caf7afaf10f7b8eeed9be0cc9c73b02d5c42c5c9ddd1be32cf7d1259ce26d56219cda57707e25e154e50cfa2cc80e823a4b924da4e5e0
 SHA512 
0a833510df002bfc05c23445a58a8b2ff165c0fb2fd5c411498d1e89b5b1990d2778b32346dd2b6d61c166ff707c6277a5d1937db6345c77d3825eb59875
 DIST docker-proxy-0.8.0_p20190604.tar.gz 2721379 BLAKE2B 
edc36302ca4b2be297505a5bfd8acd45f17bc752e88bcaa72f34e2d972230d92b9bfe3d0dccbb2f1e04718fb1adc95631fc0f533ca5572bdcfc468d843ce480e
 SHA512 
dea31fd82ab2d445fbd39fe15550a91f7e489a06f6dedd32ea1925f7e9a7971952d26b874f9687249609a0d204ea35da357e0a957b819df2026a0cf8109cb354
 DIST docker-proxy-0.8.0_p20190807.tar.gz 3377742 BLAKE2B 
c1ccc76dd9157c715d09db27b6800a86b0dc7532089d87eb78a6e656f3b42d4c4824c34e972196038f915e3b08b12197f305fd1a86e3fe75fec621ed49e5e71a
 SHA512 
ffe18805dc6b85f8b058e342cde2baedf2497465298daa444fecba8222885606c85242ca59016bc32a5c2c0164c1c980b92ed3d5f82e011a7e9871a67d67b947
+DIST docker-proxy-0.8.0_p20191011.tar.gz 3377526 BLAKE2B 
10dd1817ffa65dc75855daba5efbe6dc7c8a048e8868354d2ad7c2cc4e99dcedb95ba4c5e37a54d60e4bd89c5f5bcac5fde4db8d21b7cc903fd42e4224a084e0
 SHA512 
a21b9b5883056cf75dda9f229ff199e6daad63d94dcf75ebe3e21204bdeef89c41ddd5730bb6bb4387af9a84a8a81e7adfaf726b2fdd299d8aa9d6d35a096ce2

diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20191011.ebuild 
b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20191011.ebuild
new file mode 100644
index 000..dbfc6c6a965
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20191011.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == * ]]; then
+   inherit golang-vcs
+else
+   EGIT_COMMIT="3eb39382bfa6a3c42f83674ab080ae13b0e34e5d"
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test" # needs dockerd
+
+src_compile() {
+   GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || 
die
+}
+
+src_install() {
+   dodoc README.md CHANGELOG.md
+   dobin bin/docker-proxy
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-proxy/

2019-10-09 Thread Manuel Rüger
commit: 60c3c138353e5b0f54dcdf37434f86074209c73e
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Oct  9 14:20:02 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Oct  9 16:57:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60c3c138

app-emulation/docker-proxy: Version bump for docker-19.03.3

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-proxy/Manifest|  1 +
 .../docker-proxy-0.8.0_p20190807.ebuild| 34 ++
 2 files changed, 35 insertions(+)

diff --git a/app-emulation/docker-proxy/Manifest 
b/app-emulation/docker-proxy/Manifest
index a387c1564a0..8622733d583 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -1,2 +1,3 @@
 DIST docker-proxy-0.8.0_p20190513.tar.gz 2705298 BLAKE2B 
ff897b18b8265b3d718caf7afaf10f7b8eeed9be0cc9c73b02d5c42c5c9ddd1be32cf7d1259ce26d56219cda57707e25e154e50cfa2cc80e823a4b924da4e5e0
 SHA512 
0a833510df002bfc05c23445a58a8b2ff165c0fb2fd5c411498d1e89b5b1990d2778b32346dd2b6d61c166ff707c6277a5d1937db6345c77d3825eb59875
 DIST docker-proxy-0.8.0_p20190604.tar.gz 2721379 BLAKE2B 
edc36302ca4b2be297505a5bfd8acd45f17bc752e88bcaa72f34e2d972230d92b9bfe3d0dccbb2f1e04718fb1adc95631fc0f533ca5572bdcfc468d843ce480e
 SHA512 
dea31fd82ab2d445fbd39fe15550a91f7e489a06f6dedd32ea1925f7e9a7971952d26b874f9687249609a0d204ea35da357e0a957b819df2026a0cf8109cb354
+DIST docker-proxy-0.8.0_p20190807.tar.gz 3377742 BLAKE2B 
c1ccc76dd9157c715d09db27b6800a86b0dc7532089d87eb78a6e656f3b42d4c4824c34e972196038f915e3b08b12197f305fd1a86e3fe75fec621ed49e5e71a
 SHA512 
ffe18805dc6b85f8b058e342cde2baedf2497465298daa444fecba8222885606c85242ca59016bc32a5c2c0164c1c980b92ed3d5f82e011a7e9871a67d67b947

diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190807.ebuild 
b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190807.ebuild
new file mode 100644
index 000..1c5ef257e17
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190807.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == * ]]; then
+   inherit golang-vcs
+else
+   EGIT_COMMIT="45c710223c5fbf04dc3028b9a90b51892e36ca7f"
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test" # needs dockerd
+
+src_compile() {
+   GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || 
die
+}
+
+src_install() {
+   dodoc README.md CHANGELOG.md
+   dobin bin/docker-proxy
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-10-09 Thread Manuel Rüger
commit: 823df5c504a2f7764e1f458eaa8b4c8dbb97c0df
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Oct  9 14:25:13 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Oct  9 16:57:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=823df5c5

app-emulation/docker: Version bump to 19.03.3

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 app-emulation/docker/docker-19.03.3.ebuild | 309 +
 2 files changed, 310 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 0e4d9c3760d..58ba3448abc 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,2 +1,3 @@
 DIST docker-18.09.9.tar.gz 15299640 BLAKE2B 
2a4fa670ddac0136e85300fd137a8ea91651c51c54fa3d52ddc5b1a640a1ee202a34f428fcf9eea286c581f49a2c28b711100e7541773e5bc1f2e37884cae2dc
 SHA512 
d0235ae54e4d8d4d0893f6f35293f36177afabc71d0b3e6a74341260e52dcd9351a924efe8fa299cf9a51efdc68b6b284f6435d7210c44193a673f7fff71ce0b
 DIST docker-19.03.2.tar.gz 16657356 BLAKE2B 
3e48ea67f1ef65786c30b4d47b29dbe92d7fb7b043d2c4f15c07cdc929554a07870ce5ade2c1fe26eebea74d28dc71752e9c96e86fe12e0d96608059b5c91f11
 SHA512 
6b594fdbb53dcc0228781375a3884eb370446738c44f7c1e42945c4ccc263e75f53d984bc8ea6a6a498446859e667305bd967299c12956f1cb925d868a4bf2b8
+DIST docker-19.03.3.tar.gz 16960782 BLAKE2B 
8ce23ca22edf7c4435dbaca5a0321de52b108951b935d5ed82439c57409757cd054698934f9dbab0db74d5c9f6a6d04c5ca33e64212dedc0c9bf92d06ddb
 SHA512 
251756ca8b5d8eb962fde447fdab8307ce8013e14dc3b955387af5d8bdfdee16ea170ecb37a59e5900fa5c2e366f0d4080e79c28e5b8ef945cc67cb959d88eef

diff --git a/app-emulation/docker/docker-19.03.3.ebuild 
b/app-emulation/docker/docker-19.03.3.ebuild
new file mode 100644
index 000..1cbb014cfdd
--- /dev/null
+++ b/app-emulation/docker/docker-19.03.3.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   DOCKER_GITCOMMIT="1576bd7"
+   MY_PV=${PV/_/-}
+   SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   >=dev-lang/go-1.12
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.2.10
+   ~app-emulation/runc-1.0.0_rc9[apparmor?,seccomp?]
+   ~app-emulation/docker-proxy-0.8.0_p20190807
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
+   ~KEYS
+   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+   ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
+   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+   ~POSIX_MQUEUE
+
+   ~USER_NS
+   ~SECCOMP
+   ~CGROUP_PIDS
+   ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+   ~BLK_CGROUP ~BLK_DEV_THROTTLING
+   ~CGROUP_PERF
+   ~CGROUP_HUGETLB
+   ~NET_CLS_CGROUP
+   ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+   ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+   ~VXLAN
+   ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-registry/files/

2019-09-28 Thread Zac Medico
commit: e14174e202816166c529e6f9348edcfb744db11a
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Sep 28 07:41:37 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sat Sep 28 21:56:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e14174e2

app-emulation/docker-registry: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/13066
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Zac Medico  gentoo.org>

 ...ocker-registry-2.6.1-notifications-expvar.patch | 64 --
 1 file changed, 64 deletions(-)

diff --git 
a/app-emulation/docker-registry/files/docker-registry-2.6.1-notifications-expvar.patch
 
b/app-emulation/docker-registry/files/docker-registry-2.6.1-notifications-expvar.patch
deleted file mode 100644
index 1d40edf1f0c..000
--- 
a/app-emulation/docker-registry/files/docker-registry-2.6.1-notifications-expvar.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 9a58c91051e03b46f1461e371a7bf527c1284612 Mon Sep 17 00:00:00 2001
-From: Noah Treuhaft 
-Date: Wed, 8 Feb 2017 11:38:44 -0800
-Subject: [PATCH] notifications: fix expvar for Go 1.7
-
-Remove EndpointConfig.Transport from the return value of the
-registry.notifications.endpoints expvar.Func.  It results in an empty
-value for that expvar variable under Go 1.7 because it is a non-nil
-*http.Transport, which Go 1.7 can no longer encode as JSON.
-
-Signed-off-by: Noah Treuhaft 

- notifications/endpoint.go |  2 +-
- notifications/metrics_test.go | 28 
- 2 files changed, 29 insertions(+), 1 deletion(-)
- create mode 100644 notifications/metrics_test.go
-
-diff --git a/src/github.com/docker/distribution/notifications/endpoint.go 
b/src/github.com/docker/distribution/notifications/endpoint.go
-index 29a9e27b5..44d0f6d7b 100644
 a/src/github.com/docker/distribution/notifications/endpoint.go
-+++ b/src/github.com/docker/distribution/notifications/endpoint.go
-@@ -13,7 +13,7 @@ type EndpointConfig struct {
-   Threshold int
-   Backoff   time.Duration
-   IgnoredMediaTypes []string
--  Transport *http.Transport
-+  Transport *http.Transport `json:"-"`
- }
- 
- // defaults set any zero-valued fields to a reasonable default.
-diff --git a/src/github.com/docker/distribution/notifications/metrics_test.go 
b/src/github.com/docker/distribution/notifications/metrics_test.go
-new file mode 100644
-index 0..03a08e2c8
 /dev/null
-+++ b/notifications/metrics_test.go
-@@ -0,0 +1,28 @@
-+package notifications
-+
-+import (
-+  "encoding/json"
-+  "expvar"
-+  "testing"
-+)
-+
-+func TestMetricsExpvar(t *testing.T) {
-+  endpointsVar := 
expvar.Get("registry").(*expvar.Map).Get("notifications").(*expvar.Map).Get("endpoints")
-+
-+  var v interface{}
-+  if err := json.Unmarshal([]byte(endpointsVar.String()), ); err != nil 
{
-+  t.Fatalf("unexpected error unmarshaling endpoints: %v", err)
-+  }
-+  if v != nil {
-+  t.Fatalf("expected nil, got %#v", v)
-+  }
-+
-+  NewEndpoint("x", "y", EndpointConfig{})
-+
-+  if err := json.Unmarshal([]byte(endpointsVar.String()), ); err != nil 
{
-+  t.Fatalf("unexpected error unmarshaling endpoints: %v", err)
-+  }
-+  if slice, ok := v.([]interface{}); !ok || len(slice) != 1 {
-+  t.Logf("expected one-element []interface{}, got %#v", v)
-+  }
-+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-09-23 Thread Manuel Rüger
commit: 878b31dfa8a561b2531cd46dbd650e039c93
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Sep 18 07:30:27 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Sep 23 13:57:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=878b31df

app-emulation/docker: Stabilize on amd64

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/docker-18.09.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker/docker-18.09.9.ebuild 
b/app-emulation/docker/docker-18.09.9.ebuild
index 94950688f27..86284c9e396 100644
--- a/app-emulation/docker/docker-18.09.9.ebuild
+++ b/app-emulation/docker/docker-18.09.9.ebuild
@@ -14,7 +14,7 @@ else
DOCKER_GITCOMMIT="039a7df"
MY_PV=${PV/_/-}
SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64"
+   KEYWORDS="amd64 ~arm ~arm64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually 
for each bump!"
inherit golang-vcs-snapshot
 fi



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-09-23 Thread Manuel Rüger
commit: f9751fb76e7d7bbe40b6cc2cd30f20adf974e92d
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Sep 18 07:30:52 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Sep 23 13:58:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9751fb7

app-emulation/docker: Remove old

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   2 -
 app-emulation/docker/docker-18.09.8.ebuild | 308 -
 app-emulation/docker/docker-19.03.1.ebuild | 308 -
 3 files changed, 618 deletions(-)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 4893496ab53..0e4d9c3760d 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,4 +1,2 @@
-DIST docker-18.09.8.tar.gz 15263186 BLAKE2B 
9c6d23172e138491c383342753ddf0f7d3831d11b0d4212bd62709733a68b77151884c2a7a7b52e53a3885a84fc860eeb1561723e5967e0a95eff174fda68ae4
 SHA512 
34cf91da732ebbde88f0c8cd39664130e6bd344b18d4643715a00e1c4062d0838a37650a8ee68fb371abd8f01910c7bdce1237af74a49cd63b5ed5382eaf00ed
 DIST docker-18.09.9.tar.gz 15299640 BLAKE2B 
2a4fa670ddac0136e85300fd137a8ea91651c51c54fa3d52ddc5b1a640a1ee202a34f428fcf9eea286c581f49a2c28b711100e7541773e5bc1f2e37884cae2dc
 SHA512 
d0235ae54e4d8d4d0893f6f35293f36177afabc71d0b3e6a74341260e52dcd9351a924efe8fa299cf9a51efdc68b6b284f6435d7210c44193a673f7fff71ce0b
-DIST docker-19.03.1.tar.gz 16652136 BLAKE2B 
be5c001e48bdce0ea8e520c131ff1699d12e39c45cf7dba3452689879e29abe12509c5d70e4a82eb66ac599b85717cd7e057cff1a41ba552eb2ce549e692d991
 SHA512 
92b4e5fe2bbf96a261d290ca807550af45146be9d21680940bd6aa45d9127ae8ddbc706df4056f1720ed6975a2a92004f1789fae4109c50206904ad827d4bf2e
 DIST docker-19.03.2.tar.gz 16657356 BLAKE2B 
3e48ea67f1ef65786c30b4d47b29dbe92d7fb7b043d2c4f15c07cdc929554a07870ce5ade2c1fe26eebea74d28dc71752e9c96e86fe12e0d96608059b5c91f11
 SHA512 
6b594fdbb53dcc0228781375a3884eb370446738c44f7c1e42945c4ccc263e75f53d984bc8ea6a6a498446859e667305bd967299c12956f1cb925d868a4bf2b8

diff --git a/app-emulation/docker/docker-18.09.8.ebuild 
b/app-emulation/docker/docker-18.09.8.ebuild
deleted file mode 100644
index 58711331389..000
--- a/app-emulation/docker/docker-18.09.8.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = ** ]]; then
-   # Docker cannot be fetched via "go get", thanks to autogenerated code
-   EGIT_REPO_URI="https://${EGO_PN}.git;
-   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-   inherit git-r3
-else
-   DOCKER_GITCOMMIT="00dd43dd"
-   MY_PV=${PV/_/-}
-   SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64"
-   [ "$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
-
-DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
-HOMEPAGE="https://dockerproject.org;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
seccomp"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-   >=dev-db/sqlite-3.7.9:3
-   device-mapper? (
-   >=sys-fs/lvm2-2.02.89[thin]
-   )
-   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-   apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-   ${CDEPEND}
-
-   dev-go/go-md2man
-
-   btrfs? (
-   >=sys-fs/btrfs-progs-3.16.1
-   )
-"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-   ${CDEPEND}
-   >=net-firewall/iptables-1.4
-   sys-process/procps
-   >=dev-vcs/git-1.7
-   >=app-arch/xz-utils-4.9
-   dev-libs/libltdl
-   ~app-emulation/containerd-1.2.6
-   ~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
-   ~app-emulation/docker-proxy-0.8.0_p20190513
-   container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
-   ~KEYS
-   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
-   ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
-   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
-   ~POSIX_MQUEUE
-
-   ~USER_NS
-   ~SECCOMP
- 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-registry/

2019-09-18 Thread Zac Medico
commit: 400b0c2e011d9466f5b53f709c5c0963bddd0c3e
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Sep 19 02:04:58 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Sep 19 02:04:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=400b0c2e

app-emulation/docker-registry: Remove old versions

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/docker-registry/Manifest |  2 -
 .../docker-registry-2.6.2-r1.ebuild| 43 ---
 .../docker-registry-2.7.0-r1.ebuild| 48 --
 .../docker-registry/docker-registry-2.7.0.ebuild   | 41 --
 4 files changed, 134 deletions(-)

diff --git a/app-emulation/docker-registry/Manifest 
b/app-emulation/docker-registry/Manifest
index 9bf0d949d91..c13a696e584 100644
--- a/app-emulation/docker-registry/Manifest
+++ b/app-emulation/docker-registry/Manifest
@@ -1,3 +1 @@
-DIST docker-registry-2.6.2.tar.gz 1579760 BLAKE2B 
d0e067f2e9124847b5e362f23ca7d67655fbf0a6227efc3fd9073d5360389d6d8531e5709b52225c54e6e3097a2d5d79102e27fd09412b95d2e5d8a4a30dde2d
 SHA512 
a091db2e15d7c1dc8cd39a40de5bb63cc1ead68e95dfaf6b3735a789adb87f146c03eff81f700e0059e5f6ffc43e6c3dd3358503697882cb080b991629f82c60
-DIST docker-registry-2.7.0.tar.gz 1996485 BLAKE2B 
49022546b72a1ea2b457a3dc059d8940bfba3070208b2962f8acd1351312d568d6facc1690ae8ee78742b5647c3a84bd6538a9eb0c279aec0a8dfae2c823fa61
 SHA512 
72bf5f0953c58e4d1adf6427ee13a9456204ab278d4489277e4dd1b3a3df6717cc02c966cdfcdf77d86e769209fa18e377e0b12a6c02b9f58980185e9844aec6
 DIST docker-registry-2.7.1.tar.gz 1996699 BLAKE2B 
2e22db69f476be5a4688f5b3d6b41fbbf71460351543ae849f707dd5b3d56624f674815a25214002886b057f0859f75fd197bb275a7b3cc8a7787422f716ad0e
 SHA512 
f6baf0e7aa96ebe828c628f7dfd84ee899331c3c1bdab86662aef595b092702b6d9b2c9be766a6de6d153ff4ca55d85c5fd8785a0968f285f56a32a50092c754

diff --git a/app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild 
b/app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild
deleted file mode 100644
index 863b9ac5082..000
--- a/app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/docker/distribution"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Docker Registry 2.0"
-HOMEPAGE="https://github.com/docker/distribution;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-SVCNAME=registry
-
-PATCHES=( "${FILESDIR}/${PN}-2.6.1-notifications-expvar.patch" )
-
-pkg_setup() {
-   enewgroup ${SVCNAME}
-   enewuser ${SVCNAME} -1 -1 /dev/null ${SVCNAME}
-}
-
-src_compile() {
-   export -n GOCACHE XDG_CACHE_HOME #681072
-   GOPATH="${S}" \
-   go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/..." || die
-}
-
-src_install() {
-   exeinto /usr/libexec/${PN}
-   doexe bin/*
-   insinto /etc/docker/registry
-   newins src/${EGO_PN}/cmd/registry/config-example.yml config.yml.example
-   newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
-   newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
-   systemd_dounit "${FILESDIR}/${SVCNAME}.service"
-   keepdir /var/{lib,log}/${SVCNAME}
-   fowners ${SVCNAME}:${SVCNAME} /var/{lib,log}/${SVCNAME}
-   insinto /etc/logrotate.d
-   newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
-}

diff --git a/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild 
b/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild
deleted file mode 100644
index c117f1e1314..000
--- a/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/docker/distribution"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Docker Registry 2.0"
-HOMEPAGE="https://github.com/docker/distribution;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-SVCNAME=registry
-
-pkg_setup() {
-   enewgroup ${SVCNAME}
-   enewuser ${SVCNAME} -1 -1 /dev/null ${SVCNAME}
-}
-
-src_prepare() {
-   default
-   pushd src/${EGO_PN} || die
-   eapply "${FILESDIR}"/${P}-notification-metrics.patch
-   popd || die
-}
-
-src_compile() {
-   export -n GOCACHE XDG_CACHE_HOME #681072
-   GOPATH="${S}" \
-   go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/..." || die
-}
-
-src_install() {
-   exeinto /usr/libexec/${PN}
-   doexe bin/*
-   insinto /etc/docker/registry
-   newins src/${EGO_PN}/cmd/registry/config-example.yml 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-registry/

2019-09-18 Thread Zac Medico
commit: b1d74fd5116887fec2a0d8206d56e9a870c4fcc8
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Sep 19 02:32:37 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Sep 19 02:33:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d74fd5

app-emulation/docker-registry: LICENSE: account for vendored software

Reported-by: Michał Górny  gentoo.org>
Bug: https://bugs.gentoo.org/694890
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/docker-registry/docker-registry-2.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker-registry/docker-registry-2.7.1.ebuild 
b/app-emulation/docker-registry/docker-registry-2.7.1.ebuild
index 57b97ad055d..23e7af931a1 100644
--- a/app-emulation/docker-registry/docker-registry-2.7.1.ebuild
+++ b/app-emulation/docker-registry/docker-registry-2.7.1.ebuild
@@ -10,7 +10,7 @@ EGIT_COMMIT="2461543d988979529609e8cb6fca9ca190dc48da"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="Docker Registry 2.0"
 HOMEPAGE="https://github.com/docker/distribution;
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 MIT ZLIB"
 SLOT="0"
 IUSE=""
 SVCNAME=registry



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-swarm/

2019-09-18 Thread Zac Medico
commit: d925e93db8e6fe2c22c39ab28225863f2b6a8b61
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Sep 19 02:02:57 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Sep 19 02:03:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d925e93d

app-emulation/docker-swarm: LICENSE: account for vendored software

Reported-by: Michał Górny  gentoo.org>
Bug: https://bugs.gentoo.org/694890
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild 
b/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild
index 10d18218802..95e2cbea5ca 100644
--- a/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild
+++ b/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://${EGO_PN%/*}/archive/${PV}.tar.gz -> 
${P}.tar.gz
https://github.com/Sirupsen/logrus/archive/v0.11.0.tar.gz -> 
logrus-0.11.0.tar.gz"
 DESCRIPTION="A Docker-native clustering system"
 HOMEPAGE="https://docs.docker.com/swarm;
-LICENSE="Apache-2.0 CC-BY-SA-4.0"
+LICENSE="Apache-2.0 CC-BY-SA-4.0 BSD BSD-2 ISC MIT MPL-2.0 WTFPL-2"
 SLOT="0"
 IUSE=""
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-swarm/

2019-09-18 Thread Zac Medico
commit: 48d35238b40eba8505ec5cf6559b34f9a2650737
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Sep 19 01:50:35 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Sep 19 01:50:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48d35238

app-emulation/docker-swarm: Remove old version 1.2.0

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/docker-swarm/Manifest|  1 -
 .../docker-swarm/docker-swarm-1.2.0.ebuild | 38 --
 2 files changed, 39 deletions(-)

diff --git a/app-emulation/docker-swarm/Manifest 
b/app-emulation/docker-swarm/Manifest
index 8958a437440..5c30c4fd969 100644
--- a/app-emulation/docker-swarm/Manifest
+++ b/app-emulation/docker-swarm/Manifest
@@ -1,4 +1,3 @@
-DIST docker-swarm-1.2.0.tar.gz 4474619 BLAKE2B 
2a0f6f06b549e8f0319c3c7f0e3a0b756a3c13aeb7cbee519e0c483b4c8831187e47b1eaae918efdce3c9fe3bf7d4da02c5e7d55b6235da5dba7827465b81508
 SHA512 
dab97d7df9d38c7bc7a1565788c84a13c8c792161d61a904ba9e45f43fbf835d055bd1c1a0f1d2f9b29f9b7fc6ed6fe19aef75b53288188caf82b152d37392ac
 DIST docker-swarm-1.2.5.tar.gz 4619026 BLAKE2B 
cae94bcb1bbb1f495b18662ac62ad3295d22547b332d6b6c4e55c070650fc3a1c314ef1ef696787b3109c0c5dce3c48979adc85031c0d65834d3d8ff5bd417b3
 SHA512 
2684c1fbb8e01c062c62137c874825120d0f2da0ca13808c1558ef01680a6f4d77bbff3769d1f59d9bb8011066f202dbb89c23d25597283cc24245db70731992
 DIST gobrake-2.0.8.tar.gz 6392 BLAKE2B 
ec3eccd5a52442163108c9e8f83e2e7a19ed45438c91e541d75af5cd44f382899098cecc5130c5d36a62ca53f1dc2062a82ec9e04b17e2db835cecdfbaa3b565
 SHA512 
76d1dfc55ddcbfa0b719d9eb3a75a0c8bc9d2f0308fef391cc59efa7c6b7607860c61c1e77d609d3a2d2cad473da359d0f1df98775a6da791a70d81f98ce5e6c
 DIST gogo-protobuf-0.3.tar.gz 2116795 BLAKE2B 
6b90ad97648e75724c69bb9b8d3cfb17b919a1121813c09ec463df99c290c117b0e0b87f43b285eb5147a205f2f926c223cc4b4d58205a286af2afa87dbd7f5b
 SHA512 
57e1b1715d4811800da8cf9f2c72d202deae622d89715d7eff2ff0c406a0ea3778c187443abb17b072ae6fe57382844807f103837032759dab5420c860b99fb8

diff --git a/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild 
b/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild
deleted file mode 100644
index c0ec9a06739..000
--- a/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGO_PN=github.com/docker/${PN##*-}/...
-
-if [[ ${PV} = ** ]]; then
-   inherit golang-vcs
-else
-   KEYWORDS="~amd64"
-   EGIT_COMMIT="v${PV}"
-   SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> 
${P}.tar.gz"
-   inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="A Docker-native clustering system"
-HOMEPAGE="https://docs.docker.com/swarm;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-DEPEND=">=dev-lang/go-1.6:=
-   !!

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-machine/

2019-09-18 Thread Zac Medico
commit: ee1d33b9a56864782f4d0184c0cc0c8a034da4e8
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Sep 19 01:40:40 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Sep 19 01:47:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee1d33b9

app-emulation/docker-machine: LICENSE: account for vendored software

Reported-by: Michał Górny  gentoo.org>
Bug: https://bugs.gentoo.org/694890
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/docker-machine/docker-machine-0.13.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/docker-machine/docker-machine-0.13.0.ebuild 
b/app-emulation/docker-machine/docker-machine-0.13.0.ebuild
index 1697e3defa6..974d8a443e7 100644
--- a/app-emulation/docker-machine/docker-machine-0.13.0.ebuild
+++ b/app-emulation/docker-machine/docker-machine-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ inherit golang-build
 
 DESCRIPTION="Machine management for a container-centric world"
 HOMEPAGE="https://docs.docker.com/machine/;
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0 ZLIB"
 SLOT="0"
 IUSE="hardened"
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-machine/

2019-09-18 Thread Zac Medico
commit: a73f37cbe129737989dda9f02e923117a4bf0a74
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Sep 19 01:32:48 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Sep 19 01:47:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a73f37cb

app-emulation/docker-machine: Remove old version 0.12.2

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/docker-machine/Manifest  |  1 -
 .../docker-machine/docker-machine-0.12.2.ebuild| 39 --
 2 files changed, 40 deletions(-)

diff --git a/app-emulation/docker-machine/Manifest 
b/app-emulation/docker-machine/Manifest
index 8167f7a04d5..e693d6a2c9d 100644
--- a/app-emulation/docker-machine/Manifest
+++ b/app-emulation/docker-machine/Manifest
@@ -1,2 +1 @@
-DIST docker-machine-0.12.2.tar.gz 1725590 BLAKE2B 
8e96fc0f54d7ce4ecea7a670c0851f5a0f9516316877da43dd3dce4e891c67a6231732a4102b82bf8bbd6f3b0be579f3c1faaaf2cad4be48ad00df21a704f240
 SHA512 
58b2ed13b56034f5bfb8374397aead67c669fc544409932f6c29ca56578ad61b3f584a8f32b281cafac56a9647d6e215ab5138045c2c6810a5d202c68bfdb3b0
 DIST docker-machine-0.13.0.tar.gz 1730091 BLAKE2B 
9268f55c1b2a630043be7875d6ab72eced67e5e5618c95666e9c31a4180b40bf770782405b4ecdc141c50398ace0de882a60922fcfb8068a498eb81f0e614da3
 SHA512 
c31b3505e475f5e55310cc3b8805db8b94522703956a640954c3898c584fc3a07830c346535855cbb2fb10016dd0e7ef72e7174e919a3651f05e18b652132121

diff --git a/app-emulation/docker-machine/docker-machine-0.12.2.ebuild 
b/app-emulation/docker-machine/docker-machine-0.12.2.ebuild
deleted file mode 100644
index 1697e3defa6..000
--- a/app-emulation/docker-machine/docker-machine-0.12.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN=github.com/docker/machine
-
-if [[ ${PV} = ** ]]; then
-   inherit golang-vcs
-else
-   KEYWORDS="~amd64"
-   EGIT_COMMIT="v${PV}"
-   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Machine management for a container-centric world"
-HOMEPAGE="https://docs.docker.com/machine/;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-RESTRICT="test"
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-src_prepare() {
-   default
-   # don't pre-strip binaries
-   sed -e 's|\(GO_LDFLAGS := $(GO_LDFLAGS) -w\) -s|\1|' -i mk/main.mk ||die
-}
-
-src_compile() {
-   CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" 
emake build || die
-}
-
-src_install() {
-   dobin bin/*
-   dodoc CHANGELOG.md CONTRIBUTING.md README.md ROADMAP.md
-}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-machine-kvm/

2019-09-18 Thread Zac Medico
commit: 9d84458da3461791005ad6e40a44c99e82f3175a
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Sep 19 01:45:50 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Sep 19 01:47:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d84458d

app-emulation/docker-machine-kvm: LICENSE: Add MPL-2.0 for vendored govcloudair

See: https://github.com/vmware/govcloudair/blob/master/LICENSE
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild 
b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
index 9fe51b9af89..509420dad7c 100644
--- a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
+++ b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
 DESCRIPTION="KVM driver for docker-machine"
 
 HOMEPAGE="https://github.com/dhiltgen/docker-machine-kvm;
-LICENSE="Apache-2.0 BSD CC-BY-SA-4.0 MIT ZLIB"
+LICENSE="Apache-2.0 BSD CC-BY-SA-4.0 MIT MPL-2.0 ZLIB"
 SLOT="0"
 IUSE=""
 COMMON_DEPEND="app-emulation/libvirt:=[qemu,virt-network]"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-machine-kvm/

2019-09-18 Thread Zac Medico
commit: 94ed176ed2259b338d6bf86c24b12b94461b3653
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Sep 19 01:30:36 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Sep 19 01:31:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ed176e

app-emulation/docker-machine-kvm: LICENSE: account for vendored software

Reported-by: Michał Górny  gentoo.org>
Bug: https://bugs.gentoo.org/694890
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild 
b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
index b9a0908fcb3..9fe51b9af89 100644
--- a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
+++ b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
 DESCRIPTION="KVM driver for docker-machine"
 
 HOMEPAGE="https://github.com/dhiltgen/docker-machine-kvm;
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD CC-BY-SA-4.0 MIT ZLIB"
 SLOT="0"
 IUSE=""
 COMMON_DEPEND="app-emulation/libvirt:=[qemu,virt-network]"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-09-05 Thread Manuel Rüger
commit: 1efa3f04dffe37b2f54d76f502ed96c85ee81529
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Sep  5 09:07:59 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Sep  5 09:07:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1efa3f04

app-emulation/docker: Version bump to 18.09.9

Package-Manager: Portage-2.3.75, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 app-emulation/docker/docker-18.09.9.ebuild | 308 +
 2 files changed, 309 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 51cb8d1b85a..4893496ab53 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1,4 @@
 DIST docker-18.09.8.tar.gz 15263186 BLAKE2B 
9c6d23172e138491c383342753ddf0f7d3831d11b0d4212bd62709733a68b77151884c2a7a7b52e53a3885a84fc860eeb1561723e5967e0a95eff174fda68ae4
 SHA512 
34cf91da732ebbde88f0c8cd39664130e6bd344b18d4643715a00e1c4062d0838a37650a8ee68fb371abd8f01910c7bdce1237af74a49cd63b5ed5382eaf00ed
+DIST docker-18.09.9.tar.gz 15299640 BLAKE2B 
2a4fa670ddac0136e85300fd137a8ea91651c51c54fa3d52ddc5b1a640a1ee202a34f428fcf9eea286c581f49a2c28b711100e7541773e5bc1f2e37884cae2dc
 SHA512 
d0235ae54e4d8d4d0893f6f35293f36177afabc71d0b3e6a74341260e52dcd9351a924efe8fa299cf9a51efdc68b6b284f6435d7210c44193a673f7fff71ce0b
 DIST docker-19.03.1.tar.gz 16652136 BLAKE2B 
be5c001e48bdce0ea8e520c131ff1699d12e39c45cf7dba3452689879e29abe12509c5d70e4a82eb66ac599b85717cd7e057cff1a41ba552eb2ce549e692d991
 SHA512 
92b4e5fe2bbf96a261d290ca807550af45146be9d21680940bd6aa45d9127ae8ddbc706df4056f1720ed6975a2a92004f1789fae4109c50206904ad827d4bf2e
 DIST docker-19.03.2.tar.gz 16657356 BLAKE2B 
3e48ea67f1ef65786c30b4d47b29dbe92d7fb7b043d2c4f15c07cdc929554a07870ce5ade2c1fe26eebea74d28dc71752e9c96e86fe12e0d96608059b5c91f11
 SHA512 
6b594fdbb53dcc0228781375a3884eb370446738c44f7c1e42945c4ccc263e75f53d984bc8ea6a6a498446859e667305bd967299c12956f1cb925d868a4bf2b8

diff --git a/app-emulation/docker/docker-18.09.9.ebuild 
b/app-emulation/docker/docker-18.09.9.ebuild
new file mode 100644
index 000..94950688f27
--- /dev/null
+++ b/app-emulation/docker/docker-18.09.9.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   DOCKER_GITCOMMIT="039a7df"
+   MY_PV=${PV/_/-}
+   SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.2.6
+   ~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
+   ~app-emulation/docker-proxy-0.8.0_p20190513
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
+   ~KEYS
+   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+   ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
+   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+   ~POSIX_MQUEUE
+
+   ~USER_NS
+   ~SECCOMP
+   ~CGROUP_PIDS
+   ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-09-04 Thread Manuel Rüger
commit: 705d80c401fe14ff1224b2b4c4ec3fbd7b0cd6fc
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Sep  4 13:49:50 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Sep  4 13:49:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=705d80c4

app-emulation/docker: Version bump to 19.03.2

Package-Manager: Portage-2.3.75, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 app-emulation/docker/docker-19.03.2.ebuild | 308 +
 2 files changed, 309 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 1c281c6c3df..51cb8d1b85a 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,2 +1,3 @@
 DIST docker-18.09.8.tar.gz 15263186 BLAKE2B 
9c6d23172e138491c383342753ddf0f7d3831d11b0d4212bd62709733a68b77151884c2a7a7b52e53a3885a84fc860eeb1561723e5967e0a95eff174fda68ae4
 SHA512 
34cf91da732ebbde88f0c8cd39664130e6bd344b18d4643715a00e1c4062d0838a37650a8ee68fb371abd8f01910c7bdce1237af74a49cd63b5ed5382eaf00ed
 DIST docker-19.03.1.tar.gz 16652136 BLAKE2B 
be5c001e48bdce0ea8e520c131ff1699d12e39c45cf7dba3452689879e29abe12509c5d70e4a82eb66ac599b85717cd7e057cff1a41ba552eb2ce549e692d991
 SHA512 
92b4e5fe2bbf96a261d290ca807550af45146be9d21680940bd6aa45d9127ae8ddbc706df4056f1720ed6975a2a92004f1789fae4109c50206904ad827d4bf2e
+DIST docker-19.03.2.tar.gz 16657356 BLAKE2B 
3e48ea67f1ef65786c30b4d47b29dbe92d7fb7b043d2c4f15c07cdc929554a07870ce5ade2c1fe26eebea74d28dc71752e9c96e86fe12e0d96608059b5c91f11
 SHA512 
6b594fdbb53dcc0228781375a3884eb370446738c44f7c1e42945c4ccc263e75f53d984bc8ea6a6a498446859e667305bd967299c12956f1cb925d868a4bf2b8

diff --git a/app-emulation/docker/docker-19.03.2.ebuild 
b/app-emulation/docker/docker-19.03.2.ebuild
new file mode 100644
index 000..c501202e523
--- /dev/null
+++ b/app-emulation/docker/docker-19.03.2.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   DOCKER_GITCOMMIT="6a30dfc"
+   MY_PV=${PV/_/-}
+   SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.2.6
+   ~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
+   ~app-emulation/docker-proxy-0.8.0_p20190604
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
+   ~KEYS
+   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+   ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
+   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+   ~POSIX_MQUEUE
+
+   ~USER_NS
+   ~SECCOMP
+   ~CGROUP_PIDS
+   ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+   ~BLK_CGROUP ~BLK_DEV_THROTTLING
+   ~CGROUP_PERF
+   ~CGROUP_HUGETLB
+   ~NET_CLS_CGROUP
+   ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+   ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+   ~VXLAN
+   ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-credential-helpers/

2019-08-09 Thread Joonas Niilola
commit: 967e6e8779995d82dfcee5313447ba9dc72280ac
Author: Rafael Kitover  gmail  com>
AuthorDate: Fri Aug  9 19:55:21 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Aug 10 05:06:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=967e6e87

app-emulation/docker-credential-helpers: add 0.6.3

Both stores tested to work correctly.

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Rafael Kitover  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12637
Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/docker-credential-helpers/Manifest   |  1 +
 .../docker-credential-helpers-0.6.3.ebuild | 58 ++
 2 files changed, 59 insertions(+)

diff --git a/app-emulation/docker-credential-helpers/Manifest 
b/app-emulation/docker-credential-helpers/Manifest
index 487217d743a..8e9ab64e45b 100644
--- a/app-emulation/docker-credential-helpers/Manifest
+++ b/app-emulation/docker-credential-helpers/Manifest
@@ -1 +1,2 @@
 DIST docker-credential-helpers-0.6.0.tar.gz 27441 BLAKE2B 
6517f069782d5a496d3f140d86e5b1f32f197e9209ed61f75bfb9ba29cf0e1fa509bdbbbce2defc14ad0abe316632683cfad25e7ac9a6a1d70c3289e0ad489f5
 SHA512 
359e8ec700f423ce0687f13ce02946007f90456abe86659a87c59419ebde5e79adb4d28ee5e6a9762a44cfd65648c247629a5273326abf18a8880bee637e74d8
+DIST docker-credential-helpers-0.6.3.tar.gz 28971 BLAKE2B 
b50e4de0f3b126e0118f24f845a94be5e932975ab54ad6e0a52129a56109ecafb021f14986569295242cb0af4ea109d8786b8a5ca8481cc48daad14671841432
 SHA512 
2d15be8df134bff08eef9461348f07cd57c70c15a0ab044de2e69296c400b8c0e16198c90fd064d5ce83037d0bad57520e7524b0832b7a00e69397203dc90d10

diff --git 
a/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild
 
b/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild
new file mode 100644
index 000..3f46440c7bb
--- /dev/null
+++ 
b/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A suite of programs to use native stores to keep Docker 
credentials safe"
+HOMEPAGE="https://github.com/docker/docker-credential-helpers;
+EGO_PN=github.com/docker/docker-credential-helpers
+
+LICENSE="MIT"
+SLOT="0"
+
+if [[ ${PV} = ** ]]; then
+   inherit golang-vcs
+else
+   KEYWORDS="~amd64"
+   EGIT_COMMIT="v${PV}"
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+   inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+IUSE="gnome-keyring pass"
+REQUIRED_USE="|| ( gnome-keyring pass )"
+RESTRICT="test"
+
+DEPEND="gnome-keyring? ( app-crypt/libsecret )"
+
+RDEPEND="(
+   ${DEPEND}
+   pass? ( app-admin/pass )
+)
+"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+   local -x GOPATH="${WORKDIR}/${P}"
+   use gnome-keyring && emake secretservice
+   use pass && emake pass
+}
+
+src_install() {
+   dobin bin/*
+   dodoc CHANGELOG.md MAINTAINERS README.md
+}
+
+pkg_postinst() {
+   if use gnome-keyring; then
+   elog "For gnome-keyring/kwallet add:\n"
+   elog '  "credStore": "secretservice"'"\n"
+   fi
+   if use pass; then
+   elog "For 'pass' add:\n"
+   elog '  "credStore": "pass"'"\n"
+   fi
+   elog "to your ~/.docker/config.json"
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-07-29 Thread Manuel Rüger
commit: 4ce24a96acc1f161e4ced2ab4cad13e6f18b2090
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Jul 29 09:12:25 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Jul 29 09:12:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ce24a96

app-emulation/docker: Fix kernel checks

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/docker-18.09.8.ebuild | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app-emulation/docker/docker-18.09.8.ebuild 
b/app-emulation/docker/docker-18.09.8.ebuild
index 54a3355176f..58711331389 100644
--- a/app-emulation/docker/docker-18.09.8.ebuild
+++ b/app-emulation/docker/docker-18.09.8.ebuild
@@ -71,7 +71,7 @@ CONFIG_CHECK="
~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
~KEYS
~VETH ~BRIDGE ~BRIDGE_NETFILTER
-   ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+   ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
~POSIX_MQUEUE
@@ -81,7 +81,7 @@ CONFIG_CHECK="
~CGROUP_PIDS
~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
 
-   ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+   ~BLK_CGROUP ~BLK_DEV_THROTTLING
~CGROUP_PERF
~CGROUP_HUGETLB
~NET_CLS_CGROUP
@@ -141,6 +141,14 @@ pkg_setup() {
"
fi
 
+   if kernel_is lt 5 1; then
+   CONFIG_CHECK+="
+   ~NF_NAT_IPV4
+   ~IOSCHED_CFQ
+   ~CFQ_GROUP_IOSCHED
+   "
+   fi
+
if use aufs; then
CONFIG_CHECK+="
~AUFS_FS



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-07-29 Thread Manuel Rüger
commit: 808b8bc13cb7e8228478ff6d6e5cdba570a1e6ad
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Jul 29 09:16:58 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Jul 29 09:16:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=808b8bc1

app-emulation/docker: Version bump to 19.03.1

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 app-emulation/docker/docker-19.03.1.ebuild | 308 +
 2 files changed, 309 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 9ec7b69503d..1c281c6c3df 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1 +1,2 @@
 DIST docker-18.09.8.tar.gz 15263186 BLAKE2B 
9c6d23172e138491c383342753ddf0f7d3831d11b0d4212bd62709733a68b77151884c2a7a7b52e53a3885a84fc860eeb1561723e5967e0a95eff174fda68ae4
 SHA512 
34cf91da732ebbde88f0c8cd39664130e6bd344b18d4643715a00e1c4062d0838a37650a8ee68fb371abd8f01910c7bdce1237af74a49cd63b5ed5382eaf00ed
+DIST docker-19.03.1.tar.gz 16652136 BLAKE2B 
be5c001e48bdce0ea8e520c131ff1699d12e39c45cf7dba3452689879e29abe12509c5d70e4a82eb66ac599b85717cd7e057cff1a41ba552eb2ce549e692d991
 SHA512 
92b4e5fe2bbf96a261d290ca807550af45146be9d21680940bd6aa45d9127ae8ddbc706df4056f1720ed6975a2a92004f1789fae4109c50206904ad827d4bf2e

diff --git a/app-emulation/docker/docker-19.03.1.ebuild 
b/app-emulation/docker/docker-19.03.1.ebuild
new file mode 100644
index 000..7c0a798fbfd
--- /dev/null
+++ b/app-emulation/docker/docker-19.03.1.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   DOCKER_GITCOMMIT="74b1e89"
+   MY_PV=${PV/_/-}
+   SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.2.6
+   ~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
+   ~app-emulation/docker-proxy-0.8.0_p20190604
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
+   ~KEYS
+   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+   ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
+   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+   ~POSIX_MQUEUE
+
+   ~USER_NS
+   ~SECCOMP
+   ~CGROUP_PIDS
+   ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+   ~BLK_CGROUP ~BLK_DEV_THROTTLING
+   ~CGROUP_PERF
+   ~CGROUP_HUGETLB
+   ~NET_CLS_CGROUP
+   ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+   ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+   ~VXLAN
+   ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO 
~XFRM_USER
+   ~IPVLAN
+   ~MACVLAN ~DUMMY
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap 
usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container 
statistics gathering"
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-07-29 Thread Manuel Rüger
commit: 1cbd2f3a462f7aba9175f21cadaf60b8fa4cd9e6
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Jul 29 09:06:55 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Jul 29 09:06:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cbd2f3a

app-emulation/docker: Remove old

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 -
 app-emulation/docker/docker-18.09.7.ebuild | 300 -
 2 files changed, 301 deletions(-)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 6636246a197..9ec7b69503d 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,2 +1 @@
-DIST docker-18.09.7.tar.gz 15264213 BLAKE2B 
5aa4be6d63271fd0b9a8ea480ed55a1dc312d479d7d387a35573963393b33da96086741dbb817aff765cceb81e309fd76122b3622dd91640a492a9f46c9dbd64
 SHA512 
7d06ab01673b5931a8dde1d2fcebf442d1a107c98c95cd8fe3b886c123b48470950601782fe0c83e7537a1e856069e79a096b9f4523fea7984fd3e773b243b66
 DIST docker-18.09.8.tar.gz 15263186 BLAKE2B 
9c6d23172e138491c383342753ddf0f7d3831d11b0d4212bd62709733a68b77151884c2a7a7b52e53a3885a84fc860eeb1561723e5967e0a95eff174fda68ae4
 SHA512 
34cf91da732ebbde88f0c8cd39664130e6bd344b18d4643715a00e1c4062d0838a37650a8ee68fb371abd8f01910c7bdce1237af74a49cd63b5ed5382eaf00ed

diff --git a/app-emulation/docker/docker-18.09.7.ebuild 
b/app-emulation/docker/docker-18.09.7.ebuild
deleted file mode 100644
index e466c07b7c1..000
--- a/app-emulation/docker/docker-18.09.7.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = ** ]]; then
-   # Docker cannot be fetched via "go get", thanks to autogenerated code
-   EGIT_REPO_URI="https://${EGO_PN}.git;
-   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-   inherit git-r3
-else
-   DOCKER_GITCOMMIT="2d0083d"
-   MY_PV=${PV/_/-}
-   SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64"
-   [ "$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
-
-DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
-HOMEPAGE="https://dockerproject.org;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
seccomp"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-   >=dev-db/sqlite-3.7.9:3
-   device-mapper? (
-   >=sys-fs/lvm2-2.02.89[thin]
-   )
-   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-   apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-   ${CDEPEND}
-
-   dev-go/go-md2man
-
-   btrfs? (
-   >=sys-fs/btrfs-progs-3.16.1
-   )
-"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-   ${CDEPEND}
-   >=net-firewall/iptables-1.4
-   sys-process/procps
-   >=dev-vcs/git-1.7
-   >=app-arch/xz-utils-4.9
-   dev-libs/libltdl
-   ~app-emulation/containerd-1.2.6
-   ~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
-   ~app-emulation/docker-proxy-0.8.0_p20190513
-   container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
-   ~KEYS
-   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
-   ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
-   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
-   ~POSIX_MQUEUE
-
-   ~USER_NS
-   ~SECCOMP
-   ~CGROUP_PIDS
-   ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
-   ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-   ~CGROUP_PERF
-   ~CGROUP_HUGETLB
-   ~NET_CLS_CGROUP
-   ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-   ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-   ~VXLAN
-   ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO 
~XFRM_USER
-   ~IPVLAN
-   ~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap 
usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-07-29 Thread Manuel Rüger
commit: 2470695f5345f6948228600531940e260f6e073e
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Jul 29 09:06:38 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Jul 29 09:06:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2470695f

app-emulation/docker: Stabilize 18.09.8

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/docker-18.09.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker/docker-18.09.8.ebuild 
b/app-emulation/docker/docker-18.09.8.ebuild
index 19f2b397a11..54a3355176f 100644
--- a/app-emulation/docker/docker-18.09.8.ebuild
+++ b/app-emulation/docker/docker-18.09.8.ebuild
@@ -14,7 +14,7 @@ else
DOCKER_GITCOMMIT="00dd43dd"
MY_PV=${PV/_/-}
SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64"
+   KEYWORDS="amd64 ~arm ~arm64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually 
for each bump!"
inherit golang-vcs-snapshot
 fi



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-proxy/

2019-07-29 Thread Manuel Rüger
commit: 038a9a6bd5173be886bd6abf864121752541abf0
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Jul 29 09:05:11 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Jul 29 09:05:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=038a9a6b

app-emulation/docker-proxy: Update snapshot for docker-19.03.1

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-proxy/Manifest|  1 +
 .../docker-proxy-0.8.0_p20190604.ebuild| 34 ++
 2 files changed, 35 insertions(+)

diff --git a/app-emulation/docker-proxy/Manifest 
b/app-emulation/docker-proxy/Manifest
index cbd11db94b9..a387c1564a0 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -1 +1,2 @@
 DIST docker-proxy-0.8.0_p20190513.tar.gz 2705298 BLAKE2B 
ff897b18b8265b3d718caf7afaf10f7b8eeed9be0cc9c73b02d5c42c5c9ddd1be32cf7d1259ce26d56219cda57707e25e154e50cfa2cc80e823a4b924da4e5e0
 SHA512 
0a833510df002bfc05c23445a58a8b2ff165c0fb2fd5c411498d1e89b5b1990d2778b32346dd2b6d61c166ff707c6277a5d1937db6345c77d3825eb59875
+DIST docker-proxy-0.8.0_p20190604.tar.gz 2721379 BLAKE2B 
edc36302ca4b2be297505a5bfd8acd45f17bc752e88bcaa72f34e2d972230d92b9bfe3d0dccbb2f1e04718fb1adc95631fc0f533ca5572bdcfc468d843ce480e
 SHA512 
dea31fd82ab2d445fbd39fe15550a91f7e489a06f6dedd32ea1925f7e9a7971952d26b874f9687249609a0d204ea35da357e0a957b819df2026a0cf8109cb354

diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190604.ebuild 
b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190604.ebuild
new file mode 100644
index 000..4400a3255a1
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190604.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == * ]]; then
+   inherit golang-vcs
+else
+   EGIT_COMMIT="fc5a7d91d54cc98f64fc28f9e288b46a0bee756c"
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test" # needs dockerd
+
+src_compile() {
+   GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || 
die
+}
+
+src_install() {
+   dodoc README.md CHANGELOG.md
+   dobin bin/docker-proxy
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-07-23 Thread Manuel Rüger
commit: 8def5473517a155b7f19f36306a69e3c5b2a337e
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Jul 23 15:16:24 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Jul 23 15:17:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8def5473

app-emulation/docker: Version bump to 18.09.8

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 app-emulation/docker/docker-18.09.8.ebuild | 300 +
 2 files changed, 301 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 4c8ff062be8..6636246a197 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1 +1,2 @@
 DIST docker-18.09.7.tar.gz 15264213 BLAKE2B 
5aa4be6d63271fd0b9a8ea480ed55a1dc312d479d7d387a35573963393b33da96086741dbb817aff765cceb81e309fd76122b3622dd91640a492a9f46c9dbd64
 SHA512 
7d06ab01673b5931a8dde1d2fcebf442d1a107c98c95cd8fe3b886c123b48470950601782fe0c83e7537a1e856069e79a096b9f4523fea7984fd3e773b243b66
+DIST docker-18.09.8.tar.gz 15263186 BLAKE2B 
9c6d23172e138491c383342753ddf0f7d3831d11b0d4212bd62709733a68b77151884c2a7a7b52e53a3885a84fc860eeb1561723e5967e0a95eff174fda68ae4
 SHA512 
34cf91da732ebbde88f0c8cd39664130e6bd344b18d4643715a00e1c4062d0838a37650a8ee68fb371abd8f01910c7bdce1237af74a49cd63b5ed5382eaf00ed

diff --git a/app-emulation/docker/docker-18.09.8.ebuild 
b/app-emulation/docker/docker-18.09.8.ebuild
new file mode 100644
index 000..19f2b397a11
--- /dev/null
+++ b/app-emulation/docker/docker-18.09.8.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   DOCKER_GITCOMMIT="00dd43dd"
+   MY_PV=${PV/_/-}
+   SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.2.6
+   ~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
+   ~app-emulation/docker-proxy-0.8.0_p20190513
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
+   ~KEYS
+   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+   ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
+   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+   ~POSIX_MQUEUE
+
+   ~USER_NS
+   ~SECCOMP
+   ~CGROUP_PIDS
+   ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+   ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+   ~CGROUP_PERF
+   ~CGROUP_HUGETLB
+   ~NET_CLS_CGROUP
+   ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+   ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+   ~VXLAN
+   ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO 
~XFRM_USER
+   ~IPVLAN
+   ~MACVLAN ~DUMMY
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap 
usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-credential-helpers/

2019-07-08 Thread Michał Górny
commit: 255484bb6b84b327dc333ae4899309cbf1e90ded
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Jul  8 10:15:55 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jul  8 10:18:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=255484bb

app-emulation/docker-credential-helpers: Fix inconsistent indent

Signed-off-by: Michał Górny  gentoo.org>

 app-emulation/docker-credential-helpers/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/docker-credential-helpers/metadata.xml 
b/app-emulation/docker-credential-helpers/metadata.xml
index 1e58ef54d4d..196e66de1e6 100644
--- a/app-emulation/docker-credential-helpers/metadata.xml
+++ b/app-emulation/docker-credential-helpers/metadata.xml
@@ -1,12 +1,12 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
+   
A suite of programs to use native stores to keep Docker 
credentials
safe.  Currently provides docker-credential-secretservice to 
use the
D-Bus secret service APIs, and docker-credential-pass to use the
pass framework.
-
+   

rkito...@gmail.com
Rafael Kitover



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/

2019-07-07 Thread Sebastian Pipping
commit: 00953ed653a1ddfc64335a87e7e39059ce83b60a
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun Jul  7 14:17:34 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Jul  7 14:22:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00953ed6

app-emulation/docker-compose: Tests need pytest <4

Closes: https://bugs.gentoo.org/688688
Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.67, Repoman-2.3.12

 app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild | 2 +-
 app-emulation/docker-compose/docker-compose-1.23.2.ebuild| 2 +-
 app-emulation/docker-compose/docker-compose-1.24.0.ebuild| 2 +-
 app-emulation/docker-compose/docker-compose-1.24.1.ebuild| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild 
b/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild
index df1a0e87a65..0e0b3b5585b 100644
--- a/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
$(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
 
 DEPEND="${RDEPEND}
-   test? ( dev-python/pytest[${PYTHON_USEDEP}]
+   test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
 
 S="${WORKDIR}/compose-${PV}"

diff --git a/app-emulation/docker-compose/docker-compose-1.23.2.ebuild 
b/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
index 4028e926086..4b06e9a17e9 100644
--- a/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
@@ -43,7 +43,7 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
$(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
 
 DEPEND="${RDEPEND}
-   test? ( dev-python/pytest[${PYTHON_USEDEP}]
+   test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
 
 S="${WORKDIR}/compose-${PV}"

diff --git a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild 
b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
index 27bb0bdfb34..4845028c559 100644
--- a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
@@ -34,7 +34,7 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
$(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
 
 DEPEND="${RDEPEND}
-   test? ( dev-python/pytest[${PYTHON_USEDEP}]
+   test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
 
 S="${WORKDIR}/compose-${PV}"

diff --git a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild 
b/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
index 1efb5d463ed..0a65a87e67c 100644
--- a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
$(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
 
 DEPEND="${RDEPEND}
-   test? ( dev-python/pytest[${PYTHON_USEDEP}]
+   test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
 
 S="${WORKDIR}/compose-${PV}"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/, app-emulation/docker-compose/

2019-07-07 Thread Sebastian Pipping
commit: 6fd9b25683c4fd0c40e6aa2b37d57f9733ed239d
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun Jul  7 14:21:43 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Jul  7 14:22:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd9b256

app-emulation/docker-compose: Remove old

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.67, Repoman-2.3.12

 app-emulation/docker-compose/Manifest  |  1 -
 .../docker-compose/docker-compose-1.23.2-r1.ebuild | 67 ---
 .../docker-compose/docker-compose-1.23.2.ebuild| 75 --
 .../files/docker-compose-1.23.2-setup-py.patch | 58 -
 4 files changed, 201 deletions(-)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index ffe2528f81e..677fb229edc 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,3 +1,2 @@
-DIST docker-compose-1.23.2.tar.gz 302950 BLAKE2B 
b96db2e718bd6b05f6a35829749570320209def17b7536e402b9991b56e05a2d8da97fbd8d79d8125d9df6ff361a181fbfd71346a33a68704db0327a92757f66
 SHA512 
baa233c84ac770798ba3d8d256687630b331d774a8d60f3c0d5046aa0a74c8c3b8b0b8bc4431f3bc7d5b7a54f0646f5e2fd14d5af31db37cb546e86c96c8c1db
 DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B 
cb2a6f96e14c04d0279b25c075182d8f09e5a622e4cee2ce74995224e3a8634cc5f22ccc548b7754bbeb11630c1e638386cb1a6df927b3619cb6e7e3595aac6c
 SHA512 
318c6bf9877147de09526b4d49c3fd86012d85626e7a9a15863ca55a60e10fa85b27429605045d0aaa9933bc2e5f23cbb76856276a874e84793b878a3e86
 DIST docker-compose-1.24.1.tar.gz 307749 BLAKE2B 
7ded0a4b82a7a9beb9de38752f38998ca4ea9421e5ed5630627820ec7e250ad6f03f6788bcbebe8bc0dd4c064d275bb4ca5a6055a95b6a0f72d7ae9038ec7f22
 SHA512 
9b8632ef263b8dfa678e8b99b46e00441f779716a524280ce25f62fcd2605f400723b7790c466338374c34653946dc2c5d7f09593ddd892fee3409c2a2fd1a5f

diff --git a/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild 
b/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild
deleted file mode 100644
index 15e7493fe93..000
--- a/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose;
-SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-   >=dev-python/docker-py-3.6.0[${PYTHON_USEDEP}]
-   >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-   >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-   >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-   >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
-   >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-   >=dev-python/requests-2.18.1[${PYTHON_USEDEP}]
-   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-   >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
-   >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-   $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 
'python2_7' )
-   $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 
'python2_7' )
-   $(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
-
-DEPEND="${RDEPEND}
-   test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
-
-S="${WORKDIR}/compose-${PV}"
-
-PATCHES=(
-   # Bug #679968 -- https://bugs.gentoo.org/679968
-   # Bug #681002 -- https://bugs.gentoo.org/681002
-   "${FILESDIR}"/${PN}-1.23.2-setup-py.patch
-)
-
-src_prepare() {
-   # Address QA issue "docker-compose.exe: missing alias (symlink) for 
completed command."
-   sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i 
contrib/completion/bash/docker-compose || die
-
-   default
-}
-
-python_test() {
-   distutils_install_for_testing
-   ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-   newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-   insinto /usr/share/zsh/site-functions
-   doins contrib/completion/zsh/*
-
-   distutils-r1_python_install_all
-}

diff --git a/app-emulation/docker-compose/docker-compose-1.23.2.ebuild 
b/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
deleted file mode 100644
index c9a313c7e29..000
--- a/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/

2019-07-07 Thread Sebastian Pipping
commit: 4e9ab392c38a8a941c53bc3b15f62772eb5b2f39
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun Jul  7 14:20:20 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Jul  7 14:22:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e9ab392

app-emulation/docker-compose: Tests need pyyaml <5.1

Closes: https://bugs.gentoo.org/687460
Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.67, Repoman-2.3.12

 app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild | 1 +
 app-emulation/docker-compose/docker-compose-1.23.2.ebuild| 1 +
 app-emulation/docker-compose/docker-compose-1.24.0.ebuild| 1 +
 app-emulation/docker-compose/docker-compose-1.24.1.ebuild| 1 +
 4 files changed, 4 insertions(+)

diff --git a/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild 
b/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild
index 0e0b3b5585b..15e7493fe93 100644
--- a/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild
@@ -34,6 +34,7 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 DEPEND="${RDEPEND}
test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
 
 S="${WORKDIR}/compose-${PV}"

diff --git a/app-emulation/docker-compose/docker-compose-1.23.2.ebuild 
b/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
index 4b06e9a17e9..c9a313c7e29 100644
--- a/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
@@ -44,6 +44,7 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 DEPEND="${RDEPEND}
test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
 
 S="${WORKDIR}/compose-${PV}"

diff --git a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild 
b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
index 4845028c559..aacd6aa050a 100644
--- a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
@@ -35,6 +35,7 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 DEPEND="${RDEPEND}
test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
 
 S="${WORKDIR}/compose-${PV}"

diff --git a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild 
b/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
index 0a65a87e67c..a9866c0a92e 100644
--- a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
@@ -35,6 +35,7 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 DEPEND="${RDEPEND}
test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
 
 S="${WORKDIR}/compose-${PV}"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-proxy/

2019-07-04 Thread Manuel Rüger
commit: 4cc1192bd85267be83f2ce967b8bcad1c103fd7b
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Jul  4 15:30:17 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Jul  4 15:30:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cc1192b

app-emulation/docker-proxy: Stable on amd64

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-proxy/docker-proxy-0.8.0_p20190513.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190513.ebuild 
b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190513.ebuild
index 1fccabf5362..1dea7040531 100644
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190513.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190513.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == * ]]; then
 else
EGIT_COMMIT="e7933d41e7b206756115aa9df5e0599fc5169742"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
 fi
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-proxy/

2019-07-04 Thread Manuel Rüger
commit: a8dbc4070eb3a4c8656cbd1d17e05ec60e94151e
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Jul  4 15:32:41 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Jul  4 15:32:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8dbc407

app-emulation/docker-proxy: Remove old and unmaintained live

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-proxy/Manifest|  7 -
 .../docker-proxy-0.8.0_p20180411.ebuild| 36 --
 .../docker-proxy-0.8.0_p20180626.ebuild| 36 --
 .../docker-proxy-0.8.0_p20180907.ebuild| 36 --
 .../docker-proxy-0.8.0_p20181207.ebuild| 36 --
 .../docker-proxy-0.8.0_p20190301.ebuild| 36 --
 .../docker-proxy-0.8.0_p20190405.ebuild| 34 
 .../docker-proxy-0.8.0_p20190417.ebuild| 34 
 .../docker-proxy/docker-proxy-.ebuild  | 36 --
 9 files changed, 291 deletions(-)

diff --git a/app-emulation/docker-proxy/Manifest 
b/app-emulation/docker-proxy/Manifest
index c5e4fba6bfc..cbd11db94b9 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -1,8 +1 @@
-DIST docker-proxy-0.8.0_p20180411.tar.gz 2695069 BLAKE2B 
5205d5700ad116bb457dc7a57f2624f9efa46f1dbf3f5fe9215077655cddba8e1e1301bc555fb43a22cba4d74423123953a67994bf8974b114350e64be601299
 SHA512 
300e197313017536f91768ba675f2ab773eb1914f8e5908f4ff5b6fc8c4f0fa5ba1653cd9f8ca26e7c466f1623716aa45a2746f862e47ca9fe9136010085f600
-DIST docker-proxy-0.8.0_p20180626.tar.gz 2718698 BLAKE2B 
6214ba714ba8b01214168171f465dfaee4d8ff791db7a219a3fb92fade3e4207d36d90090790c0a3059e6fb209f3cd8bb0082ca75496108ebffb7c9b0c5092a4
 SHA512 
21d3d1bd8aafeab51a3e0a14ada4d559b5b113a48d315e91f7d70e4fa839f5c92d4068b38c28bf6929da9c11cfc61703bafc7148f64b784208d61fa14ee4545d
-DIST docker-proxy-0.8.0_p20180907.tar.gz 2711336 BLAKE2B 
ad1fc76347058610e2cd1659fb89f9990cc704c3a31006b976e44f31a30e754ac86e7b4823c48461cdcba948bb8d320ae25eac1e13b26f1fde072343251a61e0
 SHA512 
603ad154d0987a021dae69d542fa82a53b8d25ad9b44cf16f0ef551e0b81e0174dcc73b3a8e9ba89ca1d209f0022e767d44a8350b00b9b4e252cfab698b1d5bd
-DIST docker-proxy-0.8.0_p20181207.tar.gz 2703206 BLAKE2B 
46b71a4d6ac9eb0659a45c1956eb967a73b2b73c446d55de3a5b4014149f911daa03c6a914e8d79da53e01892c6592adf0df769b6b5ed3b41f3c4a3c9f979da3
 SHA512 
9256eedc6ed530506e4e61673a9f45397274093dd61105097d5c650796f0afebc8ad7c550d2dc3cacf94426e3872a2b764906bca46fc907a21b865314c8927d4
-DIST docker-proxy-0.8.0_p20190301.tar.gz 2703026 BLAKE2B 
0d0da49e1daf260c5d5699cfa8dd447cd6fe83f5903834aa065af52f133910d1f16a06ef7688340d2068e5ac544de8b1a2b9644f65af486077b66d56efd9447f
 SHA512 
8ffd6fc97df4b63b1f83a5eb6d8e63c8c413bcf3e2ff82f507dbf875d0df6903b6fe1546d8625dd3b4681d611aed4702c423d0d5c9621ed57073cbe16bf35200
-DIST docker-proxy-0.8.0_p20190405.tar.gz 2703481 BLAKE2B 
7df4333c0d5303be5819faa1e984cc516df21d197b08f07fadbe7800f6035cefbeea6a63bf0cc7bca0a23cf324558d0422638e15c7750877fa4fb589e4052ec4
 SHA512 
a24061cd29c3c9852a435f742e6653da48edd419205be18a37d065b50c2fbf005bfe62a1f909b91781f521b70cb3a9639a4a67e8563e2e39e6dd22f1c7bf82b2
-DIST docker-proxy-0.8.0_p20190417.tar.gz 2705315 BLAKE2B 
13d2b9caeaf0d2d16dc8cda641e9b13d12bc7c9dcdcf9caa60fb80c2bba9b4c9a15c8c959fdce019367002d58d83859145d70b78431b5fe7e9322d3b127cd0df
 SHA512 
c8e8544a3d8d44dc0f309aa3520a2cf62cee374a06d40473542078de94d88cb484c0dca1cee7ad89fb312c969af1694c848f464d04d61df5a9888058e21a485e
 DIST docker-proxy-0.8.0_p20190513.tar.gz 2705298 BLAKE2B 
ff897b18b8265b3d718caf7afaf10f7b8eeed9be0cc9c73b02d5c42c5c9ddd1be32cf7d1259ce26d56219cda57707e25e154e50cfa2cc80e823a4b924da4e5e0
 SHA512 
0a833510df002bfc05c23445a58a8b2ff165c0fb2fd5c411498d1e89b5b1990d2778b32346dd2b6d61c166ff707c6277a5d1937db6345c77d3825eb59875

diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild 
b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild
deleted file mode 100644
index a6ad01507ca..000
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/docker/libnetwork"
-
-if [[ ${PV} == * ]]; then
-   inherit golang-vcs
-else
-   EGIT_COMMIT="c15b372ef22125880d378167dde44f4b134e1a77"
-   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
-   inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="Docker container networking"
-HOMEPAGE="https://github.com/docker/libnetwork;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RDEPEND="!https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-07-04 Thread Manuel Rüger
commit: 348e9540e07a7400a1eb0a3e15baa4f2947a10ef
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Jul  4 15:30:45 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Jul  4 15:30:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=348e9540

app-emulation/docker: Stable on amd64

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/docker-18.09.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker/docker-18.09.7.ebuild 
b/app-emulation/docker/docker-18.09.7.ebuild
index 2da1efbfefa..e466c07b7c1 100644
--- a/app-emulation/docker/docker-18.09.7.ebuild
+++ b/app-emulation/docker/docker-18.09.7.ebuild
@@ -14,7 +14,7 @@ else
DOCKER_GITCOMMIT="2d0083d"
MY_PV=${PV/_/-}
SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64"
+   KEYWORDS="amd64 ~arm ~arm64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually 
for each bump!"
inherit golang-vcs-snapshot
 fi



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-07-04 Thread Manuel Rüger
commit: be754f832d9cffb47f7aa2c28d6885b0695a04d7
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Jul  4 15:31:54 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Jul  4 15:31:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be754f83

app-emulation/docker: Remove old

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   4 -
 app-emulation/docker/docker-18.09.5.ebuild | 299 
 app-emulation/docker/docker-18.09.6.ebuild | 299 
 .../docker/docker-18.09.6_p20190604.ebuild | 300 -
 app-emulation/docker/docker-18.09.7_rc1.ebuild | 300 -
 app-emulation/docker/metadata.xml  |   3 -
 6 files changed, 1205 deletions(-)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 5927e3556f6..4c8ff062be8 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,5 +1 @@
-DIST docker-18.09.5.tar.gz 15256899 BLAKE2B 
c55ef822b3e655b0bec9585de6ee346e73d48d388225141097768db9f5ddaeca2d1937274a7131e3e301686e2214a9ed2051dd72c07893bcfccb00424d02df73
 SHA512 
a6012d202761d6449e347b03759d92f5f45309e72562fd4a619b2a21c62b3f50b1256d2e4820317aa6b412f1eecda66dbd960d322293699433417a5f7ee73486
-DIST docker-18.09.6.tar.gz 15257416 BLAKE2B 
e0f93f09c403f043d3b2f390d50da83565b0520d18b695a8166aa240817cc713eb9eff314d4c7eeba242c25e35c0b6a9ea3a7f1d661d6aca4a40f7e77856a05d
 SHA512 
f05fc78f5891fa0308878690576e245eebb1e72f306f5b629b0e82dc96a04812202a2393ee6fd352bc59a1c5d29d398f0d6cddf545d57b483a051d14d7a0ee28
-DIST docker-18.09.6_p20190604.tar.gz 15259344 BLAKE2B 
f958063ab9fc851fda13117210dade6b7fb211426c9565c62f2786a2b5878194ea052f866da1b2e489bd75d622cdf77bafccc538377cc5c261f86f50163cb151
 SHA512 
da518f07cfd9f90ad46796f5047156ef517fa75ff27daa16ab16b868b7f1c9822cb61ce2ee558b1632c4acfdd8d74a608f5b6cb5cb5ca932aca5bf42d497d6a9
 DIST docker-18.09.7.tar.gz 15264213 BLAKE2B 
5aa4be6d63271fd0b9a8ea480ed55a1dc312d479d7d387a35573963393b33da96086741dbb817aff765cceb81e309fd76122b3622dd91640a492a9f46c9dbd64
 SHA512 
7d06ab01673b5931a8dde1d2fcebf442d1a107c98c95cd8fe3b886c123b48470950601782fe0c83e7537a1e856069e79a096b9f4523fea7984fd3e773b243b66
-DIST docker-18.09.7_rc1.tar.gz 15264071 BLAKE2B 
d124cff1e32cedda35d8d0fac074a2227d078673639e99a1313e42b73b2c84b0c97af5470d3d4c8f2684e93898ab9d081fe536cd4e428ef8a8a5639761bd380b
 SHA512 
377a07c7a1515a8f08c412d2117e10d9c9100a4a55dc5df69e8a8b822362b0b41812b3d4ee8fc8a1e7bc7258c15ee3da6aa42c7bc71fd86def1f6cda9f1566cd

diff --git a/app-emulation/docker/docker-18.09.5.ebuild 
b/app-emulation/docker/docker-18.09.5.ebuild
deleted file mode 100644
index 450eaa2a1f0..000
--- a/app-emulation/docker/docker-18.09.5.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = ** ]]; then
-   # Docker cannot be fetched via "go get", thanks to autogenerated code
-   EGIT_REPO_URI="https://${EGO_PN}.git;
-   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-   inherit git-r3
-else
-   DOCKER_GITCOMMIT="e8ff056"
-   SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64"
-   [ "$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
-
-DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
-HOMEPAGE="https://dockerproject.org;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
pkcs11 seccomp"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-   >=dev-db/sqlite-3.7.9:3
-   device-mapper? (
-   >=sys-fs/lvm2-2.02.89[thin]
-   )
-   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-   apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-   ${CDEPEND}
-
-   dev-go/go-md2man
-
-   btrfs? (
-   >=sys-fs/btrfs-progs-3.16.1
-   )
-"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-   ${CDEPEND}
-   >=net-firewall/iptables-1.4
-   sys-process/procps
-   >=dev-vcs/git-1.7
-   >=app-arch/xz-utils-4.9
-   dev-libs/libltdl
-   ~app-emulation/containerd-1.2.5
-   ~app-emulation/runc-1.0.0_rc6_p20190216[apparmor?,seccomp?]
-   ~app-emulation/docker-proxy-0.8.0_p20190405
-   container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-06-27 Thread Manuel Rüger
commit: 9019ec6bb81ee24f31e62d968bd9b27b3e3477db
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Jun 27 21:53:57 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Jun 27 21:57:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9019ec6b

app-emulation/docker: Version bump to 18.09.7

Package-Manager: Portage-2.3.67, Repoman-2.3.11
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 app-emulation/docker/docker-18.09.7.ebuild | 300 +
 2 files changed, 301 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 162e9f958f7..5927e3556f6 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,4 +1,5 @@
 DIST docker-18.09.5.tar.gz 15256899 BLAKE2B 
c55ef822b3e655b0bec9585de6ee346e73d48d388225141097768db9f5ddaeca2d1937274a7131e3e301686e2214a9ed2051dd72c07893bcfccb00424d02df73
 SHA512 
a6012d202761d6449e347b03759d92f5f45309e72562fd4a619b2a21c62b3f50b1256d2e4820317aa6b412f1eecda66dbd960d322293699433417a5f7ee73486
 DIST docker-18.09.6.tar.gz 15257416 BLAKE2B 
e0f93f09c403f043d3b2f390d50da83565b0520d18b695a8166aa240817cc713eb9eff314d4c7eeba242c25e35c0b6a9ea3a7f1d661d6aca4a40f7e77856a05d
 SHA512 
f05fc78f5891fa0308878690576e245eebb1e72f306f5b629b0e82dc96a04812202a2393ee6fd352bc59a1c5d29d398f0d6cddf545d57b483a051d14d7a0ee28
 DIST docker-18.09.6_p20190604.tar.gz 15259344 BLAKE2B 
f958063ab9fc851fda13117210dade6b7fb211426c9565c62f2786a2b5878194ea052f866da1b2e489bd75d622cdf77bafccc538377cc5c261f86f50163cb151
 SHA512 
da518f07cfd9f90ad46796f5047156ef517fa75ff27daa16ab16b868b7f1c9822cb61ce2ee558b1632c4acfdd8d74a608f5b6cb5cb5ca932aca5bf42d497d6a9
+DIST docker-18.09.7.tar.gz 15264213 BLAKE2B 
5aa4be6d63271fd0b9a8ea480ed55a1dc312d479d7d387a35573963393b33da96086741dbb817aff765cceb81e309fd76122b3622dd91640a492a9f46c9dbd64
 SHA512 
7d06ab01673b5931a8dde1d2fcebf442d1a107c98c95cd8fe3b886c123b48470950601782fe0c83e7537a1e856069e79a096b9f4523fea7984fd3e773b243b66
 DIST docker-18.09.7_rc1.tar.gz 15264071 BLAKE2B 
d124cff1e32cedda35d8d0fac074a2227d078673639e99a1313e42b73b2c84b0c97af5470d3d4c8f2684e93898ab9d081fe536cd4e428ef8a8a5639761bd380b
 SHA512 
377a07c7a1515a8f08c412d2117e10d9c9100a4a55dc5df69e8a8b822362b0b41812b3d4ee8fc8a1e7bc7258c15ee3da6aa42c7bc71fd86def1f6cda9f1566cd

diff --git a/app-emulation/docker/docker-18.09.7.ebuild 
b/app-emulation/docker/docker-18.09.7.ebuild
new file mode 100644
index 000..2da1efbfefa
--- /dev/null
+++ b/app-emulation/docker/docker-18.09.7.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   DOCKER_GITCOMMIT="2d0083d"
+   MY_PV=${PV/_/-}
+   SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.2.6
+   ~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
+   ~app-emulation/docker-proxy-0.8.0_p20190513
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
+   ~KEYS
+   ~VETH ~BRIDGE 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-06-25 Thread Manuel Rüger
commit: 33b68b9ee03a50b1c84c33deb1d523768c60967d
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Jun 25 15:43:39 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Jun 25 15:43:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33b68b9e

app-emulation/docker: Version bump to 18.09.7_rc1

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 app-emulation/docker/docker-18.09.7_rc1.ebuild | 300 +
 2 files changed, 301 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 40619db8ec7..162e9f958f7 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1,4 @@
 DIST docker-18.09.5.tar.gz 15256899 BLAKE2B 
c55ef822b3e655b0bec9585de6ee346e73d48d388225141097768db9f5ddaeca2d1937274a7131e3e301686e2214a9ed2051dd72c07893bcfccb00424d02df73
 SHA512 
a6012d202761d6449e347b03759d92f5f45309e72562fd4a619b2a21c62b3f50b1256d2e4820317aa6b412f1eecda66dbd960d322293699433417a5f7ee73486
 DIST docker-18.09.6.tar.gz 15257416 BLAKE2B 
e0f93f09c403f043d3b2f390d50da83565b0520d18b695a8166aa240817cc713eb9eff314d4c7eeba242c25e35c0b6a9ea3a7f1d661d6aca4a40f7e77856a05d
 SHA512 
f05fc78f5891fa0308878690576e245eebb1e72f306f5b629b0e82dc96a04812202a2393ee6fd352bc59a1c5d29d398f0d6cddf545d57b483a051d14d7a0ee28
 DIST docker-18.09.6_p20190604.tar.gz 15259344 BLAKE2B 
f958063ab9fc851fda13117210dade6b7fb211426c9565c62f2786a2b5878194ea052f866da1b2e489bd75d622cdf77bafccc538377cc5c261f86f50163cb151
 SHA512 
da518f07cfd9f90ad46796f5047156ef517fa75ff27daa16ab16b868b7f1c9822cb61ce2ee558b1632c4acfdd8d74a608f5b6cb5cb5ca932aca5bf42d497d6a9
+DIST docker-18.09.7_rc1.tar.gz 15264071 BLAKE2B 
d124cff1e32cedda35d8d0fac074a2227d078673639e99a1313e42b73b2c84b0c97af5470d3d4c8f2684e93898ab9d081fe536cd4e428ef8a8a5639761bd380b
 SHA512 
377a07c7a1515a8f08c412d2117e10d9c9100a4a55dc5df69e8a8b822362b0b41812b3d4ee8fc8a1e7bc7258c15ee3da6aa42c7bc71fd86def1f6cda9f1566cd

diff --git a/app-emulation/docker/docker-18.09.7_rc1.ebuild 
b/app-emulation/docker/docker-18.09.7_rc1.ebuild
new file mode 100644
index 000..445bb43dc5a
--- /dev/null
+++ b/app-emulation/docker/docker-18.09.7_rc1.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   DOCKER_GITCOMMIT="e97b22c"
+   MY_PV=${PV/_/-}
+   SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
pkcs11 seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.2.6
+   ~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
+   ~app-emulation/docker-proxy-0.8.0_p20190513
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
+   ~KEYS
+   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+   ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
+   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+   ~POSIX_MQUEUE
+
+   ~USER_NS
+   ~SECCOMP
+   ~CGROUP_PIDS

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/

2019-06-24 Thread Sebastian Pipping
commit: e5eb393709b24ec6441cd3f9a41a35eb2b3ced79
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Mon Jun 24 18:01:15 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Mon Jun 24 18:02:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5eb3937

app-emulation/docker-compose: 1.24.1

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.67, Repoman-2.3.12

 app-emulation/docker-compose/Manifest  |  1 +
 .../docker-compose/docker-compose-1.24.1.ebuild| 67 ++
 2 files changed, 68 insertions(+)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index fdfb476798a..ffe2528f81e 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,2 +1,3 @@
 DIST docker-compose-1.23.2.tar.gz 302950 BLAKE2B 
b96db2e718bd6b05f6a35829749570320209def17b7536e402b9991b56e05a2d8da97fbd8d79d8125d9df6ff361a181fbfd71346a33a68704db0327a92757f66
 SHA512 
baa233c84ac770798ba3d8d256687630b331d774a8d60f3c0d5046aa0a74c8c3b8b0b8bc4431f3bc7d5b7a54f0646f5e2fd14d5af31db37cb546e86c96c8c1db
 DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B 
cb2a6f96e14c04d0279b25c075182d8f09e5a622e4cee2ce74995224e3a8634cc5f22ccc548b7754bbeb11630c1e638386cb1a6df927b3619cb6e7e3595aac6c
 SHA512 
318c6bf9877147de09526b4d49c3fd86012d85626e7a9a15863ca55a60e10fa85b27429605045d0aaa9933bc2e5f23cbb76856276a874e84793b878a3e86
+DIST docker-compose-1.24.1.tar.gz 307749 BLAKE2B 
7ded0a4b82a7a9beb9de38752f38998ca4ea9421e5ed5630627820ec7e250ad6f03f6788bcbebe8bc0dd4c064d275bb4ca5a6055a95b6a0f72d7ae9038ec7f22
 SHA512 
9b8632ef263b8dfa678e8b99b46e00441f779716a524280ce25f62fcd2605f400723b7790c466338374c34653946dc2c5d7f09593ddd892fee3409c2a2fd1a5f

diff --git a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild 
b/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
new file mode 100644
index 000..1efb5d463ed
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose;
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+   >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
+   >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+   >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+   >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+   dev-python/paramiko[${PYTHON_USEDEP}]
+   >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+   >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+   >=dev-python/requests-2.18.1[${PYTHON_USEDEP}]
+   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+   >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+   >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
+
+DEPEND="${RDEPEND}
+   test? ( dev-python/pytest[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
+
+S="${WORKDIR}/compose-${PV}"
+
+PATCHES=(
+   # Bug #679968 -- https://bugs.gentoo.org/679968
+   # Bug #681002 -- https://bugs.gentoo.org/681002
+   "${FILESDIR}"/${PN}-1.24.0-setup-py.patch
+)
+
+src_prepare() {
+   # Address QA issue "docker-compose.exe: missing alias (symlink) for 
completed command."
+   sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i 
contrib/completion/bash/docker-compose || die
+
+   default
+}
+
+python_test() {
+   distutils_install_for_testing
+   ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+   newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+   insinto /usr/share/zsh/site-functions
+   doins contrib/completion/zsh/*
+
+   distutils-r1_python_install_all
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-06-06 Thread Manuel Rüger
commit: d190b253ea2681c243de01909c773cc8d3968e53
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Jun  6 17:09:56 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Jun  6 17:09:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d190b253

app-emulation/docker: Add snapshot fixing CVE-2018-15664

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 .../docker/docker-18.09.6_p20190604.ebuild | 300 +
 2 files changed, 301 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 6c5b8b9b9d4..40619db8ec7 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,2 +1,3 @@
 DIST docker-18.09.5.tar.gz 15256899 BLAKE2B 
c55ef822b3e655b0bec9585de6ee346e73d48d388225141097768db9f5ddaeca2d1937274a7131e3e301686e2214a9ed2051dd72c07893bcfccb00424d02df73
 SHA512 
a6012d202761d6449e347b03759d92f5f45309e72562fd4a619b2a21c62b3f50b1256d2e4820317aa6b412f1eecda66dbd960d322293699433417a5f7ee73486
 DIST docker-18.09.6.tar.gz 15257416 BLAKE2B 
e0f93f09c403f043d3b2f390d50da83565b0520d18b695a8166aa240817cc713eb9eff314d4c7eeba242c25e35c0b6a9ea3a7f1d661d6aca4a40f7e77856a05d
 SHA512 
f05fc78f5891fa0308878690576e245eebb1e72f306f5b629b0e82dc96a04812202a2393ee6fd352bc59a1c5d29d398f0d6cddf545d57b483a051d14d7a0ee28
+DIST docker-18.09.6_p20190604.tar.gz 15259344 BLAKE2B 
f958063ab9fc851fda13117210dade6b7fb211426c9565c62f2786a2b5878194ea052f866da1b2e489bd75d622cdf77bafccc538377cc5c261f86f50163cb151
 SHA512 
da518f07cfd9f90ad46796f5047156ef517fa75ff27daa16ab16b868b7f1c9822cb61ce2ee558b1632c4acfdd8d74a608f5b6cb5cb5ca932aca5bf42d497d6a9

diff --git a/app-emulation/docker/docker-18.09.6_p20190604.ebuild 
b/app-emulation/docker/docker-18.09.6_p20190604.ebuild
new file mode 100644
index 000..0e1c5d64756
--- /dev/null
+++ b/app-emulation/docker/docker-18.09.6_p20190604.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   DOCKER_GITCOMMIT="c38f3f8"
+   GIT_COMMIT="c38f3f8cb20a779ef83b05ccdc7368db938219cf"
+   SRC_URI="https://${EGO_PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
pkcs11 seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.2.5
+   ~app-emulation/runc-1.0.0_rc6_p20190216[apparmor?,seccomp?]
+   ~app-emulation/docker-proxy-0.8.0_p20190513
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
+   ~KEYS
+   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+   ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
+   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+   ~POSIX_MQUEUE
+
+   ~USER_NS
+   ~SECCOMP
+   ~CGROUP_PIDS
+   ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+   ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+   ~CGROUP_PERF
+   ~CGROUP_HUGETLB
+   ~NET_CLS_CGROUP
+   ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-proxy/

2019-06-06 Thread Manuel Rüger
commit: de705a2227df237bd7d8ae8aa417a78ef87b1434
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Jun  6 15:42:42 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Jun  6 15:42:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de705a22

app-emulation/docker-proxy: Update snapshot for 18.09.7

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-proxy/Manifest|  1 +
 .../docker-proxy-0.8.0_p20190513.ebuild| 34 ++
 2 files changed, 35 insertions(+)

diff --git a/app-emulation/docker-proxy/Manifest 
b/app-emulation/docker-proxy/Manifest
index 90bfe1f972e..c5e4fba6bfc 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -5,3 +5,4 @@ DIST docker-proxy-0.8.0_p20181207.tar.gz 2703206 BLAKE2B 
46b71a4d6ac9eb0659a45c1
 DIST docker-proxy-0.8.0_p20190301.tar.gz 2703026 BLAKE2B 
0d0da49e1daf260c5d5699cfa8dd447cd6fe83f5903834aa065af52f133910d1f16a06ef7688340d2068e5ac544de8b1a2b9644f65af486077b66d56efd9447f
 SHA512 
8ffd6fc97df4b63b1f83a5eb6d8e63c8c413bcf3e2ff82f507dbf875d0df6903b6fe1546d8625dd3b4681d611aed4702c423d0d5c9621ed57073cbe16bf35200
 DIST docker-proxy-0.8.0_p20190405.tar.gz 2703481 BLAKE2B 
7df4333c0d5303be5819faa1e984cc516df21d197b08f07fadbe7800f6035cefbeea6a63bf0cc7bca0a23cf324558d0422638e15c7750877fa4fb589e4052ec4
 SHA512 
a24061cd29c3c9852a435f742e6653da48edd419205be18a37d065b50c2fbf005bfe62a1f909b91781f521b70cb3a9639a4a67e8563e2e39e6dd22f1c7bf82b2
 DIST docker-proxy-0.8.0_p20190417.tar.gz 2705315 BLAKE2B 
13d2b9caeaf0d2d16dc8cda641e9b13d12bc7c9dcdcf9caa60fb80c2bba9b4c9a15c8c959fdce019367002d58d83859145d70b78431b5fe7e9322d3b127cd0df
 SHA512 
c8e8544a3d8d44dc0f309aa3520a2cf62cee374a06d40473542078de94d88cb484c0dca1cee7ad89fb312c969af1694c848f464d04d61df5a9888058e21a485e
+DIST docker-proxy-0.8.0_p20190513.tar.gz 2705298 BLAKE2B 
ff897b18b8265b3d718caf7afaf10f7b8eeed9be0cc9c73b02d5c42c5c9ddd1be32cf7d1259ce26d56219cda57707e25e154e50cfa2cc80e823a4b924da4e5e0
 SHA512 
0a833510df002bfc05c23445a58a8b2ff165c0fb2fd5c411498d1e89b5b1990d2778b32346dd2b6d61c166ff707c6277a5d1937db6345c77d3825eb59875

diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190513.ebuild 
b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190513.ebuild
new file mode 100644
index 000..1fccabf5362
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190513.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == * ]]; then
+   inherit golang-vcs
+else
+   EGIT_COMMIT="e7933d41e7b206756115aa9df5e0599fc5169742"
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test" # needs dockerd
+
+src_compile() {
+   GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || 
die
+}
+
+src_install() {
+   dodoc ROADMAP.md README.md CHANGELOG.md
+   dobin bin/docker-proxy
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/

2019-06-05 Thread Agostino Sarubbo
commit: 168199fea7a3e675d58336b79f564c30e62e6263
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun  5 06:46:18 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun  5 06:46:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168199fe

app-emulation/docker-compose: amd64 stable wrt bug #687190

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 app-emulation/docker-compose/docker-compose-1.24.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild 
b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
index 1efb5d463ed..27bb0bdfb34 100644
--- a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-06-04 Thread Manuel Rüger
commit: 9658d139139d73c50c47e3d88a2f98b1b4e2d426
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Jun  4 16:56:56 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Jun  4 16:56:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9658d139

app-emulation/docker: Stable on amd64

Package-Manager: Portage-2.3.67, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/docker-18.09.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker/docker-18.09.6.ebuild 
b/app-emulation/docker/docker-18.09.6.ebuild
index 9e222ed54de..70a115c0501 100644
--- a/app-emulation/docker/docker-18.09.6.ebuild
+++ b/app-emulation/docker/docker-18.09.6.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = ** ]]; then
 else
DOCKER_GITCOMMIT="481bc77"
SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64"
+   KEYWORDS="amd64 ~arm ~arm64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually 
for each bump!"
inherit golang-vcs-snapshot
 fi



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-proxy/

2019-06-04 Thread Manuel Rüger
commit: a5d525e494d0dfb6a82994259f28656c7c3f460f
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Jun  4 16:56:26 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Jun  4 16:56:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d525e4

app-emulation/docker-proxy: Stable on amd64

Package-Manager: Portage-2.3.67, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-proxy/docker-proxy-0.8.0_p20190417.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190417.ebuild 
b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190417.ebuild
index f87e25fa079..d28adee62a9 100644
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190417.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190417.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == * ]]; then
 else
EGIT_COMMIT="872f0a83c98add6cae255c8859e29532febc0039"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
 fi
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/

2019-05-10 Thread Sebastian Pipping
commit: 31a31e98f5ca988ee30cfa4b59bab98981c0f054
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Fri May 10 23:05:43 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Fri May 10 23:06:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31a31e98

app-emulation/docker-compose: Restore upstream ID

Dropped by mistake in 272a161a0b1a3b4a18253bb39b5ff60e0ddfed8a
Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.65, Repoman-2.3.12

 app-emulation/docker-compose/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-emulation/docker-compose/metadata.xml 
b/app-emulation/docker-compose/metadata.xml
index 6d2298876fa..e8aeb1e23f1 100644
--- a/app-emulation/docker-compose/metadata.xml
+++ b/app-emulation/docker-compose/metadata.xml
@@ -5,4 +5,7 @@
sp...@gentoo.org
Sebastian Pipping

+   
+   docker-compose
+   
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/, app-emulation/docker-compose/

2019-05-10 Thread Sebastian Pipping
commit: f2777951efa218a63fadb93dd78e33fedac5d157
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Fri May 10 22:41:18 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Fri May 10 22:41:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2777951

app-emulation/docker-compose: 1.24.0

Closes: https://bugs.gentoo.org/682148
Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.65, Repoman-2.3.12

 app-emulation/docker-compose/Manifest  |  1 +
 .../docker-compose/docker-compose-1.24.0.ebuild| 67 ++
 .../files/docker-compose-1.24.0-setup-py.patch | 58 +++
 3 files changed, 126 insertions(+)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index 6c1ed1c4939..fdfb476798a 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1 +1,2 @@
 DIST docker-compose-1.23.2.tar.gz 302950 BLAKE2B 
b96db2e718bd6b05f6a35829749570320209def17b7536e402b9991b56e05a2d8da97fbd8d79d8125d9df6ff361a181fbfd71346a33a68704db0327a92757f66
 SHA512 
baa233c84ac770798ba3d8d256687630b331d774a8d60f3c0d5046aa0a74c8c3b8b0b8bc4431f3bc7d5b7a54f0646f5e2fd14d5af31db37cb546e86c96c8c1db
+DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B 
cb2a6f96e14c04d0279b25c075182d8f09e5a622e4cee2ce74995224e3a8634cc5f22ccc548b7754bbeb11630c1e638386cb1a6df927b3619cb6e7e3595aac6c
 SHA512 
318c6bf9877147de09526b4d49c3fd86012d85626e7a9a15863ca55a60e10fa85b27429605045d0aaa9933bc2e5f23cbb76856276a874e84793b878a3e86

diff --git a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild 
b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
new file mode 100644
index 000..1efb5d463ed
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose;
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+   >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
+   >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+   >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+   >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+   dev-python/paramiko[${PYTHON_USEDEP}]
+   >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+   >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+   >=dev-python/requests-2.18.1[${PYTHON_USEDEP}]
+   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+   >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+   >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
+
+DEPEND="${RDEPEND}
+   test? ( dev-python/pytest[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
+
+S="${WORKDIR}/compose-${PV}"
+
+PATCHES=(
+   # Bug #679968 -- https://bugs.gentoo.org/679968
+   # Bug #681002 -- https://bugs.gentoo.org/681002
+   "${FILESDIR}"/${PN}-1.24.0-setup-py.patch
+)
+
+src_prepare() {
+   # Address QA issue "docker-compose.exe: missing alias (symlink) for 
completed command."
+   sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i 
contrib/completion/bash/docker-compose || die
+
+   default
+}
+
+python_test() {
+   distutils_install_for_testing
+   ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+   newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+   insinto /usr/share/zsh/site-functions
+   doins contrib/completion/zsh/*
+
+   distutils-r1_python_install_all
+}

diff --git 
a/app-emulation/docker-compose/files/docker-compose-1.24.0-setup-py.patch 
b/app-emulation/docker-compose/files/docker-compose-1.24.0-setup-py.patch
new file mode 100644
index 000..1632a018bd4
--- /dev/null
+++ b/app-emulation/docker-compose/files/docker-compose-1.24.0-setup-py.patch
@@ -0,0 +1,58 @@
+From 981faad5f67a843f2b6c44f40be4dc8d2c5156c7 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping 
+Date: Sat, 11 May 2019 00:32:22 +0200
+Subject: [PATCH] setup.py: Drop generic upper version boundaries
+
+---
+ setup.py | 26 +-
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/

2019-05-10 Thread Sebastian Pipping
commit: 7d776dec03d457f8c799c98cc2b4695901bd8330
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Fri May 10 22:25:36 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Fri May 10 22:26:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d776dec

app-emulation/docker-compose: Remove unused patches

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.65, Repoman-2.3.12

 .../files/docker-compose-1.22.0-setup-py.patch | 58 -
 .../files/docker-compose-1.23.0-setup-py.patch | 59 --
 2 files changed, 117 deletions(-)

diff --git 
a/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch 
b/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch
deleted file mode 100644
index 191e96d6396..000
--- a/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 950506efebe97cb76f6cd3a558bab724452a51e9 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping 
-Date: Mon, 24 Sep 2018 17:35:22 +0200
-Subject: [PATCH] setup.py: Drop generic upper version boundaries
-

- setup.py | 24 +-
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index e0a26b0..1f9fb7f 100644
 a/setup.py
-+++ b/setup.py
-@@ -30,16 +30,16 @@ def find_version(*file_paths):
- 
- 
- install_requires = [
--'cached-property >= 1.2.0, < 2',
--'docopt >= 0.6.1, < 0.7',
--'PyYAML >= 3.10, < 4',
--'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19',
--'texttable >= 0.9.0, < 0.10',
--'websocket-client >= 0.32.0, < 1.0',
--'docker >= 3.4.1, < 4.0',
--'dockerpty >= 0.4.1, < 0.5',
--'six >= 1.3.0, < 2',
--'jsonschema >= 2.5.1, < 3',
-+'cached-property >= 1.2.0',
-+'docopt >= 0.6.1',
-+'PyYAML >= 3.10',
-+'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
-+'texttable >= 0.9.0',
-+'websocket-client >= 0.32.0',
-+'docker >= 3.4.1',
-+'dockerpty >= 0.4.1',
-+'six >= 1.3.0',
-+'jsonschema >= 2.5.1',
- ]
- 
- 
-@@ -52,11 +52,11 @@ if sys.version_info[:2] < (3, 4):
- tests_require.append('mock >= 1.0.1')
- 
- extras_require = {
--':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
-+':python_version < "3.4"': ['enum34 >= 1.0.4'],
- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
- ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
--':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'],
--'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
-+':sys_platform == "win32"': ['colorama >= 0.3.9'],
-+'socks': ['PySocks >= 1.5.6, != 1.5.7'],
- }
- 
- 
--- 
-2.19.0.rc2
-

diff --git 
a/app-emulation/docker-compose/files/docker-compose-1.23.0-setup-py.patch 
b/app-emulation/docker-compose/files/docker-compose-1.23.0-setup-py.patch
deleted file mode 100644
index c95c776b2c3..000
--- a/app-emulation/docker-compose/files/docker-compose-1.23.0-setup-py.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From c481f53ff75d015b4db37b294c5a2142d0272f32 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping 
-Date: Wed, 31 Oct 2018 18:45:59 +0100
-Subject: [PATCH] setup.py: Drop generic upper version boundaries
-

- setup.py | 28 ++--
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 8260ebc..7f76abb 100644
 a/setup.py
-+++ b/setup.py
-@@ -30,16 +30,16 @@ def find_version(*file_paths):
- 
- 
- install_requires = [
--'cached-property >= 1.2.0, < 2',
--'docopt >= 0.6.1, < 0.7',
--'PyYAML >= 3.10, < 4',
--'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21',
--'texttable >= 0.9.0, < 0.10',
--'websocket-client >= 0.32.0, < 1.0',
--'docker >= 3.5.0, < 4.0',
--'dockerpty >= 0.4.1, < 0.5',
--'six >= 1.3.0, < 2',
--'jsonschema >= 2.5.1, < 3',
-+'cached-property >= 1.2.0',
-+'docopt >= 0.6.1',
-+'PyYAML >= 3.10',
-+'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
-+'texttable >= 0.9.0',
-+'websocket-client >= 0.32.0',
-+'docker >= 3.5.0',
-+'dockerpty >= 0.4.1',
-+'six >= 1.3.0',
-+'jsonschema >= 2.5.1',
- ]
- 
- 
-@@ -52,11 +52,11 @@ if sys.version_info[:2] < (3, 4):
- tests_require.append('mock >= 1.0.1')
- 
- extras_require = {
--':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
-+':python_version < "3.4"': ['enum34 >= 1.0.4'],
- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
--':python_version < "3.3"': ['ipaddress >= 1.0.16'],
--':sys_platform == "win32"': ['colorama >= 0.4, < 0.5'],
--'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
-+':python_version < "3.3"': ['ipaddress'],
-+':sys_platform == "win32"': ['colorama >= 0.4'],
-+'socks': ['PySocks >= 1.5.6, != 1.5.7'],
- }
- 
- 
--- 
-2.19.1
-



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/

2019-05-10 Thread Sebastian Pipping
commit: 272a161a0b1a3b4a18253bb39b5ff60e0ddfed8a
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Fri May 10 21:50:53 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Fri May 10 22:26:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=272a161a

app-emulation/docker-compose: Set maintainer

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.65, Repoman-2.3.12

 app-emulation/docker-compose/metadata.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-emulation/docker-compose/metadata.xml 
b/app-emulation/docker-compose/metadata.xml
index 24393649cec..6d2298876fa 100644
--- a/app-emulation/docker-compose/metadata.xml
+++ b/app-emulation/docker-compose/metadata.xml
@@ -1,8 +1,8 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
-   
-   
-   
-   docker-compose
-   
+
+   
+   sp...@gentoo.org
+   Sebastian Pipping
+   
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/, app-emulation/docker-compose/

2019-05-10 Thread Sebastian Pipping
commit: da5c9b70bf178b68f852270718ef67dcbbfcb0c7
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Fri May 10 22:08:44 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Fri May 10 22:26:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da5c9b70

app-emulation/docker-compose: Fix dependencies

This unblocks system-wide updates of e.g.
- dev-python/jsonschema-3.0.1
- dev-python/pyyaml-5.1
- dev-python/texttable-1.6.1
Closes: https://bugs.gentoo.org/681002
Bug: https://bugs.gentoo.org/679968

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.65, Repoman-2.3.12

 .../docker-compose/docker-compose-1.23.2-r1.ebuild | 66 ++
 .../files/docker-compose-1.23.2-setup-py.patch | 58 +++
 2 files changed, 124 insertions(+)

diff --git a/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild 
b/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild
new file mode 100644
index 000..df1a0e87a65
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose;
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+   >=dev-python/docker-py-3.6.0[${PYTHON_USEDEP}]
+   >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+   >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+   >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+   >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+   >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+   >=dev-python/requests-2.18.1[${PYTHON_USEDEP}]
+   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+   >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+   >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
+
+DEPEND="${RDEPEND}
+   test? ( dev-python/pytest[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
+
+S="${WORKDIR}/compose-${PV}"
+
+PATCHES=(
+   # Bug #679968 -- https://bugs.gentoo.org/679968
+   # Bug #681002 -- https://bugs.gentoo.org/681002
+   "${FILESDIR}"/${PN}-1.23.2-setup-py.patch
+)
+
+src_prepare() {
+   # Address QA issue "docker-compose.exe: missing alias (symlink) for 
completed command."
+   sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i 
contrib/completion/bash/docker-compose || die
+
+   default
+}
+
+python_test() {
+   distutils_install_for_testing
+   ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+   newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+   insinto /usr/share/zsh/site-functions
+   doins contrib/completion/zsh/*
+
+   distutils-r1_python_install_all
+}

diff --git 
a/app-emulation/docker-compose/files/docker-compose-1.23.2-setup-py.patch 
b/app-emulation/docker-compose/files/docker-compose-1.23.2-setup-py.patch
new file mode 100644
index 000..193ece1c09f
--- /dev/null
+++ b/app-emulation/docker-compose/files/docker-compose-1.23.2-setup-py.patch
@@ -0,0 +1,58 @@
+From 15b1ac5bfeb0ca2a8524dae10db7573b4efacba9 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping 
+Date: Fri, 10 May 2019 23:54:14 +0200
+Subject: [PATCH] setup.py: Drop generic upper version boundaries
+
+---
+ setup.py | 26 +-
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 22dafdb..00167ce 100644
+--- a/setup.py
 b/setup.py
+@@ -30,16 +30,16 @@ def find_version(*file_paths):
+ 
+ 
+ install_requires = [
+-'cached-property >= 1.2.0, < 2',
+-'docopt >= 0.6.1, < 0.7',
+-'PyYAML >= 3.10, < 4',
+-'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21',
+-'texttable >= 0.9.0, < 0.10',
+-'websocket-client >= 0.32.0, < 1.0',
+-'docker >= 3.6.0, < 4.0',
+-'dockerpty >= 0.4.1, < 0.5',
+-'six >= 1.3.0, < 2',
+-'jsonschema >= 2.5.1, < 3',
++'cached-property >= 1.2.0',
++'docopt >= 0.6.1',
++'PyYAML >= 3.10',
++'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
++'texttable >= 0.9.0',
++'websocket-client >= 0.32.0',
++'docker >= 3.6.0',
++'dockerpty >= 0.4.1',
++'six >= 1.3.0',
++

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/

2019-05-08 Thread Mikle Kolyada
commit: 6db182b83f4d8f8a6936479f968c16b63f94a10e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed May  8 10:00:19 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed May  8 10:00:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db182b8

app-emulation/docker-compose: Drop myself from metadata

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 app-emulation/docker-compose/metadata.xml | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app-emulation/docker-compose/metadata.xml 
b/app-emulation/docker-compose/metadata.xml
index 5098f7be1a7..24393649cec 100644
--- a/app-emulation/docker-compose/metadata.xml
+++ b/app-emulation/docker-compose/metadata.xml
@@ -1,10 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
-
-   
-   zlog...@gentoo.org
-   Mikle Kolyada
-   
+   
+   

docker-compose




[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-05-07 Thread Manuel Rüger
commit: 513d727375b22da2bddf9dda78c1952895082272
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue May  7 16:04:54 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue May  7 16:04:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=513d7273

app-emulation/docker: Version bump to 18.09.6

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 app-emulation/docker/docker-18.09.6.ebuild | 299 +
 2 files changed, 300 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 2c2cce9f72a..6c5b8b9b9d4 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1 +1,2 @@
 DIST docker-18.09.5.tar.gz 15256899 BLAKE2B 
c55ef822b3e655b0bec9585de6ee346e73d48d388225141097768db9f5ddaeca2d1937274a7131e3e301686e2214a9ed2051dd72c07893bcfccb00424d02df73
 SHA512 
a6012d202761d6449e347b03759d92f5f45309e72562fd4a619b2a21c62b3f50b1256d2e4820317aa6b412f1eecda66dbd960d322293699433417a5f7ee73486
+DIST docker-18.09.6.tar.gz 15257416 BLAKE2B 
e0f93f09c403f043d3b2f390d50da83565b0520d18b695a8166aa240817cc713eb9eff314d4c7eeba242c25e35c0b6a9ea3a7f1d661d6aca4a40f7e77856a05d
 SHA512 
f05fc78f5891fa0308878690576e245eebb1e72f306f5b629b0e82dc96a04812202a2393ee6fd352bc59a1c5d29d398f0d6cddf545d57b483a051d14d7a0ee28

diff --git a/app-emulation/docker/docker-18.09.6.ebuild 
b/app-emulation/docker/docker-18.09.6.ebuild
new file mode 100644
index 000..9e222ed54de
--- /dev/null
+++ b/app-emulation/docker/docker-18.09.6.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   DOCKER_GITCOMMIT="481bc77"
+   SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
pkcs11 seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.2.5
+   ~app-emulation/runc-1.0.0_rc6_p20190216[apparmor?,seccomp?]
+   ~app-emulation/docker-proxy-0.8.0_p20190417
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
+   ~KEYS
+   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+   ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
+   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+   ~POSIX_MQUEUE
+
+   ~USER_NS
+   ~SECCOMP
+   ~CGROUP_PIDS
+   ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+   ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+   ~CGROUP_PERF
+   ~CGROUP_HUGETLB
+   ~NET_CLS_CGROUP
+   ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+   ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+   ~VXLAN
+   ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO 
~XFRM_USER
+   ~IPVLAN
+   ~MACVLAN ~DUMMY
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap 
usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-proxy/

2019-05-07 Thread Manuel Rüger
commit: e27062705adb6e7f09052dc659a9b936208303e2
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue May  7 15:54:32 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue May  7 15:54:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2706270

app-emulation/docker-proxy: Version bump

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-proxy/Manifest|  1 +
 .../docker-proxy-0.8.0_p20190417.ebuild| 34 ++
 2 files changed, 35 insertions(+)

diff --git a/app-emulation/docker-proxy/Manifest 
b/app-emulation/docker-proxy/Manifest
index 39bb59c49da..90bfe1f972e 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -4,3 +4,4 @@ DIST docker-proxy-0.8.0_p20180907.tar.gz 2711336 BLAKE2B 
ad1fc76347058610e2cd165
 DIST docker-proxy-0.8.0_p20181207.tar.gz 2703206 BLAKE2B 
46b71a4d6ac9eb0659a45c1956eb967a73b2b73c446d55de3a5b4014149f911daa03c6a914e8d79da53e01892c6592adf0df769b6b5ed3b41f3c4a3c9f979da3
 SHA512 
9256eedc6ed530506e4e61673a9f45397274093dd61105097d5c650796f0afebc8ad7c550d2dc3cacf94426e3872a2b764906bca46fc907a21b865314c8927d4
 DIST docker-proxy-0.8.0_p20190301.tar.gz 2703026 BLAKE2B 
0d0da49e1daf260c5d5699cfa8dd447cd6fe83f5903834aa065af52f133910d1f16a06ef7688340d2068e5ac544de8b1a2b9644f65af486077b66d56efd9447f
 SHA512 
8ffd6fc97df4b63b1f83a5eb6d8e63c8c413bcf3e2ff82f507dbf875d0df6903b6fe1546d8625dd3b4681d611aed4702c423d0d5c9621ed57073cbe16bf35200
 DIST docker-proxy-0.8.0_p20190405.tar.gz 2703481 BLAKE2B 
7df4333c0d5303be5819faa1e984cc516df21d197b08f07fadbe7800f6035cefbeea6a63bf0cc7bca0a23cf324558d0422638e15c7750877fa4fb589e4052ec4
 SHA512 
a24061cd29c3c9852a435f742e6653da48edd419205be18a37d065b50c2fbf005bfe62a1f909b91781f521b70cb3a9639a4a67e8563e2e39e6dd22f1c7bf82b2
+DIST docker-proxy-0.8.0_p20190417.tar.gz 2705315 BLAKE2B 
13d2b9caeaf0d2d16dc8cda641e9b13d12bc7c9dcdcf9caa60fb80c2bba9b4c9a15c8c959fdce019367002d58d83859145d70b78431b5fe7e9322d3b127cd0df
 SHA512 
c8e8544a3d8d44dc0f309aa3520a2cf62cee374a06d40473542078de94d88cb484c0dca1cee7ad89fb312c969af1694c848f464d04d61df5a9888058e21a485e

diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190417.ebuild 
b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190417.ebuild
new file mode 100644
index 000..f87e25fa079
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190417.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == * ]]; then
+   inherit golang-vcs
+else
+   EGIT_COMMIT="872f0a83c98add6cae255c8859e29532febc0039"
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test" # needs dockerd
+
+src_compile() {
+   GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || 
die
+}
+
+src_install() {
+   dodoc ROADMAP.md README.md CHANGELOG.md
+   dobin bin/docker-proxy
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-credential-helpers/

2019-05-03 Thread Michał Górny
commit: 00581305676b1b485a95d24af7d9a656c8c74f65
Author: Rafael Kitover  gmail  com>
AuthorDate: Thu May  2 22:20:48 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri May  3 07:15:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00581305

app-emulation/docker-credential-helpers: new package

New ebuild for docker-credential-helpers, which has helper programs for
docker to store your password and other sensitive information.

This ebuild builds either docker-credential-secretservice, which uses
the D-Bus secret service API to talk to either kwallet or gnome-keyring;
or docker-credential-pass which relies on the pass utility; or both
depending on USE flags.

The supported USE flags are:

- 'gnome-keyring': build secretservice helper

- 'pass': build pass helper

A message is printed via elog() upon successful merge about how to use
the helper with docker.

Signed-off-by: Rafael Kitover  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/9805
Signed-off-by: Michał Górny  gentoo.org>

 app-emulation/docker-credential-helpers/Manifest   |  1 +
 .../docker-credential-helpers-0.6.0.ebuild | 58 ++
 .../docker-credential-helpers/metadata.xml | 27 ++
 3 files changed, 86 insertions(+)

diff --git a/app-emulation/docker-credential-helpers/Manifest 
b/app-emulation/docker-credential-helpers/Manifest
new file mode 100644
index 000..487217d743a
--- /dev/null
+++ b/app-emulation/docker-credential-helpers/Manifest
@@ -0,0 +1 @@
+DIST docker-credential-helpers-0.6.0.tar.gz 27441 BLAKE2B 
6517f069782d5a496d3f140d86e5b1f32f197e9209ed61f75bfb9ba29cf0e1fa509bdbbbce2defc14ad0abe316632683cfad25e7ac9a6a1d70c3289e0ad489f5
 SHA512 
359e8ec700f423ce0687f13ce02946007f90456abe86659a87c59419ebde5e79adb4d28ee5e6a9762a44cfd65648c247629a5273326abf18a8880bee637e74d8

diff --git 
a/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.0.ebuild
 
b/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.0.ebuild
new file mode 100644
index 000..d1223733ba0
--- /dev/null
+++ 
b/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2001-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A suite of programs to use native stores to keep Docker 
credentials safe"
+HOMEPAGE="https://github.com/docker/docker-credential-helpers;
+EGO_PN=github.com/docker/docker-credential-helpers
+
+LICENSE="MIT"
+SLOT="0"
+
+if [[ ${PV} = ** ]]; then
+   inherit golang-vcs
+else
+   KEYWORDS="~amd64"
+   EGIT_COMMIT="v${PV}"
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+   inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+IUSE="gnome-keyring pass"
+REQUIRED_USE="|| ( gnome-keyring pass )"
+RESTRICT="test"
+
+DEPEND="gnome-keyring? ( app-crypt/libsecret )"
+
+RDEPEND="(
+   ${DEPEND}
+   pass? ( app-admin/pass )
+)
+"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+src_compile() {
+   local -x GOPATH="${WORKDIR}/${P}"
+   use gnome-keyring && emake secretservice
+   use pass && emake pass
+}
+
+src_install() {
+   dobin bin/*
+   dodoc CHANGELOG.md MAINTAINERS README.md
+}
+
+pkg_postinst() {
+   if use gnome-keyring; then
+   elog "For gnome-keyring/kwallet add:\n"
+   elog '  "credStore": "secretservice"'"\n"
+   fi
+   if use pass; then
+   elog "For 'pass' add:\n"
+   elog '  "credStore": "pass"'"\n"
+   fi
+   elog "to your ~/.docker/config.json"
+}

diff --git a/app-emulation/docker-credential-helpers/metadata.xml 
b/app-emulation/docker-credential-helpers/metadata.xml
new file mode 100644
index 000..1e58ef54d4d
--- /dev/null
+++ b/app-emulation/docker-credential-helpers/metadata.xml
@@ -0,0 +1,27 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+   A suite of programs to use native stores to keep Docker 
credentials
+   safe.  Currently provides docker-credential-secretservice to 
use the
+   D-Bus secret service APIs, and docker-credential-pass to use the
+   pass framework.
+
+   
+   rkito...@gmail.com
+   Rafael Kitover
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   
+   Build secretservice helper which works with 
gnome-keyring or kwallet
+   using D-Bus.
+   
+   
+   Build pass helper for the pass utility.
+   
+   
+



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/files/

2019-04-24 Thread Aaron Bauman
commit: e9c58a50e6e18182552a96b6f76dc86d6693ed54
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Apr 24 17:32:02 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Apr 25 03:33:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9c58a50

app-emulation/docker: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11816
Signed-off-by: Aaron Bauman  gentoo.org>

 .../bsc1073877-docker-apparmor-add-signal-r2.patch | 72 --
 1 file changed, 72 deletions(-)

diff --git 
a/app-emulation/docker/files/bsc1073877-docker-apparmor-add-signal-r2.patch 
b/app-emulation/docker/files/bsc1073877-docker-apparmor-add-signal-r2.patch
deleted file mode 100644
index fd365425fb9..000
--- a/app-emulation/docker/files/bsc1073877-docker-apparmor-add-signal-r2.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 4822fb1e2423d88cdf0ad5d039b8fd3274b05401 Mon Sep 17 00:00:00 2001
-From: Aleksa Sarai 
-Date: Sun, 8 Apr 2018 20:21:30 +1000
-Subject: [PATCH] apparmor: allow receiving of signals from 'docker kill'
-
-In newer kernels, AppArmor will reject attempts to send signals to a
-container because the signal originated from outside of that AppArmor
-profile. Correct this by allowing all unconfined signals to be received.
-
-Signed-off-by: Goldwyn Rodrigues 
-Signed-off-by: Aleksa Sarai 

- profiles/apparmor/apparmor.go | 21 +
- profiles/apparmor/template.go |  6 ++
- 2 files changed, 27 insertions(+)
-
-diff --git a/components/engine/profiles/apparmor/apparmor.go 
b/components/engine/profiles/apparmor/apparmor.go
-index b021668c8e4c..2f58ee852cab 100644
 a/components/engine/profiles/apparmor/apparmor.go
-+++ b/components/engine/profiles/apparmor/apparmor.go
-@@ -23,6 +23,8 @@ var (
- type profileData struct {
-   // Name is profile name.
-   Name string
-+  // DaemonProfile is the profile name of our daemon.
-+  DaemonProfile string
-   // Imports defines the apparmor functions to import, before defining 
the profile.
-   Imports []string
-   // InnerImports defines the apparmor functions to import in the profile.
-@@ -70,6 +72,25 @@ func InstallDefault(name string) error {
-   Name: name,
-   }
- 
-+  // Figure out the daemon profile.
-+  currentProfile, err := ioutil.ReadFile("/proc/self/attr/current")
-+  if err != nil {
-+  // If we couldn't get the daemon profile, assume we are running
-+  // unconfined which is generally the default.
-+  currentProfile = nil
-+  }
-+  daemonProfile := string(currentProfile)
-+  // Normally profiles are suffixed by " (enforcing)" or similar. AppArmor
-+  // profiles cannot contain spaces so this doesn't restrict daemon 
profile
-+  // names.
-+  if parts := strings.SplitN(daemonProfile, " ", 2); len(parts) >= 1 {
-+  daemonProfile = parts[0]
-+  }
-+  if daemonProfile == "" {
-+  daemonProfile = "unconfined"
-+  }
-+  p.DaemonProfile = daemonProfile
-+
-   // Install to a temporary directory.
-   f, err := ioutil.TempFile("", name)
-   if err != nil {
-diff --git a/components/engine/profiles/apparmor/template.go 
b/components/engine/profiles/apparmor/template.go
-index c00a3f70e993..400b3bd50a11 100644
 a/components/engine/profiles/apparmor/template.go
-+++ b/components/engine/profiles/apparmor/template.go
-@@ -17,6 +17,12 @@ profile {{.Name}} 
flags=(attach_disconnected,mediate_deleted) {
-   capability,
-   file,
-   umount,
-+{{if ge .Version 208096}}
-+{{/* Allow 'docker kill' to actually send signals to container processes. */}}
-+  signal (receive) peer={{.DaemonProfile}},
-+{{/* Allow container processes to send signals amongst themselves. */}}
-+  signal (send,receive) peer={{.Name}},
-+{{end}}
- 
-   deny @{PROC}/* w,   # deny write for all files directly in /proc (not in a 
subdir)
-   # deny write to files not in /proc//** or /proc/sys/**



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-04-23 Thread Manuel Rüger
commit: 21e5f7125cfe62e9ada9d3905e441ed4644057a6
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Apr 23 14:06:07 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Apr 23 14:06:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21e5f712

app-emulation/docker: Remove old

Package-Manager: Portage-2.3.63, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   2 -
 app-emulation/docker/docker-18.06.2.ebuild | 306 -
 app-emulation/docker/docker-18.09.4.ebuild | 299 
 3 files changed, 607 deletions(-)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 7a93451767d..2c2cce9f72a 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1 @@
-DIST docker-18.06.2.tar.gz 13675733 BLAKE2B 
1b0852851a9c0412d7098b114f8ff62a7fc624f1bd77ba72629009c5b2afbbbacd79f93cdb4287bdb5a58c9b09ff76c9fb5b9ea40933686b62c78ebdc61d1a1b
 SHA512 
78ab03001071eee47964894798847d7a60ac826479215a2d0a74c75bac88ad212b7f5ab0f2907456a3914c263c04a1398dc895586026440f203b50a4
-DIST docker-18.09.4.tar.gz 15254594 BLAKE2B 
9dec1752d58e874abf13a5d6285d4318af3d147f6ae989691ce4c1df577d79b1e4b7fdb673f979d5e4be2359debeaf766018d96ac17866d656d754575411c646
 SHA512 
139d09829b92319f66dea692bac0664decc666d9bc13f0a85b275e3fe2cf3b7e71b7e608a519c7a7baa40626309e2d4da880bee84da19f5eb3107af55d072ddf
 DIST docker-18.09.5.tar.gz 15256899 BLAKE2B 
c55ef822b3e655b0bec9585de6ee346e73d48d388225141097768db9f5ddaeca2d1937274a7131e3e301686e2214a9ed2051dd72c07893bcfccb00424d02df73
 SHA512 
a6012d202761d6449e347b03759d92f5f45309e72562fd4a619b2a21c62b3f50b1256d2e4820317aa6b412f1eecda66dbd960d322293699433417a5f7ee73486

diff --git a/app-emulation/docker/docker-18.06.2.ebuild 
b/app-emulation/docker/docker-18.06.2.ebuild
deleted file mode 100644
index 8245be26fc7..000
--- a/app-emulation/docker/docker-18.06.2.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = ** ]]; then
-   # Docker cannot be fetched via "go get", thanks to autogenerated code
-   EGIT_REPO_URI="https://${EGO_PN}.git;
-   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-   inherit git-r3
-else
-   inherit versionator
-   if [ "$(get_version_component_count)" = 4 ]; then
-   MY_PV="$(replace_version_separator 3 '-ce-')"
-   else
-   MY_PV="$PV-ce"
-   fi
-   DOCKER_GITCOMMIT="6247962"
-   EGIT_COMMIT="v${MY_PV}"
-   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64"
-   [ "$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
-
-DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
-HOMEPAGE="https://dockerproject.org;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened +overlay 
pkcs11 seccomp"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-   >=dev-db/sqlite-3.7.9:3
-   device-mapper? (
-   >=sys-fs/lvm2-2.02.89[thin]
-   )
-   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-   apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-   ${CDEPEND}
-
-   dev-go/go-md2man
-
-   btrfs? (
-   >=sys-fs/btrfs-progs-3.16.1
-   )
-"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-   ${CDEPEND}
-   >=net-firewall/iptables-1.4
-   sys-process/procps
-   >=dev-vcs/git-1.7
-   >=app-arch/xz-utils-4.9
-   dev-libs/libltdl
-   ~app-emulation/containerd-1.1.2
-   ~app-emulation/runc-1.0.0_rc5_p20180509[apparmor?,seccomp?]
-   >=app-emulation/runc-1.0.0_rc5_p20180509-r1
-   ~app-emulation/docker-proxy-0.8.0_p20180626
-   container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-PATCHES=( "${FILESDIR}"/bsc1073877-docker-apparmor-add-signal-r2.patch )
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
-   ~KEYS
-   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
-   ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
-   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
- 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-04-23 Thread Manuel Rüger
commit: 4dfd06216c7ce0002b755eed73f279a874f98462
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Apr 23 12:43:20 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Apr 23 12:43:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dfd0621

app-emulation/docker: Stable on amd64

Package-Manager: Portage-2.3.63, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/docker-18.09.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker/docker-18.09.5.ebuild 
b/app-emulation/docker/docker-18.09.5.ebuild
index 041c2af199a..450eaa2a1f0 100644
--- a/app-emulation/docker/docker-18.09.5.ebuild
+++ b/app-emulation/docker/docker-18.09.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = ** ]]; then
 else
DOCKER_GITCOMMIT="e8ff056"
SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64"
+   KEYWORDS="amd64 ~arm ~arm64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually 
for each bump!"
inherit golang-vcs-snapshot
 fi



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-proxy/

2019-04-23 Thread Manuel Rüger
commit: 4e588c65056087f2f92722286c9094c535b60978
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Apr 23 12:42:28 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Apr 23 12:42:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e588c65

app-emulation/docker-proxy: Stable on amd64

Package-Manager: Portage-2.3.63, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-proxy/docker-proxy-0.8.0_p20190405.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190405.ebuild 
b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190405.ebuild
index 39c8d927990..7e49b93098b 100644
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190405.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190405.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == * ]]; then
 else
EGIT_COMMIT="c9029898e32f7c89bbb81511fbb721df252ce61a"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
 fi
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-04-11 Thread Manuel Rüger
commit: 22cd7f49bc0d0cc7a8521f32d35456e125500a72
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Apr 11 10:00:47 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Apr 11 10:00:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22cd7f49

app-emulation/docker: Drop unmaintained live ebuild

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/docker-.ebuild | 289 
 1 file changed, 289 deletions(-)

diff --git a/app-emulation/docker/docker-.ebuild 
b/app-emulation/docker/docker-.ebuild
deleted file mode 100644
index 9892842ffeb..000
--- a/app-emulation/docker/docker-.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker"
-
-if [[ ${PV} = ** ]]; then
-   # Docker cannot be fetched via "go get", thanks to autogenerated code
-   EGIT_REPO_URI="https://${EGO_PN}.git;
-   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-   inherit git-r3
-else
-   MY_PV="${PV/_/-}"
-   DOCKER_GITCOMMIT=""
-   EGIT_COMMIT="v${MY_PV}"
-   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64"
-   [ "$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
-
-DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
-HOMEPAGE="https://dockerproject.org;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened overlay 
pkcs11 seccomp"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-   >=dev-db/sqlite-3.7.9:3
-   device-mapper? (
-   >=sys-fs/lvm2-2.02.89[thin]
-   )
-   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-   apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-   ${CDEPEND}
-
-   dev-go/go-md2man
-
-   btrfs? (
-   >=sys-fs/btrfs-progs-3.16.1
-   )
-"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-   ${CDEPEND}
-
-   !app-emulation/docker-bin
-   >=net-firewall/iptables-1.4
-   sys-process/procps
-   >=dev-vcs/git-1.7
-   >=app-arch/xz-utils-4.9
-
-   >=app-emulation/containerd-1.0.0
-   app-emulation/runc[apparmor?,seccomp?]
-   app-emulation/docker-proxy
-   container-init? ( >=sys-process/tini-0.13.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
-   ~KEYS
-   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
-   ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
-   ~NF_NAT ~NF_NAT_NEEDED
-   ~POSIX_MQUEUE
-
-   ~USER_NS
-   ~SECCOMP
-   ~CGROUP_PIDS
-   ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
-   ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-   ~CGROUP_PERF
-   ~CGROUP_HUGETLB
-   ~NET_CLS_CGROUP
-   ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-   ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-   ~VXLAN
-   ~XFRM_ALGO ~XFRM_USER
-   ~IPVLAN
-   ~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap 
usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container 
statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics 
gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics 
gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics 
gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container 
statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-   if kernel_is lt 3 10; then
-   ewarn ""
-   ewarn "Using Docker with kernels older than 3.10 is unstable 
and unsupported."
-   ewarn " - 
http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies;
-   fi
-
-   # for where these kernel versions come from, see:
-   # 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-04-11 Thread Manuel Rüger
commit: 1243d315cc7a2b7adbb9af53ef8fb2456f0124ef
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Apr 11 09:56:42 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Apr 11 09:57:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1243d315

app-emulation/docker: Version bump to 18.09.5

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 app-emulation/docker/docker-18.09.5.ebuild | 299 +
 2 files changed, 300 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index d8ae36e1689..7a93451767d 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,2 +1,3 @@
 DIST docker-18.06.2.tar.gz 13675733 BLAKE2B 
1b0852851a9c0412d7098b114f8ff62a7fc624f1bd77ba72629009c5b2afbbbacd79f93cdb4287bdb5a58c9b09ff76c9fb5b9ea40933686b62c78ebdc61d1a1b
 SHA512 
78ab03001071eee47964894798847d7a60ac826479215a2d0a74c75bac88ad212b7f5ab0f2907456a3914c263c04a1398dc895586026440f203b50a4
 DIST docker-18.09.4.tar.gz 15254594 BLAKE2B 
9dec1752d58e874abf13a5d6285d4318af3d147f6ae989691ce4c1df577d79b1e4b7fdb673f979d5e4be2359debeaf766018d96ac17866d656d754575411c646
 SHA512 
139d09829b92319f66dea692bac0664decc666d9bc13f0a85b275e3fe2cf3b7e71b7e608a519c7a7baa40626309e2d4da880bee84da19f5eb3107af55d072ddf
+DIST docker-18.09.5.tar.gz 15256899 BLAKE2B 
c55ef822b3e655b0bec9585de6ee346e73d48d388225141097768db9f5ddaeca2d1937274a7131e3e301686e2214a9ed2051dd72c07893bcfccb00424d02df73
 SHA512 
a6012d202761d6449e347b03759d92f5f45309e72562fd4a619b2a21c62b3f50b1256d2e4820317aa6b412f1eecda66dbd960d322293699433417a5f7ee73486

diff --git a/app-emulation/docker/docker-18.09.5.ebuild 
b/app-emulation/docker/docker-18.09.5.ebuild
new file mode 100644
index 000..041c2af199a
--- /dev/null
+++ b/app-emulation/docker/docker-18.09.5.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   DOCKER_GITCOMMIT="e8ff056"
+   SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
pkcs11 seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.2.5
+   ~app-emulation/runc-1.0.0_rc6_p20190216[apparmor?,seccomp?]
+   ~app-emulation/docker-proxy-0.8.0_p20190405
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
+   ~KEYS
+   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+   ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
+   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+   ~POSIX_MQUEUE
+
+   ~USER_NS
+   ~SECCOMP
+   ~CGROUP_PIDS
+   ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+   ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+   ~CGROUP_PERF
+   ~CGROUP_HUGETLB
+   ~NET_CLS_CGROUP
+   ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+   ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+   ~VXLAN
+   ~CRYPTO ~CRYPTO_AEAD 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-proxy/

2019-04-11 Thread Manuel Rüger
commit: 29bf5ffa25e8cb776f487e7c5dc622f9a60c45cd
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Apr 11 09:52:06 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Apr 11 09:57:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29bf5ffa

app-emulation/docker-proxy: Add snapshot for docker 18.09.5

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-proxy/Manifest|  1 +
 .../docker-proxy-0.8.0_p20190405.ebuild| 34 ++
 2 files changed, 35 insertions(+)

diff --git a/app-emulation/docker-proxy/Manifest 
b/app-emulation/docker-proxy/Manifest
index 44ff02e9d38..39bb59c49da 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -3,3 +3,4 @@ DIST docker-proxy-0.8.0_p20180626.tar.gz 2718698 BLAKE2B 
6214ba714ba8b0121416817
 DIST docker-proxy-0.8.0_p20180907.tar.gz 2711336 BLAKE2B 
ad1fc76347058610e2cd1659fb89f9990cc704c3a31006b976e44f31a30e754ac86e7b4823c48461cdcba948bb8d320ae25eac1e13b26f1fde072343251a61e0
 SHA512 
603ad154d0987a021dae69d542fa82a53b8d25ad9b44cf16f0ef551e0b81e0174dcc73b3a8e9ba89ca1d209f0022e767d44a8350b00b9b4e252cfab698b1d5bd
 DIST docker-proxy-0.8.0_p20181207.tar.gz 2703206 BLAKE2B 
46b71a4d6ac9eb0659a45c1956eb967a73b2b73c446d55de3a5b4014149f911daa03c6a914e8d79da53e01892c6592adf0df769b6b5ed3b41f3c4a3c9f979da3
 SHA512 
9256eedc6ed530506e4e61673a9f45397274093dd61105097d5c650796f0afebc8ad7c550d2dc3cacf94426e3872a2b764906bca46fc907a21b865314c8927d4
 DIST docker-proxy-0.8.0_p20190301.tar.gz 2703026 BLAKE2B 
0d0da49e1daf260c5d5699cfa8dd447cd6fe83f5903834aa065af52f133910d1f16a06ef7688340d2068e5ac544de8b1a2b9644f65af486077b66d56efd9447f
 SHA512 
8ffd6fc97df4b63b1f83a5eb6d8e63c8c413bcf3e2ff82f507dbf875d0df6903b6fe1546d8625dd3b4681d611aed4702c423d0d5c9621ed57073cbe16bf35200
+DIST docker-proxy-0.8.0_p20190405.tar.gz 2703481 BLAKE2B 
7df4333c0d5303be5819faa1e984cc516df21d197b08f07fadbe7800f6035cefbeea6a63bf0cc7bca0a23cf324558d0422638e15c7750877fa4fb589e4052ec4
 SHA512 
a24061cd29c3c9852a435f742e6653da48edd419205be18a37d065b50c2fbf005bfe62a1f909b91781f521b70cb3a9639a4a67e8563e2e39e6dd22f1c7bf82b2

diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190405.ebuild 
b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190405.ebuild
new file mode 100644
index 000..39c8d927990
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190405.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == * ]]; then
+   inherit golang-vcs
+else
+   EGIT_COMMIT="c9029898e32f7c89bbb81511fbb721df252ce61a"
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test" # needs dockerd
+
+src_compile() {
+   GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || 
die
+}
+
+src_install() {
+   dodoc ROADMAP.md README.md CHANGELOG.md
+   dobin bin/docker-proxy
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-runc/

2019-04-10 Thread Manuel Rüger
commit: 6b6e7e87ed03b6f89d6c357d8b2435bd79031ef6
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Apr 10 08:42:34 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Apr 10 08:42:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b6e7e87

app-emulation/docker-runc: Unmaintain

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-runc/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app-emulation/docker-runc/metadata.xml 
b/app-emulation/docker-runc/metadata.xml
index 9fe8126b58a..6e7ba248cbb 100644
--- a/app-emulation/docker-runc/metadata.xml
+++ b/app-emulation/docker-runc/metadata.xml
@@ -5,10 +5,7 @@
runc is a CLI tool for spawning and running containers according
to the OCF (Open Container Format) specification.

-   
-   mr...@gentoo.org
-   Manuel Rüger
-   
+   

Enable support for ambient 
capability
Enable AppArmor support



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-03-28 Thread Manuel Rüger
commit: 9974367c82cb43b5f45998b9a5ed9bf2fb52f570
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Mar 28 15:00:36 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Mar 28 15:02:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9974367c

app-emulation/docker: Stable on amd64

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/docker-18.09.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker/docker-18.09.4.ebuild 
b/app-emulation/docker/docker-18.09.4.ebuild
index 5013b1449a1..560eff8e1ff 100644
--- a/app-emulation/docker/docker-18.09.4.ebuild
+++ b/app-emulation/docker/docker-18.09.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = ** ]]; then
 else
DOCKER_GITCOMMIT="d14af54"
SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64"
+   KEYWORDS="amd64 ~arm ~arm64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually 
for each bump!"
inherit golang-vcs-snapshot
 fi



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-03-28 Thread Manuel Rüger
commit: 793ead5d006f5eb2ebfd76b51c5a63ab7c4f9129
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Mar 28 14:58:34 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Mar 28 15:02:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=793ead5d

app-emulation/docker: Version bump to 18.09.4

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 app-emulation/docker/docker-18.09.4.ebuild | 299 +
 2 files changed, 300 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index cf87052..a64b25514c1 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1,4 @@
 DIST docker-18.06.2.tar.gz 13675733 BLAKE2B 
1b0852851a9c0412d7098b114f8ff62a7fc624f1bd77ba72629009c5b2afbbbacd79f93cdb4287bdb5a58c9b09ff76c9fb5b9ea40933686b62c78ebdc61d1a1b
 SHA512 
78ab03001071eee47964894798847d7a60ac826479215a2d0a74c75bac88ad212b7f5ab0f2907456a3914c263c04a1398dc895586026440f203b50a4
 DIST docker-18.09.2.tar.gz 15252871 BLAKE2B 
f87d3a7e6ccb4750eae231b88c686ad9c0be08aa8e0657343c89593d75374dfaeb063f842b8f5cef58e4b64982d3296a6808f076837243e61d75b93ad495fb44
 SHA512 
eacbeb754cdf2c111a2b72473b437e64cf176a5e93e1a9a0e5ed092d38db5846777d23c4ad51112d8a21317d471e5f1e93f85ae5c0ad1d5d50aea95e226dfa01
 DIST docker-18.09.3.tar.gz 15249718 BLAKE2B 
ca63e611185d8514a3719e95dcc4688a1fcb4b155ffb8997e11442bd6719cc63d9e6aea9153254d281bcff1c48ea7f8c40c38bcda09b7f21b7718ccd348ee3a0
 SHA512 
c7df08c03c6bfd8451977cb86593d8ac68390c846c84cc4d8a32e05e815688ccd84a6296f819e440c850c2aa52c131686492206ec4d47765cd0af90c3c39dc03
+DIST docker-18.09.4.tar.gz 15254594 BLAKE2B 
9dec1752d58e874abf13a5d6285d4318af3d147f6ae989691ce4c1df577d79b1e4b7fdb673f979d5e4be2359debeaf766018d96ac17866d656d754575411c646
 SHA512 
139d09829b92319f66dea692bac0664decc666d9bc13f0a85b275e3fe2cf3b7e71b7e608a519c7a7baa40626309e2d4da880bee84da19f5eb3107af55d072ddf

diff --git a/app-emulation/docker/docker-18.09.4.ebuild 
b/app-emulation/docker/docker-18.09.4.ebuild
new file mode 100644
index 000..5013b1449a1
--- /dev/null
+++ b/app-emulation/docker/docker-18.09.4.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   DOCKER_GITCOMMIT="d14af54"
+   SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
pkcs11 seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.2.5
+   ~app-emulation/runc-1.0.0_rc6_p20190216[apparmor?,seccomp?]
+   ~app-emulation/docker-proxy-0.8.0_p20190301
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
+   ~KEYS
+   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+   ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
+   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+   ~POSIX_MQUEUE
+
+   ~USER_NS
+   ~SECCOMP
+   ~CGROUP_PIDS
+   ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-03-28 Thread Manuel Rüger
commit: ddcdaa934dfb66fcc72a54b6dd0b06873b7eeb40
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Mar 28 15:00:58 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Mar 28 15:02:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddcdaa93

app-emulation/docker: Remove old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   2 -
 app-emulation/docker/docker-18.09.2.ebuild | 300 -
 app-emulation/docker/docker-18.09.3.ebuild | 300 -
 3 files changed, 602 deletions(-)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index a64b25514c1..d8ae36e1689 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,4 +1,2 @@
 DIST docker-18.06.2.tar.gz 13675733 BLAKE2B 
1b0852851a9c0412d7098b114f8ff62a7fc624f1bd77ba72629009c5b2afbbbacd79f93cdb4287bdb5a58c9b09ff76c9fb5b9ea40933686b62c78ebdc61d1a1b
 SHA512 
78ab03001071eee47964894798847d7a60ac826479215a2d0a74c75bac88ad212b7f5ab0f2907456a3914c263c04a1398dc895586026440f203b50a4
-DIST docker-18.09.2.tar.gz 15252871 BLAKE2B 
f87d3a7e6ccb4750eae231b88c686ad9c0be08aa8e0657343c89593d75374dfaeb063f842b8f5cef58e4b64982d3296a6808f076837243e61d75b93ad495fb44
 SHA512 
eacbeb754cdf2c111a2b72473b437e64cf176a5e93e1a9a0e5ed092d38db5846777d23c4ad51112d8a21317d471e5f1e93f85ae5c0ad1d5d50aea95e226dfa01
-DIST docker-18.09.3.tar.gz 15249718 BLAKE2B 
ca63e611185d8514a3719e95dcc4688a1fcb4b155ffb8997e11442bd6719cc63d9e6aea9153254d281bcff1c48ea7f8c40c38bcda09b7f21b7718ccd348ee3a0
 SHA512 
c7df08c03c6bfd8451977cb86593d8ac68390c846c84cc4d8a32e05e815688ccd84a6296f819e440c850c2aa52c131686492206ec4d47765cd0af90c3c39dc03
 DIST docker-18.09.4.tar.gz 15254594 BLAKE2B 
9dec1752d58e874abf13a5d6285d4318af3d147f6ae989691ce4c1df577d79b1e4b7fdb673f979d5e4be2359debeaf766018d96ac17866d656d754575411c646
 SHA512 
139d09829b92319f66dea692bac0664decc666d9bc13f0a85b275e3fe2cf3b7e71b7e608a519c7a7baa40626309e2d4da880bee84da19f5eb3107af55d072ddf

diff --git a/app-emulation/docker/docker-18.09.2.ebuild 
b/app-emulation/docker/docker-18.09.2.ebuild
deleted file mode 100644
index f3387de3b5d..000
--- a/app-emulation/docker/docker-18.09.2.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = ** ]]; then
-   # Docker cannot be fetched via "go get", thanks to autogenerated code
-   EGIT_REPO_URI="https://${EGO_PN}.git;
-   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-   inherit git-r3
-else
-   DOCKER_GITCOMMIT="6247962"
-   SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64"
-   [ "$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
-
-DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
-HOMEPAGE="https://dockerproject.org;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
pkcs11 seccomp"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-   >=dev-db/sqlite-3.7.9:3
-   device-mapper? (
-   >=sys-fs/lvm2-2.02.89[thin]
-   )
-   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-   apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-   ${CDEPEND}
-
-   dev-go/go-md2man
-
-   btrfs? (
-   >=sys-fs/btrfs-progs-3.16.1
-   )
-"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-   ${CDEPEND}
-   >=net-firewall/iptables-1.4
-   sys-process/procps
-   >=dev-vcs/git-1.7
-   >=app-arch/xz-utils-4.9
-   dev-libs/libltdl
-   ~app-emulation/containerd-1.2.2
-   ~app-emulation/runc-1.0.0_rc6_p20181203[apparmor?,seccomp?]
-   >=app-emulation/runc-1.0.0_rc6_p20181203-r1
-   ~app-emulation/docker-proxy-0.8.0_p20181207
-   container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
-   ~KEYS
-   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
-   ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
-   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
-   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-proxy/

2019-03-28 Thread Manuel Rüger
commit: c39363c64194e077285877d8ec6cc5ddd784eed5
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Mar 28 14:49:58 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Mar 28 14:49:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c39363c6

app-emulation/docker-proxy: Update snapshot

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-proxy/Manifest|  1 +
 .../docker-proxy-0.8.0_p20190301.ebuild| 36 ++
 2 files changed, 37 insertions(+)

diff --git a/app-emulation/docker-proxy/Manifest 
b/app-emulation/docker-proxy/Manifest
index d1717237948..44ff02e9d38 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -2,3 +2,4 @@ DIST docker-proxy-0.8.0_p20180411.tar.gz 2695069 BLAKE2B 
5205d5700ad116bb457dc7a
 DIST docker-proxy-0.8.0_p20180626.tar.gz 2718698 BLAKE2B 
6214ba714ba8b01214168171f465dfaee4d8ff791db7a219a3fb92fade3e4207d36d90090790c0a3059e6fb209f3cd8bb0082ca75496108ebffb7c9b0c5092a4
 SHA512 
21d3d1bd8aafeab51a3e0a14ada4d559b5b113a48d315e91f7d70e4fa839f5c92d4068b38c28bf6929da9c11cfc61703bafc7148f64b784208d61fa14ee4545d
 DIST docker-proxy-0.8.0_p20180907.tar.gz 2711336 BLAKE2B 
ad1fc76347058610e2cd1659fb89f9990cc704c3a31006b976e44f31a30e754ac86e7b4823c48461cdcba948bb8d320ae25eac1e13b26f1fde072343251a61e0
 SHA512 
603ad154d0987a021dae69d542fa82a53b8d25ad9b44cf16f0ef551e0b81e0174dcc73b3a8e9ba89ca1d209f0022e767d44a8350b00b9b4e252cfab698b1d5bd
 DIST docker-proxy-0.8.0_p20181207.tar.gz 2703206 BLAKE2B 
46b71a4d6ac9eb0659a45c1956eb967a73b2b73c446d55de3a5b4014149f911daa03c6a914e8d79da53e01892c6592adf0df769b6b5ed3b41f3c4a3c9f979da3
 SHA512 
9256eedc6ed530506e4e61673a9f45397274093dd61105097d5c650796f0afebc8ad7c550d2dc3cacf94426e3872a2b764906bca46fc907a21b865314c8927d4
+DIST docker-proxy-0.8.0_p20190301.tar.gz 2703026 BLAKE2B 
0d0da49e1daf260c5d5699cfa8dd447cd6fe83f5903834aa065af52f133910d1f16a06ef7688340d2068e5ac544de8b1a2b9644f65af486077b66d56efd9447f
 SHA512 
8ffd6fc97df4b63b1f83a5eb6d8e63c8c413bcf3e2ff82f507dbf875d0df6903b6fe1546d8625dd3b4681d611aed4702c423d0d5c9621ed57073cbe16bf35200

diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190301.ebuild 
b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190301.ebuild
new file mode 100644
index 000..ed5d2bce09c
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190301.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == * ]]; then
+   inherit golang-vcs
+else
+   EGIT_COMMIT="4725f2163fb214a6312f3beae5991f838ec36326"
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RDEPEND="!

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-proxy/

2019-03-28 Thread Manuel Rüger
commit: 47bd3e70e9e12765d0bac5bbf9cddb3f8417c9d9
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Mar 28 14:50:23 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Mar 28 14:50:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47bd3e70

app-emulation/docker-proxy: Stabilize on amd64

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-proxy/docker-proxy-0.8.0_p20190301.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190301.ebuild 
b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190301.ebuild
index ed5d2bce09c..a0aba5ee00b 100644
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190301.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190301.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == * ]]; then
 else
EGIT_COMMIT="4725f2163fb214a6312f3beae5991f838ec36326"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
 fi
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-registry/

2019-03-20 Thread Zac Medico
commit: 496d7b5ac1e6a32b7cdf799aa2ba2c2b3dcba575
Author: Zac Medico  gentoo  org>
AuthorDate: Wed Mar 20 22:45:22 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Wed Mar 20 22:45:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=496d7b5a

app-emulation/docker-registry: filter GOCACHE vars (bug 681072)

Reported-by: Toralf Förster  gentoo.org>
Closes: https://bugs.gentoo.org/681072
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild | 3 ++-
 app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild | 3 ++-
 app-emulation/docker-registry/docker-registry-2.7.0.ebuild| 3 ++-
 app-emulation/docker-registry/docker-registry-2.7.1.ebuild| 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild 
b/app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild
index 6ea2a86bd59..863b9ac5082 100644
--- a/app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild
+++ b/app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,7 @@ pkg_setup() {
 }
 
 src_compile() {
+   export -n GOCACHE XDG_CACHE_HOME #681072
GOPATH="${S}" \
go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/..." || die
 }

diff --git a/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild 
b/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild
index 7f36e363292..c117f1e1314 100644
--- a/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild
+++ b/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,6 +28,7 @@ src_prepare() {
 }
 
 src_compile() {
+   export -n GOCACHE XDG_CACHE_HOME #681072
GOPATH="${S}" \
go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/..." || die
 }

diff --git a/app-emulation/docker-registry/docker-registry-2.7.0.ebuild 
b/app-emulation/docker-registry/docker-registry-2.7.0.ebuild
index 152ac01305b..90b39c280c9 100644
--- a/app-emulation/docker-registry/docker-registry-2.7.0.ebuild
+++ b/app-emulation/docker-registry/docker-registry-2.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,6 +21,7 @@ pkg_setup() {
 }
 
 src_compile() {
+   export -n GOCACHE XDG_CACHE_HOME #681072
GOPATH="${S}" \
go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/..." || die
 }

diff --git a/app-emulation/docker-registry/docker-registry-2.7.1.ebuild 
b/app-emulation/docker-registry/docker-registry-2.7.1.ebuild
index 3ab8dea6448..57b97ad055d 100644
--- a/app-emulation/docker-registry/docker-registry-2.7.1.ebuild
+++ b/app-emulation/docker-registry/docker-registry-2.7.1.ebuild
@@ -31,6 +31,7 @@ src_prepare() {
 }
 
 src_compile() {
+   export -n GOCACHE XDG_CACHE_HOME #681072
GOPATH="${S}" GO_BUILD_FLAGS="-v" emake -C src/${EGO_PN} binaries
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/

2019-03-12 Thread Mikle Kolyada
commit: 13231bbe125077f1e266b577a46699197c3ec2f7
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Mar 12 18:55:49 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Mar 12 18:57:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13231bbe

app-emulation/docker-compose: ammend requests boundary in setup.py

Closes: https://bugs.gentoo.org/679968
Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 app-emulation/docker-compose/docker-compose-1.23.2.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-emulation/docker-compose/docker-compose-1.23.2.ebuild 
b/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
index bb0f9242708..721e14ac21a 100644
--- a/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
@@ -52,6 +52,9 @@ src_prepare() {
# Address QA issue "docker-compose.exe: missing alias (symlink) for 
completed command."
sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i 
contrib/completion/bash/docker-compose || die
 
+   # Get rid of requests boundary
+   sed -i -e  "/^.*requests/s/, <.*/',/" setup.py || die
+
default
 
 }



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/

2019-03-10 Thread Mikle Kolyada
commit: 633d9ed67747f204a2cd4c4c14bb83d5bd6b339d
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Mar 10 08:41:02 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Mar 10 08:41:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=633d9ed6

app-emulation/docker-compose: mark stable

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-emulation/docker-compose/Manifest  |  4 --
 .../docker-compose/docker-compose-1.19.0.ebuild| 71 -
 .../docker-compose/docker-compose-1.21.2-r1.ebuild | 71 -
 .../docker-compose/docker-compose-1.22.0-r1.ebuild | 72 --
 .../docker-compose/docker-compose-1.23.1-r1.ebuild | 72 --
 .../docker-compose/docker-compose-1.23.2.ebuild|  2 +-
 6 files changed, 1 insertion(+), 291 deletions(-)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index 182767853e7..6c1ed1c4939 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,5 +1 @@
-DIST docker-compose-1.19.0.tar.gz 238307 BLAKE2B 
2a7bbcf50c2cc591eba1d59db30cb0341e33e3f1ebe948e0b6762d9bffcdcc72d98e2da19fc549c5fabda192fca69a9d54e016601ddb4f4a94f0dc1c93f99a29
 SHA512 
f1d522621580a5130378508e6b15ad2e4708e9c5ff713627ca54308ab3e6bf000e21c55bbdf9585b2116e73648fdc773500a5415ab81a72dd2c69c9c07e71581
-DIST docker-compose-1.21.2.tar.gz 294070 BLAKE2B 
c27ce8708f20385ee3f072c4aa832a42dc975d08d71d9e61ce3a822055d606db7e1e7b6e182523e64115922416d5c1baeca14897a241e84873a97aa755bce539
 SHA512 
6392582d8c6c321458b1163336f1c902548cc250f9ab5b765d144287b006ef6dacdc47199fafbb6efe426e382325b94986aa159df08dec4974a71968862a8435
-DIST docker-compose-1.22.0.tar.gz 296747 BLAKE2B 
9dfd25fb186436801d9c12900c4103c1c0d83bee3b424b3f2373247aeeb8261fed04cf9be9cee230a48e1c19523b48d5618a18f322c236bac1d769036f9ac979
 SHA512 
eccef2165221fcfdac089ffd3bd0795d08d8c6f7158709dbc2fc83a6d6e9466af4b73c0c7d24a751c6b546b4219e10dfc96cd41e13e7ebc676da603c97b7620e
-DIST docker-compose-1.23.1.tar.gz 302224 BLAKE2B 
510a6236194297dd68b3b1a00239142d0f5dd1cacb79a82604a22e7f57581f778ad6027d0108ff896e9f4354c5eb0e1fb2ceea4285bee6a47e5cb8e32a3e5a75
 SHA512 
d294663e575657c361602693d66aca1ae3c0f5d4b25a74f4ab575be34054dc3168cb77d59fedf981f6bc98e253e87791187440f10c6957254c4f2e29ef7063d0
 DIST docker-compose-1.23.2.tar.gz 302950 BLAKE2B 
b96db2e718bd6b05f6a35829749570320209def17b7536e402b9991b56e05a2d8da97fbd8d79d8125d9df6ff361a181fbfd71346a33a68704db0327a92757f66
 SHA512 
baa233c84ac770798ba3d8d256687630b331d774a8d60f3c0d5046aa0a74c8c3b8b0b8bc4431f3bc7d5b7a54f0646f5e2fd14d5af31db37cb546e86c96c8c1db

diff --git a/app-emulation/docker-compose/docker-compose-1.19.0.ebuild 
b/app-emulation/docker-compose/docker-compose-1.19.0.ebuild
deleted file mode 100644
index a5225f60246..000
--- a/app-emulation/docker-compose/docker-compose-1.19.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://www.docker.com/;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-
-CDEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-   =dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-   =dev-python/docker-py-2.7.0[${PYTHON_USEDEP}]
-   =dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-   =dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-   =dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-   !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-   =dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-   =dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-   =dev-python/texttable-0.9[${PYTHON_USEDEP}]
-   =dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-   =dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 
'python2_7' )
-   $(python_gen_cond_dep '=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 
'python2_7' )
-   $(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-   ${CDEPEND}
-   test? (
-   dev-python/pytest[${PYTHON_USEDEP}]
-   $(python_gen_cond_dep 
'>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-   )
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-   ${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-   newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-   insinto /usr/share/zsh/site-functions
-   doins contrib/completion/zsh/*
-
-   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/

2019-03-10 Thread Mikle Kolyada
commit: f943ad1cacb81d7468b503291d418e6b6dd673ac
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Mar 10 08:31:19 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Mar 10 08:31:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f943ad1c

app-emulation/docker-compose: Drop lower bpundary for requests

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-emulation/docker-compose/docker-compose-1.23.2.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-emulation/docker-compose/docker-compose-1.23.2.ebuild 
b/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
index 67051b8efed..a022e0c42a4 100644
--- a/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,6 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-   =dev-python/six-1.3.0[${PYTHON_USEDEP}]
=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/files/

2019-03-03 Thread Aaron Bauman
commit: 723d6a11886802c940657e967cb61d0ae5721c9c
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Mar  2 11:42:57 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Mar  4 03:12:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=723d6a11

app-emulation/docker: remove unused patch

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11207
Signed-off-by: Aaron Bauman  gentoo.org>

 .../bsc1073877-docker-apparmor-add-signal.patch  | 20 
 1 file changed, 20 deletions(-)

diff --git 
a/app-emulation/docker/files/bsc1073877-docker-apparmor-add-signal.patch 
b/app-emulation/docker/files/bsc1073877-docker-apparmor-add-signal.patch
deleted file mode 100644
index 6bc3fa494e3..000
--- a/app-emulation/docker/files/bsc1073877-docker-apparmor-add-signal.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Goldwyn Rodrigues 
-Subject: Allow signal mediation while for apparmor profile
-
-Allows docker processes under docker-default ot receive all signals.
-
-Signed-off-by: Goldwyn Rodrigues 

- components/engine/profiles/apparmor/template.go |1 +
- 1 file changed, 1 insertion(+)
-
 a/components/engine/profiles/apparmor/template.go
-+++ b/components/engine/profiles/apparmor/template.go
-@@ -17,6 +17,7 @@ profile {{.Name}} flags=(attach_disconne
-   capability,
-   file,
-   umount,
-+  signal (receive) peer=unconfined,
- 
-   deny @{PROC}/* w,   # deny write for all files directly in /proc (not in a 
subdir)
-   # deny write to files not in /proc//** or /proc/sys/**



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-03-01 Thread Manuel Rüger
commit: 2a932ff99f3549c743ffbd2a083cfe721aebd7ef
Author: Manuel Rüger  gentoo  org>
AuthorDate: Fri Mar  1 13:38:05 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Fri Mar  1 13:42:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a932ff9

app-emulation/docker: Version bump to 18.09.3

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 app-emulation/docker/docker-18.09.3.ebuild | 300 +
 2 files changed, 301 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 927bca63e16..f5237acd510 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1,4 @@
 DIST docker-18.03.1.tar.gz 12758590 BLAKE2B 
98213af07b945fda536e321ef5cc9e272848aab97dcadb7a6b1433b9310fa78015794b5ee4f255448251366a7811e97248b9cc90b0225c528249188768f344ab
 SHA512 
48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10
 DIST docker-18.06.2.tar.gz 13675733 BLAKE2B 
1b0852851a9c0412d7098b114f8ff62a7fc624f1bd77ba72629009c5b2afbbbacd79f93cdb4287bdb5a58c9b09ff76c9fb5b9ea40933686b62c78ebdc61d1a1b
 SHA512 
78ab03001071eee47964894798847d7a60ac826479215a2d0a74c75bac88ad212b7f5ab0f2907456a3914c263c04a1398dc895586026440f203b50a4
 DIST docker-18.09.2.tar.gz 15252871 BLAKE2B 
f87d3a7e6ccb4750eae231b88c686ad9c0be08aa8e0657343c89593d75374dfaeb063f842b8f5cef58e4b64982d3296a6808f076837243e61d75b93ad495fb44
 SHA512 
eacbeb754cdf2c111a2b72473b437e64cf176a5e93e1a9a0e5ed092d38db5846777d23c4ad51112d8a21317d471e5f1e93f85ae5c0ad1d5d50aea95e226dfa01
+DIST docker-18.09.3.tar.gz 15249718 BLAKE2B 
ca63e611185d8514a3719e95dcc4688a1fcb4b155ffb8997e11442bd6719cc63d9e6aea9153254d281bcff1c48ea7f8c40c38bcda09b7f21b7718ccd348ee3a0
 SHA512 
c7df08c03c6bfd8451977cb86593d8ac68390c846c84cc4d8a32e05e815688ccd84a6296f819e440c850c2aa52c131686492206ec4d47765cd0af90c3c39dc03

diff --git a/app-emulation/docker/docker-18.09.3.ebuild 
b/app-emulation/docker/docker-18.09.3.ebuild
new file mode 100644
index 000..c1958f2b807
--- /dev/null
+++ b/app-emulation/docker/docker-18.09.3.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   DOCKER_GITCOMMIT="774a1f4"
+   SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
pkcs11 seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.2.2
+   ~app-emulation/runc-1.0.0_rc6_p20181203[apparmor?,seccomp?]
+   >=app-emulation/runc-1.0.0_rc6_p20181203-r1
+   ~app-emulation/docker-proxy-0.8.0_p20181207
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
+   ~KEYS
+   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+   ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
+   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+   ~POSIX_MQUEUE
+
+   ~USER_NS
+   ~SECCOMP
+   ~CGROUP_PIDS

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-03-01 Thread Manuel Rüger
commit: f4647ac06b8048b2fef4bdd5db64442d7544d6d2
Author: Manuel Rüger  gentoo  org>
AuthorDate: Fri Mar  1 13:38:26 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Fri Mar  1 13:42:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4647ac0

app-emulation/docker: Remove old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest |   1 -
 app-emulation/docker/docker-18.03.1-r1.ebuild | 303 --
 app-emulation/docker/docker-18.03.1.ebuild| 303 --
 3 files changed, 607 deletions(-)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index f5237acd510..cf87052 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,4 +1,3 @@
-DIST docker-18.03.1.tar.gz 12758590 BLAKE2B 
98213af07b945fda536e321ef5cc9e272848aab97dcadb7a6b1433b9310fa78015794b5ee4f255448251366a7811e97248b9cc90b0225c528249188768f344ab
 SHA512 
48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10
 DIST docker-18.06.2.tar.gz 13675733 BLAKE2B 
1b0852851a9c0412d7098b114f8ff62a7fc624f1bd77ba72629009c5b2afbbbacd79f93cdb4287bdb5a58c9b09ff76c9fb5b9ea40933686b62c78ebdc61d1a1b
 SHA512 
78ab03001071eee47964894798847d7a60ac826479215a2d0a74c75bac88ad212b7f5ab0f2907456a3914c263c04a1398dc895586026440f203b50a4
 DIST docker-18.09.2.tar.gz 15252871 BLAKE2B 
f87d3a7e6ccb4750eae231b88c686ad9c0be08aa8e0657343c89593d75374dfaeb063f842b8f5cef58e4b64982d3296a6808f076837243e61d75b93ad495fb44
 SHA512 
eacbeb754cdf2c111a2b72473b437e64cf176a5e93e1a9a0e5ed092d38db5846777d23c4ad51112d8a21317d471e5f1e93f85ae5c0ad1d5d50aea95e226dfa01
 DIST docker-18.09.3.tar.gz 15249718 BLAKE2B 
ca63e611185d8514a3719e95dcc4688a1fcb4b155ffb8997e11442bd6719cc63d9e6aea9153254d281bcff1c48ea7f8c40c38bcda09b7f21b7718ccd348ee3a0
 SHA512 
c7df08c03c6bfd8451977cb86593d8ac68390c846c84cc4d8a32e05e815688ccd84a6296f819e440c850c2aa52c131686492206ec4d47765cd0af90c3c39dc03

diff --git a/app-emulation/docker/docker-18.03.1-r1.ebuild 
b/app-emulation/docker/docker-18.03.1-r1.ebuild
deleted file mode 100644
index 0af07da23fd..000
--- a/app-emulation/docker/docker-18.03.1-r1.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = ** ]]; then
-   # Docker cannot be fetched via "go get", thanks to autogenerated code
-   EGIT_REPO_URI="https://${EGO_PN}.git;
-   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-   inherit git-r3
-else
-   inherit versionator
-   if [ "$(get_version_component_count)" = 4 ]; then
-   MY_PV="$(replace_version_separator 3 '-ce-')"
-   else
-   MY_PV="$PV-ce"
-   fi
-   DOCKER_GITCOMMIT="9ee9f40"
-   EGIT_COMMIT="v${MY_PV}"
-   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm"
-   [ "$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
-
-DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
-HOMEPAGE="https://dockerproject.org;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened +overlay 
pkcs11 seccomp"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-   >=dev-db/sqlite-3.7.9:3
-   device-mapper? (
-   >=sys-fs/lvm2-2.02.89[thin]
-   )
-   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-   apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-   ${CDEPEND}
-
-   dev-go/go-md2man
-
-   btrfs? (
-   >=sys-fs/btrfs-progs-3.16.1
-   )
-"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-   ${CDEPEND}
-   >=net-firewall/iptables-1.4
-   sys-process/procps
-   >=dev-vcs/git-1.7
-   >=app-arch/xz-utils-4.9
-   dev-libs/libltdl
-   ~app-emulation/containerd-1.0.3
-   ~app-emulation/runc-1.0.0_rc5[apparmor?,seccomp?]
-   ~app-emulation/docker-proxy-0.8.0_p20180411
-   container-init? ( >=sys-process/tini-0.16.1[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-PATCHES=( "${FILESDIR}"/bsc1073877-docker-apparmor-add-signal-r1.patch )
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-02-11 Thread Manuel Rüger
commit: 6ab8b9ad7f6f7773b7d4d6846939f3e91ab831b9
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Feb 11 19:39:03 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Feb 11 19:39:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab8b9ad

app-emulation/docker: Remove old

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest |   2 -
 app-emulation/docker/docker-18.06.1-r1.ebuild | 305 --
 app-emulation/docker/docker-18.09.1.ebuild| 299 -
 3 files changed, 606 deletions(-)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index db9866e15f4..927bca63e16 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,5 +1,3 @@
 DIST docker-18.03.1.tar.gz 12758590 BLAKE2B 
98213af07b945fda536e321ef5cc9e272848aab97dcadb7a6b1433b9310fa78015794b5ee4f255448251366a7811e97248b9cc90b0225c528249188768f344ab
 SHA512 
48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10
-DIST docker-18.06.1.tar.gz 13672693 BLAKE2B 
7aed2f409914471b3e0eec4f3d024bf59e6505060c1da9c4bb68f0d6efdb5286a8e9e5ee0de19b3f0165c965db27d409f72fceb3f792fc91b9b8dddc8a2b01f0
 SHA512 
7375452669bf6576e1f8d193cd7f421cf39a26d575351f2b4e433c7fc89384f441547417dbe8c12a12a0937c9fea3800b5c541f0ba8b58ceffe7445183ceeef1
 DIST docker-18.06.2.tar.gz 13675733 BLAKE2B 
1b0852851a9c0412d7098b114f8ff62a7fc624f1bd77ba72629009c5b2afbbbacd79f93cdb4287bdb5a58c9b09ff76c9fb5b9ea40933686b62c78ebdc61d1a1b
 SHA512 
78ab03001071eee47964894798847d7a60ac826479215a2d0a74c75bac88ad212b7f5ab0f2907456a3914c263c04a1398dc895586026440f203b50a4
-DIST docker-18.09.1.tar.gz 15247155 BLAKE2B 
5c9a6c0d6e383da2b99341812b0cc1d1498e46decc3b3aaa418607d5f4d725a6842a4462c06357685a32312b90978b0349aaceb69907324761589e68cfae7bca
 SHA512 
9813d3bd41eff63a089495a976226b93d5d43544530aea0ebce78b96e6b4b38389fe3ad1117f1ca95c38727047a24211ad2c2b44217935c26ffb5496cf90407e
 DIST docker-18.09.2.tar.gz 15252871 BLAKE2B 
f87d3a7e6ccb4750eae231b88c686ad9c0be08aa8e0657343c89593d75374dfaeb063f842b8f5cef58e4b64982d3296a6808f076837243e61d75b93ad495fb44
 SHA512 
eacbeb754cdf2c111a2b72473b437e64cf176a5e93e1a9a0e5ed092d38db5846777d23c4ad51112d8a21317d471e5f1e93f85ae5c0ad1d5d50aea95e226dfa01

diff --git a/app-emulation/docker/docker-18.06.1-r1.ebuild 
b/app-emulation/docker/docker-18.06.1-r1.ebuild
deleted file mode 100644
index a5aaa520b41..000
--- a/app-emulation/docker/docker-18.06.1-r1.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = ** ]]; then
-   # Docker cannot be fetched via "go get", thanks to autogenerated code
-   EGIT_REPO_URI="https://${EGO_PN}.git;
-   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-   inherit git-r3
-else
-   inherit versionator
-   if [ "$(get_version_component_count)" = 4 ]; then
-   MY_PV="$(replace_version_separator 3 '-ce-')"
-   else
-   MY_PV="$PV-ce"
-   fi
-   DOCKER_GITCOMMIT="e68fc7a"
-   EGIT_COMMIT="v${MY_PV}"
-   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64"
-   [ "$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
-
-DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
-HOMEPAGE="https://dockerproject.org;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened +overlay 
pkcs11 seccomp"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-   >=dev-db/sqlite-3.7.9:3
-   device-mapper? (
-   >=sys-fs/lvm2-2.02.89[thin]
-   )
-   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-   apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-   ${CDEPEND}
-
-   dev-go/go-md2man
-
-   btrfs? (
-   >=sys-fs/btrfs-progs-3.16.1
-   )
-"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-   ${CDEPEND}
-   >=net-firewall/iptables-1.4
-   sys-process/procps
-   >=dev-vcs/git-1.7
-   >=app-arch/xz-utils-4.9
-   dev-libs/libltdl
-   ~app-emulation/containerd-1.1.2
-   ~app-emulation/runc-1.0.0_rc5_p20180509[apparmor?,seccomp?]
-   ~app-emulation/docker-proxy-0.8.0_p20180626
-   container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-02-11 Thread Manuel Rüger
commit: b0b02c83928c85cc7a8753932196e365438d632c
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Feb 11 19:38:39 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Feb 11 19:38:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b02c83

app-emulation/docker: Stabilize on amd64

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/docker-18.06.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker/docker-18.06.2.ebuild 
b/app-emulation/docker/docker-18.06.2.ebuild
index 311e6048a8f..8245be26fc7 100644
--- a/app-emulation/docker/docker-18.06.2.ebuild
+++ b/app-emulation/docker/docker-18.06.2.ebuild
@@ -20,7 +20,7 @@ else
DOCKER_GITCOMMIT="6247962"
EGIT_COMMIT="v${MY_PV}"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64"
+   KEYWORDS="amd64 ~arm ~arm64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually 
for each bump!"
inherit golang-vcs-snapshot
 fi



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-02-11 Thread Manuel Rüger
commit: 50ef975b503569836ce4f77dc07e04928009235c
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Feb 11 19:38:15 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Feb 11 19:38:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ef975b

app-emulation/docker: Version bump to 18.06.2

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 app-emulation/docker/docker-18.06.2.ebuild | 306 +
 2 files changed, 307 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index e0348a33e56..db9866e15f4 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,4 +1,5 @@
 DIST docker-18.03.1.tar.gz 12758590 BLAKE2B 
98213af07b945fda536e321ef5cc9e272848aab97dcadb7a6b1433b9310fa78015794b5ee4f255448251366a7811e97248b9cc90b0225c528249188768f344ab
 SHA512 
48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10
 DIST docker-18.06.1.tar.gz 13672693 BLAKE2B 
7aed2f409914471b3e0eec4f3d024bf59e6505060c1da9c4bb68f0d6efdb5286a8e9e5ee0de19b3f0165c965db27d409f72fceb3f792fc91b9b8dddc8a2b01f0
 SHA512 
7375452669bf6576e1f8d193cd7f421cf39a26d575351f2b4e433c7fc89384f441547417dbe8c12a12a0937c9fea3800b5c541f0ba8b58ceffe7445183ceeef1
+DIST docker-18.06.2.tar.gz 13675733 BLAKE2B 
1b0852851a9c0412d7098b114f8ff62a7fc624f1bd77ba72629009c5b2afbbbacd79f93cdb4287bdb5a58c9b09ff76c9fb5b9ea40933686b62c78ebdc61d1a1b
 SHA512 
78ab03001071eee47964894798847d7a60ac826479215a2d0a74c75bac88ad212b7f5ab0f2907456a3914c263c04a1398dc895586026440f203b50a4
 DIST docker-18.09.1.tar.gz 15247155 BLAKE2B 
5c9a6c0d6e383da2b99341812b0cc1d1498e46decc3b3aaa418607d5f4d725a6842a4462c06357685a32312b90978b0349aaceb69907324761589e68cfae7bca
 SHA512 
9813d3bd41eff63a089495a976226b93d5d43544530aea0ebce78b96e6b4b38389fe3ad1117f1ca95c38727047a24211ad2c2b44217935c26ffb5496cf90407e
 DIST docker-18.09.2.tar.gz 15252871 BLAKE2B 
f87d3a7e6ccb4750eae231b88c686ad9c0be08aa8e0657343c89593d75374dfaeb063f842b8f5cef58e4b64982d3296a6808f076837243e61d75b93ad495fb44
 SHA512 
eacbeb754cdf2c111a2b72473b437e64cf176a5e93e1a9a0e5ed092d38db5846777d23c4ad51112d8a21317d471e5f1e93f85ae5c0ad1d5d50aea95e226dfa01

diff --git a/app-emulation/docker/docker-18.06.2.ebuild 
b/app-emulation/docker/docker-18.06.2.ebuild
new file mode 100644
index 000..311e6048a8f
--- /dev/null
+++ b/app-emulation/docker/docker-18.06.2.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   inherit versionator
+   if [ "$(get_version_component_count)" = 4 ]; then
+   MY_PV="$(replace_version_separator 3 '-ce-')"
+   else
+   MY_PV="$PV-ce"
+   fi
+   DOCKER_GITCOMMIT="6247962"
+   EGIT_COMMIT="v${MY_PV}"
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init +device-mapper hardened +overlay 
pkcs11 seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.1.2
+   ~app-emulation/runc-1.0.0_rc5_p20180509[apparmor?,seccomp?]
+   >=app-emulation/runc-1.0.0_rc5_p20180509-r1
+   ~app-emulation/docker-proxy-0.8.0_p20180626
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-02-11 Thread Manuel Rüger
commit: dd66d7b0cf907eae723446bca2c9656a8d21f303
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Feb 11 17:54:49 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Feb 11 17:54:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd66d7b0

app-emulation/docker: Stabilize on amd64

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/docker-18.09.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker/docker-18.09.2.ebuild 
b/app-emulation/docker/docker-18.09.2.ebuild
index 40b6abc8a07..f3387de3b5d 100644
--- a/app-emulation/docker/docker-18.09.2.ebuild
+++ b/app-emulation/docker/docker-18.09.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = ** ]]; then
 else
DOCKER_GITCOMMIT="6247962"
SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64"
+   KEYWORDS="amd64 ~arm ~arm64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually 
for each bump!"
inherit golang-vcs-snapshot
 fi



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-proxy/

2019-02-11 Thread Manuel Rüger
commit: cdf747dc8ac653ef1d3747c60aefdc4af4d85b5a
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Feb 11 17:52:28 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Feb 11 17:54:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdf747dc

app-emulation/docker-proxy: Stabilize on amd64

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-proxy/docker-proxy-0.8.0_p20181207.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20181207.ebuild 
b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20181207.ebuild
index 6e64beaea41..c0bd42bd486 100644
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20181207.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20181207.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == * ]]; then
 else
EGIT_COMMIT="2cfbf9b1f98162a55829a21cc603c76072a75382"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
 fi
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-02-11 Thread Manuel Rüger
commit: 3a1c1dbc55bebcdf2971926aa66274872fb2c28d
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Feb 11 17:49:16 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Feb 11 17:49:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a1c1dbc

app-emulation/docker: Version bump to 18.09.2

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 app-emulation/docker/docker-18.09.2.ebuild | 300 +
 2 files changed, 301 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 8ac1a0d9034..e0348a33e56 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1,4 @@
 DIST docker-18.03.1.tar.gz 12758590 BLAKE2B 
98213af07b945fda536e321ef5cc9e272848aab97dcadb7a6b1433b9310fa78015794b5ee4f255448251366a7811e97248b9cc90b0225c528249188768f344ab
 SHA512 
48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10
 DIST docker-18.06.1.tar.gz 13672693 BLAKE2B 
7aed2f409914471b3e0eec4f3d024bf59e6505060c1da9c4bb68f0d6efdb5286a8e9e5ee0de19b3f0165c965db27d409f72fceb3f792fc91b9b8dddc8a2b01f0
 SHA512 
7375452669bf6576e1f8d193cd7f421cf39a26d575351f2b4e433c7fc89384f441547417dbe8c12a12a0937c9fea3800b5c541f0ba8b58ceffe7445183ceeef1
 DIST docker-18.09.1.tar.gz 15247155 BLAKE2B 
5c9a6c0d6e383da2b99341812b0cc1d1498e46decc3b3aaa418607d5f4d725a6842a4462c06357685a32312b90978b0349aaceb69907324761589e68cfae7bca
 SHA512 
9813d3bd41eff63a089495a976226b93d5d43544530aea0ebce78b96e6b4b38389fe3ad1117f1ca95c38727047a24211ad2c2b44217935c26ffb5496cf90407e
+DIST docker-18.09.2.tar.gz 15252871 BLAKE2B 
f87d3a7e6ccb4750eae231b88c686ad9c0be08aa8e0657343c89593d75374dfaeb063f842b8f5cef58e4b64982d3296a6808f076837243e61d75b93ad495fb44
 SHA512 
eacbeb754cdf2c111a2b72473b437e64cf176a5e93e1a9a0e5ed092d38db5846777d23c4ad51112d8a21317d471e5f1e93f85ae5c0ad1d5d50aea95e226dfa01

diff --git a/app-emulation/docker/docker-18.09.2.ebuild 
b/app-emulation/docker/docker-18.09.2.ebuild
new file mode 100644
index 000..40b6abc8a07
--- /dev/null
+++ b/app-emulation/docker/docker-18.09.2.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   DOCKER_GITCOMMIT="6247962"
+   SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
pkcs11 seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.2.2
+   ~app-emulation/runc-1.0.0_rc6_p20181203[apparmor?,seccomp?]
+   >=app-emulation/runc-1.0.0_rc6_p20181203-r1
+   ~app-emulation/docker-proxy-0.8.0_p20181207
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
+   ~KEYS
+   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+   ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
+   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+   ~POSIX_MQUEUE
+
+   ~USER_NS
+   ~SECCOMP
+   ~CGROUP_PIDS

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-02-01 Thread Manuel Rüger
commit: 22990f0ad4c42683bc1f73760423373fe7552e0b
Author: Manuel Rüger  gentoo  org>
AuthorDate: Fri Feb  1 16:01:59 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Fri Feb  1 16:01:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22990f0a

app-emulation/docker: Remove old

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 -
 app-emulation/docker/docker-18.09.0.ebuild | 301 -
 2 files changed, 302 deletions(-)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 3e5380be214..8ac1a0d9034 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,4 +1,3 @@
 DIST docker-18.03.1.tar.gz 12758590 BLAKE2B 
98213af07b945fda536e321ef5cc9e272848aab97dcadb7a6b1433b9310fa78015794b5ee4f255448251366a7811e97248b9cc90b0225c528249188768f344ab
 SHA512 
48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10
 DIST docker-18.06.1.tar.gz 13672693 BLAKE2B 
7aed2f409914471b3e0eec4f3d024bf59e6505060c1da9c4bb68f0d6efdb5286a8e9e5ee0de19b3f0165c965db27d409f72fceb3f792fc91b9b8dddc8a2b01f0
 SHA512 
7375452669bf6576e1f8d193cd7f421cf39a26d575351f2b4e433c7fc89384f441547417dbe8c12a12a0937c9fea3800b5c541f0ba8b58ceffe7445183ceeef1
-DIST docker-18.09.0.tar.gz 15196102 BLAKE2B 
99b791da6351268ccd54424f1ec1d0b1246d7283e5bf8f41f604f0437202a0c494f7017d68c58f01782eea8539fcc189c290f494125878eb3ca368f3d8cdd57d
 SHA512 
a6173d9e2dde33c6059b3464720207a3bc0f4d6d79af65ad10cd30b4b437134ad45fc2039cebcaa41b2dfb68a21963010d63a4051ade6a6d25fcd93c8d560c67
 DIST docker-18.09.1.tar.gz 15247155 BLAKE2B 
5c9a6c0d6e383da2b99341812b0cc1d1498e46decc3b3aaa418607d5f4d725a6842a4462c06357685a32312b90978b0349aaceb69907324761589e68cfae7bca
 SHA512 
9813d3bd41eff63a089495a976226b93d5d43544530aea0ebce78b96e6b4b38389fe3ad1117f1ca95c38727047a24211ad2c2b44217935c26ffb5496cf90407e

diff --git a/app-emulation/docker/docker-18.09.0.ebuild 
b/app-emulation/docker/docker-18.09.0.ebuild
deleted file mode 100644
index 2b1d6a9b7fc..000
--- a/app-emulation/docker/docker-18.09.0.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = ** ]]; then
-   # Docker cannot be fetched via "go get", thanks to autogenerated code
-   EGIT_REPO_URI="https://${EGO_PN}.git;
-   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-   inherit git-r3
-else
-   DOCKER_GITCOMMIT="4d60db4"
-   SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64"
-   [ "$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
-
-DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
-HOMEPAGE="https://dockerproject.org;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
pkcs11 seccomp"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-   >=dev-db/sqlite-3.7.9:3
-   device-mapper? (
-   >=sys-fs/lvm2-2.02.89[thin]
-   )
-   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-   apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-   ${CDEPEND}
-
-   dev-go/go-md2man
-
-   btrfs? (
-   >=sys-fs/btrfs-progs-3.16.1
-   )
-"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-   ${CDEPEND}
-   >=net-firewall/iptables-1.4
-   sys-process/procps
-   >=dev-vcs/git-1.7
-   >=app-arch/xz-utils-4.9
-   dev-libs/libltdl
-   ~app-emulation/containerd-1.1.2
-   ~app-emulation/runc-1.0.0_rc5_p20180509[apparmor?,seccomp?]
-   ~app-emulation/docker-proxy-0.8.0_p20180907
-   container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-PATCHES=( "${FILESDIR}"/bsc1073877-docker-apparmor-add-signal-r2.patch )
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
-   ~KEYS
-   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
-   ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
-   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
-   ~POSIX_MQUEUE
-
-   ~USER_NS
-   ~SECCOMP
-  

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-registry/

2019-01-18 Thread Manuel Rüger
commit: 8c16279f2ac3ec405007a7d5ca9e679e8cfbc8ec
Author: Manuel Rüger  gentoo  org>
AuthorDate: Fri Jan 18 12:53:04 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Fri Jan 18 12:53:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c16279f

app-emulation/docker-registry: Version bump to 2.7.1

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-registry/Manifest |  1 +
 .../docker-registry/docker-registry-2.7.1.ebuild   | 49 ++
 2 files changed, 50 insertions(+)

diff --git a/app-emulation/docker-registry/Manifest 
b/app-emulation/docker-registry/Manifest
index 0b420bbbe03..9bf0d949d91 100644
--- a/app-emulation/docker-registry/Manifest
+++ b/app-emulation/docker-registry/Manifest
@@ -1,2 +1,3 @@
 DIST docker-registry-2.6.2.tar.gz 1579760 BLAKE2B 
d0e067f2e9124847b5e362f23ca7d67655fbf0a6227efc3fd9073d5360389d6d8531e5709b52225c54e6e3097a2d5d79102e27fd09412b95d2e5d8a4a30dde2d
 SHA512 
a091db2e15d7c1dc8cd39a40de5bb63cc1ead68e95dfaf6b3735a789adb87f146c03eff81f700e0059e5f6ffc43e6c3dd3358503697882cb080b991629f82c60
 DIST docker-registry-2.7.0.tar.gz 1996485 BLAKE2B 
49022546b72a1ea2b457a3dc059d8940bfba3070208b2962f8acd1351312d568d6facc1690ae8ee78742b5647c3a84bd6538a9eb0c279aec0a8dfae2c823fa61
 SHA512 
72bf5f0953c58e4d1adf6427ee13a9456204ab278d4489277e4dd1b3a3df6717cc02c966cdfcdf77d86e769209fa18e377e0b12a6c02b9f58980185e9844aec6
+DIST docker-registry-2.7.1.tar.gz 1996699 BLAKE2B 
2e22db69f476be5a4688f5b3d6b41fbbf71460351543ae849f707dd5b3d56624f674815a25214002886b057f0859f75fd197bb275a7b3cc8a7787422f716ad0e
 SHA512 
f6baf0e7aa96ebe828c628f7dfd84ee899331c3c1bdab86662aef595b092702b6d9b2c9be766a6de6d153ff4ca55d85c5fd8785a0968f285f56a32a50092c754

diff --git a/app-emulation/docker-registry/docker-registry-2.7.1.ebuild 
b/app-emulation/docker-registry/docker-registry-2.7.1.ebuild
new file mode 100644
index 000..3ab8dea6448
--- /dev/null
+++ b/app-emulation/docker-registry/docker-registry-2.7.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/docker/distribution"
+EGIT_COMMIT="2461543d988979529609e8cb6fca9ca190dc48da"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Docker Registry 2.0"
+HOMEPAGE="https://github.com/docker/distribution;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+SVCNAME=registry
+
+pkg_setup() {
+   enewgroup ${SVCNAME}
+   enewuser ${SVCNAME} -1 -1 /dev/null ${SVCNAME}
+}
+
+src_prepare() {
+   default
+   pushd src/${EGO_PN} || die
+   eapply "${FILESDIR}"/${PN}-2.7.0-notification-metrics.patch
+   sed -i -e "s/git describe.*/echo ${PV})/"\
+   -e "s/git rev-parse.*/echo ${EGIT_COMMIT})/"\
+   -e "s/-s -w/-w/" Makefile || die
+   popd || die
+}
+
+src_compile() {
+   GOPATH="${S}" GO_BUILD_FLAGS="-v" emake -C src/${EGO_PN} binaries
+}
+
+src_install() {
+   exeinto /usr/libexec/${PN}
+   doexe src/${EGO_PN}/bin/*
+   insinto /etc/docker/registry
+   newins src/${EGO_PN}/cmd/registry/config-example.yml config.yml.example
+   newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
+   newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
+   systemd_dounit "${FILESDIR}/${SVCNAME}.service"
+   keepdir /var/{lib,log}/${SVCNAME}
+   fowners ${SVCNAME}:${SVCNAME} /var/{lib,log}/${SVCNAME}
+   insinto /etc/logrotate.d
+   newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2019-01-10 Thread Manuel Rüger
commit: 8e97a2d8b27370b69e98c20338aceff976e801b1
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Jan 10 13:34:22 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Jan 10 13:34:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e97a2d8

app-emulation/docker: Version bump to 18.09.1

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker/Manifest  |   1 +
 app-emulation/docker/docker-18.09.1.ebuild | 299 +
 2 files changed, 300 insertions(+)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index ce4031f589e..3e5380be214 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1,4 @@
 DIST docker-18.03.1.tar.gz 12758590 BLAKE2B 
98213af07b945fda536e321ef5cc9e272848aab97dcadb7a6b1433b9310fa78015794b5ee4f255448251366a7811e97248b9cc90b0225c528249188768f344ab
 SHA512 
48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10
 DIST docker-18.06.1.tar.gz 13672693 BLAKE2B 
7aed2f409914471b3e0eec4f3d024bf59e6505060c1da9c4bb68f0d6efdb5286a8e9e5ee0de19b3f0165c965db27d409f72fceb3f792fc91b9b8dddc8a2b01f0
 SHA512 
7375452669bf6576e1f8d193cd7f421cf39a26d575351f2b4e433c7fc89384f441547417dbe8c12a12a0937c9fea3800b5c541f0ba8b58ceffe7445183ceeef1
 DIST docker-18.09.0.tar.gz 15196102 BLAKE2B 
99b791da6351268ccd54424f1ec1d0b1246d7283e5bf8f41f604f0437202a0c494f7017d68c58f01782eea8539fcc189c290f494125878eb3ca368f3d8cdd57d
 SHA512 
a6173d9e2dde33c6059b3464720207a3bc0f4d6d79af65ad10cd30b4b437134ad45fc2039cebcaa41b2dfb68a21963010d63a4051ade6a6d25fcd93c8d560c67
+DIST docker-18.09.1.tar.gz 15247155 BLAKE2B 
5c9a6c0d6e383da2b99341812b0cc1d1498e46decc3b3aaa418607d5f4d725a6842a4462c06357685a32312b90978b0349aaceb69907324761589e68cfae7bca
 SHA512 
9813d3bd41eff63a089495a976226b93d5d43544530aea0ebce78b96e6b4b38389fe3ad1117f1ca95c38727047a24211ad2c2b44217935c26ffb5496cf90407e

diff --git a/app-emulation/docker/docker-18.09.1.ebuild 
b/app-emulation/docker/docker-18.09.1.ebuild
new file mode 100644
index 000..e6637e5dca2
--- /dev/null
+++ b/app-emulation/docker/docker-18.09.1.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = ** ]]; then
+   # Docker cannot be fetched via "go get", thanks to autogenerated code
+   EGIT_REPO_URI="https://${EGO_PN}.git;
+   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+   inherit git-r3
+else
+   DOCKER_GITCOMMIT="4c52b90"
+   SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64"
+   [ "$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
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://dockerproject.org;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay 
pkcs11 seccomp"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+   >=dev-db/sqlite-3.7.9:3
+   device-mapper? (
+   >=sys-fs/lvm2-2.02.89[thin]
+   )
+   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+   apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+   ${CDEPEND}
+
+   dev-go/go-md2man
+
+   btrfs? (
+   >=sys-fs/btrfs-progs-3.16.1
+   )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+   ${CDEPEND}
+   >=net-firewall/iptables-1.4
+   sys-process/procps
+   >=dev-vcs/git-1.7
+   >=app-arch/xz-utils-4.9
+   dev-libs/libltdl
+   ~app-emulation/containerd-1.2.2
+   ~app-emulation/runc-1.0.0_rc6_p20181203[apparmor?,seccomp?]
+   ~app-emulation/docker-proxy-0.8.0_p20181207
+   container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
+   ~KEYS
+   ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+   ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+   ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK 
~NETFILTER_XT_MATCH_IPVS
+   ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+   ~POSIX_MQUEUE
+
+   ~USER_NS
+   ~SECCOMP
+   ~CGROUP_PIDS
+   ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-proxy/

2019-01-10 Thread Manuel Rüger
commit: e8d5f66f36fa8980b826ca4442c063be10838a92
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Jan 10 13:11:17 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Jan 10 13:11:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8d5f66f

app-emulation/docker-proxy: Update snapshot for docker-18.09.1

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 app-emulation/docker-proxy/Manifest|  1 +
 .../docker-proxy-0.8.0_p20181207.ebuild| 36 ++
 2 files changed, 37 insertions(+)

diff --git a/app-emulation/docker-proxy/Manifest 
b/app-emulation/docker-proxy/Manifest
index 2f5b8db2fdf..d1717237948 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -1,3 +1,4 @@
 DIST docker-proxy-0.8.0_p20180411.tar.gz 2695069 BLAKE2B 
5205d5700ad116bb457dc7a57f2624f9efa46f1dbf3f5fe9215077655cddba8e1e1301bc555fb43a22cba4d74423123953a67994bf8974b114350e64be601299
 SHA512 
300e197313017536f91768ba675f2ab773eb1914f8e5908f4ff5b6fc8c4f0fa5ba1653cd9f8ca26e7c466f1623716aa45a2746f862e47ca9fe9136010085f600
 DIST docker-proxy-0.8.0_p20180626.tar.gz 2718698 BLAKE2B 
6214ba714ba8b01214168171f465dfaee4d8ff791db7a219a3fb92fade3e4207d36d90090790c0a3059e6fb209f3cd8bb0082ca75496108ebffb7c9b0c5092a4
 SHA512 
21d3d1bd8aafeab51a3e0a14ada4d559b5b113a48d315e91f7d70e4fa839f5c92d4068b38c28bf6929da9c11cfc61703bafc7148f64b784208d61fa14ee4545d
 DIST docker-proxy-0.8.0_p20180907.tar.gz 2711336 BLAKE2B 
ad1fc76347058610e2cd1659fb89f9990cc704c3a31006b976e44f31a30e754ac86e7b4823c48461cdcba948bb8d320ae25eac1e13b26f1fde072343251a61e0
 SHA512 
603ad154d0987a021dae69d542fa82a53b8d25ad9b44cf16f0ef551e0b81e0174dcc73b3a8e9ba89ca1d209f0022e767d44a8350b00b9b4e252cfab698b1d5bd
+DIST docker-proxy-0.8.0_p20181207.tar.gz 2703206 BLAKE2B 
46b71a4d6ac9eb0659a45c1956eb967a73b2b73c446d55de3a5b4014149f911daa03c6a914e8d79da53e01892c6592adf0df769b6b5ed3b41f3c4a3c9f979da3
 SHA512 
9256eedc6ed530506e4e61673a9f45397274093dd61105097d5c650796f0afebc8ad7c550d2dc3cacf94426e3872a2b764906bca46fc907a21b865314c8927d4

diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20181207.ebuild 
b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20181207.ebuild
new file mode 100644
index 000..6e64beaea41
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20181207.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == * ]]; then
+   inherit golang-vcs
+else
+   EGIT_COMMIT="2cfbf9b1f98162a55829a21cc603c76072a75382"
+   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+   inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RDEPEND="!

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/

2018-12-27 Thread Mikle Kolyada
commit: 049ed1ed122a43abd4f0c22747691bb4e857f827
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Dec 28 07:43:41 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Dec 28 07:43:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=049ed1ed

app-emulation/docker-compose: Drop old

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../docker-compose/docker-compose-1.22.0.ebuild| 78 --
 .../docker-compose/docker-compose-1.23.1.ebuild| 73 
 2 files changed, 151 deletions(-)

diff --git a/app-emulation/docker-compose/docker-compose-1.22.0.ebuild 
b/app-emulation/docker-compose/docker-compose-1.22.0.ebuild
deleted file mode 100644
index 762d474a043..000
--- a/app-emulation/docker-compose/docker-compose-1.22.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose;
-SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-   =dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-   =dev-python/docker-py-3.4.1[${PYTHON_USEDEP}]
-   =dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-   =dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-   =dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-   !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-   =dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-   =dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-   =dev-python/texttable-0.9[${PYTHON_USEDEP}]
-   =dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-   =dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 
'python2_7' )
-   $(python_gen_cond_dep '=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 
'python2_7' )
-   $(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-   ${CDEPEND}
-   test? (
-   dev-python/pytest[${PYTHON_USEDEP}]
-   $(python_gen_cond_dep 
'>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-   )
-"
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
-   # Address QA issue "docker-compose.exe: missing alias (symlink) for 
completed command."
-   sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i 
contrib/completion/bash/docker-compose || die
-
-   eapply_user
-}
-
-python_test() {
-   ${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-   newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-   insinto /usr/share/zsh/site-functions
-   doins contrib/completion/zsh/*
-
-   distutils-r1_python_install_all
-}

diff --git a/app-emulation/docker-compose/docker-compose-1.23.1.ebuild 
b/app-emulation/docker-compose/docker-compose-1.23.1.ebuild
deleted file mode 100644
index 02d47b99134..000
--- a/app-emulation/docker-compose/docker-compose-1.23.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose;
-SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-   >=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-   >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-   >=dev-python/docker-py-3.5.0[${PYTHON_USEDEP}]
-   >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-   >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-   >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-   !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-   >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-   >=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-   !~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-   !~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-   !~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-   >=dev-python/texttable-0.9[${PYTHON_USEDEP}]
-   >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-   $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 
'python2_7' )
-   $(python_gen_cond_dep 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/

2018-12-21 Thread Mikle Kolyada
commit: 1bc4f8ad3173053fd6884e077e6c6d403ded09a3
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Dec 21 16:00:23 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Dec 21 16:00:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bc4f8ad

app-emulation/docker-compose: Version bump (v1.23.2)

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-emulation/docker-compose/Manifest  |  1 +
 .../docker-compose/docker-compose-1.23.2.ebuild| 72 ++
 2 files changed, 73 insertions(+)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index c98f39b21ea..182767853e7 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -2,3 +2,4 @@ DIST docker-compose-1.19.0.tar.gz 238307 BLAKE2B 
2a7bbcf50c2cc591eba1d59db30cb03
 DIST docker-compose-1.21.2.tar.gz 294070 BLAKE2B 
c27ce8708f20385ee3f072c4aa832a42dc975d08d71d9e61ce3a822055d606db7e1e7b6e182523e64115922416d5c1baeca14897a241e84873a97aa755bce539
 SHA512 
6392582d8c6c321458b1163336f1c902548cc250f9ab5b765d144287b006ef6dacdc47199fafbb6efe426e382325b94986aa159df08dec4974a71968862a8435
 DIST docker-compose-1.22.0.tar.gz 296747 BLAKE2B 
9dfd25fb186436801d9c12900c4103c1c0d83bee3b424b3f2373247aeeb8261fed04cf9be9cee230a48e1c19523b48d5618a18f322c236bac1d769036f9ac979
 SHA512 
eccef2165221fcfdac089ffd3bd0795d08d8c6f7158709dbc2fc83a6d6e9466af4b73c0c7d24a751c6b546b4219e10dfc96cd41e13e7ebc676da603c97b7620e
 DIST docker-compose-1.23.1.tar.gz 302224 BLAKE2B 
510a6236194297dd68b3b1a00239142d0f5dd1cacb79a82604a22e7f57581f778ad6027d0108ff896e9f4354c5eb0e1fb2ceea4285bee6a47e5cb8e32a3e5a75
 SHA512 
d294663e575657c361602693d66aca1ae3c0f5d4b25a74f4ab575be34054dc3168cb77d59fedf981f6bc98e253e87791187440f10c6957254c4f2e29ef7063d0
+DIST docker-compose-1.23.2.tar.gz 302950 BLAKE2B 
b96db2e718bd6b05f6a35829749570320209def17b7536e402b9991b56e05a2d8da97fbd8d79d8125d9df6ff361a181fbfd71346a33a68704db0327a92757f66
 SHA512 
baa233c84ac770798ba3d8d256687630b331d774a8d60f3c0d5046aa0a74c8c3b8b0b8bc4431f3bc7d5b7a54f0646f5e2fd14d5af31db37cb546e86c96c8c1db

diff --git a/app-emulation/docker-compose/docker-compose-1.23.2.ebuild 
b/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
new file mode 100644
index 000..67051b8efed
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,6}} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose;
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+   =dev-python/docker-py-3.6.0[${PYTHON_USEDEP}]
+   =dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+   =dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+   =dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+   =dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+   =dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+   =dev-python/requests-2.6.1[${PYTHON_USEDEP}]
+   =dev-python/six-1.3.0[${PYTHON_USEDEP}]
+   =dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+   =dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+   =dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
+
+DEPEND="${RDEPEND}
+   test? ( dev-python/pytest[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
+
+S="${WORKDIR}/compose-${PV}"
+
+src_prepare() {
+   # Address QA issue "docker-compose.exe: missing alias (symlink) for 
completed command."
+   sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i 
contrib/completion/bash/docker-compose || die
+
+   default
+
+}
+
+python_test() {
+   distutils_install_for_testing
+   ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+   newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+   insinto /usr/share/zsh/site-functions
+   doins contrib/completion/zsh/*
+
+   distutils-r1_python_install_all
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2018-12-16 Thread Manuel Rüger
commit: de6bf75fbcc2cab7012bb9fef25aeade5df30281
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Dec 16 13:10:24 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Dec 16 13:10:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de6bf75f

app-emulation/docker: Remove old

Signed-off-by: Manuel Rüger  gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.11

 app-emulation/docker/Manifest  |   1 -
 app-emulation/docker/docker-18.06.0.ebuild | 305 -
 app-emulation/docker/docker-18.06.1.ebuild | 305 -
 3 files changed, 611 deletions(-)

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 2fcc4618def..ce4031f589e 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,4 +1,3 @@
 DIST docker-18.03.1.tar.gz 12758590 BLAKE2B 
98213af07b945fda536e321ef5cc9e272848aab97dcadb7a6b1433b9310fa78015794b5ee4f255448251366a7811e97248b9cc90b0225c528249188768f344ab
 SHA512 
48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10
-DIST docker-18.06.0.tar.gz 13656557 BLAKE2B 
cc5e28d47eca07a42f040d8b47de25a35403e9e0451ca57eddcf1b6721169eb9bc41d4f4b5aad355f4394534e339ccbc83c6fb6d4df750c9738f1aa2466f90ef
 SHA512 
d5bd6a83126c4dba14c775533b6c9bda35af2cd97db13922b3766494ce10dd9316d0167c87a6683dede28ea063f9435a0a009b96e413dad8abc7884a3468d589
 DIST docker-18.06.1.tar.gz 13672693 BLAKE2B 
7aed2f409914471b3e0eec4f3d024bf59e6505060c1da9c4bb68f0d6efdb5286a8e9e5ee0de19b3f0165c965db27d409f72fceb3f792fc91b9b8dddc8a2b01f0
 SHA512 
7375452669bf6576e1f8d193cd7f421cf39a26d575351f2b4e433c7fc89384f441547417dbe8c12a12a0937c9fea3800b5c541f0ba8b58ceffe7445183ceeef1
 DIST docker-18.09.0.tar.gz 15196102 BLAKE2B 
99b791da6351268ccd54424f1ec1d0b1246d7283e5bf8f41f604f0437202a0c494f7017d68c58f01782eea8539fcc189c290f494125878eb3ca368f3d8cdd57d
 SHA512 
a6173d9e2dde33c6059b3464720207a3bc0f4d6d79af65ad10cd30b4b437134ad45fc2039cebcaa41b2dfb68a21963010d63a4051ade6a6d25fcd93c8d560c67

diff --git a/app-emulation/docker/docker-18.06.0.ebuild 
b/app-emulation/docker/docker-18.06.0.ebuild
deleted file mode 100644
index 5e383f38290..000
--- a/app-emulation/docker/docker-18.06.0.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = ** ]]; then
-   # Docker cannot be fetched via "go get", thanks to autogenerated code
-   EGIT_REPO_URI="https://${EGO_PN}.git;
-   EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-   inherit git-r3
-else
-   inherit versionator
-   if [ "$(get_version_component_count)" = 4 ]; then
-   MY_PV="$(replace_version_separator 3 '-ce-')"
-   else
-   MY_PV="$PV-ce"
-   fi
-   DOCKER_GITCOMMIT="0ffa825"
-   EGIT_COMMIT="v${MY_PV}"
-   SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64"
-   [ "$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
-
-DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
-HOMEPAGE="https://dockerproject.org;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened +overlay 
pkcs11 seccomp"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-   >=dev-db/sqlite-3.7.9:3
-   device-mapper? (
-   >=sys-fs/lvm2-2.02.89[thin]
-   )
-   seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-   apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-   ${CDEPEND}
-
-   dev-go/go-md2man
-
-   btrfs? (
-   >=sys-fs/btrfs-progs-3.16.1
-   )
-"
-
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-   ${CDEPEND}
-   >=net-firewall/iptables-1.4
-   sys-process/procps
-   >=dev-vcs/git-1.7
-   >=app-arch/xz-utils-4.9
-   dev-libs/libltdl
-   ~app-emulation/containerd-1.1.1
-   ~app-emulation/runc-1.0.0_rc5_p20180509[apparmor?,seccomp?]
-   ~app-emulation/docker-proxy-0.8.0_p20180626
-   container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-PATCHES=( "${FILESDIR}"/bsc1073877-docker-apparmor-add-signal.patch )
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-   ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-   ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-registry/, app-emulation/docker-registry/files/

2018-12-14 Thread Manuel Rüger
commit: 4f6a9e4e9b4b483cfdfc3dcf42ea1c45e5f366f0
Author: Manuel Rüger  gentoo  org>
AuthorDate: Fri Dec 14 16:48:40 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Fri Dec 14 16:48:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f6a9e4e

app-emulation/docker-registry: Apply patch to provide more notification metrics

Signed-off-by: Manuel Rüger  gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.11

 .../docker-registry-2.7.0-r1.ebuild|  47 +++
 ...ocker-registry-2.7.0-notification-metrics.patch | 398 +
 2 files changed, 445 insertions(+)

diff --git a/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild 
b/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild
new file mode 100644
index 000..7f36e363292
--- /dev/null
+++ b/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/docker/distribution"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Docker Registry 2.0"
+HOMEPAGE="https://github.com/docker/distribution;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+SVCNAME=registry
+
+pkg_setup() {
+   enewgroup ${SVCNAME}
+   enewuser ${SVCNAME} -1 -1 /dev/null ${SVCNAME}
+}
+
+src_prepare() {
+   default
+   pushd src/${EGO_PN} || die
+   eapply "${FILESDIR}"/${P}-notification-metrics.patch
+   popd || die
+}
+
+src_compile() {
+   GOPATH="${S}" \
+   go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/..." || die
+}
+
+src_install() {
+   exeinto /usr/libexec/${PN}
+   doexe bin/*
+   insinto /etc/docker/registry
+   newins src/${EGO_PN}/cmd/registry/config-example.yml config.yml.example
+   newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
+   newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
+   systemd_dounit "${FILESDIR}/${SVCNAME}.service"
+   keepdir /var/{lib,log}/${SVCNAME}
+   fowners ${SVCNAME}:${SVCNAME} /var/{lib,log}/${SVCNAME}
+   insinto /etc/logrotate.d
+   newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
+}

diff --git 
a/app-emulation/docker-registry/files/docker-registry-2.7.0-notification-metrics.patch
 
b/app-emulation/docker-registry/files/docker-registry-2.7.0-notification-metrics.patch
new file mode 100644
index 000..8adf364ce16
--- /dev/null
+++ 
b/app-emulation/docker-registry/files/docker-registry-2.7.0-notification-metrics.patch
@@ -0,0 +1,398 @@
+From 7b2292ee20c5d49053cc5262dfbc99ce121b9b74 Mon Sep 17 00:00:00 2001
+From: tifayuki 
+Date: Tue, 13 Feb 2018 13:30:56 -0800
+Subject: [PATCH 1/4] Add notification metrics
+
+It adds notification related prometheus metrics, including:
+  - total count for events/success/failure/error
+  - total count for notification per each status code
+  - gauge of the pending notification queue
+
+Signed-off-by: tifayuki 
+---
+ metrics/prometheus.go|  3 +++
+ notifications/metrics.go | 28 
+ 2 files changed, 31 insertions(+)
+
+diff --git a/metrics/prometheus.go b/metrics/prometheus.go
+index b5a532144..91b32b23d 100644
+--- a/metrics/prometheus.go
 b/metrics/prometheus.go
+@@ -10,4 +10,7 @@ const (
+ var (
+   // StorageNamespace is the prometheus namespace of blob/cache related 
operations
+   StorageNamespace = metrics.NewNamespace(NamespacePrefix, "storage", nil)
++
++  // NotificationsNamespace is the prometheus namespace of notification 
related metrics
++  NotificationsNamespace = metrics.NewNamespace(NamespacePrefix, 
"notifications", nil)
+ )
+diff --git a/notifications/metrics.go b/notifications/metrics.go
+index a20af1687..69960e9cb 100644
+--- a/notifications/metrics.go
 b/notifications/metrics.go
+@@ -5,6 +5,18 @@ import (
+   "fmt"
+   "net/http"
+   "sync"
++
++  prometheus "github.com/docker/distribution/metrics"
++  "github.com/docker/go-metrics"
++)
++
++var (
++  // eventsCounter counts total events of incoming, success, failure, and 
errors
++  eventsCounter = 
prometheus.NotificationsNamespace.NewLabeledCounter("events", "The number of 
total events", "type")
++  // pendingGauge measures the pending queue size
++  pendingGauge = prometheus.NotificationsNamespace.NewGauge("pending", 
"The gauge of pending events in queue", metrics.Total)
++  // statusCounter counts the total notification call per each status code
++  statusCounter = 
prometheus.NotificationsNamespace.NewLabeledCounter("status", "The number of 
status code", "code")
+ )
+ 
+ // EndpointMetrics track various actions taken by the endpoint, typically by
+@@ -61,6 +73,9 @@ func (emsl *endpointMetricsHTTPStatusListener) 
success(status int, events ...Eve
+   defer 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

2018-12-11 Thread Manuel Rüger
commit: 11d4182406b777ae98a3fd4bb35c82998c682362
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Dec 11 10:12:48 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Dec 11 10:12:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11d41824

app-emulation/docker: Stabilize on amd64

Signed-off-by: Manuel Rüger  gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.11

 app-emulation/docker/docker-18.06.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/docker/docker-18.06.1-r1.ebuild 
b/app-emulation/docker/docker-18.06.1-r1.ebuild
index 149bfeb91e8..a5aaa520b41 100644
--- a/app-emulation/docker/docker-18.06.1-r1.ebuild
+++ b/app-emulation/docker/docker-18.06.1-r1.ebuild
@@ -20,7 +20,7 @@ else
DOCKER_GITCOMMIT="e68fc7a"
EGIT_COMMIT="v${MY_PV}"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64"
+   KEYWORDS="amd64 ~arm ~arm64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually 
for each bump!"
inherit golang-vcs-snapshot
 fi



<    1   2   3   4   5   6   7   >