commit:     a5d99bb10c7ab3aa8b6080383e1f855de24510e9
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Dec 29 01:04:02 2023 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Fri Dec 29 01:34:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a5d99bb1

app-crypt/intel-ipsec-mb: update to 1.5

Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 app-crypt/intel-ipsec-mb/Manifest                  |  1 +
 ...ec-mb-9999.ebuild => intel-ipsec-mb-1.5.ebuild} | 32 ++++------------------
 .../intel-ipsec-mb/intel-ipsec-mb-9999.ebuild      | 30 ++++----------------
 3 files changed, 12 insertions(+), 51 deletions(-)

diff --git a/app-crypt/intel-ipsec-mb/Manifest 
b/app-crypt/intel-ipsec-mb/Manifest
index 3a14699a29..f8c7d589ef 100644
--- a/app-crypt/intel-ipsec-mb/Manifest
+++ b/app-crypt/intel-ipsec-mb/Manifest
@@ -1,3 +1,4 @@
 DIST intel-ipsec-mb-1.1.tar.gz 1227915 BLAKE2B 
56d104c2bcebd4a8125d64362c14603b7005c8ef0978d4039da3128f06fbba7f469ac8df23e3315b9f3fe33c392804fd718a533edd34e4a545f767a1c2e2fd60
 SHA512 
aca5863d36b333c4c896549074242fb4c2c0a4d6598b27baa794944436527bdd6e1a5dbca9d39e0c3a89e61d7d175adcf5bf6c6cbdffd0a43bca1fea0be42ebe
 DIST intel-ipsec-mb-1.2.tar.gz 1251965 BLAKE2B 
f92172ea727f8c0a5beff6e8fe6bb1630b5e83ddffa7384b998ebb6dfe09fd2657203ab53358296ade0106240278f659c297c0897e2de364b434032a58f417b3
 SHA512 
dc566ea433f7c85109e833d1debb3c8dc3686b4c0562a00872dd9801ba3530bf87b7b382e167e7d5cec17c3b3535834cc5bdc78f349f501bdfe8920ee51532ac
 DIST intel-ipsec-mb-1.3.tar.gz 2139105 BLAKE2B 
f7ae09cb2721a0193879ee4a3a04fa6d190ebcd70c681a1f885554dbd644d39511cd0832eb22edc5566d72f0fcaba955450d2208b17a040f053aef6134e174b0
 SHA512 
4b91bffcd62f69245da90b70586df425fa6f17fa63d530b0cd09b990fb1ac4c85c2ebc8ed5d8952bd4b8a20e82c3b418e9ef4d61cfe1811af04f1ee16630ec67
+DIST intel-ipsec-mb-1.5.tar.gz 2214942 BLAKE2B 
b4a2ac6b5671721ec79c100be86270c1b4344be731c40bafda58d4f718169e37d5bd1c6b3a14a1917dedb151daa3f732a01961255a94e9628efb0c4e588d47e1
 SHA512 
1fca0797d73fc2edbd9edecfc5628c4926512dc414a6fa832602d3d7abd6d86b1305013d1b433a21b77f4bc2b215d5f947553791925f2698fb30f90f9e7086ef

diff --git a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild 
b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.5.ebuild
similarity index 50%
copy from app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild
copy to app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.5.ebuild
index 8f9457fefc..40762d9769 100644
--- a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild
+++ b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit cmake
 
 DESCRIPTION="Multi-Buffer Crypto for IPSec from Intel"
 HOMEPAGE="https://github.com/intel/intel-ipsec-mb";
@@ -25,31 +25,11 @@ BDEPEND="
        >=dev-lang/nasm-2.13.03
 "
 
-PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.3_remove-werror-and-O3.patch" )
-
 src_configure(){
-       tc-export CC LD AR
-}
-
-src_compile() {
-       local myconf=(
-               SAFE_DATA=$(usex safe-data y n)
-               SAFE_LOOKUP=$(usex safe-lookup y n)
-               SAFE_PARAM=$(usex safe-param y n)
+       local mycmakeargs=(
+               -DSAFE_DATA=$(usex safe-data)
+               -DSAFE_LOOKUP=$(usex safe-lookup)
+               -DSAFE_PARAM=$(usex safe-param)
        )
-       emake "${myconf[@]}" EXTRA_CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-       emake PREFIX="${ED}/usr" \
-               NOLDCONFIG=y \
-               LIB_INSTALL_DIR="${ED}/usr/$(get_libdir)" \
-               MAN_DIR="${ED}/usr/share/man/man7" \
-               install
-}
-
-src_test() {
-       cd "${S}/test"
-       LD_LIBRARY_PATH=../lib ./ipsec_MB_testapp -v
-       LD_LIBRARY_PATH=../lib ./ipsec_xvalid_test -v
+       cmake_src_configure
 }

diff --git a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild 
b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild
index 8f9457fefc..8203eb9d6f 100644
--- a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild
+++ b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild
@@ -25,31 +25,11 @@ BDEPEND="
        >=dev-lang/nasm-2.13.03
 "
 
-PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.3_remove-werror-and-O3.patch" )
-
 src_configure(){
-       tc-export CC LD AR
-}
-
-src_compile() {
-       local myconf=(
-               SAFE_DATA=$(usex safe-data y n)
-               SAFE_LOOKUP=$(usex safe-lookup y n)
-               SAFE_PARAM=$(usex safe-param y n)
+       local mycmakeargs=(
+               -DSAFE_DATA=$(usex safe-data)
+               -DSAFE_LOOKUP=$(usex safe-lookup)
+               -DSAFE_PARAM=$(usex safe-param)
        )
-       emake "${myconf[@]}" EXTRA_CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-       emake PREFIX="${ED}/usr" \
-               NOLDCONFIG=y \
-               LIB_INSTALL_DIR="${ED}/usr/$(get_libdir)" \
-               MAN_DIR="${ED}/usr/share/man/man7" \
-               install
-}
-
-src_test() {
-       cd "${S}/test"
-       LD_LIBRARY_PATH=../lib ./ipsec_MB_testapp -v
-       LD_LIBRARY_PATH=../lib ./ipsec_xvalid_test -v
+       cmake_src_configure
 }

Reply via email to