summaryrefslogtreecommitdiff
path: root/dev-util/imediff
diff options
context:
space:
mode:
authorroot <root@alpha.trunkmasters.com>2026-06-12 11:50:53 -0500
committerroot <root@alpha.trunkmasters.com>2026-06-12 11:50:53 -0500
commit290aebdea65a02557706eaeda477fef0437b6a48 (patch)
treef87a939169a508a2e943570501b64cc16b411cda /dev-util/imediff
parent6783ddcd4b73d9ce586a71770caed352bec93b16 (diff)
downloadbaldeagleos-repo-290aebdea65a02557706eaeda477fef0437b6a48.tar.gz
baldeagleos-repo-290aebdea65a02557706eaeda477fef0437b6a48.tar.xz
baldeagleos-repo-290aebdea65a02557706eaeda477fef0437b6a48.zip
Adding metadata
Diffstat (limited to 'dev-util/imediff')
-rw-r--r--dev-util/imediff/Manifest3
-rw-r--r--dev-util/imediff/files/1.1.2.1-python-3.patch157
-rw-r--r--dev-util/imediff/imediff-1.1.2.1.ebuild40
-rw-r--r--dev-util/imediff/imediff-3.4.0.ebuild35
-rw-r--r--dev-util/imediff/imediff-3.4.1.ebuild30
-rw-r--r--dev-util/imediff/metadata.xml6
6 files changed, 0 insertions, 271 deletions
diff --git a/dev-util/imediff/Manifest b/dev-util/imediff/Manifest
deleted file mode 100644
index d557b22fa096..000000000000
--- a/dev-util/imediff/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST imediff-3.4.0.tar.gz 98338 BLAKE2B 9ca95917bae7222a7298c23fb2ccac52273f786b3486524d40808dd609f5581f0be591b2b5b9cc1efa149811f7ce0b1aa3a2e642697cd424e94d9da672af46dd SHA512 abfa3614c884443df2ab7941a3e92e2753efe042d5f4ce9a6c50d1851f16a3b45ea1602746ccee71f5f4e7be506e8c451324756857cd3b9669a3bf2e2a2388f3
-DIST imediff-3.4.1.tar.gz 98759 BLAKE2B 1bada99f611a177bde5d1bc9821be25220c2cf75642a621fe9a65d694c9f0a21ca0448bafc22af46832fe7a402b9e6c10f8c714008d811b039d17caf922d2583 SHA512 9f5dd99495119c98cb4630c25bbdde5fb0af3ed50e10ba1794318e296a8be99c7a0b05f3afbac335f31ddfb075d96750bdc4ef8fb7072c59529ae45233aeb416
-DIST imediff2_1.1.2.1.orig.tar.gz 20393 BLAKE2B 560eef8600bac8ad302907563bd8520ef7881009c8a35c74427d0d5d9e8d4303446f1eb39c01fec201c798f286023765776a84b1e1aaa9e2d585a45870375f16 SHA512 ad0e22f5f2f16efb976a0d6d16c34798cc8aace4251a99cb7764df6841f93c2a6bb9dc8cbb59d8f3ae5a5ad7c161a05b9c3c7b36cc7bdf98eac3ef3b735ef6c4
diff --git a/dev-util/imediff/files/1.1.2.1-python-3.patch b/dev-util/imediff/files/1.1.2.1-python-3.patch
deleted file mode 100644
index aa26ad7f9dbb..000000000000
--- a/dev-util/imediff/files/1.1.2.1-python-3.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff -aurN a/imediff2 b/imediff2
---- a/imediff2 2018-10-20 13:36:19.000000000 -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, "# <command_key_in_action> <command_key_in_manpage>"
-- 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(("# <command_key_in_action> <command_key_in_manpage>"), file=f)
-+ print(("# edit only first character of each line to 'a'...'z'"), file=f)
-+ print(("#"), file=f)
- for k in kcvalues:
-- print >>f, "%s %s" % (k , k)
-+ print(("%s %s" % (k , k)), file=f)
- except:
-- print "%s not writable, aborting" % config_file
-+ print(("%s not writable, aborting" % config_file))
- 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:
-@@ -692,14 +695,14 @@
- 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
-@@ -707,8 +710,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.strerror));
-
- if not launch_editor:
- break
-@@ -719,11 +722,11 @@
- else:
- try:
- if ofile is not None:
-- of = file(ofile, 'wb')
-- of.write( output )
-+ of = open(ofile, 'wb')
-+ 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 IOError as e:
-+ sys.stderr.write(_("Could not write to '%s': %s\n") % (ofile, e.strerror));
-
- sys.exit(3)
diff --git a/dev-util/imediff/imediff-1.1.2.1.ebuild b/dev-util/imediff/imediff-1.1.2.1.ebuild
deleted file mode 100644
index 3d6e3e81cc1f..000000000000
--- a/dev-util/imediff/imediff-1.1.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{13..14} )
-PYTHON_REQ_USE="ncurses"
-
-inherit python-single-r1
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}_${PV}"
-
-DESCRIPTION="2-way/3-way merge tool (CLI, Ncurses)"
-HOMEPAGE="https://github.com/osamuaoki/imediff"
-SRC_URI="mirror://debian/pool/main/i/${MY_PN}/${MY_P}.orig.tar.gz"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
-
-src_compile() {
- # Otherwise the docs get regenerated :)
- :
-}
-
-src_install() {
- python_doscript imediff2
- dobin git-ime
- dodoc AUTHORS README.md
- doman imediff2.1 git-ime.1
-}
diff --git a/dev-util/imediff/imediff-3.4.0.ebuild b/dev-util/imediff/imediff-3.4.0.ebuild
deleted file mode 100644
index 83fb0a6b5c52..000000000000
--- a/dev-util/imediff/imediff-3.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="2-way/3-way merge tool (CLI, Ncurses)"
-HOMEPAGE="https://github.com/osamuaoki/imediff"
-SRC_URI="https://github.com/osamuaoki/${PN}/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${PN}-upstream-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-distutils_enable_tests unittest
-
-src_install() {
- distutils-r1_src_install
- rm "${ED}"/usr/bin/imediff_install || die
- python_doscript "${ED}"/usr/bin/imediff
- newbin usr/bin/git-ime.in git-ime
- doman usr/share/man/man1/imediff.1 usr/share/man/man1/git-ime.1
-}
diff --git a/dev-util/imediff/imediff-3.4.1.ebuild b/dev-util/imediff/imediff-3.4.1.ebuild
deleted file mode 100644
index c2bc6e8dca53..000000000000
--- a/dev-util/imediff/imediff-3.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="2-way/3-way merge tool (CLI, Ncurses)"
-HOMEPAGE="https://github.com/osamuaoki/imediff"
-SRC_URI="https://github.com/osamuaoki/${PN}/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-upstream-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-
-distutils_enable_tests unittest
-
-src_install() {
- distutils-r1_src_install
- rm "${ED}"/usr/bin/imediff_install || die
- python_doscript "${ED}"/usr/bin/imediff
- newbin usr/bin/git-ime.in git-ime
- doman usr/share/man/man1/imediff.1 usr/share/man/man1/git-ime.1
-}
diff --git a/dev-util/imediff/metadata.xml b/dev-util/imediff/metadata.xml
deleted file mode 100644
index 3a8349e6ffc5..000000000000
--- a/dev-util/imediff/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
-<pkgmetadata>
- <stabilize-allarches />
- <origin>baldeagleos-repo</origin>
-</pkgmetadata>