Fix utf8 check after changes by blockquote patch, bug #491954

Package-Manager: portage-2.2.7-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

3 files changed, 53 insertions, 30 deletions

diff --git a/app-text/vilistextum/ChangeLog b/app-text/vilistextum/ChangeLog
index 9527a48c1e2a..36d0facfcea0 100644
--- a/app-text/vilistextum/ChangeLog
+++ b/app-text/vilistextum/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/vilistextum
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/ChangeLog,v 1.39 2013/11/22 07:40:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/ChangeLog,v 1.40 2013/11/23 10:39:41 grobian Exp $
+
+  23 Nov 2013; Fabian Groffen <grobian@gentoo.org>
+  files/vilistextum-2.6.9-blockquote.patch:
+  Fix utf8 check after changes by blockquote patch, bug #491954
 
   22 Nov 2013; Justin Lecher <jlec@gentoo.org> vilistextum-2.6.9-r1.ebuild,
   metadata.xml:
diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
index 1c831fd0ae97..a661f724cb2b 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -1,31 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX vilistextum-2.6.7-gentoo.diff 770 SHA256 a9d58adaf0d9b9813f45b0658db97b9ee2b43de230b629cdbb78f079398fb587 SHA512 7a7831993fcbf1023756909d7ca575b93eb373a1e4bf34025491ff9a5169c1a64cf1ed22a1505d907c66056c8a53ad098eeb0d8511c8619ff0d7d1de67d62583 WHIRLPOOL bd0d0e39602382a6a5619a5e4133c4b2d60ff08df26d90cf2b0e8833cc728c7e36a9638966b76698f1aae436c6ffc5b75c8205ebc0ce1e7f5aa7e224fa33de37
 AUX vilistextum-2.6.7-use-glibc-iconv.diff 16367 SHA256 01d2c7ba44ffa7b3ef0aaed163820fa25881b6ab4d383fa79364a9fd1965baaf SHA512 6fffecc9542c5818463f12fdefb7ced030761c700b8163f457d78c1844e6815b90af9ced5149b78874560ca95257882dad64179c84849bfc6ae8bcd23aee83ad WHIRLPOOL 6e5b8e949d0eadc090f2300acd1ac27f35df2533d1b8e91d4389ddc1dca9bd4f18a1714661ce7ad65e7ee9a11498fbde9bf708a1c9518fd00b0ef435dde7d7ca
