gentoo auto-resync : 03:12:2024 - 02:07:18

8 files changed, 118 insertions, 59 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6a90d0134c68..aa5577523e56 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index 85195cc84817..443ac99c32e8 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -2,5 +2,5 @@ DIST html2text-2.1.1.tar.gz 172655 BLAKE2B ab112e41b9cb08664ae9cba2b137b59e67769
 DIST html2text-2.2.3.tar.gz 329841 BLAKE2B 311defd6aa6affc6f1ad59d9971f0315b6f2d748b4ae26e2c5f61cbd090ff76f0f0df7155acb1ec5c0114a6b6253eb27fc73d327162dca2a144afae74cdf4afa SHA512 ff851abdc0f672d6bf8de494d6595362d5b71eeb03f4f761e32afb50bb75fe12c0cede8c7ca4ca7290b1c9e0f08aaff9821946dd272e1a30ce3b585e452cf6ec
 EBUILD html2text-2.1.1.ebuild 883 BLAKE2B caa8a392389af3f1a67430fa2037943470cd1f543bd0a3806129fccd5cc33a3956b3074d1b97e472a2bf75cf93e30bd43aa86cf49ac9467df81efc89dfaf656d SHA512 7edfb385cb1c8955f02a17cda7cce8d0314d8bc2c48455e4708415dd451531c5975c5b1d7ea6b45895ea7ee23d103dcd96a6fca6c9ada9dedc6bca9538de7376
 EBUILD html2text-2.2.3-r1.ebuild 636 BLAKE2B ecfda104b50b26689ac094ed29906cedc43d79526a21353f7a39c73009ab2c1d4545d0402d087f232be22d0520842135bd334dc845b86208fff6d1a7ef66a49f SHA512 315b28c268b00c0011b1e4be0e4fd2df1fb311a94fa31933a21039a21df990e180dccdb3f85ec3d9a9fcb5296a571e3f3e10dee74486c89a6b088d3f45a93d29
-EBUILD html2text-2.2.3.ebuild 658 BLAKE2B 913ddd02421d062b88e03c9a9569865f67981994d924a5a333140311083f722f8e01d876d6a5657f803ca62d885cd31336f67b72a179dae29aa473c1a84517c6 SHA512 d4829711133798842e8f415324a84c2310c175722446d938bc2311380c0691192e09e72f9d1b165415b75d305b555b933bfbdd63cac85d67cb5e05d9301850f7
+EBUILD html2text-2.2.3.ebuild 657 BLAKE2B 6d0936c2fab55e7eaaeab1585eee46e9d7bcf81bd218d8310f24ec3497a4820379908c2dd607284acbf79040dcd8baeaf60687e42255ea0d21215c08cea2717d SHA512 238bc1c73b251fbd3d18c0ff8494e641362d62c218b3a50a0318d34fded87fac38cbcf34fddacfb0f05016164b70dbf92add1dde43b8ce3c15208e27a403e134
 MISC metadata.xml 331 BLAKE2B 43e61ec021521aaae0dcdbbcef0a40be6da311dd188cf64c66a8dc5c4191befa9955c669cec80d1d9dd0ed584f35e8f3076a0a1d9986e9453c3d96a0cc3ae921 SHA512 dd843839ec2124a68865214d5d2b71d5af631c26bf86fd37f48af940ccd9aa5f1543c9e6232b44119edd7ca429ea869df2acdbf9faafd1454936e23a52d721cf
diff --git a/app-text/html2text/html2text-2.2.3.ebuild b/app-text/html2text/html2text-2.2.3.ebuild
index 93784df9d57a..a22ec5ef2d57 100644
--- a/app-text/html2text/html2text-2.2.3.ebuild
+++ b/app-text/html2text/html2text-2.2.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/grobian/html2text.git"
 else
 	SRC_URI="https://github.com/grobian/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="HTML to text converter"
diff --git a/app-text/lowdown/Manifest b/app-text/lowdown/Manifest
index 8ce4669033e3..a22b86d9a78b 100644
--- a/app-text/lowdown/Manifest
+++ b/app-text/lowdown/Manifest
@@ -1,9 +1,12 @@
 AUX lowdown-0.10.0-pkgconfig-libmd.patch 309 BLAKE2B 617d3af07f0414fce674573e48f86f541f3b6c6c6b1649d7ba4302b0817fa8a8edf0beb1d0628c7deb79eb64934089b8ae9ff8f50171f3e94cd93427464a9c59 SHA512 f40f0a04deb70708b3059ccce394cbb78b8ba6020db4df62533abe1d3d125e1372947a5c249b9aa9a655b9b67f3f448a8963fe53fbd7d13c87b637143b36e9b0
 AUX lowdown-1.1.0-shared-linking.patch 1504 BLAKE2B d53f317fb68c6a627a96243df871a205d460124fa91c4d08373a5a3134bbc4877a0ffdeb7e0336342d049f67b003e82d978cbbbba9b660fabd82550deafbd2e7 SHA512 21f282ca34c319f33795a71c5dbb0937a171853bd570538c750537013dcfc93c06035ee14eca468382e27bba427cb009fb57fef54c34d9509a93279abd52c05b
