From 737ba3ba5a57738042dbcb93ddd4017c79662648 Mon Sep 17 00:00:00 2001 From: Aaron Walker Date: Thu, 18 Nov 2004 16:09:06 +0000 Subject: Added gentoo patch, which consolidates common patches with the addition of some other fixes, including fixed --TODO output as well as some automake/autoconf warning fixes. --- app-misc/devtodo/ChangeLog | 13 ++- app-misc/devtodo/Manifest | 17 ++-- app-misc/devtodo/devtodo-0.1.17-r2.ebuild | 37 ++++--- app-misc/devtodo/devtodo-0.1.18-r1.ebuild | 16 ++- app-misc/devtodo/devtodo-0.1.18-r2.ebuild | 47 +++++++++ app-misc/devtodo/files/devtodo-0.1.18-gentoo.diff | 112 +++++++++++++++++++++ .../devtodo/files/devtodo-0.1.18-invalid-ptr.patch | 11 -- app-misc/devtodo/files/devtodo-1.1.17-notdl.patch | 46 --------- app-misc/devtodo/files/digest-devtodo-0.1.18-r2 | 1 + 9 files changed, 206 insertions(+), 94 deletions(-) create mode 100644 app-misc/devtodo/devtodo-0.1.18-r2.ebuild create mode 100644 app-misc/devtodo/files/devtodo-0.1.18-gentoo.diff delete mode 100644 app-misc/devtodo/files/devtodo-0.1.18-invalid-ptr.patch delete mode 100644 app-misc/devtodo/files/devtodo-1.1.17-notdl.patch create mode 100644 app-misc/devtodo/files/digest-devtodo-0.1.18-r2 (limited to 'app-misc/devtodo') diff --git a/app-misc/devtodo/ChangeLog b/app-misc/devtodo/ChangeLog index f0a509a91599..dff190034ecd 100644 --- a/app-misc/devtodo/ChangeLog +++ b/app-misc/devtodo/ChangeLog @@ -1,6 +1,17 @@ # 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.31 2004/11/15 13:56:14 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/ChangeLog,v 1.32 2004/11/18 16:09:06 ka0ttic Exp $ + +*devtodo-0.1.18-r2 (18 Nov 2004) + + 18 Nov 2004; Aaron Walker + +files/devtodo-0.1.18-gentoo.diff, + -files/devtodo-0.1.18-invalid-ptr.patch, + -files/devtodo-1.1.17-notdl.patch, devtodo-0.1.17-r2.ebuild, + devtodo-0.1.18-r1.ebuild, +devtodo-0.1.18-r2.ebuild: + Added gentoo patch, which consolidates common patches with the addition of + some other fixes, including fixed --TODO output as well as some + automake/autoconf warning fixes. 15 Nov 2004; Gustavo Zacarias devtodo-0.1.18-r1.ebuild: diff --git a/app-misc/devtodo/Manifest b/app-misc/devtodo/Manifest index fd3ca61a9c50..5af3d02fceb8 100644 --- a/app-misc/devtodo/Manifest +++ b/app-misc/devtodo/Manifest @@ -1,12 +1,13 @@ -MD5 49aa7e447d01cf70ca74b4a38108c3f0 ChangeLog 4681 -MD5 b98044c2f037b2bef3988ee7fc5fc3d0 devtodo-0.1.17-r2.ebuild 1531 -MD5 67272f7350079b62317169d701a6b774 devtodo-0.1.18-r1.ebuild 1462 +MD5 e78efac8e5c707c25635f776865fcab2 devtodo-0.1.18-r2.ebuild 1337 +MD5 58b66fa976a8dfb0347dad1b29ece9e0 devtodo-0.1.17-r2.ebuild 1663 +MD5 13f4abad0118af937b2f187bc4e0dee5 devtodo-0.1.18-r1.ebuild 1338 +MD5 e19726b2130e7349f087f9b1e71df074 ChangeLog 5141 MD5 99ce5509db4b50f28a1f6675f8c09b2b metadata.xml 258 -MD5 3d389c27b4ba6ade4412c088cefe6f46 files/devtodo-1.1.17-notdl.patch 1985 -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 404d78d738ead3b99865b3f9cb33177d files/devtodo-fix-TERM-sigabrt.patch 758 +MD5 aa51faed7416749ab46f020ce585ffc7 files/devtodo-0.1.18-gentoo.diff 4250 MD5 68c51e9b769e87f037a34aa64bbc911f files/devtodo-fix-cd-builtin.patch 303 -MD5 cb4cff0cd869696d1207553de89551c1 files/digest-devtodo-0.1.17-r2 66 MD5 d32e7456f09dcc45419319fcf1df8ae0 files/devtodo.bash-completion 3319 -MD5 b6e718b64f0c3f457d1d5820485d257d files/devtodo-0.1.18-invalid-ptr.patch 372 -MD5 e254b7fe4623f6fb5dfb4c9169e75ef7 files/digest-devtodo-0.1.18-r1 66 +MD5 48d3c0943acaae812475061a16fe6eb9 files/devtodo.patch 2359 diff --git a/app-misc/devtodo/devtodo-0.1.17-r2.ebuild b/app-misc/devtodo/devtodo-0.1.17-r2.ebuild index ac21b6e5c075..588ad07565d8 100644 --- a/app-misc/devtodo/devtodo-0.1.17-r2.ebuild +++ b/app-misc/devtodo/devtodo-0.1.17-r2.ebuild @@ -1,8 +1,8 @@ # 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.17-r2.ebuild,v 1.8 2004/10/31 14:39:10 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.17-r2.ebuild,v 1.9 2004/11/18 16:09:06 ka0ttic Exp $ -inherit eutils gnuconfig +inherit eutils gnuconfig flag-o-matic DESCRIPTION="A nice command line todo list for developers" HOMEPAGE="http://swapoff.org/DevTodo" @@ -13,33 +13,32 @@ 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} sys-devel/automake" +RDEPEND=">=sys-libs/ncurses-5.2 + >=sys-libs/readline-4.1" +DEPEND="${RDEPEND}" src_unpack() { unpack ${A} cd ${S} - # Patch to allow compilation with gcc-3.3 - epatch ${FILESDIR}/${PN}.patch - # bug #55371 - epatch ${FILESDIR}/${PN}-1.1.17-notdl.patch - - # bug 60206 + 60207 - epatch ${FILESDIR}/${PN}-fix-cd-builtin.patch - epatch ${FILESDIR}/${PN}-fix-TERM-sigabrt.patch - automake + 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() { - gnuconfig_update - econf --sysconfdir=/etc/devtodo || die - emake || die + 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 - dodoc AUTHORS ChangeLog QuickStart README TODO - dodoc doc/scripts.sh doc/scripts.tcsh doc/todorc.example contrib/tdrec + 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() { diff --git a/app-misc/devtodo/devtodo-0.1.18-r1.ebuild b/app-misc/devtodo/devtodo-0.1.18-r1.ebuild index 11541b9148c1..5417eabbb960 100644 --- a/app-misc/devtodo/devtodo-0.1.18-r1.ebuild +++ b/app-misc/devtodo/devtodo-0.1.18-r1.ebuild @@ -1,6 +1,6 @@ # 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.3 2004/11/15 13:56:14 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.18-r1.ebuild,v 1.4 2004/11/18 16:09:06 ka0ttic Exp $ inherit eutils gnuconfig bash-completion flag-o-matic @@ -13,21 +13,19 @@ 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" +RDEPEND=">=sys-libs/ncurses-5.2 + >=sys-libs/readline-4.1" +DEPEND="${RDEPEND}" src_unpack() { unpack ${A} cd ${S} - - # bug #55371 - tdl conflicts with app-misc/tdl - epatch ${FILESDIR}/${PN}-1.1.17-notdl.patch - # invalid pointer bug that rears its head w/gcc-3.4.x - epatch ${FILESDIR}/${P}-invalid-ptr.patch + epatch ${FILESDIR}/${P}-gentoo.diff gnuconfig_update } src_compile() { + einfo "Running autoreconf" autoreconf || die "autoreconf failed" replace-flags -O? -O1 econf --sysconfdir=/etc/devtodo || die "econf failed" @@ -37,7 +35,7 @@ src_compile() { 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 + doc/scripts.tcsh doc/todorc.example contrib/tdrec || die "dodoc failed" dobashcompletion ${FILESDIR}/${PN}.bash-completion ${PN} } diff --git a/app-misc/devtodo/devtodo-0.1.18-r2.ebuild b/app-misc/devtodo/devtodo-0.1.18-r2.ebuild new file mode 100644 index 000000000000..31da0cb04855 --- /dev/null +++ b/app-misc/devtodo/devtodo-0.1.18-r2.ebuild @@ -0,0 +1,47 @@ +# 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-r2.ebuild,v 1.1 2004/11/18 16:09:06 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}" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-gentoo.diff + gnuconfig_update +} + +src_compile() { + einfo "Running autoreconf" + 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 || 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/files/devtodo-0.1.18-gentoo.diff b/app-misc/devtodo/files/devtodo-0.1.18-gentoo.diff new file mode 100644 index 000000000000..086183907cba --- /dev/null +++ b/app-misc/devtodo/files/devtodo-0.1.18-gentoo.diff @@ -0,0 +1,112 @@ +diff -urN devtodo-0.1.18.orig/acconfig.h devtodo-0.1.18/acconfig.h +--- devtodo-0.1.18.orig/acconfig.h 2004-02-09 09:10:37.000000000 -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-08-29 22:09:57.000000000 -0400 ++++ devtodo-0.1.18/configure.in 2004-11-18 02:07:54.106856224 -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-08-29 06:02:00.000000000 -0400 ++++ devtodo-0.1.18/doc/devtodo.1.in 2004-11-18 02:07:38.040298712 -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-02-09 09:10:37.000000000 -0500 ++++ devtodo-0.1.18/doc/Makefile.am 2004-11-18 02:07:38.039298864 -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-08-29 06:08:26.000000000 -0400 ++++ devtodo-0.1.18/src/Makefile.am 2004-11-18 02:07:46.086075568 -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-02-09 09:10:37.000000000 -0500 ++++ devtodo-0.1.18/src/TodoDB.cc 2004-11-18 02:07:38.042298408 -0500 +@@ -750,7 +750,6 @@ + if (options.verbose > 1) + cout << info << "todo: permanently removing item '" << (*j) << "'" << normal << endl; + erase(todo, *j); +- t->db->setDirty(true); + } else + notfound.push_back(*j); + } +@@ -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 --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 deleted file mode 100644 index 674e3f84216f..000000000000 --- a/app-misc/devtodo/files/devtodo-0.1.18-invalid-ptr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/devtodo-1.1.17-notdl.patch b/app-misc/devtodo/files/devtodo-1.1.17-notdl.patch deleted file mode 100644 index 806068bc70b5..000000000000 --- a/app-misc/devtodo/files/devtodo-1.1.17-notdl.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ru devtodo-0.1.17/doc/Makefile.am devtodo-0.1.17-notdl/doc/Makefile.am ---- devtodo-0.1.17/doc/Makefile.am 2002-12-18 23:07:14.000000000 -0500 -+++ devtodo-0.1.17-notdl/doc/Makefile.am 2004-07-18 02:32:21.512198704 -0400 -@@ -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 -ru devtodo-0.1.17/doc/devtodo.1.in devtodo-0.1.17-notdl/doc/devtodo.1.in ---- devtodo-0.1.17/doc/devtodo.1.in 2002-12-26 02:50:23.000000000 -0500 -+++ devtodo-0.1.17-notdl/doc/devtodo.1.in 2004-07-18 02:32:21.513198552 -0400 -@@ -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. -@@ -369,6 +366,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 -ru devtodo-0.1.17/src/Makefile.am devtodo-0.1.17-notdl/src/Makefile.am ---- devtodo-0.1.17/src/Makefile.am 2002-12-21 10:29:29.000000000 -0500 -+++ devtodo-0.1.17-notdl/src/Makefile.am 2004-07-18 02:33:13.775253512 -0400 -@@ -1,7 +1,7 @@ - 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 diff --git a/app-misc/devtodo/files/digest-devtodo-0.1.18-r2 b/app-misc/devtodo/files/digest-devtodo-0.1.18-r2 new file mode 100644 index 000000000000..1e3f25c5d61f --- /dev/null +++ b/app-misc/devtodo/files/digest-devtodo-0.1.18-r2 @@ -0,0 +1 @@ +MD5 6ca0a414685cb7a7f32f7ae22cb3a2a9 devtodo-0.1.18.tar.gz 432858 -- cgit v1.2.3-65-gdbad