gentoo resync : 25.05.2018

17 files changed, 46 insertions, 152 deletions

diff --git a/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild b/media-fonts/Humor-Sans/Humor-Sans-1.0-r1.ebuild
index 79abfa716fb0..a840cf3146d2 100644
--- a/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild
+++ b/media-fonts/Humor-Sans/Humor-Sans-1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 inherit font
 
@@ -19,5 +19,5 @@ FONT_S="${S}"
 FONT_SUFFIX="ttf"
 
 src_unpack() {
-	cp "${DISTDIR}/${A}" "${FONT_S}/${PN}.${FONT_SUFFIX}"
+	cp "${DISTDIR}/${A}" "${FONT_S}/${PN}.${FONT_SUFFIX}" || die
 }
diff --git a/media-fonts/Humor-Sans/Manifest b/media-fonts/Humor-Sans/Manifest
index 2823f051bbf5..630565d1e17e 100644
--- a/media-fonts/Humor-Sans/Manifest
+++ b/media-fonts/Humor-Sans/Manifest
@@ -1,3 +1,3 @@
 DIST Humor-Sans-1.0.ttf 25832 BLAKE2B 4190361e42ae30a5870ba79a1125e16569c6eeb2ad6fc739d18068c36d39dfb33d46ee0d0944af6f7b61fdbd7cffb992ef6e69bcc736d322897b612305fa9bcf SHA512 f0ed2f61f5cedb93ff955d9d5562fd110db750b6d4d91a74346ff94c16c87cac294c061e6ded97ffea372970912f51ee0792a611a6224cd3a38585812971b3dd
