Skip to content

Commit

Permalink
media-sound/lilypond: Drop dependency on dev-tex/metapost.
Browse files Browse the repository at this point in the history
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@gentoo.org>
  • Loading branch information
ulm committed Jul 28, 2020
1 parent aabad36 commit c9de6da
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 34 deletions.
18 changes: 1 addition & 17 deletions media-sound/lilypond/lilypond-2.21.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
18 changes: 1 addition & 17 deletions media-sound/lilypond/lilypond-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit c9de6da

Please sign in to comment.