From 4295ea4d6c9020043cb3508f1b0c8d646d1c563a Mon Sep 17 00:00:00 2001
From: Samuli Suominen <ssuominen@gentoo.org>
Date: Fri, 24 Jul 2009 18:23:17 +0000
Subject: Fix building with GCC 4.4 wrt #277731. (Portage version:
 2.2_rc33/cvs/Linux x86_64)

---
 dev-cpp/tclap/ChangeLog                     |  6 +++++-
 dev-cpp/tclap/files/tclap-1.1.0-gcc44.patch | 24 ++++++++++++++++++++++++
 dev-cpp/tclap/tclap-1.1.0.ebuild            | 13 ++++++++++---
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 dev-cpp/tclap/files/tclap-1.1.0-gcc44.patch

(limited to 'dev-cpp/tclap')

diff --git a/dev-cpp/tclap/ChangeLog b/dev-cpp/tclap/ChangeLog
index debed19ad608..cd7ed420dd55 100644
--- a/dev-cpp/tclap/ChangeLog
+++ b/dev-cpp/tclap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/tclap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tclap/ChangeLog,v 1.2 2009/04/16 16:34:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tclap/ChangeLog,v 1.3 2009/07/24 18:23:17 ssuominen Exp $
+
+  24 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> tclap-1.1.0.ebuild,
+  +files/tclap-1.1.0-gcc44.patch:
+  Fix building with GCC 4.4 wrt #277731.
 
   16 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org> tclap-1.1.0.ebuild:
   Added ~amd64 and ~x86, minor QA
diff --git a/dev-cpp/tclap/files/tclap-1.1.0-gcc44.patch b/dev-cpp/tclap/files/tclap-1.1.0-gcc44.patch
new file mode 100644
index 000000000000..b13a91123509
--- /dev/null
+++ b/dev-cpp/tclap/files/tclap-1.1.0-gcc44.patch
@@ -0,0 +1,24 @@
+diff -ur tclap-1.1.0.orig/include/tclap/MultiArg.h tclap-1.1.0/include/tclap/MultiArg.h
+--- tclap-1.1.0.orig/include/tclap/MultiArg.h	2005-09-11 02:25:43.000000000 +0300
++++ tclap-1.1.0/include/tclap/MultiArg.h	2009-07-24 21:20:59.000000000 +0300
+@@ -23,6 +23,8 @@
+ #ifndef TCLAP_MULTIPLE_ARGUMENT_H
+ #define TCLAP_MULTIPLE_ARGUMENT_H
+ 
++#include <cstdio>
++
+ #include <string>
+ #include <vector>
+ 
+diff -ur tclap-1.1.0.orig/include/tclap/ValueArg.h tclap-1.1.0/include/tclap/ValueArg.h
+--- tclap-1.1.0.orig/include/tclap/ValueArg.h	2005-09-11 02:25:43.000000000 +0300
++++ tclap-1.1.0/include/tclap/ValueArg.h	2009-07-24 21:20:46.000000000 +0300
+@@ -23,6 +23,8 @@
+ #ifndef TCLAP_VALUE_ARGUMENT_H
+ #define TCLAP_VALUE_ARGUMENT_H
+ 
++#include <cstdio>
++
+ #include <string>
+ #include <vector>
+ 
diff --git a/dev-cpp/tclap/tclap-1.1.0.ebuild b/dev-cpp/tclap/tclap-1.1.0.ebuild
index 79772032c6e4..33b86029ac78 100644
--- a/dev-cpp/tclap/tclap-1.1.0.ebuild
+++ b/dev-cpp/tclap/tclap-1.1.0.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tclap/tclap-1.1.0.ebuild,v 1.2 2009/04/16 16:34:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tclap/tclap-1.1.0.ebuild,v 1.3 2009/07/24 18:23:17 ssuominen Exp $
+
+EAPI=2
+inherit eutils
 
 DESCRIPTION="Small flexible library for dealing with command line arguments"
 HOMEPAGE="http://tclap.sourceforge.net"
@@ -11,9 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=""
 RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+}
 
 src_install() {
-	emake DESTDIR="${D}" install || die 'install failed'
+	emake DESTDIR="${D}" install || die "emake install failed"
 }
-- 
cgit v1.2.3-65-gdbad