Add depend on npapi sdk. Disable the mozilla build (does not affect nsplugin).

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 7ba2b6c9b954308d2b1f8ef9871016658b51f72f..2292a23678bd53c7ebd555f64cce242755feacb2 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.191 2011/11/07 18:04:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.192 2011/11/08 11:03:49 scarabeus Exp $
+
+  08 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-9999-r1.ebuild:
+  Add depend on npapi sdk. Disable the mozilla build (does not affect
+  nsplugin).
 
   07 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.4.2.ebuild, libreoffice-3.4.9999-r1.ebuild,

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 148e1364792201a5ced3ed7f206b930d7140644d..ae86b2abe10cee70920342e157f227f5b32e2442 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -174,23 +174,23 @@ EBUILD libreoffice-3.3.4.ebuild 18254 RMD160 f8ccfefe0f1663982a07f9468db62cd8be2
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 08657e1067a7769b11aa1a095a9e755a478f9a24 SHA1 035c05abc1ccc7fd3834ebc0150103be35bec5eb SHA256 4265eb3af09948f4145550f372ad3d632ca36472ec461aa93d2fcbea4a27d242
 EBUILD libreoffice-3.4.4.2.ebuild 16230 RMD160 e9dee95e4c013d38e0ed97e94837679402918494 SHA1 235a45abfcd1dca5ffc3dea94366bcfa7294858e SHA256 0af9ab7b728b6f781648c0174fdf8e3f7512db853e114d628ba4f6e4576b40f9
 EBUILD libreoffice-3.4.9999-r1.ebuild 16235 RMD160 760cac63fb0d1689889becfbd2a205459f435ed3 SHA1 2557f8a9cfb15042c79c915c08b33e8fced3de08 SHA256 10dc12813968fd9fd8b0ffaadc46b8ef1012c3c4eaa55d09fdc05727c2a390eb
-EBUILD libreoffice-9999-r1.ebuild 14542 RMD160 736eb7f6719451a73e61ac727ffac63afb7d157f SHA1 10c9d2c1ce56fda2ed6fce2902d3f8456e7efc99 SHA256 890fae952b230961af79eae25ca521c96d376a5424f9c0ce8eccc45259100a9d
-MISC ChangeLog 34852 RMD160 b88ae71bb66a0f6ed1e2964ebb04e67913472c02 SHA1 1a357ecb73821eac2b0952d6bbe5b8fb0b66883f SHA256 6c2af6373121d096e170d1d0d4df5906ebf89aa9dddac43dc7b1bacee0f04f78
+EBUILD libreoffice-9999-r1.ebuild 14577 RMD160 d346282d8da690cd7563750a06051773254021f4 SHA1 b81f525d891660d35cab34b69de24f56690277e4 SHA256 32d56a7fa4f0b5ebb85329a7494bc265f7dc3600ed3295814d8776bea7629f47
+MISC ChangeLog 35021 RMD160 8a6fb5def98e48d70e0ab8b1776b163b4b403b1c SHA1 d59e47203fa38f906f4621f7b183dce266544e26 SHA256 ece8cbdc3f3494f1059db07b5c5bd836428f51a38d300dd0df32e3e5f499abc6
 MISC metadata.xml 1341 RMD160 532608f457f9d6f714051e0b118e6a6a1fc4dee4 SHA1 7890f0068f2750aee68293f9bc1248037f799ca7 SHA256 0f7c6fbbf0a908b5206bc6af740375006f903b61f356fb21b6df8d1fc6a59755
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOuB20AAoJEOSiRoyO7jvopAcQAJgJ/byRXbsyv/7I66HWeOJN
-N5+Z15OGbd2vnjEajjFln/9ewXB6My0/jszdlWd/L2mjHUq2MlzzmS3ArQpFVegs
-BOTPSfPdtqf4vj0oS5j+02TFwWUhBUKUK34gJ2NWGbmM7IBFRaaiu+NWNtR+E6di
-3/7lw28CLGmiIsXcLMqNumveGU05yl0T9h0G1gUGIvapzVHubS4paHHgFJkKGMRC
-LqB6L65NMt+5KDv5qJ/QmNTDVNVmY5rH50RDuBIN0dNoEKyf6vw5/ivPYDmJbtKu
-rEFcAqcTSec/Em4mkR8JntJzEsVzTM/CLYpssyPpGGXdTRDKZjuWpe6F9oZnn2T4
-BXOMMy/uJOzj4HmrS0dfWKIsqVXo5Yx9RTPauN6wApQNGEDBw6CVCXHaj8/H/32W
-acv3iUPi4AzUXOykBMiLZc1mN9dzTPttfIKjqs4b+Vg+WxgFMayiqXkLHYkMRwo/
-amIIhgcdcvc3wO9P7glknmou7rkFC9Q+2uwADzHABf6jauWF1fly7fTD/B8K+6ZZ
-mrGSYtGsQit3CUbYh96jbstquHw4LFHXeMJUfB429z3OKtxrhW5KRscEVR1LwuRp
-V1owq7hZh/ch3IL5EbJEjxuT6U1HQVUE6A9hvBdOymkaNZGn45l6rfIGpQMLUjyi
-HSdHtniRZNvHWaPejk72
-=NXfu
+iQIcBAEBAgAGBQJOuQySAAoJEOSiRoyO7jvog/0P/iI7rCaOllUE63S0zkJA4C2K
+eohfzaak73mkGO0Pz/D17UIOgF27tyVdiB0iXpNsRxX4FRG9Nt1a49CddUvef4SG
+vdHgTB370x1hKznXZlZtM/SWAEn1FLQDB3Cnuyn/6TrqecWmMO7+MZjXwSR8g1Vo
+iCvzDydxrh+/0/0bxL3Pn3vrNk0RnZ/9xUKjGyynbtcGSaSwLGzPpnSYxBD0G4ee
+bLT+KooGyIKW0QJ3Hu2dPIkBNOOfxT4EIUC1AbcQNnMm1OtWLTghFp4to8LuMqzG
+H8Y5+GwDOjUZOc3nb6UvIf5t3pSvhHPUnwLy/2d4PSUQ/BiRGdZCkjd64VAMtF5Y
+FaVBnMBpzEa8K+y2MasQPx7UZIIje+HvtDH7WxQZpQ8Egqmh1sBYX9QF+tULtXxq
+IiUcfVI3m9mQdHJwsXb3jMYEJ2gOvW3Mtz91mVLMknL49uHhXoU3Ld50qdR6XAs5
+VsHWRmPpWOlLR98HMFHSJ4KplBXNnSPS+tZsOX6meW+nejzeLit47l/qp+W+X+nZ
+qLbJ3+jk68BwgFe4Wi5AzERxOr2+gLAAubeqV1cCCEoRXgvD/2vye10JxMgWDVgd
+yhTjbGNET/zXZ5AIAqSVxpsYhbD6SIjAMBw8EguHJRiPhTI0T8BEmN0F9NDa0ihv
+zo3ux39KGhsd7jP8lCh9
+=2iyh
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index a0876f4d81bdba4cdf070ef77eb2588483dd41f3..c3d1be89812102adcc23ad53c6a3a9ec00404f86 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r1.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-9999-r1.ebuild,v 1.53 2011/11/07 18:04:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.54 2011/11/08 11:03:49 scarabeus Exp $
 
 EAPI=4
 
