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 C8771138334 for ; Sun, 19 May 2019 06:49:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C535FE0AEA; Sun, 19 May 2019 06:49:45 +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 95B87E0AEA for ; Sun, 19 May 2019 06:49:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 CE2BF344A78 for ; Sun, 19 May 2019 06:49:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3AD2457F for ; Sun, 19 May 2019 06:49:41 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1558248445.9a964bc7f58242d9fc71bf2fd532337737ca5107.ulm@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: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 9a964bc7f58242d9fc71bf2fd532337737ca5107 X-VCS-Branch: master Date: Sun, 19 May 2019 06:49:41 +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: 50364337-9a04-4506-9eef-0e4ab6780e43 X-Archives-Hash: 1f3c61ff02882a43d387d2800a6f8cc7 commit: 9a964bc7f58242d9fc71bf2fd532337737ca5107 Author: Ulrich Müller gentoo org> AuthorDate: Sun May 19 06:47:25 2019 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun May 19 06:47:25 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a964bc7 sys-kernel/linux-firmware: Update live ebuild. Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Ulrich Müller gentoo.org> .../linux-firmware/linux-firmware-99999999.ebuild | 287 ++++++++++++++++----- 1 file changed, 225 insertions(+), 62 deletions(-) diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild index b96ea070749..7625a280f3c 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit savedconfig if [[ ${PV} == 99999999* ]]; then @@ -17,54 +17,60 @@ fi DESCRIPTION="Linux firmware files" HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git" -LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+" +LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) + redistributable? ( + linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) + unknown-license? ( all-rights-reserved )" SLOT="0" -IUSE="savedconfig" +IUSE="+redistributable savedconfig unknown-license" +RESTRICT="binchecks strip + unknown-license? ( bindist )" -DEPEND="" RDEPEND="!savedconfig? ( - !sys-firmware/alsa-firmware[alsa_cards_ca0132] - !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 - ! ${PN}.conf - find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf + find * ! -type d ! -name ${PN}.conf >> ${PN}.conf if use savedconfig; then restore_config ${PN}.conf - ebegin "Removing all files not listed in config" - local file delete_file preserved_file preserved_files=() + local file preserved_files=() remove=() while IFS= read -r file; do # Ignore comments. @@ -95,23 +257,13 @@ src_prepare() { done < ${PN}.conf || die while IFS= read -d "" -r file; do - delete_file=true - for preserved_file in "${preserved_files[@]}"; do - if [[ "${file}" == "${preserved_file}" ]]; then - delete_file=false - fi - done - - if ${delete_file}; then - rm "${file}" || die - fi - done < <(find * \( \! -type d -and \! -name ${PN}.conf \) -print0 || die) - - eend || die - - # remove empty directories, bug #396073 - find -type d -empty -delete || die + has "${file}" "${preserved_files[@]}" || remove+=("${file}") + done < <(find * ! -type d ! -name ${PN}.conf -print0 || die) + printf "%s\0" "${remove[@]}" | xargs -0 --no-run-if-empty rm || die fi + + # remove empty directories, bug #396073 + find -type d -empty -delete || die } src_install() { @@ -132,4 +284,15 @@ pkg_preinst() { pkg_postinst() { elog "If you are only interested in particular firmware files, edit the saved" elog "configfile and remove those that you do not want." + + local ver + for ver in ${REPLACING_VERSIONS}; do + if ver_test ${ver} -lt 20190514; then + elog + elog 'Starting with version 20190514, installation of many firmware' + elog 'files is controlled by USE flags. Please review your USE flag' + elog 'and package.license settings if you are missing some files.' + break + fi + done }