From: Andreas K. Hüttel <dilfridge@gentoo.org>
Date: Sat, 17 Sep 2016 21:52:31 +0000 (+0200)
Subject: app-office/libreoffice: Rename useflag for Google Drive integration to googledrive... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1583c43bb19240215976dab469ba117a6c22ce1a;p=gentoo.git

app-office/libreoffice: Rename useflag for Google Drive integration to googledrive in future versions

Package-Manager: portage-2.3.0
---

diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index d2494129c60b..553b8c2f09d9 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -77,7 +77,7 @@ unset ADDONS_SRC
 # Extensions that need extra work:
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
+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
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
@@ -467,8 +467,8 @@ src_configure() {
 		$(use_with coinmp system-coinmp) \
 		$(use_with collada system-opencollada) \
 		$(use_with gltf system-libgltf) \
-		$(use_with google gdrive-client-id ${google_default_client_id}) \
-		$(use_with google gdrive-client-secret ${google_default_client_secret}) \
+		$(use_with googledrive gdrive-client-id ${google_default_client_id}) \
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
 		$(use_with java) \
 		$(use_with mysql system-mysql-cppconn) \
 		$(use_with odk doxygen) \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 7dff9ae439b1..f6b680cbfa52 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -77,7 +77,7 @@ unset ADDONS_SRC
 # Extensions that need extra work:
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
+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
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
@@ -466,8 +466,8 @@ src_configure() {
 		$(use_with coinmp system-coinmp) \
 		$(use_with collada system-opencollada) \
 		$(use_with gltf system-libgltf) \
-		$(use_with google gdrive-client-id ${google_default_client_id}) \
-		$(use_with google gdrive-client-secret ${google_default_client_secret}) \
+		$(use_with googledrive gdrive-client-id ${google_default_client_id}) \
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
 		$(use_with java) \
 		$(use_with mysql system-mysql-cppconn) \
 		$(use_with odk doxygen) \
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index e1f2f4716caf..5959c487702c 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -14,7 +14,8 @@ version</longdescription>
     <flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
     <flag name="collada">Enable Collada for rendering 3D models stored in *.dae and *.kmz format</flag>
     <flag name="gltf">Use media-libs/libgltf for inserting 3D models in the glTF format into presentations</flag>
-    <flag name="google">Enable support for remote files on Google Drive</flag>
+    <flag name="google">Enable support for remote files on Google Drive (LibreOffice 5.2.1 and earlier)</flag>
+    <flag name="googledrive">Enable support for remote files on Google Drive</flag>
     <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>