diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2013-03-23 10:24:42 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2013-03-23 10:24:42 +0000 |
| commit | 994acecc4e1398a3c629b17ae4e3069bd10b42e3 (patch) | |
| tree | f1018a67c0378d7f30bd8221034e2c4fb6875d2b /eclass | |
| parent | Enable libreoffice implementation by default for office extensions. (diff) | |
| download | gentoo-2-994acecc4e1398a3c629b17ae4e3069bd10b42e3.tar.gz gentoo-2-994acecc4e1398a3c629b17ae4e3069bd10b42e3.tar.bz2 gentoo-2-994acecc4e1398a3c629b17ae4e3069bd10b42e3.zip | |
Do not use-default here as we enable it by profile variable.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/office-ext-r1.eclass | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 511374cb1e79..8d138fe5138b 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.750 2013/03/23 10:19:39 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.751 2013/03/23 10:24:41 scarabeus Exp $ + + 23 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> office-ext-r1.eclass: + Do not use-default here as we enable it by profile variable. 23 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> office-ext-r1.eclass: Fix stupid copy&paste. diff --git a/eclass/office-ext-r1.eclass b/eclass/office-ext-r1.eclass index c3604347ed42..168205167b3a 100644 --- a/eclass/office-ext-r1.eclass +++ b/eclass/office-ext-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/office-ext-r1.eclass,v 1.2 2013/03/23 10:19:39 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/office-ext-r1.eclass,v 1.3 2013/03/23 10:24:42 scarabeus Exp $ # @ECLASS: office-ext-r1.eclass # @MAINTAINER: @@ -61,13 +61,7 @@ IUSE="" RDEPEND="" for i in ${OFFICE_IMPLEMENTATIONS[@]}; do - # Set default on for the libreoffice implementation. - # Or if we have just one impl set it also on enabled. - if [[ ${i} == libreoffice || ${#OFFICE_IMPLEMENTATIONS[@]} == 1 ]]; then - IUSE+=" +office_implementation_${i}" - else - IUSE+=" office_implementation_${i}" - fi + IUSE+=" office_implementation_${i}" RDEPEND+=" office_implementation_${i}? ( || ( |