From 7aa730dbdb0a8c8a1f33dd6e89127f4fc54a477e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Sat, 21 Feb 2015 01:03:52 +0000 Subject: [PATCH] Version bump; add patch for bug 523822 and sandbox workaround for bugs 540624 and 501508 Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xEBE6A336BE19039C! --- app-office/libreoffice/ChangeLog | 10 +- app-office/libreoffice/Manifest | 41 +- .../libreoffice/libreoffice-4.3.6.2.ebuild | 623 ++++++++++++++++++ .../libreoffice/libreoffice-4.3.9999.ebuild | 7 +- .../libreoffice/libreoffice-4.4.9999.ebuild | 7 +- .../libreoffice/libreoffice-9999.ebuild | 9 +- 6 files changed, 674 insertions(+), 23 deletions(-) create mode 100644 app-office/libreoffice/libreoffice-4.3.6.2.ebuild diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 978f6955a6c2..a18497dda78c 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.617 2015/02/15 19:58:47 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.618 2015/02/21 01:03:47 dilfridge Exp $ + +*libreoffice-4.3.6.2 (21 Feb 2015) + + 21 Feb 2015; Andreas K. Huettel + +libreoffice-4.3.6.2.ebuild, libreoffice-4.3.9999.ebuild, + libreoffice-4.4.9999.ebuild, libreoffice-9999.ebuild: + Version bump; add patch for bug 523822 and sandbox workaround for bugs 540624 + and 501508 15 Feb 2015; Andreas K. Huettel libreoffice-4.3.9999.ebuild, libreoffice-4.4.9999.ebuild, diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index c0f5fca7cd36..39c79cf4bf97 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -33,32 +33,37 @@ DIST OpenCOLLADA-master-6509aa13af.tar.bz2 9691335 SHA256 8f25d429237cde289a448c DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0 DIST libreoffice-4.3.5.2.tar.xz 152786724 SHA256 78e6821a69f37b6c0c2c8d436aef24810d0a76b5d087ef95f6107a6bdbef2637 SHA512 4dd9737c53b080413458fe63e86c43514c0c44f77bc5eb680f615af584a3de4f4733644658d8e53b2b20002e7ea003c2116b6ba3a58f3e581f9fffbd6b7444a9 WHIRLPOOL cb7c74e5f282e92bb715848f904ba155015d91514edff3151aac0f3ff0a14592a31b002e629ddccdd79951b8f18c3174578cd25dcad57a93d5d74edb63c978e4 +DIST libreoffice-4.3.6.2.tar.xz 153142516 SHA256 5596dc38bd72bce72783bb04e014a3f64d1e9ba49cc8e6a9d2d52950309dda97 SHA512 a00b953b2dfa4dcd1d09866cb68b6326c39c13d699eafc4cf0d80a26689f71842456ad0036f774e10c9c2d6ec754d5ea6435dad1f615f27bae5516a55a14170d WHIRLPOOL 21b627c21b324548fad5afefdf5456e092188f96d1497a76dcf7c0b2e6c7265a001bfaf1bd07d9cbd17adabd70a92887a555b932be621ea69f182b5e75020ebf DIST libreoffice-4.4.0.3.tar.xz 164003832 SHA256 d168f3d27e840a861def7739515b4093635c422275b11b25bddd783519300cf7 SHA512 0792b9441a2030fdd1b3f4afc660993d63a069575e6426e3cf367fd8a57c684bf0cfcedc82e8bdc473b057cd6f5b471a773e98b148333f4e5885e5b8a1f9bfb8 WHIRLPOOL 90535c519edb5b4295d659c3188f215e298e05c27e8a4a8f957065974f533cb4078f825e5175c8e2048160dc1e4e6c331314671d946d3b3d59c1182559091345 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538 DIST libreoffice-help-4.3.5.2.tar.xz 1852412 SHA256 78b586931d8e085aa18d137711e7c878f858ea386a80ee673b0a787953836d92 SHA512 8525cc1bef1ac95a89c3100e137793bdea9ac05a85468e0ec96c6a360ce65baf3dfef7e634d9e8dbc644dec138df2b979cdb8a636ff27cdb7ee652ddee114236 WHIRLPOOL f5bd7d1da705e20def1cc6bff3dd3902ce6d77e2b5fb977860a4fbf9748a6ffec3524fe9ab0e2c539ece015082aadcf9f7392a145862ebb20f4abc117667b25e +DIST libreoffice-help-4.3.6.2.tar.xz 1855080 SHA256 adda6c20e3a1de48a026b60938b546dcdd2b2d54aaeee5bce9cfe813c222a556 SHA512 e012c00b6164c72c16aff70563a662c73bdcb2825668e0422a458af6d15edb796589043f74eb8d5a6189cce57677b52bb28b9f742bef655a03c973df8c2544f4 WHIRLPOOL 907c835e24ddf72da05cd1aa96325197050f44c4d6b7e2ba2ab9a83e30076ea4158dc404ab613bdc6f9c75288d0279259cb8ca98442983dccad8fe96b4416529 DIST libreoffice-help-4.4.0.3.tar.xz 1875968 SHA256 2d805934b8fe74ca9478d550ca21c8237a7b88e2e7f48d2a74e68bcf76115415 SHA512 f00058026e6badf1a560ea36f1de10f85c004e47e537e6359071b98afa1ff5867580c4ebb1694e1bf8f8cebd21e3e3fd649bc0fa4712c0aa417b615d7d1c23e9 WHIRLPOOL c4a446430b49a82597c34f3bd1fae6c3fda115cfadb23ee98c95eb9d8e27dfa585f5ccd6c4e410c8c7fedf431d1e63caeb154a4c6a5805840ca25fd9c0e858f0 EBUILD libreoffice-4.3.5.2.ebuild 19013 SHA256 4c5191d59fab78f7f012136d6fe86f44193078eed9835d75d8c414a1becbd313 SHA512 967680d1bef3490d4b18c6f0988655cd4b0ebca2542a478d0fbec2dea9480385d9031c1a3c99a8636db2eb7093f975d17e0ab7060e1b2903876e2e077069d079 WHIRLPOOL 7e1fddeec64014fa0166e63f54b67cb1a4a485075d1957b6a855c2527b949524e38fdac215c94c05200f49e328b7453ea93735d7284e73b372839013c14a1e5a -EBUILD libreoffice-4.3.9999.ebuild 18950 SHA256 3474548076ed265be8b95cb08d3dd945a291dd2ac9a86d18fb6b88a033f72f33 SHA512 5ec65696af03a4637fef6ac86182d9873565fab9397fa459fa5c507c1015798a3dc0236e3f64a8addb9abb5eab76e8bcdf3677c7d307a4d9e0c2692e18edd28a WHIRLPOOL 064061116106c8a9e1bc8fb6ef2975ba8df15035a965fcea0210ecce2cfd5c5437a8677760243eb4063062a615a3d1f9c88144f11d1b760b2f510e03a17b80df +EBUILD libreoffice-4.3.6.2.ebuild 19117 SHA256 e15a660ff36215d0463e649115f00b16a8eced67d44f8a9a9c064a95b044beb5 SHA512 cd5f296383c2ff72d35ccd7b4b26e5324611d57f0da469ff56f82985fc32e8dbef8e5c51523ff8260010fac0657f7a525082c641d8f0d2104e8fb84137e987c9 WHIRLPOOL 6a41296468272c3167b962f176d85c2cde66794bc8a9370e8022183d5448f63c32db8553d6ecba3394e3c3d6e628bfb6ffd29eed417e5308d3bd8d6cb0425181 +EBUILD libreoffice-4.3.9999.ebuild 19119 SHA256 0d1cbf42712b12e9e85b833acffaa5829416ad37f23c7d589ba4f36bda6d4b5f SHA512 b1c84c63523d8ac25f1746b40e0940d2ae1ffb8c0d7fe54c6664b1ad0498104c30b72b6db1b5e1121f923d7d58173c8541ec5a090c1e78387adb3c61954a1dfc WHIRLPOOL 0e3031fc37af6a80ddc3e21306234e5ea865601fad986b6f043ed304b49d4ee763417e32a54f88a7d36ab487962f39fd7bdf83cc69995d1644d99dba887563ef EBUILD libreoffice-4.4.0.3.ebuild 18614 SHA256 8c8a5129dd429a96d1edcaaa50eef58c1cddf667d9f0e7a0f46138202139e45c SHA512 e09751eaf973fcfb5023a9e6af7c1d3672a9e17ce1d3e25a9adcd7f3e1f8210db501a7907e007bf2ff95e5bd645e513ca7c9476141c88db3f78e551a99b2332f WHIRLPOOL adcb10971253069e8fd55921b6f87b0ecb64c4bff500355487eb6ce1243c7b6d6978e3c227196ed8ef52abc7c119cf379d091ad68d23ce53e720b992374dee57 -EBUILD libreoffice-4.4.9999.ebuild 18603 SHA256 ee3cae2ca0bc604250f74725a809af9aaef2a5841eeb0929e2bbaef540b1f402 SHA512 5cd8673665841605bc33aca1f54ffef46aae26efc77761767e4f0e0cac73a9654c477f47dc6a3b5e974df3fdb1b4bb6c560513091f575b3daad37db2734067c7 WHIRLPOOL a5fa225d33a01f158b65e9ff58c32a5c4fcba8ceabe7b78c6c992cfb1ff9384ff73930abf821689df10cf344526b75405de694d49a49ab1f35e796118045c70e -EBUILD libreoffice-9999.ebuild 18522 SHA256 c6d6632a4fdbf5fd3a59fa2ce101adc082cfca810bc40941f0c90067deeb1232 SHA512 6f22baf8d799557cfaece7084c7a2cbad760d4f12c0597126b16fc66bd1e43cd10e55c6a8b2fadd36b0561776d981a42bd6483053125a979c4da40b6b085d3b7 WHIRLPOOL 40ea82d264935040a79389c0c5eea0ee62ff948f8b54ac86d2ef7c1ecb17ecdfdcd6c89127fd35b3381c176ac5bb72cdbd3153bce0683b6541e9384b4d703d19 -MISC ChangeLog 3000 SHA256 26969c47bd7d305642ba0a2871876ec333c896d1b57f315822de01b40c1d7ba3 SHA512 8ce02fa464069a6f8d9465d7015949c8c6e92ca72af2197e7dbeb27c7a060031753f09cbbcab42c497a7bff66a241e0920cc8d7461c2cab2e4ef59ebedde3f78 WHIRLPOOL 9d4928fba21e0d5dc788d0196d666a7b807279e8413d42796c281b8ab54768f42bbc25da85ff642b9ddb2bda9aed8271cd5a6de0699029e9ed9399ce4dcaedf3 +EBUILD libreoffice-4.4.9999.ebuild 18772 SHA256 923d7316dd72ac7c0a9ef7ce79bdecfaa252461624f523aa23f2a7930c2c5e1d SHA512 b9d880400a5dc20bc323ad16d457f075ff719168c385e28c9733cba7ecc958f683ca3235b640baeb628c3a91e43b0b894ca0a228521bdce8c4f30df7288f6c44 WHIRLPOOL 7e9d59eafeb9b04301447c148fce22aaaa8a91863c93be8c04cb86f5c06184c42bc13d9c75c8bcfc104c0b954ea317894ac551a9ecf853e8d10ee56d17acceef +EBUILD libreoffice-9999.ebuild 18691 SHA256 8a01e22bc07e796926220c5fe8ec670dd4f7f3edfb71473b6077a96a34b0db20 SHA512 9d30b4c4d9d298d568cd9a25d1fae4b3e32d47864612d6cb2170e4886c2cdcd70168c26409561ca5e08d14755b4b82cce1419ab0b8b3f9026f9a07bf5068d012 WHIRLPOOL a2b7129102aab431270fc37aaaa7bea14037156b54d2552e4fb0056e07fe85dcd5ec7169e1e46b8403b97ae37224f226140242bda348bf776df2bcb7cc5ce45f +MISC ChangeLog 3303 SHA256 17761f5a4e25fc777db99ca1f6af06792e03a2d63fc70c4e3de53a4d82219424 SHA512 dd38a476b2097d777be4d69f989b637f341bfb289acf4ad395015e09ae2bd88e91a0dd8f39ef40b13fc81e4859756992080d858c280aca9b92819bea1a17bc3c WHIRLPOOL deaeef591ab64e0795dd8a901c62d38e5e2a004207e26ef893503e94d9eb09d095edf7dbc607d199431994a5c841dcdc2b4acf91ce256a72ff8c1609717aece1 MISC ChangeLog-2014 109721 SHA256 db62affd74b541212d4043dbc88acf51fb8aa36602d6e5625cab9b0b823a54f7 SHA512 6481d8f26924300ca46f0cd216962167b6ce5d53028558b0128ed4f996a8cf5576182e9e511493e4b57f628189fc127dec9ce62110bc8d3d85c6d4e2a815bf26 WHIRLPOOL 76c87a30a9296f64675baeb5f77a8500b9b1ff25c6edd5a5d0b984dc3cb3b3aecee37938d882194d6be58ef34c8b1925c1d9b8b7a7b786a5d68539fba714e627 MISC metadata.xml 1170 SHA256 94d12aad619c0489c65857246c536b65ae98f1cd7fd698fc0cc3a59972887c6e SHA512 3baf086b2cb75fd88d1044df055e443d46824041d9741172769707f25b7e284ce96dd16292454c1321e0078546dd694770c4111669a4ad394cea7c5e4b5e1a5f WHIRLPOOL 4c326355000a944206b8b85a8a40f7467fb6012d38b2934c8534003e4a4c20046363fd6fa07f189a5cf082887771e581a28cf2910d78a1158f11be37324f7c87 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQIcBAEBCAAGBQJU4PsDAAoJEB9VdM6hupKVqHYQAI+HnUkwe0yVL+YpfoMdK7sc -p/tGDuN/285/bm0QkTdPOhr4/7D9cTnUNI10bsnzjovFZLKfkHfVz5ciVcLN8lfc -x+3UVZFCMeMTQmx/dt0ZJDQv8JNdDYTDAt9X8TcIOIkiUoKZFOU3HJoURPp70SIl -w5V3GYCxw75YQsB23I2AUCAr7bbZ9YlNpEkC5jb9QQ756QOSx+l9h8+LPUbn3XHU -HZrUhJK/RgUKDmvTjUuH0912ksy2Wz46d0w8W4Wd1f6Ob2pBJ/nJYZ4cQBllsoHc -7iBvzT9pjRdRFMqhVykIFdG8ii6Hiy189q1/eJClnUvqesUvFJLC4VFnqaD4QVrP -yJ6bM/lWB1Xrb/ek72N5LG/z4X2zqrKmOGEWqqpcsFe2HuH/vssmqD3A33A2tKQY -i9yKvf4xDljBHPGBC6K51Ei/piEbRSE2t5KrLnP6hw4E2shvOb0/rkGS5rtNyoyh -/M2KcLCAhFboOH2Y8gDLvZNF6CNzvQQJvUuAAjdYANVhEPnunszL3AzloSWXXpAH -S/T8ixcTIAiGCguWffgVYA7msMz6DuOF0nLC8wylczJ90q/3wYySzZF3e/Rp+Adk -l2HC96h/of1x67ayFcCPVAa4tFj96PazlooQZER0JQWDmmRrdHIlly+KqiqKbrAK -9XO09XtDEqhTs9EAQTOv -=CkNB +iQJ8BAEBCABmBQJU59l1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF +QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOch7QP/j/XuYjq8nmysHh3ZFSj1V59 +qj4fxrggyTg/qQs9ohpDgMHzdq3z7jS6kTXfyyWkTSSE0lRepOk6Fy4TRdNCzYm8 +2tDRlQFO7/t0qbzoJJMwXtPb7M74fDvu9IaP/POQab0ixM7R4DWRJqdVMxtl4yGj +9yJJxwiaJijlvxC7JL/vQIw+A6a2U16ZYxLlN7DpjlzrP85knQJaXJBLqjDe/+eF +HYBHXHjgs4adiZMzvHBhnLSTCeCIQ25DOX8b0el0Kuwb7y3BQkXh7/Xve5YgFKcz ++5aNyAv+KPIC7cpoA3kSjbmNs5ZH0dd3Vz6pQaLmTgl33LBZN65YKo53urTexJ5s +drFJ6uQ8LPiEMzWbKCvDe8JntcN2SQvdcbKKla0cjDKjVFaLOPiEvWbbFDWV8IGM +zaRzuG3FUf4PlMAh1eJLz9525mgFZId1hNOpDucP30Gz4sPShHXLqagKU8Fo+Hfa +Mj64tF34H5MGLGBYQWHMbTO4tvJ/cvmFGcMdbUGQSV6jB4ItEf0QcN59n01DV1gF +heFpw9NKb+8sQ4OKLGasVS1bjREvpSdIUZlsGkZPXV83gqKskHq+VEBHHdvjQ6vx +HkgqbnkAO+Co8zg3u+xiYQK8pXIxg5+gSIz0fkxUSpO/cgqytoCtXZFRgPFNPxa+ +hzA+vmmjw21f7T45fEVD +=mL9T -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-4.3.6.2.ebuild b/app-office/libreoffice/libreoffice-4.3.6.2.ebuild new file mode 100644 index 000000000000..c7fe325d1623 --- /dev/null +++ b/app-office/libreoffice/libreoffice-4.3.6.2.ebuild @@ -0,0 +1,623 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.6.2.ebuild,v 1.1 2015/02/21 01:03:47 dilfridge Exp $ + +EAPI=5 + +KDE_REQUIRED="optional" +QT_MINIMAL="4.7.4" +KDE_SCM="git" +CMAKE_REQUIRED="never" + +PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) +PYTHON_REQ_USE="threads,xml" + +# experimental ; release ; old +# Usually the tarballs are moved a lot so this should make +# everyone happy. +DEV_URI=" + http://dev-builds.libreoffice.org/pre-releases/src + http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/ + http://download.documentfoundation.org/libreoffice/old/${PV}/ +" +EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice" +ADDONS_URI="http://dev-www.libreoffice.org/src/" + +BRANDING="${PN}-branding-gentoo-0.8.tar.xz" +# PATCHSET="${P}-patchset-01.tar.xz" + +[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" +inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS} +unset SCM_ECLASS + +DESCRIPTION="LibreOffice, a full office productivity suite" +HOMEPAGE="http://www.libreoffice.org" +SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" +[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" + +# Split modules following git/tarballs +# Core MUST be first! +# Help is used for the image generator +MODULES="core help" +# Only release has the tarballs +if [[ ${PV} != *9999* ]]; then + for i in ${DEV_URI}; do + for mod in ${MODULES}; do + if [[ ${mod} == core ]]; then + SRC_URI+=" ${i}/${P}.tar.xz" + else + SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" + fi + done + unset mod + done + unset i +fi +unset DEV_URI + +# Really required addons +# These are bundles that can't be removed for now due to huge patchsets. +# If you want them gone, patches are welcome. +ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz" +ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code +ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" +ADDONS_SRC+=" collada? ( ${ADDONS_URI}/OpenCOLLADA-master-6509aa13af.tar.bz2 )" +ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" +ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? +ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all +ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino +ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable +SRC_URI+=" ${ADDONS_SRC}" + +unset ADDONS_URI +unset EXT_URI +unset ADDONS_SRC + +IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer ++gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test vlc" + +LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" +# Unpackaged separate extensions: +# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf? +# hunart: only on ooo extensions -> fubared download path somewhere on sf +# numbertext, typo, validator, watch-window: ^^ +# oooblogger: no homepage or anything +# Extensions that need extra work: +for lo_xt in ${LO_EXTS}; do + IUSE+=" libreoffice_extensions_${lo_xt}" +done +unset lo_xt + +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" +[[ ${PV} == *9999* ]] || \ +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" + +# FIXME: collada? ( media-libs/opencollada ) +# how to configure system-collada? +COMMON_DEPEND=" + ${PYTHON_DEPS} + app-arch/zip + app-arch/unzip + >=app-text/hunspell-1.3.2-r3 + app-text/mythes + >=app-text/libabw-0.1.0 + >=app-text/libexttextcat-3.2 + >=app-text/libebook-0.1.1 + >=app-text/libetonyek-0.1.1 + app-text/liblangtag + >=app-text/libmspub-0.1.0 + >=app-text/libmwaw-0.3.1 + >=app-text/libodfgen-0.1.0 + app-text/libwpd:0.10[tools] + app-text/libwpg:0.3 + >=app-text/libwps-0.3.0 + >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] + >=dev-cpp/clucene-2.3.3.4-r2 + =dev-cpp/libcmis-0.4* + dev-db/unixODBC + >=dev-libs/boost-1.46:= + dev-libs/expat + >=dev-libs/hyphen-2.7.1 + >=dev-libs/icu-4.8.1.1:= + >=dev-libs/liborcus-0.7.0 + >=dev-libs/librevenge-0.0.1 + >=dev-libs/nspr-4.8.8 + >=dev-libs/nss-3.12.9 + >=dev-lang/perl-5.0 + >=dev-libs/openssl-1.0.0d:0 + >=dev-libs/redland-1.0.16 + media-gfx/graphite2 + >=media-libs/fontconfig-2.8.0 + media-libs/freetype:2 + >=media-libs/glew-1.10 + >=media-libs/harfbuzz-0.9.18:=[icu(+)] + media-libs/lcms:2 + >=media-libs/libpng-1.4:0= + >=media-libs/libcdr-0.1.0 + >=media-libs/libfreehand-0.1.0 + >=media-libs/libvisio-0.1.0 + >=net-misc/curl-7.21.4 + net-libs/neon + net-nds/openldap + sci-mathematics/lpsolve + virtual/jpeg:0 + >=x11-libs/cairo-1.10.0[X] + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + bluetooth? ( net-wireless/bluez ) + coinmp? ( sci-libs/coinor-mp ) + cups? ( net-print/cups ) + dbus? ( >=dev-libs/dbus-glib-0.92 ) + eds? ( gnome-extra/evolution-data-server ) + firebird? ( >=dev-db/firebird-2.5 ) + gltf? ( media-libs/libgltf ) + gnome? ( gnome-base/gconf:2 ) + gtk? ( + x11-libs/gdk-pixbuf[X] + >=x11-libs/gtk+-2.24:2 + ) + gtk3? ( >=x11-libs/gtk+-3.2:3 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + jemalloc? ( dev-libs/jemalloc ) + libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) + libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) + libreoffice_extensions_wiki-publisher? ( + dev-java/commons-codec:0 + dev-java/commons-httpclient:3 + dev-java/commons-lang:2.1 + dev-java/commons-logging:0 + dev-java/tomcat-servlet-api:3.0 + ) + mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) + opengl? ( + virtual/glu + virtual/opengl + ) + postgres? ( >=dev-db/postgresql-9.0[kerberos] ) + telepathy? ( + dev-libs/glib:2 + >=net-libs/telepathy-glib-0.18.0 + >=x11-libs/gtk+-2.24:2 + ) +" + +RDEPEND="${COMMON_DEPEND} + !app-office/libreoffice-bin + !app-office/libreoffice-bin-debug + !=virtual/jre-1.6 ) + vlc? ( media-video/vlc ) +" + +if [[ ${PV} != *9999* ]]; then + PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*" +else + # Translations are not reliable on live ebuilds + # rather force people to use english only. + PDEPEND="!app-office/libreoffice-l10n" +fi + +# FIXME: cppunit should be moved to test conditional +# after everything upstream is under gbuild +# as dmake execute tests right away +DEPEND="${COMMON_DEPEND} + >=dev-libs/libatomic_ops-7.2d + >=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-0.10.3:= + media-libs/glm + net-misc/npapi-sdk + >=sys-apps/findutils-4.4.2 + sys-devel/bison + sys-apps/coreutils + sys-devel/flex + sys-devel/gettext + >=sys-devel/make-3.82 + sys-devel/ucpp + sys-libs/zlib + virtual/pkgconfig + x11-libs/libXt + x11-libs/libXtst + x11-proto/randrproto + x11-proto/xextproto + x11-proto/xineramaproto + x11-proto/xproto + java? ( + >=virtual/jdk-1.6 + >=dev-java/ant-core-1.7 + ) + odk? ( >=app-doc/doxygen-1.8.4 ) + test? ( dev-util/cppunit ) +" + +PATCHES=( + # not upstreamable stuff + "${FILESDIR}/${PN}-3.7-system-pyuno.patch" + + # from 4.4 branch + "${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch" + "${FILESDIR}/${PN}-4.3.4.1-boost-1.56.0.patch" # bug 522178 + "${FILESDIR}/${PN}-4.3.5.2-system-opencollada.patch" + "${FILESDIR}/${PN}-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch" + "${FILESDIR}/${PN}-4.3.5.2-DPI.patch" + + # from master branch + + # submitted + "${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454 +) + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + bluetooth? ( dbus ) + collada? ( gltf ) + gnome? ( gtk ) + eds? ( gnome ) + telepathy? ( gtk ) + libreoffice_extensions_nlpsolver? ( java ) + libreoffice_extensions_scripting-beanshell? ( java ) + libreoffice_extensions_scripting-javascript? ( java ) + libreoffice_extensions_wiki-publisher? ( java ) +" + +CHECKREQS_MEMORY="512M" +CHECKREQS_DISK_BUILD="6G" + +pkg_pretend() { + local pgslot + + if [[ ${MERGE_TYPE} != binary ]]; then + check-reqs_pkg_pretend + + if [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ + ; then + eerror "Compilation with gcc older than 4.6 is not supported" + die "Too old gcc found." + fi + fi + + # Ensure pg version but we have to be sure the pg is installed (first + # install on clean system) + if use postgres && has_version dev-db/postgresql; then + pgslot=$(postgresql-config show) + if [[ ${pgslot//.} < 90 ]] ; then + eerror "PostgreSQL slot must be set to 9.0 or higher." + eerror " postgresql-config set 9.0" + die "PostgreSQL slot is not set to 9.0 or higher." + fi + fi +} + +pkg_setup() { + java-pkg-opt-2_pkg_setup + kde4-base_pkg_setup + python-single-r1_pkg_setup + + [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup +} + +src_unpack() { + local mod mod2 dest tmplfile tmplname mypv + + [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} + use branding && unpack "${BRANDING}" + + if [[ ${PV} != *9999* ]]; then + unpack "${P}.tar.xz" + for mod in ${MODULES}; do + [[ ${mod} == core ]] && continue + unpack "${PN}-${mod}-${PV}.tar.xz" + done + else + for mod in ${MODULES}; do + mypv=${PV/.9999} + [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" + [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}" + EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" + git-r3_src_unpack + if [[ ${mod} != core ]]; then + mod2=${mod} + # mapping does not match on help + [[ ${mod} == help ]] && mod2="helpcontent2" + mkdir -p "${S}/${mod2}/" || die + mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die + rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" + fi + done + unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH + fi +} + +src_prepare() { + # optimization flags + export GMAKE_OPTIONS="${MAKEOPTS}" + # System python 2.7 enablement: + export PYTHON_CFLAGS=$(python_get_CFLAGS) + export PYTHON_LIBS=$(python_get_LIBS) + + # patchset + if [[ -n ${PATCHSET} ]]; then + EPATCH_FORCE="yes" \ + EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \ + EPATCH_SUFFIX="patch" \ + epatch + fi + + base_src_prepare + + AT_M4DIR="m4" eautoreconf + # hack in the autogen.sh + touch autogen.lastrun + + # system pyuno mess + sed \ + -e "s:%eprefix%:${EPREFIX}:g" \ + -e "s:%libdir%:$(get_libdir):g" \ + -i pyuno/source/module/uno.py \ + -i scripting/source/pyprov/officehelper.py || die + # sed in the tests + sed -i \ + -e 's#all : build unitcheck#all : build#g' \ + solenv/gbuild/Module.mk || die + sed -i \ + -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \ + -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \ + Makefile.in || die + + if use branding; then + # hack... + mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die + fi +} + +src_configure() { + local java_opts + local internal_libs + local lo_ext + local ext_opts + local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") + + # recheck that there is some value in jobs + [[ -z ${jbs} ]] && jbs="1" + + # sane: just sane.h header that is used for scan in writer, not + # linked or anything else, worthless to depend on + # vigra: just uses templates from there + # it is serious pain in the ass for packaging + # should be replaced by boost::gil if someone interested + internal_libs+=" + --without-system-sane + --without-system-vigra + " + + # libreoffice extensions handling + for lo_xt in ${LO_EXTS}; do + if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then + ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})" + else + ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})" + fi + done + + if use java; then + # hsqldb: system one is too new + java_opts=" + --without-junit + --without-system-hsqldb + --with-ant-home="${ANT_HOME}" + --with-jdk-home=$(java-config --jdk-home 2>/dev/null) + --with-jvm-path="${EPREFIX}/usr/lib/" + " + + use libreoffice_extensions_scripting-beanshell && \ + java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" + + use libreoffice_extensions_scripting-javascript && \ + java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)" + + if use libreoffice_extensions_wiki-publisher; then + java_opts+=" + --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar) + --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar) + --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar) + --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar) + --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar) + " + fi + fi + + # system headers/libs/...: enforce using system packages + # --enable-cairo: ensure that cairo is always required + # --enable-graphite: disabling causes build breakages + # --enable-*-link: link to the library rather than just dlopen on runtime + # --enable-release-build: build the libreoffice as release + # --disable-fetch-external: prevent dowloading during compile phase + # --disable-gnome-vfs: old gnome virtual fs support + # --disable-kdeab: kde3 adressbook + # --disable-kde: kde3 support + # --disable-systray: quickstarter does not actually work at all so do not + # promote it + # --enable-extension-integration: enable any extension integration support + # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs + # --disable-report-builder: too much java packages pulled in without pkgs + # FIXME: $(use_with collada system-opencollada) + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ + --with-system-headers \ + --with-system-libs \ + --with-system-jars \ + --with-system-dicts \ + --enable-cairo-canvas \ + --enable-graphite \ + --enable-largefile \ + --enable-neon \ + --enable-python=system \ + --enable-randr \ + --enable-randr-link \ + --enable-release-build \ + --disable-hardlink-deliver \ + --disable-ccache \ + --disable-crashdump \ + --disable-dependency-tracking \ + --disable-epm \ + --disable-fetch-external \ + --disable-gnome-vfs \ + --disable-gstreamer-0-10 \ + --disable-report-builder \ + --disable-kdeab \ + --disable-kde \ + --disable-mergelibs \ + --disable-online-update \ + --disable-systray \ + --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ + --with-build-version="Gentoo official package" \ + --enable-extension-integration \ + --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-tar="${DISTDIR}" \ + --with-lang="" \ + --with-parallelism=${jbs} \ + --with-system-ucpp \ + --with-vendor="Gentoo Foundation" \ + --with-x \ + --without-fonts \ + --without-myspell-dicts \ + --without-help \ + --with-helppack-integration \ + --without-sun-templates \ + $(use_enable bluetooth sdremote-bluetooth) \ + $(use_enable coinmp) \ + $(use_enable collada) \ + $(use_enable cups) \ + $(use_enable debug) \ + $(use_enable dbus) \ + $(use_enable eds evolution2) \ + $(use_enable firebird firebird-sdbc) \ + $(use_enable gltf) \ + $(use_enable gnome gconf) \ + $(use_enable gnome gio) \ + $(use_enable gnome lockdown) \ + $(use_enable gstreamer) \ + $(use_enable gtk) \ + $(use_enable gtk3) \ + $(use_enable kde kde4) \ + $(use_enable mysql ext-mariadb-connector) \ + $(use_enable odk) \ + $(use_enable opengl) \ + $(use_enable postgres postgresql-sdbc) \ + $(use_enable telepathy) \ + $(use_enable vlc) \ + $(use_with coinmp system-coinmp) \ + $(use_with gltf system-libgltf) \ + $(use_with java) \ + $(use_with mysql system-mysql-cppconn) \ + $(use_with odk doxygen) \ + ${internal_libs} \ + ${java_opts} \ + ${ext_opts} +} + +src_compile() { + # more and more LO stuff tries to use OpenGL, including tests during build + # bug 501508, bug 540624 and probably more + addpredict /dev/dri + addpredict /dev/nvidiactl + + # hack for offlinehelp, this needs fixing upstream at some point + # it is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + ( + grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" + source "${T}/config_host.mk" 2&> /dev/null + + local path="${WORKDIR}/helpcontent2/source/auxiliary/" + mkdir -p "${path}" || die + + echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\"" + perl "${S}/helpcontent2/helpers/create_ilst.pl" \ + -dir=icon-themes/galaxy/res/helpimg \ + > "${path}/helpimg.ilst" + [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug." + ) + + local target + use test && target="build" || target="build-nocheck" + + # this is not a proper make script + make ${target} || die +} + +src_test() { + make unitcheck || die + make slowcheck || die +} + +src_install() { + # This is not Makefile so no buildserver + make DESTDIR="${D}" distro-pack-install -o build -o check || die + + # Fix bash completion placement + newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} + bashcomp_alias \ + libreoffice \ + unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice + rm -rf "${ED}"/etc/ || die + + if use branding; then + insinto /usr/$(get_libdir)/${PN}/program + newins "${WORKDIR}/branding-sofficerc" sofficerc + dodir /etc/env.d + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} + fi + + # symlink the nsplugin to proper location + # use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so + + # Hack for offlinehelp, this needs fixing upstream at some point. + # It is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + insinto /usr/$(get_libdir)/libreoffice/help + doins xmlhelp/util/*.xsl + + # Remove desktop files for support to old installs that can't parse mime + rm -rf "${ED}"/usr/share/mimelnk/ + + # FIXME: Hack add missing file + insinto /usr/$(get_libdir)/${PN}/program + doins "${S}"/instdir/program/libsaxlo.so + + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin +} + +pkg_preinst() { + # Cache updates - all handled by kde eclass for all environments + kde4-base_pkg_preinst +} + +pkg_postinst() { + kde4-base_pkg_postinst + + use java || \ + ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' +} + +pkg_postrm() { + kde4-base_pkg_postrm +} diff --git a/app-office/libreoffice/libreoffice-4.3.9999.ebuild b/app-office/libreoffice/libreoffice-4.3.9999.ebuild index 1f07fe092606..eb7745fad6bd 100644 --- a/app-office/libreoffice/libreoffice-4.3.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.3.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.15 2015/02/15 19:58:47 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.16 2015/02/21 01:03:47 dilfridge Exp $ EAPI=5 @@ -534,6 +534,11 @@ src_configure() { } src_compile() { + # more and more LO stuff tries to use OpenGL, including tests during build + # bug 501508, bug 540624 and probably more + addpredict /dev/dri + addpredict /dev/nvidiactl + # hack for offlinehelp, this needs fixing upstream at some point # it is broken because we send --without-help # https://bugs.freedesktop.org/show_bug.cgi?id=46506 diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild index f70ce1cd4232..89a63ebe43bd 100644 --- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.4.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v 1.5 2015/02/15 19:58:47 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v 1.6 2015/02/21 01:03:47 dilfridge Exp $ EAPI=5 @@ -522,6 +522,11 @@ src_configure() { } src_compile() { + # more and more LO stuff tries to use OpenGL, including tests during build + # bug 501508, bug 540624 and probably more + addpredict /dev/dri + addpredict /dev/nvidiactl + # hack for offlinehelp, this needs fixing upstream at some point # it is broken because we send --without-help # https://bugs.freedesktop.org/show_bug.cgi?id=46506 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index faf14fa609a7..754907d033e9 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 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.28 2015/02/15 19:58:47 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.29 2015/02/21 01:03:47 dilfridge Exp $ EAPI=5 @@ -214,7 +214,7 @@ DEPEND="${COMMON_DEPEND} dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool - >=dev-util/mdds-0.10.3:= + >=dev-util/mdds-0.12.0:= media-libs/glm net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 @@ -519,6 +519,11 @@ src_configure() { } src_compile() { + # more and more LO stuff tries to use OpenGL, including tests during build + # bug 501508, bug 540624 and probably more + addpredict /dev/dri + addpredict /dev/nvidiactl + # hack for offlinehelp, this needs fixing upstream at some point # it is broken because we send --without-help # https://bugs.freedesktop.org/show_bug.cgi?id=46506 -- 2.26.2