commit:     842bba13133c19720953a8d420400b3de075ec5e
Author:     Marshall Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Sat Jul  2 16:01:03 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Jul  4 03:07:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=842bba13

dev-libs/protobuf: version bump 3.0.0_beta3_p1

- moved -DGOOGLE_PROTOBUF_NO_RTTI from append-cxxflags to append-cppflags
- changed subslot to 0/10b3 to trigger rebuilds of problematic consumer
  protobuf-c

Package-Manager: portage-2.3.0
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=586972
Closes: https://github.com/gentoo/gentoo/pull/1816

Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 dev-libs/protobuf/Manifest                                           | 2 +-
 .../{protobuf-3.0.0_beta3.ebuild => protobuf-3.0.0_beta3_p1.ebuild}  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 9ef6e17..7701631 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,3 +1,3 @@
 DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 
13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 SHA512 
5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee
 WHIRLPOOL 
7e6786e1f20bf253d0e386a95c2bbfe1b443f484d492f97552cadcea62c24461436aa88130e3ff20b4dc9f352c101458cb8c03686f1cc4e6e2133b6e78f5b70d
 DIST protobuf-2.6.1.tar.bz2 2021416 SHA256 
ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910 SHA512 
8b092b87fcd79223db199cd3d330f3d43689b47f345aa4e34028dcf1680d609a5d5a89ab08588e817b566d3b265834c38f1db580bc1c144b512ce74d35f2a174
 WHIRLPOOL 
b8d7f5e6b85670520435fd1107eb67035c822c2dad9689dadc29754de3bf8076ac256cf3fe3e719e99c0ccb03ed78edecb91afbe96b611073b60ae3fb3f29b1a
-DIST protobuf-3.0.0_beta3.tar.gz 3654440 SHA256 
d8d11564ff4085e7095cf5601fdc094946e6dbb0085863829668eb3a50b1ae0d SHA512 
b8e0e73ab03d18b6715d875aff8552a603d46feaa5b7b4fb225ba841ff917381bdecf5083202ec1753fd1e82a8d0281937fba6d0f0928261a68c035f509360fd
 WHIRLPOOL 
dbc8896a0b1bb92a5e0a586c6952c7b32b2c0cfce03ed5c2f39634d038977f50fbc3b2e9297944316f73d258d21b6766a4fae8f86b65e096f92ed93b0bf1615e
+DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 SHA256 
494726c9a6a45a20cd085795a26e4f05627e9b3b1fa5ab21a8b0edc5db8173dc SHA512 
bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b
 WHIRLPOOL 
d35dca8e402741e4d30c9c787f5927c7fe7f22619ddb3ca20d302c27fbeb929cecd55cc7e6785b28acb76c89893d2baf7fce3f685a3f186006e1e30a2901ae1b

diff --git a/dev-libs/protobuf/protobuf-3.0.0_beta3.ebuild 
b/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild
similarity index 97%
rename from dev-libs/protobuf/protobuf-3.0.0_beta3.ebuild
rename to dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild
index fd536b1..4194c06 100644
--- a/dev-libs/protobuf/protobuf-3.0.0_beta3.ebuild
+++ b/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild
@@ -10,13 +10,14 @@ inherit python-r1 autotools flag-o-matic toolchain-funcs 
elisp-common multilib-m
 # If you bump this package, also consider bumping the official language 
bindings!
 # At the current time these are java and python.
 MY_PV=${PV/_beta/-beta-}
+MY_PV=${MY_PV/_p/.}
 
 DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding 
structured data"
 HOMEPAGE="https://github.com/google/protobuf/ 
https://developers.google.com/protocol-buffers/";
 SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0/10"
+SLOT="0/10b3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples java python static-libs test vim-syntax zlib"
 
@@ -32,7 +33,7 @@ PATCHES=( "${FILESDIR}/${PN}-2.5.0-emacs-24.4.patch"
        "${FILESDIR}/${PN}-3.0.0_beta2-disable-local-gmock.patch" )
 
 src_prepare() {
-       append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
+       append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
        default
        eautoreconf
 }

Reply via email to