diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2015-11-06 20:15:57 +0800 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2015-11-06 20:17:48 +0800 |
| commit | 9fad56181b6c461b554c3fa286379dac3f8df457 (patch) | |
| tree | 215382214171f2a6cfc350e14222999916fa1031 | |
| parent | dev-perl/Devel-NYTProf: Remove dev-perl/JSON-Any dependency. (diff) | |
| parent | media-sound/lilypond: add Karl Linden (lilrc) as proxy-maintainer (diff) | |
| download | gentoo-9fad56181b6c461b554c3fa286379dac3f8df457.tar.gz gentoo-9fad56181b6c461b554c3fa286379dac3f8df457.tar.bz2 gentoo-9fad56181b6c461b554c3fa286379dac3f8df457.zip | |
Merge remote-tracking branch 'remotes/lilrc/bug-557160'
Pull request: #https://github.com/gentoo/gentoo/pull/311
| -rw-r--r-- | media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch | 29 | ||||
| -rw-r--r-- | media-sound/lilypond/lilypond-2.18.2.ebuild | 3 | ||||
| -rw-r--r-- | media-sound/lilypond/metadata.xml | 5 |
3 files changed, 36 insertions, 1 deletions
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 index 000000000000..cfd3295b3948 --- /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 2604de192bbc..02301ed46db1 100644 --- 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 diff --git a/media-sound/lilypond/metadata.xml b/media-sound/lilypond/metadata.xml index ea8736230eea..988c0d0c5fe2 100644 --- a/media-sound/lilypond/metadata.xml +++ b/media-sound/lilypond/metadata.xml @@ -2,6 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>scheme</herd> + <herd>proxy-maintainers</herd> <maintainer> <email>hkBst@gentoo.org</email> <name>Marijn Schouten</name> @@ -10,6 +11,10 @@ <email>radhermit@gentoo.org</email> <name>Tim Harder</name> </maintainer> + <maintainer> + <email>karl.j.linden@gmail.com</email> + <name>Karl Linden</name> + </maintainer> <longdescription lang="en"> LilyPond is an automated engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files. </longdescription> |