Try to bond together odk and doxygen to avoid issues wrt bug#430878.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

5 files changed, 31 insertions, 21 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 87fd2b5ff555..76bcfb17a03b 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.354 2012/08/11 08:44:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.355 2012/08/11 08:51:51 scarabeus Exp $
+
+  11 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.0.4.ebuild,
+  libreoffice-3.6.9999.ebuild, libreoffice-9999-r2.ebuild:
+  Try to bond together odk and doxygen to avoid issues wrt bug#430878.
 
   11 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.0.4.ebuild,
   libreoffice-3.6.9999.ebuild, libreoffice-9999-r2.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e3ebfdd4e995..402f408a0c64 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -28,25 +28,25 @@ DIST libreoffice-help-3.5.5.3.tar.xz 1856804 SHA256 62631206eb03de10d24295e21260
 DIST libreoffice-help-3.6.0.4.tar.xz 1863972 SHA256 30b79e3b4cb5b2167d1f3c17b8781e8940665f861197ee9021a6ac8c64d508f8 SHA512 f6fe9296c605999634b484de4a62e7665dae8353d8c5dc20595036b1cc87d51750f6b2eedcae70c4739993337a8ec22de6cf3046d0a15f8669464247e6da1745 WHIRLPOOL 8237777a6bcaf15d875f8cdc909f401906902a5670f2e2097376a90ceb74bd116d42a258faafba563317b7b1e9469b6fdaf1ffa71d95c9d3447d25cfdaf3f6b5
 EBUILD libreoffice-3.5.5.3.ebuild 15651 SHA256 2d917faf6e64025100fc3913d5709d995ecd608b65c977d029e789dfe0ac9d12 SHA512 c45a9848e807334c62b0e3ee537bbf96b4c5fae01756364c02e67b5c4cfc8ab53b5613408f7aa82e1e534ae54d56d375538210bd1cfea20e3375196f424f3364 WHIRLPOOL 63957862d965632f8f60a5fe2a4b1f5d86202f652e4bf5156f0ae62e333656c5c7f5b59dc74de1de4fbaa8805549afbf3e667f00e8c7fd31b3bd1db78472aaa7
 EBUILD libreoffice-3.5.9999.ebuild 15656 SHA256 e53d4935d180d5f3910904e1b90e091f392f268bae3a137fde30f0d1ec7ad996 SHA512 bb81fce7015a3bbb10684bde943bfa29b2f40dec6bffd91f844d770eafab0fba48015e29aaa29d55bcd74c4e67fa3d7c21c6628d8418d878197457894824b78d WHIRLPOOL a6813f67b4bd317f246dcec9347e0cc43d695751f0fd6c8055d0973469e0e31f50445fec4c77861dd4866b5cad0a85796c8120016700ef9780875d36254194ac
