gentoo resync : 28.04.2021

7 files changed, 4 insertions, 264 deletions

diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
index f0aec7561ede..b94ef19a73c4 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -2,18 +2,13 @@ AUX vilistextum-2.6.9-blockquote.patch 4541 BLAKE2B 231ea3348a4519c5f24160bd1755
 AUX vilistextum-2.6.9-darwin11.patch 615 BLAKE2B 0bfefb47961cf1752c8251a484d04b20c55196d2c64c2e98bc50caf6842b02960257ff22d7d6f7b04c4a7e97e5c66a6a2f122db24faaae4c7fe326833e57c7c6 SHA512 35aeec20cb7e6ba1668d97f041bbd5b98712589eaaf0ab70a59d3a7df74e0d2e67abbab3a27c7c5ee5f6fe9d61f11610686df3459f0cb401cca03f3f671309ac
 AUX vilistextum-2.6.9-gentoo.diff 763 BLAKE2B bb145aa629084c370281fdb2bd31e763d0c0106bb8aa5c7fc1ee030e837cc0062b9f46ad9d626b88a199c12e6163acc2ab28978eb5cb236c3a212b341a7ad9b9 SHA512 b4c49ff27598cedeb06058d3237ea8ebc59a4df9031818f98b5fb22225733d94b820b892541dbddc38c28c08a62ff6f52ef8278c016522b1db95352653178b21
 AUX vilistextum-2.6.9-prefix.patch 837 BLAKE2B 65aec718915942919f371453af12cbfa74437f999d7c25a49186ed5c02e975c4c10ebf629bc54a8a6fb69b9acc9723a32d4d82b0ee09c039afdc5f0fa8d9370c SHA512 6f913d283542bfea02d062f872dc2471e7ea2bc4c29ddb8893aecb9abeb36e6cc821c393217a92421e6888f7c25aa072bfc16c56a69a40593ed504245d8cd187
-AUX vilistextum-2.8.0-blockquote.patch 4479 BLAKE2B 45b63c30064bceb80cd37fa6fc8cf86685ee2017ed53a40ac76508e830b85c5b14d449ef0b5088245fbe87f056a28b83fba95f3795f5b8a05c35d2221696ff14 SHA512 88d5c696f4e20825e032258c85a154c65b9404bb2fc31854f88d8a6b2939cddaf6e6c99b9fa74bffb19a4fb4a75d200afd15a362fbcbcdcee075754866c9fa06
-AUX vilistextum-2.8.0-gentoo.patch 278 BLAKE2B 6fc580c02c38bd65855ff5866555360c6f0d13e1d558f19298418556b5b4124aad280bf0a46505db242ec25f869e8abfbd47dcd6eb030641eadb30878887c6d6 SHA512 3a1d701067ea291756e29d0a23dc6c21ae83a80239d2cfbf576513a667e0ef1222746aff7d1d1ec7bf0af0ceaa48ad44ea37b7b56b499eb214b103d682880d1f
-AUX vilistextum-2.8.0-list-alignment.patch 827 BLAKE2B cbe9415e3d807c247531c3b81537aa76fd3b25d9930a41cd4506434246cab2b820803fdb9f4ef9ed0ffdaae23e52b186c1f39b74ba80dc0a230bc7db90962180 SHA512 29b3657d999106cd4fb4b4d539c8a977271d4f526551dddc7f5370363c8c3914a277f54950a06657994d9c7574d5f659f9ff248d1ebd560a3783f9a0c28df2a6
 AUX vilistextum-2.8.0-prefix.patch 784 BLAKE2B 4aeab8e91012cc1302aa7a94337069973c9cea8b179658f30346f3d95bb9d0a351e1430666d6465888432fb74e3454d2eaadedbd8af64e2b57cfe00e9633c65e SHA512 95a92905c68e357c40f64696cf20c9639bed5da3c651c75df803eef4c991bb56424893a40a2a9ca80a9e66a16e1e986d0589dd43d751130146697348c5b0205f
 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 2070 BLAKE2B d379fafb8e698a88aaa526d05ced264f3e0299c37e7255c96c951da3dd0e45fcadffb07b4503f2944dfcb5c0e0aba051bb2283a3c64b8371d224b815e68434b2 SHA512 097d99abbd9d5344143d5177d4bbb4ae0d19f51f29ab4fd08344d986fcca09506769c975a6a3babc9a50fb1455d8c1f65eb3065ae2baaacc49aadc4f6f6b168b