+AUX lowdown-1.3.0-shared-linking.patch 1548 BLAKE2B 9a2e7d03c17f34ca3a9b04ab144a7944e422e92db53f8a031beebf9d964913f7b060a1e4b0ecba00716379b1422423c48627edd5e3dc8b8f2204988a6b710480 SHA512 ec6891da03a56178610bc70e7133f3fbe5757093f2ad2939215db636fc10c652172c48b6a273cd886e696139923af4a849c0d3288185c076ff1df992d9265653
 DIST lowdown-1.1.1.tar.gz 600635 BLAKE2B 39c0a2472ff6b9b3fa2b6d72c1f2d482592976f7b50c1bbaf1965bfbb6d28f22e0a7498bb54087bb83070bd74ea673409be97815f51a0a5a67e980bbfc4e01b2 SHA512 2a69da945a83696480651e8221d73bcb18bac9bc38bb88126ddf73520d2a4ff396dde08a7abf6f550669ec9ba34abdaa186b0980f312fa157371ee754576bb6a
 DIST lowdown-1.1.2.tar.gz 603453 BLAKE2B 02c549ad803d3e7a0bfc7fb05094452d57dbfd2ada9f5211571a3df45bef7fdca0b1cbd54a28cb86e6bec6b6be2d914ace05c728a3c0263bafe00f47eb52b7c2 SHA512 b8a649814bda946740695b5fe1120ad8653fe058acf37cc3c033fa78a0d49b0036eb2f4ada9b4aeda5d2c85ede7195d681c2605c6113f3c6a1113f760a7f2e49
 DIST lowdown-1.2.0.tar.gz 657032 BLAKE2B 73b3bfc1b09bc6beb38949a344e5b458f8a1537a99ce48710d170f0553c099d0226b6082923b01c02971d3f82c9773ae95e8792f56ccf0d530708aecab480766 SHA512 ed989e12f1bd6da03cbf139bfe0fb0100fbe23cac266990bb1bc34a3e0be3d4512e1ab1da2397c439d20dc40dd7daa4fc4318116ef2b5e759368e9a28e483744
+DIST lowdown-1.3.0.tar.gz 666560 BLAKE2B 8bf9da6163a65bff7ac5774d0d31a0dc1438832944b2560a9f725bf9c83c359575fdb828d5065a0138e84466c9a95ca514c72cba6c457a0bb02f9e4558cce017 SHA512 ac51e8ff74450bf02d3c8e41f129f15f2ac92d47a07c020f10eea143b506fd113afac0e9bec447c336cf70176ebc886a8933fa38f5779931c9dfd9c06421fcda
 EBUILD lowdown-1.1.1.ebuild 1268 BLAKE2B 5255cfe4e112542e70a082e060c0cea16b6e1fd1816abb7b7e767b4e45f6357ffc689727b55a92dd72f8fde86feaa3f7254f2a0c654f3c3ed5199e20e21a23f1 SHA512 c8d00b1d2a3f5bb5e868d753ea589b489f214ed64e9a7cd74f2e7416f9016222c7a315a09b70d3d7b747d9bc02d029fe094651df960e57e694855dc00af76517
 EBUILD lowdown-1.1.2.ebuild 1269 BLAKE2B 1ba13052f20726d5e431dc3d2f26c81a0c61c349477d4d4ad1ef17586174f7afd698d47ba288156e82197f0415a32c981328473ce9e461cd90a645263077e2aa SHA512 2df11c9c31ff55f298ae3c5696f46688863c15bd425b4981472225d25d717fc0b953c09251119998c5782d8f74ea9a351634140720c762a90116666a2f212d71
 EBUILD lowdown-1.2.0.ebuild 1305 BLAKE2B 0765b3bb4bd833cb589f5d077065e50adc130f388206cab7995f7e25a9ceabfe0f9ed4b7b2ac9de7dc82ce9044e0de0b81406811191895f6244bd624c62c75d7 SHA512 3f40949ac3848b5988c719420074d93f1b1917a40e69f914807729e031036d45c7b18c7e5f41b09fe0fccbd34503dfbe534a50ed5d1411c27fecc5f0dca20c50
