From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- media-sound/abcmidi/Manifest | 5 ++- media-sound/abcmidi/abcmidi-2020.01.22.ebuild | 17 +++++----- media-sound/abcmidi/abcmidi-2020.06.07.ebuild | 36 ++++++++++++++++++++++ .../files/abcmidi-2016.05.05-fno-common.patch | 23 ++++++++++++++ 4 files changed, 73 insertions(+), 8 deletions(-) create mode 100644 media-sound/abcmidi/abcmidi-2020.06.07.ebuild create mode 100644 media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch (limited to 'media-sound/abcmidi') diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest index baadec002990..8c657b6599fd 100644 --- a/media-sound/abcmidi/Manifest +++ b/media-sound/abcmidi/Manifest @@ -1,4 +1,7 @@ AUX abcmidi-2016.05.05-docs.patch 614 BLAKE2B f9071f832d49d8dcb679843c5724c3a554df5f8f1ac6b545be637c2db6a37096b26c5b80f0b366d4e66f33230431de3b50b1198e2b9fe939e5231321ee1aeb27 SHA512 c06436cab7dbc4eb4bf8595e561402428bd1d45be653fa652841c3378e4b78f246ae5c862addf7bffbcb21d994f11151d464837f20915e91eef31d4f66618213 +AUX abcmidi-2016.05.05-fno-common.patch 745 BLAKE2B 8e6cb17df225b21261e42abda4f8073c4493ea41eaf833fcf2f4616a6a828afc03e116de6c1807ee2436c9f385bf39527406e93c628b07dda2c16b3f5d51a0be SHA512 33c72c178812f527b7c2ce27635368a8f6531369025d36ab4d760f8ee19391027029de0b3d8698454b5eb35a1227b5d6efc1602fc5d5b6f58967ecf89579aada DIST abcMIDI-2020.01.22.zip 569060 BLAKE2B 078ba04a614c253266a5239b5b3f133e94c1d44e2cf91c65195f85229892cd4b8d05527124741477decb8eae83d38777b27bf1135e4ad96779c0c6b68bb46747 SHA512 5897e1344ef8e88f7ae81622c18bc8144fb95e928482c8f63cd897397ce5a5d2a5f7e5a8f13a62c6f40387f875d2f3827e74dc703ccc3c9dd81cfff018efb1de -EBUILD abcmidi-2020.01.22.ebuild 793 BLAKE2B f0c9abd3f726827008b247db49e3abd8502afd77e94dfd777e6dd88d26a21b66c63d6ddb82d6645a444072e2ef527c73b17c14e88a98492f9f8934ee69dc7887 SHA512 6f6d59511723bfebc2b35b47824a7a0334faca92800b68d4f0b8f800552d9432aa213c3f77422aecbed0185f1440371fe9b2ca15db0d1eb537ada8de6378e32b +DIST abcMIDI-2020.06.07.zip 571242 BLAKE2B 94a54ca3eb5110f74e3cb6ce3cba16e65230a202c5e33d735a3d98f2dc7fe03c997819acd065e08eaed5ad2e6f8882159ae21b2984673508c9a0842425ef5820 SHA512 d363d7148c2bd29b300f03ff70a3a4f75110d7416efe29d605f89d02c8922f227ab2dbb78a6f55fab530779af323b49a3824f609cb4e03ff6dfa4d15e3cf7969 +EBUILD abcmidi-2020.01.22.ebuild 838 BLAKE2B 4c11e7de7d64eff9946d897263a483cac920d23fb60d9c03e02205403d696e59a89faa412146c1feb5c978a543b9efd2a2ce710026797ee7d19a2eb0a4e33a36 SHA512 2180b9e9a9e4954d70521303e35c2c8cba39989e92164660ce206802c7731e95e2b3ced6a5d785c66ae8315b47a8a9d6fb7dc8f446f2e573995566cab31c2b15 +EBUILD abcmidi-2020.06.07.ebuild 676 BLAKE2B 8f4a55416063df0b72cf37ef4ce66325801481eaaf1563a7c65da2b5e16b65f06d8bbdf10353eb9530a17beb1b40b1dec657857bb0487af7cf2be7b4ebf59161 SHA512 a2f3af1a21ae8dd2bc1713d2d840ffd56b8cd948fa68702a7c7c93b25f748c17666ef618be8cc9abc4eba36971411ed9a6c4b404676f02b4e08807a488ce5bae MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a diff --git a/media-sound/abcmidi/abcmidi-2020.01.22.ebuild b/media-sound/abcmidi/abcmidi-2020.01.22.ebuild index 2dfe422dfb9d..a88113b01904 100644 --- a/media-sound/abcmidi/abcmidi-2020.01.22.ebuild +++ b/media-sound/abcmidi/abcmidi-2020.01.22.ebuild @@ -6,6 +6,7 @@ EAPI=7 inherit autotools MY_P="abcMIDI-${PV}" + DESCRIPTION="Programs for processing ABC music notation files" HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html" SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip" @@ -13,14 +14,17 @@ SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="examples" -DEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip" S=${WORKDIR}/${PN} +PATCHES=( + "${FILESDIR}"/${PN}-2016.05.05-docs.patch + "${FILESDIR}"/${PN}-2016.05.05-fno-common.patch +) + src_prepare() { - local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch ) default rm configure Makefile || die @@ -33,8 +37,7 @@ src_install() { default dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt} - if use examples ; then - docinto examples - dodoc samples/*.abc - fi + docinto examples + dodoc samples/*.abc + docompress -x /usr/share/doc/${PF}/examples } diff --git a/media-sound/abcmidi/abcmidi-2020.06.07.ebuild b/media-sound/abcmidi/abcmidi-2020.06.07.ebuild new file mode 100644 index 000000000000..cec3c72c3b03 --- /dev/null +++ b/media-sound/abcmidi/abcmidi-2020.06.07.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +MY_P="abcMIDI-${PV}" +DESCRIPTION="Programs for processing ABC music notation files" +HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html" +SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +DEPEND="app-arch/unzip" + +S=${WORKDIR}/${PN} + +src_prepare() { + default + sed -i "s:-O2::" configure.ac || die + sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die + eautoreconf +} + +src_install() { + default + + if use examples ; then + docinto examples + dodoc samples/*.abc + fi +} diff --git a/media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch b/media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch new file mode 100644 index 000000000000..e8ed8bec37ee --- /dev/null +++ b/media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch @@ -0,0 +1,23 @@ +--- a/drawtune.c ++++ b/drawtune.c +@@ -75,7 +75,8 @@ + int rootstem; + int fontsize, fontnum; + int donemeter; +-int ingrace, inchord; ++extern int ingrace; ++int inchord; + int chordcount; + struct feature* chordhead; + +--- a/toabc.c ++++ b/toabc.c +@@ -85,7 +85,7 @@ + int new_key_number; /* used for gchord transposition */ + int oldtable[7], newtable[7]; /* for handling transposition */ + int inchord; /* are we in a chord [ ] ? */ +-int ingrace; /* are we in a grace note set { } ? */ ++extern int ingrace; /* are we in a grace note set { } ? */ + int chordcount; /* number of notes or rests in current chord */ + int inlinefield; /* boolean - are we in [: ] ? */ + int cleanup; /* boolean to indicate -u option (update notation) */ -- cgit v1.2.3