gentoo auto-resync : 08:09:2022 - 04:37:19

3 files changed, 174 insertions, 0 deletions

diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 4a91764316e2..7988265519df 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,6 +1,8 @@
 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
 AUX xmlto-0.0.28-dont-hardcode-paths.patch 845 BLAKE2B 37618989b609bc7dd2d94d22fad0562d6e0580541d8f6ec2a222316da89a6744a16cac9b4cd446ef80f58cf415f4a784aefedf53349ea85e98cf33000b7799b6 SHA512 9947787a1c3ebbd0a73e271ebab3dfcd01b7aad3bcaa627e7a236947bc7edbc23696c38f96aae62785013e2ac8c5171ce6f386f655676a4cde8d820f49d5df7d
+AUX xmlto-0.0.28-fix-warnings.patch 3085 BLAKE2B 2c9e6323dda3fed36bdd999e10d76b8cfcc3c2bef3893ec044588c22519609889101d65f656f8ebb7b70a2819d009fb81d1f34ad2659b1398d7d3c7b9d565ffc SHA512 b16699d6e592c74ca7400f1a4a0ff6b158eb44cb6e77b73bebab03e10535f44890241bfd53d16382266da4102a42c4db7905481115324a76e667d1b91ec61fe1
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
 EBUILD xmlto-0.0.28-r8.ebuild 1495 BLAKE2B fb48fd354d2837e842b3400014f768119d962345f9dd37cba16ef65517d8bf3c9933ed306d558f408809e513d171727383f7a54c207edd773dd46a15d4880fd9 SHA512 09a4b2c9467c8dc35301dd733207f82bc7f6ccdd9f764da50bfdba5de120ce66c388e181e709ae22e08164e5fdde79ea74aca8a95bf8658b6004e3bf1645022f
+EBUILD xmlto-0.0.28-r9.ebuild 1596 BLAKE2B 8b9bf3d3249c7985e9e0f7afa7166e704452f09a92d786aaeaa28839ac66689ec64f971a0840c0a930054ea87f1068863c4e37eb3dfc24c85de6ca8f41017856 SHA512 3833b6f2d10c22237a2fce8e7717db020695b6b1b51b7ab211dca02194ff7b6ba24c1fa8da3686d5a9a186edde53644701160a7c6c841c01d6e15565c2812b4f
 MISC metadata.xml 324 BLAKE2B 3cabb2600d6843ebecec023a16fef87a40432202ff195a6130e57f97802d4c0ed2e82ffee506c65afe554291f05c64c7ae2fe524c708db7a9c6bf4a71c4c8710 SHA512 19ed2fabc04f96b1b61495e2fdba674ca4b4a9a1cee11b3cb13baec6d9e7fe0d82b653a0cbb523de3fcd4ed1ef18d8111686f8b618db9924674ee274ae5a21ed
