Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/
Date: Tue, 04 Jan 2022 03:29:35
Message-Id: 1641266936.b9542e652763128a58b5c042434386b399291d7a.sam@gentoo
1 commit: b9542e652763128a58b5c042434386b399291d7a
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 3 15:50:50 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 4 03:28:56 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9542e65
7
8 sys-apps/sysvinit: remove kernel_FreeBSD
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 sys-apps/sysvinit/sysvinit-2.99-r1.ebuild | 11 ++---------
14 sys-apps/sysvinit/sysvinit-3.00-r1.ebuild | 11 ++---------
15 sys-apps/sysvinit/sysvinit-3.01.ebuild | 11 ++---------
16 3 files changed, 6 insertions(+), 27 deletions(-)
17
18 diff --git a/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
19 index 9d78abebae42..589bb6747c9b 100644
20 --- a/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
21 +++ b/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2021 Gentoo Authors
24 +# Copyright 1999-2022 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=7
28 @@ -13,7 +13,7 @@ LICENSE="GPL-2"
29 SLOT="0"
30 [[ "${PV}" == *beta* ]] || \
31 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
32 -IUSE="selinux ibm static kernel_FreeBSD"
33 +IUSE="selinux ibm static"
34
35 CDEPEND="
36 selinux? (
37 @@ -76,13 +76,6 @@ src_prepare() {
38 )
39 fi
40 (use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
41 - if use kernel_FreeBSD ; then
42 - sed -i \
43 - -e 's/linux/cons25/g' \
44 - -e 's/ttyS0/cuaa0/g' \
45 - -e 's/ttyS1/cuaa1/g' \
46 - inittab #121786
47 - fi
48 if use x86 || use amd64 ; then
49 sed -i \
50 -e '/ttyS[01]/s:9600:115200:' \
51
52 diff --git a/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild b/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild
53 index 83d6e6f7635b..2b6267d776db 100644
54 --- a/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild
55 +++ b/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild
56 @@ -1,4 +1,4 @@
57 -# Copyright 1999-2021 Gentoo Authors
58 +# Copyright 1999-2022 Gentoo Authors
59 # Distributed under the terms of the GNU General Public License v2
60
61 EAPI=7
62 @@ -13,7 +13,7 @@ LICENSE="GPL-2"
63 SLOT="0"
64 [[ "${PV}" == *beta* ]] || \
65 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
66 -IUSE="selinux ibm static kernel_FreeBSD"
67 +IUSE="selinux ibm static"
68
69 CDEPEND="
70 selinux? (
71 @@ -76,13 +76,6 @@ src_prepare() {
72 )
73 fi
74 (use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
75 - if use kernel_FreeBSD ; then
76 - sed -i \
77 - -e 's/linux/cons25/g' \
78 - -e 's/ttyS0/cuaa0/g' \
79 - -e 's/ttyS1/cuaa1/g' \
80 - inittab #121786
81 - fi
82 if use x86 || use amd64 ; then
83 sed -i \
84 -e '/ttyS[01]/s:9600:115200:' \
85
86 diff --git a/sys-apps/sysvinit/sysvinit-3.01.ebuild b/sys-apps/sysvinit/sysvinit-3.01.ebuild
87 index 83d6e6f7635b..2b6267d776db 100644
88 --- a/sys-apps/sysvinit/sysvinit-3.01.ebuild
89 +++ b/sys-apps/sysvinit/sysvinit-3.01.ebuild
90 @@ -1,4 +1,4 @@
91 -# Copyright 1999-2021 Gentoo Authors
92 +# Copyright 1999-2022 Gentoo Authors
93 # Distributed under the terms of the GNU General Public License v2
94
95 EAPI=7
96 @@ -13,7 +13,7 @@ LICENSE="GPL-2"
97 SLOT="0"
98 [[ "${PV}" == *beta* ]] || \
99 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
100 -IUSE="selinux ibm static kernel_FreeBSD"
101 +IUSE="selinux ibm static"
102
103 CDEPEND="
104 selinux? (
105 @@ -76,13 +76,6 @@ src_prepare() {
106 )
107 fi
108 (use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
109 - if use kernel_FreeBSD ; then
110 - sed -i \
111 - -e 's/linux/cons25/g' \
112 - -e 's/ttyS0/cuaa0/g' \
113 - -e 's/ttyS1/cuaa1/g' \
114 - inittab #121786
115 - fi
116 if use x86 || use amd64 ; then
117 sed -i \
118 -e '/ttyS[01]/s:9600:115200:' \