Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.5.2.ebuild ChangeLog libreoffice-3.4.3.2-r1.ebuild
Date: Mon, 27 Feb 2012 21:56:42
Message-Id: 20120227215630.9C0D52004B@flycatcher.gentoo.org
1 dilfridge 12/02/27 21:56:30
2
3 Modified: libreoffice-3.4.5.2.ebuild ChangeLog
4 libreoffice-3.4.3.2-r1.ebuild
5 Log:
6 Revert last commit on old versions to avoid unnecessary rebuilds
7
8 (Portage version: 2.1.10.49/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.7 app-office/libreoffice/libreoffice-3.4.5.2.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild?rev=1.7&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild?rev=1.7&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild?r1=1.6&r2=1.7
16
17 Index: libreoffice-3.4.5.2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v
20 retrieving revision 1.6
21 retrieving revision 1.7
22 diff -u -r1.6 -r1.7
23 --- libreoffice-3.4.5.2.ebuild 27 Feb 2012 21:29:20 -0000 1.6
24 +++ libreoffice-3.4.5.2.ebuild 27 Feb 2012 21:56:30 -0000 1.7
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-3.4.5.2.ebuild,v 1.6 2012/02/27 21:29:20 dilfridge Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.7 2012/02/27 21:56:30 dilfridge Exp $
30
31 EAPI=4
32
33 @@ -67,7 +67,7 @@
34 unset EXT_URI
35 unset ADDONS_SRC
36
37 -IUSE="binfilter +branding +cups custom-cflags dbus debug eds gnome graphite
38 +IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
39 gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python
40 test +vba webdav"
41 LICENSE="LGPL-3"
42 @@ -94,6 +94,7 @@
43 >=media-libs/fontconfig-2.8.0
44 >=media-libs/vigra-1.7
45 >=media-libs/libpng-1.4
46 + net-print/cups
47 sci-mathematics/lpsolve
48 >=sys-libs/db-4.8
49 virtual/jpeg
50 @@ -136,7 +137,6 @@
51 !app-office/libreoffice-bin
52 !app-office/openoffice-bin
53 !app-office/openoffice
54 - cups? ( net-print/cups )
55 java? ( >=virtual/jre-1.6 )
56 "
57
58 @@ -154,7 +154,6 @@
59 dev-util/mdds
60 >=dev-util/pkgconfig-0.26
61 >=net-misc/curl-7.21.4
62 - net-print/cups
63 >=sys-apps/findutils-4.4.2
64 sys-devel/bison
65 sys-apps/coreutils
66 @@ -508,10 +507,6 @@
67 kde4-base_pkg_postinst
68
69 pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
70 -
71 - if ! use cups ; then
72 - ewarn 'You will need net-print/cups to be able to print with libreoffice.'
73 - fi
74 }
75
76 pkg_postrm() {
77
78
79
80 1.244 app-office/libreoffice/ChangeLog
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.244&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.244&content-type=text/plain
84 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.243&r2=1.244
85
86 Index: ChangeLog
87 ===================================================================
88 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
89 retrieving revision 1.243
90 retrieving revision 1.244
91 diff -u -r1.243 -r1.244
92 --- ChangeLog 27 Feb 2012 21:44:55 -0000 1.243
93 +++ ChangeLog 27 Feb 2012 21:56:30 -0000 1.244
94 @@ -1,6 +1,10 @@
95 # ChangeLog for app-office/libreoffice
96 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
97 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.243 2012/02/27 21:44:55 scarabeus Exp $
98 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.244 2012/02/27 21:56:30 dilfridge Exp $
99 +
100 + 27 Feb 2012; Andreas K. Huettel <dilfridge@g.o>
101 + libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.5.2.ebuild:
102 + Revert last commit on old versions to avoid unnecessary rebuilds
103
104 27 Feb 2012; Tomáš Chvátal <scarabeus@g.o> libreoffice-9999-r2.ebuild:
105 Reduce if condition to oneliner. Less code++
106
107
108
109 1.21 app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
110
111 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild?rev=1.21&view=markup
112 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild?rev=1.21&content-type=text/plain
113 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild?r1=1.20&r2=1.21
114
115 Index: libreoffice-3.4.3.2-r1.ebuild
116 ===================================================================
117 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v
118 retrieving revision 1.20
119 retrieving revision 1.21
120 diff -u -r1.20 -r1.21
121 --- libreoffice-3.4.3.2-r1.ebuild 27 Feb 2012 21:29:20 -0000 1.20
122 +++ libreoffice-3.4.3.2-r1.ebuild 27 Feb 2012 21:56:30 -0000 1.21
123 @@ -1,6 +1,6 @@
124 # Copyright 1999-2012 Gentoo Foundation
125 # Distributed under the terms of the GNU General Public License v2
126 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.20 2012/02/27 21:29:20 dilfridge Exp $
127 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.21 2012/02/27 21:56:30 dilfridge Exp $
128
129 EAPI=3
130
131 @@ -100,7 +100,7 @@
132 unset EXT_URI
133 unset ADDONS_SRC
134
135 -IUSE="binfilter +branding +cups custom-cflags dbus debug eds gnome graphite
136 +IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
137 gstreamer gtk kde ldap mysql nsplugin odk opengl python templates test +vba
138 webdav pdfimport"
139 LICENSE="LGPL-3"
140 @@ -134,6 +134,7 @@
141 >=media-libs/fontconfig-2.8.0
142 >=media-libs/vigra-1.7
143 >=media-libs/libpng-1.4
144 + net-print/cups
145 sci-mathematics/lpsolve
146 >=sys-libs/db-4.8
147 virtual/jpeg
148 @@ -176,7 +177,6 @@
149 !app-office/libreoffice-bin
150 !app-office/openoffice-bin
151 !app-office/openoffice
152 - cups? ( net-print/cups )
153 java? ( >=virtual/jre-1.6 )
154 "
155
156 @@ -194,7 +194,6 @@
157 dev-util/mdds
158 >=dev-util/pkgconfig-0.26
159 >=net-misc/curl-7.21.4
160 - net-print/cups
161 >=sys-apps/findutils-4.4.2
162 sys-devel/bison
163 sys-apps/coreutils
164 @@ -558,10 +557,6 @@
165 kde4-base_pkg_postinst
166
167 pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
168 -
169 - if ! use cups ; then
170 - ewarn 'You will need net-print/cups to be able to print with libreoffice.'
171 - fi
172 }
173
174 pkg_postrm() {