Re-add 2to3 patch, step 1

2 files changed, 9 insertions, 318 deletions

diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 67112c1c4f25..8a5760f855ff 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -3,23 +3,23 @@ Hash: SHA1
 
 AUX doomsday-1.9.0_beta69-png15.patch 5042 RMD160 249fb6f153b01632c5d41c0b52ce9d0d84f57520 SHA1 adc25a193b07d6a13fb861d0d6bf77ecb4c46f3b SHA256 0a406daa9afafffca641be96a7f153635655b5611d7747daaf67ca2f2a943d07
 AUX doomsday-1.9.0_beta69-underlink.patch 386 RMD160 4dc1504b2da9e0aba061cffc348b5b414c02a2b9 SHA1 19c6b6d3e1ebabd3dbb2c92876d7c7786ddb2c45 SHA256 b774ef4cdad497668728668ec49b46b17c90a399cce5949337e8c0756cdfe0b7
-AUX doomsday-1.9.8-2to3.patch 12524 RMD160 f6db8120efcd2b12e810889366178017a75fbf39 SHA1 d9d4c48823e8ea641c4e60667ea116c33b5b7ae7 SHA256 01b554d28ce83b1f37cbb191349beb70577c54d64c16550e6357e1ef237f5061
+AUX doomsday-1.9.8-2to3.patch 12480 RMD160 d5790b8cbdeca2ca2ad832249b0b058c8f071c4e SHA1 7df383823e97d3a95b8996226dad267b324736b7 SHA256 e9439d7d1c2482e73c623ac45271d627928a08419002c13e5e45d37de6008149
 AUX doomsday-1.9.8-openal-link.patch 4100 RMD160 8c4b72e600cfa285ddaaf52fc696494320212a5d SHA1 92efe901c45ef6e4ff44471b867879e5ed48dd1f SHA256 61b75a8c3bc299dcbf23c887ea3f5799c12f80e94bdb0924d58e02e222563d5a
 AUX wrapper 136 RMD160 9eb253537d5e2b443cf0807401b86a7526ae3e4e SHA1 2cb84a8feca8d213ecf0ac92d3bfa36282d293c1 SHA256 64b959cfeb77bd778f16768c0ee509cd128eb855fa4acd8e7c37046c5885dbc8
 DIST deng-1.9.0-beta6.9.tar.gz 6085833 RMD160 e91a4bc76b39da9e2e51925e03154ffcb128fea9 SHA1 e1f7d64b1b60eef2659bc4636fbe41a0abf6a6ce SHA256 3553f6a58660916fdedbe0594f5b22dac4738ee6e02b042992d3140d358954af
 DIST doomsday-1.9.8.tar.gz 7048039 RMD160 41ad7f106b4de5ed4ca9b38894bb7b3103efc3af SHA1 e149ab138009bdb7a5cd8d9a187a91b1e8e4c13b SHA256 5401e5d58d197c287f7bc1318ee8429f27a76792ae6f2471c12d10281a569474
 EBUILD doomsday-1.9.0_beta69.ebuild 2264 RMD160 57c5e354e01efd62838fee18b41639309335916c SHA1 e558e286fb4ff9f744254daf7b5b8ee8280ef4a0 SHA256 5ba265d19c0868cebf7a53b32585babbc0fa99bbe29b3686da5c7fda5f227469
 EBUILD doomsday-1.9.8.ebuild 3659 RMD160 85f42fcb0acf0dab9a22068c18ef0a29aa935361 SHA1 74f7db9cfb02f82d72d5b249635360ae82832557 SHA256 658edef547368a8e5b90fa0202215a25ec6ad5eea636e7a67edb2182250293d3
