gentoo resync : 10.12.2017

4 files changed, 36 insertions, 39 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b3751776598e..be29b10f66fd 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -2,19 +2,19 @@ AUX libreoffice-5.2.5.1-glibc-2.24.patch 361 BLAKE2B d95ded4f051c77aed22ce99f627
 AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6
 AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
-DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
-DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4
-DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 WHIRLPOOL d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34
-DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
-DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
-DIST libreoffice-5.4.2.2.tar.xz 192795940 SHA256 2fda4a8c446786a3afff2cf1b07b818c45c9dcd136bfae1f3191b0b1565ba675 SHA512 37edf44b4b3c3e694f5b5915647f9555413c3fcc6d29f5f8d74806439b65ed90418905476d7b75ce58a032abb1f55cecf1ca74b63279666ca2af5f3ac95a645c WHIRLPOOL 1d2f55af8da2d1c8f2998cc3ab6346be7f6e2e524fef664281ba585910a9e98914c9e07612d597a89c77ab6dc25beffc4dcb1b4575f314752a892d18ea15415d
-DIST libreoffice-5.4.3.2.tar.xz 192920640 SHA256 d59526dc6adf96c53cd7ed3c0235d9a876cbd1af07ab653456395ea94479d931 SHA512 5996d8abc7f28df7de8f527fac6120955d673bb50f3691ff8a3606c216f049dd19a57bdd23faed1e169fcbdf3369350ea4519ed73d1a172661f7eaab6239649a WHIRLPOOL 38176055247f0210aea5d8e0c6f93bdd36a0bc190ea64a1953f5196089ed2a95cd1c170bde0dcd5c09f779e4d457643d07799ae61838e556bfd3246cf5cf0311
+DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
+DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
+DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 BLAKE2B dd66515fb2835c40905f91338a89921608f6aa96f0df2a0f2396d8ce397c2fd76173e1f72eff437d0167d5f831b3dd6b3050d5590ed88131921d269d0c63a8d2 SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8
+DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
+DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
+DIST libreoffice-5.4.2.2.tar.xz 192795940 BLAKE2B 35672c2d7c78b5aca71e4f492dd41475f4da0ca01433c0d05a811bfee39467c037e510552258b149f463f0c05dec83d2d7109342b88bc7d7775a51bf6831891a SHA512 37edf44b4b3c3e694f5b5915647f9555413c3fcc6d29f5f8d74806439b65ed90418905476d7b75ce58a032abb1f55cecf1ca74b63279666ca2af5f3ac95a645c
+DIST libreoffice-5.4.3.2.tar.xz 192920640 BLAKE2B 5bca1ede11009ab9ba8da0ba13033ab9d4582840879f9d158bde4c47224eb3bb588270420a12b2a2e53632f2cf753dc273460140aeaf289337e4ec4b1e3ba6f0 SHA512 5996d8abc7f28df7de8f527fac6120955d673bb50f3691ff8a3606c216f049dd19a57bdd23faed1e169fcbdf3369350ea4519ed73d1a172661f7eaab6239649a
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-5.4.2.2.tar.xz 2343504 SHA256 5fc740dbe77876b96ed731f0a6ce793925a9a4a4ba983b5a3506ab24beb73057 SHA512 ba845653d6388bae53eaa945abebb367fedace81c1949ed975a2ad0c270c688649b385b463256b362a6397f18d214aed9b876869434c6c3868649180e57c3112 WHIRLPOOL f5c81288d7d6f608a47f59fe6ae75b6d90b30383fc7fafbc398394c3274014c29fc6933c7b09c517e033e2477355584cb8970f55cf925d645bee57b935e1d253
-DIST libreoffice-help-5.4.3.2.tar.xz 2343476 SHA256 85dd76aabc205e8b30f9622bc5300156df6debf4ac0364eb732ced92932d30e4 SHA512 eb74eae6ef624deabe23784dbad6bf9e22341c2f2728cc8f8109c239c6a3f0ed008ac0600b3c8cab10944d2c471695c3925592980265b2fc67415f9981898452 WHIRLPOOL e1fff7683d62203f9aedc41b919ff9f93a165107a2fd63692c0f39f0b29fb9e33344a7e254e03698b63a6d8b32f9f7554fe5e1b55bc35c4ab704a2aa6eb453d3
+DIST libreoffice-help-5.4.2.2.tar.xz 2343504 BLAKE2B 7d446d5b078adc8943be3fced92f367101f84c8639b84d86a1b8c2386d8aeec61dc01706078cbb251ad81abebb914acc7f5e977aa17fcd1f55db65c0861814e2 SHA512 ba845653d6388bae53eaa945abebb367fedace81c1949ed975a2ad0c270c688649b385b463256b362a6397f18d214aed9b876869434c6c3868649180e57c3112
+DIST libreoffice-help-5.4.3.2.tar.xz 2343476 BLAKE2B 794ef2b9bc8cd8b0d33875113642d01756f6f34fca89a67e8a5d3198db6fdc1bc2bef8515867684231ce68c50e0c8e40792cee7c6a9de4b513450b020973564c SHA512 eb74eae6ef624deabe23784dbad6bf9e22341c2f2728cc8f8109c239c6a3f0ed008ac0600b3c8cab10944d2c471695c3925592980265b2fc67415f9981898452
 EBUILD libreoffice-5.4.2.2.ebuild 17284 BLAKE2B 2f1c4a8f7a661b36fa3eaa8559eeeb9e7140cb3e1cc71ca1f4272512e3a268c7e24e60bebd9088a76f06e546bf0307a6e18626fc2e4fe55f04f7ad081befdc27 SHA512 3fde8087bbe39bc3bbf6509bb2faa9635a9e7ced06df58c67f143de24fc49f9e3742d5e61001a28fa9a0d600e8bb5ff72fb578acdd5637ac37c51679408cc810
 EBUILD libreoffice-5.4.3.2.ebuild 17339 BLAKE2B 2a0458cc28aaf6794f7fcad1c51f20c0fd5dcbc6649e269ade9c3ae8101e01d4ab2464db6e5a868267065b2150eda4b31bd67a952f29e9912f156bd5325e34f9 SHA512 fd6e1aac788c4d6a9f9fccee877764dc7728247799aaa72bd8a6af1cac12ebd9ebc089eee43849f85c78c96af4c543e2869c1764eab4f1c6b5c2983c790e2291
-EBUILD libreoffice-5.4.9999.ebuild 17339 BLAKE2B 2a0458cc28aaf6794f7fcad1c51f20c0fd5dcbc6649e269ade9c3ae8101e01d4ab2464db6e5a868267065b2150eda4b31bd67a952f29e9912f156bd5325e34f9 SHA512 fd6e1aac788c4d6a9f9fccee877764dc7728247799aaa72bd8a6af1cac12ebd9ebc089eee43849f85c78c96af4c543e2869c1764eab4f1c6b5c2983c790e2291
-EBUILD libreoffice-6.0.9999.ebuild 16721 BLAKE2B 6c9c419b5c6da53a3314af6345e6bb588b39cbacf9c338ac61873094c4e877918523ee2753aaee0049c3157e251ff8e0a4d1becba927004c07eb4c7f217d90d2 SHA512 81d04881b24d6b3ea1cdcaa1582a4770e3e779e8138abef054ff4b6ef01ad501739785bc5012aca12e8a6a852db60d250f5a10b4774449b5e751f42a036b2fb4
-EBUILD libreoffice-9999.ebuild 16721 BLAKE2B 6c9c419b5c6da53a3314af6345e6bb588b39cbacf9c338ac61873094c4e877918523ee2753aaee0049c3157e251ff8e0a4d1becba927004c07eb4c7f217d90d2 SHA512 81d04881b24d6b3ea1cdcaa1582a4770e3e779e8138abef054ff4b6ef01ad501739785bc5012aca12e8a6a852db60d250f5a10b4774449b5e751f42a036b2fb4
+EBUILD libreoffice-5.4.9999.ebuild 17304 BLAKE2B d0761bbfd97c378ada44b111c71360094bf75d262ae02c7ca407aa82fb4b21b6fdcb06d44635877d14013089cc9ee6ff39b50c088bda36b66fd708c21ab9d23a SHA512 547dad518eff3c314638d0a5172937e8fdd7701a0ca66244d981a80c56633f3f539b655da90ef465df44959b546bda84c97380e2b638332ce46bd76cc3f574d9
+EBUILD libreoffice-6.0.9999.ebuild 16686 BLAKE2B 922a677b1441257da5558c5e58cb8b7f29cc0f90fdb4248b3991c968462c937a1f28f70758dbf19d3935350dc331379bb2d3d3b297cc0d58856526971e7989ce SHA512 a29702e96e9ae9721ad6ae1d6eab2451b3fc4f619c8645bd316665fb207cfdcb47ab31aaa725c8e6b7266cc4bf82f6a50a2bfb073d16dfcd3e8330a22ed92e39
+EBUILD libreoffice-9999.ebuild 16686 BLAKE2B 922a677b1441257da5558c5e58cb8b7f29cc0f90fdb4248b3991c968462c937a1f28f70758dbf19d3935350dc331379bb2d3d3b297cc0d58856526971e7989ce SHA512 a29702e96e9ae9721ad6ae1d6eab2451b3fc4f619c8645bd316665fb207cfdcb47ab31aaa725c8e6b7266cc4bf82f6a50a2bfb073d16dfcd3e8330a22ed92e39
 MISC metadata.xml 1393 BLAKE2B 011d5a2e756882852e46eedb9ef66977b93131c570491008a9ebc547b91276bc2e6a7a3db045d3de0758d1ea6ca486d3ea5b4d5c7c667b08534212cce25c0867 SHA512 72cff0c78665cb79e4cb3df72a87af3dc02d9d46f6293a02974602387b50245553d90e1d7d3134d8143ffda809b3a497b43279652ede8ae7eeee9e724918bef7
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index 92815ff4ba5c..201395b5c801 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -64,7 +64,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 googledrive
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf googledrive
 gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
