gentoo resync : 03.07.2021

6 files changed, 2 insertions, 127 deletions

diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index d2128678fac2..2480e5c5569e 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,11 +1,5 @@
-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
-DIST abcMIDI-2020.06.07.zip 571242 BLAKE2B 94a54ca3eb5110f74e3cb6ce3cba16e65230a202c5e33d735a3d98f2dc7fe03c997819acd065e08eaed5ad2e6f8882159ae21b2984673508c9a0842425ef5820 SHA512 d363d7148c2bd29b300f03ff70a3a4f75110d7416efe29d605f89d02c8922f227ab2dbb78a6f55fab530779af323b49a3824f609cb4e03ff6dfa4d15e3cf7969
 DIST abcMIDI-2021.05.25.zip 604797 BLAKE2B 78b2d43bb7569aa2eece63f319352aa71b77e9c5219c5f806384f007ffe026741a0852ffffe1e6b6c15b60f69f54e143cb26aa47b54baca41bc2fc231fa5b66a SHA512 57975f7c131855a713fc399c7aa1c7bd94775e7a257f2412d321aa51d0bf95cf9e1410e0819d2ad5cabde9ef996512ccca16058f7267baabc5702a926c173b3f
 DIST abcMIDI-2021.06.27.zip 605658 BLAKE2B b522c96b7f8990f297cc13a3334872763fb2879f5893f09e630d66ab425d1772e0eee64273249d26e8118c6d341dad84129e140d8c309adab160f3120b5a18a2 SHA512 b1e4a7a9b93e6633abe211258995cfa84bb8eaed3870ed20e244aa12353c6cc351ea7e1c842e4e410dad9dd91b2e8c918826138bec39503c56e95062f4a99f37
-EBUILD abcmidi-2020.01.22.ebuild 836 BLAKE2B 40f9d16d5c10a2897d1395ca2334e8ec58ea32a8e126ce5bf9e570c3e0fe8a5081737e3c83d71d522abaae6e7b7eaa2a3a3c875690e62e8bf88cc9351af9d4e6 SHA512 a64b2ce08d7968f332b9d617274ff0c08af97f554f375808608baa7c7687ff8a1ffcf1f4e264fa55346863aa853955e652f9243c5aca4536360bbea7068ae892
-EBUILD abcmidi-2020.06.07.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
-EBUILD abcmidi-2021.05.25.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
+EBUILD abcmidi-2021.05.25.ebuild 676 BLAKE2B 916e0595b5c1cbf9dad1ba1c9fd7fdba8010898e12ebbc95ef02bcc725cb22a44e8608bf07ec3dd253128aafa3af728ae3709bb9a8bef786b3e6124cd32ae7c5 SHA512 3f000a5a47de4dcc3da9279dee49e962f526833ec4f85dd7f2d749d54b4c08057a99b53deef3c978f7dd1840ffd96b97d3db875d7bf559e27e18042eb8dc8bc6
 EBUILD abcmidi-2021.06.27.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
 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
deleted file mode 100644
index 893a32ea9da0..000000000000
--- a/media-sound/abcmidi/abcmidi-2020.01.22.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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"
-
-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() {
-	default
-
-	rm configure Makefile || die
-	sed -i "s:-O2::" configure.ac || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
-
-	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
deleted file mode 100644
index 10c98f2d31f4..000000000000
--- a/media-sound/abcmidi/abcmidi-2020.06.07.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 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"
-S="${WORKDIR}"/${PN}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-BDEPEND="app-arch/unzip"
-
-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/abcmidi-2021.05.25.ebuild b/media-sound/abcmidi/abcmidi-2021.05.25.ebuild
index 10c98f2d31f4..0245e20b7e80 100644
--- a/media-sound/abcmidi/abcmidi-2021.05.25.ebuild
+++ b/media-sound/abcmidi/abcmidi-2021.05.25.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-sound/abcmidi/files/abcmidi-2016.05.05-docs.patch b/media-sound/abcmidi/files/abcmidi-2016.05.05-docs.patch
deleted file mode 100644
index bc36b260bd34..000000000000
--- a/media-sound/abcmidi/files/abcmidi-2016.05.05-docs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Install docs via Gentoo mechanisms instead of the build system.
-
---- abcmidi/Makefile.in
-+++ abcmidi/Makefile.in
-@@ -143,13 +143,6 @@
- 	$(INSTALL) -d $(DESTDIR)$(bindir)

- 	$(INSTALL) -m 755 ${binaries} $(DESTDIR)$(bindir)

- 

--	# install documentation

--	$(INSTALL) -d $(DESTDIR)${docdir}

--	$(INSTALL)  -m 644 doc/*.txt $(DESTDIR)$(docdir)

--	$(INSTALL)  -m 644 doc/AUTHORS $(DESTDIR)$(docdir)

--	$(INSTALL)  -m 644 doc/CHANGES $(DESTDIR)$(docdir)

--	$(INSTALL)  -m 644 VERSION $(DESTDIR)$(docdir)

--

- 	# install manpages

- 	$(INSTALL)  -d $(DESTDIR)${mandir}

- 	$(INSTALL)  -m 644 doc/*.1 $(DESTDIR)$(mandir)

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
deleted file mode 100644
index e8ed8bec37ee..000000000000
--- a/media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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 [<field>: ] ? */

- int cleanup; /* boolean to indicate -u option (update notation) */