Gentoo Archives: gentoo-commits

From: "Andreas Proschofsky (suka)" <suka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: ChangeLog libreoffice-3.3.0.ebuild
Date: Tue, 25 Jan 2011 22:22:18
Message-Id: 20110125222207.6432420054@flycatcher.gentoo.org
1 suka 11/01/25 22:22:07
2
3 Modified: ChangeLog libreoffice-3.3.0.ebuild
4 Log:
5 Fix jpeg-dep and some ebuild cleanups
6
7 (Portage version: 2.1.9.35/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.7 app-office/libreoffice/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.7&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.7&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.6&r2=1.7
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
19 retrieving revision 1.6
20 retrieving revision 1.7
21 diff -u -r1.6 -r1.7
22 --- ChangeLog 25 Jan 2011 12:35:53 -0000 1.6
23 +++ ChangeLog 25 Jan 2011 22:22:07 -0000 1.7
24 @@ -1,6 +1,9 @@
25 # ChangeLog for app-office/libreoffice
26 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.6 2011/01/25 12:35:53 suka Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.7 2011/01/25 22:22:07 suka Exp $
29 +
30 + 25 Jan 2011; Andreas Proschofsky <suka@g.o> libreoffice-3.3.0.ebuild:
31 + Fix jpeg-dep and some ebuild cleanups
32
33 25 Jan 2011; Andreas Proschofsky <suka@g.o> libreoffice-3.3.0.ebuild:
34 Ooops, another little fix for bash-completion
35
36
37
38 1.4 app-office/libreoffice/libreoffice-3.3.0.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.4&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.4&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?r1=1.3&r2=1.4
43
44 Index: libreoffice-3.3.0.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v
47 retrieving revision 1.3
48 retrieving revision 1.4
49 diff -u -r1.3 -r1.4
50 --- libreoffice-3.3.0.ebuild 25 Jan 2011 12:35:53 -0000 1.3
51 +++ libreoffice-3.3.0.ebuild 25 Jan 2011 22:22:07 -0000 1.4
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2011 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.3 2011/01/25 12:35:53 suka Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.4 2011/01/25 22:22:07 suka Exp $
57
58 EAPI="3"
59
60 @@ -152,7 +152,7 @@
61 >=media-libs/fontconfig-2.3.0
62 cups? ( net-print/cups )
63 dev-libs/redland[ssl]
64 - media-libs/jpeg
65 + virtual/jpeg
66 media-libs/libpng
67 app-arch/zip
68 app-arch/unzip
69 @@ -414,18 +414,18 @@
70 make DESTDIR="${D}" install || die "Installation failed!"
71
72 # Fix the permissions for security reasons
73 - chown -RP root:0 "${D}"
74 + chown -RP root:0 "${ED}"
75
76 # record java libraries
77 if use java; then
78 - java-pkg_regjar "${D}"/usr/$(get_libdir)/${PN}/${BASIS}/program/classes/*.jar
79 - java-pkg_regjar "${D}"/usr/$(get_libdir)/${PN}/ure/share/java/*.jar
80 + java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}/${BASIS}/program/classes/*.jar
81 + java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}/ure/share/java/*.jar
82 fi
83
84 # Upstream places the bash-completion module in /etc. Gentoo places them in
85 # /usr/share/bash-completion. bug 226061
86 - dobashcompletion "${D}"/etc/bash_completion.d/libreoffice.sh libreoffice
87 - rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed"
88 + dobashcompletion "${ED}"/etc/bash_completion.d/libreoffice.sh libreoffice
89 + rm -rf "${ED}"/etc/bash_completion.d/ || die "rm failed"
90
91 }