commit: 9c7c6ae23cd9b36437d232a562d9e398ae57286a Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sun Apr 11 18:15:20 2021 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sun Apr 11 18:24:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c7c6ae2
app-portage/repoman: Revbump to 3.0.3-r1 #779508 unit test PORTAGE_GPG_KEY KeyError #779967 repoman --version TypeError Closes: https://bugs.gentoo.org/779508 Closes: https://bugs.gentoo.org/779967 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> app-portage/repoman/Manifest | 2 ++ .../{repoman-3.0.3.ebuild => repoman-3.0.3-r1.ebuild} | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest index 260bb545fd2..44fdc398753 100644 --- a/app-portage/repoman/Manifest +++ b/app-portage/repoman/Manifest @@ -1,4 +1,6 @@ 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-unit-test-bug-779967.patch 1205 BLAKE2B f8ff8f98031dcf93ff2812c2e5416d6f731adb948dd8c62304443dc401ab0c7e21a25d59a951fe3ae35e417cb8e0badb2863d97e6d9ff6cacba4ee17054f2dce SHA512 b82ec000d73e93949aa7150005556cff9c4ef7ee11a06b5456af375ea7cf81985f91b0a152d40767a1cd768f30cb1d155d01adfe0e15ed49c9f50ab03c33b808 +DIST repoman-3.0.3-version-bug-779508.patch 1887 BLAKE2B bc3a49266fe64d55ec95537196cb4fd3881bfdfd2a6bd30bc0e55ced674d4a12688264a3802f3f72ac291c108ab1d81c45fd0571dc0f2a6b0af8a05177d873b4 SHA512 75c41144e18833e7e46aeb9d57ea4ca29019701d5522be827ea28db2238baa6cf0b220461aba01bcfa7b42d979e2b284613d76a099f8a34eedd62d619df82dd9 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-r1.ebuild similarity index 81% rename from app-portage/repoman/repoman-3.0.3.ebuild rename to app-portage/repoman/repoman-3.0.3-r1.ebuild index 01185e48afa..a7bb7dee6d4 100644 --- a/app-portage/repoman/repoman-3.0.3.ebuild +++ b/app-portage/repoman/repoman-3.0.3-r1.ebuild @@ -15,7 +15,9 @@ if [[ ${PV} == *9999 ]]; then S="${WORKDIR}/${P}/repoman" else 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" + https://github.com/gentoo/portage/compare/285d3ae987a079f32b909c6e6eddde9bc45a4a25...b09b4071151d8e3a81f3576843d00f88eb407799.patch -> ${P}-unit-test-bug-779055.patch + https://github.com/gentoo/portage/commit/e29177fcd2950199afa4f83673c0771afb261123.patch -> ${P}-version-bug-779508.patch + https://github.com/gentoo/portage/commit/2eb3ca092a528e0722e0ca32f616836ed8039936.patch -> ${P}-unit-test-bug-779967.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 @@ -34,7 +36,13 @@ RDEPEND=" DEPEND="${RDEPEND}" python_prepare_all() { - eapply -p2 "${DISTDIR}/${P}-unit-test-bug-779055.patch" + local patches=( + "${DISTDIR}/${P}-unit-test-bug-779055.patch" + "${DISTDIR}/${P}-version-bug-779508.patch" + "${DISTDIR}/${P}-unit-test-bug-779967.patch" + ) + eapply -p2 "${patches[@]}" + distutils-r1_python_prepare_all }
