gentoo resync : 20.03.2022

6 files changed, 103 insertions, 6 deletions

diff --git a/app-text/lowdown/Manifest b/app-text/lowdown/Manifest
index a3af625d46f3..2c5821b5f297 100644
--- a/app-text/lowdown/Manifest
+++ b/app-text/lowdown/Manifest
@@ -1,9 +1,13 @@
 AUX lowdown-0.10.0-dont-install-static-lib.patch 467 BLAKE2B dcf6e7e61025248ad62af0534a9a04d8f113889ab8a909f746e26928733c243c49bafff41eeac0fb618bd49ceb980998b41c54b7ac62790868419e3e384a1d21 SHA512 9d4ba6ed91376b9013c6104d1157721efcda390471d9b89716573a74f73167d469ba23769197f7c8ea8f534c34920f1329313660579722f85f53291153b22cd2
-AUX lowdown-0.10.0-linking.patch 1628 BLAKE2B 7a390371b9969722c1651f1c79a8d07fddc42a1466b0f85dffc395b59a0f5dab2e92e3d9ca562b804e7ca5fef32b9f65a84cb458aa3fa465ff37a09185de5d5f SHA512 b38f6c9d96be0097a59dd99ad04b5da53267af243aa8e2f42ec61b6a777725fd0d6477890d2290ab875f0a5fc035c5aff7d38330bc3e910218e2f0e1299fa8b4
+AUX lowdown-0.10.0-linking.patch 1569 BLAKE2B f69db3407a8175fcb7f267a9b7328c7830cc01589d71405e528f8cf96270c2b17bc607de21ecf88afd2b9589fd71e60fa3f19c82f35bc3cc65273cb7e49f330d SHA512 a50e9a6e1461bcf315c6ac05d6a1896b21d35e4ee25e26f925fb21dfd347a74d95ee45ba2a0373557a8245e2c608b34018f041d3fb70aa49927568408da524ca
+AUX lowdown-0.10.0-pkgconfig-libmd.patch 309 BLAKE2B 617d3af07f0414fce674573e48f86f541f3b6c6c6b1649d7ba4302b0817fa8a8edf0beb1d0628c7deb79eb64934089b8ae9ff8f50171f3e94cd93427464a9c59 SHA512 f40f0a04deb70708b3059ccce394cbb78b8ba6020db4df62533abe1d3d125e1372947a5c249b9aa9a655b9b67f3f448a8963fe53fbd7d13c87b637143b36e9b0
 AUX lowdown-0.10.0-shared-library.patch 1847 BLAKE2B 42d32a96aed20ac8419805c4d5e3f3ae5bde9801121452fdad68d085c618c22064770ebe6b021d25f104557c149a1f1e279873987400161b5a57e9313023a36a SHA512 dafec418078bdc9ca047fb69e299a5508d2be12f7ce37cd34322ef7d415031cb8db7b8f688f1f5d100398672eccc7cecd0de290fd748252655a8813f9ae2991d
+AUX lowdown-0.11.1-linking.patch 1330 BLAKE2B adffc64357e84d9f6ef82b4c85e0c7302995304859c20c5dc1c6ab3f4c32c0aca4d4c5739f43515386f00f59e4ab58a2c9d3e9ffde15a338bdcc210de5ab9ad5 SHA512 47c44d73eeac0a7b607c16afe8a24e9ee9a75672e90119cc63d577bd39db69d1dce8985a90535504f33eb1ea39728a175bcedd718730cf47fb822a0a0169aea3
 AUX lowdown-0.8.4-configure.patch 770 BLAKE2B c91c27b9d7a33435515214ab8701ee0c5c2ea79b074e4ba8f96d57d0ced14ca77a918258cdbcb60b6ad9522e14f298b707b69aa70aae3e89b9b061c91905da72 SHA512 b768fade94fc2369e75d4c59b13cc2a053c3edf8502e246abd0a90123a9483f2160ab470c2c162cdf439dfacf4fd184751a069d6b008775f6ffa8bf4eba85463
 DIST lowdown-0.10.0.tar.gz 547397 BLAKE2B 93d87e3aca2466398a625750b928062fbafd26311899e52ddd8264218675e78d30714c920f3331619fcd510a92cc6046401c946f5bd1465d6fd46f26937318ac SHA512 7454e618607628ec0a1649f44f5ec64f8778ecaa151f6aad4984935e297abfe8e84ffc321d3c93cec5d336ff14b6bf9a0ff9054e7363cc58ba708a5b60db9048
