gentoo resync : 17.06.2021

15 files changed, 108 insertions, 436 deletions

diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index 2cd4f0a4064a..7c19a0518649 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -1,13 +1,3 @@
-AUX tvision-2.1.0_pre2-asneeded.patch 1908 BLAKE2B 7a3013155d762b9e49ab91ceec8ac1eb4dc6b9217b80feda8e2f93d9927882b36796ea7b73b4bb65a57f07308cfb2c9a23652b0567c271788f96be12b1aa7b7b SHA512 673532f787496598498a179b6a59518e6e24bc63d45223b42660592e27afb37f0bb8102c7f791b645d1e809f9ffcdf065db580a683b8119fa574e3ada978b2f1
-AUX tvision-2.1.0_pre2-build-system.patch 1102 BLAKE2B 61f600f1922a4e969392c2b8770c7e291af0f4c8aef08f07d5e3206384babebc7d6bc0d7aad2a42cab4c882f64e4eb109c3f4c27c70005c1ea10238636cb80d0 SHA512 5459a69aeb70fff0832a9b24c80020ef63c535e942a8767888509f7a3e6ae8dd845a4d81a36d0be9335ec9dd7cbeb688fbb315737c9d748e1d0be66a46f20ede
-AUX tvision-2.1.0_pre2-flags.patch 335 BLAKE2B 972dd44183334619e24d25ccb9f9301088a9e539883a2d7ae42bc90d04f1f7d50d364cdeca7ff08979e1e9d369e09643e4567fe23fbd0a31c2866f35dd9201fd SHA512 3537bf54649dee2eb1b245c446ffdd07e1123f08724567ccbab008a5df9fd8c93e47e654ef7da35199fa05e032a731dc4b777bd35685b8aa756ed5541a773588
-AUX tvision-2.1.0_pre2-gcc41.patch 265 BLAKE2B 9e5ef9db210048f15f103e664762d7df3aec7a2c2e05a91ff2d95187407b3551eab2a7ec48f44878b40c8dd09023115a469c2443555ddfa951534c391f4a2fc8 SHA512 89b6130c6e62c55b8c6f0b380672cc5e305e2f6eedc3b4cd3bd511e0959727aa7445c5999dbc3fbc9d651ed67620600d56f40e3701c8d649f7d12bf1e0a0f4d9
-AUX tvision-2.1.0_pre2-gcc44.patch 438 BLAKE2B ad2f7400b9f6683862b67c2558010984c4e627caad6eaf775160d8f6015aea23681fefd1b6611d6a25fca75ef347bfc3b03a9c4efe86eaa15ffc9e848df38f30 SHA512 203181e2e110e93fa082cf351333e6b662bd2236fa3aeafe546cc83edd5e8ae639769fa3e60350d1d7f5466b82db840e313c3637c7f5e5c414f8638127ac14d4
-AUX tvision-2.1.0_pre2-gcc6.patch 4891 BLAKE2B 674ddaebc2d4fa35debd319627d862c152b491106c6fcec0cc8d4d09896e13362fda099a5541e2b68b4c27cfd46f607717bfa8d3500b5dec891aba3ea730010e SHA512 cba8d6f16e10e8821be6c255ae156760030c725dda279537180ac66ae2dfdee28aa286c2a93653b77f666ddc28ad3e4440b9f58449f81d5d8f2dbfb0060964f1
-AUX tvision-2.1.0_pre2-ldconfig.patch 522 BLAKE2B 459dd4941159ca23027339e812a0c21ffc81a10ff1afdb136f6d8ab9ca819f25120ec0172386140b1e8f15258507831903ec5232c108e784c87b2416f14686b8 SHA512 d54daf2946007f43a4777571e89cc4670fd0124f28d82471de7d4010a84878fd08923e952e9cca9b08938b45e1e367e268c967f1afd12c25f50cac75e591fcf4
-AUX tvision-2.1.0_pre2-outb.patch 954 BLAKE2B c0cf973c3d83008106b96ad2b1658a2b50891c88a9ce81091a65db9b98818fc6fbef105604b78101e2fd84e217eca17a18b21797876a119ab293ef986467f03f SHA512 bb9cf5ac414f02d008aac345299d1a0701103bc044e637cdf4be5181fabcc7c4851ee6d569f91d86a8c9ff1134e32db36f3efaf5242e528b091c029a489d1fd7
-AUX tvision-2.1.0_pre2-perl-INC.patch 680 BLAKE2B e525daf089b00cd22338dd483394591c12be634b3d825a22706b31aff25a46c119bf662c808f74267f2b9f465551b230b7753d816e23934e57ee087f5dbafe9c SHA512 007d2a8738a918e455685b50ed148b5a0b43c64c53c1674826771f4b3510706161e81477f82f1cf123d52fee123c649446644be9a78dbf6966650e3bf51db1f3
-AUX tvision-2.1.0_pre2-underflow.patch 279 BLAKE2B e0eee5f31987b57f39db001ede136a919e306a128adf256791bf1a8c1465958072518baa19d35aed92bedd9b6ec9b31c3a708bfae216857941bc1165e721a375 SHA512 aec060b923adc3c98f21ca659eb26f3c3cbd5164c1287a1e61e4a5d34ba6dc609cc352a465f937b851d63379a8682f44a199e64822f1d590042d75a120a42bda
 AUX tvision-2.2.1.4-Gentoo-specific-fix-linker-paths.patch 1267 BLAKE2B 3e0e09562052ff2830fefc9ded095f7693de0e92290aebb8317327261968cbc055dd908e60b46aecc6705e64974aa4921ad4e00bfa744e8f11fd838044053fb5 SHA512 83f50ecb6ee9f1eeb2599c46764257c8931fc6f6d8daac3b9f0ab28de25931718c90fdae4d52ef042dd42cacd3f5946c55697760ed35939e4ca5d6f0d0a9d516
 AUX tvision-2.2.1.4-build-system.patch 1119 BLAKE2B 98d594371ba91cb70acb8865b1817c4cfa4563bd7965d4079357ccdab2c679f584677f209275e9a4851b31cca0de7ca2ca1688d523970704a3cc126620b4df59 SHA512 60b239c4f2c6a5c3ca00e5f6c29293f92ebb5f00e6dcfc709bee986a1960a01cb77c542921c2e02c576ef9ffc2a7a600534997d8c2a6e5d691ae2825b38b161d
 AUX tvision-2.2.1.4-fix-dot-INC.patch 675 BLAKE2B 8fd53d6e384b5cd71a2850fa0d80fdcd4544f1462d21cbfeb0cd5056ed23f5892d5f97d4f5fca7d8a86757ae171aae19fb689df98927f8ae0acac2d351e92e5f SHA512 49ab191bb74388d1cb6fd31c825b924dccfee5e9a85a55e86c2df50c5a186f78e6112b3fc0dde361f481ea7daea5b9b656aaa93ebbaccb80bcf146d460efda7d
