Fix gcc-4.3, bug #227067. Clean old.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)

7 files changed, 262 insertions, 93 deletions

diff --git a/app-doc/doc++/ChangeLog b/app-doc/doc++/ChangeLog
index bb09952e6c08..216bd1fb7a7d 100644
--- a/app-doc/doc++/ChangeLog
+++ b/app-doc/doc++/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-doc/doc++
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doc++/ChangeLog,v 1.24 2007/08/04 21:47:21 anant Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doc++/ChangeLog,v 1.25 2008/06/28 23:16:12 loki_val Exp $
+
+  28 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/doc++-3.4.10-flex.patch, +files/doc++-3.4.10-gcc43.patch,
+  -files/flex.patch, -doc++-3.4.10.ebuild, -doc++-3.4.10-r1.ebuild,
+  -doc++-3.4.10-r2.ebuild, doc++-3.4.10-r3.ebuild:
+  Fix gcc-4.3, bug #227067. Clean old.
 
 *doc++-3.4.10-r3 (02 Aug 2007)
 
diff --git a/app-doc/doc++/doc++-3.4.10-r1.ebuild b/app-doc/doc++/doc++-3.4.10-r1.ebuild
deleted file mode 100644
index 7277219ba3b0..000000000000
--- a/app-doc/doc++/doc++-3.4.10-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doc++/doc++-3.4.10-r1.ebuild,v 1.7 2007/05/11 18:16:25 bangert Exp $
-
-inherit eutils
-
-DESCRIPTION="Documentation system for C, C++, IDL and Java"
-HOMEPAGE="http://docpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/docpp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/flex.patch
-}
-
-src_compile() {
-	econf || die
-	emake all || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc CREDITS INSTALL NEWS PLATFORMS REPORTING-BUGS
-}
diff --git a/app-doc/doc++/doc++-3.4.10-r2.ebuild b/app-doc/doc++/doc++-3.4.10-r2.ebuild
deleted file mode 100644
index 045e7937f9f1..000000000000
--- a/app-doc/doc++/doc++-3.4.10-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doc++/doc++-3.4.10-r2.ebuild,v 1.2 2007/07/04 17:46:15 angelos Exp $
-
-inherit eutils
-
-DESCRIPTION="Documentation system for C, C++, IDL and Java"
-HOMEPAGE="http://docpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/docpp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/flex.patch
-	sed -i -e "s/locale.alias//g" ${S}/intl/Makefile.in
-}
-
-src_compile() {
-	econf || die
-	emake all || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc CREDITS INSTALL NEWS PLATFORMS REPORTING-BUGS
-}
diff --git a/app-doc/doc++/doc++-3.4.10-r3.ebuild b/app-doc/doc++/doc++-3.4.10-r3.ebuild
index d16d044b3255..ba6655efefec 100644
--- a/app-doc/doc++/doc++-3.4.10-r3.ebuild
+++ b/app-doc/doc++/doc++-3.4.10-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doc++/doc++-3.4.10-r3.ebuild,v 1.1 2007/08/04 21:47:21 anant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doc++/doc++-3.4.10-r3.ebuild,v 1.2 2008/06/28 23:16:12 loki_val Exp $
 
 inherit eutils
 
