[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     c9de6da2710d4d635196c767a943e4c91872e760
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 25 21:30:53 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 08:45:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9de6da2

media-sound/lilypond: Drop dependency on dev-tex/metapost.

dev-tex/metapost and app-eselect/eselect-mpost are slated for removal.
The any-of-many dependency had no effect, because in any case
texlive-metapost would pull in app-text/texlive-core as a dependency.

Also remove eselect-mpost magic in pkg_setup().

Bug: https://bugs.gentoo.org/733862
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 media-sound/lilypond/lilypond-2.21.1.ebuild | 18 +-----------------
 media-sound/lilypond/lilypond-9999.ebuild   | 18 +-----------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/media-sound/lilypond/lilypond-2.21.1.ebuild b/media-sound/lilypond/lilypond-2.21.1.ebuild
index 36707103792..53f73d164f5 100644
--- a/media-sound/lilypond/lilypond-2.21.1.ebuild
+++ b/media-sound/lilypond/lilypond-2.21.1.ebuild
@@ -24,11 +24,7 @@ IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
-	>=dev-texlive/texlive-metapost-2013
-	|| (
-		>=app-text/texlive-core-2013
-		>=dev-tex/metapost-1.803
-	)
+	>=dev-texlive/texlive-metapost-2020
 	>=sys-apps/texinfo-4.11
 	>=sys-devel/bison-2.0
 	sys-devel/flex
@@ -63,18 +59,6 @@ PATCHES=(
 
 DOCS=( DEDICATION HACKING README.txt ROADMAP )
 
-pkg_setup() {
-	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
-	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
-		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
-			einfo "Updating metapost symlink"
-			eselect mpost update || die
-		fi
-	fi
-
-	python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 

diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index fe972b46434..97370354492 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -24,11 +24,7 @@ IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
-	>=dev-texlive/texlive-metapost-2013
-	|| (
-		>=app-text/texlive-core-2013
-		>=dev-tex/metapost-1.803
-	)
+	>=dev-texlive/texlive-metapost-2020
 	>=sys-apps/texinfo-4.11
 	>=sys-devel/bison-2.0
 	sys-devel/flex
@@ -63,18 +59,6 @@ PATCHES=(
 
 DOCS=( DEDICATION HACKING README.txt ROADMAP )
 
-pkg_setup() {
-	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
-	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
-		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
-			einfo "Updating metapost symlink"
-			eselect mpost update || die
-		fi
-	fi
-
-	python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	default