From 26ee24cc74cf11743df1d582dc2a583a2f4ed184 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Wed, 7 Apr 2021 23:27:01 +0100
Subject: app-text/xmlto: fix links patch macro

Closes: https://bugs.gentoo.org/679626
Signed-off-by: Sam James <sam@gentoo.org>
---
 .../xmlto/files/xmlto-0.0.28-allow-links.patch     |  2 +-
 app-text/xmlto/xmlto-0.0.28-r5.ebuild              | 52 ----------------------
 app-text/xmlto/xmlto-0.0.28-r6.ebuild              | 52 ++++++++++++++++++++++
 3 files changed, 53 insertions(+), 53 deletions(-)
 delete mode 100644 app-text/xmlto/xmlto-0.0.28-r5.ebuild
 create mode 100644 app-text/xmlto/xmlto-0.0.28-r6.ebuild

(limited to 'app-text')

diff --git a/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch b/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch
index abb583fc9044..b35b492d9120 100644
--- a/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch
+++ b/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch
@@ -9,7 +9,7 @@ Thanks-to: dolphinling
 -AC_ARG_VAR([LINKS], [Name and path of the `elinks' browser.])
 -AC_PATH_PROG([LINKS], [elinks], [elinks])
 +AC_ARG_VAR([LINKS], [Name and path of the `links/elinks' browser.])
-+AC_PATH_PROG([LINKS], [links elinks], [links])
++AC_PATH_PROGS([LINKS], [links elinks], [links])
  
  AC_ARG_VAR([W3M], [Name and path of the `w3m' browser.])
  AC_PATH_PROG([W3M], [w3m], [w3m])
diff --git a/app-text/xmlto/xmlto-0.0.28-r5.ebuild b/app-text/xmlto/xmlto-0.0.28-r5.ebuild
deleted file mode 100644
index 9188b524d598..000000000000
--- a/app-text/xmlto/xmlto-0.0.28-r5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Script for converting XML and DocBook documents to a variety of output formats"
-HOMEPAGE="https://pagure.io/xmlto"
-SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="latex text"
-
-RDEPEND="
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	|| ( sys-apps/util-linux app-misc/getopt )
-	text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) )
-	latex? ( dev-texlive/texlive-formatsextra )
-"
-# We only depend on flex when we patch the input lexer.
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
-	"${FILESDIR}"/${PN}-0.0.28-allow-links.patch
-)
-
-src_prepare() {
-	default
-
-	# fix symbol clash on Solaris
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	# We don't want the script to detect /bin/sh if it is bash.
-	export ac_cv_path_BASH="${BASH}"
-	has_version sys-apps/util-linux || export GETOPT=getopt-long
-
-	econf
-}
diff --git a/app-text/xmlto/xmlto-0.0.28-r6.ebuild b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
new file mode 100644
index 000000000000..9188b524d598
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Script for converting XML and DocBook documents to a variety of output formats"
+HOMEPAGE="https://pagure.io/xmlto"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="latex text"
+
+RDEPEND="
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	|| ( sys-apps/util-linux app-misc/getopt )
+	text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) )
+	latex? ( dev-texlive/texlive-formatsextra )
+"
+# We only depend on flex when we patch the input lexer.
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
+	"${FILESDIR}"/${PN}-0.0.28-allow-links.patch
+)
+
+src_prepare() {
+	default
+
+	# fix symbol clash on Solaris
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# We don't want the script to detect /bin/sh if it is bash.
+	export ac_cv_path_BASH="${BASH}"
+	has_version sys-apps/util-linux || export GETOPT=getopt-long
+
+	econf
+}
-- 
cgit v1.2.3-65-gdbad