+EBUILD lowdown-1.3.0.ebuild 1305 BLAKE2B 366bb95f82c794f0ceb696f4d727d72b36d7346975228f48fb367574f56c3316a2d35b0958c815295a6e94d6eb5063ef48ec1c7a84b1a7ec613338244f96be7a SHA512 9c110a201bcb2bbd923b6160ee095b1fe1102d419643c2ed688bf65c7d14ec8ef49029ecd0bd030a1c1286beaa52818e377218d762121f0e0d4a003bdd3eeb49
 MISC metadata.xml 333 BLAKE2B cfa2021e507b7538cf73840fb9eb8e1f6c157f7090b1156e4bd1cd917547adeea76cc31d619d60b0d189c915ae4748437b8d9a9a96a532276d6deb1d0f2258d9 SHA512 fa991b0162a4eab9c81815b4a523d33a08e7a7716b5a443165f0cc05d906b7dc3d7da388d0e3d3202a7262a7971d771ffb29debf42659c8ed3c3de6ed184d73e
diff --git a/app-text/lowdown/files/lowdown-1.3.0-shared-linking.patch b/app-text/lowdown/files/lowdown-1.3.0-shared-linking.patch
new file mode 100644
index 000000000000..0a3c05be4458
--- /dev/null
+++ b/app-text/lowdown/files/lowdown-1.3.0-shared-linking.patch
@@ -0,0 +1,46 @@
+diff --git a/Makefile b/Makefile
+index 3adf379..a10dd82 100644
+--- a/Makefile
++++ b/Makefile
+@@ -151,11 +151,11 @@ installwww: www
+ 	$(INSTALL) -m 0444 lowdown.tar.gz $(WWWDIR)/snapshots
+ 	$(INSTALL) -m 0444 lowdown.tar.gz.sha512 $(WWWDIR)/snapshots
+ 
+-lowdown: liblowdown.a main.o
+-	$(CC) -o $@ main.o liblowdown.a $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD)
++lowdown: liblowdown.so main.o compats.o
++	$(CC) -o $@ main.o compats.o -L. -llowdown $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD)
+ 
+ lowdown-diff: lowdown
+-	ln -f lowdown lowdown-diff
++	ln -s lowdown lowdown-diff
+ 
+ liblowdown.a: $(OBJS) $(COMPAT_OBJS)
+ 	$(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
+@@ -173,7 +173,7 @@ uninstall:
+ 		rm -f $(MANDIR)/man$$section/$$name ; \
+ 	done
+ 
+-install: bins
++install: bins install_libs
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man1
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man5
+@@ -182,7 +182,7 @@ install: bins
+ 	$(INSTALL_DATA) share/html/* $(DESTDIR)$(SHAREDIR)/lowdown/html
+ 	$(INSTALL_DATA) share/odt/* $(DESTDIR)$(SHAREDIR)/lowdown/odt
+ 	$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
+-	$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
++	ln -s lowdown $(DESTDIR)$(BINDIR)/lowdown-diff
+ 	for f in $(MAN1S) $(MAN5S) ; do \
+ 		name=`basename $$f .html` ; \
+ 		section=$${name##*.} ; \
+@@ -225,7 +225,7 @@ install_static: liblowdown.a install_lib_common
+ 
+ uninstall_libs: uninstall_shared uninstall_static
+ 
+-install_libs: install_shared install_static
++install_libs: install_shared
+ 
+ distcheck: lowdown.tar.gz.sha512
+ 	mandoc -Tlint -Werror man/*.[135]
diff --git a/app-text/lowdown/lowdown-1.3.0.ebuild b/app-text/lowdown/lowdown-1.3.0.ebuild
new file mode 100644
index 000000000000..3857bd5c0a85
--- /dev/null
+++ b/app-text/lowdown/lowdown-1.3.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+MY_PV="VERSION_${PV//./_}"
+DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
+HOMEPAGE="https://kristaps.bsd.lv/lowdown/"
+SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="ISC"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	virtual/libcrypt:=
+"
+RDEPEND="
+	${DEPEND}
+"
+
+# configure tests for a bunch of BSD functions on Linux
+QA_CONFIG_IMPL_DECL_SKIP=(
+	crypt_newhash
+	crypt_checkpass
+	warnc
+	errc
+	getexecname
+	getprogname
+	memset_s
+	pledge
+	recallocarray
+	strlcat
+	strlcpy
+	strtonum
+	TAILQ_FOREACH_SAFE
+	unveil
+)
+
+PATCHES=(
+	"${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
+	"${FILESDIR}/lowdown-1.3.0-shared-linking.patch"
+)
+
+src_configure() {
+	append-flags -fPIC
+	tc-export CC AR
+
+	./configure \
+		PREFIX="/usr" \
+		MANDIR="/usr/share/man" \
+		LDFLAGS="${LDFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LIBDIR="/usr/$(get_libdir)" \
+		|| die "./configure failed"
+}
+
+src_compile() {
+	emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" emake regress
+}
diff --git a/app-text/sablotron/Manifest b/app-text/sablotron/Manifest
index 2c027ce980a9..54aa1fc0c3e7 100644
--- a/app-text/sablotron/Manifest
+++ b/app-text/sablotron/Manifest
@@ -2,6 +2,5 @@ AUX sablotron-1.0.3-cxx11.patch 524 BLAKE2B 4b8c5f68e662b2d65e4acb50e2cc3584d218
 AUX sablotron-1.0.3-drop-register-keyword.patch 431 BLAKE2B fa6549e313468f035d2d3c01d63c7cd36ca54e612fa6e880e6b129bb88a7489f6c48c399f8f0773688868542fdb00a11a08930c6c53e8ed4c182c162615c9d56 SHA512 7684a064dae059d94260b6370820e93943b273eee78071b7cdc2ca111708c1bd44de4a48faf8e239c10563133770fb8044ae22a60a3237ef364581ab17a59566
 AUX sablotron-1.0.3-libsablot-expat.patch 193 BLAKE2B 4fc1aa2401257e1f50a09d91e5b65a0de819515fd24d8abc4f6b271d6eaae21113413b81a125041c71f4ededc39f8710514ff1bdcc00c164bab9c39dcc62f2b5 SHA512 4a63627d1888a102b645a69860a6ebc834c34d08d9779626942bf7384c852a25fb96d7b369375ae195a6a0d5e7d4f5e9e4ea83fa4f23649aab13ba958b021fb9
 DIST Sablot-1.0.3.tar.gz 607597 BLAKE2B 429df09361d233b290e1179d5a3fbe7b421b834c23ff32d72466f007fd4ce19e810d68483b1b0314e943f2ff0f3713a3f28a357a71c69722883f5c85499cb582 SHA512 836c1a9d09317194333619461b0e5ea312277cadb6df5ae5ed327bdfee4090970bd3056ec0b3bd6aa8a3e3289af1bc5c1461c9fe15b53a944f1042190c485031
-EBUILD sablotron-1.0.3-r2.ebuild 1158 BLAKE2B b6bd67aec2b1af63e048308e567a2d3c268c0e6053a4cf981c4b34bd67768cf6b590262393a1f1507a108aaefcc55fcbd410956e6c568375d382fada0faea5a1 SHA512 130d60cd690f65118d0f9565174dec6354fa5a71aad183c8ae2b7b0994a858aa7cc2deb2b1feac3ecdf4b394e827ec3d61c7bd88ead4e29d5dfce52ed94454e8
 EBUILD sablotron-1.0.3-r3.ebuild 1206 BLAKE2B 24dda9a626aa8f0aef2087ebf8db70b2dca241d278bc100e6a53e78f6f3524ea0258a419863322ae3bc403ec004cc2455daaf03b337a5bee3deedba30174bfe3 SHA512 92ee7dbb6ae27fcc229dfbf381f68ea0808e0ca2c8940de3e200642a443ef3a5785ee2df4e74f7f854f6d528ca9391d9f50cb5f389ceae2408994e6a2559125d
 MISC metadata.xml 247 BLAKE2B 03888b860f85ea6690f71e27d2d6d87f3dec604b35ac2b14b23c5bb4b926901b22876470032d6ae72d1e78f177c832dae3b54e895cf9dcbf9bb620026004ec76 SHA512 eb395f541767b9c949d9385cf5e95bff8f31889cd10dd002d4ec1f92690214153e4f23f5f8864a630515b008946d73d4c3b131b0ec58308795e69933bc6f6475
diff --git a/app-text/sablotron/sablotron-1.0.3-r2.ebuild b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
deleted file mode 100644
index 979b01202d6c..000000000000
--- a/app-text/sablotron/sablotron-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_PN="Sablot"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An XSLT Parser in C++"
-HOMEPAGE="https://sourceforge.net/projects/sablotron/"
-SRC_URI="https://downloads.sourceforge.net/sablotron/${MY_P}.tar.gz"
-
-# Sablotron can optionally be built under GPL, using MPL for now
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="perl"
-
-RDEPEND="
-	>=dev-libs/expat-1.95.6-r1
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	>=dev-perl/XML-Parser-2.3
-"
-DOCS=(
-	README README_JS RELEASE src/TODO
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.3-libsablot-expat.patch
-	"${FILESDIR}"/${PN}-1.0.3-cxx11.patch
-)
-
-src_prepare() {
-	default
-	sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable perl perlconnect) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}