gentoo resync : 11.07.2019

3 files changed, 110 insertions, 10 deletions

diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index d0b597e27d5b..7e526c03c469 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -10,11 +10,12 @@ AUX tvision-2.1.0_pre2-perl-INC.patch 680 BLAKE2B e525daf089b00cd22338dd48339459
 AUX tvision-2.1.0_pre2-underflow.patch 279 BLAKE2B e0eee5f31987b57f39db001ede136a919e306a128adf256791bf1a8c1465958072518baa19d35aed92bedd9b6ec9b31c3a708bfae216857941bc1165e721a375 SHA512 aec060b923adc3c98f21ca659eb26f3c3cbd5164c1287a1e61e4a5d34ba6dc609cc352a465f937b851d63379a8682f44a199e64822f1d590042d75a120a42bda
 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
+AUX tvision-2.2.1.4-fix-overloaded-abs.patch 2771 BLAKE2B 84be3f2028a24fdd60a214fc27e99b2d09c7aa67380bd94d171d799424f745bc269d8df7e848326b0dcec0a37c05b56cc066e574c3f686d26b7db29615164516 SHA512 fb0bc0091e7101947497b3ddaf2e539b86fcdd4613bdb7f607d956b503a13bf285ce1eb1d32d809ad0f1a8d6b6fee7e74bd7e47ba69af46515386655247bb14e
 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
 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
-EBUILD tvision-2.2.1.4.ebuild 1593 BLAKE2B 723fab61c34c17187bf486c75003ff9ac3669e0c7e5a53d51b1264ac82cae7582b60df64241375b61c00969c8611c90f0f896ad2e2c1b837b3923c1ba0864168 SHA512 bf7c9a101bd696abe85c49570f78e919541b068631cfc1da7e2e2c2b0b7318d43ad9ba09f99564bad9240b6df4ad026c05aa639142381aad2b96e46dfef6590e
+EBUILD tvision-2.2.1.4.ebuild 1529 BLAKE2B 1b53eb32da985f60ae0a1175344845355f9ced9b9bd389e03d52a94728bc35cb6faca17c2926fd7e4291e1813e21f563f082d8428a744708aa7acb34a2aa2164 SHA512 6515f50efad2f73fe08445cdea72fa6995b1dcd061731ec76b15dadd26ae797c446ab45a570aad8f1c02223be30bbc9f2eb0b76fee5282c841f537093c0c0fb4
 MISC metadata.xml 694 BLAKE2B d6d43df5a039473776af219de660a9c1d288a31b401f2486c9f5366cde7173d86e18f1ca772dcbbbdbf1ec2d19e85f334714ac8f9b1dbb19340219e14fd2c852 SHA512 19b0c4d1690a4bc85a6b018d5032a5809d772b9982aa932af486223329fbe10562e287e08692a6c1d772f627d158b6d82bf6844e1365f3a248c7bc9195535aca
