gentoo resync : 30.06.2018

4 files changed, 124 insertions, 4 deletions

diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
index 453f3209a9c8..b17abe1da051 100644
--- a/dev-util/imediff2/Manifest
+++ b/dev-util/imediff2/Manifest
@@ -1,3 +1,4 @@
+AUX 1.1.2-python-3.patch 3102 BLAKE2B cae5f4633e43cd6c9ee94422070d556bc1419eabf702033017d3366c618cbd88d8afcde2d68fb19dc9328170b226fe509331f6cca595c2d8d1657c6dd05c3a75 SHA512 847998b733587ff3714c9a2b482a461a29de99d836c0ad4ba5e27fdf4f53deb534369146b6ccf454ec362903058d74e8af0b3c4d660ddf59d2d769e93b6de6dd
 DIST imediff2_1.1.2.orig.tar.gz 17974 BLAKE2B f83b6ab652b1dd044587e75e4e7551a8132e1860b14f0d85d37f35383bd161a672860162e93554cf4db844d6a4700fa1876a30874c50fcb8442b4190a9b19185 SHA512 54d196d67107283bc3339eba30acb1c60972f256a268e86da397e0bdafa05220facc7979638a6a917b0c2dc7171edc3aa6b188295c9f40e9debf87a63731e748
-EBUILD imediff2-1.1.2-r3.ebuild 748 BLAKE2B 12c38a333b954d6d46719b315d5a9ae441e99fe52f275dc56130d266885ddbc8b0441ce4b7888c86c45278aa3d229c393f3ddcb7a7a5e36f0b66559c4e211c8a SHA512 37d293a96506ee1d5184287ce5222ae1cace1da406ae82a67e429ab3b524ac4db37e991918cffed5e0ecf17eb74c68be26256239af33ddcfdd90509d55fe73bc
-MISC metadata.xml 250 BLAKE2B 50c4b89c67107f8c4eba77c3b35992d381dfc6a30f5e8fb7c696f6b2cde6b7b1f90566a99ceba3df17485a88283059ef51010414e8df6c72d9e7b8c7f9ff0e27 SHA512 a57d332a86b16f67fe2896c47c6cc9ba57f602b65943080289c816a9d0f70b779f61cde882034cc1c2adda79208865dae0bf43d95deea4556e840b785e062343
+EBUILD imediff2-1.1.2-r4.ebuild 814 BLAKE2B 95c325c3a197088b415fa739553a7e0be0fd60389f4f0e2b3af82caa097adfdd3b4e751b5393282cdf2422353463d546a6d6623fe165175c9f39ab73a952afa3 SHA512 6cd0c1a6014f058ed575f5492c593b97b2472294b71e558a210601f293172a1d5a323b6b9917d93a7504d668c57a568d02454f9dee6e01cdff465026c5b7b819
+MISC metadata.xml 357 BLAKE2B fd7b99a53b06a9ed310039486dd9c631d70ae5af05b47b42009e92b6134e52ee13e520066b8170f70b000a8eca1ca6c3c670478e393a4e36f3fe6c21187f090e SHA512 2c36e9355ac79bb027b25c63e0487299cfdf226217ea891349c4665107f6e7fb2931e56386ff1d88f16ad9e573041fc94658f61e8658d234b04bfa49c5fe902b
diff --git a/dev-util/imediff2/files/1.1.2-python-3.patch b/dev-util/imediff2/files/1.1.2-python-3.patch
new file mode 100644
index 000000000000..a7b4fadf4d66
--- /dev/null
+++ b/dev-util/imediff2/files/1.1.2-python-3.patch
@@ -0,0 +1,113 @@
+--- a/imediff2	2017-11-14 09:28:57.007929569 -0500
++++ b/imediff2	2017-11-14 10:11:12.618496692 -0500
+@@ -18,10 +18,12 @@
+ # License along with the program; if not, write to the Free Software
+ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+-VERSION = '1.1.1'
++VERSION = '1.1.2'
+ PACKAGE = 'imediff2'
+ 
+-import curses.wrapper
++import sys
++if sys.version_info<(3,0,0):
++  import curses.wrapper
+ import curses
+ import tempfile
+ import gettext
+@@ -31,7 +33,6 @@
+ import types
+ import time
+ import pty
+-import sys
+ import os
+ import errno
+ 
+@@ -121,19 +122,19 @@
+ def read_lines( filename ):
+   global assume_empty
+   try:
+-    fp = file( filename )
++    fp = open( filename )
+     l = fp.readlines()
+     fp.close()
+     return l
+-  except IOError, (error, message):
+-    if error == errno.ENOENT and assume_empty:
++  except IOError as e:
++    if e.error == errno.ENOENT and assume_empty:
+       return ""
+     else:
+-      sys.stderr.write(_("Could not read '%s': %s\n") % (filename, message))
++      sys.stderr.write(_("Could not read '%s': %s\n") % (filename, e.message))
+       sys.exit(3)
+ 
+ def strip_end_lines( txt ):
+-  return string.replace(string.replace(txt,"%c"%10,""),"%c"%13,"")
++  return txt.replace("%c"%10,"").replace("%c"%13,"")
+ 
+ def main(stdscr, lines_a, lines_b, start_mode):
+   global sel, active_chunks, x,y, lines, textpad, contw,conth
+@@ -237,7 +238,7 @@
+         active_chunks.append( [j, j+len(line_list), i] )
+ 
+       for l in line_list:
+-        lines.append( [string.expandtabs(strip_end_lines(l)),
++        lines.append( [strip_end_lines(l).expandtabs(),
+           decor, color_pair] )
+         j+=1
+ 
+@@ -512,21 +513,21 @@
+ try:
+   opts, args = getopt.getopt(sys.argv[1:], "hmuo:abcNV",
+     ["help","mono","unresolved","output=", "version", "new-file"])
+-except getopt.GetoptError, e:
+-  print _("Error: ") + str(e)
+-  print usagetext()
++except getopt.GetoptError as e:
++  print(_("Error: ") + str(e))
++  print(usagetext())
+   sys.exit(2)
+ 
+ for o, a in opts:
+   if o in ("-h", "--help"):
+-    print usagetext()
++    print(usagetext())
+     sys.exit()
+   elif o in ("-V", "--version"):
+-    print "%s %s" % (PACKAGE, VERSION)
++    print("%s %s" % (PACKAGE, VERSION))
+     sys.exit()
+ 
+ if len(args)<2:
+-  print usagetext()
++  print(usagetext())
+   sys.exit(2)
+ 
+ for o, a in opts:
+@@ -607,8 +608,8 @@
+         else:
+           chunks = 'old'
+       os.unlink(of_name)
+-    except IOError, (error, message):
+-      sys.stderr.write(_("Could not write to '%s': %s\n") % (of_name, message));
++    except IOError as e:
++      sys.stderr.write(_("Could not write to '%s': %s\n") % (of_name, e.message));
+ 
+   if not launch_editor:
+     break
+@@ -619,11 +620,11 @@
+ else:
+   try:
+     if ofile is not None:
+-      of = file(ofile, 'wb')
++      of = open(ofile, 'w')
+       of.write( output )
+       of.close()
+     sys.exit(0)
+-  except IOError, (error, message):
+-    sys.stderr.write(_("Could not write to '%s': %s\n") % (ofile, message));
++  except IOError as e:
++    sys.stderr.write(_("Could not write to '%s': %s\n") % (ofile, e.message));
+ 
+ sys.exit(3)
diff --git a/dev-util/imediff2/imediff2-1.1.2-r3.ebuild b/dev-util/imediff2/imediff2-1.1.2-r4.ebuild
index 9c30e2e03597..22d3fb364d12 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-single-r1 versionator
@@ -25,6 +25,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 S=${WORKDIR}/${PN}
 
+PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
+
 src_compile() {
 	# Otherwise the docs get regenerated :)
 	:
diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml
index 5c23291b5215..b01015a7e56c 100644
--- a/dev-util/imediff2/metadata.xml
+++ b/dev-util/imediff2/metadata.xml
@@ -5,4 +5,8 @@
 		<email>dev-zero@gentoo.org</email>
 		<name>Tiziano Müller</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>grknight@gentoo.org</email>
+		<name>Brian Evans</name>
+	</maintainer>
 </pkgmetadata>