From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2B55D138350 for ; Fri, 24 Apr 2020 07:31:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 099D9E0B42; Fri, 24 Apr 2020 07:31:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0357E0A9C for ; Fri, 24 Apr 2020 07:31:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B1ED134F29D for ; Fri, 24 Apr 2020 07:31:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 36BFB1EB for ; Fri, 24 Apr 2020 07:31:07 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1587713431.80aaf821ee7bae376a13419e7559b3705399885c.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/catalyst/catalyst-9999.ebuild X-VCS-Directories: dev-util/catalyst/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 80aaf821ee7bae376a13419e7559b3705399885c X-VCS-Branch: master Date: Fri, 24 Apr 2020 07:31:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1024a22a-f044-44bb-952a-b29c40a8033a X-Archives-Hash: 028116102fe1dd79f0af52eae1907b46 commit: 80aaf821ee7bae376a13419e7559b3705399885c Author: Matt Turner gentoo org> AuthorDate: Fri Apr 24 07:03:18 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Apr 24 07:30:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80aaf821 dev-util/catalyst: Reformat dependencies Signed-off-by: Matt Turner gentoo.org> dev-util/catalyst/catalyst-9999.ebuild | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild index 0e58e9160c4..ea6a5b43445 100644 --- a/dev-util/catalyst/catalyst-9999.ebuild +++ b/dev-util/catalyst/catalyst-9999.ebuild @@ -33,20 +33,28 @@ RDEPEND=" >=dev-python/pydecomp-0.3[${PYTHON_USEDEP}] app-arch/lbzip2 app-arch/tar[xattr] + app-misc/zisofs-tools app-crypt/shash sys-fs/dosfstools - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) + >=sys-fs/squashfs-tools-2.1 ccache? ( dev-util/ccache ) + iso? ( virtual/cdrtools ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) + + amd64? ( >=sys-boot/syslinux-3.72 ) + x86? ( >=sys-boot/syslinux-3.72 ) +" +PDEPEND=" + system-bootloader? ( + >=sys-apps/memtest86+-5.01-r4 + sys-boot/grub:2 + sys-boot/shim + sys-boot/syslinux + + amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) + x86? ( sys-boot/grub[grub_platforms_efi-32] ) + ) " -PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 - sys-boot/grub:2 - amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) - x86? ( sys-boot/grub[grub_platforms_efi-32] ) - sys-boot/syslinux - sys-boot/shim )" python_prepare_all() { python_setup