gentoo resync : 24.06.2021

7 files changed, 185 insertions, 28 deletions

diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index 7c19a0518649..5ba7c2aa154b 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -5,9 +5,12 @@ 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
-AUX tvision-2.2.3-0001-use-proper-AR.patch 622 BLAKE2B e95e94946361f3f32058318603dd863ca14620d4dcebcf9e0a2335afcaed221bf7dceaff2f210d4d928a9c9afa514ba2e3e9f43730d5a28aa098a9cd67845511 SHA512 aca74659cf17f614178cbcdc6f6161ed46d7f6dbbcd0166f9f4697bce63a8547bdf3d9a615483071616911665e8c2a154e7116388d8b0c2c64c8ca08b3b62bcb
+AUX tvision-2.2.3-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch 1281 BLAKE2B 1db252881ba1bd93b28623020749e2ab5b4c0410132dcd447367a1940766085c63f072656084ded6a041433dceffb4630359b02818e7db652060255ccc270b07 SHA512 6308f5557a5cdd1eb87fa92509377c0e3ef70ac168ddfc3da17d19155e27576950055a46f7edc606fae2997587b8a6852a943e9e5ccce79d533ae0f68c037ba7
+AUX tvision-2.2.3-0002-Added-configuration-option-to-exclude-libgpm.patch 1931 BLAKE2B d14b41fdbf96615cf7b8abf667179cf54aa0478724252d6ef6e3ff50c79ad94b3a1e581a894fdeac8ca79e003a865f493d42dc3bda7a948e8d53f5bf2cd2a119 SHA512 269e36ea6c26d6cf7201d886d52758e827761bc4fdacd3af2fae2dd4ccb328847ca3d40661626effebf77bd075f0c19d2201c5d35e0a58348ada58ea35dbdb97
+AUX tvision-2.2.3-0003-Adjusted-c-years.patch 908 BLAKE2B 87a2bbe41e0ff3a7e765bd38fb29a1ce710db6e9c4576c09ef80bea500bea6751893592726ea7132f6693010f24e8d70443dd8c6aa2c6a792eefcce087dbe0c1 SHA512 639c8668910f64bdd1e765f75a37cf9b5d480e2872cb4b2aae0fbc84f6da8f75899525271811a64cc2bb363f2490c3f8e70a08003cb27851d269a2d65144664e
+AUX tvision-2.2.3-0004-Made-ar-command-configurable.patch 540 BLAKE2B fe8bcb93d28897debe4d3c94c04291758d0a6fed051ba320e27f453ea4c3f206339c9052db14173f7e8899c14c1ab2c00b3c76a29e4d71e8a95c5f1450cfef0c SHA512 0f04d4ee449a401f3276a3642b71139c9fc39286314932cc22dc2a0ff8c452b06ff082f850240a3ef89b7719bef993ae63dc45b9812eb7e56e72812a7f98c254
 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
 EBUILD tvision-2.2.1.4.ebuild 1591 BLAKE2B 25dfa8ba53fc2bf40e717daa4e502820ea2609fb2ea96d170c79acff33ff640c1242d3b98593ca9abc22026ec9bbd7162f12e4f65cb8a73f500f35bb4954945e SHA512 d090aa5a123d4b81ffacbaa14ec6dea5f728196afc185abc076c3ff288b5a3db9e1f788999f89ec124ce6d5130b12a2e4b5c03970c507d8e353b03110a864d67
-EBUILD tvision-2.2.3.ebuild 1696 BLAKE2B 1f59386adba13f4083bc84b19dd68f469ebeeb6069862ccb363fb633219bd48337c040f3076b8709b9974b749b68e102c586a690ed2de81d5acafa3c2401af76 SHA512 9894629043baf8046153d6ce042418e8b2ce28beb5e70b24cb1bba28f5c2eb0ca95cad03795e8e45ad33ccb6fbcad1e05103b35195a2259ef0a83df76d6a83dc
+EBUILD tvision-2.2.3.ebuild 1970 BLAKE2B f15daa149840ddec0992d30c278386454a0054f4f5432972c0df64082dbb7146805b11a23ab2220258c0d63f272a98f7bf48b06628b223176902c36f4a3b8ce7 SHA512 cd699af7ea3e165ccc2e20e4307b04bc1370ba275fdf78b50d19fb9d4c8f5f7fea1ff2daf00fbbe4a0e5dbfaff68667f9b10a3154f91c702deed0f128f1bae0e
 MISC metadata.xml 480 BLAKE2B dae64ea0d83b95289c108bd2b7d6bebd3d715e528ac3805306855962df76fa3e30192776d344443c25b874d739753a963fa9074d302b26b19c697ee743ba6562 SHA512 b55cef1bf47c4254ecc1461f246e5f3548bce7ebd449bf62f08574a5c27394bc9cfa8affa948ff63d14f815bd7ac41e6d78780a1b94b77d52d28541e2ddfc88a
