Make sure libodfgen has at least version 0.0.3, bug 523674

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

4 files changed, 28 insertions, 24 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 955d726c7721..3f705343df64 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.593 2014/11/18 10:02:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.594 2014/12/21 21:57:07 dilfridge Exp $
+
+  21 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  libreoffice-4.2.6.3.ebuild, libreoffice-4.2.9999.ebuild:
+  Make sure libodfgen has at least version 0.0.3, bug 523674
 
   18 Nov 2014; Justin Lecher <jlec@gentoo.org> libreoffice-4.3.4.1.ebuild,
   libreoffice-4.3.9999.ebuild, libreoffice-9999-r2.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 00e9f988b431..eb54aa649c83 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX libreoffice-3.7-system-pyuno.patch 1642 SHA256 191d2462c13947d63a3f2758ec26b4b5b7765d06f0454add1c471e9dccfa9016 SHA512 76d0b836f2b26c9cd3a0ad2b471d033c863ffc1eb593f28f1ebecaae30f205adb97b4b0a63483f93d2f32d5934480f580776e1ce83baf77e5bedee759112fb8d WHIRLPOOL efada275cfa123b2f3fd96a20057fab5a8f83c50e0d401df1af76d1eb017e5c7ceb74d0a5d8fd77352379be4a69b67f22d99a072213b5644012094a31f353da0
 AUX libreoffice-4.1.3.2-kde-calchang.patch 2630 SHA256 a70bd71a561ebbc37d8b545a9828734bbfe5fa9268283a6df92a459c0749f9b9 SHA512 d9c2e13ab6bcb795af56af52545fb508287b327bd22ffaef1821f4e68b4d47755b9abe9469210ccfee10a3bf368dfed24ae07b15d5e9e79b58facf90791ffaca WHIRLPOOL 6c23183327c65c48f01f18666203d1942a433a44033bac1a13d0a858c14db2df5901498c22235e42a1965a8c9f0bb0dfd78fce5b51da3108b25e149f31124eb8
@@ -28,29 +28,29 @@ DIST libreoffice-4.3.4.1.tar.xz 152803160 SHA256 a2413419dd635eccac20b4f9bf35966
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
 DIST libreoffice-help-4.2.6.3.tar.xz 1855444 SHA256 892a78b667f5b1d771920c71bb010a7b1e537d965007591288094ae1e37bf21f SHA512 7eb441bd8e07485a3f003a3317a050c2a9a623d63b42ccbd1dd8e8fa387ab3ea8155e6a2ee135c829a851517a2bfe1ca78d89927ba4afe2f5cc6a59d14e5de80 WHIRLPOOL 217b634e51695465f4ff8e78145a7b4030b634c37f7daf0f8c46fc13db72dc9fdbb9ea8c4b669fd0c7a61fa5a1b75386cf966e3f351534a33691a817baac9e6e
 DIST libreoffice-help-4.3.4.1.tar.xz 1854700 SHA256 a9ab46e2f775a8914fd4377e4859da87344c05ad1ec928646cc40021717c71a3 SHA512 6f9572f785975c014ba6ce589a7f5274c7fe157e9950a7f5ab34d7df0b085737ca2dfa13715e8df93af758c256d7f5bc8b4f0a27dc6abd4421b79e7cca364416 WHIRLPOOL 688180f8d98e1355ac144b2c2565a58c9cbd1f599b043aeed4c217f38638260cc5a1f6856bbf2a2d7716968ace480df0a1db76e7d3794226fab5ee7830e6c8dd
