shiny new version of ximian patchset, masked for now, see ChangeLog

7 files changed, 27 insertions, 1034 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 378cbdaaaa30..437294d1db0f 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.56 2004/08/01 13:57:26 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.57 2004/08/20 06:24:29 suka Exp $
+
+*openoffice-ximian-1.3.0 (20 Aug 2004)
+
+  20 Aug 2004; suka@gentoo.org -files/1.1.2/gentoo-1.1.60.patch,
+  -files/1.1.2/nativefix.diff, -files/1.1.2/print-fontconfig.diff,
+  -openoffice-ximian-1.1.60.ebuild, +openoffice-ximian-1.3.0.ebuild:
+  Great new release of the Ximian patchset, which brings lots of goodies:
+  Native fileselectors for GNOME and KDE are just the highlight. Take a look at
+  
+  http://ooo.ximian.com/NEWS
+  
+  for more infos.
+  
+  Unfortunately the ooo-kde-build is broken for the moment, so this version is
+  in package.mask for now, if you don't use that use-flag you should happily be
+  able to unmask it.
 
 *openoffice-ximian-1.1.61 (01 Aug 2004)
 
diff --git a/app-office/openoffice-ximian/files/1.1.2/gentoo-1.1.60.patch b/app-office/openoffice-ximian/files/1.1.2/gentoo-1.1.60.patch
deleted file mode 100644
index 754d98778f35..000000000000
--- a/app-office/openoffice-ximian/files/1.1.2/gentoo-1.1.60.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- patches/OOO_1_1_2/apply 2004-05-08 08:54:17.055306480 +0200
-+++ patches/OOO_1_1_2/apply 2004-05-08 08:54:17.057306176 +0200
-@@ -25,6 +25,7 @@
- SuSE : SuSEOnly, LinuxCommon, KDEBase, GlobalDesktopFiles, VBABits
- PLD : PLDOnly, LinuxCommon, KDEBase, OOoCUPS, GlobalDesktopFiles, StartupNotification, ODKFixes, VBABits
- Ark : ArkOnly, LinuxCommon, NativeWidgets, GlobalDesktopFiles, ODKFixes, VBABits, OOoCUPS
-+Gentoo : XimianOnly, LinuxCommon, GnomeVFS, GnomeCUPS, GlobalDesktopFiles, StartupNotification, ODKFixes, VBABits, NativeWidgets
- # somewhat odder:
- Win32 : Common, ODKFixes, VBABits, Win32Only
-
diff --git a/app-office/openoffice-ximian/files/1.1.2/nativefix.diff b/app-office/openoffice-ximian/files/1.1.2/nativefix.diff
deleted file mode 100644
index ed609db6b8dc..000000000000
--- a/app-office/openoffice-ximian/files/1.1.2/nativefix.diff
+++ /dev/null
@@ -1,116 +0,0 @@
---- nativewidgets-vcl.diff
-+++ nativewidgets-vcl.diff
-@@ -3924,9 +3924,9 @@
- + *
- + *  $RCSfile: nativewidgets-vcl.diff,v $
- + *
--+ *  $Revision: 1.7 $
-++ *  $Revision: 1.8 $
- + *
--+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
-++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
-@@ -4021,9 +4021,9 @@
- + *
- + *  $RCSfile: nativewidgets-vcl.diff,v $
- + *
--+ *  $Revision: 1.7 $
-++ *  $Revision: 1.8 $
- + *
--+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
-++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
-@@ -4399,9 +4399,9 @@
- + *
- + *  $RCSfile: nativewidgets-vcl.diff,v $
- + *
--+ *  $Revision: 1.7 $
-++ *  $Revision: 1.8 $
- + *
--+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
-++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
-@@ -4667,9 +4667,9 @@
- + *
- + *  $RCSfile: nativewidgets-vcl.diff,v $
- + *
--+ *  $Revision: 1.7 $
-++ *  $Revision: 1.8 $
- + *
--+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
-++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
-@@ -4758,14 +4758,14 @@
- unchanged:
- --- /dev/null	2003-09-23 19:59:22.000000000 +0200
- +++ vcl/unx/source/gdi/salnativewidgets-gtk.cxx	2004-03-03 15:32:34.000000000 +0100
--@@ -0,0 +1,2163 @@
-+@@ -0,0 +1,2326 @@
- +/*************************************************************************
- + *
- + *  $RCSfile: nativewidgets-vcl.diff,v $
- + *
--+ *  $Revision: 1.7 $
-++ *  $Revision: 1.8 $
- + *
--+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
-++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
-@@ -7093,9 +7093,9 @@
- + *
- + *  $RCSfile: nativewidgets-vcl.diff,v $
- + *
--+ *  $Revision: 1.7 $
-++ *  $Revision: 1.8 $
- + *
--+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
-++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
-@@ -8729,9 +8729,9 @@
- + *
- + *  $RCSfile: nativewidgets-vcl.diff,v $
- + *
--+ *  $Revision: 1.7 $
-++ *  $Revision: 1.8 $
- + *
--+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
-++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
-@@ -8951,9 +8951,9 @@
- + *
- + *  $RCSfile: nativewidgets-vcl.diff,v $
- + *
--+ *  $Revision: 1.7 $
-++ *  $Revision: 1.8 $
- + *
--+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
-++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
-@@ -9045,9 +9045,9 @@
- + *
- + *  $RCSfile: nativewidgets-vcl.diff,v $
- + *
--+ *  $Revision: 1.7 $
-++ *  $Revision: 1.8 $
- + *
--+ *  last change: $Author: dcbw $ $Date: 2004/06/23 13:42:51 $
-++ *  last change: $Author: pmladek $ $Date: 2004/06/29 12:30:05 $
- + *
- + *  The Contents of this file are made available subject to the terms of
- + *  either of the following licenses
diff --git a/app-office/openoffice-ximian/files/1.1.2/print-fontconfig.diff b/app-office/openoffice-ximian/files/1.1.2/print-fontconfig.diff
deleted file mode 100644
index c9eb9bec6f6d..000000000000
--- a/app-office/openoffice-ximian/files/1.1.2/print-fontconfig.diff
+++ /dev/null
@@ -1,876 +0,0 @@
-Index: inc/psprint/fontmanager.hxx
-===================================================================
-RCS file: /cvs/gsl/psprint/inc/psprint/fontmanager.hxx,v
-retrieving revision 1.15.20.1
-diff -u -r1.15.20.1 fontmanager.hxx
---- psprint/inc/psprint/fontmanager.hxx	7 Apr 2004 11:04:23 -0000	1.15.20.1
-+++ psprint/inc/psprint/fontmanager.hxx	9 Jun 2004 04:25:27 -0000
-@@ -81,6 +81,13 @@
- #define ATOM_FAMILYNAME                     2
- #define ATOM_PSNAME                         3
- 
-+#ifdef FONTCONFIG_FONTS
-+extern "C" {
-+  struct _FcFontSet;
-+  struct _FcPattern;
-+};
-+#endif
-+
- /*
-  *  some words on metrics: every length returned by PrintFontManager and
-  *  friends are PostScript afm style, that is they are 1/1000 font height
-@@ -300,7 +307,9 @@
-         int                 m_nDirectory;       // atom containing system dependent path
-         rtl::OString      m_aFontFile;        // relative to directory
-         rtl::OString      m_aMetricFile;      // dito
-+#ifndef FONTCONFIG_FONTS
-         rtl::OString      m_aXLFD;            // mainly for administration, contains the XLFD from fonts.dir
-+#endif
- 
-         /* note: m_aFontFile and Metric file are not atoms
-            because they should be fairly unique */
-@@ -314,7 +323,9 @@
-     {
-         int					    m_nDirectory;       // atom containing system dependent path
-         rtl::OString          m_aFontFile;        // relative to directory
-+#ifndef FONTCONFIG_FONTS
-         rtl::OString          m_aXLFD;            // mainly for administration, contains the XLFD from fonts.dir
-+#endif
-         int                     m_nCollectionEntry; // -1 for regular fonts, 0 to ... for fonts stemming from collections
-         unsigned int           m_nTypeFlags;		// from TrueType file; only known use is for copyright flags
- 
-@@ -367,6 +378,7 @@
-     std::hash_map< fontID, PrintFont* >       m_aFonts;
-     std::hash_map< int, family::type >        m_aFamilyTypes;
-     std::list< rtl::OUString >              m_aPrinterDrivers;
-+#ifndef FONTCONFIG_FONTS
-     std::list< rtl::OString >               m_aFontDirectories;
-     std::list< int >							m_aPrivateFontDirectories;
-     std::map< struct XLFDEntry, std::list< struct XLFDEntry > >
-@@ -374,7 +386,10 @@
-     utl::MultiAtomProvider*                   m_pAtoms;
-     // for speeding up findFontFileID
-     std::hash_map< rtl::OString, std::set< fontID >, rtl::OStringHash >
--    											m_aFontFileToFontID;
-+    						m_aFontFileToFontID;
-+#else
-+    utl::MultiAtomProvider*			m_pAtoms;
-+#endif
- 
-     std::hash_map< rtl::OString, int, rtl::OStringHash >
-     m_aDirToAtom;
-@@ -393,17 +408,40 @@
-     rtl::OString getAfmFile( PrintFont* pFont ) const;
-     rtl::OString getFontFile( PrintFont* pFont ) const;
- 
-+#ifndef FONTCONFIG_FONTS
-+	     void getFontAttributesFromXLFD( PrintFont* pFont, const ByteString& rXLFD ) const;
-+#endif
-+
-     void getFontAttributesFromXLFD( PrintFont* pFont, const std::list< rtl::OString >& rXLFDs ) const;
- 
-     bool analyzeFontFile( int nDirID, const rtl::OString& rFileName, bool bReadFile, const std::list< rtl::OString >& rXLFDs, std::list< PrintFont* >& rNewFonts ) const;
-     rtl::OUString convertTrueTypeName( void* pNameRecord ) const; // actually a NameRecord* formt font subsetting code
-     void analyzeTrueTypeFamilyName( void* pTTFont, std::list< rtl::OUString >& rnames ) const; // actually a TrueTypeFont* from font subsetting code
-     bool analyzeTrueTypeFile( PrintFont* pFont ) const;
-+#ifndef FONTCONFIG_FONTS
-     // finds the FIRST id for this font file; there may be more
-     // for TrueType collections
-     fontID findFontFileID( int nDirID, const rtl::OString& rFile ) const;
-+#endif
-     fontID findFontBuiltinID( int nPSNameAtom ) const;
- 
-+#ifdef FONTCONFIG_FONTS
-+    void getFontAttributesFromFcPattern( PrintFont* pFont, const struct _FcPattern *fc_font) const;
-+    void addFcSystemFont    (struct _FcPattern *fc_pattern);
-+    void addFcSystemFontSet (struct _FcFontSet *fc_set);
-+    int  addFontFile( const ::rtl::OString& rFilePath, const struct _FcPattern *fc_font, bool bMergeBuiltin );
-+#endif
-+    void ensureAnalysed( PrintFont* pFont ) const
-+    {
-+      if ( pFont && pFont->m_nAscend == 0 && pFont->m_nDescend == 0 )
-+       {
-+         if (pFont->m_eType == fonttype::TrueType )
-+           analyzeTrueTypeFile( pFont );
-+         else if (pFont->m_eType == fonttype::Type1 )
-+            pFont->readAfmMetrics( getAfmFile( pFont ), m_pAtoms );
-+       }
-+    }
-+
-     family::type matchFamilyName( const rtl::OUString& rFamily ) const;
- 
-     PrintFont* getFont( fontID nID ) const
-@@ -412,14 +450,18 @@
-         it = m_aFonts.find( nID );
-         return it == m_aFonts.end() ? NULL : it->second;
-     }
-+#ifndef FONTCONFIG_FONTS
-     ByteString getXLFD( PrintFont* pFont ) const;
-+#endif
-     void fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& rInfo ) const;
-     void fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const;
- 
-     const rtl::OString& getDirectory( int nAtom ) const;
-     int getDirectoryAtom( const rtl::OString& rDirectory, bool bCreate = false );
- 
-+#ifndef FONTCONFIG_FONTS
-     void getServerDirectories(); // get font server directories on e.g. redhat
-+#endif
- 
-     static bool parseXLFD( const rtl::OString& rXLFD, XLFDEntry& rEntry );
-     void parseXLFD_appendAliases( const std::list< rtl::OString >& rXLFDs, std::list< XLFDEntry >& rEntries ) const;
-@@ -546,11 +588,13 @@
-     void hasVerticalSubstitutions( fontID nFontID, const sal_Unicode* pCharacters,
-         int nCharacters, bool* pHasSubst ) const;
- 
-+#ifndef FONTCONFIG_FONTS
-     // get the XLFD for a font that originated from the X fontpath
-     // note: this may not be the original line that was in the fonts.dir
-     // returns a string for every font, but only TrueType and Type1
-     // fonts originated from the X font path, so check for the font type
-     rtl::OUString getFontXLFD( fontID nFontID ) const;
-+#endif
- 
-     // get a specific fonts metrics
- 
-@@ -616,6 +660,7 @@
- 
-     // font administration functions
- 
-+#ifndef FONTCONFIG_FONTS
-     // for importFonts to provide the user feedback
-     class ImportFontCallback
-     {
-@@ -648,6 +693,7 @@
-     bool removeFonts( const std::list< fontID >& rFonts );
- 
-     bool isPrivateFontFile( fontID ) const;
-+#endif
- 
-     // returns false if there were not any
-     bool getAlternativeFamilyNames( fontID nFont, std::list< rtl::OUString >& rNames ) const;
-Index: source/fontmanager/fontmanager.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/fontmanager/fontmanager.cxx,v
-retrieving revision 1.39.20.5
-diff -u -r1.39.20.5 fontmanager.cxx
---- psprint/source/fontmanager/fontmanager.cxx	15 Apr 2004 14:28:22 -0000	1.39.20.5
-+++ psprint/source/fontmanager/fontmanager.cxx	9 Jun 2004 04:25:27 -0000
-@@ -140,6 +140,11 @@
- 
- #include <adobeenc.tab> // get encoding table for AFM metrics
- 
-+#ifdef FONTCONFIG_FONTS
-+#include <stdio.h>
-+#include <fontconfig/fontconfig.h>
-+#endif
-+
- #define PRINTER_METRICDIR "fontmetric"
- 
- using namespace utl;
-@@ -169,6 +174,7 @@
-     return nRet;
- }
- 
-+#ifndef FONTCONFIG_FONTS
- static italic::type parseItalic( const ByteString& rItalic )
- {
-     italic::type eItalic = italic::Unknown;
-@@ -180,6 +186,7 @@
-         eItalic = italic::Upright;
-     return eItalic;
- }
-+#endif
- 
- // -------------------------------------------------------------------------
- 
-@@ -220,6 +227,7 @@
- 
- // -------------------------------------------------------------------------
- 
-+#ifndef FONTCONFIG_FONTS
- static width::type parseWidth( const ByteString& rWidth )
- {
-     width::type eWidth = width::Unknown;
-@@ -247,6 +255,7 @@
- 
-     return eWidth;
- }
-+#endif
- 
- // -------------------------------------------------------------------------
- bool PrintFontManager::XLFDEntry::operator<(const PrintFontManager::XLFDEntry& rRight) const
-@@ -1189,6 +1198,178 @@
- }
- 
- // -------------------------------------------------------------------------
-+#ifdef FONTCONFIG_FONTS
-+int PrintFontManager::addFontFile( const OString& rFontPath,
-+				   const FcPattern *fc_font,
-+				   bool bMergeBuiltin)
-+{
-+    sal_Int32 idx;
-+	fontID nNewFontId = 0;
-+    ::std::list< PrintFontManager::PrintFont* > aNewFonts;
-+
-+    idx = rFontPath.lastIndexOf ('/');
-+    if (idx < 0)
-+      {
-+	fprintf (stderr, "Invalid path\n");
-+	return 0;
-+      }
-+    // Split the directory
-+    OString aDir (rFontPath, idx);
-+    // And the filename
-+    OString aFontFile( rFontPath + idx + 1, rFontPath.getLength() - idx - 1);
-+    // And the extension
-+    ByteString aExt( aFontFile.copy( aFontFile.lastIndexOf( '.' )+1 ) );
-+
-+    int nDirID = getDirectoryAtom( aDir, true );
-+	bool bFromCache = false;
-+
-+    if( m_pFontCache->getFontCacheFile( nDirID, aDir, aFontFile, aNewFonts ) )
-+	{
-+#ifdef DEBUG
-+		fprintf( stderr, "Hit cache for '%s'\n", (sal_Char *) rFontPath );
-+#endif
-+		bFromCache = true;
-+	}
-+    else if( aExt.EqualsIgnoreCaseAscii( "pfb" ) || aExt.EqualsIgnoreCaseAscii( "pfa" ) )
-+    {
-+        // check for corresponding afm metric
-+        // first look for an adjacent file
-+
-+        ByteString aName( aFontFile );
-+        aName.Erase( aName.Len()-4 );
-+        aName.Append( ".afm" );
-+        
-+        ByteString aFilePath( aDir );
-+        aFilePath.Append( '/' );
-+        aFilePath.Append( aName );
-+        
-+        ByteString aAfmFile;
-+        if( access( aFilePath.GetBuffer(), F_OK ) )
-+        {
-+            // try in subdirectory afm instead
-+            aFilePath = aDir;
-+            aFilePath.Append( "/afm/" );
-+            aFilePath.Append( aName );
-+            
-+            if( ! access( aFilePath.GetBuffer(), F_OK ) )
-+            {
-+                aAfmFile = "afm/";
-+                aAfmFile += aName;
-+            }
-+        }
-+        else
-+            aAfmFile = aName;
-+
-+        if( aAfmFile.Len() )
-+        {
-+            Type1FontFile* pFont = new Type1FontFile();
-+            pFont->m_nDirectory     = nDirID;
-+
-+            pFont->m_aFontFile      = aFontFile;
-+            pFont->m_aMetricFile    = aAfmFile;
-+
-+			if (fc_font)
-+				getFontAttributesFromFcPattern( pFont, fc_font );
-+            if( ! pFont->readAfmMetrics( getAfmFile( pFont ), m_pAtoms ) )
-+            {
-+                delete pFont;
-+                pFont = NULL;
-+            }
-+            if( pFont )
-+                aNewFonts.push_back( pFont );
-+        }
-+    }
-+    else if( aExt.EqualsIgnoreCaseAscii( "afm" ) )
-+    {
-+        ByteString aFilePath( aDir );
-+        aFilePath.Append( '/' );
-+        aFilePath.Append( ByteString( aFontFile ) );
-+        BuiltinFont* pFont = new BuiltinFont();
-+        pFont->m_nDirectory		= nDirID;
-+        pFont->m_aMetricFile	= aFontFile;
-+        if( pFont->readAfmMetrics( aFilePath, m_pAtoms ) )
-+            aNewFonts.push_back( pFont );
-+        else
-+            delete pFont;
-+    }
-+    else if( aExt.EqualsIgnoreCaseAscii( "ttf" ) )
-+    {
-+        TrueTypeFontFile* pFont     = new TrueTypeFontFile();
-+        pFont->m_nDirectory         = nDirID;
-+        pFont->m_aFontFile          = aFontFile;
-+        pFont->m_nCollectionEntry   = -1;
-+
-+		if( fc_font )
-+			getFontAttributesFromFcPattern( pFont, fc_font );
-+        // need to read the font anyway to get aliases
-+        if( ! analyzeTrueTypeFile( pFont ) )
-+            delete pFont;
-+        else
-+            aNewFonts.push_back( pFont );
-+    }
-+    else if( aExt.EqualsIgnoreCaseAscii( "ttc" ) )
-+    {
-+		int nIndex = 0;
-+
-+		// It would be ideal to use the:
-+		// FcPatternGetInteger (fc_font, FC_INDEX, 0, &nIndex) )
-+		// unfortunately with weak contiguity garrentees from FC,
-+		// and no index support from the font cache this makes
-+		// life nastily painful; so we just copy the existing
-+		// parsing code with no FC support.
-+
-+        // get number of ttc entries
-+        int nLength = CountTTCFonts( rFontPath.getStr() );
-+        if( nLength )
-+        {
-+#if OSL_DEBUG_LEVEL > 1
-+            fprintf( stderr, "%s contains %d fonts\n", rFontPath.getStr(), nLength );
-+#endif
-+            for( int i = 0; i < nLength; i++ )
-+            {
-+                TrueTypeFontFile* pFont     = new TrueTypeFontFile();
-+                pFont->m_nDirectory         = nDirID;
-+                pFont->m_aFontFile          = aFontFile;
-+                pFont->m_nCollectionEntry   = i;
-+
-+                if( ! analyzeTrueTypeFile( pFont ) )
-+                    delete pFont;
-+                else
-+                    aNewFonts.push_back( pFont );
-+            }
-+        }
-+    }
-+
-+    for( ::std::list< PrintFont* >::iterator it = aNewFonts.begin(); it != aNewFonts.end(); ++it )
-+	{
-+		if (!bMergeBuiltin ||
-+			!findFontBuiltinID( (*it)->m_nPSName ) )
-+		{
-+			nNewFontId = m_nNextFontID++;
-+			m_aFonts[ nNewFontId ] = *it;
-+
-+			if (!bFromCache)
-+			{
-+#ifdef DEBUG
-+				fprintf( stderr, "Add font to cache\n" );
-+#endif
-+				m_pFontCache->updateFontCacheEntry( *it, true );
-+			}
-+		}
-+		else
-+			delete (*it);
-+	}
-+
-+	return nNewFontId;
-+}
-+
-+int PrintFontManager::addFontFile( const ::rtl::OString& rFileName, int nFaceNum )
-+{
-+	// Purely for salgdi3 usage ...
-+	return addFontFile( rFileName, NULL, false );
-+}
-+
-+#else
- 
- int PrintFontManager::addFontFile( const ::rtl::OString& rFileName, int nFaceNum )
- {
-@@ -1212,6 +1393,9 @@
-                 m_pFontCache->updateFontCacheEntry( *it, true );
-             }
-         }
-+		else
-+				fprintf (stderr, "analyse font file failed for '%s'\n",
-+						 (const sal_Char *) aName );
-     }
-     return nFontId;
- }
-@@ -1352,6 +1536,7 @@
-     }
-     return ! rNewFonts.empty();
- }
-+#endif
- 
- // -------------------------------------------------------------------------
- 
-@@ -1370,6 +1555,7 @@
- 
- // -------------------------------------------------------------------------
- 
-+#ifndef FONTCONFIG_FONTS
- fontID PrintFontManager::findFontFileID( int nDirID, const OString& rFontFile ) const
- {
-     fontID nID = 0;
-@@ -1649,6 +1835,69 @@
- 
-     return aXLFD;
- }
-+#else /* FONTCONFIG_FONTS */
-+
-+void PrintFontManager::getFontAttributesFromFcPattern( PrintFont* pFont, const FcPattern *fc_font ) const
-+ {
-+    FcChar8 *fc_str;
-+    int      fc_int;
-+
-+    if (!FcPatternGetString (fc_font, FC_FAMILY, 0, &fc_str) && fc_str)
-+	pFont->m_nFamilyName =
-+	  m_pAtoms->getAtom( ATOM_FAMILYNAME,
-+			     String( ByteString((sal_Char *) fc_str ), RTL_TEXTENCODING_UTF8 ),
-+			     sal_True );
-+
-+    if (!FcPatternGetInteger (fc_font, FC_WEIGHT, 0, &fc_int))
-+      {
-+	if (fc_int < FC_WEIGHT_LIGHT)
-+	  pFont->m_eWeight = weight::UltraLight;
-+	else if (fc_int == FC_WEIGHT_LIGHT)
-+	  pFont->m_eWeight = weight::Light;
-+	else if (fc_int < FC_WEIGHT_MEDIUM)
-+	  pFont->m_eWeight = weight::SemiLight;
-+	else if (fc_int == FC_WEIGHT_MEDIUM)
-+	  pFont->m_eWeight = weight::Normal;
-+	else if (fc_int < FC_WEIGHT_DEMIBOLD)
-+	  pFont->m_eWeight = weight::Medium;
-+	else if (fc_int == FC_WEIGHT_DEMIBOLD)
-+	  pFont->m_eWeight = weight::SemiBold;
-+	else if (fc_int <= FC_WEIGHT_BOLD)
-+	  pFont->m_eWeight = weight::Bold;
-+	else if (fc_int < FC_WEIGHT_BLACK)
-+	  pFont->m_eWeight = weight::UltraBold;
-+	else
-+	  pFont->m_eWeight = weight::Black;
-+      }
-+
-+    if (!FcPatternGetInteger (fc_font, FC_SLANT, 0, &fc_int))
-+      {
-+	if (fc_int <= FC_SLANT_ROMAN)
-+	  pFont->m_eItalic = italic::Upright;
-+	else if (fc_int <= FC_SLANT_ITALIC)
-+	  pFont->m_eItalic = italic::Italic;
-+	else if (fc_int <= FC_SLANT_ITALIC)
-+	  pFont->m_eItalic = italic::Oblique;
-+      }
-+
-+    /* FIXME: this used to be parsed from XLFD (parseWidth) */
-+    pFont->m_eWidth = width::Normal;
-+
-+    if (!FcPatternGetInteger (fc_font, FC_SLANT, 0, &fc_int))
-+      {
-+	if (fc_int > FC_PROPORTIONAL && (fc_int <= FC_MONO ||
-+					      fc_int <= FC_CHARCELL))
-+	  pFont->m_ePitch = pitch::Fixed;
-+	else
-+	  pFont->m_ePitch = pitch::Variable;
-+      }
-+     else
-+         pFont->m_ePitch = pitch::Variable;
-+
-+#warning Missing encoding fixup ! 
-+
-+ }
-+#endif
- 
- // -------------------------------------------------------------------------
- 
-@@ -1922,6 +2171,7 @@
- 
- // -------------------------------------------------------------------------
- 
-+#ifndef FONTCONFIG_FONTS
- static void normPath( ByteString& rPath )
- {
-     char buf[PATH_MAX];
-@@ -2023,6 +2273,37 @@
-     }
- }
- 
-+#else
-+
-+void 
-+PrintFontManager::addFcSystemFont (struct _FcPattern *fc_pattern)
-+ {
-+  FcChar8 *fc_str = NULL;
-+  if( FcPatternGetString( fc_pattern, FC_FILE, 0, &fc_str ) || !fc_str)
-+    return;
-+  
-+  OString aFileName( (sal_Char *) fc_str );
-+
-+  addFontFile( aFileName, fc_pattern, false );
-+}
-+
-+void
-+PrintFontManager::addFcSystemFontSet( FcFontSet *fc_set )
-+{
-+  int i;
-+  if (!fc_set)
-+    return;
-+ 
-+  for (i = 0; i < fc_set->nfont; i++)
-+    {
-+      FcPattern *font = fc_set->fonts[i];
-+      if (!font)
-+         continue;
-+      addFcSystemFont( font );
-+    }
-+}
-+#endif
-+
- void PrintFontManager::initialize( void* pInitDisplay )
- {
-     long aDirEntBuffer[ (sizeof(struct dirent)+_PC_NAME_MAX)+1 ];
-@@ -2048,8 +2329,10 @@
-             delete (*it).second;
-         m_nNextFontID = 1;
-         m_aFonts.clear();
-+#ifndef FONTCONFIG_FONTS
-         m_aFontDirectories.clear();
-         m_aPrivateFontDirectories.clear();
-+#endif
-     }
- 
- #if OSL_DEBUG_LEVEL > 1
-@@ -2065,6 +2348,7 @@
-     aStart = times( &tms );
- #endif
- 
-+#ifndef FONTCONFIG_FONTS
-     // part one - look for downloadable fonts
-     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-     const ::rtl::OUString &rSalPrivatePath = psp::getFontPath();
-@@ -2285,6 +2569,15 @@
-                 m_pFontCache->markEmptyDir( nDirID );
-         }
-     }
-+#else /* FONTCONFIG_FONTS */
-+
-+    FcConfig *config = FcInitLoadConfigAndFonts();
-+    if ( !config)
-+      fprintf( stderr, "Can't init fontconfig\n" );
-+
-+    addFcSystemFontSet( FcConfigGetFonts( config, FcSetSystem ) );
-+    addFcSystemFontSet( FcConfigGetFonts( config, FcSetApplication ) );
-+#endif
- 
- #if OSL_DEBUG_LEVEL > 1
-     aStep1 = times( &tms );
-@@ -2297,8 +2590,9 @@
-     std::list< OString > aEmptyFontsDir;
-     for( std::list< OUString >::const_iterator met_dir_it = aMetricDirs.begin(); met_dir_it != aMetricDirs.end(); ++met_dir_it )
-     {
--        OString aDir = OUStringToOString( *met_dir_it, aEncoding );
-+        OString aDir = OUStringToOString( *met_dir_it, osl_getThreadTextEncoding() );
- 
-+#ifndef FONTCONFIG_FONTS
-         // ask the font cache whether it handles this directory
-         std::list< PrintFont* > aCacheFonts;
-         
-@@ -2328,6 +2622,7 @@
-             }
-             continue;
-         }
-+#endif
- 
-         DIR* pDIR = opendir( aDir.getStr() );
-         if( pDIR )
-@@ -2346,10 +2641,17 @@
-                     && S_ISREG( aStat.st_mode )
-                     )
-                 {
-+#ifndef FONTCONFIG_FONTS
-                     OString aFileName( pDirEntry->d_name, strlen( pDirEntry->d_name ) );
-+#else
-+                    OString aFileName( aFile );
-+#endif
-                     OString aExt( aFileName.copy( aFileName.lastIndexOf( '.' )+1 ) );
-                     if( aExt.equalsIgnoreAsciiCase( "afm" ) )
-                     {
-+#ifdef FONTCONFIG_FONTS
-+			    addFontFile( aFileName, NULL, true );
-+#else
-                         ::std::list< PrintFont* > aNewFonts;
- 
-                         analyzeFontFile( nDirID, aFileName, true, aEmptyFontsDir, aNewFonts );
-@@ -2367,6 +2669,7 @@
-                             else
-                                 delete *it;
-                         }
-+#endif
-                     }
-                 }
-             }
-@@ -2523,14 +2826,7 @@
- 
- void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const
- {
--    if( pFont->m_nAscend == 0 && pFont->m_nDescend == 0 )
--    {
--        // might be a truetype font not analyzed or type1 without metrics read
--        if( pFont->m_eType == fonttype::Type1 )
--            pFont->readAfmMetrics( getAfmFile( pFont ), m_pAtoms );
--        else if( pFont->m_eType == fonttype::TrueType )
--            analyzeTrueTypeFile( pFont );
--    }
-+    ensureAnalysed( pFont );
- 
-     fillPrintFontInfo( pFont, static_cast< FastPrintFontInfo& >( rInfo ) );
- 
-@@ -2725,6 +3021,7 @@
- const ::rtl::OUString& PrintFontManager::getFontFamily( fontID nFontID ) const
- {
-     PrintFont* pFont = getFont( nFontID );
-+    ensureAnalysed( pFont );
-     return m_pAtoms->getString( ATOM_FAMILYNAME, pFont ? pFont->m_nFamilyName : INVALID_ATOM );
- }
- 
-@@ -2788,11 +3085,8 @@
- const ::rtl::OUString& PrintFontManager::getPSName( fontID nFontID ) const
- {
-     PrintFont* pFont = getFont( nFontID );
--    if( pFont && pFont->m_nPSName == 0 )
--    {
--        if( pFont->m_eType == fonttype::TrueType )
--            analyzeTrueTypeFile( pFont );
--    }
-+
-+    ensureAnalysed( pFont );
- 
-     return m_pAtoms->getString( ATOM_PSNAME, pFont ? pFont->m_nPSName : INVALID_ATOM );
- }
-@@ -2811,12 +3105,7 @@
- int PrintFontManager::getFontAscend( fontID nFontID ) const
- {
-     PrintFont* pFont = getFont( nFontID );
--    if( pFont->m_nAscend == 0 && pFont->m_nDescend == 0 )
--    {
--        // might be a truetype font not yet analyzed
--        if( pFont->m_eType == fonttype::TrueType )
--            analyzeTrueTypeFile( pFont );
--    }
-+    ensureAnalysed( pFont );
-     return pFont->m_nAscend;
- }
- 
-@@ -2825,12 +3114,7 @@
- int PrintFontManager::getFontDescend( fontID nFontID ) const
- {
-     PrintFont* pFont = getFont( nFontID );
--    if( pFont->m_nAscend == 0 && pFont->m_nDescend == 0 )
--    {
--        // might be a truetype font not yet analyzed
--        if( pFont->m_eType == fonttype::TrueType )
--            analyzeTrueTypeFile( pFont );
--    }
-+    ensureAnalysed( pFont );
-     return pFont->m_nDescend;
- }
- 
-@@ -2839,12 +3123,7 @@
- int PrintFontManager::getFontLeading( fontID nFontID ) const
- {
-     PrintFont* pFont = getFont( nFontID );
--    if( pFont->m_nAscend == 0 && pFont->m_nDescend == 0 )
--    {
--        // might be a truetype font not yet analyzed
--        if( pFont->m_eType == fonttype::TrueType )
--            analyzeTrueTypeFile( pFont );
--    }
-+    ensureAnalysed( pFont );
-     return pFont->m_nLeading;
- }
- 
-@@ -2853,12 +3132,7 @@
- bool PrintFontManager::hasVerticalSubstitutions( fontID nFontID ) const
- {
-     PrintFont* pFont = getFont( nFontID );
--    if( pFont->m_nAscend == 0 && pFont->m_nDescend == 0 )
--    {
--        // might be a truetype font not yet analyzed
--        if( pFont->m_eType == fonttype::TrueType )
--            analyzeTrueTypeFile( pFont );
--    }
-+    ensureAnalysed( pFont );
-     return pFont->m_bHaveVerticalSubstitutedGlyphs;
- }
- 
-@@ -2868,12 +3142,8 @@
-     const sal_Unicode* pCharacters, int nCharacters, bool* pHasSubst ) const
- {
-     PrintFont* pFont = getFont( nFontID );
--    if( pFont->m_nAscend == 0 && pFont->m_nDescend == 0 )
--    {
--        // might be a truetype font not yet analyzed
--        if( pFont->m_eType == fonttype::TrueType )
--            analyzeTrueTypeFile( pFont );
--    }
-+
-+    ensureAnalysed( pFont );
- 
-     if( ! pFont->m_bHaveVerticalSubstitutedGlyphs )
-         memset( pHasSubst, 0, sizeof(bool)*nCharacters );
-@@ -2892,7 +3162,7 @@
- }
- 
- // -------------------------------------------------------------------------
--
-+#ifndef FONTCONFIG_FONTS
- OUString PrintFontManager::getFontXLFD( fontID nFontID ) const
- {
-     PrintFont* pFont = getFont( nFontID );
-@@ -2905,6 +3175,7 @@
-     }
-     return aRet;
- }
-+#endif
- 
- // -------------------------------------------------------------------------
- 
-@@ -2916,6 +3187,7 @@
-     if( ! pFont )
-         return aEmpty;
- 
-+    ensureAnalysed( pFont );
-     if( ! pFont->m_pMetrics || ! pFont->m_pMetrics->m_bKernPairsQueried )
-         pFont->queryMetricPage( 0, m_pAtoms );
-     if( ! pFont->m_pMetrics || ! pFont->m_pMetrics->m_bKernPairsQueried )
-@@ -2969,14 +3241,7 @@
-     if( ! pFont )
-         return false;
- 
--    if( pFont->m_nAscend == 0 && pFont->m_nDescend == 0 )
--    {
--        // might be a font not yet analyzed
--        if( pFont->m_eType == fonttype::Type1 )
--            pFont->readAfmMetrics( getAfmFile( pFont ), m_pAtoms );
--        else if( pFont->m_eType == fonttype::TrueType )
--            analyzeTrueTypeFile( pFont );
--    }
-+    ensureAnalysed( pFont );
- 
-     for( int i = 0; i < nLen; i++ )
-     {
-@@ -3036,7 +3301,7 @@
- }
- 
- // -------------------------------------------------------------------------
--
-+#ifndef FONTCONFIG_FONTS
- static bool createPath( const ByteString& rPath )
- {
-     bool bSuccess = false;
-@@ -3659,6 +3924,7 @@
-     }
-     return rNames.begin() != rNames.end();
- }
-+#endif /* FONTCONFIG_FONTS */
- 
- // -------------------------------------------------------------------------
- 
-Index: source/fontmanager/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/psprint/source/fontmanager/makefile.mk,v
-retrieving revision 1.4
-diff -u -r1.4 makefile.mk
---- psprint/source/fontmanager/makefile.mk	20 Aug 2002 15:00:13 -0000	1.4
-+++ psprint/source/fontmanager/makefile.mk	9 Jun 2004 04:25:27 -0000
-@@ -79,6 +79,9 @@
- 	$(SLO)$/fontcache.obj		\
- 	$(SLO)$/parseAFM.obj
- 
-+.IF "$(FONTCONFIG_FONTS)" == "YES"
-+CFLAGS+=$(FONTCONFIG_CFLAGS) -Wall -DFONTCONFIG_FONTS
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISI"
- NOOPTFILES=$(SLO)$/fontmanager.obj
- .ENDIF
-Index: unx/source/gdi/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/makefile.mk,v
-retrieving revision 1.9
-diff -u -r1.9 makefile.mk
---- vcl/unx/source/gdi/makefile.mk	27 Aug 2002 14:52:35 -0000	1.9
-+++ vcl/unx/source/gdi/makefile.mk	9 Jun 2004 04:26:15 -0000
-@@ -106,6 +106,10 @@
- SLOFILES+=$(SLO)$/salprnpsp.obj
- .ENDIF
- 
-+.IF "$(FONTCONFIG_FONTS)" == "YES"
-+CFLAGS+=$(FONTCONFIG_CFLAGS) -DFONTCONFIG_FONTS
-+.ENDIF
-+
- .IF "$(OS)"=="SOLARIS"
- SLOFILES+=$(SLO)$/cdeint.obj
- ENVCFLAGS+=-DUSE_CDE
-Index: unx/source/gdi/salgdi3.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salgdi3.cxx,v
-retrieving revision 1.105.46.5
-diff -u -r1.105.46.5 salgdi3.cxx
---- vcl/unx/source/gdi/salgdi3.cxx	13 Feb 2004 14:03:54 -0000	1.105.46.5
-+++ vcl/unx/source/gdi/salgdi3.cxx	9 Jun 2004 04:26:15 -0000
-@@ -1741,6 +1741,7 @@
-     else
- #endif
-     {
-+#if defined(NASTY_X_FONTS) || !defined(FONTCONFIG_FONTS)
-         XlfdStorage* pFonts = _GetDisplay()->GetXlfdList();
- 
-         for ( int nIdx = 0; nIdx < pFonts->GetCount(); nIdx++ )
-@@ -1759,6 +1760,7 @@
-                 pList->Add( pFontData );
-             }
-         }
-+#endif
- 
- #ifdef USE_BUILTIN_RASTERIZER
-         aX11GlyphPeer.SetDisplay( maGraphicsData.GetXDisplay(),
-@@ -1807,6 +1809,7 @@
- 
- void SalGraphics::GetDevFontSubstList( OutputDevice* pOutDev )
- {
-+#ifndef FONTCONFIG_FONTS
- #ifndef _USE_PRINT_EXTENSION_
-     if( maGraphicsData.m_pPrinterGfx != NULL )
-     {
-@@ -1818,6 +1821,7 @@
-         }
-     }
- #endif
-+#endif
- }
- 
- // ----------------------------------------------------------------------------
-Index: util/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/util/makefile.mk,v
-retrieving revision 1.47.10.2
-diff -u -r1.47.10.2 makefile.mk
---- vcl/util/makefile.mk	3 Mar 2004 14:33:18 -0000	1.47.10.2
-+++ vcl/util/makefile.mk	9 Jun 2004 04:43:26 -0000
-@@ -234,6 +234,11 @@
- SHL1RES=    $(RES)$/salsrc.res
- .ENDIF
- .ENDIF
-+
-+.IF "$(FONTCONFIG_FONTS)" == "YES"
-+SHL1STDLIBS+=$(FONTCONFIG_LIBS)
-+.ENDIF
-+
- SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
- 
- DEF1NAME    =$(SHL1TARGET)
---- psprint/util/makefile.mk-old	2004-06-27 18:48:42.000000000 +0200
-+++ psprint/util/makefile.mk	2004-06-27 18:48:12.000000000 +0200
-@@ -105,6 +105,10 @@
-			$(TOOLSLIB) 		\
- 			$(SALLIB)			\
- 			-lX11
-+.IF "$(FONTCONFIG_FONTS)" == "YES"
-+SHL1STDLIBS+=$(FONTCONFIG_LIBS)
-+.ENDIF
-+
- .IF "$(SOLAR_JAVA)"!=""
- SHL1STDLIBS+=$(JVMACCESSLIB)
- .ENDIF
diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.60 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.60
deleted file mode 100644
index 0cd394c3dd3b..000000000000
--- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.60
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 d6fd3f6cb34bdbc14287460e1cfa3f76 OOo_1.1.2_source.tar.gz 220632989
-MD5 02ec567fcaff657c9927fe7bd82ab7dd ooo-build-1.1.60.tar.gz 2095752
-MD5 5157d4453d17cae586ce24989d34357a ooo-KDE_icons-OOO_1_1-0.1.tar.gz 1037481
-MD5 32a0e62f89ef36a91437fc705fbe6440 ooo-icons-OOO_1_1-9.tar.gz 1561812
diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.0 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.0
new file mode 100644
index 000000000000..0a8937fa90ef
--- /dev/null
+++ b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.0
@@ -0,0 +1,4 @@
+MD5 d6fd3f6cb34bdbc14287460e1cfa3f76 OOo_1.1.2_source.tar.gz 220632989
+MD5 9772e0deeb9f25dca34a71ad321de4cb ooo-build-1.3.0.tar.gz 2649158
+MD5 50486f5208ec5ae7af1dbb8f9e77cb12 ooo-KDE_icons-OOO_1_1-0.2.tar.gz 1024910
+MD5 be79d3cb5f64d2c0ac8a75e65a59cb09 ooo-icons-OOO_1_1-10.tar.gz 1563326
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.0.ebuild
index c154ae19ab75..433cdb00b962 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.60.ebuild,v 1.8 2004/08/01 13:19:08 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.0.ebuild,v 1.1 2004/08/20 06:24:29 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -32,9 +32,9 @@ IUSE="gnome kde ooo-kde"
 
 OO_VER=1.1.2
 PATCHLEVEL=OOO_1_1_2
