app-office/libreoffice: PDF import is optional again. Yay...

Package-Manager: portage-2.3.0

diff --git a/app-office/libreoffice/libreoffice-5.2.1.2.ebuild b/app-office/libreoffice/libreoffice-5.2.1.2.ebuild
index d2494129c60b5022a913eee3bc7540c6ff77740c..1c449411602df715c0a30848168c1687a682bf10 100644 (file)
--- a/app-office/libreoffice/libreoffice-5.2.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.1.2.ebuild
@@ -78,7 +78,7 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -102,7 +102,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
        app-text/libwpg:0.3
        >=app-text/libwps-0.4
        app-text/mythes
-       app-text/poppler:=[cxx]
        >=dev-cpp/clucene-2.3.3.4-r2
        =dev-cpp/libcmis-0.5*
        dev-db/unixODBC
@@ -169,6 +168,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
        libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
        libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
        mysql? ( dev-db/mysql-connector-c++ )
+       pdfimport? ( app-text/poppler:=[cxx] )
        postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
        telepathy? ( net-libs/telepathy-glib )
 "
@@ -460,6 +460,7 @@ src_configure() {
                $(use_enable kde kde4) \
                $(use_enable mysql ext-mariadb-connector) \
                $(use_enable odk) \
+               $(use_enable pdfimport) \
                $(use_enable postgres postgresql-sdbc) \
                $(use_enable quickstarter systray) \
                $(use_enable telepathy) \

diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 553b8c2f09d9095b68946d15dd1c4d27be0dddf1..8247cdf2a159a2cd52fe793342b07723116fcaa4 100644 (file)
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -78,7 +78,7 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -102,7 +102,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
        app-text/libwpg:0.3
        >=app-text/libwps-0.4
        app-text/mythes
-       app-text/poppler:=[cxx]
        >=dev-cpp/clucene-2.3.3.4-r2
        =dev-cpp/libcmis-0.5*
        dev-db/unixODBC
@@ -169,6 +168,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
        libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
        libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
        mysql? ( dev-db/mysql-connector-c++ )
+       pdfimport? ( app-text/poppler:=[cxx] )
        postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
        telepathy? ( net-libs/telepathy-glib )
 "
@@ -460,6 +460,7 @@ src_configure() {
                $(use_enable kde kde4) \
                $(use_enable mysql ext-mariadb-connector) \
                $(use_enable odk) \
+               $(use_enable pdfimport) \
                $(use_enable postgres postgresql-sdbc) \
                $(use_enable quickstarter systray) \
                $(use_enable telepathy) \

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f6b680cbfa52af9e2315a71de191edbac5b21be9..e4088dbb544fa08b8a4c034faef7b9a4e7a95aaa 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -78,7 +78,7 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -102,7 +102,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
        app-text/libwpg:0.3
        >=app-text/libwps-0.4
        app-text/mythes
-       app-text/poppler:=[cxx]
        >=dev-cpp/clucene-2.3.3.4-r2
        =dev-cpp/libcmis-0.5*
        dev-db/unixODBC
@@ -169,6 +168,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
        libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
        libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
        mysql? ( dev-db/mysql-connector-c++ )
+       pdfimport? ( app-text/poppler:=[cxx] )
        postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
        telepathy? ( net-libs/telepathy-glib )
 "
@@ -459,6 +459,7 @@ src_configure() {
                $(use_enable kde kde4) \
                $(use_enable mysql ext-mariadb-connector) \
                $(use_enable odk) \
+               $(use_enable pdfimport) \
                $(use_enable postgres postgresql-sdbc) \
                $(use_enable quickstarter systray) \
                $(use_enable telepathy) \

diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 5959c487702cb212f5742acada4fa3d1db21b026..5c463aef12d2b90ea85e7efb338bc81271ebc637 100644 (file)
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -19,6 +19,7 @@ version</longdescription>
     <flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
     <flag name="odk">Build the Office Development Kit</flag>
+    <flag name="pdfimport">Enable PDF import via the Poppler library</flag>
     <flag name="quickstarter">Build the system tray quickstarter</flag>
     <flag name="telepathy">Enable document colaboration features using telepathy communication framework.</flag>
     <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>