[gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/

2021-08-09 Thread Ionen Wolkens 
commit: a869257503e4e8c79ca36796e8795715dc1ffdc7
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Aug  9 19:26:18 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Aug 10 05:29:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8692575

dev-libs/tvision: drop 2.2.1.4

cleanup old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21936
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-libs/tvision/Manifest  |   1 -
 ...-2.2.1.4-Gentoo-specific-fix-linker-paths.patch |  33 ---
 .../files/tvision-2.2.1.4-build-system.patch   |  31 ---
 .../files/tvision-2.2.1.4-fix-dot-INC.patch|  30 ---
 .../files/tvision-2.2.1.4-fix-overloaded-abs.patch | 100 -
 dev-libs/tvision/files/tvision-2.2.1.4-gcc6.patch  |  45 --
 dev-libs/tvision/tvision-2.2.1.4.ebuild|  71 ---
 7 files changed, 311 deletions(-)

diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index f2836cee41a..fd96210a44d 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -1,2 +1 @@
-DIST rhtvision_2.2.1-4.tar.gz 1777675 BLAKE2B 
04fee72d25c01825c8e21115bf16348e1f204371055490520d86a7eb6ad07d73c3d46f6046e11e01f7725b4fe8bd9eaf039ed72233f9141aaa19193635d6fe98
 SHA512 
bbbaab611fc7831eb339ddb612ef208a16e74f8e0961268e7e63f69c38cdfe45013d440861f3396aceabddf1a44e4cd65023b5b4238a39d55bbf133bde37dd8f
 DIST tvision-2.2.3.tar.gz 1150257 BLAKE2B 
a642f2b6b7c30b14fdebd97911230f9b108144f346aff327c7db9d29d230c476d556b5891e7c31e1a126b95c94a938d9ad414a0a19bf720d552f44dbe4f0ada3
 SHA512 
96785b7539c23cd205f7180024ed0b451fc4c33599d83e625c43a84b42e7fa4655ed2ccb4d0b885e1917e23bad7cb68b7d7ceda7dfdea95f8c1db3f0c59f4030

diff --git 
a/dev-libs/tvision/files/tvision-2.2.1.4-Gentoo-specific-fix-linker-paths.patch 
b/dev-libs/tvision/files/tvision-2.2.1.4-Gentoo-specific-fix-linker-paths.patch
deleted file mode 100644
index 6721aa9c029..000
--- 
a/dev-libs/tvision/files/tvision-2.2.1.4-Gentoo-specific-fix-linker-paths.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 62fce1e63e92ae71e2ce061c40ba736f4b22f71d Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Mon, 8 Feb 2021 23:43:47 +0100
-Subject: [PATCH] [Gentoo-specific] fix linker paths
-
-Signed-off-by: Bernd Waibel 

- config.pl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/config.pl b/config.pl
-index 4664baa..9e2cb96 100644
 a/config.pl
-+++ b/config.pl
-@@ -179,13 +179,13 @@ if ($OS eq 'UNIX')
-# QNX 6.2 beta 3 workaround
-$MakeDefsRHIDE[3].='/lib ' if ($OSf eq 'QNXRtP');
-# Link with installed libraries
--   $MakeDefsRHIDE[3].=$realPrefix.'/lib';
-+   #$MakeDefsRHIDE[3].=$realPrefix.'/lib';
-$MakeDefsRHIDE[3].='/'.$conf{'libs-subdir'} if $conf{'libs-subdir'};
-$MakeDefsRHIDE[3].=' ';
-$MakeDefsRHIDE[3].='../../makes ' unless $conf{'libs-here'} eq 'no';
-$MakeDefsRHIDE[3].=$here.'/makes ' unless $conf{'libs-here'} eq 'no';
-$MakeDefsRHIDE[3].='../../intl/dummy ' if $UseDummyIntl;
--   $MakeDefsRHIDE[3].=$conf{'X11LibPath'}.' ' if ($conf{'HAVE_X11'} eq 'yes');
-+   #$MakeDefsRHIDE[3].=$conf{'X11LibPath'}.' ' if ($conf{'HAVE_X11'} eq 
'yes');
-$MakeDefsRHIDE[3].=$AllegroPath.' ' if $conf{'HAVE_ALLEGRO'} eq 'yes';
-   }
- elsif ($OS eq 'DOS')
--- 
-2.30.0
-

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
deleted file mode 100644
index d2c1316a794..000
--- a/dev-libs/tvision/files/tvision-2.2.1.4-build-system.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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

[gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/

2021-06-15 Thread Sam James 
commit: 4be13fee7a71000d8306f7b2035a779e4d814c91
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Jun 14 11:02:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 15 14:39:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4be13fee

dev-libs/tvision: drop 2.1.0_pre2

Cleanup old

Closes: https://bugs.gentoo.org/760576
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 dev-libs/tvision/Manifest  |   1 -
 .../files/tvision-2.1.0_pre2-asneeded.patch|  45 ---
 .../files/tvision-2.1.0_pre2-build-system.patch|  30 -
 .../tvision/files/tvision-2.1.0_pre2-flags.patch   |  11 --
 .../tvision/files/tvision-2.1.0_pre2-gcc41.patch   |  11 --
 .../tvision/files/tvision-2.1.0_pre2-gcc44.patch   |  21 ---
 .../tvision/files/tvision-2.1.0_pre2-gcc6.patch| 147 -
 .../files/tvision-2.1.0_pre2-ldconfig.patch|  15 ---
 .../tvision/files/tvision-2.1.0_pre2-outb.patch|  41 --
 .../files/tvision-2.1.0_pre2-perl-INC.patch|  30 -
 .../files/tvision-2.1.0_pre2-underflow.patch   |  14 --
 dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild  |  53 
 12 files changed, 419 deletions(-)

diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index c74c34504d3..d3349d3da6d 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -1,2 +1 @@
-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

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 314ab225f05..000
--- 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 8ba26208948..000
--- 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
-@@ -,7 +,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

[gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/

2019-07-05 Thread Michał Górny 
commit: f524f5217331b84965e484eded8b5271b907fb6b
Author: Bernd Waibel  gmail  com>
AuthorDate: Wed Jun 12 12:04:40 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jul  5 14:23:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f524f521

dev-libs/tvision: fix gcc-7 incompatibilities

With gcc-7, they way overloaded functions are handled has changed,
which led to build failures. This has been addressed by upstream,
see https://sourceforge.net/p/tvision/bugs/17/

Closes: https://bugs.gentoo.org/639492
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12245
Signed-off-by: Michał Górny  gentoo.org>

 .../files/tvision-2.2.1.4-fix-overloaded-abs.patch | 100 +
 dev-libs/tvision/tvision-2.2.1.4.ebuild|  17 ++--
 2 files changed, 108 insertions(+), 9 deletions(-)

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 000..aab66f3a8cb
--- /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 
+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 
+---
+ 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 
+ 
++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 
+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 
+---
+ 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 
+ 
++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 0e8e0a50a55..4cbbeea9403 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}"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/

2017-12-04 Thread Patrice Clement 
commit: 206f0333252feea61ad01bdceb927ac0a1ee6d60
Author: Bernd Waibel  gmail  com>
AuthorDate: Sat Nov 11 15:49:08 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Dec  4 20:26:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=206f0333

dev-libs/tvision: fix dot-in-INC issue.

Closes: https://bugs.gentoo.org/634684
Closes: https://github.com/gentoo/gentoo/pull/6172
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 .../files/tvision-2.1.0_pre2-perl-INC.patch| 30 ++
 dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild  |  1 +
 2 files changed, 31 insertions(+)

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
new file mode 100644
index 000..8a559bde5cc
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.1.0_pre2-perl-INC.patch
@@ -0,0 +1,30 @@
+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/tvision-2.1.0_pre2-r4.ebuild 
b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
index 1bac9ca9f3f..0990426185e 100644
--- a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
+++ b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
@@ -28,6 +28,7 @@ PATCHES=(
"${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() {

[gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/

2017-11-29 Thread Andreas Sturmlechner 
commit: 00b1c4b1bd755b05fdddca6c1f4e696892f8e117
Author: Bernd Waibel  gmail  com>
AuthorDate: Sat Nov 25 14:04:50 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 29 23:19:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00b1c4b1

dev-libs/tvision: Version bump to 2.2.1.4

Copied over from release 2.1.0_pre2-r4
Add some USE flags: X, debug, gpm
Update metadata.xml: Add maintainer, longdescription, use

Application to proxy maintaining this package.

Closes: https://bugs.gentoo.org/638794
Package-Manager: Portage-2.3.16, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6295

 dev-libs/tvision/Manifest  |  3 +-
 .../files/tvision-2.2.1.4-build-system.patch   | 31 ++
 .../files/tvision-2.2.1.4-fix-dot-INC.patch| 30 ++
 dev-libs/tvision/files/tvision-2.2.1.4-flags.patch | 13 
 dev-libs/tvision/files/tvision-2.2.1.4-gcc6.patch  | 45 ++
 .../tvision/files/tvision-2.2.1.4-ldconfig.patch   | 17 ++
 dev-libs/tvision/metadata.xml  | 17 +-
 dev-libs/tvision/tvision-2.2.1.4.ebuild| 70 ++
 8 files changed, 224 insertions(+), 2 deletions(-)

diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index e976d4ba28a..c74c34504d3 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -1 +1,2 @@
-DIST rhtvision_2.1.0-2.tar.gz 1590449 SHA256 
fef19d839069dea2cd5459f24a190883a3b2b600a60d6f7823f456d8e6889412 SHA512 
0593cd2eee9490d5cd6e79a6b8f4c0b384f78e5bb24b0728876fb9df482a43ee97c141d89127254210b4e012970327adfc5c8815d7c3c580a6d54a09291d42a1
 WHIRLPOOL 
5ce2e0bd7eb161aaef520a3bfafde7146784ac5a9d528ce73a51f502b23d790f42caeee5028508a8902615dfa31e295a988daef341f3fa3f6bb1c360b4b90d2b
+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

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 000..d2c1316a794
--- /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 000..ee81c4febd5
--- /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

[gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/

2017-06-04 Thread Andreas Sturmlechner 
commit: 7912f0be85446a42535ba2b4f8f73788e065407e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun  4 23:13:18 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun  4 23:14:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7912f0be

dev-libs/tvision: Fix invalid characters

Gentoo-bug: 620824

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch | 20 +---
 dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild|  8 
 2 files changed, 17 insertions(+), 11 deletions(-)

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
index 30f8ade3354..8570bb04222 100644
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch
+++ b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch
@@ -28,21 +28,19 @@ Fix gcc-6 compilation errors; bug 594176
  
 --- a/classes/tvtext1.cc
 +++ b/classes/tvtext1.cc
-@@ -110,10 +110,10 @@
+@@ -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}; // ���
+-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};
  
- char TButton::shadows[] = "\xDC\xDB\xDF"; // ���
- char TButton::oshadows[] = "\xDC\xDB\xDF"; // ���
 --- a/classes/x11/x11src.cc
 +++ b/classes/x11/x11src.cc
 @@ -94,6 +94,10 @@

diff --git a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild 
b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
index 3e21aab2f9e..800f4b2a0c1 100644
--- a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
+++ b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
@@ -30,6 +30,14 @@ PATCHES=(
"${FILESDIR}/${P}-build-system.patch" # for EAPI=6
 )
 
+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
 }

[gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/

2017-06-03 Thread Andreas Sturmlechner 
commit: a1956cb78426714fd8f0fcc55b5a60e5390724b0
Author: Kacper Kołodziej  kolodziej  in>
AuthorDate: Sat Mar 11 11:34:59 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun  3 21:26:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1956cb7

dev-libs/tvision: Bump to EAPI=6

Package-Manager: Portage-2.3.4, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4182

 .../files/tvision-2.1.0_pre2-build-system.patch| 30 +++
 dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild  | 44 ++
 2 files changed, 74 insertions(+)

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
new file mode 100644
index 000..8ba26208948
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch
@@ -0,0 +1,30 @@
+index 8b78ba3..92aa570 100644
+--- a/config.pl
 b/config.pl
+@@ -,7 +,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/tvision-2.1.0_pre2-r4.ebuild 
b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
new file mode 100644
index 000..3e21aab2f9e
--- /dev/null
+++ b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
@@ -0,0 +1,44 @@
+# 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
+)
+
+src_configure() {
+   ./configure --fhs || die
+}
+
+src_install() {
+   emake DESTDIR="${D}" install \
+   prefix="\${DESTDIR}/usr" \
+   libdir="\$(prefix)/$(get_libdir)"
+
+   einstalldocs
+   dosym rhtvision /usr/include/tvision
+}