From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1267820-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id AF0371382C5
for <garchives@archives.gentoo.org>; Mon, 5 Apr 2021 22:33:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9AF7DE075F;
Mon, 5 Apr 2021 22:33:38 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 82DB4E075F
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Apr 2021 22:33:38 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 4ED39335D98
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Apr 2021 22:33:37 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E0B9C4C6
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Apr 2021 22:33:35 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1617662006.d68f550bb71767b4cadd452a36698f7e1f0a6b15.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/xmlto/files/, app-text/xmlto/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-text/xmlto/files/xmlto-0.0.28-allow-links.patch app-text/xmlto/xmlto-0.0.28-r4.ebuild app-text/xmlto/xmlto-0.0.28-r5.ebuild
X-VCS-Directories: app-text/xmlto/ app-text/xmlto/files/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: d68f550bb71767b4cadd452a36698f7e1f0a6b15
X-VCS-Branch: master
Date: Mon, 5 Apr 2021 22:33:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 2d4e8fc9-a3c0-430b-bcf7-294b65647144
X-Archives-Hash: 5b8162f929642ee76468a70578bdcbec
commit: d68f550bb71767b4cadd452a36698f7e1f0a6b15
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 5 22:32:32 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 5 22:33:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d68f550b
app-text/xmlto: allow elinks
There's been a lot of history about allowing elinks but ours in Gentoo is
an active fork, so let's give it a whirl. It's already listed in the deps
anyway.
Thanks-to: dolphinling
Closes: https://bugs.gentoo.org/679626
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/xmlto/files/xmlto-0.0.28-allow-links.patch | 15 +++++++++++++++
.../{xmlto-0.0.28-r4.ebuild => xmlto-0.0.28-r5.ebuild} | 11 +++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
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
new file mode 100644
index 00000000000..abb583fc904
--- /dev/null
+++ b/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/679626
+Thanks-to: dolphinling
+--- a/configure.in
++++ b/configure.in
+@@ -100,8 +100,8 @@ dnl
+ AC_ARG_VAR([LYNX], [Name and path of the `lynx' browser.])
+ AC_PATH_PROG([LYNX], [lynx], [lynx])
+
+-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_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-r4.ebuild b/app-text/xmlto/xmlto-0.0.28-r5.ebuild
similarity index 88%
rename from app-text/xmlto/xmlto-0.0.28-r4.ebuild
rename to app-text/xmlto/xmlto-0.0.28-r5.ebuild
index 02c6d5f1d33..9188b524d59 100644
--- a/app-text/xmlto/xmlto-0.0.28-r4.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r5.ebuild
@@ -3,6 +3,8 @@
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"
@@ -12,12 +14,14 @@ 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
+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 )"
+ latex? ( dev-texlive/texlive-formatsextra )
+"
# We only depend on flex when we patch the input lexer.
DEPEND="${RDEPEND}"
@@ -25,6 +29,7 @@ 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() {
@@ -34,6 +39,8 @@ src_prepare() {
if [[ ${CHOST} == *-solaris* ]] ; then
sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die
fi
+
+ eautoreconf
}
src_configure() {