@@ -15,8 +5,9 @@ AUX tvision-2.2.1.4-fix-overloaded-abs.patch 2771 BLAKE2B 84be3f2028a24fdd60a214
 AUX tvision-2.2.1.4-flags.patch 392 BLAKE2B 8124537533a9a9e6568dec6aebdae766f05b1c59f7bbfbb34f8096ce0c4b61e9e5f0a70f525505592fe57c41ee61c8e31db1cd5e6fad5c977c73649c6b4f9b8e SHA512 8b3ccdf1dd49d436d9ebb05ee69081ca0abfb6b1dc6b41042788ef7b0c1328cbcf67788837577897d2e2485b41aaf620d789b39b33a0f82d442a263508f52017
 AUX tvision-2.2.1.4-gcc6.patch 1108 BLAKE2B 7a99bd2aa759d7995fa1bd0afd93c4b1a329d764f9dfff47796a997079718d90eeabe71e09046a6801644fcbf04caa05c955225a3fc77a0f031cad6d6ccc45e8 SHA512 05f55ad5f99107419bac22226b82dd2f94ec673e2c10e9872b59d47a42c7ab12e0f36c30bb1d019b15c8c07d8f5ebe2cf7637d42ca271d34c2042bb259fab3af
 AUX tvision-2.2.1.4-ldconfig.patch 596 BLAKE2B 672d0c67c4cc95d0857a79d824c34aa5bb25d68e5c9ad8d09c2fd16ca6e7a5c52c1febc2e8547b4f3444339f806415a396cccd140db1df10de6a3dbdb6ebff0f SHA512 92c867111f4f528da29ff612c72c90d77709eb46c587b5759f2bc69392d538a6c25ed2d54b8fe7eca0cd3b167a7db0c50de94e88f2107f7527884d15485c1a3f
