summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-libs/protobuf/Manifest2
-rw-r--r--dev-libs/protobuf/files/protobuf-23.3-messages_lite-template-instances.patch66
-rw-r--r--dev-libs/protobuf/protobuf-23.3-r4.ebuild116
-rw-r--r--dev-libs/protobuf/protobuf-23.4.ebuild126
4 files changed, 0 insertions, 310 deletions
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 0d5774fbf0f0..cc4031cdc2f8 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,8 +1,6 @@
DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f82c42c70054d47d1899e6bb79f3fdde2666cad5b8eff6e1bc539c3b0cdf9f2b125ce7e5d3a459a69e84d67ab535e SHA512 2dc8f552388438268d8b9f7a9e84c6abf1736be3d5031438c789c317410c9f4b5cedd25bf7da6d67b3ba32ca890869f9ddaab2284d6ac0e734a5b135ffbb1346
DIST protobuf-21.9.tar.gz 5110670 BLAKE2B a4f5b7f58e1c5904ca990b100a72992f6f56177b28773f8de8c99e4158391d33cfb8aa8575915887fc9ae4294faf81d4ff6b470bc07b394bfd5885a09ba0fafe SHA512 6954b42d21921e630173b7848c056ab95635627d8eddec960f3db2ddda13eedde00520a9b350722e76e2998649eb8ebe10758e1db938b6a91e38ff3295b1b7c1
DIST protobuf-22.5.tar.gz 4924661 BLAKE2B d69c73f4ebfddf45fd94b4f5f898faf00256fe674f2cbc0443c60a88d7a0f47fb96f2f6262879927c6da88095b4ea3ee7fd4c471c100bf42a2bae9edf48c07f1 SHA512 058ab2fec5b11007972e6043071056d1944c3b6fe1d31246cddba8eb57686e3b5280f6ad3d58e78940ca63005e74a8de3c72237f9f7c5066548c5a2513ddc584
-DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b
-DIST protobuf-23.4.tar.gz 5043507 BLAKE2B bf6a50771eb977ef92b779a32fd909693faae6394254c73e3c9b2729bce643f8cbfb5a1bd18b30abf3003b9fbfd24c074cea4085a6ccf14fdb6a3aeac9efcb89 SHA512 b93a4e0339ecbe085796de5b6c61feae35229d40db9019c043090bcaa483a1cce78a99487c5638482c68832fcede5579a0e5ec731221a88359b80db9bb6dc566
DIST protobuf-25.3.tar.gz 5878962 BLAKE2B 9268f9bd993a1cfd6d3937a2ad56ba4cfe3d84923756513841cbf13039d4a07acb260468745cb1294f30334cb34b45c6fde272f5c40d9de63ac6a4ce5c263077 SHA512 1f73e237c919082e5423ae9e2ea8813dccf672c059051d1531fe89ffaa45872d3cf3052b8c3af26f674296ec17d7dc861c67b8f0834ed80261ce4a6a14ed7115
DIST protobuf-25.5.tar.gz 5877036 BLAKE2B a8174c7cbda47afa3f31d64c7a7aa7f233efd5df5a783abedd229613c8c27a2380684fb5851dad67f76f063688dd8060a0a373f2c95441c2ad91630eb187af22 SHA512 9fe130f5c04919accc99113e13096df93db4c2254a9c2428faf9459416907c77fbf4adefbae3fe644e1f26d9c1fc597165e2c5b6219156c97500d6ef3fdc0793
DIST protobuf-25.6.tar.gz 5878040 BLAKE2B b82848406890460d9321e6736e413290e1b4a73dc5f2d3db17dd4419e7ddbb788b6cdb52c884c3e7f0c49c5a69ce31468dcc311d73efca06f94ec51577472fcc SHA512 f1920414bbaed0a882b73349e1cd9cdf87c0d9c99790d70ab8ef589161a8dcad92361daec67bf9bf8350f4181fa8514b50362f1495f082ba5805c4a2e70b6308
diff --git a/dev-libs/protobuf/files/protobuf-23.3-messages_lite-template-instances.patch b/dev-libs/protobuf/files/protobuf-23.3-messages_lite-template-instances.patch
deleted file mode 100644
index 3869ad95993c..000000000000
--- a/dev-libs/protobuf/files/protobuf-23.3-messages_lite-template-instances.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://bugs.gentoo.org/917046
-https://github.com/protocolbuffers/protobuf/commit/e6f8b9d1026996f6463d4f014d7760256b757227
-
-From e6f8b9d1026996f6463d4f014d7760256b757227 Mon Sep 17 00:00:00 2001
-From: Protobuf Team Bot <protobuf-github-bot@google.com>
-Date: Wed, 8 Nov 2023 09:20:10 -0800
-Subject: [PATCH] message_lite.h: Use PROTOBUF_EXPORT_TEMPLATE_DECLARE with
- extern template
-
-Export extern templates in message_lite.h to avoid missing symbols when
-linking protobuf-lite.so.
-
-PiperOrigin-RevId: 580556084
---- a/src/google/protobuf/message_lite.h
-+++ b/src/google/protobuf/message_lite.h
-@@ -616,22 +616,22 @@ namespace internal {
- template <bool alias>
- bool MergeFromImpl(absl::string_view input, MessageLite* msg,
- MessageLite::ParseFlags parse_flags);
--extern template bool MergeFromImpl<false>(absl::string_view input,
-- MessageLite* msg,
-- MessageLite::ParseFlags parse_flags);
--extern template bool MergeFromImpl<true>(absl::string_view input,
-- MessageLite* msg,
-- MessageLite::ParseFlags parse_flags);
-+extern template PROTOBUF_EXPORT_TEMPLATE_DECLARE bool MergeFromImpl<false>(
-+ absl::string_view input, MessageLite* msg,
-+ MessageLite::ParseFlags parse_flags);
-+extern template PROTOBUF_EXPORT_TEMPLATE_DECLARE bool MergeFromImpl<true>(
-+ absl::string_view input, MessageLite* msg,
-+ MessageLite::ParseFlags parse_flags);
-
- template <bool alias>
- bool MergeFromImpl(io::ZeroCopyInputStream* input, MessageLite* msg,
- MessageLite::ParseFlags parse_flags);
--extern template bool MergeFromImpl<false>(io::ZeroCopyInputStream* input,
-- MessageLite* msg,
-- MessageLite::ParseFlags parse_flags);
--extern template bool MergeFromImpl<true>(io::ZeroCopyInputStream* input,
-- MessageLite* msg,
-- MessageLite::ParseFlags parse_flags);
-+extern template PROTOBUF_EXPORT_TEMPLATE_DECLARE bool MergeFromImpl<false>(
-+ io::ZeroCopyInputStream* input, MessageLite* msg,
-+ MessageLite::ParseFlags parse_flags);
-+extern template PROTOBUF_EXPORT_TEMPLATE_DECLARE bool MergeFromImpl<true>(
-+ io::ZeroCopyInputStream* input, MessageLite* msg,
-+ MessageLite::ParseFlags parse_flags);
-
- struct BoundedZCIS {
- io::ZeroCopyInputStream* zcis;
-@@ -641,10 +641,10 @@ struct BoundedZCIS {
- template <bool alias>
- bool MergeFromImpl(BoundedZCIS input, MessageLite* msg,
- MessageLite::ParseFlags parse_flags);
--extern template bool MergeFromImpl<false>(BoundedZCIS input, MessageLite* msg,
-- MessageLite::ParseFlags parse_flags);
--extern template bool MergeFromImpl<true>(BoundedZCIS input, MessageLite* msg,
-- MessageLite::ParseFlags parse_flags);
-+extern template PROTOBUF_EXPORT_TEMPLATE_DECLARE bool MergeFromImpl<false>(
-+ BoundedZCIS input, MessageLite* msg, MessageLite::ParseFlags parse_flags);
-+extern template PROTOBUF_EXPORT_TEMPLATE_DECLARE bool MergeFromImpl<true>(
-+ BoundedZCIS input, MessageLite* msg, MessageLite::ParseFlags parse_flags);
-
- template <typename T>
- struct SourceWrapper;
-
diff --git a/dev-libs/protobuf/protobuf-23.3-r4.ebuild b/dev-libs/protobuf/protobuf-23.3-r4.ebuild
deleted file mode 100644
index 6a47828975bb..000000000000
--- a/dev-libs/protobuf/protobuf-23.3-r4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib elisp-common toolchain-funcs
-
-if [[ "${PV}" == *9999 ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
- EGIT_SUBMODULES=()
-else
- SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://protobuf.dev/"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2).0"
-IUSE="emacs examples test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="
- <dev-cpp/abseil-cpp-20240116.2:=[${MULTILIB_USEDEP}]
- >=dev-cpp/abseil-cpp-20230125.3:=[${MULTILIB_USEDEP}]
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
- test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
- <dev-cpp/abseil-cpp-20240116.2:=[${MULTILIB_USEDEP}]
- >=dev-cpp/abseil-cpp-20230125.3:=[${MULTILIB_USEDEP}]
- emacs? ( app-editors/emacs:* )
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-23.3-disable-32-bit-tests.patch"
- "${FILESDIR}/${PN}-23.3-static_assert-failure.patch"
- "${FILESDIR}/${PN}-23.3-messages_lite-template-instances.patch"
-)
-
-DOCS=( CONTRIBUTORS.txt README.md )
-
-src_configure() {
- if tc-ld-is-gold; then
- # https://sourceware.org/bugzilla/show_bug.cgi?id=24527
- tc-ld-disable-gold
- fi
-
- cmake-multilib_src_configure
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -Dprotobuf_DISABLE_RTTI=ON
- -Dprotobuf_BUILD_EXAMPLES=$(usex examples)
- -Dprotobuf_WITH_ZLIB=$(usex zlib)
- -Dprotobuf_BUILD_TESTS=$(usex test)
- -Dprotobuf_ABSL_PROVIDER=package
- )
- use test && mycmakeargs+=(-Dprotobuf_USE_EXTERNAL_GTEST=ON)
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake-multilib_src_compile
-
- if use emacs; then
- elisp-compile editors/protobuf-mode.el
- fi
-}
-
-src_test() {
- local -x srcdir="${S}"/src
- cmake-multilib_src_test
-}
-
-multilib_src_install_all() {
- find "${ED}" -name "*.la" -delete || die
-
- if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then
- eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
- "Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}"
- die "Please update SLOT variable"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins editors/proto.vim
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/proto.vim"
-
- if use emacs; then
- elisp-install ${PN} editors/protobuf-mode.el*
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
- fi
-
- if use examples; then
- DOCS+=(examples)
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- einstalldocs
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-23.4.ebuild b/dev-libs/protobuf/protobuf-23.4.ebuild
deleted file mode 100644
index 87f127940ad0..000000000000
--- a/dev-libs/protobuf/protobuf-23.4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib elisp-common toolchain-funcs
-
-ABSEIL_BRANCH="lts_2023_01_25" # NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules
-
-ABSEIL_MIN_VER="${ABSEIL_BRANCH//lts_}"
-ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
-
-if [[ "${PV}" == *9999 ]]; then
- EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
- EGIT_SUBMODULES=( '-*' )
-
- 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://protobuf.dev/"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2).0"
-IUSE="emacs examples test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- emacs? ( app-editors/emacs:* )
-"
-
-COMMON_DEPEND="
- dev-libs/jsoncpp
- >=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}]
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- ${BDEPEND}
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-23.3-disable-32-bit-tests.patch"
- "${FILESDIR}/${PN}-23.3-static_assert-failure.patch"
- "${FILESDIR}/${PN}-23.3-messages_lite-template-instances.patch"
-)
-
-DOCS=( CONTRIBUTORS.txt README.md )
-
-src_configure() {
- if tc-ld-is-gold; then
- # https://sourceware.org/bugzilla/show_bug.cgi?id=24527
- tc-ld-disable-gold
- fi
-
- cmake-multilib_src_configure
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -Dprotobuf_DISABLE_RTTI="yes" # TODO why?
- -Dprotobuf_BUILD_EXAMPLES="$(usex examples)"
- -Dprotobuf_WITH_ZLIB="$(usex zlib)"
- -Dprotobuf_BUILD_TESTS="$(usex test)"
- -Dprotobuf_ABSL_PROVIDER="package"
- )
- use test && mycmakeargs+=(-Dprotobuf_USE_EXTERNAL_GTEST=ON)
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake-multilib_src_compile
-
- if use emacs; then
- elisp-compile editors/protobuf-mode.el
- fi
-}
-
-src_test() {
- local -x srcdir="${S}"/src
- cmake-multilib_src_test
-}
-
-multilib_src_install_all() {
- find "${ED}" -name "*.la" -delete || die
-
- if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then
- eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
- "Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}"
- die "Please update SLOT variable"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins editors/proto.vim
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/proto.vim"
-
- if use emacs; then
- elisp-install "${PN}" editors/protobuf-mode.el*
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
- fi
-
- if use examples; then
- DOCS+=(examples)
- docompress -x "/usr/share/doc/${PF}/examples"
- fi
-
- einstalldocs
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-04 19:31:27 +0000