commit: 394c6f7dd050f36515200846bd597284a7a3f0cd Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sun Feb 24 09:37:22 2019 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sun Feb 24 10:52:59 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=394c6f7d
app-text/docbook-xsl-stylesheets: Fix prefix support Thanks-to: James R Larrowe Closes: https://bugs.gentoo.org/676646 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> .../docbook-xsl-stylesheets-1.79.1-r2.ebuild | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild index 66d7cf90e11..fcf22a76752 100644 --- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild +++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild @@ -1,13 +1,12 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 - USE_RUBY="ruby22 ruby23 ruby24 ruby25" inherit ruby-single -DOCBOOKDIR="/usr/share/sgml/${PN/-//}" +DOCBOOKDIR="${EPREFIX}/usr/share/sgml/${PN/-//}" MY_PN="${PN%-stylesheets}" MY_P="${MY_PN}-${PV}" @@ -20,8 +19,10 @@ SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="ruby" -RDEPEND=">=app-text/build-docbook-catalog-1.1 - ruby? ( ${RUBY_DEPS} )" +RDEPEND=" + >=app-text/build-docbook-catalog-1.1 + ruby? ( ${RUBY_DEPS} ) +" S="${WORKDIR}/${MY_P}" @@ -42,7 +43,7 @@ src_prepare() { -printf "removed %p\n" -delete || die if ! use ruby; then - rm -rv epub/ || die + rm -rv epub/ || die fi } @@ -83,12 +84,12 @@ src_install() { # we can't use a symlink or it'll look for the library in the # wrong path. dodir /usr/bin - cat - > "${D}"/usr/bin/${cmd} <<EOF + cat - > "${D}"${EPREFIX}/usr/bin/${cmd} <<EOF #!/usr/bin/env ruby load "${DOCBOOKDIR}/epub/bin/dbtoepub" EOF - fperms 0755 /usr/bin/${cmd} + fperms 0755 ${EPREFIX}/usr/bin/${cmd} fi }