| 1 |
suka 11/02/05 11:07:56 |
| 2 |
|
| 3 |
Modified: ChangeLog libreoffice-bin-3.3.0.ebuild |
| 4 |
Log: |
| 5 |
Some more prefix fixes |
| 6 |
|
| 7 |
(Portage version: 2.1.9.35/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.7 app-office/libreoffice-bin/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/ChangeLog?rev=1.7&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/ChangeLog?rev=1.7&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/ChangeLog?r1=1.6&r2=1.7 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v |
| 19 |
retrieving revision 1.6 |
| 20 |
retrieving revision 1.7 |
| 21 |
diff -u -r1.6 -r1.7 |
| 22 |
--- ChangeLog 5 Feb 2011 09:11:16 -0000 1.6 |
| 23 |
+++ ChangeLog 5 Feb 2011 11:07:55 -0000 1.7 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for app-office/libreoffice-bin |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.6 2011/02/05 09:11:16 suka Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.7 2011/02/05 11:07:55 suka Exp $ |
| 29 |
+ |
| 30 |
+ 05 Feb 2011; Andreas Proschofsky <suka@g.o> files/50-libreoffice-bin, |
| 31 |
+ libreoffice-bin-3.3.0.ebuild, files/wrapper.in: |
| 32 |
+ Some more prefix fixes |
| 33 |
|
| 34 |
05 Feb 2011; Andreas Proschofsky <suka@g.o> |
| 35 |
libreoffice-bin-3.3.0.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.5 app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild?rev=1.5&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild?rev=1.5&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild?r1=1.4&r2=1.5 |
| 44 |
|
| 45 |
Index: libreoffice-bin-3.3.0.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild,v |
| 48 |
retrieving revision 1.4 |
| 49 |
retrieving revision 1.5 |
| 50 |
diff -u -r1.4 -r1.5 |
| 51 |
--- libreoffice-bin-3.3.0.ebuild 5 Feb 2011 09:11:16 -0000 1.4 |
| 52 |
+++ libreoffice-bin-3.3.0.ebuild 5 Feb 2011 11:07:55 -0000 1.5 |
| 53 |
@@ -1,10 +1,10 @@ |
| 54 |
# Copyright 1999-2011 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild,v 1.4 2011/02/05 09:11:16 suka Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild,v 1.5 2011/02/05 11:07:55 suka Exp $ |
| 58 |
|
| 59 |
EAPI="3" |
| 60 |
|
| 61 |
-inherit eutils fdo-mime gnome2-utils pax-utils rpm multilib |
| 62 |
+inherit eutils fdo-mime gnome2-utils pax-utils prefix rpm multilib |
| 63 |
|
| 64 |
IUSE="gnome java kde offlinehelp" |
| 65 |
|
| 66 |
@@ -47,13 +47,13 @@ |
| 67 |
|
| 68 |
LICENSE="LGPL-3" |
| 69 |
SLOT="0" |
| 70 |
-KEYWORDS="~amd64 ~x86" |
| 71 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 72 |
|
| 73 |
RDEPEND="!app-office/libreoffice |
| 74 |
!app-office/openoffice |
| 75 |
!app-office/openoffice-bin |
| 76 |
x11-libs/libXaw |
| 77 |
- sys-libs/glibc |
| 78 |
+ !prefix? ( sys-libs/glibc ) |
| 79 |
>=dev-lang/perl-5.0 |
| 80 |
app-arch/zip |
| 81 |
app-arch/unzip |
| 82 |
@@ -83,6 +83,9 @@ |
| 83 |
|
| 84 |
unpack ${A} |
| 85 |
|
| 86 |
+ cp "${FILESDIR}"/{50-libreoffice-bin,wrapper.in} "${T}" |
| 87 |
+ eprefixify "${T}"/{50-libreoffice-bin,wrapper.in} |
| 88 |
+ |
| 89 |
for i in base binfilter calc core01 core02 core03 core04 core05 core06 \ |
| 90 |
core07 draw graphicfilter images impress math ogltrans ooofonts \ |
| 91 |
ooolinguistic pyuno testtool writer xsltfilter ; do |
| 92 |
@@ -161,7 +164,7 @@ |
| 93 |
doins -r "${WORKDIR}"/usr/share/mime |
| 94 |
|
| 95 |
# Install wrapper script |
| 96 |
- newbin "${FILESDIR}/wrapper.in" libreoffice |
| 97 |
+ newbin "${T}/wrapper.in" libreoffice |
| 98 |
sed -i -e s/LIBDIR/$(get_libdir)/g "${ED}/usr/bin/libreoffice" || die |
| 99 |
|
| 100 |
# Component symlinks |
| 101 |
@@ -180,7 +183,7 @@ |
| 102 |
use !java && rm -f "${ED}${INSTDIR}/ure/bin/javaldx" |
| 103 |
|
| 104 |
# prevent revdep-rebuild from attempting to rebuild all the time |
| 105 |
- insinto /etc/revdep-rebuild && doins "${FILESDIR}/50-libreoffice-bin" |
| 106 |
+ insinto /etc/revdep-rebuild && doins "${T}/50-libreoffice-bin" |
| 107 |
|
| 108 |
} |
Archives