summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-04-24 07:16:41 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-04-24 07:16:41 +0000
commit86fdf8f528ee9b978b015b45403b872f44a642f7 (patch)
tree5f8f907d5e48e39507e47c15552eeeff16babdb7 /app-office
parentmarked x86 per bug 413089 (diff)
downloadhistorical-86fdf8f528ee9b978b015b45403b872f44a642f7.tar.gz
historical-86fdf8f528ee9b978b015b45403b872f44a642f7.tar.bz2
historical-86fdf8f528ee9b978b015b45403b872f44a642f7.zip
Add back the cppunit to depend as it is configure.in unconditionaly checked and some test are still compiled at build.
Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/ChangeLog6
-rw-r--r--app-office/libreoffice/Manifest30
-rw-r--r--app-office/libreoffice/libreoffice-9999-r2.ebuild3
3 files changed, 22 insertions, 17 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 8e03fa407699..2221d956bc27 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.288 2012/04/23 16:44:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.289 2012/04/24 07:16:41 scarabeus Exp $
+
+ 24 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
+ Add back the cppunit to depend as it is configure.in unconditionaly checked
+ and some test are still compiled at build.
23 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
Actually delete cppunit from depend as it should be now properly separated.
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index c7c7c1f6c6a7..160525b07937 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -118,23 +118,23 @@ EBUILD libreoffice-3.4.3.2-r1.ebuild 18554 RMD160 0b79b699e3d60974db7793b41c9f8d
EBUILD libreoffice-3.4.5.2.ebuild 15232 RMD160 246fd5a3007a6de67ee6023c7bd6a89794692d6d SHA1 29546cda5ce47875b54c9b583261e0bc1b35e514 SHA256 24bff75483db00b80173eff9f60e4fe4117ee871183042a7f8bc2455a08e90cb
EBUILD libreoffice-3.5.2.2.ebuild 14776 RMD160 2d1a9687c1ccb08aa15e55f5e39d7a15d209c888 SHA1 6942905d18baad17e1607968020eb560fe28cdbe SHA256 fec6b2073236a6cd99f1ce5e1e2a0bab0edec849e7786e5a1a8e36b91325f350
EBUILD libreoffice-3.5.9999.ebuild 14643 RMD160 0fc580cfb56a74d6c0b8106538e2407e55272406 SHA1 cb0e6c702f0b55dc3911cdc61c0ea792c9f51592 SHA256 ad59dc7fb2a33e3f5827e7fc36da83db400a7598515768b66eac221569c58c62
-EBUILD libreoffice-9999-r2.ebuild 14576 RMD160 a770b5cd46f170bbc01d224fd6c2428c751798ad SHA1 0059654afefb41f68285e56f00a7e867fb4c774d SHA256 712697dd10b6e538799975cdf7deb2c83287f11445d9d950db60586bf9128661
-MISC ChangeLog 52983 RMD160 16642f7ed24aebf9da15fcc4b6a84968c0bb4790 SHA1 b9c3774303d1f6f6d235d7144dfdb5ead72bdf54 SHA256 dc45cf562fc5c913adfd5433f09f0ae143b888e9b742aeb2129529e284807359
+EBUILD libreoffice-9999-r2.ebuild 14594 RMD160 c5b9d8535969247ef18a785b44ff96c2d44aad29 SHA1 71c5937ff98b7e234c234a8bd1c43136764a4607 SHA256 a5d5a4e5a7a58f9590c3f86c7ee85d62c56d6d7c955730a542c2b14386a6217b
+MISC ChangeLog 53190 RMD160 682df0eb6036f54d30d442585ff50fbc8f57f013 SHA1 8c9f88025e039bf54290df681940a2553a44813d SHA256 d2d5d19b01f664478e17f1d5978d12ffe3b713575e8c4501ba845feaa949db72
MISC metadata.xml 1490 RMD160 0c1570336daac60ec87e2dc84a4f3897d5c3feda SHA1 5efa4d2ef0eb9bd9daa685202b97fdb6a18a7250 SHA256 6ab64c192679a514a95c3c594ca5d212ba60f02b1760352bcc1a6c22838a6c96
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJPlYcHAAoJEOSiRoyO7jvoBTAP/i4tL7MZmnfeHBTJG3J/kVdB
-QhJMpe8MBR01Zu+chUv9N8EczWtBPaH3c+1ZVIVnkPVUVZ0jB4IV5mq3M0aZhB4N
-zRR3n21EWoUH9iYFNcMQVECzzMe3GVknQgEiEz+uS0GDYZHM4t+QIohmjhvUtkm3
-SEW0/vhSXN4iAeQ2Dzi4UDaFoAxUCW8OxtdahM8L5H4XRg0nbzhGeXpqMwmCXsQs
-vWV/nMNKmFCfm0rUtz6ysDaIwcdrY98X1BQNFXShlEDCRqipxPNVjypszjbL7ngd
-AT8mGl+afjZTpViLfsePLrayg/BqhgOjqMqN7Z5hIgEUzGF6dhaUDoRQ0S+UPDZ/
-X2dWJ83RJ6pfFcxOQRYvis+r41DAqhPWe7SUg4SOkSpQkLkUuEsoRPr12TXhqkZA
-T1elXu3iXBw6qn7dhhlLXuTUEu/O36k+uQOXqTkP5WZbET8nf1sF9nQfLbNgfUGa
-/zLyTbUEYiAuKoRb3nl5983fseDaNUn4DLZd4HoGiB7EM/wJim9gWAb3NCGsyz4X
-LHVoFjX1IN3uN0DyDQI/fX4GCwymmit2s4PWvh1a+3WSdhOTQxlcrBUspw0YriwM
-bX15L1oV5dCLm6a59JAFxuznKE1lJwpK0Rv1UrBAArtZGdjuDiRnfpNZrcdusDbk
-Gt3PdBvGfaq7CV730ZU6
-=rUaS
+iQIbBAEBAgAGBQJPllRsAAoJEOSiRoyO7jvopTUP90GyT0ha7Poy12vG1+uWIrPy
+cXCQ4/hZ5mY81u31gRWzIOj9lM5gQeVvNC3nDfcefG9iZ8/PE27TkmgRlAxQITOX
+2qn83No+ujFs7WIsCQOfrSt41W+dumci8GZb9Ww6C6oDeC5n8TtY/cDcVakyKycZ
+CvDV+kVfaNzvM6SR32IhddrC6l7A++5qKSh66Z0wnxfRpEUTmpLvq3kXr/UltILB
+piK8HEeFj6hiJPHRuulMXQHLYNAS9apgy1By5DGRCUOM1EuaCBvhUDW47aHA+agn
+jJuQTg9FuzODS1n7RY0hHhDljOgsrYpDDu81+ZmuXr8vIbgmqSP27iWKjtdJ3XNo
+hVVVXhsAF4TsTr8EghIMjLxcC801NbakdG/6TkIbd6wZGw8TZqIhHPBn0fTDKA81
+Webnb/Am3kqe5/PhbmHYDWGKLULYyl7KmRz9Au3Q/PuMPbxwLXBu6O8ARTKr51pS
+4Rxmfy8hh8xe0y3ocI4zNClo+xOhA7NK4OSTCWp2dws2yDA+bnpJMMbGWDyOZ9Tf
+Zzy8bJY+UbGfYv0jngqejC1ymsrcR32FQ+0Un5583MvfJDo4vy6x9af/pAGS6Cah
+FyDuSDwEXsYButohhMMdQCxiloyeDp29jK81vY4lNUvC+rlIqrEXl0VHaWFbPom+
+VHpBltz8dPjabHH92dc=
+=tjWm
-----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 6d9f3690d511..d2a6aced93c1 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.52 2012/04/23 16:44:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.53 2012/04/24 07:16:41 scarabeus Exp $
EAPI=4
@@ -170,6 +170,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-libs/libxml2-2.7.8
dev-libs/libxslt
dev-perl/Archive-Zip
+ dev-util/cppunit
>=dev-util/gperf-3
dev-util/intltool
dev-util/mdds