From f300354de9fe5d997850456a9e1f400193e6544f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Aug 2024 12:00:09 +0100 Subject: gentoo auto-resync : 26:08:2024 - 12:00:09 --- dev-libs/protobuf/Manifest | 4 ++-- dev-libs/protobuf/protobuf-27.2.ebuild | 8 ++++---- dev-libs/protobuf/protobuf-9999.ebuild | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'dev-libs/protobuf') diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index e10572d92d05..1e4c9025785c 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -29,6 +29,6 @@ EBUILD protobuf-24.4.ebuild 2915 BLAKE2B 2fd3f84bf7e86b64393fd39962080809ef4d65b EBUILD protobuf-25.3.ebuild 2915 BLAKE2B 75df59e6ca105a529cf582cda4371c26f0b9bf1df94fb11c3b409e1b01fcde43e0705e05212ea630839446aba819c4b8132514383f94fa2aa455b232a3f64eae SHA512 8daaf04ef736d389f634f2366e833e7c6ce40a9e60b022a31df31868b01a282f948d583270827b1714cc7cfacac4cdd0e9971944dc5b3dd823afa4696c4cf1c7 EBUILD protobuf-26.1-r1.ebuild 2722 BLAKE2B 2b4a648933fe23621fdbc67d5a6a7783d7716c1f4cbf72eec5292c3f87006a426a7444744a83d77700e94c2b411c0b5c1983cb1bb1dedd4fe8e4b3ea58b8452b SHA512 7b8cfc2fa64f4dd633ad93da7428ffaeae2cef9aea78f7032c5506abad91ab8f2da91a5598eab47f065419210686afc2a54bc49b3edbaa2801d419857de810e4 EBUILD protobuf-26.1-r2.ebuild 2915 BLAKE2B 75df59e6ca105a529cf582cda4371c26f0b9bf1df94fb11c3b409e1b01fcde43e0705e05212ea630839446aba819c4b8132514383f94fa2aa455b232a3f64eae SHA512 8daaf04ef736d389f634f2366e833e7c6ce40a9e60b022a31df31868b01a282f948d583270827b1714cc7cfacac4cdd0e9971944dc5b3dd823afa4696c4cf1c7 -EBUILD protobuf-27.2.ebuild 3699 BLAKE2B 03234f91b5cfe5aa855992e64e1789abb1d0de3417f2fcc5e02610654cd364addcb2bfb3cb77a8c4f7754652bad65b5d6c73275735a5aa9b81f6d655052d1476 SHA512 71131957f60c7aef844b6d1766423303599908ca93e56eea65427ff57ea33c4dfa18d7ee6eb04d30b9700c3af635be6bb08a534e52f9bca670c7ab233d0c9254 -EBUILD protobuf-9999.ebuild 3693 BLAKE2B 8afae42032a489c92a8c4c1accd66b8e43a023d431ce0f4e280f05803bcab2bb313e242507284df0cfcc6dd9756a02d78b543dec66891a4165cefb09842cb7b3 SHA512 971352e81516941cbbd7287834cc06d885d358845622ebc69521d76bae82128aec25d207c9a52a97642ea623ff22ea90f67408d0b3ccc4ecf7550a999df1eb36 +EBUILD protobuf-27.2.ebuild 3743 BLAKE2B 542d8b7d10d88dd30f7bf2a1caa132f2527d4e1d8c1c8d35cab157191bd550f07a69911da414875390b5fd2dc6f85b2bcc3ac1d8371a441a259cadedb06085cb SHA512 524c1da7e84895ab48b59dbe5eb36232f3c93f3ccbe37ae03030204a9fa9fdeb1a5a244751b413a4fa993ceff1039e612ef107e2e8a6a615b280bb6d879f87ff +EBUILD protobuf-9999.ebuild 3724 BLAKE2B 99f967b6b8a50269240ea74ebbc5f4347c37ba27b09929c0d95a9f29fa55bb145a974aed09b52ca65b3009d743ae92c92d015b9696723eca78d37c5ba7ba7557 SHA512 e319f2897b7b2729f632f43b7fb560f40e489c9e9fb957a220d875ae610645de177eeeb0137b8c9707309933db53d71e973a17c393d094b47147cbfcb4ff14f9 MISC metadata.xml 917 BLAKE2B c25c810e47e764843ad71be5eb5ebe617d881e7363ce3206401eb59c6df12969bc22bbedc34f08b0a2fbcf955de5b85aa8e4d3a964c1349f07ed1d0eb344a915 SHA512 baa5737981669f1b28ce32884698a4d91e0f1fbdde6056779307e1a6c85dde8ca36ee47ca3ce8794b996934dfafc5482afbe9532a7f3e17c833c3aef0a330376 diff --git a/dev-libs/protobuf/protobuf-27.2.ebuild b/dev-libs/protobuf/protobuf-27.2.ebuild index e6c26cbfee3a..1e406912d89b 100644 --- a/dev-libs/protobuf/protobuf-27.2.ebuild +++ b/dev-libs/protobuf/protobuf-27.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake-multilib elisp-common toolchain-funcs +inherit cmake-multilib elisp-common toolchain-funcs multilib ABSEIL_BRANCH="lts_2023_08_02" # NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules @@ -18,7 +18,7 @@ if [[ "${PV}" == *9999 ]]; then inherit git-r3 else SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" MY_SLOT=$(ver_cut 1-2) fi @@ -127,9 +127,9 @@ src_test() { multilib_src_install_all() { find "${ED}" -name "*.la" -delete || die - if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then + if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \ - "Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" + "Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" die "Please update SLOT variable" fi diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild index c2a90ff0480c..9988631acc75 100644 --- a/dev-libs/protobuf/protobuf-9999.ebuild +++ b/dev-libs/protobuf/protobuf-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake-multilib elisp-common toolchain-funcs +inherit cmake-multilib elisp-common toolchain-funcs multilib ABSEIL_BRANCH="lts_2023_08_02" # NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules @@ -127,9 +127,9 @@ src_test() { multilib_src_install_all() { find "${ED}" -name "*.la" -delete || die - if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then + if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \ - "Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" + "Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" die "Please update SLOT variable" fi -- cgit v1.2.3