| 1 |
commit: c5bd4ddefd1b1f6e8b9f69da68e6aef5249bc5a5 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 7 19:35:09 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 7 19:40:43 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5bd4dde |
| 7 |
|
| 8 |
sys-apps/portage: disable rsync-verify for stage1 build |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
sys-apps/portage/portage-2.3.24.ebuild | 12 ++++++------ |
| 13 |
sys-apps/portage/portage-9999.ebuild | 7 ++++++- |
| 14 |
2 files changed, 12 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/portage/portage-2.3.24.ebuild b/sys-apps/portage/portage-2.3.24.ebuild |
| 17 |
index 9c6f5d9387d..f0ad350864b 100644 |
| 18 |
--- a/sys-apps/portage/portage-2.3.24.ebuild |
| 19 |
+++ b/sys-apps/portage/portage-2.3.24.ebuild |
| 20 |
@@ -44,17 +44,17 @@ RDEPEND=" |
| 21 |
>=app-admin/eselect-1.2 |
| 22 |
$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ |
| 23 |
python{2_7,3_4,3_5} pypy) |
| 24 |
+ rsync-verify? ( |
| 25 |
+ >=app-portage/gemato-10 |
| 26 |
+ app-crypt/gentoo-keys |
| 27 |
+ app-crypt/gnupg[ssl(-)] |
| 28 |
+ ) |
| 29 |
) |
| 30 |
elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
| 31 |
elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
| 32 |
elibc_musl? ( >=sys-apps/sandbox-2.2 ) |
| 33 |
elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
| 34 |
>=app-misc/pax-utils-0.1.17 |
| 35 |
- rsync-verify? ( |
| 36 |
- >=app-portage/gemato-10 |
| 37 |
- app-crypt/gentoo-keys |
| 38 |
- app-crypt/gnupg[ssl(-)] |
| 39 |
- ) |
| 40 |
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) |
| 41 |
xattr? ( kernel_linux? ( |
| 42 |
>=sys-apps/install-xattr-0.3 |
| 43 |
@@ -123,7 +123,7 @@ python_prepare_all() { |
| 44 |
|| die "failed to append to make.globals" |
| 45 |
fi |
| 46 |
|
| 47 |
- if ! use rsync-verify; then |
| 48 |
+ if use build || ! use rsync-verify; then |
| 49 |
sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ |
| 50 |
-i cnf/repos.conf || die "sed failed" |
| 51 |
fi |
| 52 |
|
| 53 |
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild |
| 54 |
index e91f5535212..2df6101a5f9 100644 |
| 55 |
--- a/sys-apps/portage/portage-9999.ebuild |
| 56 |
+++ b/sys-apps/portage/portage-9999.ebuild |
| 57 |
@@ -44,6 +44,11 @@ RDEPEND=" |
| 58 |
>=app-admin/eselect-1.2 |
| 59 |
$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ |
| 60 |
python{2_7,3_4,3_5} pypy) |
| 61 |
+ rsync-verify? ( |
| 62 |
+ >=app-portage/gemato-10 |
| 63 |
+ app-crypt/gentoo-keys |
| 64 |
+ app-crypt/gnupg[ssl(-)] |
| 65 |
+ ) |
| 66 |
) |
| 67 |
elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
| 68 |
elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
| 69 |
@@ -122,7 +127,7 @@ python_prepare_all() { |
| 70 |
|| die "failed to append to make.globals" |
| 71 |
fi |
| 72 |
|
| 73 |
- if ! use rsync-verify; then |
| 74 |
+ if use build || ! use rsync-verify; then |
| 75 |
sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ |
| 76 |
-i cnf/repos.conf || die "sed failed" |
| 77 |
fi |
Archives