diff --git a/dev-libs/tvision/files/tvision-2.2.3-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch b/dev-libs/tvision/files/tvision-2.2.3-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch
new file mode 100644
index 000000000000..239161b2f0a9
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.3-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch
@@ -0,0 +1,56 @@
+From: "Salvador E. Tropea" <salvador@inti.gob.ar>
+Date: Thu, 17 Jun 2021 13:11:22 -0300
+Subject: [PATCH 1/4] Added `ar` command now can be configured from the
+ environment
+
+- Using the AR environment variable.
+- Related to issue: #1
+- Gentoo issue: https://bugs.gentoo.org/796278
+---
+ conflib.pl | 24 +++++++++++++++---------
+ 1 file changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/conflib.pl b/conflib.pl
+index 0abd33df..946bfa95 100644
+--- a/conflib.pl
++++ b/conflib.pl
+@@ -1386,21 +1386,27 @@ sub LookForGNUMake
+ 
+ sub LookForGNUar
+ {
+- my $test;
+- print 'Looking for GNU ar: ';
++ my ($ar, $test);
+ 
+- if ($conf{'GNU_AR'})
++ print 'Looking for GNU ar: ';
++ $ar=$conf{'GNU_AR'};
++ if ($ar)
+    {
+-    print "$conf{'GNU_AR'} (cached)\n";
+-    return $conf{'GNU_AR'};
++    print "$ar (cached)\n";
++    return $ar;
++   }
++ $ar=$ENV{'AR'};
++ if (!length($ar))
++   {
++    $ar='ar';
+    }
+  $conf{'UseRanLib'}=0;
+- $test=RunRedirect('ar --version',$ErrorLog);
++ $test=RunRedirect($ar.' --version',$ErrorLog);
+  if (($test=~/GNU ar/) || ($test=~/BSD ar/))
+    {
+-    $conf{'GNU_AR'}='ar';
+-    print "ar\n";
+-    return 'ar';
++    $conf{'GNU_AR'}=$ar;
++    print "$ar\n";
++    return $ar;
+    }
+  $test=RunRedirect('gar --version',$ErrorLog);
+  if ($test=~/GNU ar/)
+-- 
+2.32.0
+
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
deleted file mode 100644
index ce45ec32ef5e..000000000000
--- a/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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/files/tvision-2.2.3-0002-Added-configuration-option-to-exclude-libgpm.patch b/dev-libs/tvision/files/tvision-2.2.3-0002-Added-configuration-option-to-exclude-libgpm.patch
new file mode 100644
index 000000000000..03cbb76a82d9
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.3-0002-Added-configuration-option-to-exclude-libgpm.patch
@@ -0,0 +1,60 @@
+From: "Salvador E. Tropea" <salvador@inti.gob.ar>
+Date: Thu, 17 Jun 2021 13:28:36 -0300
+Subject: [PATCH 2/4] Added configuration option to exclude libgpm
+
+- Fixes #1
+---
+ config.pl | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/config.pl b/config.pl
+index 21d81ff3..424e3065 100644
+--- a/config.pl
++++ b/config.pl
+@@ -73,7 +73,14 @@ if ($OS eq 'DOS')
+ 
+ if ($OS eq 'UNIX')
+   {
+-   LookForGPM($GPMVersionNeeded);
++   if ($conf{'gpm'} eq 'no')
++     {
++      $conf{'HAVE_GPM'}='no';
++     }
++   else
++     {
++      LookForGPM($GPMVersionNeeded);
++     }
+    LookForNCurses($NCursesVersionNeeded);
+    LookForKeysyms();
+    LookForXlib();
+@@ -424,6 +431,10 @@ sub SeeCommandLine
+       {
+        $conf{'no-dynamic'}='yes';
+       }
++    elsif ($i eq '--without-gpm')
++      {
++       $conf{'gpm'}='no';
++      }
+ #    elsif ($i eq '--unsafe-memcpy')
+ #      {
+ #       $conf{'HAVE_UNSAFE_MEMCPY'}='yes';
+@@ -482,6 +493,7 @@ sub ShowHelp
+  print "--no-intl        : don't use international support.\n";
+  print "--without-static : don't create the static library.\n";
+  print "--without-dynamic: don't create the dynamic library.\n";
++ print "--without-gpm    : skip gpm library detection.\n";
+  print "--with-mss       : compiles with MSS memory debugger.\n";
+  print "--without-mss    : compiles without MSS [default].\n";
+  print "--with-ssc       : compiles using Simple Streams Compatibility.\n";
+@@ -532,7 +544,7 @@ sub GiveAdvice
+     print "  using this library reconfigure using --no-intl. Read about it in the readme.\n";
+     print "  [[[[[[[*******************>>>>> IMPORTANT!!! <<<<<*******************]]]]]]]\n";
+    }
+- if ((@conf{'HAVE_GPM'} eq 'no') && ($OSf eq 'Linux'))
++ if ((@conf{'HAVE_GPM'} eq 'no') && ($OSf eq 'Linux') && ($conf{'gpm'} ne 'no'))
+    {
+     print "\n";
+     print "* No mouse support for console! please install the libgpm package needed\n";
+-- 
+2.32.0
+
diff --git a/dev-libs/tvision/files/tvision-2.2.3-0003-Adjusted-c-years.patch b/dev-libs/tvision/files/tvision-2.2.3-0003-Adjusted-c-years.patch
new file mode 100644
index 000000000000..743591c324ad
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.3-0003-Adjusted-c-years.patch
@@ -0,0 +1,34 @@
+From: "Salvador E. Tropea" <salvador@inti.gob.ar>
+Date: Thu, 17 Jun 2021 13:35:42 -0300
+Subject: [PATCH 3/4] Adjusted (c) years
+
+---
+ config.pl  | 2 +-
+ conflib.pl | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config.pl b/config.pl
+index 424e3065..cda54600 100644
+--- a/config.pl
++++ b/config.pl
+@@ -1,5 +1,5 @@
+ #!/usr/bin/perl
+-# Copyright (C) 1999-2012 by Salvador E. Tropea (SET),
++# Copyright (C) 1999-2021 by Salvador E. Tropea (SET),
+ # see copyrigh file for details
+ #
+ # To specify the compilation flags define the CFLAGS environment variable.
+diff --git a/conflib.pl b/conflib.pl
+index 946bfa95..c8e70204 100644
+--- a/conflib.pl
++++ b/conflib.pl
+@@ -1,5 +1,5 @@
+ #!/usr/bin/perl
+-# Copyright (C) 1999-2004 by Salvador E. Tropea (SET),
++# Copyright (C) 1999-2021 by Salvador E. Tropea (SET),
+ # see copyrigh file for details
+ #
+ # Common configuration routines.
+-- 
+2.32.0
+
diff --git a/dev-libs/tvision/files/tvision-2.2.3-0004-Made-ar-command-configurable.patch b/dev-libs/tvision/files/tvision-2.2.3-0004-Made-ar-command-configurable.patch
new file mode 100644
index 000000000000..9c67313523aa
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.3-0004-Made-ar-command-configurable.patch
@@ -0,0 +1,23 @@
+From: "Salvador E. Tropea" <salvador@inti.gob.ar>
+Date: Thu, 17 Jun 2021 13:36:09 -0300
+Subject: [PATCH 4/4] Made ar command configurable.
+
+---
+ intl/dummy/Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/intl/dummy/Makefile b/intl/dummy/Makefile
+index c32b0a8b..e24c1976 100644
+--- a/intl/dummy/Makefile
++++ b/intl/dummy/Makefile
+@@ -1,5 +1,6 @@
+ RHIDE_GCC=gcc
++RHIDE_AR=ar
+ CC=$(RHIDE_GCC)
+ 
+ libtvfintl.a: intldummy.o
+-	ar -rv libtvfintl.a intldummy.o
++	$(RHIDE_AR) -rv libtvfintl.a intldummy.o
+-- 
+2.32.0
+
diff --git a/dev-libs/tvision/tvision-2.2.3.ebuild b/dev-libs/tvision/tvision-2.2.3.ebuild
index 28c667ecd8dd..9f8e1f689593 100644
--- a/dev-libs/tvision/tvision-2.2.3.ebuild
+++ b/dev-libs/tvision/tvision-2.2.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples nls"
+IUSE="examples gpm nls"
 
 DOCS=( readme.txt THANKS TODO )
 HTML_DOCS=( www-site/. )
@@ -25,7 +25,6 @@ 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
@@ -36,6 +35,7 @@ RDEPEND="
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libxcb:=
+	gpm? ( sys-libs/gpm )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/gettext"
@@ -43,7 +43,10 @@ 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
+	"${FILESDIR}"/${P}-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch
+	"${FILESDIR}"/${P}-0002-Added-configuration-option-to-exclude-libgpm.patch
+	"${FILESDIR}"/${P}-0003-Adjusted-c-years.patch
+	"${FILESDIR}"/${P}-0004-Made-ar-command-configurable.patch
 )
 
 src_configure() {
@@ -58,6 +61,7 @@ src_configure() {
 		--x-include="${EPREFIX}/usr/include/X11"
 	)
 
+	use gpm || myconf+=( --without-gpm )
 	use nls || myconf+=( --no-intl )
 
 	# Note: Do not use econf here, this isn't an autoconf configure script,