diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-11-02 12:58:35 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-11-02 12:58:35 +0000 |
| commit | 53d5d3819286dc83af6e1ebc9152c49538ad4f05 (patch) | |
| tree | 62c932f3dc3ef4a6c1ae864f2bb68aee9456a257 | |
| parent | Version bump (diff) | |
| download | gentoo-2-53d5d3819286dc83af6e1ebc9152c49538ad4f05.tar.gz gentoo-2-53d5d3819286dc83af6e1ebc9152c49538ad4f05.tar.bz2 gentoo-2-53d5d3819286dc83af6e1ebc9152c49538ad4f05.zip | |
Backport pdfimport useflag to 3.4.3 as the poppler abi changed again :/
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 2a13c52a4833..b8443cc068c1 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.185 2011/11/02 12:28:22 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.186 2011/11/02 12:58:35 scarabeus Exp $ + + 02 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org> + libreoffice-3.4.3.2-r1.ebuild: + Backport pdfimport useflag to 3.4.3 as the poppler abi changed again :/ 02 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.4.1.ebuild, diff --git a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild index 206cc89ac4a6..7f3891e7ba33 100644 --- a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.3.2-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-3.4.3.2-r1.ebuild,v 1.14 2011/11/02 12:28:22 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.15 2011/11/02 12:58:35 scarabeus Exp $ EAPI=3 @@ -102,7 +102,7 @@ unset ADDONS_SRC IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite gstreamer gtk kde ldap mysql nsplugin odk opengl python templates test +vba -webdav" +webdav pdfimport" LICENSE="LGPL-3" SLOT="0" [[ ${PV} == *9999* ]] || KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" @@ -122,7 +122,6 @@ COMMON_DEPEND=" app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 - >=app-text/poppler-0.12.3-r3[xpdf-headers,cairo] dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 @@ -144,6 +143,7 @@ COMMON_DEPEND=" x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender + pdfimport? ( >=app-text/poppler-0.12.3-r3[xpdf-headers,cairo] ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( @@ -374,7 +374,7 @@ src_configure() { # list the extensions we are going to build by default extensions=" - --enable-ext-pdfimport + $(use_enable pdfimport ext-pdfimport) --enable-ext-presenter-console --enable-ext-presenter-minimizer " |