[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/

[Zac Medico]

commit:     89d8132fc8d0bf544fa699e2e73ad89b73e05f3b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  1 06:39:57 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Feb  1 06:47:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89d8132f

sys-apps/portage: 2.3.22 version bump

  #646184 - prevent gemato call with USE="-rsync-verify"

Package-Manager: Portage-2.3.22, Repoman-2.3.6

 sys-apps/portage/Manifest                                         | 2 +-
 sys-apps/portage/{portage-2.3.21.ebuild => portage-2.3.22.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index dd7014a2b64..99f6c934c53 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,6 +3,6 @@ DIST portage-2.3.14.tar.bz2 948535 BLAKE2B 
765c9eabb64c3b095993bb244481df2d243f5
 DIST portage-2.3.16.tar.bz2 949134 BLAKE2B 
f8e7b6f13dfbf9aecdec444705042c6584c324522c0d131bf3c10f8fbfd5f6eeb97134afa42ed23da37f36ad4e2a0fc27129aebeb100aed2e3fd650c360ed060
 SHA512 
5847904b3262adcef04c7d6781cf2d03130480a49c5343a3a2d5cc36ddc7245ac30b1ba152329f96e2e4ca8d62ef387554cb228798db60f6f8141830d147dfaf
 DIST portage-2.3.19.tar.bz2 954921 BLAKE2B 
e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240
 SHA512 
94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d
 DIST portage-2.3.20.tar.bz2 956633 BLAKE2B 
cf166a10522c5fab6b273674be4d7a673b961fe1c2ca649c7fa6d3759364dd1454ea57edd1e99fd2648b47244fde6f311fb925f50b9a118a1d2880048eb9f39e
 SHA512 
e4fde56f5293b25ef5f484cf601c1db71c350603987e1b2736d9b8434158e8778c637dd5891401e6d484c7a11f1982bbe8213a352c185fc4c6b0039006756764
-DIST portage-2.3.21.tar.bz2 958588 BLAKE2B 
01dadfa582e5810c42b389708b108016697ad78c1d184b06d5a2f0d4ce8086232200fa135920d4a1ab9fbde0020f2c8ce4322cd087fd70cb4aa6c42b92226dda
 SHA512 
a6acc6b553f3ecd57479328a0261f09dbe92a84b2a7ae21a97d4651ee392d420c76b51384054d6a3ea41bce19a9b2178faf491273afc6d4af9e0559ca7b79f2c
+DIST portage-2.3.22.tar.bz2 958924 BLAKE2B 
16ff087bc1ae8222c9ba10943c72b68820b0e1bdddde6f3c94bd5d5159542aa5b1e126874ee2c4dc615f6f2ce88f244997addcb14a701456eba2ddff86c41627
 SHA512 
71d36bb15748e8485b4331751e349679592a6dba157f47c82c2ad8fbecbd8a0c8f7194a66db319b02697b15a8996ec85ff5b230087c21ae9d379f6ae4642e9d4
 DIST portage-2.3.6.tar.bz2 943085 BLAKE2B 
5c649ec5f5a82b5f55c71425d13ee3335a773c7f78500d6ec963594c95eba5d9fc49c37ab5ca1bde7621398443d526a8a1485b67748f859726f7f581e2d88091
 SHA512 
5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 
3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3
 SHA512 
4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8

diff --git a/sys-apps/portage/portage-2.3.21.ebuild 
b/sys-apps/portage/portage-2.3.22.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.3.21.ebuild
rename to sys-apps/portage/portage-2.3.22.ebuild
index 8ec832904bf..8e5bc50d4eb 100644
--- a/sys-apps/portage/portage-2.3.21.ebuild
+++ b/sys-apps/portage/portage-2.3.22.ebuild
@@ -144,7 +144,7 @@ python_prepare_all() {
 
                einfo "Adjusting repos.conf ..."
                sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(sync-rsync-openpgp-key-path = 
\)\(.*\)|\\1${EPREFIX}\\2|" \
+                       -e "s|^\(sync-openpgp-key-path = 
\)\(.*\)|\\1${EPREFIX}\\2|" \
                        -i cnf/repos.conf || die "sed failed"
                if use prefix-guest ; then
                        sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \