Add horev font. Depend on >=x11-apps/mkfontscale-1.0.9-r1 as Heavy weight is required for this font.

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

4 files changed, 193 insertions, 20 deletions

diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index e1cd31e0d100..bf1b5d3bbe43 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -2,23 +2,15 @@
 Hash: SHA1
 
 DIST cantarell-fonts-0.0.6.tar.bz2 494468 RMD160 c78a9bfdc827c0c62dd5b2dbd1cfaa0040df5806 SHA1 d99bc6123c1c91a68572587a6bd6ce5922889196 SHA256 bf2cce939aeea3244f6786cd6b09dd40e63d65fadd5f3e37f354baf68d4d91df
+DIST cantarell-fonts-0.0.7.tar.xz 363692 RMD160 dfdf10d505d061319687a12fe41821f91b14e1eb SHA1 7ed434ab096e26b143843826f32a552e40d851e4 SHA256 6a21f841d28de444deee201a25e5cbc129fde14d633c547a7d36941437f72090
 EBUILD cantarell-0.0.6.ebuild 783 RMD160 1d4b257ec67c713449c1e9da86adebe4eeadb8bf SHA1 2df564c29f2b1e7338beccf2e5b07cfc6292bf56 SHA256 3da23e67deeb0dd45451d6f45573c825d1b484f5eae45d3dab56ccc48331b4c4
-MISC ChangeLog 575 RMD160 2da884835f5fe8c38e909d22e69585442d9fa388 SHA1 fdba657f11dbc3875e00850a3d1d216328fda9f4 SHA256 d91c4630f9896a268ac3cd61ab6347074492154f994f49f90b44c80e986f6807
+EBUILD cantarell-0.0.7.ebuild 780 RMD160 713fd2f3b31afa72cab1b1a2220f4c3861d3b74b SHA1 ad27b3359b1d09fd05d30769ebf812f4ce7f5ed9 SHA256 82a00fb0644bf70de27214825cc6b10b3256c8b6d490b94457f836913a9e1497
+MISC ChangeLog 692 RMD160 214b55694c011f68dfbabda71b9f4946274e5c2b SHA1 91070c9039d2da77ccf2cb8eb5afed98dd1b7794 SHA256 91eabc1ef267f2abe159694ee4aab72e36264e3ade69417617a2bcc9e7506b1b
 MISC metadata.xml 160 RMD160 2b0d347221b384d4765ecdcccefbc74b0ae502ef SHA1 ae1b892a3e72888c5b66b520f15f740576f607ec SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOTJlDAAoJEO/kOhxWD91km1wQAIwybi4MBCtG7DZBv0Nmv0yC
-iqIj5vm9jsidtI1KflaDxj/mUlxkuHym3nKL7MDsUmtnhszdunCIzqLX35ZliAY6
-Yk3VvY3VQqDKZpu8pRusLCaOQYfqlEFd0/8Hn5iR2gt5uw1J7VxDw2KW5eIgWhNX
-zhHTd+aZCJ8w5VVTKmfV6KtNUAKxFYFc69gB0liXgQ0YekYUeOxOxFX0U6YYZu6F
-T+qQPi50cN5PSorz3hTfLE7REQGcOzuwcPxEXScUFfLxs61U6oLQSB7wRAiLwzUE
-8Yq+OYlH0YN6da+qiGq8WveGH1AYF0j77CHXPEWZ8g64mf9fBDKDJ5yGks8P5w7a
-rAF9QBpxSRXep0fij2oHgK2n2BgWD7c7zal54bsncIxmjGPNZhYXDoVqwU2KnZIM
-y088nGyMyPK2kudFUFCgMVlZqCTnna4yh7lTfl14C2yIBa/Wtyf0LxO2aehqg352
-MeTh5IjqmOrkvbmPfudbuKAO6yYHxfrjj39IFAdJxq7a8B/uZJBMWFG3vzWyRW/n
-sLEOdAGRyAVISYJhRml+CqAmQna0NPCnbYylh31/LBk44MJPmWlImW2LSAz3lv7O
-sLqAPNw/ICqQ5ITigof6t0VJHDcI8d6nXDj+hvlFnvGJIMgBZKWhaDgabZHzJ+Un
-kvT0/bl39Tg4Vk8yRajL
-=/jFo
+iEYEARECAAYFAk6dz9oACgkQCaWpQKGI+9QC7gCfSoDycWO3B1s8PPDuy5Zl/2hV
+DGcAnRVK81Qo3WMJ+6HNXesDGGEXbuAX
+=L+E6
 -----END PGP SIGNATURE-----
