diff options
Diffstat (limited to 'dev-python/python-distutils-extra')
5 files changed, 3 insertions, 139 deletions
diff --git a/dev-python/python-distutils-extra/Manifest b/dev-python/python-distutils-extra/Manifest index 7ea1a7d98796..b5f3c60494d6 100644 --- a/dev-python/python-distutils-extra/Manifest +++ b/dev-python/python-distutils-extra/Manifest @@ -1,7 +1,3 @@ -AUX python-distutils-extra-2.44-skip-build.patch 2560 BLAKE2B 2c027fe6875b1b0b94f7a40b521bfdf226be5add5634958395c637918363ea6ad98d82b7befbd95b3c566581719cd316afbf487ce30683427eddde4d49ff2818 SHA512 07808a920eeb5b1519778bcc9dd24186715b90b82b32b5c21a2e1754e6cb89057c3da856a250874777311fdd38de277161999f50e03af7a60fcc9b295450469f -AUX python-distutils-extra-2.44-test.patch 1020 BLAKE2B 5818c26d89980d5f1608a9d0ed59f4ebedecc942d5eee599a78b77ff331244b4969d265390c9e6b6dddd3a0886f2a39eaf7f4e7f631ab6dab9fcdd5dfc02cdc5 SHA512 3381a8ca6cd87635a260f37d349204cb5112718f7a2aa13b384d1c3622fa3e61685c2e4bdbd15e7f8421d2d8554a13cabbfd490e17975d5aa7084c293b161c55 -DIST python-distutils-extra-2.44.tar.bz2 37687 BLAKE2B 3d7e3ad277440bfb6fbade8b890b95aad37589700b69a26ec9a5c30e97491871bc8c8f82b540131859d2ce82cebd3758f29ca510abe28046ffcaa0e7240fad3e SHA512 517222b4e34efba730db53ffeee8b8c8d96bd9d1b6044e6ca84c0f2c1d5c0e044240b899d460c50295615c94c513f7e57db3e34e5db6588a01ec92a73999f822 DIST python-distutils-extra-2.45.tar.bz2 38094 BLAKE2B b8c0adcb92d07e087e10389c9671e9eca78a9a634d0092c1633e184fb9d128b006903ce8f2c9deb504b3d1557a8afc78e3edea7f1a2e95734c55099b4a21dd41 SHA512 04d2be290726d7ceed599031bfa960468c6a8654c8d9105dd77cb5744f6908d1c9a6732095692aebde1f1e042ef70b2695d41586663e4d539ee96247a39f02a1 -EBUILD python-distutils-extra-2.44-r1.ebuild 1082 BLAKE2B e466ccbb2ca635c9d090ecc6a9e80181558ee4918bf1d6ca2a04df7b67775d0c00d9b6bd2a35fef3d9e6983054f9182dba0129cee05df61351210f239c7f41ec SHA512 17fdf960c10b6654bd19c2fac3d72497d3254fb44db577488a0e84221a968cf16665b3c6e059e1d0fc7016c8d0d1e79e3a755b54c8770dd1534ae9728ff299e0 -EBUILD python-distutils-extra-2.45.ebuild 920 BLAKE2B aa6eff79bbacae0546157626555ba8b46de2d7d12439fd0b761b87d649621e12f48a103842993a173794d7acb7f1a303afaa3bdc1d50dde0d4d7e35904406ac6 SHA512 689820557953e0e5dc7ef162ba8c35184a3cea23d33215445c8b6126c7cd47b86bba4f5129646a4f42dd1eed50986f3b55b07a07a8a06e406ff083f5205ddd91 +EBUILD python-distutils-extra-2.45.ebuild 907 BLAKE2B 0cba3536f3809dce9b6ab9d34302d294042be4f0dd8b99dc3b1f68663a0f71ea80d212c0528a20e1bdbd46b2a7832dc91a49a8e2b571df18e07cae0267b34209 SHA512 824eb2f000b947a714fda7ae31bb562446121807d6b12e786b7adf527ff3beabef8ddf65d4838efc1f766ebe10b4774fe619888306915b3db5a935d9f69a6aff MISC metadata.xml 339 BLAKE2B c7a822f45ad521df2cf6837bdc46e1e8473d8fac77428f80561dfd518b84b47353a37064bd0b9ad1e77441e7f376f0f005755d9c07c67e742c38b7dda02e7348 SHA512 2b8f9ffa8823ba2e9f1811782e17e8a6b3011c2096454b3dfa9373d085b4404f6a0afd1d8d9346adedaa01e09f4410c0d154ca74a00d770b8ad5da33a1a151a0 diff --git a/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-skip-build.patch b/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-skip-build.patch deleted file mode 100644 index f2a19990ed34..000000000000 --- a/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-skip-build.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4f5e11110ce9cc3f511c798acfc009ce5db4e9ef Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Tue, 28 Apr 2020 10:48:18 +0200 -Subject: [PATCH] Fix install_auto command with --skip-build - -python-distutils-extra seems to rely on a very bad practice of modifying -internal state (file lists) in middle of `build` commands. As a result, -if the package is installed via `build` command followed by `install ---skip-build` (since everything was built already!), most of the files -are not installed. - -Ideally, this would be resolved by making internal state updates -independent of `build` command execution. However, given that -the package is not really alive and worth the effort, let's settle -on a cheap hack of calling all `build_*` subcommands from `install` -if `--skip-build` is used. This partially reverses what standard -distutils `install` command does but it will rebuild only the data files -rather than all C extensions. - -Modify tests to use `--skip-build` unconditionally to test this better. -Testing both scenarios probably makes little sense. ---- - DistUtilsExtra/auto.py | 7 +++++++ - test/auto.py | 5 +++-- - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/DistUtilsExtra/auto.py b/DistUtilsExtra/auto.py -index ea15183..db45f7a 100644 ---- a/DistUtilsExtra/auto.py -+++ b/DistUtilsExtra/auto.py -@@ -711,6 +711,13 @@ class sdist_auto(distutils.command.sdist.sdist): - - class install_auto(distutils.command.install.install): - def run(self): -+ # run build_* subcommands to get file lists if install command -+ # won't run 'build' for us -+ if self.skip_build: -+ self.run_command('build_help') -+ self.run_command('build_i18n') -+ self.run_command('build_icons') -+ - # install files from etc/ - if os.path.isdir('etc'): - # work around a bug in copy_tree() which fails with "File exists" on -diff --git a/test/auto.py b/test/auto.py -index b9644ba..15780c6 100755 ---- a/test/auto.py -+++ b/test/auto.py -@@ -873,8 +873,9 @@ print ('import iamnota.module') - ''' - self.install_tree = tempfile.mkdtemp() - -- return self.setup_py(['install', '--no-compile', '--prefix=/usr', -- '--root=' + self.install_tree]) -+ self.setup_py(['build']) -+ return self.setup_py(['install', '--no-compile', '--skip-build', -+ '--prefix=/usr', '--root=' + self.install_tree]) - - def installed_files(self): - '''Return list of file paths in install tree.''' --- -2.26.2 - diff --git a/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-test.patch b/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-test.patch deleted file mode 100644 index b00fc32d017a..000000000000 --- a/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-test.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 33026583f3b2f59bcc415fae4c1ae84bfd058817 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 27 Apr 2020 21:25:37 +0200 -Subject: [PATCH] test: Find .egg-info file rather than guessing path (wrong) - ---- - test/auto.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/test/auto.py b/test/auto.py -index b9644ba..1d605e6 100755 ---- a/test/auto.py -+++ b/test/auto.py -@@ -734,7 +734,9 @@ print ('import iamnota.module') - # parse .egg-info - (o, e, s) = self.setup_py(['install_egg_info', '-d', self.install_tree]) - self.assertEqual(e, 'ERROR: Python module unknown not found\n') -- egg = self._installed_contents('foo-0.1.egg-info').splitlines() -+ egg_paths = [x for x in inst if x.endswith('.egg-info')] -+ self.assertEqual(len(egg_paths), 1) -+ egg = self._installed_contents(egg_paths[0].strip(os.path.sep)).splitlines() - self.assertIn('Name: foo', egg) - - # check provides --- -2.26.2 - diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild deleted file mode 100644 index a53af5d7f0fd..000000000000 --- a/dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS="rdepend" -PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} ) - -inherit distutils-r1 - -DESCRIPTION="Gettext support, themed icons and scrollkeeper-based documentation in distutils" -HOMEPAGE=" - https://salsa.debian.org/python-team/modules/python-distutils-extra - https://launchpad.net/python-distutils-extra" -SRC_URI=" - https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DOCS=( doc/{README,FAQ} ) - -BDEPEND=" - test? ( - dev-libs/gobject-introspection - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/pygobject[${PYTHON_USEDEP}] - dev-util/intltool - )" - -PATCHES=( - "${FILESDIR}"/python-distutils-extra-2.44-test.patch - "${FILESDIR}"/python-distutils-extra-2.44-skip-build.patch -) - -python_test() { - unset LINGUAS PYTHONDONTWRITEBYTECODE - "${EPYTHON}" test/auto.py -v || die "Tests fail with ${EPYTHON}" -} diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild index 426f03e80fb7..a802c7dfdbae 100644 --- a/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild +++ b/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_USE_SETUPTOOLS="rdepend" -PYTHON_COMPAT=( python2_7 python3_{6..9} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit distutils-r1 @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc x86" IUSE="test" RESTRICT="!test? ( test )" |