fix for freetype 2.2

Package-Manager: portage-2.1

6 files changed, 831 insertions, 11 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index b2f8ff037099..10d79da59ac4 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.75 2006/09/17 14:41:16 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.76 2006/09/18 15:53:16 foser Exp $
+
+*fontconfig-2.3.2-r2 (18 Sep 2006)
+
+  18 Sep 2006; Marinus Schraal <foser@gentoo.org> fontconfig-2.3.2-r2.ebuild,
+  fontconfig-2.3.2-noftinternals.patch :
+  Don't break on freetype 2.2 (#140359)
 
 *fontconfig-2.4.1 (17 Sep 2006)
 
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 058dc69313d9..9e14692f1cd8 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -2,6 +2,10 @@ AUX fontconfig-2.3.2-docbook.patch 506 RMD160 c205d99ecc19866da8d0ac4ef7172dcef9
 MD5 083e41bbcbce3f6ee01214d8cecf150b files/fontconfig-2.3.2-docbook.patch 506
 RMD160 c205d99ecc19866da8d0ac4ef7172dcef98a6299 files/fontconfig-2.3.2-docbook.patch 506
 SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5 files/fontconfig-2.3.2-docbook.patch 506
+AUX fontconfig-2.3.2-noftinternals.patch 18275 RMD160 69c409a41708662bd04b9ba998e5d2b5a77b1016 SHA1 c89e63ef691a779ae1ee5f8a4bda2cc55cd280c6 SHA256 f1b41d3438acf7624c3df767111817dfdea283e418c16b3c74d25768e6d2fedd
+MD5 92cad1f7eef3edc6a34a2fd5cbbf352a files/fontconfig-2.3.2-noftinternals.patch 18275
+RMD160 69c409a41708662bd04b9ba998e5d2b5a77b1016 files/fontconfig-2.3.2-noftinternals.patch 18275
+SHA256 f1b41d3438acf7624c3df767111817dfdea283e418c16b3c74d25768e6d2fedd files/fontconfig-2.3.2-noftinternals.patch 18275
 AUX fontconfig-2.3.2-pkg_config.patch 421 RMD160 502c0bf09bf8ffe4fe0f64c8e7c42da7bbd8042e SHA1 5c1ee873eafcbb64cc6314a9a045eaf8cc8eedb0 SHA256 3b536251b30a12d200e40676ae6b040e08394fc19c163b201a1d8d8795d1ea88
 MD5 89e73e244d58f9a2f27bca903ed69000 files/fontconfig-2.3.2-pkg_config.patch 421
 RMD160 502c0bf09bf8ffe4fe0f64c8e7c42da7bbd8042e files/fontconfig-2.3.2-pkg_config.patch 421
@@ -38,10 +42,14 @@ EBUILD fontconfig-2.2.3.ebuild 2752 RMD160 b3cdaddad6fc7b8e50fee6e987a804d2f66de
 MD5 7fe2a6a842745d66817206e354bc47d8 fontconfig-2.2.3.ebuild 2752
 RMD160 b3cdaddad6fc7b8e50fee6e987a804d2f66dee9b fontconfig-2.2.3.ebuild 2752
 SHA256 3fbb8735612c0fc1fbc95732a22acf393f047e022de124775efd06f98b257f35 fontconfig-2.2.3.ebuild 2752
-EBUILD fontconfig-2.3.2-r1.ebuild 2593 RMD160 ed2930ab1dba1db6b395ac98705c812d8eed77e6 SHA1 729f0b69f880e68504114717a684f4bf9daa79d8 SHA256 e03fcea28395976aa7345a013bd5a8520a49d80b0a4e454e7db405c8f485fbca
-MD5 f33343f58f70d5f73ab85d1d2c6894dd fontconfig-2.3.2-r1.ebuild 2593
-RMD160 ed2930ab1dba1db6b395ac98705c812d8eed77e6 fontconfig-2.3.2-r1.ebuild 2593
-SHA256 e03fcea28395976aa7345a013bd5a8520a49d80b0a4e454e7db405c8f485fbca fontconfig-2.3.2-r1.ebuild 2593
+EBUILD fontconfig-2.3.2-r1.ebuild 2604 RMD160 aceeab2c9272b4144bba58d4dd0efde76c3311c6 SHA1 ce47ba25a85f1d17f9c5f23ba6c9675587d96810 SHA256 2a1caa46e8c2b60dc313e1ec8dfd55714673812f5ca7bea51b5381689d5c7c4d
+MD5 f0b424edb9f449a7bba7af69f64739f5 fontconfig-2.3.2-r1.ebuild 2604
+RMD160 aceeab2c9272b4144bba58d4dd0efde76c3311c6 fontconfig-2.3.2-r1.ebuild 2604
+SHA256 2a1caa46e8c2b60dc313e1ec8dfd55714673812f5ca7bea51b5381689d5c7c4d fontconfig-2.3.2-r1.ebuild 2604
+EBUILD fontconfig-2.3.2-r2.ebuild 2672 RMD160 28e5612589010f5590604f088894ae2ce9d13f84 SHA1 97c50c7cd438d63860b09eab2793467e59358fff SHA256 3fd8184db7c6f71129bb062292f157d4535f117f76b55d0c801e2060721d8de4
+MD5 0d8f983229a42e13f9bd029c1c53fb7d fontconfig-2.3.2-r2.ebuild 2672
+RMD160 28e5612589010f5590604f088894ae2ce9d13f84 fontconfig-2.3.2-r2.ebuild 2672
+SHA256 3fd8184db7c6f71129bb062292f157d4535f117f76b55d0c801e2060721d8de4 fontconfig-2.3.2-r2.ebuild 2672
 EBUILD fontconfig-2.3.2.ebuild 2169 RMD160 cb17f29befa2b9577c83cb43d9f5cf97661d3363 SHA1 5884352f6b5caedf07a8bbc0c6b028f8645016a6 SHA256 e1dae86754014d59880d8310455ce7107b7fe750dbe906c69a93c5bbc933434b
 MD5 a578afa9a421f842533106bb0b978d0d fontconfig-2.3.2.ebuild 2169
 RMD160 cb17f29befa2b9577c83cb43d9f5cf97661d3363 fontconfig-2.3.2.ebuild 2169
