From aa0a4b4781de99a7720cf6f3da59413843d881e5 Mon Sep 17 00:00:00 2001 From: Markus Ullmann Date: Sat, 7 Apr 2007 15:21:40 +0000 Subject: [PATCH] Fix bug #138412 and bug #160154 , wipe old ebuilds and set me up as maintainer since ka0ttic is gone. Also bumping -r2 to stable as it's more or less a bash-completion modification which is safe Package-Manager: portage-2.1.2.3 --- app-misc/devtodo/ChangeLog | 11 +- app-misc/devtodo/Manifest | 33 ++-- app-misc/devtodo/devtodo-0.1.19-r2.ebuild | 52 +++++++ .../files/devtodo-0.1.19-r2-gentoo.diff | 146 ++++++++++++++++++ .../devtodo/files/digest-devtodo-0.1.19-r2 | 3 + app-misc/devtodo/metadata.xml | 6 +- 6 files changed, 238 insertions(+), 13 deletions(-) create mode 100644 app-misc/devtodo/devtodo-0.1.19-r2.ebuild create mode 100644 app-misc/devtodo/files/devtodo-0.1.19-r2-gentoo.diff create mode 100644 app-misc/devtodo/files/digest-devtodo-0.1.19-r2 diff --git a/app-misc/devtodo/ChangeLog b/app-misc/devtodo/ChangeLog index 63fdfd6fb767..114489fea326 100644 --- a/app-misc/devtodo/ChangeLog +++ b/app-misc/devtodo/ChangeLog @@ -1,6 +1,15 @@ # 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.66 2007/03/19 01:54:49 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/ChangeLog,v 1.67 2007/04/07 15:21:40 jokey Exp $ + +*devtodo-0.1.19-r2 (07 Apr 2007) + + 07 Apr 2007; Markus Ullmann + +files/devtodo-0.1.19-r2-gentoo.diff, metadata.xml, + +devtodo-0.1.19-r2.ebuild: + Fix bug #138412 and bug #160154 , wipe old ebuilds and set me up as + maintainer since ka0ttic is gone. Also bumping -r2 to stable as it's more or + less a bash-completion modification which is safe 19 Mar 2007; Bryan Østergaard metadata.xml: Remove ka0ttic from metadata.xml due to retirement. diff --git a/app-misc/devtodo/Manifest b/app-misc/devtodo/Manifest index 748f40757b41..d0d053c0bcb5 100644 --- a/app-misc/devtodo/Manifest +++ b/app-misc/devtodo/Manifest @@ -17,6 +17,10 @@ AUX devtodo-0.1.19-gentoo.diff 4623 RMD160 21b8f58fbe335510a43fe058dc5e4a9044a8b MD5 d4832a9a5c0f6bd3d6a400be666a60d4 files/devtodo-0.1.19-gentoo.diff 4623 RMD160 21b8f58fbe335510a43fe058dc5e4a9044a8b3da files/devtodo-0.1.19-gentoo.diff 4623 SHA256 76a1044235db9caaf4da9327ae629c1dbc74f5736e07128544d7e79c1b347538 files/devtodo-0.1.19-gentoo.diff 4623 +AUX devtodo-0.1.19-r2-gentoo.diff 6063 RMD160 a1bfccb8dc39c824c6726e983be2f9dacb457731 SHA1 63ebcc5541b9c136c0d5c8307c7c26f69d71ce49 SHA256 09dc95fc237c8482edb0bcd4d38ee36791da3cddfdd0aeadac2f6196dbe65fe9 +MD5 3871bd05f060370cabfb527c613b676b files/devtodo-0.1.19-r2-gentoo.diff 6063 +RMD160 a1bfccb8dc39c824c6726e983be2f9dacb457731 files/devtodo-0.1.19-r2-gentoo.diff 6063 +SHA256 09dc95fc237c8482edb0bcd4d38ee36791da3cddfdd0aeadac2f6196dbe65fe9 files/devtodo-0.1.19-r2-gentoo.diff 6063 AUX devtodo.bash-completion 1546 RMD160 8eedea3302f3a09993f0227efe08cf8444bc0bde SHA1 f66b3bb66e9b3a1b2b0f1b498aaa8a841b995e84 SHA256 1518b2f37ad447c2de6d32331c057dd630877106ad0e7126ce3eadb69482431f MD5 fb4916ad754050b018e360663a1f3497 files/devtodo.bash-completion 1546 RMD160 8eedea3302f3a09993f0227efe08cf8444bc0bde files/devtodo.bash-completion 1546 @@ -31,18 +35,22 @@ EBUILD devtodo-0.1.19-r1.ebuild 1465 RMD160 17a5206953b9b954bc4ee92054c331a96a14 MD5 e91894daeebece2e55976fd7954b794c devtodo-0.1.19-r1.ebuild 1465 RMD160 17a5206953b9b954bc4ee92054c331a96a14d8df devtodo-0.1.19-r1.ebuild 1465 SHA256 94be2337c6b0793fc6a97caa06255f0f6a7eb3af4e21fb4729412d47589a3348 devtodo-0.1.19-r1.ebuild 1465 +EBUILD devtodo-0.1.19-r2.ebuild 1467 RMD160 0e4546f2d637f92a8d93c145a9e962a073edd3d6 SHA1 4dbaa4f9170e1429047e1da6bcca70b05a9d421a SHA256 066cab844d3c32fa78604402a37d4050acf102902f771befd701d65a6ad6088c +MD5 f0d749b51438c3ca323aec950c8d9f85 devtodo-0.1.19-r2.ebuild 1467 +RMD160 0e4546f2d637f92a8d93c145a9e962a073edd3d6 devtodo-0.1.19-r2.ebuild 1467 +SHA256 066cab844d3c32fa78604402a37d4050acf102902f771befd701d65a6ad6088c devtodo-0.1.19-r2.ebuild 1467 EBUILD devtodo-0.1.19.ebuild 1406 RMD160 00c8af03075e11f90544e600cb21bb85bf86acca SHA1 591f820298f2b036e324fde1966af2ac178525cc SHA256 ed93a5189732146210c5d94dfff710d1476bd13365dcba90e005805292eabe63 MD5 68d789320b15bb492cfff845349c4949 devtodo-0.1.19.ebuild 1406 RMD160 00c8af03075e11f90544e600cb21bb85bf86acca devtodo-0.1.19.ebuild 1406 SHA256 ed93a5189732146210c5d94dfff710d1476bd13365dcba90e005805292eabe63 devtodo-0.1.19.ebuild 1406 -MISC ChangeLog 9203 RMD160 e5f0dccd197c61508e498a24b3d6dccb23001be5 SHA1 5e5e3f52f1bb1f21ad130c499e38bc61074f691a SHA256 e07ab1d96865340d6f4a01913614d4c98832fe620a83001f6e9cf19c6b19a879 -MD5 99e692f5682032c477073b036b711ae1 ChangeLog 9203 -RMD160 e5f0dccd197c61508e498a24b3d6dccb23001be5 ChangeLog 9203 -SHA256 e07ab1d96865340d6f4a01913614d4c98832fe620a83001f6e9cf19c6b19a879 ChangeLog 9203 -MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd -MD5 0c131a7201c4670302767f93643876fa metadata.xml 165 -RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 metadata.xml 165 -SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd metadata.xml 165 +MISC ChangeLog 9570 RMD160 6bb0fbaa34f561276888a0f24810ec7c14a5f9ed SHA1 821e028e16c55b1088b829bd133f5cf63e96cca2 SHA256 7df622d7808d6121ae8b7b182b79b9acc9b879d90acf037436e70283a1c2de52 +MD5 dfaebc5325f8c5fcaa5afba40fc1cfc0 ChangeLog 9570 +RMD160 6bb0fbaa34f561276888a0f24810ec7c14a5f9ed ChangeLog 9570 +SHA256 7df622d7808d6121ae8b7b182b79b9acc9b879d90acf037436e70283a1c2de52 ChangeLog 9570 +MISC metadata.xml 255 RMD160 0bcf3fd41cb09b6e3b6940688d7a9b7a781087c6 SHA1 1b26506fae93dd0a0e2ec40ed72625c0f3682e48 SHA256 93b760b33c156ae03356d6d7932b99c103963b7fcac55611ba8b16895220f149 +MD5 0769336eefa95d899f35168464f6f453 metadata.xml 255 +RMD160 0bcf3fd41cb09b6e3b6940688d7a9b7a781087c6 metadata.xml 255 +SHA256 93b760b33c156ae03356d6d7932b99c103963b7fcac55611ba8b16895220f149 metadata.xml 255 MD5 af5bc288fdfc6cf0ada134f474740a96 files/digest-devtodo-0.1.18-r2 244 RMD160 10eb81dc6e46240fbf58c162f0f66df63a521521 files/digest-devtodo-0.1.18-r2 244 SHA256 cb30833dde1827151d23a9a676b826e80d38ceb99379860aacb99e9b63162faf files/digest-devtodo-0.1.18-r2 244 @@ -52,10 +60,13 @@ SHA256 4bffb2703cfbef5bf41d78fa5bb246cb7fdc25a2bec4b2a115cc12c164d3c8fd files/di MD5 c17a54a30b6dc90cff94303e872b9ac3 files/digest-devtodo-0.1.19-r1 244 RMD160 1a2d156f797f0246ff1ef8ab2b215db5fec8a47a files/digest-devtodo-0.1.19-r1 244 SHA256 4bffb2703cfbef5bf41d78fa5bb246cb7fdc25a2bec4b2a115cc12c164d3c8fd files/digest-devtodo-0.1.19-r1 244 +MD5 c17a54a30b6dc90cff94303e872b9ac3 files/digest-devtodo-0.1.19-r2 244 +RMD160 1a2d156f797f0246ff1ef8ab2b215db5fec8a47a files/digest-devtodo-0.1.19-r2 244 +SHA256 4bffb2703cfbef5bf41d78fa5bb246cb7fdc25a2bec4b2a115cc12c164d3c8fd files/digest-devtodo-0.1.19-r2 244 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF/e0yugEuf3OQ0akRAoFVAJ46W5nmBIg7UFbjhWJVy44ITocpEACgire7 -Nfa20TKyBVoOUWcMEsG5+rU= -=M+z+ +iD8DBQFGF7cUz974XjDVpbkRAvnGAJ9yHr4Ie3J3menqLGcOBStliGplQACgkwP1 +ayy1swbzflHL1wIka5cWvq4= +=kh+2 -----END PGP SIGNATURE----- diff --git a/app-misc/devtodo/devtodo-0.1.19-r2.ebuild b/app-misc/devtodo/devtodo-0.1.19-r2.ebuild new file mode 100644 index 000000000000..75af0355d05e --- /dev/null +++ b/app-misc/devtodo/devtodo-0.1.19-r2.ebuild @@ -0,0 +1,52 @@ +# 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-r2.ebuild,v 1.1 2007/04/07 15:21:40 jokey 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}-r2-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/files/devtodo-0.1.19-r2-gentoo.diff b/app-misc/devtodo/files/devtodo-0.1.19-r2-gentoo.diff new file mode 100644 index 000000000000..7c55f0e7f031 --- /dev/null +++ b/app-misc/devtodo/files/devtodo-0.1.19-r2-gentoo.diff @@ -0,0 +1,146 @@ +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, +--- devtodo-0.1.19/contrib/devtodo.bash-completion {cset 9b4d9f02-fdb7-4641-b07f-7359b794d6b0} ++++ devtodo-0.1.19/contrib/devtodo.bash-completion {local clone} +@@ -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 : +--- devtodo-0.1.19/src/support.cc {cset 5f5bd9cb-18fb-4046-bff5-4f3dbd781e47} ++++ devtodo-0.1.19/src/support.cc {local clone} +@@ -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; diff --git a/app-misc/devtodo/files/digest-devtodo-0.1.19-r2 b/app-misc/devtodo/files/digest-devtodo-0.1.19-r2 new file mode 100644 index 000000000000..980082f5be41 --- /dev/null +++ b/app-misc/devtodo/files/digest-devtodo-0.1.19-r2 @@ -0,0 +1,3 @@ +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/metadata.xml b/app-misc/devtodo/metadata.xml index 40149c995561..b254c33d04a1 100644 --- a/app-misc/devtodo/metadata.xml +++ b/app-misc/devtodo/metadata.xml @@ -1,5 +1,9 @@ - shell-tools +shell-tools + + jokey@gentoo.org + Markus Ullmann + -- 2.26.2