-EBUILD Humor-Sans-1.0.ebuild 465 BLAKE2B 9030efedbc4bd893cde2611672a8092b23737ffdf34242dc3617eb1a0f40033d69d747877e7c87719fbf2b59e0a6fcd61921e859c9b4dd8276c1164e9a8a735b SHA512 bbda3120d96e4950c3c3190414d4fa08756abd17c5ff3ab74d942945ae12b47ef02996c184c5c05ff1dd00d5028e43a2bdf12e1eda8d204089aace42c2e5daf4
+EBUILD Humor-Sans-1.0-r1.ebuild 470 BLAKE2B 1cb8726f6b05f42ddd634386e6aac1b934de3e8894c0fb30dc07b05d4d4f628988be902f2e4595fcd4bc4cbde80adcec5ec4836eb13bbd6a300957d1cf403de3 SHA512 f399b467438de103cb65cae033172d1ac861104550c1849a3a78773592ebe4eeb8a6f54b98778cda4dbadaca194c94514c22d192c4e3c0e7022c7d5220a65746
 MISC metadata.xml 447 BLAKE2B 4dabe996257d908ff535332b5d0a02d8ec460e9d5c2e24571ccc40f4a6c2f558643c4e1f859193adec70b347b05b94b63a057936ba6785aa83e8973a5bd74d72 SHA512 6c529893c55d015bee56c3ed28b0d46b6ee847461474776fb4d7fc77705f7b0ea5207f95a627f63cd9ba4b673251b9371d8f4ae690c5b32cb5c54f8582fec1bf
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 5a0851bc7366..877235ca2ef0 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/alegreya-sans/Manifest b/media-fonts/alegreya-sans/Manifest
index 30874ea0ee1d..816fc67fdfaa 100644
--- a/media-fonts/alegreya-sans/Manifest
+++ b/media-fonts/alegreya-sans/Manifest
@@ -1,3 +1,3 @@
-DIST alegreya-sans-1.0.2.zip 1461248 BLAKE2B 58e4ac68583dc6be6389cb7d1844c46442614b32b2267cd2967632c55c89b5541a028ffb29593ce6e84dc5faa43a154181e5550056cac99a0304d15ce61780e3 SHA512 d2f4b116c32386f26d1fd754e544af97b4ec8d25de1f5358e8e8d9049dff5f77dade44b8fd23f003e9a11459ed9423ddf3235d5dd84f1f497873e7f9d05f5f7c
-EBUILD alegreya-sans-1.0.2.ebuild 497 BLAKE2B e882d780dfc082a25e066566c262b4160f931ae9d8f707a5bcd6e0ee6dd01bac8f7f2e01674d9ad5b33577a9573d27d29cc9a697d6b2b648ee16930edae46168 SHA512 2e0eff37c22e14ef19502ba8978f5b21f3683736b6be957420ebcaf69c8fda8ce56b46c90c0b722828935bcba354b71679f25a54c9f40a3222ce7231ac5af22b
-MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
+DIST alegreya-sans-2.008.tar.gz 16351420 BLAKE2B 163593cda1419bbc24503c9c892349c941a7de9e85e6f26614d54092098d0343d388018cd92d940e55ab073347ad38dc961b03bc2982ea6b96ea5415a437018a SHA512 8052fe15717ecdfd301d878b03282ff4fd472a7e13a1e581c84d6f3993780897354d103aeda2f027350d9e56466914be38e97417fe450ec32e5823769015d0a4
+EBUILD alegreya-sans-2.008.ebuild 576 BLAKE2B 1d319462adb154243b6c393338af1354b8fb18d6db66a0bc795f5d98abd18169130df740e114e1251a1c9e08b4491156f5824d7c6bc5884a6465e77e083552e5 SHA512 cdff19bbfe3d56868bcd194e9f3672c3cd54d7aa31bee4e0edc08a5e025913fa38aabcd9c2c67efa5894eea12c461b526f13234b08e477dc600568d7b0237cec
+MISC metadata.xml 334 BLAKE2B 19a664636579edd6ca0a99d72eec9c0bdd8c69148ef85d9bdb6fe46269e6aaf98199f7a45d3f88dfd141ec8ebcea2d95509ac792cf605f62cc7ccf6b593f2629 SHA512 997159235cfe76fa19578a74a7c2f3a636476632ccf856fc7d6f494bc3a618b90f42fb76ccfa6cf6b36d6419f9b32b35efccab843748f3400d1e91b9b472532c
diff --git a/media-fonts/alegreya-sans/alegreya-sans-1.0.2.ebuild b/media-fonts/alegreya-sans/alegreya-sans-1.0.2.ebuild
deleted file mode 100644
index 50178bb54bac..000000000000
--- a/media-fonts/alegreya-sans/alegreya-sans-1.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit font
-
-DESCRIPTION="A humanist sans-serif typeface with a calligraphic, dynamic feeling"
-HOMEPAGE="http://www.huertatipografica.com/fonts/alegreya-sans-ht"
-SRC_URI="http://www.huertatipografica.com/free_download/23 -> ${P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-FONT_S=${WORKDIR}
-FONT_SUFFIX="otf"
diff --git a/media-fonts/alegreya-sans/alegreya-sans-2.008.ebuild b/media-fonts/alegreya-sans/alegreya-sans-2.008.ebuild
new file mode 100644
index 000000000000..ed6906668cf2
--- /dev/null
+++ b/media-fonts/alegreya-sans/alegreya-sans-2.008.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="Alegreya-Sans"
+inherit font
+
+DESCRIPTION="A humanist sans-serif typeface with a calligraphic, dynamic feeling"
+HOMEPAGE="https://www.huertatipografica.com/en/fonts/alegreya-sans-ht"
+SRC_URI="https://github.com/huertatipografica/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DOCS="CONTRIBUTORS.txt README.md"
+S="${WORKDIR}/${MY_PN}-${PV}"
+FONT_S="${S}/fonts/ttf"
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/alegreya-sans/metadata.xml b/media-fonts/alegreya-sans/metadata.xml
index d0f1df7c94c0..52a13773a341 100644
--- a/media-fonts/alegreya-sans/metadata.xml
+++ b/media-fonts/alegreya-sans/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">huertatipografica/Alegreya-Sans</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-fonts/fira-code/Manifest b/media-fonts/fira-code/Manifest
index 73f4b7d6400f..7fb46a718419 100644
--- a/media-fonts/fira-code/Manifest
+++ b/media-fonts/fira-code/Manifest
@@ -1,4 +1,4 @@
 DIST FiraCode-Regular-Symbol.zip 9337 BLAKE2B b901cc37ad796f3a68d8b9e492aa35570c2d718fc84920b5b23c0a055e46c19916a7ec6b2c0a0adba650161c5a032761d46b303de64bddd81696adf960e3e541 SHA512 2570958b0f4b28ded52327150b67118d693d6bc6f483be3e3147ddda1c5870ab21f1b64938e4abc1030080455976c0d33ae3925b51660fd2c8b5428b5b0f8eb7
 DIST fira-code-1.205.tar.gz 5348822 BLAKE2B 9167765fb986a0b4552387fa43e71ddcfb97371692ad071659cc6a198dd4bee707e15a2f438daac1d5e038b8a4d2ddf4d5e0b94cf182655cd83b5085af3a207a SHA512 cbeb5fe4577ff6de5c4d58247c3b82b7aec4022afa5552394c660846d8caab8cca3a1a44aed8cccd10d03fe8c38e419d97663f5a750bd9d4e11ec4d2e5659bf8
