commit: 5ac5916f6e712383849d73ca83ed15509a558a0c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 21:59:49 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 21:59:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ac5916f
app-office/libreoffice: PDF import is optional again. Yay...
Package-Manager: portage-2.3.0
app-office/libreoffice/libreoffice-5.2.1.2.ebuild | 5 +++--
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 5 +++--
app-office/libreoffice/libreoffice-9999.ebuild | 5 +++--
app-office/libreoffice/metadata.xml | 1 +
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.1.2.ebuild
b/app-office/libreoffice/libreoffice-5.2.1.2.ebuild
index d249412..1c44941 100644
--- 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 553b8c2..8247cdf 100644
--- 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 f6b680c..e4088db 100644
--- 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 5959c48..5c463ae 100644
--- 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>
