summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-11-12 19:40:31 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-11-12 19:40:31 +0000
commit831fa19c3beffceb5b4b0402cef089f0f371b5e8 (patch)
tree028d816e9156ffb824995eb0074deefbb952a631 /app-office
parent[bump] dev-perl/Variable-Magic-0.520.0 (diff)
downloadgentoo-2-831fa19c3beffceb5b4b0402cef089f0f371b5e8.tar.gz
gentoo-2-831fa19c3beffceb5b4b0402cef089f0f371b5e8.tar.bz2
gentoo-2-831fa19c3beffceb5b4b0402cef089f0f371b5e8.zip
Add back the nsplugin.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/ChangeLog5
-rw-r--r--app-office/libreoffice/libreoffice-9999-r2.ebuild7
2 files changed, 9 insertions, 3 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 0b280949ce14..001c53f2ab04 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.389 2012/11/09 19:29:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.390 2012/11/12 19:40:31 scarabeus Exp $
+
+ 12 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
+ Add back the nsplugin.
09 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org>
files/libreoffice-3.7-separate-checks.patch:
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 80501a7105fb..b6557294ea54 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.125 2012/11/09 09:50:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.126 2012/11/12 19:40:31 scarabeus Exp $
EAPI=4
@@ -68,7 +68,7 @@ unset EXT_URI
unset ADDONS_SRC
IUSE="bluetooth +branding +cups dbus eds gnome gstreamer +gtk gtk3
-jemalloc kde mysql odk opengl postgres telepathy test +vba +webdav"
+jemalloc kde mysql nsplugin odk opengl postgres telepathy test +vba +webdav"
LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
@@ -152,6 +152,7 @@ COMMON_DEPEND="
dev-java/tomcat-servlet-api:3.0
)
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+ nsplugin? ( net-misc/npapi-sdk )
opengl? (
virtual/glu
virtual/opengl
@@ -230,6 +231,7 @@ REQUIRED_USE="
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
libreoffice_extensions_wiki-publisher? ( java )
+ nsplugin? ( gtk )
"
S="${WORKDIR}/${PN}-core-${PV}"
@@ -499,6 +501,7 @@ src_configure() {
$(use_enable gtk3) \
$(use_enable kde kde4) \
$(use_enable mysql ext-mysql-connector) \
+ $(use_enable nsplugin) \
$(use_enable odk) \
$(use_enable opengl) \
$(use_enable postgres postgresql-sdbc) \