Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/protobuf: ChangeLog protobuf-2.5.0-r2.ebuild protobuf-2.6.1-r1.ebuild
Date: Thu, 27 Nov 2014 18:05:27
Message-Id: 20141127180523.6EC1EB086@oystercatcher.gentoo.org
1 radhermit 14/11/27 18:05:23
2
3 Modified: ChangeLog
4 Added: protobuf-2.5.0-r2.ebuild protobuf-2.6.1-r1.ebuild
5 Log:
6 Add multilib support.
7
8 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
9
10 Revision Changes Path
11 1.71 dev-libs/protobuf/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.71&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.71&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?r1=1.70&r2=1.71
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v
20 retrieving revision 1.70
21 retrieving revision 1.71
22 diff -u -r1.70 -r1.71
23 --- ChangeLog 21 Nov 2014 14:04:29 -0000 1.70
24 +++ ChangeLog 27 Nov 2014 18:05:23 -0000 1.71
25 @@ -1,6 +1,13 @@
26 # ChangeLog for dev-libs/protobuf
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.70 2014/11/21 14:04:29 ago Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.71 2014/11/27 18:05:23 radhermit Exp $
30 +
31 +*protobuf-2.6.1-r1 (27 Nov 2014)
32 +*protobuf-2.5.0-r2 (27 Nov 2014)
33 +
34 + 27 Nov 2014; Tim Harder <radhermit@g.o> +protobuf-2.5.0-r2.ebuild,
35 + +protobuf-2.6.1-r1.ebuild:
36 + Add multilib support.
37
38 21 Nov 2014; Agostino Sarubbo <ago@g.o> protobuf-2.5.0-r1.ebuild:
39 Stable for amd64, wrt bug #529858
40
41
42
43 1.1 dev-libs/protobuf/protobuf-2.5.0-r2.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?rev=1.1&content-type=text/plain
47
48 Index: protobuf-2.5.0-r2.ebuild
49 ===================================================================
50 # Copyright 1999-2014 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v 1.1 2014/11/27 18:05:23 radhermit Exp $
53
54 EAPI=5
55 AUTOTOOLS_AUTORECONF=1
56 AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
57 JAVA_PKG_IUSE="source"
58 PYTHON_COMPAT=( python2_7 )
59 DISTUTILS_OPTIONAL=1
60
61 inherit autotools-multilib flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common
62
63 DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
64 HOMEPAGE="http://code.google.com/p/protobuf/"
65 SRC_URI="http://protobuf.googlecode.com/files/${P}.tar.bz2"
66
67 LICENSE="Apache-2.0"
68 SLOT="0/8" # subslot = soname major version
69 KEYWORDS="~amd64 ~arm -hppa ~ia64 ~mips -ppc -ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
70 IUSE="emacs examples java python static-libs vim-syntax"
71
72 CDEPEND="emacs? ( virtual/emacs )
73 python? ( ${PYTHON_DEPS} )"
74 DEPEND="${CDEPEND}
75 java? ( >=virtual/jdk-1.5 )
76 python? ( dev-python/setuptools[${PYTHON_USEDEP}] )"
77 RDEPEND="${CDEPEND}
78 java? ( >=virtual/jre-1.5 )"
79
80 src_prepare() {
81 local PATCHES=( "${FILESDIR}"/${P}-x32.patch )
82
83 # breaks Darwin, bug #472514
84 [[ ${CHOST} != *-darwin* ]] && PATCHES+=( "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch )
85
86 append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
87
88 if use python; then
89 cd python && distutils-r1_src_prepare
90 fi
91
92 autotools-multilib_src_prepare
93 }
94
95 src_compile() {
96 autotools-multilib_src_compile
97
98 if use python; then
99 einfo "Compiling Python library ..."
100 pushd python >/dev/null
101 distutils-r1_src_compile
102 popd >/dev/null
103 fi
104
105 if use java; then
106 einfo "Compiling Java library ..."
107 src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto
108 mkdir java/build
109 pushd java/src/main/java >/dev/null
110 ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed"
111 popd >/dev/null
112 jar cf ${PN}.jar -C java/build . || die "jar failed"
113 fi
114
115 if use emacs; then
116 elisp-compile "${S}"/editors/protobuf-mode.el
117 fi
118 }
119
120 src_test() {
121 autotools-multilib_src_test check
122
123 if use python; then
124 pushd python >/dev/null
125 distutils-r1_src_test
126 popd >/dev/null
127 fi
128 }
129
130 src_install() {
131 local DOCS=( CHANGES.txt CONTRIBUTORS.txt README.txt )
132 autotools-multilib_src_install
133
134 if use python; then
135 pushd python >/dev/null
136 distutils-r1_src_install
137 popd >/dev/null
138 fi
139
140 if use java; then
141 java-pkg_dojar ${PN}.jar
142 use source && java-pkg_dosrc java/src/main/java/*
143 fi
144
145 if use vim-syntax; then
146 insinto /usr/share/vim/vimfiles/syntax
147 doins editors/proto.vim
148 insinto /usr/share/vim/vimfiles/ftdetect/
149 doins "${FILESDIR}"/proto.vim
150 fi
151
152 if use emacs; then
153 elisp-install ${PN} editors/protobuf-mode.el*
154 elisp-site-file-install "${FILESDIR}"/70${PN}-gentoo.el
155 fi
156
157 if use examples; then
158 dodoc -r examples
159 docompress -x /usr/share/doc/${PF}/examples
160 fi
161 }
162
163 pkg_postinst() {
164 use emacs && elisp-site-regen
165 }
166
167 pkg_postrm() {
168 use emacs && elisp-site-regen
169 }
170
171
172
173 1.1 dev-libs/protobuf/protobuf-2.6.1-r1.ebuild
174
175 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?rev=1.1&view=markup
176 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?rev=1.1&content-type=text/plain
177
178 Index: protobuf-2.6.1-r1.ebuild
179 ===================================================================
180 # Copyright 1999-2014 Gentoo Foundation
181 # Distributed under the terms of the GNU General Public License v2
182 # $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v 1.1 2014/11/27 18:05:23 radhermit Exp $
183
184 EAPI=5
185 AUTOTOOLS_AUTORECONF=1
186 AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
187 JAVA_PKG_IUSE="source"
188 PYTHON_COMPAT=( python2_7 )
189 DISTUTILS_OPTIONAL=1
190
191 inherit autotools-multilib flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common
192
193 DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
194 HOMEPAGE="http://code.google.com/p/protobuf/ https://github.com/google/protobuf/"
195 SRC_URI="https://github.com/google/${PN}/releases/download/${PV}/${P}.tar.bz2"
196
197 LICENSE="Apache-2.0"
198 SLOT="0/9" # subslot = soname major version
199 KEYWORDS="~amd64 ~arm -hppa ~mips -ppc -ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
200 IUSE="emacs examples java python static-libs vim-syntax"
201
202 CDEPEND="emacs? ( virtual/emacs )
203 python? ( ${PYTHON_DEPS} )"
204 DEPEND="${CDEPEND}
205 java? ( >=virtual/jdk-1.5 )
206 python? (
207 dev-python/google-apputils[${PYTHON_USEDEP}]
208 dev-python/setuptools[${PYTHON_USEDEP}]
209 )"
210 RDEPEND="${CDEPEND}
211 java? ( >=virtual/jre-1.5 )"
212
213 src_prepare() {
214 # breaks Darwin, bug #472514
215 [[ ${CHOST} != *-darwin* ]] && local PATCHES=( "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch )
216
217 append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
218
219 if use python; then
220 cd python && distutils-r1_src_prepare
221 fi
222
223 autotools-multilib_src_prepare
224 }
225
226 src_compile() {
227 autotools-multilib_src_compile
228
229 if use python; then
230 einfo "Compiling Python library ..."
231 pushd python >/dev/null
232 distutils-r1_src_compile
233 popd >/dev/null
234 fi
235
236 if use java; then
237 einfo "Compiling Java library ..."
238 src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto
239 mkdir java/build
240 pushd java/src/main/java >/dev/null
241 ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed"
242 popd >/dev/null
243 jar cf ${PN}.jar -C java/build . || die "jar failed"
244 fi
245
246 if use emacs; then
247 elisp-compile "${S}"/editors/protobuf-mode.el
248 fi
249 }
250
251 src_test() {
252 autotools-multilib_src_test check
253
254 if use python; then
255 pushd python >/dev/null
256 distutils-r1_src_test
257 popd >/dev/null
258 fi
259 }
260
261 src_install() {
262 local DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md )
263 autotools-multilib_src_install
264
265 if use python; then
266 pushd python >/dev/null
267 distutils-r1_src_install
268 popd >/dev/null
269 fi
270
271 if use java; then
272 java-pkg_dojar ${PN}.jar
273 use source && java-pkg_dosrc java/src/main/java/*
274 fi
275
276 if use vim-syntax; then
277 insinto /usr/share/vim/vimfiles/syntax
278 doins editors/proto.vim
279 insinto /usr/share/vim/vimfiles/ftdetect/
280 doins "${FILESDIR}"/proto.vim
281 fi
282
283 if use emacs; then
284 elisp-install ${PN} editors/protobuf-mode.el*
285 elisp-site-file-install "${FILESDIR}"/70${PN}-gentoo.el
286 fi
287
288 if use examples; then
289 dodoc -r examples
290 docompress -x /usr/share/doc/${PF}/examples
291 fi
292 }
293
294 pkg_postinst() {
295 use emacs && elisp-site-regen
296 }
297
298 pkg_postrm() {
299 use emacs && elisp-site-regen
300 }
Report Message
Find on MARC Find on Google Groups