1 |
commit: 5aca4a6656e0c744b348c36cdbdfc6d9dc3dbdd5 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 27 16:57:48 2023 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 27 16:57:48 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aca4a66 |
7 |
|
8 |
sys-apps/portage: drop FEATURES=force-prefix from make.globals |
9 |
|
10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
11 |
|
12 |
sys-apps/portage/Manifest | 2 +- |
13 |
.../portage/{portage-3.0.45.1.ebuild => portage-3.0.45-r1.ebuild} | 4 ---- |
14 |
sys-apps/portage/portage-9999.ebuild | 4 ---- |
15 |
3 files changed, 1 insertion(+), 9 deletions(-) |
16 |
|
17 |
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest |
18 |
index a99559657375..b576b950806c 100644 |
19 |
--- a/sys-apps/portage/Manifest |
20 |
+++ b/sys-apps/portage/Manifest |
21 |
@@ -1,3 +1,3 @@ |
22 |
DIST portage-3.0.43.tar.bz2 1139615 BLAKE2B e0f2646c3b6d5d49ec23038ad27507f7b9c0c03b848e82aff336896802c07b29344f924c4525d880f8895ba38f8116a7c79ecea51c794a433da9bd146efadc20 SHA512 b5e5339f3b5446f5c8f9b319e86e82d260e004b0606c3d0eadf09f91c95de0279c64c0fc4d7f6251ebd2cf7a65ba1ba37d752ed48b712e72b8c024835e747691 |
23 |
DIST portage-3.0.44.tar.bz2 1140911 BLAKE2B 06f584e6e37bbb309b9bb0e29ba4381eadd4ae6246aeb1045e3a5c5dcb33d74f74e74aa3f2325acbf37e16a535095c433f2796ed042f73cea5e208150e210cb0 SHA512 d40c95f3a31c5e2ae35374243c40c8d1f6b47b7c89f6a711a12d8744cb6848a85443298c0f947475b32acf52332e7f09b1e85915149ab8363930c0404f08410e |
24 |
-DIST portage-3.0.45.1.tar.bz2 1146037 BLAKE2B 562900b41684a4da3b10a91d796e91b75d631267145c36f0e46d0b3bc749b2e88bbc7e20c4a3c1a8cba74e8bfb25dc1ffc9ffd481ec11a2a2e1d23f9cae770a3 SHA512 961630cd0959001a841d62b3a293458442aeb7725241d6808d4052dd47209bf5d0abdf229a48013d91f9c441349075117747229639a1228fccd5bf6f75e947fd |
25 |
+DIST portage-3.0.45.tar.bz2 1145640 BLAKE2B f4956e3c56613f782d07947b28b1a30b47c780c13455f68b42ae26722544698ae02849279474a22c3239844712bbf255c2783edf351959200708592d852d903e SHA512 f089a75046b3e6bcac3eb8d01f776364f1c5c6873931e13c54375d35c2d85702914cd243db9fdc1b6898b8c05334663cfdc96710af7ac3b67ba19ee8d2d4fc67 |
26 |
|
27 |
diff --git a/sys-apps/portage/portage-3.0.45.1.ebuild b/sys-apps/portage/portage-3.0.45-r1.ebuild |
28 |
similarity index 98% |
29 |
rename from sys-apps/portage/portage-3.0.45.1.ebuild |
30 |
rename to sys-apps/portage/portage-3.0.45-r1.ebuild |
31 |
index df564a4830d3..c226bd813658 100644 |
32 |
--- a/sys-apps/portage/portage-3.0.45.1.ebuild |
33 |
+++ b/sys-apps/portage/portage-3.0.45-r1.ebuild |
34 |
@@ -158,10 +158,6 @@ python_prepare_all() { |
35 |
-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ |
36 |
-i cnf/repos.conf || die "sed failed" |
37 |
fi |
38 |
- |
39 |
- einfo "Adding FEATURES=force-prefix to make.globals ..." |
40 |
- echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ |
41 |
- || die "failed to append to make.globals" |
42 |
fi |
43 |
|
44 |
cd "${S}/cnf" || die |
45 |
|
46 |
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild |
47 |
index 3eac8033c3bd..fb5130b9482e 100644 |
48 |
--- a/sys-apps/portage/portage-9999.ebuild |
49 |
+++ b/sys-apps/portage/portage-9999.ebuild |
50 |
@@ -151,10 +151,6 @@ python_prepare_all() { |
51 |
-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ |
52 |
-i cnf/repos.conf || die "sed failed" |
53 |
fi |
54 |
- |
55 |
- einfo "Adding FEATURES=force-prefix to make.globals ..." |
56 |
- echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ |
57 |
- || die "failed to append to make.globals" |
58 |
fi |
59 |
|
60 |
cd "${S}/cnf" || die |