diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-03-08 14:53:56 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-03-08 14:53:56 +0000 |
| commit | 50ec067c67d60757ae5f9d967e8da695df268acb (patch) | |
| tree | dccbb6200bfb68c587ba57aee4d013a387fa4585 /app-office/libreoffice | |
| parent | Marking libebml-1.2.2 ppc64 for bug 400013 (diff) | |
| download | gentoo-2-50ec067c67d60757ae5f9d967e8da695df268acb.tar.gz gentoo-2-50ec067c67d60757ae5f9d967e8da695df268acb.tar.bz2 gentoo-2-50ec067c67d60757ae5f9d967e8da695df268acb.zip | |
Use internal vigra even on 3.4.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 5 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.4.5.2.ebuild | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index aa774f9d7d8a..32f7459c3072 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.249 2012/03/07 11:15:44 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.250 2012/03/08 14:53:56 scarabeus Exp $ + + 08 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.4.5.2.ebuild: + Use internal vigra even on 3.4. 07 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild: Always disable gtk3 on 3.5 series as it is highly experimental. diff --git a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild b/app-office/libreoffice/libreoffice-3.4.5.2.ebuild index fb75c3cd25e4..02c4592a9e44 100644 --- a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.5.2.ebuild @@ -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/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.9 2012/02/29 15:21:02 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.10 2012/03/08 14:53:56 scarabeus Exp $ EAPI=4 @@ -52,6 +52,7 @@ unset DEV_URI # addons # FIXME: actually review which one of these are used +ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz" ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz" ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip" ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz" @@ -92,7 +93,6 @@ COMMON_DEPEND=" >=dev-libs/redland-1.0.14[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 - >=media-libs/vigra-1.7 >=media-libs/libpng-1.4 net-print/cups sci-mathematics/lpsolve @@ -344,6 +344,7 @@ src_configure() { --without-system-hsqldb --without-system-cppunit --without-system-sane-header + --without-system-vigra " # When building without java some things needs to be done |