Fixed compilation with gcc 4.3, thanks to Peter Alfredsen (bug #227503).

(Portage version: 2.1.5.6)

4 files changed, 63 insertions, 9 deletions

diff --git a/dev-embedded/ponyprog/ChangeLog b/dev-embedded/ponyprog/ChangeLog
index 58fc90f9743e..9d0de917d9d2 100644
--- a/dev-embedded/ponyprog/ChangeLog
+++ b/dev-embedded/ponyprog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-embedded/ponyprog
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ChangeLog,v 1.13 2008/02/29 17:53:31 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ChangeLog,v 1.14 2008/06/20 20:24:44 calchan Exp $
+
+  20 Jun 2008; Denis Dupeyron <calchan@gentoo.org>
+  +files/ponyprog-2.07a-gcc43.patch, ponyprog-2.07a.ebuild:
+  Fixed compilation with gcc 4.3, thanks to Peter Alfredsen (bug #227503).
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> ponyprog-2.07a.ebuild:
   Remove icon extension from desktop entry to match Icon Theme Specification.
diff --git a/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch b/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch
new file mode 100644
index 000000000000..ea934f1c255a
--- /dev/null
+++ b/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch
@@ -0,0 +1,44 @@
+--- a/v/includex/v/vpsdc.h
++++ b/v/includex/v/vpsdc.h
+@@ -14,7 +14,9 @@
+ 
+ #include <v/vdc.h>
+ #include <v/vprinter.h>
+-#include <fstream.h>
++#include <fstream>
++
++using namespace std;
+ 
+     class vPostScriptDC : public vDC
+       {
+--- a/v/includex/v/vpsprntr.h
++++ b/v/includex/v/vpsprntr.h
+@@ -14,7 +14,7 @@
+ 
+ #include <v/v_defs.h>
+ #include <v/vmodald.h>
+-#include <fstream.h>
++#include <fstream>
+ 
+ #define vPaperLetter 0
+ #define vPaperLegal 1
+@@ -31,6 +31,8 @@
+ #define vPaperQuarto 12
+ #define vPaper10x14 13
+ 
++using namespace std;
++
+ #define vPaperDefault vPaperLetter		// Index to default paper
+ 
+     class vPSPrinter : public vModalDialog
+--- a/v/srcx/vpsprntr.cxx
++++ b/v/srcx/vpsprntr.cxx
+@@ -103,7 +103,7 @@ static unsigned char prompt_bits[] = {
+     _height = PaperHeights[_paperType];
+     _portrait = 1;
+     _useColor = 0;
+-    _pstream = 0;
++    vPSPrinter::_pstream = 0;
+ 
+     ++_instances;		// bump reference counter
+   }
diff --git a/dev-embedded/ponyprog/ponyprog-2.06c.ebuild b/dev-embedded/ponyprog/ponyprog-2.06c.ebuild
index 305b26775fc4..81e26720b59c 100644
--- a/dev-embedded/ponyprog/ponyprog-2.06c.ebuild
+++ b/dev-embedded/ponyprog/ponyprog-2.06c.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/dev-embedded/ponyprog/ponyprog-2.06c.ebuild,v 1.11 2007/07/22 07:49:25 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ponyprog-2.06c.ebuild,v 1.12 2008/06/20 20:24:44 calchan Exp $
 
 S=${WORKDIR}
 DESCRIPTION="EEprom e Pic Programmer"
@@ -29,9 +29,9 @@ src_install () {
 	einfo "Installing binaries"
 
 	into /opt/${PN}
-	dobin ${S}/usr/local/bin/ponyprog2000
+	dobin "${S}"/usr/local/bin/ponyprog2000
 	dodir /opt/${PN}/lib
-	dolib ${S}/usr/lib/*
+	dolib "${S}"/usr/lib/*
 
 	dodir /opt/bin
 	dosym /opt/${PN}/bin/ponyprog2000 /opt/bin/ponyprog
diff --git a/dev-embedded/ponyprog/ponyprog-2.07a.ebuild b/dev-embedded/ponyprog/ponyprog-2.07a.ebuild
index 40c9ad43ae67..a601bab35b51 100644
--- a/dev-embedded/ponyprog/ponyprog-2.07a.ebuild
+++ b/dev-embedded/ponyprog/ponyprog-2.07a.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-embedded/ponyprog/ponyprog-2.07a.ebuild,v 1.3 2008/02/29 17:53:31 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ponyprog-2.07a.ebuild,v 1.4 2008/06/20 20:24:44 calchan Exp $
 
 inherit eutils
 
@@ -31,13 +31,16 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
+
 	sed -i \
 		-e "s:\$(HOME)/Progetti/PonyProg_Sourceforge/v:${S}/v:" \
 		-e 's/\-O2//' \
-		v/Config.mk
-	sed -i -e 's/<asm\/io.h>/<sys\/io.h>/' *.cpp
+		v/Config.mk || die "sed failed"
+
+	sed -i -e 's/<asm\/io.h>/<sys\/io.h>/' *.cpp || die "sed failed"
+
 	if use epiphany ; then
 		sed -i -e 's/netscape/epiphany/' e2cmdw.cpp
 	fi
@@ -48,6 +51,9 @@ src_unpack() {
 		sed -i -e 's/netscape/seamonkey/' e2cmdw.cpp
 	fi
 	convert ponyprog.ico ponyprog.png
+
+	# Fix compilation with gcc-4.3, bug #227503
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 }
 
 src_compile() {