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 EE340158086 for ; Tue, 4 Jan 2022 03:29:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 028832BC04D; Tue, 4 Jan 2022 03:29:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B53BE2BC04D for ; Tue, 4 Jan 2022 03:29:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D4AFD34318E for ; Tue, 4 Jan 2022 03:29:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99C3229A for ; Tue, 4 Jan 2022 03:29:24 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1641266936.b9542e652763128a58b5c042434386b399291d7a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/sysvinit/sysvinit-2.99-r1.ebuild sys-apps/sysvinit/sysvinit-3.00-r1.ebuild sys-apps/sysvinit/sysvinit-3.01.ebuild X-VCS-Directories: sys-apps/sysvinit/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b9542e652763128a58b5c042434386b399291d7a X-VCS-Branch: master Date: Tue, 4 Jan 2022 03:29:24 +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: 9670f46d-99e3-463e-9077-2fbce1bd6072 X-Archives-Hash: fdb22052a2d582a7ce670e625afdd660 commit: b9542e652763128a58b5c042434386b399291d7a Author: David Seifert gentoo org> AuthorDate: Mon Jan 3 15:50:50 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jan 4 03:28:56 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9542e65 sys-apps/sysvinit: remove kernel_FreeBSD Signed-off-by: David Seifert gentoo.org> Signed-off-by: Sam James gentoo.org> sys-apps/sysvinit/sysvinit-2.99-r1.ebuild | 11 ++--------- sys-apps/sysvinit/sysvinit-3.00-r1.ebuild | 11 ++--------- sys-apps/sysvinit/sysvinit-3.01.ebuild | 11 ++--------- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild index 9d78abebae42..589bb6747c9b 100644 --- a/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild +++ b/sys-apps/sysvinit/sysvinit-2.99-r1.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 @@ -13,7 +13,7 @@ LICENSE="GPL-2" SLOT="0" [[ "${PV}" == *beta* ]] || \ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="selinux ibm static kernel_FreeBSD" +IUSE="selinux ibm static" CDEPEND=" selinux? ( @@ -76,13 +76,6 @@ src_prepare() { ) fi (use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab - if use kernel_FreeBSD ; then - sed -i \ - -e 's/linux/cons25/g' \ - -e 's/ttyS0/cuaa0/g' \ - -e 's/ttyS1/cuaa1/g' \ - inittab #121786 - fi if use x86 || use amd64 ; then sed -i \ -e '/ttyS[01]/s:9600:115200:' \ diff --git a/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild b/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild index 83d6e6f7635b..2b6267d776db 100644 --- a/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild +++ b/sys-apps/sysvinit/sysvinit-3.00-r1.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 @@ -13,7 +13,7 @@ LICENSE="GPL-2" SLOT="0" [[ "${PV}" == *beta* ]] || \ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="selinux ibm static kernel_FreeBSD" +IUSE="selinux ibm static" CDEPEND=" selinux? ( @@ -76,13 +76,6 @@ src_prepare() { ) fi (use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab - if use kernel_FreeBSD ; then - sed -i \ - -e 's/linux/cons25/g' \ - -e 's/ttyS0/cuaa0/g' \ - -e 's/ttyS1/cuaa1/g' \ - inittab #121786 - fi if use x86 || use amd64 ; then sed -i \ -e '/ttyS[01]/s:9600:115200:' \ diff --git a/sys-apps/sysvinit/sysvinit-3.01.ebuild b/sys-apps/sysvinit/sysvinit-3.01.ebuild index 83d6e6f7635b..2b6267d776db 100644 --- a/sys-apps/sysvinit/sysvinit-3.01.ebuild +++ b/sys-apps/sysvinit/sysvinit-3.01.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 @@ -13,7 +13,7 @@ LICENSE="GPL-2" SLOT="0" [[ "${PV}" == *beta* ]] || \ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="selinux ibm static kernel_FreeBSD" +IUSE="selinux ibm static" CDEPEND=" selinux? ( @@ -76,13 +76,6 @@ src_prepare() { ) fi (use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab - if use kernel_FreeBSD ; then - sed -i \ - -e 's/linux/cons25/g' \ - -e 's/ttyS0/cuaa0/g' \ - -e 's/ttyS1/cuaa1/g' \ - inittab #121786 - fi if use x86 || use amd64 ; then sed -i \ -e '/ttyS[01]/s:9600:115200:' \