Sync with overlay: relaxed l10n version deps, drop ppc

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 3ce73e5d5360abd9da7e8d62bc00d90ce821eb1b..97ae2893bfb13bbf5e22d069dab4e0f7cfc99094 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.613 2015/02/15 14:58:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.614 2015/02/15 16:44:40 dilfridge Exp $
+
+  15 Feb 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  libreoffice-4.3.9999.ebuild, libreoffice-4.4.9999.ebuild:
+  Sync with overlay: relaxed l10n version deps, drop ppc
 
   15 Feb 2015; Agostino Sarubbo <ago@gentoo.org> libreoffice-4.3.5.2.ebuild:
   Stable for x86, wrt bug #534684

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 54dfd2c299ab5b0dce9235a7289cda1f48928cc7..838ec2671fd89e2a1fa6111eb7949d8888dd639b 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -42,27 +42,27 @@ DIST libreoffice-help-4.4.0.3.tar.xz 1875968 SHA256 2d805934b8fe74ca9478d550ca21
 EBUILD libreoffice-4.2.8.2.ebuild 17952 SHA256 47b3d7661bac7965053ccd96368a1ba417f1d172f2faa71ca64f59a8c96b738f SHA512 14d5254340ee2c05426cdd3eb1d0c76c3adc3d226eb424ba6dc1891a676b4e6f2dc8ce742dd99fb592bbc7187427007d0bfd207c279a57b18bec66286c5f5d0f WHIRLPOOL 1de2d1a662a296bc26719fe6d23feaefaa5550c8cdc9b6c175783c1462f0588a71ad0f8d61fe7d725e90366817983890bc41a94157ca666527fd50b11589800d
 EBUILD libreoffice-4.2.9999.ebuild 17926 SHA256 0f2909c0eea7b24fa4cbe4d673db0cdc98710e92067e2c4bb3f800620cc390c6 SHA512 e05949e157d208d68b07aae017c4d534159eafacc891801756e302b655afffd8c498bc81b145a5779a502223cd8150f5f5e654deab6f42806add53da192c6a5a WHIRLPOOL 633b570bcc923df072de13b117620fe7ea3e99c6d1660c1d34057fee3f2b5fd67f3986d162a11f496889cba7b701caa77abeee22f165a16b33bb6bcbce7e0ecc
 EBUILD libreoffice-4.3.5.2.ebuild 19013 SHA256 4c5191d59fab78f7f012136d6fe86f44193078eed9835d75d8c414a1becbd313 SHA512 967680d1bef3490d4b18c6f0988655cd4b0ebca2542a478d0fbec2dea9480385d9031c1a3c99a8636db2eb7093f975d17e0ab7060e1b2903876e2e077069d079 WHIRLPOOL 7e1fddeec64014fa0166e63f54b67cb1a4a485075d1957b6a855c2527b949524e38fdac215c94c05200f49e328b7453ea93735d7284e73b372839013c14a1e5a
-EBUILD libreoffice-4.3.9999.ebuild 18910 SHA256 642c9fc9c069fcb426be5f2c36fbd8f63a3e3a2d67e6039cc93ff9bd08fd7ca2 SHA512 4596fcf90a6626675d52208313acac64a062578525db93e1a1f59e4436836f3ed5e57ee5314e4170e2e6bdbbd742f07c39b8177047c57a01c4f7bff8894cf45b WHIRLPOOL 0520f6b7d52791d53603f837ed283623f8d1ae5a20ed0cd693286146f34765be09325f6bf736af65d204fd6201fe126cf5e39573bbaf8dd7bbba0d362f8d7c5a
+EBUILD libreoffice-4.3.9999.ebuild 18947 SHA256 775844e99e9062dd48c1428ec9583d452cecfd7fef892214a29d18e795b2cc48 SHA512 b55c17b41beb1964cdbb9e0becaecdc0b013672881c24b3d1f1b9b96b718ce488c221f3e67dc1865ccae41595d4c76584c2adb01e54b5ca75314bb38a99152f4 WHIRLPOOL 0cc8647f8fc16c904aeea59ee7ecf4a0ba7276ab0f6417d68b5f956a35f1cd0a9ae2ce6995f626bcae283db7b7f9a63152223a78b38a1b8a6c609274eb2c1eb3
 EBUILD libreoffice-4.4.0.3.ebuild 18628 SHA256 b975107ce7d1eb7b9b44c1fefb5bf6c9168f85f1286a97b14a256a491ad304a2 SHA512 c3bb52daa31a8037153ffa039d3640d052136068949595313059a4b102f3cec79be12ee373e29844447e506959dc206fc84c412e18321a400d8ec10a1a11d1f9 WHIRLPOOL a6231536e1b00ef4d6a6f56efedaf8ef545ad66598829bbeed42ef601b3109de0710a9a97f5343f3d83c1cddcadb8504c8a35734f4fd193cefca0eb1f7f2d5dc
