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-4.0.9999.ebuild ChangeLog
Date: Fri, 29 Mar 2013 09:41:31
Message-Id: 20130329094128.67A122171D@flycatcher.gentoo.org
1 scarabeus 13/03/29 09:41:28
2
3 Modified: libreoffice-9999-r2.ebuild
4 libreoffice-4.0.9999.ebuild ChangeLog
5 Log:
6 Update the pythoncflags/libs detection with the eclass functions. Put the branding mv call to prepare phase.
7
8 (Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
9
10 Revision Changes Path
11 1.168 app-office/libreoffice/libreoffice-9999-r2.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.168&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.168&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.167&r2=1.168
16
17 Index: libreoffice-9999-r2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
20 retrieving revision 1.167
21 retrieving revision 1.168
22 diff -u -r1.167 -r1.168
23 --- libreoffice-9999-r2.ebuild 18 Mar 2013 18:59:00 -0000 1.167
24 +++ libreoffice-9999-r2.ebuild 29 Mar 2013 09:41:28 -0000 1.168
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.167 2013/03/18 18:59:00 scarabeus Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.168 2013/03/29 09:41:28 scarabeus Exp $
30
31 EAPI=5
32
33 @@ -313,6 +313,9 @@
34 src_prepare() {
35 # optimization flags
36 export GMAKE_OPTIONS="${MAKEOPTS}"
37 + # System python 2.7 enablement:
38 + export PYTHON_CFLAGS=$(python_get_CFLAGS)
39 + export PYTHON_LIBS=$(python_get_LIBS)
40
41 # patchset
42 if [[ -n ${PATCHSET} ]]; then
43 @@ -324,8 +327,7 @@
44
45 base_src_prepare
46
47 - AT_M4DIR="m4"
48 - eautoreconf
49 + AT_M4DIR="m4" eautoreconf
50 # hack in the autogen.sh
51 touch autogen.lastrun
52
53 @@ -343,6 +345,11 @@
54 -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
55 -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
56 Makefile.in || die
57 +
58 + if use branding; then
59 + # hack...
60 + mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
61 + fi
62 }
63
64 src_configure() {
65 @@ -401,15 +408,6 @@
66 fi
67 fi
68
69 - if use branding; then
70 - # hack...
71 - mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
72 - fi
73 -
74 - # System python 2.7 enablement:
75 - export PYTHON_CFLAGS=`pkg-config --cflags python-${EPYTHON#python}`
76 - export PYTHON_LIBS=`pkg-config --libs python-${EPYTHON#python}`
77 -
78 # system headers/libs/...: enforce using system packages
79 # --enable-unix-qstart-libpng: use libpng splashscreen that is faster
80 # --enable-cairo: ensure that cairo is always required
81
82
83
84 1.25 app-office/libreoffice/libreoffice-4.0.9999.ebuild
85
86 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.25&view=markup
87 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.25&content-type=text/plain
88 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.24&r2=1.25
89
90 Index: libreoffice-4.0.9999.ebuild
91 ===================================================================
92 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
93 retrieving revision 1.24
94 retrieving revision 1.25
95 diff -u -r1.24 -r1.25
96 --- libreoffice-4.0.9999.ebuild 18 Mar 2013 09:50:12 -0000 1.24
97 +++ libreoffice-4.0.9999.ebuild 29 Mar 2013 09:41:28 -0000 1.25
98 @@ -1,6 +1,6 @@
99 # Copyright 1999-2013 Gentoo Foundation
100 # Distributed under the terms of the GNU General Public License v2
101 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.24 2013/03/18 09:50:12 scarabeus Exp $
102 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.25 2013/03/29 09:41:28 scarabeus Exp $
103
104 EAPI=5
105
106 @@ -320,6 +320,11 @@
107 export ARCH_FLAGS="${CXXFLAGS}"
108 export LINKFLAGSOPTIMIZE="${LDFLAGS}"
109 export GMAKE_OPTIONS="${MAKEOPTS}"
110 + # System python 2.7 enablement:
111 + export PYTHON="${PYTHON}"
112 + export PYTHON_CFLAGS=$(python_get_CFLAGS)
113 + export PYTHON_LIBS=$(python_get_LIBS)
114 +
115
116 # patchset
117 if [[ -n ${PATCHSET} ]]; then
118 @@ -342,6 +347,11 @@
119 -e "s:%libdir%:$(get_libdir):g" \
120 -i pyuno/source/module/uno.py \
121 -i scripting/source/pyprov/officehelper.py || die
122 +
123 + if use branding; then
124 + # hack...
125 + mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
126 + fi
127 }
128
129 src_configure() {
130 @@ -401,16 +411,6 @@
131 fi
132 fi
133
134 - if use branding; then
135 - # hack...
136 - mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
137 - fi
138 -
139 - # System python 2.7 enablement:
140 - export PYTHON="${PYTHON}"
141 - export PYTHON_CFLAGS=`pkg-config --cflags python-${EPYTHON#python}`
142 - export PYTHON_LIBS=`pkg-config --libs python-${EPYTHON#python}`
143 -
144 # system headers/libs/...: enforce using system packages
145 # --enable-unix-qstart-libpng: use libpng splashscreen that is faster
146 # --enable-cairo: ensure that cairo is always required
147
148
149
150 1.455 app-office/libreoffice/ChangeLog
151
152 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.455&view=markup
153 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.455&content-type=text/plain
154 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.454&r2=1.455
155
156 Index: ChangeLog
157 ===================================================================
158 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
159 retrieving revision 1.454
160 retrieving revision 1.455
161 diff -u -r1.454 -r1.455
162 --- ChangeLog 28 Mar 2013 16:49:05 -0000 1.454
163 +++ ChangeLog 29 Mar 2013 09:41:28 -0000 1.455
164 @@ -1,6 +1,11 @@
165 # ChangeLog for app-office/libreoffice
166 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
167 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.454 2013/03/28 16:49:05 maekke Exp $
168 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.455 2013/03/29 09:41:28 scarabeus Exp $
169 +
170 + 29 Mar 2013; Tomáš Chvátal <scarabeus@g.o> libreoffice-4.0.9999.ebuild,
171 + libreoffice-9999-r2.ebuild:
172 + Update the pythoncflags/libs detection with the eclass functions. Put the
173 + branding mv call to prepare phase.
174
175 28 Mar 2013; Markus Meier <maekke@g.o> libreoffice-4.0.1.2.ebuild:
176 add ~arm, bug #451464
Report Message
Find on MARC Find on Google Groups