As pdfimport was turned to internal code it was decided to have it non optional :/ Fixes bug#451508.

Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

5 files changed, 35 insertions, 33 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index c2a240733b92..11d504080f31 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.428 2013/01/11 21:24:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.429 2013/01/12 10:52:05 scarabeus Exp $
+
+  12 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.0.1.ebuild,
+  libreoffice-4.0.9999.ebuild, libreoffice-9999-r2.ebuild:
+  As pdfimport was turned to internal code it was decided to have it non
+  optional :/ Fixes bug#451508.
 
 *libreoffice-4.0.0.1 (11 Jan 2013)
 
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index db43e4a4be93..1cd56bd7fb91 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -23,25 +23,25 @@ DIST libreoffice-help-3.6.4.3.tar.xz 1863976 SHA256 ed4395f9264a27411050b0be4a95
 DIST libreoffice-help-4.0.0.1.tar.xz 1863312 SHA256 68432934b70645ed8e390a1fce73dfd9c3a52434e2384c30c11321aeef1a335f SHA512 cae1ebf2b282d0e93e169aa2849b5beea6d1a4b910b92067885ee605797aac7f08f4da7c7900f80daeb3105ec95c466a446b8468372cde497d80b8440f5f9988 WHIRLPOOL b31be242bd245a9af787aebc3d9f0baee7d6064c8262ac5a4c36d28d3304b73a06461a173aebf94bcf91f0fbb72ec96a310311821736657ee46c183183aaaab0
 EBUILD libreoffice-3.6.4.3.ebuild 17474 SHA256 ebfebf22f2c06bc68f4a63e2ae74a9f0f378b79eb7fa297ead8f4741a39ce162 SHA512 2e540b456c2eaa2624cded3fe929678c5641797f0c8fbf044b760ce44c53b8008b9b70b0aa41350510fa671cf7f595acf355d8a804fdba2c7b0b3015db886858 WHIRLPOOL 5ffd405228caa4f36c7897db21ff10964b545b2180bd65854d2a9ce7e09f9b70228a294a2645c6bcb94f8635e08b9215a6a9943a54d745a927d5ce546b09fd1c
 EBUILD libreoffice-3.6.9999.ebuild 17504 SHA256 63590679442804681a97aeb2a575da274b6da92761f61df81eda0a38352a5411 SHA512 90b2c48c1e9f9bf2b543eb09d8a5d9fda7f26291adfc7f3a3a6da8502259542a0bb87503f093e8383ec2c3f4cc15be67a0d87a5045518833eab2842f93193195 WHIRLPOOL d7f48a6495f6901e5e7989d63dd23b242488b040cc128374c96816ff647fb3f263ebdffe8a8d32eb5e9913c8d97f83ce9a39ed83926d106bf6f83a3c416880e6
