gentoo resync : 04.08.2018

5 files changed, 6 insertions, 5 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 26477c94ff67..1828ac2210e3 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/arphicfonts/Manifest b/media-fonts/arphicfonts/Manifest
index 473a5589c32b..74ec41ecd088 100644
--- a/media-fonts/arphicfonts/Manifest
+++ b/media-fonts/arphicfonts/Manifest
@@ -6,5 +6,5 @@ DIST gbsn00lp.ttf.gz 2345803 BLAKE2B 6b4bcca2a6947b532d0471cb91e3e7d5265af5f56ea
 DIST gkai00mp.ttf.gz 2698942 BLAKE2B c8ca0e99239904bb80834878c9d77e228d8460e2f308ba7bee1f9606e4c423fe4e3fcadd91bcb521b2856ab778a570db5838d4976e7f17eaa9e235f60237c3ff SHA512 5797d1a4e49c4ba219381fe4e90225584513f47c29af77f8004bb318c5cddf2097be56ea6cc09ed31573e8ceeec5870129cbacafe81df3d68d8bd556594b2c89
 DIST ttf-arphic-ukai_0.2.20080216.1.orig.tar.gz 10336387 BLAKE2B 89ea5d1ccabc30ae77c245c4ce2a8f9b058dbe5d1da5812158639a2270d20610633389cf1335f68e290525875f2e6ba50f1197c23993102571e3f14fbcc3414e SHA512 8c96d36f5e36eb73ec3e415cba7ee5f02a0b85c334af7362facb2dd9a7650ed3329cfadb21fe0fe7273f52c87f1bd1aeb039c40499ca32925db4cd96ebd03c21
 DIST ttf-arphic-uming_0.2.20080216.1.orig.tar.gz 10684442 BLAKE2B 0d5c73e36169cd91faaa9b61186a83f2d07baf5794a534bfcf330750aed643b4931918f7bfaaabe1b655f04faec36f5064c711cb2f68c605d63c4022cad78370 SHA512 ef96969d1c5f1bda14aadfbe112a1ba30ae1bc477a89838753287ceaf07804e59c2f3f306399e9d54074be99d0c963abdb33d789f3933fdd98453a1ef7731407
-EBUILD arphicfonts-0.2.20080216.1-r2.ebuild 2243 BLAKE2B 4080cd26127d91fc673684f19fb8bf2a5725cdc070b04d5386d9c541efe6970b02479cd444c02309770edfdd0e3abd7b4b4ed453edbbf7235fd80a81883d8077 SHA512 23e0fcb43ca56958bba0dd15d879708b7d1fab13723798fe135ca00909d2fe7f54266740891a42c7fb0f036c504cd48a2bcaf1bac6a018253f07f04158a3e1ce
+EBUILD arphicfonts-0.2.20080216.1-r2.ebuild 2275 BLAKE2B 6f73f5ef31b1d782b23545aceeb372acfb5fdffae24d8e39abc86a991238c773e5c82dafc1d40442e84344eeb74d32cc6c5143cadacf2dc859ee7590f06c8dbc SHA512 28474058adbddab8646eeecef708fba2b7d52d8c701513f41a6f159c0e5212872ef2a99057e059b6a7be63ca2b4bc1768a29bf97e38c6ac7c4024507ef34c847
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
index fd83c1f2a838..e9669cc08246 100644
--- a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
+++ b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit font eutils
+inherit eutils font xdg-utils
 
 DESCRIPTION="Chinese TrueType Arphic Fonts"
 HOMEPAGE="http://www.arphic.com.tw/
@@ -59,6 +59,7 @@ src_prepare() {
 	find "${WORKDIR}" -mindepth 2 -maxdepth 2 -name '*.ttc' -exec mv {} . \;
 	find "${WORKDIR}" -name '*.conf' -exec mv "{}" . \;
 	epatch "${FILESDIR}"/${P}-fontconfig.patch
+	xdg_environment_reset
 	fontforge -script "${FILESDIR}"/${P}.pe b*.ttf || die
 }
 
