commit:     7579afbd4aa1f2356b8de3c2870df2c49ab68d5f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 19:41:29 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 19:42:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7579afbd

sys-fs/squashfs-tools-ng: stabilize 1.3.0 for amd64

Note that I merged 84e655a1f462a58154b701b9b8077ebf3071e82f badly
as I hit a merge conflict with my earlier 
2c5cd6c4e004dc5037761c4a7a64fe956cac4bc4
when rebasing a branch.

I should figure out why merge-driver-ekeyword didn't handle the conflict.

Thanks to Matt for noticing.

Fixes: 84e655a1f462a58154b701b9b8077ebf3071e82f
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.0.ebuild 
b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.0.ebuild
index f936c78e267e..a4168be5e3b8 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.0.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
        EGIT_REPO_URI="https://github.com/AgentD/${PN}.git";
 else
        inherit libtool
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+       KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
        SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz";
 fi
 

Reply via email to