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-bin: libreoffice-bin-3.4.5.2-r1.ebuild ChangeLog
Date: Mon, 27 Feb 2012 21:34:18
Message-Id: 20120227213407.65BF62004B@flycatcher.gentoo.org
1 dilfridge 12/02/27 21:34:07
2
3 Modified: libreoffice-bin-3.4.5.2-r1.ebuild ChangeLog
4 Log:
5 Introduce use-flag cups to allow for no-printing installation, bug 402987
6
7 (Portage version: 2.1.10.49/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.3 app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild?r1=1.2&r2=1.3
15
16 Index: libreoffice-bin-3.4.5.2-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- libreoffice-bin-3.4.5.2-r1.ebuild 24 Feb 2012 21:38:41 -0000 1.2
23 +++ libreoffice-bin-3.4.5.2-r1.ebuild 27 Feb 2012 21:34:07 -0000 1.3
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2012 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild,v 1.2 2012/02/24 21:38:41 dilfridge Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild,v 1.3 2012/02/27 21:34:07 dilfridge Exp $
29
30 EAPI=4
31
32 @@ -48,7 +48,7 @@
33 x86? ( ${SRC_URI_X86} )
34 "
35
36 -IUSE="gnome java kde"
37 +IUSE="+cups gnome java kde"
38 LICENSE="LGPL-3"
39 SLOT="0"
40 KEYWORDS="-* ~amd64 ~x86"
41 @@ -72,7 +72,6 @@
42 media-libs/freetype:2
43 >=media-libs/fontconfig-2.8.0
44 >=media-libs/libpng-1.5
45 - net-print/cups
46 sci-mathematics/lpsolve
47 >=sys-libs/db-4.8
48 virtual/jpeg
49 @@ -104,6 +103,7 @@
50 !app-office/libreoffice
51 !app-office/openoffice-bin
52 !app-office/openoffice
53 + cups? ( net-print/cups )
54 java? ( >=virtual/jre-1.6 )
55 "
56
57 @@ -111,7 +111,8 @@
58 =app-office/libreoffice-l10n-$(get_version_component_range 1-3)*
59 "
60
61 -DEPEND="${COMMON_DEPEND}"
62 +# after all it's a binary package
63 +DEPEND=""
64
65 # only one flavor at a time
66 REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde )"
67 @@ -151,7 +152,6 @@
68
69 # prevent revdep-rebuild from attempting to rebuild all the time
70 insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
71 -
72 }
73
74 pkg_preinst() {
75 @@ -163,6 +163,10 @@
76 kde4-base_pkg_postinst
77
78 pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
79 +
80 + if ! use cups; then
81 + ewarn 'You will need net-print/cups in order to be able to print with libreoffice.'
82 + fi
83 }
84
85 pkg_postrm() {
86
87
88
89 1.56 app-office/libreoffice-bin/ChangeLog
90
91 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/ChangeLog?rev=1.56&view=markup
92 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/ChangeLog?rev=1.56&content-type=text/plain
93 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/ChangeLog?r1=1.55&r2=1.56
94
95 Index: ChangeLog
96 ===================================================================
97 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v
98 retrieving revision 1.55
99 retrieving revision 1.56
100 diff -u -r1.55 -r1.56
101 --- ChangeLog 25 Feb 2012 15:21:45 -0000 1.55
102 +++ ChangeLog 27 Feb 2012 21:34:07 -0000 1.56
103 @@ -1,6 +1,10 @@
104 # ChangeLog for app-office/libreoffice-bin
105 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
106 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.55 2012/02/25 15:21:45 dilfridge Exp $
107 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.56 2012/02/27 21:34:07 dilfridge Exp $
108 +
109 + 27 Feb 2012; Andreas K. Huettel <dilfridge@g.o>
110 + libreoffice-bin-3.4.5.2-r1.ebuild:
111 + Introduce use-flag cups to allow for no-printing installation, bug 402987
112
113 25 Feb 2012; Andreas K. Huettel <dilfridge@g.o>
114 -libreoffice-bin-3.4.5.2.ebuild: