gentoo resync : 06.01.2018

5 files changed, 7 insertions, 7 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index c93773c0de76..10c0644dcefd 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 76e2ae7db562..c10ffc2ef323 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -15,5 +15,5 @@ AUX a2ps-4.14-ptrdiff_t.patch 367 BLAKE2B 1a69ba36b72a08f3c853905d9d2a0f787259f4
 AUX a2ps-4.14-texinfo-5.x.patch 5996 BLAKE2B 720a408c88c848fbe9b6ece319a8eb05a109df97dd2c25a26ed8a4ad8f49d545d111900cedc4d5eda05b4aa120b9f1f4aecd6434c6f20f1944d863b13d4952aa SHA512 1e93a21cda8547a49d09e429c8ffed23b68e7f7555fa356f615bc76eef059a0065cc71e62bb4f1a1239aaf140796195c7d264c5c884e1a89516facbdbcb955d9
 DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
 DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
-EBUILD a2ps-4.14-r6.ebuild 3607 BLAKE2B 462d3d0c2f172af673d36cc71c1acd7f1cbaff16b2ccf305924f7c618f5c73fde873b098262c67189c9c3ddd47ddc299eaa42836ea0a5744591079e46853afc4 SHA512 6dc1bad592bade03497dc0c3ab5deeb8b826d280e58652d6f10b42d0068fb4370b35c1567954ba4a443ef8b6934a764195d31b602d97f49e56b6009168e30c6e
+EBUILD a2ps-4.14-r6.ebuild 3586 BLAKE2B 0aeab0e2234264c064222ea83b2390bad9a950854c0f63ffe150efc5a66b238e4ae69354df63ef73e13d31c7ef1636d709585f334ebee74ba5ac37c2b5e94c91 SHA512 72ae818e2a7d5cb613a8aa3465b1a493be404d7159f5280aa2fefce224fc3a64e90f2b0c60b6cb5f8fc9b12561363a5ea5f88c4459a3aa22510b6445adc207a8
 MISC metadata.xml 346 BLAKE2B 5f3d7c0d868dfb3ce0ec6e47c33087f9d41b6b2e11d569c48b1a6a635f1a46e7cbb51e793f7df235c4b9dc20eb2eb24a5c8764ca2b6eee34a900d1f4641c4de7 SHA512 0973b9c922d40a291ad52b590c40ef122167070e2f3c2c30980a83188bf8ed8742d825542ca1ea88139fd7ceb0e251f91dff13822ffbec4c9a6af2ea2b7a0010
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild
index 0094fa4318f0..8d73b88d0665 100644
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r6.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
@@ -7,12 +7,12 @@ inherit autotools elisp-common flag-o-matic
 DESCRIPTION="Any to PostScript filter"
 HOMEPAGE="https://www.gnu.org/software/a2ps/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	linguas_ja? ( mirror://gentoo/${P}-ja_nls.patch.gz )"
+	cjk? ( mirror://gentoo/${P}-ja_nls.patch.gz )"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="emacs latex linguas_ja nls static-libs userland_BSD userland_GNU vanilla"
+IUSE="cjk emacs latex nls static-libs userland_BSD userland_GNU vanilla"
 
 RESTRICT=test
 
@@ -39,7 +39,7 @@ src_prepare() {
 
 	eapply "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff
 	use vanilla || eapply -p0 "${FILESDIR}"/${PN}-4.13-stdout.diff
-	if use linguas_ja; then
+	if use cjk; then
 		eapply "${WORKDIR}"/${P}-ja_nls.patch
 		# bug #335803
 		eapply -p0 "${FILESDIR}"/${P}-ja-cleanup.patch
diff --git a/app-text/xfbib/Manifest b/app-text/xfbib/Manifest
index 9777fd1595bd..e439829cc5d1 100644
--- a/app-text/xfbib/Manifest
+++ b/app-text/xfbib/Manifest
@@ -2,5 +2,5 @@ AUX xfbib-0.0.2-libxfce4ui.patch 2662 BLAKE2B 261e9de735f6872ad30675af2073a65357
 AUX xfbib-0.0.2-validate.patch 349 BLAKE2B 282c326fe8f80039a10930777a063bd556447617c74dcd7ccee8ab0572169521029246e4ac2728b8188c19dff41d5c4df0027d338f454fdf0f66f625f819d1de SHA512 fffd683dc018889793dc9371c756ec89c89d7de0a1c863aba9bac3fad8660baf16688b02831f83c07642de401c134ed86b62e34c95018c8836c714ad2fe89035
 DIST xfbib-0.0.2.tar.bz2 340703 BLAKE2B 4f15fb39fc55e06b5cde8961db27661f3f2f2e954e52e809105fb7f3326f54c63e63acb6fa21585da8a5aa340eafd4bc33df73822fe9f6ac7a04e67d95db6e0a SHA512 7f6f812bfdb6b95574f66b63e51fb1a70ce20fd795b6070b055cdc8e753656a266237be92a7e60865d9f1e5fa750be0af3404ecf219a8a5d89dde505c759aebc
 EBUILD xfbib-0.0.2-r1.ebuild 926 BLAKE2B 2f972986b3b315c28ef6eefa1a40137525501dd0b7c5c112378b3ff0ef6d9c8a291a2d1897aebb794473fb444ac18e2315ae6c5e32c6cd519c9952be323d4f2c SHA512 b41007e3fe8929163c416b1ef13ecfb90dbecd270005f47d7a756861a9ad23a82686ff94a665390f6bd061f3b80fdbafbe43b494413e025f7889245fd8673fee
-EBUILD xfbib-0.0.2-r2.ebuild 860 BLAKE2B 99931d273bd4b91d01368b9eb79b2af44ab3f7404af6c01a7f85f28051cdba66a494db18acec8a57c1781a66cdafca915dbe7857c02195d5abf0d433b2d70399 SHA512 de8a6c0c0bcdcfad5dea5c2b70e62a302da19fb26230413faebfc7fc2282c2635e470838a0af1b92ae4a51aea26de1ac5f27a6c122e06c979b0d456fdde28a09
+EBUILD xfbib-0.0.2-r2.ebuild 859 BLAKE2B ac797067144696fbb734d69018fdd6aafbe93c108ab7c084a4bc72166d154e2ca0ee5ba2681e4ef348ba6a179b21ba06d9ca1f4499a76004d70fbb9df14b3cfa SHA512 117d12c679e6fa9e6b1f9c730deafdcbf81d210e2d82f104f116f141016527239b7b387d45b0bcb66742a4f63a2adf916fb497e3f7a26e8226a9961813010f66
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/app-text/xfbib/xfbib-0.0.2-r2.ebuild b/app-text/xfbib/xfbib-0.0.2-r2.ebuild
index aedf4556c6d7..2a24e6eae3ee 100644
--- a/app-text/xfbib/xfbib-0.0.2-r2.ebuild
+++ b/app-text/xfbib/xfbib-0.0.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://goodies.xfce.org/releases/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.12