| 1 |
commit: e435225e72637d8383e06b0e0244c697e4d1423f |
| 2 |
Author: Ian Leonard <antonlacon <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu May 7 15:51:38 2020 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 7 16:12:27 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e435225e |
| 7 |
|
| 8 |
sys-apps/portage: convert USE zstd to USE flag binpkg-zstd |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/715108 |
| 11 |
Bug: https://bugs.gentoo.org/719456 |
| 12 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 13 |
Signed-off-by: Ian Leonard <antonlacon <AT> gmail.com> |
| 14 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 15 |
|
| 16 |
profiles/arch/riscv/package.use.mask | 4 ++-- |
| 17 |
sys-apps/portage/metadata.xml | 1 + |
| 18 |
sys-apps/portage/portage-9999.ebuild | 6 +++--- |
| 19 |
3 files changed, 6 insertions(+), 5 deletions(-) |
| 20 |
|
| 21 |
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask |
| 22 |
index bb0fdc58ad0..e1c7c4fe544 100644 |
| 23 |
--- a/profiles/arch/riscv/package.use.mask |
| 24 |
+++ b/profiles/arch/riscv/package.use.mask |
| 25 |
@@ -1,9 +1,9 @@ |
| 26 |
# Copyright 2019-2020 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
-# Zac Medico <zmedico@g.o> (2020-05-05) |
| 30 |
+# Zac Medico <zmedico@g.o> (2020-05-07) |
| 31 |
# Mask until app-arch/zstd is keyworded |
| 32 |
-sys-apps/portage zstd |
| 33 |
+sys-apps/portage binpkg-zstd |
| 34 |
|
| 35 |
# Patrick McLean <chutzpah@g.o> (2020-04-16) |
| 36 |
# Lots of python dependencies, mask to facilitate keywording |
| 37 |
|
| 38 |
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml |
| 39 |
index 062dafe6248..0f9d932ce5e 100644 |
| 40 |
--- a/sys-apps/portage/metadata.xml |
| 41 |
+++ b/sys-apps/portage/metadata.xml |
| 42 |
@@ -12,6 +12,7 @@ |
| 43 |
</maintainer> |
| 44 |
<use> |
| 45 |
<flag name="apidoc">Build html API documentation with sphinx-apidoc.</flag> |
| 46 |
+ <flag name="binpkg-zstd">Use zstd compression with creating binary packages.</flag> |
| 47 |
<flag name="gentoo-dev">Enable features required for Gentoo ebuild development.</flag> |
| 48 |
<flag name="ipc">Use inter-process communication between portage and |
| 49 |
running ebuilds. |
| 50 |
|
| 51 |
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild |
| 52 |
index e8b41acd67a..f5da3ae281b 100644 |
| 53 |
--- a/sys-apps/portage/portage-9999.ebuild |
| 54 |
+++ b/sys-apps/portage/portage-9999.ebuild |
| 55 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
| 56 |
LICENSE="GPL-2" |
| 57 |
KEYWORDS="" |
| 58 |
SLOT="0" |
| 59 |
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr zstd" |
| 60 |
+IUSE="apidoc binpkg-zstd build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" |
| 61 |
|
| 62 |
DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 63 |
>=app-arch/tar-1.27 |
| 64 |
@@ -53,7 +53,7 @@ RDEPEND=" |
| 65 |
xattr? ( kernel_linux? ( |
| 66 |
>=sys-apps/install-xattr-0.3 |
| 67 |
) ) |
| 68 |
- zstd? ( app-arch/zstd ) |
| 69 |
+ binpkg-zstd? ( app-arch/zstd ) |
| 70 |
!<app-admin/logrotate-3.8.0" |
| 71 |
PDEPEND=" |
| 72 |
!build? ( |
| 73 |
@@ -115,7 +115,7 @@ python_prepare_all() { |
| 74 |
|| die "failed to append to make.globals" |
| 75 |
fi |
| 76 |
|
| 77 |
- if use zstd ; then |
| 78 |
+ if use binpkg-zstd ; then |
| 79 |
einfo "Adding BINGPKG_COMPRESS=\"zstd\" to make.globals ..." |
| 80 |
echo -e '\nBINGPKG_COMPRESS="zstd"' >> cnf/make.globals \ |
| 81 |
|| die "failed to append to make.globals" |
Archives