[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: af12d78e6190b0b918557aab2fdfcb301b28
Author: James Le Cuirot gentoo org>
AuthorDate: Mon Apr 1 21:41:09 2024 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Apr 1 21:44:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af12d78e
dev-util/imediff2: Add Python 3.12
Signed-off-by: James Le Cuirot gentoo.org>
dev-util/imediff2/imediff2-1.1.2.1.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
index c1519e6bfc83..e2e1bb5b5818 100644
--- a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="ncurses"
inherit python-single-r1
@@ -17,7 +17,6 @@
SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
DEPEND="${PYTHON_DEPS}"
RDEPEND="${DEPEND}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/, net-misc/omnisync/, lxde-base/lxdm/, mail-client/s-nail/, ...
commit: 68c7ae1d12f497508f3268a2bba8b069cef82150 Author: Joonas Niilola gentoo org> AuthorDate: Sun Jun 25 13:46:56 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Jun 25 13:55:32 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c7ae1d */*: reassign grknight's packages, #502564 Signed-off-by: Joonas Niilola gentoo.org> dev-db/mycli/metadata.xml | 5 + dev-libs/judy/metadata.xml | 5 + dev-python/cli_helpers/metadata.xml | 4 dev-python/terminaltables/metadata.xml | 4 dev-ruby/facter/metadata.xml| 3 --- dev-util/imediff2/metadata.xml | 5 + lxde-base/lxdm/metadata.xml | 5 + mail-client/s-nail/metadata.xml | 5 + mail-filter/amavisd-milter/metadata.xml | 5 + net-misc/omnisync/metadata.xml | 5 + sys-apps/ack/metadata.xml | 4 sys-power/acpilight/metadata.xml| 5 + 12 files changed, 8 insertions(+), 47 deletions(-) diff --git a/dev-db/mycli/metadata.xml b/dev-db/mycli/metadata.xml index a84dc1414504..29ada13e241e 100644 --- a/dev-db/mycli/metadata.xml +++ b/dev-db/mycli/metadata.xml @@ -1,10 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - grkni...@gentoo.org - Brian Evans - + dbcli/mycli mycli diff --git a/dev-libs/judy/metadata.xml b/dev-libs/judy/metadata.xml index 61d3437afe43..a6a6cd45139a 100644 --- a/dev-libs/judy/metadata.xml +++ b/dev-libs/judy/metadata.xml @@ -1,10 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - grkni...@gentoo.org - Brian Evans - + judy diff --git a/dev-python/cli_helpers/metadata.xml b/dev-python/cli_helpers/metadata.xml index 35fb84a1bb89..79ba6aa529dd 100644 --- a/dev-python/cli_helpers/metadata.xml +++ b/dev-python/cli_helpers/metadata.xml @@ -1,10 +1,6 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - grkni...@gentoo.org - Brian Evans - pyt...@gentoo.org diff --git a/dev-python/terminaltables/metadata.xml b/dev-python/terminaltables/metadata.xml index 38af7ae0ae2b..2506f3e8e71c 100644 --- a/dev-python/terminaltables/metadata.xml +++ b/dev-python/terminaltables/metadata.xml @@ -1,10 +1,6 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - grkni...@gentoo.org - Brian Evans - pyt...@gentoo.org diff --git a/dev-ruby/facter/metadata.xml b/dev-ruby/facter/metadata.xml index 5e85a8995a99..1f54ed29ba4d 100644 --- a/dev-ruby/facter/metadata.xml +++ b/dev-ruby/facter/metadata.xml @@ -4,9 +4,6 @@ prometheanf...@gentoo.org - - grkni...@gentoo.org - sysad...@gentoo.org Gentoo Sysadmin Project diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml index 3ee8eee9efef..c27b2d8278c5 100644 --- a/dev-util/imediff2/metadata.xml +++ b/dev-util/imediff2/metadata.xml @@ -1,10 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - grkni...@gentoo.org - Brian Evans - + osamuaoki/imediff diff --git a/lxde-base/lxdm/metadata.xml b/lxde-base/lxdm/metadata.xml index 346eccc47865..b9095c9781d0 100644 --- a/lxde-base/lxdm/metadata.xml +++ b/lxde-base/lxdm/metadata.xml @@ -1,10 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - grkni...@gentoo.org - Brian Evans - + lxde diff --git a/mail-client/s-nail/metadata.xml b/mail-client/s-nail/metadata.xml index ac063bad5a3e..3a5e3dc2c701 100644 --- a/mail-client/s-nail/metadata.xml +++ b/mail-client/s-nail/metadata.xml @@ -1,10 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd;> - -grkni...@gentoo.org -Brian Evans - + Enable support for network protocols (POP, IMAP and SMTP). If you diff --git a/mail-filter/amavisd-milter/metadata.xml b/mail-filter/amavisd-milter/metadata.xml index a9b34c5dc3e9..f353ae51ac29 100644 --- a/mail-filter/amavisd-milter/metadata.xml +++ b/mail-filter/amavisd-milter/metadata.xml @@ -1,10 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - grkni...@gentoo.org - Brian Evans - + prehor/amavisd-milter diff --git a/net-misc/omnisync/metadata.xml b/net-misc/omnisync/metadata.xml index f5282bc8aecd..85e4ed814fa2 100644 --- a/net-misc/omnisync/metadata.xml +++ b/net-misc/omnisync/metadata.xml @@ -1,8 +1,5 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - grkni...@gentoo.org - Brian Evans - + diff --git a/sys-apps/ack/metadata.xml
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: 7c6bf4364221708a3748f1344521c1ebc5f4efef
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Jan 15 16:45:44 2023 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Jan 15 16:45:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c6bf436
dev-util/imediff2: Add Python 3.11, update metadata
Signed-off-by: James Le Cuirot gentoo.org>
dev-util/imediff2/imediff2-1.1.2.1.ebuild | 4 ++--
dev-util/imediff2/metadata.xml| 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
index 3efa6758d2a3..c1519e6bfc83 100644
--- a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="ncurses"
inherit python-single-r1
@@ -11,7 +11,7 @@ inherit python-single-r1
MY_P="${PN}_${PV}"
DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
-HOMEPAGE="https://elonen.iki.fi/code/imediff/;
+HOMEPAGE="https://github.com/osamuaoki/imediff;
SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml
index 898553d0c3fb..3ee8eee9efef 100644
--- a/dev-util/imediff2/metadata.xml
+++ b/dev-util/imediff2/metadata.xml
@@ -5,5 +5,8 @@
grkni...@gentoo.org
Brian Evans
+
+ osamuaoki/imediff
+
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: ce33d669733cb6251cab53ec3c563b79b5f2e35c
Author: James Le Cuirot gentoo org>
AuthorDate: Tue Nov 29 23:21:22 2022 +
Commit: James Le Cuirot gentoo org>
CommitDate: Tue Nov 29 23:21:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce33d669
dev-util/imediff2: Keyword 1.1.2.1 for ~arm64
Tested and working.
Signed-off-by: James Le Cuirot gentoo.org>
dev-util/imediff2/imediff2-1.1.2.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
index 5a59a527a4a8..32f81ba94a30 100644
--- a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
@@ -16,7 +16,7 @@
SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
DEPEND="${PYTHON_DEPS}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/, dev-util/imediff2/files/
commit: 16b5b03885a6220bd72c987409d430ce94eeb396
Author: Brian Evans gentoo org>
AuthorDate: Sat May 21 13:39:20 2022 +
Commit: Brian Evans gentoo org>
CommitDate: Sat May 21 13:39:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16b5b038
dev-util/imediff2: Drop old
Signed-off-by: Brian Evans gentoo.org>
dev-util/imediff2/Manifest | 1 -
dev-util/imediff2/files/1.1.2-python-3.patch | 155 ---
dev-util/imediff2/imediff2-1.1.2-r6.ebuild | 39 ---
3 files changed, 195 deletions(-)
diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
index f550529bdba8..90751ecabb58 100644
--- a/dev-util/imediff2/Manifest
+++ b/dev-util/imediff2/Manifest
@@ -1,2 +1 @@
DIST imediff2_1.1.2.1.orig.tar.gz 20393 BLAKE2B
560eef8600bac8ad302907563bd8520ef7881009c8a35c74427d0d5d9e8d4303446f1eb39c01fec201c798f286023765776a84b1e1aaa9e2d585a45870375f16
SHA512
ad0e22f5f2f16efb976a0d6d16c34798cc8aace4251a99cb7764df6841f93c2a6bb9dc8cbb59d8f3ae5a5ad7c161a05b9c3c7b36cc7bdf98eac3ef3b735ef6c4
-DIST imediff2_1.1.2.orig.tar.gz 17974 BLAKE2B
f83b6ab652b1dd044587e75e4e7551a8132e1860b14f0d85d37f35383bd161a672860162e93554cf4db844d6a4700fa1876a30874c50fcb8442b4190a9b19185
SHA512
54d196d67107283bc3339eba30acb1c60972f256a268e86da397e0bdafa05220facc7979638a6a917b0c2dc7171edc3aa6b188295c9f40e9debf87a63731e748
diff --git a/dev-util/imediff2/files/1.1.2-python-3.patch
b/dev-util/imediff2/files/1.1.2-python-3.patch
deleted file mode 100644
index 811f41583129..
--- a/dev-util/imediff2/files/1.1.2-python-3.patch
+++ /dev/null
@@ -1,155 +0,0 @@
a/imediff2 2017-11-14 09:28:57.007929569 -0500
-+++ b/imediff2 2017-11-14 10:11:12.618496692 -0500
-@@ -18,20 +18,20 @@
- # 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
- import difflib
- import getopt
--import string
- 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.errno == 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.strerror))
- 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
-
-@@ -287,9 +287,9 @@
- def sel_next( dir ):
- global sel, active_chunks
- if dir == 'up':
-- rng = range(sel-1, -1, -1)
-+ rng = list(range(sel-1, -1, -1))
- else:
-- rng = range(sel+1, len(active_chunks))
-+ rng = list(range(sel+1, len(active_chunks)))
- for j in rng:
- if active_chunks[j][1] > y and active_chunks[j][0] < y+winh:
- sel = j
-@@ -442,7 +441,7 @@
- elif c == ord('h') or c == ord('?') or c == curses.KEY_HELP:
- helpw = 0
- helph = 0
-- for l in string.split(helptext(), "%c"%10):
-+ for l in helptext().split("%c"%10):
- helpw = max(helpw, len(l))
- helph += 1
- helppad = curses.newpad(helph+2, helpw+2)
-@@ -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:
-@@ -592,15 +592,15 @@
- if launch_editor:
- assert( not editor is None )
- try:
- (of, of_name) = tempfile.mkstemp(prefix='imediff2')
--
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: aa6968f4c5473e8cb3deb9b91fc53cfec7fdc09f
Author: Brian Evans gentoo org>
AuthorDate: Sat May 21 13:37:58 2022 +
Commit: Brian Evans gentoo org>
CommitDate: Sat May 21 13:37:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa6968f4
dev-util/imediff2: Expand python targets
Closes: https://bugs.gentoo.org/845954
Signed-off-by: Brian Evans gentoo.org>
dev-util/imediff2/imediff2-1.1.2.1.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
index ea0b4c610181..5a59a527a4a8 100644
--- a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
PYTHON_REQ_USE="ncurses"
inherit python-single-r1
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: 67ed3f5cfbb81ea9467c3e159f07ae695a0f13cc
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Jun 1 06:32:27 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Jun 1 06:32:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67ed3f5c
dev-util/imediff2: amd64/x86 stable (ALLARCHES policy) wrt bug #793338
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-util/imediff2/imediff2-1.1.2.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
index 464fc4d97d2..ea0b4c61018 100644
--- a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
@@ -16,7 +16,7 @@
SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="${PYTHON_DEPS}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/files/, dev-util/imediff2/
commit: b128eb024fca796802c6b47f7ca4addbb3c9b7f8
Author: Brian Evans gentoo org>
AuthorDate: Wed Mar 10 20:31:49 2021 +
Commit: Brian Evans gentoo org>
CommitDate: Wed Mar 10 20:31:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b128eb02
dev-util/imediff2: Version bump for 1.1.2.1
Signed-off-by: Brian Evans gentoo.org>
dev-util/imediff2/Manifest | 1 +
dev-util/imediff2/files/1.1.2.1-python-3.patch | 157 +
dev-util/imediff2/imediff2-1.1.2.1.ebuild | 40 +++
3 files changed, 198 insertions(+)
diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
index ec5ecf74b82..f550529bdba 100644
--- a/dev-util/imediff2/Manifest
+++ b/dev-util/imediff2/Manifest
@@ -1 +1,2 @@
+DIST imediff2_1.1.2.1.orig.tar.gz 20393 BLAKE2B
560eef8600bac8ad302907563bd8520ef7881009c8a35c74427d0d5d9e8d4303446f1eb39c01fec201c798f286023765776a84b1e1aaa9e2d585a45870375f16
SHA512
ad0e22f5f2f16efb976a0d6d16c34798cc8aace4251a99cb7764df6841f93c2a6bb9dc8cbb59d8f3ae5a5ad7c161a05b9c3c7b36cc7bdf98eac3ef3b735ef6c4
DIST imediff2_1.1.2.orig.tar.gz 17974 BLAKE2B
f83b6ab652b1dd044587e75e4e7551a8132e1860b14f0d85d37f35383bd161a672860162e93554cf4db844d6a4700fa1876a30874c50fcb8442b4190a9b19185
SHA512
54d196d67107283bc3339eba30acb1c60972f256a268e86da397e0bdafa05220facc7979638a6a917b0c2dc7171edc3aa6b188295c9f40e9debf87a63731e748
diff --git a/dev-util/imediff2/files/1.1.2.1-python-3.patch
b/dev-util/imediff2/files/1.1.2.1-python-3.patch
new file mode 100644
index 000..aa26ad7f9db
--- /dev/null
+++ b/dev-util/imediff2/files/1.1.2.1-python-3.patch
@@ -0,0 +1,157 @@
+diff -aurN a/imediff2 b/imediff2
+--- a/imediff2 2018-10-20 13:36:19.0 -0400
b/imediff2 2021-03-03 10:03:31.121774492 -0500
+@@ -167,19 +167,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.errno == 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.strerror))
+ 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
+@@ -283,7 +283,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
+
+@@ -332,9 +332,9 @@
+ def sel_next( dir ):
+ global sel, active_chunks
+ if dir == 'up':
+- rng = range(sel-1, -1, -1)
++ rng = list(range(sel-1, -1, -1))
+ else:
+- rng = range(sel+1, len(active_chunks))
++ rng = list(range(sel+1, len(active_chunks)))
+ for j in rng:
+ if active_chunks[j][1] > y and active_chunks[j][0] < y+winh:
+ sel = j
+@@ -487,7 +487,7 @@
+ elif c == ord('h') or c == ord('?') or c == curses.KEY_HELP:
+ helpw = 0
+ helph = 0
+- for l in string.split(helptext(), "%c"%10):
++ for l in helptext().split("%c"%10):
+ helpw = max(helpw, len(l))
+ helph += 1
+ helppad = curses.newpad(helph+2, helpw+2)
+@@ -502,7 +502,7 @@
+ elif c == ord('q') or c == curses.KEY_CANCEL:
+ quitw = 0
+ quith = 0
+- for l in string.split(quittext(), "%c"%10):
++ for l in quittext().split("%c"%10):
+ quitw = max(quitw, len(l))
+ quith += 1
+ quitpad = curses.newpad(quith+2, quitw+2)
+@@ -571,33 +571,33 @@
+ try:
+ opts, args = getopt.getopt(sys.argv[1:], "hmuo:abcNtV",
+ ["help","mono","unresolved","output=", "template", "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 ("-t", "--template"):
+ try:
+ with open(config_file, 'w') as f:
+-print >>f, "# Configuration for imediff2: (Erase this file to reset)"
+-print >>f, "# "
+-print >>f, "# edit only first character of each line to 'a'...'z'"
+-print >>f, "#"
++print(("# Configuration for imediff2: (Erase this file to reset)"),
file=f)
++print(("# "), file=f)
++print(("# edit only first character of each line to 'a'...'z'"),
file=f)
++print(("#"),
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: add3da60addf37ca795f6abb3ff6b728ec5bf09c
Author: Brian Evans gentoo org>
AuthorDate: Mon Nov 30 18:17:28 2020 +
Commit: Brian Evans gentoo org>
CommitDate: Mon Nov 30 18:17:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=add3da60
dev-util/imediff2: Drop old revision
Signed-off-by: Brian Evans gentoo.org>
dev-util/imediff2/imediff2-1.1.2-r5.ebuild | 39 --
1 file changed, 39 deletions(-)
diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
deleted file mode 100644
index 367b5313edf..000
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="ncurses"
-
-inherit python-single-r1 eapi7-ver
-
-MY_P="${PN}_$(ver_rs 3 -)"
-
-DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
-HOMEPAGE="https://elonen.iki.fi/code/imediff/;
-SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
-
-src_compile() {
- # Otherwise the docs get regenerated :)
- :
-}
-
-src_install() {
- python_doscript imediff2
- dodoc AUTHORS README
- doman imediff2.1
-}
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: 002b67d13460dd5e0f5dff3e27f2b9ec087e68c6 Author: Brian Evans gentoo org> AuthorDate: Mon Nov 30 18:16:32 2020 + Commit: Brian Evans gentoo org> CommitDate: Mon Nov 30 18:16:32 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=002b67d1 dev-util/imediff2: Add ALLARCHES to metadata.xml Signed-off-by: Brian Evans gentoo.org> dev-util/imediff2/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml index 7782eaa2297..dc74e8075c1 100644 --- a/dev-util/imediff2/metadata.xml +++ b/dev-util/imediff2/metadata.xml @@ -5,4 +5,5 @@ grkni...@gentoo.org Brian Evans +
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: 406016e4f83f23a127e2909b3f1df422fe45707b
Author: Brian Evans gentoo org>
AuthorDate: Mon Nov 30 18:15:00 2020 +
Commit: Brian Evans gentoo org>
CommitDate: Mon Nov 30 18:15:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=406016e4
dev-util/imediff2: Stable 1.1.2-r6 for all arches
Closes: https://bugs.gentoo.org/757639
Signed-off-by: Brian Evans gentoo.org>
dev-util/imediff2/imediff2-1.1.2-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
b/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
index 53ef872d434..a210685fab7 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
@@ -16,7 +16,7 @@
SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="${PYTHON_DEPS}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: 48e7133b98ccbfd0cf5d3d4fdc1b41674aa1f517
Author: Brian Evans gentoo org>
AuthorDate: Tue Sep 1 16:15:02 2020 +
Commit: Brian Evans gentoo org>
CommitDate: Tue Sep 1 16:16:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e7133b
dev-util/imediff2: Revbump for 3.8 support
Signed-off-by: Brian Evans gentoo.org>
dev-util/imediff2/imediff2-1.1.2-r6.ebuild | 39 ++
1 file changed, 39 insertions(+)
diff --git a/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
b/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
new file mode 100644
index 000..53ef872d434
--- /dev/null
+++ b/dev-util/imediff2/imediff2-1.1.2-r6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="ncurses"
+
+inherit python-single-r1
+
+MY_P="${PN}_$(ver_rs 3 -)"
+
+DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
+HOMEPAGE="https://elonen.iki.fi/code/imediff/;
+SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
+
+src_compile() {
+ # Otherwise the docs get regenerated :)
+ :
+}
+
+src_install() {
+ python_doscript imediff2
+ dodoc AUTHORS README
+ doman imediff2.1
+}
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: 742150467ecca03c7aa2cae1069247326322f9df
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Mar 29 21:54:21 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Mar 29 21:54:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74215046
dev-util/imediff2: Add ~arm keyword
Tested and working.
Package-Manager: Portage-2.3.96, Repoman-2.3.20
Signed-off-by: James Le Cuirot gentoo.org>
dev-util/imediff2/imediff2-1.1.2-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
index a6ac1bd2e64..367b5313edf 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
@@ -16,7 +16,7 @@
SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="${PYTHON_DEPS}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: 3973b94df329231c969b59a4304b0d1f91b30673
Author: Brian Evans gentoo org>
AuthorDate: Thu Feb 13 14:04:48 2020 +
Commit: Brian Evans gentoo org>
CommitDate: Thu Feb 13 14:04:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3973b94d
dev-util/imediff2: Enable python 3.7
Tests OK
Signed-off-by: Brian Evans gentoo.org>
dev-util/imediff2/imediff2-1.1.2-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
index 4e119dda418..a6ac1bd2e64 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
PYTHON_REQ_USE="ncurses"
inherit python-single-r1 eapi7-ver
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: ba012d85c5fa149d4a8fff13d1ce410f8fce7431 Author: Michał Górny gentoo org> AuthorDate: Mon Feb 10 11:41:04 2020 + Commit: Michał Górny gentoo org> CommitDate: Mon Feb 10 11:54:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba012d85 dev-util/imediff2: Remove py2 Signed-off-by: Michał Górny gentoo.org> dev-util/imediff2/imediff2-1.1.2-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild index 1e0262909eb..4e119dda418 100644 --- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild +++ b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) +PYTHON_COMPAT=( python3_6 ) PYTHON_REQ_USE="ncurses" inherit python-single-r1 eapi7-ver
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: b909bb72e5979366d7e184b1b4ecc3f767056ba5
Author: Brian Evans gentoo org>
AuthorDate: Fri Aug 31 13:54:00 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Fri Aug 31 13:54:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b909bb72
dev-util/imediff2: Mark stable on amd64 and x86
Package-Manager: Portage-2.3.48, Repoman-2.3.10
dev-util/imediff2/imediff2-1.1.2-r5.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
index 52fad5519ff..6e8fc59be1f 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="ncurses"
inherit python-single-r1 eapi7-ver
-MY_P=${PN}_$(ver_rs 3 -)
+MY_P="${PN}_$(ver_rs 3 -)"
DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
HOMEPAGE="https://elonen.iki.fi/code/imediff/;
@@ -16,14 +16,14 @@
SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="${PYTHON_DEPS}"
RDEPEND="${DEPEND}"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: 4007466ddbdb917f45e0741286539e59dd99c3f3
Author: Brian Evans gentoo org>
AuthorDate: Sat Aug 11 23:38:38 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Sat Aug 11 23:38:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4007466d
dev-util/imediff2: Replace versionator with eapi7-ver
Package-Manager: Portage-2.3.45, Repoman-2.3.10
dev-util/imediff2/imediff2-1.1.2-r5.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
index 22d3fb364d1..52fad5519ff 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
@@ -6,9 +6,9 @@ EAPI=6
PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
PYTHON_REQ_USE="ncurses"
-inherit python-single-r1 versionator
+inherit python-single-r1 eapi7-ver
-MY_P=${PN}_$(replace_version_separator 3 -)
+MY_P=${PN}_$(ver_rs 3 -)
DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
HOMEPAGE="https://elonen.iki.fi/code/imediff/;
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/files/, dev-util/imediff2/
commit: 32dfd7499ed52070388283df91257bfef02abffb
Author: Brian Evans gentoo org>
AuthorDate: Tue Jul 10 14:20:33 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Tue Jul 10 14:20:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32dfd749
dev-util/imediff2: Revbump to fix errors in python 3 patch
Package-Manager: Portage-2.3.41, Repoman-2.3.9
dev-util/imediff2/files/1.1.2-python-3.patch | 68 +-
...f2-1.1.2-r4.ebuild => imediff2-1.1.2-r5.ebuild} | 0
2 files changed, 55 insertions(+), 13 deletions(-)
diff --git a/dev-util/imediff2/files/1.1.2-python-3.patch
b/dev-util/imediff2/files/1.1.2-python-3.patch
index a7b4fadf4d6..811f4158312 100644
--- a/dev-util/imediff2/files/1.1.2-python-3.patch
+++ b/dev-util/imediff2/files/1.1.2-python-3.patch
@@ -1,6 +1,6 @@
--- a/imediff2 2017-11-14 09:28:57.007929569 -0500
+++ b/imediff2 2017-11-14 10:11:12.618496692 -0500
-@@ -18,10 +18,12 @@
+@@ -18,20 +18,20 @@
# License along with the program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -15,7 +15,9 @@
import curses
import tempfile
import gettext
-@@ -31,7 +33,6 @@
+ import difflib
+ import getopt
+-import string
import types
import time
import pty
@@ -35,11 +37,11 @@
- except IOError, (error, message):
-if error == errno.ENOENT and assume_empty:
+ except IOError as e:
-+if e.error == errno.ENOENT and assume_empty:
++if e.errno == 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.stderr.write(_("Could not read '%s': %s\n") % (filename,
e.strerror))
sys.exit(3)
def strip_end_lines( txt ):
@@ -57,6 +59,27 @@
decor, color_pair] )
j+=1
+@@ -287,9 +287,9 @@
+ def sel_next( dir ):
+ global sel, active_chunks
+ if dir == 'up':
+- rng = range(sel-1, -1, -1)
++ rng = list(range(sel-1, -1, -1))
+ else:
+- rng = range(sel+1, len(active_chunks))
++ rng = list(range(sel+1, len(active_chunks)))
+ for j in rng:
+ if active_chunks[j][1] > y and active_chunks[j][0] < y+winh:
+ sel = j
+@@ -442,7 +441,7 @@
+ elif c == ord('h') or c == ord('?') or c == curses.KEY_HELP:
+ helpw = 0
+ helph = 0
+- for l in string.split(helptext(), "%c"%10):
++ for l in helptext().split("%c"%10):
+ helpw = max(helpw, len(l))
+ helph += 1
+ helppad = curses.newpad(helph+2, helpw+2)
@@ -512,21 +513,21 @@
try:
opts, args = getopt.getopt(sys.argv[1:], "hmuo:abcNV",
@@ -65,26 +88,44 @@
- print _("Error: ") + str(e)
- print usagetext()
+except getopt.GetoptError as e:
-+ print(_("Error: ") + str(e))
-+ print(usagetext())
++ print((_("Error: ") + str(e)))
++ print((usagetext()))
sys.exit(2)
for o, a in opts:
if o in ("-h", "--help"):
-print usagetext()
-+print(usagetext())
++print((usagetext()))
sys.exit()
elif o in ("-V", "--version"):
-print "%s %s" % (PACKAGE, VERSION)
-+print("%s %s" % (PACKAGE, VERSION))
++print(("%s %s" % (PACKAGE, VERSION)))
sys.exit()
if len(args)<2:
- print usagetext()
-+ print(usagetext())
++ print((usagetext()))
sys.exit(2)
for o, a in opts:
+@@ -592,15 +592,15 @@
+ if launch_editor:
+ assert( not editor is None )
+ try:
+ (of, of_name) = tempfile.mkstemp(prefix='imediff2')
+- os.write( of, output )
++ os.write( of, output.encode() )
+ os.close(of)
+ time.sleep(0.1) # make the change visible - many editor look a lot like
imediff2
+ editor_ret = os.system('%s %s' % (editor, of_name))
+ time.sleep(0.1)
+ if editor_ret == 0:
+ new_b_lines = read_lines(of_name)
+-if string.join(new_b_lines, '') == output:
++if ''.join(new_b_lines) == output:
+ chunk_mode = 'old'
+ elif new_b_lines != lines_a:
+ lines_b = new_b_lines
@@ -607,8 +608,8 @@
else:
chunks = 'old'
@@ -92,7 +133,7 @@
-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));
++ sys.stderr.write(_("Could not write to '%s': %s\n") % (of_name,
e.strerror));
if not launch_editor:
break
@@ -101,13 +142,14 @@
try:
if ofile is not None:
- of = file(ofile, 'wb')
-+ of = open(ofile, 'w')
- of.write( output )
++ of = open(ofile, 'wb')
+- of.write( output )
++ of.write( output.encode() )
of.close()
sys.exit(0)
- except IOError, (error, message):
-sys.stderr.write(_("Could not write to '%s': %s\n") % (ofile, message));
+ except
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: 8852af0bb98206c59057fa90044f1c2507b90791 Author: Brian Evans gentoo org> AuthorDate: Mon Jun 25 13:19:05 2018 + Commit: Brian Evans gentoo org> CommitDate: Mon Jun 25 13:28:29 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8852af0b dev-util/imediff2: Add myself as a maintainer dev-util/imediff2/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml index 5c23291b521..b01015a7e56 100644 --- a/dev-util/imediff2/metadata.xml +++ b/dev-util/imediff2/metadata.xml @@ -5,4 +5,8 @@ dev-z...@gentoo.org Tiziano Müller + + grkni...@gentoo.org + Brian Evans +
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/, dev-util/imediff2/files/
commit: f17145ba725c8f46cf096fc5bbd425b4a09136ab
Author: Brian Evans gentoo org>
AuthorDate: Mon Jun 25 13:25:31 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Mon Jun 25 13:28:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f17145ba
dev-util/imediff2: Add python 3 support
Closes: https://bugs.gentoo.org/650050
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-util/imediff2/files/1.1.2-python-3.patch | 113 +++
dev-util/imediff2/imediff2-1.1.2-r4.ebuild | 39 +
2 files changed, 152 insertions(+)
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 000..a7b4fadf4d6
--- /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-r4.ebuild
b/dev-util/imediff2/imediff2-1.1.2-r4.ebuild
new file mode 100644
index 000..22d3fb364d1
--- /dev/null
+++ b/dev-util/imediff2/imediff2-1.1.2-r4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_REQ_USE="ncurses"
+
+inherit python-single-r1 versionator
+
+MY_P=${PN}_$(replace_version_separator 3 -)
+
+DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
+HOMEPAGE="https://elonen.iki.fi/code/imediff/;
+SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
+
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: 11a8aa42ee569a289e1e38dc8f8547fff2b1a4e4
Author: Brian Evans gentoo org>
AuthorDate: Mon Jun 25 13:27:38 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Mon Jun 25 13:28:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11a8aa42
dev-util/imediff2: Drop old revision
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-util/imediff2/imediff2-1.1.2-r3.ebuild | 37 --
1 file changed, 37 deletions(-)
diff --git a/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
b/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
deleted file mode 100644
index 9c30e2e0359..000
--- a/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses"
-
-inherit python-single-r1 versionator
-
-MY_P=${PN}_$(replace_version_separator 3 -)
-
-DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
-HOMEPAGE="https://elonen.iki.fi/code/imediff/;
-SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
- # Otherwise the docs get regenerated :)
- :
-}
-
-src_install() {
- python_doscript imediff2
- dodoc AUTHORS README
- doman imediff2.1
-}
[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/
commit: 6fbe68fee60da84b521f8f1f55b17bed6b600d2b
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Fri Apr 27 07:46:40 2018 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue May 1 21:15:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fbe68fe
dev-util/imediff2: use HTTPS.
Closes: https://github.com/gentoo/gentoo/pull/8158
dev-util/imediff2/imediff2-1.1.2-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
b/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
index 7291ee8d470..9c30e2e0359 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -11,7 +11,7 @@ inherit python-single-r1 versionator
MY_P=${PN}_$(replace_version_separator 3 -)
DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
-HOMEPAGE="http://elonen.iki.fi/code/imediff/;
+HOMEPAGE="https://elonen.iki.fi/code/imediff/;
SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
LICENSE="GPL-2"
