Install type1 fonts required for culmus-latex, bug #350657 thank Thomas Kahle for report. Drop old.

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

4 files changed, 181 insertions, 52 deletions

diff --git a/media-fonts/culmus/ChangeLog b/media-fonts/culmus/ChangeLog
index bb08f6bb8439..1e2ad2efda30 100644
--- a/media-fonts/culmus/ChangeLog
+++ b/media-fonts/culmus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-fonts/culmus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/ChangeLog,v 1.61 2011/04/17 15:26:24 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/ChangeLog,v 1.62 2011/04/19 16:01:26 pva Exp $
+
+*culmus-0.120-r1 (19 Apr 2011)
+
+  19 Apr 2011; Peter Volkov <pva@gentoo.org> -culmus-0.105.ebuild,
+  +culmus-0.120-r1.ebuild:
+  Install type1 fonts required for culmus-latex, bug #350657 thank Thomas Kahle
+  for report. Drop old.
 
   17 Apr 2011; Christian Faulhammer <fauli@gentoo.org> culmus-0.120.ebuild:
   x86 stable per bug 349268
diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index 5e77bdd04bfa..91eab1fdbec3 100644
--- a/media-fonts/culmus/Manifest
+++ b/media-fonts/culmus/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST AncientSemiticFonts-0.06-1.TTF.tgz 337085 RMD160 8f53fbf871206fea8c92487b333eb85b9b871c0b SHA1 2c1ce3e3fbb40a42259b9780bdd059beaba15f48 SHA256 90c58958ca6c536b81cafd12feb7466a5fa8118a0bf388a7c520b4534c44f8eb
 DIST AncientSemiticFonts-0.06-1.tgz 1094932 RMD160 977b7a6e0a1b916382f2d01306529c1286fae581 SHA1 c582e7bdf23ad60d3d1903b55f6f087da4dbdcaf SHA256 78a5476ead3271a73379270e83f265b8433eb0c5e53b53dff90c0beff7bd8dc7
 DIST KeterAramTsova.zip 2418489 RMD160 b3a521798e878e907e99fc49e5648327e01e8d38 SHA1 5879fbb4c9b9c366b4e8ef33a9584566adc73dab SHA256 cf921087282638578f2659184e4aaa4a2c5723b64174a1c1311ecad725346103
@@ -29,15 +26,8 @@ DIST ozrad.tar.gz 16709 RMD160 d63712fe2d32577f51a79a6a1f48914a72262de3 SHA1 201
 EBUILD culmus-0.104-r1.ebuild 1341 RMD160 29bb0336e75a86e789ea60f47efa594ac4114689 SHA1 6524430e7d1bcb0eb0deea8b1066dae7a52328cf SHA256 d07cc50082f9dcc72dd28e2f2cff931b3eb2554229d05811ef28c1e23badfe96
 EBUILD culmus-0.105-r1.ebuild 1515 RMD160 3898f4127a1448b399cc97221d95d66a8ef1f76c SHA1 35f412263899f3038e99b46593931285ee43a57c SHA256 cf361fcb1c1252133554d295ae3df1dd988311bfad61e55f0bd4240be96c0786
 EBUILD culmus-0.105-r2.ebuild 1569 RMD160 f986df4c199f272f9e00217d306ddd01a705ac2d SHA1 22132b7de3fd36a84d350aeb549637f53f0614d8 SHA256 3b27289dee75287844973cf505d7308c6095e0a4d77e663704ab569a242bb957
-EBUILD culmus-0.105.ebuild 1408 RMD160 38dae89946fe01f534864dd867da9b24b5e729f3 SHA1 be8288b66565eb9a9113778215f0d0f425479cf8 SHA256 86d43a6f785e35ec8a41b0ee0c444e67325a2fb4ab7a3e56c91da0dcb8c24b3e
 EBUILD culmus-0.110.ebuild 4051 RMD160 9da849bdd34c4a0dd2623345cd44271020b9c9a5 SHA1 92323659a1368c162aa3edcbd670aa1fe30ba452 SHA256 bca8a31b7ff046d79ed16cb3deda1eeab3559f9f5426341063da2bec88c03794
