Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
Date: Sun, 24 May 2020 22:46:05
Message-Id: 1590360356.bb552b0006b6d0c570a67f4588bc0750f22ef2cb.zmedico@gentoo
1 commit: bb552b0006b6d0c570a67f4588bc0750f22ef2cb
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 24 22:29:30 2020 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun May 24 22:45:56 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb552b00
7
8 sys-apps/portage: remove binpkg-zstd USE flag (zstd will become a hard dep)
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 sys-apps/portage/metadata.xml | 1 -
14 sys-apps/portage/portage-9999.ebuild | 9 +--------
15 2 files changed, 1 insertion(+), 9 deletions(-)
16
17 diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
18 index 0f9d932ce5e..062dafe6248 100644
19 --- a/sys-apps/portage/metadata.xml
20 +++ b/sys-apps/portage/metadata.xml
21 @@ -12,7 +12,6 @@
22 </maintainer>
23 <use>
24 <flag name="apidoc">Build html API documentation with sphinx-apidoc.</flag>
25 - <flag name="binpkg-zstd">Use zstd compression with creating binary packages.</flag>
26 <flag name="gentoo-dev">Enable features required for Gentoo ebuild development.</flag>
27 <flag name="ipc">Use inter-process communication between portage and
28 running ebuilds.
29
30 diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
31 index f5da3ae281b..c635ab675c7 100644
32 --- a/sys-apps/portage/portage-9999.ebuild
33 +++ b/sys-apps/portage/portage-9999.ebuild
34 @@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
35 LICENSE="GPL-2"
36 KEYWORDS=""
37 SLOT="0"
38 -IUSE="apidoc binpkg-zstd build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
39 +IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
40
41 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
42 >=app-arch/tar-1.27
43 @@ -53,7 +53,6 @@ RDEPEND="
44 xattr? ( kernel_linux? (
45 >=sys-apps/install-xattr-0.3
46 ) )
47 - binpkg-zstd? ( app-arch/zstd )
48 !<app-admin/logrotate-3.8.0"
49 PDEPEND="
50 !build? (
51 @@ -115,12 +114,6 @@ python_prepare_all() {
52 || die "failed to append to make.globals"
53 fi
54
55 - if use binpkg-zstd ; then
56 - einfo "Adding BINGPKG_COMPRESS=\"zstd\" to make.globals ..."
57 - echo -e '\nBINGPKG_COMPRESS="zstd"' >> cnf/make.globals \
58 - || die "failed to append to make.globals"
59 - fi
60 -
61 if use build || ! use rsync-verify; then
62 sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
63 -i cnf/repos.conf || die "sed failed"