| 1 |
scarabeus 11/07/27 23:37:47 |
| 2 |
|
| 3 |
Modified: ChangeLog libreoffice-3.4.2.3.ebuild |
| 4 |
Log: |
| 5 |
When building nsplugin symlink it to system location. Fixes bug #375299. Also put branding only into one location. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.68 app-office/libreoffice/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.68&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.68&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.67&r2=1.68 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v |
| 19 |
retrieving revision 1.67 |
| 20 |
retrieving revision 1.68 |
| 21 |
diff -u -r1.67 -r1.68 |
| 22 |
--- ChangeLog 27 Jul 2011 20:50:35 -0000 1.67 |
| 23 |
+++ ChangeLog 27 Jul 2011 23:37:47 -0000 1.68 |
| 24 |
@@ -1,6 +1,11 @@ |
| 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.67 2011/07/27 20:50:35 mattst88 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.68 2011/07/27 23:37:47 scarabeus Exp $ |
| 29 |
+ |
| 30 |
+ 27 Jul 2011; Tomáš Chvátal <scarabeus@g.o> |
| 31 |
+ libreoffice-3.4.2.3.ebuild: |
| 32 |
+ When building nsplugin symlink it to system location. Fixes bug #375299. Also |
| 33 |
+ put branding only into one location. |
| 34 |
|
| 35 |
27 Jul 2011; Matt Turner <mattst88@g.o> libreoffice-3.4.2.3.ebuild: |
| 36 |
Update branding version. |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.5 app-office/libreoffice/libreoffice-3.4.2.3.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?rev=1.5&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?rev=1.5&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?r1=1.4&r2=1.5 |
| 45 |
|
| 46 |
Index: libreoffice-3.4.2.3.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v |
| 49 |
retrieving revision 1.4 |
| 50 |
retrieving revision 1.5 |
| 51 |
diff -u -r1.4 -r1.5 |
| 52 |
--- libreoffice-3.4.2.3.ebuild 27 Jul 2011 20:50:35 -0000 1.4 |
| 53 |
+++ libreoffice-3.4.2.3.ebuild 27 Jul 2011 23:37:47 -0000 1.5 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.4 2011/07/27 20:50:35 mattst88 Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.5 2011/07/27 23:37:47 scarabeus Exp $ |
| 59 |
|
| 60 |
EAPI=3 |
| 61 |
|
| 62 |
@@ -15,11 +15,13 @@ |
| 63 |
EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice" |
| 64 |
ADDONS_URI="http://dev-www.libreoffice.org/src/" |
| 65 |
|
| 66 |
-inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic |
| 67 |
+BRANDING="${PN}-branding-gentoo-0.2.tar.xz" |
| 68 |
+ |
| 69 |
+inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins |
| 70 |
|
| 71 |
DESCRIPTION="LibreOffice, a full office productivity suite." |
| 72 |
HOMEPAGE="http://www.libreoffice.org" |
| 73 |
-SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${PN}-branding-gentoo-0.2.tar.xz )" |
| 74 |
+SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )" |
| 75 |
|
| 76 |
# Shiny split sources with so many packages... |
| 77 |
MODULES="artwork base calc components extensions extras filters help |
| 78 |
@@ -290,7 +292,7 @@ |
| 79 |
local mod dest tmplfile tmplname |
| 80 |
|
| 81 |
if use branding; then |
| 82 |
- unpack "${PN}-branding-gentoo-0.2.tar.xz" |
| 83 |
+ unpack "${BRANDING}" |
| 84 |
fi |
| 85 |
|
| 86 |
#first the bootstrap files |
| 87 |
@@ -516,6 +518,11 @@ |
| 88 |
# This is not Makefile so no buildserver |
| 89 |
make DESTDIR="${D}" distro-pack-install || die |
| 90 |
|
| 91 |
+ # symlink the plugin to system location |
| 92 |
+ if use nsplugin; then |
| 93 |
+ inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so |
| 94 |
+ fi |
| 95 |
+ |
| 96 |
if use branding; then |
| 97 |
insinto /usr/$(get_libdir)/${PN}/program |
| 98 |
newins "${WORKDIR}/branding-sofficerc" sofficerc || die |
Archives