From 4b0041a38825c1182ff2d6c2e980a0c37ee66993 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Sun, 13 Nov 2011 10:21:51 +0000 Subject: [PATCH] Depend on cxx useflag on poppler. Fixes bug #390273. Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64 --- app-office/libreoffice/ChangeLog | 7 +++- app-office/libreoffice/Manifest | 34 +++++++++---------- .../libreoffice/libreoffice-3.4.4.2-r1.ebuild | 4 +-- .../libreoffice-3.4.9999-r2.ebuild | 4 +-- .../libreoffice/libreoffice-9999-r2.ebuild | 4 +-- 5 files changed, 29 insertions(+), 24 deletions(-) diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 3e5d57b76fb1..cc5d25979e3c 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,11 @@ # 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.200 2011/11/12 14:40:30 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.201 2011/11/13 10:21:51 scarabeus Exp $ + + 13 Nov 2011; Tomáš Chvátal + libreoffice-3.4.4.2-r1.ebuild, libreoffice-3.4.9999-r2.ebuild, + libreoffice-9999-r2.ebuild: + Depend on cxx useflag on poppler. Fixes bug #390273. 12 Nov 2011; Tomáš Chvátal libreoffice-9999-r2.ebuild: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index e57196244787..80ede112ddde 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -173,25 +173,25 @@ DIST libreoffice-writer-3.4.4.2.tar.bz2 7296517 RMD160 0ea8e99afe53c3ad81148562f DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c EBUILD libreoffice-3.3.4.ebuild 18266 RMD160 c0204063e1a6bd7621267fd4dc92d8b73340d2c9 SHA1 4ba8289141748a37763049aad453ce8cde277e1b SHA256 7da90f1704e492c9ea60982283868860d96ab7550e7cb6a5806858d68fa15b98 EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 08657e1067a7769b11aa1a095a9e755a478f9a24 SHA1 035c05abc1ccc7fd3834ebc0150103be35bec5eb SHA256 4265eb3af09948f4145550f372ad3d632ca36472ec461aa93d2fcbea4a27d242 -EBUILD libreoffice-3.4.4.2-r1.ebuild 16537 RMD160 859a610da9e697a9e5b7832108f3f57dc9145d33 SHA1 0be702423727887cb1b42b3157766c0235fa03b5 SHA256 fe8abb5d7a09586e76f5181064f0d88ad91814db459084b332adbff4e80694d8 -EBUILD libreoffice-3.4.9999-r2.ebuild 15026 RMD160 8d20c6104f2e9f80c6a92967591b0cbd56230997 SHA1 a970c49517e7421db3a238f94feb18b62bda28b2 SHA256 db95e3f8a7bcb9ade0b2b58acdc0591b77eabf223c61c4f99c72a95553b8e53a -EBUILD libreoffice-9999-r2.ebuild 13391 RMD160 8b7bda0a1c8b7164ec9327edc43479e0acb59ad5 SHA1 1697489fc8640bbd079eb9773dd4a964fa08e582 SHA256 27578dfac643dfdd5e1b8e2f992668f4d1692d2e7c9896374d49b51ad6f32eef -MISC ChangeLog 36515 RMD160 4537550d1b7d4cb15e19114d10f12b844142303c SHA1 5061cad71f107839095bc3886f24458dc9c138f1 SHA256 209207c6f60ebbdc0e2d2becb8fb231f5f14be401b56191b5e50ffd143068aab +EBUILD libreoffice-3.4.4.2-r1.ebuild 16541 RMD160 c7ceaab85af40e4ba3fc4eec2d0525301b17c819 SHA1 f76f95c4499831be5154ef2fea8993d86078e23d SHA256 13ee29e0f298ef5b80066cf40b24da0947e07cab675663ccbbf2ddd35d7ab5a3 +EBUILD libreoffice-3.4.9999-r2.ebuild 15030 RMD160 3153aacc42fd42e13d15c3608f12f6a211fe2276 SHA1 de53d2831feb106cf8542c47787b03c6a146250c SHA256 0516f39c816c3e86d8ce3ab63213e144f4e3c06b6694a037831a87f29e97d82b +EBUILD libreoffice-9999-r2.ebuild 13395 RMD160 779b0f0710582a23a5c38525bcab5287f1e73b99 SHA1 9ac8bdc7eba0758646b3ee37720995d84efe9da7 SHA256 803d783fc809b2aef9fc9f3bc89c981b9ab3dca61624e3bb0650fd58a9ee82ae +MISC ChangeLog 36721 RMD160 57b6a32ac092a23b4a549b4c07499d2ea7ab27d1 SHA1 2cd419da517e8ecf918beea73c3facacb4a0c135 SHA256 111941c9d824a28ec6e2f4e1d8a6bbbe23c694d0c99f5e57ce397b36891f8e3a MISC metadata.xml 1341 RMD160 532608f457f9d6f714051e0b118e6a6a1fc4dee4 SHA1 7890f0068f2750aee68293f9bc1248037f799ca7 SHA256 0f7c6fbbf0a908b5206bc6af740375006f903b61f356fb21b6df8d1fc6a59755 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOvoVZAAoJEOSiRoyO7jvosa0P/R9ETcrxbi+XH/5NeLFwje3t -981Zo8x4eg6sl7S4vltX7elYiaUGiUVcDzCeucelFdk8J3uOBnwnOEzoAXEeZZzv -tz7k6QMp/7TfAZMi+LvR93VKGwo0QxbaCXlpZ5k1FoFy4/5ErOdWxq164WJUqbjb -2In6GKBuGQ0uRTKp9cz8+82iWueTbwJ2INFyGS9Dj1G+dhgBX71Gho2VBwpRhWM9 -NisUct4Tc2vsAlqpTCQt/wVZ/M3pXZaFJ/CMO8Jem6UtMVYvpS/qCPcF+PhX62B2 -R4zbu2sN5o7s8umVKNRTCV10tDiQsEkDkKJ/dfDaPXMcjw0S9VmR/t9JgSMr7ccN -cDEAW7HTCkgQmN97BGeimzN7qiNNz5/qRGcacvWMuvm3ZHch1Rjm4pVbq3Az39ca -jt5oaVJlLtmqKVggwlWc3s9RLWsNOC82XyRLc4yYoh8oCon4ANM52qQ0t927V3a0 -2S66ofGmqJbORF59l36X5x9/vtXgVTV/h/Qos1VojcJEy+t6cxbhr++TN8L+oXFa -wvk704uJNyJAq9pwcwyjD7Fqd1h4Tp6xM3uve1WFPgAnFswCeeSZCWZyjF+Opq3s -1U84VrjodR0E/Ub1YGnPph3mZ0BoVnVBeAqokmhdlbeSTXQwh4zyxksUZr3kLePA -QgE6iVd5iPMP9zlESEvu -=uvFS +iQIcBAEBAgAGBQJOv5s0AAoJEOSiRoyO7jvoFhgP/2o/6OJgwwTj96OGML3hGjI2 +qfZGy5Z9Ns5AHjCZZtwCN7atWhHBkFda6thTsTJoGxEvCFmyI1RiLY0JQmoX53TC +cizvYV4TdDuCYLJAtc5WKTyjxhzIU1qt3ahbJ61JeItXiMB/F2DuigUoscrLkYGa +gSD3tWAbJF81R8uBkDOYpkv2WFup+A6XkcWGUp6viCdIeYh4btMlkw3Tb/XMfZwV +WMaNdXqBKb3fyo8699Een7lQG/vglNa5zujG8ocQbvgUUBZQiuQHU74VgeaR/hIu +0+ZkWftxHuKahLsJKUM4ik1aNysuP5y1+ksF1pIbvZ+fDizq5Uwa1owaDWbGJFNE +GMlMqvBQVXRlADhxuKkT585oPRFZBrqb5KYeQBt8TI035MyHNur9DXONGxC6lOKf +U09Cz5NBKlDbbtc2maDqp+fZc7HbYazbFcHIBQDc2ShJuMEJYieAFXNNdHgfIYgJ +U7ory/xxlQHLzY4+GmJU2DtgAZT8ntUPOsHLGEX2wn4Ad/PWxFviIvsjikNW1DYa +d/lys0lxlHadNOHzbRDVJ9l3mzw+xJ2DhhaY+SPlwJIwru74U2QNonI7P62uCY33 +SWmVrSCicIxXDtEvsI8q33DvEcdU1wkp0NF9fwux9h8nuJEu48GK57sLY/HSeLZ8 +tJHlapZy2ebIvFKkJrF7 +=s7Ry -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild index 197cd7518bf9..36f34f9b37e6 100644 --- a/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.4.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.4.2-r1.ebuild,v 1.2 2011/11/10 12:28:02 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild,v 1.3 2011/11/13 10:21:51 scarabeus Exp $ EAPI=4 @@ -146,7 +146,7 @@ COMMON_DEPEND=" >=dev-libs/nss-3.12.9 ) opengl? ( virtual/opengl ) - pdfimport? ( >=app-text/poppler-0.16[xpdf-headers] ) + pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) webdav? ( net-libs/neon ) " diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r2.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r2.ebuild index 1a7e75a8a2b2..5e9157d4b5ba 100644 --- a/app-office/libreoffice/libreoffice-3.4.9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.9999-r2.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.9999-r2.ebuild,v 1.1 2011/11/12 12:32:14 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r2.ebuild,v 1.2 2011/11/13 10:21:51 scarabeus Exp $ EAPI=4 @@ -129,7 +129,7 @@ COMMON_DEPEND=" >=dev-libs/nss-3.12.9 ) opengl? ( virtual/opengl ) - pdfimport? ( >=app-text/poppler-0.16[xpdf-headers] ) + pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) webdav? ( net-libs/neon ) " diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index c30fce333de8..4bf3061da478 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.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-9999-r2.ebuild,v 1.2 2011/11/12 14:40:30 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.3 2011/11/13 10:21:51 scarabeus Exp $ EAPI=4 @@ -134,7 +134,7 @@ COMMON_DEPEND=" jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) - pdfimport? ( >=app-text/poppler-0.16[xpdf-headers] ) + pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( ${NSS_DEPEND} ) -- 2.26.2