From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3CCA2138359 for ; Tue, 28 Jul 2020 08:45:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B6E4E08F7; Tue, 28 Jul 2020 08:45:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22C26E08F7 for ; Tue, 28 Jul 2020 08:45:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0D41734EEC8 for ; Tue, 28 Jul 2020 08:45:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B679E274 for ; Tue, 28 Jul 2020 08:45:17 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1595925908.c9de6da2710d4d635196c767a943e4c91872e760.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/lilypond/lilypond-2.21.1.ebuild media-sound/lilypond/lilypond-9999.ebuild X-VCS-Directories: media-sound/lilypond/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: c9de6da2710d4d635196c767a943e4c91872e760 X-VCS-Branch: master Date: Tue, 28 Jul 2020 08:45:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 76a83751-d207-4e9b-8bbd-27b4b5df154d X-Archives-Hash: 965292c3dbfa3e5bb5edb480e8dddb69 commit: c9de6da2710d4d635196c767a943e4c91872e760 Author: Ulrich Müller gentoo org> AuthorDate: Sat Jul 25 21:30:53 2020 +0000 Commit: Ulrich Müller gentoo 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 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