gcc-3.3 fix

8 files changed, 109 insertions, 70 deletions

diff --git a/app-misc/devtodo/ChangeLog b/app-misc/devtodo/ChangeLog
index eab3e695b259..9e4d4bc15f18 100644
--- a/app-misc/devtodo/ChangeLog
+++ b/app-misc/devtodo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/devtodo
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/ChangeLog,v 1.5 2003/02/12 04:58:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/ChangeLog,v 1.6 2003/12/09 19:02:23 seemant Exp $
+
+  09 Dec 2003; Seemant Kulleen <seemant@gentoo.org> devtodo-0.1.11-r1.ebuild,
+  devtodo-0.1.14.ebuild, devtodo-0.1.17.ebuild, files/devtodo.patch:
+  Added patch to have devtodo compile with gcc-3.3, patch is actually from:
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=195195 and was submitted in
+  our bug #35449 by jim_jim33@hotmail.com
 
 *devtodo-0.1.17 (04 Jan 2003)
 
diff --git a/app-misc/devtodo/Manifest b/app-misc/devtodo/Manifest
index 7cd55551bb8e..3903379a8606 100644
--- a/app-misc/devtodo/Manifest
+++ b/app-misc/devtodo/Manifest
@@ -1,8 +1,5 @@
-MD5 10ec62a489f30696ccbd43f037688117 ChangeLog 1041
-MD5 3162e0ba684f0bfcee87ec4500f37da6 devtodo-0.1.11-r1.ebuild 772
-MD5 c717f57fdd9f07a15bf4e788b8523ae9 devtodo-0.1.14.ebuild 743
-MD5 6dca0d6e86c26286790a920ad27a0192 devtodo-0.1.17.ebuild 745
-MD5 690abe23e1e2a741222bbc156f9e6478 files/devtodo-0.1.11.colourplain.patch 360
-MD5 39110dc7abf1cae6d24d2bae06036c45 files/digest-devtodo-0.1.11-r1 66
-MD5 1efca55d3c97a94b979a7ccae5687fce files/digest-devtodo-0.1.14 66
+MD5 3ec36e229c03ac50ef8886b2d3de5c90 devtodo-0.1.17.ebuild 922
+MD5 5305912ca69960331300db2c40c29fa5 ChangeLog 1387
 MD5 cb4cff0cd869696d1207553de89551c1 files/digest-devtodo-0.1.17 66
+MD5 48d3c0943acaae812475061a16fe6eb9 files/devtodo.patch 2359
+MD5 690abe23e1e2a741222bbc156f9e6478 files/devtodo-0.1.11.colourplain.patch 360
diff --git a/app-misc/devtodo/devtodo-0.1.11-r1.ebuild b/app-misc/devtodo/devtodo-0.1.11-r1.ebuild
deleted file mode 100644
index 2a273a9f8402..000000000000
--- a/app-misc/devtodo/devtodo-0.1.11-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.11-r1.ebuild,v 1.8 2003/02/13 08:55:14 vapier Exp $
-
-DESCRIPTION="A nice command line todo list for developers"
-SRC_URI="http://activelysecure.net/~alec/development/devtodo/0.1.11/${P}.tar.gz"
-HOMEPAGE="http://activelysecure.net/~alec/development/devtodo/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}.colourplain.patch
-}
-
-src_compile() {
-	econf
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog QuickStart README TODO
-}
diff --git a/app-misc/devtodo/devtodo-0.1.14.ebuild b/app-misc/devtodo/devtodo-0.1.14.ebuild
deleted file mode 100644
index fd0cd660ea52..000000000000
--- a/app-misc/devtodo/devtodo-0.1.14.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.14.ebuild,v 1.10 2003/09/05 12:10:36 msterret Exp $
-
-DESCRIPTION="A nice command line todo list for developers"
-SRC_URI="http://devtodo.sourceforge.net/${PV}/${P}.tar.gz"
-HOMEPAGE="http://devtodo.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1"
-
-src_compile() {
-	econf --sysconfdir=/etc/devtodo
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog QuickStart README TODO
-	dodoc doc/scripts.sh doc/scripts.tcsh doc/todorc.example contrib/tdrec
-}
diff --git a/app-misc/devtodo/devtodo-0.1.17.ebuild b/app-misc/devtodo/devtodo-0.1.17.ebuild
index 22a70d99012c..846490c6bec0 100644
--- a/app-misc/devtodo/devtodo-0.1.17.ebuild
+++ b/app-misc/devtodo/devtodo-0.1.17.ebuild
@@ -1,22 +1,31 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.17.ebuild,v 1.5 2003/09/05 12:10:36 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.17.ebuild,v 1.6 2003/12/09 19:02:23 seemant Exp $
 
 IUSE=""
 DESCRIPTION="A nice command line todo list for developers"
-SRC_URI="http://devtodo.sourceforge.net/${PV}/${P}.tar.gz"
 HOMEPAGE="http://devtodo.sourceforge.net/"
