commit: 53cd5b5bbfcab92c9817c7ebf1df2a80425e10b9 Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sat Mar 28 13:48:34 2020 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sat Mar 28 14:11:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53cd5b5b
app-office/libreoffice-bin: Fix x86 and liborcus problems Closes: https://bugs.gentoo.org/713560 Closes: https://bugs.gentoo.org/709934 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org> app-office/libreoffice-bin/Manifest | 12 ++++++++++++ ...-bin-6.3.4.2.ebuild => libreoffice-bin-6.3.4.2-r1.ebuild} | 3 ++- app-office/libreoffice-bin/libreoffice-bin-6.3.4.2.ebuild | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest index bcc60557f0c..41341ef036e 100644 --- a/app-office/libreoffice-bin/Manifest +++ b/app-office/libreoffice-bin/Manifest @@ -1,12 +1,24 @@ +DIST amd64-bin-libreoffice-6.3.4.2-r1.tar.xz 120405708 BLAKE2B 0395c234ab0197cc4c80b1164a98d9638ac35703c195a56152b1cbca43eb4f49b6180d264ae9ee3c1cdf12e711db0d4e23f7dc7d919e74cb8e7d6bbe5d18f778 SHA512 c22669ae2e93bdcef6b1b6bb4b1aac9a17ecf6aceb3cc249e9f8925e18244185c03d5e420457bba8506628b6b997858e132012807fde4c73c62c84590c972872 DIST amd64-bin-libreoffice-6.3.4.2.tar.xz 120383964 BLAKE2B 2e03acd9de791650263609a370ea7c0ec2ae4af3086f937f9160f17523fe1f2ef9727e1e630875cac24bd28d30d91d88c8e6ea5c227b57705c3af8691ba624ee SHA512 c369cd02b81fba3682080ad99a6f039bd2c99ffa7fe299b1b1e59eb998a712d0c9be1d96e953e37acebe1e1b9e7d94ed7ae143742ed1da4aeb68c5ec081be736 +DIST amd64-bin-libreoffice-gnome-6.3.4.2-r1.xd3 1045524 BLAKE2B 22879632b95de6b39887c4bd8066685c86d1993e0b36e079e8d7582bb53a2338f6e07f0743bcb11b384099676e9df7b0ee61d1943e172b43dab8b4ab409034b9 SHA512 8d4fec241583782e14abc832175c11199d27400f9f3f876c7d31be89dbdf6e346a9d38049594657726368d40d5d80d8e2b96c30a6b971f24a98288abd032310b DIST amd64-bin-libreoffice-gnome-6.3.4.2.xd3 1044405 BLAKE2B f3e0822f7f6254fc63b5f794f89864d6609a08d3f708847bd0c2153a3910b481f042273a929bfd813d613ed7c84c862f6b00222f072393a7395b5f6dbfdc995a SHA512 95113bd128851d3b61361fc2c0b4ef00e676fa9cec8607e08573bafa02c8a9034c590b2e56c5deba607659dc4ebcc0f27373969792f9db29f10f92fc5042ef77 +DIST amd64-bin-libreoffice-gnome-java-6.3.4.2-r1.xd3 28708504 BLAKE2B d804206438db8f62dc8b60f0a5ac454812188da276e62364f42bc7f80035958f10e99af8f22088ab3d8ad28fa87581a722b6c167aa7e4382ba644770c6278af1 SHA512 3130d2db027980dcf4ca06ee54c9957006acb5978d9da243722f9ec92616ecb3cc9c00639623c0a4125d95fb7cae4d813a689cddd3e0e7eb7136c7ec6f8f8417 DIST amd64-bin-libreoffice-gnome-java-6.3.4.2.xd3 28710042 BLAKE2B d2ec91775f4225e38b424365d96b3b3be288a27b71f59f4b3fbdc6b6ac1304aa79c881dfa0c1119d519c697cf397504a9d57f383fd5afac158d4dc201f154cc6 SHA512 f4ef915a1eef9658ae1200adf2374646f5a8d117dba5f169920d0a662e8e16fa8e700f726bdd5cc9913973c0d5d55a61f303d2b13cd8c3372159ebb19308601b +DIST amd64-bin-libreoffice-java-6.3.4.2-r1.xd3 28563471 BLAKE2B 548eb7147726909020fb7f1b063110c54c1bae5f6403ac4dde81125c1591b527c11f1fe0f86d46779d0ca8ffb9e2c2c9802f9dfaef113b2067482d970f80c89d SHA512 e9882ff68ae93cd4c64dd790b288bc4c54f16d26c8f78507452cf46e1ec12c0d30bd3c875973f5ebf816bc57529e71b4495363f2ad5e1b33a4c3e01672d9abe8 DIST amd64-bin-libreoffice-java-6.3.4.2.xd3 28561387 BLAKE2B e4524e07151178167c4e60442b04d665fcf3d10e2a9ae1226d23cbe86e04a3ac2fb8026f2dc17723e747cba54684ebc525c23a0950a57fff7c77bb602f7d7307 SHA512 11cf85d0ef3fd88be747ff324b211cd3ae2e4432b1a8e6d54f4308d0e2f86df209fd26ce4e2309c8c406e655ee217852c817cc46bab1a1135e61020177081c7b +DIST amd64-bin-libreoffice-kde-6.3.4.2-r1.xd3 17993514 BLAKE2B 773b1051efc1d4ee0c3cd7f87c8e08ae62a66dc1410be10e842c06b7ce3fb371bfccd6e5b80a9640e063afcc6f72175fb075dcf1657a89b8cb95ace13d6618d9 SHA512 c72409dfbc88bc5864d7b70a101212aefc75ed037b896fb761a5a62460d7d46567401284caf5d518044d0ea306ecded89bc6e1f86d96dda6a97b6ee78ca6a265 DIST amd64-bin-libreoffice-kde-6.3.4.2.xd3 17993497 BLAKE2B 9be9c0190f0fe2ca56bc470d27938a6a199b384847252027e7b4573bd00370a57d685dcc45f62a30766d3a7f97366e8754a34f426f2cfee4c2669dfa0c37eebf SHA512 7ef1be0c8d837e8ffb88ab03dbbbc0bfeb7442f81e695a7325b7c130e3175a3b8cf22aa71fbf8e175684fd0e39259c17621b6b0dac7f6681c63ca497888ba59c +DIST amd64-bin-libreoffice-kde-java-6.3.4.2-r1.xd3 28570032 BLAKE2B 7f2e117bd82c315f984dfb4bfadf25e5b5bca1a6b8bfe47cdb8ef6fa30dfdc01ae4a29edf9b2750b28bbd7648c93bf84aa273034581afeb48b16764fa511d11e SHA512 ba36687555e7ad863a9b4a385f7689506dd5e567a77a61560792aa278ce77d30ff02ae134c1b09dcc1068335bb008a29e24175ba79bd38fac273b626e713ddeb DIST amd64-bin-libreoffice-kde-java-6.3.4.2.xd3 28568852 BLAKE2B 649a4d3d4191a8806c7ad047c5ef47f4516ffeaa111646b72dce5bc10a5a5aab9b5feec2c93c6cb2479031dd5d3d464869d63093a5c0254ac6e58feae6439e71 SHA512 c9c1c30ccb279351a00e2389a47dff6468abfe0d28fb2afb1a94e68631601bbb89f83192bddee55b8c155959e92259b1b171409e846b8be6f761041452196ede +DIST x86-bin-libreoffice-6.3.4.2-r1.tar.xz 122245316 BLAKE2B 0a61ff884bd78b57bff1c120d52728d3a3d9c13c21620b6b324defbb3043420ce52eb3a52e4a582228518d467857d710d4d290b3e5a1a12c8be10ca3a0d73a2f SHA512 4c705bbba757c370c6b21c0381d22f7719e426bdc8dbab435f1abef14732144af48a77628dcadd414af6bea566917b9c526dafd62ac0b7d1e84ce50616b9f216 DIST x86-bin-libreoffice-6.3.4.2.tar.xz 122223412 BLAKE2B 0075aa5a6b1b0d3a827d59cbeea5a55cd7fb8e263ee974e1e61bbc70fea4adf256d691d0cf898eb6f2d56de74903b02d41e6321846a5548553eacec79041835f SHA512 8842965b124ac909f553f428240476e7a1e6c7ecf4448bb55bce0a53eb60b169f9e481cc9828a74aa5553e61581bfaa4504a1c4ef6e5b2144120cd7e1d2ac8a1 +DIST x86-bin-libreoffice-gnome-6.3.4.2-r1.xd3 1043556 BLAKE2B dfac5bc6503d050411980bda03f281f74608abe304a22d20fdc9df6ec13cd5700e55007f69f9884d78acb15f066582fb887b9723421bb3e4789953137d13eca8 SHA512 3b5c88c3248f0faad9b4cf223861a63c24ae951f84ce4c73f2838895e17c9094fa91e24dff79a95f34c4ff25fb8ec3d90ca59b07ca3ace7146d19689da70b9d1 DIST x86-bin-libreoffice-gnome-6.3.4.2.xd3 1045006 BLAKE2B 088e84623e976ae6ed6c237d5b3226a3e8c828b6c2d9c9664814459a4d8c3c0478218fbd62bc7898711d2786304931ca24f8fa7314b9cc2834ffb03925762c13 SHA512 2fe49e8b27304aab3acbc9b5ecbd9bb4acd1426314ab083b016af0cb3dc35e530524983d1a8c65c23e2597108e7f07ae96287a8c3f535f4a035a834cf36429f6 +DIST x86-bin-libreoffice-gnome-java-6.3.4.2-r1.xd3 27040719 BLAKE2B c29f8c84dfd59344b0bec981f27e08e77fc1ea0c138fb9461579a40ace2dd8e985bf23103ca19183577057946fad8494401858d4df7eacc01d5051ee323d52c4 SHA512 44888d46157e31a95f7289aab6ae8bc6f03ff35de6cde7fa06de02844b031d55fac4779de608e03ce80af891261fd6f12f36628028bcf320cf8dfdc7b6cc4184 DIST x86-bin-libreoffice-gnome-java-6.3.4.2.xd3 27117930 BLAKE2B 580fba65ea072d346522a88f0d663be520d25d7260bbea4f74478523a6027a6bbbb969c0630f8e0a9fbfef86b9a01219162188b5359bb7fc70f5004ac77a1856 SHA512 e78c108a5a0d0b9c0382f12a9c03f7e02e80cd61b31f881f12fa5fed8d77a36a93f52f37bd89fd626d92a23bb30b4bde99fba65bd18de7863837678fe6744b4c +DIST x86-bin-libreoffice-java-6.3.4.2-r1.xd3 25338180 BLAKE2B ed97b18e75a4c7db8e06778f0279d241c6e279c64968aa1dd39712644ae654e8c5be86ce0866d0b561d4287543d4f077e28ba4c48bef2d36d630fd182f3befed SHA512 a8ac0f146f827a944d953e518f1050d549750d295a86c39a6de40f558c8267d496dfd54f6206b0dc745f56d87e0b8f9bcea456d41cc4d9e25ae08ac62339096f DIST x86-bin-libreoffice-java-6.3.4.2.xd3 25450755 BLAKE2B abdb68a94301a686a3592b3c31330adfe77a4500b2845ec134613ccf7944af32243fb91f63a30015d5cfac4192f1f7c36f460e38cb44cc6400a22c25d01a1a45 SHA512 830b8307c5800c38c773653e64cfb276ab182f4b2cb1b338c94762ae4994efbee616b49df2855c3f8d8970e8f0c7095e6353f18d24c5415e51eb7e8696bd39bb +DIST x86-bin-libreoffice-kde-6.3.4.2-r1.xd3 15518276 BLAKE2B fa0e8787b50063579383208cb7bacea952bdf55b9d945ddebc1d0ff5e2e008573e2e1711a5cfb7e50bc2dcf4d1584bb6d47208cfa31321654758214a30137f95 SHA512 dd7f6dd9337fbe06df0779bf3a5a1a0fc8f382a5ea9c6c5eb02d5fe6418de19701d8305cea726c729503c89520043444b622b31814023931a9da3933bee6e7b2 DIST x86-bin-libreoffice-kde-6.3.4.2.xd3 15509638 BLAKE2B 886a5e6c2969946fe37972e8feead95f73e62a99c0da49bdf8a7fa2e5b3a6f6ce0ae672948066edb16cb192679f3bbcac3c3de5190e8e8bf30e049eedecbe043 SHA512 8493ef0b5b0f416d0c2bd4b92b46043458764f1f20b1e26b8e532c5205bb4589c0e8143b41bad83c9026aa6156b813880ee64602b7cb84d37d81bcdf2e8082ff +DIST x86-bin-libreoffice-kde-java-6.3.4.2-r1.xd3 26706960 BLAKE2B bd8a07d94fdaca1bfb718b99ea726487619b74fd6b3d2488db8f98c1e98a5c62cc29e89d3260b50ac42d3185315227d3583caa6a559254649bab713e5b832632 SHA512 aae33cf21f8bc06b7051cc3b253d9a8feabd1ca848fd8aa337d7de7cf65832bac6aff82c29f499d6278b5eb38f6352a29ce216283f401efda487b1b69ddd499f DIST x86-bin-libreoffice-kde-java-6.3.4.2.xd3 26699170 BLAKE2B 6883f499429a1d77213ecabf9438555e94d74b69779776bcb029a1400f24c7f5ce3ecca76bb56f2806dd5c81cff1e2ac1b35c0dbd293e10627a98ebdcb5e6909 SHA512 8282896e75cabc7db04212d8714e22bb6948c34e2002a2894ae5b8739bc441b994f965f80ba2e19ab9b6a2f1194e527bee3f3509af841ea9f88809cc97b586ff diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.3.4.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.3.4.2-r1.ebuild similarity index 99% copy from app-office/libreoffice-bin/libreoffice-bin-6.3.4.2.ebuild copy to app-office/libreoffice-bin/libreoffice-bin-6.3.4.2-r1.ebuild index 2ee21e0d786..d6cc846b116 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-6.3.4.2.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-6.3.4.2-r1.ebuild @@ -51,7 +51,7 @@ SRC_URI=" IUSE="gnome java kde" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="-* amd64 x86" +KEYWORDS="-* ~amd64 ~x86" BIN_COMMON_DEPEND=" app-text/hunspell:0/1.7 @@ -59,6 +59,7 @@ BIN_COMMON_DEPEND=" =app-text/libmwaw-0.3* dev-libs/boost:0/1.72.0 dev-libs/icu:0/65.1 + =dev-libs/liborcus-0.14* >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.3.4.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.3.4.2.ebuild index 2ee21e0d786..2e36bbc7b7c 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-6.3.4.2.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-6.3.4.2.ebuild @@ -59,6 +59,7 @@ BIN_COMMON_DEPEND=" =app-text/libmwaw-0.3* dev-libs/boost:0/1.72.0 dev-libs/icu:0/65.1 + =dev-libs/liborcus-0.14* >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16
