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

Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-3.5.4.2-r1.ebuild libreoffice-3.5.9999.ebuild ChangeLog
Date: Fri, 01 Jun 2012 17:09:52
Message-Id: 20120601170942.7D4E12004B@flycatcher.gentoo.org
1 scarabeus 12/06/01 17:09:42
2
3 Modified: libreoffice-9999-r2.ebuild
4 libreoffice-3.5.4.2-r1.ebuild
5 libreoffice-3.5.9999.ebuild ChangeLog
6 Log:
7 Bump gcc requirement to 4.5 to fix bugs like bug#419027.
8
9 (Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.76 app-office/libreoffice/libreoffice-9999-r2.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.76&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.76&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.75&r2=1.76
17
18 Index: libreoffice-9999-r2.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
21 retrieving revision 1.75
22 retrieving revision 1.76
23 diff -u -r1.75 -r1.76
24 --- libreoffice-9999-r2.ebuild 31 May 2012 14:20:25 -0000 1.75
25 +++ libreoffice-9999-r2.ebuild 1 Jun 2012 17:09:42 -0000 1.76
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2012 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.75 2012/05/31 14:20:25 scarabeus Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.76 2012/06/01 17:09:42 scarabeus Exp $
31
32 EAPI=4
33
34 @@ -241,8 +241,10 @@
35 if [[ ${MERGE_TYPE} != binary ]]; then
36 check-reqs_pkg_pretend
37
38 - if [[ $(gcc-major-version) -lt 4 ]]; then
39 - eerror "Compilation with gcc older than 4.0 is not supported"
40 + if [[ $(gcc-major-version) -lt 4 ]] || \
41 + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 5 ]] ) \
42 + ; then
43 + eerror "Compilation with gcc older than 4.5 is not supported"
44 die "Too old gcc found."
45 fi
46 fi
47
48
49
50 1.6 app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild?rev=1.6&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild?rev=1.6&content-type=text/plain
54 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild?r1=1.5&r2=1.6
55
56 Index: libreoffice-3.5.4.2-r1.ebuild
57 ===================================================================
58 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild,v
59 retrieving revision 1.5
60 retrieving revision 1.6
61 diff -u -r1.5 -r1.6
62 --- libreoffice-3.5.4.2-r1.ebuild 31 May 2012 11:45:48 -0000 1.5
63 +++ libreoffice-3.5.4.2-r1.ebuild 1 Jun 2012 17:09:42 -0000 1.6
64 @@ -1,6 +1,6 @@
65 # Copyright 1999-2012 Gentoo Foundation
66 # Distributed under the terms of the GNU General Public License v2
67 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild,v 1.5 2012/05/31 11:45:48 nativemad Exp $
68 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild,v 1.6 2012/06/01 17:09:42 scarabeus Exp $
69
70 EAPI=4
71
72 @@ -218,8 +218,10 @@
73 CHECKREQS_DISK_BUILD="6G"
74 check-reqs_pkg_pretend
75
76 - if [[ $(gcc-major-version) -lt 4 ]]; then
77 - eerror "Compilation with gcc older than 4.0 is not supported"
78 + if [[ $(gcc-major-version) -lt 4 ]] || \
79 + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 5 ]] ) \
80 + ; then
81 + eerror "Compilation with gcc older than 4.5 is not supported"
82 die "Too old gcc found."
83 fi
84 fi
85
86
87
88 1.49 app-office/libreoffice/libreoffice-3.5.9999.ebuild
89
90 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.49&view=markup
91 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.49&content-type=text/plain
92 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?r1=1.48&r2=1.49
93
94 Index: libreoffice-3.5.9999.ebuild
95 ===================================================================
96 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v
97 retrieving revision 1.48
98 retrieving revision 1.49
99 diff -u -r1.48 -r1.49
100 --- libreoffice-3.5.9999.ebuild 31 May 2012 14:20:25 -0000 1.48
101 +++ libreoffice-3.5.9999.ebuild 1 Jun 2012 17:09:42 -0000 1.49
102 @@ -1,6 +1,6 @@
103 # Copyright 1999-2012 Gentoo Foundation
104 # Distributed under the terms of the GNU General Public License v2
105 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.48 2012/05/31 14:20:25 scarabeus Exp $
106 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.49 2012/06/01 17:09:42 scarabeus Exp $
107
108 EAPI=4
109
110 @@ -189,7 +189,6 @@
111 "
112
113 PATCHES=(
114 - # this can't be upstreamed :(
115 "${FILESDIR}/${PN}-system-pyuno.patch"
116 "${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch"
117 "${FILESDIR}/${PN}-3.5-doublebuild.patch"
118 @@ -215,8 +214,10 @@
119 CHECKREQS_DISK_BUILD="6G"
120 check-reqs_pkg_pretend
121
122 - if [[ $(gcc-major-version) -lt 4 ]]; then
123 - eerror "Compilation with gcc older than 4.0 is not supported"
124 + if [[ $(gcc-major-version) -lt 4 ]] || \
125 + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 5 ]] ) \
126 + ; then
127 + eerror "Compilation with gcc older than 4.5 is not supported"
128 die "Too old gcc found."
129 fi
130 fi
131
132
133
134 1.325 app-office/libreoffice/ChangeLog
135
136 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.325&view=markup
137 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.325&content-type=text/plain
138 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.324&r2=1.325
139
140 Index: ChangeLog
141 ===================================================================
142 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
143 retrieving revision 1.324
144 retrieving revision 1.325
145 diff -u -r1.324 -r1.325
146 --- ChangeLog 31 May 2012 14:20:25 -0000 1.324
147 +++ ChangeLog 1 Jun 2012 17:09:42 -0000 1.325
148 @@ -1,6 +1,11 @@
149 # ChangeLog for app-office/libreoffice
150 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
151 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.324 2012/05/31 14:20:25 scarabeus Exp $
152 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.325 2012/06/01 17:09:42 scarabeus Exp $
153 +
154 + 01 Jun 2012; Tomáš Chvátal <scarabeus@g.o>
155 + libreoffice-3.5.4.2-r1.ebuild, libreoffice-3.5.9999.ebuild,
156 + libreoffice-9999-r2.ebuild:
157 + Bump gcc requirement to 4.5 to fix bugs like bug#419027.
158
159 31 May 2012; Tomáš Chvátal <scarabeus@g.o> libreoffice-3.5.9999.ebuild,
160 libreoffice-9999-r2.ebuild:
Report Message
Find on MARC Find on Google Groups