diff --git a/media-fonts/culmus/ChangeLog b/media-fonts/culmus/ChangeLog
index 74a818359c13..ed0d234bcd0f 100644
--- a/media-fonts/culmus/ChangeLog
+++ b/media-fonts/culmus/ChangeLog
@@ -1,6 +1,12 @@
 # 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.69 2011/10/11 17:05:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/ChangeLog,v 1.70 2011/10/18 19:12:48 pva Exp $
+
+*culmus-0.120-r3 (18 Oct 2011)
+
+  18 Oct 2011; Peter Volkov <pva@gentoo.org> +culmus-0.120-r3.ebuild:
+  Add horev font. Depend on >=x11-apps/mkfontscale-1.0.9-r1 as Heavy weight is
+  required for this font.
 
   11 Oct 2011; Jeroen Roovers <jer@gentoo.org> culmus-0.120-r1.ebuild:
   Stable for HPPA (bug #376347).
diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index 69c3d0b7fa91..984348289775 100644
--- a/media-fonts/culmus/Manifest
+++ b/media-fonts/culmus/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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
@@ -20,19 +20,21 @@ DIST dorian.tar.gz 141215 RMD160 cf6bc4b2552562bcb55aa187804ba48939479220 SHA1 9
 DIST gan.tar.gz 18076 RMD160 8897f105e90485851485262617508ea81db24966 SHA1 54e2473f68a9ddbece1d1a4f52115a1f95a5eb4e SHA256 a51f4f0a1782d1c33d251b2f59b47401351d0bdf4b5b5c634b850b5c5004b08d
 DIST gladia.tar.gz 25336 RMD160 ed91b9edaa98b3226ef2252bcce14595d6e276cf SHA1 dc20455dd4d2f4404011e82e27d078c7dda59c63 SHA256 6b972c34ec796880b4b2714401ef7f9ef0e733fee088e5974c9446d389d3e40d
 DIST hillel.tar.gz 23084 RMD160 5ff96ce2cb80dbabc80d0ce709fbf983a637aeee SHA1 c39aed3a11830ef9808abde6bb732e95c226a1d8 SHA256 30c9505bcb1688c5e370e6b2161876f61c1bd0c73befca55e803ef7860d99781
+DIST horev.tar.gz 19261 RMD160 e784c5e313e752e3714889b6aa0334d40a08ab02 SHA1 a628f0efbfc8d93757d9316dc567b848c7b2e8c4 SHA256 29d44c67dbbd95e91132e102f541d7c344f361d173f6cbb7528fe8457b680968
 DIST journal.tar.gz 27112 RMD160 3e081f29ec372ba53b19c43eea83dd009243f641 SHA1 feef0614cd0843243c36edae456e5960687592b7 SHA256 1986606dfb6915bdcf0950323ac94d8e89f9b3969e8a13717405d5ec897da8de
 DIST ktav-yad.tar.gz 89373 RMD160 8c8cdb05210b5350785d5a6a333c1ea62b899a6d SHA1 0f3e93c5921d38ee21c459e8cab2870ffa4a0c92 SHA256 ebdeeac393a03ab50eb606ef709ab8d697104bcf284d8e1c5fb5eeaf50fbc888
 DIST ozrad.tar.gz 16709 RMD160 d63712fe2d32577f51a79a6a1f48914a72262de3 SHA1 20138f4f39c8fcaca6bac39c1e867a02b120404d SHA256 088809471bb16f2ea8322b1d4ffcc68336cf70c2db80f9dc4436a7c221ead858
 EBUILD culmus-0.104-r1.ebuild 1341 RMD160 29bb0336e75a86e789ea60f47efa594ac4114689 SHA1 6524430e7d1bcb0eb0deea8b1066dae7a52328cf SHA256 d07cc50082f9dcc72dd28e2f2cff931b3eb2554229d05811ef28c1e23badfe96
 EBUILD culmus-0.120-r1.ebuild 4536 RMD160 9039d07295a06835701466ae4beb23da6581d367 SHA1 8e20d195b082511a45dbed5c19394d09ae0d08c2 SHA256 f0599e4e939f60002f673fd5bd07b996ad07ee31b29e91f10360d1a000ceea0c
 EBUILD culmus-0.120-r2.ebuild 4547 RMD160 0a0b63c7e81cb503670fa428b14d809347a8c04d SHA1 461813c9d9088daca1f6db8a9cb7c4e96bda6e12 SHA256 8ac7688cb2fc2f8b05cf9f6c7be4fda50d2079d59623aefe890af9952d3d68c3
+EBUILD culmus-0.120-r3.ebuild 4656 RMD160 ab25f35b7b448c3567a45af42a64d1b36b8a21f5 SHA1 6752a42669729ed84d43d2550aab0868ad970266 SHA256 801c6c6a88c852d4c30ae2338e7bca473250b0129916407f0fd48a679cd896b1
 EBUILD culmus-0.120.ebuild 4079 RMD160 5b594f4b5edcc97c6db0a8dd555ad8ba526cde95 SHA1 84a7678bbf077038fab6cc4bb3b2fe058c5d0448 SHA256 6236ccb7ea24e3d87b690ef9cdb9fa88fc553c3b5ff81214f4f4e8389127c587
-MISC ChangeLog 10242 RMD160 602c034c8c6e9937ef03b162f15c067270c3f0c3 SHA1 acb7003f298de9b207a48ebde5733c0a64608277 SHA256 8543d463edce9808a5bb9633c80a6ddc77956d81162643022cb760cdfcec1ace
+MISC ChangeLog 10450 RMD160 6f01ed0ad3cdbdbab6f801cb473dd437c3cb4bff SHA1 3eddfd6a413c837beabf579cbf79d92b23f4d4bc SHA256 003a1a9e339b39c48899e6b48feb318f32599a6991a17393d149c54c44f4508b
 MISC metadata.xml 417 RMD160 f775aaf3c761480949472018f1d4e4bc67e58eaa SHA1 a0c54423e97c3285b3043ae6d04722bb00e69255 SHA256 6238ee7d80afd10e4bddd082df02f12dfcd93d7b1ce80c7e3dd48103658e8e03
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6Ud1QACgkQVWmRsqeSphOmvwCfQArbH8hSRLpe5em4rkw7tiLa
-QcYAn2W/D9GYh7OVgDQOSH5dUa2W/0Ob
-=TcJl
+iF4EAREIAAYFAk6dz0YACgkQGrk+8vGYmwd57gEArxywDLk3tFgGZ5MzGE0oCMEm
+oVP0vQzfj/eAPY1PwZYA/2j5cBb+uM+VEYamuTpFL4vqxO0mJLDTQS6/uMQxZtuj
+=aosU
 -----END PGP SIGNATURE-----
diff --git a/media-fonts/culmus/culmus-0.120-r3.ebuild b/media-fonts/culmus/culmus-0.120-r3.ebuild
new file mode 100644
index 000000000000..5b81b2e622fa
--- /dev/null
+++ b/media-fonts/culmus/culmus-0.120-r3.ebuild
@@ -0,0 +1,173 @@
+# 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-r3.ebuild,v 1.1 2011/10/18 19:12:48 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 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=( "${FILESDIR}/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_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 $(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
+}