gentoo resync : 29.12.2022

2 files changed, 15 insertions, 22 deletions

diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 1066234b9b30..44e2a922bf02 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1,4 +1,4 @@
 AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
 DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
-EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2341 BLAKE2B 6b650cd47b119613e244addf3cee71c50f4c90d4c4bee724a04f0393c55621eb8c805964147aa17f504cc7237f92111f7adeeb514e10ef91ffcc10ec11cbaf5b SHA512 95c5129e7bb5fc413176f00ea8451a9cebf0d52c44c353bcf00e00880df77d9eb7aa3eb2e1b758cbf125e5e8352bb5312fbf458a80ea9dd1547096bae1d0fb9f
+EBUILD docbook-xsl-stylesheets-1.79.1-r3.ebuild 2251 BLAKE2B 66f47268adea4ed47b73e211a38447b441723367f85ae93c11bf1803089f199f92f841d51e4c8ac2d549b422c6990d11cdc283d6ef3c9d3dc05f66b94dc7506d SHA512 52f1925aeee4d249235a9866840d4baf4638e4385e818ca22796be1b90f3f1a4af8c3e9b476bc6cc0fafabecc2105430357127be32e49f9f657f7df16831a393
 MISC metadata.xml 414 BLAKE2B f10f5576731ded90514b956bb032bf6472634a509e709e998b0120ced275cea6d7027b18623b8f7d8198b6137a9566eab1b0462626a20693655c791b9763952e SHA512 f844b8d60c1c3413b8eb647bdffba6fb08e09e7f62df9e122ad6d69f9f67ec67711a66ec840f1ef92edefef83bd5e77103a10b0feeeb4a08f98680274c3dd93a
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
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
 }