commit: 34fef534dc8545266df9665e31b6758cfa0a585c Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Sat Sep 5 11:22:34 2020 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sat Sep 5 11:22:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34fef534
media-sound/lilypond: bump to 2.21.5 + updated live + doc use flag the doc use flag is for testing purposes now and to resolve all possible issues with building the documentation, i hope community can help with that Closes: https://bugs.gentoo.org/179178 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-sound/lilypond/Manifest | 1 + ...lilypond-9999.ebuild => lilypond-2.21.5.ebuild} | 23 ++++++++++++++++------ media-sound/lilypond/lilypond-9999.ebuild | 23 ++++++++++++++++------ 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 3687cff7423..e6b0880818e 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,2 +1,3 @@ DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75 DIST lilypond-2.21.4.tar.gz 18011766 BLAKE2B fe9731a170ec6e551bd5e2259cca33e1c69ee5dedccaf39e7026afe3342da8d301f7450450122f4e102915d4469dddb89575b3a75db21e988d526d9b683bcc38 SHA512 29d671d411cf3817e8a62f208bec4c8d74a08c3a54b8856c1474cfa736e2882c5418b52af2675598093fae2b77c2ba4c812aae9164d99c9643ff18271cee6860 +DIST lilypond-2.21.5.tar.gz 18005124 BLAKE2B d41f2baaeb0e72905f688bf7bd88e9acdc1eabc1bf69a05e8d5208f8ffc06197830c6b6ff1f09034eebc15fc4d94f6909848940361e06120530abc67b10aa87e SHA512 bcc72d0d040125fc9e4f7447e31af59959cae8c1afef1f6c4b7fb1fdbf037931a94d64c94b6b26e37de7d66ec52f24b2ba1b4fd0a6e0862b82eeef3c86d94958 diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-2.21.5.ebuild similarity index 84% copy from media-sound/lilypond/lilypond-9999.ebuild copy to media-sound/lilypond/lilypond-2.21.5.ebuild index ffa9b40c076..c03d4b78151 100644 --- a/media-sound/lilypond/lilypond-9999.ebuild +++ b/media-sound/lilypond/lilypond-2.21.5.ebuild @@ -20,7 +20,9 @@ HOMEPAGE="http://lilypond.org/"; LICENSE="GPL-3 FDL-1.3" SLOT="0" -IUSE="debug emacs guile2 profile vim-syntax" +LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh" +IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}" +unset LANG_USE REQUIRED_USE="${PYTHON_REQUIRED_USE}" BDEPEND=" @@ -29,6 +31,7 @@ BDEPEND=" >=sys-devel/bison-2.0 sys-devel/flex virtual/pkgconfig + doc? ( app-text/texi2html ) " RDEPEND=">=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12=[deprecated,regex] @@ -48,8 +51,14 @@ DEPEND="${RDEPEND} dev-lang/perl dev-libs/kpathsea media-gfx/fontforge[png,python] - sys-devel/gettext" - + sys-devel/gettext + doc? ( + dev-texlive/texlive-langcyrillic + l10n_cs? ( dev-texlive/texlive-xetex ) + l10n_ja? ( dev-texlive/texlive-langjapanese ) + l10n_zh? ( dev-texlive/texlive-langchinese ) + ) +" # Correct output data for tests isn't bundled with releases RESTRICT="test" @@ -81,14 +90,12 @@ src_configure() { # fix hardcoded `ar` sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" - # documentation generation currently not supported since it requires a newer - # version of texi2html than is currently in the tree local myeconfargs=( --with-texgyre-dir=/usr/share/fonts/tex-gyre - --disable-documentation --disable-optimising --disable-pipe $(use_enable debug debugging) + $(use_enable doc documentation) $(use_enable profile profiling) ) @@ -100,6 +107,8 @@ src_configure() { src_compile() { default + use doc && emake LANGS="${L10N}" doc info + if use emacs ; then elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \ || die "elisp-compile failed" @@ -109,6 +118,8 @@ src_compile() { src_install() { emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install + use doc && emake DESTDIR="${D}" install-doc + # remove elisp files since they are in the wrong directory rm -r "${ED}"/usr/share/emacs || die diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild index ffa9b40c076..c03d4b78151 100644 --- a/media-sound/lilypond/lilypond-9999.ebuild +++ b/media-sound/lilypond/lilypond-9999.ebuild @@ -20,7 +20,9 @@ HOMEPAGE="http://lilypond.org/"; LICENSE="GPL-3 FDL-1.3" SLOT="0" -IUSE="debug emacs guile2 profile vim-syntax" +LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh" +IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}" +unset LANG_USE REQUIRED_USE="${PYTHON_REQUIRED_USE}" BDEPEND=" @@ -29,6 +31,7 @@ BDEPEND=" >=sys-devel/bison-2.0 sys-devel/flex virtual/pkgconfig + doc? ( app-text/texi2html ) " RDEPEND=">=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12=[deprecated,regex] @@ -48,8 +51,14 @@ DEPEND="${RDEPEND} dev-lang/perl dev-libs/kpathsea media-gfx/fontforge[png,python] - sys-devel/gettext" - + sys-devel/gettext + doc? ( + dev-texlive/texlive-langcyrillic + l10n_cs? ( dev-texlive/texlive-xetex ) + l10n_ja? ( dev-texlive/texlive-langjapanese ) + l10n_zh? ( dev-texlive/texlive-langchinese ) + ) +" # Correct output data for tests isn't bundled with releases RESTRICT="test" @@ -81,14 +90,12 @@ src_configure() { # fix hardcoded `ar` sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" - # documentation generation currently not supported since it requires a newer - # version of texi2html than is currently in the tree local myeconfargs=( --with-texgyre-dir=/usr/share/fonts/tex-gyre - --disable-documentation --disable-optimising --disable-pipe $(use_enable debug debugging) + $(use_enable doc documentation) $(use_enable profile profiling) ) @@ -100,6 +107,8 @@ src_configure() { src_compile() { default + use doc && emake LANGS="${L10N}" doc info + if use emacs ; then elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \ || die "elisp-compile failed" @@ -109,6 +118,8 @@ src_compile() { src_install() { emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install + use doc && emake DESTDIR="${D}" install-doc + # remove elisp files since they are in the wrong directory rm -r "${ED}"/usr/share/emacs || die
