Fix building with glibc 2.10+ wrt #276182, thanks to Joost Ruis and Arttu Valo.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 20 insertions, 15 deletions

diff --git a/x11-misc/xmbdfed/ChangeLog b/x11-misc/xmbdfed/ChangeLog
index a9b1fc960e5d..c1eb811c92bb 100644
--- a/x11-misc/xmbdfed/ChangeLog
+++ b/x11-misc/xmbdfed/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xmbdfed
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/ChangeLog,v 1.20 2009/01/01 01:33:50 matsuu Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/ChangeLog,v 1.21 2009/07/18 22:19:52 ssuominen Exp $
+
+  18 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xmbdfed-4.7_p1-r1.ebuild:
+  Fix building with glibc 2.10+ wrt #276182, thanks to Joost Ruis and Arttu
+  Valo.
 
 *xmbdfed-4.7_p1-r1 (01 Jan 2009)
 
diff --git a/x11-misc/xmbdfed/Manifest b/x11-misc/xmbdfed/Manifest
index 008e20258bd0..ec38f4379fe9 100644
--- a/x11-misc/xmbdfed/Manifest
+++ b/x11-misc/xmbdfed/Manifest
@@ -2,7 +2,7 @@ AUX xmbdfed-4.7_p1-gcc4.patch 784 RMD160 de8fe543f0d3a1eaa8a853e1094b0124c75748c
 AUX xmbdfed-4.7_p1-gentoo.patch 2207 RMD160 763a3e51a7b85622e8539cd2feeab7c47a4c574e SHA1 a52519ec221c16ee9cd93ec972bd17eab00256c2 SHA256 bd4c0c4fc13563ad7b6595f121995cc5a5c25a1eabe5f50766e27e4c462c25b3
 DIST xmbdfed-4.7-patch1 549 RMD160 69880ceb0c055e569e9fae55740ac48bd472e4f6 SHA1 76e27d1fde66bd4bffdfc201be2476f3c2881cf4 SHA256 35dd9419ae1491da8343905f96ea4d5537cc4810d672f913ac0c0fcd801e2381
 DIST xmbdfed-4.7.tar.bz2 208877 RMD160 3df40c8061f2b84e01fdadd55904091c47d558e1 SHA1 d47e8b43d5326b0e09ac9e2808ce2f9510127e46 SHA256 d1807ae89238261738d6bf69e900eabdfe1f54cf110329ebde4b6a26cc134e65
-EBUILD xmbdfed-4.7_p1-r1.ebuild 1115 RMD160 29f2f22ce4fef90b97c395a1f7e62463d1fbb65e SHA1 117f8b4612152bf04188c65fe19ca69920c35cda SHA256 276de52d2fb8118d31bff8e79c7285156f33b1a85e233ee163dccc4b035fe699
+EBUILD xmbdfed-4.7_p1-r1.ebuild 1172 RMD160 2562f7d15fed3501f61534429e5814298739469e SHA1 9481f34ab643a150fa52f793b3b2c26c940fa3fa SHA256 e4b5ba2ef12731508b2d0b5c9762f52c5dae944f4b79a36061710dbbc30ee9c0
 EBUILD xmbdfed-4.7_p1.ebuild 1364 RMD160 5696de45ad350e4f0b6725538525c8f32ed596fe SHA1 e461df37bd8610c12ac82f33f9485554101ec58c SHA256 ee9c0c1c185226a6e5e9822a3f6d977e54dfd4b483fe2e3e523c488da0d9ff1f
-MISC ChangeLog 2842 RMD160 959f6d08c5dcf62e2697a240d07b7d6c2b44e15d SHA1 3d44dfb37451deea64792b5ee26c3df3cf06763e SHA256 d9b0289daed182f5a52b0bdff8d9df004e94cdb2f5ba952a5ad73864550a21ec
+MISC ChangeLog 3012 RMD160 21fa1b8b003193e9b39f1832083d3f70969b4fe5 SHA1 4281386c5241fc7b7f25e0aeb26ab8d099e10bad SHA256 cafca9f59634a895dfbafd5fe589c0a58026b5d0c518de6b8200b4b7ae72cf5c
 MISC metadata.xml 186 RMD160 f9c0cd0067910f83743571180499362e63c1bb34 SHA1 43794c2b15d9ecc45434cd22a06426daea0c119f SHA256 77b4ff7fa61d38152f48228d81bbf96b98b7bf9cec0a0ac22d70c99f84423125
diff --git a/x11-misc/xmbdfed/xmbdfed-4.7_p1-r1.ebuild b/x11-misc/xmbdfed/xmbdfed-4.7_p1-r1.ebuild
index d5c0e5396555..5f9c7de187a4 100644
--- a/x11-misc/xmbdfed/xmbdfed-4.7_p1-r1.ebuild
+++ b/x11-misc/xmbdfed/xmbdfed-4.7_p1-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/xmbdfed-4.7_p1-r1.ebuild,v 1.1 2009/01/01 01:33:50 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/xmbdfed-4.7_p1-r1.ebuild,v 1.2 2009/07/18 22:19:52 ssuominen Exp $
 
+EAPI=2
+MY_P=${P/_p*}
 inherit eutils multilib toolchain-funcs
 
-MY_P="${P/_p*}"
 DESCRIPTION="BDF font editor for X"
 SRC_URI="http://clr.nmsu.edu/~mleisher/${MY_P}.tar.bz2
 	http://clr.nmsu.edu/~mleisher/${P/_p/-patch}"
@@ -24,23 +25,22 @@ RDEPEND="${DEPEND}
 	media-fonts/font-alias
 	media-fonts/font-misc-misc"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${DISTDIR}/${P/_p/-patch}"
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+src_prepare() {
+	epatch "${DISTDIR}"/${P/_p/-patch} \
+		"${FILESDIR}"/${P}-gcc4.patch \
+		"${FILESDIR}"/${P}-gentoo.patch
 	sed -i -e "/^LIBS/s:/usr/lib:/usr/$(get_libdir):" Makefile || die
+	sed -i -e "s:getline:get_line:g" bdfgname.c || die
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {
-	dobin xmbdfed || die
+	dobin xmbdfed || die "dobin failed"
 	newman xmbdfed.man xmbdfed.1
 	dodoc CHANGES README xmbdfedrc
 }