15 files changed, 51 insertions, 194 deletions
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 2dd8f7ead0b7..8c8d0eedb532 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/droid/Manifest b/media-fonts/droid/Manifest
index fb809a57d949..242cb9152b5b 100644
--- a/media-fonts/droid/Manifest
+++ b/media-fonts/droid/Manifest
@@ -6,4 +6,5 @@ DIST DroidSansMonoSlashed-112_p1.ttf.bz2 74632 BLAKE2B e699ae9170d91a980fe295fcc
 DIST droid-113-r1.tar.bz2 4227725 BLAKE2B 9b9c25b93c5b4b9335589af02e6844d52a5a01d37b168b117f0191793b5274e8d4c944dd15a949c4ad868d8c2e51412ec875e72fc642b388d4018e6bfadb9248 SHA512 1219f54bb153b26bf460d89d866236a4f4ae9010eaf0c1236a9d9633dea7808df7228c6cffcf9635fcfeaa81e5f93e8ece7b02b885a5e9baddc9f522ee07ac64
 EBUILD droid-113-r3.ebuild 1095 BLAKE2B 74dc3095dba592c8854bc1f4139e2a7fd41d12672917f4c8934d6a67949993dd610cf0ee7050754b224621d900d209c20e7e338727e2d410813a742cc105ed90 SHA512 4459fd2ba1c69aeb8107ea3dd0dadca81ce3324b1bcf5b8015aab29378515656ea723d8512964fd0d2cb73f4c70e1041514408a6859e6ad4ae445945c05abbd7
 EBUILD droid-113-r4.ebuild 1122 BLAKE2B 23036ca22e6b85c54cd35957083fb7e3050dfc3b503e59aa5c5c0ac4d908e7b86526ad958f666e2eccd80de43a4a0b77d12b3a2f017bb657332aea0a96f4a892 SHA512 e8c8a76af7e5e364996b679ed717b851d60eb8d26a3f9a7fbb3a184dc9ddf98059c7ea6a52ac6aa8b732af6e1d55f70ebbb0ee78cd14298aca956a53f57dea0e
+EBUILD droid-113-r5.ebuild 1157 BLAKE2B bc6bea86593e355dc5d71feb198c5626f9000511b24558710eb1545109ee3ba51397761d6a6de1c2fc348f1a85b9ae337a0663a338fc3332e280e3bdfa637600 SHA512 876b76649ff949cfe2fcb362d5a98ddeee64efe41c187a61ff841942b6ef82436cc28ecfff8b32a6b9b872bfdf34e9720fedd00770a5228566c9c3508d12069b
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/droid/droid-113-r5.ebuild b/media-fonts/droid/droid-113-r5.ebuild
new file mode 100644
index 000000000000..f38574c7cf84
--- /dev/null
+++ b/media-fonts/droid/droid-113-r5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit font
+
+MY_PN="${PN/d/D}"
+
+# $PV is a build number, use fontforge to find it out. 113 was taken from:
+# https://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts;hb=HEAD
+DESCRIPTION="Font family from Google's Android project"
+HOMEPAGE="https://code.google.com/android/RELEASENOTES.html http://www.cosmix.org/software/"
+SRC_URI="mirror://gentoo/${P}-r1.tar.bz2
+	mirror://gentoo/${MY_PN}SansMonoSlashed-112_p1.ttf.bz2
+	mirror://gentoo/${MY_PN}SansMonoDotted-112_p1.ttf.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
+FONT_CONF=(
+	"${FILESDIR}/59-google-droid-sans-mono.conf"
+	"${FILESDIR}/59-google-droid-sans.conf"
+	"${FILESDIR}/59-google-droid-serif.conf"
+)
+
+src_prepare() {
+	default
+	mv "${WORKDIR}/${MY_PN}SansMonoSlashed-112_p1.ttf" \
+		"${S}/${MY_PN}SansMonoSlashed.ttf" || die
+	mv "${WORKDIR}/${MY_PN}SansMonoDotted-112_p1.ttf" \
+		"${S}/${MY_PN}SansMonoDotted.ttf" || die
+	rm Ahem.ttf || die # bug 530158
+}
diff --git a/media-fonts/fifth-leg/Manifest b/media-fonts/fifth-leg/Manifest
index cc2f831b4b58..4f0abbaff685 100644
--- a/media-fonts/fifth-leg/Manifest
+++ b/media-fonts/fifth-leg/Manifest
@@ -1,3 +1,3 @@
 DIST opensuse-font-fifth-leg-0.6.tar.bz2 265609 BLAKE2B d121f9593f2ee744e91360fb8af50354d800ee3d460573f8493c87aa7b803d7e0c71988524315d606988e18610057740ea4cdb2f54882784dba135e1772f1b2b SHA512 7c2ee6aab8d5bc54d3a0d3a7d02ff5514cdc9e6672fcd28e827197061e5aa3f023b1d6cbe7077458f8cb3046a22e4aac085d4a56398d59845d004edde67622f9
