Version bumped. Fixed giflib dependency; bug #85720.

(Portage version: 2.0.51.19)

8 files changed, 69 insertions, 94 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index d8b33a442347..ddf7fef42369 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/fontforge
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.10 2005/02/19 10:04:20 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.11 2005/03/18 15:22:23 usata Exp $
+
+*fontforge-20050310 (18 Mar 2005)
+
+  18 Mar 2005; Mamoru KOMACHI <usata@gentoo.org>
+  -files/fontforge-20040618.patch, fontforge-20040930.ebuild,
+  fontforge-20041231.ebuild, fontforge-20050209.ebuild,
+  +fontforge-20050310.ebuild:
+  Version bumped. Fixed giflib dependency; bug #85720.
 
 *fontforge-20050209 (19 Feb 2005)
 
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 30f8b8925c47..74f906cf1a06 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -5,5 +5,8 @@ MD5 b2121c6b8ce55349775383caf7065554 fontforge-20041231.ebuild 1188
 MD5 d55b25ec423e5a02ecc9b1c3e522e292 fontforge-20050209.ebuild 1309
 MD5 efc93312d0c5dfac72586f4ae523b635 files/digest-fontforge-20050209 73
 MD5 4e5ecf5678b060d7cee57dfe7b7cd268 files/fontforge-20040618.patch 2933
-MD5 d5a8ce92eaf3d0c4677ae12a632dae01 files/digest-fontforge-20040930 73
+MD5 c8f9ca2044c72ddc3df79207a84c52c7 files/digest-fontforge-20040618 73
+MD5 4e5ecf5678b060d7cee57dfe7b7cd268 files/fontforge-20040618.patch 2933
+MD5 c4492e19d9402ea7ecbbb421285d3cf0 files/digest-fontforge-20040824 73
+MD5 f8fa572061a50dba58afc848e19f773f files/digest-fontforge-20050310 73
 MD5 134c4b8ebaff766b1c675d67597995a1 files/digest-fontforge-20041231 73
