gentoo auto-resync : 06:10:2023 - 05:56:26

5 files changed, 90 insertions, 0 deletions

diff --git a/app-text/htp/Manifest b/app-text/htp/Manifest
index cda6ad4d60f5..c4df3136fad1 100644
--- a/app-text/htp/Manifest
+++ b/app-text/htp/Manifest
@@ -1,3 +1,7 @@
+AUX htp-1.19-fix-perl-5.26.patch 245 BLAKE2B 62f2b7a3ea607f00c07ef286dadf276c816663be65a82d3a879b33c7a556f6b788df491f63d5cae3c1472c5e03e143796bfb069071731f7d58a9ee9b28e2fbe0 SHA512 95195c71eb3b2897798f49c6da1b797c54eb2da4f5cd3235879203ea1cdf00bc863014a9cd88f7994786c0abce6dff77ee0169e9b433df5e0a81cef243375d02
+AUX htp-1.19-no-prestrip.patch 238 BLAKE2B 02d28ba9bda2264de0edd0a0179c04bafc90b35a14fc7cbd54a97ee21005a77b4b1c9bca00d7e3641831f26949c159d60ee3c48e26c2b5f9dc544cc727e38074 SHA512 6a673c84b97255b22e7bcbf19c5bfaa48f886de99652ac88310b253682df0bd412468300087e82c226e5272279459b05d33f5088f29e8d1b56dc4b9412064fd9
+AUX htp-1.19-parallel-make.patch 758 BLAKE2B d3f106b9951386c2485b95773b455a925196c0a1b9e051306a7724d07672096046c2317af4c7559e104fc27799aa94d96a91f7f3913d5ab50c25470b1ffca9c7 SHA512 3946a7ac4dd37dbd768389c4761cf7a4187cdefb315a4581438be83ebf8355805f7d6f4d168d1940e9d73c4dc6c125e0e9c158ed577e61c4d257267894d6df3f
 DIST htp-1.19.tar.gz 208683 BLAKE2B 86837290a2f14b8a0337d9eb6a0fa4ad553c5c51074d5df903ee19aa7ba441898199f0649b39b93c35fa3707e4084a284e02d8802c014bf5c0277e3f18d02c98 SHA512 32d82bb42ef877bd815fe45fa81599a1428ad6d3269cbe53a4e686bcfe6d1c12ac2af280462768d488b1983ca67cc521da4ed78cc82d904575ffeff08c7eec1d
+EBUILD htp-1.19-r1.ebuild 845 BLAKE2B dbf5370dacd12249e84be567512a7451ee06ef3ffa6b8f88002608fc22602c9b77ccb57108c6cd1aaf07be4e435a02a5dd8fb5570fbccd3135ab09e18b37c8d4 SHA512 4eba9d70b0b98ff199029e6472cfb30a489da7f6c37858964c48364c54d10323a53d8411acb442ff56b912be6db88471ab8c3e0d3dcbb8542eb97689f897db5b
 EBUILD htp-1.19.ebuild 688 BLAKE2B 260c735a88959148e91d0987c1310459003284e82dd1de4d9565ef744a48ae6c640f5d8585b304fd07ecc057ba4a87312bea49bbb7127db85558538d4d2aa898 SHA512 b29c85c8f3c7a513d790182fb45f84e27fd7474b8207cab1d13f35d7c8d09175d31ec2742306c08ad15723ecbcc4469bb80ff2b367397e6baffc674a4bd5d8bd
 MISC metadata.xml 324 BLAKE2B f50c674c3b49fdf33568893e52cdc07346930fc63577ae3a06d88b4458da04fcce805f1ad65cacab300ad0ed1ce499d554fad0643494d018ba4ab479cc11e954 SHA512 840a52457ca080294d6dadcb72b32da6a22e5c51565e53894383f46d369edafaf949fe4fc147986c559609a75a6a56582d253e79e29a7daf4cebcffe74b01cb4
