Version bump. Add fancy USE flag to install fancy fonts, merge in culmus-ancient fonts and add taamey fonts. Add fontforge USE flag to rebuild ttf fonts.

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

4 files changed, 181 insertions, 3 deletions

diff --git a/media-fonts/culmus/ChangeLog b/media-fonts/culmus/ChangeLog
index 3ba3ab96e420..05bd478448c0 100644
--- a/media-fonts/culmus/ChangeLog
+++ b/media-fonts/culmus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-fonts/culmus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/ChangeLog,v 1.52 2010/09/10 06:57:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/ChangeLog,v 1.53 2010/10/19 12:30:22 pva Exp $
+
+*culmus-0.110 (19 Oct 2010)
+
+  19 Oct 2010; Peter Volkov <pva@gentoo.org> +culmus-0.110.ebuild,
+  metadata.xml:
+  Version bump. Add fancy USE flag to install fancy fonts, merge in
+  culmus-ancient fonts and add taamey fonts. Add fontforge USE flag to
+  rebuild ttf fonts.
 
 *culmus-0.105-r2 (10 Sep 2010)
 
diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index cf8623ef4040..5437e5048985 100644
--- a/media-fonts/culmus/Manifest
+++ b/media-fonts/culmus/Manifest
@@ -1,9 +1,17 @@
+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
+DIST KeterYG.zip 499641 RMD160 8adc116ae354835c8c306e661fa8452042a2174b SHA1 d2b590a102af88facf4cd9aa58d09e7e5e1288ae SHA256 e8f1ad3c505af9b892a289fe9b0dc96f829ecb9ddf167e3d35c9c50c78c5eac6
 DIST MakabiYG.zip 35526 RMD160 c770e42a57398b44ecb4985ed8d1cb8b48316b38 SHA1 b1f7d3f25bae6ec97ca007f9192b346c1732af8f SHA256 c50e2f345abc0beaff263ac461f6df2f95ae270578fe22ac833d35b74971829c
 DIST ShmuelCLM.zip 19123 RMD160 0dae6b596a00d89f553dcc7a4e70391e5c6fb6e2 SHA1 6b718dfb705591a9a27d2d5b6b9578bdeb65887e SHA256 c7f01d66d4985f043c23f6dde7341ad607bccb32393ca637495ab0c1e832c506
+DIST TaameyDavidCLM.zip 572761 RMD160 8f8af3e92b3481b313561581d7a9cc40c55b86d6 SHA1 133eefc6ad82ac87c39f03e05b70835e20ecb78a SHA256 9cf88bb590d8aa46290f10eeaf3840ddbc6c470e8d51bab4b615c3ad64d4fa80
+DIST TaameyFrankCLM.zip 742392 RMD160 3487bb5746a104f5450534114dcc412878624b31 SHA1 82d6d68eb4eb5d9e2e02e41806df1afc5927db74 SHA256 20e1dd3d32d558436339bf586d7df04e82b273ca7d0c48b798224cbdb0c29374
 DIST anka.tar.gz 21210 RMD160 99c8d971f39fdc6ba82d74f3bbc2952702261423 SHA1 3ba33c83d666f558d06050c7f6f94cd92367fd4b SHA256 1e62cf0f3782c59742bab2ee7a04c515caf61d9096b911522794b622c180f1d8
 DIST comix.tar.gz 100296 RMD160 a6f436a2fac0402c0dfa03f45de224315b8e1da4 SHA1 1ed4f31348d8b9ca99d4440c879f40c10e7c81b1 SHA256 567a0672c74dd4a772b055affe271bc1a41654f2b4f533aae905cc13d571d58d
 DIST culmus-0.104.tar.gz 988587 RMD160 9b6bc0b5fc23f7b88fb9e6dbe41b37dc5be84e32 SHA1 a2f6291c227be29134328fd067f15d3c2db46d26 SHA256 f9ca2b4e3432e581877ec49d33e842a36211763cec0b1c53f5e6bc4248645d84
 DIST culmus-0.105.tar.gz 855530 RMD160 4cdd96442dfbf4fcf8349f92c05fae022527d5fa SHA1 139a9a44dea20c3238627069b966e3295c8638e7 SHA256 693e0ef9f0eaf8ba6be1c4999a770d11cbd73fd5e5c1b3d95f4cbb86dc6dd1fa
