Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xsl-stylesheets/
Date: Thu, 23 Jun 2022 20:12:45
Message-Id: 1656015139.aa22ce0a3223734c223d8b28ba10a1f9f8354555.soap@gentoo
1 commit: aa22ce0a3223734c223d8b28ba10a1f9f8354555
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 23 20:12:19 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 23 20:12:19 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa22ce0a
7
8 app-text/docbook-xsl-stylesheets: update EAPI 6 -> 8
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 ...ld => docbook-xsl-stylesheets-1.79.1-r3.ebuild} | 35 +++++++++-------------
13 1 file changed, 14 insertions(+), 21 deletions(-)
14
15 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-r3.ebuild
16 similarity index 81%
17 rename from app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
18 rename to app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r3.ebuild
19 index ba35adf04592..82ed385947cd 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-r3.ebuild
22 @@ -1,9 +1,9 @@
23 # Copyright 1999-2022 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 -EAPI=6
27 -USE_RUBY="ruby25 ruby26 ruby27"
28 +EAPI=8
29
30 +USE_RUBY="ruby26 ruby27"
31 inherit ruby-single
32
33 DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
34 @@ -13,22 +13,20 @@ MY_P="${MY_PN}-${PV}"
35 DESCRIPTION="XSL Stylesheets for Docbook"
36 HOMEPAGE="https://github.com/docbook/wiki/wiki"
37 SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
38 +S="${WORKDIR}/${MY_P}"
39
40 LICENSE="BSD"
41 SLOT="0"
42 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
43 IUSE="ruby"
44 +# Makefile is broken since 1.76.0
45 +RESTRICT="test"
46
47 RDEPEND="
48 >=app-text/build-docbook-catalog-1.1
49 ruby? ( ${RUBY_DEPS} )
50 "
51
52 -S="${WORKDIR}/${MY_P}"
53 -
54 -# Makefile is broken since 1.76.0
55 -RESTRICT=test
56 -
57 PATCHES=(
58 "${FILESDIR}"/nonrecursive-string-subst.patch
59 )
60 @@ -66,30 +64,25 @@ src_install() {
61 for i in */; do
62 i=${i%/}
63
64 - cd "${S}"/${i}
65 for doc in ChangeLog README; do
66 - if [ -e "$doc" ]; then
67 - mv ${doc} ${doc}.${i}
68 - dodoc ${doc}.${i}
69 - rm ${doc}.${i}
70 + if [[ -e ${i}/${doc} ]]; then
71 + newdoc ${i}/${doc} ${doc}.${i}
72 + rm ${i}/${doc} || die
73 fi
74 done
75
76 - doins -r "${S}"/${i}
77 + doins -r ${i}
78 done
79
80 if use ruby; then
81 local cmd="dbtoepub${MY_PN#docbook-xsl}"
82
83 - # we can't use a symlink or it'll look for the library in the
84 - # wrong path.
85 - dodir /usr/bin
86 - cat - > "${ED%/}"/usr/bin/${cmd} <<EOF
87 -#!/usr/bin/env ruby
88 + # we can't use a symlink or it'll look for the library in the wrong path
89 + newbin - ${cmd} <<-EOF
90 + #!/usr/bin/env ruby
91
92 -load "${EPREFIX}${DOCBOOKDIR}/epub/bin/dbtoepub"
93 -EOF
94 - fperms 0755 /usr/bin/${cmd}
95 + load "${EPREFIX}${DOCBOOKDIR}/epub/bin/dbtoepub"
96 + EOF
97 fi
98 }