gentoo resync : 16.02.1018

5 files changed, 216 insertions, 60 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index c9d0941224d3..02c9a79e23a5 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,6 +3,7 @@ AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94aca
 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083
 AUX libreoffice-6.1.5.2-gtk3_kde5-non-native-fpicker-for-non-plasma.patch 4093 BLAKE2B c6f74ef29c055e22f7f58e4962c3036a39ca4cd731abf382576c6ad1954b8d8dd8c5fa90147931ef0bc4bd094c70143726e4a046c57e9a5062875c1ff248caa6 SHA512 df571472de299a3c184348ce48caef937604b9981101b986d8473b7bdfa0ca0244395ab8079cc97dcef23aea9864aff93523582a459c55457fdd4dbba4e4e985
 AUX libreoffice-6.1.5.2-gtk3_kde5-set-kfilewidgets-custom-widget-only-once.patch 1693 BLAKE2B fee5ce93d89458b90465ab6febadb9fd86c8c039d42af8a4beb15aa5167f4cab87737219b11037949c180f4f8e4672f5319e90e1afbf5836c5bc7977814b168c SHA512 ffb7d60d30e84bdccc590e5d6575727f63ffa237b68813ca34106b9dc8112c0033af6eadfde44887da69f35341a3dccd92281c8a40b55889c50cbdad87e0a207
+AUX libreoffice-6.2-ldap-optional.patch 6188 BLAKE2B 53ad75d5340f40b4229329e79b777464107553459ae56a2cce2e953ebc15b7f3decc4496fa11bed931d83feceb983d3a1613ea452671931244337125e8bd109d SHA512 9098e1208e1a35627f88ccd94f509ed48d28a02eafd45d9a20a4dcc2ea537a29b0f89c4cdec25be3e9af1773e93b7cf6d20dd0d8db9451117e4c61eb261f1548
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
@@ -10,15 +11,15 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
 DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
 DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
-DIST libreoffice-6.2.0.3-patchset-02.tar.xz 22264 BLAKE2B 2ffa88eb84fd00100ad43717a9b6ca24d60f2ce03061f518f19cede0b383d7f0f3da42152ef396c976475d5b5cdb28b27c54b7680785e78fc7be2056e4fed171 SHA512 2df69e01ace90beaee993e62f0eff9bebe631f16933343156222d5b110531d17e1b9994013ba5a6cb5f8b44743743042ace9573d4d191ae43f0d54d85d4e34f0
-DIST libreoffice-6.2.0.3.tar.xz 213476336 BLAKE2B e0a44098aa46c86d5fb7d26366d57d4bf395f642cf228a426446067a7037b5199715a7d34a2b28664123f814cc23da7e299da4f93ed8b65c29ae90056cc40399 SHA512 991cab829c88010b5df0c40e6422fd725f7854d256cfa7ffcf595549ccc49aeebe135513b56c5ccdc810ea07b8df186004a3d9e5d84b5d69992996158166d0c1
+DIST libreoffice-6.2.1.1-patchset-01.tar.xz 8404 BLAKE2B 6fd1a3e931a1d3ef040e0e79ff53299fb47a55bf36f98998ebb896738a639aca8844bf6a5bb5fcbf3a5afeae935cb3e637436dcba456df005d00d5ed5a80e0d0 SHA512 eff36e8b5af2a592572ed60d9f22f59d8611dd5f62977ad93aa957181173d479a19f5907673b0f7532bfcca728a12a20101f2282914a34e0f0a53fd53e682ef3
+DIST libreoffice-6.2.1.1.tar.xz 213874132 BLAKE2B f8d4cc02e712f84363bca723e18127c25c76e2057985333c1045a5f656bb6482d7c381a5407dbf08ee5d1ca0f8692e43290ad90b8ed11ee5c4753072760a432f SHA512 92c79b62e99c9928eed2a0c1c14fe147f7bd0d6f891a87525b38fc3964bd298587f42f363503a93853bf57ecf898b4f0dd15d5064fcd354a8d3b4b7eba118b13
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
 DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