diff --git a/media-gfx/fontforge/files/digest-fontforge-20050310 b/media-gfx/fontforge/files/digest-fontforge-20050310
new file mode 100644
index 000000000000..0778558d82f1
--- /dev/null
+++ b/media-gfx/fontforge/files/digest-fontforge-20050310
@@ -0,0 +1 @@
+MD5 55787a2c60fd84599d316e0311bcb3ae fontforge_full-20050310.tgz 4476929
diff --git a/media-gfx/fontforge/files/fontforge-20040618.patch b/media-gfx/fontforge/files/fontforge-20040618.patch
deleted file mode 100644
index e79ce79e1906..000000000000
--- a/media-gfx/fontforge/files/fontforge-20040618.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- fontforge/tottf.c.orig	Mon Jun  7 19:18:27 2004
-+++ fontforge/tottf.c	Wed Jun 16 13:37:06 2004
-@@ -3038,6 +3038,8 @@
-     int i,j,cnt1,cnt2,first,last,avg1,avg2,k;
-     SplineFont *sf = _sf;
-     char *pt;
-+    static int const weightFactors[26] = { 64, 14, 27, 35, 100, 20, 14, 42, 63,
-+	3, 6, 35, 20, 56, 56, 17, 4, 49, 56, 71, 31, 10, 18, 3, 18, 2 };
- 
-     os2->version = 1;
-     os2->weightClass = sf->pfminfo.weight;
-@@ -3102,9 +3104,10 @@
- 		if ( sf->chars[i]->width!=0 ) {
- 		    avg2 += sf->chars[i]->width; ++cnt2;
- 		}
--		if ( sf->chars[i]->unicodeenc==' ' ||
--			(sf->chars[i]->unicodeenc>='a' && sf->chars[i]->unicodeenc<='z')) {
--		    avg1 += sf->chars[i]->width; ++cnt1;
-+		if ( sf->chars[i]->unicodeenc==' ') {
-+		    avg1 += sf->chars[i]->width * 166; ++cnt1;
-+		} else if (sf->chars[i]->unicodeenc>='a' && sf->chars[i]->unicodeenc<='z') {
-+		    avg1 += sf->chars[i]->width * weightFactors[sf->chars[i]->unicodeenc-'a']; ++cnt1;
- 		}
- 	    }
- 	}
-@@ -3122,9 +3125,9 @@
-     while ( pt<os2->achVendID ) *pt++ = ' ';	/* Pad with spaces not NUL */
- 
-     os2->avgCharWid = 500;
--    /*if ( cnt1==27 )
--	os2->avgCharWid = avg1/cnt1;
--    else*/ if ( cnt2!=0 )
-+    if ( cnt1==27 )
-+	os2->avgCharWid = avg1/1000;
-+    else if ( cnt2!=0 )
- 	os2->avgCharWid = avg2/cnt2;
-     memcpy(os2->panose,sf->pfminfo.panose,sizeof(os2->panose));
-     if ( format==ff_ttfsym ) {
-@@ -3349,11 +3352,34 @@
- 	putshort(at->os2f,0);
- }
- 
--static void dumpgasp(struct alltabs *at) {
-+static void dumpgasp(struct alltabs *at, SplineFont *sf) {
-+    BDFFont *bdf;
-+    uint32 bitmaps = 0;
-+    int i, rangecnt = 1;
-+
-+    for ( bdf=sf->bitmaps; bdf!=NULL; bdf=bdf->next) {
-+	if ( BDFDepth(bdf)==1 && bdf->pixelsize<=32 )
-+	    bitmaps |= 1<<(bdf->pixelsize-1);
-+    }
-+    for ( i=1; i<32; i++ ) {
-+      if ( (bitmaps&(1<<i))!=((bitmaps&(1<<(i-1)))<<1) )
-+	rangecnt++;
-+    }
-+    if (bitmaps&(1<<31)) rangecnt++;
- 
-     at->gaspf = tmpfile();
-     putshort(at->gaspf,0);	/* Version number */
--    putshort(at->gaspf,1);	/* One range */
-+    putshort(at->gaspf,rangecnt);	/* One range */
-+    for ( i=0; i<31; i++ ) {
-+	if ( (bitmaps&(1<<i))<<1 != (bitmaps&(1<<(i+1))) ) {
-+	    putshort(at->gaspf, i+1);
-+	    putshort(at->gaspf, bitmaps&(1<<i) ? 0x0 : 0x2);
-+	}
-+    }
-+    if ( bitmaps&(1<<31) ) {
-+	putshort(at->gaspf,32);
-+	putshort(at->gaspf,0x0);
-+    }
-     putshort(at->gaspf,0xffff);	/* Upper bound on pixels/em for this range */
-     putshort(at->gaspf,0x2);	/* Grey scale, no gridfitting */
- 				    /* No hints, so no grids to fit */
-@@ -4730,7 +4756,7 @@
-     redoos2(at);
-     if ( format!=ff_otf && format!=ff_otfcid && format!=ff_none ) {
- 	if ( !SFHasInstructions(sf))
--	    dumpgasp(at);
-+	    dumpgasp(at, sf);
- 	at->fpgmf = dumpstoredtable(sf,CHR('f','p','g','m'),&at->fpgmlen);
- 	at->prepf = dumpstoredtable(sf,CHR('p','r','e','p'),&at->preplen);
- 	at->cvtf = dumpstoredtable(sf,CHR('c','v','t',' '),&at->cvtlen);
-
diff --git a/media-gfx/fontforge/fontforge-20040930.ebuild b/media-gfx/fontforge/fontforge-20040930.ebuild
index 02664216dfeb..673121f06d5b 100644
--- a/media-gfx/fontforge/fontforge-20040930.ebuild
+++ b/media-gfx/fontforge/fontforge-20040930.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20040930.ebuild,v 1.2 2005/01/06 15:37:24 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20040930.ebuild,v 1.3 2005/03/18 15:22:23 usata Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,11 +10,11 @@ SRC_URI="http://fontforge.sourceforge.net/${PN}_full-${PV}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="x86 ppc ~amd64 ~sparc"
 IUSE="png gif jpeg tiff truetype svg unicode X"
 
 DEPEND="png? ( >=media-libs/libpng-1.2.4 )
-	gif? ( >=media-libs/libungif-4.1.0-r1 )
+	gif? ( >=media-libs/giflib-4.1.0-r1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.5.7-r1 )
 	truetype? ( >=media-libs/freetype-2.1.4 )
@@ -24,6 +24,8 @@ DEPEND="png? ( >=media-libs/libpng-1.2.4 )
 	!media-gfx/pfaedit"
 
 src_compile() {
+	sed -i -e "s@ungif@gif@g" configure* || die
+	sed -i -e 's@"libungif"@"libgif"@g' gdraw/gimagereadgif.c || die
 	local myconf="--with-multilayer"
 	use X || myconf="--without-x"
 
diff --git a/media-gfx/fontforge/fontforge-20041231.ebuild b/media-gfx/fontforge/fontforge-20041231.ebuild
index 239d0bf5eb2e..0ef8405015f9 100644
--- a/media-gfx/fontforge/fontforge-20041231.ebuild
+++ b/media-gfx/fontforge/fontforge-20041231.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20041231.ebuild,v 1.2 2005/02/18 17:43:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20041231.ebuild,v 1.3 2005/03/18 15:22:23 usata Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 ~ppc amd64 ~sparc ia64 alpha"
 IUSE="png gif jpeg tiff truetype svg unicode X"
 
 DEPEND="png? ( >=media-libs/libpng-1.2.4 )
-	gif? ( >=media-libs/libungif-4.1.0-r1 )
+	gif? ( >=media-libs/giflib-4.1.0-r1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.5.7-r1 )
 	truetype? ( >=media-libs/freetype-2.1.4 )
@@ -24,6 +24,8 @@ DEPEND="png? ( >=media-libs/libpng-1.2.4 )
 	!media-gfx/pfaedit"
 
 src_compile() {
+	sed -i -e "s@ungif@gif@g" configure* || die
+	sed -i -e 's@"libungif"@"libgif"@g' gdraw/gimagereadgif.c || die
 	local myconf="--with-multilayer"
 	use X || myconf="--without-x"
 
diff --git a/media-gfx/fontforge/fontforge-20050209.ebuild b/media-gfx/fontforge/fontforge-20050209.ebuild
index 2c142651abe4..c86b1d4dcddf 100644
--- a/media-gfx/fontforge/fontforge-20050209.ebuild
+++ b/media-gfx/fontforge/fontforge-20050209.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20050209.ebuild,v 1.1 2005/02/19 10:04:20 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20050209.ebuild,v 1.2 2005/03/18 15:22:23 usata Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,7 @@ KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ia64 ~alpha"
 IUSE="png gif jpeg tiff truetype svg unicode X"
 
 DEPEND="png? ( >=media-libs/libpng-1.2.4 )
-	gif? ( >=media-libs/libungif-4.1.0-r1 )
+	gif? ( >=media-libs/giflib-4.1.0-r1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.5.7-r1 )
 	truetype? ( >=media-libs/freetype-2.1.4 )
@@ -23,6 +23,8 @@ DEPEND="png? ( >=media-libs/libpng-1.2.4 )
 	!media-gfx/pfaedit"
 
 src_compile() {
+	sed -i -e "s@ungif@gif@g" configure* || die
+	sed -i -e 's@"libungif"@"libgif"@g' gdraw/gimagereadgif.c || die
 	local myconf="--with-multilayer"
 	use X || myconf="--without-x"
 
diff --git a/media-gfx/fontforge/fontforge-20050310.ebuild b/media-gfx/fontforge/fontforge-20050310.ebuild
new file mode 100644
index 000000000000..bee10262950e
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20050310.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20050310.ebuild,v 1.1 2005/03/18 15:22:23 usata Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="postscript font editor and converter"
+HOMEPAGE="http://fontforge.sourceforge.net/"
+SRC_URI="http://fontforge.sourceforge.net/${PN}_full-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+IUSE="png gif jpeg tiff truetype svg unicode X"
+
+DEPEND="png? ( >=media-libs/libpng-1.2.4 )
+	gif? ( >=media-libs/giflib-4.1.0-r1 )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( >=media-libs/tiff-3.5.7-r1 )
+	truetype? ( >=media-libs/freetype-2.1.4 )
+	svg? ( >=dev-libs/libxml2-2.6.7 )
+	unicode? ( >=media-libs/libuninameslist-030713 )
+	!media-gfx/pfaedit"
+
+src_compile() {
+	sed -i -e "s@ungif@gif@g" configure* || die
+	sed -i -e 's@"libungif"@"libgif"@g' gdraw/gimagereadgif.c || die
+	local myconf="--with-multilayer"
+	use X || myconf="--without-x"
+
+	filter-mfpmath "sse" "387"
+
+	econf ${myconf} --without-freetype-src || die "econf failed"
+	make || die
+}
+
+src_install() {
+	# make install fails if this directory doesn't exist
+	dodir /usr/lib
+	einstall || die
+	dodoc AUTHORS README*
+}