gentoo resync : 28.04.2021

5 files changed, 44 insertions, 14 deletions

diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 9781aa7a7fd1..08e63be8b69e 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,5 +1,6 @@
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8e6fd792bfacfee75d180a1493d960348a33c7737a33a15a809fff28f4b6ade3deb045b629eb48a675b56037da56a7fabcd20718dfdaa6a4 SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4
+AUX xmlto-0.0.28-allow-links.patch 535 BLAKE2B 71412bff616c9499ed6cf045a5d7ea1e6c697db791c58c1a56a1fea3bd7c1619814e20cf58e3549609fc104b0223f80c9a84ef4f4b203da90d5a8dc3b6c943b8 SHA512 cc3ccd209872a54cd3d91a1e261348ce412efab3d9d6d0d9199bd40396fa9c8de5e1ba6a5fef2e5d23d2819ae74bc19e2705b54792296eb7a3b8dc82b8637f22
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
-EBUILD xmlto-0.0.28-r3.ebuild 1420 BLAKE2B fb16508bb472a89a2312c7fba3d61694f59fbbf28f6a011fcb000439146ac40f7175a85fe416958bb0cc491d8388b02ddfa9782a3ee90f898f1c56b57dc37b51 SHA512 5d40affae036b2dc9e1d44136c00b3cd68327a06d7946cebb219c597acadabd0b64f006481e439693e28ba28373c44c7c89e5f5ef9ce758274791edc82642ad5
-EBUILD xmlto-0.0.28-r4.ebuild 1356 BLAKE2B 38104dfcdd90a36e4dfffcc1022e7666fa8da4f74cfa00321bc685b5ccc59a640e04655edde22f5e906584c0afddbe7b8fc63839b3104087d578274261830c85 SHA512 2a57acfed31b948c578d923d04d676d1ff4c3f116ba226cf1cf322e85dfd3aec34ca4ef6c881f44399dd574f55899dce5ae52184a688889b812c2ae014980bd2
-MISC metadata.xml 247 BLAKE2B 17c173af66eaa7e25c4a88ae4e5b8cba24cd1f324224ddeb95774690a862c678f2c6c51cfd175aaa3781efa83d0526c01883b7888cba6fb9ba8f62b9bef5942f SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47
+EBUILD xmlto-0.0.28-r3.ebuild 1422 BLAKE2B 82f75b7468184f59b6b7edbecf2b9a9a06daf91c61f163f0c6501ea5ebb1cec4922d309f4bfb5962ec7192035dc9daa887aa967a1f46e88f390f478ea5565091 SHA512 88c76795131133792a8de0591b183682418e7c670b347276eab3bfc7f1c966d980d9d48de407bc0de746aa7ac5e0371bea5bb149c9a302984de042ed79a674f6
+EBUILD xmlto-0.0.28-r6.ebuild 1442 BLAKE2B a5993d04bc74818acd4c4fb2213067f6ded07baa625e602ebf028a6b59188b340bbbc9b2e00cbdf04023eccd20477a0103ade366b489ed1dba409edefe7a32f7 SHA512 bcbe983428e3a8abb22bfc1fea7bc200a77ede274432c903887053dd5da1a90b4ef9b5c632007466d2050de64fe9463de693309dd6000f04a7d05f2ad53c7a20
+MISC metadata.xml 323 BLAKE2B fc92312d7c96a25a1d35384dd78942a7d6bfdeb0d1c36a7ffddc687d42a83261766e7042dc109b2544da11d72274761a98c62cc8e0ac872e8478e5e027cc69bf SHA512 33789a6e807d048100b32969bfbce0beea9c3b25fe279fe5d318d59b970b4562ec8edd222bf5817a62e46d23961160ccb11384be06e605fb115b3fc7c72299c5
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 000000000000..b35b492d9120
--- /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_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/metadata.xml b/app-text/xmlto/metadata.xml
index a6f3fe89fa47..d52af1c934ce 100644
--- a/app-text/xmlto/metadata.xml
+++ b/app-text/xmlto/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="text">Support conversion from XML to plain text</flag>
-</use>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<use>
+		<flag name="text">Support conversion from XML to plain text</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/xmlto/xmlto-0.0.28-r3.ebuild b/app-text/xmlto/xmlto-0.0.28-r3.ebuild
index 21e100a54846..6b8268c5f689 100644
--- a/app-text/xmlto/xmlto-0.0.28-r3.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r3.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 DESCRIPTION="script for converting XML and DocBook documents to a variety of output formats"
 HOMEPAGE="https://pagure.io/xmlto"
@@ -10,7 +9,7 @@ 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"
+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-1.62.0-r1
@@ -28,8 +27,12 @@ DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS ChangeLog FAQ NEWS README THANKS"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
+	default
 
 	# fix symbol clash on Solaris
 	if [[ ${CHOST} == *-solaris* ]] ; then
@@ -41,5 +44,6 @@ 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-r4.ebuild b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
index 0659a3d55d97..d56b7a4beafe 100644
--- a/app-text/xmlto/xmlto-0.0.28-r4.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
@@ -3,21 +3,25 @@
 
 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"
+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() {