-DIST libreoffice-help-6.2.0.3.tar.xz 16186548 BLAKE2B 95d7fbdaac774032f5ddac121eec5ace9f7964a112f8137d8cf3b999e4ba6685048c027b5635283de9913547c2776ba9b9ab7e28b97cf94fac536decc12fda98 SHA512 7b1c7949ede3fdd6dcc09fd38b62f17d68c5f79e75fb72cedb9d55889d8d8cf261d6614aa5e2e3eae3e26764b2cdb0e4344bef25851daef6041ac3935ad64fb1
+DIST libreoffice-help-6.2.1.1.tar.xz 16186528 BLAKE2B 69b42c88a2c4ff9efe06d397bed3d782805ce85bffdc52ce02742e7f8a65e36ecdd3e08ed9639941fa4a7812fe02405865fb2aff7ef73b41f4a8df0c77019222 SHA512 0e5e753cacae453ceeb299ea6137e249078b50e6cb8797704175fc39355d2c644e4e402838d5eb32ee62c90231ea27bc65bfe8990957a61120e9caf00242d39c
 EBUILD libreoffice-6.1.4.2.ebuild 16800 BLAKE2B 9bd5e46e7e599f9f916d49f5d72aaa0934257a2b46301c74fb61d0e78c7b93eb0297a7bfca5d99b56d8909e5d289d18fc520f290c2f7512962cf940fe774a950 SHA512 df15098dc1693424aee0db6bda394cc001f5370ee0b841befc040f1e1376bc87287f4f507540d5270442c66cdbe2aacf65571039458ab1a426b89037de22c1e8
 EBUILD libreoffice-6.1.5.2.ebuild 16967 BLAKE2B 8d9a5c9c4911d59941ed05ecd3c19d6c4db99b0be3d350b81d4bd22dc79e2bd38d281131ea163dfa2b329b11abb5a44c7d7e0e09835ef9ccca31e6e8f301fa3d SHA512 88f136246b17e0f2599163b43131e3a332b265aec9bd6d3afc6d18b95c633dd3b903c8214b66608a14fff6e207f0ac45430b5c37f0d5a28eeae138fda7802789
