Bump revision to update dorian fonts. Drop old.

(Portage version: 2.1.10.11/cvs/Linux x86_64)

4 files changed, 27 insertions, 88 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/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}"