-MISC ChangeLog 6956 RMD160 37c092d160350aa73a3cf14d1599c3e3634c3142 SHA1 fd80736173fbe6f2f50e37f04a1eb7986a51b032 SHA256 f8ad74d7742b03c31621f3d4a26e389b32e2313f4b0335d04cf09423758f8cef
+MISC ChangeLog 7103 RMD160 66e2fc0e71360fe64dff329febe290ccaba2b247 SHA1 198ec3075b8fd963d8790cbde6958f2ba50bf234 SHA256 4649ec29640a79e9cef892d673ef6e3105c167d886b1f25659c8c679903b5220
 MISC metadata.xml 718 RMD160 28e5d9cbc6c1cc8775dd782ad39de771387f12a6 SHA1 5507160cdcd4555c86b22bf1492bce620b65d0d2 SHA256 0d8702a3ad1afd41e3315663411c97c3cf7a4faf2892f69785c2c497e7a694cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPxkobAAoJEAmJmMX429reURMH+wUqZO07dN63y4TZekXcj/NN
-GaVcqetVzGY7DRPnWriUPb7LI2DSutsHg5dtmBFNh5sU9dpjog5BSZzy5BGMfZda
-Y1/Ls1g4VoS9S0EMJYyYfg52rZ97sfLrlFH/EElar2tkPxkqi4AUxJD6zafe51B5
-miuF5P8hvzYEDhaMVgVHiK3pPi5wffBgZSomKY4siK68zpVjzAPfQoMq4areAcK6
-c23ycJnAMDey2stsHpWhgbctCa7HQv4HBh6kf1e2M1+E8ZKfBW0Yna4yfYLsEAZ4
-qWN7Yynn6NVZaB4DM1wmmy+kmKsmIg9hqTt9CLFGEI7ZpBBzxq1hvYljpbCFr/s=
-=dNVd
+iQEcBAEBAgAGBQJPxvO5AAoJEAmJmMX429rewMAH/RbBgROB3H/cX7x+i9rKGHJn
+oKgG4EropwfuFXRUHWY1Aps8RprG7oGqojDTL2jXOGnIL1tGJ31/2IuAK1hKPpSe
+u3dfdyZUZAZ/Ds6NPiYxYdf/bezN88ynlPIWAtf4U1vto1N52JuevDKyN3NwH/fh
+5oCKQPpgdXJPEwSMmw8KdFN6TcXZz5xtlpEv/QAFm/ONznx4JOqVHgg9Gu7ReR9j
+onUIrVReT8Bl/0PYqa1YMRH8rf7wH4XSN7DLIJy+FnhFiFYd2vaw7kXMiEMEVTG6
+Ni1TuowMpURHbkIGTZImDptCsKj56Cq0eteTagwy1l+U3qjDQ/Vh6QalzIEmBCE=
+=60o1
 -----END PGP SIGNATURE-----
