From ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Feb 2020 18:01:47 +0000 Subject: gentoo (leap year) resync : 29.02.2020 --- app-portage/Manifest.gz | Bin 10258 -> 10255 bytes app-portage/deltup/Manifest | 2 +- app-portage/deltup/deltup-0.4.6-r1.ebuild | 6 +- app-portage/distpatch/Manifest | 3 +- app-portage/distpatch/distpatch-0.1.2-r1.ebuild | 25 -- app-portage/distpatch/distpatch-0.1.2-r2.ebuild | 26 ++ .../files/distpatch-python3-support.patch | 420 +++++++++++++++++++++ app-portage/g-octave/Manifest | 6 +- .../files/g-octave-0.4.1-add_cave_support.patch | 88 ----- .../files/g-octave-0.4.1-fix-Makefile.patch | 12 - .../g-octave-0.4.1-fix-sourceforge-svn-root.patch | 36 -- app-portage/g-octave/g-octave-0.4.1-r6.ebuild | 81 ---- app-portage/g-octave/g-octave-0.4.1-r7.ebuild | 81 ++++ app-portage/g-sorcery/Manifest | 4 +- app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild | 2 +- app-portage/g-sorcery/g-sorcery-9999.ebuild | 2 +- app-portage/gemato/Manifest | 4 +- app-portage/gemato/gemato-14.3.ebuild | 16 +- app-portage/gemato/gemato-9999.ebuild | 13 +- app-portage/gentoolkit/Manifest | 6 +- app-portage/gentoolkit/gentoolkit-0.4.6.ebuild | 2 +- app-portage/gentoolkit/gentoolkit-0.4.7.ebuild | 2 +- app-portage/gentoolkit/gentoolkit-9999.ebuild | 2 +- app-portage/getdelta/Manifest | 2 +- app-portage/getdelta/getdelta-0.7.9-r2.ebuild | 4 +- app-portage/layman/Manifest | 6 +- app-portage/layman/layman-2.4.2-r1.ebuild | 4 +- app-portage/layman/layman-2.4.2-r2.ebuild | 4 +- app-portage/layman/layman-9999.ebuild | 4 +- app-portage/metagen/Manifest | 2 +- app-portage/metagen/metagen-0.7.2.ebuild | 2 +- app-portage/mirrorselect/Manifest | 8 +- app-portage/mirrorselect/mirrorselect-2.2.3.ebuild | 2 +- .../mirrorselect/mirrorselect-2.2.4-r1.ebuild | 2 +- .../mirrorselect/mirrorselect-2.2.6-r1.ebuild | 2 +- app-portage/mirrorselect/mirrorselect-9999.ebuild | 2 +- app-portage/porthole/Manifest | 2 +- app-portage/porthole/porthole-0.6.1-r5.ebuild | 4 +- 38 files changed, 581 insertions(+), 308 deletions(-) delete mode 100644 app-portage/distpatch/distpatch-0.1.2-r1.ebuild create mode 100644 app-portage/distpatch/distpatch-0.1.2-r2.ebuild create mode 100644 app-portage/distpatch/files/distpatch-python3-support.patch delete mode 100644 app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch delete mode 100644 app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch delete mode 100644 app-portage/g-octave/files/g-octave-0.4.1-fix-sourceforge-svn-root.patch delete mode 100644 app-portage/g-octave/g-octave-0.4.1-r6.ebuild create mode 100644 app-portage/g-octave/g-octave-0.4.1-r7.ebuild (limited to 'app-portage') diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz index be7af118a565..428fe508fece 100644 Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ diff --git a/app-portage/deltup/Manifest b/app-portage/deltup/Manifest index c03f973e6edf..6135b02e1b60 100644 --- a/app-portage/deltup/Manifest +++ b/app-portage/deltup/Manifest @@ -1,5 +1,5 @@ AUX deltup-0.4.6-cxx.patch 659 BLAKE2B 1005ff5439b96eda1f8106dc3620a00e343fd4df6f1736b9ca1b5fe6f06f8bafcc332852f7e51565179fccf8994515ce8dff19c6eb89b8263253e71132cdfdd5 SHA512 fae1d6c90a7458b0c4a7795a16ac794a506e2bd002be0be9e0772ef7a9f5174aeef35422d6ee1cca69e4dccc49b36dc732a3408d92d0c960e229935318d0033c AUX deltup-0.4.6-ldflags.patch 241 BLAKE2B 43091ce7b06d5b554183248b3e26732a00c0a7eccaaeaa7aa5dcdd4b2d11ca4f6cde707941545b9ecc13367152efd85e086f5ee94d8816ac967a79e5d29e01ad SHA512 e8b705bd581928b15523e6692648fb89f2bb0c15c565a7dee4d45292fae8aad88e9c6e83b29672825943c2bc15d8b151e57f603dd1c6577a62203249f1e96316 DIST deltup-0.4.6.tar.gz 14869 BLAKE2B d0332eca70da268f0f85718bf08f8b19da7e7e8a1868d6bb4b2edd386d498f61342538234defebbc0430cc176da13b57efc11ecd62f300eef960b62e738d3147 SHA512 196be319f31860d89654c23241edde503d4194064617970d87cb0d0a66544959bc666dd34a3bf1a42e69ddb5927420728a1e208b7bb848e935e99f3a090ffa7a -EBUILD deltup-0.4.6-r1.ebuild 915 BLAKE2B 1651ccaa2f0a066f166d75417f532100bc4aca577e17b82dcfbea34f4f4026417d9b0b8dd327e381422441ede4b3b2bc07f0876bcbd52a2ff424d46b2f15ba1d SHA512 e41bb9abe643fb6961f6b99081b318208430b6f03ada7e196bad9dd388ed7ea4a1a31b94fd12bcda1dae212c125a40c075efb8a0208a69667833e82ef032a46f +EBUILD deltup-0.4.6-r1.ebuild 910 BLAKE2B 65481b8a3acdea5d12056c14ab8d796ac05694ad10d79967b1aab1365c65bb2ea1759a60017ebe074f7fcda1ae62c9bf3adf1782dace5d5c1611979fe289f9e0 SHA512 cdbd7ba84716721a97cf62a992e9380e5a786d3f8f70bed32ce86e48e4b569de3d53f62b8f6f0f58bb79bd6a2226e97e6c865b114924bb285fcb153bfb0229d8 MISC metadata.xml 529 BLAKE2B 32728c366ecf7e40a84e875ba3dc2e6e181faa241939ed343e23257ac7120008ec86718495a4e7866aa7037b99143360df13253bd4f8fbffd6abc78aecda7fb9 SHA512 453e074a02cbd112c17da0b4726a15f4f98ae3dd1d73b454dd09775c2db4d792a9687920c0a647940e810e4bce623b59f793dc66bf9f33d697ed3bb8cdc77790 diff --git a/app-portage/deltup/deltup-0.4.6-r1.ebuild b/app-portage/deltup/deltup-0.4.6-r1.ebuild index 9c4ebf21a658..635dc23ba668 100644 --- a/app-portage/deltup/deltup-0.4.6-r1.ebuild +++ b/app-portage/deltup/deltup-0.4.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -31,11 +31,11 @@ PATCHES=( "${FILESDIR}"/${PN}-0.4.6-cxx.patch ) -src_compile () { +src_compile() { emake CXX=$(tc-getCXX) } -src_install () { +src_install() { emake DESTDIR="${D}" PREFIX=/usr install dodoc "${S}"/../{README,ChangeLog} doman "${S}"/../deltup.1 diff --git a/app-portage/distpatch/Manifest b/app-portage/distpatch/Manifest index dbad45f122ec..96a8adc8de1c 100644 --- a/app-portage/distpatch/Manifest +++ b/app-portage/distpatch/Manifest @@ -1,3 +1,4 @@ +AUX distpatch-python3-support.patch 15542 BLAKE2B bd0e0ca9d1c77c0ddcfa254f723488ce44002258988854b5a4d911e6d919d93653d07a66f43dec63ede94d914ea98e72e8fba4f7f2510e2bae23f75447cb71ae SHA512 1384cbe023f8cbf6dd67990c1a2bc6b80c9ef9a19082e76353dc3079dbdd4e2e330b344e7292cece4587e1dccabba58fdeb4aa1cadaf2425fe143fec223c23ee DIST distpatch-0.1.2.tar.gz 19998 BLAKE2B 1ede140e1b427df8f35011a025dc81b614c1a372668e41a26bbd02a3ab084b97c504a5de8e288a9d16d75439d0e3393ac13ef8cf49d55620babcee79fd137699 SHA512 f4dd08fd69a5b2030e0b912c1153994bcc03f40af65fff185231a220c110d0e7b5a4acf402d116e9dbfef86b13d17036ca563d0fefd89bc62809e1ecc9acf1ed -EBUILD distpatch-0.1.2-r1.ebuild 635 BLAKE2B 96618d42a93a603a5b7e563d1887859ad20abb38e5783221236a6311a32abced86e835f2cb35489d1dd17dfd450b8c05d497e91d78d7ebc4bd5dc2eedabee928 SHA512 ef959c8e830250459274b17318722cf826a539bc07dc88e2f086c3021bbb32bf8401d9a21eeaa07e260f1768024514603bfcdf7cd25d10abb545a2a583e7a913 +EBUILD distpatch-0.1.2-r2.ebuild 662 BLAKE2B 124ab94ba6c49b11da24a465c86424abe8dae68d97da04b3c27895152c44fc2e091493d2d1ac8b920c77c8cec11794be035dd17304cb933bde025a226fe61cdd SHA512 b33e3dea9cdbe572cd3fed82175b00eff1af453aba2acf317a72a8dcf2a8b758c0182405e5bc647e590a54598a576a63daa47575505512de2c9340a9558c5de6 MISC metadata.xml 489 BLAKE2B 8e711ca92c6c71f69ad71dbe4253ea4ff8444c5122e408c404d0adfa9b0cbcbe61df31a9ef7f58564109a4a655bcf3fe9d4cbb1e1c5b3d5b7bfff0318355f149 SHA512 bf9e190068b60e9bcf3a857a38a155c7189d0ea00a098e2df94b152218157c03f936ab15e00038edc09aa9583cba1711a57e1a9ef17edb794fef59372b35f08a diff --git a/app-portage/distpatch/distpatch-0.1.2-r1.ebuild b/app-portage/distpatch/distpatch-0.1.2-r1.ebuild deleted file mode 100644 index f54a61631051..000000000000 --- a/app-portage/distpatch/distpatch-0.1.2-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Distfile Patching Support for Gentoo Linux (tools)" -HOMEPAGE="https://github.com/rafaelmartins/distpatch" -SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -CDEPEND=" - >=sys-apps/portage-2.1.8.3[${PYTHON_USEDEP}] - dev-python/snakeoil[${PYTHON_USEDEP}]" -DEPEND="${CDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${CDEPEND} - >=dev-util/diffball-1.0.1" diff --git a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild new file mode 100644 index 000000000000..1a7f003bbd19 --- /dev/null +++ b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) +DISTUTILS_USE_SETUPTOOLS=bdepend + +inherit distutils-r1 + +DESCRIPTION="Distfile Patching Support for Gentoo Linux (tools)" +HOMEPAGE="https://github.com/rafaelmartins/distpatch" +SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +PATCHES=( "${FILESDIR}/${PN}-python3-support.patch" ) + +DEPEND=" + >=sys-apps/portage-2.1.8.3[${PYTHON_USEDEP}] + dev-python/snakeoil[${PYTHON_USEDEP}]" +RDEPEND="${CDEPEND} + >=dev-util/diffball-1.0.1" diff --git a/app-portage/distpatch/files/distpatch-python3-support.patch b/app-portage/distpatch/files/distpatch-python3-support.patch new file mode 100644 index 000000000000..eec335633d77 --- /dev/null +++ b/app-portage/distpatch/files/distpatch-python3-support.patch @@ -0,0 +1,420 @@ +From 0274956acf4479b7346ac441fe09f2e56d575c47 Mon Sep 17 00:00:00 2001 +From: "Rafael G. Martins" +Date: Wed, 26 Feb 2020 18:22:06 +0100 +Subject: [PATCH] python3 support + +--- + distdiffer | 46 ++++++++++++++++++++++---------------------- + distpatch/chksums.py | 12 ++++++------ + distpatch/deltadb.py | 4 ++-- + distpatch/diff.py | 12 ++++++------ + distpatch/package.py | 6 +++--- + distpatch/patch.py | 4 ++-- + distpatch/stats.py | 6 +++--- + distpatcher | 32 +++++++++++++++--------------- + distpatchq | 28 +++++++++++++-------------- + 9 files changed, 75 insertions(+), 75 deletions(-) + +diff --git a/distdiffer b/distdiffer +index a2b933d..6975b5c 100755 +--- a/distdiffer ++++ b/distdiffer +@@ -73,39 +73,39 @@ def main(): + return + + if args.verbose: +- print '>>> Starting distdiffer ...\n' ++ print('>>> Starting distdiffer ...\n') + + for package in packages: + if args.verbose: +- print '>>> Package: %s' % package ++ print('>>> Package: %s' % package) + pkg = Package(db) + try: + pkg.diff(package) +- except Exception, err: +- print >> sys.stderr, str(err) ++ except Exception as err: ++ print(str(err), file=sys.stderr) + if args.verbose: +- print ' >>> Versions:' ++ print(' >>> Versions:') + for cpv in pkg.ebuilds: +- print ' %s' % cpv +- print ' >>> Deltas:' ++ print(' %s' % cpv) ++ print(' >>> Deltas:') + if len(pkg.diffs) == 0: +- print ' None\n' ++ print(' None\n') + else: + for diff in pkg.diffs: +- print ' %s -> %s' % (diff.src.fname, +- diff.dest.fname) ++ print(' %s -> %s' % (diff.src.fname, ++ diff.dest.fname)) + if len(pkg.diffs) == 0: + continue + if args.verbose: +- print ' >>> Fetching distfiles:' ++ print(' >>> Fetching distfiles:') + try: + pkg.fetch_distfiles() +- except Exception, err: +- print >> sys.stderr, str(err) +- print ++ except Exception as err: ++ print(str(err), file=sys.stderr) ++ print() + continue + if args.verbose: +- print ' >>> Generating deltas:' ++ print(' >>> Generating deltas:') + for diff in pkg.diffs: + if args.verbose: + sys.stdout.write(' %s -> %s ... ' % (diff.src.fname, +@@ -116,20 +116,20 @@ def main(): + not args.no_compress, args.force) + except DiffExists: + if args.verbose: +- print 'up2date!' +- print ' %s' % os.path.basename(diff.diff_file) +- except Exception, err: ++ print('up2date!') ++ print(' %s' % os.path.basename(diff.diff_file)) ++ except Exception as err: + if args.verbose: +- print 'failed!' +- print ' %s: %s' % (err.__class__.__name__, str(err)) ++ print('failed!') ++ print(' %s: %s' % (err.__class__.__name__, str(err))) + else: + if args.verbose: +- print 'done!' +- print ' %s' % os.path.basename(diff.diff_file) ++ print('done!') ++ print(' %s' % os.path.basename(diff.diff_file)) + db.add(diff.dbrecord) + diff.cleanup() + if args.verbose: +- print ++ print() + + if __name__ == '__main__': + main() +diff --git a/distpatch/chksums.py b/distpatch/chksums.py +index 808dc59..d3dffab 100644 +--- a/distpatch/chksums.py ++++ b/distpatch/chksums.py +@@ -26,16 +26,16 @@ class ChksumValue(object): + self._handler = get_handler(algorithm) + + def to_str(self): +- if isinstance(self.value, basestring): ++ if isinstance(self.value, str): + return self.value +- elif isinstance(self.value, long): ++ elif isinstance(self.value, int): + return self._handler.long2str(self.value) + raise ChksumException('Invalid value: %s' % self.value) + + def to_long(self): +- if isinstance(self.value, long): ++ if isinstance(self.value, int): + return self.value +- elif isinstance(self.value, basestring): ++ elif isinstance(self.value, str): + return self._handler.str2long(self.value) + raise ChksumException('Invalid value: %s' % self.value) + +@@ -69,11 +69,11 @@ class Chksum(object): + raise ChksumException('File not found: %s' % fname) + + values = get_chksums(fname, *self.algorithms) +- chksums = zip(self.algorithms, values) ++ chksums = list(zip(self.algorithms, values)) + + # if provided checksums, use them + else: +- chksums = chksums.items() ++ chksums = list(chksums.items()) + + # validate checksums, and set attributes + tmp_algorithms = list(self.algorithms) +diff --git a/distpatch/deltadb.py b/distpatch/deltadb.py +index 77d8c21..345077d 100644 +--- a/distpatch/deltadb.py ++++ b/distpatch/deltadb.py +@@ -40,7 +40,7 @@ import os + + from collections import OrderedDict + from fcntl import lockf, LOCK_EX, LOCK_UN +-from itertools import izip ++ + from shutil import rmtree + from snakeoil.chksum import get_handler + from snakeoil.fileutils import AtomicWriteFile +@@ -171,7 +171,7 @@ class DeltaDB(list): + pieces = line.split() + chksums = OrderedDict() + uchksums = OrderedDict() +- for key, value in izip(pieces[::2], pieces[1::2]): ++ for key, value in zip(pieces[::2], pieces[1::2]): + key = key.lower()[:] + mykey = key[0] == 'u' and key[1:] or key + myvalue = get_handler(mykey).str2long(value.strip()) +diff --git a/distpatch/diff.py b/distpatch/diff.py +index d5818f1..eeaf8a6 100644 +--- a/distpatch/diff.py ++++ b/distpatch/diff.py +@@ -37,11 +37,11 @@ class DiffUnsupported(Exception): + + + _supported_formats = [ +- u'.tar', +- u'.tar.gz', u'.tgz', u'.gz', +- u'.tar.bz2', u'.tbz2', u'.bz2', +- u'.tar.xz', u'.xz', +- u'.tar.lzma', u'.ĺzma', ++ '.tar', ++ '.tar.gz', '.tgz', '.gz', ++ '.tar.bz2', '.tbz2', '.bz2', ++ '.tar.xz', '.xz', ++ '.tar.lzma', '.ĺzma', + ] + + +@@ -152,7 +152,7 @@ class Diff(object): + try: + patch = Patch(self.dbrecord) + patch.reconstruct(output_dir, tmp_dir, False) +- except PatchException, err: ++ except PatchException as err: + if clean_sources: + os.unlink(self.diff_file) + raise DiffException('Delta reconstruction failed: %s' % str(err)) +diff --git a/distpatch/package.py b/distpatch/package.py +index 553fc18..3c834cc 100644 +--- a/distpatch/package.py ++++ b/distpatch/package.py +@@ -35,17 +35,17 @@ class Package(object): + diffs = [] + taken = {} + for ebuild_id in range(len(self.ebuilds) - 1): +- cpvs = self.ebuilds.keys() ++ cpvs = list(self.ebuilds.keys()) + src_cpv = cpvs[ebuild_id] + dest_cpv = cpvs[ebuild_id + 1] + src_ebuild = self.ebuilds[src_cpv] + dest_ebuild = self.ebuilds[dest_cpv] +- for src_distfile in src_ebuild.src_uri_map.keys(): ++ for src_distfile in list(src_ebuild.src_uri_map.keys()): + avg_distfile = None + avg_ebuild = None + max_avg = 0.0 + avgs = {} +- for dest_distfile in dest_ebuild.src_uri_map.keys(): ++ for dest_distfile in list(dest_ebuild.src_uri_map.keys()): + prefix = '' + suffix = '' + for i in range(min(len(src_distfile), len(dest_distfile))): +diff --git a/distpatch/patch.py b/distpatch/patch.py +index c210a5e..83eb3d6 100644 +--- a/distpatch/patch.py ++++ b/distpatch/patch.py +@@ -14,7 +14,7 @@ import portage + import posixpath + import re + +-from itertools import izip ++ + from portage.package.ebuild.fetch import fetch + from shutil import move + from subprocess import call +@@ -96,7 +96,7 @@ class Patch(object): + if self.src != DeltaDBFile(src): + raise PatchException('Bad checksum for source: %s' % \ + self.src.fname) +- for delta, delta_record in izip(deltas, self.dbrecords): ++ for delta, delta_record in zip(deltas, self.dbrecords): + if delta_record.delta != DeltaDBFile(delta): + raise PatchException('Bad checksum for delta: %s' % \ + delta_record.delta.fname) +diff --git a/distpatch/stats.py b/distpatch/stats.py +index 187f926..7716e07 100644 +--- a/distpatch/stats.py ++++ b/distpatch/stats.py +@@ -48,7 +48,7 @@ class Stats(object): + delta = float(record.delta.chksums['size']) + dest = float(record.dest.chksums['size']) + ratio.append(100 - ((delta / dest) * 100)) +- pyplot.plot(range(1, len(ratio) + 1), sorted(ratio)) ++ pyplot.plot(list(range(1, len(ratio) + 1)), sorted(ratio)) + pyplot.axes() + pyplot.xlabel('Deltas (total: %i)' % len(ratio)) + pyplot.ylabel('Percentage of savings (for compressed files)') +@@ -60,6 +60,6 @@ class Stats(object): + for record in self.deltadb: + dest.append(int(record.dest.chksums['size'])) + delta.append(int(record.delta.chksums['size'])) +- pyplot.plot(range(len(dest)), dest) +- pyplot.plot(range(len(delta)), delta) ++ pyplot.plot(list(range(len(dest))), dest) ++ pyplot.plot(list(range(len(delta))), delta) + pyplot.show() +diff --git a/distpatcher b/distpatcher +index 05980e2..984e4c2 100755 +--- a/distpatcher ++++ b/distpatcher +@@ -69,35 +69,35 @@ def main(): + return + + if args.verbose: +- print '>>> Starting distpatcher ...\n' ++ print('>>> Starting distpatcher ...\n') + + for cpv in cpv_list: + if args.verbose: + if args.distfile: +- print '>>> Distfile: %s' % cpv ++ print('>>> Distfile: %s' % cpv) + else: +- print '>>> CPV: %s' % cpv ++ print('>>> CPV: %s' % cpv) + pkg = Package(db) + if args.distfile: + pkg.patch_distfile(cpv, args.output_dir) + else: + pkg.patch(cpv, args.output_dir) + if args.verbose: +- print ' >>> Deltas:' ++ print(' >>> Deltas:') + if len(pkg.patches) == 0: +- print ' None\n' ++ print(' None\n') + else: + for patch in pkg.patches: +- print ' %s' % '\n -> '.join( +- [i.delta.fname for i in patch.dbrecords]) ++ print(' %s' % '\n -> '.join( ++ [i.delta.fname for i in patch.dbrecords])) + if len(pkg.patches) == 0: + continue + if args.verbose: +- print ' >>> Fetching deltas:' ++ print(' >>> Fetching deltas:') + for patch in pkg.patches: + patch.fetch_deltas(args.root_url, args.input_dir) + if args.verbose: +- print ' >>> Reconstructing distfiles:' ++ print(' >>> Reconstructing distfiles:') + for patch in pkg.patches: + if args.verbose: + sys.stdout.write(' %s ... ' % '\n -> '.join( +@@ -106,17 +106,17 @@ def main(): + try: + patch.reconstruct(args.input_dir, args.output_dir, + not args.no_compress) +- except PatchException, err: ++ except PatchException as err: + if args.verbose: +- print 'failed!' +- print ' %s' % str(err) ++ print('failed!') ++ print(' %s' % str(err)) + else: + if args.verbose: +- print 'done!' +- print ' %s' % \ +- os.path.basename(patch.dest.fname) ++ print('done!') ++ print(' %s' % \ ++ os.path.basename(patch.dest.fname)) + if args.verbose: +- print ++ print() + + if __name__ == '__main__': + main() +diff --git a/distpatchq b/distpatchq +index 902f6c0..e6bcebe 100755 +--- a/distpatchq ++++ b/distpatchq +@@ -48,7 +48,7 @@ def delta_fetch_size(pkg, filename, distfiles_dir=None, deltas_dir=None): + except OSError: + pass + if filename in distfiles: +- print 0 ++ print(0) + return 0 + pkg.patch_distfile(filename, distfiles_dir) + if len(pkg.patches) == 0: +@@ -62,7 +62,7 @@ def delta_fetch_size(pkg, filename, distfiles_dir=None, deltas_dir=None): + if dbrecord.delta.fname in deltas: + continue + fetch_size += int(dbrecord.delta.chksums.size.to_long()) +- print fetch_size ++ print(fetch_size) + + + def delta_verify_checksums(pkg, filename, distfiles_dir=None): +@@ -96,20 +96,20 @@ def delta_verify_checksums(pkg, filename, distfiles_dir=None): + return 0 if dest_record.uchksums == _Chksum(usrc) else 4 + + +-commands = sorted(i for i in globals().keys() if not i.startswith('_')) ++commands = sorted(i for i in list(globals().keys()) if not i.startswith('_')) + + + def usage(argv): +- print '>>> distpatch information query tool' +- print '>>> Usage: distpatchq [