| 1 |
commit: 3a07366122f0949b3264f1d4037345e7a95a079f |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 31 12:57:48 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 31 12:57:48 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a073661 |
| 7 |
|
| 8 |
sys-apps/portage: depend on fixed file for sandbox-2.30 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/889046 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
....0.38.1-r5.ebuild => portage-3.0.38.1-r6.ebuild} | 18 +++++++++++++----- |
| 14 |
...ge-3.0.41-r1.ebuild => portage-3.0.41-r2.ebuild} | 21 +++++++++++++++------ |
| 15 |
...rtage-3.0.42.ebuild => portage-3.0.42-r1.ebuild} | 21 +++++++++++++++------ |
| 16 |
sys-apps/portage/portage-9999.ebuild | 15 +++++++++++---- |
| 17 |
4 files changed, 54 insertions(+), 21 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-apps/portage/portage-3.0.38.1-r5.ebuild b/sys-apps/portage/portage-3.0.38.1-r6.ebuild |
| 20 |
similarity index 97% |
| 21 |
rename from sys-apps/portage/portage-3.0.38.1-r5.ebuild |
| 22 |
rename to sys-apps/portage/portage-3.0.38.1-r6.ebuild |
| 23 |
index 2f21f269366b..636d3faab4a1 100644 |
| 24 |
--- a/sys-apps/portage/portage-3.0.38.1-r5.ebuild |
| 25 |
+++ b/sys-apps/portage/portage-3.0.38.1-r6.ebuild |
| 26 |
@@ -22,7 +22,8 @@ RESTRICT="!test? ( test )" |
| 27 |
BDEPEND=" |
| 28 |
app-arch/xz-utils |
| 29 |
test? ( dev-vcs/git )" |
| 30 |
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 31 |
+DEPEND=" |
| 32 |
+ !build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 33 |
>=app-arch/tar-1.27 |
| 34 |
dev-lang/python-exec:2 |
| 35 |
>=sys-apps/sed-4.0.5 sys-devel/patch |
| 36 |
@@ -30,7 +31,8 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 37 |
apidoc? ( |
| 38 |
dev-python/sphinx[${PYTHON_USEDEP}] |
| 39 |
dev-python/sphinx-epytext[${PYTHON_USEDEP}] |
| 40 |
- )" |
| 41 |
+ ) |
| 42 |
+" |
| 43 |
# Require sandbox-2.2 for bug #288863. |
| 44 |
# For whirlpool hash, require python[ssl] (bug #425046). |
| 45 |
# For compgen, require bash[readline] (bug #445576). |
| 46 |
@@ -63,13 +65,19 @@ RDEPEND=" |
| 47 |
!<app-admin/logrotate-3.8.0 |
| 48 |
!<app-portage/gentoolkit-0.4.6 |
| 49 |
!<app-portage/repoman-2.3.10 |
| 50 |
- !~app-portage/repoman-3.0.0" |
| 51 |
+ !~app-portage/repoman-3.0.0 |
| 52 |
+" |
| 53 |
+# Weird dep construct for sys-apps/file can be removed once >=file-5.44-r1 stable |
| 54 |
PDEPEND=" |
| 55 |
!build? ( |
| 56 |
>=net-misc/rsync-2.6.4 |
| 57 |
- >=sys-apps/file-5.41 |
| 58 |
+ || ( |
| 59 |
+ >=sys-apps/file-5.44-r1 |
| 60 |
+ =sys-apps/file-5.43-r2 |
| 61 |
+ ) |
| 62 |
>=sys-apps/coreutils-6.4 |
| 63 |
- )" |
| 64 |
+ ) |
| 65 |
+" |
| 66 |
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
| 67 |
# NOTE: FEATURES=installsources requires debugedit and rsync |
| 68 |
|
| 69 |
|
| 70 |
diff --git a/sys-apps/portage/portage-3.0.41-r1.ebuild b/sys-apps/portage/portage-3.0.41-r2.ebuild |
| 71 |
similarity index 97% |
| 72 |
rename from sys-apps/portage/portage-3.0.41-r1.ebuild |
| 73 |
rename to sys-apps/portage/portage-3.0.41-r2.ebuild |
| 74 |
index 7c0dd5a89947..7654a8382e76 100644 |
| 75 |
--- a/sys-apps/portage/portage-3.0.41-r1.ebuild |
| 76 |
+++ b/sys-apps/portage/portage-3.0.41-r2.ebuild |
| 77 |
@@ -21,8 +21,10 @@ RESTRICT="!test? ( test )" |
| 78 |
|
| 79 |
BDEPEND=" |
| 80 |
app-arch/xz-utils |
| 81 |
- test? ( dev-vcs/git )" |
| 82 |
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 83 |
+ test? ( dev-vcs/git ) |
| 84 |
+" |
| 85 |
+DEPEND=" |
| 86 |
+ !build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 87 |
>=app-arch/tar-1.27 |
| 88 |
dev-lang/python-exec:2 |
| 89 |
>=sys-apps/sed-4.0.5 sys-devel/patch |
| 90 |
@@ -30,7 +32,8 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 91 |
apidoc? ( |
| 92 |
dev-python/sphinx[${PYTHON_USEDEP}] |
| 93 |
dev-python/sphinx-epytext[${PYTHON_USEDEP}] |
| 94 |
- )" |
| 95 |
+ ) |
| 96 |
+" |
| 97 |
# Require sandbox-2.2 for bug #288863. |
| 98 |
# For whirlpool hash, require python[ssl] (bug #425046). |
| 99 |
# For compgen, require bash[readline] (bug #445576). |
| 100 |
@@ -63,13 +66,19 @@ RDEPEND=" |
| 101 |
!<app-admin/logrotate-3.8.0 |
| 102 |
!<app-portage/gentoolkit-0.4.6 |
| 103 |
!<app-portage/repoman-2.3.10 |
| 104 |
- !~app-portage/repoman-3.0.0" |
| 105 |
+ !~app-portage/repoman-3.0.0 |
| 106 |
+" |
| 107 |
+# Weird dep construct for sys-apps/file can be removed once >=file-5.44-r1 stable |
| 108 |
PDEPEND=" |
| 109 |
!build? ( |
| 110 |
>=net-misc/rsync-2.6.4 |
| 111 |
- >=sys-apps/file-5.41 |
| 112 |
+ || ( |
| 113 |
+ >=sys-apps/file-5.44-r1 |
| 114 |
+ =sys-apps/file-5.43-r2 |
| 115 |
+ ) |
| 116 |
>=sys-apps/coreutils-6.4 |
| 117 |
- )" |
| 118 |
+ ) |
| 119 |
+" |
| 120 |
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
| 121 |
# NOTE: FEATURES=installsources requires debugedit and rsync |
| 122 |
|
| 123 |
|
| 124 |
diff --git a/sys-apps/portage/portage-3.0.42.ebuild b/sys-apps/portage/portage-3.0.42-r1.ebuild |
| 125 |
similarity index 97% |
| 126 |
rename from sys-apps/portage/portage-3.0.42.ebuild |
| 127 |
rename to sys-apps/portage/portage-3.0.42-r1.ebuild |
| 128 |
index f01eddfc50ae..cba50d3d026d 100644 |
| 129 |
--- a/sys-apps/portage/portage-3.0.42.ebuild |
| 130 |
+++ b/sys-apps/portage/portage-3.0.42-r1.ebuild |
| 131 |
@@ -21,8 +21,10 @@ RESTRICT="!test? ( test )" |
| 132 |
|
| 133 |
BDEPEND=" |
| 134 |
app-arch/xz-utils |
| 135 |
- test? ( dev-vcs/git )" |
| 136 |
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 137 |
+ test? ( dev-vcs/git ) |
| 138 |
+" |
| 139 |
+DEPEND=" |
| 140 |
+ !build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 141 |
>=app-arch/tar-1.27 |
| 142 |
dev-lang/python-exec:2 |
| 143 |
>=sys-apps/sed-4.0.5 sys-devel/patch |
| 144 |
@@ -30,7 +32,8 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 145 |
apidoc? ( |
| 146 |
dev-python/sphinx[${PYTHON_USEDEP}] |
| 147 |
dev-python/sphinx-epytext[${PYTHON_USEDEP}] |
| 148 |
- )" |
| 149 |
+ ) |
| 150 |
+" |
| 151 |
# Require sandbox-2.2 for bug #288863. |
| 152 |
# For whirlpool hash, require python[ssl] (bug #425046). |
| 153 |
# For compgen, require bash[readline] (bug #445576). |
| 154 |
@@ -63,13 +66,19 @@ RDEPEND=" |
| 155 |
!<app-admin/logrotate-3.8.0 |
| 156 |
!<app-portage/gentoolkit-0.4.6 |
| 157 |
!<app-portage/repoman-2.3.10 |
| 158 |
- !~app-portage/repoman-3.0.0" |
| 159 |
+ !~app-portage/repoman-3.0.0 |
| 160 |
+" |
| 161 |
+# Weird dep construct for sys-apps/file can be removed once >=file-5.44-r1 stable |
| 162 |
PDEPEND=" |
| 163 |
!build? ( |
| 164 |
>=net-misc/rsync-2.6.4 |
| 165 |
- >=sys-apps/file-5.41 |
| 166 |
+ || ( |
| 167 |
+ >=sys-apps/file-5.44-r1 |
| 168 |
+ =sys-apps/file-5.43-r2 |
| 169 |
+ ) |
| 170 |
>=sys-apps/coreutils-6.4 |
| 171 |
- )" |
| 172 |
+ ) |
| 173 |
+" |
| 174 |
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
| 175 |
# NOTE: FEATURES=installsources requires debugedit and rsync |
| 176 |
|
| 177 |
|
| 178 |
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild |
| 179 |
index f44665dcdb56..27741e2fdd31 100644 |
| 180 |
--- a/sys-apps/portage/portage-9999.ebuild |
| 181 |
+++ b/sys-apps/portage/portage-9999.ebuild |
| 182 |
@@ -21,8 +21,10 @@ IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux |
| 183 |
RESTRICT="!test? ( test )" |
| 184 |
|
| 185 |
BDEPEND=" |
| 186 |
- test? ( dev-vcs/git )" |
| 187 |
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 188 |
+ test? ( dev-vcs/git ) |
| 189 |
+" |
| 190 |
+DEPEND=" |
| 191 |
+ !build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 192 |
>=app-arch/tar-1.27 |
| 193 |
dev-lang/python-exec:2 |
| 194 |
>=sys-apps/sed-4.0.5 sys-devel/patch |
| 195 |
@@ -64,12 +66,17 @@ RDEPEND=" |
| 196 |
!<app-portage/gentoolkit-0.4.6 |
| 197 |
!<app-portage/repoman-2.3.10 |
| 198 |
!~app-portage/repoman-3.0.0" |
| 199 |
+# Weird dep construct for sys-apps/file can be removed once >=file-5.44-r1 stable |
| 200 |
PDEPEND=" |
| 201 |
!build? ( |
| 202 |
>=net-misc/rsync-2.6.4 |
| 203 |
- >=sys-apps/file-5.41 |
| 204 |
+ || ( |
| 205 |
+ >=sys-apps/file-5.44-r1 |
| 206 |
+ =sys-apps/file-5.43-r2 |
| 207 |
+ ) |
| 208 |
>=sys-apps/coreutils-6.4 |
| 209 |
- )" |
| 210 |
+ ) |
| 211 |
+" |
| 212 |
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
| 213 |
# NOTE: FEATURES=installsources requires debugedit and rsync |
Archives