summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Leonard <antonlacon@gmail.com>2020-05-07 08:51:38 -0700
committerZac Medico <zmedico@gentoo.org>2020-05-07 09:12:27 -0700
commite435225e72637d8383e06b0e0244c697e4d1423f (patch)
tree174a567b3752be74af973cbf8c9bfe059f6b268f
parentmedia-sound/qsynth: amd64 stable wrt bug #720454 (diff)
downloadgentoo-e435225e72637d8383e06b0e0244c697e4d1423f.tar.gz
gentoo-e435225e72637d8383e06b0e0244c697e4d1423f.tar.bz2
gentoo-e435225e72637d8383e06b0e0244c697e4d1423f.zip
sys-apps/portage: convert USE zstd to USE flag binpkg-zstd
Bug: https://bugs.gentoo.org/715108 Bug: https://bugs.gentoo.org/719456 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Ian Leonard <antonlacon@gmail.com> Signed-off-by: Zac Medico <zmedico@gentoo.org>
-rw-r--r--profiles/arch/riscv/package.use.mask4
-rw-r--r--sys-apps/portage/metadata.xml1
-rw-r--r--sys-apps/portage/portage-9999.ebuild6
3 files changed, 6 insertions, 5 deletions
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index bb0fdc58ad0..e1c7c4fe544 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,9 +1,9 @@
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Zac Medico <zmedico@gentoo.org> (2020-05-05)
+# Zac Medico <zmedico@gentoo.org> (2020-05-07)
# Mask until app-arch/zstd is keyworded
-sys-apps/portage zstd
+sys-apps/portage binpkg-zstd
# Patrick McLean <chutzpah@gentoo.org> (2020-04-16)
# Lots of python dependencies, mask to facilitate keywording
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index 062dafe6248..0f9d932ce5e 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -12,6 +12,7 @@
</maintainer>
<use>
<flag name="apidoc">Build html API documentation with sphinx-apidoc.</flag>
+ <flag name="binpkg-zstd">Use zstd compression with creating binary packages.</flag>
<flag name="gentoo-dev">Enable features required for Gentoo ebuild development.</flag>
<flag name="ipc">Use inter-process communication between portage and
running ebuilds.
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index e8b41acd67a..f5da3ae281b 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
LICENSE="GPL-2"
KEYWORDS=""
SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr zstd"
+IUSE="apidoc binpkg-zstd build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
>=app-arch/tar-1.27
@@ -53,7 +53,7 @@ RDEPEND="
xattr? ( kernel_linux? (
>=sys-apps/install-xattr-0.3
) )
- zstd? ( app-arch/zstd )
+ binpkg-zstd? ( app-arch/zstd )
!<app-admin/logrotate-3.8.0"
PDEPEND="
!build? (
@@ -115,7 +115,7 @@ python_prepare_all() {
|| die "failed to append to make.globals"
fi
- if use zstd ; then
+ if use binpkg-zstd ; then
einfo "Adding BINGPKG_COMPRESS=\"zstd\" to make.globals ..."
echo -e '\nBINGPKG_COMPRESS="zstd"' >> cnf/make.globals \
|| die "failed to append to make.globals"