-EBUILD libreoffice-4.2.6.3.ebuild 17855 SHA256 8a1d6e9dac26eb3011bb9efdeaff26f9619a9d5027eb4e88035b29e17015e941 SHA512 43d321fd4d5e13d38aaff6eb670afa9468838109f1ed034432f913f0431af19d0c4300cf47484028f7c373266d520463d73ef32ff0f02a2249483985d63bc9ac WHIRLPOOL 63119198556f7738edbb26ea1df895531c265e0dbc2d905444911236b6f795f9a2d73cba748dc8eb2fb97b505127a88eb9cbaf47ac4ddbdeb1e30d063a1963e5
-EBUILD libreoffice-4.2.9999.ebuild 17858 SHA256 513423ac39886ff4a758c8dc0ffebacacd3589dd0239c6a994eb4793872903cc SHA512 4ccef13718a4bb388053de2fb2a1f76305bf8ccf479f131908c2231239fcb4a96e46ed0638b63480f332694b9bb45629de0a0b5121cc95c51c420d13c35f3e4c WHIRLPOOL 1c02f41eb2dfdea6ea917799399fca31e3460b6e7798db0277bca4a5ed0c7568955645946c01084a05dfb49276fb3aed110817deabf9e43adf6f4c4e6fe116e2
+EBUILD libreoffice-4.2.6.3.ebuild 17881 SHA256 37dc7e0f6a05838c50e9ac5bcd491e14a18b502078d87f584de1911333b00537 SHA512 eaf8a4a36b266e4c91e1343e4dbab2eb149320259543389f41eedd1ffe3351b47a90a46945ec795909ff4a1548bf7c8accd64daf59b4089cf61f96c8eac354b2 WHIRLPOOL a25058ab52d41b6b82b3549d37cf9d4fef9dd94600635052231d4012532358f528ecd3e84c5634f3b37544f66e78f1c20f3dfe861daf9342ceecc3203fbef64a
+EBUILD libreoffice-4.2.9999.ebuild 17884 SHA256 409d0760b8383b1a9c31d5b100cb7b0ff7518003f7086b5d68985c554cb673a5 SHA512 b883e8854d42eddc3cb351f4301700c6062d27d332447a1ba5948ac1b574b357f3ec1247492795631b653011e21b96462056951191262165569c7ec4ad9cbc0c WHIRLPOOL 161ff8a28258eab39742623d389bc7ae2605eab99b5d8e64dd84dbac638ea7b6e728383d8ed204312a44201d835fb8b2c3652fac46b0b95b0be7b7d1030f8d0b
 EBUILD libreoffice-4.3.4.1.ebuild 18235 SHA256 2b95cbb3b474cf09e2c9ce4876d282ef3e195639bbcc636cb88ab8068731120d SHA512 3d65423f3dbb71b2dafcad7c51369074267ba1dab7a7739fdbc48f319515e133af37b11372284ba7ad1ac268d60c9258bcef471ae1da41b62a567f866cc15588 WHIRLPOOL a9004f899b537aa53e8453c13ca68b4a175ff20a5b6efb22741845f7d047af1d5019618601d626c9722773da9d56efeb44a0cbb42d5a2219a67b18a32c5d07fc
 EBUILD libreoffice-4.3.9999.ebuild 18241 SHA256 47063fc6e38946d3ba740b8f1b50b7aabf94e2392cff589fd42360e3c84da3e4 SHA512 d57dd074ab531dac9fd53763f173bfda185f03422d1641007a76405bd12c9a0599e94d30a46ea800ee9dcb554a3823cab965d92e6687d4d981bab4b8f4314389 WHIRLPOOL 3cb047dd964b38640fdbf76f9567f8299ac0c2a9d298de8a70bbeb7b6329b15dd45e0bbff4acb65c94be21d41014aa5764f698404d0e4f5489eacd19e97b897a
 EBUILD libreoffice-9999-r2.ebuild 18311 SHA256 9f30f38345d1f3fa535d6a18dbf7416dd0efeca22b5eb1fa00fb0bbc45854b93 SHA512 77fa0a778c759d72cf0aa6c569a1a1430427feefe6c668cceeee9031447268f05e50e2d6aa451c76141eac15651c1aab7005447f413c8a39c296c94c79fa0870 WHIRLPOOL 5abff4cc4523baab0a0b2d86fac2fcad55c8ceccec74ce5e05d353063aab062d2e4b3fffd1694dbda285a597cf77c6b6dbad5a1a289c6eb6e85a26482fd4e10c
-MISC ChangeLog 107778 SHA256 144f34ca3770a886d9aaa36a0cd453daf5d270fba0e4cda52dde73b8766f2f8a SHA512 8d43e1a7864af826bb4a50964d0904c08cf9d787900537eda417472f6fe41c779782b078945f703ac7b4de5453a737ecea8e242bcb18aa680e3838805f69f770 WHIRLPOOL bbd543270efe7cb7c9cf378d99de7f4efd182cba5911b463ec2f84cf5050c93eafe5880069fea5ff766dfd4f55a24dae5abca6cde9904e58c111573349213173
+MISC ChangeLog 107961 SHA256 41db60367dc4e0c1cb7b12109c9fa55427b0bfd69abc90e6cd5b7718538a5cac SHA512 f34f262cc67806d176c87770140523990033bde72cdb89e60d0db4b779cdf5ea10be28cebd0d5a931b0451bba35538b564654faae18da06d8b8ac4abad7c2f7a WHIRLPOOL b1a4512e315fcd89e54be55fe0557f49e0405d1d5f7c59a550487d9795d0ceffd0d862064850b7372becc8f78bb67c9396186a8cef53c46eb314ea32915ff98a
 MISC metadata.xml 1354 SHA256 bf91c27f941b42e977112a3ea9465babd4c4d94dde3f8308d6db1ccd56bc65b9 SHA512 636da2f295d3055de61b52b2a1d371a25101efdc55014ba2e5a7446bb55b30dca1bb58cc2a84873fb862e40f60de10122c55dba19ba9e5d058eab36f7c33aad6 WHIRLPOOL 4aa957484052955572b2bdca42a7d32f5a89f3916a646e92cca940ce2f4e5c8dec824c75150bf80455dcbc2e13f550d1158c418ca38cecac5ac3090419a52f5e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUaxkeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirJJwQAILaKUXBk6giVsFiZPJ4z1E6
