From 74c7fa0f762c736768032a3b5030d18cad02b737 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Sat, 8 Oct 2011 08:23:15 +0000 Subject: [PATCH] Require also cairo useflag Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64 --- app-office/libreoffice/ChangeLog | 6 +++++- app-office/libreoffice/Manifest | 14 ++++++++++++-- .../libreoffice/libreoffice-3.4.3.2-r1.ebuild | 4 ++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 10e5f52d33e5..9ccf4d247246 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.169 2011/10/07 18:23:58 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.170 2011/10/08 08:23:15 scarabeus Exp $ + + 08 Oct 2011; Tomáš Chvátal + libreoffice-3.4.3.2-r1.ebuild: + Require also cairo useflag 07 Oct 2011; Tomáš Chvátal -libreoffice-3.3.3.ebuild: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 6a5280992431..c083caf87a41 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1 AUX fix-ooo-collision.diff 1253 RMD160 6ad0355c7530d5fe490ea377ed10e047926f2ff7 SHA1 41a3a26973f95531cf76a673eb7b7bab5c50de91 SHA256 991f311611f812699c8d39df85d64d9041d6033ddd73d4aed10ba019406733e4 @@ -148,8 +151,15 @@ DIST libreoffice-writer-3.3.4.1.tar.bz2 6778265 RMD160 a2a3bbe1f8e6ff0f03b419ece DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6addb59fee22ace29 SHA1 57a549b811c0b95898a9532968ce4a9f6fc33f16 SHA256 65fdcb132a84fae9f4ec0d84501f13ada3861fbd7646947ad0cea495b637be9a DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c EBUILD libreoffice-3.3.4.ebuild 18143 RMD160 567f3a8d7b2267220770f600b893d13028db6f26 SHA1 f525de7d3ea068f38ae62a6887d0e0aadf651592 SHA256 4e7131a8fa14b4224068a21473093a16447086d0d9e390ad74faaffc72ec8ff1 -EBUILD libreoffice-3.4.3.2-r1.ebuild 18436 RMD160 b191fa9979d6dbdaa1bcd28e2c6d2f9032bbc1e3 SHA1 8257e6ccadccce2be69f4b505434b6797acb069a SHA256 db88c53de529b6375dc88e0d80a20fb9e60c6662141ef0a6671cfb266c4b67c7 +EBUILD libreoffice-3.4.3.2-r1.ebuild 18443 RMD160 003fac975e22979f6d83775c74bdce01f68b0fd6 SHA1 ed41080e7477a81c87536f19b9c71daf1cf71bb2 SHA256 cc07b25d5c374c493fe3b90fdab63ca196f346cdd337638c1d31ba82de153f57 EBUILD libreoffice-3.4.9999-r1.ebuild 16232 RMD160 c231738d7bddf6864506de2340e689741516de06 SHA1 c1088425b7f4e05d206c9fb82852cab485d3023b SHA256 854be998206ea97ad425a41e2b287aa4e4f9c4bcf2da8b39bf5e5e0688d6fb18 EBUILD libreoffice-9999-r1.ebuild 14388 RMD160 e054aa7c5f3f7d2d50cdd7ee500472310004c9ce SHA1 66f2b524d233bc5a8fe52a430225afa93080a09c SHA256 42be374e78e6d3704967df75db6593c9ed9bf4083ca3e79712e85a18b0ee3427 -MISC ChangeLog 31194 RMD160 9c189386dbcc3941230194e76a98eb917fbe42d7 SHA1 13db140f58858d72d8da6096b7489ca3c6c7df37 SHA256 f7b450270b086c10d2e26e9284ae0d8b826b9ffe5254967e5074cd45805e228b +MISC ChangeLog 31312 RMD160 83a285f7c9e753d4b1da77f1a1d60962f150c0ed SHA1 3c6ded81d790052605e47dc8bda9b50058bc42a7 SHA256 94e61a4adf21a01a14858835c7c5abb2e5671bbfd4678c046adf201014f63792 MISC metadata.xml 1288 RMD160 c6b52caaa3e75c7397e6861118161c8a1fc5c71b SHA1 853447f772970ae4fadd8946514ca8e5fdd2c94c SHA256 be7565ef5c1d68c3d1403d267adde287588d51145da8f374ee247ee5549f8a9c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iEYEARECAAYFAk6QCIEACgkQHB6c3gNBRYercACaA+p8RNido86ooRvHjWu5jBNa +KIkAn1zCIWS9g7c2FCIbvSvGqRxJATSl +=6+8N +-----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 032d316bdbba..7beea3485bba 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.9 2011/09/30 10:09:16 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.10 2011/10/08 08:23:15 scarabeus Exp $ EAPI=3 @@ -122,7 +122,7 @@ 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] + >=app-text/poppler-0.12.3-r3[xpdf-headers,cairo] dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.18 -- 2.26.2