gentoo resync : 16.06.2019

9 files changed, 187 insertions, 7 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 892da3d8ccbb..28d259e876c9 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index 7f5436530076..778d91b307e7 100644
--- a/media-fonts/culmus/Manifest
+++ b/media-fonts/culmus/Manifest
@@ -20,4 +20,5 @@ DIST journal.tar.gz 27112 BLAKE2B 516255f54278c02492e17f7490540ff9c3d838fea673df
 DIST ktav-yad.tar.gz 89373 BLAKE2B ada55f47b018d2cd624fd17ea9df472aead17ec331d09a3c73be7adf21ef9b160cc076c6eece43438383952237de44a0b83e176964dc37ffa928cd653e15d816 SHA512 c5b065cbcd2389ef3a81e408347be0dfabc130237f55567b4666b58533122b7c0622f09d17fe45c1fd73f0117afd411c10e6961398fe2de5764bbc53d5557cc8
 DIST ozrad.tar.gz 16709 BLAKE2B c8122ca1a9aa984fc0bd913e073150dcc4beb50e60fadbc532ec7c022d8efe9ef0b43299dda506794ea674946091c705ca775bf88bc5cb7a60de0aa5bf25d919 SHA512 78f5b686b6bd472966a2e682f057b03b05bf2450a6cfc147668c13f6857c655067b83f8549038ffea15429f067f2ee57520e3722e1ad818376e410468298f382
 EBUILD culmus-0.120-r4.ebuild 4612 BLAKE2B e94029a3b7ad41261dc4925959f2a0b735857232d862880edd9fcf8b8fac7e6c3bd3e539bceb96ae29ac10e13d9b498cf1b29347a907c9580494f0bfe96d05ba SHA512 5f33a6f2d7c618a881d6156dbac171579cc89ea4346be8c9fd077c03ba19592b17e40e5f922f32061273c2ec6255d466fd44598eda4fe543534f5339a96f271d
+EBUILD culmus-0.120-r5.ebuild 4644 BLAKE2B 438779c82574c39d23a675f300cd27fa1af91600f242c2f32080c84d2ebee0ca455bb6a8b56279ca0adcffb072ede2754c96ec6f587e5b6cde1f327e11cee376 SHA512 da4815892512e79bb820063260a6f708bde4e6a9613a7d3b401934240de3f2c05616b247ddc0866efcd94846081e227436b2a5f902535c9dc0ef1ce72163c3bf
 MISC metadata.xml 583 BLAKE2B 824a24c5f7812a73e49afa35f98ef8b31465dc797fae6048a057be7253d87d4d41da698550fc237fd2f1ce584e6d80d005361c98dd1964da9b9f6ddf222095ef SHA512 38b8e8dfc13787e2bfed9f0205e7a8ab7109634af52cf29acf8f1301eda8499725e8ee0df4dbc47474913901ea99446f16bcf82fced23a8961a70b60cc8beb01
