diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-10 09:33:59 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-10 09:33:59 +0000 |
| commit | ddc2ad46c32c5c05e594dc3d82174d4af341c53c (patch) | |
| tree | 48f16a4b6955ee28a85dfa46096fbad16b691b16 /eclass | |
| parent | Revert init script change as it causes problems (#415101 by Eduard Huguet) an... (diff) | |
| download | historical-ddc2ad46c32c5c05e594dc3d82174d4af341c53c.tar.gz historical-ddc2ad46c32c5c05e594dc3d82174d4af341c53c.tar.bz2 historical-ddc2ad46c32c5c05e594dc3d82174d4af341c53c.zip | |
Ignore licenses, user accept them by portage. Fixes bug#415337.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/office-ext.eclass | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 5fdf6d8dd426..0f5f72120e39 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.249 2012/05/10 03:58:18 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.250 2012/05/10 09:33:59 scarabeus Exp $ + + 10 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> office-ext.eclass: + Ignore licenses, user accept them by portage. 10 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> waf-utils.eclass: Depend on python and block python[-threads] for bug #409427. 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 $? |