Added a patch to fix tdr segfaults with gcc-3.4.x; devtodo's support.cc doesn't like -O2 at all, so we now use replace-flags. Also, run autoreconf rather than just automake after patching.

5 files changed, 78 insertions, 12 deletions

diff --git a/app-misc/devtodo/ChangeLog b/app-misc/devtodo/ChangeLog
index 99f380881cd1..b0eeeefd8690 100644
--- a/app-misc/devtodo/ChangeLog
+++ b/app-misc/devtodo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/devtodo
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/ChangeLog,v 1.27 2004/11/07 02:49:54 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/ChangeLog,v 1.28 2004/11/11 10:37:54 ka0ttic Exp $
+
+*devtodo-0.1.18-r1 (11 Nov 2004)
+
+  11 Nov 2004; Aaron Walker <ka0ttic@gentoo.org>
+  +files/devtodo-0.1.18-invalid-ptr.patch, +devtodo-0.1.18-r1.ebuild:
+  Added a patch to fix tdr segfaults with gcc-3.4.x; devtodo's support.cc
+  doesn't like -O2 at all, so we now use replace-flags. Also, run autoreconf
+  rather than just automake after patching.
 
   06 Nov 2004; Aaron Walker <ka0ttic@gentoo.org> devtodo-0.1.18.ebuild:
   Use pkg_postinst provided by bash-completion.eclass
diff --git a/app-misc/devtodo/Manifest b/app-misc/devtodo/Manifest
index c882682cf859..249801800550 100644
--- a/app-misc/devtodo/Manifest
+++ b/app-misc/devtodo/Manifest
@@ -1,25 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 26f617dc1d0fe0d93ca6c5454807b01a devtodo-0.1.17-r1.ebuild 1413
 MD5 27f76d41ee0d3149d8578c31c1f9ed26 devtodo-0.1.18.ebuild 1445
 MD5 708bc8d1cf20e92b71d189b71d12b641 devtodo-0.1.17.ebuild 939
 MD5 b98044c2f037b2bef3988ee7fc5fc3d0 devtodo-0.1.17-r2.ebuild 1531
-MD5 8d13e86d749e959f421a5991c4e69c31 ChangeLog 3891
+MD5 af2bfdca39cff1f6f66b971140c4097c devtodo-0.1.18-r1.ebuild 1638
+MD5 41c6bf810a1481c400d42e9e4a9e63b6 ChangeLog 4240
 MD5 99ce5509db4b50f28a1f6675f8c09b2b metadata.xml 258
+MD5 b6e718b64f0c3f457d1d5820485d257d files/devtodo-0.1.18-invalid-ptr.patch 372
 MD5 cb4cff0cd869696d1207553de89551c1 files/digest-devtodo-0.1.17 66
 MD5 e254b7fe4623f6fb5dfb4c9169e75ef7 files/digest-devtodo-0.1.18 66
 MD5 cb4cff0cd869696d1207553de89551c1 files/digest-devtodo-0.1.17-r1 66
 MD5 cb4cff0cd869696d1207553de89551c1 files/digest-devtodo-0.1.17-r2 66
+MD5 e254b7fe4623f6fb5dfb4c9169e75ef7 files/digest-devtodo-0.1.18-r1 66
 MD5 404d78d738ead3b99865b3f9cb33177d files/devtodo-fix-TERM-sigabrt.patch 758
 MD5 68c51e9b769e87f037a34aa64bbc911f files/devtodo-fix-cd-builtin.patch 303
 MD5 2f6f41259976609db78b40c59b9131f0 files/devtodo.bash-completion 3070
 MD5 48d3c0943acaae812475061a16fe6eb9 files/devtodo.patch 2359
 MD5 3d389c27b4ba6ade4412c088cefe6f46 files/devtodo-1.1.17-notdl.patch 1985
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBjY1jEZCkKN40op4RAu/MAJ9uVnLHuT4vchXvzYpfz6vClh3qIQCgxPCn
-IXpr7PpuFmD5LVZY3ihqQUA=
-=U2Of
------END PGP SIGNATURE-----
diff --git a/app-misc/devtodo/devtodo-0.1.18-r1.ebuild b/app-misc/devtodo/devtodo-0.1.18-r1.ebuild
new file mode 100644
index 000000000000..464c56a092d2
--- /dev/null
+++ b/app-misc/devtodo/devtodo-0.1.18-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2004 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.1 2004/11/11 10:37:54 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="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64 ~s390"
+IUSE=""
+
+RDEPEND=">=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1"
+DEPEND="${RDEPEND} sys-devel/automake"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# bug #55371 - tdl conflicts with app-misc/tdl
+	epatch ${FILESDIR}/${PN}-1.1.17-notdl.patch
+	epatch ${FILESDIR}/${P}-invalid-ptr.patch
+	gnuconfig_update
+}
+
+src_compile() {
+	autoreconf || 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
+
+	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."
+	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"
+	bash-completion_pkg_postinst
+}
diff --git a/app-misc/devtodo/files/devtodo-0.1.18-invalid-ptr.patch b/app-misc/devtodo/files/devtodo-0.1.18-invalid-ptr.patch
new file mode 100644
index 000000000000..674e3f84216f
--- /dev/null
+++ b/app-misc/devtodo/files/devtodo-0.1.18-invalid-ptr.patch
@@ -0,0 +1,11 @@
+--- src/TodoDB.cc.orig	2004-11-11 02:41:46.295927056 -0500
++++ src/TodoDB.cc	2004-11-11 02:40:56.882439048 -0500
+@@ -750,7 +750,7 @@
+ 			if (options.verbose > 1)
+ 				cout << info << "todo: permanently removing item '" << (*j) << "'" << normal << endl;
+ 			erase(todo, *j);
+-			t->db->setDirty(true);
++			//t->db->setDirty(true);
+ 		} else
+ 			notfound.push_back(*j);
+ 	}
diff --git a/app-misc/devtodo/files/digest-devtodo-0.1.18-r1 b/app-misc/devtodo/files/digest-devtodo-0.1.18-r1
new file mode 100644
index 000000000000..1e3f25c5d61f
--- /dev/null
+++ b/app-misc/devtodo/files/digest-devtodo-0.1.18-r1
@@ -0,0 +1 @@
+MD5 6ca0a414685cb7a7f32f7ae22cb3a2a9 devtodo-0.1.18.tar.gz 432858