Updated patch to fix last remaining compiler warning. Also pass -f -i to autoreconf to fix ltmain.sh bug.

5 files changed, 48 insertions, 27 deletions

diff --git a/app-misc/devtodo/ChangeLog b/app-misc/devtodo/ChangeLog
index 7b9557f372a6..8fda8e73e5b3 100644
--- a/app-misc/devtodo/ChangeLog
+++ b/app-misc/devtodo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.35 2004/12/17 14:37:22 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/ChangeLog,v 1.36 2004/12/17 15:45:24 ka0ttic Exp $
+
+  17 Dec 2004; Aaron Walker <ka0ttic@gentoo.org>
+  files/devtodo-0.1.18-gentoo.diff, devtodo-0.1.18-r1.ebuild,
+  devtodo-0.1.18-r2.ebuild:
+  Updated patch to fix last remaining compiler warning. Also pass -f -i to
+  autoreconf to fix ltmain.sh bug.
 
   17 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   devtodo-0.1.18-r2.ebuild:
diff --git a/app-misc/devtodo/Manifest b/app-misc/devtodo/Manifest
index 0ee469b3dee3..81378ce2be43 100644
--- a/app-misc/devtodo/Manifest
+++ b/app-misc/devtodo/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a70354d1fb7a51926234c2ae44d61464 ChangeLog 5448
+MD5 24120b746aa072315308539da84fda9a devtodo-0.1.18-r2.ebuild 1346
 MD5 e4146bc4aebf03940014b45116b09b09 devtodo-0.1.17-r2.ebuild 1663
-MD5 880c3e74308636dc8f4986324ad61bf2 devtodo-0.1.18-r1.ebuild 1335
-MD5 ff05a227d0901800d25639f13f2808bf devtodo-0.1.18-r2.ebuild 1339
+MD5 fc65f157fc019b5fabe88b3a2cde8773 devtodo-0.1.18-r1.ebuild 1342
+MD5 82f50885056fa1b5234ca886ae6943f0 ChangeLog 5697
 MD5 99ce5509db4b50f28a1f6675f8c09b2b metadata.xml 258
-MD5 aa51faed7416749ab46f020ce585ffc7 files/devtodo-0.1.18-gentoo.diff 4250
+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 d2457f597a941172dfdc9e12d13ce605 files/devtodo-0.1.18-gentoo.diff 4853
 MD5 68c51e9b769e87f037a34aa64bbc911f files/devtodo-fix-cd-builtin.patch 303
 MD5 d32e7456f09dcc45419319fcf1df8ae0 files/devtodo.bash-completion 3319
 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBwu8dKRy60XGEcJIRAkREAJ9aZXjLBSLtq7RAhvty16nRpJlTKgCglPNl
-k1cQgOkVaiIKuHv5llfpI2E=
-=z6BE
+iD8DBQFBwv8dEZCkKN40op4RAl62AJ9L/04ziTkf5EWUadOfGNHEVh+LdgCgjPPQ
+crmWA6L0PQnt8NVxb8zAcbc=
+=lKa2
 -----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
index 932ed522a157..75901eabbe64 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.5 2004/12/11 16:34:07 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.18-r1.ebuild,v 1.6 2004/12/17 15:45:24 ka0ttic Exp $
 
 inherit eutils gnuconfig bash-completion flag-o-matic
 
@@ -26,7 +26,7 @@ src_unpack() {
 
 src_compile() {
 	einfo "Running autoreconf"
-	autoreconf || die "autoreconf failed"
+	autoreconf -f -i || die "autoreconf failed"
 	replace-flags -O? -O1
 	econf --sysconfdir=/etc/devtodo || die "econf failed"
 	emake || die "emake failed"
diff --git a/app-misc/devtodo/devtodo-0.1.18-r2.ebuild b/app-misc/devtodo/devtodo-0.1.18-r2.ebuild
index 49e17a82f1b2..f4e8fb5a1c5f 100644
--- a/app-misc/devtodo/devtodo-0.1.18-r2.ebuild
+++ b/app-misc/devtodo/devtodo-0.1.18-r2.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-r2.ebuild,v 1.3 2004/12/17 14:37:22 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.18-r2.ebuild,v 1.4 2004/12/17 15:45:24 ka0ttic Exp $
 
 inherit eutils gnuconfig bash-completion flag-o-matic
 
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64 ~s390"
 IUSE=""
 
 RDEPEND=">=sys-libs/ncurses-5.2
@@ -26,7 +26,7 @@ src_unpack() {
 
 src_compile() {
 	einfo "Running autoreconf"
-	autoreconf || die "autoreconf failed"
+	autoreconf -f -i || die "autoreconf failed"
 	replace-flags -O? -O1
 	econf --sysconfdir=/etc/devtodo || die "econf failed"
 	emake || die "emake failed"
diff --git a/app-misc/devtodo/files/devtodo-0.1.18-gentoo.diff b/app-misc/devtodo/files/devtodo-0.1.18-gentoo.diff
index 086183907cba..85b53a72ce2a 100644
--- a/app-misc/devtodo/files/devtodo-0.1.18-gentoo.diff
+++ b/app-misc/devtodo/files/devtodo-0.1.18-gentoo.diff
@@ -1,5 +1,5 @@
 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.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 */
@@ -9,8 +9,8 @@ diff -urN devtodo-0.1.18.orig/acconfig.h devtodo-0.1.18/acconfig.h
 -#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
+--- 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])
@@ -30,8 +30,8 @@ diff -urN devtodo-0.1.18.orig/configure.in devtodo-0.1.18/configure.in
  
  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
+--- 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<indices>\fP\fP
@@ -54,8 +54,8 @@ diff -urN devtodo-0.1.18.orig/doc/devtodo.1.in devtodo-0.1.18/doc/devtodo.1.in
  .LP 
  Alec Thomas \fI<alec@swapoff.org>\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
+--- 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
@@ -64,8 +64,8 @@ diff -urN devtodo-0.1.18.orig/doc/Makefile.am devtodo-0.1.18/doc/Makefile.am
  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
+--- 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 \
@@ -87,8 +87,8 @@ diff -urN devtodo-0.1.18.orig/src/Makefile.am devtodo-0.1.18/src/Makefile.am
  	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
+--- 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;
@@ -110,3 +110,18 @@ diff -urN devtodo-0.1.18.orig/src/TodoDB.cc devtodo-0.1.18/src/TodoDB.cc
  	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,