-n2J55pMOa6ejpaRjGShqfLO2sJ73yTKSZQabdkde25R8U7SqBwdbrANmHXN64crZ
-3Ancub6FTBalxQ2Oa0aZgGK4VjiRSjPkMbrEb6wwftoqktGyARtkJctZamOgD78N
-dilJHiWOWnatNHNst1DgFKuk5+BEHOnLYOlol2buaQJd54JyObJRkSp9NXPEPoP3
-K/vL8O31JgRpfkvNg4ax8Ci45mLJjGbkVrFux7uj5aOVcNy14kOkwBvj+Mgl9Sed
-etFSHfUbj+ZaGezCl6xsfRF4z0H5g0T7NQqJM4B5SAvEwdeJuR3nt9x3Np2guiuD
-OjVpL1QIDEQ4RvFxayPOyyCqzagWWaBRy2qsQ1m+eDMSeWQWDs76hf8tHs2RIonT
-FH/Syl+Xl+nYwqytgN3xQqeSNZMRGhnEtpA+495LSMrsfj9MveuW8Vv+RfCe3gwO
-XZNLW2aeA+H1SOsMmTH0QX8ZLlN7GtGWkzMACKMws3Robjd/bd8YGY27fzWiolV5
-LQb1ILqJY3RVGvyIuG5JHwgpOqlz03nTSLJaFPMO3BPQ8nJVh8v647lYYt5rCoLv
-2CfqkfA520eIUKo60Z0XMLFdnXlAcIaycUJpAP3FRdAqK9qaVeJBskz99vrzDxdC
-EeJ7J8seKSeEi/v1UC+M
-=WqLJ
+iQJ8BAEBCABmBQJUl0I0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOccykQAMsv0arS+aMU08g9AGcs7D5v
+8d7w4N3/KusdVtHjqHX2RAesa6bGmsKA+A1Xa9Yc3y5626BM2TAeRcTEIKWRq4QE
+t0vl48fpiftOxAebOov6oTcYQrccgyeiJt0PcJLhjC46V2JSR3nHDI+rByv81+3O
+8TBUhFObsJ9jgetauFGGuNPnCoeP6rx16TQ65thVcT1VM7XeqciX8AQPS8P7kLdY
+0IaNBT+015odjjfTT7BW4gF4zWhxjAOOC46Fdzx+7C5v+3YTV/abGdfFQiUMlHiF
+nMTVT+7X2RLRWiyMlYQrJml+F1vxHXvXB0ojcm4OzQGX1WppU4yX1b19uMg9Kx6t
+Q5tuAcCx+XU4HU6U5gfLEApehJizUHjzKePyKDNMHgUGq5BXfg9h76zFRFrfPLm2
+THxBatUbblRlXETAQ0wDMzHCBSWnfnl7olEay9G+vok0X17eGaTNKQpiZExRmLiI
+mrFZwxCCirN1gCfBediPiidviYdXuWB/Q26dK4nSr0gFR05rxzZrunUqDX02qURg
+hFpxX11ECna9YUn/DXOAquNmyTWc4MhIY5AdC8vLmIjFXFcKwla4CI4p8dWyjywx
+5qFKmI+dgxQ1H4iEEd24XGYC8fK+0Sl8bWDQ0mHucb62jPyp3dPTdAdcM23LHrUe
+Cp4ZOiqiraF7PrBgtav2
+=B0mn
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-4.2.6.3.ebuild b/app-office/libreoffice/libreoffice-4.2.6.3.ebuild
index 6e7b3b79029c..a9b8e03e83da 100644
--- a/app-office/libreoffice/libreoffice-4.2.6.3.ebuild
+++ b/app-office/libreoffice/libreoffice-4.2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.6.3.ebuild,v 1.14 2014/11/03 11:16:53 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.6.3.ebuild,v 1.15 2014/12/21 21:57:07 dilfridge Exp $
 
 EAPI=5
 
@@ -104,7 +104,7 @@ COMMON_DEPEND="
 	app-text/liblangtag
 	=app-text/libmspub-0.0*
 	=app-text/libmwaw-0.2*
-	=app-text/libodfgen-0.0*
+	=app-text/libodfgen-0.0*	>=app-text/libodfgen-0.0.3
 	app-text/libwpd:0.9[tools]
 	app-text/libwpg:0.2
 	=app-text/libwps-0.2*
diff --git a/app-office/libreoffice/libreoffice-4.2.9999.ebuild b/app-office/libreoffice/libreoffice-4.2.9999.ebuild
index 72aa2f9186af..918a91c4b23e 100644
--- a/app-office/libreoffice/libreoffice-4.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 1.28 2014/11/03 11:16:53 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 1.29 2014/12/21 21:57:07 dilfridge Exp $
 
 EAPI=5
 
@@ -104,7 +104,7 @@ COMMON_DEPEND="
 	app-text/liblangtag
 	=app-text/libmspub-0.0*
 	=app-text/libmwaw-0.2*
-	=app-text/libodfgen-0.0*
+	=app-text/libodfgen-0.0*	>=app-text/libodfgen-0.0.3
 	app-text/libwpd:0.9[tools]
 	app-text/libwpg:0.2
 	=app-text/libwps-0.2*