gentoo resync : 05.03.2021

3 files changed, 23 insertions, 8 deletions

diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
index 5974427a0098..8b2a75e0afd4 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -9,10 +9,11 @@ AUX vilistextum-2.8.0-prefix.patch 784 BLAKE2B 4aeab8e91012cc1302aa7a94337069973
 AUX vilistextum-2.8.0-towlower.patch 274 BLAKE2B b6c043049bf6d928ecb147465aeff6ac959c3320b76ff92c6ebfffb9dda0d8719fe1c1d5dded60e00e6a10a3fab9f177ccbfc053c9daee81b7a95d6ba29044e1 SHA512 3283ebd7694be279f9956df31f6b1e62de3f674f3af0a6d4d5cc139f2cc04c3be322d103faaf1bf0f9845dbcc2f9a12e89d49178df48c90020267fec73f2ecd5
 AUX vilistextum-2.8.0.20200411-blockquote.patch 4500 BLAKE2B 1f1c996181771b20b9570d4f7cc322f773590943470d10021820a84acd9fbfb48e496506b42df2ec2b2c05a214953ab854d70b777289639de9f26346e4b815c8 SHA512 5d280336f9bc3363d35d5136fe6a5cbcdb08cc90ff8826063ce9f594fc241b4f7db94852aba6cf278a34872a9abf55693f04ac01b0f191045792114473857dd8
 AUX vilistextum-2.8.0.20200411-list-alignment.patch 855 BLAKE2B e23391c5e3e33d05fa17403dacf027e066e5fb75cd62a2707ddf10edd45c16c71ed591a99f3d99939258718591e747bce38cfaa1ca8303cb63401828afc52bb4 SHA512 b5674a76b8ca6f63b2dd30f273219767fe3863ee16eb0d63a0c675334ca9f2b99d059c3276f31473efb1576bc0ed8a6546f37d278130902ddd4c1efa0e1e4549
+AUX vilistextum-2.8.0.20200411-static.patch 429 BLAKE2B e5a86f226bd0f272a21ccb1b787d2579ca3ebabfac5e3c35420c9f4db2e3426d87ab554e52a14f3352cbc62fa2d7a97c57eaf726283e1024018aa896d547d808 SHA512 b15a4d067faaaeedde484c1e944f73cb14bf205bb33436e46b3348d278ba3ba199a023ae8f95c2aca5a9fb5752ef3dbdd993108d31ea7268d5c88ece8c2749e8
 DIST vilistextum-2.6.9.tar.bz2 147743 BLAKE2B 1cf6f187cb277271ddd9946984afb4d59336ea0cd446e62df3593070ccc63b3510a107e2b7e7b8dc757c63e4f5caf3790c7d998b6be325f4d22d2a6b9fea3432 SHA512 ce76a4061b766e4544d1a86986333314a3b6959439ba6995a2977c10b01b0142c524d4b215c3272a1dcfcc4f5b6fda03210de95d65cedecfc6a1c940cedf487d
 DIST vilistextum-2.8.0.20191023.tar.gz 219395 BLAKE2B 5e3962b4b18b9e6e3896f26e04a63394b3ed58473862f264a3255641b5d13474e12529acadcff3d2f71eb5a41ec7b11a1367f3da15e473551e87e554472f6727 SHA512 99023b4801159047e1433dc5a887e6164192f7aa25bdc79594e717f047f83177612e5120d55cbbc22f3ad4e225bc229a0b186f7fc337c6081ff27ac781422f4e
 DIST vilistextum-2.8.0.20200411.tar.gz 219791 BLAKE2B 95b86d17e8dbf29b520aa48c88eb8c9e8abb01a234848ed55bdad0a63a7c0ec8ca9ae7c437fe7f84bbf7f4dad74fc8437a9e3b53493552e9e01b8029b10ef18a SHA512 40a219ebe7bebd61548a3bad794690cf091b67b70e8e6c44548a0c1b9f61077b141a035335e7128b191a8501103707f5324b00326a407e29ec0fee383c4d0917
 EBUILD vilistextum-2.6.9-r1.ebuild 1795 BLAKE2B 3a9b4d9462338f2524f649aedb4945012c093f7275f3a9ee1f5852f049318ac06634c74362f6eddae65cca4e339aff8d87801b18628785f3c72b6eba794b983c SHA512 ce2733938218ede9fc6577567887cc9d6d6668ee04a1c077ad125ddc4f3db263cf96d863ff9402a3200370d10552bbf5a21433aa72746c034fda5e337c545697
 EBUILD vilistextum-2.8.0.20191023-r1.ebuild 2042 BLAKE2B 43f180fa1d9526d2b86d33512195ca3601808bd82cbbf9ec4f6bcf19c1b00edd30cf05a148070fdbe455dd851da0ebe84b27b6715e0f702518eed32364803bf9 SHA512 b68a906d38a98ea2a69d1d1eead9588f181a118c83ea84a6ae05d768b54d29718af2b8549e6ed98b45064b1e0ea6b45bf8b7258d61e6baf7a5314b4523b2fa56