-EBUILD libreoffice-4.0.0.1.ebuild 17485 SHA256 7f82a88690076ee5926db3c3b3a018b44b65314c9c1bb5187407cca0ff01a5a5 SHA512 a6649d19293b8834af76ca1ff7c9869dd7f3636f7feccc53ea8689848ee401d20aed8b2c26d0788d9ea0def21a4ec2f20e2b44b91d0dd2101d6c8a02b1544459 WHIRLPOOL d97c0e2971af088c078b6cb8da7a5b46ad13f0bc6b113e5f1f6b7ee7089fe75f8b202347e7ac58ac9b0cdd327c2f39cc75f917c1cb6ef454d31b96fefdf5addb
-EBUILD libreoffice-4.0.9999.ebuild 17492 SHA256 6ee710464cbaade9aebb91305ea036536968e756e0e88a5df3ce6416e4d8bc0a SHA512 1b365e40886f124582627fc8cac1e4c2f3e1a5617f351ed0374ed8c9d7a16d5bf65ecf4dba585fa5a91091d62c92fba06860f697fa988a77aa3ae9953e302da8 WHIRLPOOL 3f3e7b5adc9b16355c8c49d9ae6a164b9c16b48888f71b69d43367044f27097c9b2b1755b5473100a4c33b1443ae44f7bf0f4742828423a6e95016a1eff765c6
-EBUILD libreoffice-9999-r2.ebuild 17189 SHA256 061674b0f2c7c0a5d9d4b84ea93c95b7f51e555926ecc4c52b14cf8b9ceb8307 SHA512 2ef10956cc2c68f25f1465b09af9460f821731a275df8d599b77ed92e5f7a3545b3783bccd70fe70f1f0b530303e54aaaa45e523d6cb23567a052a27d3809b30 WHIRLPOOL 7697bda0ed88a55f0aaa86e4706d1b32f49a1c7118d71cac1a642c2dc03c48cd82c8f6a96d8822971bf40deba03765a4665ad7a00a2525aec363d81343ce9a82
-MISC ChangeLog 77615 SHA256 358f6298f5ebea0df754647b997a7e2d4e6608d731bafd160fd58e23d180c465 SHA512 980136fa1b09fd9d5418e40d8e322069bc6e28488ddaa31d0d75c559945dbd77eb385db6ed46e57f7c7d8cef2d009ec7daf6675b65a09e60771325d3067ed264 WHIRLPOOL 295453360a83cd5b8a26a659828159c95f9fa0424cdbdf362ec02380339d14f4d1fa9e16eee77596dae4419af0679ba99a0ebf06f2d2e59e18106b995dc628ab
+EBUILD libreoffice-4.0.0.1.ebuild 17432 SHA256 78ca37f8702ac16a97839233c2f9540cd149c4cfa392f9be743a84b24fd41429 SHA512 60ad7f475fd7b6e875fdfb08a41cfb1d1d79f33a5fb9be5cdecee1ee5b83881a0d2991696de32a97f487b3e8c3e5600de3b1ad1cf2e1f71e93ec131c44e72ba4 WHIRLPOOL 96337d96f1e94b723ad67fbaa4b66f5697ceb2f482a485b238ef3b6418b6b42803edc6cefc289f8f02694f504d8ff25732db6bde0e03f7954848eb47a72a6f76
+EBUILD libreoffice-4.0.9999.ebuild 17439 SHA256 e26d1313a956dc567a8b75dc257db3df40eb5e61148828deaa96428d39960626 SHA512 d0175e16c46d1255ec41635360e5ecc5404e198d0e02750cd13a2b6ce879d14641f06e31e31549a4e51a31e045d4c892477534b67bf60c3084e01d9cac6ceb48 WHIRLPOOL f2559431879a00b5b1f381b64b8cd790f001885a3fdd5318e7937f6aa37564a21d95f613cdcd5f3fece98414d1b7b080f735bbf9d092fd4cdc3f72e13533239b
+EBUILD libreoffice-9999-r2.ebuild 17136 SHA256 3d6baa103e7cdf351f2c6e29abe6288b36c52d3154df132f5149de4d8b321b24 SHA512 473cf2610d92ceb8ee1c9e10d5494d81c51d4c1a647dc5209040a0ddc953dc9026e2f6d12d073d67698ee8942a2fd8c93eb8aec0839d149a01c6d6936ea001c3 WHIRLPOOL 6ad3c443d214a19c361943c71777fa56d6e31ed76a4ea54ef1db26ccb968060a1dc2fb1875aa6b2c700a750cab6ec1e439f89eda124f9c5c901db559cf540874
+MISC ChangeLog 77863 SHA256 cb095f993c551b862a42b424d2b27f29e666321fa8eb2e987f947d0dbae42715 SHA512 e5c869f781d794e549b354b3722aa61b81e5737fa2a20041351941bae21cedbf1eda56bd38048710fe16c5aac82524274e990c4782fb1e9a26babff09fc91fdf WHIRLPOOL b4aa3e54cf1af687e1b4ed09568b43bc0441f64c083aaff2ec814aa28a32bd8f2952e3503e19c3317bec769762eca2113f1e3946dba3fbdf9d8a946007518fee
 MISC metadata.xml 1316 SHA256 8f09b5b07d6954e7a7fe0b847c9c8e68b0cb9cb649d4cf2a800dbab6a1a42fca SHA512 a44703f5db81a9c3c5ac6600bf44a8cf5e115b9650bd12dcd09a351255a7fd5f8215fe30a300e5aad1a7c8578c7c6cab6609f56c19988febbc599ea84556b60d WHIRLPOOL 3f2d634b6aed5c1b41784517f1b6cb2a929f89c63a25ef140a13a12124ab26de660bf6da767a4be6b1bff77cc75dae6ccff8d6bba5ec23e7e269e96fc21bc6a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ8IMqAAoJEOSiRoyO7jvoj1sP/22M+8NESuS+T2cNUoeg/oQv
