gentoo resync : 27.03.2021

4 files changed, 264 insertions, 250 deletions

diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index 59c45b5dd592..bcf1de3dce03 100644
--- a/media-fonts/culmus/Manifest
+++ b/media-fonts/culmus/Manifest
@@ -1,3 +1,4 @@
+AUX culmus-0.133-fontconfig-test.patch 7473 BLAKE2B 77e02be89533d98d69e8ceea04c240117cbee379baa4bc71c583934b1fc64cdc154c74ee15c27e1cdeba786de113e5e9f8c8c2a8650fa8cec0c394280d18e6b5 SHA512 eb9c1dcce7870797eb6724e4a27c3a6047d3bf1353844a4894a191a4ec8a33fcc1c01ee6ffd8c1e8667eeb0b090dec74d6189d79f7cba5dfc188437d7df592bb
 DIST AncientSemiticFonts-0.06-1.TTF.tgz 337085 BLAKE2B bf55807160e011bdf378364f0bd258bfcbe3fe8fb2ca0c611ef97fe7ebe63dfc408ec9cb49ca0523374a4e84e17a4e7d5b3de314495764b7167e75b85fb3fdb8 SHA512 554b330ad80b778ea1b590d74417a7ba7d5f534c06281fe25735f6b6af65d7dd33df667c1cca1b16ab8a25ade0076c710532e8340f3947f78f28c8e0122b335a
 DIST AncientSemiticFonts-0.06-1.tgz 1094932 BLAKE2B c4a3b5c1cc1ba8d1cb37ca01822025c3e060d1c31006855987593b2cd98f8f54a90a5212479cb6149f1e8dbd44211c8cff1e3be677ef1a6536825598bfee4831 SHA512 c77cca2de26efa4aacfc57c53710ed5bd099f22f41fe7f972285ae56957aeb38aa2b23a990c9c375c46c0b88e6af01b204676fd52165969c539f1e8b1f11a1e2
 DIST KeterAramTsova.zip 2418489 BLAKE2B 6906b4965cb1c9bc5aadba6a7c33b53c13bb8a8c495f652180de33fff4cba2e9b8e21e09e2fd54f9f7146e695db9039801d3f7789f31471be560f98f0a4eeec6 SHA512 9aa1440309a62068d780e674f2173d8eb427bead090bdc36b189315a9c982b0fd40553cba5551b907d752328c87229f0935d75745eff7049e5a7d07e5948893b
@@ -8,9 +9,7 @@ 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
@@ -21,6 +20,5 @@ 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.120-r5.ebuild 4632 BLAKE2B 11b67941cf7b0c7fc7bf06fefd1f40cc312f1fbfd42343968fc391123ea94b9e140cd07084af03e5301a6e48e4f75e8e4e124e5901cd2ed593801def59d8ffb9 SHA512 57d1568fd50188a190c31d6cf226a71d60d871611c7b9f0d2e8761fa0a36fb9ac5dcaa478aec599ed4216267acdfae7671039188dca346874b719b670d90aca5
-EBUILD culmus-0.133.ebuild 4639 BLAKE2B 6df802e7d531ed9f6a036439fa9ff96d61c98d564e496481489687a4e41029bed354a8f242b74a1e42c5a99702622ada5159c9090bf78f1a89243be5c101bcf3 SHA512 cb21d9308c4f1ed715f03ddfe096e54eec50ffc14586302802a7736ab18e92adb4537e962fbfa37aa1c483ce190cc514fe61985c377f743e9c2687eeb5a7df63
+EBUILD culmus-0.133-r1.ebuild 5146 BLAKE2B bb35d8dfe74cca46b55ab61d11371fe272869e6a2be3e231acc9515046822566270c24c747607c581c611f6392276e44224980121725730cb7dc3b92a8469531 SHA512 394a02e9a91af769aa90ff5734d738bc5661b32b69850c2198d09dff6f50903ce958bd2f6812fea037a7b53a6f500b91decf88d82965cbcf1ea33e1a29649ae8
 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.133-r1.ebuild
index 95a55a83564e..1d3fec0e13b8 100644
--- a/media-fonts/culmus/culmus-0.120-r5.ebuild
+++ b/media-fonts/culmus/culmus-0.133-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit font
 
@@ -39,109 +39,114 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="ancient fancy fontforge taamey"
 
-FONT_CONF=( "${T}/65-culmus.conf" )
+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}
+BDEPEND="
 	app-arch/unzip
 	>=x11-apps/mkfontscale-1.0.9-r1
-	fontforge? ( media-gfx/fontforge )"
+	fontforge? ( media-gfx/fontforge )
+"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 # Put all fonts, generated or not here
-FONT_S=${S}/FONTS
+FONT_S="${S}/FONTS"
+
+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 ancient && unpack ${MY_A_P}$(use fontforge || echo .TTF).tgz
+	use ancient && unpack ${MY_A_P}$(usex fontforge '' .TTF).tgz
 
 	if use fancy; then
 		unpack $(printf "%s.tar.gz " ${FANCY_FONTS})
 		unpack $(printf "%s.zip " ${FANCY_YG_FONTS})
