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 1A7A71580D3 for ; Wed, 29 Nov 2023 06:16:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E4D92BC05B; Wed, 29 Nov 2023 06:16:38 +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 384412BC071 for ; Wed, 29 Nov 2023 06:16:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 44166335D17 for ; Wed, 29 Nov 2023 06:16:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AAC5D13F1 for ; Wed, 29 Nov 2023 06:16:35 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1701238592.3c6adf5ee3a73ab91a089958291f1f492b43a53f.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/containers-image/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/containers-image/Manifest app-containers/containers-image/containers-image-5.29.0.ebuild app-containers/containers-image/containers-image-9999.ebuild X-VCS-Directories: app-containers/containers-image/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 3c6adf5ee3a73ab91a089958291f1f492b43a53f X-VCS-Branch: master Date: Wed, 29 Nov 2023 06:16:35 +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: c4d090a2-17e0-4830-86a6-af3ac9975924 X-Archives-Hash: 97d0a88579c02b582676cfde9ec532f8 commit: 3c6adf5ee3a73ab91a089958291f1f492b43a53f Author: Rahil Bhimjiani gmail com> AuthorDate: Fri Nov 17 10:23:34 2023 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Nov 29 06:16:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c6adf5e app-containers/containers-image: add 5.29.0 & update live 1. Fix dep category of go-md2man 2. remove redundant functions 3. Add EPREFIX while installing Signed-off-by: Rahil Bhimjiani gmail.com> Signed-off-by: Zac Medico gentoo.org> app-containers/containers-image/Manifest | 1 + ...rs-image-9999.ebuild => containers-image-5.29.0.ebuild} | 14 +++----------- .../containers-image/containers-image-9999.ebuild | 14 +++----------- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/app-containers/containers-image/Manifest b/app-containers/containers-image/Manifest index 386995e8ccba..ac4252cf4d1f 100644 --- a/app-containers/containers-image/Manifest +++ b/app-containers/containers-image/Manifest @@ -1 +1,2 @@ DIST containers-image-5.28.0.tar.gz 688100 BLAKE2B 0cee8be579bd11eb0524590d8afe16b6ef863d7adfd74db51b68385142804c8096fec3f2a492e0d5a5021eba9edc91219b327138635aaa329c6ef7d0c01129c8 SHA512 0b76539e04016f5f1067c576a877ace475f25d0f0840fc969606601105a8a7f0e242cc054b0a2cfb6f1b751d850734360a524c78563fdf2330c8ae8c11bba1cf +DIST containers-image-5.29.0.tar.gz 706774 BLAKE2B 0af5c7c43e8b75df591cbd291d0865ac19322bf62ad98b4f36cfb51b006ced088f91f0b3f582ce29ae80582e72087467cfe589683216eeb50ad3762152853dc0 SHA512 5e670f85fe0b43769667f1a3e710434ab65c4ec2d8c60b0cad4b0ed41c35f84677528f9dfecb0b946de556ebbdd56f4949760432ec49b1b3c691120a323af869 diff --git a/app-containers/containers-image/containers-image-9999.ebuild b/app-containers/containers-image/containers-image-5.29.0.ebuild similarity index 81% copy from app-containers/containers-image/containers-image-9999.ebuild copy to app-containers/containers-image/containers-image-5.29.0.ebuild index a29e5e602b78..7e9e9b9dad81 100644 --- a/app-containers/containers-image/containers-image-9999.ebuild +++ b/app-containers/containers-image/containers-image-5.29.0.ebuild @@ -6,7 +6,7 @@ EAPI=8 DESCRIPTION="Default config and docs related to Containers' images" HOMEPAGE="https://github.com/containers/image" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/containers/image.git" else @@ -18,27 +18,19 @@ fi LICENSE="Apache-2.0" SLOT="0" -DEPEND=">=dev-go/go-md2man-2.0.2" +BDEPEND=">=dev-go/go-md2man-2.0.2" src_prepare() { default eapply "${FILESDIR}/fix-warnings.patch" } -src_configure() { - return -} - src_compile() { emake docs } -src_test() { - return -} - src_install() { - emake DESTDIR="${D}" install + emake DESTDIR="${ED}" install insinto /etc/containers doins registries.conf diff --git a/app-containers/containers-image/containers-image-9999.ebuild b/app-containers/containers-image/containers-image-9999.ebuild index a29e5e602b78..7e9e9b9dad81 100644 --- a/app-containers/containers-image/containers-image-9999.ebuild +++ b/app-containers/containers-image/containers-image-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 DESCRIPTION="Default config and docs related to Containers' images" HOMEPAGE="https://github.com/containers/image" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/containers/image.git" else @@ -18,27 +18,19 @@ fi LICENSE="Apache-2.0" SLOT="0" -DEPEND=">=dev-go/go-md2man-2.0.2" +BDEPEND=">=dev-go/go-md2man-2.0.2" src_prepare() { default eapply "${FILESDIR}/fix-warnings.patch" } -src_configure() { - return -} - src_compile() { emake docs } -src_test() { - return -} - src_install() { - emake DESTDIR="${D}" install + emake DESTDIR="${ED}" install insinto /etc/containers doins registries.conf