gentoo resync : 21.09.2018

13 files changed, 110 insertions, 31 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 39b5df8d5ac7..76813fae79c8 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/bitstream-cyberbit/Manifest b/media-fonts/bitstream-cyberbit/Manifest
index c5929f795d2f..1001a71b646d 100644
--- a/media-fonts/bitstream-cyberbit/Manifest
+++ b/media-fonts/bitstream-cyberbit/Manifest
@@ -1,4 +1,3 @@
 DIST bitstream-cyberbit-2.0.zip 6427108 BLAKE2B 4d79ea91f478df159ad230300bf94e42d57148cac22d01b2eea653e12651dfc71b667fdfdb92da282bdaf281d45dfb9fbc04eeee806a82b6741a313872a3375d SHA512 39af2720123e7d732e3dffffab37d949221211748594a66ecbd41bafcd387e4582433ece802e42f3d1f0728da9ed0c5bb00465f20fa2ff3687018ed94edf25a1
-EBUILD bitstream-cyberbit-2.0-r1.ebuild 591 BLAKE2B 1d1c144253e370ed65f304ca690933459d0dfc73ed4671e6bdb2ded9fd92589c145b6c68d65879c69c5110f6260b3dbf6ce757ebef5fe32884038f0b74afd815 SHA512 653cc5de3f9f2c3d3b623270f91a2997091cf9d3b4cf18618fd37e5231cc0668b15a4f29e4fd910dbe99dc4d2ace1928e62444e5b35d3b2454e4bdc202d47f68
-EBUILD bitstream-cyberbit-2.0.ebuild 591 BLAKE2B de61523e9d45aded1d58fe6def7f8e966d88eecc03a221981331751f4cdd1c58e46d6623e2d4455b3084f9ff1125a13e2ad5bb3b1db8f7be30b40560830fe3c9 SHA512 fddf2ed46df2bc810c4d59bbb090eaf35b9e3d5d3d5a8b5527759720a3465ffe6316d619a3aafa37ad83104d94233e5b9d8213e34f509609bce7e553e6864d7a
+EBUILD bitstream-cyberbit-2.0-r2.ebuild 591 BLAKE2B de61523e9d45aded1d58fe6def7f8e966d88eecc03a221981331751f4cdd1c58e46d6623e2d4455b3084f9ff1125a13e2ad5bb3b1db8f7be30b40560830fe3c9 SHA512 fddf2ed46df2bc810c4d59bbb090eaf35b9e3d5d3d5a8b5527759720a3465ffe6316d619a3aafa37ad83104d94233e5b9d8213e34f509609bce7e553e6864d7a
 MISC metadata.xml 364 BLAKE2B a3ae59e04600fb512fe1e0dd6ebb3d146faee164775446754633c9bf88845f0ea0459fa4a145ce7e232206bde0bf2e72b4ed29420fe667620acfe5b8074d348a SHA512 2b2701e4698f5adc465a1ab038f176e405a0df1528560560831e43ae34421eb74e4332ad3001c6ad2eba43ac976b6856e2ee2690685a03428fd1ae71552017e5
