Patch to allow 0.0.11 to compile with gcc-3.4. Fixes bug 116223, thanks to Jan Hrabe <hrabe at maildot magalien dot com>. 0.7.0 version bump.

Package-Manager: portage-2.1_pre1

6 files changed, 58 insertions, 5 deletions

diff --git a/app-misc/aldo/ChangeLog b/app-misc/aldo/ChangeLog
index 1e3c465df890..dcd9cfa56a80 100644
--- a/app-misc/aldo/ChangeLog
+++ b/app-misc/aldo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/aldo
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/aldo/ChangeLog,v 1.7 2005/07/21 17:13:46 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/aldo/ChangeLog,v 1.8 2005/12/22 18:58:31 vanquirius Exp $
+
+*aldo-0.7.0 (22 Dec 2005)
+
+  22 Dec 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/aldo-0.0.11-iostream.diff, aldo-0.0.11.ebuild, +aldo-0.7.0.ebuild:
+  Patch to allow 0.0.11 to compile with gcc-3.4. Fixes bug 116223, thanks to
+  Jan Hrabe <hrabe at maildot magalien dot com>. 0.7.0 version bump.
 
   21 Jul 2005; David Holm <dholm@gentoo.org> aldo-0.6.7.ebuild:
   Added to ~ppc.
diff --git a/app-misc/aldo/Manifest b/app-misc/aldo/Manifest
index 604834ada1da..71d7a26cddaf 100644
--- a/app-misc/aldo/Manifest
+++ b/app-misc/aldo/Manifest
@@ -1,6 +1,9 @@
-MD5 d569527ecaa3e7bd55a7f1e293904fbc ChangeLog 876
-MD5 095e017755968164c9d984f274420fe7 aldo-0.0.11.ebuild 548
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 5b2746ea72ddeab19ffd9d6578d29db2 ChangeLog 1183
+MD5 d5dda7f9abe7059782bbc9f999a58ba1 aldo-0.0.11.ebuild 736
 MD5 9d333747d22579bb61b0bc75f693e0b6 aldo-0.6.7.ebuild 603
+MD5 218441abb3569bf50865890857926c8b aldo-0.7.0.ebuild 573
+MD5 e4d8125fb937aa185e704995a424c3ba files/aldo-0.0.11-iostream.diff 245
 MD5 835f1b4d268021c0496bf5cbf111b363 files/digest-aldo-0.0.11 63
 MD5 e5b56ca142a2d1f41556eeeae0d507e9 files/digest-aldo-0.6.7 62
+MD5 7fa9c1895db55adbced119b0015d6be7 files/digest-aldo-0.7.0 62
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
diff --git a/app-misc/aldo/aldo-0.0.11.ebuild b/app-misc/aldo/aldo-0.0.11.ebuild
index c25b38bb386d..a47ba3d897f8 100644
--- a/app-misc/aldo/aldo-0.0.11.ebuild
+++ b/app-misc/aldo/aldo-0.0.11.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/aldo/aldo-0.0.11.ebuild,v 1.7 2005/01/01 14:50:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/aldo/aldo-0.0.11.ebuild,v 1.8 2005/12/22 18:58:31 vanquirius Exp $
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="a morse tutor"
 HOMEPAGE="http://aldo.sourceforge.net/"
@@ -13,7 +15,16 @@ IUSE=""
 
 DEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	# compile with gcc 3.4, bug 116223
+	epatch "${FILESDIR}"/${P}-iostream.diff
+}
+
 src_compile() {
+	# use our compiler
+	export CXX="$(tc-getCXX)"
+
 	make libs || die
 	make aldo || die
 }
diff --git a/app-misc/aldo/aldo-0.7.0.ebuild b/app-misc/aldo/aldo-0.7.0.ebuild
new file mode 100644
index 000000000000..f89730a90a02
--- /dev/null
+++ b/app-misc/aldo/aldo-0.7.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/aldo/aldo-0.7.0.ebuild,v 1.1 2005/12/22 18:58:31 vanquirius Exp $
+
+DESCRIPTION="a morse tutor"
+HOMEPAGE="http://savannah.nongnu.org/projects/aldo"
+SRC_URI="http://savannah.nongnu.org/download/aldo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc
+	sys-libs/libtermcap-compat"
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc README TODO AUTHORS ChangeLog NEWS THANKS
+}
+
diff --git a/app-misc/aldo/files/aldo-0.0.11-iostream.diff b/app-misc/aldo/files/aldo-0.0.11-iostream.diff
new file mode 100644
index 000000000000..12a849c3e0b0
--- /dev/null
+++ b/app-misc/aldo/files/aldo-0.0.11-iostream.diff
@@ -0,0 +1,10 @@
+--- aldo-0.0.11.orig/include/dialog.h	2005-12-22 16:39:30.000000000 -0200
++++ aldo-0.0.11/include/dialog.h	2005-12-22 16:42:08.000000000 -0200
+@@ -26,6 +26,7 @@
+ 
+ #include <string>
+ #include <vector>
++#include <iostream>
+ 
+ #pragma interface
+ 
diff --git a/app-misc/aldo/files/digest-aldo-0.7.0 b/app-misc/aldo/files/digest-aldo-0.7.0
new file mode 100644
index 000000000000..f4c05d26e9f4
--- /dev/null
+++ b/app-misc/aldo/files/digest-aldo-0.7.0
@@ -0,0 +1 @@
+MD5 bb1c13597d7aae6bf101362c99e66702 aldo-0.7.0.tar.bz2 88567