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.ebuild
Date: Sat, 29 Jun 2013 20:36:15
Message-Id: 20130629203606.C5EDD2171C@flycatcher.gentoo.org
1 radhermit 13/06/29 20:36:06
2
3 Modified: ChangeLog protobuf-2.5.0.ebuild
4 Log:
5 Make python deps optional (bug #475242 by Diego Elio Pettenò).
6
7 (Portage version: 2.2.0_alpha184/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
8
9 Revision Changes Path
10 1.49 dev-libs/protobuf/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.49&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.49&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?r1=1.48&r2=1.49
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v
19 retrieving revision 1.48
20 retrieving revision 1.49
21 diff -u -r1.48 -r1.49
22 --- ChangeLog 29 Jun 2013 19:40:40 -0000 1.48
23 +++ ChangeLog 29 Jun 2013 20:36:06 -0000 1.49
24 @@ -1,6 +1,9 @@
25 # ChangeLog for dev-libs/protobuf
26 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.48 2013/06/29 19:40:40 ago Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.49 2013/06/29 20:36:06 radhermit Exp $
29 +
30 + 29 Jun 2013; Tim Harder <radhermit@g.o> protobuf-2.5.0.ebuild:
31 + Make python deps optional (bug #475242 by Diego Elio Pettenò).
32
33 29 Jun 2013; Agostino Sarubbo <ago@g.o> protobuf-2.4.1.ebuild:
34 Stable for ppc64, wrt bug #474922
35
36
37
38 1.3 dev-libs/protobuf/protobuf-2.5.0.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild?rev=1.3&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild?rev=1.3&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild?r1=1.2&r2=1.3
43
44 Index: protobuf-2.5.0.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild,v
47 retrieving revision 1.2
48 retrieving revision 1.3
49 diff -u -r1.2 -r1.3
50 --- protobuf-2.5.0.ebuild 15 Jun 2013 11:26:56 -0000 1.2
51 +++ protobuf-2.5.0.ebuild 29 Jun 2013 20:36:06 -0000 1.3
52 @@ -1,10 +1,11 @@
53 # Copyright 1999-2013 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild,v 1.2 2013/06/15 11:26:56 grobian Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild,v 1.3 2013/06/29 20:36:06 radhermit Exp $
57
58 EAPI=5
59 JAVA_PKG_IUSE="source"
60 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
61 +DISTUTILS_OPTIONAL=1
62
63 inherit autotools eutils distutils-r1 java-pkg-opt-2 elisp-common
64
65 @@ -17,10 +18,12 @@
66 KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos x86-macos"
67 IUSE="emacs examples java python static-libs vim-syntax"
68
69 -DEPEND="java? ( >=virtual/jdk-1.5 )
70 - emacs? ( virtual/emacs )"
71 -RDEPEND="java? ( >=virtual/jre-1.5 )
72 - emacs? ( virtual/emacs )"
73 +CDEPEND="emacs? ( virtual/emacs )
74 + python? ( ${PYTHON_DEPS} )"
75 +DEPEND="${CDEPEND}
76 + java? ( >=virtual/jdk-1.5 )"
77 +RDEPEND="${CDEPEND}
78 + java? ( >=virtual/jre-1.5 )"
79
80 src_prepare() {
81 if [[ ${CHOST} != *-darwin* ]] ; then