commit: 26b96a65cbf78c2c61c881fe29d6ef5f4acbec50 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> AuthorDate: Sun Mar 7 16:23:13 2021 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Mar 14 18:55:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b96a65
sys-apps/groff: EAPI 7 Closes: https://bugs.gentoo.org/774699 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-apps/groff/groff-1.22.4.ebuild | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild index 562ef0a0eeb..9b743edaf3b 100644 --- a/sys-apps/groff/groff-1.22.4.ebuild +++ b/sys-apps/groff/groff-1.22.4.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs @@ -21,14 +21,15 @@ IUSE="examples uchardet X" RDEPEND=" uchardet? ( app-i18n/uchardet ) X? ( + x11-libs/libICE + x11-libs/libSM x11-libs/libX11 - x11-libs/libXt - x11-libs/libXmu x11-libs/libXaw - x11-libs/libSM - x11-libs/libICE + x11-libs/libXmu + x11-libs/libXt )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-lang/perl sys-apps/texinfo" @@ -70,16 +71,13 @@ src_configure() { } src_compile() { - if tc-is-cross-compiler ; then - local CROSS_ARGS=( - GROFFBIN="$(type -P groff)" - TROFFBIN="$(type -P troff)" - GROFF_BIN_DIR= - GROFF_BIN_PATH= - ) - else - unset CROSS_ARGS - fi + local -a CROSS_ARGS + tc-is-cross-compiler && CROSS_ARGS+=( + GROFFBIN="$(type -P groff)" + TROFFBIN="$(type -P troff)" + GROFF_BIN_DIR= + GROFF_BIN_PATH= + ) emake AR="$(tc-getAR)" "${CROSS_ARGS[@]}" } @@ -93,11 +91,11 @@ src_install() { if ! use examples ; then # The pdf files might not be generated if ghostscript is unavailable. #602020 - local pdf="${ED%/}/usr/share/doc/${PF}/examples/mom/mom-pdf.pdf" + local pdf="${ED}/usr/share/doc/${PF}/examples/mom/mom-pdf.pdf" if [[ -e ${pdf} ]] ; then # Keep mom-pdf.pdf since it's more of a manual than an example. #454196 #516732 - mv "${pdf}" "${ED%/}"/usr/share/doc/${PF}/pdf/ || die + mv "${pdf}" "${ED}/usr/share/doc/${PF}/pdf/" || die fi - rm -rf "${ED%/}"/usr/share/doc/${PF}/examples + rm -rf "${ED}/usr/share/doc/${PF}/examples" fi }