@@ -17,8 +17,9 @@ RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/flex.patch
-	sed -i -e "s/locale.alias//g" ${S}/intl/Makefile.in
+	epatch "${FILESDIR}"/${P}-flex.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	sed -i -e "s/locale.alias//g" "${S}"/intl/Makefile.in
 }
 
 src_compile() {
diff --git a/app-doc/doc++/doc++-3.4.10.ebuild b/app-doc/doc++/doc++-3.4.10.ebuild
deleted file mode 100644
index 29be9ee86197..000000000000
--- a/app-doc/doc++/doc++-3.4.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doc++/doc++-3.4.10.ebuild,v 1.17 2007/07/15 23:35:58 mr_bones_ Exp $
-
-DESCRIPTION="Documentation system for C, C++, IDL and Java"
-HOMEPAGE="http://docpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/docpp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="virtual/libc"
-
-src_compile() {
-	econf || die
-	emake all || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc CREDITS INSTALL NEWS PLATFORMS REPORTING-BUGS
-}
diff --git a/app-doc/doc++/files/flex.patch b/app-doc/doc++/files/doc++-3.4.10-flex.patch
index 2fe135f92174..2fe135f92174 100644
--- a/app-doc/doc++/files/flex.patch
+++ b/app-doc/doc++/files/doc++-3.4.10-flex.patch
diff --git a/app-doc/doc++/files/doc++-3.4.10-gcc43.patch b/app-doc/doc++/files/doc++-3.4.10-gcc43.patch
new file mode 100644
index 000000000000..20243f69930c
--- /dev/null
+++ b/app-doc/doc++/files/doc++-3.4.10-gcc43.patch
@@ -0,0 +1,249 @@
+--- doc++-3.4.10.orig/src/main.cc
++++ doc++-3.4.10/src/main.cc
+@@ -25,7 +25,7 @@
+ #include "config.h"
+ 
+ #include <assert.h>
+-#include <fstream.h>
++#include <fstream>
+ #include <getopt.h>
+ #include <locale.h>
+ #include <stdio.h>
+@@ -38,6 +38,8 @@
+ 
+ #define	GIF_FILE_NAME	"gifs.db"
+ 
++using namespace std;
++
+ FILE *out;
+ char language;
+ Entry *root;
+only in patch2:
+unchanged:
+--- doc++-3.4.10.orig/src/nametable.h
++++ doc++-3.4.10/src/nametable.h
+@@ -25,7 +25,9 @@
+ #define	_NAME_TABLE_H
+ 
+ #include <assert.h>
+-#include <iostream.h>
++#include <iostream>
++
++using namespace std;
+ 
+ #include "datahashtable.h"
+ 
+only in patch2:
+unchanged:
+--- doc++-3.4.10.orig/src/doc2tex.ll
++++ doc++-3.4.10/src/doc2tex.ll
+@@ -23,13 +23,15 @@
+ 
+ %{
+ #include <assert.h>
+-#include <fstream.h>
+-#include <iostream.h>
++#include <fstream>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
+ 
++using namespace std;
++
+ #include "classgraph.h"
+ #include "doc.h"
+ 
+only in patch2:
+unchanged:
+--- doc++-3.4.10.orig/src/java.ll
++++ doc++-3.4.10/src/java.ll
+@@ -26,7 +26,7 @@
+ 
+ #include <assert.h>
+ #include <ctype.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
+ 
+ #include "doc.h"
+only in patch2:
+unchanged:
+--- doc++-3.4.10.orig/src/html.cc
++++ doc++-3.4.10/src/html.cc
+@@ -31,7 +31,7 @@
+ #include <direct.h>
+ #endif
+ #include <errno.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+only in patch2:
+unchanged:
+--- doc++-3.4.10.orig/src/comment.ll
++++ doc++-3.4.10/src/comment.ll
+@@ -24,7 +24,7 @@
+ 
+ #include <assert.h>
+ #include <ctype.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdarg.h>
+ #include <stdio.h>
+ 
+only in patch2:
+unchanged:
+--- doc++-3.4.10.orig/src/tex2gif.cc
++++ doc++-3.4.10/src/tex2gif.cc
+@@ -21,8 +21,8 @@
+   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+-#include <iostream.h>
+-#include <fstream.h>
++#include <iostream>
++#include <fstream>
+ #include <stdio.h>
+ #include <string.h>
+ 
+@@ -38,6 +38,8 @@
+ #include "nametable.h"
+ #include "tex2gif.h"
+ 
++using namespace std;
++
+ void _system(const char *b)
+ {
+ #ifdef DEBUG
+only in patch2:
+unchanged:
+--- doc++-3.4.10.orig/src/cpp.ll
++++ doc++-3.4.10/src/cpp.ll
+@@ -26,7 +26,7 @@
+ 
+ #include <assert.h>
+ #include <ctype.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdarg.h>
+ #include <stdio.h>
+ 
+only in patch2:
+unchanged:
+--- doc++-3.4.10.orig/src/doc.ll
++++ doc++-3.4.10/src/doc.ll
+@@ -23,8 +23,8 @@
+ 
+ %{
+ #include <assert.h>
+-#include <fstream.h>
+-#include <iostream.h>
++#include <fstream>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+only in patch2:
+unchanged:
+--- doc++-3.4.10.orig/src/nametable.cc
++++ doc++-3.4.10/src/nametable.cc
+@@ -22,7 +22,7 @@
+ */
+ 
+ #include <assert.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdlib.h>
+ #include <string.h>
+ 
+only in patch2:
+unchanged:
+--- doc++-3.4.10.orig/src/datahashtable.h
++++ doc++-3.4.10/src/datahashtable.h
+@@ -26,9 +26,11 @@
+ #define _DATAHASHTABLE_H
+ 
+ #include <assert.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdlib.h>
+ 
++using namespace std;
++
+ #include "McDArray.h"
+ 
+ /* This should be a private subclass of #DataHashTable#. However, since cfront
+only in patch2:
+unchanged:
+--- doc++-3.4.10.orig/src/equate.cc
++++ doc++-3.4.10/src/equate.cc
+@@ -23,9 +23,9 @@
+ 
+ #include "config.h"
+ 
+-#include <fstream.h>
++#include <fstream>
+ #include <getopt.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
+ #include <string.h>
+ 
+only in patch2:
+unchanged:
+--- doc++-3.4.10.orig/src/doc2dbsgml.ll
++++ doc++-3.4.10/src/doc2dbsgml.ll
+@@ -22,12 +22,14 @@
+ 
+ %{
+ #include <assert.h>
+-#include <fstream.h>
+-#include <iostream.h>
++#include <fstream>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
++using namespace std;
++
+ #include "classgraph.h"
+ #include "doc.h"
+ 
+only in patch2:
+unchanged:
+--- doc++-3.4.10.orig/src/doc2dbxml.ll
++++ doc++-3.4.10/src/doc2dbxml.ll
+@@ -25,12 +25,14 @@
+ 
+ %{
+ #include <assert.h>
+-#include <fstream.h>
+-#include <iostream.h>
++#include <fstream>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
++using namespace std;
++
+ #include "classgraph.h"
+ #include "doc.h"
+ 
+only in patch2:
+unchanged:
+--- doc++-3.4.10.orig/src/php.ll
++++ doc++-3.4.10/src/php.ll
+@@ -23,7 +23,7 @@
+ %{
+ #include <assert.h>
+ #include <ctype.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
+ 
+ #include "doc.h"