-EBUILD libreoffice-3.6.0.4.ebuild 17360 SHA256 2d4f1b4bf88399470c120ce3d5b985a410b06ba8a6c31d906bd3f347d1963d2b SHA512 aae194b870d923e2d4a72057030f7ecbda6f0dcf5b3f69a386f7e9a65b96880b9f8c836bff2d1488e685be24e1b1bfdedd4d2bfe522821f50496e91d244a2f3c WHIRLPOOL 596e0ca4792e2c999c8af3d401cb477c2d702d74ab40102e9513b3510f3e02d137b846d44778dd8abaa8e5d6bb7c09272e37fefad61eb03578c0d860c78169dc
-EBUILD libreoffice-3.6.9999.ebuild 17256 SHA256 57977a8ba30d0cf6cd17c8c909bef37eec166dc402b36dc0fe8abed6454e8252 SHA512 865aadf5a98cebf831e2088acf8a0ea31d2e8cbe33a2bc0f87b82ee6f0a59c018181494786d0fae70aaf03fe74459874ead0451c59ba663d818bfd65a108519b WHIRLPOOL b3e9481fb193b08cfecbd8981f3012c64ac1ddc4873570023ea51f22ea767c394f468571cc5d8ba1afd1e21cb219f21f797516663f7a9f264473e5905d19b17d
-EBUILD libreoffice-9999-r2.ebuild 17416 SHA256 e6db68b981fd88feabb0d4810ba77f066edde3334ab87e362da09548f473140e SHA512 2da5448c02223095bf89901b696a24b632831a6a8d01d3219880ca00a2336f35917a4a2f8ab0008c1142533f4fc2a9d9fc49661da6735249907a02ad95733934 WHIRLPOOL ccfe789ca84168a7feafc9e12573aaf11ee15b0697d5bc133083a245a5a17c26ee587c3462953ecb4d83dcec9c614f9ba46dd720fa7489a3235f71b108b32df6
-MISC ChangeLog 65103 SHA256 dcff7b2e50215bfccb3160439f9d271c033725b804bfc3f29298a0bdc62db704 SHA512 c17e1abdecdbe46723b720c04267d4e47668107f0c38d0eef2dcf829f86b7945b0cabe9d170d9b0fa7a261853e5295ef7097d6eef8f7f8af263696ca72412f7c WHIRLPOOL 8170cbdc5c1a453bb1f8647a1f69eccdfbb917023bc9a71182055886932f0e7394ab7b17f365c26b9d9f8b0347062eaeeaad3b02b15bb583f15ed7f4143c008d
+EBUILD libreoffice-3.6.0.4.ebuild 17414 SHA256 13135143a6ecf38730523884b359385aaa182b6c462f42918426375cc14a0bea SHA512 941c6a6f935d1ae4ca713340c2a675872dc6e347874b5ea55ab29eaef606788f930188b4cc7e738131e3d5435bb843e1c9881a6f20b177dd5559576bfb593673 WHIRLPOOL 56651f50cc39b4aa360dcfb1a129d837c42159c4ffbaf652c54f168a574a9951bfefcf438d7e972662cbe4351329f54843839f7a697b49e5c5d506e1c69e4d79
+EBUILD libreoffice-3.6.9999.ebuild 17310 SHA256 90237ce05e43ad96f59703ecbc7aa8cf5b776a2698ad9713525d55285599fefa SHA512 ab7c25e2928f3abfa6ac4c849374f8d5f3ba829b891d7da3edf4b477188b6a2c267280b09a8bd836f215444288061aa4df29b8665813c7b1b306dd229283537c WHIRLPOOL 90b43d20ca1f8dbd32592a0c7173be2962b29106c3ddadb257ea492f6c456b95fe067e43fa7db6e3164d4cf38271aa65cea8df16767b45dfb3baa6d1c0898900
+EBUILD libreoffice-9999-r2.ebuild 17471 SHA256 cc4b0344ef211374fe1ae0bdbee5d351d7e81b82e80c15779f7233a26eda16e1 SHA512 00d5900d7c8b17c02274d67c27eec9b698173076eb53619a2896cf89bd9607b0e80da35516e5eb3d6a1732d41a92a30e1a76ef3791a35615b2637d4bfc549fdd WHIRLPOOL e82a705357c0262b7e372bbd29613ebf790288871bdf5c500e0f599095773940b775c2e394d3933130dbdda9a9e8d6b6dcd96aba67b187340387a9fcec3a531d
+MISC ChangeLog 65317 SHA256 730055671e0ef4567c8cfe2ac8767c2c1394d5dce7dd1e1b2af1b36d4971eef1 SHA512 3f54f8a2b0fc6f91c6a4b01c85aeb5cc96dc670b5163afaf3843f9c3308d5cdb67760170524475a01719ee36613964cb2efb13ea507b9ee55acc6f8e3f6051b3 WHIRLPOOL 6597cb9cbe5b814565a15b9b02d589c91c28db295c2c1526e7115f0dbec105120e18bbb6c3c7e6b50a82eb1a0dd4056ef5a58a5132ba6998f2b884bfc8678326
 MISC metadata.xml 1534 SHA256 2f095ea98ee3715366a47bfb72683434384d06526cb66a3db8b071fed537b401 SHA512 6e07d86c7aef51c72303ae0f41c49ebc9f0bb89d9bc176822c50a2f73684253c16acf718caef6bfe8bd072ae9e987235e0181806fb0989319ea40e894fa2ea39 WHIRLPOOL 4708c3823f88598934b7ffdcc5f02c8a1427e6d06d3424634042e22527f9e16786a45114ea6010fa085ae25170b8ca241a8f2741d522f159b563d511977d521f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQJht2AAoJEOSiRoyO7jvo0GYQAIQz7jyT/fWg0urm4lqHmKny
