Bump revision to update dorian fonts. Drop old.

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

5 files changed, 30 insertions, 106 deletions

diff --git a/media-fonts/culmus/ChangeLog b/media-fonts/culmus/ChangeLog
index fc716c5383ae..1591646f0bc3 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.67 2011/08/07 17:40:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/ChangeLog,v 1.68 2011/09/03 11:37:16 pva Exp $
+
+*culmus-0.120-r2 (03 Sep 2011)
+
+  03 Sep 2011; Peter Volkov <pva@gentoo.org> -culmus-0.105-r1.ebuild,
+  -culmus-0.105-r2.ebuild, -culmus-0.110.ebuild, +culmus-0.120-r2.ebuild:
+  Bump revision to update dorian fonts. Drop old.
 
   07 Aug 2011; Raúl Porcel <armin76@gentoo.org> culmus-0.120-r1.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #376347
diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index b72a10972b25..eed936b8db98 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
@@ -12,14 +9,11 @@ DIST TaameyFrankCLM.zip 742392 RMD160 3487bb5746a104f5450534114dcc412878624b31 S
 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-0.120.tar.gz 1190095 RMD160 8d8ced3a98d97683cfd2a5f94555bc7e91b5c86b SHA1 6be4ec69c544ca46d686d9357ef274366fe9fbcf SHA256 8140047dfdaae9b548953fb13016055a13571cb09b940ba155932b20319d62d8
-DIST culmus-src-0.110.tar.gz 906304 RMD160 8b6f064ece737d08ed84fe7de6677d3a1d134dcc SHA1 57548e79b1b9656d0115cf3ccdd1faa3089b619b SHA256 63a4591ec18020740ae21751886a24f8315f0957384ae5650a4a678d24ee66f6
 DIST culmus-src-0.120.tar.gz 1180742 RMD160 0fed6302625dcd31dd2530613158494e1c3bf11d SHA1 73cdfbc45de402ff2a01179785bb610c089a1140 SHA256 970efe9809edb0926db903caec085da2936f16040ac189d048160352eac4e6ed
 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
+DIST dorian.tar.gz 141215 RMD160 cf6bc4b2552562bcb55aa187804ba48939479220 SHA1 91f760a8a53fb3ee850b195204e29f6569229847 SHA256 8c4f5450181de7f25812255f27bd8c8f11ffb9aa15bf31f7cb4aa53fc22e08bd
 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
@@ -27,17 +21,8 @@ DIST journal.tar.gz 27112 RMD160 3e081f29ec372ba53b19c43eea83dd009243f641 SHA1 f
 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.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.110.ebuild 4051 RMD160 9da849bdd34c4a0dd2623345cd44271020b9c9a5 SHA1 92323659a1368c162aa3edcbd670aa1fe30ba452 SHA256 bca8a31b7ff046d79ed16cb3deda1eeab3559f9f5426341063da2bec88c03794
 EBUILD culmus-0.120-r1.ebuild 4541 RMD160 e451664e6a914f319bef3d7ad8b3294a1b6c9c74 SHA1 09a9d51e59677cb47ef6332feb91d53e2804202a SHA256 b60554d28b9f35b16af4fd5cb738a4ce473c1142cbcfac65cf91dd476da3555c
+EBUILD culmus-0.120-r2.ebuild 4547 RMD160 0a0b63c7e81cb503670fa428b14d809347a8c04d SHA1 461813c9d9088daca1f6db8a9cb7c4e96bda6e12 SHA256 8ac7688cb2fc2f8b05cf9f6c7be4fda50d2079d59623aefe890af9952d3d68c3
 EBUILD culmus-0.120.ebuild 4079 RMD160 5b594f4b5edcc97c6db0a8dd555ad8ba526cde95 SHA1 84a7678bbf077038fab6cc4bb3b2fe058c5d0448 SHA256 6236ccb7ea24e3d87b690ef9cdb9fa88fc553c3b5ff81214f4f4e8389127c587
-MISC ChangeLog 9914 RMD160 ca2bbc65adefbd1096528067462c8d8ab4247091 SHA1 5c112f3c68fb8b470fe6bcd5f9cb114ca9cfe8c9 SHA256 edb2733b574383ac022b2b3cff8363e317e05ed9f48326ebad77667eb52bb9b8
+MISC ChangeLog 10137 RMD160 2d3ae4670aeacfe3992c80383f7858987c9f1d84 SHA1 70c487974c0f831400895ea986a49e94dfc3b53e SHA256 2c970c381294dccc34f8b9a57a916efda1e96dc366e1ff1f23d6da367ab9484d
 MISC metadata.xml 417 RMD160 f775aaf3c761480949472018f1d4e4bc67e58eaa SHA1 a0c54423e97c3285b3043ae6d04722bb00e69255 SHA256 6238ee7d80afd10e4bddd082df02f12dfcd93d7b1ce80c7e3dd48103658e8e03
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk4+zh4ACgkQuQc30/atMkCrKACeI74f7YUf/zqF3vsnJ2oQOUmB
-AicAoK0YoB5vFohe1dfRE9pOd+B0X7Q4
-=Jkoe
------END PGP SIGNATURE-----
diff --git a/media-fonts/culmus/culmus-0.105-r1.ebuild b/media-fonts/culmus/culmus-0.105-r1.ebuild
deleted file mode 100644
index aa588f281afd..000000000000
--- a/media-fonts/culmus/culmus-0.105-r1.ebuild
+++ /dev/null
@@ -1,41 +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-r1.ebuild,v 1.1 2010/09/03 06:26:58 pva 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/journal.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
-#	http://culmus.sourceforge.net/fancy/journal-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.105-r2.ebuild b/media-fonts/culmus/culmus-0.105-r2.ebuild
deleted file mode 100644
index 307e98eeca29..000000000000
--- a/media-fonts/culmus/culmus-0.105-r2.ebuild
+++ /dev/null
@@ -1,42 +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-r2.ebuild,v 1.1 2010/09/10 06:57:32 pva 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/ShmuelCLM.zip
-	http://culmus.sourceforge.net/fancy/journal.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
-#	http://culmus.sourceforge.net/fancy/journal-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.110.ebuild b/media-fonts/culmus/culmus-0.120-r2.ebuild
index aa87defc85d3..65b1e1db1b3c 100644
--- a/media-fonts/culmus/culmus-0.110.ebuild
+++ b/media-fonts/culmus/culmus-0.120-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.110.ebuild,v 1.1 2010/10/19 12:30:22 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.120-r2.ebuild,v 1.1 2011/09/03 11:37:16 pva Exp $
 
 EAPI="2"
 
@@ -9,6 +9,10 @@ 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/"
@@ -18,6 +22,7 @@ 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 ) )"
@@ -37,8 +42,9 @@ IUSE="ancient fancy fontforge taamey"
 
 FONT_CONF=( "${FILESDIR}/65-culmus.conf" )
 
-DEPEND="!media-fonts/culmus-ancient"
-RDEPEND="${DEPEND}"
+RDEPEND="!media-fonts/culmus-ancient"
+DEPEND="${RDEPEND}
+	fontforge? ( media-gfx/fontforge )"
 
 S=${WORKDIR}
 # Put all fonts, generated or not here
@@ -46,6 +52,7 @@ 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
@@ -73,6 +80,11 @@ src_compile() {
 		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
@@ -103,6 +115,10 @@ src_compile() {
 		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}"