@@ -77,7 +77,7 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer gtk
-+jemalloc kde mysql nsplugin odk opengl pdfimport svg templates test +vba
++jemalloc kde mysql odk opengl pdfimport svg templates test +vba
 +webdav +xmlsec"
 LICENSE="LGPL-3"
 SLOT="0"
@@ -148,10 +148,6 @@ COMMON_DEPEND="
        )
        jemalloc? ( dev-libs/jemalloc )
        mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
-       nsplugin? (
-               net-libs/xulrunner:1.9
-               ${NSS_DEPEND}
-       )
        opengl? ( virtual/opengl )
        pdfimport? ( >=app-text/poppler-0.16[xpdf-headers] )
        svg? ( gnome-base/librsvg )
@@ -187,6 +183,7 @@ DEPEND="${COMMON_DEPEND}
        >=dev-util/pkgconfig-0.26
        >=media-libs/vigra-1.7
        >=net-misc/curl-7.21.4
+       net-misc/npapi-sdk
        >=sys-apps/findutils-4.4.2
        sys-devel/bison
        sys-apps/coreutils
@@ -212,7 +209,6 @@ PATCHES=(
 REQUIRED_USE="
        || ( gtk gnome kde )
        gnome? ( gtk )
-       nsplugin? ( gtk )
 "
 
 S="${WORKDIR}/${PN}-core-${PV}"
@@ -238,8 +234,8 @@ pkg_setup() {
        python_pkg_setup
 
        if ! use gtk; then
-               ewarn "If you want the LibreOffice systray quickstarter to work"
-               ewarn "activate the 'gtk' use flag."
+               ewarn "If you want the LibreOffice systray quickstarter or nsplugin to"
+               ewarn "work activate the 'gtk' use flag."
                ewarn
        fi
 }
@@ -366,6 +362,8 @@ src_configure() {
        # --disable-kdeab: kde3 adressbook
        # --disable-kde: kde3 support
        # --disable-ldap: ldap requires internal mozilla stuff, same like mozab
+       # --disable-mozilla: disable mozilla build that is used for adresbook, not
+       #   affecting the nsplugin that is always ON
        # --disable-pch: precompiled headers cause build crashes
        # --disable-rpath: relative runtime path is not desired
        # --disable-static-gtk: ensure that gtk is linked dynamically
@@ -399,6 +397,7 @@ src_configure() {
                --disable-kdeab \
                --disable-kde \
                --disable-ldap \
+               --disable-mozilla \
                --disable-online-update \
                --disable-pch \
                --disable-rpath \
@@ -425,6 +424,7 @@ src_configure() {
                --without-myspell-dicts \
                --without-ppds \
                --without-stlport \
+               --without-system-mozilla \
                --without-helppack-integration \
                $(use_enable binfilter) \
                $(use_enable dbus) \
@@ -441,7 +441,6 @@ src_configure() {
                $(use_enable java ext-scripting-beanshell) \
                $(use_enable kde kde4) \
                $(use_enable mysql ext-mysql-connector) \
-               $(use_enable nsplugin mozilla) \
                $(use_enable odk) \
                $(use_enable opengl) \
                $(use_enable pdfimport ext-pdfimport) \
@@ -453,7 +452,6 @@ src_configure() {
                $(use_enable xmlsec) \
                $(use_with java) \
                $(use_with mysql system-mysql-cppconn) \
-               $(use_with nsplugin system-mozilla libxul) \
                $(use_with templates sun-templates) \
                ${internal_libs} \
                ${java_opts}
@@ -476,8 +474,8 @@ src_install() {
        newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
        rm -rf "${ED}"/etc/
 
-       # symlink the plugin to system location
-       if use nsplugin; then
+       # symlink the nsplugin to system location
+       if use gtk; then
                inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
        fi