From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D0C7F15808B for ; Tue, 15 Mar 2022 21:09:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25C59E0A45; Tue, 15 Mar 2022 21:09:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C3D66E0A45 for ; Tue, 15 Mar 2022 21:09:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 67ABF343745 for ; Tue, 15 Mar 2022 21:09:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0471F31B for ; Tue, 15 Mar 2022 19:24:13 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1647372248.81ad958f54e2d7183b4908fea8c36202f5da8d6a.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/docker-compose/docker-compose-2.3.3-r1.ebuild X-VCS-Directories: app-containers/docker-compose/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 81ad958f54e2d7183b4908fea8c36202f5da8d6a X-VCS-Branch: master Date: Tue, 15 Mar 2022 19:24:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0692b4d5-5d52-41c2-be4d-bc3563d8e67c X-Archives-Hash: ab641a5e1457ebdece96a70088e4e410 commit: 81ad958f54e2d7183b4908fea8c36202f5da8d6a Author: William Hubbs gentoo org> AuthorDate: Tue Mar 15 19:21:04 2022 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Mar 15 19:24:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ad958f app-containers/docker-compose: add 2.3.3-r1 - rdepend on docker-cli instead of docker - fix the failure in pkg_postinst Closes: https://bugs.gentoo.org/835366 Signed-off-by: William Hubbs gentoo.org> .../docker-compose/docker-compose-2.3.3-r1.ebuild | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/app-containers/docker-compose/docker-compose-2.3.3-r1.ebuild b/app-containers/docker-compose/docker-compose-2.3.3-r1.ebuild new file mode 100644 index 000000000000..b6d6d3326e38 --- /dev/null +++ b/app-containers/docker-compose/docker-compose-2.3.3-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 2018-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit bash-completion-r1 go-module +MY_PV=${PV/_/-} + +DESCRIPTION="Multi-container orchestration for Docker" +HOMEPAGE="https://github.com/docker/compose" +SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~amd64" + +RDEPEND=">=app-containers/docker-cli-20.10.3" + +S="${WORKDIR}/compose-${MY_PV}" + +src_prepare() { + default + # do not strip + sed -i -e 's/-s -w//' builder.Makefile || die +} + +src_compile() { + emake -f builder.Makefile GIT_TAG=v${PV} +} + +src_install() { + dodir /usr/libexec/docker/cli-plugins + exeinto /usr/libexec/docker/cli-plugins + doexe bin/docker-compose +dodoc README.md +} + +src_test() { + emake -f builder.Makefile test +} + +pkg_postinst() { + has_version =app-containers/docker-compose-1* || return + elog + elog "docker-compose 2.x is a sub command of docker" + elog "Use 'docker compose' from the command line instead of" + elog "'docker-compose'" +}