+DIST lowdown-0.11.1.tar.gz 571320 BLAKE2B 28fe8cb4f164618be602770c602f3ce51c0f0e765fb9869b82cb29c50bdbe0fd92c09c10074d8968108eca59096d7e176531eb56cb2b40f1d9c00a3f944e3b8c SHA512 5a8ca9d731171b97daed7a9095bc4206d2bed9095fa267eb9270782770247743f1a096c5235fd301320418c37a478fbc71552ade105eba0e756ff687835d4efb
 DIST lowdown-0.8.4.tar.gz 520735 BLAKE2B dc66b92f285b186ca83b9fad1cccfef9b395233ef56756e9ea9071b5502cd81dc6ce2d67d7ef265dab8953010af0907cd76125cd4442cfbfc2bcf8c63e097809 SHA512 cd46ead69ed038bf3ccf848b784327d66c78dd8adbc9ae4bfee660b9b1e52844ac8c7ad0377f8f38a3fee0d2e523f979a22d6b547c7964304accef0951cfca34
-EBUILD lowdown-0.10.0.ebuild 1038 BLAKE2B 7afcb03620a4472430ee5e66e470da9416bd88d1978f725bb8016f7d7fc5fdb952ce5d44d3aab79d83b90476613fd9d5fdbe873ce7bf7d791356240d3e68d2e3 SHA512 8ee31b181cc2e0e6cc42c4796e48c58ef796a763fdd2dd25fb5f1763253ebde9f677e5a8ad5c4a4718f9139eeab7f6d8d1776f74d0fd307c553df2424d19cf48
+EBUILD lowdown-0.10.0-r1.ebuild 1090 BLAKE2B 86a81147c8526d853cbe6a685ba7dba5457c0c806703f56f08926e2f11818ca3d741b530d12ac5cbf3016ccc77767bca42edc2abc8d16ec366eb1738d5679172 SHA512 14362d2ad669c06bfccf72b11cf1731d7dfe38a3467a3df7d20a8554b8c78c048f57b473027000a5510128d1307973683f400336ad94bd232398c60959c104b4
+EBUILD lowdown-0.11.1-r1.ebuild 979 BLAKE2B 203bb3e6a99fd8e256c02464a3b015925e0c5a8e1293bd1c16ddad4a463ab1f11718771ba2d722d316bcb17dfa3a8ccdcc04a82aa6e86afa782e66d01deabaf5 SHA512 c7271fea2e918847f42cd24b47d95589e4d37900d433d5d56b178317cfb06647a4674f23802ba3b26ebda67730d4266d659f3359263e3bb93d6faeb6d6bcb697
 EBUILD lowdown-0.8.4-r1.ebuild 793 BLAKE2B bd37690ad0713dd2d74fba662ac26f6cde745eb3ae57b19a44bdf8b9b62f559f3217b16e97848657f9b962627abb58bc42a1ef2c442a6455bea67419e62d8655 SHA512 8dc701ba341787364ae600391f2945d3f4d1fb5a47fdbcfffa4eada6f5a10aedd9b3403876b9f78afec654790822bae3a3cb0976629161b9804b9a0f34248d4d
 MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/app-text/lowdown/files/lowdown-0.10.0-linking.patch b/app-text/lowdown/files/lowdown-0.10.0-linking.patch
index e0ab7285e07a..1581e94b7c9d 100644
--- a/app-text/lowdown/files/lowdown-0.10.0-linking.patch
+++ b/app-text/lowdown/files/lowdown-0.10.0-linking.patch
@@ -23,16 +23,15 @@ index d013a1c..c9de4d4 100644
  
  install: all
  	mkdir -p $(DESTDIR)$(BINDIR)