-EBUILD fifth-leg-0.6.ebuild 465 BLAKE2B 12076d63998215181626617c2e55b29162d512ce086ada7d68a16d8c8c6de3125ef404ec821a4f7d78873f54d1d3eb67d4dca6b64e1a980efe27694c51f7a7ba SHA512 3338003f90e26448804d9bb1233618d85a184a6dd5d18de3fffe1eb1571a0b907f86ade491538ec109e5d73e5a8f00baa233e74a73cf181ecb98b1ac89e70771
+EBUILD fifth-leg-0.6-r1.ebuild 465 BLAKE2B ea92d5b6c3bae0f6c4faefc8c22cf40058a1c922c3cedda0c7583d2367bcef5e0568313e0c1c4321d3a76517d7754e8c505b030cc5fc91ad400c1003be2fc0d9 SHA512 22d675184ced00fbc3f0479376846478505ad9b3638723a5bc8e073649c5b8f87e5259f1424288aba91705fa88ce50a0b747a09f96470e84d038c8e684995204
 MISC metadata.xml 322 BLAKE2B 23c93f72b17caf0c0e7077c961b71cf7657950d688e1da1a4576ff75387e218b90e382216af2bc8ac785b6493b0f0d415b6d8b117a6918ac4e1ee89868dadde8 SHA512 83052c769bf8a2610b449c3f31bd39d9113483c326b947fe2e62967312be711fd3f3802fab0e2e72cb0fb18a8ea9496f82e836bf87dc2a8c91de1967f59ff555
diff --git a/media-fonts/fifth-leg/fifth-leg-0.6.ebuild b/media-fonts/fifth-leg/fifth-leg-0.6-r1.ebuild
index e0853c0f0805..3d7b659bcbaa 100644
--- a/media-fonts/fifth-leg/fifth-leg-0.6.ebuild
+++ b/media-fonts/fifth-leg/fifth-leg-0.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 OPENSUSE_RELEASE="12.2"
 OBS_PACKAGE="${PN}-font"
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index 024c6751ff77..d53004d022ac 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,5 +1,3 @@
-DIST font-util-1.3.0.tar.bz2 142059 BLAKE2B 14d32bacca571bfa6ce298cea945e42bc64cb44fbee212be671ec3079bd2f588d5ce996e48eb16d06c397e63839f4714324cb002837492c6f5d04bbff91a03b0 SHA512 61ce9a730e9601decf21fed222c7500aa8a08afd1919634367b927f5479cabfc235c76855f447a560605a477da5cbcbf614af7d18a74fcb512db2f7b3bf4ce5a
 DIST font-util-1.3.1.tar.bz2 153289 BLAKE2B b85b2dbbe3ed97e22d765b73a9fee7472790ff037878967ee6865e3122c651ff5e3b6aeb99492b1330bb77d2518157abcc45e503419b21f2cc76a3196d505f22 SHA512 9fd6dd4c0a01ede5f0b09ec0f9d316267ca086e2ee9526a43a4e4d6ce3cd67c977293bd3cf440328ca417292fcae1579888b24b7259eaf012230890210d74889
-EBUILD font-util-1.3.0.ebuild 630 BLAKE2B 3a2cd41c3c68ce7bc020c2525b07e89a2ccb193c265e8eb1bc9dfcff85814b89ed790e8f6969a8312051230194524ce8abe291fe6ecaacdc156027ef7e52a481 SHA512 38997ec6127ab0621a901bb56c6053947b0e5eba4aaeff1236802bb5ce04d469bbb6aca409a96cf04791cb6f591ecadecb1206c9e15bbbc65a2ad88080d7e59d
 EBUILD font-util-1.3.1.ebuild 632 BLAKE2B 77c7e583d51e1aff577c782adda1d0ff634bdc397b244e6f37e36f92da62eb4cc0d8152a4791c8281126a84b4187064d1e7e7b991c966794b5aac4944a0bb557 SHA512 0d54814d6f26034403784bcbc795290a70f92ba86c35b7290b7c3147d15127546c2cb1737b4d102c05b5093f18a3b7b9ec2ed98c3b62f57b0177c4cb57eac5cd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-util/font-util-1.3.0.ebuild b/media-fonts/font-util/font-util-1.3.0.ebuild
