Fix installation of Type1 versions of David and Miriam, bump to EAPI=2.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

3 files changed, 60 insertions, 2 deletions

diff --git a/media-fonts/culmus/ChangeLog b/media-fonts/culmus/ChangeLog
index 389474722b69..06d6ad8e5067 100644
--- a/media-fonts/culmus/ChangeLog
+++ b/media-fonts/culmus/ChangeLog
@@ -1,6 +1,11 @@
 # 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.41 2010/01/20 09:26:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/ChangeLog,v 1.42 2010/03/06 15:14:09 spatz Exp $
+
+*culmus-0.104-r1 (06 Mar 2010)
+
+  06 Mar 2010; Dror Levin <spatz@gentoo.org> +culmus-0.104-r1.ebuild:
+  Fix installation of Type1 versions of David and Miriam, bump to EAPI=2.
 
 *culmus-0.104 (20 Jan 2010)
 
diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index 9852e93009bf..b4d5e5aebce9 100644
--- a/media-fonts/culmus/Manifest
+++ b/media-fonts/culmus/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST anka-otf.zip 15148 RMD160 f2a7d0b0d6c372634797e44ba3d6d94e772bdec6 SHA1 d7d2702a93669e287255ce2eded506c5845c0c2e SHA256 20ae14b84102623e246869be327be6a0fc238b3d07d23e4042fa865693f1e916
 DIST anka.tar.gz 21210 RMD160 99c8d971f39fdc6ba82d74f3bbc2952702261423 SHA1 3ba33c83d666f558d06050c7f6f94cd92367fd4b SHA256 1e62cf0f3782c59742bab2ee7a04c515caf61d9096b911522794b622c180f1d8
 DIST comix.tar.gz 100296 RMD160 a6f436a2fac0402c0dfa03f45de224315b8e1da4 SHA1 1ed4f31348d8b9ca99d4440c879f40c10e7c81b1 SHA256 567a0672c74dd4a772b055affe271bc1a41654f2b4f533aae905cc13d571d58d
@@ -13,6 +16,18 @@ DIST ktav-yad.tar.gz 89373 RMD160 8c8cdb05210b5350785d5a6a333c1ea62b899a6d SHA1
 DIST ozrad.tar.gz 16709 RMD160 d63712fe2d32577f51a79a6a1f48914a72262de3 SHA1 20138f4f39c8fcaca6bac39c1e867a02b120404d SHA256 088809471bb16f2ea8322b1d4ffcc68336cf70c2db80f9dc4436a7c221ead858
 EBUILD culmus-0.103-r1.ebuild 1299 RMD160 e0f921a6ae40cd3d685c9a50f41e0e8f5fd81f30 SHA1 ab1933d38d96f2084b4e1633a585571b276af51a SHA256 18d5d6f2869e8e736a2fb0a9304387e4bb3b32678e3c68e8a016b3c15da8e497
 EBUILD culmus-0.103.ebuild 1123 RMD160 1f2692f5cd545c892b8929d2f4f7b16d50ce7946 SHA1 ab8a28354739214c64fdba5f21a1baf0544336bb SHA256 df1d0904816ce0ff4278e2c5518ff70da8c9c86957aebd9fc614d779034a0cd4
+EBUILD culmus-0.104-r1.ebuild 1346 RMD160 ea5e03d98a48c0270298deed0c17d50662fb257b SHA1 4d717cdd189acb5e036257bc80f760d93f7afb7c SHA256 4c1464aba8edb423c15af6abf9cbe91d4fbeac0e5c53f382aa7e4643eb97ed2b
 EBUILD culmus-0.104.ebuild 1296 RMD160 ee8597b31eea4852f33b7d1d9773236fe7b71a92 SHA1 0c50c5e0a254b1dba9a9c81307e5e70c21dcec06 SHA256 c2b8f1cd0cbc58c5ddfd0dd273f40740ed5860e6b726e4618158fe97bddb0407
-MISC ChangeLog 6513 RMD160 22d2bb3db1b31c5b6c718b6bb4a841817cf873cf SHA1 0b43270e7015f09769f7e2f0c71660370b1c4b65 SHA256 041b2d50b525b318c2b50c5c63e0718121a5b874d16be1591248f3f419a2cec1
+MISC ChangeLog 6692 RMD160 998ac19e8c443a92edd41e168885c71e5377d7c3 SHA1 424d8a43929eb6c4eda3c1505be80497af8fa762 SHA256 c5dbddce8eac7e8507d2785a47ee332443dc1154f6b64f04c353312ca41516af
 MISC metadata.xml 184 RMD160 ab44fde1e4345b1982874b56974e57ac6b75a63c SHA1 1d3f1606e33657adb22d32506651bf8585604119 SHA256 b86fc6266c280e148a5a629217471a7ee69f7fe51c3cca9acbae23d7ec2bf53a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQEcBAEBCgAGBQJLknFKAAoJEAWF714uGAc6akcIAI++F1YudcYQ3cm4qDVPJzpf
+t7Om0obLWBlN40r+UJf+yA4MyArsDmmgPazXFXHHbwWJ0uHsAPx1p5w2pPqP5ndj
+/26UNmqfiz8SNqsxMlHNLaAByFpgg7hoefcPJaBjb0w0ekdZlW1rek0/IwfU1K0l
++UauGrRBg7OUfM5AzoU3qH6L6MqFvLooxugi7vPDLP/YUniPrFPpoPSztJe8NHs7
+gTD2LBwo/l9tkCuw/i/O4UhNZ3DLBh0bAPM5PG7JthDtCcOEMgc9VrcNTzY8hHpQ
+NISSKBgHZfHzUEOyHb8nRcF9WYJyO+joHayaTFJFFf7h/+GCzEG1TYrNDPaE1Hs=
+=h9fA
+-----END PGP SIGNATURE-----
diff --git a/media-fonts/culmus/culmus-0.104-r1.ebuild b/media-fonts/culmus/culmus-0.104-r1.ebuild
new file mode 100644
index 000000000000..244915a5c916
--- /dev/null
+++ b/media-fonts/culmus/culmus-0.104-r1.ebuild
@@ -0,0 +1,38 @@
+# 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.104-r1.ebuild,v 1.1 2010/03/06 15:14:09 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/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} ${S}
+	mv ${WORKDIR}/${PN}-type1-${PV}/*.{afm,pfa} ${S}
+	mv culmus.conf 65-culmus.conf
+}