@@ -125,13 +125,13 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	net-nds/openldap
 	sci-mathematics/lpsolve
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
 	x11-libs/cairo[X]
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
 	bluetooth? ( net-wireless/bluez )
 	coinmp? ( sci-libs/coinor-mp )
 	collada? ( media-libs/opencollada )
@@ -143,7 +143,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
 	gltf? ( >=media-libs/libgltf-0.1.0 )
-	gnome? ( gnome-base/dconf )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -155,6 +154,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	gtk3? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
+		gnome-base/dconf
 		x11-libs/gtk+:3
 	)
 	jemalloc? ( dev-libs/jemalloc )
@@ -231,8 +231,7 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	bluetooth? ( dbus )
 	collada? ( gltf )
-	eds? ( gnome )
-	gnome? ( gtk )
+	eds? ( gtk3 )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
@@ -463,11 +462,11 @@ src_configure() {
 		$(use_enable eds evolution2) \
 		$(use_enable firebird firebird-sdbc) \
 		$(use_enable gltf) \
-		$(use_enable gnome gio) \
-		$(use_enable gnome dconf) \
 		$(use_enable gstreamer gstreamer-1-0) \
 		$(use_enable gtk) \
 		$(use_enable gtk3) \
+		$(use_enable gtk3 dconf) \
+		$(use_enable gtk3 gio) \
 		$(use_enable kde kde4) \
 		$(use_enable mysql ext-mariadb-connector) \
 		$(use_enable odk) \
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index a9461079bcb9..6033b315d7eb 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -63,7 +63,7 @@ unset ADDONS_SRC
 # Extensions that need extra work:
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird gnome googledrive
+IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
 gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
@@ -126,13 +126,13 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	net-nds/openldap
 	sci-mathematics/lpsolve
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
 	x11-libs/cairo[X]
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
 	bluetooth? ( net-wireless/bluez )
 	coinmp? ( sci-libs/coinor-mp )
 	cups? ( net-print/cups )
@@ -142,7 +142,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		gnome-extra/evolution-data-server
 	)
 	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
-	gnome? ( gnome-base/dconf )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -154,6 +153,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	gtk3? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
+		gnome-base/dconf
 		x11-libs/gtk+:3
 	)
 	jemalloc? ( dev-libs/jemalloc )
@@ -234,8 +234,7 @@ DEPEND="${COMMON_DEPEND}
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	bluetooth? ( dbus )
-	eds? ( gnome )
-	gnome? ( gtk )
+	eds? ( gtk3 )
 	kde? ( || ( qt4 qt5 ) )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
@@ -466,11 +465,11 @@ src_configure() {
 		$(use_enable dbus) \
 		$(use_enable eds evolution2) \
 		$(use_enable firebird firebird-sdbc) \
-		$(use_enable gnome gio) \
-		$(use_enable gnome dconf) \
 		$(use_enable gstreamer gstreamer-1-0) \
 		$(use_enable gtk) \
 		$(use_enable gtk3) \
+		$(use_enable gtk3 dconf) \
+		$(use_enable gtk3 gio) \
 		$(use_enable mysql ext-mariadb-connector) \
 		$(use_enable odk) \
 		$(use_enable pdfimport) \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index a9461079bcb9..6033b315d7eb 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -63,7 +63,7 @@ unset ADDONS_SRC
 # Extensions that need extra work:
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird gnome googledrive
+IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
 gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
@@ -126,13 +126,13 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	net-nds/openldap
 	sci-mathematics/lpsolve
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
 	x11-libs/cairo[X]
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
 	bluetooth? ( net-wireless/bluez )
 	coinmp? ( sci-libs/coinor-mp )
 	cups? ( net-print/cups )
@@ -142,7 +142,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		gnome-extra/evolution-data-server
 	)
 	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
-	gnome? ( gnome-base/dconf )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -154,6 +153,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	gtk3? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
+		gnome-base/dconf
 		x11-libs/gtk+:3
 	)
 	jemalloc? ( dev-libs/jemalloc )
@@ -234,8 +234,7 @@ DEPEND="${COMMON_DEPEND}
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	bluetooth? ( dbus )
-	eds? ( gnome )
-	gnome? ( gtk )
+	eds? ( gtk3 )
 	kde? ( || ( qt4 qt5 ) )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
@@ -466,11 +465,11 @@ src_configure() {
 		$(use_enable dbus) \
 		$(use_enable eds evolution2) \
 		$(use_enable firebird firebird-sdbc) \
-		$(use_enable gnome gio) \
-		$(use_enable gnome dconf) \
 		$(use_enable gstreamer gstreamer-1-0) \
 		$(use_enable gtk) \
 		$(use_enable gtk3) \
+		$(use_enable gtk3 dconf) \
+		$(use_enable gtk3 gio) \
 		$(use_enable mysql ext-mariadb-connector) \
 		$(use_enable odk) \
 		$(use_enable pdfimport) \