-EBUILD fira-code-1.205.ebuild 621 BLAKE2B 68fcbdbcbd51163996704209108dc0b82f490902835cdca441515189b19b80f214c0c421ae8c65d72c19afc6de52fcf79fcab8cef53079378e5d17e85309f3ef SHA512 fe8ecbd00908bfa2b745b9513bedb33dc4343658e402c4f28f091aaee7c2f6cd62130aaddf7e7b3fd07e6fd9f8fe894cf07908979488d8ded3753561fdf5ea3f
+EBUILD fira-code-1.205.ebuild 620 BLAKE2B 70785ffdc85e8cc83a6ac7662ea8de3710f3efb6f5aa85ffed06e04242b6a8295ad5048f865d300e34b72036b9fb9054ded01800cbbb81b20440ee021bc23c0d SHA512 11157bf704a5782860fe0855ba249e0edb90ccd7c8309279ff78ac70325a6897feb5c9c5e4d324d35908a96c4dbb0781be4b1dbee45801a533ef132f955c3ce0
 MISC metadata.xml 430 BLAKE2B 1d5b9b36382478e6ce2e7444cec9513f560e7c642cace9241ec36769b2ac17ba9282151ea321574dc53dfd26e2a98a289b9dd02bea1ea7a4641f8a75046213f2 SHA512 2378c23273f922c0088d9535e4ac94da0c05e59a79ef8119f351911bde62f7e3c8706a4276a888404ae8f18a3e5ad7181358db00c8a9c990a6874dc69f24eac8
diff --git a/media-fonts/fira-code/fira-code-1.205.ebuild b/media-fonts/fira-code/fira-code-1.205.ebuild
index 9fe9f4c9623d..50bb9a72f16a 100644
--- a/media-fonts/fira-code/fira-code-1.205.ebuild
+++ b/media-fonts/fira-code/fira-code-1.205.ebuild
@@ -12,7 +12,7 @@ https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE=""
 
 S="${WORKDIR}/FiraCode-${PV}"
diff --git a/media-fonts/inconsolata-hellenic/Manifest b/media-fonts/inconsolata-hellenic/Manifest
index ec4e8baf7d11..7e46d46c1066 100644
--- a/media-fonts/inconsolata-hellenic/Manifest
+++ b/media-fonts/inconsolata-hellenic/Manifest
@@ -1,3 +1,3 @@
 DIST inconsolata-hellenic-1.19.zip 18362 BLAKE2B fa9999195802b7171c643fc68f4f984a521f393e7110b6219cf1b9bb87d89bfb43f298bd7f4ff26c3a0bae5f6352a857ed3a1635ff7d1d5e3125837a09f61bea SHA512 5834a46e200abea9045c0d88fbf8ec55486e87e1faf27478b376f1006737d37bafe4b4e1938a3dd28fd107c587db40de0ec77ebab4fd82317f0dff87fb11cfbe
-EBUILD inconsolata-hellenic-1.19.ebuild 479 BLAKE2B ace0311722706874c4ef5ac535ccd34d51e192e1f53d4ebaf53f87e8db1333ed6d780487568178a505f33e094dcde2cc113f6c2990b8434984e5cbefb80b6516 SHA512 b7007803bbb02c34e026fe9754f9ce9fedfe0618b8db4027ef2f6650f3e0908e424a150917c972bdb6c3bb1b33c7473de068a0907a1aaf6b8d20c74155001e79
+EBUILD inconsolata-hellenic-1.19-r1.ebuild 480 BLAKE2B 75c83dcf258b2dd3d6dcb7e27c29ca893458e4bbe20465bf3e19b3d10b41b34eaca9b4b5729a0b78c9b7ef743709994752621c6e2edfe88c67d24455bc426ba3 SHA512 8fafddcef8178e674923a54a40fdb74042c82b4a54cc1dbaa5176365af445fed7b817f1ede5e2207a6c6fbdf45d360b8060582496bf0fea1bbfdc6866d077145
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19.ebuild b/media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19-r1.ebuild
index 9f963398ca7d..5c0ab15d5935 100644
--- a/media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19.ebuild
+++ b/media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit font
 
 DESCRIPTION="Hellenisation of the wonderful, monospace, open/free font Inconsolata"
diff --git a/media-fonts/lklug/Manifest b/media-fonts/lklug/Manifest
index e65bba7d2c31..36cf0cc0d95b 100644
--- a/media-fonts/lklug/Manifest
+++ b/media-fonts/lklug/Manifest
@@ -1,4 +1,3 @@
 DIST ttf-sinhala-lklug-0.6.tar.gz 382873 BLAKE2B cce5b23e2c83db860fc023a4acdfcc336c79b335e39ffd226d7c26d87b98ca12a23ed7aa7fa99832c4c72b2b3ac75e0681f8f70392cc7f0123a42dd08353c36b SHA512 d1b1459981f1d80acd17aa09a2171e17ad246d98e00035c9592a6c93d89423ccb20f440c3eaccb21b9bb5fae2ac8eca5458715fe8a60e7294f75f9fffe3417aa
-EBUILD lklug-0.6-r1.ebuild 450 BLAKE2B b92a42c6b419a6c636a1f94392354e69d8e98b2baa68b46f04456d5db153816194ba3cbd752704c238be0ce6643e7874e1bab1fd6a09bc399e2c5d582d09d111 SHA512 dda3ecf89ddf550d1bb13b507e8aa9a8ab5e7f05f90f8aecb7c3d3b9acedd0dfa9e40375c8d51439a3f7a391f2fbf9cc4acbda0ba3d4f8b253c8cbfbc825ec27
-EBUILD lklug-0.6.ebuild 448 BLAKE2B c874b7cdbea4cfc3998e54d2c85af21b305777b1caeb44dc09c02868311f1061f5d04989c0db3f600785e7db0f0180fafd3248d64959804554238568efb02f41 SHA512 1cb8d840f37e85715509ab52a6d6c5786aefe7354397303926d83326bd735ac0a24908929b21cc4a6d0b8cf8eb8d30cc0d00a56eb5d8ded9213d792a5450b8b9
+EBUILD lklug-0.6-r1.ebuild 446 BLAKE2B d81dc6728a5e8481d42e04721f0b67e7fd2e052d97a51eb86f1db18ae6575a1062e38c43491034b8ef239f6f1e8d8b547f610f2706610a8b699219348a3e2f17 SHA512 454f301b92324c7c04505adb217c05558a5713b2885fe8f37299c078f46eb02952c321e4f52f813d4c42903bdadbcfef03f61c5ee586307a2f1aacaee115c02b
 MISC metadata.xml 315 BLAKE2B 552ff2bb3878109136f58c429e796e690fe2d9813291d1cd2f9617910e5d8ddbc5e9891560a081b90c6d866972108879d63be2058a0b975647c1fc05390c6701 SHA512 2d525597860e240d8d7d1282ea6b3a9459597e7980f9e82c99ed76e10a1d78ca71993fdb321279f45fe517a5852effd3abe31c7ef7b1af5dfa04af0b8c3d7089