-AUX vilistextum-2.6.9-blockquote.patch 2688 SHA256 393594f39d3695a9e218570fbe8ddd07240a45770871bd4af4d5e7e393513e96 SHA512 f7ecfd1466dbc729a87d816a40bbea97d896bb074619b5901abee238713bcb2e5763409459ce568685449b55b8adb5c272b858b3d3574e39bbd4f79fc4f4108e WHIRLPOOL d641a0fcf9cc119557ba34cfffe42c36437ce9a45d8b8c07cbcd1462a7e87d2d672c04a55b32ce469cf9b25a47063734a400b897aea0f8b9bb515b1867918f88
+AUX vilistextum-2.6.9-blockquote.patch 4541 SHA256 27e8d9f390b1b919f60f5bffef227908a2dea0228d578af5c3691b6f238399b0 SHA512 e5c13e5a500cc893ffbcdacb98e4433b88bc9bf73866e1acd080c83e8927ef647a83aa207e617838f7f3a3bb6783d5fc76ae74924297df2d3fc5b61c24bd97a3 WHIRLPOOL 44d4d41a74559b1b7343df00418e1c05f496ba54ddacbc805df4e0c27b7cd5d1ad145b01f113ca18f2f7c0cdae67373eefce66445ef43428cb66f36aaebac0da
 AUX vilistextum-2.6.9-darwin11.patch 615 SHA256 e24b52353bb9e9f40d560b246238cd697b17fd98e1238b5d91893e7df605121d SHA512 35aeec20cb7e6ba1668d97f041bbd5b98712589eaaf0ab70a59d3a7df74e0d2e67abbab3a27c7c5ee5f6fe9d61f11610686df3459f0cb401cca03f3f671309ac WHIRLPOOL c0ded53e7621fea36ac2ac3229bb78eacf7b103d3bf74524c3d6bb0a5b5ca26407380000d7f52a9dd78c0c32aa187fe40506c55736dc121f4dd9311238962c23
 AUX vilistextum-2.6.9-gentoo.diff 763 SHA256 39bce048c11e797c2d0eaaa5e83eff0ddc1832a4c617bbca382c87b1ee12fe0a SHA512 b4c49ff27598cedeb06058d3237ea8ebc59a4df9031818f98b5fb22225733d94b820b892541dbddc38c28c08a62ff6f52ef8278c016522b1db95352653178b21 WHIRLPOOL 2b3d83a7827bca828aa01184949ba866946d3bda27c59e32fb1776ad346587dd608c87edaa098dfb53b34352e7d028d070ca3d6ce27eb0f55b424512ad7bf690
 AUX vilistextum-2.6.9-prefix.patch 837 SHA256 a1420515275ca09057abef458940311b9a3a3fd411cfca2cbcead0548834a75b SHA512 6f913d283542bfea02d062f872dc2471e7ea2bc4c29ddb8893aecb9abeb36e6cc821c393217a92421e6888f7c25aa072bfc16c56a69a40593ed504245d8cd187 WHIRLPOOL cf922064cc717d7acfe583e35cea6ba8454f825f65f4cabb09971e8f70b38c64b2d0c37c583f7f0361a7b6015a3c873cc2ecce2300363ea3b9ce5f0fd17738a6
 DIST vilistextum-2.6.9.tar.bz2 147743 SHA256 dddf05b4b9dbb408ea37b5654666f8cf57b5c1da0dd722de763bc86788723d0f SHA512 ce76a4061b766e4544d1a86986333314a3b6959439ba6995a2977c10b01b0142c524d4b215c3272a1dcfcc4f5b6fda03210de95d65cedecfc6a1c940cedf487d WHIRLPOOL b9b6011763143c49a0e5496a42102173b4aa5d16b6c21ccf60d3018ce7c3c7b86b54fc3cbe8bf58b1a3344de498768d79c9ebc7e5c2b3f0a51d822c45e69a56b
 EBUILD vilistextum-2.6.9-r1.ebuild 1972 SHA256 c16a6e7cf49d66e2a10c936ce2a8f6965c09bf169bacfae8542a77f2143c8996 SHA512 a9ca80858e5dd398f1099728685280e0c2caed2b2e5cf24b7dcae3c9f8c660f2f63ded1c0cc71ca428d7a56aad0b7dff2adba4c2cdf4b88c63f986c5f42c9eed WHIRLPOOL ad8cf1e70dffe9bde7c69de3c409651297f36ff3b6cf37adc704c098dab282ea7eae56719db64a26c1c47d8dbddd12c3884685ed05595f41ff088c9ea7e10d55
 EBUILD vilistextum-2.6.9.ebuild 2007 SHA256 dd45ab059bba26d60bc0b479ba3fe01cafc52f1c0a5e23c0cc8d69bd9f57346d SHA512 478b8bfb9a6cd7b6ee8d76c8245d8c929355ead8eafd33ec9c2c951646c24ae7d0df6125cbf596f8f5ae2ae2ef808a3ce1240161a5a0ecd7f89a7716cddffa60 WHIRLPOOL cbf7e7b5c34d332bc31e68b6dc98187c2c68cdc0a27e43a0d1eb96766d4dbbbb9fd2840f84c1b39b95ed6d821c68e8c3cfb73b5d4583efcc8294e18ac67a5ae4
