Improve repoman happiness

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

6 files changed, 32 insertions, 29 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 24c993d0006f..978f6955a6c2 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.616 2015/02/15 19:41:23 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.617 2015/02/15 19:58:47 dilfridge Exp $
+
+  15 Feb 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  libreoffice-4.3.9999.ebuild, libreoffice-4.4.9999.ebuild,
+  libreoffice-9999.ebuild, metadata.xml:
+  Improve repoman happiness
 
   15 Feb 2015; Andreas K. Huettel <dilfridge@gentoo.org>
   libreoffice-4.4.0.3.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 29035ef2f5ab..c0f5fca7cd36 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -38,27 +38,27 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e06
 DIST libreoffice-help-4.3.5.2.tar.xz 1852412 SHA256 78b586931d8e085aa18d137711e7c878f858ea386a80ee673b0a787953836d92 SHA512 8525cc1bef1ac95a89c3100e137793bdea9ac05a85468e0ec96c6a360ce65baf3dfef7e634d9e8dbc644dec138df2b979cdb8a636ff27cdb7ee652ddee114236 WHIRLPOOL f5bd7d1da705e20def1cc6bff3dd3902ce6d77e2b5fb977860a4fbf9748a6ffec3524fe9ab0e2c539ece015082aadcf9f7392a145862ebb20f4abc117667b25e
 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 18947 SHA256 775844e99e9062dd48c1428ec9583d452cecfd7fef892214a29d18e795b2cc48 SHA512 b55c17b41beb1964cdbb9e0becaecdc0b013672881c24b3d1f1b9b96b718ce488c221f3e67dc1865ccae41595d4c76584c2adb01e54b5ca75314bb38a99152f4 WHIRLPOOL 0cc8647f8fc16c904aeea59ee7ecf4a0ba7276ab0f6417d68b5f956a35f1cd0a9ae2ce6995f626bcae283db7b7f9a63152223a78b38a1b8a6c609274eb2c1eb3
+EBUILD libreoffice-4.3.9999.ebuild 18950 SHA256 3474548076ed265be8b95cb08d3dd945a291dd2ac9a86d18fb6b88a033f72f33 SHA512 5ec65696af03a4637fef6ac86182d9873565fab9397fa459fa5c507c1015798a3dc0236e3f64a8addb9abb5eab76e8bcdf3677c7d307a4d9e0c2692e18edd28a WHIRLPOOL 064061116106c8a9e1bc8fb6ef2975ba8df15035a965fcea0210ecce2cfd5c5437a8677760243eb4063062a615a3d1f9c88144f11d1b760b2f510e03a17b80df
 EBUILD libreoffice-4.4.0.3.ebuild 18614 SHA256 8c8a5129dd429a96d1edcaaa50eef58c1cddf667d9f0e7a0f46138202139e45c SHA512 e09751eaf973fcfb5023a9e6af7c1d3672a9e17ce1d3e25a9adcd7f3e1f8210db501a7907e007bf2ff95e5bd645e513ca7c9476141c88db3f78e551a99b2332f WHIRLPOOL adcb10971253069e8fd55921b6f87b0ecb64c4bff500355487eb6ce1243c7b6d6978e3c227196ed8ef52abc7c119cf379d091ad68d23ce53e720b992374dee57
-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 2813 SHA256 d69e83534c7fe8588de853dcff2cde3b3e93690c9e8e0434fc9d49767328dae6 SHA512 ddab57bdd3ce1a872980b45f65947c3f588458320fcb2e603e5ce39f266e9f59673323ea4de29aeafa0bd8761dc665b0a37dd23cae2e3af0e7e9b5e81c0b890f WHIRLPOOL f0c58ba9bb319acfcd3f1a5980da935cdd3ed1f108f5b3620a7de038aacbae03409aec49798eca056df73932a32d0aac5c668c509d3643e83246448623654b7c
+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
 MISC ChangeLog-2014 109721 SHA256 db62affd74b541212d4043dbc88acf51fb8aa36602d6e5625cab9b0b823a54f7 SHA512 6481d8f26924300ca46f0cd216962167b6ce5d53028558b0128ed4f996a8cf5576182e9e511493e4b57f628189fc127dec9ce62110bc8d3d85c6d4e2a815bf26 WHIRLPOOL 76c87a30a9296f64675baeb5f77a8500b9b1ff25c6edd5a5d0b984dc3cb3b3aecee37938d882194d6be58ef34c8b1925c1d9b8b7a7b786a5d68539fba714e627