-DIST rhtvision_2.1.0-2.tar.gz 1590449 BLAKE2B f5c31f997396f7b41b40089d3ebad8cdb5f24fce22f19defe3530d8a6cfcd728bf9cd3bcbb4e5d1d76c1fa3bc13c3b84f1147bd3c5aa07810077f5f159684eb0 SHA512 0593cd2eee9490d5cd6e79a6b8f4c0b384f78e5bb24b0728876fb9df482a43ee97c141d89127254210b4e012970327adfc5c8815d7c3c580a6d54a09291d42a1
+AUX tvision-2.2.3-0001-use-proper-AR.patch 622 BLAKE2B e95e94946361f3f32058318603dd863ca14620d4dcebcf9e0a2335afcaed221bf7dceaff2f210d4d928a9c9afa514ba2e3e9f43730d5a28aa098a9cd67845511 SHA512 aca74659cf17f614178cbcdc6f6161ed46d7f6dbbcd0166f9f4697bce63a8547bdf3d9a615483071616911665e8c2a154e7116388d8b0c2c64c8ca08b3b62bcb
 DIST rhtvision_2.2.1-4.tar.gz 1777675 BLAKE2B 04fee72d25c01825c8e21115bf16348e1f204371055490520d86a7eb6ad07d73c3d46f6046e11e01f7725b4fe8bd9eaf039ed72233f9141aaa19193635d6fe98 SHA512 bbbaab611fc7831eb339ddb612ef208a16e74f8e0961268e7e63f69c38cdfe45013d440861f3396aceabddf1a44e4cd65023b5b4238a39d55bbf133bde37dd8f
-EBUILD tvision-2.1.0_pre2-r4.ebuild 1275 BLAKE2B c1c538a7a489f6854e67ad163bd6258a217e6401fabcbe0757162835e5775dd262c5f8bb0a2e6e32f72cac5983e962ac5c09f1152b0d5934f6ac24f371e32df2 SHA512 e63b0507b474f10a61c3c369cbaa18c1f51a7d6fadffc74a1a19309b2cd151047e9e40884e826a32d154d0a83259c2b3f76bef9c4f87250283b6829634cd7cc5
+DIST tvision-2.2.3.tar.gz 1150257 BLAKE2B a642f2b6b7c30b14fdebd97911230f9b108144f346aff327c7db9d29d230c476d556b5891e7c31e1a126b95c94a938d9ad414a0a19bf720d552f44dbe4f0ada3 SHA512 96785b7539c23cd205f7180024ed0b451fc4c33599d83e625c43a84b42e7fa4655ed2ccb4d0b885e1917e23bad7cb68b7d7ceda7dfdea95f8c1db3f0c59f4030
 EBUILD tvision-2.2.1.4.ebuild 1591 BLAKE2B 25dfa8ba53fc2bf40e717daa4e502820ea2609fb2ea96d170c79acff33ff640c1242d3b98593ca9abc22026ec9bbd7162f12e4f65cb8a73f500f35bb4954945e SHA512 d090aa5a123d4b81ffacbaa14ec6dea5f728196afc185abc076c3ff288b5a3db9e1f788999f89ec124ce6d5130b12a2e4b5c03970c507d8e353b03110a864d67