+EBUILD culmus-0.120-r1.ebuild 4559 RMD160 1794699967a128a5ad0349fd869a3f1bc4607623 SHA1 cca6d494e9f044afb8f2305bfc96234f73deddbf SHA256 6a537b63c2a41e88d574cee50a371cb5d4e39cf7db093efcbbf2053fded469ac
 EBUILD culmus-0.120.ebuild 4079 RMD160 5b594f4b5edcc97c6db0a8dd555ad8ba526cde95 SHA1 84a7678bbf077038fab6cc4bb3b2fe058c5d0448 SHA256 6236ccb7ea24e3d87b690ef9cdb9fa88fc553c3b5ff81214f4f4e8389127c587
-MISC ChangeLog 9079 RMD160 a8dc8a67142eba2cc3ec8ac5eeeccdf73fa8acd1 SHA1 ff98ec39d5fc29444b135c5d574d2ad173467072 SHA256 6907c93de2ad43a88d735651ae3ec46f93208e899604a6306536433d7c2e7099
+MISC ChangeLog 9308 RMD160 74a13fb0ae2a23d7ff76d0c60065f8323cc5b608 SHA1 072902f4a5bb9df44c95877d6a6e5cdf29d5f7df SHA256 a861bb9ce5493cb4d220309151c3d5135fcfe3a2e033be5d681e4aaf5ef4c89e
 MISC metadata.xml 417 RMD160 f775aaf3c761480949472018f1d4e4bc67e58eaa SHA1 a0c54423e97c3285b3043ae6d04722bb00e69255 SHA256 6238ee7d80afd10e4bddd082df02f12dfcd93d7b1ce80c7e3dd48103658e8e03
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2rBqYACgkQNQqtfCuFnePaSACggne6WHYb+aEtwL+tT0Tyw9Jz
-mU8AnjQ3ARVu+sTLGp5OexyGJBbfv0DZ
-=Bw/9
------END PGP SIGNATURE-----
diff --git a/media-fonts/culmus/culmus-0.105.ebuild b/media-fonts/culmus/culmus-0.105.ebuild
deleted file mode 100644
index 2f218f9821aa..000000000000
--- a/media-fonts/culmus/culmus-0.105.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.105.ebuild,v 1.2 2010/08/30 16:49:21 spatz Exp $
-
-EAPI="2"
-
-inherit font
-
-DESCRIPTION="Hebrew Type1 fonts"
-HOMEPAGE="http://culmus.sourceforge.net/"
-SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
-	mirror://sourceforge/culmus/${PN}-type1-${PV}.tar.gz
-	http://culmus.sourceforge.net/fancy-yg/MakabiYG.zip
-	http://culmus.sourceforge.net/fancy/hillel.tar.gz
-	http://culmus.sourceforge.net/fancy/anka.tar.gz
-	http://culmus.sourceforge.net/fancy/comix.tar.gz
-	http://culmus.sourceforge.net/fancy/gan.tar.gz
-	http://culmus.sourceforge.net/fancy/ozrad.tar.gz
-	http://culmus.sourceforge.net/fancy/ktav-yad.tar.gz
-	http://culmus.sourceforge.net/fancy/dorian.tar.gz
-	http://culmus.sourceforge.net/fancy/gladia.tar.gz"
-# 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
-
-LICENSE="|| ( GPL-2 LICENSE-BITSTREAM )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-FONT_SUFFIX="afm pfa ttf"
-FONT_CONF=( "65-culmus.conf" )
-DOCS="CHANGES"
-
-src_prepare() {
-	mv "${WORKDIR}"/*.{afm,pfa,ttf} "${S}"
-	mv "${WORKDIR}"/${PN}-type1-${PV}/*.{afm,pfa} "${S}"
-	mv culmus.conf 65-culmus.conf
-}
diff --git a/media-fonts/culmus/culmus-0.120-r1.ebuild b/media-fonts/culmus/culmus-0.120-r1.ebuild
new file mode 100644
index 000000000000..1a4b7cf941e2
--- /dev/null
+++ b/media-fonts/culmus/culmus-0.120-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.120-r1.ebuild,v 1.1 2011/04/19 16:01:26 pva Exp $
+
+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"
+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=( "${FILESDIR}/65-culmus.conf" )
+
+RDEPEND="!media-fonts/culmus-ancient"
+DEPEND="${RDEPEND}
+	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_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 *.ttf "${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 *.ttf "${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 $(use fancy && echo afm 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
+}