diff --git a/media-fonts/lklug/lklug-0.6-r1.ebuild b/media-fonts/lklug/lklug-0.6-r1.ebuild
index 2f2a9e7752d2..956e033f45d9 100644
--- a/media-fonts/lklug/lklug-0.6-r1.ebuild
+++ b/media-fonts/lklug/lklug-0.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://sinhala.sourceforge.net/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-fonts/lklug/lklug-0.6.ebuild b/media-fonts/lklug/lklug-0.6.ebuild
deleted file mode 100644
index dc4415457e9a..000000000000
--- a/media-fonts/lklug/lklug-0.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit font
-
-MY_P="ttf-sinhala-${P}"
-DESCRIPTION="Sinhala font"
-HOMEPAGE="http://sinhala.sourceforge.net"
-SRC_URI="http://sinhala.sourceforge.net/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}"
-
-FONT_SUFFIX="ttf"
-
-DOCS="README.fonts"
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index e4c89db25ad4..5f517754df0a 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,7 +1,5 @@
-DIST terminus-font-4.39.tar.gz 324890 BLAKE2B ed5ad839311ac08601ea78a617db285c6e9a7bee6776d4902879aa95a26c79eca4195ee58bd5b2f44d25c401222ed966b5a3cfacbcff7ccad873b3155e009c67 SHA512 d2b1c55584eabf423a455ea11d90ba8037b4e5823c677a8c604de1e41c55d829b743db2d1932cd755064db681fcd0b5be8484439ddde4394955d0af5174ff591
 DIST terminus-font-4.40.tar.gz 558440 BLAKE2B 60a9b6a62c2db82896071adee6004aeb54cefc1f1d1cc941e5322d8d318413bb1255e8219c3fb56f6568baee0998357c572348b4085dd884bf6bcf360448e9a1 SHA512 843da1f51e37d48ae88c88def965ed96c2236c183fb596705290a96eba41256a02197a298439b83913eb7679b32c2a8f44dd04de031be4db56285efd3d4c6900
 DIST terminus-font-4.46.tar.gz 590210 BLAKE2B 427b4878afd47cc6c1a0ba6b6116568630a618e313c24744b3465b3e301e142ccbb9bd5e336bed7d98f3d1e01a0a61c6fbdd17912f4d9332ed5430ef47bca4fe SHA512 ae221920ecff54b9575a25d30a429feee6e19ef1e9669896c34f86f80d5495c3654f5423ff1df76e86bc999d1f37c306048b44d8ca55144f0f299926d3d33b58
-EBUILD terminus-font-4.39-r1.ebuild 2696 BLAKE2B 71a63ebe584b926b19e1da008704c0609fe4da9004cdc240f1703cae24a96c7f0bd6de464ccad6ddb9082ab2442d7787cd068a937700df0074f5793dfbeaae30 SHA512 c445efab8de32f841076128525ece1ad4ebf56108fb4d3e5c19f0a5cee970aa58e777ff09b1ca64c94390e580daa71886f1119ba494278f65a8d587b8f30b244
 EBUILD terminus-font-4.40.ebuild 2662 BLAKE2B 02446fd7b02c53f52552f8bcb73c4d0ce6f9445e2af1ba8d88865ed88b52c664d6997266c3830c70291f072ae7273d216f2098f88737fb61095061d8628c70d9 SHA512 074a9be54fb79b9e86540fef5a49d6c075d443d29b21eb7e1ab160c102ff4e8649e608f71e928f24c900c342dc0b9bc1fc3958e994f21f554308e2d2ccd33f5e
-EBUILD terminus-font-4.46.ebuild 2640 BLAKE2B 3e3ae6413e4ef2a9552f14097ae208d0cc0de2630b23a788311232c8b3c66a9455b323bbb4583b7f02f47d19f56a1febcb776b2fe807c9da9082998c77961a2e SHA512 6c670b9ff6d173fe65e6bcbaef4cdc595be0f9943b4fb5fb0a4c271b70f3998883170d6de4326bdf4021566ca8f220045537bc94afd85483ef922ab333aadd2c
+EBUILD terminus-font-4.46.ebuild 2638 BLAKE2B 705a200f18b30d3627f68323e2b1be07e65497e3f6508cf60fba0fb0aff16d7ae9883dcbdbeb22b8d04f90ebb132dc2132c555ce0d68c647bc836323444a148b SHA512 c4dc34a7033eac72e482c6cf74969184c790610c0d290e1ff7ecc0eb4261060bbe0e4bcc63e0a863d652f1f8ea2c9ee5626a51034b0626761abbdf3bd99c16b0
 MISC metadata.xml 1727 BLAKE2B 2b0553ed8023868296f4c29a97a3f27c799933af878fcbfb6b5fb6cc1f8c94c53d3581da7b7b8550b8e41e2d5f69a13f3b88e19a7b53b5b42a42e4f1c9523299 SHA512 fc2290e70f773c2418aa9a0eb58013a855eece0edb345da21ed176739a22a3344d6ec97b9f72b2480b57b4d4c68400db00bbd9dafd55b3bb02ffaaed1d788967
diff --git a/media-fonts/terminus-font/terminus-font-4.39-r1.ebuild b/media-fonts/terminus-font/terminus-font-4.39-r1.ebuild
deleted file mode 100644
index daf180b3bc5b..000000000000
--- a/media-fonts/terminus-font/terminus-font-4.39-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils font
-
-DESCRIPTION="A clean fixed font for the console and X11"
-HOMEPAGE="http://terminus-font.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="OFL-1.1 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
-	raw-font-data ru-dv +ru-g ru-i ru-k"
-
-DEPEND="app-arch/gzip
-	dev-lang/perl
-	virtual/awk
-	pcf? ( x11-apps/bdftopcf )"
-RDEPEND=""
-
-FONTDIR=/usr/share/fonts/terminus
-FONT_CONF=( 75-yes-terminus.conf )
-DOCS="README README-BG AUTHORS CHANGES"
-
-REQUIRED_USE="X? ( pcf )"
-
-src_prepare() {
-	# Upstream patches. Some of them are suggested to be applied by default
-	# dv - de NOT like latin g, but like caps greek delta
-	#      ve NOT like greek beta, but like caps latin B
-	# ge - ge NOT like "mirrored" latin s, but like caps greek gamma
-	# ka - small ka NOT like minimised caps latin K, but like small latin k
-	use a-like-o && epatch "${S}"/alt/ao2.diff
-	use center-tilde && epatch "${S}"/alt/td1.diff
-	use distinct-l && epatch "${S}"/alt/ll2.diff
-	use ru-i     && epatch "${S}"/alt/ij1.diff
-	use ru-k     && epatch "${S}"/alt/ka2.diff
-	use ru-dv    && epatch "${S}"/alt/dv1.diff
-	use ru-g     && epatch "${S}"/alt/ge2.diff
-	use quote    && epatch "${S}"/alt/gq2.diff
-}
-
-src_configure() {
-	# selfwritten configure script without executable bit
-	chmod +x ./configure || die
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--psfdir="${EPREFIX}"/usr/share/consolefonts \
-		--acmdir="${EPREFIX}"/usr/share/consoletrans \
-		--unidir="${EPREFIX}"/usr/share/consoletrans \
-		--x11dir="${EPREFIX}"/${FONTDIR} || die
-}
-
-src_compile() {
-	local args=(
-		$(usex psf 'psf txt' '')
-		$(usex raw-font-data 'raw' '')
-		$(usex pcf 'pcf' '')
-	)
-	[[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
-}
-
-src_install() {
-	local args=(
-		$(usex psf 'install-psf install-uni install-acm install-ref' '')
-		$(usex raw-font-data 'install.raw' '')
-		$(usex pcf 'install-pcf' '')
-	)
-	# Set the CHECKDIR to a dummy location so we always get the same set of
-	# files installed regardless of what is in / or ROOT or wherever.
-	[[ ${#args[@]} -gt 0 ]] && emake DESTDIR="${D}" CHECKDIR="${D}" "${args[@]}"
-
-	# Remove trans files that the kbd package takes care of installing.
-	rm -f "${ED}"/usr/share/consoletrans/*.trans
-
-	if use pcf-unicode-only; then
-		# Only the ter-x* fonts are unicode (ISO-10646-1) based
-		rm -f "${ED}"/usr/share/fonts/terminus/ter-[0-9a-wy-z]* || die
-	fi
-
-	font_src_install
-}
diff --git a/media-fonts/terminus-font/terminus-font-4.46.ebuild b/media-fonts/terminus-font/terminus-font-4.46.ebuild
index 442b89128e6f..6fe4b660df39 100644
--- a/media-fonts/terminus-font/terminus-font-4.46.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.46.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="OFL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
 	ru-dv +ru-g ru-i ru-k"