New version of nvu, latest comming once I figure out where they hid it. Thanks to Jory A. Pratt for both the patches and putting up with me :P.

(Portage version: 2.0.51.19)

7 files changed, 489 insertions, 6 deletions

diff --git a/net-www/nvu/ChangeLog b/net-www/nvu/ChangeLog
index eca97d4b31d7..9bb001d550cd 100644
--- a/net-www/nvu/ChangeLog
+++ b/net-www/nvu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/nvu
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/nvu/ChangeLog,v 1.11 2004/12/21 18:07:14 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/nvu/ChangeLog,v 1.12 2005/03/11 06:27:44 chriswhite Exp $
+
+*nvu-0.81 (11 Mar 2005)
+
+  11 Mar 2005; Chris White <chriswhite@gentoo.org> +files/mozconfig2,
+  +files/nvu-0.50-freetype-compile.patch, +nvu-0.81.ebuild:
+  New version of nvu, latest comming once I figure out where they hid it.
+  Thanks to Jory A. Pratt for both the patches and putting up with me :P.
 
   22 Dec 2004; Chris White <chriswhite@gentoo.org> files/nvu.desktop:
   Fixed a typo in the .desktop file as per Bug #75010.
diff --git a/net-www/nvu/files/digest-nvu-0.81 b/net-www/nvu/files/digest-nvu-0.81
new file mode 100644
index 000000000000..236fab3ee324
--- /dev/null
+++ b/net-www/nvu/files/digest-nvu-0.81
@@ -0,0 +1 @@
+MD5 7287dca818596df8f58031af7819c330 nvu-0.81-sources.tar.bz2 29706074
diff --git a/net-www/nvu/files/mozconfig2 b/net-www/nvu/files/mozconfig2
new file mode 100644
index 000000000000..be4da7f65981
--- /dev/null
+++ b/net-www/nvu/files/mozconfig2
@@ -0,0 +1,63 @@
+export MOZILLA_OFFICIAL=1
+export BUILD_OFFICIAL=1
+
+export MOZ_STANDALONE_COMPOSER=1
+mk_add_options MOZ_STANDALONE_COMPOSER=1
+
+# if you want don't want to use gcc and g++ or want to use
+# a specific version of the compilers, specify it in the
+# two following lines and uncomment them
+#export CC="gcc-3.0"
+#export CXX="g++-3.0"
+
+# Uncomment the 3 following lines on Debian (this includes
+# Linspire)
+#export OS_LIBS="-lc -lpthread"
+#export CFLAGS="-DDEBIAN"
+#export CXXFLAGS="-DDEBIAN"
+
+# Uncomment the two following lines on Linspire
+#export LINSPIRE=1
+#mk_add_options LINSPIRE=1
+
+# Uncomment and edit this line if you want to build
+# outside of the source tree
+#mk_add_options MOZ_OBJDIR=/home/glazman/nvu-0.50
+
+# Uncomment the following lines for an optimized build
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+
+# You may need to uncomment and edit that line. On Linspire,
+# just uncomment it
+ac_add_options --with-default-mozilla-five-home=/usr/lib/nvu
+
+# You probably have nothing to change below that line
+ac_add_options  --disable-svg
+ac_add_options  --without-system-mng
+ac_add_options  --without-system-png
+ac_add_options  --disable-ldap
+ac_add_options  --disable-mailnews
+ac_add_options  --disable-installer
+ac_add_options  --disable-activex
+ac_add_options  --disable-activex-scripting
+ac_add_options  --disable-tests
+ac_add_options  --disable-oji
+ac_add_options  --disable-necko-disk-cache
+ac_add_options  --disable-profilesharing
+ac_add_options  --enable-extensions=wallet,xml-rpc,xmlextras,pref,universalchardet,editor/cascades,spellcheck
+ac_add_options  --enable-image-decoders=png,gif,jpeg
+ac_add_options  --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data
+ac_add_options  --disable-pedantic
+ac_add_options  --disable-short-wchar
+ac_add_options  --enable-xprint
+ac_add_options  --enable-strip-libs
+ac_add_options  --enable-crypto
+ac_add_options  --disable-mathml
+ac_add_options  --with-system-zlib
+ac_add_options  --enable-freetype2
+ac_add_options  --enable-toolkit=gtk2
+ac_add_options  --enable-default-toolkit=gtk2
+ac_add_options  --enable-xft
+ac_add_options  --prefix=/usr
+ac_add_options  --enable-single-profile
diff --git a/net-www/nvu/files/nvu-0.50-freetype-compile.patch b/net-www/nvu/files/nvu-0.50-freetype-compile.patch
new file mode 100644
index 000000000000..0bef6ad0a0f5
--- /dev/null
+++ b/net-www/nvu/files/nvu-0.50-freetype-compile.patch
@@ -0,0 +1,339 @@
+diff -ru ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h ./extensions/transformiix/source/base/ErrorObserver.h
+--- ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h 2003-01-17 21:39:36.000000000 +0900
++++ ./extensions/transformiix/source/base/ErrorObserver.h   2004-06-10 22:56:01.000000000 +0900
+@@ -28,7 +28,8 @@
+ 
+ #include "baseutils.h"
+ #include "txError.h"
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ class nsAString;
+ 
+ /**
+diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
+--- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl    2004-04-16 10:09:33.000000000 +0900
++++ ./gfx/idl/nsIFreeType2.idl  2004-06-11 00:32:42.000000000 +0900
+@@ -76,10 +76,11 @@
+ native FT_Sfnt_Tag(FT_Sfnt_Tag);
+ native FT_Size(FT_Size);
+ 
+-[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
++[ptr] native FTC_ImageType_p(FTC_ImageType);
+ native FTC_Face_Requester(FTC_Face_Requester);
+ native FTC_Font(FTC_Font);
+-native FTC_Image_Cache(FTC_Image_Cache);
++native FTC_FaceID(FTC_FaceID);
++native FTC_ImageCache(FTC_ImageCache);
+ native FTC_Manager(FTC_Manager);
+ 
+ // #ifdef MOZ_SVG
+@@ -99,7 +100,7 @@
+ 
+     readonly attribute FT_Library library;
+     readonly attribute FTC_Manager FTCacheManager;
+-    readonly attribute FTC_Image_Cache ImageCache;
++    readonly attribute FTC_ImageCache ImageCache;
+ 
+     void    doneFace(in FT_Face face);
+     void    doneFreeType(in FT_Library lib);
+@@ -115,16 +116,16 @@
+     void    outlineDecompose(in FT_Outline_p outline,
+                              in const_FT_Outline_Funcs_p funcs, in voidPtr p);
+     void    setCharmap(in FT_Face face, in FT_CharMap charmap);
+-    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
++    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
+                              in FT_UInt gindex, out FT_Glyph glyph);
+-    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
+-                              out FT_Face face, out FT_Size size);
++    void    managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
++                              out FT_Face face);
+     void    managerDone(in FTC_Manager manager);
+     void    managerNew(in FT_Library lib, in FT_UInt max_faces,
+                        in FT_UInt max_sizes, in FT_ULong max_bytes,
+                        in FTC_Face_Requester requester, in FT_Pointer req_data,
+                        out FTC_Manager manager);
+-    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
++    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
+ /* #ifdef MOZ_SVG */
+     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
+                         in FT_Vector_p delta);
+$NetBSD: patch-ai,v 1.9 2004/06/21 14:14:00 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp
+--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp  2004-02-05 10:57:05.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.cpp    2004-06-10 23:00:08.000000000 +0900
+@@ -1141,10 +1141,10 @@
+   
+   mPixelSize = NSToIntRound(app2dev * mFont->size);
+ 
+-  mImageDesc.font.face_id    = (void*)mEntry;
+-  mImageDesc.font.pix_width  = mPixelSize;
+-  mImageDesc.font.pix_height = mPixelSize;
+-  mImageDesc.image_type = 0;
++  mImageDesc->face_id = (FTC_FaceID)&mEntry;
++  mImageDesc->width  = mPixelSize;
++  mImageDesc->height = mPixelSize;
++  mImageDesc->flags = 0;
+ 
+   nsresult rv;
+   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
+@@ -1190,7 +1190,7 @@
+   if (!face)
+     return 0;
+ 
+-  FTC_Image_Cache iCache;
++  FTC_ImageCache iCache;
+   nsresult rv = mFt2->GetImageCache(&iCache);
+   if (NS_FAILED(rv)) {
+     NS_ERROR("Failed to get Image Cache");
+@@ -1228,8 +1228,8 @@
+   
+   FTC_Manager cManager;
+   mFt2->GetFTCacheManager(&cManager);
+-  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
+-                                        &face, nsnull);
++  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
++                                        &face);
+   NS_ASSERTION(rv==0, "failed to get face/size");
+   if (rv)
+     return nsnull;
+@@ -1622,16 +1622,16 @@
+   mEntry->GetFamilyName(fontName);
+   mEntry->GetStyleName(styleName);
+   
+-  mImageDesc.font.face_id    = (void*)mEntry;
++  mImageDesc->face_id = (FTC_FaceID)&mEntry;
+   // TT glyph has no relation to size
+-  mImageDesc.font.pix_width  = 16;
+-  mImageDesc.font.pix_height = 16;
+-  mImageDesc.image_type = 0;
++  mImageDesc->width  = 16;
++  mImageDesc->height = 16;
++  mImageDesc->flags = 0;
+   FT_Face face = nsnull;
+   FTC_Manager cManager;
+   mFt2->GetFTCacheManager(&cManager);
+-  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
+-                                        &face, nsnull);
++  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
++                                        &face);
+   if (NS_FAILED(rv))
+     return;
+ 
+$NetBSD: patch-aj,v 1.10 2004/06/21 14:14:00 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h
+--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h   2004-04-17 06:31:42.000000000 +0900
++++ ./gfx/src/freetype/nsFreeType.h 2004-06-10 23:03:07.000000000 +0900
+@@ -104,13 +104,13 @@
+ typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
+ typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
+ typedef FT_Error (*FTC_Image_Cache_Lookup_t)
+-                      (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
+-typedef FT_Error (*FTC_Manager_Lookup_Size_t)
+-                      (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
++                      (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
++typedef FT_Error (*FTC_Manager_LookupFace_t)
++                      (FTC_Manager, FTC_FaceID, FT_Face*);
+ typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
+ typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
+                        FTC_Face_Requester, FT_Pointer, FTC_Manager*);
+-typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
++typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
+ // #ifdef MOZ_SVG
+ typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
+ typedef FT_Error (*FT_Get_Kerning_t)
+@@ -165,7 +165,7 @@
+   FT_Outline_Decompose_t    nsFT_Outline_Decompose;
+   FT_Set_Charmap_t          nsFT_Set_Charmap;
+   FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
+-  FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
++  FTC_Manager_LookupFace_t  nsFTC_Manager_LookupFace;
+   FTC_Manager_Done_t        nsFTC_Manager_Done;
+   FTC_Manager_New_t         nsFTC_Manager_New;
+   FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
+@@ -213,7 +213,7 @@
+   PRLibrary      *mSharedLib;
+   FT_Library      mFreeTypeLibrary;
+   FTC_Manager     mFTCacheManager;
+-  FTC_Image_Cache mImageCache;
++  FTC_ImageCache  mImageCache;
+ 
+   static nsHashtable   *sFontFamilies;
+   static nsHashtable   *sRange1CharSetNames;
+$NetBSD: patch-ak,v 1.11 2004/06/21 14:14:00 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp
+--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp 2004-02-08 00:22:30.000000000 +0900
++++ ./gfx/src/freetype/nsFreeType.cpp   2004-06-10 23:05:42.000000000 +0900
+@@ -110,11 +110,11 @@
+   {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
+   {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
+   {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
+-  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
+-  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
++  {"FTC_ImageCache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),   PR_TRUE},
++  {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace),   PR_TRUE},
+   {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
+   {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
+-  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
++  {"FTC_ImageCache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),      PR_TRUE},
+ // #ifdef MOZ_SVG
+   {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
+   {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
+@@ -282,7 +282,7 @@
+ } 
+  
+ NS_IMETHODIMP
+-nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
++nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
+                               FT_UInt glyphID, FT_Glyph *glyph)
+ { 
+   // call the FreeType2 function via the function pointer
+@@ -291,11 +291,11 @@
+ } 
+  
+ NS_IMETHODIMP
+-nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
+-                               FT_Face *face, FT_Size *size)
++nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
++                               FT_Face *face)
+ { 
+   // call the FreeType2 function via the function pointer
+-  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
++  FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
+   return error ? NS_ERROR_FAILURE : NS_OK;
+ } 
+  
+@@ -320,7 +320,7 @@
+ } 
+  
+ NS_IMETHODIMP
+-nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
++nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
+ { 
+   // call the FreeType2 function via the function pointer
+   FT_Error error = nsFTC_Image_Cache_New(manager, cache);
+@@ -389,7 +389,7 @@
+ } 
+  
+ NS_IMETHODIMP
+-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
++nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
+ {
+   *aCache = mImageCache;
+   return NS_OK;
+$NetBSD: patch-al,v 1.9 2004/06/21 14:14:00 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h
+--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h    2003-04-23 01:25:09.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.h  2004-06-10 23:06:23.000000000 +0900
+@@ -320,7 +320,7 @@
+   nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
+   nsCOMPtr<nsIFreeType2> mFt2;
+   PRUint16        mPixelSize;
+-  FTC_Image_Desc  mImageDesc;
++  FTC_ImageType   mImageDesc;
+ 
+ 
+   static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
+@@ -363,7 +363,7 @@
+ protected:
+   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
+   nsCOMPtr<nsIFreeType2> mFt2;
+-  FTC_Image_Desc  mImageDesc;
++  FTC_ImageType   mImageDesc;
+ };
+ #endif
+ 
+$NetBSD: patch-an,v 1.7 2004/06/21 14:14:00 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h
+--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h  2003-04-23 01:25:13.000000000 +0900
++++ ./gfx/src/x11shared/nsFontFreeType.h    2004-06-10 23:06:35.000000000 +0900
+@@ -110,7 +110,7 @@
+   XImage *GetXImage(PRUint32 width, PRUint32 height);
+   nsITrueTypeFontCatalogEntry *mFaceID;
+   PRUint16        mPixelSize;
+-  FTC_Image_Desc  mImageDesc;
++  FTC_ImageType   mImageDesc;
+   nsCOMPtr<nsIFreeType2> mFt2;
+ };
+ 
+$NetBSD: patch-ao,v 1.5 2004/06/21 14:14:00 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
+--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp    2003-12-25 17:24:52.000000000 +0900
++++ ./gfx/src/x11shared/nsFontFreeType.cpp  2004-06-10 23:06:38.000000000 +0900
+@@ -177,7 +177,7 @@
+   FTC_Manager mgr;
+   nsresult rv;
+   mFt2->GetFTCacheManager(&mgr);
+-  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
++  rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
+   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
+   if (NS_FAILED(rv))
+     return nsnull;
+@@ -191,22 +191,15 @@
+   PRBool embedded_bimap = PR_FALSE;
+   mFaceID = aFaceID;
+   mPixelSize = aPixelSize;
+-  mImageDesc.font.face_id    = (void*)mFaceID;
+-  mImageDesc.font.pix_width  = aPixelSize;
+-  mImageDesc.font.pix_height = aPixelSize;
+-  mImageDesc.image_type = 0;
++  mImageDesc->face_id = (FTC_FaceID)&mFaceID;
++  mImageDesc->width  = aPixelSize;
++  mImageDesc->height = aPixelSize;
++  mImageDesc->flags = 0;
+ 
+   if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
+-    mImageDesc.image_type |= ftc_image_mono;
+     anti_alias = PR_FALSE;
+   }
+ 
+-  if (nsFreeType2::gFreeType2Autohinted)
+-    mImageDesc.image_type |= ftc_image_flag_autohinted;
+-
+-  if (nsFreeType2::gFreeType2Unhinted)
+-    mImageDesc.image_type |= ftc_image_flag_unhinted;
+-
+   PRUint32  num_embedded_bitmaps, i;
+   PRInt32*  embedded_bitmapheights;
+   mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
+@@ -218,7 +211,6 @@
+         if (embedded_bitmapheights[i] == aPixelSize) {
+           embedded_bimap = PR_TRUE;
+           // unhinted must be set for embedded bitmaps to be used
+-          mImageDesc.image_type |= ftc_image_flag_unhinted;
+           break;
+         }
+       }
+@@ -312,7 +304,7 @@
+   if (!face)
+     return NS_ERROR_FAILURE;
+ 
+-  FTC_Image_Cache icache;
++  FTC_ImageCache icache;
+   mFt2->GetImageCache(&icache);
+   if (!icache)
+     return NS_ERROR_FAILURE;
+@@ -401,7 +393,7 @@
+   if (!face)
+     return 0;
+ 
+-  FTC_Image_Cache icache;
++  FTC_ImageCache icache;
+   mFt2->GetImageCache(&icache);
+   if (!icache)
+     return 0;
+@@ -723,7 +715,7 @@
+     if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
+ #endif
+ 
+-  FTC_Image_Cache icache;
++  FTC_ImageCache icache;
+   mFt2->GetImageCache(&icache);
+   if (!icache)
+     return 0; 
diff --git a/net-www/nvu/nvu-0.50.ebuild b/net-www/nvu/nvu-0.50.ebuild
index e0f882bba514..c9356dc377e9 100644
--- a/net-www/nvu/nvu-0.50.ebuild
+++ b/net-www/nvu/nvu-0.50.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/nvu/nvu-0.50.ebuild,v 1.8 2004/11/27 14:51:05 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/nvu/nvu-0.50.ebuild,v 1.9 2005/03/11 06:27:44 chriswhite Exp $
 
 inherit eutils mozilla flag-o-matic
 
diff --git a/net-www/nvu/nvu-0.60.ebuild b/net-www/nvu/nvu-0.60.ebuild
index 2803c191a668..5cf2687c62d5 100644
--- a/net-www/nvu/nvu-0.60.ebuild
+++ b/net-www/nvu/nvu-0.60.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/nvu/nvu-0.60.ebuild,v 1.1 2004/12/09 05:20:17 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/nvu/nvu-0.60.ebuild,v 1.2 2005/03/11 06:27:44 chriswhite Exp $
 
 inherit eutils mozilla flag-o-matic
 
diff --git a/net-www/nvu/nvu-0.81.ebuild b/net-www/nvu/nvu-0.81.ebuild
new file mode 100644
index 000000000000..94402706cdf5
--- /dev/null
+++ b/net-www/nvu/nvu-0.81.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/nvu/nvu-0.81.ebuild,v 1.1 2005/03/11 06:27:44 chriswhite Exp $
+
+inherit eutils mozilla flag-o-matic
+
+DESCRIPTION="A WYSIWG web editor for linux similiar to Dreamweaver"
+HOMEPAGE="http://www.nvu.com/"
+SRC_URI="http://cvs.nvu.com/download/${P}-sources.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE=""
+DEPEND="sys-apps/gawk
+	dev-lang/perl
+	app-doc/doxygen
+	>=media-libs/freetype-2.1.9-r1"
+
+S=${WORKDIR}/mozilla
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# Fix those darn directories!  Make something more "standard"
+	# That can extend to future versions with much more ease. - Chris
+	epatch ${FILESDIR}/nvu-0.50-dir.patch
+	epatch ${FILESDIR}/nvu-0.50-freetype-compile.patch
+
+	# I had to manually edit the mozconfig.linux file as it
+	# has some quirks... just copy the darn thing over :) - Chris
+	# cp ${FILESDIR}/mozconfig ${S}/.mozconfig
+	# remove --enable-optimize and let the code below
+	# add the appropriate one - basic
+	grep -v enable-optimize ${FILESDIR}/mozconfig2 > .mozconfig
+
+	# copied from mozilla.eclass (modified slightly),
+	# otherwise it defaults to -O which crashes on startup for me - basic
+	# Set optimization level based on CFLAGS
+	if is-flag -O0; then
+		echo 'ac_add_options --enable-optimize=-O0' >> .mozconfig
+	elif [[ ${ARCH} == alpha || ${ARCH} == amd64 || ${ARCH} == ia64 ]]; then
+		# more than -O1 causes segfaults on 64-bit (bug 33767)
+		echo 'ac_add_options --enable-optimize=-O1' >> .mozconfig
+	elif is-flag -O1; then
+		echo 'ac_add_options --enable-optimize=-O1' >> .mozconfig
+	else
+		# mozilla fallback
+		echo 'ac_add_options --enable-optimize=-O2' >> .mozconfig
+	fi
+}
+
+src_compile() {
+	# The build system is a weeee bit sensitive to naughty -O flags.
+	# filter them out and let the build system figure out what
+	# won't let it die :) - Chris
+	filter-flags '-O*'
+	# epatch ${FILESDIR}/nvu-0.80-mozconfig.patch
+
+	make -f client.mk build_all
+}
+
+src_install() {
+
+	# patch the final nvu binary to workaround bug #67658
+	epatch ${FILESDIR}/nvu-0.50-nvu.patch
+
+	make -f client.mk DESTDIR=${D} install || die
+
+	#menu entry for gnome/kde
+	insinto /usr/share/applications
+	doins ${FILESDIR}/nvu.desktop
+}