From 177728c6b35b55815743503cdf94c5d25337de7f Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 11 Feb 2021 03:25:10 +0000 Subject: app-misc/devtodo: further modernisation * .diff -> .patch * Missing BDEPEND on virtual/pkgconfig (we call it in the ebuild!) Fixes: eee598673c7af3dcb75c673f87e60ccc21985ee9 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James --- app-misc/devtodo/devtodo-0.1.20-r3.ebuild | 3 +- app-misc/devtodo/files/devtodo-0.1.20-gentoo.diff | 85 ---------------------- app-misc/devtodo/files/devtodo-0.1.20-gentoo.patch | 85 ++++++++++++++++++++++ 3 files changed, 87 insertions(+), 86 deletions(-) delete mode 100644 app-misc/devtodo/files/devtodo-0.1.20-gentoo.diff create mode 100644 app-misc/devtodo/files/devtodo-0.1.20-gentoo.patch (limited to 'app-misc/devtodo') diff --git a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild index 9c52eec150dc..7be802db3607 100644 --- a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild +++ b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild @@ -13,6 +13,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +BDEPEND="virtual/pkgconfig" RDEPEND=" >=sys-libs/ncurses-5.2:0= >=sys-libs/readline-4.1:0=" @@ -21,7 +22,7 @@ DEPEND="${RDEPEND}" DOCS=( AUTHORS ChangeLog QuickStart README doc/scripts.sh doc/scripts.tcsh doc/todorc.example ) PATCHES=( - "${FILESDIR}"/${P}-gentoo.diff + "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-gcc43.patch "${FILESDIR}"/${P}-bashcom_spaces.patch ) diff --git a/app-misc/devtodo/files/devtodo-0.1.20-gentoo.diff b/app-misc/devtodo/files/devtodo-0.1.20-gentoo.diff deleted file mode 100644 index 5be7bdca9c81..000000000000 --- a/app-misc/devtodo/files/devtodo-0.1.20-gentoo.diff +++ /dev/null @@ -1,85 +0,0 @@ ---- a/doc/devtodo.1.in -+++ b/doc/devtodo.1.in -@@ -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 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -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 ---- a/src/TodoDB.cc -+++ b/src/TodoDB.cc -@@ -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(); ---- a/contrib/devtodo.bash-completion -+++ b/contrib/devtodo.bash-completion -@@ -35,6 +35,6 @@ _devtodo() { - ;; - esac - } --complete -o filenames -F _devtodo devtodo todo tda tde tdr tdd tdl -+complete -o filenames -F _devtodo devtodo todo tda tde tdr tdd - - # vim: set ft=sh tw=80 sw=4 et : ---- a/src/support.cc -+++ b/src/support.cc -@@ -289,11 +289,10 @@ enum { Help = -100, Remove, Version, Tit - << "Where can be any of the following:" << endl; - args.displayHelp(cout, options.columns); - cout << endl -- << "In addition, there are five convenience symlinks. These are 'tda', 'tdr'," << endl -- << "'tdd', 'tde', and 'tdl'. For 'tde', 'tdd' and 'tdr' supply an index to edit," << endl -+ << "In addition, there are four convenience symlinks. These are 'tda', 'tdr'," << endl -+ << "'tdd', and 'tde'. For 'tde', 'tdd' and 'tdr' supply an index to edit," << endl - << "mark done and remove respectively. For 'tda' supply the text of the todo item" << endl -- << "item and optionally the priority. For 'tdl' supply the path to another todo" << endl -- << "file to link in to the current todo file." << endl -+ << "item and optionally the priority." << endl - << "eg. tde 1" << endl; - exit(0); - break; ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -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/devtodo-0.1.20-gentoo.patch b/app-misc/devtodo/files/devtodo-0.1.20-gentoo.patch new file mode 100644 index 000000000000..5be7bdca9c81 --- /dev/null +++ b/app-misc/devtodo/files/devtodo-0.1.20-gentoo.patch @@ -0,0 +1,85 @@ +--- a/doc/devtodo.1.in ++++ b/doc/devtodo.1.in +@@ -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 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -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 +--- a/src/TodoDB.cc ++++ b/src/TodoDB.cc +@@ -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(); +--- a/contrib/devtodo.bash-completion ++++ b/contrib/devtodo.bash-completion +@@ -35,6 +35,6 @@ _devtodo() { + ;; + esac + } +-complete -o filenames -F _devtodo devtodo todo tda tde tdr tdd tdl ++complete -o filenames -F _devtodo devtodo todo tda tde tdr tdd + + # vim: set ft=sh tw=80 sw=4 et : +--- a/src/support.cc ++++ b/src/support.cc +@@ -289,11 +289,10 @@ enum { Help = -100, Remove, Version, Tit + << "Where can be any of the following:" << endl; + args.displayHelp(cout, options.columns); + cout << endl +- << "In addition, there are five convenience symlinks. These are 'tda', 'tdr'," << endl +- << "'tdd', 'tde', and 'tdl'. For 'tde', 'tdd' and 'tdr' supply an index to edit," << endl ++ << "In addition, there are four convenience symlinks. These are 'tda', 'tdr'," << endl ++ << "'tdd', and 'tde'. For 'tde', 'tdd' and 'tdr' supply an index to edit," << endl + << "mark done and remove respectively. For 'tda' supply the text of the todo item" << endl +- << "item and optionally the priority. For 'tdl' supply the path to another todo" << endl +- << "file to link in to the current todo file." << endl ++ << "item and optionally the priority." << endl + << "eg. tde 1" << endl; + exit(0); + break; +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -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 -- cgit v1.2.3-65-gdbad