diff options
| author |   Rick Farina <zerochaos@gentoo.org> | 2013-09-16 20:09:37 +0000 |
|---|---|---|
| committer | Rick Farina <zerochaos@gentoo.org> | 2013-09-16 20:09:37 +0000 |
| commit | d00bb14b80448264173d9e1d6f169f50bd702bd5 (patch) | |
| tree | 8cb8d235b0a980412f8b953dc61942d9662f41a5 /app-office | |
| parent | Conditionally build tests (bug #485116, patches by Arfrever). (diff) | |
| download | gentoo-2-d00bb14b80448264173d9e1d6f169f50bd702bd5.tar.gz gentoo-2-d00bb14b80448264173d9e1d6f169f50bd702bd5.tar.bz2 gentoo-2-d00bb14b80448264173d9e1d6f169f50bd702bd5.zip | |
fixing subslot dep on boost per bug 485066, all blame goes to zerochaos
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 5 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.0.4.2.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 43686359e864..c93c08692b38 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.506 2013/09/16 14:47:50 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.507 2013/09/16 20:09:37 zerochaos Exp $ + + 16 Sep 2013; Rick Farina <zerochaos@gentoo.org> libreoffice-4.0.4.2.ebuild: + fixing subslot dep on boost per bug 485066, all blame goes to zerochaos 16 Sep 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.5.2.ebuild: Disable nsplugin here too. diff --git a/app-office/libreoffice/libreoffice-4.0.4.2.ebuild b/app-office/libreoffice/libreoffice-4.0.4.2.ebuild index f38efcef8478..169f2b670b0d 100644 --- a/app-office/libreoffice/libreoffice-4.0.4.2.ebuild +++ b/app-office/libreoffice/libreoffice-4.0.4.2.ebuild @@ -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/app-office/libreoffice/libreoffice-4.0.4.2.ebuild,v 1.8 2013/09/16 14:30:55 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.4.2.ebuild,v 1.9 2013/09/16 20:09:37 zerochaos Exp $ EAPI=5 @@ -193,7 +193,7 @@ fi # after everything upstream is under gbuild # as dmake execute tests right away DEPEND="${COMMON_DEPEND} - >=dev-libs/boost-1.46 + >=dev-libs/boost-1.46:= >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip |