Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/
Date: Fri, 28 Dec 2018 07:44:08
Message-Id: 1545983038.049ed1ed122a43abd4f0c22747691bb4e857f827.zlogene@gentoo
1 commit: 049ed1ed122a43abd4f0c22747691bb4e857f827
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 28 07:43:41 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 28 07:43:58 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=049ed1ed
7
8 app-emulation/docker-compose: Drop old
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 .../docker-compose/docker-compose-1.22.0.ebuild | 78 ----------------------
14 .../docker-compose/docker-compose-1.23.1.ebuild | 73 --------------------
15 2 files changed, 151 deletions(-)
16
17 diff --git a/app-emulation/docker-compose/docker-compose-1.22.0.ebuild b/app-emulation/docker-compose/docker-compose-1.22.0.ebuild
18 deleted file mode 100644
19 index 762d474a043..00000000000
20 --- a/app-emulation/docker-compose/docker-compose-1.22.0.ebuild
21 +++ /dev/null
22 @@ -1,78 +0,0 @@
23 -# Copyright 1999-2018 Gentoo Foundation
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=6
27 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
28 -
29 -inherit bash-completion-r1 distutils-r1 vcs-snapshot
30 -
31 -MY_PV=${PV/_/}
32 -
33 -DESCRIPTION="Multi-container orchestration for Docker"
34 -HOMEPAGE="https://github.com/docker/compose"
35 -SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
36 -
37 -LICENSE="Apache-2.0"
38 -SLOT="0"
39 -KEYWORDS="~amd64"
40 -IUSE="test"
41 -
42 -CDEPEND="
43 - dev-python/setuptools[${PYTHON_USEDEP}]
44 - >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
45 - <dev-python/cached-property-2[${PYTHON_USEDEP}]
46 - >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
47 - <dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
48 - >=dev-python/docker-py-3.4.1[${PYTHON_USEDEP}]
49 - <dev-python/docker-py-3.5[${PYTHON_USEDEP}]
50 - >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
51 - <dev-python/docopt-0.7[${PYTHON_USEDEP}]
52 - >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
53 - <dev-python/jsonschema-3[${PYTHON_USEDEP}]
54 - >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
55 - !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
56 - <dev-python/PySocks-2[${PYTHON_USEDEP}]
57 - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
58 - <dev-python/pyyaml-4[${PYTHON_USEDEP}]
59 - !~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
60 - <dev-python/requests-2.19[${PYTHON_USEDEP}]
61 - >=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
62 - >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
63 - <dev-python/six-2[${PYTHON_USEDEP}]
64 - >=dev-python/texttable-0.9[${PYTHON_USEDEP}]
65 - <dev-python/texttable-0.10[${PYTHON_USEDEP}]
66 - >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
67 - <dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
68 - $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
69 - $(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
70 - $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
71 - $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
72 -"
73 -DEPEND="
74 - ${CDEPEND}
75 - test? (
76 - dev-python/pytest[${PYTHON_USEDEP}]
77 - $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
78 - )
79 -"
80 -RDEPEND="${CDEPEND}"
81 -
82 -src_prepare() {
83 - # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
84 - sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
85 -
86 - eapply_user
87 -}
88 -
89 -python_test() {
90 - ${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
91 -}
92 -
93 -python_install_all() {
94 - newbashcomp contrib/completion/bash/docker-compose ${PN}
95 -
96 - insinto /usr/share/zsh/site-functions
97 - doins contrib/completion/zsh/*
98 -
99 - distutils-r1_python_install_all
100 -}
101
102 diff --git a/app-emulation/docker-compose/docker-compose-1.23.1.ebuild b/app-emulation/docker-compose/docker-compose-1.23.1.ebuild
103 deleted file mode 100644
104 index 02d47b99134..00000000000
105 --- a/app-emulation/docker-compose/docker-compose-1.23.1.ebuild
106 +++ /dev/null
107 @@ -1,73 +0,0 @@
108 -# Copyright 1999-2018 Gentoo Authors
109 -# Distributed under the terms of the GNU General Public License v2
110 -
111 -EAPI=6
112 -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
113 -
114 -inherit bash-completion-r1 distutils-r1 vcs-snapshot
115 -
116 -MY_PV=${PV/_/}
117 -
118 -DESCRIPTION="Multi-container orchestration for Docker"
119 -HOMEPAGE="https://github.com/docker/compose"
120 -SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
121 -
122 -LICENSE="Apache-2.0"
123 -SLOT="0"
124 -KEYWORDS="~amd64"
125 -IUSE="test"
126 -
127 -CDEPEND="
128 - dev-python/setuptools[${PYTHON_USEDEP}]
129 - >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
130 - >=dev-python/colorama-0.4[${PYTHON_USEDEP}]
131 - >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
132 - >=dev-python/docker-py-3.5.0[${PYTHON_USEDEP}]
133 - >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
134 - >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
135 - >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
136 - !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
137 - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
138 - >=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
139 - !~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
140 - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
141 - !~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
142 - >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
143 - >=dev-python/texttable-0.9[${PYTHON_USEDEP}]
144 - >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
145 - $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
146 - $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
147 - $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
148 -"
149 -DEPEND="
150 - ${CDEPEND}
151 - test? (
152 - dev-python/pytest[${PYTHON_USEDEP}]
153 - $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
154 - )
155 -"
156 -RDEPEND="${CDEPEND}"
157 -
158 -PATCHES=(
159 - "${FILESDIR}"/${PN}-1.23.0-setup-py.patch
160 -)
161 -
162 -src_prepare() {
163 - # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
164 - sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
165 -
166 - default
167 -}
168 -
169 -python_test() {
170 - ${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
171 -}
172 -
173 -python_install_all() {
174 - newbashcomp contrib/completion/bash/docker-compose ${PN}
175 -
176 - insinto /usr/share/zsh/site-functions
177 - doins contrib/completion/zsh/*
178 -
179 - distutils-r1_python_install_all
180 -}