deleted file mode 100644
index 680926fc4c15..000000000000
--- a/media-fonts/font-util/font-util-1.3.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/font/util.git"
-DESCRIPTION="X.Org font utilities"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-XORG_CONFIGURE_OPTIONS="--with-mapdir=${EPREFIX}/usr/share/fonts/util --with-fontrootdir=${EPREFIX}/usr/share/fonts"
diff --git a/media-fonts/mix-mplus-ipa/Manifest b/media-fonts/mix-mplus-ipa/Manifest
index 45afc4ac6581..31c266111be4 100644
--- a/media-fonts/mix-mplus-ipa/Manifest
+++ b/media-fonts/mix-mplus-ipa/Manifest
@@ -1,38 +1,10 @@
-DIST MigMix-1M-20110825.zip 4329341 BLAKE2B 2d2c7f7ada0bdbe6ae9308c7ee1b5523b9fefb49eb6ace69730ced1e17226983b5a00c9cc8d27ddc59a4f821ffdadedda5fc2c73662d2e5e20e00a183e708250 SHA512 66293b0fc7151cfbd5df51f028db699f2ce36ed2a81634f20ef0a60db9e954a094959c9faa0f8ae367ea28b1fb2ef7f9963120c0ba48a36e65b9f45b49375f16
-DIST MigMix-1P-20110825.zip 4425294 BLAKE2B 3d8b58e1bac8101df3260af40b0ff7fd9a0e49b0039f6fb857f514cef1f9c3bc927e926755ea12c3125aba91679226466828036c7bd9ce25a9d7f59234fb8ba4 SHA512 0bc28994090590d1d5e91c560272f37dcb5a1d0506f884b7abc270d766410ac92aa4428fd723491a5c4a08f726ed41bf4690e78d55d261e4b60e915cd88a6a59
-DIST MigMix-2M-20110825.zip 4327015 BLAKE2B 97072bc6d7d5a4e12c2e47c1b25e2eeec776885b875b45485a2f7a9636635c3d3a50c58156799941967de00f9beeb85e304fc5846734dccc853cb8fdc1064ba5 SHA512 a630ea18861a4bd4843aee7ed21721509cd772fe55f5abee279f0fa4fbcea6346df0e2fbc7310c7da4415b0496f2491006646fa6b48e27c93c6d35fc1d4a8089
-DIST MigMix-2P-20110825.zip 4424802 BLAKE2B 7920f6048ea1ca9ff6d30a4b529af7ed9722d12754b2084cc674c50896b820c23e6f93a295973cbea0b010961402390198967b692b4abbba562cc7f752c49bb4 SHA512 d871d5050a6e268d583b113272fe6113bf3675e828909a4a9e92f0c418a9f1875b6f89850d0a5556a2788e37e81128331c697a1d58d34b7c8643e514514e142a
-DIST Migu-1C-20110825.zip 4433526 BLAKE2B b573c78b1f293aa7eefcbd4c1e84d449d06de7f41638d99319f48e4d7bfebfb35a037f537d19a64772cd4c0d7b17dc826d02322db419dd1b938d01b4a340157a SHA512 7017b3e17d2a75dc392491998b427185787b1f899a2d62f5ff888f81a1a83fd09dc2503d86e65921afdd145aa2cd4bb370077df9e3f04f7eccf51a8706d3e9af
-DIST Migu-1M-20110825.zip 4337420 BLAKE2B 5a88d2c72b5a8c42ab112030bb88bd8eb93209bf177257f5414ae24d0685cd632fb21eb4b2bd92104d8be8e3de1c071ed578348dc2c1a5c745278ed9940cb24e SHA512 8cdeea237c014ddc4babaabac48ab04a47124b2a28627b0a6e364ee688726fbb052ed706f15838589598a954ae1d1a591b9c8b55699b353c715d3f1c3d01031c
-DIST Migu-1VS-20110825.zip 4835029 BLAKE2B f4f5ae16a11b5bcffbf85ad206c0aff36701dfb26b4966d0ebdb4b93c9a35720650413de01df989a1cd35ea2b966287b83032a6f6203466dafcea97b8ee7a14f SHA512 9112d9ee658b4a1c0905b30cb52c3e04e91aa3a89810644dbcff2292db6df2567d1bf34741b2401cee344e4a42b4cb8f6662481c76f149bb54c5eab2cc3bd631
-DIST Migu-2DS-20110825.zip 4644604 BLAKE2B af4437c7d75a7bf60f93e6846a6af29d4e9ba5fd1e25443639daebfff00b9d1fc63729ca5e3c0ee347b045b0967c6306766cf0d1446566ebfb272054d05fac15 SHA512 c879a5c061f7bfdd1125628feff3e684ca8d28035790ddff2c0d7f4d723a9bc6160b5d1aa4951db0867ed26d8795122131758a88e9a0fffff0ccb6faac16abbf
-DIST Migu-2M-20110825.zip 4335267 BLAKE2B cc2c5f175589a99c662894601414cb039c42cbcaa427ff2ded50e08e093d249d08d7e783586843605c9bfef79e562d65a9b8c279364fcf1fa93b543cee1c961a SHA512 97015d8bda7191bf2fccc362a25fc2aecf93eb0dec99c4a13137ff48e986cfaf1c413e2e116a5dcb634de72ff547e8c440d04a9ec29de03fc28427485ce3e88c
-DIST migmix-1m-20111002.zip 4326677 BLAKE2B bd1847169c78f0c56c1e4bb2a8cd8f83d2e4768148b047c7e71b0306af22023d296f98afd0d9ed7dd4e68dc237533cfc972d56e0006fb626c81bcfd1f7771055 SHA512 d15cdc6192c7bb9b033bd69a79f12fdb1fdf3da022aacbc75f3e41b9958a1f70230bfe33d3bc076f5d34a0455006e1934da9cd4e2472541f013826e55d40c5da
-DIST migmix-1m-20120411-2.zip 4318638 BLAKE2B 089277e8197f4219f453b410359e5882747eecc29f1e54125259fbef8009eee7a83dcd3779d357cfc15c8fe016a00f9edbef0873b6abf5026916895a6cca1560 SHA512 f9cca47bee59c1ffb462b9563200fc0d5bab056ef65aa3000c415cebb04117664b6c44b179507a7c02e7fcd6edc6674ab751c834d609b137dfea347af58a2510
 DIST migmix-1m-20130617.zip 4259978 BLAKE2B 35a16d171862baccf82c33b0efcbc205af56b48d905780ab6f7916159a879674082f590790b17003b15aaea3c788c44166e231a72215538fa8fbcfdb575cf6b3 SHA512 cd1b39d5389a3e90d1732805aba1a79b030c75692009f3a9029f5b09ee00c21793b3c87ebcee8fd3687666c31d0208070b695a720a693f7c2061cfb4d503c054
