gentoo resync : 08.01.2018

5 files changed, 7 insertions, 7 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 6fe480d2e3e5..5b9376af270b 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 54daf50dbae5..c281fde3f864 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -3,5 +3,5 @@ DIST gnome-terminal-3.22.2.tar.xz 1952372 BLAKE2B eddaa5b3900211a2823c86353c68b9
 DIST gnome-terminal-3.24.2.tar.xz 1960952 BLAKE2B c94303cd8b322a37c70487fbab0f6ecd27b8e831cf44cdc80c82b31d2758f7c6927704d31c229cbbe41be565748238bbfcfae72470f273f7f3a9378c218af8b5 SHA512 08cd7b1b08cf22618554b1a051dcfee4a967165bfe93b77a6bc8b0c935695101e773e8d53a482d71aadb9ba7be7ac991d82dbf53b7a6f74f1f5144e4158f8a93
 DIST gnome-terminal-notify-open-title-transparency.patch.xz 37448 BLAKE2B 159bbcf6ca387af8ae2f05c23b48afcdf11351025420ecfd10d1b8a1dd9c2c8016d1c89c6fca20dde3bf8ffe3a6091232a989cfd520fa6761f65eec29b569d84 SHA512 9af0d56df105a5bdb81b2609794669557a7f442f71b240ee10a6411fab20ad74c14489dbb9a536e208515053ea17776b3a15afb3b949a75a66f8c2ab3dbbff96
 EBUILD gnome-terminal-3.22.2.ebuild 2120 BLAKE2B 4a8700e79ada5c404385154b3a7e27eea5388fa68a41eb477b6a9fda167ee7898f3044ee4f77411398eb28a85665539a862c6f46449d017ea11d38e6860f341b SHA512 3d92988db6fa83333666f08a7b329ecc8b405dcb7acc0e2c81dfd23a84ee30db940905936de4405efb61944cda7b617b68512c0bca3b6beb67bb61191b0a13e5
-EBUILD gnome-terminal-3.24.2.ebuild 2614 BLAKE2B 9f18afd5a9f059633a50f94e82de4f56870dd899768ed3a045b785adfdf187e74f871b2109cc8f5614e4874a03b82591174d50cda4263bab7ef9928852ebe254 SHA512 515d9e38de1c9cdc6a31ec5af0391ad81f4ef756e40fccbb41af60acb8c94405371abe5c5aff2a029f7fa713ccd08539d363a08d557757faa914fbbde15a31ce
+EBUILD gnome-terminal-3.24.2.ebuild 2617 BLAKE2B fd7ac1473378274c705ce8b21e6e0219bdcf0d18e70615deb66b464a616ac72417b6d8ad643d101a2f21052452ebee115af8d407bb231b51ede6e04bf592786c SHA512 be552a6b1c1a9f0414bd779bc63550cd602aa0bc9d59e10925b472a748f58800107ebbd96791ff5136b626209df55d2500efce678e1a416e3e39918c265605c6
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.24.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.24.2.ebuild
index 0a7b6da09997..934e903908da 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.24.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,11 +16,11 @@ SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/gnome-ter
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
-# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control
+# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
 # Needed vte in 3.24.2 is 0.48.2, but we add desktop notification patches in 0.48.3 that non-vanilla needs
 RDEPEND="
-	>=dev-libs/glib-2.42:2[dbus]
-	>=x11-libs/gtk+-3.20:3[X]
+	>=dev-libs/glib-2.42:2
+	>=x11-libs/gtk+-3.20:3
 	>=x11-libs/vte-0.48.3:2.91[!vanilla?]
 	>=dev-libs/libpcre2-10
 	>=gnome-base/dconf-0.14
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 92ba6465ec92..99da57a6c1e0 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -3,5 +3,5 @@ DIST xfce4-terminal-0.8.5.1.tar.bz2 942117 BLAKE2B b72f1f51837778a90b4f3299ed2d4
 DIST xfce4-terminal-0.8.6.tar.bz2 952859 BLAKE2B 7f6ed679eb53196d2665003cc2af7543c42c73679f91581ee241c4c1d3d4d34dfd8b78e2a8f3038514727d585b51a2ae11fe20a48a55e9d0b869c6baeb4ecf18 SHA512 96d9c3fab56ad9cd267bd7b33f4d8fb3831200b9507653a69e6872b673ca5e30adffc73ef2f73de6eb858a2817a98b781188a39a4c0d79298699711c49f8be97
 EBUILD xfce4-terminal-0.6.3.ebuild 797 BLAKE2B 3c6ac612d2a64b1073a1c0cc8c7a6ed5a6765695858ec76a8e96c4d8a38cf98d86778f90b7681eede18b4586c53c15c3c2ecae7623b33703c76ed88b11ebf819 SHA512 8f4e7bd5b0bf6a633dcb3de46cf428d6b300072a90e6b96dbae51bf3efa19a77a29b927b08f742f74ede0a0355804ed991e8d72c769f4ba0cfef5b7d31298ff0
 EBUILD xfce4-terminal-0.8.5.1.ebuild 747 BLAKE2B 7b1b10843d7a62af551b255cc9ee3be18b13f6adea9557a8906439da9199face5d944351da7aedbff02faf203159c35b31d28b8b235bc07dd9ddc0faf2515328 SHA512 7516c226517cfa1b55c447b259712c855f413ddaee16d252e101f9d793309fad42af7b1a731988f088db4236c916c21963c67aa06b425910fd088ff10a78009d
-EBUILD xfce4-terminal-0.8.6.ebuild 750 BLAKE2B 67e7533281e8a51f58a381de978e7a6f280a6fc97ada612a491353fa8e8f0d8970bc25085c4a23016095b001c242fa3eb0da2c5817c2c3448b48390d1b2eaffe SHA512 7009b8190515aa9e624fa41f3adf9c4a9d00d3dbd8d5bb9afcd8c8dc5996d093ae299e5f4b458d3a4364d90eb910eb403cc80e4e1a7ed10b2f45076303d5e01d
+EBUILD xfce4-terminal-0.8.6.ebuild 748 BLAKE2B 611927b11196ad3d3702c8d4588ced12fc0375c2ee0cad1bb09a71daee05565bcc438fd1ef62a2ccd27935151ab799777d748813f36c179ca29e12fa5320d79a SHA512 a357f52e4723ce70a587ba21ce52f518f1ee9c7d1e74283904f90ccab0fd7677a737331d61313f6780fd3d2b98829af916c644b8e1b6eef179e9896a48e3e28a
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.6.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.6.ebuild
index 7d9ebe5891c4..b92ec55cd60d 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.6.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.32:2=