commit:     d3607794794a591c28d03310bc2307cc18ed8c3d
Author:     Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Wed Mar  6 21:46:05 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 00:59:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3607794

app-containers/containers-common: add 0.58.0

1. Use PATCHES variable instead of eapply

Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/35642
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 app-containers/containers-common/Manifest                          | 1 +
 ...ntainers-common-9999.ebuild => containers-common-0.58.0.ebuild} | 7 ++++---
 app-containers/containers-common/containers-common-9999.ebuild     | 7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app-containers/containers-common/Manifest 
b/app-containers/containers-common/Manifest
index ac07f9c98804..d683aa50a470 100644
--- a/app-containers/containers-common/Manifest
+++ b/app-containers/containers-common/Manifest
@@ -1,2 +1,3 @@
 DIST containers-common-0.57.0.tar.gz 12700958 BLAKE2B 
8432a7d839b94b59eabd75d4978a4d0c1340a64ed626db74e74a8318e08c61172bfba5e4f4c4b0dfffec302c5a310bb5be8fad3ab4d91a6d89ced373a0a6f297
 SHA512 
b993821040788085ff44e48023a64cea4e3e7e50731c359087bd287168e6849a543d930acbdaff2437fc7951acc46f7183f337dd977215eca814332e6869d1e3
 DIST containers-common-0.57.3.tar.gz 12702863 BLAKE2B 
7842893f9b8ca72fa0657ea716f61cad95c4a8bff680922a15cffad4cecf897683591272fee83494e800023a432458cc689a810726e60e4d5ff9dd6af2d71737
 SHA512 
f0b7c4632317e666342f7b31bd9e5e9cdc794125d4d358e6a62ba115099ee1e6b33751cff982dcadbb3055b093d05fbd1049402f79ca2e6465cc6fcabce7c928
+DIST containers-common-0.58.0.tar.gz 13164567 BLAKE2B 
17795eec2d38b4d8b9d6afeb20e249208c5ae2ac767a365ef7313d1e7c36eadb9a9eb284a657dfe3f4fcb0577448d4883fabbad76e0318425fdc03809e27cd7c
 SHA512 
6f569d68d3b0e5ead304c7f23341808d66a47b6352c772d353d50c5f4777cd8a5a5b85d6faaf2887f828c17ec49b9c5f929177a67294b5bbb69baa80656982a8

diff --git a/app-containers/containers-common/containers-common-9999.ebuild 
b/app-containers/containers-common/containers-common-0.58.0.ebuild
similarity index 94%
copy from app-containers/containers-common/containers-common-9999.ebuild
copy to app-containers/containers-common/containers-common-0.58.0.ebuild
index 5a0aa2f26d0b..c4d53773f1d9 100644
--- a/app-containers/containers-common/containers-common-9999.ebuild
+++ b/app-containers/containers-common/containers-common-0.58.0.ebuild
@@ -35,14 +35,15 @@ BDEPEND="
        >=dev-go/go-md2man-2.0.3
 "
 
+PATCHES=(
+       "${FILESDIR}/examplify-mounts-conf.patch"
+)
+
 src_prepare() {
        default
 
        [[ -f docs/Makefile && -f Makefile ]] || die
        sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
-
-       # add comments to mounts.conf
-       eapply "${FILESDIR}/examplify-mounts-conf.patch"
 }
 
 src_compile() {

diff --git a/app-containers/containers-common/containers-common-9999.ebuild 
b/app-containers/containers-common/containers-common-9999.ebuild
index 5a0aa2f26d0b..c4d53773f1d9 100644
--- a/app-containers/containers-common/containers-common-9999.ebuild
+++ b/app-containers/containers-common/containers-common-9999.ebuild
@@ -35,14 +35,15 @@ BDEPEND="
        >=dev-go/go-md2man-2.0.3
 "
 
+PATCHES=(
+       "${FILESDIR}/examplify-mounts-conf.patch"
+)
+
 src_prepare() {
        default
 
        [[ -f docs/Makefile && -f Makefile ]] || die
        sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
-
-       # add comments to mounts.conf
-       eapply "${FILESDIR}/examplify-mounts-conf.patch"
 }
 
 src_compile() {

Reply via email to