diff --git a/app-text/htp/files/htp-1.19-fix-perl-5.26.patch b/app-text/htp/files/htp-1.19-fix-perl-5.26.patch
new file mode 100644
index 000000000000..b3adff7db2be
--- /dev/null
+++ b/app-text/htp/files/htp-1.19-fix-perl-5.26.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/668250
+--- a/homepage/ref/pphtp.pl
++++ b/homepage/ref/pphtp.pl
+@@ -6,7 +6,7 @@
+ #  -n include line numbers
+ #  -s include EBNF like syntax
+ 
+-require "hlhtp.pl";
++require "./hlhtp.pl";
+ 
+ 
+ while ($ARGV[0] =~ /^-(.*)/) {
diff --git a/app-text/htp/files/htp-1.19-no-prestrip.patch b/app-text/htp/files/htp-1.19-no-prestrip.patch
new file mode 100644
index 000000000000..c47b9e4d4241
--- /dev/null
+++ b/app-text/htp/files/htp-1.19-no-prestrip.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.sub
++++ b/src/Makefile.sub
+@@ -46,7 +46,7 @@ install: install-bin
+ 
+ install-bin: $(HTP)
+ 	mkdir -p $(bindir)
+-	$(INSTALL) -s $(HTP) $(bindir)
++	$(INSTALL) $(HTP) $(bindir)
+ 
+ #
+ # explicit dependency: final executable
diff --git a/app-text/htp/files/htp-1.19-parallel-make.patch b/app-text/htp/files/htp-1.19-parallel-make.patch
new file mode 100644
index 000000000000..850b1d18e330
--- /dev/null
+++ b/app-text/htp/files/htp-1.19-parallel-make.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/827173
+https://sources.debian.org/patches/htp/1.19-8/0004-Parallel-ftbfs.patch/
+
+Description: Fix occasional parallel FTBFS
+ Various source files indirectly include $(d)/version.inc,
+ don't regenerate it in the middle of the build.
+Author: Adrian Bunk <bunk@debian.org>
+
+--- htp-1.19.orig/src/Makefile.sub
++++ htp-1.19/src/Makefile.sub
+@@ -57,14 +57,12 @@ $(HTP) : $(OBJ$(d))
+ #
+ # implicit dependencies for source code
+ #
+-$(OBJ$(d)) : %.$(OBJEXT) : %.c
++$(OBJ$(d)) : %.$(OBJEXT) : %.c $(d)/version.inc
+ ifdef WIN32DMC
+ 	cd $(dir $<); $(CC) $(CCOPT) $(DEFINES) $(notdir $<)
+ else
+ 	$(CC) $(CCOPT) $(DEFINES) -o $*.$(OBJEXT) $<
+ endif
+ 
+-$(d)/htp.$(OBJEXT) $(d)/ver.$(OBJEXT): $(d)/version.inc
+-
+ # restore parent dir
+ d := $(p$(d))
+
diff --git a/app-text/htp/htp-1.19-r1.ebuild b/app-text/htp/htp-1.19-r1.ebuild
new file mode 100644
index 000000000000..c01e19b48e7d
--- /dev/null
+++ b/app-text/htp/htp-1.19-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="An HTML preprocessor"
+HOMEPAGE="http://htp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="Clarified-Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.19-no-prestrip.patch
+	"${FILESDIR}"/${PN}-1.19-parallel-make.patch
+	"${FILESDIR}"/${PN}-1.19-fix-perl-5.26.patch
+)
+
+src_compile() {
+	# TOOD: Tests are always run by the Makefile right now
+	emake \
+		CCOPT="-c ${CFLAGS} ${CPPFLAGS} -DHAVE_SNPRINTF -DHAVE_VASPRINTF -DHAVE_ASPRINTF" \
+		CC="$(tc-getCC)" \
+		LINK='$(CC) $(LDFLAGS)'
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		prefix='$(DESTDIR)/usr' \
+		pkgdocdir='$(DESTDIR)/usr/share/doc/${PF}/html' \
+		install
+}