From 72621196b19501a6585282649e4301aae96a055e Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Sat, 17 Sep 2011 10:32:27 +0000 Subject: [PATCH] Hsqldb is actually required with +java. Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64 --- app-office/libreoffice/ChangeLog | 6 +++- app-office/libreoffice/Manifest | 30 +++++++++---------- .../libreoffice/libreoffice-9999-r1.ebuild | 3 +- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 76ec4ce86aa1..e75c42be87af 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.138 2011/09/17 03:58:44 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.139 2011/09/17 10:32:27 scarabeus Exp $ + + 17 Sep 2011; Tomáš Chvátal + libreoffice-9999-r1.ebuild: + Hsqldb is actually required with +java. 17 Sep 2011; Tomáš Chvátal libreoffice-9999-r1.ebuild: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 2ac76dca218b..1ceb961487fd 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -173,23 +173,23 @@ EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c0 EBUILD libreoffice-3.3.4.ebuild 18146 RMD160 1c71a223f37c402ab01d95b71dfa5af2c69f61af SHA1 18c1211e8eaf8c587f52ee303dc264c941e7c045 SHA256 d602a3efffc23cb848b1fdc667a0d7b1c9dde2502dfae0fb537fecb9ee744cc2 EBUILD libreoffice-3.4.3.2-r1.ebuild 18350 RMD160 54bbfb6be956667016eefe1dad15737cc44e1deb SHA1 59dafcc4461a5c8571f814b41843950420b54fdc SHA256 8f883984653e50045ec2404ce4286950bafd82cf31e97347edc38a61e1fe2b4d EBUILD libreoffice-3.4.9999-r1.ebuild 18356 RMD160 51b1cb846c7900663975354fd6f1d7cf0f22a177 SHA1 c7c39420e80a0644d8260db8be7a6df4ac5f6870 SHA256 028fb7cbf31d0e5189d226d7fe6d78a5fed657cddbadb84d3801ba5665f1ea5f -EBUILD libreoffice-9999-r1.ebuild 16752 RMD160 4d59c585d852292c4eabbcbe89f4fb395a219aa0 SHA1 949dafa99bf6d460a97fe86419f0845de9044206 SHA256 9028d16957e1b79b09d0f16274c5a3bf4b6db91370a413ab4eab49d28c057c1f -MISC ChangeLog 26929 RMD160 a7da1c9652fd5a228165bce0dfb067abaf890dd4 SHA1 58b035a57772ba9349e7dccef452445e4a39e206 SHA256 4205ffd0eae326827ab38748f2c090a65d6f280a6b45c8d2ad97a26ae7552d5b +EBUILD libreoffice-9999-r1.ebuild 16841 RMD160 24f38ffa38b926a50b2f201bbe2388d8d5f70957 SHA1 40619e043a94a9922f56a33075d8580a944607b0 SHA256 9112073c0de0974afdb1aeda2d354eccddadc8f10bae65cbc91549fb53ac79b7 +MISC ChangeLog 27057 RMD160 b61d5464a365cf5673304722c4d344af3d4efce6 SHA1 fa075a3a1491646e1924be656ff346758ed7185b SHA256 0e079b7a29d5ce941f685da79290c63c27ad3acf9f35ce5e9007082b4344a734 MISC metadata.xml 980 RMD160 5201a4943c69632cf94cfaf309fba261ea5146ec SHA1 069a007c495275783c7a025f44e4f1ab59edb715 SHA256 191a40132b182e7dc3f504055341014664f42d74caa27ee8dda2b5edbbdac6c2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOdBsMAAoJEOSiRoyO7jvoNGgP/0mlF6CVQ148RxZRKE10W9es -IV9C/ZrhHINngqgyy9zC3UEFkSHYS2DAbMrkabIcfPe877o/BqdKBI38pxojqqyn -kW6gsAz1qvkNN1SbeUjQJfzhcOmSsPUwMoqB++O2oXrrrkN7zP62YdkYLuqbFQSy -off1CXKGSqS+hUxNTfylSOieEK3BjXcNGncO0zGzQKDjSZQcIlen8q+oj9M41GMR -7yf6o5vWLkxksc/2nWraW7G7bniBQ3YlxMThh1HMLY8asRDAdV/YWaQGgVn/BOEb -pw0dxZOa6oCOlBuO0YukGv/5X8anHUgJzmgcRu3Motb4/07mOZ+WXO4d3X8qXtZB -bh7nzlhG/H63nQNxpT+ntWx+bVLWgay9pNazympKMR+6cu6Za3ZXxa6zirtEOFva -ZAmmt8WOwB+D9MkpaPFcDmctZzwzzzNCUwfIZDCFIJ5s63tZPx5VWluTZKhre306 -9OZYbploZKTQfX+VFgX+hCjyNDsPIpjO9/FjIH3PweJA+AaNR5PlCq6zW4C593FN -26G9wesbcoSyGVPxJv7adukSK1Kg2L7X/FrHjUyp2U/O6g/BIz1L0bLIqrCyeVi+ -0paQ3zmvLG5lHbITE+CLVPxNnipQnf/B40WWOgu4wKCqUavzBNjis+GBq3SL2uv9 -RnW7KqhmWwKH6MwINykq -=eMhr +iQIcBAEBAgAGBQJOdHdFAAoJEOSiRoyO7jvopDQP/iSsiHuEDrltxlVyOSp70zjR +UUPxmqQjZqQ+1Cg88wsQ4YnNQ7k3+duE+sstjut2jzEbcbSIlZfaYwcPtKDf/mkd +s9WDsNLHx/xxemBB28Vos3NeuXNXI4mOCKcMBUwNbvHfVFBXMgUPvXaKW7LYOvGM +A8eNqRVdBU5meKfKPumDo4Yw47g13eVOK5MiviKvgslIPbpleQIz35sIReDebJ47 +QPnC0HG1FMaAU8pU2Yd/SuW/LflA60UdyVHOrhIr2buH7ZJXKk69cNQyb66n60ia +RTdIVA+GUFi+LH7jorKmlM3B8rv5W4e6zHr1nkKbdd/YPjkGnnRAwzYAQ/gQDzoh +hAaH2v8b4njNs26Rq7Zjuz2E4Wi+XSLlr4K/Ag5lpLBrug8/iGh0YKZG/8uMfWkQ +I0WM7kTP32EOTF/GDmxebjIM+eyINqbnGx0KWK3Ilb70VPOebNaTbZTeaBzjSqjR +tCgzl4iGvMn6/RN077Lts/QRPloirLeW8OCTUSDBtRAP/suj2Y2n/Cnoih+qbMg0 +nUq88ReAz9wjbgHezbx407FEIYN1baRhH37Zs4gqQAnE7VowA6s3n9ZJwKNGAAWT +h4cuzNU6ZRQXQg8z8V95ahjGZ0FxHKOzN40cvN2fD1H/8MHUNLrbZ4yEtuQ4Ka9F +WJpvB4tVy5ujrkl/bclC +=jWp8 -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild index c18f431becb2..e9277bdb4e6d 100644 --- a/app-office/libreoffice/libreoffice-9999-r1.ebuild +++ b/app-office/libreoffice/libreoffice-9999-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-9999-r1.ebuild,v 1.14 2011/09/17 03:58:44 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.15 2011/09/17 10:32:27 scarabeus Exp $ EAPI=3 @@ -81,6 +81,7 @@ ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-L # REALLY REQUIRED ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz" ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz" +ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" SRC_URI+=" ${ADDONS_SRC}" TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt" -- 2.26.2