[gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xsl-stylesheets/

["David Seifert" <soap@gentoo.org>]

commit:     aa22ce0a3223734c223d8b28ba10a1f9f8354555
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 20:12:19 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 20:12:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa22ce0a

app-text/docbook-xsl-stylesheets: update EAPI 6 -> 8

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...ld => docbook-xsl-stylesheets-1.79.1-r3.ebuild} | 35 +++++++++-------------
 1 file changed, 14 insertions(+), 21 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-r3.ebuild
similarity index 81%
rename from app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
rename to app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r3.ebuild
index ba35adf04592..82ed385947cd 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-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
+EAPI=8
 
+USE_RUBY="ruby26 ruby27"
 inherit ruby-single
 
 DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
@@ -13,22 +13,20 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="XSL Stylesheets for Docbook"
 HOMEPAGE="https://github.com/docbook/wiki/wiki"
 SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
 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"
 IUSE="ruby"
+# Makefile is broken since 1.76.0
+RESTRICT="test"
 
 RDEPEND="
 	>=app-text/build-docbook-catalog-1.1
 	ruby? ( ${RUBY_DEPS} )
 "
 
-S="${WORKDIR}/${MY_P}"
-
-# Makefile is broken since 1.76.0
-RESTRICT=test
-
 PATCHES=(
 	"${FILESDIR}"/nonrecursive-string-subst.patch
 )
@@ -66,30 +64,25 @@ src_install() {
 	for i in */; do
 		i=${i%/}
 
-		cd "${S}"/${i}
 		for doc in ChangeLog README; do
-			if [ -e "$doc" ]; then
-				mv ${doc} ${doc}.${i}
-				dodoc ${doc}.${i}
-				rm ${doc}.${i}
+			if [[ -e ${i}/${doc} ]]; then
+				newdoc ${i}/${doc} ${doc}.${i}
+				rm ${i}/${doc} || die
 			fi
 		done
 
-		doins -r "${S}"/${i}
+		doins -r ${i}
 	done
 
 	if use ruby; then
 		local cmd="dbtoepub${MY_PN#docbook-xsl}"
 
-		# we can't use a symlink or it'll look for the library in the
-		# wrong path.
-		dodir /usr/bin
-		cat - > "${ED%/}"/usr/bin/${cmd} <<EOF
-#!/usr/bin/env ruby
+		# we can't use a symlink or it'll look for the library in the wrong path
+		newbin - ${cmd} <<-EOF
+			#!/usr/bin/env ruby
 
-load "${EPREFIX}${DOCBOOKDIR}/epub/bin/dbtoepub"
-EOF
-		fperms 0755 /usr/bin/${cmd}
+			load "${EPREFIX}${DOCBOOKDIR}/epub/bin/dbtoepub"
+		EOF
 	fi
 }