From a59b8b51e9eba0c11899e20012516fbcbbd8a280 Mon Sep 17 00:00:00 2001
From: Samuli Suominen <ssuominen@gentoo.org>
Date: Sun, 9 Aug 2009 16:47:15 +0000
Subject: Fix building with GLIBC 2.10+ wrt #273842. (Portage version:
 2.2_rc36/cvs/Linux x86_64)

---
 app-arch/tardy/ChangeLog                         |  8 +++--
 app-arch/tardy/files/tardy-1.17-glibc-2.10.patch | 42 ++++++++++++++++++++++++
 app-arch/tardy/tardy-1.17.ebuild                 |  5 +--
 3 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 app-arch/tardy/files/tardy-1.17-glibc-2.10.patch

(limited to 'app-arch/tardy')

diff --git a/app-arch/tardy/ChangeLog b/app-arch/tardy/ChangeLog
index 4f9643b959f6..c9866a0dc755 100644
--- a/app-arch/tardy/ChangeLog
+++ b/app-arch/tardy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/tardy
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tardy/ChangeLog,v 1.9 2008/06/28 18:00:50 vanquirius Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tardy/ChangeLog,v 1.10 2009/08/09 16:47:07 ssuominen Exp $
+
+  09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> tardy-1.17.ebuild,
+  +files/tardy-1.17-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #273842.
 
 *tardy-1.17 (28 Jun 2008)
 
diff --git a/app-arch/tardy/files/tardy-1.17-glibc-2.10.patch b/app-arch/tardy/files/tardy-1.17-glibc-2.10.patch
new file mode 100644
index 000000000000..11a0b88258cc
--- /dev/null
+++ b/app-arch/tardy/files/tardy-1.17-glibc-2.10.patch
@@ -0,0 +1,42 @@
+diff -ur tardy-1.17.orig/common/arglex.cc tardy-1.17/common/arglex.cc
+--- tardy-1.17.orig/common/arglex.cc	2008-06-23 05:50:02.000000000 +0300
++++ tardy-1.17/common/arglex.cc	2009-08-09 19:46:21.000000000 +0300
+@@ -418,7 +418,7 @@
+         {
+             char    *eqp;
+ 
+-            eqp = strchr(arg, '=');
++            eqp = const_cast<char*> (strchr(arg, '='));
+             if (eqp)
+             {
+                 pushback = eqp + 1;
+diff -ur tardy-1.17.orig/common/trace.cc tardy-1.17/common/trace.cc
+--- tardy-1.17.orig/common/trace.cc	2008-06-23 05:50:02.000000000 +0300
++++ tardy-1.17/common/trace.cc	2009-08-09 19:48:36.000000000 +0300
+@@ -256,7 +256,7 @@
+     trace_printf("%s = '", name);
+     if (*vp < ' ' || *vp > '~' || strchr("(){}[]", *vp))
+     {
+-        char    *s;
++        const char    *s;
+ 
+         s = strchr("\bb\nn\tt\rr\ff", *vp);
+         if (s)
+@@ -283,7 +283,7 @@
+     trace_printf("%s = '", name);
+     if (*vp < ' ' || *vp > '~' || strchr("(){}[]", *vp))
+     {
+-        char    *s;
++        const char    *s;
+ 
+         s = strchr("\bb\nn\tt\rr\ff", *vp);
+         if (s)
+@@ -400,7 +400,7 @@
+         c = *s;
+         if (c < ' ' || c > '~')
+         {
+-            char    *cp;
++            const char    *cp;
+ 
+             cp = strchr("\bb\ff\nn\rr\tt", c);
+             if (cp)
diff --git a/app-arch/tardy/tardy-1.17.ebuild b/app-arch/tardy/tardy-1.17.ebuild
index c88bc53e466e..c269c5b07cec 100644
--- a/app-arch/tardy/tardy-1.17.ebuild
+++ b/app-arch/tardy/tardy-1.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tardy/tardy-1.17.ebuild,v 1.1 2008/06/28 18:00:50 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tardy/tardy-1.17.ebuild,v 1.2 2009/08/09 16:47:07 ssuominen Exp $
 
 inherit eutils
 
@@ -17,6 +17,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	sed -i '/^CFLAGS/d' Makefile.in
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 }
 
 src_test() {
-- 
cgit v1.2.3-65-gdbad