gentoo resync : 28.04.2021

3 files changed, 268 insertions, 32 deletions

diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index bcf1de3dce03..cd24544b670e 100644
--- a/media-fonts/culmus/Manifest
+++ b/media-fonts/culmus/Manifest
@@ -9,7 +9,9 @@ DIST TaameyDavidCLM.zip 572761 BLAKE2B f33bf233a5da417b0edc364e13d39f58b9746997e
 DIST TaameyFrankCLM.zip 742392 BLAKE2B 91eeea273e69a570ecf8c30fdba37dbc7d65a819748dfe8e131b6f9b87f2c08e53a3aa295e7b7a4616f6d005440028b91bd5a77dc43bbc303f71b43703915be6 SHA512 6f87d95f2359f1facba32594a0bf0fc3c69b1faf895cb9dbc48325b757ec1446eb70cef6f1cbc88f38025a0d549d310bb3c2b34f52617846da3702938ff01b1a
 DIST anka.tar.gz 21210 BLAKE2B 04d40f828a94f7aa58e4ddb83bf47e73f369aee1cafd2ae01126d9cbd34c6119681cf46a589eac9de901662a89547cb0a017ee3b3b8f6d8aec7d24f4dce5c66e SHA512 e343918245a05aa11243dfda65a00295d09f04a04bb56594155129e5744a7f100793940eb0d417d708e6f25a1856c20d09d5198bab03a2c8fba258816bd2d14b
 DIST comix.tar.gz 100296 BLAKE2B 038e09da9a33f57be3fc983185d2ce9054fecb65c00c522071730fc27419dfc9e6767440bdb50f5e3fab65c19d658e787ec64bb48b72d1d1ec70c62e13e1effb SHA512 eacf751e7d9503db1cab95190c4b9473d4e5b459bc4baeb9341f35a7859ff6068ceffdcb27bee2294ead9a18d3471ee21b725ae48d80c946817d9b420f7adb9f
+DIST culmus-0.120.tar.gz 1190095 BLAKE2B 8bc67812f2afda337ac5354c1f18c50b2e74ae5668c351f0130f88f2b010d742f80829b9b2af84a74c7933fc749c8623e27befd9ce8255c980fbb6ca1b637831 SHA512 e99578fc92d4184f92cb6fb8b990ecfb1da1a84e77e400218f40087380d36edd3a65ca4f776330c3d867bbe8b32e58fb13d8485e1ece689336756d3d7d69ccc3
 DIST culmus-0.133.tar.gz 1174687 BLAKE2B 17674939dab12b76280cf420edd00c8a39059415a0abfe3af79a3cddfa33e05826068d71c6bf6355f9032641b7391e763c36d39de4713d0fe1b44b7b4d6f1bb6 SHA512 97c17dbe4ad5b542a2bfd6c9c7a7afeeabae942cbbd3a718d46ceb18b4020fe7fdf93ade07a65a2da93dadff645abf0da4648713e3452d30bf2a9a79201f2845
+DIST culmus-src-0.120.tar.gz 1180742 BLAKE2B 0453dbb778c7e6cbad68165bcd9b8b1bbc54a646f70864c9ce6f8315b8c7ad269dafdc15b4360acf58b6d826ec7db8b31deee2e461c2c56aaf2eee5254259322 SHA512 1c57024e7cfbcf6a5237db317cdaf73327fe4bbd06b84cb9f1218f560723f3bd421ecc53c27e523c600f50586f9daf1223ecc641f81bdc45f6fbef82fdcc0146
 DIST culmus-src-0.133.tar.gz 2054572 BLAKE2B 12ecc62b0e0eb2fe665750c6abba7bf1673904013287afef8ba10b98bbe8d5fb0cf345753b6e48aa4c7ea893c015aee24ba7ec48d6b470987a2b25dc0ef73f08 SHA512 d15eafe199bdb1071fbd434797e4f83d37b757d97bf480e68d6a8181dc642352b698b637a9bbebe380cf6f52367d55a4a8a3573077bb5e7508950af81ad1eb63
 DIST culmus-type1-0.105.tar.gz 465679 BLAKE2B 4ba8a9fa14507c19df16ba9cf80325fa7ed01de6db9be8aaed535e20ecfba65c5b5e8ab98ac2795f5a6ecbe780817da567a280f6b426ffd2ee0b7b4a68ae0649 SHA512 f2cc3ddb31e72936802998a3f64fd265aacb40f8390f9f3f8556ce4ce546b90eeeca0fe3a8a326b4dbc79ed943c886900d08bc5f5e6dfd3508fa5b3eeb173f7d
 DIST dorian.tar.gz 141215 BLAKE2B 44e92f5c7534598e2b4de7ae2edc87f73482d185997fefd52d7f1b85baa190bb303efb9d77e39cd429e4c0be64cd507a763d8cdd4f9b1dea4ff4409a17d4b691 SHA512 f05b602528fb9a4ddb4eb876d48f3ef67d446180fb9374bb8b82bca61c9922bfa7cb7ad85a79d04a9ed7fcdf3690ab1ae574ff5e4b595ea9cc5a7d5516aa6fca