+EBUILD vilistextum-2.6.9-r1.ebuild 1795 BLAKE2B 49f0673b3c30271e2686da6598c94455d57df7dad4dceed7e039c459d30d3cacf6407234d8d459f13f992be9990e660f00198d2017e829ae4252e58a476e6dcd SHA512 9a58610ef3a53b1179d57c837b9fef01c2a6dd1a0f520582846dd88bbb3124a4935f55e048c2f320aee0042c2acbf987fb0b1bb6b2d6d5a2b201703a9acbc7a4
+EBUILD vilistextum-2.8.0.20200411.ebuild 2057 BLAKE2B 82a354948640b4c655941f3f897100c1175c81c266ec81b888fe52c386b84627d637189ecaf6176f9db3f57054bd0a2a2343ecc63f9b1f632402539658c4456b SHA512 0eb8b8128357d314d89c5a708e6fef7f45f9e845d944b03ac1bf2f6273b1243a838575fc10af9f0fdc2d5d8e5db9027d1a0caefed686bc51df21ea04969fb267
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch b/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch
deleted file mode 100644
index 74d44309669b..000000000000
--- a/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-Many clients seem to use blockquote tags to flag quotes these days, so
-write them out as quotes, so they remain readable.
-
---- a/src/html_tags.c	2019-10-23 16:25:27.000000000 +0200
-+++ b/src/html_tags.c	2020-02-05 20:11:57.308596941 +0100
-@@ -261,6 +261,7 @@
- 		line_break();
- 	} else {
- 		start_p();
-+		quote++;
- 	}
- } /* html_pre */
- 
-@@ -271,6 +272,7 @@
- 		line_break();
- 	} else {
- 		paragraphen_ende();
-+		quote -= quote != 0;
- 	}
- } /* html_pre_end */
- 
---- a/src/multibyte.h	2020-02-05 20:08:43.863715764 +0100
-+++ b/src/multibyte.h	2020-02-05 20:12:34.401382354 +0100
-@@ -18,6 +18,7 @@
-  #define ATOI(n) wcstoi(n)
- 
-  #define ONESPACE L" "
-+ #define QUOTE L">"
-  #define WORT_PLUS_STRING(str) wort_plus_string(L##str)
- 
-  #define STRSTR(haystack, needle) wcsstr(haystack, L##needle)
-@@ -43,6 +44,7 @@
-  #define ATOI(n) atoi(n)
- 
-  #define ONESPACE " "
-+ #define QUOTE ">"
-  #define WORT_PLUS_STRING(str) wort_plus_string(str)
- 
-  #define STRSTR(haystack, needle) strstr(haystack, needle)
---- a/src/text.c	2019-10-23 16:25:27.000000000 +0200
-+++ b/src/text.c	2020-02-05 20:16:04.852164539 +0100
-@@ -28,6 +28,7 @@
- int breite=76,
- 	hr_breite=76,
- 	paragraph=0,
-+	quote=0,
- 
- 	tab=4,         /* tabulator */
- 	spaces=0,      /* spaces at beginning of line */
-@@ -378,6 +379,12 @@
- 			printf(" z0: zeilen_pos: %d\n",zeilen_pos);
- #endif
- 			print_zeile();
-+			if (quote > 0)
-+			{
-+				i=0;
-+				while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
-+				zeile_plus_wort(ONESPACE,1,1);
-+			}
- 			i=0;
- 			while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
- 			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
-@@ -398,6 +405,12 @@
- 			printf(" z2: zeilen_len: %d\n",zeilen_len);
- 			printf(" z2: zeilen_pos: %d\n",zeilen_pos);
- #endif
-+			if (quote > 0)
-+			{
-+				i=0;
-+				while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
-+				zeile_plus_wort(ONESPACE,1,1);
-+			}
- 			i=0;
- 			while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
- 			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
---- a/src/text.h	2019-10-23 16:25:27.000000000 +0200
-+++ b/src/text.h	2020-02-05 20:18:40.792261818 +0100
-@@ -26,6 +26,7 @@
- 
- int tab;
- int spaces;
-+int quote;
- 
- void print_zeile();
- int is_zeile_empty();
---- a/tests/test_functions
-+++ b/tests/test_functions
-@@ -12,6 +12,9 @@
-   rm -f testcases/$prefix.output.test
-   ../src/vilistextum 2>/dev/null $args testcases/$prefix.html testcases/$output_prefix.output.test
- 
-+  # remove (block)quotes
-+  sed -i -e 's/^>\+ //' testcases/$output_prefix.output.test
-+
-   diff >/dev/null testcases/$output_prefix.output testcases/$output_prefix.output.test
-   retval=$?
-   if [ $retval -ne 0 ]; then
---- a/tests/testcases/utf-8-sampler.output
-+++ b/tests/testcases/utf-8-sampler.output.test
-@@ -100,8 +100,8 @@
- ვეპხის ტყაოსანი შოთა რუსთაველი
- 
- ღმერთსი შემვედრე, ნუთუ კვლა დამხსნას სოფლისა შრომასა, ცეცხლს, წყალსა და
--მიწასა, ჰაერთა თანა მრომასა; მომცნეს ფრთენი და აღვფრინდე, მივჰხვდე მას ჩემსა
--ნდომასა, დღისით და ღამით ვჰხედვიდე მზისა ელვათა კრთომაასა.
-+მიწასა, ჰაერთა თანა მრომასა; მომცნეს ფრთენი და აღვფრინდე, მივჰხვდე მას
-+ჩემსა ნდომასა, დღისით და ღამით ვჰხედვიდე მზისა ელვათა კრთომაასა.
- 
- Tamil poetry of Cupiramaniya Paarathiyar: சுப்ரமணிய பாரதியார் (1882-1921)
- 
-@@ -446,7 +446,8 @@
- д, п, and/or т:
- 
-  Bulgarian:    [ бгдпт ]    [ бгдпт ]     Мога да ям стъкло и не ме боли.
-- Russian:  [ бгдпт ]    [ бгдпт ]    Я могу есть стекло, это мне не вредит.
-+ Russian:  [ бгдпт ]    [ бгдпт ]    Я могу есть стекло, это мне не
-+вредит.
-  Serbian:  [ бгдпт ]    [ бгдпт ]     Могу јести стакло а да ми не шкоди.
- 
-   ------------------------------------------------------------------------
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch b/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch
deleted file mode 100644
index a26ae7178184..000000000000
--- a/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -6,7 +6,7 @@
- 											main.c main.h util.c util.h \
- 											multibyte.h unicode_entities.c unicode_entities.h
- 
--AM_CFLAGS = -Wall -O2 -ansi
-+AM_CFLAGS = -Wall -ansi
- AM_LDFLAGS = $(STATIC)
- 
- EXTRA_DIST = kilistextum.kaptn
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-list-alignment.patch b/app-text/vilistextum/files/vilistextum-2.8.0-list-alignment.patch
deleted file mode 100644
index c308cfe1615f..000000000000
--- a/app-text/vilistextum/files/vilistextum-2.8.0-list-alignment.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/src/lists.c
-+++ b/src/lists.c
-@@ -74,6 +74,7 @@
- 	}
- 
- 	spaces += tab;
-+	orderedlist++;
- #ifdef proc_debug
- 	printf("start_uls() ende\n");
- #endif
-@@ -82,6 +83,7 @@
- void end_uls()
- {
- 	spaces -= tab;
-+	orderedlist--;
- 	line_break();
- 
- 	if (bullet_style=='%') { bullet_style='$'; }
---- a/src/text.c
-+++ b/src/text.c
-@@ -387,7 +387,11 @@
- 			}
- 			i=0;
- 			while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
--			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
-+			if (orderedlist>0)
-+			{
-+				i=(spaces%tab) + 1;
-+				while (i>0) { zeile_plus_wort(ONESPACE,1,1); i--; }
-+			}
- 			zeile_plus_wort(wort, wort_len, wort_pos);
- 		}
- 		else if (zeilen_len != 0)
---- a/src/text.h
-+++ b/src/text.h
-@@ -27,6 +27,7 @@
- int tab;
- int spaces;
- int quote;
-+int orderedlist;
- 
- void print_zeile();
- int is_zeile_empty();
diff --git a/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild b/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild
index 37ed62c44954..378b7e597fb2 100644
--- a/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild
+++ b/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils autotools
+inherit epatch autotools
 
 DESCRIPTION="HTML to ASCII converter programmed to handle incorrect html"
 HOMEPAGE="https://bhaak.net/vilistextum/"
