commit: 4b2ae18a0e89693566c0ad99f1dada17ea6fb700 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Wed Mar 31 08:17:46 2021 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Wed Mar 31 08:19:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b2ae18a
app-portage/repoman: Fix 3.0.3 unit tests Closes: https://bugs.gentoo.org/779055 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> app-portage/repoman/Manifest | 1 + app-portage/repoman/repoman-3.0.3.ebuild | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest index 0a73ad91868..260bb545fd2 100644 --- a/app-portage/repoman/Manifest +++ b/app-portage/repoman/Manifest @@ -1,3 +1,4 @@ DIST repoman-2.3.23.tar.bz2 87108 BLAKE2B c1190433bd8aedf59e1ddf192dd14cca13e3bdae7367decd6bf64a79021f54a63f21ec49d5737b90c46be3894f4d3ff11bf5bd2868c9ebf65e44b4eb3bb4eee0 SHA512 9d01fadc5820501a9bfb9c1b6d9634ecbc14aacdc448bb440d1e37d47f7e4bcdea8269f8ba90e3783d84f31121870a9d7b165f58b78f0d0f0f4e822a25687d1b DIST repoman-3.0.2.tar.bz2 88258 BLAKE2B 32c4d6750fd225cf9fc071be0ffbb38563ffdaf50f1f1ac7247ce3733bd781cd699052101df8b6565fd3d32ec6d9a54efb611b815a722b7954d8100ce01de146 SHA512 fd5b4549a0b108ed1ad37fc0766fc73db127bba8b023a74566ee0167e2a9c56c8597b83ead16522aaf84f158a9a5d0d59e4b5bcc908e6024724c087c837e1fa2 +DIST repoman-3.0.3-unit-test-bug-779055.patch 4153 BLAKE2B 80dd075ca2930f5b14be72eb46d92f83804a87f0ad43b1970cba5b086b5925a0ff9e9b00abcac23f50175ca59a272d7f5b73a051e79ed170511654a0237e0d7b SHA512 badeb6435495a716d0e7a00790bf12fe68031c7207b8fc53a50538adc1dd6a57aa628d8469b924519501b27c39088f316fe018c1ffa3a8d099a34d9dc1bd1d71 DIST repoman-3.0.3.tar.bz2 90373 BLAKE2B a4ea542c452d44b1f4aef235d67390b0a0f139f32da33ab9ad8992797965724f4ef8123a49b681e9205b6e3fe279dd248b65b0119659b7a0038fe9884bec0797 SHA512 09855a8a0098482c1ce0a7f50d2481528e713fb6796a4004475c841de59f9df8d264f2e9342fdaee87c71d275137234b7e3adc3454f7f33dcf75e32a0ae3f0e9 diff --git a/app-portage/repoman/repoman-3.0.3.ebuild b/app-portage/repoman/repoman-3.0.3.ebuild index d6e3b529898..01185e48afa 100644 --- a/app-portage/repoman/repoman-3.0.3.ebuild +++ b/app-portage/repoman/repoman-3.0.3.ebuild @@ -14,7 +14,8 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"; S="${WORKDIR}/${P}/repoman" else - SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"; + SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2 + https://github.com/gentoo/portage/compare/285d3ae987a079f32b909c6e6eddde9bc45a4a25...b09b4071151d8e3a81f3576843d00f88eb407799.patch -> ${P}-unit-test-bug-779055.patch" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -32,7 +33,13 @@ RDEPEND=" " DEPEND="${RDEPEND}" +python_prepare_all() { + eapply -p2 "${DISTDIR}/${P}-unit-test-bug-779055.patch" + distutils-r1_python_prepare_all +} + python_test() { + unset REPOMAN_DEFAULT_OPTS esetup.py test }
