[gentoo-commits] gentoo-x86 commit in dev-libs/protobuf: ChangeLog protobuf-2.5.0-r2.ebuild protobuf-2.6.1-r1.ebuild - 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 19:51:39
Message-Id:	`20141127195133.DBB13B09D@oystercatcher.gentoo.org`

1

radhermit    14/11/27 19:51:33

2

3

  Modified:             ChangeLog protobuf-2.5.0-r2.ebuild

4

                        protobuf-2.6.1-r1.ebuild

5

  Log:

6

  Apply patches manually so they don't get applied twice.

7

8

  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

9

10

Revision  Changes    Path

11

1.72                 dev-libs/protobuf/ChangeLog

12

13

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.72&view=markup

14

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.72&content-type=text/plain

15

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?r1=1.71&r2=1.72

16

17

Index: ChangeLog

18

===================================================================

19

RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v

20

retrieving revision 1.71

21

retrieving revision 1.72

22

diff -u -r1.71 -r1.72

23

--- ChangeLog	27 Nov 2014 18:05:23 -0000	1.71

24

+++ ChangeLog	27 Nov 2014 19:51:33 -0000	1.72

25

@@ -1,6 +1,10 @@

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.71 2014/11/27 18:05:23 radhermit Exp $

29

+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.72 2014/11/27 19:51:33 radhermit Exp $

30

+

31

+  27 Nov 2014; Tim Harder <radhermit@g.o> protobuf-2.5.0-r2.ebuild,

32

+  protobuf-2.6.1-r1.ebuild:

33

+  Apply patches manually so they don't get applied twice.

34

35

 *protobuf-2.6.1-r1 (27 Nov 2014)

36

 *protobuf-2.5.0-r2 (27 Nov 2014)

1.2                  dev-libs/protobuf/protobuf-2.5.0-r2.ebuild

41

42

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?rev=1.2&view=markup

43

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?rev=1.2&content-type=text/plain

44

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?r1=1.1&r2=1.2

45

46

Index: protobuf-2.5.0-r2.ebuild

47

===================================================================

48

RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v

49

retrieving revision 1.1

50

retrieving revision 1.2

51

diff -u -r1.1 -r1.2

52

--- protobuf-2.5.0-r2.ebuild	27 Nov 2014 18:05:23 -0000	1.1

53

+++ protobuf-2.5.0-r2.ebuild	27 Nov 2014 19:51:33 -0000	1.2

54

@@ -1,6 +1,6 @@

55

 # Copyright 1999-2014 Gentoo Foundation

56

 # Distributed under the terms of the GNU General Public License v2

57

-# $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 $

58

+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v 1.2 2014/11/27 19:51:33 radhermit Exp $

59

60

 EAPI=5

61

 AUTOTOOLS_AUTORECONF=1

62

@@ -9,7 +9,7 @@

63

 PYTHON_COMPAT=( python2_7 )

64

 DISTUTILS_OPTIONAL=1

65

66

-inherit autotools-multilib flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common

67

+inherit autotools-multilib eutils flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common

68

69

 DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"

70

 HOMEPAGE="http://code.google.com/p/protobuf/"

71

@@ -29,18 +29,18 @@

72

 	java? ( >=virtual/jre-1.5 )"

73