@@ -20,5 +22,6 @@ DIST horev.tar.gz 19261 BLAKE2B 4a2c372f8ec0baac10190dda5ff462a32143240f90393dad
 DIST journal.tar.gz 27112 BLAKE2B 516255f54278c02492e17f7490540ff9c3d838fea673dfb69406ac3d49a75dd7eb83b283b497250b10ae6d948e4a869ee5a04afead6aa8e80e45ab939550614f SHA512 8ec18622b889fdddce3a0cc834a86bf55aa051acdb40114bd10b46f9b0e2b28222a781ec9bad135e784216c70d05ee5a0cdbc475029579bcbb5dcc99351b407d
 DIST ktav-yad.tar.gz 89373 BLAKE2B ada55f47b018d2cd624fd17ea9df472aead17ec331d09a3c73be7adf21ef9b160cc076c6eece43438383952237de44a0b83e176964dc37ffa928cd653e15d816 SHA512 c5b065cbcd2389ef3a81e408347be0dfabc130237f55567b4666b58533122b7c0622f09d17fe45c1fd73f0117afd411c10e6961398fe2de5764bbc53d5557cc8
 DIST ozrad.tar.gz 16709 BLAKE2B c8122ca1a9aa984fc0bd913e073150dcc4beb50e60fadbc532ec7c022d8efe9ef0b43299dda506794ea674946091c705ca775bf88bc5cb7a60de0aa5bf25d919 SHA512 78f5b686b6bd472966a2e682f057b03b05bf2450a6cfc147668c13f6857c655067b83f8549038ffea15429f067f2ee57520e3722e1ad818376e410468298f382
-EBUILD culmus-0.133-r1.ebuild 5146 BLAKE2B bb35d8dfe74cca46b55ab61d11371fe272869e6a2be3e231acc9515046822566270c24c747607c581c611f6392276e44224980121725730cb7dc3b92a8469531 SHA512 394a02e9a91af769aa90ff5734d738bc5661b32b69850c2198d09dff6f50903ce958bd2f6812fea037a7b53a6f500b91decf88d82965cbcf1ea33e1a29649ae8
+EBUILD culmus-0.120-r6.ebuild 4851 BLAKE2B fd7167ffa59f825a9ad190e8c349fa14d01da09b7a4e31bde424f7a21fc04fbe74caf8d08e99346e96e8180b8e1d80d1d2c5df42b8e7f50bd590cefd81f32ce7 SHA512 ca145f3a4c7c705fbf7949ecaa6daa404fc45f2097bf33de15e0b05bdc9e6dedb956219ee7594487db69e70f2fb01e58c8757518d8f9c020e3ef40b12d6231c7
+EBUILD culmus-0.133-r1.ebuild 5077 BLAKE2B cf061ca2c435ae5f37115b3da56f8d609c8bc3945d0645550ea482fa9b233f9b49d0e080edf76f00cf10ffb65d65f5df21210543f499ff04096a2e12b88ad552 SHA512 99fecfd5cb1c8fc5c46021f776cd20d54b5d2e4cbe48f10695a3c2a90bd53550d7a3fc5a0ee3a1b13c03c33382ac37219920d8b77246b986635c758cda76135c
 MISC metadata.xml 583 BLAKE2B 824a24c5f7812a73e49afa35f98ef8b31465dc797fae6048a057be7253d87d4d41da698550fc237fd2f1ce584e6d80d005361c98dd1964da9b9f6ddf222095ef SHA512 38b8e8dfc13787e2bfed9f0205e7a8ab7109634af52cf29acf8f1301eda8499725e8ee0df4dbc47474913901ea99446f16bcf82fced23a8961a70b60cc8beb01