-EBUILD libreoffice-6.2.0.3.ebuild 17063 BLAKE2B 12a93d45b161e4850510d1e38dbc33db6c8585f3bf7de96c8a49ec9841cd879f4594e130cb1d95117681b6052ed039d74e12a5ec2290a2b26e2b597b7cf407cc SHA512 ffe11ba7450d381d530d79d750a21aab3c83e794894fe5fa788b565f9bb07af55cfa93fd48657ac6ef69f9c183ce064e9d905e33a9a514855e2bc6b6346f6cf0
-EBUILD libreoffice-6.2.9999.ebuild 17198 BLAKE2B 0d35a3be8f943ca128db41c55f2750bdb1acd8e9819ef2d4d6b1123f969ad9ae3b33ef9a55bb71b734b24f9853e03ff8c806fa688df0553390e1714f42294bfe SHA512 006ca2d316a9275a4ec27b7afa6546b54cde941b26adafa44be10063148416b7471f0dacc9b25b0ba72d2529067af449373a225237e00777a44379455594c5be
-EBUILD libreoffice-9999.ebuild 16954 BLAKE2B 7398d9b515e4332f33ee70a868252a2a99e94199a84a0186f218e3faad212c8c6bfa7c566ea7df80e2f7facabfa2e4740f534c91f6b914c1eaa89fcc40c4eb33 SHA512 54dfe9063403924f7c93157414730b6b1b7873de7410d86269279272fd0802b42d5412d2a0ea3e15afacb9aa539937e7b07927f19efb1a67cfb437a269909b46
+EBUILD libreoffice-6.2.1.1.ebuild 16882 BLAKE2B ae0be771b6f39b2f1c6187494767860541a94c69c8b69e7cb3dfa708afee16056d4b048fe119789c359e0ae3e91e49f5dacbf8d05c883d0fa9d74b683e2b5b4e SHA512 af76eb401ee7cbe4f571a61371dd74217dd6345c8cb3a54a727fe7d10e3e58dfc05ec857d7807759b7672e5ad7b917699e7f47cbdc6ef4b5e382d8ddd6d094a9
+EBUILD libreoffice-6.2.9999.ebuild 16877 BLAKE2B 8d658b1638b8701418c1e9c2627643ead7e4c522373529e5f2841c8f499bdd5b3dd034e7c7f4dc66d598d4df1bbabdb115d26bb1750b37df407f6c7e2ff43cc7 SHA512 0047a128972a9103944fc50ab498349156015153e2d73051ce8b822647cac1d6116de409fc941f064e9597e09ec1b3acd9afd2994679bc8af8262795f52f919b
+EBUILD libreoffice-9999.ebuild 16810 BLAKE2B 720ad5222852d017c242a6659788fdb81586ccbafa8ff09cac1831c482335b156714781d700b67676f4d5fb24686fc6ecc50ea563a6e91d0f7d3ffcdb0389956 SHA512 15e040b739a7f572e43a91edee6dba625e8caf6c619ed28b83695f0054d344a55499f7359a1ba53ea666c8a16b0af7d6c51b5b7c53d4806003da45ea2ab0514e
 MISC metadata.xml 1086 BLAKE2B 486defe600d5a74151756ff486e6eca7d529491dfc8db061c6589dc122d9c47e97f8301f28cb86b566ba69e578b9ae6d1e5dae2ca44972e322ccdb1e829aea94 SHA512 c29b3763e187455edc966fb2fdd85cd22faaa5c58b0dbdafc80c9c0ae8ea8400c189723778a86d108869d8891d9d0db5e1e7de931303737178c1e1f084d6f8c7