-DIST migmix-1p-20111002.zip 4428269 BLAKE2B 020ba6c789a9f7a06f811f504550f388ec3faeafa7830f7e5ec777cb891e8959f82474af8baa12d8ef4d754691090ef45af97606ca84248d17d97b7aa5abd039 SHA512 efcb19e29ede4e47d0f0e47b311519f744a8375fd432b26846823c84e6ba1042e8d9709f0d242fb27d5a1b4c19ccc004e91cad18a56d97dce61bfbae4cf99031
-DIST migmix-1p-20120411-2.zip 4419548 BLAKE2B ba492fe1a6f58876b313d65fca38a468b9371a925fe34c5efd216e01f26229964e54b1e9177270002d1de51e7085a1eaa22773eb499e9bbeb00cd2099267ad28 SHA512 3c8e771551ff30ba798ac03079120a3356bcc2401eae6128515ad0a4b1ecf74d648f8c37de206505ed2873b968f6db85d74f29240f3f3aefa54fd440ebe3abae
 DIST migmix-1p-20130617.zip 4363373 BLAKE2B c33e0b9988c5c0f5e570b4d6e60bc2357a84a0cf8df6a603b68bff821cf89b6c6124f9eb34aa6dc9213a654313ec9685ee903696d41faf8afbd3832cbddb5ff0 SHA512 e71c2dce30e163252353c59d8e120d3d3f4c1885d84ba025446850596c071d263f44b9dd70973df2dc8d10a113180065e106f070a9e711928ea093174b7f6ec0
-DIST migmix-2m-20111002.zip 4324338 BLAKE2B 3d56702bb37284a67ac633f38833d7e9b48abbf84b195798850c35983a3ffecd518ce2160d563cb434a9ec6e15f96ed2f13893206b2b3c854c63d8aa3196aede SHA512 7a8714f0f6dc039183fd17c87255570b0d0254484259ef882582625828d61c8dc3494ca1e1a44aa28b97a5114de8163f74343686f3b717a953a54677cd60f84c
-DIST migmix-2m-20120411-2.zip 4316236 BLAKE2B 88a277e25fc8733994bd2eae4b2fc3d15a238b6749909922184d081b73a41facfe5cbfa36c48973dad29532533e7c02df986c518730ad61b8ab530ee22541841 SHA512 78d5a1fbee282f4410abb1e78fb1cd9509453c46d37456a0f427d215eb16e6c554b6d9156fedd1e3405446c813dc4cab3c9b65bc77f9691c240fa0cd713ffe6e
 DIST migmix-2m-20130617.zip 4258188 BLAKE2B ee313bffc639d6952b936cb98dad74f6f53f30a812b32693a203f2add6d0dafa634e75d6e5c6d842645896649bd832fa1f12700960f060f5b75ad04c561b4477 SHA512 e5a83f25287bcd6fcefa1de3c42631eb5bff347b7471f55f7489d4e60dbfc3378344de2f2034b8b5e8bc2aa439e02bf90f03728d8ad59458ee2d93e9468eca2f