+SRC_URI="http://devtodo.sourceforge.net/${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	>=sys-libs/readline-4.1"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Patch to allow compilation with gcc-3.3
+	epatch ${FILESDIR}/${PN}.patch
+}
+
 src_compile() {
-	econf --sysconfdir=/etc/devtodo
-	emake
+	econf  \
+		--sysconfdir=/etc/devtodo || die
+	emake || die
 }
 
 src_install() {
diff --git a/app-misc/devtodo/files/devtodo.patch b/app-misc/devtodo/files/devtodo.patch
new file mode 100644
index 000000000000..c37fd1f542be
--- /dev/null
+++ b/app-misc/devtodo/files/devtodo.patch
@@ -0,0 +1,84 @@
+diff -ru devtodo-0.1.17.old/src/support.cc devtodo-0.1.17.new/src/support.cc
+--- devtodo-0.1.17.old/src/support.cc	2002-12-26 05:32:18.000000000 +0100
++++ devtodo-0.1.17.new/src/support.cc	2003-07-01 00:36:30.000000000 +0200
+@@ -2,7 +2,7 @@
+ #include <cstdlib>
+ #include <cstring>
+ #include <cstdio>
+-#include <strstream>
++#include <sstream>
+ #include <stdexcept>
+ #include "support.h"
+ #include "TodoDB.h"
+@@ -814,7 +814,7 @@
+ 
+ 		while (in.getline(line, 1024)) {
+ 		string str;
+-		istrstream is(line);
++		istringstream is(line);
+ 
+ 			if (is >> str) {
+ 				if (str[0] == '#') continue;
+@@ -837,7 +837,7 @@
+ 					// multi-line event ?
+ 					if (str == "{") {
+ 						while (in.getline(line, 1024)) {
+-						istrstream is(line);
++						istringstream is(line);
+ 
+ 							if (is >> str) {
+ 								if (str[0] == '#') continue;
+diff -ru devtodo-0.1.17.old/util/CommandArgs.h devtodo-0.1.17.new/util/CommandArgs.h
+--- devtodo-0.1.17.old/util/CommandArgs.h	2001-07-10 19:11:47.000000000 +0200
++++ devtodo-0.1.17.new/util/CommandArgs.h	2003-07-01 00:36:30.000000000 +0200
+@@ -5,6 +5,7 @@
+ #include <string>
+ #include <vector>
+ #include <iostream>
++#include <cassert>
+ #include "Strings.h"
+ 
+ using namespace std;
+diff -ru devtodo-0.1.17.old/util/Regex.h devtodo-0.1.17.new/util/Regex.h
+--- devtodo-0.1.17.old/util/Regex.h	2002-12-21 16:10:43.000000000 +0100
++++ devtodo-0.1.17.new/util/Regex.h	2003-07-01 00:36:30.000000000 +0200
+@@ -6,6 +6,7 @@
+ #include <map>
+ #include <utility>
+ #include <stdexcept>
++#include <cassert>
+ #include <sys/types.h>
+ #include "c_regex.h"
+ 
+diff -ru devtodo-0.1.17.old/util/Strings.h devtodo-0.1.17.new/util/Strings.h
+--- devtodo-0.1.17.old/util/Strings.h	2002-07-23 07:25:45.000000000 +0200
++++ devtodo-0.1.17.new/util/Strings.h	2003-07-01 00:36:30.000000000 +0200
+@@ -7,7 +7,7 @@
+ #include <cerrno>
+ #include <iostream>
+ #include <vector>
+-#include <strstream>
++#include <sstream>
+ #include <stdexcept>
+ 
+ using namespace std;
+@@ -118,8 +118,8 @@
+ 	@parameter var Variable to convert.
+ */
+ template <typename T> string stringify(T const &t) {
+-ostrstream os;
+-	os << t << '\0';
++ostringstream os;
++	os << t;
+ 	return os.str();
+ }
+ 
+@@ -135,7 +135,7 @@
+ 	@parameter str Strings to convert to type T.
+ */
+ template <typename T> T destringify(string const &str) {
+-istrstream os(str.c_str());
++istringstream os(str);
+ T t;
+ 
+ 	os >> t;
diff --git a/app-misc/devtodo/files/digest-devtodo-0.1.11-r1 b/app-misc/devtodo/files/digest-devtodo-0.1.11-r1
deleted file mode 100644
index cfedd6be9d04..000000000000
--- a/app-misc/devtodo/files/digest-devtodo-0.1.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 501566f92724a2073280cbdf8adeb709 devtodo-0.1.11.tar.gz 285229
diff --git a/app-misc/devtodo/files/digest-devtodo-0.1.14 b/app-misc/devtodo/files/digest-devtodo-0.1.14
deleted file mode 100644
index 0589627594aa..000000000000
--- a/app-misc/devtodo/files/digest-devtodo-0.1.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e9c3960a67585cc14f00814058bad303 devtodo-0.1.14.tar.gz 277963