| 1 |
commit: 6a381b421b8283c73c2bd6e5d4e4a46cbe9a43a2 |
| 2 |
Author: Ian Leonard <antonlacon <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Apr 25 20:32:57 2020 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 5 23:56:43 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a381b42 |
| 7 |
|
| 8 |
sys-apps/portage: add zstd USE flag |
| 9 |
|
| 10 |
The zstd USE flag sets the default binary package compression to use |
| 11 |
zstd and adds it as a dependency. |
| 12 |
|
| 13 |
Masked on riscv until app-arch/zstd is keyworded. |
| 14 |
|
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/15520 |
| 16 |
Bug: https://bugs.gentoo.org/715108 |
| 17 |
Bug: https://bugs.gentoo.org/719456 |
| 18 |
Signed-off-by: Ian Leonard <antonlacon <AT> gmail.com> |
| 19 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 20 |
|
| 21 |
profiles/arch/riscv/package.use.mask | 4 ++++ |
| 22 |
sys-apps/portage/portage-9999.ebuild | 9 ++++++++- |
| 23 |
2 files changed, 12 insertions(+), 1 deletion(-) |
| 24 |
|
| 25 |
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask |
| 26 |
index 0d4cb1e3de5..bb0fdc58ad0 100644 |
| 27 |
--- a/profiles/arch/riscv/package.use.mask |
| 28 |
+++ b/profiles/arch/riscv/package.use.mask |
| 29 |
@@ -1,6 +1,10 @@ |
| 30 |
# Copyright 2019-2020 Gentoo Authors |
| 31 |
# Distributed under the terms of the GNU General Public License v2 |
| 32 |
|
| 33 |
+# Zac Medico <zmedico@g.o> (2020-05-05) |
| 34 |
+# Mask until app-arch/zstd is keyworded |
| 35 |
+sys-apps/portage zstd |
| 36 |
+ |
| 37 |
# Patrick McLean <chutzpah@g.o> (2020-04-16) |
| 38 |
# Lots of python dependencies, mask to facilitate keywording |
| 39 |
# keywording dev-libs/libfido2 |
| 40 |
|
| 41 |
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild |
| 42 |
index f581cb8ae97..4134cca8ce9 100644 |
| 43 |
--- a/sys-apps/portage/portage-9999.ebuild |
| 44 |
+++ b/sys-apps/portage/portage-9999.ebuild |
| 45 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
| 46 |
LICENSE="GPL-2" |
| 47 |
KEYWORDS="" |
| 48 |
SLOT="0" |
| 49 |
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" |
| 50 |
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr zstd" |
| 51 |
|
| 52 |
DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 53 |
>=app-arch/tar-1.27 |
| 54 |
@@ -54,6 +54,7 @@ RDEPEND=" |
| 55 |
xattr? ( kernel_linux? ( |
| 56 |
>=sys-apps/install-xattr-0.3 |
| 57 |
) ) |
| 58 |
+ zstd? ( app-arch/zstd ) |
| 59 |
!<app-admin/logrotate-3.8.0" |
| 60 |
PDEPEND=" |
| 61 |
!build? ( |
| 62 |
@@ -115,6 +116,12 @@ python_prepare_all() { |
| 63 |
|| die "failed to append to make.globals" |
| 64 |
fi |
| 65 |
|
| 66 |
+ if use zstd ; then |
| 67 |
+ einfo "Adding BINGPKG_COMPRESS=\"zstd\" to make.globals ..." |
| 68 |
+ echo -e '\nBINGPKG_COMPRESS="zstd"' >> cnf/make.globals \ |
| 69 |
+ || die "failed to append to make.globals" |
| 70 |
+ fi |
| 71 |
+ |
| 72 |
if use build || ! use rsync-verify; then |
| 73 |
sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ |
| 74 |
-i cnf/repos.conf || die "sed failed" |
Archives