Forgot to remove useless patches now.

(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)

4 files changed, 6 insertions, 317 deletions

diff --git a/app-text/htmltidy/ChangeLog b/app-text/htmltidy/ChangeLog
index ed2f1b545a17..b54cf2123acb 100644
--- a/app-text/htmltidy/ChangeLog
+++ b/app-text/htmltidy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/htmltidy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.58 2010/12/01 14:44:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.59 2010/12/01 14:54:15 flameeyes Exp $
+
+  01 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/03-html2db-null.patch, -files/04-htmltidy-docbook.patch,
+  -files/05-htmltidy-docbook.patch:
+  Forgot to remove useless patches now.
 
   01 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org> -htmltidy-4.8.6.ebuild,
   -htmltidy-5.10.26-r2.ebuild:
diff --git a/app-text/htmltidy/files/03-html2db-null.patch b/app-text/htmltidy/files/03-html2db-null.patch
deleted file mode 100644
index 926f57b9caf6..000000000000
--- a/app-text/htmltidy/files/03-html2db-null.patch
+++ /dev/null
@@ -1,117 +0,0 @@
---- html2b-unpatched/html2db/main.c	2003-03-11 04:28:46.000000000 +0800
-+++ html2db/main.c	2003-11-08 12:32:41.000000000 +0800
-@@ -75,8 +75,8 @@
-         doc = tidyDocToImpl( tdoc );
-         out = FileOutput(stdout, 0, '\n');
-         doc->docOut = out;
--        PrintSgml( doc, 0, 0, doc->root );
--        doc->docOut = null;
-+        PrintSgml( doc, 0, 0, &( doc->root ) );
-+        doc->docOut = NULL;
-     }
-     else {
-         fprintf(stderr, "Problem parsing file %s\n", file); 
---- html2b-unpatched/html2db/pprint.c	2003-05-05 22:23:30.000000000 +0800
-+++ html2db/pprint.c	2003-11-08 12:34:42.000000000 +0800
-@@ -341,7 +341,7 @@
-     Node *parent;
-     
-     for (parent = element->parent;
--            parent != null; parent = parent->parent)
-+            parent != NULL; parent = parent->parent)
-     {   if (parent->element && tmbstrcasecmp(parent->element, "address") == 0)
-             return yes;
-     }
-@@ -488,7 +488,7 @@
-     Bool xhtml = cfgBool( doc, TidyXhtmlOut);
-     uint spaces = cfg( doc, TidyIndentSpaces );
- 
--    if (node == null)
-+    if (node == NULL)
-         return;
-     
-     if (node->type == TextNode) {
-@@ -521,7 +521,7 @@
-     else if (node->type == RootNode)
-     {
-         for (content = node->content;
--                content != null;
-+                content != NULL;
-                 content = content->next)
-            PrintSgml(doc, mode, indent, content);
-     }
-@@ -565,7 +565,7 @@
-             PFlushLine(doc, indent);
- 
-             for (content = node->content;
--                    content != null;
-+                    content != NULL;
-                     content = content->next)
-                 PrintSgml(doc, (mode | PREFORMATTED | NOWRAP), 
-                             indent, content);
-@@ -574,7 +574,7 @@
-             PrintSgmlTag(doc, mode, indent, node, SgmlTagEnd);
-             PFlushLine(doc, indent);
- 
--            if ( !cfg(doc, TidyIndentContent) && node->next != null )
-+            if ( !cfg(doc, TidyIndentContent) && node->next != NULL )
-                 PFlushLine(doc, indent);
-         }
-         else if (node->tag->model & CM_INLINE)
-@@ -586,7 +586,7 @@
-                 indent += spaces;
- 
-                 for (content = node->content;
--                        content != null;
-+                        content != NULL;
-                         content = content->next)
-                     PrintSgml(doc, mode, indent, content);
- 
-@@ -598,7 +598,7 @@
-             {
- 
-                 for (content = node->content;
--                        content != null;
-+                        content != NULL;
-                         content = content->next)
-                     PrintSgml(doc, mode, indent, content);
-             }
-@@ -607,7 +607,7 @@
-         }
-         else 
-         {   PCondFlushLine(doc, indent);
--/*            if (TidySmartIndent && node->prev != null)
-+/*            if (TidySmartIndent && node->prev != NULL)
-                 PFlushLine(doc, indent);
- */
-             PrintSgmlTag(doc, mode ,indent, node, SgmlTagStart);
-@@ -623,7 +623,7 @@
-                 indent += spaces;
- 
-                 for (content = node->content;
--                        content != null;
-+                        content != NULL;
-                         content = content->next)
-                     PrintSgml(doc, mode, indent, content);
-                 PCondFlushLine(doc, indent);
-@@ -632,9 +632,9 @@
-             }
-             else
-             {   Node *last;
--                last = null;
-+                last = NULL;
-                 for (content = node->content;
--                        content != null;
-+                        content != NULL;
-                         content = content->next) {
-                     /* kludge for naked text before block level tag */
-                     if (last && !cfg(doc, TidyIndentContent) && 
-@@ -654,7 +654,7 @@
-             PrintSgmlTag(doc, mode, indent, node, SgmlTagEnd);
-             PFlushLine(doc, indent);
-             if (cfg(doc, TidyIndentContent) == no &&
--                node->next != null &&
-+                node->next != NULL &&
-                 TidyHideEndTags == no &&
-                 (node->tag->model & (CM_BLOCK|CM_LIST|CM_DEFLIST|CM_TABLE)))
-                 PFlushLine(doc, indent);
diff --git a/app-text/htmltidy/files/04-htmltidy-docbook.patch b/app-text/htmltidy/files/04-htmltidy-docbook.patch
deleted file mode 100644
index 5e6cb1cec139..000000000000
--- a/app-text/htmltidy/files/04-htmltidy-docbook.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- src/pprint.c.orig	2004-08-02 16:14:50.000000000 +0900
-+++ src/pprint.c	2004-08-18 08:49:24.000000000 +0900
-@@ -40,7 +40,7 @@
- static int  TextEndsWithNewline( Lexer *lexer, Node *node, uint mode );
- static int  TextStartsWithWhitespace( Lexer *lexer, Node *node, uint start, uint mode );
- static Bool InsideHead( TidyDocImpl* doc, Node *node );
--static Bool ShouldIndent( TidyDocImpl* doc, Node *node );
-+Bool ShouldIndent( TidyDocImpl* doc, Node *node );
- 
- #if SUPPORT_ASIAN_ENCODINGS
- /* #431953 - start RJ Wraplen adjusted for smooth international ride */
-@@ -704,7 +704,7 @@
-     }
- }
- 
--static void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
-+void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
- {
-     tmbchar entity[128];
-     ctmbstr p;
-@@ -939,7 +939,7 @@
-   to UTF-8 is deferred to the WriteChar() routine called
-   to flush the line buffer.
- */
--static void PPrintText( TidyDocImpl* doc, uint mode, uint indent,
-+void PPrintText( TidyDocImpl* doc, uint mode, uint indent,
-                         Node* node  )
- {
-     uint start = node->start;
-@@ -980,15 +980,13 @@
-     }
- }
- 
--#if 0
--static void PPrintString( TidyDocImpl* doc, uint indent, ctmbstr str )
-+void PPrintString( TidyDocImpl* doc, uint indent, ctmbstr str )
- {
- #pragma unused(indent)
- 
-     while ( *str != '\0' )
-         AddChar( &doc->pprint, *str++ );
- }
--#endif /* 0 */
- 
- 
- static void PPrintAttrValue( TidyDocImpl* doc, uint indent,
-@@ -1384,7 +1382,7 @@
-     AddChar( pprint, '>' );
- }
- 
--static void PPrintComment( TidyDocImpl* doc, uint indent, Node* node )
-+void PPrintComment( TidyDocImpl* doc, uint indent, Node* node )
- {
-     TidyPrintImpl* pprint = &doc->pprint;
- 
-@@ -1471,7 +1469,7 @@
-     PCondFlushLine( doc, indent );
- }
- 
--static void PPrintPI( TidyDocImpl* doc, uint indent, Node *node )
-+void PPrintPI( TidyDocImpl* doc, uint indent, Node *node )
- {
-     TidyPrintImpl* pprint = &doc->pprint;
-     tchar c;
-@@ -1502,7 +1500,7 @@
-     PCondFlushLine( doc, indent );
- }
- 
--static void PPrintXmlDecl( TidyDocImpl* doc, uint indent, Node *node )
-+void PPrintXmlDecl( TidyDocImpl* doc, uint indent, Node *node )
- {
-     AttVal* att;
-     uint saveWrap;
-@@ -1590,7 +1588,7 @@
-     WrapOn( doc, saveWrap );
- }
- 
--static void PPrintCDATA( TidyDocImpl* doc, uint indent, Node *node )
-+void PPrintCDATA( TidyDocImpl* doc, uint indent, Node *node )
- {
-     uint saveWrap;
-     TidyPrintImpl* pprint = &doc->pprint;
-@@ -1609,7 +1607,7 @@
-     WrapOn( doc, saveWrap );          /* restore wrapping */
- }
- 
--static void PPrintSection( TidyDocImpl* doc, uint indent, Node *node )
-+void PPrintSection( TidyDocImpl* doc, uint indent, Node *node )
- {
-     TidyPrintImpl* pprint = &doc->pprint;
-     Bool wrapSect = cfgBool( doc, TidyWrapSection );
-@@ -1825,7 +1823,7 @@
- 
- 
- 
--static Bool ShouldIndent( TidyDocImpl* doc, Node *node )
-+Bool ShouldIndent( TidyDocImpl* doc, Node *node )
- {
-     uint indentContent = cfg( doc, TidyIndentContent );
-     if ( indentContent == no )
diff --git a/app-text/htmltidy/files/05-htmltidy-docbook.patch b/app-text/htmltidy/files/05-htmltidy-docbook.patch
deleted file mode 100644
index 23c2ad468d7f..000000000000
--- a/app-text/htmltidy/files/05-htmltidy-docbook.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -urN tidy.old/src/pprint.c tidy-26/src/pprint.c
---- tidy.old/src/pprint.c	2005-08-03 08:58:11.000000000 +0200
-+++ tidy-26/src/pprint.c	2006-02-13 17:29:01.000000000 +0100
-@@ -40,7 +40,7 @@
- static int  TextEndsWithNewline( Lexer *lexer, Node *node, uint mode );
- static int  TextStartsWithWhitespace( Lexer *lexer, Node *node, uint start, uint mode );
- static Bool InsideHead( TidyDocImpl* doc, Node *node );
--static Bool ShouldIndent( TidyDocImpl* doc, Node *node );
-+Bool ShouldIndent( TidyDocImpl* doc, Node *node );
- 
- #if SUPPORT_ASIAN_ENCODINGS
- /* #431953 - start RJ Wraplen adjusted for smooth international ride */
-@@ -708,7 +708,7 @@
-     }
- }
- 
--static void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
-+void PPrintChar( TidyDocImpl* doc, uint c, uint mode )
- {
-     tmbchar entity[128];
-     ctmbstr p;
-@@ -943,7 +943,7 @@
-   to UTF-8 is deferred to the WriteChar() routine called
-   to flush the line buffer.
- */
--static void PPrintText( TidyDocImpl* doc, uint mode, uint indent,
-+void PPrintText( TidyDocImpl* doc, uint mode, uint indent,
-                         Node* node  )
- {
-     uint start = node->start;
-@@ -984,13 +984,11 @@
-     }
- }
- 
--#if 0
--static void PPrintString( TidyDocImpl* doc, uint indent, ctmbstr str )
-+void PPrintString( TidyDocImpl* doc, uint indent, ctmbstr str )
- {
-     while ( *str != '\0' )
-         AddChar( &doc->pprint, *str++ );
- }
--#endif /* 0 */
- 
- 
- static void PPrintAttrValue( TidyDocImpl* doc, uint indent,
-@@ -1414,7 +1412,7 @@
-     AddChar( pprint, '>' );
- }
- 
--static void PPrintComment( TidyDocImpl* doc, uint indent, Node* node )
-+void PPrintComment( TidyDocImpl* doc, uint indent, Node* node )
- {
-     TidyPrintImpl* pprint = &doc->pprint;
- 
-@@ -1501,7 +1499,7 @@
-     PCondFlushLine( doc, indent );
- }
- 
--static void PPrintPI( TidyDocImpl* doc, uint indent, Node *node )
-+void PPrintPI( TidyDocImpl* doc, uint indent, Node *node )
- {
-     TidyPrintImpl* pprint = &doc->pprint;
-     tchar c;
-@@ -1532,7 +1530,7 @@
-     PCondFlushLine( doc, indent );
- }
- 
--static void PPrintXmlDecl( TidyDocImpl* doc, uint indent, Node *node )
-+void PPrintXmlDecl( TidyDocImpl* doc, uint indent, Node *node )
- {
-     AttVal* att;
-     uint saveWrap;
-@@ -1620,7 +1618,7 @@
-     WrapOn( doc, saveWrap );
- }
- 
--static void PPrintCDATA( TidyDocImpl* doc, uint indent, Node *node )
-+void PPrintCDATA( TidyDocImpl* doc, uint indent, Node *node )
- {
-     uint saveWrap;
-     TidyPrintImpl* pprint = &doc->pprint;
-@@ -1639,7 +1637,7 @@
-     WrapOn( doc, saveWrap );          /* restore wrapping */
- }
- 
--static void PPrintSection( TidyDocImpl* doc, uint indent, Node *node )
-+void PPrintSection( TidyDocImpl* doc, uint indent, Node *node )
- {
-     TidyPrintImpl* pprint = &doc->pprint;
-     Bool wrapSect = cfgBool( doc, TidyWrapSection );
-@@ -1856,7 +1854,7 @@
- 
- 
- 
--static Bool ShouldIndent( TidyDocImpl* doc, Node *node )
-+Bool ShouldIndent( TidyDocImpl* doc, Node *node )
- {
-     TidyTriState indentContent = cfgAutoBool( doc, TidyIndentContent );
-     if ( indentContent == TidyNoState )