diff --git a/dev-libs/tvision/files/tvision-2.2.1.4-fix-overloaded-abs.patch b/dev-libs/tvision/files/tvision-2.2.1.4-fix-overloaded-abs.patch
new file mode 100644
index 000000000000..aab66f3a8cba
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.1.4-fix-overloaded-abs.patch
@@ -0,0 +1,100 @@
+From 85185e7787b34545faf095b64935d80982b5cf81 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Wed, 12 Jun 2019 11:52:16 +0200
+Subject: [PATCH] Patches from upstream to address abs issue with >gcc-6 See
+ https://sourceforge.net/p/tvision/bugs/17/
+
+The patches declare inline static abs functions where they are
+needed to make gcc happy.
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ classes/dos/sescreen.cc | 6 ++++++
+ classes/tdesktop.cc     | 6 ++++++
+ classes/x11/x11src.cc   | 6 ++++++
+ 3 files changed, 18 insertions(+)
+
+diff --git a/classes/dos/sescreen.cc b/classes/dos/sescreen.cc
+index 4dd3195..8a500d5 100644
+--- a/classes/dos/sescreen.cc
++++ b/classes/dos/sescreen.cc
+@@ -248,6 +248,12 @@ static int is_plane_mode = 0;
+ static int TextModeXres;
+ static int TextModeYres;
+ 
++inline
++static unsigned abs(unsigned v)
++{
++ return unsigned(abs(int(v)));
++}
++
+ /*****************************************************************************
+ 
+ ***************************  VESA BIOS ROUTINES ******************************
+diff --git a/classes/tdesktop.cc b/classes/tdesktop.cc
+index 38f1be4..26447eb 100644
+--- a/classes/tdesktop.cc
++++ b/classes/tdesktop.cc
+@@ -26,6 +26,12 @@ Modified cursor behavior while desktop locked by Salvador E. Tropea (SET)
+ #define Uses_TVCodePage
+ #include <tv.h>
+ 
++inline
++static unsigned abs(unsigned v)
++{
++ return unsigned(abs(int(v)));
++}
++
+ TDeskInit::TDeskInit( TBackground *(*cBackground)( TRect ) ) :
+     createBackground( cBackground )
+ {
+diff --git a/classes/x11/x11src.cc b/classes/x11/x11src.cc
+index 538457e..dc350df 100644
+--- a/classes/x11/x11src.cc
++++ b/classes/x11/x11src.cc
+@@ -141,6 +141,12 @@ void    (*TScreenX11::writeLine)(int x, int y, int w, void *str, unsigned color)
+ void    (*TScreenX11::redrawBuf)(int x, int y, unsigned w, unsigned off)=
+                 TScreenX11::redrawBufCP;
+ 
++inline
++static unsigned abs(unsigned v)
++{
++ return unsigned(abs(int(v)));
++}
++
+ TScreenX11::~TScreenX11()
+ {
+  STOP_UPDATE_THREAD;
+-- 
+2.21.0
+
+From 9b9f1aea8c9972ab9c1e633835ed4359d7fe000c Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Wed, 12 Jun 2019 12:05:58 +0200
+Subject: [PATCH] classes/tdisplay.c: Also add abs patch to tdisplay.cc
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ classes/tdisplay.cc | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/classes/tdisplay.cc b/classes/tdisplay.cc
+index 9225d48..569bc1d 100644
+--- a/classes/tdisplay.cc
++++ b/classes/tdisplay.cc
+@@ -22,6 +22,12 @@ same used in original Turbo Vision for compatibility purposes.
+ #define Uses_TVCodePage
+ #include <tv.h>
+ 
++inline
++static unsigned abs(unsigned v)
++{
++	return unsigned(abs(int(v)));
++}
++
+ // Remove me please!
+ int TDisplay::dual_display=0;
+ 
+-- 
+2.21.0
+
diff --git a/dev-libs/tvision/tvision-2.2.1.4.ebuild b/dev-libs/tvision/tvision-2.2.1.4.ebuild
index 0e8e0a50a556..4cbbeea9403b 100644
--- a/dev-libs/tvision/tvision-2.2.1.4.ebuild
+++ b/dev-libs/tvision/tvision-2.2.1.4.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+MY_PV=$(ver_rs 3 -)
 
 DESCRIPTION="Text User Interface that implements the well known CUA widgets"
 HOMEPAGE="http://tvision.sourceforge.net/"
-MY_PVR=${PVR:0:5}-${PVR:6}
-SRC_URI="mirror://sourceforge/tvision/rhtvision_${MY_PVR}.tar.gz"
+SRC_URI="mirror://sourceforge/tvision/rhtvision_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -33,7 +34,7 @@ RDEPEND="
 		x11-libs/libXext
 		x11-libs/libXmu
 		x11-libs/libXt
-		x11-libs/libxcb
+		x11-libs/libxcb:=
 	)"
 DEPEND="${RDEPEND}"
 
@@ -43,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-build-system.patch"
 	"${FILESDIR}/${P}-gcc6.patch"
 	"${FILESDIR}/${P}-flags.patch"
+	"${FILESDIR}/${P}-fix-overloaded-abs.patch"
 )
 
 src_configure() {
@@ -63,8 +65,5 @@ src_install() {
 	dosym rhtvision /usr/include/tvision
 
 	# remove CVS directory which gets copied over
-	rm -rf "${ED%/}/usr/share/doc/${P}/html/CVS" || die
-
-	# TODO: remove locales which are not needed, depending on current user
-	# locale settings. How?
+	rm -r "${ED}/usr/share/doc/${P}/html/CVS" || die
 }