-@@ -153,7 +154,7 @@ install: all
- 	$(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig
+@@ -153,6 +154,7 @@ install: all
  	$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
  	$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
--	$(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
 +	$(INSTALL_LIB) liblowdown.so.1 $(DESTDIR)$(LIBDIR)
  	$(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
  	for f in $(MANS) ; do \
  		name=`basename $$f .html` ; \
-@@ -271,7 +272,7 @@ main.o: lowdown.h
+@@ -271,7 +273,7 @@ main.o: lowdown.h
  
  clean:
  	rm -f $(OBJS) $(COMPAT_OBJS) main.o
diff --git a/app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch b/app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch
new file mode 100644
index 000000000000..0337f3d68d99
--- /dev/null
+++ b/app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch
@@ -0,0 +1,11 @@
+diff --git a/lowdown.in.pc b/lowdown.in.pc
+index 078d0c0..a31aaac 100644
+--- a/lowdown.in.pc
++++ b/lowdown.in.pc
+@@ -9,5 +9,5 @@ URL: https://kristaps.bsd.lv/lowdown
+ Version: @VERSION@
+ Requires:
+ Libs.private: 
+-Libs: -L${libdir} -llowdown -lm
++Libs: -L${libdir} -llowdown -lm -lmd
+ Cflags: -I${includedir}
diff --git a/app-text/lowdown/files/lowdown-0.11.1-linking.patch b/app-text/lowdown/files/lowdown-0.11.1-linking.patch
new file mode 100644
index 000000000000..2aa5cb1fe58e
--- /dev/null
+++ b/app-text/lowdown/files/lowdown-0.11.1-linking.patch
@@ -0,0 +1,37 @@
+diff --git a/Makefile b/Makefile
+index ccc163d..d148da6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -173,8 +173,8 @@ 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
++lowdown: liblowdown.so main.o
++	$(CC) -o $@ main.o $(LDADD_MD5) -lm -L. -llowdown $(LDFLAGS)
+ 
+ lowdown-diff: lowdown
+ 	ln -f lowdown lowdown-diff
+@@ -183,10 +183,10 @@ liblowdown.a: $(OBJS) $(COMPAT_OBJS)
+ 	$(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
+ 
+ liblowdown.so: $(OBJS) $(COMPAT_OBJS)
+-	$(CC) -shared -o $@.$(LIBVER) $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -Wl,-soname,$@.$(LIBVER)
++	$(CC) -shared -o $@.$(LIBVER) $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -lm  -Wl,-soname,$@.$(LIBVER)
+ 	ln -sf $@.$(LIBVER) $@
+ 
+-install: bins
++install: bins install_libs
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man1
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man5
+@@ -218,7 +218,7 @@ install_shared: liblowdown.so install_lib_common
+ install_static: liblowdown.a install_lib_common
+ 	$(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
+ 
+-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-0.10.0.ebuild b/app-text/lowdown/lowdown-0.10.0-r1.ebuild
index a38987c1e1aa..c0a7c32c57ec 100644
--- a/app-text/lowdown/lowdown-0.10.0.ebuild
+++ b/app-text/lowdown/lowdown-0.10.0-r1.ebuild
@@ -22,6 +22,7 @@ PATCHES=(
 	"${FILESDIR}/lowdown-0.10.0-shared-library.patch"
 	"${FILESDIR}/lowdown-0.10.0-dont-install-static-lib.patch"
 	"${FILESDIR}/lowdown-0.10.0-linking.patch"
+	"${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
 )
 
 src_configure() {
diff --git a/app-text/lowdown/lowdown-0.11.1-r1.ebuild b/app-text/lowdown/lowdown-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..203b145ffc66
--- /dev/null
+++ b/app-text/lowdown/lowdown-0.11.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2022 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"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/libcrypt:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
+	"${FILESDIR}/lowdown-0.11.1-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() {
+	emake regress
+}