Gentoo Archives: gentoo-commits

From: Yixun Lan <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/
Date: Mon, 04 Jul 2016 03:10:46
Message-Id: 1467601640.842bba13133c19720953a8d420400b3de075ec5e.dlan@gentoo
1 commit: 842bba13133c19720953a8d420400b3de075ec5e
2 Author: Marshall Brewer <tomboy64 <AT> sina <DOT> cn>
3 AuthorDate: Sat Jul 2 16:01:03 2016 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 4 03:07:20 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=842bba13
7
8 dev-libs/protobuf: version bump 3.0.0_beta3_p1
9
10 - moved -DGOOGLE_PROTOBUF_NO_RTTI from append-cxxflags to append-cppflags
11 - changed subslot to 0/10b3 to trigger rebuilds of problematic consumer
12 protobuf-c
13
14 Package-Manager: portage-2.3.0
15 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=586972
16 Closes: https://github.com/gentoo/gentoo/pull/1816
17
18 Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
19
20 dev-libs/protobuf/Manifest | 2 +-
21 .../{protobuf-3.0.0_beta3.ebuild => protobuf-3.0.0_beta3_p1.ebuild} | 5 +++--
22 2 files changed, 4 insertions(+), 3 deletions(-)
23
24 diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
25 index 9ef6e17..7701631 100644
26 --- a/dev-libs/protobuf/Manifest
27 +++ b/dev-libs/protobuf/Manifest
28 @@ -1,3 +1,3 @@
29 DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee WHIRLPOOL 7e6786e1f20bf253d0e386a95c2bbfe1b443f484d492f97552cadcea62c24461436aa88130e3ff20b4dc9f352c101458cb8c03686f1cc4e6e2133b6e78f5b70d
30 DIST protobuf-2.6.1.tar.bz2 2021416 SHA256 ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910 SHA512 8b092b87fcd79223db199cd3d330f3d43689b47f345aa4e34028dcf1680d609a5d5a89ab08588e817b566d3b265834c38f1db580bc1c144b512ce74d35f2a174 WHIRLPOOL b8d7f5e6b85670520435fd1107eb67035c822c2dad9689dadc29754de3bf8076ac256cf3fe3e719e99c0ccb03ed78edecb91afbe96b611073b60ae3fb3f29b1a
31 -DIST protobuf-3.0.0_beta3.tar.gz 3654440 SHA256 d8d11564ff4085e7095cf5601fdc094946e6dbb0085863829668eb3a50b1ae0d SHA512 b8e0e73ab03d18b6715d875aff8552a603d46feaa5b7b4fb225ba841ff917381bdecf5083202ec1753fd1e82a8d0281937fba6d0f0928261a68c035f509360fd WHIRLPOOL dbc8896a0b1bb92a5e0a586c6952c7b32b2c0cfce03ed5c2f39634d038977f50fbc3b2e9297944316f73d258d21b6766a4fae8f86b65e096f92ed93b0bf1615e
32 +DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 SHA256 494726c9a6a45a20cd085795a26e4f05627e9b3b1fa5ab21a8b0edc5db8173dc SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b WHIRLPOOL d35dca8e402741e4d30c9c787f5927c7fe7f22619ddb3ca20d302c27fbeb929cecd55cc7e6785b28acb76c89893d2baf7fce3f685a3f186006e1e30a2901ae1b
33
34 diff --git a/dev-libs/protobuf/protobuf-3.0.0_beta3.ebuild b/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild
35 similarity index 97%
36 rename from dev-libs/protobuf/protobuf-3.0.0_beta3.ebuild
37 rename to dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild
38 index fd536b1..4194c06 100644
39 --- a/dev-libs/protobuf/protobuf-3.0.0_beta3.ebuild
40 +++ b/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild
41 @@ -10,13 +10,14 @@ inherit python-r1 autotools flag-o-matic toolchain-funcs elisp-common multilib-m
42 # If you bump this package, also consider bumping the official language bindings!
43 # At the current time these are java and python.
44 MY_PV=${PV/_beta/-beta-}
45 +MY_PV=${MY_PV/_p/.}
46
47 DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
48 HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
49 SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
50
51 LICENSE="Apache-2.0"
52 -SLOT="0/10"
53 +SLOT="0/10b3"
54 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
55 IUSE="emacs examples java python static-libs test vim-syntax zlib"
56
57 @@ -32,7 +33,7 @@ PATCHES=( "${FILESDIR}/${PN}-2.5.0-emacs-24.4.patch"
58 "${FILESDIR}/${PN}-3.0.0_beta2-disable-local-gmock.patch" )
59
60 src_prepare() {
61 - append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
62 + append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
63 default
64 eautoreconf
65 }