gentoo resync : 06.01.2018

5 files changed, 12 insertions, 12 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index d6d2c85be9c4..4d182d9b85d3 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest
index 49e5cd0b886a..c62295546cdc 100644
--- a/x11-terms/mrxvt/Manifest
+++ b/x11-terms/mrxvt/Manifest
@@ -1,5 +1,5 @@
 AUX mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch 380 BLAKE2B fd1c07e4e4ea15ed40ce97a9ac79c952e4ce5b0b824c749614f3a95712d37d3b87573137130c5be6c4d7e6b01c1a85e35ec8f197812198d6c201cf0d87801a58 SHA512 703d32e803d73e21ba5c746bcea94331c43e53e6f1b84a86271e94ae4cc59e6c4e8d4e86cbc3e29d594aec04881db57f587b1e94c42249b2beef08e718b69a36
 AUX mrxvt-0.5.4-libpng14.patch 841 BLAKE2B 4d78c68def28ae24678db2fd4aca346fbee170e81ac394deb671569434eed42e6dd8b02f68197eb2245af3d4997561a1b14959d2dfc7d5b030a8db3ed53a451a SHA512 469f2f40b5f09e645be2f59166787b01eb76215e2810b9804d088ed271f743f8d1850e4ed60795674e5d041364e465da8e1f2159131a5b48cab015a106b383c6
 DIST mrxvt-0.5.4.tar.gz 603978 BLAKE2B 7abea6035620f4d93208458cdf994ad57ae47376364c65fe8e62542f013a65a4760df24c0a2c9d5fdecb76f20b895417792f773a32a7624836cda458b948dd3f SHA512 572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992
-EBUILD mrxvt-0.5.4.ebuild 3470 BLAKE2B a43c9aedd2f1ebf3199f475dca3e52b962c5a4936d201797f2206136e5199dbb0350401418469c639204c51d10be8976184f54cecad5cc8b50b85d808c397c33 SHA512 1e16e4cfd43d662eb6e3e6e94515985e40f5eff169dfb54d91b3892d06fea8a965df62f29ca88bef9213bb6fd57c3132882cdc66fb78c919d881cc29a35b4698
+EBUILD mrxvt-0.5.4.ebuild 3428 BLAKE2B 246e633bd13d91d4f45f045fc46d45a02a90eb5f0b6e78a44624e12bd340a32b813a123e1bc5671bf59377d87e35a5ab2c12029c8d4cecc58badb9f6ba14f749 SHA512 9f5bc02b26ff088c87047a5b8954b5328fcb86432487ff2e3631be1dd32b681b8b7f82d76f87bfac398d70088a63ed8600c3eb58a1bbe1f9883c5624bd5f4953
 MISC metadata.xml 478 BLAKE2B a0f3413f95c5926e2fa4294967283d32f94081447f5d37d0f57b81a54cd50f3bd1ba8790eaf23fcbf7e5bdeeff21da5e392030f5869100dffa6478201bf2954b SHA512 fb26a82c0a26b3e23e9307ab811cc05fc6affce3bdf705d9417d8f10de7c8448b506414da9134888f4fc3c6fbf4d261646b77916730df711a0e86952a352ce72
diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
index cb411ad2200f..9bc62ba04fb4 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -12,8 +12,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-LINGUAS_IUSE="linguas_el linguas_ja linguas_ko linguas_th linguas_zh_CN linguas_zh_TW"
-IUSE="debug png jpeg session truetype menubar utempter xpm ${LINGUAS_IUSE}"
+L10N_IUSE="l10n_el l10n_ja l10n_ko l10n_th l10n_zh-CN l10n_zh-TW"
+IUSE="debug png jpeg session truetype menubar utempter xpm ${L10N_IUSE}"
 
 RDEPEND="png? ( media-libs/libpng )
 	utempter? ( sys-libs/libutempter )
@@ -46,24 +46,24 @@ src_configure() {
 	local myconf
 
 	# if you want to pass any other flags, use EXTRA_ECONF.
-	if use linguas_el ; then
+	if use l10n_el ; then
 		myconf="${myconf} --enable-greek"
 	fi
-	if use linguas_ja ; then
+	if use l10n_ja ; then
 		# --with-encoding=sjis
 		myconf="${myconf} --enable-kanji --with-encoding=eucj"
 	fi
-	if use linguas_ko ; then
+	if use l10n_ko ; then
 		myconf="${myconf} --enable-kr --with-encoding=kr"
 	fi
-	if use linguas_th ; then
+	if use l10n_th ; then
 		myconf="${myconf} --enable-thai"
 	fi
-	if use linguas_zh_CN ; then
+	if use l10n_zh-CN ; then
 		# --with-encoding=gbk
 		myconf="${myconf} --enable-gb --with-encoding=gb"
 	fi
-	if use linguas_zh_TW ; then
+	if use l10n_zh-TW ; then
 		myconf="${myconf} --enable-big5 --with-encoding=big5"
 	fi
 
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 6ddc7777abf5..e3b01a258473 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 752 BLAKE2B dbaf6037e4970ff5e4d9a35c9cf7620ee6c960c7b9286426ed7e2f18ac3edec649f71d2ca5ff07a320b064d28c70845427c1b9e74cdb6182ec00126c3b85ad79 SHA512 2d8c7d83b1d6b3bff388b96ed4bc360bcb7a686316bfc94ca7f93fd9ac0a457e431f00156c35d3543ed9d8d0f76431b6e89cf466442d070eb315e2a74164eb2d
+EBUILD xfce4-terminal-0.8.6.ebuild 751 BLAKE2B eb929725cf3b4da909e0131bbd2908f6a94522a54251344d3d0239b06dbce1ebd369d9cc38349f2cd2223bad7bd86b71a960eb687cba88db5fc60ec8bd77dcec SHA512 e2c732131dc466ce8bccf83b5cca05a9a4530577aab534c1c835f2388670a187e914852a4ddf2882b963d799f4720e06fb2525298e1f7d724cf7b28d11088506
 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 14576252e317..43b6c1ca395f 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=