diff --git a/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r1.ebuild b/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r1.ebuild
deleted file mode 100644
index 07567cd6151f..000000000000
--- a/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font
-
-DESCRIPTION="Cyberbit Unicode (including CJK) font"
-HOMEPAGE="http://www.bitstream.com/"
-SRC_URI="http://ftp.netscape.com/pub/communicator/extras/fonts/windows/Cyberbit.ZIP -> ${P}.zip ftp://ftp.netscape.com.edgesuite.net/pub/communicator/extras/fonts/windows/Cyberbit.ZIP -> ${P}.zip"
-LICENSE="BitstreamCyberbit"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}"
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0.ebuild b/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild
index 51438253a0f8..51438253a0f8 100644
--- a/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0.ebuild
+++ b/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild
diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index 8c434f69685b..ff763def585b 100644
--- a/media-fonts/encodings/Manifest
+++ b/media-fonts/encodings/Manifest
@@ -1,3 +1,4 @@
 DIST encodings-1.0.4.tar.bz2 665087 BLAKE2B 867da2247836ed829af8e6c465eeeb40e84d98bd114939843be619f2915f61c5ffc56a48adf9414e39c7a3ddd0fc86572fb85d2bc486cf68886d48d78e369761 SHA512 838d1c9489e9880bf1982dc14d34a48b624b7bc2c0fffbf28e2c24e1546b0602357ca31afef100053481d6a18e357085ef74ac7a82261daa1ac1398bc1e05d17
 EBUILD encodings-1.0.4-r1.ebuild 463 BLAKE2B 5792cec02343ff49eb7d8d2bd32f07150cbd0dbd2f8ce49cf33e24d1fe479d5063e8567b5bc35bac8b400f854b08faa867d3b76a52e43a3a55860268396d1e5c SHA512 f2e888043b226d472bb8ac9c70f8ac7a213f8c6d6d4ea5c5a0900b432dadbf16d6b125f6deb44de6d3581ec77e8986836dc9bae823529fc0d09b89e8e9b34c30
+EBUILD encodings-1.0.4-r3.ebuild 720 BLAKE2B 69e18738bb851bdfdc71e045179905e13cca0a8d3f0a126b5c20ee4450eaf21fa71687c9898a2cf97917f898dc2000cc9931f4191f8f78091e77b2e5bf040622 SHA512 688fc31be1caf5673ed80f967b990482205779b46cf3d9d958f8b1781e76961bc91fa2b5cbe4c0b0b436f4324e66ef142b8347056de72be7602cba77900cfc20
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/encodings/encodings-1.0.4-r3.ebuild b/media-fonts/encodings/encodings-1.0.4-r3.ebuild
new file mode 100644
index 000000000000..af7bb67275f0
--- /dev/null
+++ b/media-fonts/encodings/encodings-1.0.4-r3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# font eclass is needed since "media-fonts/encodings" does not match
+# check for pattern media-fonts/font* in xorg-2 eclass
+inherit font xorg-2
+
+DESCRIPTION="X.Org font encodings"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="x11-apps/mkfontscale
+	>=media-fonts/font-util-1.1.1-r1"
+
+ECONF_SOURCE="${S}"
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	font_pkg_postinst
+}
+
+pkg_postrm() {
+	xorg-2_pkg_postrm
+	font_pkg_postrm
+}
diff --git a/media-fonts/mplus-fonts/Manifest b/media-fonts/mplus-fonts/Manifest
index 0984efc1d866..1a1e0c22ba97 100644
--- a/media-fonts/mplus-fonts/Manifest
+++ b/media-fonts/mplus-fonts/Manifest
@@ -1,3 +1,4 @@
 DIST mplus_bitmap_fonts-2.2.4.tar.gz 382574 BLAKE2B 76f1da0dcf9ac25425ace63efb751c5c193f717e76a51750e359216057469cc74cf84572c8162302ac4fb9682ddcd5396325b5ee570a5639f06f338c1ce4d86f SHA512 77aa46d651dbfbbfd6e254619ec917fd861fc44bc7847c2f9e7c4d5ebe0f90bafd8a543eceac394bd3482f868dc6a54440dda384b8be0c24e0c4093735f017e8
+EBUILD mplus-fonts-2.2.4-r1.ebuild 685 BLAKE2B c4a00512ace2f7795e7e32cb86cb6f1027f13d1a83ab531b38e0826e151b5949c809eef376f7d1061028a4a8a9e8ac4dd2dd671a2e995facbb91687d78c7b17b SHA512 7a01b590309de400fd7f4fc15d34e0aa7a59e739d72ae76ee1a4b4945264f489002bf61be0c0850293e3e7143a880f0dbd256685b121fb4c14a7c65bcc3a17d3
 EBUILD mplus-fonts-2.2.4.ebuild 683 BLAKE2B 9c70a1454795fcc382757c3562e416bc1ea4b9c56f7c56c6f96e6ee5083989c7549b264cc48881f4a57d8f17e4be8ea79c309403c2042be3085200c90ce1df71 SHA512 563d65f5caf0fa2f60e8bc7681fab65092b29f9b02638240110991972628ec97c8711e219fa116f0426894bd9e3dc558f2507c1060458b621c3d4e0fef45d874
 MISC metadata.xml 417 BLAKE2B afd3ff35d1939503c1e6638acf5dec0ec8545cdca271d8c40f67f7386c6d9328292a1d6f15645f913615ab01a6ae4c3ca5b32551256e4e4a530958a447caa5a4 SHA512 a7b75bfcec2be8a238c1079dff5ada5b5ae6e5e4ba4fb634dcd83baee4558ca10a958c3fd0fc7880d7fde815dd56cccdbea8639b16ba713f6517796f19227f49