@@ -50,10 +58,10 @@ EBUILD fontconfig-2.4.1.ebuild 2452 RMD160 3c6ff6e56006012c50c44c0c943dae49617ee
 MD5 667e3b1f890d7c0642e34b34f1150ae2 fontconfig-2.4.1.ebuild 2452
 RMD160 3c6ff6e56006012c50c44c0c943dae49617ee8e9 fontconfig-2.4.1.ebuild 2452
 SHA256 5e74c222b63ccbf394d37e6d2cfc8aeca82dc0283ea7f3e3e04d196ec745872a fontconfig-2.4.1.ebuild 2452
-MISC ChangeLog 11121 RMD160 e077c45531cffc4f654220cd949d50123c8e8650 SHA1 d1958ed213148ac14bba5530a13f11ed944acd05 SHA256 bcf2e6562210951ed608aeff73913860f588dc2cbd0d98909cdc54fa8708e3d5
-MD5 6911ac60d7cc50f297803994782feafb ChangeLog 11121
-RMD160 e077c45531cffc4f654220cd949d50123c8e8650 ChangeLog 11121
-SHA256 bcf2e6562210951ed608aeff73913860f588dc2cbd0d98909cdc54fa8708e3d5 ChangeLog 11121
+MISC ChangeLog 11317 RMD160 3839e6d29b0e07cdaeedf9473fbfe6675b80a900 SHA1 53d1427217061b278c221d68417b3c9f92636e0e SHA256 a6ae13fad21ac4246aca88ab81d8ecc01a2109633762839b63ec242ffac72072
+MD5 89e6cd149c07a256d453639d32d38bb6 ChangeLog 11317
+RMD160 3839e6d29b0e07cdaeedf9473fbfe6675b80a900 ChangeLog 11317
+SHA256 a6ae13fad21ac4246aca88ab81d8ecc01a2109633762839b63ec242ffac72072 ChangeLog 11317
 MISC metadata.xml 419 RMD160 898b8233ab233060d8137dadf28c291b83a65500 SHA1 ee62c352812f8765122e5a65b7df5f8794c6c485 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db
 MD5 ae7171ca850597a2455b8b10c72a8de1 metadata.xml 419
 RMD160 898b8233ab233060d8137dadf28c291b83a65500 metadata.xml 419
@@ -70,6 +78,9 @@ SHA256 94de40c9bac3de79a1bfc417f64d89398077e18e222d171493901211dac8bcae files/di
 MD5 c77d154bcfcfd17b636769089ba8a821 files/digest-fontconfig-2.3.2-r1 250
 RMD160 1aeaff56f8319f0831d42d6a367f83a57b51e0f6 files/digest-fontconfig-2.3.2-r1 250
 SHA256 94de40c9bac3de79a1bfc417f64d89398077e18e222d171493901211dac8bcae files/digest-fontconfig-2.3.2-r1 250
