gentoo resync : 10.02.2020

6 files changed, 256 insertions, 0 deletions

diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
index d2b23abdc0e0..423ea078613c 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -2,6 +2,12 @@ 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-prefix.patch 784 BLAKE2B 4aeab8e91012cc1302aa7a94337069973c9cea8b179658f30346f3d95bb9d0a351e1430666d6465888432fb74e3454d2eaadedbd8af64e2b57cfe00e9633c65e SHA512 95a92905c68e357c40f64696cf20c9639bed5da3c651c75df803eef4c991bb56424893a40a2a9ca80a9e66a16e1e986d0589dd43d751130146697348c5b0205f
+AUX vilistextum-2.8.0-towlower.patch 274 BLAKE2B b6c043049bf6d928ecb147465aeff6ac959c3320b76ff92c6ebfffb9dda0d8719fe1c1d5dded60e00e6a10a3fab9f177ccbfc053c9daee81b7a95d6ba29044e1 SHA512 3283ebd7694be279f9956df31f6b1e62de3f674f3af0a6d4d5cc139f2cc04c3be322d103faaf1bf0f9845dbcc2f9a12e89d49178df48c90020267fec73f2ecd5
 DIST vilistextum-2.6.9.tar.bz2 147743 BLAKE2B 1cf6f187cb277271ddd9946984afb4d59336ea0cd446e62df3593070ccc63b3510a107e2b7e7b8dc757c63e4f5caf3790c7d998b6be325f4d22d2a6b9fea3432 SHA512 ce76a4061b766e4544d1a86986333314a3b6959439ba6995a2977c10b01b0142c524d4b215c3272a1dcfcc4f5b6fda03210de95d65cedecfc6a1c940cedf487d
+DIST vilistextum-2.8.0.20191023.tar.gz 219266 BLAKE2B b94f3179f9181711fd6fe2a8240c7654917f7f93f161495b3380c840bff687714862116d15dfd3f1817a521f0c2d2730221084b6fbe7d1242d4285b2fe21b18b SHA512 a68410993e1b9d3d9dbdfb5677941bf2e95805573d210c510f65be5ebad00cb09f50ef5e592f25a34e535b32a44fc23265e839195316d0ac3c8c8c3b626bfe98
 EBUILD vilistextum-2.6.9-r1.ebuild 1834 BLAKE2B 393ebec6b3a0dca18b66ce9782232e2d0a83fa15107040096e58d1e54b58c9fcdd6c18f28e5cdb4699e869361c6725ec6e36ff7be0834d0a70b2ea913af7b12a SHA512 7ff7b37ef26ea0cb2d421e8e26091431cedec2808e5bd75844930c5714b00d370fb17e5eab30ab312644b8aed9c0003dacdd5cd1b6f7ac17c5921df94f69f8f7
+EBUILD vilistextum-2.8.0.20191023.ebuild 2001 BLAKE2B b210f25ac626818ee22c432ef72b24bec152b0b06235313a91bf5316fb6895343720f5026a4398d35aa700c80136a2a6800de803c0fe152cc1a89c0a9a4349cf SHA512 2d15b2be165252e030ce9559423ae9c1fd2da0b63a1eb8b19bb753126a2c489c7e0bd5ac2ec44c61849ea72898ad372164c9cbad875200aa8c9e821358d4b21e
 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
new file mode 100644
index 000000000000..74d44309669b
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch
@@ -0,0 +1,120 @@
+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
new file mode 100644
index 000000000000..a26ae7178184
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch
@@ -0,0 +1,11 @@
+--- 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-prefix.patch b/app-text/vilistextum/files/vilistextum-2.8.0-prefix.patch
new file mode 100644
index 000000000000..e5cb3ba2a18a
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-prefix.patch
@@ -0,0 +1,27 @@
+* don't look in /usr/local
+* try to hack around not being able to use AM_ICONV
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,10 +21,6 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(getopt.h) 	
+ 
+-dnl add /usr/local
+-CFLAGS="$CFLAGS -I/usr/local/include"
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-
+ dnl checking for options
+ AC_MSG_CHECKING(if --enable-multibyte specified)
+ AC_ARG_ENABLE(multibyte,
+@@ -41,7 +37,9 @@
+ AC_CHECK_HEADERS(iconv.h,,
+ 			AC_MSG_ERROR(Need libiconv or iconv.h for multibyte support))
+ 
+-AC_CHECK_LIB(iconv, iconv,,
++dnl iconv_open_into is implemented only in GNU libiconv and not in other
++dnl iconv implementations
++AC_CHECK_LIB(iconv, libiconv_open_into,,
+ 			AC_MSG_WARN([Generic iconv found but not libiconv. See INSTALL for details]))
+ 
+ dnl setting INTERNAL_LOCALE
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch b/app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch
new file mode 100644
index 000000000000..a9c8a96a7522
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch
@@ -0,0 +1,12 @@
+towlower is defined by wctype.h
+
+--- a/src/multibyte.h
++++ b/src/multibyte.h
+@@ -2,6 +2,7 @@
+ 
+ #ifdef MULTIBYTE
+ #include <wchar.h>
++#include <wctype.h>
+  #define CHAR wchar_t
+  #define STRLEN(s) wcslen(s)
+  #define CPYSS(dest, src) wcscpy(dest, src) /* copy str to str */
diff --git a/app-text/vilistextum/vilistextum-2.8.0.20191023.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20191023.ebuild
new file mode 100644
index 000000000000..d77ae962a94b
--- /dev/null
+++ b/app-text/vilistextum/vilistextum-2.8.0.20191023.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 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/tarball/${GITID} -> ${P}.tar.gz"
+S="${WORKDIR}/bhaak-${PN}-${GITID:0:7}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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_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
+}