From bb552b0006b6d0c570a67f4588bc0750f22ef2cb Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 24 May 2020 15:29:30 -0700
Subject: sys-apps/portage: remove binpkg-zstd USE flag (zstd will become a
 hard dep)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Zac Medico <zmedico@gentoo.org>
---
 sys-apps/portage/metadata.xml        | 1 -
 sys-apps/portage/portage-9999.ebuild | 9 +--------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index 0f9d932ce5e7..062dafe62481 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -12,7 +12,6 @@
   </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 f5da3ae281b4..c635ab675c70 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 binpkg-zstd build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+IUSE="apidoc 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,6 @@ RDEPEND="
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
 	) )
-	binpkg-zstd? ( app-arch/zstd )
 	!<app-admin/logrotate-3.8.0"
 PDEPEND="
 	!build? (
@@ -115,12 +114,6 @@ python_prepare_all() {
 			|| die "failed to append to make.globals"
 	fi
 
-	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"
-	fi
-
 	if use build || ! use rsync-verify; then
 		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
 			-i cnf/repos.conf || die "sed failed"
-- 
cgit v1.2.3-18-g5258