Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xsl-stylesheets/
Date: Sun, 24 Feb 2019 10:53:39
Message-Id: 1551005579.394c6f7dd050f36515200846bd597284a7a3f0cd.pacho@gentoo
1 commit: 394c6f7dd050f36515200846bd597284a7a3f0cd
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 24 09:37:22 2019 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 24 10:52:59 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=394c6f7d
7
8 app-text/docbook-xsl-stylesheets: Fix prefix support
9
10 Thanks-to: James R Larrowe
11 Closes: https://bugs.gentoo.org/676646
12 Package-Manager: Portage-2.3.62, Repoman-2.3.12
13 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
14
15 .../docbook-xsl-stylesheets-1.79.1-r2.ebuild | 17 +++++++++--------
16 1 file changed, 9 insertions(+), 8 deletions(-)
17
18 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
19 index 66d7cf90e11..fcf22a76752 100644
20 --- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
21 +++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
22 @@ -1,13 +1,12 @@
23 -# Copyright 1999-2018 Gentoo Foundation
24 +# Copyright 1999-2019 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=6
28 -
29 USE_RUBY="ruby22 ruby23 ruby24 ruby25"
30
31 inherit ruby-single
32
33 -DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
34 +DOCBOOKDIR="${EPREFIX}/usr/share/sgml/${PN/-//}"
35 MY_PN="${PN%-stylesheets}"
36 MY_P="${MY_PN}-${PV}"
37
38 @@ -20,8 +19,10 @@ SLOT="0"
39 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"
40 IUSE="ruby"
41
42 -RDEPEND=">=app-text/build-docbook-catalog-1.1
43 - ruby? ( ${RUBY_DEPS} )"
44 +RDEPEND="
45 + >=app-text/build-docbook-catalog-1.1
46 + ruby? ( ${RUBY_DEPS} )
47 +"
48
49 S="${WORKDIR}/${MY_P}"
50
51 @@ -42,7 +43,7 @@ src_prepare() {
52 -printf "removed %p\n" -delete || die
53
54 if ! use ruby; then
55 - rm -rv epub/ || die
56 + rm -rv epub/ || die
57 fi
58 }
59
60 @@ -83,12 +84,12 @@ src_install() {
61 # we can't use a symlink or it'll look for the library in the
62 # wrong path.
63 dodir /usr/bin
64 - cat - > "${D}"/usr/bin/${cmd} <<EOF
65 + cat - > "${D}"${EPREFIX}/usr/bin/${cmd} <<EOF
66 #!/usr/bin/env ruby
67
68 load "${DOCBOOKDIR}/epub/bin/dbtoepub"
69 EOF
70 - fperms 0755 /usr/bin/${cmd}
71 + fperms 0755 ${EPREFIX}/usr/bin/${cmd}
72 fi
73 }