-6VHgKJYY+/sZXVSgaV4mGkm28TSPw5BZlJxdUJO1hfVtVkFcQEduqTuq7druJWE4
-vBch4zVuPoT2HLWI1U7TlMbtmfEm5fdFiHECI0KXLQEy1RnBg25vXm+n7JslzCub
-grQS5BPxIAMmE4V9w5rUWhSvrF9TPrGutYbWS88VIg59xIO9jozPvhEIXFosufLQ
-V/uRVANz8oRFCUk5Kt7yLTfdGhhH/beaErrjwI0e5eTdfj0vbPdi7+r51mFOOWUj
-OAM+fWBgt7My8ByJS0SbGA3hZ6Hdp6tWAZvfCqHuxol4uC/4m+mxQBiskBBtEINx
-q++LR/sh9Im5AUj/iROWJ92vMqQNfW8aBDbFR8BlQt4uhWJCoq75/KgcbSvETw7F
-HNOPNdzsCz9oF0l3t7xo2U4mwQd3dbHakDN9Ckgq4+t4x1aX1iubTHzbi0Z6TZeu
-Y90Fq2UWYT7maCqSDzP3ydJ1M8zC6Mu3ZwCuYqeQSfWRrVnUwifNzkeh7ZUiLVg5
-8yIBKoYfGEf1f5Z0hiE3IfF9RIUWt+VHS3MqSE4EtDQBrLWE4DBpcMFwnlR/tvm0
-1wvBunItbkG6A3zshcdQQQeCZDnyXddh3926JcHpsEQY4ewTehxTvy+haXdRCE2w
-PJGf989H1x26A0taNFMp
-=6UXd
+iQIcBAEBCAAGBQJQJh0tAAoJEOSiRoyO7jvozzoQALFa9FVbVk/zFsv3Ralflmm+
+idU9w0MQJZYM4NTZaaK2pzXR+Qo1BR/cJ+RdIt890FaEbRsUnbPEv8PXnq3aoyji
+S4pDlmnIrNHVlrL3s+CwOgvAOH7C9GLwb87JmgUimshybawLZAX3f9U/PwqLQ0n5
+jrwdnqC/hp0BVo1fhJQGbhCXi7eBOKkpDugmSm1bO0fjabPfYe1bRudE0qo4q3IY
+YBDTN1SZuHAVEYCSGcq6bWzeQbdPKMT0BpNFlEW+XkpLSZfYcn/f5ZR4KnOt6Gy8
+NNvCk65BTFWYCRuA3UWnUUyw/9pHIApavxSxa7FfryK8PgREeezmPifx60n/wYaY
+EUAl44UUgfityKkUdoI+ND6Fc98r7ZityqmmKWG4CG0O54UqQepQXDLsgbtxGrEd
+r56pleWA1gcuZDMCyaLHELEnMZzpN+NvRE0ei4eKFX1wZ2Gr8AwHNAFRzIIBaWpj
+8yAlwf2TbOI5Aa1SZquwFkTtXasN/pm8hjiMX9gBVoMXAmgpSqmD1SEZFkOkToO3
+YCdzZv+S+QHPuXDHslPLeLooy5lehPQH+CzT4GGMx6ad8y7ai8yoGrDnAg/K3i8F
+IoKPiqUWvkKKKYWShjTN9BJYiBLVwpjL2NxH5z4zEvvBGlh2xdDzrSYpwodRD5YX
+KhjOXSzG1XP6T0xaWlsx
+=dCTJ
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.6.0.4.ebuild b/app-office/libreoffice/libreoffice-3.6.0.4.ebuild
index 162f3247bea5..ae451033da3b 100644
--- a/app-office/libreoffice/libreoffice-3.6.0.4.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.0.4.ebuild,v 1.7 2012/08/11 08:44:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.0.4.ebuild,v 1.8 2012/08/11 08:51:51 scarabeus Exp $
 
 EAPI=4
 
@@ -208,6 +208,7 @@ DEPEND="${COMMON_DEPEND}
 		>=dev-java/ant-core-1.7
 		test? ( dev-java/junit:4 )
 	)
+	odk? ( app-doc/doxygen )
 	test? ( dev-util/cppunit )
 "
 
@@ -510,6 +511,7 @@ src_configure() {
 		$(use_enable xmlsec) \
 		$(use_with java) \
 		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
 		${internal_libs} \
 		${java_opts} \
 		${ext_opts}
diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
index c1a868f4960e..ef6f96f6b113 100644
--- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.17 2012/08/11 08:44:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.18 2012/08/11 08:51:51 scarabeus Exp $
 
 EAPI=4
 
@@ -208,6 +208,7 @@ DEPEND="${COMMON_DEPEND}
 		>=dev-java/ant-core-1.7
 		test? ( dev-java/junit:4 )
 	)
+	odk? ( app-doc/doxygen )
 	test? ( dev-util/cppunit )
 "
 
@@ -508,6 +509,7 @@ src_configure() {
 		$(use_enable xmlsec) \
 		$(use_with java) \
 		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
 		${internal_libs} \
 		${java_opts} \
 		${ext_opts}
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 2be55ecaa6ac..95e2a5020e1e 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.99 2012/08/11 08:44:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.100 2012/08/11 08:51:51 scarabeus Exp $
 
 EAPI=4
 
@@ -212,6 +212,7 @@ DEPEND="${COMMON_DEPEND}
 		>=dev-java/ant-core-1.7
 		test? ( dev-java/junit:4 )
 	)
+	odk? ( app-doc/doxygen )
 	test? ( dev-util/cppunit )
 "
 
@@ -512,6 +513,7 @@ src_configure() {
 		$(use_enable xmlsec) \
 		$(use_with java) \
 		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
 		${internal_libs} \
 		${java_opts} \
 		${ext_opts}