Fix bug #372233 (patch by Michal Gorny).

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 62 insertions, 7 deletions

diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index 94f5d640ac2e..b73c10b968a0 100644
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fbida
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.80 2011/06/18 18:29:25 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.81 2011/06/21 21:31:06 spock Exp $
+
+  21 Jun 2011; Michał Januszewski <spock@gentoo.org> fbida-2.08.ebuild,
+  +files/fbida-2.08-posix-make.patch:
+  Fix bug #372233 (patch by Michal Gorny).
 
 *fbida-2.08 (18 Jun 2011)
 
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 34320f1fd32a..89883911024b 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -2,19 +2,20 @@
 Hash: SHA1
 
 AUX fbida-2.07-libpng14.patch 403 RMD160 b14a55a93a9e2c8b846aa040dbe66b5685799be6 SHA1 b0536b0896c5ec87fb3b57e38631464f85936a95 SHA256 3495f5e3fc640e6f2fd41e6586c80cb958f1c56aeb4b3c4de9906d88ce4e5160
+AUX fbida-2.08-posix-make.patch 1495 RMD160 2683508bb7eaacafbca37c004aea777d7dd6ab44 SHA1 f7cc9168315778fe562786ec879f1822b8abf62f SHA256 7f8b0a7f46205efcb765133f287bfac7023e837f159364f8932ac146b4428c10
 AUX ida-desktop.patch 453 RMD160 389f2b32fc2154a7c120447a72793a3b748cb59b SHA1 d06b70f2d581a1a3e9e0909b5af7f3f71ed54717 SHA256 51dabac02c6326e7f2d28db304f0b481cbcef7371807eb93618b2b5eb0104907
 AUX ida.png 11458 RMD160 3ebfaba3ae9219c3c840f5aa2a4be04065f28f49 SHA1 97da34d4e72ed004280d8c8416b2be5efb666c66 SHA256 57a21e900eb13c1a2b2d25e1dd78693e4fcf9fb86eef1138bf750f8a45819993
 DIST fbida-2.07-libjpeg-8a.patch.bz2 16001 RMD160 2cbb3c588259b2e41e696ad65ce715034acce92d SHA1 42f36ab3a73dcbc8dc929e4addbf72c81118561c SHA256 51f86a08161b6db7b88000d7c34e3d77d856b07d7b6757cb78161492a11d4d04
 DIST fbida-2.07.tar.gz 213622 RMD160 edd9174468e7c7e43b70b0364ac72655415b0c83 SHA1 4758178299e09d5251b9cf20337a81cc20553d45 SHA256 6510dee7c4f45cb63094d540e66aa39d53215c59f46944b8bb050c26b71bdb44
 DIST fbida-2.08.tar.gz 241283 RMD160 2740f3bed9d3819eb30dbd48833ad75186ba2136 SHA1 597e0953c68112bf7c363b1ccaa94e72100b116a SHA256 298e7f3545e33596a5876f6b9c3da7ef475c2692e5fab0df824fbcd7a489cd80
 EBUILD fbida-2.07-r2.ebuild 2518 RMD160 b64f1cdeb5093e0f8ef885dfec2cf08cbcdb01e4 SHA1 177049bc5083b204155f3d2a923de4c2d1b81455 SHA256 299c77398e70443e13ba723304d0a53621962bb7a4f670e5494bb9ffc31de22d
-EBUILD fbida-2.08.ebuild 2413 RMD160 b65a115bd8d9f17fcc194dee359c7a60f7b5d246 SHA1 3f761e8abff8f4b9743017997f196f9b4c5a6246 SHA256 38eafad12a140920f5f5a7edc25567eac4b90773b8147d5432ed6ffe89c68dff
-MISC ChangeLog 10065 RMD160 4633f49ff347df231d39d1836bfa71e70f71d626 SHA1 3776a3c48b72967e2e588bf18738c840a7adc91e SHA256 71d6caf17e0b514d8fca0e0df957769a4b0ce70ba2686da68a759e196edfc69e
+EBUILD fbida-2.08.ebuild 2463 RMD160 8d29e1ef61c81862890c7962ed16f52f343f4fab SHA1 5ade0d34acc745d1f845660e7ffcd94d94607507 SHA256 d86e3c0c4a776ae1a6fab8d6ab640ac889efb4aae9e279f3b842de4074ab4fb5
+MISC ChangeLog 10220 RMD160 df3fcf7b29cb4df63aa40dabce97667fb39d112b SHA1 74c3a13be3a43fb3463f9d31df58cae7e0368abb SHA256 ac3c8338f1c99370d809ddac4092c9fd43a5826c35247cebce4c1f0baff84470
 MISC metadata.xml 221 RMD160 90fef1dff5d0b3945073e90bb7ffec583ff1bbe8 SHA1 f35d1b1858e1223f4dc7b2c03fdf17e50091f1ca SHA256 fd573abb9cf89f320d00d1c107a25a46a5dfba633087d4179d0b8bd9aa539c8e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk387pQACgkQchej4aZK9/e9owCfRtofsziqveYJLPax/5j20tgP
