From: Markus Ullmann Date: Sat, 7 Apr 2007 15:53:26 +0000 (+0000) Subject: cvs delete comes in handy sometimes X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e3beb9aaa9e387fdb99240e7d055bbc4e2c41145;p=gentoo.git cvs delete comes in handy sometimes Package-Manager: portage-2.1.2.3 --- diff --git a/app-misc/devtodo/ChangeLog b/app-misc/devtodo/ChangeLog index 114489fea326..3c7080b38d17 100644 --- a/app-misc/devtodo/ChangeLog +++ b/app-misc/devtodo/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-misc/devtodo # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/ChangeLog,v 1.67 2007/04/07 15:21:40 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/ChangeLog,v 1.68 2007/04/07 15:53:26 jokey Exp $ + + 07 Apr 2007; Markus Ullmann + -files/devtodo-0.1.18-gentoo.diff, -files/devtodo-0.1.19-gentoo.diff, + -devtodo-0.1.18-r2.ebuild, -devtodo-0.1.19.ebuild, + -devtodo-0.1.19-r1.ebuild: + cvs delete comes in handy sometimes *devtodo-0.1.19-r2 (07 Apr 2007) diff --git a/app-misc/devtodo/devtodo-0.1.18-r2.ebuild b/app-misc/devtodo/devtodo-0.1.18-r2.ebuild deleted file mode 100644 index 47142539a20c..000000000000 --- a/app-misc/devtodo/devtodo-0.1.18-r2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2007 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.15 2007/01/28 05:06:50 genone Exp $ - -inherit eutils 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 s390 sparc x86 ppc64" -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 - epatch ${FILESDIR}/${P}-gcc4.diff -} - -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 - elog "Because of a conflict with app-misc/tdl, the tdl symbolic link" - elog "and manual page have been removed." - bash-completion_pkg_postinst -} diff --git a/app-misc/devtodo/devtodo-0.1.19-r1.ebuild b/app-misc/devtodo/devtodo-0.1.19-r1.ebuild deleted file mode 100644 index 58bef11cb59e..000000000000 --- a/app-misc/devtodo/devtodo-0.1.19-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2007 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-r1.ebuild,v 1.9 2007/01/28 05:06:50 genone Exp $ - -inherit eutils 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 m68k mips ppc ppc64 s390 sh 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 - epatch ${FILESDIR}/${P}-fix-multiline-segv.diff -} - -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 - elog "Because of a conflict with app-misc/tdl, the tdl symbolic link" - elog "and manual page have been removed." - bash-completion_pkg_postinst -} diff --git a/app-misc/devtodo/devtodo-0.1.19.ebuild b/app-misc/devtodo/devtodo-0.1.19.ebuild deleted file mode 100644 index 2583cff80807..000000000000 --- a/app-misc/devtodo/devtodo-0.1.19.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2007 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.11 2007/01/28 05:06:50 genone Exp $ - -inherit eutils 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 -} - -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 - elog "Because of a conflict with app-misc/tdl, the tdl symbolic link" - elog "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 deleted file mode 100644 index 85b53a72ce2a..000000000000 --- a/app-misc/devtodo/files/devtodo-0.1.18-gentoo.diff +++ /dev/null @@ -1,127 +0,0 @@ -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 -@@ -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 -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-0.1.19-gentoo.diff b/app-misc/devtodo/files/devtodo-0.1.19-gentoo.diff deleted file mode 100644 index 4152776d58f7..000000000000 --- a/app-misc/devtodo/files/devtodo-0.1.19-gentoo.diff +++ /dev/null @@ -1,119 +0,0 @@ -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/digest-devtodo-0.1.18-r2 b/app-misc/devtodo/files/digest-devtodo-0.1.18-r2 deleted file mode 100644 index 0adf4b117b77..000000000000 --- a/app-misc/devtodo/files/digest-devtodo-0.1.18-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6ca0a414685cb7a7f32f7ae22cb3a2a9 devtodo-0.1.18.tar.gz 432858 -RMD160 c6ba5829f4c8b41d77c582fe1f0350174a164b65 devtodo-0.1.18.tar.gz 432858 -SHA256 fb47178c9d109e05640da9fcf049282d53e4b16aea2cbbf45ec8f06200f7c85e 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 deleted file mode 100644 index 980082f5be41..000000000000 --- a/app-misc/devtodo/files/digest-devtodo-0.1.19 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 723c86eae76c425ab9f271760bb951a3 devtodo-0.1.19.tar.gz 442920 -RMD160 133140acde8a3fdd9f055460c28926f60873aeb3 devtodo-0.1.19.tar.gz 442920 -SHA256 36d90650441f9cea7b144700676547b7a0ea2f18e664242deb7ce1820b463599 devtodo-0.1.19.tar.gz 442920 diff --git a/app-misc/devtodo/files/digest-devtodo-0.1.19-r1 b/app-misc/devtodo/files/digest-devtodo-0.1.19-r1 deleted file mode 100644 index 980082f5be41..000000000000 --- a/app-misc/devtodo/files/digest-devtodo-0.1.19-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 723c86eae76c425ab9f271760bb951a3 devtodo-0.1.19.tar.gz 442920 -RMD160 133140acde8a3fdd9f055460c28926f60873aeb3 devtodo-0.1.19.tar.gz 442920 -SHA256 36d90650441f9cea7b144700676547b7a0ea2f18e664242deb7ce1820b463599 devtodo-0.1.19.tar.gz 442920