Depend on added libtextcat and reorder deps.

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index f5dde1e349be4ae3b90c246daa8577806713a6f8..c60253819ab56a265353e19f81f4787ab1ea854a 100644 (file)
--- 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.95 2011/08/09 13:37:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.96 2011/08/09 14:34:42 scarabeus Exp $
+
+  09 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.9999.ebuild, libreoffice-9999.ebuild:
+  Depend on added libtextcat and reorder deps.
 
   09 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999.ebuild:
   Drop packages that can be done externally (yes i know this thing won't

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 42cc28d797479f49030ac1d3dec94d9f2890db64..f30f458075cd747e2760242fa0ca5c6b6b4d5e61 100644 (file)
--- 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
@@ -168,7 +171,14 @@ DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712
 EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf7b1e0 SHA1 60ef1f62c341ce7997de7ff5bcef04b304f4dfd9 SHA256 a3fae0a7f7da4a92e67d9c86ba4e7f92a92bbfac8f40a2703c64f317b670da6b
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
 EBUILD libreoffice-3.4.2.3.ebuild 19258 RMD160 98feedaa6e9f65d571ee7599f8da3afef748cac3 SHA1 3c8d81230332dd40654373231c36e15f8d38f08f SHA256 77fd3a15d8151762dd4b154b76ce2ffe103a797e50f331e8c525c41af29f8b03
-EBUILD libreoffice-3.4.9999.ebuild 19183 RMD160 b29a219e83802a608a0cc0b8117db8c17782e529 SHA1 4889b01a357abe49f3489f7f7ec5d5648672d36b SHA256 261c78a93d427cd8a4682480e116db417cc2382d8d8af512eb72c91fb180f84c
-EBUILD libreoffice-9999.ebuild 18521 RMD160 8f3a137e88a7c31950026b67936e5c16304ac82c SHA1 94d89ff00acebbe0662c8eff08aa26ab109bdfd6 SHA256 6adec8c7e910244626120f348eff03735d73c706859e8a4fe748f897fd77fc66
-MISC ChangeLog 18885 RMD160 e05c5bb2532b476d0cbdf69a41e3b0eb75835a38 SHA1 ae0b8a64fc0fd660a8f3be2561b27352f3e3a02b SHA256 6143d956b0243d8e5c17f0437402f03684cffb60a4f063c58a718f3dda88b33f
+EBUILD libreoffice-3.4.9999.ebuild 19183 RMD160 f89233c47402266b47bb2ab32a9581d1cbee5787 SHA1 ce687eca34d858d1d808ee2c013de57695e86050 SHA256 d19742b93a9ed75040b96aa069b27cc43d78c83f83500c24c619cdcc957f8056
+EBUILD libreoffice-9999.ebuild 18542 RMD160 f92b73e8db02a79082cb1a805ddc536f85ef2cd8 SHA1 534a93b9dba61e42f28f9ef14c96b5843bae5472 SHA256 bb522fb72627196f20ea3e163f322c48b81f460e0947ae3885d4ba05384683b4
+MISC ChangeLog 19044 RMD160 1f369d77ce3849a716305be06188f3200cfa22e5 SHA1 ed845d2f116d07b3a8ca7a12ab28f01a5761ddd7 SHA256 63e413b0a756c1e93479ca75b433525fc4bd047b06a296b357276394861bedce
 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk5BRZAACgkQHB6c3gNBRYcmIQCgvG+wQKPntsSOB8YXRf9Ctiyj
+VKgAoKhjqMURoHdYl71EwvEoYulOADNW
+=diVF
+-----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-3.4.9999.ebuild b/app-office/libreoffice/libreoffice-3.4.9999.ebuild
index ac78606a423454aee8118ae70ec811ac6b2cfae6..2e945c8d576740b9fd4c43ca9803eda64ebe49a2 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999.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.ebuild,v 1.13 2011/08/08 09:27:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.14 2011/08/09 14:34:42 scarabeus Exp $
 
 EAPI=3
 
@@ -133,6 +133,7 @@ COMMON_DEPEND="
        >=app-text/hunspell-1.1.4-r1
        app-text/mythes
        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]
        dev-db/unixODBC
@@ -147,7 +148,6 @@ COMMON_DEPEND="
        >=media-libs/fontconfig-2.3.0
        >=media-libs/vigra-1.4
        media-libs/libpng
-       app-text/libwpg:0.2
        sci-mathematics/lpsolve
        >=sys-libs/db-4.8
        virtual/jpeg

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index e7a8bad1958407b86699f4968a54d4786b1aa0ff..6e9f6f1c74c23319c73fe788a8afdd47c10bb73d 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.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.ebuild,v 1.5 2011/08/09 13:37:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.6 2011/08/09 14:34:42 scarabeus Exp $
 
 EAPI=3
 
@@ -129,7 +129,9 @@ COMMON_DEPEND="
        app-arch/unzip
        >=app-text/hunspell-1.1.4-r1
        app-text/mythes
+       app-text/libtextcat
        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]
        dev-db/unixODBC
@@ -144,7 +146,6 @@ COMMON_DEPEND="
        >=media-libs/fontconfig-2.3.0
        >=media-libs/vigra-1.4
        media-libs/libpng
-       app-text/libwpg:0.2
        sci-mathematics/lpsolve
        >=sys-libs/db-4.8
        virtual/jpeg