-DIST migmix-2p-20111002.zip 4427314 BLAKE2B 11c7c4887bf92eda8d524f45d5707cef2041ebbcca2e7127f35ce38c32e5ea6e15339cb9fa7be59d8ffe61014650f3a5efbbb344b4f3f80a147b878315123efd SHA512 69c9d78f528f418919386136149a5c3580983ffdf201ad62a83afcfc1534987af48a46b66cddd463887cfb0a490e5518fa2d3202da7c0091411e9d264c24e08e
-DIST migmix-2p-20120411-2.zip 4419141 BLAKE2B a2ba3a2957f5df45fd495178f29aa73df51f080ad99e3996d5e63721e0933270fe58a3b98395ee42ce89f397a74bcf212d5f6c8db410fb25d5a94c6a88c5e2e9 SHA512 46224a5a8750208872ac8514c07b42c56a93a24ffb8b05920ce14d11be1c57825b99fdf9e0d24fb8e981b1df6ed812afc9b0f0963a6c53b91719fef55e26105d
 DIST migmix-2p-20130617.zip 4363986 BLAKE2B a5fb93354ceab48041770a10a9d251bfe1f03a7a577772ebddbe94f47a1093ac1c047765dd4fd517ea83ae696f6542a5b0ed07034b545ce5a8cf35a0170e1bd4 SHA512 aea1fa7193271c5de931ecf384237df6a3f175e07d89d1cd2b8d877e7ab408a32de383022a23c5c24777190afc417b7a835a65cec574d7b26cbfd4aebfa6ee54
-DIST migu-1c-20111002.zip 4436245 BLAKE2B 7e92dde7a1ae927f32d391a9c91b1aa54ca625e5b7e1d37397980642bf4088bf3ca41c83a02a3051749bb9886c6eed012ceaf1cba05c56e03d8a792c14056c21 SHA512 57a105c79c9195442db482fe5cb56dcd586ddfcc0eb66b35e76ea9994183ad386246ffadbbb341f19295d8d3378b45d10c2d82a96ea33e2bee3b9180e39f510b
-DIST migu-1c-20120411-2.zip 4428093 BLAKE2B 5c7ab2350e23668cfff3b3e3d230ff64ca8fa8c31c932cdaa348497c8fb8ff8f2f2722e347dc9a59684439c85376c5ad9c98b7ccf32531fac3f97768db0d93fa SHA512 ba02bbca934344361b03a339df73bb50a1ca1a41f7bb7bdc903f9cb2df9744ed97f560b42b3ba7089ffda0a61dc7a4db221903aa1af7359d3714d9f3619dd403
 DIST migu-1c-20130617.zip 4373842 BLAKE2B 00fd09bcfa67796d1d81b4724a247787c8852a6b00e87c99147d608e28ecdbf756b19cf068a99fed4abfa0ecb1c6083bac0486155593b8f861a77a5a724ddaeb SHA512 4b28445fe2990c69bc4dc01d97403cd5c75ad2bb8d7f2742cf3766a0b0a4cb035dc46f467c226349697e82975d9ca31c54c4df9d091c14c8eb4b2d6401b6fe78
-DIST migu-1m-20111002.zip 4334677 BLAKE2B a67511744c6510b65ffb34e2940dd77777144276104ab26921cd105c42032244f2ec24f059ffdb02415ec7d91ac9285467286c09cce7bd61193a933768a575d6 SHA512 b92352fb19b993aa093f7fb9de890ad10e85c61009c436baea83009b878778f160e42db5a447adf5f3f95e3c7852a9a700106ec712a61a3c7187dc9e811157c3
-DIST migu-1m-20120411-2.zip 4326597 BLAKE2B 74695cbb430fdad9e8b007929b655311febec2d09cc4ac84635e7b6fccfd3b5df10df690bdaa017dbead544c3a647fe2086940c09f18d431909142dd5ebf1bda SHA512 4dd30516848ba480aea904a62787ef6aa4c2fce7ef33fb6248100fe7a7597f325c52f7d9d0bab4eb7cc7188e8db333ed2ee35cfd3d9fdad2b4a61f6129b062c0
 DIST migu-1m-20130617.zip 4268071 BLAKE2B a5607fb7ef1d029bbb1f8a9b4149b75ea75a788e526aa82e876adaaa0e3e395f387a0a3c7b223163183685812da38914fce7c39b301eaa32e53aec38d204fdfc SHA512 6a0b33cdcadb57e856606c372740f1243b95c0dbd19b00873b9efa84056176ae7c3477258e90e6ef399b3f67e51a3a269792c30c7920d56d29ff3c5a3af2f8c4
