gentoo auto-resync : 09:01:2023 - 12:18:20

3 files changed, 55 insertions, 3 deletions

diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 38ebd3c3188f..e7861a645a3c 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,5 +1,6 @@
+AUX recode-3.7.13-no-help2man.patch 1945 BLAKE2B 62f5af8333b360ff7519edaa7af3ebef8c602c811aa8575c18910929c1f2776e44a234bff2abb2c5403cb94d803f3a2601aee00fd259497c6eaeb07b882b4112 SHA512 bd808c741e58dd7fd56c0960188d49237016e3a66996b8ef286d1305a8ca32d5b9a8f30fa08120ddae1901eb5d3fa019044b63fda32dc78d71c91babacc84ded
 DIST recode-3.7.12.tar.gz 2399126 BLAKE2B 420ba6f96d532da4ae0e1861b512c39ad59f1f63b0e0ef061dcff95c15ff4ed82a3b7bb72f6abb29f85588476a76cb5d50151ca9e3f857c2c1c09727ccdd2890 SHA512 365602bf7b20e5362d13d1ab5269419f7f0838fb81dc01c466ea99c38eb1b979f8d707d24ca3dabbd3a0c65cde97704b570007ac60689d88bbafd33351d37d95
 DIST recode-3.7.13.tar.gz 2400432 BLAKE2B 457ba7855aeb5ae8b0cc32ee82b5b61b1b46ba2908406c0c10a76ae242343f421e81038b9bb6784089e8e3e687ecc0f61a6263c24f6b234962f94853e9359734 SHA512 af86754ed2ed1dc414f1dd7ab3564d606abb309766fb02bf085e56241527a74ac7141617956d01b0797e8e426cfb39ec597bd221d8ad58d9246e96b228e65b00
 EBUILD recode-3.7.12-r1.ebuild 1521 BLAKE2B 3445d43122f73fbc1a5c85e78f2433043f5b5f3627482ced67d733c016beeefd115ff5eca79b06ec3b659196557d8a64899449c2ea63a8fd0529c62924f12334 SHA512 1eb3427f0e2607c182dd165bc12e3688af8c9430584c0f66c8a67d8dca5f44d540a9cefb30622486de059c15c3093c1682b614991dbcaefcf8aee0994cbefccf
-EBUILD recode-3.7.13.ebuild 1612 BLAKE2B 50340a139b4905c7f531d9bd3467d8ca582f6244a5ed09e171e58adc7896eabf98cff134f1c6ff8caee0bad34b9e8f652b945bc00ac98f8fe4538a07e906a1d2 SHA512 03b2050efd7318e2c83ae6fc6dbf423e4ebc7a75ec2ddff69d146ada2e065c3a55052da7ec110d8d0984ad16d8d3aa9daa55cded0bcb98bc4fc6c8e2e44892fa
+EBUILD recode-3.7.13.ebuild 1580 BLAKE2B 6fd77f09d824fe222c02fbec0d6b5b6ce1e10b4be22bfc69b6ad696b135cda9f8cf03d858e63798c51e11761147e44213d51625b7fcc6777f4485d768de67dcb SHA512 4a93c11468c4c9336bcc8d05489b7c998e858fcd486b2950c72af9c0708a791b203a8f21c28b380315e58dec292ff75e780c8418eb786eb7a09c915c016d4bd1
 MISC metadata.xml 431 BLAKE2B a2f1b90590a30ec6d561845193e29d2fde7254ece1cc31b777bc5d3ed85aae53a6abb23cd9a00f9fd07ac4e13ccabd35e2fc71816106e46c89ff0607e869419c SHA512 388038f9e95b0491e8061def1c405facb327e8feefeca08d7b425b143db03d4f7745c6b7515cc000f42992b97cc9e82aac7660e313a2159d324883792d6d85fb
diff --git a/app-text/recode/files/recode-3.7.13-no-help2man.patch b/app-text/recode/files/recode-3.7.13-no-help2man.patch
new file mode 100644
index 000000000000..bc493d429e28
--- /dev/null
+++ b/app-text/recode/files/recode-3.7.13-no-help2man.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/890256
+https://github.com/rrthomas/recode/commit/dcdd5d26c0c2c49f8113b63186449d6a1e3a509e
+
+From dcdd5d26c0c2c49f8113b63186449d6a1e3a509e Mon Sep 17 00:00:00 2001
+From: Reuben Thomas <rrt@sc3d.org>
+Date: Fri, 6 Jan 2023 20:11:03 +0100
+Subject: [PATCH] src/Makefile.am: allow build without help2man
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = gnits
+ bin_PROGRAMS = recode
+ lib_LTLIBRARIES = librecode.la
+ noinst_LTLIBRARIES = libmerged.la
+-man_MANS = recode.1
++dist_man_MANS = recode.1
+ include_HEADERS = recode.h recodext.h
+ 
+ H_STEPS = common.h decsteps.h inisteps.h tersteps.h \
+@@ -100,12 +100,12 @@ merged.c: mergelex.py $(L_STEPS)
+ # Depend on recode$(EXEEXT) rather than explicitly make-ing it, as otherwise
+ # we break parallel builds, as libmerged.la can be built twice in parallel,
+ # which can fail.
+-recode.1: main.c $(top_srcdir)/configure.ac recode$(EXEEXT)
++recode.1: main.c $(top_srcdir)/configure.ac
+ ## Exit gracefully if recode.1 is not writeable, such as during distcheck!
+ 	$(AM_V_GEN)if ( touch $@.w && rm -f $@.w; ) >/dev/null 2>&1; then \
+ 	  $(top_srcdir)/build-aux/missing --run $(HELP2MAN) --locale=en_US.UTF-8 \
+ 		--name="converts files between character sets" \
+-		--output=$@ ./recode; \
++		--output=$@ ./recode$(EXEEXT); \
+ 	fi
+ 
+ main.o: main.c ../config.status
+@@ -169,5 +169,3 @@ strip-pool.c strip-data.c: stamp-strip
+ stamp-strip: ../tables.py $(MNEMONICS_DS) $(CHARSETS_DEF)
+ 	$(TABLES_PY) -C $(srcdir) -p $(MNEMONICS_DS) $(CHARSETS_DEF)
+ 	@echo timestamp > $(srcdir)/$@
+-
+-DISTCLEANFILES = recode.1
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1,5 +1,5 @@
+ # Makefile for Recode regression tests.
+-# Copyright © 1996-2022 Free Software Foundation, Inc.
++# Copyright © 1996-2023 Free Software Foundation, Inc.
+ # François Pinard <pinard@iro.umontreal.ca>, 1988.
+ 
+ # This program is free software; you can redistribute it and/or modify
+
diff --git a/app-text/recode/recode-3.7.13.ebuild b/app-text/recode/recode-3.7.13.ebuild
index b903f2d850fd..fa935e6151e6 100644
--- a/app-text/recode/recode-3.7.13.ebuild
+++ b/app-text/recode/recode-3.7.13.ebuild
@@ -33,8 +33,9 @@ BDEPEND="
 	)
 "
 
-# False positive (runs within a conditional)
-QA_AM_MAINTAINER_MODE=".*help2man.*"
+PATCHES=(
+	"${FILESDIR}"/${P}-no-help2man.patch
+)
 
 python_check_deps() {
 	python_has_version "dev-python/cython[${PYTHON_USEDEP}]"