-EBUILD libreoffice-4.4.9999.ebuild 18558 SHA256 a8303b9bc3e520beceec16b65c3aaf9b77208180bce80d7fb5f1b50a84a92119 SHA512 66181a2a16751194829b38daf8130799d2165b4b9f63b0ffb9378e27117cdd00d1b4962e5e935513488efad4a991844f425a6702dfea2847c68f27f2774086f5 WHIRLPOOL edb222f83b4b462c0da479dcf3818099b102d87626974b2948828df735d5d8f4331af9b6ea5b438a0b7bc020ff0463aa50c03579c84c300791fb6efec0fd2875
+EBUILD libreoffice-4.4.9999.ebuild 18600 SHA256 e62816104843730a4afc11bc4831e8a529e0eb8c76807d0b91968784e40b368e SHA512 c74aa97f21fb595382147d81445b850edae182d991ed05f1eec3aa3cc4f685aaead1456ffa0f8dc6c5c87af8d0fd75a7ccc78a81844592293a5dd4d328da8d81 WHIRLPOOL 469b92e094acada6b3649cff2836cff3a79ef502a67daca4f04a4538ab2f463925b80d20502310cb07b2ad65ad74067b8e8b8ed541a6a618200cc060cca762c6
 EBUILD libreoffice-9999.ebuild 18477 SHA256 6fb127d5f4a2defe175fe397f195b1c03651ac1aa01376ce1e81e70b4dce1e0d SHA512 c0299dea8ea04926d19efdc6e468db727aea952dfecd0cd7ee5442440d572c1f89377a133514fef40dea140d8af562026188eab4fc884b70a3729afd4b3efc9f WHIRLPOOL 4278dbde26ed6b30b28e4f859f8eab26f828bc65645f3f6eb83f846a2f49df9f2a177f48379d93b7e2de7eb6b97a4f92b8358b5021d7ce8cc7d96082760be37d
-MISC ChangeLog 2376 SHA256 4e023364da8b72a12e8b3eaad17289b72e93caacb3cbfacc6181e5e796bd5ea4 SHA512 ad41736d31c72080a19e2022ba036ac836a555160f4769c80b81cd90816cf43e09efc42e606c4d72c7ffab9694b1be0cf05cec0709f9bf55097a650072924bfd WHIRLPOOL 4dc50557943f381b6f50c3a77826f0705395eedd73db9f952a9acfe35d09d3477096c4b63a50a5c4b9ac574e08d8ca020742834134b021c1104f4f5de4879a3d
+MISC ChangeLog 2557 SHA256 3b848a75c91c61d4169f2559e4aef02237085d8a2026fb250cfd08d22b3d3cbb SHA512 1c745812c98a5cb8b8d987ff425e74ec4762874114b8194806f52158b166c666ddcf0f4d7e15d3d257cc5e678a70eab40da8a5d055eceeb15e5d214f2ddfe11f WHIRLPOOL 1da77b5745d05921569a1774cdbcfe17c874a610c0bfa81c49efddb5d03faac410842fc3429e01362bb6e3c705770389ad1a238a45f664b1866258841821dd30
 MISC ChangeLog-2014 109721 SHA256 db62affd74b541212d4043dbc88acf51fb8aa36602d6e5625cab9b0b823a54f7 SHA512 6481d8f26924300ca46f0cd216962167b6ce5d53028558b0128ed4f996a8cf5576182e9e511493e4b57f628189fc127dec9ce62110bc8d3d85c6d4e2a815bf26 WHIRLPOOL 76c87a30a9296f64675baeb5f77a8500b9b1ff25c6edd5a5d0b984dc3cb3b3aecee37938d882194d6be58ef34c8b1925c1d9b8b7a7b786a5d68539fba714e627
 MISC metadata.xml 1354 SHA256 bf91c27f941b42e977112a3ea9465babd4c4d94dde3f8308d6db1ccd56bc65b9 SHA512 636da2f295d3055de61b52b2a1d371a25101efdc55014ba2e5a7446bb55b30dca1bb58cc2a84873fb862e40f60de10122c55dba19ba9e5d058eab36f7c33aad6 WHIRLPOOL 4aa957484052955572b2bdca42a7d32f5a89f3916a646e92cca940ce2f4e5c8dec824c75150bf80455dcbc2e13f550d1158c418ca38cecac5ac3090419a52f5e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4LQKAAoJELp701BxlEWfup4P/2TkUK7NL4HsWRsZRxyy6qg9
