[gentoo-commits] repo/gentoo:master commit in: sys-libs/libseccomp/

[Sam James]

commit:     00cf8331ebf19a6388a34b26d1b386a4ef88d3db
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 08:02:04 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 08:02:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00cf8331

sys-libs/libseccomp: add 2.5.5

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

 sys-libs/libseccomp/Manifest                         |  1 +
 ...ibseccomp-9999.ebuild => libseccomp-2.5.5.ebuild} | 20 ++++++++++++++++----
 sys-libs/libseccomp/libseccomp-9999.ebuild           |  2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index 5d986c8464d9..2d96b6c0ddf3 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -1,3 +1,4 @@
 DIST libseccomp-2.5.4-loongarch64-20220425.patch.xz 132768 BLAKE2B 
f3ab165b028b5f8b4c16574936b915595807ebeb49ef7365d6051f3dfafa7da46ef2a9de458e0a268298cb340152abe1f3c0c293446462a06696bc9ce92d2f72
 SHA512 
94f23c7a2cc2ea8acb01fef00ef184295c276b14b2b3ba0c65687fd72081df8478f3f04c51b0b391ba44529c4f914e6edbb4132af935e3be55902f641d478780
 DIST libseccomp-2.5.4-loongarch64-20220622.patch.xz 67668 BLAKE2B 
faf1b5653a4d454626e310cdfd7def1fb8b768b88d3f792a28170d969a834be7ced8bb7b511a11e0e44691d626046e4c387c08f3fbacdedd6689813f65c129aa
 SHA512 
9aba715c6f120f8df249158f73bc64097243f911d5864294048dc3976580e9ca96cc538c890918a375c3b35369fdbf2383424b6f3d41822c834228ff188680fa
 DIST libseccomp-2.5.4.tar.gz 637228 BLAKE2B 
38b134cb578f9355667546f92950ebcf8c53ccaf98db568db9aadfa9629c054136849e03d4bf9f09f73998fe66a5e8a9038573d19740b2bddf5518a8a0119229
 SHA512 
92650bd7d1d48b383f402a536b97a017fd0f6ad1234daf4b938d01c92e8d134a01d2f2dd45fd9e2d025d7556bd1386ec360402145a87f20580c85949d62cea0e
+DIST libseccomp-2.5.5.tar.gz 642445 BLAKE2B 
d770cee1f3e02fbbcd9f25655b360ab38160ad800e2829a67f2b9da62b095a90be99ac851a67344cf95bd6810a6268da4655dc1d37d996e58239c4999eb41998
 SHA512 
f630e7a7e53a21b7ccb4d3e7b37616b89aeceba916677c8e3032830411d77a14c2d74dcf594cd193b1acc11f52595072e28316dc44300e54083d5d7b314a38da

diff --git a/sys-libs/libseccomp/libseccomp-9999.ebuild 
b/sys-libs/libseccomp/libseccomp-2.5.5.ebuild
similarity index 75%
copy from sys-libs/libseccomp/libseccomp-9999.ebuild
copy to sys-libs/libseccomp/libseccomp-2.5.5.ebuild
index b6598e8ceaa8..0c1061b4e9fe 100644
--- a/sys-libs/libseccomp/libseccomp-9999.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.5.5.ebuild
@@ -16,13 +16,14 @@ if [[ ${PV} == *9999 ]] ; then
        PRERELEASE="2.6.0"
        inherit autotools git-r3
 else
-       
SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz";
-       KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 
~x86 ~amd64-linux ~x86-linux"
+       
SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz
+               experimental-loong? ( 
https://dev.gentoo.org/~xen0n/distfiles/${PN}-2.5.4-loongarch64-20220425.patch.xz
 )"
+       KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="python static-libs test"
+IUSE="experimental-loong python static-libs test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -37,13 +38,24 @@ BDEPEND="${DEPEND}
        python? ( dev-python/cython[${PYTHON_USEDEP}] )"
 
 PATCHES=(
-       "${FILESDIR}"/libseccomp-2.6.0-python-shared.patch
+       "${FILESDIR}"/libseccomp-python-shared.patch
        "${FILESDIR}"/libseccomp-2.5.3-skip-valgrind.patch
 )
 
 src_prepare() {
+       if use experimental-loong; then
+               PATCHES+=( "${WORKDIR}/${PN}-2.5.4-loongarch64-20220425.patch" )
+       fi
+
        default
 
+       if use experimental-loong; then
+               # touch generated files to avoid activating maintainer mode
+               # remove when loong-fix-build.patch is no longer necessary
+               touch ./aclocal.m4 ./configure ./configure.h.in || die
+               find . -name Makefile.in -exec touch {} + || die
+       fi
+
        if [[ ${PV} == *9999 ]] ; then
                sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die
 

diff --git a/sys-libs/libseccomp/libseccomp-9999.ebuild 
b/sys-libs/libseccomp/libseccomp-9999.ebuild
index b6598e8ceaa8..8f4603d67b3a 100644
--- a/sys-libs/libseccomp/libseccomp-9999.ebuild
+++ b/sys-libs/libseccomp/libseccomp-9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
        inherit autotools git-r3
 else
        
SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz";
-       KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 
~x86 ~amd64-linux ~x86-linux"
+       KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"