gentoo auto-resync : 26:12:2022 - 14:07:48

2 files changed, 0 insertions, 104 deletions

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index a33edcfab946..2d5c04b1ff4f 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -10,7 +10,6 @@ AUX nmap-7.80-ac-config-subdirs.patch 849 BLAKE2B d46ad183900ca2f541a1577a2add5c
 AUX nmap-7.91-no-FORTIFY_SOURCE.patch 2007 BLAKE2B 708b85b655592e919fde46d2f3e39f72cca6cbfa8bbca775c8677235fa4d2a62392d23d6728ecf86c398a9eb6ab5c85e1cbace965e96d733ef7d5375d957c2bd SHA512 077d76ee9687dfe33d27bf9e12a39dd7f160bed38d054d01809782aece19ff62249543f228b435614c32d6aaeaac6ae053b3f11ca849dffa9e7a1b1cad206e86
 AUX nmap-7.93-openssl-1.1.patch 9229 BLAKE2B 1dc23ee66574296264882a0c99ae671cb31ea629b38884e6e68a15fab4bd5990e58208a4a7dece52724a970f43eff2d05baf955db6f7545076d38316bfd8e99b SHA512 fd7d52c6bf0bfe1c3953e864d328e6b2609a284c202f7be84019a22f79c467e64ec063dd89819cafb930d8526c5ae16e6fa004109cfc886fa46dfbdc2c23ed1c
 AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475e9351105c7348fe9fd48156e452d8f9697b83a7860ffb188a7f8089c3696c8eef49322a7b029496a334972ae1a180 SHA512 1e062a571eaefbea55f8c4164d8c2b7da177f7c5dd7e846bea5515f81847248bfcaffdb58433fee5f2e08cba387c1ddda21bacbd86efc32a6cdea486cac57cd1
-AUX nmap-9999-python3.patch 4321 BLAKE2B 11b864345c044f10397416640ad23ce79fdaf81400e39e530a435c0ad36bb80f2cbc979ea683a0162ddac986eab8eb6c3caf8c86cc4ff95738acbfc6fc28d0f0 SHA512 23b86b61cc36fe454a3ae098fbf34e5bf4cf4e2f12c88e2e3260bb4d7ad236b5ca3c460262c0bb99518428180ccf13c9839123faaaf60c8a83b578ec9b1a11c9
 DIST nmap-7.93.tar.bz2 10823114 BLAKE2B e9fa0fe0f219258ab29cf59a98f09142ce1e5e70395f6578d57e644d343ff95764a8208f2fd00a686a14217821adb038a1bb4cdf25f355696e68131773cc1995 SHA512 4ec9295e25bd7a215e718c3dbbf09bfe6339b60850f4a8d09b5ad0cbf41a0da8ece0168efc5ca91ba1ecbd83b1d31735d77dacd5f1ec1a9fd212454dd1f0f0fd
 DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 0c18200507c8c0901df6f0fa3230330eff72dd5e54f2d862d35a1df26b9ff3b189cebe0b91cdf47c4f87fef523cc6d9c3bcc36a42d8fcc8be7830fc861c64b5f SHA512 9bd8e436a6f7010ba2e3578affc4174fae12e2e7b78e523ceeb94ba44ccd928ac2cf5da52d02a00c4f190f71425671cc817b44a6a2f8d0b42b10d535bb1af3a9
 EBUILD nmap-7.93.ebuild 3598 BLAKE2B f8c000828ba49cf456b44518cf95e48d3845124171cee50efccb439e9285ce275631eba48182370c6011a9f61e54d59b5331eae382f1c0903fbde11ae7e1fe4f SHA512 005b778fba01d7c504a6dcecac540a5d0f0a23fa5ff41d3d60ade333fdf7812dc67fb039be6db96b9385dee8682d8e28bd91e607864057ca66798a97a0aed7f0