diff --git a/media-fonts/culmus/culmus-0.120-r6.ebuild b/media-fonts/culmus/culmus-0.120-r6.ebuild
new file mode 100644
index 000000000000..6d0109d856bd
--- /dev/null
+++ b/media-fonts/culmus/culmus-0.120-r6.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}) )"
+S="${WORKDIR}"
+
+# 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 sparc x86"
+IUSE="ancient fancy fontforge taamey"
+
+RDEPEND="!media-fonts/culmus-ancient"
+# >=x11-apps/mkfontscale-1.0.9-r1 as Heavy weight support is required
+BDEPEND="
+	app-arch/unzip
+	>=x11-apps/mkfontscale-1.0.9-r1
+	fontforge? ( media-gfx/fontforge )
+"
+
+FONT_CONF=( "${T}/65-culmus.conf" )
+# 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/* . || die
+	fi
+
+	if use taamey; then
+		for font in ${TAAMEY_FONTS}; do
+			mkdir ${font} || die
+			pushd ${font} || die
+			unpack ${font}.zip
+			popd >/dev/null || die
+		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} || die
+
+		mv *.afm *.pfa "${FONT_S}" || die
+		rm *.ttf || die
+
+		popd >/dev/null || die
+
+		pushd ${PN}-type1-${TYPE1_PV} || die
+
+		mv *.afm *.pfa "${FONT_S}" || die
+
+		popd >/dev/null || die
+
+		pushd ${PN}-src-${PV} || die
+
+		for f in *.sfd; do
+			"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
+		done
+
+		popd >/dev/null || die
+
+		if use ancient; then
+			pushd ${MY_A_P}/src || die
+
+			export FONTFORGE_LANGUAGE=ff
+
+			emake clean
+			emake all
+
+			mv *.ttf "${FONT_S}" || die
+
+			popd >/dev/null || die
+		fi
+
+		if use taamey; then
+			for font in ${TAAMEY_FONTS}; do
+				rm -rf ${font}/TTF || die
+
+				pushd ${font}/SFD || die
+
+				for f in *.sfd; do
+					"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
+				done
+
+				popd >/dev/null || die
+			done
+		fi
+	else
+		pushd ${P} || die
+
+		mv *.afm *.pfa *.ttf "${FONT_S}" || die
+
+		popd >/dev/null || die
+
+		pushd ${PN}-type1-${TYPE1_PV} || die
+
+		mv *.afm *.pfa "${FONT_S}" || die
+
+		popd >/dev/null || die
+
+		if use ancient; then
+			pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts || die
+
+			mv *.ttf "${FONT_S}" || die
+
+			popd >/dev/null || die
+		fi
+
+		if use taamey; then
+			for font in ${TAAMEY_FONTS}; do
+				pushd ${font}/TTF || die
+
+				mv *.ttf "${FONT_S}" || die
+
+				popd >/dev/null || die
+			done
+		fi
+	fi
+
+	if use fancy; then
+		mv *.afm *.pfa *.ttf "${FONT_S}" || die
+	fi
+}
+
+src_install() {
+	einstalldocs
+
+	FONT_SUFFIX="pfa afm $((use fancy || use taamey) && echo ttf)" \
+		font_src_install
+
+	rm -rf "${FONT_S}" || die
+	find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' |
+		while read font; do
+			eqawarn "Missed font file: ${font}"
+		done
+
+	pushd ${PN}$(use fontforge && echo -src)-${PV} || die
+
+	dodoc CHANGES
+
+	popd >/dev/null || die
+
+	if use ancient; then
+		pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/" || die
+
+		newdoc CHANGES{,.ancient}
+		newdoc README{,.ancient}
+
+		popd >/dev/null || die
+	fi
+
+	if use taamey; then
+		for font in ${TAAMEY_FONTS}; do
+			pushd ${font} || die
+
+			[[ -f ChangeLog ]] && newdoc ChangeLog{,.${font}}
+			newdoc README{,.${font}}
+			docinto ${font}
+			dodoc -r Samples
+
+			popd >/dev/null || die
+		done
+	fi
+}
diff --git a/media-fonts/culmus/culmus-0.133-r1.ebuild b/media-fonts/culmus/culmus-0.133-r1.ebuild
index 1d3fec0e13b8..1c2c789c19fc 100644
--- a/media-fonts/culmus/culmus-0.133-r1.ebuild
+++ b/media-fonts/culmus/culmus-0.133-r1.ebuild
@@ -28,6 +28,7 @@ SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
 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}) )"
+S="${WORKDIR}"
 
 # Some fonts are available in otf format too. Do we need them?
 #	http://culmus.sourceforge.net/fancy/anka-otf.zip
