gentoo resync : 01.12.2017

8 files changed, 231 insertions, 3 deletions

diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index 1a6a98d91799..4b2a9094aa59 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -7,6 +7,13 @@ AUX tvision-2.1.0_pre2-gcc6.patch 4891 BLAKE2B 674ddaebc2d4fa35debd319627d862c15
 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-underflow.patch 279 BLAKE2B e0eee5f31987b57f39db001ede136a919e306a128adf256791bf1a8c1465958072518baa19d35aed92bedd9b6ec9b31c3a708bfae216857941bc1165e721a375 SHA512 aec060b923adc3c98f21ca659eb26f3c3cbd5164c1287a1e61e4a5d34ba6dc609cc352a465f937b851d63379a8682f44a199e64822f1d590042d75a120a42bda
-DIST rhtvision_2.1.0-2.tar.gz 1590449 SHA256 fef19d839069dea2cd5459f24a190883a3b2b600a60d6f7823f456d8e6889412 SHA512 0593cd2eee9490d5cd6e79a6b8f4c0b384f78e5bb24b0728876fb9df482a43ee97c141d89127254210b4e012970327adfc5c8815d7c3c580a6d54a09291d42a1 WHIRLPOOL 5ce2e0bd7eb161aaef520a3bfafde7146784ac5a9d528ce73a51f502b23d790f42caeee5028508a8902615dfa31e295a988daef341f3fa3f6bb1c360b4b90d2b
+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-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 1227 BLAKE2B ab504d173ba559303e527020d92181f7aa964eac2dc7dbf3b80de7d6a546e53a92b712e00a36a4c52b2a0d92e6c43fa9c287c9aa6e208e2a1021dada11ce5051 SHA512 353c2c6d4fa810a561a1554cd9094256a896da6f85c92319fe8177f17c0f495222179e8fc22df2562ab3a7e5010f8ffa0f378711170cffa73ccfeb1277c205fb
-MISC metadata.xml 244 BLAKE2B ad41183ebf63cfd25842578ff5a7522cdec2eef6345a64991de7bbb2a822b0908165a10f8f71dd884424df197adceaf8afb95ab44c8ddd146f3ffcb1e7a29d57 SHA512 dfcd52de94a376364f43c7ef81e7c86af22a20896050fb7390542c473c9dd6bdffe8247361f51d081a45e15a016c9514f294b17a52501b34b8d412cdb263c976
+EBUILD tvision-2.2.1.4.ebuild 1593 BLAKE2B 723fab61c34c17187bf486c75003ff9ac3669e0c7e5a53d51b1264ac82cae7582b60df64241375b61c00969c8611c90f0f896ad2e2c1b837b3923c1ba0864168 SHA512 bf7c9a101bd696abe85c49570f78e919541b068631cfc1da7e2e2c2b0b7318d43ad9ba09f99564bad9240b6df4ad026c05aa639142381aad2b96e46dfef6590e
+MISC metadata.xml 694 BLAKE2B d6d43df5a039473776af219de660a9c1d288a31b401f2486c9f5366cde7173d86e18f1ca772dcbbbdbf1ec2d19e85f334714ac8f9b1dbb19340219e14fd2c852 SHA512 19b0c4d1690a4bc85a6b018d5032a5809d772b9982aa932af486223329fbe10562e287e08692a6c1d772f627d158b6d82bf6844e1365f3a248c7bc9195535aca
diff --git a/dev-libs/tvision/files/tvision-2.2.1.4-build-system.patch b/dev-libs/tvision/files/tvision-2.2.1.4-build-system.patch
new file mode 100644
index 000000000000..d2c1316a794e
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.1.4-build-system.patch
@@ -0,0 +1,31 @@
+diff --git a/config.pl b/config.pl
+index 6a7a8b3..4664baa 100644
+--- a/config.pl
++++ b/config.pl
+@@ -1188,7 +1188,7 @@ sub GenerateMakefile
+     $rep.="\t\$(MAKE) -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;
+@@ -1273,7 +1273,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;
+ 
+@@ -1293,7 +1293,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.2.1.4-fix-dot-INC.patch b/dev-libs/tvision/files/tvision-2.2.1.4-fix-dot-INC.patch
new file mode 100644
index 000000000000..ee81c4febd5f
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.1.4-fix-dot-INC.patch
@@ -0,0 +1,30 @@
+diff --git a/config.pl b/config.pl
+index caf9c2d..caf2ed3 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";
+ 
+ # This optimization is giving problems and current PCs are quite fast to
+ # make a real difference.
+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.2.1.4-flags.patch b/dev-libs/tvision/files/tvision-2.2.1.4-flags.patch
new file mode 100644
index 000000000000..832a0c7c2659
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.1.4-flags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 722fb29..f4128dc 100644
+--- a/Makefile.in
++++ b/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.2.1.4-gcc6.patch b/dev-libs/tvision/files/tvision-2.2.1.4-gcc6.patch
new file mode 100644
index 000000000000..e882e8539821
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.1.4-gcc6.patch
@@ -0,0 +1,45 @@
+diff --git a/classes/tdesktop.cc b/classes/tdesktop.cc
+index 38f1be4..f8f44f0 100644
+--- 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 )
+ {
+diff --git a/classes/tdisplay.cc b/classes/tdisplay.cc
+index 9225d48..ee5eca8 100644
+--- 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;
+ 
+diff --git a/classes/x11/x11src.cc b/classes/x11/x11src.cc
+index 538457e..10f9911 100644
+--- a/classes/x11/x11src.cc
++++ b/classes/x11/x11src.cc
+@@ -98,6 +98,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;
+ 
diff --git a/dev-libs/tvision/files/tvision-2.2.1.4-ldconfig.patch b/dev-libs/tvision/files/tvision-2.2.1.4-ldconfig.patch
new file mode 100644
index 000000000000..f253eeecbcf4
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.1.4-ldconfig.patch
@@ -0,0 +1,17 @@
+diff --git a/config.pl b/config.pl
+index caf2ed3..6a7a8b3 100644
+--- a/config.pl
++++ b/config.pl
+@@ -1270,12 +1270,6 @@ sub GenerateMakefile
+     $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/metadata.xml b/dev-libs/tvision/metadata.xml
index ae4bd97fa26b..8fc9090f78d2 100644
--- a/dev-libs/tvision/metadata.xml
+++ b/dev-libs/tvision/metadata.xml
@@ -1,7 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>waebbl@gmail.com</email>
+		<name>Bernd Waibel</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Text User Interface (TUI) that implements the well known CUA widgets.
+	</longdescription>
+	<use>
+		<flag restrict="&gt;dev-libs/tvision-2.2.1-r4" name="gpm">
+			Support text mode mouse through <pkg>sys-libs/gpm</pkg>
+		</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">tvision</remote-id>
 	</upstream>
diff --git a/dev-libs/tvision/tvision-2.2.1.4.ebuild b/dev-libs/tvision/tvision-2.2.1.4.ebuild
new file mode 100644
index 000000000000..0e8e0a50a556
--- /dev/null
+++ b/dev-libs/tvision/tvision-2.2.1.4.ebuild
@@ -0,0 +1,70 @@
+# 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/"
+MY_PVR=${PVR:0:5}-${PVR:6}
+SRC_URI="mirror://sourceforge/tvision/rhtvision_${MY_PVR}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+X debug gpm"
+
+DOCS=( readme.txt THANKS TODO )
+HTML_DOCS=( www-site/. )
+
+S=${WORKDIR}/${PN}
+
+# installed lib links to those
+RDEPEND="
+	dev-libs/libbsd
+	sys-apps/util-linux
+	sys-libs/ncurses:0=
+	gpm? ( sys-libs/gpm )
+	X? (
+		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}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-dot-INC.patch"
+	"${FILESDIR}/${P}-ldconfig.patch"
+	"${FILESDIR}/${P}-build-system.patch"
+	"${FILESDIR}/${P}-gcc6.patch"
+	"${FILESDIR}/${P}-flags.patch"
+)
+
+src_configure() {
+	# Note: Do not use econf here, this isn't an autoconf configure script,
+	# but a perl based script which simply calls config.pl
+	./configure --fhs \
+		$(use_with debug debug) \
+		--without-static \
+	|| die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install \
+		prefix="\${DESTDIR}/${EPREFIX}/usr" \
+		libdir="\$(prefix)/$(get_libdir)"
+
+	einstalldocs
+	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?
+}