diff --git a/games-fps/doomsday/files/doomsday-1.9.8-2to3.patch b/games-fps/doomsday/files/doomsday-1.9.8-2to3.patch
deleted file mode 100644
index 62b4db2627ec..000000000000
--- a/games-fps/doomsday/files/doomsday-1.9.8-2to3.patch
+++ /dev/null
@@ -1,309 +0,0 @@
---- ./build/mac/createfont_osx.py	(original)
-+++ ./build/mac/createfont_osx.py	(refactored)
-@@ -36,7 +36,7 @@
- 
- 
- def _getBitmapImageRep(size, hasAlpha=True):
--    width, height = map(int, size)
-+    width, height = list(map(int, size))
-     return NSBitmapImageRep.alloc().initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_(None, width, height, 8, 4, hasAlpha, False, NSDeviceRGBColorSpace, width*4, 32)
- 
- 
-@@ -55,7 +55,7 @@
- 
- def filter_range(n):
-     offset = 1 # - int(n/5)
--    return range(-n/2 + offset, n/2 + offset)
-+    return list(range(-n/2 + offset, n/2 + offset))
- 
- 
- class SysFont(object):
-@@ -79,7 +79,7 @@
-                 self._isBold and 'Bold' or '',
-                 self._isOblique and 'Oblique' or '')
-         self._font = NSFont.fontWithName_size_(name, self._size)
--        print name, self._font
-+        print(name, self._font)
-         if self._font is None:
-             if self._isBold:
-                 self._font = NSFont.boldSystemFontOfSize(self._size)
-@@ -121,10 +121,10 @@
-         self._isUnderline = isUnderline
-         
-     def size(self, text):
--        return tuple(map(int,map(math.ceil, NSString.sizeWithAttributes_(text, {
-+        return tuple(map(int,list(map(math.ceil, NSString.sizeWithAttributes_(text, {
-             NSFontAttributeName: self._font,
-             NSUnderlineStyleAttributeName: self._isUnderline and 1.0 or 0,
--        }))))
-+        })))))
-         
-     def advancement(self, glyph):
-         return tuple(self._font.advancementForGlyph_(ord(glyph)))
-@@ -196,7 +196,7 @@
-                            [6,  36,  90,  120, 90,  36,  6],
-                            [1,  6,   15,  20,  15,  6,   1]]
-             else:
--                print "factors for filter size", filter_size, "not defined!"
-+                print("factors for filter size", filter_size, "not defined!")
-                 factors = 0
- 
-             # Filter a shadow.
-@@ -269,7 +269,7 @@
- 
- if __name__=='__main__':
-     if len(sys.argv) < 5:
--        print "usage: " + sys.argv[0] + " (font-name) (font-size) (texture-width) (output-file)"
-+        print("usage: " + sys.argv[0] + " (font-name) (font-size) (texture-width) (output-file)")
-         sys.exit(0)
- 
-     out_filename = sys.argv[4]
-@@ -286,17 +286,17 @@
-     
-     texture_width = int(sys.argv[3])
-     font_point_height = s.get_height()
--    print "Font texture width =", texture_width
--    print "Line height =", font_point_height, "pt"
--    print "Font size =", point_size, "pt"
-+    print("Font texture width =", texture_width)
-+    print("Line height =", font_point_height, "pt")
-+    print("Font size =", point_size, "pt")
-     
-     ascent = s.get_ascent()
-     descent = s.get_descent()
--    print "Ascent =", ascent, "pt  Descent =", descent, "pt"
--    
--    print "Shadow filter is sized %i for this font." % s.shadow_filter_size()
-+    print("Ascent =", ascent, "pt  Descent =", descent, "pt")
-+    
-+    print("Shadow filter is sized %i for this font." % s.shadow_filter_size())
-     border_size = s.border_size()
--    print "Glyph borders are %i pixels wide." % border_size
-+    print("Glyph borders are %i pixels wide." % border_size)
-     
-     rover = (0, 0)
-     line_height = 0
-@@ -304,7 +304,7 @@
-     used_pixels = 0
-     
-     # Only the basic ASCII set, and some specific characters.
--    char_range = range(0x20, 0x7F) + [0x96, 0x97, 0xA3, 0xA4, 0xA9, 0xB0, 0xB1]
-+    char_range = list(range(0x20, 0x7F)) + [0x96, 0x97, 0xA3, 0xA4, 0xA9, 0xB0, 0xB1]
-     for code in char_range: 
-         glyph = Glyph(code)
-         try:
-@@ -320,7 +320,7 @@
-                 # No, move to the new row.
-                 rover = (0, rover[1] + line_height)
-                 texture_height += line_height
--                print "Finished a %i pixels tall line." % line_height
-+                print("Finished a %i pixels tall line." % line_height)
-                 line_height = 0
-             
-             glyph.pos = rover
-@@ -332,20 +332,20 @@
-             glyphs.append(glyph)
-         #except Exception, x:
-         except KeyboardInterrupt:
--            print "Code %i: Failed to render." % code
--            print x
--        
--    print "Finished rendering %i glyphs." % len(glyphs)
-+            print("Code %i: Failed to render." % code)
-+            print(x)
-+        
-+    print("Finished rendering %i glyphs." % len(glyphs))
-     actual_line_height = glyphs[0].dims[1] - border_size*2
--    print "Actual line height is %i pixels." % actual_line_height
--    
--    print "Size of the finished texture is %i x %i." % (texture_width, texture_height)
-+    print("Actual line height is %i pixels." % actual_line_height)
-+    
-+    print("Size of the finished texture is %i x %i." % (texture_width, texture_height))
-         
-     actual_height = pow2(texture_height)
-     total_pixels = texture_width * actual_height
-     
--    print "Unused texture area: %.2f %%" % (100*(1.0 - used_pixels/float(total_pixels)))
--    print "Writing output to file: %s" % out_filename
-+    print("Unused texture area: %.2f %%" % (100*(1.0 - used_pixels/float(total_pixels))))
-+    print("Writing output to file: %s" % out_filename)
-     
-     out = file(out_filename, 'wb')
-     
-@@ -365,10 +365,10 @@
-     scale = float(actual_line_height) / font_point_height
-     pixel_ascent = int(math.ceil(scale * ascent))
-     pixel_descent = int(math.ceil(scale * descent))
--    print "    Pixel ascent/descent:", pixel_ascent, '/', pixel_descent
-+    print("    Pixel ascent/descent:", pixel_ascent, '/', pixel_descent)
-     
-     pixel_line_height = int(scale * font_point_height)
--    print "    Pixel line height:", pixel_line_height
-+    print("    Pixel line height:", pixel_line_height)
-     
-     # Ascent and descent.
-     out.write(struct.pack('<HHH', pixel_line_height, pixel_ascent, pixel_descent))
-@@ -379,7 +379,7 @@
-                               g.dims[0], g.dims[1]))
- 
-     # Glyph map.
--    print "    Writing glyph map..."
-+    print("    Writing glyph map...")
-     for y in range(texture_height):
-         for x in range(texture_width):
-             pixel = find_pixel(glyphs, x, y)
---- ./build/scripts/packres.py	(original)
-+++ ./build/scripts/packres.py	(refactored)
-@@ -6,8 +6,8 @@
- import sys, os, os.path, zipfile
- 
- if len(sys.argv) < 2:
--    print "Usage: %s pk3-target-dir" % sys.argv[0]
--    print "(run in build/scripts/)"
-+    print("Usage: %s pk3-target-dir" % sys.argv[0])
-+    print("(run in build/scripts/)")
-     sys.exit(0)
- 
- # Check quiet flag.
-@@ -27,7 +27,7 @@
-         self.files += fileNamesArray
-         
-     def msg(self, text):
--        if not quietMode: print text
-+        if not quietMode: print(text)
-         
-     def create(self, name):
-         full_name = os.path.join(target_dir, name)
-@@ -61,7 +61,7 @@
-                 process_dir(full_src, dest)
-             
-         # Write it out.
--        print "Created %s (with %i files)." % (os.path.normpath(full_name), len(pk3.namelist()))
-+        print("Created %s (with %i files)." % (os.path.normpath(full_name), len(pk3.namelist())))
-         pk3.close()
- 
- # First up, doomsday.pk3.
---- ./build/scripts/wadcompiler.py	(original)
-+++ ./build/scripts/wadcompiler.py	(refactored)
-@@ -49,7 +49,7 @@
-         self.type = self.file.read(4)
-         count = struct.unpack('<I', self.file.read(4))[0]
-         info_offset = struct.unpack('<I', self.file.read(4))[0]
--        print "%s, type=%s, count=%i, info_offset=%i" % (self.file_name, self.type, count, info_offset)
-+        print("%s, type=%s, count=%i, info_offset=%i" % (self.file_name, self.type, count, info_offset))
-         self.lumps = []
-         # Read the info table.
-         self.file.seek(info_offset)
-@@ -68,7 +68,7 @@
-             self.lumps.append( Lump(info[2], data, info[0]) )
-         
-     def write(self):
--        print 'writing', self.file_name
-+        print('writing', self.file_name)
-         self.file.truncate()
-         self.file.seek(0)
-         # Type.
-@@ -104,17 +104,17 @@
-         
-     def set_type(self, new_type):
-         if len(new_type) != 4:
--            print "'%s' is not a valid type. Must have 4 chars." % new_type
-+            print("'%s' is not a valid type. Must have 4 chars." % new_type)
-         else:
--            print 'setting type to %s' % new_type
-+            print('setting type to %s' % new_type)
-         self.type = new_type
-         
-     def list(self):
-         for i in range(len(self.lumps)):
-             lump = self.lumps[i]
--            print "%5i -- %-8s (at %8i, %8i bytes)" % (i, lump.name, lump.offset, 
--                                                       len(lump.data))
--        print "%i lumps total." % len(self.lumps)
-+            print("%5i -- %-8s (at %8i, %8i bytes)" % (i, lump.name, lump.offset, 
-+                                                       len(lump.data)))
-+        print("%i lumps total." % len(self.lumps))
-         
-     def insert(self, at_lump, names):
-         # Where to insert?
-@@ -128,13 +128,13 @@
-                     at = i
-                     break
-         if at == -1:
--            print "could not find insert point, aborting"
-+            print("could not find insert point, aborting")
-             return
--        print "inserting at index %i..." % at
-+        print("inserting at index %i..." % at)
-         
-         for name in names:
-             real, arch = split_name(name)
--            print "inserting %s as %s" % (real, valid_lump_name(arch))
-+            print("inserting %s as %s" % (real, valid_lump_name(arch)))
-             self.lumps.insert(at, Lump(valid_lump_name(arch), 
-                                        file(real, 'rb').read(), 0))
-     
-@@ -164,28 +164,28 @@
-                             break
-                 else:
-                     nice_name += ext
--                print "extracting", lump.name, "(%i bytes) as %s" % (len(lump.data), nice_name)
-+                print("extracting", lump.name, "(%i bytes) as %s" % (len(lump.data), nice_name))
-                 f = file(nice_name, 'wb')
-                 f.write(lump.data)
-                 f.close()
- 
- 
- def usage():
--    print 'Usage: %s [command] [wad] [files]' % sys.argv[0]
--    print 'command = l(ist) | c(reate PWAD) | C(reate IWAD) | x(tract) | a(ppend) | i(nsert) | t(ype)'
--    print 'Examples:'
--    print '%s l some.wad' % sys.argv[0]
--    print '%s c new.wad LUMP1 LUMP2 LUMP3' % sys.argv[0]
--    print '%s i LUMP2 some.wad LUMP5 LUMP6 LUMP7 (at LUMP2)' % sys.argv[0]
--    print '%s a existing.wad LUMP4 LUMP5' % sys.argv[0]
--    print '%s x existing.wad (extracts all lumps)' % sys.argv[0]
--    print '%s x existing.wad LUMP4 (extracts selected lumps)' % sys.argv[0]
--    print '%s t existing.wad IWAD' % sys.argv[0]
--    print 'You can specify files as realfilename@LUMPNAME.'
-+    print('Usage: %s [command] [wad] [files]' % sys.argv[0])
-+    print('command = l(ist) | c(reate PWAD) | C(reate IWAD) | x(tract) | a(ppend) | i(nsert) | t(ype)')
-+    print('Examples:')
-+    print('%s l some.wad' % sys.argv[0])
-+    print('%s c new.wad LUMP1 LUMP2 LUMP3' % sys.argv[0])
-+    print('%s i LUMP2 some.wad LUMP5 LUMP6 LUMP7 (at LUMP2)' % sys.argv[0])
-+    print('%s a existing.wad LUMP4 LUMP5' % sys.argv[0])
-+    print('%s x existing.wad (extracts all lumps)' % sys.argv[0])
-+    print('%s x existing.wad LUMP4 (extracts selected lumps)' % sys.argv[0])
-+    print('%s t existing.wad IWAD' % sys.argv[0])
-+    print('You can specify files as realfilename@LUMPNAME.')
-    
- # Call main function.
--print 'WAD Compiler by skyjake@users.sourceforge.net'
--print '$Date$'
-+print('WAD Compiler by skyjake@users.sourceforge.net')
-+print('$Date$')
- 
- # Check the args.
- if len(sys.argv) < 3:
-@@ -219,7 +219,7 @@
-     try:
-         wad = Wad(wad_name, mode)
-     except:
--        print 'Failure to open %s.' % wad_name
-+        print('Failure to open %s.' % wad_name)
-         import traceback
-         traceback.print_exc()
-         sys.exit(2)
---- ./engine/scripts/makedmt.py	(original)
-+++ ./engine/scripts/makedmt.py	(refactored)
-@@ -118,7 +118,7 @@
-             # Translate the type into a real C type.
-             if '_s' in c_type:
-                 c_type = 'struct ' + c_type
--            for symbol, real in type_replacements.items():
-+            for symbol, real in list(type_replacements.items()):
-                 c_type = c_type.replace(symbol, real)
-             
-             # Add some visual padding to align the members.