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

Package-Manager: portage-2.1.4.4

4 files changed, 138 insertions, 7 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/Manifest b/dev-tex/mpm/Manifest
index fdfce9603f82..0aa0a7945fdf 100644
--- a/dev-tex/mpm/Manifest
+++ b/dev-tex/mpm/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX mpm-2.7.2817-multipleroots.patch 639 RMD160 e03309e72e4fa4e5f72a77f1a3aef5a889cf3818 SHA1 1a1b839dcb16f182f63b60294ec8cab3ef0cb33b SHA256 5033e11846e7c4f2678a187f48c50dc4847b919296b47f8b50dc0c2b3fd2305a
+AUX mpm-2.7.3107-gcc-4.3.patch 5051 RMD160 7d0f3491ebc57024e436e6aa14f53938796ff5de SHA1 b13c8742417a49d1b5fecdd9b8fcc98c04862fe1 SHA256 f0680ddbd2ff89ffa41f52b1a0fb3a8bc706b0977e5a6a1379f02afef0297c5d
 DIST miktex-2.7.2960.tar.bz2 14301748 RMD160 5e0255811dee20f0fb392d083c550b1023fed7de SHA1 ff6f36c843494c8fc62c7a6cc70a3a91ba3d9711 SHA256 1c02460555f8496d2794a60d2d6c118166a45aa77bb830f981906baa2aca55c4
 DIST miktex-2.7.3107.tar.bz2 14660598 RMD160 44b6581323bc5037b3cbc052c8cd8f2ca3507522 SHA1 c3b51c221f69b197b6ec9721ca06140a8c4f781c SHA256 978a995b9babee488dbf0bd18ca53c1b9d0788ecc25dc3dd6f4f3401825de39f
 EBUILD mpm-2.7.2960.ebuild 829 RMD160 2c7ae65b1f028600e8cb2e93e3b7cf6de4fc9fdd SHA1 d1a7ffdae69e55caaf4c5e69bee5c72e81ec0b0f SHA256 7491b087f072aac3379b0663cd7678fa1c152b2483689b4822ceb31aa011a238
-EBUILD mpm-2.7.3107.ebuild 829 RMD160 3f6349acd7a2a223fb8418f3d6bbe24af099129b SHA1 96f21d78fd6c298609d159fa3fe27621baeb9a2d SHA256 122b8b6aae321ef1b7f3f3dc98917a0e7f974247c52ebdaf1c36f0f27b32736b
-MISC ChangeLog 2525 RMD160 f7a09e4ef1ff07c5502218177b1597777a36518a SHA1 7413ce1b5dc63d140ab22898f2a61d167e784206 SHA256 8904ad103a8e6a7086091a70beda9b3a639b9a7d44e483d93c7d156d7d27946f
+EBUILD mpm-2.7.3107.ebuild 870 RMD160 a26b8df90a26660db5314aed28931f6741055ee9 SHA1 2680cc72ff278b8ad03b2595866d2b0309e09e4f SHA256 78c16bf5e8447a6fa3f6f6419cd193c1770de33239998bd7f11a103b97514e0f
+MISC ChangeLog 2809 RMD160 21215a12627618db440e28e6e5c53bd74c05c101 SHA1 31bc19dcb15c3bae97068a3f97fc7a8108d76335 SHA256 7eadbb39ae405d690a8188424f5e9a41716375d5ff82511b638cce36e863a41b
 MISC metadata.xml 250 RMD160 1d24635af0184818f59417fc0003e1671ea7c8d0 SHA1 7df5ef66f1652835cc422a7a546fc959e7b11949 SHA256 3bbb49465519e69c8876c7621b24a4c61ba34e5d2c8505cc6a6341e6d1253a8c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkh4dNYACgkQNQqtfCuFneP0rACfVR7wxryfhOTzHM5Kn68L5e/h
-GAYAnjyGq4P2NJu8ASpH9ZDqpODQQ/+J
-=Kw72
+iEYEARECAAYFAkh9w7QACgkQNQqtfCuFneMUOwCghA3SSdOA480nZKXAgJFdMcIS
+HZIAnRXHx21y11Ai5fEICg8PjZ5LwD0e
+=Y5G7
 -----END PGP SIGNATURE-----
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() {