When building nsplugin symlink it to system location. Fixes bug #375299. Also put...

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index a5753540a1ad744669989ed03a55004873e73026..06a0c0a9e5eac4986bd035d6777b408ab625e657 100644 (file)
--- 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/Manifest b/app-office/libreoffice/Manifest
index b780c4d3240b0bb262fec6c53f32df01f8e3884b..e30b78479129d6955b19728b4c95ca6422bd31f4 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -165,13 +165,13 @@ DIST libreoffice-writer-3.4.2.3.tar.bz2 7294695 RMD160 2a7210c518376d9fe5c6e8a50
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf7b1e0 SHA1 60ef1f62c341ce7997de7ff5bcef04b304f4dfd9 SHA256 a3fae0a7f7da4a92e67d9c86ba4e7f92a92bbfac8f40a2703c64f317b670da6b
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
-EBUILD libreoffice-3.4.2.3.ebuild 18160 RMD160 5c8e69dfa556dc5d3b00365ccc43537f9486b246 SHA1 0c222f8243f3d185d9abecb02b214c27ea441545 SHA256 1225379f222677f9367e3acac34ce07b5c02051e0a99ff40498841ecb8b059f8
-MISC ChangeLog 13757 RMD160 a9982f01b3f56dbb18c1e916507ac9184a746868 SHA1 6d7d215f9ad19a704b36c6aa9afda5b5fb254ae4 SHA256 3be4a34ce6ebcf6768b62f674a875658e983a325345adb45800e6e5765e224ff
+EBUILD libreoffice-3.4.2.3.ebuild 18313 RMD160 6d1d15e093364e7d58cc66f54743d30edf787d88 SHA1 8c2277f026a29575cc8a29b83164d6aaddce346e SHA256 f0ecf05a997eb05e97754ee41afa622c007136f0fe90ac2fa6ddffe8a3e2f843
+MISC ChangeLog 13963 RMD160 b619e4d9941c7d66974f040a0232a4eb7f8e2330 SHA1 3f4d6e670e8b2793e9d545416ca4671aaac76109 SHA256 b9671952b016914e35ffeaca5ce9885f79a0d1cead6d1c1a4eeed8cf3f0cd19b
 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4weiEACgkQTVUdg23rv50NjQCbBS7H15BEo23x7q6Qf7+DR/Lg
-gsIAoIyHtHWXGL3bhLt1zaDmIeJ1V/oV
-=oIO6
+iEYEARECAAYFAk4woUwACgkQHB6c3gNBRYdpqQCgmp/yiWRnebD0ughsN0WK1x2C
+qpQAoMcqFA6LUYPlibCnBVgjpWqgpAsq
+=Znjg
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
index e4b0db199ada7444b32639f1c4153088fa7cd0a3..3f151b596b47066aca1969ced5c2a492e6a15d3c 100644 (file)
--- 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