commit: bf15e5b0d10158519e8e2398799c1cd8845fc626 Author: Rahil Bhimjiani <me <AT> rahil <DOT> rocks> AuthorDate: Wed Mar 19 13:00:31 2025 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Wed Mar 19 22:38:26 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf15e5b0
app-containers/skopeo: rev bump 1.18.0 to remove device-mapper * Source: upstream's commits https://github.com/containers/skopeo/commit/8d04b4a9f6430434f67b1607fc17293a24be01bc https://github.com/containers/skopeo/commit/2a39d37cc80367a9c9313de5c1c7c0ab727cac4f Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks> From: https://github.com/gentoo/gentoo/pull/41170 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> ...kopeo-1.18.0.ebuild => skopeo-1.18.0-r1.ebuild} | 5 +--- app-containers/skopeo/skopeo-9999.ebuild | 33 ++++++++-------------- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/app-containers/skopeo/skopeo-1.18.0.ebuild b/app-containers/skopeo/skopeo-1.18.0-r1.ebuild similarity index 85% rename from app-containers/skopeo/skopeo-1.18.0.ebuild rename to app-containers/skopeo/skopeo-1.18.0-r1.ebuild index 09b078b37744..28ec8a52fdf3 100644 --- a/app-containers/skopeo/skopeo-1.18.0.ebuild +++ b/app-containers/skopeo/skopeo-1.18.0-r1.ebuild @@ -18,13 +18,12 @@ fi # main LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" SLOT="0" -IUSE="btrfs device-mapper rootless" +IUSE="btrfs rootless" RESTRICT="test" DEPEND=" >=app-crypt/gpgme-1.5.5:= btrfs? ( >=sys-fs/btrfs-progs-4.0.1 ) - device-mapper? ( >=sys-fs/lvm2-2.02.145:= ) rootless? ( sys-apps/shadow:= ) " RDEPEND="${DEPEND} @@ -34,7 +33,6 @@ BDEPEND="dev-go/go-md2man" pkg_setup() { use btrfs && CONFIG_CHECK+=" ~BTRFS_FS" - use device-mapper && CONFIG_CHECK+=" ~MD" linux-info_pkg_setup } @@ -42,7 +40,6 @@ run_make() { local emakeflags=( BTRFS_BUILD_TAG="$(usex btrfs '' 'btrfs_noversion exclude_graphdriver_btrfs')" CONTAINERSCONFDIR="${EPREFIX}/etc/containers" - LIBDM_BUILD_TAG="$(usex device-mapper '' 'libdm_no_deferred_remove exclude_graphdriver_devicemapper')" LIBSUBID_BUILD_TAG="$(usex rootless 'libsubid' '')" PREFIX="${EPREFIX}/usr" ) diff --git a/app-containers/skopeo/skopeo-9999.ebuild b/app-containers/skopeo/skopeo-9999.ebuild index ab892d6789a8..28ec8a52fdf3 100644 --- a/app-containers/skopeo/skopeo-9999.ebuild +++ b/app-containers/skopeo/skopeo-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,41 +18,32 @@ fi # main LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" SLOT="0" -IUSE="btrfs device-mapper rootless" +IUSE="btrfs rootless" +RESTRICT="test" -COMMON_DEPEND=" +DEPEND=" >=app-crypt/gpgme-1.5.5:= - >=dev-libs/libassuan-2.4.3:= btrfs? ( >=sys-fs/btrfs-progs-4.0.1 ) - device-mapper? ( >=sys-fs/lvm2-2.02.145:= ) rootless? ( sys-apps/shadow:= ) " - -# TODO: Is this really needed? cause upstream doesnt mention it https://github.com/containers/skopeo/blob/main/install.md#building-from-source -# dev-libs/libgpg-error:= -DEPEND="${COMMON_DEPEND}" -RDEPEND=" - ${COMMON_DEPEND} +RDEPEND="${DEPEND} app-containers/containers-common " BDEPEND="dev-go/go-md2man" -RESTRICT="test" - pkg_setup() { use btrfs && CONFIG_CHECK+=" ~BTRFS_FS" - use device-mapper && CONFIG_CHECK+=" ~MD" linux-info_pkg_setup } 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 exclude_graphdriver_devicemapper')" \ - LIBSUBID_BUILD_TAG="$(usex rootless 'libsubid' '')" \ - PREFIX="${EPREFIX}/usr" \ - $@ + local emakeflags=( + BTRFS_BUILD_TAG="$(usex btrfs '' 'btrfs_noversion exclude_graphdriver_btrfs')" + CONTAINERSCONFDIR="${EPREFIX}/etc/containers" + LIBSUBID_BUILD_TAG="$(usex rootless 'libsubid' '')" + PREFIX="${EPREFIX}/usr" + ) + emake "${emakeflags[@]}" "$@" } src_compile() {
