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 6C0F7158013 for ; Sun, 3 Dec 2023 09:12:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A811A2BC01A; Sun, 3 Dec 2023 09:12:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8CF722BC01A for ; Sun, 3 Dec 2023 09:12:40 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC563335C7E for ; Sun, 3 Dec 2023 09:12:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E161A66 for ; Sun, 3 Dec 2023 09:12:38 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1701594724.53f58249ab6783ab39c691f65d637a09dcd5e84a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/skopeo/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/skopeo/skopeo-1.14.0-r2.ebuild app-containers/skopeo/skopeo-1.14.0-r3.ebuild X-VCS-Directories: app-containers/skopeo/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 53f58249ab6783ab39c691f65d637a09dcd5e84a X-VCS-Branch: master Date: Sun, 3 Dec 2023 09:12:38 +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: 148eb5ab-7cef-47f8-9c2e-30409f5c3675 X-Archives-Hash: 13c7122fff85ed9e989097f75019affc commit: 53f58249ab6783ab39c691f65d637a09dcd5e84a Author: Rahil Bhimjiani rahil website> AuthorDate: Sun Dec 3 08:43:28 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 3 09:12:04 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53f58249 app-containers/skopeo: revbump 1.14.0 1. Use einstalldocs instead of manual dodoc 2. fix build error caused by device-mapper introduced in 1.14.0-r2 https://github.com/containers/skopeo/pull/2161 Closes: https://bugs.gentoo.org/919074 Signed-off-by: Rahil Bhimjiani rahil.website> Closes: https://github.com/gentoo/gentoo/pull/34103 Signed-off-by: Sam James gentoo.org> .../skopeo/{skopeo-1.14.0-r2.ebuild => skopeo-1.14.0-r3.ebuild} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app-containers/skopeo/skopeo-1.14.0-r2.ebuild b/app-containers/skopeo/skopeo-1.14.0-r3.ebuild similarity index 90% rename from app-containers/skopeo/skopeo-1.14.0-r2.ebuild rename to app-containers/skopeo/skopeo-1.14.0-r3.ebuild index 2aed06a521af..445d403f11a9 100644 --- a/app-containers/skopeo/skopeo-1.14.0-r2.ebuild +++ b/app-containers/skopeo/skopeo-1.14.0-r3.ebuild @@ -49,8 +49,8 @@ run_make() { emake \ BTRFS_BUILD_TAG="$(usex btrfs '' 'btrfs_noversion exclude_graphdriver_btrfs')" \ CONTAINERSCONFDIR="${EPREFIX}/etc/containers" \ - LIBDM_BUILD_TAG=$(usex device-mapper '' libdm_no_deferred_remove) \ - LIBSUBID_BUILD_TAG=$(usex rootless 'libsubid' '') \ + LIBDM_BUILD_TAG="$(usex device-mapper '' 'libdm_no_deferred_remove exclude_graphdriver_devicemapper')" \ + LIBSUBID_BUILD_TAG="$(usex rootless 'libsubid' '')" \ PREFIX="${EPREFIX}/usr" \ $@ } @@ -63,7 +63,7 @@ src_install() { # The install target in the Makefile tries to rebuild the binary and # installs things that are already installed by containers-common. dobin bin/skopeo -dodoc README.md + einstalldocs doman docs/*.1 run_make "DESTDIR=${D}" install-completions }