-DIST migu-1p-20111002.zip 4428331 BLAKE2B d6ece5df94f3a0d2d9d91eff959c7c38126f4b1b79c611a3bdd1089235fb9bf4b1286c9ef34569b681a566634f455876a7d6d0faac62a5151a0c392dfbd1c4db SHA512 da3f30968fd120eba439d709d4025e98f29f7e8806cc021047618ad089076540f15f8511bdc37c859963224df986fd6f5a7b1240964f019ba4e536629026d27d
-DIST migu-1p-20120411-2.zip 4419857 BLAKE2B 807de7cf68f4f3c3d96e4a192522425d3cfd81a091767c36d2e8ed220d6392db460b9aba6b89b56274e8bdecdea29e4af7f4c28a7c2082e167339557d6301953 SHA512 0f7ecee522b56401a8358e9f21aac055deac8ecc8d52b966a5227e2e6824dab1642f850d53a41fd25a1a189d68ec38b73270eda33b3c75eca54d4c1b17188e6a
 DIST migu-1p-20130617.zip 4365146 BLAKE2B f083c90b90814c91f2619549ddc61e4f256eb4b646d4d3552414bffc40a01058759d6b35ee35cdcf3471de51e5209e6ac0004e7b2006522abeb433ed3d8f65d9 SHA512 d7e04680d7bfc463d2bd757950deea91843b4c0ca40a190ef75c46cdb5dbf52e8953be9a373e1b253d94dfe3dba8a4f3b76c928e107e3f666009af4a408fb6d2
-DIST migu-2m-20111002.zip 4332395 BLAKE2B 1f5ff996b5069f12d800246619f37cfec7fd420b4cc0d505831849fbcf46a19891cfc640e7b2565e76637358fd9aec408a9c0bec8c27c84f0660f506e6ebe01e SHA512 2b2e3f172308eafc6e6186b8ff66092b7cbfb81ca604f7d367d5d2bb6a7f6af7e5555e977a2b491f267ded571cd7c07702136a1d7bba1bf9cbf7f25ede805e79
-DIST migu-2m-20120411-2.zip 4324280 BLAKE2B 25b355dc8033a86c7cd9f1167e1eee5d37a934c76482ea3cf03d257637e5574742c4eeb440bdf902b5008c63b37393d46d492b8a2e65a8ce7042b75d80e3b952 SHA512 6a95a24053ad48d786997f02f82327e478a19de8a3ecc763f753ca85b630d1f6dd636b63bfdd2e4ca8a1f9c57fdd95f4bbde3c3a01a44bebe92e3950d1e8aabe
 DIST migu-2m-20130617.zip 4266805 BLAKE2B f71bd9785e1d4960f07242e8728c7dc2e52b189bb7d827e51fd30377ec94d196885b533319e07db6be3028ec5910c436712cd2a730f7d79805a9279826632d85 SHA512 926660fc18b113d0794c9a7bfccf1ebe5f08805de5d2d5bb4fbbbf9a17e86a748e09d75a693bbc8f5a4d5bbba7ac9b205ee47ab507069a22428740b89d855e83
