Fix building with glibc 2.10 , bug #273879

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 63 insertions, 4 deletions

diff --git a/sys-apps/sdd/ChangeLog b/sys-apps/sdd/ChangeLog
index b4e140284cc8..c1a8b58c5f84 100644
--- a/sys-apps/sdd/ChangeLog
+++ b/sys-apps/sdd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/sdd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdd/ChangeLog,v 1.8 2008/10/14 18:49:20 swegener Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdd/ChangeLog,v 1.9 2009/08/09 16:48:28 vostorga Exp $
+
+  09 Aug 2009; Víctor Ostorga <vostorga@gentoo.org> sdd-1.52.ebuild,
+  +files/sdd-1.52-glibc210.patch:
+  Fix building with glibc 2.10 , bug #273879
 
   14 Oct 2008; Sven Wegener <swegener@gentoo.org> sdd-1.52.ebuild:
   Respect CFLAGS, bug #242004.
diff --git a/sys-apps/sdd/files/sdd-1.52-glibc210.patch b/sys-apps/sdd/files/sdd-1.52-glibc210.patch
new file mode 100644
index 000000000000..732bcfbf9035
--- /dev/null
+++ b/sys-apps/sdd/files/sdd-1.52-glibc210.patch
@@ -0,0 +1,45 @@
+diff -NrU5 sdd-1.52.original/include/schily.h sdd-1.52/include/schily.h
+--- sdd-1.52.original/include/schily.h	2009-08-09 16:33:27.000000000 -0600
++++ sdd-1.52/include/schily.h	2009-08-09 16:49:22.000000000 -0600
+@@ -106,11 +106,11 @@
+ extern	int	fexecle __PR((const char *, FILE *, FILE *, FILE *,
+ 							const char *, ...));
+ 		/* 6th arg not const, fexecv forces av[ac] = NULL */
+ extern	int	fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
+ 							char **));
+-extern	int	fexecve __PR((const char *, FILE *, FILE *, FILE *,
++extern	int	f_execve __PR((const char *, FILE *, FILE *, FILE *,
+ 					char * const *, char * const *));
+ extern	int	fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
+ extern	int	fspawnl __PR((FILE *, FILE *, FILE *,
+ 					const char *, const char *, ...));
+ extern	int	fspawnv_nowait __PR((FILE *, FILE *, FILE *,
+@@ -185,11 +185,11 @@
+ extern	int	error __PR((const char *, ...)) __printflike__(1, 2);
+ extern	char	*fillbytes __PR((void *, int, char));
+ extern	char	*findbytes __PR((const void *, int, char));
+ extern	int	findline __PR((const char *, char, const char *,
+ 							int, char **, int));
+-extern	int	getline __PR((char *, int));
++extern	int	get_line __PR((char *, int));
+ extern	int	getstr __PR((char *, int));
+ extern	int	breakline __PR((char *, char, char **, int));
+ extern	int	getallargs __PR((int *, char * const**, const char *, ...));
+ extern	int	getargs __PR((int *, char * const**, const char *, ...));
+ extern	int	getfiles __PR((int *, char * const**, const char *));
+diff -NrU5 sdd-1.52.original/libschily/stdio/fgetline.c sdd-1.52/libschily/stdio/fgetline.c
+--- sdd-1.52.original/libschily/stdio/fgetline.c	2009-08-09 16:33:27.000000000 -0600
++++ sdd-1.52/libschily/stdio/fgetline.c	2009-08-09 16:45:03.000000000 -0600
+@@ -62,11 +62,11 @@
+ 
+ 	return (bp - buf);
+ }
+ 
+ EXPORT int
+-getline(buf, len)
++get_line(buf, len)
+ 	char	*buf;
+ 	int	len;
+ {
+ 	return (fgetline(stdin, buf, len));
+ }
diff --git a/sys-apps/sdd/sdd-1.52.ebuild b/sys-apps/sdd/sdd-1.52.ebuild
index 1d03f4b897a7..667d739f89f3 100644
--- a/sys-apps/sdd/sdd-1.52.ebuild
+++ b/sys-apps/sdd/sdd-1.52.ebuild
@@ -1,6 +1,8 @@
-# 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/sys-apps/sdd/sdd-1.52.ebuild,v 1.6 2008/10/14 18:49:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdd/sdd-1.52.ebuild,v 1.7 2009/08/09 16:48:28 vostorga Exp $
+
+inherit eutils
 
 DESCRIPTION="A fast and enhanced 'dd' replacement for UNIX"
 HOMEPAGE="http://ftp.berlios.de/pub/sdd/"
@@ -9,7 +11,15 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE=""
+
 DEPEND=""
+RDEPEND=""
+
+src_unpack(){
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-glibc210.patch
+}
 
 src_compile() {
 	# Can't use default src_compile, because ./configure will bail out