summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-07-27 23:37:47 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-07-27 23:37:47 +0000
commit9925148a1388c61872e20f48d7184c817b42c712 (patch)
treea8638955fb895765988abdaaa60e062bcc7e3cb8 /app-office
parentVersion bump (diff)
downloadgentoo-2-9925148a1388c61872e20f48d7184c817b42c712.tar.gz
gentoo-2-9925148a1388c61872e20f48d7184c817b42c712.tar.bz2
gentoo-2-9925148a1388c61872e20f48d7184c817b42c712.zip
When building nsplugin symlink it to system location. Fixes bug #375299. Also put branding only into one location.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/ChangeLog7
-rw-r--r--app-office/libreoffice/libreoffice-3.4.2.3.ebuild15
2 files changed, 17 insertions, 5 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index a5753540a1ad..06a0c0a9e5ea 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.67 2011/07/27 20:50:35 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.68 2011/07/27 23:37:47 scarabeus Exp $
+
+ 27 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-3.4.2.3.ebuild:
+ When building nsplugin symlink it to system location. Fixes bug #375299. Also
+ put branding only into one location.
27 Jul 2011; Matt Turner <mattst88@gentoo.org> libreoffice-3.4.2.3.ebuild:
Update branding version.
diff --git a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
index e4b0db199ada..3f151b596b47 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=3
@@ -15,11 +15,13 @@ DEV_EXP_URI="http://dev-builds.libreoffice.org/pre-releases/src"
EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
-inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic
+BRANDING="${PN}-branding-gentoo-0.2.tar.xz"
+
+inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins
DESCRIPTION="LibreOffice, a full office productivity suite."
HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${PN}-branding-gentoo-0.2.tar.xz )"
+SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
# Shiny split sources with so many packages...
MODULES="artwork base calc components extensions extras filters help
@@ -290,7 +292,7 @@ src_unpack() {
local mod dest tmplfile tmplname
if use branding; then
- unpack "${PN}-branding-gentoo-0.2.tar.xz"
+ unpack "${BRANDING}"
fi
#first the bootstrap files
@@ -516,6 +518,11 @@ src_install() {
# This is not Makefile so no buildserver
make DESTDIR="${D}" distro-pack-install || die
+ # symlink the plugin to system location
+ if use nsplugin; then
+ inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+ fi
+
if use branding; then
insinto /usr/$(get_libdir)/${PN}/program
newins "${WORKDIR}/branding-sofficerc" sofficerc || die