-VICJSw6hH5IsaxnlHK98SuwMtjTC4pHAt7cZL83RcUHv1aF18+MJrbpPglO6Mwry
-zyhpzwe8JGB8Sd29+RGKqcpUoE/baCf6iOvqDdGH0d9GVY0s4+mO26Fpcsk1AIeI
-scbGRwf1afr6ZepMdWHTxcPxOYl0kfkQitwpwFdTuNys17rO/lMLlJHlnAToPrWX
-AfJPpAQi/ECwWZSG3GYSmw74eDJ8NRBhV/pK+6lSyJN+mpZDKjoSeXxx87rL2UxY
-b6IPNhV3Bcp9Sgo8nkE/9Tf5QJctpD2PKyo30ANVMxx3nijr+vUK6hq7UK8KRf+7
-DLlqxFk5XEom1D0x9qy6AQ2ZsL4UcT7vWduwDhe5Dv+oBdx5OL7YnqIZVXnQ2zri
-iF8JtaVY8iWrd860c+QOm9znhHY4qdWXf3UE/B6j44fQi0tA174qWOR0S/WEx7op
-X0xvoZvWLnn8QFXxjqjKhX8hU8BjMdfNHpDNEOqbs78Ujp2ni2VTqGGQ80VNmcqY
-gQcCcPPALctWupURQ0sm0zCp2qjsqy0q1L5JNif9e+x6H8ojEUzn95Toh87sMacS
-v8R094+WDBB4hlc/zMbq5KfapHk+ad8D0TSWfFIw38ezWrBNx384SYpJZQmZjhux
-tlI3pU1YiV68vwWdbJQT
-=dOg/
+iQIcBAEBCAAGBQJQ8UCbAAoJEOSiRoyO7jvoeXoP/12BbEDB60rZr7zOJ1RH+T2c
+DL2AUBYjxUljpjDPKj1QjeDXW7Z9c57CjFN677sgNm4I1EeiznK1yEJt3FeQzsLO
+avNe5uDxoyXJ0DjRbvxvDn5pGH9AXhWLH4HyBXz6WU3IwwwshY8dLcj3ZFoYKaeq
+FLAsusSQ+gqlXMeoYB792c9l46qYmOM3rO7Bw4iJBJN2j+xs1fbJheYhDq1BDC+a
+R5BcfFDexrb0wkurNUeHYdtQ6z3zwOSYdC9ltS3Om9bOoVeCmERSa0YfRJog4RnY
+gYkKlioC2gGH+v/41SdKQ3WugRxcSo+MDE3ViMcrq9ccvwANyUDWFeNCFcHQQsPv
+/SaftMEQ30PRBWvI9d2qi1jzUQHCHuHeTdeV7Izd4yq7RpIbMqu3MJpHvxloKi44
+UP7FvoPnaO4MgBt5m0FXy2JlCazAWaEEl+ecW8U7ph3VOcJ63EN6eg6ovt3f8b0m
+ljR+M4LgfubwgkTKZ2Uo/K/3vRBXDSnepVFOPG+63yqtgwaqWcmV3ipMHQqgKiK+
+/tfxO88Ygv+0695t4q5wEv/k55vnhlfwZt1P53TZdBkSn83s3bZeJu3UqohBP6nu
+Bfw2n3LEmvZ9u6bPs1XLqd8kmZvf6dSoYeV8vKSFZbknzjWqu5kJT+RPC4Dhnmn/
+QQsxjNsL1q3fB0bEoEcp
+=dPE2
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-4.0.0.1.ebuild b/app-office/libreoffice/libreoffice-4.0.0.1.ebuild
index 1c081091b77b..2f02285b0542 100644
--- a/app-office/libreoffice/libreoffice-4.0.0.1.ebuild
+++ b/app-office/libreoffice/libreoffice-4.0.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild,v 1.1 2013/01/11 21:24:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild,v 1.2 2013/01/12 10:52:05 scarabeus Exp $
 
 EAPI=5
 