diff --git a/media-fonts/culmus/culmus-0.120-r5.ebuild b/media-fonts/culmus/culmus-0.120-r5.ebuild
new file mode 100644
index 000000000000..ff86f58b23a5
--- /dev/null
+++ b/media-fonts/culmus/culmus-0.120-r5.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit font
+
+# Maintainer: also check culmus.conf file in ${P}.tar.gz
+
+MY_A_P=AncientSemiticFonts-0.06-1
+# The Type 1 fonts are just a stripped version of TrueType fonts and they are
+# not updated unless there is a meaningful change and we need them for
+# culmus-latex, see bug #350657
+TYPE1_PV=0.105
+
+DESCRIPTION="Hebrew Type1 fonts"
+HOMEPAGE="http://culmus.sourceforge.net/"
+
+FANCY_FONTS="journal hillel anka comix gan ozrad ktav-yad dorian gladia horev"
+FANCY_YG_FONTS="ShmuelCLM MakabiYG"
+TAAMEY_FONTS="TaameyDavidCLM TaameyFrankCLM KeterAramTsova KeterYG"
+
+SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
+	mirror://sourceforge/culmus/${PN}-type1-${TYPE1_PV}.tar.gz
+	fontforge? ( mirror://sourceforge/culmus/${PN}-src-${PV}.tar.gz )
+	ancient? ( !fontforge? ( mirror://sourceforge/culmus/${MY_A_P}.TTF.tgz )
+		fontforge? ( mirror://sourceforge/culmus/${MY_A_P}.tgz ) )"
+SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy/%s.tar.gz " ${FANCY_FONTS}) )"
+SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy-yg/%s.zip " ${FANCY_YG_FONTS}) )"
+SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${TAAMEY_FONTS}) )"
+
+# Some fonts are available in otf format too. Do we need them?
+#	http://culmus.sourceforge.net/fancy/anka-otf.zip
+#	http://culmus.sourceforge.net/fancy/hillel-otf.zip
+#	http://culmus.sourceforge.net/fancy/journal-otf.zip
+
+LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ancient fancy fontforge taamey"
+
+FONT_CONF=( "${T}/65-culmus.conf" )
+
+RDEPEND="!media-fonts/culmus-ancient"
+# >=x11-apps/mkfontscale-1.0.9-r1 as Heavy weight support is required
+DEPEND="${RDEPEND}
+	>=x11-apps/mkfontscale-1.0.9-r1
+	fontforge? ( media-gfx/fontforge )"
+
+S=${WORKDIR}
+# Put all fonts, generated or not here
+FONT_S=${S}/FONTS
+
+src_unpack() {
+	unpack ${P}.tar.gz # For type1 fonts...
+	unpack ${PN}-type1-${TYPE1_PV}.tar.gz
+	use fontforge && unpack ${PN}-src-${PV}.tar.gz
+
+	use ancient && unpack ${MY_A_P}$(use fontforge || echo .TTF).tgz
+
+	if use fancy; then
+		unpack $(printf "%s.tar.gz " ${FANCY_FONTS})
+		unpack $(printf "%s.zip " ${FANCY_YG_FONTS})
+		mv TTF/* .
+	fi
+
+	if use taamey; then
+		for font in ${TAAMEY_FONTS}; do
+			mkdir ${font}
+			pushd ${font}
+			unpack ${font}.zip
+			popd >/dev/null
+		done
+	fi
+}
+
+src_prepare() {
+	default
+	cp "${P}/culmus.conf" "${T}/65-culmus.conf" || die
+}
+
+src_compile() {
+	mkdir -p "${FONT_S}"
+	if use fontforge; then
+		pushd ${P}
+		mv *.afm *.pfa "${FONT_S}"
+		rm *.ttf
+		popd >/dev/null
+
+		pushd ${PN}-type1-${TYPE1_PV}
+		mv *.afm *.pfa "${FONT_S}"
+		popd >/dev/null
+
+		pushd ${PN}-src-${PV}
+		for f in *.sfd; do
+			"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
+		done
+		popd >/dev/null
+
+		if use ancient; then
+			pushd ${MY_A_P}/src
+			export FONTFORGE_LANGUAGE=ff
+			make clean
+			make all || die "Failed to build fonts"
+			mv *.ttf "${FONT_S}"
+			popd >/dev/null
+		fi
+
+		if use taamey; then
+			for font in ${TAAMEY_FONTS}; do
+				rm -rf ${font}/TTF
+				pushd ${font}/SFD
+				for f in *.sfd; do
+					"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
+				done
+				popd >/dev/null
+			done
+		fi
+	else
+		pushd ${P}
+		mv *.afm *.pfa *.ttf "${FONT_S}"
+		popd >/dev/null
+
+		pushd ${PN}-type1-${TYPE1_PV}
+		mv *.afm *.pfa "${FONT_S}"
+		popd >/dev/null
+
+		if use ancient; then
+			pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts
+			mv *.ttf "${FONT_S}"
+			popd >/dev/null
+		fi
+
+		if use taamey; then
+			for font in ${TAAMEY_FONTS}; do
+				pushd ${font}/TTF
+				mv *.ttf "${FONT_S}"
+				popd >/dev/null
+			done
+		fi
+	fi
+
+	use fancy && mv *.afm *.pfa *.ttf "${FONT_S}"
+}
+
+src_install() {
+	einstalldocs
+
+	FONT_SUFFIX="pfa afm $((use fancy || use taamey) && echo ttf)" \
+		font_src_install
+
+	rm -rf "${FONT_S}"
+	find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' |
+		while read font; do
+			ewarn "QA: missed font file: ${font}"
+		done
+
+	pushd ${PN}$(use fontforge && echo -src)-${PV}
+	dodoc CHANGES || die
+	popd >/dev/null
+
+	if use ancient; then
+		pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/"
+		newdoc CHANGES{,.ancient} || die
+		newdoc README{,.ancient} || die
+		popd >/dev/null
+	fi
+
+	if use taamey; then
+		for font in ${TAAMEY_FONTS}; do
+			pushd ${font}
+			[[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; }
+			newdoc README{,.${font}} || die
+			insinto /usr/share/doc/${PF}/${font}
+			doins -r Samples
+			popd >/dev/null
+		done
+	fi
+}
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index ea5b74535ae9..5cafaa675f89 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,3 +1,3 @@
 DIST font-util-1.3.1.tar.bz2 153289 BLAKE2B b85b2dbbe3ed97e22d765b73a9fee7472790ff037878967ee6865e3122c651ff5e3b6aeb99492b1330bb77d2518157abcc45e503419b21f2cc76a3196d505f22 SHA512 9fd6dd4c0a01ede5f0b09ec0f9d316267ca086e2ee9526a43a4e4d6ce3cd67c977293bd3cf440328ca417292fcae1579888b24b7259eaf012230890210d74889
-EBUILD font-util-1.3.1.ebuild 620 BLAKE2B 6b3cae485c92f50d4991729cd25cbfba985e7dda0070350d66fa7f128fbec3b6c51871abfc944f200958bd4c2e15d98786381475b686f161a01073d9771b4606 SHA512 9a3d3076289346047255a39b4e6906297b168467d17d48b042ae0935d37dd9a8f42af0baecd5617fed37a8e184531747aad908a7e7387e532f7aef3188b92f98
+EBUILD font-util-1.3.1.ebuild 629 BLAKE2B 6f16c24073627c15aa14752e806178c7a335caf5955062831434bb9cc520180e8ab4c675ef15c3c6c6d8bc61b215ad7302379e47e7fc7f67773694455877c733 SHA512 6f5f9dad2a49e6e0ba1d4e643d8510622f2b4ff5112800fa69e47f797e29a3bda4fe7eb3702b1be1ff475f588740a8b774ffe0d173a527d24f21ce0cc6b20314
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-util/font-util-1.3.1.ebuild b/media-fonts/font-util/font-util-1.3.1.ebuild
index b9817fb3ccf2..e538e74d9a9e 100644
--- a/media-fonts/font-util/font-util-1.3.1.ebuild
+++ b/media-fonts/font-util/font-util-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/polarsys-b612-fonts/Manifest b/media-fonts/polarsys-b612-fonts/Manifest
index b6e7a370c339..a53752632988 100644
--- a/media-fonts/polarsys-b612-fonts/Manifest
+++ b/media-fonts/polarsys-b612-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST polarsys-b612-fonts-1.003.tar.bz2 2823506 BLAKE2B 31c918285f6072d6cc8bd44c2b57114eb027447b0002ea16d737dd75772299169fe1d9f20620fd09fd96c34b61cf41544848d945c339db02224f045d979d4d22 SHA512 7ffb6fa858eb20d02bc2fc12788fdfd3fd15117b1a5e1ed2cc70fd19bc9fad5ec92c714dee07c85dd954911862f5852716eeccc6b72d63ba32993f3d03e35f44
-EBUILD polarsys-b612-fonts-1.003.ebuild 502 BLAKE2B b9ab12d635baa5f0d96a54ac4c8173fd44364ab4ff1bc678277bd9efffd6c8f6882b31f00ba2c4a40a6b1bdbb62d8e0a43441aa69731c79f53ce75c71af4fed1 SHA512 2623c612a887a5842c1ba923d8c8a1e492ac489ef6805b7ac93927984cf40f5b0699504e40108e71d8efe15f381da286cb7b61023c0c1e10556c37ffe876742a
+EBUILD polarsys-b612-fonts-1.003.ebuild 498 BLAKE2B 0f10e43b15e76f4bbc6e2da1adacdedc87f114feef9cc0045266a619872c3baada1535d2eb830bd9c722aa08b70c329b170c5009c73f1f2898aa17879f840038 SHA512 18e2c99190166cec450e658aa527a0380d8522a2a54e6fc38022f7e4e6b6df415674bb30f404a7cb0bfc0223c54b41e3b41b771c4fa3f5ca7c377cda06c7da50
 MISC metadata.xml 547 BLAKE2B 8f7833eed4fe368c250fcf32a0abc4993c4a5966ffe1085ac2826a3c0924eb126aae96914f2235993a2d47d878e10fc34a3aa42e9dccf1cd3cbe5275a13831fc SHA512 6da5fd376c417a7a0d995c7259d11369ee93715f35b298f0e00c412fe9d1b8a1e34beb2a7929ea38380646bdef11282b82777bb2729a2ddc4022120b19f5a697
diff --git a/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.003.ebuild b/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.003.ebuild
index 3ba9480d3885..3fb78cff8b6a 100644
--- a/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.003.ebuild
+++ b/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.003.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.polarsys.org/c/b612/b612.git/snapshot/b612-bd14fde2544566e6
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE=""
 
 FONT_S="${S}/TTF"
diff --git a/media-fonts/source-pro/Manifest b/media-fonts/source-pro/Manifest
index 0cb91a0f01c0..85c6993716f5 100644
--- a/media-fonts/source-pro/Manifest
+++ b/media-fonts/source-pro/Manifest
@@ -10,5 +10,5 @@ DIST source-serif-pro-20160608.tar.gz 1528897 BLAKE2B 1b28148bac4078f0a3d8a32f14
 DIST source-serif-pro-20170111.tar.gz 4682667 BLAKE2B cbb0a421be445534fc3e654a0c75af7e0b64b92160cbc5203a559db6ad538833af86145b5394be48f47b51a572307088d984d62f19e6c6ada05c2d73c61a6510 SHA512 7644269bc99674605014b2b6fe69dc04fcbb37714cfecf8fab4fa6921cd40ce310b4a10143da894003c5aad8fd0edd80ec18fd739aac5d74867f5f3890d96b23
 EBUILD source-pro-20141211.ebuild 1267 BLAKE2B cf69c222d1a71f8ca1d25b9f4dfec9bb1c6ec236016ddca448e05db2a7463ca8c7af50ae46770c181f586631f6b975c6128eacc34ff01ddb0bb283eb2f5c0bc9 SHA512 738d88240afa81289dab161ab9776aa5da8dc71c84e25a25db9292caa1cbc87dbe430e6421de57b350e9bbbc945e466175acd3d23ab5006ca49c5e619395dc2b
 EBUILD source-pro-20160608.ebuild 1320 BLAKE2B 3e43990d7f941084ad715f2c0a5505c7c917571f27cb227e35a4ff7945cd7a8c595b74943d1f7f2b8796899c2ad35e845c6429f7ec6e8f1219e1cabce9a3f748 SHA512 6d7fdcc337dfe24fc5e199db45c03cf8fa085b9709e398e711bdb0f1ba83803d351e2f1c4d2c94f936cb8a3b471b0cbf1323f57197acdc20b2209a3b79db7cea
-EBUILD source-pro-20170111.ebuild 1322 BLAKE2B fbc3c48625656bafd03a9eb0d68258b749e01b36896f2e220f144a82d7b5a06651f90d0fbc9973d5a448fbc0c7767872d2eec919e99189844158bb14e691e81d SHA512 22d0e0b276dc4f3044198d43e5116edafc87da03fc803d511f6a021cef655ec93c20f00408155babd1492e94e3ea4ead36017926c4c7e4452612fc18be85d19c
+EBUILD source-pro-20170111.ebuild 1321 BLAKE2B 7bf9847700fc67bb21dce976bb3c28cb1a08c2566a56e8fd7a67ff3684d3ecdb4496f2aa3f22d99fe0fda83463cf6a342669819106066a332f322878dfc73768 SHA512 84f259b4015e75740ba2028cbacc85e96539c3693b50c800179e5291ad5d040609b1fbf41c179681ab9fc9cdaffdbd7fbf9a341c052e04df66a3060d03baf1a8
 MISC metadata.xml 391 BLAKE2B c0bb16c63d4e035da05e7f72abeaadee956760bbd9b82b1363cb09db1eeebe11fac61b6345f1f19cfb76f30415c2bdadfaa4888f886b0600780434248ca22968 SHA512 dc4ad0cdc83213489305cf3c520eb181249496727c83635b2b6d5675043a91644e29e4ca7d3478e0453c74a0981f3d4e5c5a35c0d7631a808d5f2710b613bf28
diff --git a/media-fonts/source-pro/source-pro-20170111.ebuild b/media-fonts/source-pro/source-pro-20170111.ebuild
index ea17639efe80..cf4b216d2bb1 100644
--- a/media-fonts/source-pro/source-pro-20170111.ebuild
+++ b/media-fonts/source-pro/source-pro-20170111.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE="cjk"
 
 RDEPEND="media-libs/fontconfig