+DIST culmus-0.110.tar.gz 1045126 RMD160 9794cbdccd8860f71630be6525f1f1f5f2823784 SHA1 72a89ab85fc0d9c88b5395cfb7f5da4f20522704 SHA256 7a4e60e3c66157b23dd7fad978e983575b77857a5d5c4ac8de543d380711641b
+DIST culmus-src-0.110.tar.gz 906304 RMD160 8b6f064ece737d08ed84fe7de6677d3a1d134dcc SHA1 57548e79b1b9656d0115cf3ccdd1faa3089b619b SHA256 63a4591ec18020740ae21751886a24f8315f0957384ae5650a4a678d24ee66f6
 DIST culmus-type1-0.104.tar.gz 231154 RMD160 8c61c5c1251125740c63752ba1d0236accc2ba98 SHA1 b363bad5f7fdc6da1598f90c4a2d309b26296a72 SHA256 4f2483075ce8dc6d8c59ca734b1efc9534ef03f3e4d8ffd489e53de2f03cde93
 DIST culmus-type1-0.105.tar.gz 465679 RMD160 4666f5369141efafdec62778e30b1db71c37dd4f SHA1 05e28b0c7badd6027de151c31cd0a1b5741fa48b SHA256 9365c01aeda7de344fe158366f8622dea9061d9d86b420781bea07aa4a975bf0
 DIST dorian.tar.gz 19919 RMD160 d22c1b69a92c2ba5ee9f676715c2db221c37f7ef SHA1 068e2a7a2225564cc4c0c61e8afcbe616831b43a SHA256 ba4131cb164f0376e0269825042c5f64b9dfcf6905426938ab4d197831454633
@@ -17,5 +25,6 @@ EBUILD culmus-0.104-r1.ebuild 1341 RMD160 29bb0336e75a86e789ea60f47efa594ac41146
 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
-MISC ChangeLog 7901 RMD160 ad6572e8dc650200ba14b6f11b6afa3732f7b870 SHA1 de05bcfd4a24b5d42dfe782af878d29a2bf66149 SHA256 7ad408329b8ebb8335a1dcd55d27d2815491def52dccc4d5b964b56c09c51050
-MISC metadata.xml 158 RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca SHA1 8e4ca6d183e52cdbea8cfba08b7a7910e648fc84 SHA256 9a8722fb0b5a1992b3942e85f23df4e08f10cabc2d783ca887479abe115b3ea8
+EBUILD culmus-0.110.ebuild 4051 RMD160 9da849bdd34c4a0dd2623345cd44271020b9c9a5 SHA1 92323659a1368c162aa3edcbd670aa1fe30ba452 SHA256 bca8a31b7ff046d79ed16cb3deda1eeab3559f9f5426341063da2bec88c03794
+MISC ChangeLog 8174 RMD160 09de3af296e743f8ccce6e07313f7b4e7af3267c SHA1 657e9e27104b081eb84bc296a9d6c2ab57e6cfe9 SHA256 dd2ba4a4ad501137b5fa98ebeb29636e507ebd2d1ac83a06ee466abbf264613f
+MISC metadata.xml 417 RMD160 f775aaf3c761480949472018f1d4e4bc67e58eaa SHA1 a0c54423e97c3285b3043ae6d04722bb00e69255 SHA256 6238ee7d80afd10e4bddd082df02f12dfcd93d7b1ce80c7e3dd48103658e8e03
diff --git a/media-fonts/culmus/culmus-0.110.ebuild b/media-fonts/culmus/culmus-0.110.ebuild
new file mode 100644
index 000000000000..aa87defc85d3
--- /dev/null
+++ b/media-fonts/culmus/culmus-0.110.ebuild
@@ -0,0 +1,155 @@
+# 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.110.ebuild,v 1.1 2010/10/19 12:30:22 pva Exp $
+
+EAPI="2"
+
+inherit font
+
+# Maintainer: also check culmus.conf file in ${P}.tar.gz
+
+MY_A_P=AncientSemiticFonts-0.06-1
+
+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
+	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" )
+
+DEPEND="!media-fonts/culmus-ancient"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+# Put all fonts, generated or not here
+FONT_S=${S}/FONTS
+
+src_unpack() {
+	unpack ${P}.tar.gz # For type1 fonts...
+	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}-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
+
+		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
+}
diff --git a/media-fonts/culmus/metadata.xml b/media-fonts/culmus/metadata.xml
index 696065edd338..04682e81d6ef 100644
--- a/media-fonts/culmus/metadata.xml
+++ b/media-fonts/culmus/metadata.xml
@@ -2,4 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>fonts</herd>
+<use>
+<flag name='ancient'>Install ancient semitic scripts</flag>
+<flag name='fancy'>Install fancy fonts</flag>
+<flag name='fontforge'>Use <pkg>media-gfx/fontforge</pkg> to build fonts from source</flag>
+<flag name='taamey'>Install taamey fonts</flag>
+</use>
 </pkgmetadata>