-EBUILD mix-mplus-ipa-20110825.ebuild 997 BLAKE2B 46e6b8f2d4136d1440c0e09d7891d5e20a226246e96b37588149af1e020cfea76661fc02762d21335bc0eb47ee8c3dbfde19558c00d808e7d8f9eedfc2a37c00 SHA512 f434e7e8783bacc9435623bc51a718a3365a2ed7ab599eaaaa50292fbbd85cb070efff890c027dc618b5cd654d5af857e975f6de5e9f3d452a97fcfc49377c56
-EBUILD mix-mplus-ipa-20111002.ebuild 1098 BLAKE2B be437badd29fc181ff83ac82c959dbd471d38bb2777642e6e5ff01dc98372d7a54a5acc7f056adb5a96771c606f3e434d13df9968c856e141d85fd1935d2431d SHA512 e018757baf7104f908ae3b95b2a0742f70e927ef10579372309c82df5667fb343892d20beb1c81747b099c27ed3bde9a00de1265fad37ac0f6bddb1d5bd8f735
-EBUILD mix-mplus-ipa-20120411_p2.ebuild 1012 BLAKE2B 0d4ce9020a341f53b966d3c15d06bd6580d2a1260fdb6a086ee4744447b6adda9739b942a0b70658ff7b21885c5fcf51819344687e7064868ebe6e3d099e45a2 SHA512 9829e00a6877fabda0a1d840086dbf4f2d6ded5193170d07fe3a3939ffdb9cdc8369e770c73555d8cccafb5c78e0469ecf902975af8a48349a796c04538001dd
-EBUILD mix-mplus-ipa-20130617.ebuild 1012 BLAKE2B eb2983abf264034e1ab4a44b0cc285de5792ed12c8db922b0040ac0ecdf626363cda40fb9d0a4bfd781bd7b8f7b0ce3b81d6616ac2a2926ef6b229e3c2598370 SHA512 910c7bd837bf56397b54a8f13a594368fb156b17a07dbd8d0773b9601068d43a0b09f6e6505ed7f9e13026191b4f40fdd20bfc50b01626369cbbfee8b1327bf0
+EBUILD mix-mplus-ipa-20130617-r1.ebuild 1019 BLAKE2B 0dabab3723c939b850ac56225cf171cf348b2082683a7d0a44fe1c3d2bfc911b605ab3e846368555814b25ef05c660ef960868a640990017d705e11c1518862c SHA512 2fade7495c68e3f18321431363ec46a3249f3baa859ec18b8adc3210fa303b488bcd06e7e88b1405a43cb2cedc79a62114721631a35ca30253ae53e3b42162e4
 MISC metadata.xml 324 BLAKE2B 51017329fa09a00ef96fde9191a5004f261574980d0fb621f8d924e6f204437b95322de67b7112aa9ab7ad1d7ff73de5657ae6ff47cf9f4c6a3126b4741697e7 SHA512 4d86e705ef5287be8dd82f391cdf6557407e944280d238c21f7843fbf3427e22c8c377b6896fb86246e3dc0b6f2f4ed40e26128d39532513d3037fca1a6f27fd
diff --git a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20110825.ebuild b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20110825.ebuild
deleted file mode 100644
index 2b2a14903e36..000000000000
--- a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20110825.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit font
-
-DESCRIPTION="Mixing mplus and IPA fonts"
-HOMEPAGE="http://mix-mplus-ipa.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/mix-mplus-ipa/53033/MigMix-1M-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53033/MigMix-1P-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53033/MigMix-2M-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53033/MigMix-2P-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53034/Migu-1C-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53034/Migu-1M-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53034/Migu-1VS-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53034/Migu-2DS-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53034/Migu-2M-${PV}.zip"
-
-LICENSE="mplus-fonts IPAfont"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-
-src_prepare() {
-	mv */*.${FONT_SUFFIX} "${FONT_S}" || die
-}
diff --git a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20111002.ebuild b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20111002.ebuild
deleted file mode 100644
index 91c6e1eef9f3..000000000000
--- a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20111002.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit font
-
-DESCRIPTION="Mixing mplus and IPA fonts"
-HOMEPAGE="http://mix-mplus-ipa.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/mix-mplus-ipa/53388/migmix-1m-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53388/migmix-1p-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53388/migmix-2m-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53388/migmix-2p-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53389/migu-1p-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53389/migu-1c-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53389/migu-1m-${PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/53389/migu-2m-${PV}.zip"
-#	mirror://sourceforge.jp/mix-mplus-ipa/53389/migu-1vs-${PV}.zip
-#	mirror://sourceforge.jp/mix-mplus-ipa/53389/migu-2ds-${PV}.zip
-
-LICENSE="mplus-fonts IPAfont"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-src_prepare() {
-	mv */*.${FONT_SUFFIX} "${FONT_S}" || die
-}
diff --git a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20120411_p2.ebuild b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20120411_p2.ebuild
deleted file mode 100644
index efcfc181aedf..000000000000
--- a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20120411_p2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit font
-
-MY_PV="${PV/_p/-}"
-
-DESCRIPTION="Mixing mplus and IPA fonts"
-HOMEPAGE="http://mix-mplus-ipa.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-1m-${MY_PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-1p-${MY_PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-2m-${MY_PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-2p-${MY_PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-1p-${MY_PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-1c-${MY_PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-1m-${MY_PV}.zip
-	mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-2m-${MY_PV}.zip"
-
-LICENSE="mplus-fonts IPAfont"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-src_prepare() {
-	mv */*.${FONT_SUFFIX} "${FONT_S}" || die
-}
diff --git a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617.ebuild b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
index fe4cb6209122..a9b375acb29c 100644
--- a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617.ebuild
+++ b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 inherit font
 
 MY_PV="${PV/_p/-}"
@@ -31,5 +31,6 @@ DEPEND="app-arch/unzip"
 RDEPEND=""
 
 src_prepare() {
+	default
 	mv */*.${FONT_SUFFIX} "${FONT_S}" || die
 }