+MD5 c77d154bcfcfd17b636769089ba8a821 files/digest-fontconfig-2.3.2-r2 250
+RMD160 1aeaff56f8319f0831d42d6a367f83a57b51e0f6 files/digest-fontconfig-2.3.2-r2 250
+SHA256 94de40c9bac3de79a1bfc417f64d89398077e18e222d171493901211dac8bcae files/digest-fontconfig-2.3.2-r2 250
 MD5 569d3d18cbbf6f0af16a34dda86051f7 files/digest-fontconfig-2.4.1 253
 RMD160 7b843cdbdf5213e2abc05f029f2de55cfabbc327 files/digest-fontconfig-2.4.1 253
 SHA256 5dcfa2b9014eb628f9bb658d56b3aed53e6a1adebe1841ce66d37c4103468f7a files/digest-fontconfig-2.4.1 253
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.3.2-r2 b/media-libs/fontconfig/files/digest-fontconfig-2.3.2-r2
new file mode 100644
index 000000000000..cfe4f11048a6
--- /dev/null
+++ b/media-libs/fontconfig/files/digest-fontconfig-2.3.2-r2
@@ -0,0 +1,3 @@
+MD5 7354f9f125ea78a8f2851cb9c31d4866 fontconfig-2.3.2.tar.gz 964045
+RMD160 42668475cca88f265a3b12c289eea2ff61ddaa2b fontconfig-2.3.2.tar.gz 964045
+SHA256 6f7b91d328d6408c097ec11777bf4b1c2c710613b573b399794bc5999ff12227 fontconfig-2.3.2.tar.gz 964045
diff --git a/media-libs/fontconfig/files/fontconfig-2.3.2-noftinternals.patch b/media-libs/fontconfig/files/fontconfig-2.3.2-noftinternals.patch
new file mode 100644
index 000000000000..06ee8425d158
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.3.2-noftinternals.patch
@@ -0,0 +1,701 @@
+diff -urN fontconfig-2.3.2/src/fcfreetype.c fontconfig-2.3.2-new/src/fcfreetype.c
+--- fontconfig-2.3.2/src/fcfreetype.c	2005-04-21 14:37:43.000000000 +0200
++++ fontconfig-2.3.2-new/src/fcfreetype.c	2005-07-07 13:17:32.224401218 +0200
+@@ -50,14 +50,11 @@
+ #include "fcint.h"
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+-#include FT_INTERNAL_OBJECTS_H
+ #include FT_TRUETYPE_TABLES_H
+ #include FT_SFNT_NAMES_H
+ #include FT_TRUETYPE_IDS_H
+ #include FT_TYPE1_TABLES_H
+-#include FT_INTERNAL_STREAM_H
+-#include FT_INTERNAL_SFNT_H
+-#include FT_INTERNAL_TRUETYPE_TYPES_H
++#include "fcftglue.h"
+ #if HAVE_FT_GET_X11_FONT_FORMAT
+ #include FT_XFREE86_H
+ #endif
+@@ -65,8 +62,7 @@
+ #if HAVE_FT_GET_BDF_PROPERTY
+ #include FT_BDF_H
+ #include FT_MODULE_H
+-#define HAS_BDF_PROPERTY(f) ((f) && (f)->driver && \
+-			     (f)->driver->root.clazz->get_interface)
++#define HAS_BDF_PROPERTY(f) ((f))
+ #define MY_Get_BDF_Property(f,n,p) (HAS_BDF_PROPERTY(f) ? \
+ 				    FT_Get_BDF_Property(f,n,p) : \
+ 				    FT_Err_Invalid_Argument)
+@@ -1559,7 +1555,7 @@
+      */
+     if (FcCharSetCount (cs) == 0)
+     {
+-	if (!strcmp(FT_MODULE_CLASS(&face->driver->root)->module_name, "pcf"))
++	if (!strcmp(FT_Get_X11_Font_Format(face),"PCF"))
+ 	    goto bail2;
+     }
+ 
+@@ -2706,8 +2702,7 @@
+ static FT_Error
+ GetScriptTags(FT_Face face, FT_ULong tabletag, FT_ULong **stags, FT_UShort *script_count)
+ {
+-    FT_ULong         cur_offset, new_offset, base_offset;
+-    TT_Face          tt_face = (TT_Face)face;
++    FT_ULong   cur_offset, new_offset, base_offset;
+     FT_Stream  stream = face->stream;
+     FT_Error   error;
+     FT_UShort          n, p;
+@@ -2716,51 +2711,43 @@
+     if ( !stream )
+ 	return TT_Err_Invalid_Face_Handle;
+ 
+-    if (( error = tt_face->goto_table( tt_face, tabletag, stream, 0 ) ))
++    if ( (error = fcft_face_goto_table( face, tabletag, stream )) != 0 )
+ 	return error;
+ 
+-    base_offset = FT_STREAM_POS();
++    base_offset = FCFT_STREAM_POS();
+ 
+     /* skip version */
+ 
+-    if ( FT_STREAM_SEEK( base_offset + 4L ) || FT_FRAME_ENTER( 2L ) )
+-	return error;
+-
+-    new_offset = FT_GET_USHORT() + base_offset;
+-
+-    FT_FRAME_EXIT();
+-
+-    cur_offset = FT_STREAM_POS();
+-
+-    if ( FT_STREAM_SEEK( new_offset ) != TT_Err_Ok )
+-	return error;
+-
+-    base_offset = FT_STREAM_POS();
++    if ( FCFT_STREAM_SEEK( base_offset + 4L ) ||
++         FCFT_READ_USHORT( new_offset )       ) 
++      return error;
++    
++    new_offset += base_offset;
++    cur_offset  = FCFT_STREAM_POS();
+ 
+-    if ( FT_FRAME_ENTER( 2L ) )
++    if ( FCFT_STREAM_SEEK( new_offset ) != TT_Err_Ok )
+ 	return error;
+ 
+-    *script_count = FT_GET_USHORT();
++    base_offset = FCFT_STREAM_POS();
+ 
+-    FT_FRAME_EXIT();
+-
+-    if ( FT_SET_ERROR (FT_MEM_ALLOC_ARRAY( *stags, *script_count, FT_ULong )) )
+-	return error;
++    if ( FCFT_READ_USHORT(*script_count)                         ||
++         FCFT_MEM_ALLOC_ARRAY( *stags, *script_count, FT_ULong ) )
++ 	return error;
+ 
+     p = 0;
+     for ( n = 0; n < *script_count; n++ )
+     {
+-	if ( FT_FRAME_ENTER( 6L ) )
++	if ( FCFT_FRAME_ENTER( 6L ) )
+ 	    goto Fail;
+ 
+-	(*stags)[p] = FT_GET_ULONG();
+-	new_offset = FT_GET_USHORT() + base_offset;
++	(*stags)[p] = FCFT_GET_ULONG();
++	new_offset  = FCFT_GET_USHORT() + base_offset;
+ 
+-	FT_FRAME_EXIT();
++	FCFT_FRAME_EXIT();
+ 
+-	cur_offset = FT_STREAM_POS();
++	cur_offset = FCFT_STREAM_POS();
+ 
+-	if ( FT_STREAM_SEEK( new_offset ) )
++	if ( FCFT_STREAM_SEEK( new_offset ) )
+ 	    goto Fail;
+ 
+ 	if ( error == TT_Err_Ok )
+@@ -2768,7 +2755,7 @@
+ 	else if ( error != TTO_Err_Empty_Script )
+ 	    goto Fail;
+ 
+-	(void)FT_STREAM_SEEK( cur_offset );
++	(void)FCFT_STREAM_SEEK( cur_offset );
+     }
+ 
+     if (!p)
+@@ -2784,7 +2771,7 @@
+ 
+ Fail:
+     *script_count = 0;
+-    FT_FREE( *stags );
++    FCFT_FREE( *stags );
+     return error;
+ }
+ 
+@@ -2841,7 +2828,7 @@
+     if (FcDebug () & FC_DBG_SCANV)
+ 	printf("complex features in this font: %s\n", complex);
+ bail:
+-    FT_FREE(gsubtags);
+-    FT_FREE(gpostags);
++    FCFT_FREE(gsubtags);
++    FCFT_FREE(gpostags);
+     return complex;
+ }
+diff -urN fontconfig-2.3.2/src/fcftglue.c fontconfig-2.3.2-new/src/fcftglue.c
+--- fontconfig-2.3.2/src/fcftglue.c	1970-01-01 01:00:00.000000000 +0100
++++ fontconfig-2.3.2-new/src/fcftglue.c	2005-07-07 13:34:48.630254000 +0200
+@@ -0,0 +1,380 @@
++#include "fcftglue.h"
++
++/***************************************************************************/
++/***************************************************************************/
++/*****                                                                 *****/
++/*****                                                                 *****/
++/*****                                                                 *****/
++/***************************************************************************/
++/***************************************************************************/
++
++/* only used internall */
++static FT_Pointer
++fcft_qalloc( FT_Memory  memory,
++             FT_ULong   size,
++             FT_Error  *perror )
++{
++  FT_Error    error = 0;
++  FT_Pointer  block = NULL;
++
++  if ( size > 0 )
++  {
++    block = memory->alloc( memory, size );
++    if ( !block )
++      error = FT_Err_Out_Of_Memory;
++  }
++
++  *perror = error;
++  return block;
++}
++
++#define  FCFT_QALLOC(ptr,size)    ( (ptr) = fcft_qalloc( memory, (size), &error ), error != 0 )
++
++
++FCFT_APIDEF( FT_Pointer )
++fcft_alloc( FT_Memory  memory,
++            FT_ULong   size,
++            FT_Error  *perror )
++{
++  FT_Error    error = 0;
++  FT_Pointer  block = NULL;
++
++  if ( size > 0 )
++  {
++    block = memory->alloc( memory, size );
++    if ( !block )
++      error = FT_Err_Out_Of_Memory;
++    else
++      memset( (char*)block, 0, (size_t)size );
++  }
++
++  *perror = error;
++  return block;
++}
++
++
++FCFT_APIDEF( FT_Pointer )
++fcft_realloc( FT_Memory   memory,
++              FT_Pointer  block,
++              FT_ULong    old_size,
++              FT_ULong    new_size,
++              FT_Error   *perror )
++{
++  FT_Pointer  block2 = NULL;
++  FT_Error    error  = 0;
++
++  if ( block == NULL )
++  {
++    block2 = fcft_alloc( memory, new_size, &error );
++  }
++  else if ( new_size <= 0 )
++  {
++    fcft_free( memory, block );
++  }
++  else
++  {
++    block2 = fcft_alloc( memory, new_size, &error );
++    if ( !error )
++    {
++      memcpy( (char*)block2, (const char*)block, (size_t)old_size );
++      if ( new_size > old_size )
++        memset( (char*)block2 + old_size, 0, (size_t)(new_size - old_size) );
++    }
++  }
++
++  if ( !error )
++    block = block2;
++
++  *perror = error;
++  return block;
++}
++
++
++FCFT_APIDEF( void )
++fcft_free( FT_Memory   memory,
++           FT_Pointer  block )
++{
++  if ( block )
++    memory->free( memory, block );
++}
++
++
++FCFT_APIDEF( FT_Long )
++fcft_stream_pos( FT_Stream   stream )
++{
++  return stream->pos;
++}
++
++
++FCFT_APIDEF( FT_Error )
++fcft_stream_seek( FT_Stream   stream,
++                  FT_Long     pos )
++{
++  FT_Error  error = 0;
++
++  stream->pos = pos;
++  if ( stream->read )
++  {
++    if ( stream->read( stream, pos, 0, 0 ) )
++      error = FT_Err_Invalid_Stream_Operation;
++  }
++  else if ( pos > stream->size )
++    error = FT_Err_Invalid_Stream_Operation;
++
++  return error;
++}
++
++
++FCFT_APIDEF( FT_Error )
++fcft_stream_frame_enter( FT_Stream   stream,
++                         FT_ULong    count )
++{
++  FT_Error  error = FT_Err_Ok;
++  FT_ULong  read_bytes;
++
++  if ( stream->read )
++  {
++    /* allocate the frame in memory */
++    FT_Memory  memory = stream->memory;
++
++
++    if ( FCFT_QALLOC( stream->base, count ) )
++      goto Exit;
++
++    /* read it */
++    read_bytes = stream->read( stream, stream->pos,
++                               stream->base, count );
++    if ( read_bytes < count )
++    {
++      FCFT_FREE( stream->base );
++      error = FT_Err_Invalid_Stream_Operation;
++    }
++    stream->cursor = stream->base;
++    stream->limit  = stream->cursor + count;
++    stream->pos   += read_bytes;
++  }
++  else
++  {
++    /* check current and new position */
++    if ( stream->pos >= stream->size        ||
++         stream->pos + count > stream->size )
++    {
++      error = FT_Err_Invalid_Stream_Operation;
++      goto Exit;
++    }
++
++    /* set cursor */
++    stream->cursor = stream->base + stream->pos;
++    stream->limit  = stream->cursor + count;
++    stream->pos   += count;
++  }
++
++Exit:
++  return error;
++}
++
++
++FCFT_APIDEF( void )
++fcft_stream_frame_exit( FT_Stream  stream )
++{
++  if ( stream->read )
++  {
++    FT_Memory  memory = stream->memory;
++
++    FCFT_FREE( stream->base );
++  }
++  stream->cursor = 0;
++  stream->limit  = 0;
++}
++
++
++FCFT_APIDEF( FT_Byte )
++fcft_stream_get_byte( FT_Stream  stream )
++{
++  FT_Byte  result = 0;
++
++  if ( stream->cursor < stream->limit )
++    result = *stream->cursor++;
++
++  return result;
++}
++
++
++FCFT_APIDEF( FT_Short )
++fcft_stream_get_short( FT_Stream  stream )
++{
++  FT_Byte*  p;
++  FT_Short  result = 0;
++
++  p = stream->cursor;
++  if ( p + 2 <= stream->limit )
++  {
++    result         = (FT_Short)((p[0] << 8) | p[1]);
++    stream->cursor = p+2;
++  }
++  return result;
++}
++
++
++FCFT_APIDEF( FT_Long )
++fcft_stream_get_long( FT_Stream   stream )
++{
++  FT_Byte*  p;
++  FT_Long   result = 0;
++
++  p = stream->cursor;
++  if ( p + 4 <= stream->limit )
++  {
++    result         = (FT_Long)(((FT_Long)p[0] << 24) |
++                               ((FT_Long)p[1] << 16) |
++                               ((FT_Long)p[2] << 8)  |
++                                         p[3]        );
++    stream->cursor = p+4;
++  }
++  return result;
++}
++
++
++static FT_Error
++fcft_stream_readp( FT_Stream   stream,
++                   FT_Byte*   *pbuffer,
++                   FT_ULong    count )
++{
++  FT_Error  error = 0;
++
++  if ( stream->read )
++  {
++    FT_ULong  read_bytes = stream->read( stream, stream->pos, *pbuffer, count );
++
++    if ( read_bytes != count )
++      goto Fail;
++
++    stream->pos += count;
++  }
++  else
++  {
++    if ( stream->pos >= stream->size        ||
++         stream->pos + count > stream->size )
++      goto Fail;
++
++    *pbuffer     = stream->base + stream->pos;
++    stream->pos += count;
++  }
++
++Exit:
++  return error;
++
++Fail:
++  error = FT_Err_Invalid_Stream_Operation;
++  goto Exit;
++}
++
++
++FCFT_API( FT_Byte )
++fcft_stream_read_byte( FT_Stream   stream,
++                       FT_Error   *perror )
++{
++  FT_Byte   temp[1], *p = temp, result = 0;
++  FT_Error  error = fcft_stream_readp( stream, &p, 1 );
++
++  if ( !error )
++    result = *p;
++
++  return error;
++}
++
++FCFT_API( FT_Short )
++fcft_stream_read_short( FT_Stream  stream,
++                        FT_Error  *perror )
++{
++  FT_Byte   temp[2], *p = temp;
++  FT_Short  result = 0;
++  FT_Error  error  = fcft_stream_readp( stream, &p, 2 );
++
++  if ( !error )
++    result = (FT_Short)((p[0] << 8) | p[1]);
++
++  return error;
++}
++
++FCFT_API( FT_Long )
++fcft_stream_read_long( FT_Stream  stream,
++                       FT_Error  *perror )
++{
++  FT_Byte   temp[4], *p = temp;
++  FT_Long   result = 0;
++  FT_Error  error  = fcft_stream_readp( stream, &p, 4 );
++
++  if ( !error )
++    result = (FT_Long)((FT_Long)(p[0] << 24) |
++                       (FT_Long)(p[1] << 16) |
++                                (p[2] << 8)  |
++                                 p[3]        );
++
++  return error;
++}
++
++
++FCFT_APIDEF( FT_Error )
++fcft_face_goto_table( FT_Face    face,
++                      FT_ULong   the_tag,
++                      FT_Stream  stream )
++{
++  FT_Error  error;
++
++  if ( !FT_IS_SFNT(face) )
++    error = FT_Err_Invalid_Face_Handle;
++  else
++  {
++   /* parse the directory table directly, without using
++    * FreeType's built-in data structures
++    */
++    FT_UInt   count, nn;
++    FT_ULong  offset = 0;
++
++    if ( face->num_faces > 1 )
++    {
++      /* deal with TrueType collections */
++      FT_ULong  offset;
++
++      if ( FCFT_STREAM_SEEK( 12 + face->face_index*4 ) ||
++           FCFT_READ_ULONG(offset)                     )
++        goto Exit;
++    }
++
++    if ( FCFT_STREAM_SEEK( offset+4 ) ||
++         FCFT_READ_USHORT(count)      )
++      goto Exit;
++
++
++    if ( FCFT_STREAM_SEEK( offset+12 ) ||
++         FCFT_FRAME_ENTER( count*16 )  )
++      goto Exit;
++
++    for ( nn = 0; nn < count; nn++ )
++    {
++      FT_ULong  tag      = FCFT_GET_TAG();
++      FT_ULong  checksum = FCFT_GET_ULONG();
++      FT_ULong  start    = FCFT_GET_ULONG();
++      FT_ULong  size     = FCFT_GET_ULONG();
++
++      FT_UNUSED(checksum);
++      FT_UNUSED(size);
++
++      if ( tag == the_tag )
++      {
++        error = fcft_stream_seek( stream, offset+start );
++        goto FoundIt;
++      }
++    }
++    error = FT_Err_Table_Missing;
++
++  FoundIt:
++    FCFT_FRAME_EXIT();
++  }
++
++Exit:
++  return error;
++}
++
++#undef FCFT_QALLOC
+diff -urN fontconfig-2.3.2/src/fcftglue.h fontconfig-2.3.2-new/src/fcftglue.h
+--- fontconfig-2.3.2/src/fcftglue.h	1970-01-01 01:00:00.000000000 +0100
++++ fontconfig-2.3.2-new/src/fcftglue.h	2005-07-07 13:15:43.292717000 +0200
+@@ -0,0 +1,135 @@
++/* the following contains code used to prevent FontConfig from
++ * abusing FreeType internals. We simply duplicate some of the FreeType
++ * functionality using only publicly defined APIs and structures
++ */
++#ifndef __FONTCONFIG_FTGLUE_H__
++#define __FONTCONFIG_FTGLUE_H__
++
++#include <ft2build.h>
++#include FT_FREETYPE_H
++
++FT_BEGIN_HEADER
++
++
++/* utility macros */
++#define  FCFT_SET_ERR(c)   ( (error = (c)) != 0 )
++
++#ifndef FCFT_API
++#define FCFT_API(x)  extern x
++#endif
++
++#ifndef FCFT_APIDEF
++#define FCFT_APIDEF(x)  x
++#endif
++
++/* stream macros used by the OpenType parser */
++#define  FCFT_STREAM_POS()       fcft_stream_pos( stream )
++#define  FCFT_STREAM_SEEK(pos)   FCFT_SET_ERR( fcft_stream_seek( stream, pos ) )
++#define  FCFT_FRAME_ENTER(size)  FCFT_SET_ERR( fcft_stream_frame_enter( stream, size ) )
++#define  FCFT_FRAME_EXIT()       fcft_stream_frame_exit( stream )
++
++#define  FCFT_GET_BYTE()         fcft_stream_get_byte( stream )
++#define  FCFT_GET_SHORT()        fcft_stream_get_short( stream )
++#define  FCFT_GET_LONG()         fcft_stream_get_long( stream )
++
++#define  FCFT_GET_CHAR()        ((FT_Char)FCFT_GET_BYTE())
++#define  FCFT_GET_USHORT()      ((FT_UShort)FCFT_GET_SHORT())
++#define  FCFT_GET_ULONG()       ((FT_ULong)FCFT_GET_LONG())
++#define  FCFT_GET_TAG()         FCFT_GET_ULONG()
++
++#define  FCFT_READ_(val,type,suffix)   \
++   ( (val) = (type) fcft_stream_read_##suffix (stream, &error), error != 0 )
++
++#define  FCFT_READ_BYTE(val)    FCFT_READ_(val,FT_Byte,byte)
++#define  FCFT_READ_SHORT(val)   FCFT_READ_(val,FT_Short,short)
++#define  FCFT_READ_LONG(val)    FCFT_READ_(val,FT_Long,long)
++
++#define  FCFT_READ_CHAR(val)    FCFT_READ_(val,FT_Char,byte)
++#define  FCFT_READ_USHORT(val)  FCFT_READ_(val,FT_UShort,short)
++#define  FCFT_READ_ULONG(val)   FCFT_READ_(val,FT_ULong,long)
++
++
++FCFT_API( FT_Long )
++fcft_stream_pos( FT_Stream   stream );
++
++FCFT_API( FT_Error )
++fcft_stream_seek( FT_Stream   stream,
++                  FT_Long     pos );
++
++FCFT_API( FT_Error )
++fcft_stream_frame_enter( FT_Stream   stream,
++                         FT_ULong    size );
++
++FCFT_API( void )
++fcft_stream_frame_exit( FT_Stream  stream );
++
++FCFT_API( FT_Byte )
++fcft_stream_get_byte( FT_Stream  stream );
++
++FCFT_API( FT_Short )
++fcft_stream_get_short( FT_Stream  stream );
++
++FCFT_API( FT_Long )
++fcft_stream_get_long( FT_Stream   stream );
++
++FCFT_API( FT_Byte )
++fcft_stream_read_byte( FT_Stream   stream,
++                       FT_Error   *perror );
++
++FCFT_API( FT_Short )
++fcft_stream_read_short( FT_Stream  stream,
++                        FT_Error  *perror );
++
++FCFT_API( FT_Long )
++fcft_stream_read_long( FT_Stream  stream,
++                       FT_Error  *perror );
++
++FCFT_API( FT_Error )
++fcft_face_goto_table( FT_Face    face,
++                      FT_ULong   tag,
++                      FT_Stream  stream );
++
++/* memory macros used by the OpenType parser */
++#define  FCFT_MEM_ALLOC(_ptr,_size)   \
++           ( (_ptr) = fcft_alloc( memory, _size, &error ), error != 0 )
++
++#define  FCFT_MEM_REALLOC(_ptr,_oldsz,_newsz)  \
++           ( (_ptr) = fcft_realloc( memory, (_ptr), (_oldsz), (_newsz), &error ), error != 0 )
++
++#define  FCFT_FREE(_ptr)               \
++  FT_BEGIN_STMNT                       \
++    if ( (_ptr) )                      \
++    {                                  \
++      fcft_free( memory, _ptr );       \
++      _ptr = NULL;                     \
++    }                                  \
++  FT_END_STMNT
++
++#define  FCFT_MEM_ALLOC_ARRAY(_ptr,_count,_type)   \
++           FCFT_MEM_ALLOC(_ptr,(_count)*sizeof(_type))
++
++#define  FCFT_MEM_REALLOC_ARRAY(_ptr,_oldcnt,_newcnt,_type) \
++           FCFT_MEM_REALLOC(_ptr,(_oldcnt)*sizeof(_type),(_newcnt)*sizeof(_type))
++
++
++FCFT_API( FT_Pointer )
++fcft_alloc( FT_Memory  memory,
++            FT_ULong   size,
++            FT_Error  *perror );
++
++FCFT_API( FT_Pointer )
++fcft_realloc( FT_Memory   memory,
++              FT_Pointer  block,
++              FT_ULong    old_size,
++              FT_ULong    new_size,
++              FT_Error   *perror );
++
++FCFT_API( void )
++fcft_free( FT_Memory   memory,
++           FT_Pointer  block );
++
++/* */
++
++FT_END_HEADER
++
++#endif /* __OPENTYPE_FCFT_H__ */
+diff -urN fontconfig-2.3.2/src/Makefile.am fontconfig-2.3.2-new/src/Makefile.am
+--- fontconfig-2.3.2/src/Makefile.am	2004-12-05 06:49:20.000000000 +0100
++++ fontconfig-2.3.2-new/src/Makefile.am	2005-07-07 13:09:15.416637082 +0200
+@@ -86,6 +86,7 @@
+ 	fcdefault.c \
+ 	fcdir.c \
+ 	fcfreetype.c \
++	fcftglue.c \
+ 	fcfs.c \
+ 	fcinit.c \
+ 	fclang.c \
+diff -urN fontconfig-2.3.2/src/Makefile.in fontconfig-2.3.2-new/src/Makefile.in
+--- fontconfig-2.3.2/src/Makefile.in	2005-04-27 21:08:51.000000000 +0200
++++ fontconfig-2.3.2-new/src/Makefile.in	2005-07-07 13:09:15.417636939 +0200
+@@ -228,6 +228,7 @@
+ 	fcdefault.c \
+ 	fcdir.c \
+ 	fcfreetype.c \
++	fcftglue.c \
+ 	fcfs.c \
+ 	fcinit.c \
+ 	fclang.c \
+@@ -257,7 +258,7 @@
+ libfontconfig_la_DEPENDENCIES =
+ am_libfontconfig_la_OBJECTS = fcatomic.lo fcblanks.lo fccache.lo \
+ 	fccfg.lo fccharset.lo fcdbg.lo fcdefault.lo fcdir.lo \
+-	fcfreetype.lo fcfs.lo fcinit.lo fclang.lo fclist.lo fcmatch.lo \
++	fcfreetype.lo fcftglue.lo fcfs.lo fcinit.lo fclang.lo fclist.lo fcmatch.lo \
+ 	fcmatrix.lo fcname.lo fcpat.lo fcstr.lo fcxml.lo
+ libfontconfig_la_OBJECTS = $(am_libfontconfig_la_OBJECTS)
+ 
diff --git a/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild b/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild
index 2d10425ecdc0..df2f8b7eb5f6 100644
--- a/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild,v 1.11 2006/09/04 03:43:18 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild,v 1.12 2006/09/18 15:53:16 foser Exp $
 
 inherit eutils libtool autotools
 
@@ -10,7 +10,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.gz"
 
 LICENSE="fontconfig"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc"
 
 DEPEND=">=media-libs/freetype-2.1.4
diff --git a/media-libs/fontconfig/fontconfig-2.3.2-r2.ebuild b/media-libs/fontconfig/fontconfig-2.3.2-r2.ebuild
new file mode 100644
index 000000000000..256cd854ac2a
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.3.2-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.3.2-r2.ebuild,v 1.1 2006/09/18 15:53:16 foser Exp $
+
+inherit eutils libtool autotools
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="http://fontconfig.org/"
+SRC_URI="http://fontconfig.org/release/${P}.tar.gz"
+
+LICENSE="fontconfig"
+SLOT="1.0"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND=">=media-libs/freetype-2.1.4
+	>=dev-libs/expat-1.95.3"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	# alias for Symbol and dingbats font (#124238)
+	epatch "${FILESDIR}"/${P}-symbol_alias.patch
+	# fix pkgconfig includes (#83623)
+	epatch "${FILESDIR}"/${P}-pkg_config.patch
+	# add docbook switch so we can disable it
+	epatch "${FILESDIR}"/${P}-docbook.patch
+	# fix build with ft 2.2 (#140359)
+	epatch ${FILESDIR}/${P}-noftinternals.patch
+
+	eautoreconf
+
+	# elibtoolize
+	epunt_cxx #74077
+}
+
+src_compile() {
+
+	[ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \
+		die "Dont compile fontconfig with ccc, it doesnt work very well"
+
+	# disable docs only disables local docs generation, they come with the tarball
+	econf --disable-docs \
+		--disable-docbook \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-default-fonts=/usr/share/fonts \
+		--with-add-fonts=/usr/local/share/fonts,/usr/X11R6/lib/X11/fonts \
+		|| die
+
+	# this triggers sandbox, we do this ourselves
+	sed -i "s:fc-cache/fc-cache -f -v:sleep 0:" Makefile
+
+	emake -j1 || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	insinto /etc/fonts
+	doins "${S}"/fonts.conf
+	newins "${S}"/fonts.conf fonts.conf.new
+
+	cd "${S}"
+	newman doc/fonts-conf.5 fonts-conf.5
+	newman fc-cache/fc-cache.man fc-cache.1
+	newman fc-list/fc-list.man fc-list.1
+
+	dohtml doc/fontconfig-user.html
+	dodoc doc/fontconfig-user.{txt,pdf}
+
+	if use doc; then
+		doman doc/Fc*.3
+		dohtml doc/fontconfig-devel.html doc
+		dohtml -r doc/fontconfig-devel
+		dodoc doc/fontconfig-devel.{txt,pdf}
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+
+	# Changes should be made to /etc/fonts/local.conf, and as we had
+	# too much problems with broken fonts.conf, we force update it ...
+	# <azarah@gentoo.org> (11 Dec 2002)
+	ewarn "Please make fontconfig related changes to /etc/fonts/local.conf,"
+	ewarn "and NOT to /etc/fonts/fonts.conf, as it will be replaced!"
+	mv -f ${ROOT}/etc/fonts/fonts.conf.new ${ROOT}/etc/fonts/fonts.conf
+	rm -f ${ROOT}/etc/fonts/._cfg????_fonts.conf
+
+	if [ "${ROOT}" = "/" ]
+	then
+		echo
+		einfo "Creating font cache..."
+		/usr/bin/fc-cache
+	fi
+
+}