summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-05-10 09:33:59 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-05-10 09:33:59 +0000
commit82564b23ec6e0959c547beccb281c09a94cad699 (patch)
tree4b969046e2347196e7aab72d8065632b4741be46 /eclass/office-ext.eclass
parentRevert init script change as it causes problems (#415101 by Eduard Huguet) an... (diff)
downloadgentoo-2-82564b23ec6e0959c547beccb281c09a94cad699.tar.gz
gentoo-2-82564b23ec6e0959c547beccb281c09a94cad699.tar.bz2
gentoo-2-82564b23ec6e0959c547beccb281c09a94cad699.zip
Ignore licenses, user accept them by portage. Fixes bug#415337.
Diffstat (limited to 'eclass/office-ext.eclass')
-rw-r--r--eclass/office-ext.eclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/office-ext.eclass b/eclass/office-ext.eclass
index c4484c660a20..f8ce221823a9 100644
--- a/eclass/office-ext.eclass
+++ b/eclass/office-ext.eclass
@@ -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/eclass/office-ext.eclass,v 1.4 2012/05/09 20:33:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/office-ext.eclass,v 1.5 2012/05/10 09:33:59 scarabeus Exp $
# @ECLASS: office-ext.eclass
# @AUTHOR:
@@ -97,7 +97,8 @@ office-ext_add_extension() {
debug-print "${FUNCNAME}: ${UNOPKG_BINARY} add --shared \"${ext}\""
ebegin "Adding office extension: \"${ext}\""
- ${UNOPKG_BINARY} add --shared "${ext}" \
+ ${UNOPKG_BINARY} add --suppress-license \
+ --shared "${ext}" \
"-env:UserInstallation=file:///${tmpdir}" \
"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
eend $?
@@ -114,7 +115,8 @@ office-ext_remove_extension() {
debug-print "${FUNCNAME}: ${UNOPKG_BINARY} remove --shared \"${ext}\""
ebegin "Removing office extension: \"${ext}\""
- ${UNOPKG_BINARY} remove --shared "${ext}" \
+ ${UNOPKG_BINARY} remove --suppress-license \
+ --shared "${ext}" \
"-env:UserInstallation=file:///${tmpdir}" \
"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
eend $?