-XYEAmwXyjGxVevqHzJbTTpWIWlkbrXhF
-=FDZ0
+iEYEARECAAYFAk4BDa4ACgkQchej4aZK9/c8MQCfaZBY6KrDgqjDtC/HGPMGzEW1
+oP4Anj5pqfhI/LkCHDZwdfFCEQkfnnuc
+=JzRj
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fbida/fbida-2.08.ebuild b/media-gfx/fbida/fbida-2.08.ebuild
index c788bd17418c..bfc84843f1e9 100644
--- a/media-gfx/fbida/fbida-2.08.ebuild
+++ b/media-gfx/fbida/fbida-2.08.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.08.ebuild,v 1.1 2011/06/18 18:29:25 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.08.ebuild,v 1.2 2011/06/21 21:31:06 spock Exp $
 
 EAPI=2
 
@@ -47,6 +47,7 @@ src_prepare() {
 	fi
 
 	epatch "${FILESDIR}"/ida-desktop.patch
+	epatch "${FILESDIR}"/fbida-2.08-posix-make.patch
 }
 
 src_configure() {
diff --git a/media-gfx/fbida/files/fbida-2.08-posix-make.patch b/media-gfx/fbida/files/fbida-2.08-posix-make.patch
new file mode 100644
index 000000000000..6add679bca6b
--- /dev/null
+++ b/media-gfx/fbida/files/fbida-2.08-posix-make.patch
@@ -0,0 +1,49 @@
+From e0c867a12fd3d49fd49ee348bcabe4eafc217082 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 19 Jun 2011 10:24:55 +0200
+Subject: [PATCH] Use `printf' instead of `echo -[en]', to make the code POSIX
+ friendly.
+
+---
+ GNUmakefile    |    2 +-
+ mk/Autoconf.mk |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index c96e635..9de3f6c 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -30,7 +30,7 @@ include $(srcdir)/mk/Autoconf.mk
+ 
+ ac_jpeg_ver = $(shell \
+ 	$(call ac_init,for libjpeg version);\
+-	$(call ac_s_cmd,echo -e '\#include <jpeglib.h>\nJPEG_LIB_VERSION' \
++	$(call ac_s_cmd,printf '\#include <jpeglib.h>\nJPEG_LIB_VERSION' \
+ 		| cpp | tail -n 1);\
+ 	$(call ac_fini))
+ 
+diff --git a/mk/Autoconf.mk b/mk/Autoconf.mk
+index 7608ea5..513f449 100644
+--- a/mk/Autoconf.mk
++++ b/mk/Autoconf.mk
+@@ -24,7 +24,7 @@ ifneq ($(verbose),no)
+   ac_fini	= echo "... result is $${rc}" >&2; echo >&2; echo "$${rc}"
+ else
+   # normal
+-  ac_init	= echo -n "checking $(1) ... " >&2; rc=no
++  ac_init	= printf '%s' "checking $(1) ... " >&2; rc=no
+   ac_b_cmd	= $(1) >/dev/null 2>&1 && rc=yes
+   ac_s_cmd	= rc=`$(1) 2>/dev/null`
+   ac_fini	= echo "$${rc}" >&2; echo "$${rc}"
+@@ -162,7 +162,7 @@ config: Make.config
+ 	@true
+ 
+ Make.config: $(srcdir)/GNUmakefile
+-	@echo -e "$(make-config-q)" > $@
++	@printf '%b' "$(make-config-q)" > $@
+ 	@echo
+ 	@echo "Make.config written, edit if needed"
+ 	@echo
+-- 
+1.7.5.3
+