diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-08-05 07:31:30 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-08-05 07:31:30 +0000 |
| commit | 357373efdb191fbf1149a4405eb1e747575e2201 (patch) | |
| tree | 0e5d9c9d7b5c15c9c64be07e04ed8e119b8802b9 /app-office | |
| parent | version bump (bug #479716) (diff) | |
| download | gentoo-2-357373efdb191fbf1149a4405eb1e747575e2201.tar.gz gentoo-2-357373efdb191fbf1149a4405eb1e747575e2201.tar.bz2 gentoo-2-357373efdb191fbf1149a4405eb1e747575e2201.zip | |
Force stable version of jpeg libraries, bug 479752
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice-bin/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice-bin/libreoffice-bin-4.0.4.2.ebuild | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog index f1a1e0cbadc1..c80f453156ae 100644 --- a/app-office/libreoffice-bin/ChangeLog +++ b/app-office/libreoffice-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice-bin # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.113 2013/07/28 22:53:00 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.114 2013/08/05 07:31:30 dilfridge Exp $ + + 05 Aug 2013; Andreas K. Huettel <dilfridge@gentoo.org> + libreoffice-bin-4.0.4.2.ebuild: + Force stable version of jpeg libraries, bug 479752 28 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org> -libreoffice-bin-3.6.6.2.ebuild: diff --git a/app-office/libreoffice-bin/libreoffice-bin-4.0.4.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-4.0.4.2.ebuild index 5d3e43f450a9..6116f08b475d 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-4.0.4.2.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-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-bin/libreoffice-bin-4.0.4.2.ebuild,v 1.4 2013/07/28 14:08:23 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-4.0.4.2.ebuild,v 1.5 2013/08/05 07:31:30 dilfridge Exp $ EAPI=5 @@ -64,6 +64,7 @@ BIN_COMMON_DEPEND=" =media-libs/libpng-1.5* >=sys-libs/glibc-2.15-r3 kde? ( >=kde-base/kdelibs-4.10.4:4 >=dev-qt/qtcore-4.8.4-r5:4 ) + || ( <media-libs/libjpeg-turbo-1.3.0-r2 =media-libs/jpeg-8* ) " # PLEASE place any restrictions that are specific to the binary builds |