From faddeff65d652bda3291eba255955adb17f1aa19 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 24 Nov 2023 16:33:11 +0000 Subject: gentoo auto-resync : 24:11:2023 - 16:33:11 --- app-containers/skopeo/Manifest | 4 +- app-containers/skopeo/skopeo-1.14.0-r1.ebuild | 80 +++++++++++++++++++++++++++ app-containers/skopeo/skopeo-1.14.0.ebuild | 80 --------------------------- app-containers/skopeo/skopeo-9999.ebuild | 2 +- 4 files changed, 83 insertions(+), 83 deletions(-) create mode 100644 app-containers/skopeo/skopeo-1.14.0-r1.ebuild delete mode 100644 app-containers/skopeo/skopeo-1.14.0.ebuild (limited to 'app-containers/skopeo') diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest index b9d3a5587801..044cf04272c6 100644 --- a/app-containers/skopeo/Manifest +++ b/app-containers/skopeo/Manifest @@ -5,7 +5,7 @@ DIST skopeo-1.14.0.tar.gz 10548883 BLAKE2B 6ecf54d236405ce59bedf77acc124fa8b3bb1 DIST skopeo-1.5.1.tar.gz 5636533 BLAKE2B 7f0e86cdee5c3250ec1280d7e71554ac2f8ad96ababe0e81dfabc00e8c128a13fc0c9c561b7a9be389d7386e9f664b95118bd2122612b9c2e8844db49769c03c SHA512 3f8c730eaa739bf2a29b82d3b04aa4eee1c09f957b61964fc8c48e59d1537bcb87b5bdf9c18fa48f9d36cf2b7ede3a1448918a20b5a3167f6ce09881a6cd3dde EBUILD skopeo-1.10.0-r1.ebuild 1066 BLAKE2B f55aa099a396fca1f8513786c48929923d7419a08d232ba910d65d325c5f31c2a4fbb43487d3585c36098375687897f07fbd9e7274edeb4e1b7bf5301dba040d SHA512 0109637023cf52163bbdc2a30fbd086f514a5bd77948888ce30a7824cf4472c46f98f6011e9a0302a054578e5bb812d2b495dac041a060bdb26abbbd034c27bc EBUILD skopeo-1.11.1.ebuild 1066 BLAKE2B d304dfa99199b32528a24710a716ab757f9670e4b474fd48c5284005a0a01cc457af1d3882572f27aa81eadb058ec495c7dcebf775dec238ae4b44f0d748d0d0 SHA512 14ad618519d078c4f539afdc3595bd80a1fd102e21abd231f71a530de5019557d915a6809ce1cecb7dc1ee6be57ee9a5b12add0fee1fc8d7325fc2f1f567896b -EBUILD skopeo-1.14.0.ebuild 2041 BLAKE2B eb2154fb6b009fb498cca5b89c0b91a4548c382de0bae319b65949cc03623b259cc792d5904fe6dce52160812cc5df4f1d280c978ff023651dc5b6dd0b4c741e SHA512 339329ea290985f4927abae7c55082e390f9f50ff2267f6ad4025d0b1f9c17bfe4f1e727037340f9ceede5ed789947f72d762e9a5e42f1176729e063b6011f7c +EBUILD skopeo-1.14.0-r1.ebuild 2074 BLAKE2B e5622deab234e5555773f35887ddb7dacd0bd77cc5f2575e9d65f3dd2faefd58e9ae91c8b43b6f1fa80e24135fff0099a0b93634ad3a88b399272d1fa5426610 SHA512 c12a399c3ffd129ba266def0421b0cff2c755f86b18b04f5bc5b830c56f3d1dd98ddc46dd0129362afe8548647944b260ea8d3194525f95f0909279f871cb412 EBUILD skopeo-1.5.1.ebuild 1403 BLAKE2B a4c236cb6248a1551c90683a45247d19d5634ca7e9ca801761953131f73a7bd0058ab5bcea1d7b2593229eb20c6482e2dae833443227467daccef020b23b5f88 SHA512 b163486639a8831eb20db3a5906378485f0aaf3299e815217b1c8a2f4e27ca35af0bda40e6265a7c58107588cab429c0044717666cd22c43e8e21c73a75277dd -EBUILD skopeo-9999.ebuild 2041 BLAKE2B eb2154fb6b009fb498cca5b89c0b91a4548c382de0bae319b65949cc03623b259cc792d5904fe6dce52160812cc5df4f1d280c978ff023651dc5b6dd0b4c741e SHA512 339329ea290985f4927abae7c55082e390f9f50ff2267f6ad4025d0b1f9c17bfe4f1e727037340f9ceede5ed789947f72d762e9a5e42f1176729e063b6011f7c +EBUILD skopeo-9999.ebuild 2074 BLAKE2B e5622deab234e5555773f35887ddb7dacd0bd77cc5f2575e9d65f3dd2faefd58e9ae91c8b43b6f1fa80e24135fff0099a0b93634ad3a88b399272d1fa5426610 SHA512 c12a399c3ffd129ba266def0421b0cff2c755f86b18b04f5bc5b830c56f3d1dd98ddc46dd0129362afe8548647944b260ea8d3194525f95f0909279f871cb412 MISC metadata.xml 932 BLAKE2B 07a3c417bf16785676ad46085fd30feef0bb9970157a34a48b5f633878633788de20da8d9d24b14b356ff19bd7012ceeb9ace0aee84dcece374dd609a14d9ce3 SHA512 33a8355d730bf0f6f53f77ef2a1d0cb5a3a3e9f4b9bb76603e2da9fa087e9065b6bf950170cdb3b194105a24e34ab98e006880b3ac9d737152a4d309ec4d0fe7 diff --git a/app-containers/skopeo/skopeo-1.14.0-r1.ebuild b/app-containers/skopeo/skopeo-1.14.0-r1.ebuild new file mode 100644 index 000000000000..9fc4a1466912 --- /dev/null +++ b/app-containers/skopeo/skopeo-1.14.0-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit go-module linux-info + +DESCRIPTION="Work with remote container images registries" +HOMEPAGE="https://github.com/containers/skopeo" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/skopeo.git" +else + SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT" +SLOT="0" +IUSE="btrfs device-mapper rootless" + +RDEPEND=" + app-containers/containers-common + >=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="${RDEPEND}" +BDEPEND="dev-go/go-md2man" + +RESTRICT="test" +PATCHES=( + "${FILESDIR}"/makefile-1.14.0.patch +) + +pkg_setup() { + use btrfs && CONFIG_CHECK+=" ~BTRFS_FS" + use device-mapper && CONFIG_CHECK+=" ~MD" + linux-info_pkg_setup +} + +src_prepare() { + default + local file + for file in btrfs_installed_tag btrfs_tag libdm_tag libsubid_tag; do + [[ -f hack/"${file}".sh ]] || die + done + + echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || die + cat <<-EOF > hack/btrfs_tag.sh || die + #!/usr/bin/env bash + $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion') + EOF + + cat <<-EOF > hack/libdm_tag.sh || die + #!/usr/bin/env bash + $(usex device-mapper echo "echo libdm_no_deferred_remove exclude_graphdriver_devicemapper") + EOF + + cat <<-EOF > hack/libsubid_tag.sh || die + #!/usr/bin/env bash + $(usex rootless "echo libsubid" echo) + EOF +} + +src_compile() { + # export variables which 'make install' is also going to use + export PREFIX="${EPREFIX}/usr" \ + CONTAINERSCONFDIR="${EPREFIX}/etc/containers" + # compile binary, docs, completions + emake all completions +} diff --git a/app-containers/skopeo/skopeo-1.14.0.ebuild b/app-containers/skopeo/skopeo-1.14.0.ebuild deleted file mode 100644 index 63503fe4b2cf..000000000000 --- a/app-containers/skopeo/skopeo-1.14.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit go-module linux-info - -DESCRIPTION="Work with remote container images registries" -HOMEPAGE="https://github.com/containers/skopeo" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/containers/skopeo.git" -else - SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64" -fi - -# main -LICENSE="Apache-2.0" -# deps -LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT" -SLOT="0" -IUSE="btrfs device-mapper rootless" - -RDEPEND=" - app-containers/containers-common - >=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="${RDEPEND}" -BDEPEND="dev-go/go-md2man" - -RESTRICT="test" -PATCHES=( - "${FILESDIR}"/makefile-1.14.0.patch -) - -pkg_setup() { - use btrfs && CONFIG_CHECK+=" ~BTRFS_FS" - use device-mapper && CONFIG_CHECK+=" ~MD" - linux-info_pkg_setup -} - -src_prepare() { - default - local file - for file in btrfs_installed_tag btrfs_tag libdm_tag libsubid_tag; do - [[ -f hack/"${file}".sh ]] || die - done - - echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || die - cat <<-EOF > hack/btrfs_tag.sh || die - #!/usr/bin/env bash - $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion') - EOF - - cat <<-EOF > hack/libdm_tag.sh || die - #!/usr/bin/env bash - $(usex device-mapper echo "echo libdm_no_deferred_remove") - EOF - - cat <<-EOF > hack/libsubid_tag.sh || die - #!/usr/bin/env bash - $(usex rootless "echo libsubid" echo) - EOF -} - -src_compile() { - # export variables which 'make install' is also going to use - export PREFIX="${EPREFIX}/usr" \ - CONTAINERSCONFDIR="${EPREFIX}/etc/containers" - # compile binary, docs, completions - emake all completions -} diff --git a/app-containers/skopeo/skopeo-9999.ebuild b/app-containers/skopeo/skopeo-9999.ebuild index 63503fe4b2cf..9fc4a1466912 100644 --- a/app-containers/skopeo/skopeo-9999.ebuild +++ b/app-containers/skopeo/skopeo-9999.ebuild @@ -62,7 +62,7 @@ src_prepare() { cat <<-EOF > hack/libdm_tag.sh || die #!/usr/bin/env bash - $(usex device-mapper echo "echo libdm_no_deferred_remove") + $(usex device-mapper echo "echo libdm_no_deferred_remove exclude_graphdriver_devicemapper") EOF cat <<-EOF > hack/libsubid_tag.sh || die -- cgit v1.2.3