gentoo resync : 18.08.2019

3 files changed, 2 insertions, 179 deletions

diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index 22008730cb5f..c8921913b0d2 100644
--- a/media-fonts/culmus/Manifest
+++ b/media-fonts/culmus/Manifest
@@ -19,6 +19,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-r4.ebuild 4612 BLAKE2B e94029a3b7ad41261dc4925959f2a0b735857232d862880edd9fcf8b8fac7e6c3bd3e539bceb96ae29ac10e13d9b498cf1b29347a907c9580494f0bfe96d05ba SHA512 5f33a6f2d7c618a881d6156dbac171579cc89ea4346be8c9fd077c03ba19592b17e40e5f922f32061273c2ec6255d466fd44598eda4fe543534f5339a96f271d
-EBUILD culmus-0.120-r5.ebuild 4636 BLAKE2B 1fd9b9f3c77587064336c05a6c096c70e57a42369875a2a6d60511c865ea54e4324ee8b6e65d6067d75fca197259e6fdf06c94e492898385b1db4973b59f271d SHA512 c81e289a5775c768eb9b4a59dbac619fb2273d83de9e6c75d281226e8f4cd9927f734d072a48d037146e7de572585d559873422c3b3e50f50132e258e7af7200
+EBUILD culmus-0.120-r5.ebuild 4635 BLAKE2B 5999d8f0840d3f97940b0cb02d28f7b2795a536f3e1aa83fe218621576003fa8e151db8ae9bc8e95eb071c6be741b02cbe6dc6ee934acc15a401069e5b1d73ab SHA512 33f12c82bf9631f27cf9f8af9d9017d17c606ce326ae204b69892208e8223b5fe12383dfc0a1bfe51e988038358c1c5bcb2eed8a21a6a88e36418575c5a5a29d
 MISC metadata.xml 583 BLAKE2B 824a24c5f7812a73e49afa35f98ef8b31465dc797fae6048a057be7253d87d4d41da698550fc237fd2f1ce584e6d80d005361c98dd1964da9b9f6ddf222095ef SHA512 38b8e8dfc13787e2bfed9f0205e7a8ab7109634af52cf29acf8f1301eda8499725e8ee0df4dbc47474913901ea99446f16bcf82fced23a8961a70b60cc8beb01
diff --git a/media-fonts/culmus/culmus-0.120-r4.ebuild b/media-fonts/culmus/culmus-0.120-r4.ebuild
deleted file mode 100644
index 4388a4b0bda9..000000000000
--- a/media-fonts/culmus/culmus-0.120-r4.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-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() {
-	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() {
-	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/culmus/culmus-0.120-r5.ebuild b/media-fonts/culmus/culmus-0.120-r5.ebuild
index a1fae8a819ae..459dcc39ef6c 100644
--- a/media-fonts/culmus/culmus-0.120-r5.ebuild
+++ b/media-fonts/culmus/culmus-0.120-r5.ebuild
@@ -36,7 +36,7 @@ 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 ~sh sparc x86 ~x86-fbsd"
+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" )