Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

10 files changed, 6 insertions, 42 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 050910bdbfc3..8a12caf016c2 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/alegreya-serif/Manifest b/media-fonts/alegreya-serif/Manifest
deleted file mode 100644
index 79703e41bf60..000000000000
--- a/media-fonts/alegreya-serif/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST alegreya-serif-2.007.tar.gz 14729050 BLAKE2B ccf4dd3827e6b3c32b1009de273723a2bd63aee992710676b20ef3a0dbb17a5608046d7d5955d5d38a6a11a4268ffb0985f5fb8044239de5a42ab5b5fd06efb3 SHA512 7220aaf9f9861ed4f3104aeb16f33267b5cc2139b91ddafbd7ff86f94faeb37bca558c642a03108094d0a60f9db77167c19996fdaeeca3fcac0346205ba4e785
-EBUILD alegreya-serif-2.007.ebuild 517 BLAKE2B 3f0c14d0662de0db0139077c88ab0b186ee666e9e1f0bac0a3edce993b0586d49033efea548206ab109171683d6f2639e2fb961997981b70edd3b1951a284b9d SHA512 822434f6f678ff373dd57a47dde7b7eb7cc5371fc9429757cfa96a2a6456a2f2726ab9cca01a0032b2bcff99b43bd873b41e551d63d55543f2c8c1073cde4f4b
-MISC metadata.xml 334 BLAKE2B 19a664636579edd6ca0a99d72eec9c0bdd8c69148ef85d9bdb6fe46269e6aaf98199f7a45d3f88dfd141ec8ebcea2d95509ac792cf605f62cc7ccf6b593f2629 SHA512 997159235cfe76fa19578a74a7c2f3a636476632ccf856fc7d6f494bc3a618b90f42fb76ccfa6cf6b36d6419f9b32b35efccab843748f3400d1e91b9b472532c
diff --git a/media-fonts/alegreya-serif/alegreya-serif-2.007.ebuild b/media-fonts/alegreya-serif/alegreya-serif-2.007.ebuild
deleted file mode 100644
index fa29261d0d10..000000000000
--- a/media-fonts/alegreya-serif/alegreya-serif-2.007.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="Alegreya"
-inherit font
-
-DESCRIPTION="Alegreya serif type family"
-HOMEPAGE="https://www.huertatipografica.com/en/fonts/alegreya-ht-pro"
-SRC_URI="https://github.com/huertatipografica/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS="CONTRIBUTORS.txt README.md"
-S="${WORKDIR}/${MY_PN}-${PV}"
-FONT_S="${S}/fonts/otf"
-FONT_SUFFIX="otf"
diff --git a/media-fonts/alegreya-serif/metadata.xml b/media-fonts/alegreya-serif/metadata.xml
deleted file mode 100644
index 52a13773a341..000000000000
--- a/media-fonts/alegreya-serif/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-	<upstream>
-		<remote-id type="github">huertatipografica/Alegreya-Sans</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-fonts/bitstream-cyberbit/Manifest b/media-fonts/bitstream-cyberbit/Manifest
index 5e17317f9189..967180b9a8ba 100644
--- a/media-fonts/bitstream-cyberbit/Manifest
+++ b/media-fonts/bitstream-cyberbit/Manifest
@@ -1,4 +1,4 @@
 DIST bitstream-cyberbit-2.0.zip 6427108 BLAKE2B 4d79ea91f478df159ad230300bf94e42d57148cac22d01b2eea653e12651dfc71b667fdfdb92da282bdaf281d45dfb9fbc04eeee806a82b6741a313872a3375d SHA512 39af2720123e7d732e3dffffab37d949221211748594a66ecbd41bafcd387e4582433ece802e42f3d1f0728da9ed0c5bb00465f20fa2ff3687018ed94edf25a1
 EBUILD bitstream-cyberbit-2.0-r1.ebuild 593 BLAKE2B cb27f21861b8096d2f5b271ad39d9e6000095f3eb09626a3fab48fe3b3b733001c1fb871dc6b4d6de3465e9b8414fe5dd9c9c8206cdefeb6d8f06eaa7d4554bc SHA512 88250383379d79e1239ddde3e276ae18a8082335dda4d4d08f43bd4263df415ce5f7694d5ef9bcbbd37b4ae267c22aa7fffc80f84ee37d9d81f41ef44c1aaf9d
-EBUILD bitstream-cyberbit-2.0.ebuild 591 BLAKE2B de61523e9d45aded1d58fe6def7f8e966d88eecc03a221981331751f4cdd1c58e46d6623e2d4455b3084f9ff1125a13e2ad5bb3b1db8f7be30b40560830fe3c9 SHA512 fddf2ed46df2bc810c4d59bbb090eaf35b9e3d5d3d5a8b5527759720a3465ffe6316d619a3aafa37ad83104d94233e5b9d8213e34f509609bce7e553e6864d7a
+EBUILD bitstream-cyberbit-2.0.ebuild 578 BLAKE2B 1f9857179eb1fb1b2e564cd2cb697b2dc65416f9579b533e768f8b46b594909282502e9729c54f0bf8bf708b50c5be698d44ce1c07f4b5330e16783fd2669ae0 SHA512 6937134b1fca67becdf4c02cfb270bc38f9f6641c829e8dd9b83aad1be7eb93761ea706e421daa1668ee228907e8e510ead3687ea5f4f18a301ccd0ee0f9bd42
 MISC metadata.xml 364 BLAKE2B a3ae59e04600fb512fe1e0dd6ebb3d146faee164775446754633c9bf88845f0ea0459fa4a145ce7e232206bde0bf2e72b4ed29420fe667620acfe5b8074d348a SHA512 2b2701e4698f5adc465a1ab038f176e405a0df1528560560831e43ae34421eb74e4332ad3001c6ad2eba43ac976b6856e2ee2690685a03428fd1ae71552017e5
diff --git a/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0.ebuild b/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0.ebuild
index 51438253a0f8..d8ca96854d61 100644
--- a/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0.ebuild
+++ b/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="2"
 
 inherit font
 
@@ -18,5 +18,4 @@ DEPEND="app-arch/unzip"
 RDEPEND=""
 RESTRICT="bindist mirror"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/dejavu/Manifest b/media-fonts/dejavu/Manifest
index a6d54b35d58c..1526402ec2c7 100644
--- a/media-fonts/dejavu/Manifest
+++ b/media-fonts/dejavu/Manifest
@@ -3,5 +3,5 @@ DIST dejavu-fonts-2.37.tar.bz2 12050109 BLAKE2B f79504870b2b8748a23dfd58221ebe5b
 DIST dejavu-fonts-ttf-2.35.tar.bz2 5092541 BLAKE2B 49b7d4a4fb88bd4a6a98ec8e37e3b80c084171a8632b9632c9bcb41ee3f17f93114c9f35c513a769d901a70271380e4af209232a7719b081afd72c78028c4b49 SHA512 af0120e4c409cdcf31994499b2f24cb34e07961d5e48a70959ce6309df219e19bf35d0bb2a11f6ef5e24aa5788136998ec94fc2608bb6f409ba324595e858006
 DIST dejavu-fonts-ttf-2.37.tar.bz2 5429777 BLAKE2B d8614907887f20967fc7c75cb33b636a0eb5c682a076ccc7aef09f4ac243507afc005ef90d0b2aeee6a4a6a1ff3d5ce4fac0d1722a382525b3883ef53cdec26a SHA512 bafa39321021097432777f0825d700190c23f917d754a4504722cd8946716c22c083836294dab7f3ae7cf20af63c4d0944f3423bf4aa25dbca562d1f30e00654
 EBUILD dejavu-2.35.ebuild 2138 BLAKE2B 1be5537b1617cef6379bc45456557e01a877e6f5be30b5dfbb2257c697c1cca0d76094856907b4339b58f1eac4fce494c736e854ab78ea08a5b3522cb44e3e7b SHA512 7ebb17717372bade13726987d3f8c7bdedae0577fad1f63256926a7da676875a70ed21e8b9b77b52e2e4b7392d7c50bb6778df1d55d9f503c849d30c541824a5