diff --git a/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild b/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
new file mode 100644
index 000000000000..d26999296ce6
--- /dev/null
+++ b/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+FONT_PN=mplus
+
+inherit font
+
+MY_P="mplus_bitmap_fonts-${PV}"
+
+DESCRIPTION="M+ Japanese bitmap fonts"
+HOMEPAGE="http://mplus-fonts.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}/5030/${MY_P}.tar.gz"
+
+LICENSE="mplus-fonts"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X"
+
+DEPEND="x11-apps/mkfontdir
+	x11-apps/bdftopcf"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+# Only installs fonts
+RESTRICT="strip binchecks"
+
+src_install(){
+	DESTDIR="${D}${FONTDIR}" ./install_mplus_fonts || die
+	dodoc README* INSTALL*
+}
diff --git a/media-fonts/symbola/Manifest b/media-fonts/symbola/Manifest
index e1ba103e1133..77439ee8efd6 100644
--- a/media-fonts/symbola/Manifest
+++ b/media-fonts/symbola/Manifest
@@ -1,7 +1,8 @@
+DIST symbola-11.00.pdf 1610961 BLAKE2B be2ed31f7d6e2401d76292a417a1ef4ee2d9974b0ab84abb5febccbecee0e3e625fb234a8950114ef13b1ec1242c7220a16d819bc71c245947d9c75a60a036f0 SHA512 92cbc6f0953cc5a8bb7ba5306e9e1ddf2d1081a94b2ecbbafb8c8e8c6cece4e20d9d3367ff67ae3688e2cb88b67c69716b3bd058ab80d2efa6dd0e064b032697
 DIST symbola-11.00.zip 2907542 BLAKE2B 38da4a33acda4d7177c70bcf832000647ad99c3d8aa6c15006792db1fdc5641399d5080e7f2970bcd321942ff87affa23a13c6c8239e104ee8817cde7140a6e8 SHA512 be7b3fd8b2070a6713b189c0ee0c6d8aef481eb0c7e476dabfa3eb1a599cc7f3a00f14d7b9ca1f563722d550c098f272f62bb99fc490aba8132ed5ae7de59a7b
 DIST symbola-8.00.zip 4668110 BLAKE2B 2807945aaab54509921756792da89d31721b575f6a1a4f65426b69ec348d1a6bf21d457d1c7a78205042c9df67187bce7c56f9bb4ba42b9f6f5f5af6ef9608cf SHA512 f496be58660c5d07fd0a9422eef1dad3d0aa06e350e37f84a547496a6a9c6abf6fa4609e9051e40772e952cd4f71a7dd02ad0ba16cf3aa2b51f31fee09ef9b84
 DIST symbola-9.17.zip 4122777 BLAKE2B 60e7188366ff9204c41e42b99ee31242c0d2eefceb2bf663e6b68bb5a924a269d608d8ba2085e956dcb5d4c2c85d7a2993f199bdf8e0597d27e3d4bc34c50be6 SHA512 29c2141ba7d5be96b4d2faa52e4d2efbd1ff6a8368fdeae8986a4a3de50522a813c46efd462556b5b6c10bb97777ca068564b9dcdfd7961c485ece5fda18e04c