diff --git a/app-text/vilistextum/vilistextum-2.8.0.20191023-r1.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20191023-r1.ebuild
deleted file mode 100644
index d36c583c8dda..000000000000
--- a/app-text/vilistextum/vilistextum-2.8.0.20191023-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-GITID="f299bb5e5f661c345c4b85a3e8de9ad8615ad17a"
-DESCRIPTION="HTML to ASCII converter programmed to handle incorrect html"
-HOMEPAGE="https://bhaak.net/vilistextum/"
-SRC_URI="https://github.com/bhaak/vilistextum/archive/${GITID}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${GITID}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="unicode"
-
-DEPEND="virtual/libiconv"
-RDEPEND=""
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.8.0-gentoo.patch"
-	eapply "${FILESDIR}/${PN}-2.8.0-prefix.patch"
-	eapply "${FILESDIR}/${PN}-2.8.0-blockquote.patch"
-	eapply "${FILESDIR}/${PN}-2.8.0-towlower.patch"
-	eapply "${FILESDIR}/${PN}-2.8.0-list-alignment.patch"
-
-	eapply_user
-	eautoreconf
-
-	# wcscasecmp needs extensions, which aren't enabled
-	export ac_cv_func_wcscasecmp=no
-}
-
-get_locale() {
-	locale -a | grep -i "$1\.utf.*8\$"
-}
-
-find_locale() {
-	local l t
-
-	# we basically prefer to find en_US.UTF-8, but it may not always be
-	# available, in which case it is better not to hardcode to use it
-	l=$(get_locale en_US)
-	if [[ -z ${l} ]] ; then
-		for t in "en_GB" "en_.*" ".*" ; do
-			l=$(get_locale ${t})
-			if [[ -n ${l} ]] ; then
-				l=${l%%$'\n'*}
-				break;
-			fi
-		done
-	fi
-	[[ -z ${l} ]] && die "Failed to find a unicode locale"
-	echo "${l}"
-}
-
-src_configure() {
-	# need hardwired locale simply because locale -a | grep -i utf-8 | head -n1
-	# isn't always returning the most sensical (and working) locale
-	econf \
-		$(use_enable unicode multibyte) \
-		$(use_with unicode unicode-locale $(find_locale))
-}
-
-src_test() {
-	if $(locale -a | grep -iq "en_US\.utf.*8"); then
-		emake -j1 check
-	else
-		ewarn "If you like to run the test,"
-		ewarn "please make sure en_US.UTF-8 is installed."
-		die "en_US.UTF-8 locale is missing"
-	fi
-}
-
-src_install() {
-	default
-	doman doc/${PN}.1
-	dodoc doc/changes.xhtml doc/htmlmail.xhtml
-}
diff --git a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
index 6a712147389b..f388ee3dd47b 100644
--- a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
+++ b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic
+inherit autotools
 
 GITID="06cc8a637efd9097af4f138b1b7c755120ffaa88"
 DESCRIPTION="HTML to ASCII converter programmed to handle incorrect html"