Replace direct make calls with $(MAKE), thanks to naota for the patch.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 79 insertions, 2 deletions

diff --git a/media-fonts/unifont/ChangeLog b/media-fonts/unifont/ChangeLog
index 89beefa12e3b..189b9efc89b7 100644
--- a/media-fonts/unifont/ChangeLog
+++ b/media-fonts/unifont/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/unifont
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/ChangeLog,v 1.46 2014/02/23 20:10:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/ChangeLog,v 1.47 2014/03/04 21:48:54 floppym Exp $
+
+  04 Mar 2014; Mike Gilbert <floppym@gentoo.org>
+  +files/unifont-6.3.20140204-make.patch, unifont-6.3.20140204.ebuild:
+  Replace direct make calls with $(MAKE), thanks to naota for the patch.
 
   23 Feb 2014; Markus Meier <maekke@gentoo.org> unifont-6.3.20140204.ebuild:
   add ~arm, bug #500844
diff --git a/media-fonts/unifont/files/unifont-6.3.20140204-make.patch b/media-fonts/unifont/files/unifont-6.3.20140204-make.patch
new file mode 100644
index 000000000000..b95fc0baca0a
--- /dev/null
+++ b/media-fonts/unifont/files/unifont-6.3.20140204-make.patch
@@ -0,0 +1,71 @@
+diff --git a/font/Makefile b/font/Makefile
+index e57a57d..04ed214 100644
+--- a/font/Makefile
++++ b/font/Makefile
+@@ -116,7 +116,7 @@ TTFSRC = ttfsrc
+ all: compiled
+ 
+ compiled: $(UNIFILES) $(COMBINING) $(UPPER_FILES) $(UPPER_COMBINING)
+-	make compiled-files
++	$(MAKE) compiled-files
+ 
+ compiled-files: pcf psf bmp ttf csurttf upperttf uppercsurttf bigpic coverage
+ 	install -p index.html $(COMPILED_DIR)/index.html
+@@ -277,7 +277,7 @@ ttf:
+ 		$(HEXDIR)/bmp-combining.txt \
+ 		$(TTFSRC)/combining.txt
+ 	cd $(TTFSRC) ; \
+-	   make FONTFILE="unifont" COMBINING="combining" \
++	   $(MAKE) FONTFILE="unifont" COMBINING="combining" \
+ 		FONTNAME="Unifont" PSNAME="Unifont"
+ 	mv $(TTFSRC)/unifont.sfd $(COMPILED_DIR)/unifont-$(VERSION).sfd 
+ 	mv $(TTFSRC)/unifont.ttf \
+@@ -287,7 +287,7 @@ ttf:
+ 		$(COMPILED_DIR)/unifont_sample-$(VERSION).bdf \
+ 		$(TTFSRC)/unifont_sample.bdf
+ 	cd $(TTFSRC) ; \
+-	   make sbit FONTFILE="unifont_sample" COMBINING="" \
++	   $(MAKE) sbit FONTFILE="unifont_sample" COMBINING="" \
+ 		FONTNAME="Unifont Sample" PSNAME="UnifontSample"
+ 	mv $(TTFSRC)/unifont_sample.ttf \
+ 		$(COMPILED_DIR)/unifont_sample-$(VERSION).ttf 
+@@ -303,7 +303,7 @@ csurttf:
+ 	sort -u plane00csur/csur-combining.txt $(HEXDIR)/bmp-combining.txt \
+ 		> $(TTFSRC)/combining_csur.txt
+ 	cd $(TTFSRC) ; \
+-	   make outline FONTFILE="unifont_csur" COMBINING="combining_csur" \
++	   $(MAKE) outline FONTFILE="unifont_csur" COMBINING="combining_csur" \
+ 		FONTNAME="Unifont CSUR" PSNAME="UnifontCSUR"
+ 	mv $(TTFSRC)/unifont_csur.sfd \
+ 		$(COMPILED_DIR)/unifont_csur-$(VERSION).sfd 
+@@ -320,7 +320,7 @@ upperttf:
+ 		$(TTFSRC)/unifont_upper.hex
+ 	sort -u $(UPPER_COMBINING) > $(TTFSRC)/combining_upper.txt
+ 	cd $(TTFSRC) ; \
+-	   make outline FONTFILE="unifont_upper" COMBINING="combining_upper" \
++	   $(MAKE) outline FONTFILE="unifont_upper" COMBINING="combining_upper" \
+ 		FONTNAME="Unifont Upper" PSNAME="UnifontUpper"
+ 	mv $(TTFSRC)/unifont_upper.sfd \
+ 		$(COMPILED_DIR)/unifont_upper-$(VERSION).sfd 
+@@ -339,7 +339,7 @@ uppercsurttf:
+ 	sort -u plane0[1-F]csur/*combining*.txt \
+ 		> $(TTFSRC)/combining_upper_csur.txt
+ 	cd $(TTFSRC) ; \
+-	   make outline FONTFILE="unifont_upper_csur" COMBINING="combining_upper_csur" \
++	   $(MAKE) outline FONTFILE="unifont_upper_csur" COMBINING="combining_upper_csur" \
+ 		FONTNAME="Unifont Upper CSUR" PSNAME="UnifontUpperCSUR"
+ 	mv $(TTFSRC)/unifont_upper_csur.sfd \
+ 		$(COMPILED_DIR)/unifont_upper_csur-$(VERSION).sfd 
+diff --git a/Makefile b/Makefile
+index 3240c2b..f933067 100644
+--- a/Makefile
++++ b/Makefile
+@@ -65,7 +65,7 @@ bindir:
+ buildfont:
+ 	if [ x$(BUILDFONT) != x ] ; \
+         then \
+-           set -e ; make -C font ; \
++           set -e ; $(MAKE) -C font ; \
+         fi
+ 
+ #
diff --git a/media-fonts/unifont/unifont-6.3.20140204.ebuild b/media-fonts/unifont/unifont-6.3.20140204.ebuild
index 15dfda93d3ca..e7a8e290a668 100644
--- a/media-fonts/unifont/unifont-6.3.20140204.ebuild
+++ b/media-fonts/unifont/unifont-6.3.20140204.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/unifont-6.3.20140204.ebuild,v 1.3 2014/02/23 20:10:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/unifont-6.3.20140204.ebuild,v 1.4 2014/03/04 21:48:54 floppym Exp $
 
 EAPI=5
 
@@ -29,6 +29,8 @@ RDEPEND="
 
 src_prepare() {
 	sed -i -e 's/install -s/install/' src/Makefile || die
+	epatch "${FILESDIR}/unifont-6.3.20140204-make.patch"
+	epatch_user
 }
 
 src_compile() {