@@ -36,11 +37,9 @@ SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${T
 
 LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 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
 BDEPEND="
@@ -49,7 +48,7 @@ BDEPEND="
 	fontforge? ( media-gfx/fontforge )
 "
 
-S="${WORKDIR}"
+FONT_CONF=( "${T}"/65-culmus.conf )
 # Put all fonts, generated or not here
 FONT_S="${S}/FONTS"
 
@@ -58,8 +57,8 @@ PATCHES=( "${FILESDIR}/${P}-fontconfig-test.patch" ) # bug 695708
 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 fontforge && unpack ${PN}-src-${PV}.tar.gz
 	use ancient && unpack ${MY_A_P}$(usex fontforge '' .TTF).tgz
 
 	if use fancy; then
@@ -71,8 +70,11 @@ src_unpack() {
 	if use taamey; then
 		for font in ${TAAMEY_FONTS}; do
 			mkdir ${font} || die
+
 			pushd ${font} > /dev/null || die
-				unpack ${font}.zip
+
+			unpack ${font}.zip
+
 			popd > /dev/null || die
 		done
 	fi
@@ -85,60 +87,78 @@ src_prepare() {
 
 src_compile() {
 	mkdir -p "${FONT_S}" || die
+
 	if use fontforge; then
 		pushd ${P} > /dev/null || die
-			mv *.afm *.pfa "${FONT_S}" || die
-			rm *.ttf || die
+
+		mv *.afm *.pfa "${FONT_S}" || die
+		rm *.ttf || die
+
 		popd > /dev/null || die
 
 		pushd ${PN}-type1-${TYPE1_PV} > /dev/null || die
-			mv *.afm *.pfa "${FONT_S}" || die
+
+		mv *.afm *.pfa "${FONT_S}" || die
+
 		popd > /dev/null || die
 
 		pushd ${PN}-src-${PV} > /dev/null || die
-			for f in *.sfd; do
-				"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
-			done
+
+		for f in *.sfd; do
+			"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
+		done
+
 		popd > /dev/null || die
 
 		if use ancient; then
 			pushd ${MY_A_P}/src > /dev/null || die
-				export FONTFORGE_LANGUAGE=ff
-				make clean || die
-				make all || die "Failed to build fonts"
-				mv *.ttf "${FONT_S}" || die
+
+			export FONTFORGE_LANGUAGE=ff
+
+			emake clean
+			emake all
+
+			mv *.ttf "${FONT_S}" || die
+
 			popd > /dev/null || die
 		fi
 
 		if use taamey; then
 			for font in ${TAAMEY_FONTS}; do
 				rm -rf ${font}/TTF || die
+
 				pushd ${font}/SFD > /dev/null || die
-					for f in *.sfd; do
-						"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
-					done
+
+				for f in *.sfd; do
+					"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
+				done
+
 				popd > /dev/null || die
 			done
 		fi
 	else
 		pushd ${P} > /dev/null || die
-			mv *.afm *.pfa *.ttf "${FONT_S}" || die
+		mv *.afm *.pfa *.ttf "${FONT_S}" || die
 		popd >/dev/null || die
 
 		pushd ${PN}-type1-${TYPE1_PV} > /dev/null || die
-			mv *.afm *.pfa "${FONT_S}" || die
+		mv *.afm *.pfa "${FONT_S}" || die
 		popd > /dev/null || die
 
 		if use ancient; then
 			pushd ${MY_A_P}$(usex fontforge '' .TTF)/fonts > /dev/null || die
-				mv *.ttf "${FONT_S}" || die
+
+			mv *.ttf "${FONT_S}" || die
+
 			popd > /dev/null || die
 		fi
 
 		if use taamey; then
 			for font in ${TAAMEY_FONTS}; do
 				pushd ${font}/TTF > /dev/null || die
-					mv *.ttf "${FONT_S}" || die
+
+				mv *.ttf "${FONT_S}" || die
+
 				popd > /dev/null || die
 			done
 		fi
@@ -158,27 +178,31 @@ src_install() {
 	rm -rf "${FONT_S}" || die
 	find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' |
 		while read font; do
-			ewarn "QA: missed font file: ${font}"
+			eqawarn "Missed font file: ${font}"
 		done
 
 	pushd ${PN}$(usex fontforge -src '')-${PV} > /dev/null || die
-		dodoc CHANGES
+	dodoc CHANGES
 	popd > /dev/null || die
 
 	if use ancient; then
 		pushd "${WORKDIR}/${MY_A_P}$(usex fontforge '' .TTF)/" > /dev/null || die
-		newdoc CHANGES{,.ancient} || die
-		newdoc README{,.ancient} || die
+
+		newdoc CHANGES{,.ancient}
+		newdoc README{,.ancient}
+
 		popd > /dev/null || die
 	fi
 
 	if use taamey; then
 		for font in ${TAAMEY_FONTS}; do
 			pushd ${font} > /dev/null || die
-				docinto ${font}
-				[[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; }
-				newdoc README{,.${font}} || die
-				dodoc -r Samples
+
+			docinto ${font}
+			[[ -f ChangeLog ]] && newdoc ChangeLog{,.${font}}
+			newdoc README{,.${font}}
+			dodoc -r Samples
+
 			popd > /dev/null || die
 		done
 	fi