@@ -68,7 +69,7 @@ src_install() {
 	do
 		cd "${WORKDIR}"/${myfont}
 		docinto ${myfont}
-		for doc in  FONTLOG KNOWN_ISSUES TODO README README.Bitmap NEWS CONTRIBUTERS
+		for doc in FONTLOG KNOWN_ISSUES TODO README README.Bitmap NEWS CONTRIBUTERS
 		do
 			[ -f ${doc} ] && dodoc ${doc}
 		done
diff --git a/media-fonts/mplus-outline-fonts/Manifest b/media-fonts/mplus-outline-fonts/Manifest
index ec61d7fc3699..e97d354a910a 100644
--- a/media-fonts/mplus-outline-fonts/Manifest
+++ b/media-fonts/mplus-outline-fonts/Manifest
@@ -1,5 +1,5 @@
 DIST mplus-TESTFLIGHT-062.tar.xz 10173592 BLAKE2B a2b202115d1b239bbbc76583261ed90d14a7ee9fba1542005fcdd995d9793fcf76352a32f4985ab6cbef60fb4e4d82c9aab030d68a78da752e1424f90c30af11 SHA512 c8c4a9419423c9e98a64e344db7bcbc3b2d6b1ef08219a445acc18a6c5d39bdf3216a827c20ed41b25368e792986937623de31579a9ece5109954db7f0dd6d9c
 DIST mplus-TESTFLIGHT-063.tar.xz 10346584 BLAKE2B d053992dc6b1220361f91d9482eeea11bc32ec1989ef9b99e178f3f229c84f1d232111b7a97df195473bd957eccc973a0233da5263038e6beaf4a9ff64ff0cd7 SHA512 477b9669c14dfb10321b5986dece72fb44a2554ff6c9239ccfadf21643714984ee7fd1e42c9c7982fa17417dee0e7ef6b5d66fc7cceec05298add4ae3d9502fa
 EBUILD mplus-outline-fonts-0_pre062.ebuild 923 BLAKE2B ee3db3e1c516e51228b7b6985092e4b549a3b914a68060fbc77c88a28c7a9c7b241fab88bc399c74728e2eefcf9ca380dc4c5a166807cf4c98420949ea0e28e5 SHA512 af37a193a8b6d643499453e46e66d292bee46b2e1e622583474b0218e4bb828642e36bd4a2d4f6ea784a7095bae019b0ab24ac94505288255e86c912662d144d
-EBUILD mplus-outline-fonts-0_pre063.ebuild 928 BLAKE2B 05901b3d4dc4390af418cfac4e74f86d13b5009144c01dc03078c066ffadb086857dbe6c54130a5e6fbccbb4918db64361e47c8af59319d90955812f5020a0de SHA512 b358a7159d682ed3a0f076133ace07abd1aaf612c06140180b5aed247c9f616245a271f05005e5b538dbf43359eb7efbeceefd92d535612fd69e668f8e17b2b9
+EBUILD mplus-outline-fonts-0_pre063.ebuild 923 BLAKE2B 5f6231dcbaf687c25729fb4f8f8eedef32bd1499f2c7835c32ff6045cc5cf9cc18d1eb79a00a7d4d16404df5e27dd721bbf536635212d02ce896ef3934ea7059 SHA512 328a3a9d037ca9b6ac1bcfa5cb05f8cc73517e3632ec37db2099d1e0538835515cb649073e262259c29baa9df8f309e8ec807bf9ba134e8a50adebf89d71c2e8
 MISC metadata.xml 549 BLAKE2B 9522a58a4c3feceab34c6aa60c8c34f514bdc9be12239b5b5337b305ef1bbfcaf8f57fe49aaf1ab05763a8ba2643bc2a4e8d37ce3bdbd12f5dca2a86de159def SHA512 280d7cad69c36ac0d3501c24e6790322d584782bcd33e44600c09de00673715c7b1315993ea1544a9533bfe41a8bef0aad3e73398469dfac62bee746b0eae1c2
diff --git a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063.ebuild b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063.ebuild
index cac86555efa7..dc6b6682bbcd 100644
--- a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063.ebuild
+++ b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/mplus-fonts/62344/${MY_P}.tar.xz"
 
 LICENSE="mplus-fonts ipafont? ( IPAfont )"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 hppa ia64 ppc x86 ~ppc-macos ~x86-macos"
 IUSE="ipafont"
 RESTRICT="binchecks strip"