-MISC metadata.xml 1354 SHA256 bf91c27f941b42e977112a3ea9465babd4c4d94dde3f8308d6db1ccd56bc65b9 SHA512 636da2f295d3055de61b52b2a1d371a25101efdc55014ba2e5a7446bb55b30dca1bb58cc2a84873fb862e40f60de10122c55dba19ba9e5d058eab36f7c33aad6 WHIRLPOOL 4aa957484052955572b2bdca42a7d32f5a89f3916a646e92cca940ce2f4e5c8dec824c75150bf80455dcbc2e13f550d1158c418ca38cecac5ac3090419a52f5e
+MISC metadata.xml 1170 SHA256 94d12aad619c0489c65857246c536b65ae98f1cd7fd698fc0cc3a59972887c6e SHA512 3baf086b2cb75fd88d1044df055e443d46824041d9741172769707f25b7e284ce96dd16292454c1321e0078546dd694770c4111669a4ad394cea7c5e4b5e1a5f WHIRLPOOL 4c326355000a944206b8b85a8a40f7467fb6012d38b2934c8534003e4a4c20046363fd6fa07f189a5cf082887771e581a28cf2910d78a1158f11be37324f7c87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4PbsAAoJEB9VdM6hupKVP+8QAJVGRreIMCgKd1nlDdVV7SK5
-huWpc3ncKV+Uxz0FqApqqYpvmKuahUvfgpjY7p/kDH/xCEZFe3KFK8m9GU1AGfgk
-TReURe3eyAKH050gHq78MZJ8tEHHMbyKr2ZYGKnCPsAl/mPvB3Uk6CcbyyEFKzx7
-tSNUfGHFwGD8OOMArn7pO8obpAANRaHsEEGQQ1a83RWyEcget0ewxsiEgma9Fmfg
-d9/JyiV4ogPTebQlxjtOY+6YjFgmd+S1qV+PMWQ6yCheTlXoCPPyGTJc6fr86wyk
-lGCWpIS/avncwpJ0VGk6zD3piP8x9xB21w20UCV86WmpyQNQBi+qwq5K0a9gmhEx
-iEH9b7oEWcNsqHah2U1JqhS03NLUurQY6phIC3HwZJQKdDPh4RKHiSaguhFnyDXZ
-Q71WKJLTwNqtKHdKGJJ3FVuOw8UyoaRwxeRwr/izDWjNCv7vgNzAN/b0PLfCtIvO
-CVs9vY8mCcRFE5u91CFy3E9/mj7KPSu1rfFQOviX6XRVptL8hxZ8LpkwDszHcTrk
-FImT49w91m86v7L3KivQM0j+JI9ErSFjpHnpIN4yckkNOnuUL8k3GVYirTjTpYuo
-a4hTw1uiBk7pPpxfVDsAigiUxPn5P8SXUn1zWJUDM8S+GOiZW/KYS3QlqGy4Wkpm
-Sez14y+ftVZxsOX9AlQC
-=TC2Q
+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
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-4.3.9999.ebuild b/app-office/libreoffice/libreoffice-4.3.9999.ebuild
index ca2b226a4aa8..1f07fe092606 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.14 2015/02/15 16:44:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.15 2015/02/15 19:58:47 dilfridge Exp $
 
 EAPI=5
 
@@ -133,7 +133,7 @@ COMMON_DEPEND="
 	>=media-libs/glew-1.10
 	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
 	media-libs/lcms:2
-	>=media-libs/libpng-1.4
+	>=media-libs/libpng-1.4:0=
 	>=media-libs/libcdr-0.1.0
 	>=media-libs/libfreehand-0.1.0
 	>=media-libs/libvisio-0.1.0
diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
index 6b9c07ba667e..f70ce1cd4232 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.4 2015/02/15 16:44:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v 1.5 2015/02/15 19:58:47 dilfridge Exp $
 
 EAPI=5
 
@@ -130,7 +130,7 @@ COMMON_DEPEND="
 	>=media-libs/glew-1.10
 	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
 	media-libs/lcms:2
-	>=media-libs/libpng-1.4
+	>=media-libs/libpng-1.4:0=
 	>=media-libs/libcdr-0.1.0
 	>=media-libs/libfreehand-0.1.0
 	media-libs/libpagemaker
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ce6bccb982bc..faf14fa609a7 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.27 2015/02/08 22:42:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.28 2015/02/15 19:58:47 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"
@@ -130,7 +130,7 @@ COMMON_DEPEND="
 	>=media-libs/glew-1.10
 	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
 	media-libs/lcms:2
-	>=media-libs/libpng-1.4
+	>=media-libs/libpng-1.4:0=
 	>=media-libs/libcdr-0.1.0
 	>=media-libs/libfreehand-0.1.0
 	media-libs/libpagemaker
@@ -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.
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 3893f228eecd..757568b84782 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -15,8 +15,6 @@ version</longdescription>
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
     <flag name="odk">Build the Office Development Kit</flag>
     <flag name="telepathy">Enable document colaboration features using telepathy communication framework.</flag>
-    <flag name="vba">Enable support for VBA compatibility and ActiveX embedding</flag>
     <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
-    <flag name="webdav">Adds support for HTTP content adding via <pkg>net-libs/neon</pkg></flag>
   </use>
 </pkgmetadata>