Reintroduce pdfimport as useflag, it got removed as extension, now is internal option.

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

3 files changed, 26 insertions, 20 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index fb8b7a34fe8e..01151f622c14 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.404 2012/11/24 13:47:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.405 2012/11/26 12:55:56 scarabeus Exp $
+
+  26 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
+  Reintroduce pdfimport as useflag, it got removed as extension, now is internal
+  option.
 
   24 Nov 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   libreoffice-3.6.3.2.ebuild, libreoffice-3.6.9999.ebuild,
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index cfa0c4cfbd18..f3ab687bd6b0 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -32,23 +32,23 @@ DIST libreoffice-help-3.6.3.2.tar.xz 1864084 SHA256 954edba6f6109037a001af97ecd3
 EBUILD libreoffice-3.5.7.2.ebuild 15682 SHA256 d86d6b532a7d1c8b66a7671e4db14d0f5bf25d61f2d0fa3fc01d9eb701d99c9d SHA512 b8388601186c29d43b26222a8f0a8f77c3f0ac468c068f284f7498a26d42685eabc61b22047bc94c5509fd796f1b95d3ee9d6a5e88370932ec1d9c37327a23b5 WHIRLPOOL 4a1bd0e270e83d3282ab768ee19c8a07ff79566bf9d3d0010dd6aca55ed5479aca48f4c577e6d90ba47af7bea4b40e2ae0c33f8e8ef4f9388c56ca5c1bb7887a
 EBUILD libreoffice-3.6.3.2.ebuild 17750 SHA256 65361f853058c7d10c737afc8fe5152e7c11a3ddaf4d7294cd812cef35a0a306 SHA512 1b268a23ddc28369123a3bd3408c703c105354244ed98b3e6336f37c0de55b32f7b26dab92c1dcec4faa12e9464e762870155a1ad7a506d17451099b3ad4cd4a WHIRLPOOL d6dcc0d184862c1cbcfcb120cfd30681c43a6a987c8c06a92daa522074460a059bc43c6b09bf07229fdd3c6a2113e5cab998680b0de852dbb0b2ee54349bdace
 EBUILD libreoffice-3.6.9999.ebuild 17496 SHA256 30b985a9e985a9763efe851648a336151178eb0483a02d74f6647020b7cf0761 SHA512 7269e9736fd31116f51569642f13e318c9b802ff53d493cc9f98d82422e3e21d6dd8bf40760f52f55a43c4f6e0fb6e3d4ee2945cf7fc0534967e267351eeb3d0 WHIRLPOOL e5abd0eeb5846ef8dffa3468a48a993e4322019ac787ced1cb9773c043f05672f43f5ab3f045f56f73bba994b7541985855b47ceb167cc07f3ca2a1a76e13015
