From 6a366d29abd9a7b8d62d71320f13fb58d79e127e Mon Sep 17 00:00:00 2001 From: Aaron Walker Date: Mon, 6 Jun 2005 16:35:25 +0000 Subject: Version bump; not many changes. most upstream changes are already present in 0.1.18-r2. Added gcc-4 patch which is applicable for both 0.1.18-r2 and 0.1.19. Tidy'd old ebuilds and patches. (Portage version: 2.0.51.22-r1) --- app-misc/devtodo/ChangeLog | 14 ++- app-misc/devtodo/Manifest | 17 ++- app-misc/devtodo/devtodo-0.1.17-r2.ebuild | 51 --------- app-misc/devtodo/devtodo-0.1.18-r1.ebuild | 47 -------- app-misc/devtodo/devtodo-0.1.18-r2.ebuild | 3 +- app-misc/devtodo/devtodo-0.1.19.ebuild | 52 +++++++++ app-misc/devtodo/files/devtodo-0.1.18-gcc4.diff | 11 ++ app-misc/devtodo/files/devtodo-0.1.19-gentoo.diff | 119 +++++++++++++++++++++ .../devtodo/files/devtodo-fix-TERM-sigabrt.patch | 23 ---- .../devtodo/files/devtodo-fix-cd-builtin.patch | 13 --- app-misc/devtodo/files/devtodo.patch | 84 --------------- app-misc/devtodo/files/digest-devtodo-0.1.17-r2 | 1 - app-misc/devtodo/files/digest-devtodo-0.1.18-r1 | 1 - app-misc/devtodo/files/digest-devtodo-0.1.19 | 1 + 14 files changed, 205 insertions(+), 232 deletions(-) delete mode 100644 app-misc/devtodo/devtodo-0.1.17-r2.ebuild delete mode 100644 app-misc/devtodo/devtodo-0.1.18-r1.ebuild create mode 100644 app-misc/devtodo/devtodo-0.1.19.ebuild create mode 100644 app-misc/devtodo/files/devtodo-0.1.18-gcc4.diff create mode 100644 app-misc/devtodo/files/devtodo-0.1.19-gentoo.diff delete mode 100644 app-misc/devtodo/files/devtodo-fix-TERM-sigabrt.patch delete mode 100644 app-misc/devtodo/files/devtodo-fix-cd-builtin.patch delete mode 100644 app-misc/devtodo/files/devtodo.patch delete mode 100644 app-misc/devtodo/files/digest-devtodo-0.1.17-r2 delete mode 100644 app-misc/devtodo/files/digest-devtodo-0.1.18-r1 create mode 100644 app-misc/devtodo/files/digest-devtodo-0.1.19 diff --git a/app-misc/devtodo/ChangeLog b/app-misc/devtodo/ChangeLog index 097b87ee6f08..7b7987cf9b7f 100644 --- a/app-misc/devtodo/ChangeLog +++ b/app-misc/devtodo/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for app-misc/devtodo # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/ChangeLog,v 1.43 2005/04/08 12:22:59 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/ChangeLog,v 1.44 2005/06/06 16:35:25 ka0ttic Exp $ + +*devtodo-0.1.19 (06 Jun 2005) + + 06 Jun 2005; Aaron Walker + +files/devtodo-0.1.18-gcc4.diff, +files/devtodo-0.1.19-gentoo.diff, + -files/devtodo.patch, -files/devtodo-fix-TERM-sigabrt.patch, + -files/devtodo-fix-cd-builtin.patch, -devtodo-0.1.17-r2.ebuild, + -devtodo-0.1.18-r1.ebuild, devtodo-0.1.18-r2.ebuild, + +devtodo-0.1.19.ebuild: + Version bump; not many changes. most upstream changes are already present in + 0.1.18-r2. Added gcc-4 patch which is applicable for both 0.1.18-r2 and + 0.1.19. Tidy'd old ebuilds and patches. 08 Apr 2005; Markus Rothe devtodo-0.1.18-r2.ebuild: Stable on ppc64 diff --git a/app-misc/devtodo/Manifest b/app-misc/devtodo/Manifest index ee2df133be91..d45f41257028 100644 --- a/app-misc/devtodo/Manifest +++ b/app-misc/devtodo/Manifest @@ -1,13 +1,10 @@ -MD5 c9e689275cbd4902645488318b23a866 ChangeLog 6294 -MD5 7682710f31d259c52a0dd3f11cfca558 devtodo-0.1.17-r2.ebuild 1667 -MD5 da5d37350b247346d077883105398d7c devtodo-0.1.18-r1.ebuild 1345 -MD5 4685485a53ddc908f6d69b148bdd06e3 devtodo-0.1.18-r2.ebuild 1348 +MD5 a422209504007bec6e8583aca3ab7877 devtodo-0.1.18-r2.ebuild 1383 +MD5 1d9147a92eb7454b8bfff238168a6070 devtodo-0.1.19.ebuild 1451 +MD5 556a2006f12294a8282510b1fd075138 ChangeLog 6850 MD5 99ce5509db4b50f28a1f6675f8c09b2b metadata.xml 258 +MD5 07ddb19b677965f01eb612985e082441 files/digest-devtodo-0.1.19 66 +MD5 e254b7fe4623f6fb5dfb4c9169e75ef7 files/digest-devtodo-0.1.18-r2 66 MD5 d2457f597a941172dfdc9e12d13ce605 files/devtodo-0.1.18-gentoo.diff 4853 -MD5 404d78d738ead3b99865b3f9cb33177d files/devtodo-fix-TERM-sigabrt.patch 758 -MD5 68c51e9b769e87f037a34aa64bbc911f files/devtodo-fix-cd-builtin.patch 303 +MD5 30a6fe495de6d0a0aaf435d52f83e254 files/devtodo-0.1.18-gcc4.diff 225 MD5 fb4916ad754050b018e360663a1f3497 files/devtodo.bash-completion 1546 -MD5 48d3c0943acaae812475061a16fe6eb9 files/devtodo.patch 2359 -MD5 cb4cff0cd869696d1207553de89551c1 files/digest-devtodo-0.1.17-r2 66 -MD5 e254b7fe4623f6fb5dfb4c9169e75ef7 files/digest-devtodo-0.1.18-r1 66 -MD5 e254b7fe4623f6fb5dfb4c9169e75ef7 files/digest-devtodo-0.1.18-r2 66 +MD5 d4832a9a5c0f6bd3d6a400be666a60d4 files/devtodo-0.1.19-gentoo.diff 4623 diff --git a/app-misc/devtodo/devtodo-0.1.17-r2.ebuild b/app-misc/devtodo/devtodo-0.1.17-r2.ebuild deleted file mode 100644 index 847dad9a67cf..000000000000 --- a/app-misc/devtodo/devtodo-0.1.17-r2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.17-r2.ebuild,v 1.10 2005/01/01 14:58:26 eradicator Exp $ - -inherit eutils gnuconfig flag-o-matic - -DESCRIPTION="A nice command line todo list for developers" -HOMEPAGE="http://swapoff.org/DevTodo" -SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ppc sparc mips alpha ~hppa amd64 ~ia64 ~s390 ppc64" -IUSE="" - -RDEPEND=">=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1" -DEPEND="${RDEPEND}" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PN}.patch # gcc-3.3 fix - epatch ${FILESDIR}/${PN}-fix-cd-builtin.patch # bug 60206 - epatch ${FILESDIR}/${PN}-fix-TERM-sigabrt.patch # bug 60207 - epatch ${FILESDIR}/${PN}-0.1.18-gentoo.diff - gnuconfig_update -} - -src_compile() { - einfo "Running autoreconf" - WANT_AUTOCONF="2.5" autoreconf -f -i || die "autoreconf failed" - replace-flags -O? -O1 - econf --sysconfdir=/etc/devtodo || die "econf failed" - emake || die "emake failed" -} - -src_install() { - make DESTDIR=${D} install || die "make install failed" - dodoc AUTHORS ChangeLog QuickStart README TODO doc/scripts.sh \ - doc/scripts.tcsh doc/todorc.example contrib/tdrec || die "dodoc failed" -} - -pkg_postinst() { - einfo "Because of a conflict with app-misc/tdl, the tdl symbolic link" - einfo "and manual page have been removed." - einfo "If you upgraded from a previous version, you may have to manually" - einfo "remove the symbolic links:" - einfo " /usr/bin/tdl -> /usr/bin/devtodo" - einfo " /usr/share/man/man1/tdl.1.gz -> /usr/share/man/man1/devtodo.1.gz" -} diff --git a/app-misc/devtodo/devtodo-0.1.18-r1.ebuild b/app-misc/devtodo/devtodo-0.1.18-r1.ebuild deleted file mode 100644 index eece249af196..000000000000 --- a/app-misc/devtodo/devtodo-0.1.18-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.18-r1.ebuild,v 1.7 2005/01/01 14:58:26 eradicator Exp $ - -inherit eutils gnuconfig bash-completion flag-o-matic - -DESCRIPTION="A nice command line todo list for developers" -HOMEPAGE="http://swapoff.org/DevTodo" -SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ~ppc sparc ~mips alpha ~hppa ~amd64 ~ia64 s390" -IUSE="" - -RDEPEND=">=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1" -DEPEND="${RDEPEND}" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-gentoo.diff - gnuconfig_update -} - -src_compile() { - einfo "Running autoreconf" - autoreconf -f -i || die "autoreconf failed" - replace-flags -O? -O1 - econf --sysconfdir=/etc/devtodo || die "econf failed" - emake || die "emake failed" -} - -src_install() { - make DESTDIR=${D} install || die "make install failed" - dodoc AUTHORS ChangeLog QuickStart README TODO doc/scripts.sh \ - doc/scripts.tcsh doc/todorc.example contrib/tdrec || die "dodoc failed" - dobashcompletion ${FILESDIR}/${PN}.bash-completion ${PN} -} - -pkg_postinst() { - echo - einfo "Because of a conflict with app-misc/tdl, the tdl symbolic link" - einfo "and manual page have been removed." - bash-completion_pkg_postinst -} diff --git a/app-misc/devtodo/devtodo-0.1.18-r2.ebuild b/app-misc/devtodo/devtodo-0.1.18-r2.ebuild index 24185e5b1d35..1652c4176e3d 100644 --- a/app-misc/devtodo/devtodo-0.1.18-r2.ebuild +++ b/app-misc/devtodo/devtodo-0.1.18-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.18-r2.ebuild,v 1.12 2005/04/08 12:22:59 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.18-r2.ebuild,v 1.13 2005/06/06 16:35:25 ka0ttic Exp $ inherit eutils gnuconfig bash-completion flag-o-matic @@ -21,6 +21,7 @@ src_unpack() { unpack ${A} cd ${S} epatch ${FILESDIR}/${P}-gentoo.diff + epatch ${FILESDIR}/${P}-gcc4.diff gnuconfig_update } diff --git a/app-misc/devtodo/devtodo-0.1.19.ebuild b/app-misc/devtodo/devtodo-0.1.19.ebuild new file mode 100644 index 000000000000..61ede5bcb627 --- /dev/null +++ b/app-misc/devtodo/devtodo-0.1.19.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.19.ebuild,v 1.1 2005/06/06 16:35:25 ka0ttic Exp $ + +inherit eutils gnuconfig bash-completion flag-o-matic + +DESCRIPTION="A nice command line todo list for developers" +HOMEPAGE="http://swapoff.org/DevTodo" +SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="" + +RDEPEND=">=sys-libs/ncurses-5.2 + >=sys-libs/readline-4.1" +DEPEND="${RDEPEND}" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${PN}-0.1.18-gcc4.diff + epatch ${FILESDIR}/${P}-gentoo.diff + gnuconfig_update +} + +src_compile() { + einfo "Running autoreconf" + autoreconf -f -i || die "autoreconf failed" + replace-flags -O[23] -O1 + econf --sysconfdir=/etc/devtodo || die "econf failed" + emake || die "emake failed" +} + +src_install() { + make DESTDIR=${D} install || die "make install failed" + dodoc AUTHORS ChangeLog QuickStart README doc/scripts.sh \ + doc/scripts.tcsh doc/todorc.example || die "dodoc failed" + + dobashcompletion contrib/${PN}.bash-completion ${PN} + rm contrib/${PN}.bash-completion + docinto contrib + dodoc contrib/* +} + +pkg_postinst() { + echo + einfo "Because of a conflict with app-misc/tdl, the tdl symbolic link" + einfo "and manual page have been removed." + bash-completion_pkg_postinst +} diff --git a/app-misc/devtodo/files/devtodo-0.1.18-gcc4.diff b/app-misc/devtodo/files/devtodo-0.1.18-gcc4.diff new file mode 100644 index 000000000000..38caf1b4b12e --- /dev/null +++ b/app-misc/devtodo/files/devtodo-0.1.18-gcc4.diff @@ -0,0 +1,11 @@ +--- src/Todo.h.orig 2005-06-06 12:15:58.000000000 -0400 ++++ src/Todo.h 2005-06-06 12:13:41.000000000 -0400 +@@ -14,6 +14,8 @@ + 01/02/01 Initial creation + */ + ++class TodoDB; ++ + class Todo { + public : + friend class TodoDB; diff --git a/app-misc/devtodo/files/devtodo-0.1.19-gentoo.diff b/app-misc/devtodo/files/devtodo-0.1.19-gentoo.diff new file mode 100644 index 000000000000..4152776d58f7 --- /dev/null +++ b/app-misc/devtodo/files/devtodo-0.1.19-gentoo.diff @@ -0,0 +1,119 @@ +diff -urN devtodo-0.1.18.orig/acconfig.h devtodo-0.1.18/acconfig.h +--- devtodo-0.1.18.orig/acconfig.h 2004-12-17 10:21:09.168345388 -0500 ++++ devtodo-0.1.18/acconfig.h 1969-12-31 19:00:00.000000000 -0500 +@@ -1,6 +0,0 @@ +-/* System configuration directory */ +-#undef SYSCONFDIR +- +-/* Use termcap to get terminal width */ +-#undef USETERMCAP +-@TOP@ +diff -urN devtodo-0.1.18.orig/configure.in devtodo-0.1.18/configure.in +--- devtodo-0.1.18.orig/configure.in 2004-12-17 10:21:09.166345721 -0500 ++++ devtodo-0.1.18/configure.in 2004-12-17 10:21:34.049210408 -0500 +@@ -25,7 +25,7 @@ + # Don't use termcap to obtain window size + AC_ARG_WITH(termcap, [ --without-termcap don't use termcap to obtain terminal width]) + if test "${with_termcap}_" = _ -o "${with_termcap}_" = yes; then +- AC_DEFINE(USETERMCAP) ++ AC_DEFINE(USETERMCAP, [], [Use termcap?]) + fi + + # Check for various headers and functions - although I'm not doing anything +@@ -79,7 +79,7 @@ + AC_SUBST(READLINE_LIBS) + + SYSCONFDIR="`eval echo $sysconfdir`" +-AC_DEFINE_UNQUOTED(SYSCONFDIR, "$SYSCONFDIR") ++AC_DEFINE_UNQUOTED(SYSCONFDIR, "$SYSCONFDIR", [System configuration directory]) + AC_SUBST(SYSCONFDIR) + + AC_CHECK_PROG(HAVE_CRASH_CONFIG, crash-config, yes) +diff -urN devtodo-0.1.18.orig/doc/devtodo.1.in devtodo-0.1.18/doc/devtodo.1.in +--- devtodo-0.1.18.orig/doc/devtodo.1.in 2004-12-17 10:21:09.135350872 -0500 ++++ devtodo-0.1.18/doc/devtodo.1.in 2004-12-17 10:21:34.050210242 -0500 +@@ -20,9 +20,6 @@ + .TP + \fBtdd \fI\fP\fP + Mark the specified items as being done. +-.TP +-\fBtdl [\-g \fI\fP] \fI\fP\fP +-Link the specified devtodo database into the current one, optionally grafting it as a child of the specified index. + .SH "DESCRIPTION" + .LP + \fBtodo\fP is a program aimed specifically at programmers (but usable by anybody at the terminal) to aid in day\-to\-day development. +@@ -372,6 +369,10 @@ + .TP + \fB~/.todorc\fR + User-specific options are specified in this file. Please refer to the section \fBTODORC\fR for more information. ++.SH "BUGS" ++.LP ++Because of a conflict with app-misc/tdl, the tdl symbolic link and the tdl manual page have been removed. ++See \fIhttp://bugs.gentoo.org/show_bug.cgi?id=55371\fR for more information. + .SH "AUTHORS" + .LP + Alec Thomas \fI\fR +diff -urN devtodo-0.1.18.orig/doc/Makefile.am devtodo-0.1.18/doc/Makefile.am +--- devtodo-0.1.18.orig/doc/Makefile.am 2004-12-17 10:21:09.135350872 -0500 ++++ devtodo-0.1.18/doc/Makefile.am 2004-12-17 10:21:34.050210242 -0500 +@@ -1,5 +1,5 @@ + man_MANS=devtodo.1 +-manlinks=tda tdr tdd tde tdl todo ++manlinks=tda tdr tdd tde todo + + install-data-local: + mkdir -p $(DESTDIR)$(mandir)/man1 +diff -urN devtodo-0.1.18.orig/src/Makefile.am devtodo-0.1.18/src/Makefile.am +--- devtodo-0.1.18.orig/src/Makefile.am 2004-12-17 10:21:09.154347715 -0500 ++++ devtodo-0.1.18/src/Makefile.am 2004-12-17 10:21:34.053209744 -0500 +@@ -1,18 +1,12 @@ + bin_PROGRAMS=devtodo + devtodo_SOURCES=Todo.cc Todo.h TodoDB.cc TodoDB.h support.cc support.h \ + main.cc todoterm.cc todoterm.h Loaders.cc Loaders.h todorl.h +-binlinks=tda tdr tdd tdl tde todo ++binlinks=tda tdr tdd tde todo + + devtodo_LDADD=../util/libutil.la + INCLUDES=-I../util + LIBS=@READLINE_LIBS@ + +-if DEBUG +-CPPFLAGS=-g +-else +-CPPFLAGS+=-DNDEBUG +-endif +- + install-exec-hook: + cd $(DESTDIR)$(bindir); for i in $(binlinks); do $(LN_S) -f devtodo $$i; done + +diff -urN devtodo-0.1.18.orig/src/TodoDB.cc devtodo-0.1.18/src/TodoDB.cc +--- devtodo-0.1.18.orig/src/TodoDB.cc 2004-12-17 10:21:09.136350706 -0500 ++++ devtodo-0.1.18/src/TodoDB.cc 2004-12-17 10:21:34.054209577 -0500 +@@ -949,7 +948,11 @@ + if (out.bad()) + throw exception("couldn't open TODO for generation"); + +- if (titleText != "") wraptext(out, titleText, 0, options.columns); ++ if (titleText != "") { ++ wraptext(out, titleText, 0, options.columns); ++ out << endl << endl; ++ } ++ + if (options.verbose > 1) + cout << "todo: generating using format '" << options.format["verbose-generated"] << "'" << endl; + filterView(); +diff -urN devtodo-0.1.18.orig/util/c_regex.h devtodo-0.1.18/util/c_regex.h +--- devtodo-0.1.18.orig/util/c_regex.h 2004-12-17 10:21:09.157347216 -0500 ++++ devtodo-0.1.18/util/c_regex.h 2004-12-17 10:25:41.026169344 -0500 +@@ -533,7 +533,10 @@ + /* For now unconditionally define __restrict_arr to expand to nothing. + Ideally we would have a test for the compiler which allows defining + it to restrict. */ +-#define __restrict_arr ++#ifdef __restrict_arr ++# undef __restrict_arr ++# define __restrict_arr ++#endif + + /* POSIX compatibility. */ + extern int regcomp _RE_ARGS ((regex_t *__restrict __preg, diff --git a/app-misc/devtodo/files/devtodo-fix-TERM-sigabrt.patch b/app-misc/devtodo/files/devtodo-fix-TERM-sigabrt.patch deleted file mode 100644 index e90f4626cb12..000000000000 --- a/app-misc/devtodo/files/devtodo-fix-TERM-sigabrt.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- src/todoterm.cc.orig 2004-08-13 00:11:52.095224000 -0400 -+++ src/todoterm.cc 2004-08-13 01:15:38.901461024 -0400 -@@ -2,6 +2,7 @@ - #include "todoterm.h" - - #ifdef USETERMCAP -+#include - #include - #include - #include -@@ -14,7 +15,11 @@ - int getWidth() { - if (!info[2047]) { - char const *termtype = getenv("TERM"); -- if (!termtype) throw runtime_error("can't get terminal type, please set TERM envar"); -+ if (!termtype) { -+ cerr << "can't get terminal type, defaulting to vt100." << endl; -+ cerr << "please set the TERM env variable." << endl; -+ setenv("TERM", "vt100", 0); -+ } - int result = tgetent(info, getenv("TERM")); - if (result < 0) - throw runtime_error("could not access termcap database"); diff --git a/app-misc/devtodo/files/devtodo-fix-cd-builtin.patch b/app-misc/devtodo/files/devtodo-fix-cd-builtin.patch deleted file mode 100644 index 09c8bf4bb999..000000000000 --- a/app-misc/devtodo/files/devtodo-fix-cd-builtin.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- doc/scripts.sh.orig 2004-08-13 00:06:05.751876192 -0400 -+++ doc/scripts.sh 2004-08-13 00:06:56.935095160 -0400 -@@ -22,7 +22,9 @@ - - cd () - { -- builtin cd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS} -+ builtin cd "$@" -+ RV=$? -+ [ -r .todo ] && devtodo ${TODO_OPTIONS} || return $RV - } - - pushd () diff --git a/app-misc/devtodo/files/devtodo.patch b/app-misc/devtodo/files/devtodo.patch deleted file mode 100644 index c37fd1f542be..000000000000 --- a/app-misc/devtodo/files/devtodo.patch +++ /dev/null @@ -1,84 +0,0 @@ -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 - #include - #include --#include -+#include - #include - #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 - #include - #include -+#include - #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 - #include - #include -+#include - #include - #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 - #include - #include --#include -+#include - #include - - using namespace std; -@@ -118,8 +118,8 @@ - @parameter var Variable to convert. - */ - template 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 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.17-r2 b/app-misc/devtodo/files/digest-devtodo-0.1.17-r2 deleted file mode 100644 index 21e6c99eeb79..000000000000 --- a/app-misc/devtodo/files/digest-devtodo-0.1.17-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 cc3cdd3064eaa7270191bee63d3b1a2c devtodo-0.1.17.tar.gz 312755 diff --git a/app-misc/devtodo/files/digest-devtodo-0.1.18-r1 b/app-misc/devtodo/files/digest-devtodo-0.1.18-r1 deleted file mode 100644 index 1e3f25c5d61f..000000000000 --- a/app-misc/devtodo/files/digest-devtodo-0.1.18-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 6ca0a414685cb7a7f32f7ae22cb3a2a9 devtodo-0.1.18.tar.gz 432858 diff --git a/app-misc/devtodo/files/digest-devtodo-0.1.19 b/app-misc/devtodo/files/digest-devtodo-0.1.19 new file mode 100644 index 000000000000..92ca1a8b9d5a --- /dev/null +++ b/app-misc/devtodo/files/digest-devtodo-0.1.19 @@ -0,0 +1 @@ +MD5 723c86eae76c425ab9f271760bb951a3 devtodo-0.1.19.tar.gz 442920 -- cgit v1.2.3-65-gdbad