diff --git a/media-fonts/ricty/Manifest b/media-fonts/ricty/Manifest
index b6663d02f98e..674f76664b48 100644
--- a/media-fonts/ricty/Manifest
+++ b/media-fonts/ricty/Manifest
@@ -1,4 +1,3 @@
 DIST Ricty-3.2.0.tar.gz 13286 BLAKE2B 11f53c1e55d43af517343682025893e8d8e8cba3ba9c187114c92c3e5b4e4778afd89b73b920f2e70778da3e376640f8c99b0609cffbd90fa573b15ad2da8028 SHA512 77b7416e8c2e6847ec4c964dda8e4fa52ba3e63751ce030fbd0cd83a07a88c777319690777e48e945d36ebf06fe4717d10a7e02193f48575507c5c1f71446b36
-EBUILD ricty-3.2.0-r1.ebuild 1058 BLAKE2B 1538d26f4a62f02f605c246b83d9df45a99006c85052827910c9892fd61af4e11faebe3a9cb0da7b1f07dd56dd14b021ea67e3b372430d4bd8022b933bff17d2 SHA512 849aa3d513891b87cb055762d876db24367a5e9a500cfcaff3cb5cbb71b33bee8dc1728dfee128267b5dafaea00afc15db5c6fafc2d98f1e290b81f864fbbe11
-EBUILD ricty-3.2.0.ebuild 1050 BLAKE2B 4ec44beccaafadbd5f78b6f0365c115178fa0dfe44ccb25ed124b031bdef3a2c7f392ce431b2e368ad0b842e2e58acc139fd4d9908de99b8d254772341a92d36 SHA512 f6e1758d0147dd43842c5219e3f0dd4be67998a89e827ac30f84e3b4b295e71ab0604bd0f6c9d75313a3deca79de2631a5a2cbe74c7e3dec5bab498cdf2f7ccd
+EBUILD ricty-3.2.0-r2.ebuild 1059 BLAKE2B a87a05850fa391fcdc56ece7049339d7b40c12b321b7b3373bf4a72648b3a220781ab8746eda52c2dc81283d00a164c5911faa06077abb0ac16cd3cc8da5b179 SHA512 3ef1a7353f9c085d660289870db73c56cf609d8dd776f521e2b3cee1f7272cd1f281d6072955e4caf3686fba03f6796c3b3048c9b34a0c7d198adf38bd4b5ab7
 MISC metadata.xml 318 BLAKE2B 0d2f085352785987bf21c4d46df5d19b543f676b683c4afceba84ca6b4f5b7770b306b4d36a48824efd3de389f0aae99bc54aedb5f61c1447e1842029936911d SHA512 a370bd25baf912693cb8991978e2e6599ebee2d69f84242558698da92f8b8209ba5d4f7a2c7034d4019d4af0c41ac6c557537d08d75ee5b8a3ff60314c9f2b89
diff --git a/media-fonts/ricty/ricty-3.2.0-r1.ebuild b/media-fonts/ricty/ricty-3.2.0-r2.ebuild
index 1c1e16b78d69..0c8d7ee3e056 100644
--- a/media-fonts/ricty/ricty-3.2.0-r1.ebuild
+++ b/media-fonts/ricty/ricty-3.2.0-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
+
 inherit font
 
 MY_PN="Ricty"
diff --git a/media-fonts/ricty/ricty-3.2.0.ebuild b/media-fonts/ricty/ricty-3.2.0.ebuild
deleted file mode 100644
index e80e2888bb59..000000000000
--- a/media-fonts/ricty/ricty-3.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit font
-
-MY_PN="Ricty"
-DESCRIPTION="A beautiful sans-serif monotype Japanese font designed for code listings"
-HOMEPAGE="http://save.sys.t.u-tokyo.ac.jp/~yusa/fonts/ricty.html"
-#SRC_URI="http://save.sys.t.u-tokyo.ac.jp/~yusa/fonts/ricty/${MY_PN}-${PV}.tar.gz"
-SRC_URI="https://github.com/yascentur/${MY_PN}/tarball/${PV} -> ${MY_PN}-${PV}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-fonts/inconsolata
-	>=media-fonts/mix-mplus-ipa-20111002
-	media-gfx/fontforge"
-RDEPEND=""
-
-#S="${WORKDIR}/yascentur-${MY_PN}-*"
-S="${WORKDIR}/yascentur-${MY_PN}-b9d8b9c"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-
-# Only installs fonts.
-RESTRICT="strip binchecks"
-
-src_compile() {
-	sh ricty_generator.sh \
-		"${EPREFIX}/usr/share/fonts/inconsolata/Inconsolata.otf" \
-		"${EPREFIX}/usr/share/fonts/mix-mplus-ipa/migu-1m-regular.ttf" \
-		"${EPREFIX}/usr/share/fonts/mix-mplus-ipa/migu-1m-bold.ttf" || die
-}