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.9999.ebuild ChangeLog
Date: Thu, 01 Mar 2012 13:14:56
Message-Id: 20120301131447.76EC22004B@flycatcher.gentoo.org
1 scarabeus 12/03/01 13:14:47
2
3 Modified: libreoffice-9999-r2.ebuild
4 libreoffice-3.5.9999.ebuild ChangeLog
5 Log:
6 Try to make pyuno work with system python. (works here). Wrt bug#379227.
7
8 (Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.32 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.32&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.32&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.31&r2=1.32
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.31
21 retrieving revision 1.32
22 diff -u -r1.31 -r1.32
23 --- libreoffice-9999-r2.ebuild 29 Feb 2012 15:21:02 -0000 1.31
24 +++ libreoffice-9999-r2.ebuild 1 Mar 2012 13:14:47 -0000 1.32
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2012 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.31 2012/02/29 15:21:02 scarabeus Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.32 2012/03/01 13:14:47 scarabeus Exp $
30
31 EAPI=4
32
33 @@ -194,6 +194,8 @@
34 "
35
36 PATCHES=(
37 + # this can't be upstreamed :(
38 + "${FILESDIR}/${PN}-system-pyuno.patch"
39 )
40
41 REQUIRED_USE="
42 @@ -300,6 +302,13 @@
43 eautoreconf
44 # hack in the autogen.sh
45 touch autogen.lastrun
46 +
47 + # system pyuno mess
48 + sed \
49 + -e "s:%eprefix%:${EPREFIX}:g" \
50 + -e "s:%libdir%:$(get_libdir):g" \
51 + -i pyuno/source/module/uno.py \
52 + -i scripting/source/pyprov/officehelper.py || die
53 }
54
55 src_configure() {
56
57
58
59 1.18 app-office/libreoffice/libreoffice-3.5.9999.ebuild
60
61 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.18&view=markup
62 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.18&content-type=text/plain
63 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?r1=1.17&r2=1.18
64
65 Index: libreoffice-3.5.9999.ebuild
66 ===================================================================
67 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v
68 retrieving revision 1.17
69 retrieving revision 1.18
70 diff -u -r1.17 -r1.18
71 --- libreoffice-3.5.9999.ebuild 29 Feb 2012 15:21:02 -0000 1.17
72 +++ libreoffice-3.5.9999.ebuild 1 Mar 2012 13:14:47 -0000 1.18
73 @@ -1,6 +1,6 @@
74 # Copyright 1999-2012 Gentoo Foundation
75 # Distributed under the terms of the GNU General Public License v2
76 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.17 2012/02/29 15:21:02 scarabeus Exp $
77 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.18 2012/03/01 13:14:47 scarabeus Exp $
78
79 EAPI=4
80
81 @@ -155,8 +155,8 @@
82 "
83
84 # FIXME: cppunit should be moved to test conditional
85 -# after everything upstream is under gbuild
86 -# as dmake execute tests right away
87 +# after everything upstream is under gbuild
88 +# as dmake execute tests right away
89 DEPEND="${COMMON_DEPEND}
90 >=dev-libs/boost-1.46
91 >=dev-libs/libxml2-2.7.8
92 @@ -191,6 +191,8 @@
93 "
94
95 PATCHES=(
96 + # this can't be upstreamed :(
97 + "${FILESDIR}/${PN}-system-pyuno.patch"
98 )
99
100 REQUIRED_USE="
101 @@ -220,7 +222,7 @@
102 pgslot=$(postgresql-config show)
103 if [[ ${pgslot//.} < 90 ]] ; then
104 eerror "PostgreSQL slot must be set to 9.0 or higher."
105 - eerror " postgresql-config set 9.0"
106 + eerror " postgresql-config set 9.0"
107 die "PostgreSQL slot is not set to 9.0 or higher."
108 fi
109 fi
110 @@ -297,6 +299,13 @@
111 eautoreconf
112 # hack in the autogen.sh
113 touch autogen.lastrun
114 + # system pyuno mess
115 + sed \
116 + -e "s:%eprefix%:${EPREFIX}:g" \
117 + -e "s:%libdir%:$(get_libdir):g" \
118 + -i pyuno/source/module/uno.py \
119 + -i scripting/source/pyprov/officehelper.py || die
120 +
121 }
122
123 src_configure() {
124
125
126
127 1.248 app-office/libreoffice/ChangeLog
128
129 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.248&view=markup
130 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.248&content-type=text/plain
131 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.247&r2=1.248
132
133 Index: ChangeLog
134 ===================================================================
135 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
136 retrieving revision 1.247
137 retrieving revision 1.248
138 diff -u -r1.247 -r1.248
139 --- ChangeLog 29 Feb 2012 15:21:02 -0000 1.247
140 +++ ChangeLog 1 Mar 2012 13:14:47 -0000 1.248
141 @@ -1,6 +1,11 @@
142 # ChangeLog for app-office/libreoffice
143 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
144 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.247 2012/02/29 15:21:02 scarabeus Exp $
145 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.248 2012/03/01 13:14:47 scarabeus Exp $
146 +
147 + 01 Mar 2012; Tomáš Chvátal <scarabeus@g.o>
148 + +files/libreoffice-system-pyuno.patch, libreoffice-3.5.9999.ebuild,
149 + libreoffice-9999-r2.ebuild:
150 + Try to make pyuno work with system python. (works here). Wrt bug#379227.
151
152 29 Feb 2012; Tomáš Chvátal <scarabeus@g.o>
153 libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.5.2.ebuild,
Report Message
Find on MARC Find on Google Groups