-MISC metadata.xml 584 BLAKE2B 9e0a46f70886d90423d03dbacca6f561f72aca282cbbead51e61a78632d93b444caf1d4485f0cdc1a3c8ef6069e0da7f04fc9eb152a0f630f8ed745e2347e11e SHA512 5c47abf240f67aa4eac6aafb2d1ca26bd494ffb8eb3ecaa6c989939cf201707ca50be9244abda468cb17391d4d8acc287a6676f4fbd565587cea446d51da4bb1
+EBUILD tvision-2.2.3.ebuild 1696 BLAKE2B 1f59386adba13f4083bc84b19dd68f469ebeeb6069862ccb363fb633219bd48337c040f3076b8709b9974b749b68e102c586a690ed2de81d5acafa3c2401af76 SHA512 9894629043baf8046153d6ce042418e8b2ce28beb5e70b24cb1bba28f5c2eb0ca95cad03795e8e45ad33ccb6fbcad1e05103b35195a2259ef0a83df76d6a83dc
+MISC metadata.xml 480 BLAKE2B dae64ea0d83b95289c108bd2b7d6bebd3d715e528ac3805306855962df76fa3e30192776d344443c25b874d739753a963fa9074d302b26b19c697ee743ba6562 SHA512 b55cef1bf47c4254ecc1461f246e5f3548bce7ebd449bf62f08574a5c27394bc9cfa8affa948ff63d14f815bd7ac41e6d78780a1b94b77d52d28541e2ddfc88a
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch
deleted file mode 100644
index 314ab225f051..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- tvision/config.pl
-+++ tvision/config.pl
-@@ -206,6 +206,7 @@
-   }
- # Flags to link as a dynamic lib
- $MakeDefsRHIDE[6]='RHIDE_LDFLAGS=';
-+$MakeDefsRHIDE[7]='RHIDE_LIBS=';
- if ($OS eq 'UNIX')
-   {
-    if ($OSf ne 'Darwin')
-@@ -229,15 +230,15 @@
-      }
-    $libs=$conf{'X11Lib'};
-    $libs=~s/(\S+)/-l$1/g;
--   $MakeDefsRHIDE[6].=" -L".$conf{'X11LibPath'}." $libs" if @conf{'HAVE_X11'} eq 'yes';
-+   $MakeDefsRHIDE[7].=" -L".$conf{'X11LibPath'}." $libs" if @conf{'HAVE_X11'} eq 'yes';
--   $MakeDefsRHIDE[6].=' -lgpm' if @conf{'HAVE_GPM'} eq 'yes';
-+   $MakeDefsRHIDE[7].=' -lgpm' if @conf{'HAVE_GPM'} eq 'yes';
--   $MakeDefsRHIDE[6].=(($OSf eq 'QNXRtP') ? ' -lncursesS' : ' -lncurses') unless $conf{'ncurses'} eq 'no';
-+   $MakeDefsRHIDE[7].=(($OSf eq 'QNXRtP') ? ' -lncursesS' : ' -lncurses') unless $conf{'ncurses'} eq 'no';
--   $MakeDefsRHIDE[6].=" $stdcxx -lm -lc";
-+   $MakeDefsRHIDE[7].=" $stdcxx -lm -lc";
--   $MakeDefsRHIDE[6].=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
-+   $MakeDefsRHIDE[7].=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
--   $MakeDefsRHIDE[6].=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
-+   $MakeDefsRHIDE[7].=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
-   }
--$MakeDefsRHIDE[7]="LIB_VER=$Version";
-+$MakeDefsRHIDE[8]="LIB_VER=$Version";
--$MakeDefsRHIDE[8]="LIB_VER_MAJOR=$VersionMajor";
-+$MakeDefsRHIDE[9]="LIB_VER_MAJOR=$VersionMajor";
- 
- ModifyMakefiles('intl/dummy/Makefile');
- CreateRHIDEenvs('examples/rhide.env','makes/rhide.env','compat/rhide.env');
---- tvision/makes/common.imk
-+++ tvision/makes/common.imk
-@@ -54,7 +54,7 @@
- C_EXTRA_FLAGS=$(SHARED_CODE_OPTION)
- RHIDE_COMPILE_ARCHIVE=$(RHIDE_LD) $(RHIDE_LIBDIRS) $(LDFLAGS) \
- 	$(RHIDE_LDFLAGS) $(C_EXTRA_FLAGS) -o $(OUTFILE)  \
--	$(OBJFILES)
-+	$(OBJFILES) $(addprefix -l,$(RHIDE_OS_LIBS))
- else
- RHIDE_COMPILE_ARCHIVE=$(RHIDE_AR) $(RHIDE_ARFLAGS) $(OUTFILE)\
- 	$(ALL_PREREQ)
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch
deleted file mode 100644
index 8ba26208948a..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-index 8b78ba3..92aa570 100644
---- a/config.pl
-+++ b/config.pl
-@@ -1111,7 +1111,7 @@ sub GenerateMakefile
-     $rep.="\t\$(MAKE) prefix=\$(prefix) -C intl\n";
-    }
-  $text=~s/\@target_rules\@/$rep/g;
-- $rep="intl-dummy:\n\t\$(MAKE) -C intl/dummy\n";
-+ $rep="intl-dummy:\n\t\$(MAKE) prefix=\$(prefix) -C intl/dummy\n";
-  $rep.="\tcp intl/dummy/libtvfintl.a $makeDir\n";
-  $rep.="\tranlib $makeDir/libtvfintl.a\n" if $conf{'UseRanLib'};
-  $text=~s/\@intl_dummy_rule\@/$rep/g;
-@@ -1196,7 +1196,7 @@ sub GenerateMakefile
-    }
-  if ($internac)
-    {
--    $rep.="\ninstall-internac:\n\t\$(MAKE) -C intl install\n";
-+    $rep.="\ninstall-internac:\n\t\$(MAKE) prefix=\$(prefix) -C intl install\n";
-    }
-  $text=~s/\@install_rules\@/$rep/g;
- 
-@@ -1216,7 +1216,7 @@ sub GenerateMakefile
-  $rep.="\trm -f intl/dummy/*.lo\n";
-  $rep.="\trm -f intl/dummy/*.a\n";
-  $rep.="\t-\$(MAKE) -C examples clean\n";
-- $rep.="\t-\$(MAKE) -C intl clean\n";
-+ $rep.="\t-\$(MAKE) prefix=\$(prefix) -C intl clean\n";
-  $rep.="\trm -f configure.cache\n";
-  $rep.="\trm -f rhtv-config\$(EXE_EXT)\n";
-  $text=~s/\@clean\@/$rep/g;
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-flags.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-flags.patch
deleted file mode 100644
index e74b09ee57d0..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tvision/Makefile.in
-+++ tvision/Makefile.in
-@@ -31,7 +31,7 @@ examples:
- 	$(MAKE) -C examples
- 
- rhtv-config$(EXE_EXT): rhtv-config.c include/tv/configtv.h
--	@GCC@ -o rhtv-config$(EXE_EXT) -Iinclude rhtv-config.c
-+	@GCC@ -o rhtv-config$(EXE_EXT) $(CFLAGS) $(LDFLAGS) -Iinclude rhtv-config.c
- 
- install-headers:
- 	@install_headers@
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc41.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc41.patch
deleted file mode 100644
index 36246b214f99..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tvision/include/tv/inputln.h
-+++ tvision/include/tv/inputln.h
-@@ -201,7 +201,7 @@
-      { return name; }
- 
- protected:
-- TInputLine::TInputLine(StreamableInit) :
-+ TInputLine(StreamableInit) :
-    TInputLineBaseT<char,TDrawBuffer>(streamableInit) {}
- 
- public:
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc44.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc44.patch
deleted file mode 100644
index 40911f3a3e29..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc44.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tvision/classes/ipstream.cc
-+++ tvision/classes/ipstream.cc
-@@ -19,6 +19,7 @@
-  *
-  */
- #include <assert.h>
-+#include <stdio.h>
- #define Uses_string
- #define Uses_TStreamable
- #define Uses_TStreamableClass
---- tvision/include/tv/textdev.h
-+++ tvision/include/tv/textdev.h
-@@ -16,6 +16,8 @@
- #if defined( Uses_TTextDevice ) && !defined( __TTextDevice )
- #define __TTextDevice
- 
-+#include <stdio.h>
-+
- class TRect;
- class TScrollBar;
- 
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch
deleted file mode 100644
index 8570bb04222e..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-Fix gcc-6 compilation errors; bug 594176
-
---- a/classes/tdesktop.cc
-+++ b/classes/tdesktop.cc
-@@ -26,6 +26,10 @@ Modified cursor behavior while desktop locked by Salvador E. Tropea (SET)
- #define Uses_TVCodePage
- #include <tv.h>
- 
-+#include <cmath>
-+
-+using std::abs;
-+
- TDeskInit::TDeskInit( TBackground *(*cBackground)( TRect ) ) :
-     createBackground( cBackground )
- {
---- a/classes/tdisplay.cc
-+++ b/classes/tdisplay.cc
-@@ -22,6 +22,10 @@ same used in original Turbo Vision for compatibility purposes.
- #define Uses_TVCodePage
- #include <tv.h>
- 
-+#include <cmath>
-+
-+using std::abs;
-+
- // Remove me please!
- int TDisplay::dual_display=0;
- 
---- a/classes/tvtext1.cc
-+++ b/classes/tvtext1.cc
-@@ -110,8 +110,8 @@
- char TCheckBoxes::button[] = " [ ] ";
- char TCheckBoxes::obutton[] = " [ ] ";
- 
--TScrollChars TScrollBar::vChars = {30, 31, 177, 254, 178};
--TScrollChars TScrollBar::ovChars = {30, 31, 177, 254, 178};
--TScrollChars TScrollBar::hChars = {17, 16, 177, 254, 178};
--TScrollChars TScrollBar::ohChars = {17, 16, 177, 254, 178};
-+TScrollChars TScrollBar::vChars = {30, 31, (char) 177, (char) 254, (char) 178};
-+TScrollChars TScrollBar::ovChars = {30, 31, (char) 177, (char) 254, (char) 178};
-+TScrollChars TScrollBar::hChars = {17, 16, (char) 177, (char) 254, (char) 178};
-+TScrollChars TScrollBar::ohChars = {17, 16, (char) 177, (char) 254, (char) 178};
- 
---- a/classes/x11/x11src.cc
-+++ b/classes/x11/x11src.cc
-@@ -94,6 +94,10 @@
-  #define TIMER_ALARM SIGALRM
- #endif
- 
-+#include <cmath>
-+
-+using std::abs;
-+
- const unsigned foWmin=5, foHmin=7, foWmax=20, foHmax=32;
- const int cursorDelay=300000;
- 
-@@ -2555,49 +2559,49 @@ Cursor TScreenX11::busyCursor,
-        TScreenX11::leftPtr;
- char   TScreenX11::busyCursorMap[]=
- {
-- 0xff, 0xff, 0xff, 0x1f,
-- 0xfd, 0xff, 0xff, 0x1f,
-- 0xf9, 0xff, 0xff, 0x1f,
-- 0xf1, 0xff, 0xff, 0x1f,
-- 0xe1, 0x7f, 0xc0, 0x1f,
-- 0xc1, 0x7f, 0xc0, 0x1f,
-- 0x81, 0x3f, 0x80, 0x1f,
-- 0x01, 0x9f, 0x3b, 0x1f,
-- 0x01, 0xce, 0x7b, 0x1e,
-- 0xc1, 0xef, 0xfb, 0x1e,
-- 0xc9, 0xef, 0xf1, 0x18,
-- 0x9d, 0xef, 0xf1, 0x18,
-- 0x9f, 0xef, 0xfe, 0x18,
-- 0x3f, 0x6f, 0xff, 0x1e,
-- 0x3f, 0xcf, 0x7f, 0x1e,
-- 0xff, 0x9f, 0x3f, 0x1f,
-- 0xff, 0x3f, 0x80, 0x1f,
-- 0xff, 0x7f, 0xc0, 0x1f,
-- 0xff, 0x7f, 0xc0, 0x1f,
-- 0xff, 0xff, 0xff, 0x1f
-+ (char)0xff, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xfd, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xf9, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xf1, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xe1, (char)0x7f, (char)0xc0, (char)0x1f,
-+ (char)0xc1, (char)0x7f, (char)0xc0, (char)0x1f,
-+ (char)0x81, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0x01, (char)0x9f, (char)0x3b, (char)0x1f,
-+ (char)0x01, (char)0xce, (char)0x7b, (char)0x1e,
-+ (char)0xc1, (char)0xef, (char)0xfb, (char)0x1e,
-+ (char)0xc9, (char)0xef, (char)0xf1, (char)0x18,
-+ (char)0x9d, (char)0xef, (char)0xf1, (char)0x18,
-+ (char)0x9f, (char)0xef, (char)0xfe, (char)0x18,
-+ (char)0x3f, (char)0x6f, (char)0xff, (char)0x1e,
-+ (char)0x3f, (char)0xcf, (char)0x7f, (char)0x1e,
-+ (char)0xff, (char)0x9f, (char)0x3f, (char)0x1f,
-+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0xff, (char)0x7f, (char)0xc0, (char)0x1f,
-+ (char)0xff, (char)0x7f, (char)0xc0, (char)0x1f,
-+ (char)0xff, (char)0xff, (char)0xff, (char)0x1f
- };
- char TScreenX11::busyCursorMask[]=
- {
-- 0xfc, 0xff, 0xff, 0x1f,
-- 0xf8, 0xff, 0xff, 0x1f,
-- 0xf0, 0xff, 0xff, 0x1f,
-- 0xe0, 0x3f, 0x80, 0x1f,
-- 0xc0, 0x3f, 0x80, 0x1f,
-- 0x80, 0x3f, 0x80, 0x1f,
-- 0x00, 0x1f, 0x00, 0x1f,
-- 0x00, 0x0e, 0x00, 0x1e,
-- 0x00, 0x04, 0x00, 0x1c,
-- 0x00, 0x04, 0x00, 0x10,
-- 0x80, 0x07, 0x00, 0x10,
-- 0x08, 0x07, 0x00, 0x10,
-- 0x0c, 0x07, 0x00, 0x10,
-- 0x1f, 0x06, 0x00, 0x10,
-- 0x1f, 0x06, 0x00, 0x1c,
-- 0x3f, 0x0f, 0x00, 0x1e,
-- 0xff, 0x1f, 0x00, 0x1f,
-- 0xff, 0x3f, 0x80, 0x1f,
-- 0xff, 0x3f, 0x80, 0x1f,
-- 0xff, 0x3f, 0x80, 0x1f
-+ (char)0xfc, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xf8, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xf0, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xe0, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0xc0, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0x80, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0x00, (char)0x1f, (char)0x00, (char)0x1f,
-+ (char)0x00, (char)0x0e, (char)0x00, (char)0x1e,
-+ (char)0x00, (char)0x04, (char)0x00, (char)0x1c,
-+ (char)0x00, (char)0x04, (char)0x00, (char)0x10,
-+ (char)0x80, (char)0x07, (char)0x00, (char)0x10,
-+ (char)0x08, (char)0x07, (char)0x00, (char)0x10,
-+ (char)0x0c, (char)0x07, (char)0x00, (char)0x10,
-+ (char)0x1f, (char)0x06, (char)0x00, (char)0x10,
-+ (char)0x1f, (char)0x06, (char)0x00, (char)0x1c,
-+ (char)0x3f, (char)0x0f, (char)0x00, (char)0x1e,
-+ (char)0xff, (char)0x1f, (char)0x00, (char)0x1f,
-+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f
- };
- 
- /* This is the function which creates cursors. On success it return
-
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-ldconfig.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-ldconfig.patch
deleted file mode 100644
index 6d7d94fe8a0d..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-ldconfig.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- tvision/config.pl
-+++ tvision/config.pl
-@@ -1193,12 +1193,6 @@
-     $rep.="\t".GenInstallFiles('0644',"$makeDir/$ver",'$(libdir)');
-     $stripDebug=($OSf eq 'Darwin') ? '-S' : '--strip-debug';
-     $rep.="\tstrip $stripDebug \$(libdir)/$ver\n" unless $conf{'debugInfo'} eq 'yes';
--    # FreeBSD: merge data from libdir.
--    # Darwin: doesn't have ldconfig.
--    if ($OSf ne 'Darwin')
--      {
--       $rep.=($OSf eq 'FreeBSD') ? "\t-ldconfig -m \$(libdir)\n" : "\t-ldconfig\n";
--      }
-    }
-  if ($internac)
-    {
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-outb.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-outb.patch
deleted file mode 100644
index 0735f8ffeb77..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-outb.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Recent kernel headers no longer provide asm/io.h.
-
---- tvision/classes/linux/linuxdis.cc
-+++ tvision/classes/linux/linuxdis.cc
-@@ -300,7 +300,11 @@
- *****************************************************************************/
- 
- #ifdef h386LowLevel
-+#if HAVE_OUTB_IN_SYS
-+#include <sys/io.h>
-+#else
- #include <asm/io.h>
-+#endif
- 
- static inline
- unsigned char I(unsigned char i)
---- tvision/classes/linux/linuxscr.cc
-+++ tvision/classes/linux/linuxscr.cc
-@@ -123,7 +123,11 @@
- #include <tv/linux/log.h>
- 
- #ifdef h386LowLevel
-+ #if HAVE_OUTB_IN_SYS
-+ #include <sys/io.h>
-+ #else
-  #include <asm/io.h>
-+ #endif
- #endif
- 
- // What a hell is that?!
---- tvision/config.pl
-+++ tvision/config.pl
-@@ -77,7 +77,7 @@
-    # glibc I use but the fact is that the needed tricks make it very Linux
-    # dependent.
-    LookForPThread() if $OSf eq 'Linux';
--   #LookForOutB();
-+   LookForOutB();
-   }
- if ($Compf eq 'Cygwin')
-   {# Cygwin incorporates a XFree86 port
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-perl-INC.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-perl-INC.patch
deleted file mode 100644
index 8a559bde5ccf..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-perl-INC.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/config.pl b/config.pl
-index 53a7b50..784676b 100644
---- a/config.pl
-+++ b/config.pl
-@@ -5,8 +5,8 @@
- # To specify the compilation flags define the CFLAGS environment variable.
- #
- 
--require "miscperl.pl";
--require "conflib.pl";
-+require "./miscperl.pl";
-+require "./conflib.pl";
- 
- # If the script is newer discard the cache.
- #GetCache() unless (-M 'config.pl' < -M 'configure.cache');
-diff --git a/confignt.pl b/confignt.pl
-index e185f49..9ff7ae6 100644
---- a/confignt.pl
-+++ b/confignt.pl
-@@ -3,8 +3,8 @@
- # see copyrigh file for details
- #
- 
--require "miscperl.pl";
--require "conflib.pl";
-+require "./miscperl.pl";
-+require "./conflib.pl";
- 
- SeeCommandLine();
- 
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-underflow.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-underflow.patch
deleted file mode 100644
index d693a359a6cf..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-underflow.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Bug #160591; fixes a buffer underflow.
-Reported by B Douglas Hilton <b.d.hilton@verizon.net>
-
---- tvision/classes/ttermina.cc
-+++ tvision/classes/ttermina.cc
-@@ -233,7 +233,7 @@
-          }
-       }
-    }
-- while (pos-->=queBack);
-+ while (pos-->queBack);
- 
-  return queBack;
- }
diff --git a/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch b/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch
new file mode 100644
index 000000000000..ce45ec32ef5e
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch
@@ -0,0 +1,23 @@
+From 017a1059067ab58a9286b3049505cb3e77696de5 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 14 Jun 2021 17:48:45 +0200
+Subject: [PATCH 2/2] use proper AR
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ intl/dummy/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/intl/dummy/Makefile b/intl/dummy/Makefile
+index c32b0a8..d47e185 100644
+--- a/intl/dummy/Makefile
++++ b/intl/dummy/Makefile
+@@ -2,4 +2,4 @@ RHIDE_GCC=gcc
+ CC=$(RHIDE_GCC)
+ 
+ libtvfintl.a: intldummy.o
+-	ar -rv libtvfintl.a intldummy.o
++	$(AR) -rv libtvfintl.a intldummy.o
+-- 
+2.32.0
+
diff --git a/dev-libs/tvision/metadata.xml b/dev-libs/tvision/metadata.xml
index 9bf7fccc56e8..74ce76bd57bf 100644
--- a/dev-libs/tvision/metadata.xml
+++ b/dev-libs/tvision/metadata.xml
@@ -9,11 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="gpm">
-			Support text mode mouse through <pkg>sys-libs/gpm</pkg>
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">set-soft/tvision</remote-id>
 	</upstream>
