Fix building with GLIBC 2.10+ wrt #276724.

(Portage version: 2.2_rc36/cvs/Linux x86_64)

3 files changed, 124 insertions, 13 deletions

diff --git a/net-print/magicfilter/ChangeLog b/net-print/magicfilter/ChangeLog
index aec2358424f5..43d9a896d9e8 100644
--- a/net-print/magicfilter/ChangeLog
+++ b/net-print/magicfilter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/magicfilter
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/magicfilter/ChangeLog,v 1.13 2007/02/09 05:03:06 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/magicfilter/ChangeLog,v 1.14 2009/08/08 21:00:28 ssuominen Exp $
+
+  08 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  magicfilter-2.3d.ebuild, +files/magicfilter-2.3d-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #276724.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/net-print/magicfilter/files/magicfilter-2.3d-glibc-2.10.patch b/net-print/magicfilter/files/magicfilter-2.3d-glibc-2.10.patch
new file mode 100644
index 000000000000..e47b721a10e2
--- /dev/null
+++ b/net-print/magicfilter/files/magicfilter-2.3d-glibc-2.10.patch
@@ -0,0 +1,103 @@
+diff -ur magicfilter-2.3.d.orig/fe.c magicfilter-2.3.d/fe.c
+--- magicfilter-2.3.d.orig/fe.c	2003-05-09 21:27:15.000000000 +0300
++++ magicfilter-2.3.d/fe.c	2009-08-08 23:59:09.000000000 +0300
+@@ -128,7 +128,7 @@
+ 
+     /* read rules
+      */
+-    while ( (r = getline(f)) != 0) {
++    while ( (r = get_line(f)) != 0) {
+ 	rulecount++;
+ 	if (tail) {
+ 	    tail->next = r;
+diff -ur magicfilter-2.3.d.orig/getline.c magicfilter-2.3.d/getline.c
+--- magicfilter-2.3.d.orig/getline.c	2002-12-14 11:02:26.000000000 +0200
++++ magicfilter-2.3.d/getline.c	2009-08-08 23:59:09.000000000 +0300
+@@ -27,7 +27,7 @@
+  *  THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ /*
+- * getline() picks up a magicfilter rule line and passes it back to magicfilter
++ * get_line() picks up a magicfilter rule line and passes it back to magicfilter
+  *
+  * rules are:
+  *
+@@ -172,10 +172,10 @@
+ 
+ 
+ /*
+- * getline() gets a rule off the input stream
++ * get_line() gets a rule off the input stream
+  */
+ struct rule *
+-getline(FILE *input)
++get_line(FILE *input)
+ {
+     static char *bfr = 0;	/* a buffer for reading lines into */
+     static int buflen = 0;	/* size of that buffer */
+@@ -189,13 +189,13 @@
+ 	/* initialize the line buffer the first time in
+ 	 */
+ 	if ( (bfr = malloc(buflen=80)) == 0) {
+-	    perror("getline::malloc");
++	    perror("get_line::malloc");
+ 	    exit(1);
+ 	}
+     }
+ 
+     if ( (r = calloc(1, sizeof *r)) == 0) {
+-	perror("getline::calloc");
++	perror("get_line::calloc");
+ 	exit(1);
+     }
+ 
+@@ -240,7 +240,7 @@
+     }
+ 
+     if ( (r->pattern = strdup(q)) == 0) {
+-	perror("getline::strdup");
++	perror("get_line::strdup");
+ 	exit(1);
+     }
+ 
+@@ -289,7 +289,7 @@
+ 
+     if (hint)
+ 	if ( (r->hint = strdup(hint)) == 0) {
+-	    perror("getline::strdup");
++	    perror("get_line::strdup");
+ 	    exit(1);
+ 	}
+ 
+@@ -302,11 +302,11 @@
+     while ( (q = getarg(&p)) != 0) {
+ 	r->argv = realloc(r->argv, (3 + r->argc) * sizeof r->argv[0]);
+ 	if (r->argv == 0) {
+-	    perror("getline::realloc");
++	    perror("get_line::realloc");
+ 	    exit(1);
+ 	}
+ 	if ( (r->argv[r->argc++] = strdup(q)) == 0) {
+-	    perror("getline::strdup");
++	    perror("get_line::strdup");
+ 	    exit(1);
+ 	}
+     }
+@@ -330,4 +330,4 @@
+     }
+     ++ruleno;
+     return r;
+-} /* getline */
++} /* get_line */
+diff -ur magicfilter-2.3.d.orig/rule.h magicfilter-2.3.d/rule.h
+--- magicfilter-2.3.d.orig/rule.h	2002-07-12 02:23:43.000000000 +0300
++++ magicfilter-2.3.d/rule.h	2009-08-08 23:59:09.000000000 +0300
+@@ -55,7 +55,7 @@
+     struct rule *next;		/* next rule in the chain */
+ } ;
+ 
+-extern struct rule *getline(FILE *);
++extern struct rule *get_line(FILE *);
+ extern struct rule *rules;
+ char * action_p(enum rule_action);
+ 
diff --git a/net-print/magicfilter/magicfilter-2.3d.ebuild b/net-print/magicfilter/magicfilter-2.3d.ebuild
index 27064725b880..ca12a7d60163 100644
--- a/net-print/magicfilter/magicfilter-2.3d.ebuild
+++ b/net-print/magicfilter/magicfilter-2.3d.ebuild
@@ -1,38 +1,42 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/magicfilter/magicfilter-2.3d.ebuild,v 1.2 2007/06/26 02:36:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/magicfilter/magicfilter-2.3d.ebuild,v 1.3 2009/08/08 21:00:28 ssuominen Exp $
 
 inherit eutils
 
-IUSE=""
-
-MY_P="${PN}-2.3.d"
+MY_P=${PN}-2.3.d
 
 DESCRIPTION="Customizable, extensible automatic printer filter"
 HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/magicfilter/"
 SRC_URI="http://www.pell.portland.or.us/~orc/Code/magicfilter/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD GPL-2"
-KEYWORDS="~x86 ~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 
 DEPEND="virtual/ghostscript
 	>=app-arch/bzip2-1.0.1-r4
 	>=app-arch/gzip-1.2.4a-r6
 	sys-apps/file"
-
 RDEPEND="${DEPEND}
 	virtual/lpr"
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+}
+
 src_compile() {
 	has_version 'net-print/lprng' \
 		&& myconf="--with-lprng"
 
 	./configure.sh \
-		--prefix=${D}/usr \
-		--filterdir=${D}/usr/share/magicfilter/filters \
+		--prefix="${D}/usr" \
+		--filterdir="${D}/usr/share/magicfilter/filters" \
 		${myconf}
 
 	# Fix headers in filters
@@ -49,5 +53,5 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "install failed"
+	emake DESTDIR="${D}" install || die "install failed"
 }