-MISC ChangeLog 5363 SHA256 ddfcdd864f96166fc25e330425f7120cee7b1c8dd297e49141c3a8093e35dbd0 SHA512 2dbe0b48332fcdbdfda43d1833a5f9e87307687b716b28c5800e9f7b96a2cc5f0a09d84b4c284853eaba8a971a85b1903677bcdcf90fd4c3c124fd2dfb97e3f2 WHIRLPOOL 43ac6f8e04eecf27166edaa2b1b8839ee0dfb29efb063489a1d81650c6d53ff076d463258dd685c6f32e8add29c5fd005cfce55585e38668cbc5180dfc91cbbc
+MISC ChangeLog 5526 SHA256 ad82ee06b4bde1688493e1a0c7f9b7650dbf92035800ca4fc0486f6275dec496 SHA512 1ee3b964eb4590de13cd058156c0f3a293fb65cd420e719a5f663d4ded15289f7f9d4bb12b51bb6a98e8656c9fa491b46e7614d106c434236cf36cf6ce6017d9 WHIRLPOOL ae54f24798faa7acf5d4a36c29e6c38ce37ca245be97a2851799e7faaf51c55b02286d9392862bd435730644778d2efe96011bd416f9afec90362e3b1b77d0af
 MISC metadata.xml 166 SHA256 064eb80cc86913e2a47d1088f1b0ebd5b64b5dab1c73d38b8501cd77891cfbbf SHA512 3fc05bf28a906b223e9bb5baeac755dd7e4edb755b5a6c054c3e4d46d294f28df948e1195e71d5a836783daefafa53fe1417aacc0ba17dd49e9b10d51e99c275 WHIRLPOOL 814a3f6a650e4373ac90ba43969b8dab3215f5da936ef5e180fe134adc05a571dc1390c80be173797c421de7f22488b19979353f7aa52536bbfcf6e0541bf748
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0.22 (SunOS)
 
-iQIcBAEBCgAGBQJSjwphAAoJELnU8jG9FVirWsgP/AtXdoUqg6jH1A6j53bKjrG6
-pAmt3v8zF9awtBdhbjciUAupx0WN22fw8Z7pK18JAAL2oubhyUjwyTBOyw3uRO53
-wwdF3txVhe6eoonprq8mtC+ix4867DB6hUMOTF2TAYlf+LZV//Q9cWhbdpCjz3xI
-0G4RXVLIjbikL1fktaD7tvWKGStJczKf77azb0jssh3W1gkW8L3HotldEizwrsx7
-b/isYo/rBUZcJk79ReST3+B4WhAiXeSIs6H3IGMG+nF/YCe1cAXGdh37wAB7Jznc
-XBvmO3mkLra8WFHvyHtC4rsdOmmnAL1eagtCFyi7ojlV6hoiVQB2HXD1BSlCLxhs
-mDA4aFbfXFA8keV+MkLzMtaaAO27evoXwARVCCFdqlZWibGf5BzWx7KvBNwwS2Rv
-DPVYLaJ0ZT6MkcVH/1r6m4cWgmKq5peWP25cgAIhXuiIBKwDyPu2ffdis8uzapsc
-lMU7p7zBYMFaV4HXrBrurOVQ89Yktuatra6Rdz1vl2fzF/JVXdiXvha5ZFysDy6d
-NK5j0su93O1MDqWKue913AAw2O6Ck8prh0wWwdkAdt3t5ERiP5t+v6pqpIZxBky1
-31GR4heOI+gDKeUQ2wtBUt37nf2a8ti9AXVakdsgYuWZ+Q0DkgF+d7A9GRUCMtvS
-MMQJV6gcgMsxhAqeGx6g
-=XLRI
+iEYEAREIAAYFAlKQhe8ACgkQX3X2B8XHTokSUQCbBnCggo90cCzdmMG3m9mkIVYB
+XdoAnjtV2nC++n6HR9HPacl1gGIEOX27
+=fl1L
 -----END PGP SIGNATURE-----
diff --git a/app-text/vilistextum/files/vilistextum-2.6.9-blockquote.patch b/app-text/vilistextum/files/vilistextum-2.6.9-blockquote.patch
index 304f4b915e32..395d03a7456f 100644
--- a/app-text/vilistextum/files/vilistextum-2.6.9-blockquote.patch
+++ b/app-text/vilistextum/files/vilistextum-2.6.9-blockquote.patch
@@ -1,9 +1,8 @@
 Many clients seem to use blockquote tags to flag quotes these days, so
 write them out as quotes, so they remain readable.
 
-diff -ru src.orig/html_tag.c src/html_tag.c
---- src.orig/html_tag.c	2013-09-11 11:51:53.000000000 +0200
-+++ src/html_tag.c	2013-09-11 12:43:25.000000000 +0200
+--- vilistextum-2.6.9/src/html_tag.c
++++ vilistextum-2.6.9/src/html_tag.c
 @@ -87,8 +87,8 @@
  
  		else if CMP("P", str)  { start_p(); }
