From d5f4c950d57f8d2efc86bf86157bcedc1d63859e Mon Sep 17 00:00:00 2001 From: "Andreas Billmeier (@p37t)" Date: Sun, 2 Aug 2020 10:50:22 +0200 Subject: [PATCH] bump protobuf-3.12.4 bump protobuf-python-3.12.4 update esphome-9999 --- CHANGELOG.txt | 5 + dev-embedded/esphome/Manifest | 2 +- dev-embedded/esphome/esphome-9999.ebuild | 4 +- dev-libs/protobuf/Manifest | 2 + dev-libs/protobuf/protobuf-3.12.4.ebuild | 128 ++++++++++++++++++ dev-python/protobuf-python/Manifest | 2 + .../protobuf-python-3.12.4.ebuild | 63 +++++++++ 7 files changed, 203 insertions(+), 3 deletions(-) create mode 100644 dev-libs/protobuf/protobuf-3.12.4.ebuild create mode 100644 dev-python/protobuf-python/protobuf-python-3.12.4.ebuild diff --git a/CHANGELOG.txt b/CHANGELOG.txt index f5356eece..026dd78a2 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,8 @@ +2020-08-02 + * bump protobuf-3.12.4 + * bump protobuf-python-3.12.4 + * update esphome-9999 + 2020-08-01 homeassistant-0.113.3 * bump youtube_dl-2020.7.28 * bump adb-shell-0.2.1 diff --git a/dev-embedded/esphome/Manifest b/dev-embedded/esphome/Manifest index 36653e8fa..3e0bbf99c 100644 --- a/dev-embedded/esphome/Manifest +++ b/dev-embedded/esphome/Manifest @@ -24,5 +24,5 @@ EBUILD esphome-1.14.4.ebuild 2622 BLAKE2B cb7fe05d60c25fa68ceec541d2a7fd9627e9be EBUILD esphome-1.14.5.ebuild 2711 BLAKE2B af450032767c0d0f37acfa5ae27a2f7af86b22cb68774a640e6d9bd4ac0424c3c7d947691218463de05ece500588c81b518b0c9c47865452776e91f013cc97e5 SHA512 28b64c51ecec5b4c0c02c45a0b9ddb90137decadacf5cabf52b8a83a1810567a33435b1d4ae3236a90c4b3d150e0c36358fee5e78caad2283a50ad61e6dbea21 EBUILD esphome-1.15.0_beta1.ebuild 2809 BLAKE2B 53697a8facd55ff909a360764131f071fb86f065de279d00bc7df8fa5d8794d218c624c2ad6b4843657273b0e4e2c14fe606329660e67203c0e82a0bd21a0923 SHA512 c824319d1f2922ac9986a251174ac0f5ab2edb50363d92608c56f69da43d89a27fa4625904bbd0ae64b586e667c50504fa024f9e020f221ff84efb2a80a59254 EBUILD esphome-1.15.0_beta2.ebuild 2809 BLAKE2B 53697a8facd55ff909a360764131f071fb86f065de279d00bc7df8fa5d8794d218c624c2ad6b4843657273b0e4e2c14fe606329660e67203c0e82a0bd21a0923 SHA512 c824319d1f2922ac9986a251174ac0f5ab2edb50363d92608c56f69da43d89a27fa4625904bbd0ae64b586e667c50504fa024f9e020f221ff84efb2a80a59254 -EBUILD esphome-9999.ebuild 2809 BLAKE2B 53697a8facd55ff909a360764131f071fb86f065de279d00bc7df8fa5d8794d218c624c2ad6b4843657273b0e4e2c14fe606329660e67203c0e82a0bd21a0923 SHA512 c824319d1f2922ac9986a251174ac0f5ab2edb50363d92608c56f69da43d89a27fa4625904bbd0ae64b586e667c50504fa024f9e020f221ff84efb2a80a59254 +EBUILD esphome-9999.ebuild 2809 BLAKE2B 76247241792076393acd87e8fad8fe0f39feac46cc008065a1239cd074c73dc4af0297c248a0ec4f7b87f8a9cca31476f2e47dc49d3325dedddc9f6a246a9f80 SHA512 bcb6a417fe7c2eaa7a7ba9f43f50dceaf51faa8e1f8f8e3b95ef756896a31274cf4a49bd3993f8b4d6ab21e977c0e84a82128171818f43d97db59ddd4966f0ef MISC metadata.xml 568 BLAKE2B bf87d46e048c7db7d8bcbf2a4c9e730e3b084504ca3708520635c92805f99554ad88fe15eba5c9566f5db8c977bf11014aa8f4a94dcc3f5a9e633f15c7438516 SHA512 c84dd850464fa34e84576c1548c2a17b036543b682a2693ca3d95bdde62014e632116a84479ac42539e9d04e97386aa3326fe587043443dd1895d01bf70463c2 diff --git a/dev-embedded/esphome/esphome-9999.ebuild b/dev-embedded/esphome/esphome-9999.ebuild index a3472564b..d811250de 100644 --- a/dev-embedded/esphome/esphome-9999.ebuild +++ b/dev-embedded/esphome/esphome-9999.ebuild @@ -37,8 +37,8 @@ DEPEND="${RDEPEND} ~dev-python/colorlog-4.1.0[${PYTHON_USEDEP}] ~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}] ~www-servers/tornado-6.0.4[${PYTHON_USEDEP}] - ~dev-python/protobuf-python-3.12.2[${PYTHON_USEDEP}] - ~dev-libs/protobuf-3.12.2 + ~dev-python/protobuf-python-3.12.4[${PYTHON_USEDEP}] + ~dev-libs/protobuf-3.12.4 ~dev-python/tzlocal-2.1[${PYTHON_USEDEP}] ~dev-python/pytz-2020.1[${PYTHON_USEDEP}] ~dev-python/pyserial-3.4[${PYTHON_USEDEP}] diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index 5b3b6931c..7143d268a 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -5,7 +5,9 @@ AUX protobuf-3.6.0-protoc_input_output_files.patch 9632 BLAKE2B 6466f6f6cf08e7a9 AUX protobuf-3.6.0-system_libraries.patch 6323 BLAKE2B 0fb8e389a58b76c592b592782900b48bb6c68e85fc159d4b9a59a43ab5a116916f7d9ef15cca392e5751f015a887f855631abb124b4d4109d51f6ba401059549 SHA512 ab58b9aa9d1398a15346d6e85611ad826f8e52744aa137ca4f138348b4738afc7c6cd27129f925f5142edac7e272d56da880a83b216b2ce264804d6967997728 AUX protobuf-3.6.1-libatomic_linking.patch 1753 BLAKE2B 50f8ac92dfada973ebcd187fa508a46ddd5d4e034e2eade2a3fcbb35ffab771578b241fa9a5343b46e91c90c4507e1d3a75a1bebc3426dbb1694c0fbb8cc03bf SHA512 c8bcb885dcf7d2871136a6410750aad69a61450b5a4bc80df56246a5875e1e9895d2d63e9e9e6deda3c4e516cd07344b92619457ef41f4f2ff0710c774957466 DIST protobuf-3.10.0.tar.gz 4908907 BLAKE2B 53a702a2cbfe7e642989eec010541fda434b7b8bbd267e3b65fc569a0ab33b08438c1a81d478426ebfbec6e330b90428e3da4fd345b8b64f890a6b3f4e360883 SHA512 0dcba6d21486fdc162f57119754b47b4a2fb605af878d5b96a32df55895321535cffb5b804566fd90ee7c36e20106d0cd4f5d9f3c652dc9c4dfca96be41a1977 +DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c DIST protobuf-3.7.0.tar.gz 4784675 BLAKE2B cb65f3384c7b0f015ab48081764ee9e01ad4bcffdb4903025774d95626f804fb9f72532371cc090de2b2e86c4bb0eb8f618d1cf8ff4d9c54d281c45a43b1cd8b SHA512 c570ece1d42706982dd87f601af6b3dd1d788d1b150b543190d10d2f070c67f0d006726ec4eafd3b9234a679e7ef77ac9d97749414f53f619287a1f23a0b739c EBUILD protobuf-3.10.0.ebuild 2475 BLAKE2B 5c45b88dd8e6191f8bbe9c0f4d93d96f5c8cda8212bec6fdc48ee8023ffa5dc41d1b33bb8d2f9cd9d39fd22899181c1ec7d2d598da3b2ededd12d72b2cac78d5 SHA512 bf188a5b38adf17891732a239b97477107f805b4bab126faa651ad47a767cac4227c994abae1c65d973d3b6e25d80b82ed8e6b51edc27fcc77441cf49dd787ff +EBUILD protobuf-3.12.4.ebuild 3028 BLAKE2B 2d35522c78efd3143ad106cd97ca661c421fdd6d6c4fdf78ec8d87837cd42aafba7e320c8d0aa81277db671171342d57cdddcd85658b9b09b26becc27a2ab3ea SHA512 923b5a6fd632b47bc8c5ad30fd555fe4ca3a8e0f8244bd24e6520bc02607f624dfa8018dc6813385020251b4b2621679b02bc99f567c7b492a733644184aeea3 EBUILD protobuf-3.7.0.ebuild 2534 BLAKE2B d98a1b9820e4c7f267a1de60a5eeba86affd428079415251faacbe3d07baa9aea3e8101d2ecc6bd07e9dcd601d1b38b7b79e5b2a0aaf85175b22d3c2d354b058 SHA512 25552aa678693af3c0983704b7be9a2fca79a5c4cecb163446e1d95b5a35a64dd080457e3daa35c4f043735d760f975b75bf9b46d5b306d8ec8768bbc422f07c MISC metadata.xml 543 BLAKE2B 43724e6d32707c62de4e1daffe50ba943c66286f6fe2357ec7171dad9feb7407049c26da517442957d61c11229617bd639d60bf070e7eedab8c871956cb3577a SHA512 f5a65ed219ff9f36c9d7bfdfe3bfe080ce0920e72f31f69820cc16822a04cdb38ec3c5d6b776b3c6cfde0bfc74c474558d048b706ac89e9405376e88504b8983 diff --git a/dev-libs/protobuf/protobuf-3.12.4.ebuild b/dev-libs/protobuf/protobuf-3.12.4.ebuild new file mode 100644 index 000000000..16f0b7ed8 --- /dev/null +++ b/dev-libs/protobuf/protobuf-3.12.4.ebuild @@ -0,0 +1,128 @@ +# Copyright 2008-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf" + EGIT_SUBMODULES=() +fi + +DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" +HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" +else + SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="BSD" +SLOT="0/23" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +IUSE="emacs examples static-libs test zlib" +RESTRICT="!test? ( test )" + +BDEPEND="emacs? ( app-editors/emacs:* )" +DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" +RDEPEND="emacs? ( app-editors/emacs:* ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" + +PATCHES=( + "${FILESDIR}/${PN}-3.12.0-disable_no-warning-test.patch" + "${FILESDIR}/${PN}-3.12.0-system_libraries.patch" + "${FILESDIR}/${PN}-3.12.0-protoc_input_output_files.patch" +) + +DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) + +src_prepare() { + default + + # https://github.com/protocolbuffers/protobuf/issues/7413 + sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die + + eautoreconf +} + +src_configure() { + append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI + + if tc-ld-is-gold; then + # https://sourceware.org/bugzilla/show_bug.cgi?id=24527 + tc-ld-disable-gold + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local options=( + $(use_enable static-libs static) + $(use_with zlib) + ) + + if tc-is-cross-compiler; then + # Build system uses protoc when building, so protoc copy runnable on host is needed. + mkdir -p "${WORKDIR}/build" || die + pushd "${WORKDIR}/build" > /dev/null || die + ECONF_SOURCE="${S}" econf_build "${options[@]}" + options+=(--with-protoc="$(pwd)/src/protoc") + popd > /dev/null || die + fi + + ECONF_SOURCE="${S}" econf "${options[@]}" +} + +src_compile() { + multilib-minimal_src_compile + + if use emacs; then + elisp-compile editors/protobuf-mode.el + fi +} + +multilib_src_compile() { + if tc-is-cross-compiler; then + emake -C "${WORKDIR}/build/src" protoc + fi + + default +} + +multilib_src_test() { + emake check +} + +multilib_src_install_all() { + find "${D}" -name "*.la" -type f -delete || die + + 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-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest index c40532f7a..3d30601d6 100644 --- a/dev-python/protobuf-python/Manifest +++ b/dev-python/protobuf-python/Manifest @@ -1,6 +1,8 @@ DIST protobuf-3.10.0.tar.gz 4908907 BLAKE2B 53a702a2cbfe7e642989eec010541fda434b7b8bbd267e3b65fc569a0ab33b08438c1a81d478426ebfbec6e330b90428e3da4fd345b8b64f890a6b3f4e360883 SHA512 0dcba6d21486fdc162f57119754b47b4a2fb605af878d5b96a32df55895321535cffb5b804566fd90ee7c36e20106d0cd4f5d9f3c652dc9c4dfca96be41a1977 +DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c DIST protobuf-3.7.0.tar.gz 4784675 BLAKE2B cb65f3384c7b0f015ab48081764ee9e01ad4bcffdb4903025774d95626f804fb9f72532371cc090de2b2e86c4bb0eb8f618d1cf8ff4d9c54d281c45a43b1cd8b SHA512 c570ece1d42706982dd87f601af6b3dd1d788d1b150b543190d10d2f070c67f0d006726ec4eafd3b9234a679e7ef77ac9d97749414f53f619287a1f23a0b739c EBUILD protobuf-python-3.10.0-r1.ebuild 1242 BLAKE2B cf5d2a2a9695ba3fd023cabd65cd1169dcb8d7e34341be7cbf3d2fe669f442eec7a71031c5a84a5b6fc07e06135740fa760cf97ed5762ffda8977f31fbb0e1f0 SHA512 956cc0cc8d1085d7f7359df371746d55f4ba113cd2c19db212c67c9fd4107b6f8a37e4ef28962c040b848e830b7076908448185c669e176194aa39ec475621c2 EBUILD protobuf-python-3.10.0.ebuild 1251 BLAKE2B b6f268d86c2596a1357a898472c28b28cac90a9ee5bf4cf6761aa7d291fd084efd31aaf793873c29c6a38ae61fff2bf161106dd55122651d29112788d7b41b9b SHA512 8d8554b92cc4b958be7a071b9a8513f32bbe817dfbd7eefab98745cd839ae7d9d4306a8718d88af42edb2f1623bfaf117f19cfa71152791e1a3eb04535909c24 +EBUILD protobuf-python-3.12.4.ebuild 1559 BLAKE2B cbf8fe7187083fcd94ae6cd1b91dfeecc2462e1a863bf7b227569fb6433de9ac2288017de69747b703f6b7ba339910a59105409f5bb1623d6a34bdbec4e15a70 SHA512 af881934dca2db4fbcd4834621f7e218ab94d33e500f5e3874b014114b43d8fe46c3b40ce5bdce20f1844e8d30853788b56814d32c2dc7e1c539fa7330b917c1 EBUILD protobuf-python-3.7.0.ebuild 1251 BLAKE2B b6f268d86c2596a1357a898472c28b28cac90a9ee5bf4cf6761aa7d291fd084efd31aaf793873c29c6a38ae61fff2bf161106dd55122651d29112788d7b41b9b SHA512 8d8554b92cc4b958be7a071b9a8513f32bbe817dfbd7eefab98745cd839ae7d9d4306a8718d88af42edb2f1623bfaf117f19cfa71152791e1a3eb04535909c24 MISC metadata.xml 656 BLAKE2B e63db63e247b105b51b506a404d8edc821cc0ccc276a3f813df3b06951184218e736e57b577ad2f64880250c55ef09c50a9fe04428f7cec02fb04293c337175a SHA512 5d747585e025672d423690fa2d8df09380a1714c2e0adad5838a41f099e3984b70c7f80c5873ea296101898cd92dea70edee964bf01b9d86acb9a1d0140169fd diff --git a/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild new file mode 100644 index 000000000..833089004 --- /dev/null +++ b/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild @@ -0,0 +1,63 @@ +# Copyright 2008-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PYTHON_COMPAT=(python{2_7,3_{6..9}}) +DISTUTILS_USE_SETUPTOOLS="manual" + +inherit distutils-r1 + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf" + EGIT_SUBMODULES=() +fi + +DESCRIPTION="Google's Protocol Buffers - Python bindings" +HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" +else + SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz" +fi + +LICENSE="BSD" +SLOT="0/23" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +IUSE="" + +BDEPEND="${PYTHON_DEPS} + ~dev-libs/protobuf-${PV} + dev-python/namespace-google[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}]" +DEPEND="${PYTHON_DEPS} + ~dev-libs/protobuf-${PV}" +RDEPEND="${BDEPEND} + !