commit: a7e669bf179acfd1aa8984449c91809d842787d2
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Apr 5 21:05:28 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Apr 5 21:05:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e669bf
games-util/umodpack: Fixes for new Perl, drop broken GUI, EAPI 7
Closes: https://bugs.gentoo.org/716196
Package-Manager: Portage-2.3.96, Repoman-2.3.20
Signed-off-by: James Le Cuirot gentoo.org>
games-util/umodpack/files/umodpack-fixes.patch| 138 ++
games-util/umodpack/umodpack-0.5_beta16-r2.ebuild | 46
games-util/umodpack/umodpack-0.5_beta16-r3.ebuild | 56 +
3 files changed, 194 insertions(+), 46 deletions(-)
diff --git a/games-util/umodpack/files/umodpack-fixes.patch
b/games-util/umodpack/files/umodpack-fixes.patch
new file mode 100644
index 000..13bcad6c9ea
--- /dev/null
+++ b/games-util/umodpack/files/umodpack-fixes.patch
@@ -0,0 +1,138 @@
+diff -Naur a/Config-Ini-1.06/test.pl b/Config-Ini-1.06/test.pl
+--- a/Config-Ini-1.06/test.pl 2020-04-05 21:08:14.033277147 +0100
b/Config-Ini-1.06/test.pl 2020-04-05 21:08:04.576074986 +0100
+@@ -11,9 +11,9 @@
+
+ # End of black magic.
+
+-use POSIX qw(tmpnam);
+-do { $tmpfile = tmpnam() } until open TMPFILE, ">$tmpfile";
+-print TMPFILE < 0);
++print $tmpfh ;
+ $/ = "\n";
+-close TMPFILE;
++close $tmpfh;
+ $shouldbe = <$tmpfile";
++( $tmpfh, $tmpfile ) = tempfile(UNLINK => 0);
+ $ini->save($tmpfile);
+
+ # test decoder
+@@ -254,8 +254,8 @@
+ unlink $tmpfile;
+
+ # test comment delimiter
+-do { $tmpfile = tmpnam() } until open TMPFILE, ">$tmpfile";
+-print TMPFILE < 0);
++print $tmpfh < '#');
+
+diff -Naur a/Makefile.PL b/Makefile.PL
+--- a/Makefile.PL 2001-01-18 16:20:37.0 +
b/Makefile.PL 2020-04-05 21:08:32.335668386 +0100
+@@ -11,7 +11,6 @@
+ 'PREREQ_PM' => {
+ 'Config::Ini' => 1.06,
+ 'Archive::Zip' => 0.07,
+- 'Tk'=> 800.020,
+ },
+-'EXE_FILES' => [qw(umod xumod)],
++'EXE_FILES' => [qw(umod)],
+ );
+diff -Naur a/umod b/umod
+--- a/umod 2020-04-05 21:08:14.033277147 +0100
b/umod 2020-04-05 21:08:04.576074986 +0100
+@@ -17,7 +17,8 @@
+ use FileHandle;
+ use File::Find;
+ use Getopt::Long;
+-use POSIX qw(tmpnam SEEK_END);
++use POSIX qw(SEEK_END);
++use File::Temp qw(tempfile);
+ use strict;
+
+ =pod
+@@ -520,7 +521,7 @@
+ if( $filename =~ /\.zip$/i ) {
+
+ my( $tmpFile, $fh );
+- do { $tmpFile = tmpnam(); } until $fh = new FileHandle( $tmpFile, 'w' );
++ ( $fh, $tmpFile ) = tempfile(UNLINK => 0);
+
+ my( $zipFile ) = new Archive::Zip;
+ if( $zipFile->read( $filename ) != AZ_OK ) {
+diff -Naur a/Umod.pm b/Umod.pm
+--- a/Umod.pm 2020-04-05 21:08:14.033277147 +0100
b/Umod.pm 2020-04-05 21:08:04.576074986 +0100
+@@ -400,22 +400,22 @@
+ if( $ini->exists( ['Setup', 'Requires'] ) ) {
+ foreach my $requirement ( $ini->get( ['Setup', 'Requires'],
+ -mapping => 'multiple' ) ) {
+- my( %hash );
+- %hash->{product} = $ini->get( [$requirement, 'Product'],
++ my( $hash );
++ $hash->{product} = $ini->get( [$requirement, 'Product'],
+ -mapping => 'single' );
+- %hash->{version} = $ini->get( [$requirement, 'Version'],
++ $hash->{version} = $ini->get( [$requirement, 'Version'],
+ -mapping => 'single' );
+- %hash->{localproduct} = $ini->get( [$requirement, 'LocalProduct'],
++ $hash->{localproduct} = $ini->get( [$requirement, 'LocalProduct'],
+ -mapping => 'single' );
+- %hash->{producturl} = $ini->get( [$requirement, 'ProductURL'],
++ $hash->{producturl} = $ini->get( [$requirement, 'ProductURL'],
+ -mapping => 'single' );
+- %hash->{versionurl} = $ini->get( [$requirement, 'VersionURL'],
++ $hash->{versionurl} = $ini->get( [$requirement, 'VersionURL'],
+ -mapping => 'single' );
+- %hash->{developer}= $ini->get( [$requirement, 'Developer'],
++ $hash->{developer}= $ini->get( [$requirement, 'Developer'],
+ -mapping => 'single' );
+- %hash->{developerurl} = $ini->get( [$requirement, 'DeveloperURL'],
++ $hash->{developerurl} = $ini->get( [$requirement, 'DeveloperURL'],
+ -mapping => 'single' );
+- push( @requirements, \%hash );
++ push( @requirements, \$hash );
+ }
+ }
+
diff --git a/games-util/umodpack/umodpack-0.5_beta16-r2.ebuild
b/games-util/umodpack/umodpack-0.5_beta16-r2.ebuild
deleted file mode 100644
index 772fe648729..000
--- a/games-util/umodpack/umodpack-0.5_beta16-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-#