@@ -15,9 +14,8 @@ diff -ru src.orig/html_tag.c src/html_tag.c
  		else if CMP("Q", str)  { wort_plus_ch('"'); }
  		else if CMP("/Q", str) { wort_plus_ch('"'); }
  
-diff -ru src.orig/multibyte.h src/multibyte.h
---- src.orig/multibyte.h	2005-09-20 12:57:54.000000000 +0200
-+++ src/multibyte.h	2013-09-11 11:56:13.000000000 +0200
+--- vilistextum-2.6.9/src/multibyte.h
++++ vilistextum-2.6.9/src/multibyte.h
 @@ -16,6 +16,7 @@
   #define ATOI(n) wcstoi(n)
  
@@ -34,9 +32,8 @@ diff -ru src.orig/multibyte.h src/multibyte.h
   #define WORT_PLUS_STRING(str) wort_plus_string(str)
  
   #define STRSTR(haystack, needle) strstr(haystack, needle)
-diff -ru src.orig/text.h src/text.h
---- src.orig/text.h	2013-09-11 12:48:23.000000000 +0200
-+++ src/text.h	2013-09-11 12:48:27.000000000 +0200
+--- vilistextum-2.6.9/src/text.h
++++ vilistextum-2.6.9/src/text.h
 @@ -26,6 +26,7 @@
  
  int tab;
@@ -45,9 +42,8 @@ diff -ru src.orig/text.h src/text.h
  
  void print_zeile();
  int is_zeile_empty();
-diff -ru src.orig/text.c src/text.c
---- src.orig/text.c	2006-01-22 20:31:45.000000000 +0100
-+++ src/text.c	2013-09-11 12:45:09.000000000 +0200
+--- vilistextum-2.6.9/src/text.c
++++ vilistextum-2.6.9/src/text.c
 @@ -28,6 +28,7 @@
  int breite=76,
  	hr_breite=76,
@@ -82,3 +78,36 @@ diff -ru src.orig/text.c src/text.c
        i=0;
        while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
  			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
+--- vilistextum-2.6.9/tests/check_utf8
++++ vilistextum-2.6.9/tests/check_utf8
+@@ -9,5 +9,6 @@
+ rm -f utf-8-sampler.output.test
+ ../src/vilistextum utf-8-sampler.html utf-8-sampler.output.test
+ 
+-diff >/dev/null utf-8-sampler.output utf-8-sampler.output.test
++sed 's/^> //' utf-8-sampler.output.test | \
++diff >/dev/null utf-8-sampler.output -
+ 
+--- vilistextum-2.6.9/tests/utf-8-sampler.output
++++ vilistextum-2.6.9/tests/utf-8-sampler.output
+@@ -100,8 +100,8 @@
+ ვეპხის ტყაოსანი შოთა რუსთაველი
+ 
+ ღმერთსი შემვედრე, ნუთუ კვლა დამხსნას სოფლისა შრომასა, ცეცხლს, წყალსა და
+-მიწასა, ჰაერთა თანა მრომასა; მომცნეს ფრთენი და აღვფრინდე, მივჰხვდე მას ჩემსა
+-ნდომასა, დღისით და ღამით ვჰხედვიდე მზისა ელვათა კრთომაასა.
++მიწასა, ჰაერთა თანა მრომასა; მომცნეს ფრთენი და აღვფრინდე, მივჰხვდე მას
++ჩემსა ნდომასა, დღისით და ღამით ვჰხედვიდე მზისა ელვათა კრთომაასა.
+ 
+ Tamil poetry of Cupiramaniya Paarathiyar: சுப்ரமணிய பாரதியார் (1882-1921)
+ 
+@@ -446,7 +446,8 @@
+ д, п, and/or т:
+ 
+  Bulgarian:    [ бгдпт ]    [ бгдпт ]     Мога да ям стъкло и не ме боли.
+- Russian:  [ бгдпт ]    [ бгдпт ]    Я могу есть стекло, это мне не вредит.
++ Russian:  [ бгдпт ]    [ бгдпт ]    Я могу есть стекло, это мне не
++вредит.
+  Serbian:  [ бгдпт ]    [ бгдпт ]     Могу јести стакло а да ми не шкоди.
+ 
+   ------------------------------------------------------------------------