diff --git a/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch b/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch
new file mode 100644
index 000000000000..c92689732527
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch
@@ -0,0 +1,178 @@
+From 6776c53b7ce2e431d8636f4e5a755f50f787ec8f Mon Sep 17 00:00:00 2001
+From: Andrew Udvare <audvare@gmail.com>
+Date: Tue, 8 Jan 2019 04:53:51 -0500
+Subject: Make LDAP support optional
+
+Change-Id: Ifbd3903494a81e7b155bf6468f6ca2c50b3370a4
+Reviewed-on: https://gerrit.libreoffice.org/65958
+Tested-by: Jenkins
+Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
+---
+ Repository.mk                                     |  2 +-
+ RepositoryExternal.mk                             |  3 ++-
+ configure.ac                                      | 24 ++++++++++++++++++++++-
+ connectivity/Library_postgresql-sdbc-impl.mk      |  2 +-
+ extensions/Module_extensions.mk                   |  7 ++++++-
+ external/postgresql/ExternalProject_postgresql.mk |  5 +++--
+ postprocess/Rdb_services.mk                       |  2 +-
+ 7 files changed, 37 insertions(+), 8 deletions(-)
+
+diff --git a/Repository.mk b/Repository.mk
+index 4ae8528..4d8389b 100644
+--- a/Repository.mk
++++ b/Repository.mk
+@@ -389,7 +389,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+ 	hyphen \
+     icg \
+ 	$(if $(ENABLE_JAVA),jdbc) \
+-	ldapbe2 \
++	$(if $(ENABLE_LDAP),ldapbe2) \
+ 	$(if $(filter WNT,$(OS)),WinUserInfoBe) \
+ 	localebe1 \
+ 	log \
+diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
+index 602ff6d..3c9be87 100644
+--- a/RepositoryExternal.mk
++++ b/RepositoryExternal.mk
+@@ -2900,7 +2900,7 @@ endef
+ 
+ endif # SYSTEM_HSQLDB
+ 
+-
++ifeq ($(ENABLE_LDAP),TRUE)
+ ifneq ($(SYSTEM_OPENLDAP),)
+ 
+ define gb_LinkTarget__use_openldap
+@@ -2929,6 +2929,7 @@ $(call gb_LinkTarget_add_libs,$(1), \
+ )
+ 
+ endef
++endif
+ 
+ define gb_ExternalProject__use_openldap
+ $(call gb_ExternalProject_use_external_project,$(1),openldap)
+diff --git a/configure.ac b/configure.ac
+index f880308..35c7e02 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1519,6 +1519,11 @@ libo_FUZZ_ARG_ENABLE(formula-logger,
+     )
+ )
+ 
++AC_ARG_ENABLE(ldap,
++    AS_HELP_STRING([--disable-ldap],
++        [Disable LDAP support.]),
++,enable_ldap=yes)
++
+ dnl ===================================================================
+ dnl Optional Packages (--with/without-)
+ dnl ===================================================================
+@@ -9214,12 +9219,29 @@ else
+ fi
+ AC_SUBST(SYSTEM_ODBC_HEADERS)
+ 
++dnl ===================================================================
++dnl Enable LDAP support
++dnl ===================================================================
++
++if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android"; then
++AC_MSG_CHECKING([whether to enable LDAP support])
++    if test "$enable_ldap" != "yes"; then
++        AC_MSG_RESULT([no])
++        ENABLE_LDAP=""
++        enable_ldap=no
++    else
++        AC_MSG_RESULT([yes])
++        ENABLE_LDAP="TRUE"
++        AC_DEFINE(HAVE_FEATURE_LDAP)
++    fi
++fi
++AC_SUBST(ENABLE_LDAP)
+ 
+ dnl ===================================================================
+ dnl Check for system openldap
+ dnl ===================================================================
+ 
+-if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android"; then
++if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android" -a "$ENABLE_LDAP" != ""; then
+ AC_MSG_CHECKING([which openldap library to use])
+ if test "$with_system_openldap" = "yes"; then
+     AC_MSG_RESULT([external])
+diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
+index 53cebd0..3d048f3 100644
+--- a/connectivity/Library_postgresql-sdbc-impl.mk
++++ b/connectivity/Library_postgresql-sdbc-impl.mk
+@@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
+ 	postgresql \
+ 	$(if $(filter-out MSC,$(COM)), \
+ 		openssl \
+-		openldap \
++		$(if $(ENABLE_LDAP),openldap) \
+ 		nss3 \
+ 		plc4 \
+ 		ssl3 \
+diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
+index f84a9ca..43dd929 100644
+--- a/extensions/Module_extensions.mk
++++ b/extensions/Module_extensions.mk
+@@ -16,7 +16,6 @@ $(eval $(call gb_Module_add_l10n_targets,extensions,\
+ ifneq ($(filter-out iOS ANDROID,$(OS)),)
+ $(eval $(call gb_Module_add_targets,extensions,\
+ 	Library_abp \
+-	Library_ldapbe2 \
+ 	$(if $(filter WNT,$(OS)),Library_WinUserInfoBe) \
+ 	Library_log \
+ 	Library_scn \
+@@ -28,6 +27,12 @@ $(eval $(call gb_Module_add_targets,extensions,\
+ ))
+ endif
+ 
++ifeq ($(ENABLE_LDAP),TRUE)
++$(eval $(call gb_Module_add_targets,extensions,\
++	Library_ldapbe2 \
++))
++endif
++
+ ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+ $(eval $(call gb_Module_add_targets,extensions,\
+ 	Library_bib \
+diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk
+index f6617e5..fc4342c 100644
+--- a/external/postgresql/ExternalProject_postgresql.mk
++++ b/external/postgresql/ExternalProject_postgresql.mk
+@@ -10,7 +10,7 @@
+ $(eval $(call gb_ExternalProject_ExternalProject,postgresql))
+ 
+ $(eval $(call gb_ExternalProject_use_externals,postgresql,\
+-	openldap \
++	$(if $(ENABLE_LDAP),openldap) \
+ 	openssl \
+ 	zlib \
+ ))
+@@ -64,9 +64,10 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) :
+ 			$(if $(DISABLE_OPENSSL),,--with-openssl \
+ 				$(if $(WITH_KRB5), --with-krb5) \
+ 				$(if $(WITH_GSSAPI),--with-gssapi)) \
++				$(if $(ENABLE_LDAP),,--with-ldap=no) \
+ 			CPPFLAGS="$(postgresql_CPPFLAGS)" \
+ 			LDFLAGS="$(postgresql_LDFLAGS)" \
+-			EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \
++			$(if $(ENABLE_LDAP),EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4") \
+ 		&& cd src/interfaces/libpq \
+ 		&& MAKEFLAGS= && $(MAKE) all-static-lib)
+ 
+diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
+index c70d1ca..342f19b 100644
+--- a/postprocess/Rdb_services.mk
++++ b/postprocess/Rdb_services.mk
+@@ -293,7 +293,7 @@ $(eval $(call gb_Rdb_add_components,services,\
+ 	desktop/source/offacc/offacc \
+ 	$(if $(DISABLE_GUI),,desktop/source/splash/spl) \
+ 	extensions/source/abpilot/abp \
+-	extensions/source/config/ldap/ldapbe2 \
++	$(if $(ENABLE_LDAP),extensions/source/config/ldap/ldapbe2) \
+ 	$(if $(filter WNT,$(OS)),\
+ 		extensions/source/config/WinUserInfo/WinUserInfoBe \
+ 	) \
+-- 
+cgit v1.1
diff --git a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild b/app-office/libreoffice/libreoffice-6.2.1.1.ebuild
index a09fbca2670b..410e0c324069 100644
--- a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 PYTHON_REQ_USE="threads(+),xml"
 
 MY_PV="${PV/_alpha/.alpha}"
@@ -18,10 +18,10 @@ DEV_URI="
 ADDONS_URI="https://dev-www.libreoffice.org/src/"
 
 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${P}-patchset-02.tar.xz"
+PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
 
 DESCRIPTION="A full office productivity suite"
 HOMEPAGE="https://www.libreoffice.org"
@@ -63,7 +63,7 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -134,7 +134,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/libzmf
 	net-libs/neon
 	net-misc/curl
-	net-nds/openldap
 	sci-mathematics/lpsolve
 	sys-libs/zlib
 	virtual/glu
@@ -186,6 +185,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		kde-frameworks/kio:5
 		kde-frameworks/kwindowsystem:5
 	)
+	ldap? ( net-nds/openldap )
 	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
 	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
 	mariadb? ( dev-db/mariadb-connector-c )
@@ -247,15 +247,14 @@ DEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
+	# master branch
+	"${FILESDIR}/${PN}-6.2-ldap-optional.patch"
 	"${WORKDIR}"/${PATCHSET/.tar.xz/}
 
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
-	# master branch
-	"${FILESDIR}/${PN}-6.1.5.2-gtk3_kde5-non-native-fpicker-for-non-plasma.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -286,7 +285,6 @@ pkg_pretend() {
 pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 	python-single-r1_pkg_setup
-	xdg_environment_reset
 
 	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
 }
@@ -310,7 +308,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	default
+	xdg_src_prepare
 
 	# sandbox violations on many systems, we don't need it. Bug #646406
 	sed -i \
@@ -446,6 +444,7 @@ src_configure() {
 		$(use_enable gtk2 gtk)
 		$(use_enable kde kde5)
 		$(use_enable kde qt5)
+		$(use_enable ldap)
 		$(use_enable odk)
 		$(use_enable pdfimport)
 		$(use_enable postgres postgresql-sdbc)
@@ -569,14 +568,7 @@ src_install() {
 	pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
 }
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
+pkg_preinst() {
+	java-utils-2_pkg_preinst
+	xdg_pkg_preinst
 }
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 12765a8bb8cd..4b4ea02af443 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -18,10 +18,10 @@ DEV_URI="
 ADDONS_URI="https://dev-www.libreoffice.org/src/"
 
 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.2.0.3-patchset-02.tar.xz"
+PATCHSET="${PN}-6.2.1.1-patchset-01.tar.xz"
 
 [[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
 
 DESCRIPTION="A full office productivity suite"
 HOMEPAGE="https://www.libreoffice.org"
@@ -63,7 +63,7 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -133,7 +133,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/libzmf
 	net-libs/neon
 	net-misc/curl
-	net-nds/openldap
 	sci-mathematics/lpsolve
 	sys-libs/zlib
 	virtual/glu
@@ -185,6 +184,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		kde-frameworks/kio:5
 		kde-frameworks/kwindowsystem:5
 	)
+	ldap? ( net-nds/openldap )
 	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
 	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
 	mariadb? ( dev-db/mariadb-connector-c )
@@ -247,9 +247,8 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	# master branch
-	"${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5-change-salgraphics-gettextlayout-def.patch
-	"${WORKDIR}"/${PATCHSET/.tar.xz/}/013-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch
-	"${WORKDIR}"/${PATCHSET/.tar.xz/}/019-drop-kde4-desktop-detection.patch
+	"${FILESDIR}/${PN}-6.2-ldap-optional.patch"
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}
 
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
@@ -285,7 +284,6 @@ pkg_pretend() {
 pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 	python-single-r1_pkg_setup
-	xdg_environment_reset
 
 	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
 }
@@ -309,7 +307,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	default
+	xdg_src_prepare
 
 	# sandbox violations on many systems, we don't need it. Bug #646406
 	sed -i \
@@ -445,6 +443,7 @@ src_configure() {
 		$(use_enable gtk2 gtk)
 		$(use_enable kde kde5)
 		$(use_enable kde qt5)
+		$(use_enable ldap)
 		$(use_enable odk)
 		$(use_enable pdfimport)
 		$(use_enable postgres postgresql-sdbc)
@@ -568,14 +567,7 @@ src_install() {
 	pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
 }
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
+pkg_preinst() {
+	java-utils-2_pkg_preinst
+	xdg_pkg_preinst
 }
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 20e311f8d5c6..66452c403fbd 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
 
 DESCRIPTION="A full office productivity suite"
 HOMEPAGE="https://www.libreoffice.org"
@@ -63,7 +63,7 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -133,7 +133,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/libzmf
 	net-libs/neon
 	net-misc/curl
-	net-nds/openldap
 	sci-mathematics/lpsolve
 	sys-libs/zlib
 	virtual/glu
@@ -185,6 +184,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		kde-frameworks/kio:5
 		kde-frameworks/kwindowsystem:5
 	)
+	ldap? ( net-nds/openldap )
 	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
 	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
 	mariadb? ( dev-db/mariadb-connector-c )
@@ -282,7 +282,6 @@ pkg_pretend() {
 pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 	python-single-r1_pkg_setup
-	xdg_environment_reset
 
 	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
 }
@@ -306,7 +305,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	default
+	xdg_src_prepare
 
 	# sandbox violations on many systems, we don't need it. Bug #646406
 	sed -i \
@@ -442,6 +441,7 @@ src_configure() {
 		$(use_enable gtk2 gtk)
 		$(use_enable kde kde5)
 		$(use_enable kde qt5)
+		$(use_enable ldap)
 		$(use_enable odk)
 		$(use_enable pdfimport)
 		$(use_enable postgres postgresql-sdbc)
@@ -565,14 +565,7 @@ src_install() {
 	pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
 }
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
+pkg_preinst() {
+	java-utils-2_pkg_preinst
+	xdg_pkg_preinst
 }