-EBUILD symbola-11.00.ebuild 605 BLAKE2B 67754b6bbeb4ce13c40999dc02fea47241c95e182cceea2a7ce1e9cce928d0a1e887cb47e1ffee15291de247583e75635c35b77eec3b2fe9a0e39a36ed4e5fdc SHA512 8f56f73faf0f15c829e4f937c283a1c47e8720ce7802adb9f00fc8e4af868bfd60447ffced8df8420f2d7b94e76026b2786b7e1e374612935924d3ad163e808a
+EBUILD symbola-11.00-r1.ebuild 677 BLAKE2B 35d895f76703bddf1b1e39d1e4f183a6fb3b5a95af0c2212fadc9a7dfc6f8f4c170bfa49d413a9f7cd747077567eebeb07e69fb798ab9613769493bb55b3d78f SHA512 f00f515807cbf449b93db54d54079d71934460a0ac24e90fd4a9a88f36e2e95e91952d513123f25620bedcf74367bfcec53e31bbd15c2326a0aeda620c4c0fd1
 EBUILD symbola-8.00.ebuild 606 BLAKE2B 2ffd9a500840cdb4c0ffeb5aecc1d3350d56afad51f07a815785c197dcaeb6a1f0e08bcc27cc3a2b69675e4d39fb6e7c023e47a1a11237a7b64174018787fe7b SHA512 2de7fd71bdbe1a00780862c9cc4035f0908b516b89040f060e822c76bd098519021a1c2d693e795def6a32b00b54f7775da560ce3464f5c1a6ec29314f1c3b9a
 EBUILD symbola-9.17.ebuild 592 BLAKE2B 878bb5b48b7bf8946aa44ab99763df10a5570d522366d0060a4ab20481666ca8719275b7843130072e7bde7a956a9a1b8c64fbb02996edce2623514f3c26131e SHA512 4f3ca1ae81315a073abbafa33641b3d69eb294823f73fa242e5c6de0aeff4d3239403e062a448de93c75b3d50d675be58906554033a78bece60f17d74c1b83b9
 MISC metadata.xml 364 BLAKE2B a3ae59e04600fb512fe1e0dd6ebb3d146faee164775446754633c9bf88845f0ea0459fa4a145ce7e232206bde0bf2e72b4ed29420fe667620acfe5b8074d348a SHA512 2b2701e4698f5adc465a1ab038f176e405a0df1528560560831e43ae34421eb74e4332ad3001c6ad2eba43ac976b6856e2ee2690685a03428fd1ae71552017e5
diff --git a/media-fonts/symbola/symbola-11.00.ebuild b/media-fonts/symbola/symbola-11.00-r1.ebuild
index 29c774677ebc..dbfeda55a4aa 100644
--- a/media-fonts/symbola/symbola-11.00.ebuild
+++ b/media-fonts/symbola/symbola-11.00-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
 
 MY_PN="${PN/s/S}"
 
@@ -9,7 +9,7 @@ inherit font
 
 DESCRIPTION="Unicode font for Latin, IPA Extensions, Greek, Cyrillic and many Symbol Blocks"
 HOMEPAGE="http://users.teilar.gr/~g1951d/"
-SRC_URI="http://users.teilar.gr/~g1951d/${MY_PN}.zip -> ${P}.zip"
+SRC_URI="http://users.teilar.gr/~g1951d/${MY_PN}.zip -> ${P}.zip doc? ( http://users.teilar.gr/~g1951d/${MY_PN}.pdf -> ${P}.pdf )"
 LICENSE="Unicode_Fonts_for_Ancient_Scripts"
 
 SLOT="0"
@@ -25,7 +25,7 @@ FONT_SUFFIX="ttf"
 
 src_prepare() {
 	if use doc; then
-		DOCS="${MY_PN}.pdf"
+		DOCS="${DISTDIR}/${P}.pdf"
 	fi
 	default
 }
