gentoo resync : 05.02.2020

3 files changed, 4 insertions, 19 deletions

diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 1137c410c33f..2801ac32cec0 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -3,10 +3,9 @@ AUX lilypond-2.17.2-tex-docs.patch 608 BLAKE2B 7cf73d59a6ebadbc34952c199ba1085e6
 AUX lilypond-2.18.2-fontforge.patch 924 BLAKE2B 5f128e65357033c2b2ae33d5f00cccd7237b59354342d33f958170e5f22d904a47aeb18dcb12b7f7c8846d3689ed7d39459b4995c99834603dc22f3b2c893fda SHA512 f4a45a1ed601c114df24e9e20aa083cd30d5b77955e19cac309508af2f59c808a629bc82bc181e5325d0534d29d3fe4de53029d2db317ed447e306e11150ef7f
 AUX lilypond-2.19.80-fontforge-version.patch 503 BLAKE2B ff0565562e2156aa833d0de1fda31cce3901999c6fc1f5ec05fcc1dad5a60b4df4823eb9e5e809e4bfd863eef7088627e8dbab38fc1b2fe10152d9c26965c934 SHA512 0098b5f7fae77bd39f08397b460efc43bed8ea90feb2afd5349cb3459209720111bba657ca04be9781d5ad2731476887b6a9414690842d455e22f3c9ed6faeed
 AUX lilypond-2.19.80-remove-ly-protect.patch 1534 BLAKE2B fbb07b254ac8c41ac3db4c00203efd46fa48b0d3157d0ac57f60587bacae6d0cee6d1694f7a1a74b4fc1d31b338f31dd55daf294872cf8cd85d090683853cbcb SHA512 ec74abc959b569ef43eae0709ea62f012d41700dcebcb9cb4ece551b0095e593e6ac579520a3be3bef648e04ee69b3549f9152158c705ebb615ecb66f0f4d0fd
-AUX lilypond-9999-programming_error.patch 479 BLAKE2B f5375c71b2a82340dcda7ca24b8f1a5f106642c9edff2dd35ccb5793e88cd5bc512bbc47ce9636d2536cef18b76bbf5e38325c635377405a277ac405d741c6ed SHA512 4ef02c68b919792199142e83607409f6e3037367e090540a257d611ce7ebe1620c586bbeaaef2d5a953e71074ecbf92cef9710bd4bda9ebfee0ab93ca6f59c9d
 DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
 DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604
 EBUILD lilypond-2.18.2-r3.ebuild 3221 BLAKE2B 6fcd41c3be787631614fbe2c28853235059eb7924bdb32cea1ffa674469b3186d3448c99a37d8c7276e17061445f7d694678974266b1b6100fa7b65664ffcd93 SHA512 735e1a2c43d913b382336e9da1fe548965c5bdf70e88104d2a0c431f4a35c76e4d6fc902ae03a3cb9f83604a737c5e17c9f65dcaa5e9e620e3adb1a21ea8cce1
 EBUILD lilypond-2.19.83.ebuild 3390 BLAKE2B de7d56199884ff98ab4dde65d786e96716dfb6f9d96adf501d7784d5d673484f163f22811622249fe87f402d6e3438e300b37f552ff2460464b2c050d038beef SHA512 a68323e25fc7d06a3c153989148e64ef22e65960feb5e7ea0429598a7c07a87988972d58e452d35e437b9c1ddd858bccdcedb8299aab60694d67b64c94547b31
-EBUILD lilypond-9999.ebuild 3534 BLAKE2B be1e58df24af25dc1b92c0e5739376be422dfef14a3519ec23d440b89ad261e1633e61ffb3c9bf229ef4222cfdf4ac86669c6389aef194ab73f0d1d27b206ea3 SHA512 f73f8e3c5dc948e0ba7d3bc78aef948afe684bccccf533fc351b23e6c05fc57afdc69327ecac5f5a185b7d9717029541fe05623ee8b567d8bca34e8b81652280
+EBUILD lilypond-9999.ebuild 3498 BLAKE2B b859d47f0f2cb99a95b17a47477a021df5565eb8c4d53c8acb732e0b8d74bb4516ad16f70b41870e71f7dcdec445d1ac9cab01f518600cc870ea4b250c6b7296 SHA512 c90a3e08058e4683d4f6c66d9e1d9be1653c6995b3a05c1660738950401cfbe737bdcbba2b2ff9203504983e3aa9b915556ad833cd332a03ebb4c8107e5c6517
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/files/lilypond-9999-programming_error.patch b/media-sound/lilypond/files/lilypond-9999-programming_error.patch
deleted file mode 100644
index f2b85164a6e5..000000000000
--- a/media-sound/lilypond/files/lilypond-9999-programming_error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
-index d25e6c9ef8..2fd2e4a4fa 100644
---- a/lily/general-scheme.cc
-+++ b/lily/general-scheme.cc
-@@ -275,7 +275,7 @@ LY_DEFINE (ly_protects, "ly:protects",
- #if SCM_MAJOR_VERSION < 2 || SCM_MAJOR_VERSION == 2 && SCM_MINOR_VERSION < 1
-   return scm_protects;
- #else
--  return programming_error ("ly:protects is not supported in Guile 2.1");
-+  programming_error ("ly:protects is not supported in Guile 2.1");
- #endif
- }
- 
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 2ae50f180475..ccdde5e349ab 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 [[ "${PV}" = "9999" ]] && inherit git-r3
 inherit elisp-common autotools python-single-r1 xdg-utils
@@ -23,7 +23,6 @@ LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
 IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 PATCHES=(
-	"${FILESDIR}"/$P-programming_error.patch
 	"${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch
 )