* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-3.5.9999.ebuild libreoffice-3.4.3.2-r1.ebuild libreoffice-3.5.0.3.ebuild libreoffice-3.4.5.2.ebuild ChangeLog
@ 2012-02-14 19:29 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-02-14 19:29 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/02/14 19:29:27
Modified: libreoffice-9999-r2.ebuild
libreoffice-3.5.9999.ebuild
libreoffice-3.4.3.2-r1.ebuild
libreoffice-3.5.0.3.ebuild
libreoffice-3.4.5.2.ebuild ChangeLog
Log:
Depend on cairo[X]. Wrt bug #401807.
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
Revision Changes Path
1.22 app-office/libreoffice/libreoffice-9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.21&r2=1.22
Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libreoffice-9999-r2.ebuild 14 Feb 2012 17:46:17 -0000 1.21
+++ libreoffice-9999-r2.ebuild 14 Feb 2012 19:29:27 -0000 1.22
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.21 2012/02/14 17:46:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.22 2012/02/14 19:29:27 scarabeus Exp $
EAPI=4
@@ -108,7 +108,7 @@
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
- >=x11-libs/cairo-1.10.0
+ >=x11-libs/cairo-1.10.0[X]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
1.9 app-office/libreoffice/libreoffice-3.5.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?r1=1.8&r2=1.9
Index: libreoffice-3.5.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libreoffice-3.5.9999.ebuild 14 Feb 2012 17:46:17 -0000 1.8
+++ libreoffice-3.5.9999.ebuild 14 Feb 2012 19:29:27 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.8 2012/02/14 17:46:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.9 2012/02/14 19:29:27 scarabeus Exp $
EAPI=4
@@ -107,7 +107,7 @@
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
- >=x11-libs/cairo-1.10.0
+ >=x11-libs/cairo-1.10.0[X]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
1.19 app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild?r1=1.18&r2=1.19
Index: libreoffice-3.4.3.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libreoffice-3.4.3.2-r1.ebuild 18 Dec 2011 20:52:15 -0000 1.18
+++ libreoffice-3.4.3.2-r1.ebuild 14 Feb 2012 19:29:27 -0000 1.19
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.18 2011/12/18 20:52:15 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.19 2012/02/14 19:29:27 scarabeus Exp $
EAPI=3
@@ -138,7 +138,7 @@
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
- >=x11-libs/cairo-1.10.0
+ >=x11-libs/cairo-1.10.0[X]
x11-libs/libXaw
x11-libs/libXinerama
x11-libs/libXrandr
1.3 app-office/libreoffice/libreoffice-3.5.0.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.3.ebuild?r1=1.2&r2=1.3
Index: libreoffice-3.5.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libreoffice-3.5.0.3.ebuild 14 Feb 2012 17:46:17 -0000 1.2
+++ libreoffice-3.5.0.3.ebuild 14 Feb 2012 19:29:27 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.3.ebuild,v 1.2 2012/02/14 17:46:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.3.ebuild,v 1.3 2012/02/14 19:29:27 scarabeus Exp $
EAPI=4
@@ -107,7 +107,7 @@
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
- >=x11-libs/cairo-1.10.0
+ >=x11-libs/cairo-1.10.0[X]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
1.5 app-office/libreoffice/libreoffice-3.4.5.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild?r1=1.4&r2=1.5
Index: libreoffice-3.4.5.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libreoffice-3.4.5.2.ebuild 16 Jan 2012 11:52:51 -0000 1.4
+++ libreoffice-3.4.5.2.ebuild 14 Feb 2012 19:29:27 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.4 2012/01/16 11:52:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.5 2012/02/14 19:29:27 scarabeus Exp $
EAPI=4
@@ -98,7 +98,7 @@
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
- >=x11-libs/cairo-1.10.0
+ >=x11-libs/cairo-1.10.0[X]
x11-libs/libXaw
x11-libs/libXinerama
x11-libs/libXrandr
1.234 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.234&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.234&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.233&r2=1.234
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- ChangeLog 14 Feb 2012 17:46:17 -0000 1.233
+++ ChangeLog 14 Feb 2012 19:29:27 -0000 1.234
@@ -1,6 +1,12 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.233 2012/02/14 17:46:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.234 2012/02/14 19:29:27 scarabeus Exp $
+
+ 14 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.5.2.ebuild,
+ libreoffice-3.5.0.3.ebuild, libreoffice-3.5.9999.ebuild,
+ libreoffice-9999-r2.ebuild:
+ Depend on cairo[X]. Wrt bug #401807.
14 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-3.5.0.3.ebuild, libreoffice-3.5.9999.ebuild,
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-3.5.9999.ebuild libreoffice-3.4.3.2-r1.ebuild libreoffice-3.5.0.3.ebuild libreoffice-3.4.5.2.ebuild ChangeLog
@ 2012-02-27 21:29 Andreas HAttel (dilfridge)
0 siblings, 0 replies; 2+ messages in thread
From: Andreas HAttel (dilfridge) @ 2012-02-27 21:29 UTC (permalink / raw
To: gentoo-commits
dilfridge 12/02/27 21:29:21
Modified: libreoffice-9999-r2.ebuild
libreoffice-3.5.9999.ebuild
libreoffice-3.4.3.2-r1.ebuild
libreoffice-3.5.0.3.ebuild
libreoffice-3.4.5.2.ebuild ChangeLog
Log:
Introduce use-flag cups to allow for no-printing installation, bug 402987
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Revision Changes Path
1.27 app-office/libreoffice/libreoffice-9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.26&r2=1.27
Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libreoffice-9999-r2.ebuild 27 Feb 2012 21:08:53 -0000 1.26
+++ libreoffice-9999-r2.ebuild 27 Feb 2012 21:29:20 -0000 1.27
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.26 2012/02/27 21:08:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.27 2012/02/27 21:29:20 dilfridge Exp $
EAPI=4
@@ -69,7 +69,7 @@
unset EXT_URI
unset ADDONS_SRC
-IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3
+IUSE="binfilter +branding +cups dbus debug eds gnome +graphite gstreamer +gtk gtk3
jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
+webdav +xmlsec"
LICENSE="LGPL-3"
@@ -104,7 +104,6 @@
>=media-libs/libpng-1.4
media-libs/libcdr
media-libs/libvisio
- net-print/cups
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
@@ -149,6 +148,7 @@
!app-office/openoffice
media-fonts/libertine-ttf
media-fonts/liberation-fonts
+ cups? ( net-print/cups )
java? ( >=virtual/jre-1.6 )
"
@@ -172,6 +172,7 @@
media-libs/sampleicc
>=net-misc/curl-7.21.4
net-misc/npapi-sdk
+ net-print/cups
>=sys-apps/findutils-4.4.2
sys-devel/bison
sys-apps/coreutils
@@ -496,6 +497,10 @@
kde4-base_pkg_postinst
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+
+ if ! use cups ; then
+ ewarn 'You will need net-print/cups to be able to print with libreoffice.'
+ fi
}
pkg_postrm() {
1.14 app-office/libreoffice/libreoffice-3.5.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?r1=1.13&r2=1.14
Index: libreoffice-3.5.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libreoffice-3.5.9999.ebuild 27 Feb 2012 21:08:53 -0000 1.13
+++ libreoffice-3.5.9999.ebuild 27 Feb 2012 21:29:20 -0000 1.14
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.13 2012/02/27 21:08:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.14 2012/02/27 21:29:20 dilfridge Exp $
EAPI=4
@@ -69,7 +69,7 @@
unset EXT_URI
unset ADDONS_SRC
-IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3
+IUSE="binfilter +branding +cups dbus debug eds gnome +graphite gstreamer +gtk gtk3
jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
+webdav +xmlsec"
LICENSE="LGPL-3"
@@ -103,7 +103,6 @@
media-libs/freetype:2
>=media-libs/libpng-1.4
media-libs/libvisio
- net-print/cups
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
@@ -145,6 +144,7 @@
!app-office/openoffice
media-fonts/libertine-ttf
media-fonts/liberation-fonts
+ cups? ( net-print/cups )
java? ( >=virtual/jre-1.6 )
"
@@ -168,6 +168,7 @@
media-libs/sampleicc
>=net-misc/curl-7.21.4
net-misc/npapi-sdk
+ net-print/cups
>=sys-apps/findutils-4.4.2
sys-devel/bison
sys-apps/coreutils
@@ -493,6 +494,10 @@
kde4-base_pkg_postinst
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+
+ if ! use cups ; then
+ ewarn 'You will need net-print/cups to be able to print with libreoffice.'
+ fi
}
pkg_postrm() {
1.20 app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild?r1=1.19&r2=1.20
Index: libreoffice-3.4.3.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libreoffice-3.4.3.2-r1.ebuild 14 Feb 2012 19:29:27 -0000 1.19
+++ libreoffice-3.4.3.2-r1.ebuild 27 Feb 2012 21:29:20 -0000 1.20
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.19 2012/02/14 19:29:27 scarabeus Exp $
+# $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 $
EAPI=3
@@ -100,7 +100,7 @@
unset EXT_URI
unset ADDONS_SRC
-IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
+IUSE="binfilter +branding +cups custom-cflags dbus debug eds gnome graphite
gstreamer gtk kde ldap mysql nsplugin odk opengl python templates test +vba
webdav pdfimport"
LICENSE="LGPL-3"
@@ -134,7 +134,6 @@
>=media-libs/fontconfig-2.8.0
>=media-libs/vigra-1.7
>=media-libs/libpng-1.4
- net-print/cups
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
@@ -177,6 +176,7 @@
!app-office/libreoffice-bin
!app-office/openoffice-bin
!app-office/openoffice
+ cups? ( net-print/cups )
java? ( >=virtual/jre-1.6 )
"
@@ -194,6 +194,7 @@
dev-util/mdds
>=dev-util/pkgconfig-0.26
>=net-misc/curl-7.21.4
+ net-print/cups
>=sys-apps/findutils-4.4.2
sys-devel/bison
sys-apps/coreutils
@@ -557,6 +558,10 @@
kde4-base_pkg_postinst
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+
+ if ! use cups ; then
+ ewarn 'You will need net-print/cups to be able to print with libreoffice.'
+ fi
}
pkg_postrm() {
1.8 app-office/libreoffice/libreoffice-3.5.0.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.3.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.3.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.3.ebuild?r1=1.7&r2=1.8
Index: libreoffice-3.5.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.3.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libreoffice-3.5.0.3.ebuild 27 Feb 2012 21:08:53 -0000 1.7
+++ libreoffice-3.5.0.3.ebuild 27 Feb 2012 21:29:20 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.3.ebuild,v 1.7 2012/02/27 21:08:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.3.ebuild,v 1.8 2012/02/27 21:29:20 dilfridge Exp $
EAPI=4
@@ -69,7 +69,7 @@
unset EXT_URI
unset ADDONS_SRC
-IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3
+IUSE="binfilter +branding +cups dbus debug eds gnome +graphite gstreamer +gtk gtk3
jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
+webdav +xmlsec"
LICENSE="LGPL-3"
@@ -103,7 +103,6 @@
media-libs/freetype:2
>=media-libs/libpng-1.4
media-libs/libvisio
- net-print/cups
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
@@ -145,6 +144,7 @@
!app-office/openoffice
media-fonts/libertine-ttf
media-fonts/liberation-fonts
+ cups? ( net-print/cups )
java? ( >=virtual/jre-1.6 )
"
@@ -168,6 +168,7 @@
media-libs/sampleicc
>=net-misc/curl-7.21.4
net-misc/npapi-sdk
+ net-print/cups
>=sys-apps/findutils-4.4.2
sys-devel/bison
sys-apps/coreutils
@@ -492,6 +493,10 @@
kde4-base_pkg_postinst
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+
+ if ! use cups ; then
+ ewarn 'You will need net-print/cups to be able to print with libreoffice.'
+ fi
}
pkg_postrm() {
1.6 app-office/libreoffice/libreoffice-3.4.5.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild?r1=1.5&r2=1.6
Index: libreoffice-3.4.5.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libreoffice-3.4.5.2.ebuild 14 Feb 2012 19:29:27 -0000 1.5
+++ libreoffice-3.4.5.2.ebuild 27 Feb 2012 21:29:20 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.5 2012/02/14 19:29:27 scarabeus Exp $
+# $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 $
EAPI=4
@@ -67,7 +67,7 @@
unset EXT_URI
unset ADDONS_SRC
-IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
+IUSE="binfilter +branding +cups custom-cflags dbus debug eds gnome graphite
gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python
test +vba webdav"
LICENSE="LGPL-3"
@@ -94,7 +94,6 @@
>=media-libs/fontconfig-2.8.0
>=media-libs/vigra-1.7
>=media-libs/libpng-1.4
- net-print/cups
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
@@ -137,6 +136,7 @@
!app-office/libreoffice-bin
!app-office/openoffice-bin
!app-office/openoffice
+ cups? ( net-print/cups )
java? ( >=virtual/jre-1.6 )
"
@@ -154,6 +154,7 @@
dev-util/mdds
>=dev-util/pkgconfig-0.26
>=net-misc/curl-7.21.4
+ net-print/cups
>=sys-apps/findutils-4.4.2
sys-devel/bison
sys-apps/coreutils
@@ -507,6 +508,10 @@
kde4-base_pkg_postinst
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+
+ if ! use cups ; then
+ ewarn 'You will need net-print/cups to be able to print with libreoffice.'
+ fi
}
pkg_postrm() {
1.242 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.242&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.242&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.241&r2=1.242
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- ChangeLog 27 Feb 2012 21:08:53 -0000 1.241
+++ ChangeLog 27 Feb 2012 21:29:21 -0000 1.242
@@ -1,6 +1,12 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.241 2012/02/27 21:08:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.242 2012/02/27 21:29:21 dilfridge Exp $
+
+ 27 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.5.2.ebuild,
+ libreoffice-3.5.0.3.ebuild, libreoffice-3.5.9999.ebuild,
+ libreoffice-9999-r2.ebuild:
+ Introduce use-flag cups to allow for no-printing installation, bug 402987
27 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org>
libreoffice-3.5.0.3.ebuild, libreoffice-3.5.9999.ebuild,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-27 21:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-27 21:29 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-3.5.9999.ebuild libreoffice-3.4.3.2-r1.ebuild libreoffice-3.5.0.3.ebuild libreoffice-3.4.5.2.ebuild ChangeLog Andreas HAttel (dilfridge)
-- strict thread matches above, loose matches on Subject: below --
2012-02-14 19:29 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox