From: Tomas Chvatal Date: Wed, 2 Nov 2011 12:58:35 +0000 (+0000) Subject: Backport pdfimport useflag to 3.4.3 as the poppler abi changed again :/ X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f85c407d26f8823f6062707831c2d4b4516cda6f;p=gentoo.git Backport pdfimport useflag to 3.4.3 as the poppler abi changed again :/ Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64 --- 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 + 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 libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.4.1.ebuild, diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 90cb3f03366d..6772137944eb 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -171,26 +171,26 @@ DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6a DIST libreoffice-writer-3.4.4.1.tar.bz2 7294975 RMD160 a5fa1a9f425b524232313470457299c0c9b479ed SHA1 3880ba1260bbea74adb6f6632e4cf2fbe3240e27 SHA256 df99ca3ddb51880547cd718b8c3de72b1f2b74b84b59755d00b02853cdde2479 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c EBUILD libreoffice-3.3.4.ebuild 18254 RMD160 f8ccfefe0f1663982a07f9468db62cd8be2e98f9 SHA1 76ee2d703a045fe306a119f7c750d5f1633a240e SHA256 4d723c31545c807a77b3b24199b566bcec50f4784a5a767ef021a13f5843d1f1 -EBUILD libreoffice-3.4.3.2-r1.ebuild 18478 RMD160 2105512b4e8db0d0b9c0602c998c564576d44dbf SHA1 ec86393e335f4e17e897c3c7765f600d963a9cf0 SHA256 89b4bb8a7b2366960046db85f4abcc573d50c55a550e7ea7447a555a8023c63d +EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 08657e1067a7769b11aa1a095a9e755a478f9a24 SHA1 035c05abc1ccc7fd3834ebc0150103be35bec5eb SHA256 4265eb3af09948f4145550f372ad3d632ca36472ec461aa93d2fcbea4a27d242 EBUILD libreoffice-3.4.4.1.ebuild 16297 RMD160 2b9f9e9e649614f563e09a7407060070e12e16c0 SHA1 e1ab24349990f88f01031343588b355925345a4d SHA256 697e95a7632573f88e0f93c3378661c181bc1fa020b0201fa690a93f201ce30d EBUILD libreoffice-3.4.9999-r1.ebuild 16302 RMD160 b97872adbd22f9ee683d3ada98131de8dae31f39 SHA1 dd91bbc58f25dcc3f7d1551452d7b530cc1ea7bb SHA256 aa93f191a6df71d103d3855752a21965162eedb94d51285bf40fa36e626c47ce EBUILD libreoffice-9999-r1.ebuild 14522 RMD160 59b1ef3970ff147d5a81d2b11f5c8a1921c3365d SHA1 a26500fb16c6fde02c345a9801f06632494e7f66 SHA256 86e5e9672316d922ba84fd3bc0fcdc399f286cdf17c470a8e5d0eea8bda9b789 -MISC ChangeLog 33900 RMD160 8e1c5af54a6666e0003ccac15792f77584acad8a SHA1 8fa9f9e0d949dfa257eacdcd4d3b5636467317ed SHA256 7b695ce5586719adb831a4e5ee5207c651f9d12df60118719d70622844440df3 +MISC ChangeLog 34063 RMD160 fdaa95d87b4f18a7a92610d91b496f2b233c3aaf SHA1 38b0eed728baa979170f575c0360c31c220f2f7c SHA256 b101a255ebe3c84a4b6e71145f7bb277a01de3c919a85dc2e612d0eb699e1bb6 MISC metadata.xml 1192 RMD160 f723ac57dc7424dea71c29a052e2aae915c908dd SHA1 87181bf865c0bd53b4215ec36063a1f422e5eca5 SHA256 e3515fe7fcec3baa6e0b2dfb769c91f459ab6c34cf29a6b68498e17c3c7400a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOsTcNAAoJEOSiRoyO7jvouqQQAIz6QCF6KwG59B0KimHTqJre -IRni5PyKE1U/r5LGSiVhA5+4vsyZYiBnmEi7xm0/bpePiDTJY5bOW2D5ze3gIAXD -MMfmYErLi7/hJpWGs3OKMKZD7ijvyF5LuzFM4YsBp/DpE0jtaajYQ4v8DnBTub6T -OvqCVv7ePuFG0tqIAbGAWYqx40R0V0fP3znmz/leNaNuOAdIa5A/TKwxGTvG2YUJ -fpfprJZzzRTsdNDTk3Ne/uSopk0B6vWfOshUVRcOGvkkqZMsjN2D57Fxintx/LdK -xAxiilA6QhcBL0XkiMPTNpueZNj0LBltBWUvnDQk1m6AjeTq560aNtNQ/gbS1QLe -FTRb/KMdvbvEzMGYtUFFswiiNbk/dzq4mdjt4KA4+gJjuY7t0ZcUdTLIuEvZEd+7 -0SSypKTipD8ut0cmAbqAXudj8a/0yMdgsoo1FQtjW2kdf8+Ti+nGVLWbC2wjHTz5 -ws8se127fuZRLdG23xfKQryaSNTZZes/TbjXwBOMQmO1EuxHGLiqfbT8fVLKWpto -raNPbJR7yN7St6hT2PnUTu+Vbo1OzPfVDgQICJ358le0CSHKHmDvaktn0/d9+wzF -czzLWs6j0bNZn2ZmFqBEaSACFfJpGwwk2JDbTEBSgZPvnPsHQ2hC7NNryAlpzL3v -B+psKwAY+6iFQ0obl/7a -=fGyK +iQIcBAEBAgAGBQJOsT4eAAoJEOSiRoyO7jvoyrEP/1CflBnRJWpW5QVB7iFkqEpt +0UsgEtbiQqeNOOQExAtPPhto75N9Pu0q5iMYeNf/a0Pu4TB60xlGUyTGnUtxz2Nw +0eiwR6aJxHnCo3KD+yeqEPMRU19KNcj94XRqDwO5EIPHL7713U2YHay5Y7vvFd3+ +M1a/IFQLLwD0IxTgQG0ewEmmFvb+QN+nIBRuOwxv2mj/psfkLf2se7FRbGORliCU +hUffL0KI7CMSy/BgmQOc+MMyqzk2xJP+wvZZtNr24ZdcDuJCNp8IHtYADNbXfGeA +mTtS2X9NHs7ns3SfQHBbpuQww1ojnK5cAVVmvjubtCpncX56F1+Ok4Du33l32Far +cYB8pJmsbXC2adt4+EzluwndsKJRbacXOvSg2d+BHdGyX8UGlJY87eZRZlUf6ySr +jTlB2gyWQnJ5AdhQIKJj7u9BpY5c4yRq1sTPI2/Uq5bFyd4eEwUbbT+55pTDgHCf +/gPKe9PqNDZsUftyUqEy9fK74yGc4FtSX8qkM6EgKYczTKiBGcCTMd3a4zCBs2Qu +b4iTbdyG0qUA/A9ZUdFenX+ne8PDkONNCX/XiBHDW1qBZiOrwoYFpwA/0RY1TTdn +OhtvJqH5GpnGkFrGBzRj1B7v4iUaVpurqR9Uz0vZiwMcF3rbuMJN5KsfvRqpm2Tu +SqNUGwJeHjkFObPOFOhj +=xtal -----END PGP SIGNATURE----- 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 "