-NOeNIKIOH6zT4/eUffd2ZQnlin40p5OfQM8HyBwQF91zKsMSrqrA5heCNsoZcAEl
-ictISisEmYiGGEQL+grnqwXfypI5RlF9VOQhjT6UtQqtl/3tJEUZHEgypNfotimC
-o2UU0jyZ4fPJJKaAwmaQLXcx5l7EYLQ7ukHhlrppwJxR56FZuAZTx8OuEXpcF3y1
-MGO7NFIv4IY3EKGbkTFuzYQ9cQ6v9sjA3PZfrDeXEdD5dPhEAqyY5arwu1J5C/Jj
-lvyeGz4kfSDT5UXZBjzQ+Q8MoGbWIXmki+mLpau9+HdLpNBBX3z0QjA9eFXFPJ2n
-t6u5r0bsg0dEBBCqEtZp3jx9FtsGfBaZC0uSyG50GitDH0MfT7XxQ9aSmYt6MGIM
-HTAawnLdpolvM+QR7plNPJEwNdfgkh9/sBMcEU7z5jUoY2F/kQaCofjCMKrPdNvP
-Trepx5llD5RQ+nxY6ARMBY1IBHU/0DM+Auf/B4CI7fJX2EDNVa00sMevBc847NDa
-WVVPxa28SRmcVk6Xm44u83+u5Y1X3cBsFtVu1v3acQJqpvhpthFXN2/nN8wQLY9x
-oJ1+tFrXoMvtniSGmxnHTPtDWCZR7bz1IYrz/BcHvDHacJd/yLxunaauZj3tD23/
-Hm8xfDOb7en2g9DJRVw3
-=msto
+iQIcBAEBCAAGBQJU4M2DAAoJEB9VdM6hupKV4kwP/0mHdAQiiHgUJac9sKehtL5H
+BfS/fVg3gcc+ZQXEOWNJxFDxdmUp8zlVHZtoJkH34BL+mropQIgNafDBp55jAC/s
+NwsiVkvxZXkY4fvkb619XOxmRYY6IwAkARZ4B7a0R5FxsaT3U65cWW+YNL/QmPli
+cBYFtT31w88ptkrqnqtlB5H6mv5iQObYidgQ1MyZ6MxijRMp6PSxLFy6OUhCDp4x
+BHSX9g8IY5BUCrcs/3ZOyv6amJRiToFXugn0PEjuh4BVL9wXzA8MD8E7wJRRzRpA
+xc6aIiVPVCb+gUDRqYoQyQJ+2nB+ywAikd/NkeYhsT4E8QEC3YHQVFDh/Z8QkCo2
+SBF31x9r57xxl5Q1Mhowh0KJd3+f1vpB5EYrzvev5KAOkaWDvalLYriBBJmBEdt1
+tpYAJ0+R04sBJsPT+MkYMCen0OPwwQ66+RQ/hwM4pCIoaFHaqHyEaZ9CJJjWzrV9
+BszVKhB/K0hiiAdcqSi0cRiFdWVOoUUcMZuXpIFgOi8ad+QOQ+mpGt7Etfd7Rl/y
+BZo7HZKAnKaYWZUvBy6I0crCKaJJqTiei4bMOoiFlrR05LZBOpsqZaOZzQovCZq4
+2dldCJTA1KMk09xCfukHyKQINSA6hWVWjlWKrFtT09Ryva9kzhdyxsS4q8AO7PMP
+IF9pWdHBhc2Yt/KmshKm
+=/2EO
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-4.3.9999.ebuild b/app-office/libreoffice/libreoffice-4.3.9999.ebuild
index 5897b0ac82d7027d293a8277ca734cb45b9519f0..ca2b226a4aa8e4f7742b5c0473e1afdc3ae83dd7 100644 (file)
--- 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.13 2015/02/08 22:42:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.14 2015/02/15 16:44:40 dilfridge Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ 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 ${SCM_ECLASS}
+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"
@@ -91,7 +91,7 @@ unset lo_xt
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 # FIXME: collada? ( media-libs/opencollada )
 #        how to configure system-collada?
@@ -199,7 +199,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 if [[ ${PV} != *9999* ]]; then
-       PDEPEND="~app-office/libreoffice-l10n-${PV}"
+       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.

diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
index 3aea647b469c099cbdf3e138f7da2835c26ff919..6b9c07ba667eca2fb9b623eaa9a1af3ae6af4bd5 100644 (file)
--- 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.3 2015/02/08 22:42:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v 1.4 2015/02/15 16:44:40 dilfridge Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
+inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
 unset SCM_ECLASS
 
 DESCRIPTION="LibreOffice, a full office productivity suite"
@@ -196,7 +196,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 if [[ ${PV} != *9999* ]]; then
-       PDEPEND="~app-office/libreoffice-l10n-${PV}"
+       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.