@@ -73,8 +73,8 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
-gtk3 jemalloc kde mysql nsplugin odk opengl pdfimport postgres
-telepathy test +vba +webdav"
+gtk3 jemalloc kde mysql nsplugin odk opengl postgres telepathy test +vba
++webdav"
 
 LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
@@ -105,6 +105,7 @@ COMMON_DEPEND="
 	app-text/libwpd:0.9[tools]
 	app-text/libwpg:0.2
 	>=app-text/libwps-0.2.2
+	>=app-text/poppler-0.16[xpdf-headers(+),cxx]
 	>=dev-cpp/clucene-2.3.3.4-r2
 	dev-cpp/libcmis:0.3
 	dev-db/unixODBC
@@ -162,7 +163,6 @@ COMMON_DEPEND="
 		virtual/glu
 		virtual/opengl
 	)
-	pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
 	postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
 	telepathy? (
 		dev-libs/glib:2
@@ -494,7 +494,6 @@ src_configure() {
 		$(use_enable nsplugin) \
 		$(use_enable odk) \
 		$(use_enable opengl) \
-		$(use_enable pdfimport) \
 		$(use_enable postgres postgresql-sdbc) \
 		$(use_enable telepathy) \
 		$(use_enable test linkoo) \
diff --git a/app-office/libreoffice/libreoffice-4.0.9999.ebuild b/app-office/libreoffice/libreoffice-4.0.9999.ebuild
index 9a5b85ef7659..34ffd1a202e5 100644
--- a/app-office/libreoffice/libreoffice-4.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.10 2013/01/11 21:24:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.11 2013/01/12 10:52:05 scarabeus Exp $
 
 EAPI=5
 
@@ -73,8 +73,8 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
-gtk3 jemalloc kde mysql nsplugin odk opengl pdfimport postgres
-telepathy test +vba +webdav"
+gtk3 jemalloc kde mysql nsplugin odk opengl postgres telepathy test +vba
++webdav"
 
 LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
@@ -105,6 +105,7 @@ COMMON_DEPEND="
 	app-text/libwpd:0.9[tools]
 	app-text/libwpg:0.2
 	>=app-text/libwps-0.2.2
+	>=app-text/poppler-0.16[xpdf-headers(+),cxx]
 	>=dev-cpp/clucene-2.3.3.4-r2
 	dev-cpp/libcmis:0.3
 	dev-db/unixODBC
@@ -162,7 +163,6 @@ COMMON_DEPEND="
 		virtual/glu
 		virtual/opengl
 	)
-	pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
 	postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
 	telepathy? (
 		dev-libs/glib:2
@@ -494,7 +494,6 @@ src_configure() {
 		$(use_enable nsplugin) \
 		$(use_enable odk) \
 		$(use_enable opengl) \
-		$(use_enable pdfimport) \
 		$(use_enable postgres postgresql-sdbc) \
 		$(use_enable telepathy) \
 		$(use_enable test linkoo) \
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 44e4e244fc14..9ab771dfdb32 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.148 2013/01/11 21:24:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.149 2013/01/12 10:52:05 scarabeus Exp $
 
 EAPI=5
 
@@ -72,8 +72,8 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
-gtk3 jemalloc kde mysql nsplugin odk opengl pdfimport postgres
-telepathy test +vba +webdav"
+gtk3 jemalloc kde mysql nsplugin odk opengl postgres telepathy test +vba
++webdav"
 
 LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
@@ -104,6 +104,7 @@ COMMON_DEPEND="
 	app-text/libwpd:0.9[tools]
 	app-text/libwpg:0.2
 	>=app-text/libwps-0.2.2
+	>=app-text/poppler-0.16[xpdf-headers(+),cxx]
 	>=dev-cpp/clucene-2.3.3.4-r2
 	dev-cpp/libcmis:0.3
 	dev-db/unixODBC
@@ -161,7 +162,6 @@ COMMON_DEPEND="
 		virtual/glu
 		virtual/opengl
 	)
-	pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
 	postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
 	telepathy? (
 		dev-libs/glib:2
@@ -487,7 +487,6 @@ src_configure() {
 		$(use_enable nsplugin) \
 		$(use_enable odk) \
 		$(use_enable opengl) \
-		$(use_enable pdfimport) \
 		$(use_enable postgres postgresql-sdbc) \
 		$(use_enable telepathy) \
 		$(use_enable test linkoo) \