-ICON_VER=OOO_1_1-9
-KDE_ICON_VER=OOO_1_1-0.1
-KDE_ICON_PATH=documents/159/1785
+ICON_VER=OOO_1_1-10
+KDE_ICON_VER=OOO_1_1-0.2
+KDE_ICON_PATH=documents/159/1929
 INSTDIR="/opt/Ximian-OpenOffice"
 PATCHDIR=${WORKDIR}/ooo-build-${PV}
 S="${WORKDIR}/oo_${OO_VER}_src"
@@ -225,38 +225,17 @@ src_unpack() {
 	cd ${WORKDIR}
 	unpack ${A}
 
-	#Fix Sandbox problems with scale-icons script
-	cd ${PATCHDIR}
-	epatch ${FILESDIR}/${OO_VER}/fixscale.patch
-
-	#Fix problems with newer curl versions
-	epatch ${FILESDIR}/${OO_VER}/curlfix.patch
-
-	#Exchange faulty patch
-	rm patches/OOO_1_1/print-fontconfig.diff || die
-	cp ${FILESDIR}/${OO_VER}/print-fontconfig.diff patches/OOO_1_1/ || die
-
-	#Beginnings of our own patchset
-	epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.patch
-
-	cd ${PATCHDIR}/patches/OOO_1_1/
-	epatch ${FILESDIR}/${OO_VER}/nativefix.diff
-
 	#Still needed: The STLport patch
 	cd ${S}
 	rm stlport/STLport-4.5.3.patch
 	epatch ${FILESDIR}/${OO_VER}/newstlportfix.patch
 
-	if [ ${ARCH} = "sparc" ]; then
-		epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-sparc64-fix.patch
-	fi
-
 	if use ooo-kde; then
 		DISTRO=KDE
 		ICONDIR=${WORKDIR}/ooo-KDE_icons-${KDE_ICON_VER}
 		WIDGETSET=kde
 	else
-		DISTRO=Gentoo
+		DISTRO=NLD
 		ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
 		WIDGETSET=gtk
 	fi
@@ -346,7 +325,7 @@ src_compile() {
 		--with-system-xrender \
 		--disable-java \
 		--disable-mozilla \
-		--with-widgetset=${WIDGETSET}"
+		--enable-${WIDGETSET}"
 	./configure ${myconf} || die
 
 	cd ${S}