media-sound/lilypond: fix compilation with fontforge wrt #557160

Package-Manager: portage-2.2.23

diff --git a/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch b/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
new file mode 100644 (file)
index 0000000..cfd3295
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
@@ -0,0 +1,29 @@
+From a832764e7300d48468a6812077b899a4beed271b Mon Sep 17 00:00:00 2001
+From: Masamichi Hosoda <trueroad@trueroad.jp>
+Date: Sat, 22 Aug 2015 21:20:17 +0900
+Subject: [PATCH] Fix fontforge version detection
+
+Newer fontforge shows git hash in `fontforge --version`.
+In that case, configure script
+might recognize it as date (version).
+---
+ aclocal.m4 | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 48d0b77..0037c58 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -42,7 +42,8 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
+ 
+     if test -z "$_ver"; then
+         ## If empty, try date [fontforge]
+-        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \
++        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 \
++          | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \
+           | head -n 1 \
+           | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
+     fi
+-- 
+2.6.2
+

diff --git a/media-sound/lilypond/lilypond-2.18.2.ebuild b/media-sound/lilypond/lilypond-2.18.2.ebuild
index 2604de192bbcf45219daef76a0d1b3c8635cdad7..02301ed46db10b8fe6f8981c04705e36379cd196 100644 (file)
--- a/media-sound/lilypond/lilypond-2.18.2.ebuild
+++ b/media-sound/lilypond/lilypond-2.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -58,6 +58,7 @@ pkg_setup() {
 
 src_prepare() {
        epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
+       epatch "${FILESDIR}"/${P}-fontforge.patch
 
        if ! use vim-syntax ; then
                sed -i 's/vim//' GNUmakefile.in || die