diff --git a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
deleted file mode 100644
index 0990426185ec..000000000000
--- a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Text User Interface that implements the well known CUA widgets"
-HOMEPAGE="http://tvision.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tvision/rhtvision_${PV/_pre/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DOCS=( readme.txt THANKS TODO )
-
-HTML_DOCS=( www-site/. )
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc41.patch"
-	"${FILESDIR}/${P}-outb.patch"
-	"${FILESDIR}/${P}-underflow.patch"
-	"${FILESDIR}/${P}-asneeded.patch"
-	"${FILESDIR}/${P}-gcc44.patch"
-	"${FILESDIR}/${P}-ldconfig.patch"
-	"${FILESDIR}/${P}-flags.patch"
-	"${FILESDIR}/${P}-gcc6.patch" # bug #594176
-	"${FILESDIR}/${P}-build-system.patch" # for EAPI=6
-	"${FILESDIR}/${P}-perl-INC.patch" # dot-in-INC
-)
-
-src_prepare() {
-	# Strip hunk from invalid characters for gcc6.patch
-	sed -e ":TScrollChars: s:; // \x1E\x1F\xB1\xFE\xB2:;:" \
-		-e ":TScrollChars: s:; // \x11\x10\xB1\xFE\xB2:;:" \
-		-i classes/tvtext1.cc || die
-	default
-}
-
-src_configure() {
-	./configure --fhs || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		prefix="\${DESTDIR}/usr" \
-		libdir="\$(prefix)/$(get_libdir)"
-
-	einstalldocs
-	dosym rhtvision /usr/include/tvision
-}
diff --git a/dev-libs/tvision/tvision-2.2.3.ebuild b/dev-libs/tvision/tvision-2.2.3.ebuild
new file mode 100644
index 000000000000..28c667ecd8dd
--- /dev/null
+++ b/dev-libs/tvision/tvision-2.2.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN="rh${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Text User Interface that implements the well known CUA widgets"
+HOMEPAGE="http://tvision.sourceforge.net/"
+SRC_URI="https://github.com/set-soft/${PN}/releases/download/v${PV}/${MY_P}.src.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples nls"
+
+DOCS=( readme.txt THANKS TODO )
+HTML_DOCS=( www-site/. )
+
+RDEPEND="
+	dev-libs/libbsd
+	media-libs/allegro:0[X]
+	sys-apps/util-linux
+	sys-libs/gpm
+	sys-libs/ncurses:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libxcb:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1.4-flags.patch
+	"${FILESDIR}"/${PN}-2.2.1.4-ldconfig.patch
+	"${FILESDIR}"/${P}-0001-use-proper-AR.patch
+)
+
+src_configure() {
+	tc-export CC CXX AR
+
+	local myconf=()
+	myconf+=(
+		--fhs
+		--prefix="${EPREFIX}/usr"
+		--with-pthread
+		--without-static
+		--x-include="${EPREFIX}/usr/include/X11"
+	)
+
+	use nls || myconf+=( --no-intl )
+
+	# Note: Do not use econf here, this isn't an autoconf configure script,
+	# but a perl based script which simply calls config.pl
+	einfo "Running ./configure ${myconf[@]}"
+	./configure ${myconf[@]} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install \
+		prefix="\${DESTDIR}${EPREFIX}/usr" \
+		libdir="\$(prefix)/$(get_libdir)"
+
+	einstalldocs
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples
+		dodoc -r examples/*
+	fi
+}