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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E55B0158020 for ; Tue, 20 Dec 2022 23:26:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01343E0952; Tue, 20 Dec 2022 23:26:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC435E0952 for ; Tue, 20 Dec 2022 23:26:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C238F33BE32 for ; Tue, 20 Dec 2022 23:26:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2FE86703 for ; Tue, 20 Dec 2022 23:26:14 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1671578735.2312b1a486f1512ad0c7c09af65739f6d8775f3c.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild sys-boot/syslinux/syslinux-6.04_pre3.ebuild X-VCS-Directories: sys-boot/syslinux/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 2312b1a486f1512ad0c7c09af65739f6d8775f3c X-VCS-Branch: master Date: Tue, 20 Dec 2022 23:26:14 +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: de1cb036-1ecc-4930-91ff-0b353ae56a72 X-Archives-Hash: 4cd3912bad783345b811b9737a60ee8a commit: 2312b1a486f1512ad0c7c09af65739f6d8775f3c Author: Mike Gilbert gentoo org> AuthorDate: Tue Dec 20 23:24:39 2022 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Dec 20 23:25:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2312b1a4 sys-boot/syslinux: rename keytab-lilo to keytab-syslinux Avoids a collision with sys-boot/lilo. Closes: https://bugs.gentoo.org/887395 Signed-off-by: Mike Gilbert gentoo.org> .../{syslinux-6.04_pre1-r2.ebuild => syslinux-6.04_pre1-r4.ebuild} | 3 ++- .../{syslinux-6.04_pre1-r3.ebuild => syslinux-6.04_pre1-r5.ebuild} | 1 + .../{syslinux-6.04_pre3.ebuild => syslinux-6.04_pre3-r1.ebuild} | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild similarity index 97% rename from sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild rename to sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild index b0ed750f5a1e..cf6b824f1fdc 100644 --- a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild +++ b/sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -116,5 +116,6 @@ src_install() { # parallel install fails sometimes einfo "loaderarch=${loaderarch}" _emake -j1 INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install + mv "${ED}"/usr/bin/keytab-{lilo,syslinux} || die dodoc README NEWS doc/*.txt } diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild similarity index 97% rename from sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild rename to sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild index 4fba6cac1462..e4925c07622a 100644 --- a/sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild +++ b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild @@ -82,6 +82,7 @@ src_install() { install ) emake -j1 "${args[@]}" + mv "${ED}"/usr/bin/keytab-{lilo,syslinux} || die einstalldocs dostrip -x /usr/share/syslinux } diff --git a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild similarity index 97% rename from sys-boot/syslinux/syslinux-6.04_pre3.ebuild rename to sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild index 9d2dcf602fe1..9c48e26d67c6 100644 --- a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild +++ b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild @@ -99,6 +99,7 @@ src_install() { install ) emake -j1 "${args[@]}" + mv "${ED}"/usr/bin/keytab-{lilo,syslinux} || die einstalldocs dostrip -x /usr/share/syslinux }