-EBUILD dejavu-2.37.ebuild 2206 BLAKE2B b437f1792559af6eaa0c546cb2beb519df61abfb3258309638c9b60f40a55439bfade34e6de58579a8a0df1a077cb938cf9897fa0eff78aed0b9906c94698b2c SHA512 962cae92eef663fedf365c596f731dbc0c82cb64a06c26e330edbe2b9f3d3b781d0b4fecc79b7d7f1df7e92a1028faa89a7601e6f2539bea77a27474960a4ba6
+EBUILD dejavu-2.37.ebuild 2207 BLAKE2B a1c0a2c2cd7585af6f0d28727c0df5cf20364e9e8c1ea8fa6a6912c4191e787efce48263b26c75005a3d4607ed8b3e48768b06d8209704f0c3f116d015d72a74 SHA512 330b482b1ebae93a1ab1d5a4c3e8b0bcef56a7a3296c9cb0ed075b6c8b80360cc0f5e78e953d12c3d567393882960f54400037726186481c51b73374c9579019
 MISC metadata.xml 854 BLAKE2B 7d8d029b63f3abd43b29cfbe45a3008e4c94b8a2ec86726da3c129ac25ce4eeb56db8a7cb1018399bb5389fd15ab78231f6c438c73c4fcf364fc6c42fcdf7f86 SHA512 2baa05f3f861db77c828c4da9dd71067577a55e0566805d71ab553eec6c450609331477a614ce058b7bea4032b8eade7c1379f5db5a17cf7d00372620eb206ef
diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild
index 29dec0f476f0..5678de566ac2 100644
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BitstreamVera"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontforge"
 
 DEPEND="fontforge? (
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 05312e5df9c6..24faef3e68c3 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,5 +1,5 @@
 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.40.ebuild 2662 BLAKE2B 02446fd7b02c53f52552f8bcb73c4d0ce6f9445e2af1ba8d88865ed88b52c664d6997266c3830c70291f072ae7273d216f2098f88737fb61095061d8628c70d9 SHA512 074a9be54fb79b9e86540fef5a49d6c075d443d29b21eb7e1ab160c102ff4e8649e608f71e928f24c900c342dc0b9bc1fc3958e994f21f554308e2d2ccd33f5e
-EBUILD terminus-font-4.46.ebuild 2635 BLAKE2B 4aac614dc0473289c1644ab90bf4333ce0ccfbca300445778cae9781be567aff3b0f23ebcc8c1897d1359fcde2ef6356409392dca60ba987c37a06ac721bcb7b SHA512 2d1691d708a9875c57d019c3a1381368aff09fe04212910f0fa16d90569ef5ff91046adf7aecdb998b21857734b54a4aa5ad24179fbb7815703f0fa65b1c58df
+EBUILD terminus-font-4.46.ebuild 2636 BLAKE2B 6435232b0e89514393a9d8cff62f5eaf395a440c77299f8ae14b1eba52622782c1bff1ace445444ed5410fed905078edee7d781a9d988e020664ecd993640c0a SHA512 950e66c97f60633557dbfc83fe681f84efa13cf695aba79f3841f68174a433711d207c30edb4ac6098715ebd40c4db574f888b5290fd309bd810556db9aee8eb
 MISC metadata.xml 1727 BLAKE2B 2b0553ed8023868296f4c29a97a3f27c799933af878fcbfb6b5fb6cc1f8c94c53d3581da7b7b8550b8e41e2d5f69a13f3b88e19a7b53b5b42a42e4f1c9523299 SHA512 fc2290e70f773c2418aa9a0eb58013a855eece0edb345da21ed176739a22a3344d6ec97b9f72b2480b57b4d4c68400db00bbd9dafd55b3bb02ffaaed1d788967
diff --git a/media-fonts/terminus-font/terminus-font-4.46.ebuild b/media-fonts/terminus-font/terminus-font-4.46.ebuild
index ba31277e9d62..69844b4d44d6 100644
--- a/media-fonts/terminus-font/terminus-font-4.46.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.46.ebuild
@@ -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"