diff --git a/net-analyzer/nmap/files/nmap-9999-python3.patch b/net-analyzer/nmap/files/nmap-9999-python3.patch
deleted file mode 100644
index 3d740d759b3c..000000000000
--- a/net-analyzer/nmap/files/nmap-9999-python3.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-https://github.com/nmap/nmap/pull/2580
-
-From 14f8e230a61748b1cde86d13a2cf2353d7ad1fa7 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 9 Dec 2022 15:58:35 +0000
-Subject: [PATCH] zenmap: further Python 3 compatibility fixes
-
-Without this, we get:
-```
-Traceback (most recent call last):
-  File "/var/tmp/portage/net-analyzer/nmap-9999/work/nmap-9999/zenmap/setup.py", line 584, in <module>
-    setup(**setup_args)
-  File "/usr/lib/python3.10/site-packages/setuptools/_distutils/core.py", line 185, in setup
-    return run_commands(dist)
-  File "/usr/lib/python3.10/site-packages/setuptools/_distutils/core.py", line 201, in run_commands
-    dist.run_commands()
-  File "/usr/lib/python3.10/site-packages/setuptools/_distutils/dist.py", line 969, in run_commands
-    self.run_command(cmd)
-  File "/usr/lib/python3.10/site-packages/setuptools/dist.py", line 1208, in run_command
-    super().run_command(command)
-  File "/usr/lib/python3.10/site-packages/setuptools/_distutils/dist.py", line 988, in run_command
-    cmd_obj.run()
-  File "/var/tmp/portage/net-analyzer/nmap-9999/work/nmap-9999/zenmap/setup.py", line 188, in run
-    self.write_installed_files()
-  File "/var/tmp/portage/net-analyzer/nmap-9999/work/nmap-9999/zenmap/setup.py", line 419, in write_installed_files
-    print >> f, output
-TypeError: unsupported operand type(s) for >>: 'builtin_function_or_method' and '_io.TextIOWrapper'. Did you mean "print(<message>, file=<output_stream>)"?
-make: *** [Makefile:372: install-zenmap] Error 1
-```
-
-This is because Python 3 doesn't support Python 2-style print without
-parentheses, or specifying the output file in that manner.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/zenmap/setup.py
-+++ b/zenmap/setup.py
-@@ -215,13 +215,13 @@ def create_uninstaller(self):
- #!/usr/bin/env python3
- import errno, os, os.path, sys
- 
--print 'Uninstall %(name)s %(version)s'
-+print('Uninstall %(name)s %(version)s')
- 
- answer = raw_input('Are you sure that you want to uninstall '
-     '%(name)s %(version)s? (yes/no) ')
- 
- if answer != 'yes' and answer != 'y':
--    print 'Not uninstalling.'
-+    print('Not uninstalling.')
-     sys.exit(0)
- 
- """ % {'name': APP_DISPLAY_NAME, 'version': VERSION}
-@@ -237,8 +237,8 @@ def create_uninstaller(self):
-                     # This should never happen (everything gets installed
-                     # inside the root), but if it does, be safe and don't
-                     # delete anything.
--                    uninstaller += ("print '%s was not installed inside "
--                        "the root %s; skipping.'\n" % (output, self.root))
-+                    uninstaller += ("print('%s was not installed inside "
-+                        "the root %s; skipping.')\n" % (output, self.root))
-                     continue
-                 output = path_strip_prefix(output, self.root)
-                 assert os.path.isabs(output)
-@@ -262,24 +262,24 @@ def create_uninstaller(self):
-         dirs.append(path)
- # Delete the files.
- for file in files:
--    print "Removing '%s'." % file
-+    print("Removing '%s'." % file)
-     try:
-         os.remove(file)
-     except OSError as e:
--        print >> sys.stderr, '  Error: %s.' % str(e)
-+        print('  Error: %s.' % str(e), file=sys.stderr)
- # Delete the directories. First reverse-sort the normalized paths by
- # length so that child directories are deleted before their parents.
- dirs = [os.path.normpath(dir) for dir in dirs]
- dirs.sort(key = len, reverse = True)
- for dir in dirs:
-     try:
--        print "Removing the directory '%s'." % dir
-+        print("Removing the directory '%s'." % dir)
-         os.rmdir(dir)
-     except OSError as e:
-         if e.errno == errno.ENOTEMPTY:
--            print "Directory '%s' not empty; not removing." % dir
-+            print("Directory '%s' not empty; not removing." % dir)
-         else:
--            print >> sys.stderr, str(e)
-+            print(str(e), file=sys.stderr)
- """
- 
-         uninstaller_file = open(uninstaller_filename, 'w')
-@@ -419,7 +419,7 @@ def write_installed_files(self):
-         with open(INSTALLED_FILES_NAME, "w") as f:
-             for output in self.get_installed_files():
-                 assert "\n" not in output
--                print >> f, output
-+                print(output, file=f)
- 
- 
- class my_uninstall(Command):
-