From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1091319-garchives=archives.gentoo.org@lists.gentoo.org>
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 36FF2138334
	for <garchives@archives.gentoo.org>; Sun, 19 May 2019 18:12:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 2EBEFE0841;
	Sun, 19 May 2019 18:12:49 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(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 F3FCAE0841
	for <gentoo-commits@lists.gentoo.org>; Sun, 19 May 2019 18:12:48 +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 856F5344AD9
	for <gentoo-commits@lists.gentoo.org>; Sun, 19 May 2019 18:12:47 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 8ED15566
	for <gentoo-commits@lists.gentoo.org>; Sun, 19 May 2019 18:12:45 +0000 (UTC)
From: "Rick Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" <zerochaos@gentoo.org>
Message-ID: <1558289567.c6eab5ce54fcfae3bdfb0c0c5fd891ad3577d513.zerochaos@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/linux-firmware/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
X-VCS-Directories: sys-kernel/linux-firmware/
X-VCS-Committer: zerochaos
X-VCS-Committer-Name: Rick Farina
X-VCS-Revision: c6eab5ce54fcfae3bdfb0c0c5fd891ad3577d513
X-VCS-Branch: master
Date: Sun, 19 May 2019 18:12:45 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1c8df212-743f-4e2e-a338-84457ef619ff
X-Archives-Hash: 00538146a7ecf9656d90ef0a8e6a0638

commit:     c6eab5ce54fcfae3bdfb0c0c5fd891ad3577d513
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 18:12:08 2019 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sun May 19 18:12:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6eab5ce

sys-kernel/linux-firmware: fix live

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 .../linux-firmware/linux-firmware-99999999.ebuild  | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index e6e8cd053ec..8261f71c57d 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -6,7 +6,6 @@ inherit savedconfig
 
 if [[ ${PV} == 99999999* ]]; then
 	inherit git-r3
-	SRC_URI=""
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
 else
 	GIT_COMMIT=""
@@ -25,17 +24,10 @@ SLOT="0"
 IUSE="+redistributable savedconfig unknown-license"
 RESTRICT="binchecks strip
 	unknown-license? ( bindist )"
-REQUIRED_USE="unknown-license? ( redistributable )"
 
 RDEPEND="!savedconfig? (
 		redistributable? (
 			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			unknown-license? (
-				!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-				!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-				!sys-firmware/alsa-firmware[alsa_cards_sb16]
-				!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-			)
 			!media-tv/cx18-firmware
 			!<sys-firmware/ivtv-firmware-20080701-r1
 			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
@@ -69,7 +61,14 @@ RDEPEND="!savedconfig? (
 			!sys-firmware/iwl3160-7260-bt-ucode
 			!sys-firmware/radeon-ucode
 		)
+		unknown-license? (
+			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
+			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
+			!sys-firmware/alsa-firmware[alsa_cards_sb16]
+			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
+		)
 	)"
+
 #add anything else that collides to this
 
 src_unpack() {
@@ -229,15 +228,17 @@ src_prepare() {
 	rm -r ${source_files[@]} || die
 
 	if use !unknown-license; then
-		# remove files in the unknown_license blacklist
+		# remove files in unknown_license
 		rm "${unknown_license[@]}" || die
 	fi
 
 	if use !redistributable; then
-		# remove files _not_ in the free_software whitelist
+		# remove files _not_ in the free_software whitelist or unknown_license
+		# everything else is confirmed (or assumed) to be redistributable based on upstream acceptance policy
 		local file remove=()
 		while IFS= read -d "" -r file; do
-			has "${file#./}" "${free_software[@]}" || remove+=("${file}")
+			has "${file#./}" "${free_software[@]}" "${unknown_license[@]}" \
+				|| remove+=("${file}")
 		done < <(find * ! -type d -print0 || die)
 		printf "%s\0" "${remove[@]}" | xargs -0 rm || die
 	fi