-		mv TTF/* .
+		mv TTF/* . || die
 	fi
 
 	if use taamey; then
 		for font in ${TAAMEY_FONTS}; do
-			mkdir ${font}
-			pushd ${font}
-			unpack ${font}.zip
-			popd >/dev/null
+			mkdir ${font} || die
+			pushd ${font} > /dev/null || die
+				unpack ${font}.zip
+			popd > /dev/null || die
 		done
 	fi
 }
 
 src_prepare() {
 	default
-	cp "${P}/culmus.conf" "${T}/65-culmus.conf" || die
+	cp "${P}"/culmus.conf "${T}"/65-culmus.conf || die
 }
 
 src_compile() {
-	mkdir -p "${FONT_S}"
+	mkdir -p "${FONT_S}" || die
 	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
+		pushd ${P} > /dev/null || 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
+		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
+		popd > /dev/null || die
 
 		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
+			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
+			popd > /dev/null || die
 		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
+				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
+				popd > /dev/null || die
 			done
 		fi
 	else
-		pushd ${P}
-		mv *.afm *.pfa *.ttf "${FONT_S}"
-		popd >/dev/null
+		pushd ${P} > /dev/null || die
+			mv *.afm *.pfa *.ttf "${FONT_S}" || die
+		popd >/dev/null || die
 
-		pushd ${PN}-type1-${TYPE1_PV}
-		mv *.afm *.pfa "${FONT_S}"
-		popd >/dev/null
+		pushd ${PN}-type1-${TYPE1_PV} > /dev/null || die
+			mv *.afm *.pfa "${FONT_S}" || die
+		popd > /dev/null || die
 
 		if use ancient; then
-			pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts
-			mv *.ttf "${FONT_S}"
-			popd >/dev/null
+			pushd ${MY_A_P}$(usex fontforge '' .TTF)/fonts > /dev/null || die
+				mv *.ttf "${FONT_S}" || die
+			popd > /dev/null || die
 		fi
 
 		if use taamey; then
 			for font in ${TAAMEY_FONTS}; do
-				pushd ${font}/TTF
-				mv *.ttf "${FONT_S}"
-				popd >/dev/null
+				pushd ${font}/TTF > /dev/null || die
+					mv *.ttf "${FONT_S}" || die
+				popd > /dev/null || die
 			done
 		fi
 	fi
 
-	use fancy && mv *.afm *.pfa *.ttf "${FONT_S}"
+	if use fancy; then
+		mv *.afm *.pfa *.ttf "${FONT_S}" || die
+	fi
 }
 
 src_install() {
@@ -150,31 +155,31 @@ src_install() {
 	FONT_SUFFIX="pfa afm $((use fancy || use taamey) && echo ttf)" \
 		font_src_install
 
-	rm -rf "${FONT_S}"
+	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}"
 		done
 
-	pushd ${PN}$(use fontforge && echo -src)-${PV}
-	dodoc CHANGES
-	popd >/dev/null
+	pushd ${PN}$(usex fontforge -src '')-${PV} > /dev/null || die
+		dodoc CHANGES
+	popd > /dev/null || die
 
 	if use ancient; then
-		pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/"
+		pushd "${WORKDIR}/${MY_A_P}$(usex fontforge '' .TTF)/" > /dev/null || die
 		newdoc CHANGES{,.ancient} || die
 		newdoc README{,.ancient} || die
-		popd >/dev/null
+		popd > /dev/null || die
 	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
+			pushd ${font} > /dev/null || die
+				docinto ${font}
+				[[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; }
+				newdoc README{,.${font}} || die
+				dodoc -r Samples
+			popd > /dev/null || die
 		done
 	fi
 }
diff --git a/media-fonts/culmus/culmus-0.133.ebuild b/media-fonts/culmus/culmus-0.133.ebuild
deleted file mode 100644
index 9d57b2ead28a..000000000000
--- a/media-fonts/culmus/culmus-0.133.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 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 ~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
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=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
-	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/culmus/files/culmus-0.133-fontconfig-test.patch b/media-fonts/culmus/files/culmus-0.133-fontconfig-test.patch
new file mode 100644
index 000000000000..17d35e823477
--- /dev/null
+++ b/media-fonts/culmus/files/culmus-0.133-fontconfig-test.patch
@@ -0,0 +1,191 @@
+  Description: Fix incorrect syntax for disjunction in fontconfig .conf file.
+  Author: Benjamin Drung <bdrung@ubuntu.com>
+  Bug-Ubuntu: https://launchpad.net/bugs/1034928
+
+--- a/culmus-0.133/culmus.conf
++++ b/culmus-0.133/culmus.conf
+@@ -8,6 +8,16 @@
+ 	<match target="pattern" >
+ 		<test name="family" >
+ 			<string>Guttman Adii</string>
++		</test>
++		<edit mode="append" binding="same" name="family" >
++			<string>David CLM</string>
++		</edit>
++		<edit mode="assign" binding="same" name="slant" >
++			<const>italic</const>
++		</edit>
++	</match>
++	<match target="pattern" >
++		<test name="family" >
+ 			<string>Guttman Adii-Light</string>
+ 		</test>
+ 		<edit mode="append" binding="same" name="family" >
+@@ -30,6 +40,13 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Guttman Stam</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Stam Ashkenaz CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Stam1</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -40,6 +57,13 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Guttman Hodes</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Hadasim CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Monotype Hadassah</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -50,7 +74,21 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Aharoni</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Aharoni CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Aharoni</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Aharoni CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman-Aharoni</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -61,7 +99,21 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>FrankRuehl</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Frank Ruehl CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Frank</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Frank Ruehl CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Frnew</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -72,7 +124,21 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>David</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>David CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>David Transparent</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>David CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman David</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -83,8 +149,29 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Fixed Miriam Transparent</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam Mono CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Myamfix</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam Mono CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman-CourMir</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam Mono CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Miriam Fixed</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -95,8 +182,29 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Guttman Miryam</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Levenim MT</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Miriam</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Miriam Transparent</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -107,6 +215,13 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Guttman Drogolin</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Drugulin CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Vilna</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >