fix GCC 4.3 failure, reported by Nico Schlömer <nico DOT schloemer AT gmx DOT net> in bug 231663, patch provided by Bert Karwatzki <spasswolf AT web DOT de> there

(Portage version: 2.1.4.4)

3 files changed, 132 insertions, 2 deletions

diff --git a/dev-tex/mpm/ChangeLog b/dev-tex/mpm/ChangeLog
index 32dd0e80c208..c4c874a80258 100644
--- a/dev-tex/mpm/ChangeLog
+++ b/dev-tex/mpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tex/mpm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/mpm/ChangeLog,v 1.12 2008/07/12 09:09:29 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/mpm/ChangeLog,v 1.13 2008/07/16 09:47:21 opfer Exp $
+
+  16 Jul 2008; Christian Faulhammer <opfer@gentoo.org>
+  +files/mpm-2.7.3107-gcc-4.3.patch, mpm-2.7.3107.ebuild:
+  fix GCC 4.3 failure, reported by Nico Schlömer <nico DOT schloemer AT gmx
+  DOT net> in bug 231663, patch provided by Bert Karwatzki <spasswolf AT web
+  DOT de> there
 
   12 Jul 2008; Christian Faulhammer <opfer@gentoo.org> mpm-2.7.2960.ebuild,
   mpm-2.7.3107.ebuild:
diff --git a/dev-tex/mpm/files/mpm-2.7.3107-gcc-4.3.patch b/dev-tex/mpm/files/mpm-2.7.3107-gcc-4.3.patch
new file mode 100644
index 000000000000..0b2659fabc57
--- /dev/null
+++ b/dev-tex/mpm/files/mpm-2.7.3107-gcc-4.3.patch
@@ -0,0 +1,123 @@
+diff -aur miktex-2.7.3107.old/BuildUtilities/md5walk/md5walk.cpp miktex-2.7.3107/BuildUtilities/md5walk/md5walk.cpp
+--- miktex-2.7.3107.old/BuildUtilities/md5walk/md5walk.cpp	2008-07-14 21:04:11.000000000 +0200
++++ miktex-2.7.3107/BuildUtilities/md5walk/md5walk.cpp	2008-07-14 21:19:05.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <cstdarg>
+ #include <cstdio>
+ #include <cstdlib>
++#include <memory>
+ 
+ #include <miktex/Core/Core>
+ #include <popt-miktex.h>
+diff -aur miktex-2.7.3107.old/BuildUtilities/mpc/mpc.cpp miktex-2.7.3107/BuildUtilities/mpc/mpc.cpp
+--- miktex-2.7.3107.old/BuildUtilities/mpc/mpc.cpp	2008-07-14 21:04:11.000000000 +0200
++++ miktex-2.7.3107/BuildUtilities/mpc/mpc.cpp	2008-07-14 21:38:46.000000000 +0200
+@@ -21,6 +21,8 @@
+ #include "StdAfx.h"
+ #include "internal.h"
+ 
++#include <memory>
++
+ const char * const TheNameOfTheGame = T_("MiKTeX Package Creator");
+ 
+ #define PROGNAME "mpc"
+diff -aur miktex-2.7.3107.old/Libraries/MiKTeX/Core/include/miktex/Core/Core miktex-2.7.3107/Libraries/MiKTeX/Core/include/miktex/Core/Core
+--- miktex-2.7.3107.old/Libraries/MiKTeX/Core/include/miktex/Core/Core	2008-07-14 21:04:10.000000000 +0200
++++ miktex-2.7.3107/Libraries/MiKTeX/Core/include/miktex/Core/Core	2008-07-14 21:13:57.000000000 +0200
+@@ -58,10 +58,12 @@
+ #  include <string>
+ #  include <stdexcept>
+ #  include <vector>
++#  include <cstring>
+ #else
+ #  include <stdio.h>
+ #  include <stdlib.h>
+ #  include <time.h>
++#  include <string.h>
+ #endif
+ 
+ #if defined(HAVE_PTHREAD)
+diff -aur miktex-2.7.3107.old/Libraries/MiKTeX/Core/internal.h miktex-2.7.3107/Libraries/MiKTeX/Core/internal.h
+--- miktex-2.7.3107.old/Libraries/MiKTeX/Core/internal.h	2008-07-14 21:04:10.000000000 +0200
++++ miktex-2.7.3107/Libraries/MiKTeX/Core/internal.h	2008-07-14 21:04:49.000000000 +0200
+@@ -40,6 +40,8 @@
+ #include "miktex/Core/Trace"
+ #include "miktex/Core/Urls"
+ 
++#include <memory>
++
+ using namespace MiKTeX::Core;
+ 
+ #define BEGIN_INTERNAL_NAMESPACE		\
+diff -aur miktex-2.7.3107.old/Libraries/MiKTeX/Extractor/CabExtractor.h miktex-2.7.3107/Libraries/MiKTeX/Extractor/CabExtractor.h
+--- miktex-2.7.3107.old/Libraries/MiKTeX/Extractor/CabExtractor.h	2008-07-14 21:04:10.000000000 +0200
++++ miktex-2.7.3107/Libraries/MiKTeX/Extractor/CabExtractor.h	2008-07-14 21:23:32.000000000 +0200
+@@ -28,6 +28,8 @@
+ 
+ #include "miktex/Extractor/Extractor"
+ 
++#include <memory>
++
+ BEGIN_INTERNAL_NAMESPACE;
+ 
+ class CabExtractor : public MiKTeX::Extractor::Extractor
+diff -aur miktex-2.7.3107.old/Libraries/MiKTeX/Extractor/TarExtractor.h miktex-2.7.3107/Libraries/MiKTeX/Extractor/TarExtractor.h
+--- miktex-2.7.3107.old/Libraries/MiKTeX/Extractor/TarExtractor.h	2008-07-14 21:04:10.000000000 +0200
++++ miktex-2.7.3107/Libraries/MiKTeX/Extractor/TarExtractor.h	2008-07-14 21:23:57.000000000 +0200
+@@ -28,6 +28,8 @@
+ 
+ #include "miktex/Extractor/Extractor"
+ 
++#include <memory>
++
+ BEGIN_INTERNAL_NAMESPACE;
+ 
+ class TarExtractor : public MiKTeX::Extractor::Extractor
+diff -aur miktex-2.7.3107.old/Libraries/MiKTeX/PackageManager/CurlWebSession.h miktex-2.7.3107/Libraries/MiKTeX/PackageManager/CurlWebSession.h
+--- miktex-2.7.3107.old/Libraries/MiKTeX/PackageManager/CurlWebSession.h	2008-07-14 21:04:10.000000000 +0200
++++ miktex-2.7.3107/Libraries/MiKTeX/PackageManager/CurlWebSession.h	2008-07-14 21:28:04.000000000 +0200
+@@ -26,6 +26,8 @@
+ #if defined(HAVE_LIBCURL) && ! defined(GUARD_8FCCFB2E6A53AC448DF1F0EDABB41EC0_)
+ #define GUARD_8FCCFB2E6A53AC448DF1F0EDABB41EC0_
+ 
++#include <memory>
++
+ BEGIN_INTERNAL_NAMESPACE;
+ 
+ class
+diff -aur miktex-2.7.3107.old/Libraries/MiKTeX/PackageManager/internal.h miktex-2.7.3107/Libraries/MiKTeX/PackageManager/internal.h
+--- miktex-2.7.3107.old/Libraries/MiKTeX/PackageManager/internal.h	2008-07-14 21:04:10.000000000 +0200
++++ miktex-2.7.3107/Libraries/MiKTeX/PackageManager/internal.h	2008-07-14 21:27:26.000000000 +0200
+@@ -28,6 +28,8 @@
+ #define F927BA187CB94546AB9CA9099D989E81
+ #include "miktex/PackageManager/PackageManager"
+ 
++#include <memory>
++
+ #define BEGIN_INTERNAL_NAMESPACE			\
+ namespace MiKTeX {					\
+   namespace Packages {					\
+diff -aur miktex-2.7.3107.old/Programs/MiKTeX/initexmf/initexmf.cpp miktex-2.7.3107/Programs/MiKTeX/initexmf/initexmf.cpp
+--- miktex-2.7.3107.old/Programs/MiKTeX/initexmf/initexmf.cpp	2008-07-14 21:04:10.000000000 +0200
++++ miktex-2.7.3107/Programs/MiKTeX/initexmf/initexmf.cpp	2008-07-14 21:36:35.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include <stack>
+ #include <string>
+ #include <vector>
++#include <memory>
+ 
+ #include "initexmf-version.h"
+ 
+diff -aur miktex-2.7.3107.old/Programs/MiKTeX/PackageManager/mpm/mpm.cpp miktex-2.7.3107/Programs/MiKTeX/PackageManager/mpm/mpm.cpp
+--- miktex-2.7.3107.old/Programs/MiKTeX/PackageManager/mpm/mpm.cpp	2008-07-14 21:04:10.000000000 +0200
++++ miktex-2.7.3107/Programs/MiKTeX/PackageManager/mpm/mpm.cpp	2008-07-14 21:34:26.000000000 +0200
+@@ -23,6 +23,9 @@
+ 
+ #include "internal.h"
+ 
++#include <memory>
++#include <climits>
++
+ #if ! defined(THE_NAME_OF_THE_GAME)
+ #  define THE_NAME_OF_THE_GAME T_("MiKTeX Package Manager")
+ #endif
diff --git a/dev-tex/mpm/mpm-2.7.3107.ebuild b/dev-tex/mpm/mpm-2.7.3107.ebuild
index baf3dd174573..c2f20875993e 100644
--- a/dev-tex/mpm/mpm-2.7.3107.ebuild
+++ b/dev-tex/mpm/mpm-2.7.3107.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/mpm/mpm-2.7.3107.ebuild,v 1.2 2008/07/12 09:09:29 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/mpm/mpm-2.7.3107.ebuild,v 1.3 2008/07/16 09:47:21 opfer Exp $
 
 inherit eutils cmake-utils
 
@@ -25,6 +25,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-2.7.2817-multipleroots.patch"
+	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
 }
 
 pkg_postinst() {