-EBUILD libreoffice-9999-r2.ebuild 17493 SHA256 a5e67197c93cd57b66f743a3a5b9c904feee0063f2b8cf860e51e951d32a329e SHA512 82ccf04f075e79973ca7a762b3498896f0c89fd1c401371f63f7f31cb767b87e43963fba41f68feaeaf86a91ee4b763896d350dc9119253001d22a7f84e061cd WHIRLPOOL 231834ac68f68003695be6d0494c3f0d4090212ad65a21a26d456adff7d738c207e7a27f9b74358c25faf5263fec3fe7cf8d53af8d24826751209d3d6cd75fe6
-MISC ChangeLog 73338 SHA256 3c6837a5bd97f85a692b8e1abfc7c822399df25a37e396bb3d3ff8ed8f1d8513 SHA512 22b69658ed8280a6b7089a57e4078c1f6ecd1e1a73fe4bbd1f785ee67dc31ca4b87f832eb0529ec6c2b678b188c230cbbbbaa23291f5fcc3f10e726971f971a8 WHIRLPOOL 6daf02049e2029b1079a7aeaf0e2cd9dc869d9feedaebab1e9bad2148d1512f7047359a09e8ea95c81021fa68ad98851c703a66d673da521156a0235117990a7
+EBUILD libreoffice-9999-r2.ebuild 17498 SHA256 781de3729735df71e781cdce9d305bdb74864552195819994e5d4095d9618356 SHA512 22e0f5a273b167c4c3c57089bc51db0f58a013f5f29fbae7a397fb4e1a7646eac463221b34bfc914b10e3420e2c9c18ebf9628ebdc33796436502ae795f4dafc WHIRLPOOL 59b73398341fce88bc1244ea267f7f8f608dbef88f7797b559b0bce9100a61786624f7ee2d19f2630aa94400d568ca245a16e22379f79f4413c805ce5bd285ec
+MISC ChangeLog 73513 SHA256 b4e175a29925101045e0963361eefbcbaf19477bc1aecaddb8799c777778f596 SHA512 701d7fd7e3c32e5ec20e76896c7cf5b4f636028ffe3419da99762f55e7b4b007151ec192cdcd9c4e583412a7b1b013d6d9e0755501f90ed1a2fb2a2ae14cfe59 WHIRLPOOL 8f4f9783391b957385fbbd1a9733700cfbd4ca3b8254cf3d1322773e9683a20f7d20f3671f76840c7007310b0f25c9e0ec59b56bece463b62769f703d11f49b7
 MISC metadata.xml 1645 SHA256 24887289646f2058654a7701555baf8afabcffa2223f5bece682d537a43fdcda SHA512 dbf85074a9bc3b984a6f8188dee88a19123d0b6fed5131a70592f31769c317b8eb5ea1095fb72a406dad9fe5214ac51e33203c162a6891a63b9cbedb0d1affc0 WHIRLPOOL 7cbfb1f8644f8cf36efc4ddd8bdb0f757483c7fce7da0e2d61922d0a5e9ab4dd968c5120064ec3307fd547544cdb9501a4bedabf905f7a7d201f972534b41172
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQsM/mAAoJENwGBM22xffeVnIP/17cI2f7NekjCSIbmfpB3+Hu
-7MHGAmWgRHVczTGCuRAh+RlnWHR7W2AEW7OzF58qJLUqV6HfjqOuIse2oqKOAfj6
-DGAWXEvtnbF5/MHnDEhPnkENr9zoe3XIWaaNbKcnWIl9KOSe/YYs/yF4DeKjh5XI
-BbDjlZOzhRVN/U1289PQYNylYwUoJXv+ZwLRi2LmF+9IJbeQ1GJ914Sg6YPe61yX
-wskMTmUYpvGHxkasFsKiC834I0VfpUDVIXquxiNzIW5RSF4s0/cSinvE/WbWU43L
-n4+FrFTQ1P6rsMrkW8uAbswYz751YmZvIDs4GoE7ExDSvSzOblCqfu5NMgIZpWi8
-0iuWWWp0GZoHIFnTWY4V6ZDgg+9pGdlVEydGslZH2yTjFqzcJEfR//bRK9JTSeGo
-w8r9Q1Koef95aFaPJJQztZysArzCY8hJS5cEiysjK/PLWHvV4qxIqI9cza0b2CO4
-tWyr+Kt5G8S7pr+PWAUX8HGaoy3AWnhTQjSasBj/oce9wkjHM9RTdAXeN1L3bxUA
-I9/uR0WIoz3nX8TBGH9XuPJs1Ws3x9LJT5kxQKU56ejpVk+NvLrLEVdp3ONdQnUr
-syOEKpdKS4UQsllosLHbo2O9NDKEB3utaWKAYHQLHdpG4dA+21l6YQ0hoyoxt0pt
-V0b3VzmQVI8KZs9db0lm
-=xWNY
+iQIcBAEBCAAGBQJQs2bEAAoJEOSiRoyO7jvo+E4P/RoSO87kfOsz6FAGOLdCPbg7
+fTnwAydjqCdkiqQ/bV3a5vtt2TEAeKItnlXWUgEHpLmIzapAJY1KveU+5JaKpK4z
+npJS7S3LlDn5ZAdIySuBqon5zs5QnpFcW7+/Iy/daNEtwbh+oXO83RxfhHKaN2ht
+MLw3naHtV7VI7IpJL+m4axTpw06uNB8PWxttYk4Fca6yrxJ9JdMpamHQOE/H9ORO
+O03LrrRyFQI7j3CIXc8T7JGODK2vG6EjCZ2ayFqJWLJ/2dnJyIA1/UJ2Xo6LvqOh
+v0Z8/Tv3XhYsbEfL8yr61jTTGaHmJimTV9E1fDLwJi4Eoo0FAHebEg4RnYfew0uq
+qAj/oY3m8rci9HrrdP3ChuudRjvs9etzcMAcnPooXRO6TBcjFNVOxAL/b9R0nrfN
+jDCda55S5k+BUY7uIdoMocd2hEEW67GddGLVOOwZPQhuoLETfk7TUlC9/at3x271
+DTBfPAoCtvrKz08ZtUsROVoiipGhJki6Y+99I4Po4TzBisgvZtJiEPmFy+mge6ng
+ivD3LHR8Y+y4P0UdJgjcfelRo6NkeJqv6jGlKS/0nJkTa+Zxe5mURwQaMtfqWAuV
+FhAYILJZ9sY4bbZB/tLChZ1EkKW6/mOgyf0aw5ntnjm7dbB+eEyJionXe5DIZyvF
+wpIT05v3mX0linm0jvQv
+=xNhl
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 6281368ef055..91cc2602acd3 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.133 2012/11/24 13:47:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.134 2012/11/26 12:55:56 scarabeus Exp $
 
 EAPI=4
 
@@ -68,9 +68,10 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="bluetooth +branding +cups dbus eds gnome gstreamer +gtk gtk3
-jemalloc kde mysql nsplugin odk opengl postgres telepathy test +vba +webdav"
+jemalloc kde mysql nsplugin odk opengl pdfimport postgres telepathy
+test +vba +webdav"
 
-LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
+LO_EXTS="nlpsolver presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
 # diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
 # hunart: only on ooo extensions -> fubared download path somewhere on sf
@@ -140,7 +141,6 @@ COMMON_DEPEND="
 		>=media-libs/gst-plugins-base-0.10:0.10
 	)
 	jemalloc? ( dev-libs/jemalloc )
-	libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
 	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
 	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
 	libreoffice_extensions_wiki-publisher? (
@@ -156,6 +156,7 @@ 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,6 +495,7 @@ 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) \