diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-10-03 09:28:24 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-10-03 09:28:24 +0000 |
| commit | 20eec48458ccdd2e4b10bb22c7b07397a36c66a8 (patch) | |
| tree | a2b3280a732e6ef2b396687a61a1a6795cb165b5 /app-office | |
| parent | Version bump. (diff) | |
| download | gentoo-2-20eec48458ccdd2e4b10bb22c7b07397a36c66a8.tar.gz gentoo-2-20eec48458ccdd2e4b10bb22c7b07397a36c66a8.tar.bz2 gentoo-2-20eec48458ccdd2e4b10bb22c7b07397a36c66a8.zip | |
Do not bother with binfilter if the useflag is not enabled.
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r1.ebuild | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 2e1b96ee145f..f40c874fe20c 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # 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.160 2011/10/03 08:58:27 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.161 2011/10/03 09:28:24 scarabeus Exp $ + + 03 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> + libreoffice-9999-r1.ebuild: + Do not bother with binfilter if the useflag is not enabled. 03 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r1.ebuild: diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild index c2776e265c30..143b581373ff 100644 --- 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.32 2011/10/03 08:58:27 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.33 2011/10/03 09:28:24 scarabeus Exp $ EAPI=3 @@ -39,7 +39,11 @@ MODULES="core binfilter dictionaries help" if [[ ${PV} != *9999* ]]; then for i in ${DEV_URI}; do for mod in ${MODULES}; do - SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.bz2" + if [[ ${mod} == binfilter ]]; then + SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.tar.bz2 )" + else + SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.bz2" + fi done unset mod done @@ -242,6 +246,9 @@ src_unpack() { done else for mod in ${MODULES}; do + if [[ ${mod} == binfilter ]] && ! use binfilter; then + continue + fi mypv=${PV/.9999} [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" EGIT_PROJECT="${PN}/${mod}" |