-EBUILD vilistextum-2.8.0.20200411.ebuild 2013 BLAKE2B a922c1aa97ec3d0a1f87a07ba78e58b0d7db1c9833c56a45a77db53ad40f3876519a0d7d4d3e3bc0cf68ba01bec87cf262a2bacdfde45108d1d2f2dc042c2c9a SHA512 36429d685f784440d7b1a1cbcc260c3ea1e774a27d0b5f9d44051daa639e04e01d8ae5e7c300f5d684db350f38daa77feb5c2b4aa0c5e662f713be6610930fb5
+EBUILD vilistextum-2.8.0.20200411.ebuild 2015 BLAKE2B 19050a34ede2add243ef731ad4b37f4aa127e60133d407e26578020b83ef5ffca408e5e5ca1466555624d6f69367ebb4191c779626cd1b8655ee431908827e13 SHA512 8f8e333f9a7c57a6728bd5d46223f16969bbcd0d554bed2e985a73e2398088438b3d2ae907de6c68fb15ffe4009832924dc62d9e5251ece3498122ff440d9797
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0.20200411-static.patch b/app-text/vilistextum/files/vilistextum-2.8.0.20200411-static.patch
new file mode 100644
index 000000000000..4f96862216b2
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0.20200411-static.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/752051
+--- a/src/html.c
++++ b/src/html.c
+@@ -47,7 +47,7 @@ CHAR attr_name[DEF_STR_LEN], /* Attribut name of a HTML-Tag */
+ /* ------------------------------------------------ */
+ #if defined(MULTIBYTE) && !defined(HAVE_WCSCASECMP)
+ #include <wchar.h>
+-static int wcscasecmp(const wchar_t *s1, const wchar_t *s2)
++extern int wcscasecmp(const wchar_t *s1, const wchar_t *s2)
+ {
+ 	size_t i;
+ 	wint_t c1, c2;
diff --git a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
index 53e0a57b8f02..fafcf1807767 100644
--- a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
+++ b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
@@ -17,15 +17,17 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 IUSE="unicode"
 
 DEPEND="virtual/libiconv"
-RDEPEND=""
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.8.0-prefix.patch"
-	eapply "${FILESDIR}/${PN}-2.8.0.20200411-blockquote.patch"
-	eapply "${FILESDIR}/${PN}-2.8.0-towlower.patch"
-	eapply "${FILESDIR}/${PN}-2.8.0.20200411-list-alignment.patch"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8.0-prefix.patch
+	"${FILESDIR}"/${PN}-2.8.0.20200411-blockquote.patch
+	"${FILESDIR}"/${PN}-2.8.0-towlower.patch
+	"${FILESDIR}"/${PN}-2.8.0.20200411-list-alignment.patch
+	"${FILESDIR}"/${P}-static.patch
+)
 
-	eapply_user
+src_prepare() {
+	default
 	eautoreconf
 
 	# wcscasecmp needs extensions, which aren't enabled