diff --git a/app-text/xmlto/files/xmlto-0.0.28-fix-warnings.patch b/app-text/xmlto/files/xmlto-0.0.28-fix-warnings.patch
new file mode 100644
index 000000000000..b90eea1f42df
--- /dev/null
+++ b/app-text/xmlto/files/xmlto-0.0.28-fix-warnings.patch
@@ -0,0 +1,116 @@
+https://bugs.gentoo.org/869080
+
+https://pagure.io/xmlto/c/1375e2df75530cd198bd16ac3de38e2b0d126276?branch=master
+https://pagure.io/xmlto/c/412f97cdc00d2bbf7e8121012b49fc07b3fe3d2b?branch=master
+https://pagure.io/xmlto/c/8e34f087bf410bcc5fe445933d6ad9bae54f24b5?branch=master
+https://pagure.io/xmlto/c/6fa6a0e07644f20abf2596f78a60112713e11cbe?branch=master
+
+From 1375e2df75530cd198bd16ac3de38e2b0d126276 Mon Sep 17 00:00:00 2001
+From: Thomas Kuehne <thomas@kuehne.cn>
+Date: Dec 11 2021 20:45:45 +0000
+Subject: fix -Wimplicit-int for ifsense
+
+
+fixes:
+xmlif/xmlif.l:46:8: warning: type defaults to ‘int’ in declaration of ‘ifsense’ [-Wimplicit-int]
+   46 | static ifsense;                 /* sense of last `if' or unless seen */
+      |        ^~~~~~~
+
+Signed-off-by: Thomas Kuehne <thomas@kuehne.cn>
+
+--- a/xmlif/xmlif.l
++++ b/xmlif/xmlif.l
+@@ -43,7 +43,7 @@
+ 
+ static char **selections;	/* selection tokens */
+ static int nselections;		/* number of selections */
+-static ifsense;			/* sense of last `if' or unless seen */
++static int ifsense;		/* sense of last `if' or unless seen */
+ static char *attribute;		/* last attribute scanned */
+ 
+ struct stack_t {
+
+
+From 412f97cdc00d2bbf7e8121012b49fc07b3fe3d2b Mon Sep 17 00:00:00 2001
+From: Thomas Kuehne <thomas@kuehne.cn>
+Date: Dec 11 2021 20:45:59 +0000
+Subject: fix extra ‘;’ outside of a function
+
+
+Fixes:
+xmlif/xmlif.l:240:24: warning: ISO C does not allow extra ‘;’ outside of a function [-Wpedantic]
+  240 | int yywrap() {exit(0);};
+      |                        ^
+
+Signed-off-by: Thomas Kuehne <thomas@kuehne.cn>
+
+--- a/xmlif/xmlif.l
++++ b/xmlif/xmlif.l
+@@ -237,7 +237,7 @@ WS		[ \t\n]*
+ 
+ #include "config.h"
+ 
+-int yywrap() {exit(0);};
++int yywrap() {exit(0);}
+ 
+ main(int argc, char *argv[])
+ {
+
+
+From 8e34f087bf410bcc5fe445933d6ad9bae54f24b5 Mon Sep 17 00:00:00 2001
+From: Thomas Kuehne <thomas@kuehne.cn>
+Date: Dec 11 2021 20:56:00 +0000
+Subject: Fix return type of main function
+
+
+Fixes:
+xmlif/xmlif.l:242:1: warning: return type defaults to ‘int’ [-Wimplicit-int]
+  242 | main(int argc, char *argv[])
+      | ^~~~
+
+Signed-off-by: Thomas Kuehne <thomas@kuehne.cn>
+
+--- a/xmlif/xmlif.l
++++ b/xmlif/xmlif.l
+@@ -239,7 +239,7 @@ WS		[ \t\n]*
+ 
+ int yywrap() {exit(0);}
+ 
+-main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+     int i;
+ 
+@@ -265,7 +265,7 @@ main(int argc, char *argv[])
+ 	    exit(1);
+ 	}
+ 
+-    yylex();
++    return yylex();
+ }
+ 
+ /*
+
+From 6fa6a0e07644f20abf2596f78a60112713e11cbe Mon Sep 17 00:00:00 2001
+From: Thomas Kuehne <thomas@kuehne.cn>
+Date: Dec 11 2021 21:03:42 +0000
+Subject: add strings.h import
+
+
+Fixes:
+xmlif/xmlif.l:162:13: warning: implicit declaration of function ‘strncasecmp’; did you mean ‘strncmp’? [-Wimplicit-function-declaration]
+  162 |         if (strncasecmp(selections[i], attr, eqoffset) == 0)
+      |             ^~~~~~~~~~~
+
+Signed-off-by: Thomas Kuehne <thomas@kuehne.cn>
+
+--- a/xmlif/xmlif.l
++++ b/xmlif/xmlif.l
+@@ -37,6 +37,7 @@
+  */
+ #include <string.h>
+ #include <stdlib.h>
++#include <strings.h>
+ 
+ #define TRUE	1
+ #define FALSE	0
diff --git a/app-text/xmlto/xmlto-0.0.28-r9.ebuild b/app-text/xmlto/xmlto-0.0.28-r9.ebuild
new file mode 100644
index 000000000000..1ac025998449
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.28-r9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~loong ~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 )
+"
+DEPEND="${RDEPEND}"
+# We only depend on flex when we patch the input lexer.
+# We touch it in fix-warnings.patch.
+BDEPEND="sys-devel/flex"
+
+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
+	"${FILESDIR}"/${P}-dont-hardcode-paths.patch
+	"${FILESDIR}"/${P}-fix-warnings.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
+}