74

 src_prepare() {

75

-	local PATCHES=( "${FILESDIR}"/${P}-x32.patch )

76

+	append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI

77

+

78

+	epatch "${FILESDIR}"/${P}-x32.patch

79

80

 	# breaks Darwin, bug #472514

81

-	[[ ${CHOST} != *-darwin* ]] && PATCHES+=( "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch )

82

+	[[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch

83

84

-	append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI

85

+	autotools-multilib_src_prepare

86

87

 	if use python; then

88

 		cd python && distutils-r1_src_prepare

89

fi

90

-

91

-	autotools-multilib_src_prepare

92

}

93

94

 src_compile() {

1.2                  dev-libs/protobuf/protobuf-2.6.1-r1.ebuild

99

100

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?rev=1.2&view=markup

101

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?rev=1.2&content-type=text/plain

102

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?r1=1.1&r2=1.2

103

104

Index: protobuf-2.6.1-r1.ebuild

105

===================================================================

106

RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v

107

retrieving revision 1.1

108

retrieving revision 1.2

109

diff -u -r1.1 -r1.2

110

--- protobuf-2.6.1-r1.ebuild	27 Nov 2014 18:05:23 -0000	1.1

111

+++ protobuf-2.6.1-r1.ebuild	27 Nov 2014 19:51:33 -0000	1.2

112

@@ -1,6 +1,6 @@

113

 # Copyright 1999-2014 Gentoo Foundation

114

 # Distributed under the terms of the GNU General Public License v2

115

-# $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 $

116

+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v 1.2 2014/11/27 19:51:33 radhermit Exp $

117

118

 EAPI=5

119

 AUTOTOOLS_AUTORECONF=1

120

@@ -9,7 +9,7 @@

121

 PYTHON_COMPAT=( python2_7 )

122

 DISTUTILS_OPTIONAL=1

123

124

-inherit autotools-multilib flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common

125

+inherit autotools-multilib eutils flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common

126

127

 DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"

128

 HOMEPAGE="http://code.google.com/p/protobuf/ https://github.com/google/protobuf/"

129

@@ -32,16 +32,16 @@

130

 	java? ( >=virtual/jre-1.5 )"

131

132

 src_prepare() {

133

+	append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI

134

+

135

 	# breaks Darwin, bug #472514

136

-	[[ ${CHOST} != *-darwin* ]] && local PATCHES=( "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch )

137

+	[[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch

138

139

-	append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI

140

+	autotools-multilib_src_prepare

141

142

 	if use python; then

143

 		cd python && distutils-r1_src_prepare

144

fi

145

-

146

-	autotools-multilib_src_prepare

147

}

148

149

 src_compile() {

1	radhermit 14/11/27 19:51:33
2
3	Modified: ChangeLog protobuf-2.5.0-r2.ebuild
4	protobuf-2.6.1-r1.ebuild
5	Log:
6	Apply patches manually so they don't get applied twice.
7
8	(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
9
10	Revision Changes Path
11	1.72 dev-libs/protobuf/ChangeLog
12
13	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.72&view=markup
14	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.72&content-type=text/plain
15	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?r1=1.71&r2=1.72
16
17	Index: ChangeLog
18	===================================================================
19	RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v
20	retrieving revision 1.71
21	retrieving revision 1.72
22	diff -u -r1.71 -r1.72
23	--- ChangeLog 27 Nov 2014 18:05:23 -0000 1.71
24	+++ ChangeLog 27 Nov 2014 19:51:33 -0000 1.72
25	@@ -1,6 +1,10 @@
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.71 2014/11/27 18:05:23 radhermit Exp $
29	+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.72 2014/11/27 19:51:33 radhermit Exp $
30	+
31	+ 27 Nov 2014; Tim Harder <radhermit@g.o> protobuf-2.5.0-r2.ebuild,
32	+ protobuf-2.6.1-r1.ebuild:
33	+ Apply patches manually so they don't get applied twice.
34
35	*protobuf-2.6.1-r1 (27 Nov 2014)
36	*protobuf-2.5.0-r2 (27 Nov 2014)
37
38
39
40	1.2 dev-libs/protobuf/protobuf-2.5.0-r2.ebuild
41
42	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?rev=1.2&view=markup
43	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?rev=1.2&content-type=text/plain
44	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?r1=1.1&r2=1.2
45
46	Index: protobuf-2.5.0-r2.ebuild
47	===================================================================
48	RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v
49	retrieving revision 1.1
50	retrieving revision 1.2
51	diff -u -r1.1 -r1.2
52	--- protobuf-2.5.0-r2.ebuild 27 Nov 2014 18:05:23 -0000 1.1
53	+++ protobuf-2.5.0-r2.ebuild 27 Nov 2014 19:51:33 -0000 1.2
54	@@ -1,6 +1,6 @@
55	# Copyright 1999-2014 Gentoo Foundation
56	# Distributed under the terms of the GNU General Public License v2
57	-# $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 $
58	+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v 1.2 2014/11/27 19:51:33 radhermit Exp $
59
60	EAPI=5
61	AUTOTOOLS_AUTORECONF=1
62	@@ -9,7 +9,7 @@
63	PYTHON_COMPAT=( python2_7 )
64	DISTUTILS_OPTIONAL=1
65
66	-inherit autotools-multilib flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common
67	+inherit autotools-multilib eutils flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common
68
69	DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
70	HOMEPAGE="http://code.google.com/p/protobuf/"
71	@@ -29,18 +29,18 @@
72	java? ( >=virtual/jre-1.5 )"
73
74	src_prepare() {
75	- local PATCHES=( "${FILESDIR}"/${P}-x32.patch )
76	+ append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
77	+
78	+ epatch "${FILESDIR}"/${P}-x32.patch
79
80	# breaks Darwin, bug #472514
81	- [[ ${CHOST} != -darwin ]] && PATCHES+=( "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch )
82	+ [[ ${CHOST} != -darwin ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch
83
84	- append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
85	+ autotools-multilib_src_prepare
86
87	if use python; then
88	cd python && distutils-r1_src_prepare
89	fi
90	-
91	- autotools-multilib_src_prepare
92	}
93
94	src_compile() {
95
96
97
98	1.2 dev-libs/protobuf/protobuf-2.6.1-r1.ebuild
99
100	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?rev=1.2&view=markup
101	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?rev=1.2&content-type=text/plain
102	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?r1=1.1&r2=1.2
103
104	Index: protobuf-2.6.1-r1.ebuild
105	===================================================================
106	RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v
107	retrieving revision 1.1
108	retrieving revision 1.2
109	diff -u -r1.1 -r1.2
110	--- protobuf-2.6.1-r1.ebuild 27 Nov 2014 18:05:23 -0000 1.1
111	+++ protobuf-2.6.1-r1.ebuild 27 Nov 2014 19:51:33 -0000 1.2
112	@@ -1,6 +1,6 @@
113	# Copyright 1999-2014 Gentoo Foundation
114	# Distributed under the terms of the GNU General Public License v2
115	-# $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 $
116	+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v 1.2 2014/11/27 19:51:33 radhermit Exp $
117
118	EAPI=5
119	AUTOTOOLS_AUTORECONF=1
120	@@ -9,7 +9,7 @@
121	PYTHON_COMPAT=( python2_7 )
122	DISTUTILS_OPTIONAL=1
123
124	-inherit autotools-multilib flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common
125	+inherit autotools-multilib eutils flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common
126
127	DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
128	HOMEPAGE="http://code.google.com/p/protobuf/ https://github.com/google/protobuf/"
129	@@ -32,16 +32,16 @@
130	java? ( >=virtual/jre-1.5 )"
131
132	src_prepare() {
133	+ append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
134	+
135	# breaks Darwin, bug #472514
136	- [[ ${CHOST} != -darwin ]] && local PATCHES=( "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch )
137	+ [[ ${CHOST} != -darwin ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch
138
139	- append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
140	+ autotools-multilib_src_prepare
141
142	if use python; then
143	cd python && distutils-r1_src_prepare
144	fi
145	-
146	- autotools-multilib_src_prepare
147	}
148
149	src_compile() {

Gentoo Archives: gentoo-commits