diff --git a/media-fonts/x11fonts-jmk/Manifest b/media-fonts/x11fonts-jmk/Manifest
index f4baec578c8d..f15035f86d2b 100644
--- a/media-fonts/x11fonts-jmk/Manifest
+++ b/media-fonts/x11fonts-jmk/Manifest
@@ -1,4 +1,5 @@
-AUX gzip.patch 468 BLAKE2B 25bb1c283440bd92896a26ee37ce179f74cf0a6f2e53e6c57f81576885ab37c283bc0c751eb3a6aa95658742b3bf0f58c363f3d5a0c78f37a4dd240757031e55 SHA512 909597bd2c113df60d4b7606e07be12e52e750fae0ac93f597b7352ab26fa3357508100e8298ed912e2cf0741a674c31e949fd39f3e0459adc7c3e5c07f653f1
+AUX gzip.patch 472 BLAKE2B 3804de127898501b76be41a8bf016bc1eb224b19a1d56ee1dbe6345352de5f6634692d2c45c1747bf38bb9a90fdaa42cb359e711b7591398576e51e624940099 SHA512 b3ba5684c9d60435032f69e22f74feda6d4a49689db9ef28acd5ca8fbc8190c344e8cb7991ea707f21317f55dd2edaaf12b6e0bb14d70d204d252a63b184a280
 DIST jmk-x11-fonts-3.0.tar.gz 624357 BLAKE2B 5513e46116cb7ac63e69d4d0fe03f627e437a11ea378c4213b1cbf13035a5e1c14dc4c1bf230e6490829b4cafc2ba3dd1b733f8549d28aeaa1e7389e527e8b85 SHA512 7a99689be59eaf50742932ce27c8b41a99d10076adf9c2990e11745a873eec610257d50e844f8380658d340cf821724d459dc9b6b189666180596f2bf255957f
 EBUILD x11fonts-jmk-3.0-r1.ebuild 766 BLAKE2B cdbf3917a84bdd3dddabfa5600100ac717b871b142fe071077ceba36fd498907c2986751006dcc2bb70142ca782bd28e502edc08deddbbc250e97737661f68d1 SHA512 cad2af87670266e2c1bfaa3ca7dda9b12455c18672283e578937a2d05a41dfa44e1dc1db3d483e36400dcdd840d07402835d373c91db8d258967883321e88092
+EBUILD x11fonts-jmk-3.0-r3.ebuild 755 BLAKE2B 10cbf56afc54d7bccdeb7bbe9c1bc5138992b72daf16444ccc4530cd161129854b6ab82e37e115c70faf3075fcecf700fa4b937e165dd15e3b324ec76c7aed5c SHA512 8188a9946c7cbead8ed42882278064c25be41651a73a606e9ce061e0706c8e1f4543bfc785fa4dd4ddcedeeccda7216bae7020404aa575ecec557c881906abdf
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/x11fonts-jmk/files/gzip.patch b/media-fonts/x11fonts-jmk/files/gzip.patch
index c01c1c09394f..3fb938c2f415 100644
--- a/media-fonts/x11fonts-jmk/files/gzip.patch
+++ b/media-fonts/x11fonts-jmk/files/gzip.patch
@@ -1,5 +1,5 @@
---- Imakefile	1999-08-24 00:09:41.000000000 -0400
-+++ Imakefile	2005-02-21 01:40:20.000000000 -0500
+--- a/Imakefile	1999-08-24 00:09:41.000000000 -0400
++++ b/Imakefile	2005-02-21 01:40:20.000000000 -0500
 @@ -22,7 +22,6 @@
  
  CAT		= cat
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
new file mode 100644
index 000000000000..b539d05e352a
--- /dev/null
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+FONT_PN=jmk
+
+inherit font
+
+MY_P=jmk-x11-fonts-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="This package contains character-cell fonts for use with X"
+SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
+HOMEPAGE="http://www.jmknoble.net/fonts/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="x11-misc/imake
+	x11-apps/mkfontdir
+	x11-apps/bdftopcf"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	eapply "${FILESDIR}"/gzip.patch
+}
+
+src_compile() {
+	xmkmf || die
+	emake || die
+}
+
+src_install() {
+	make install INSTALL_DIR="${D}${FONTDIR}" || die
+	dodoc README NEWS
+}